*** empty log message ***

4225 files changed, 81382 insertions, 20181 deletions

diff --git a/app-benchmarks/acovea/ChangeLog b/app-benchmarks/acovea/ChangeLog
index d976609092fc..d5debea96459 100644
--- a/app-benchmarks/acovea/ChangeLog
+++ b/app-benchmarks/acovea/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-benchmarks/acovea
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/acovea/ChangeLog,v 1.1 2004/05/07 17:16:37 aliz Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/acovea/ChangeLog,v 1.1.1.1 2005/11/30 09:36:34 chriswhite Exp $
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  02 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> acovea-4.0.0.ebuild:
+  Fix homepage and src_uri, closes bug 66056.
+
+  14 Jun 2004; Daniel Ahlberg <aliz@gentoo.org> acovea-4.0.0.ebuild:
+  Unmasked on x86 and amd64.
 
 *acovea-4.0.0 (07 May 2004)
 
diff --git a/app-benchmarks/acovea/Manifest b/app-benchmarks/acovea/Manifest
index 9d2a9c7bb743..96466fbd69e2 100644
--- a/app-benchmarks/acovea/Manifest
+++ b/app-benchmarks/acovea/Manifest
@@ -1,2 +1,4 @@
-MD5 193c347bdc0891305bee968fb29480e7 acovea-4.0.0.ebuild 447
+MD5 03a5151523fbed4b362342061fed80a9 ChangeLog 661
+MD5 38e00510d37a17acf7477659785ac6b5 acovea-4.0.0.ebuild 633
+MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
 MD5 da2f660984eb3f6a33ced4d33f900a26 files/digest-acovea-4.0.0 64
diff --git a/app-benchmarks/acovea/acovea-4.0.0.ebuild b/app-benchmarks/acovea/acovea-4.0.0.ebuild
index d1517b3103ed..975aa14fe81f 100644
--- a/app-benchmarks/acovea/acovea-4.0.0.ebuild
+++ b/app-benchmarks/acovea/acovea-4.0.0.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/app-benchmarks/acovea/acovea-4.0.0.ebuild,v 1.1 2004/05/07 17:16:37 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/acovea/acovea-4.0.0.ebuild,v 1.1.1.1 2005/11/30 09:36:34 chriswhite Exp $
 
 DESCRIPTION="Analysis of Compiler Options via Evolutionary Algorithm"
-HOMEPAGE="http://www.coyotegulch.com/acovea/"
-SRC_URI="http://www.coyotegulch.com/acovea/${P}.tar.gz"
+HOMEPAGE="http://www.coyotegulch.com/products/acovea/"
+SRC_URI="http://www.coyotegulch.com/products/acovea/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64"
 IUSE=""
 DEPEND="dev-libs/libcoyotl
 	dev-libs/libevocosm
-	dev-libs/expat"
+	dev-libs/expat
+	>=sys-devel/gcc-3.3"
 
 src_install() {
 	make DESTDIR=${D} install
diff --git a/app-benchmarks/bashmark/ChangeLog b/app-benchmarks/bashmark/ChangeLog
index 51bd1c93fa4f..d018eaaa7b67 100644
--- a/app-benchmarks/bashmark/ChangeLog
+++ b/app-benchmarks/bashmark/ChangeLog
@@ -1,6 +1,38 @@
 # ChangeLog for app-benchmarks/bashmark
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bashmark/ChangeLog,v 1.1 2005/03/07 16:52:08 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bashmark/ChangeLog,v 1.1.1.1 2005/11/30 09:36:37 chriswhite Exp $
+
+*bashmark-0.6.2 (21 Jul 2005)
+
+  21 Jul 2005; Stefan Schweizer <genstef@gentoo.org> +bashmark-0.6.2.ebuild:
+  version bump
+
+*bashmark-0.6.1 (12 Jun 2005)
+
+  12 Jun 2005; Stefan Schweizer <genstef@gentoo.org> -bashmark-0.3.4.ebuild,
+  -bashmark-0.4.ebuild, -bashmark-0.5.ebuild, -bashmark-0.6.ebuild,
+  +bashmark-0.6.1.ebuild:
+  Version bump, removing old versions
+
+*bashmark-0.6 (30 Mar 2005)
+
+  30 Mar 2005; Stefan Schweizer <genstef@gentoo.org> +bashmark-0.6.ebuild:
+  Version bump
+
+*bashmark-0.5 (14 Mar 2005)
+
+  14 Mar 2005; Stefan Schweizer <genstef@gentoo.org> +bashmark-0.5.ebuild:
+  version bump
+
+*bashmark-0.4 (10 Mar 2005)
+
+  10 Mar 2005; Stefan Schweizer <genstef@gentoo.org> +bashmark-0.4.ebuild:
+  version bump.
+
+*bashmark-0.3.4 (07 Mar 2005)
+
+  07 Mar 2005; Stefan Schweizer <genstef@gentoo.org> +bashmark-0.3.4.ebuild:
+  version bump
 
 *bashmark-0.3.3 (07 Mar 2005)
 
diff --git a/app-benchmarks/bashmark/Manifest b/app-benchmarks/bashmark/Manifest
index 3a1379784061..4a607ed21f07 100644
--- a/app-benchmarks/bashmark/Manifest
+++ b/app-benchmarks/bashmark/Manifest
@@ -1,4 +1,6 @@
-MD5 5304aa0a97abc18abd7ec8f202ea10fb bashmark-0.3.3.ebuild 368
-MD5 f915d2882e426a336a1465544502a4b0 ChangeLog 290
+MD5 cabb00bc3c08dd7f50a3ad2589e007a8 bashmark-0.6.1.ebuild 500
+MD5 375b0f848852e9c01b61b29ce482aade ChangeLog 1236
 MD5 5a2e4e39096f08807a92498cf41b2ad3 metadata.xml 268
-MD5 54d1e667322219444c15117c11038064 files/digest-bashmark-0.3.3 66
+MD5 e6c2f7fc60c844bbc99fbda261a4d24e bashmark-0.6.2.ebuild 500
+MD5 5850a0184f7548b3bfe69e2918ed9c04 files/digest-bashmark-0.6.1 66
+MD5 2da8440a274fce15c58488702f566e91 files/digest-bashmark-0.6.2 66
diff --git a/app-benchmarks/bashmark/bashmark-0.6.1.ebuild b/app-benchmarks/bashmark/bashmark-0.6.1.ebuild
index 2af5595b8036..8786ce1e09df 100644
--- a/app-benchmarks/bashmark/bashmark-0.6.1.ebuild
+++ b/app-benchmarks/bashmark/bashmark-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/app-benchmarks/bashmark/bashmark-0.6.1.ebuild,v 1.1 2005/06/12 18:29:01 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bashmark/bashmark-0.6.1.ebuild,v 1.1.1.1 2005/11/30 09:36:37 chriswhite Exp $
 
 DESCRIPTION="Geno's cross platform benchmarking suite"
 HOMEPAGE="http://bashmark.coders-net.de"
@@ -13,5 +13,5 @@ IUSE=""
 
 src_install() {
 	dobin bashmark
-	dodoc Changelog
+	dodoc ChangeLog
 }
diff --git a/app-benchmarks/bashmark/bashmark-0.6.2.ebuild b/app-benchmarks/bashmark/bashmark-0.6.2.ebuild
index d2a261f3ffb3..6294f2480c72 100644
--- a/app-benchmarks/bashmark/bashmark-0.6.2.ebuild
+++ b/app-benchmarks/bashmark/bashmark-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/app-benchmarks/bashmark/bashmark-0.6.2.ebuild,v 1.1 2005/07/21 16:01:21 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bashmark/bashmark-0.6.2.ebuild,v 1.1.1.1 2005/11/30 09:36:37 chriswhite Exp $
 
 DESCRIPTION="Geno's cross platform benchmarking suite"
 HOMEPAGE="http://bashmark.coders-net.de"
diff --git a/app-benchmarks/bonnie++/ChangeLog b/app-benchmarks/bonnie++/ChangeLog
index 60e5700891d9..c598dd1f9d68 100644
--- a/app-benchmarks/bonnie++/ChangeLog
+++ b/app-benchmarks/bonnie++/ChangeLog
@@ -1,15 +1,58 @@
-# ChangeLog for app-misc/bonnie++
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bonnie++/ChangeLog,v 1.1 2003/06/25 20:51:56 mholzer Exp $
+# ChangeLog for app-benchmarks/bonnie++
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bonnie++/ChangeLog,v 1.1.1.1 2005/11/30 09:36:35 chriswhite Exp $
+
+  29 Mar 2005; Aron Griffis <agriffis@gentoo.org> bonnie++-1.93c.ebuild:
+  stable on ia64
+
+  28 Nov 2004; Mike Doty <kingtaco@gentoo.org> :
+  stable on amd64
+
+  05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  bonnie++-1.03.ebuild, bonnie++-1.93c.ebuild:
+  Masked bonnie++-1.93c.ebuild stable for ppc
+
+  05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  bonnie++-1.03.ebuild:
+  Masked bonnie++-1.03.ebuild stable for ppc
+
+  15 Sep 2004; Danny van Dyk <kugelfang@gentoo.org>
+  +files/bonnie++-1.93c-64bit.patch, bonnie++-1.93c.ebuild:
+  Added patch to make bonnie++ compile on 64bit systems. Fixes BUG #63808.
+
+  27 Aug 2004; Daniel Goller <morfic@gentoo.org> bonnie++-1.93c.ebuild:
+  Going gold on x86
+
+*bonnie++-1.93c (22 Jul 2004)
+
+  22 Jul 2004; Daniel Goller <morfic@gentoo.org> +metadata.xml,
+  +bonnie++-1.93c.ebuild:
+  Bumped Version to 1.93c, added metadata.xml
+
+  01 Jun 2004; Aron Griffis <agriffis@gentoo.org> bonnie++-1.02c-r1.ebuild,
+  bonnie++-1.03.ebuild:
+  Fix use invocation
+
+  03 Oct 2003; Aron Griffis <agriffis@gentoo.org> bonnie++-1.03.ebuild:
+  Stable on alpha
+
+  02 Oct 2003; Brad House <brad_mssw@gentoo.org> bonnie++-1.03.ebuild:
+  add ~amd64 flag
 
 *bonnie++-1.02c-r1 (25 Jun 2003)
 
+  01 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Change $DEBUG -> use debug
+
   25 Jun 2003; Martin Holzer <mholzer@gentoo.org> bonnie++-1.02c-r1.ebuild,
   bonnie++-1.03.ebuild:
   Moved app-misc/bonnie++ to app-benchmarks/bonnie++
 
 *bonnie++-1.03 (6 Dec 2002)
 
+  01 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Change $DEBUG -> use debug
+
   08 Jan 2003; Jack Morgan <jmorgan@gentoo.org> bonnie++-1.03.ebuild :
   Removed sparc64 keyword 
 
diff --git a/app-benchmarks/bonnie++/Manifest b/app-benchmarks/bonnie++/Manifest
index 0468de104292..606d56e70d77 100644
--- a/app-benchmarks/bonnie++/Manifest
+++ b/app-benchmarks/bonnie++/Manifest
@@ -1,5 +1,9 @@
-MD5 a99af49bfa1d6f1115d2edbfe757ffbf ChangeLog 1380
-MD5 0455e3018789d11387ce583a4183e6df bonnie++-1.02c-r1.ebuild 830
-MD5 1b66bbe822b8642dbd3b9c95cbcf5239 bonnie++-1.03.ebuild 946
+MD5 dc34aced57074d77c5d63b0ca54cb498 ChangeLog 2931
+MD5 601159ae08db6268519548f423a2fdc7 bonnie++-1.02c-r1.ebuild 899
+MD5 09c697cf368d8b0dc521c219c93fec7a bonnie++-1.03.ebuild 857
+MD5 580dca15413c9c8a658e5c43d808485b bonnie++-1.93c.ebuild 942
+MD5 aeb5a6b55ca2477b1f998c03e6c42a15 metadata.xml 493
 MD5 0c790252377cc712ba5b9d715e4fa9b7 files/digest-bonnie++-1.02c-r1 62
 MD5 f7a1f45cf334317f5cbafa8ac9cea78a files/digest-bonnie++-1.03 61
+MD5 52da670893e9dbaa752cd942a3e37eb2 files/digest-bonnie++-1.93c 63
+MD5 e1523060054e41baed39c972d27731f3 files/bonnie++-1.93c-64bit.patch 646
diff --git a/app-benchmarks/bonnie++/bonnie++-1.02c-r1.ebuild b/app-benchmarks/bonnie++/bonnie++-1.02c-r1.ebuild
index 3ffb08fcc4f0..c99b6c442bdc 100644
--- a/app-benchmarks/bonnie++/bonnie++-1.02c-r1.ebuild
+++ b/app-benchmarks/bonnie++/bonnie++-1.02c-r1.ebuild
@@ -1,20 +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/app-benchmarks/bonnie++/bonnie++-1.02c-r1.ebuild,v 1.1 2003/06/25 20:51:56 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bonnie++/bonnie++-1.02c-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:35 chriswhite Exp $
 
-DESCRIPTION="Hard drive bottleneck testing benchmark suite."
-SRC_URI="http://www.coker.com.au/bonnie++/${P}.tgz"
+DESCRIPTION="Hard drive bottleneck testing benchmark suite"
 HOMEPAGE="http://www.coker.com.au/bonnie++/"
+SRC_URI="http://www.coker.com.au/bonnie++/${P}.tgz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86"
+IUSE="debug"
 
 src_compile() {
-	local myconf=""
-	[ "$DEBUG" == "true" ] && myconf="--with-debug --disable-stripping"
+	local myconf="`use_with debug`"
+	use debug \
+		&& myconf="${myconf} --disable-stripping" \
+		|| myconf="${myconf} --enable-stripping"
 
-	econf ${myconf}
+	econf ${myconf} || die
 	emake || die "emake failed"
 	emake zcav || die "emake zcav failed" # see #9073
 }
diff --git a/app-benchmarks/bonnie++/bonnie++-1.03.ebuild b/app-benchmarks/bonnie++/bonnie++-1.03.ebuild
index 7e19d4e7a24f..b6f444515b0d 100644
--- a/app-benchmarks/bonnie++/bonnie++-1.03.ebuild
+++ b/app-benchmarks/bonnie++/bonnie++-1.03.ebuild
@@ -1,31 +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/app-benchmarks/bonnie++/bonnie++-1.03.ebuild,v 1.1 2003/06/25 20:51:56 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bonnie++/bonnie++-1.03.ebuild,v 1.1.1.1 2005/11/30 09:36:35 chriswhite Exp $
 
 DESCRIPTION="Hard drive bottleneck testing benchmark suite."
-SRC_URI="http://www.coker.com.au/bonnie++/${P}.tgz"
 HOMEPAGE="http://www.coker.com.au/bonnie++/"
+SRC_URI="http://www.coker.com.au/bonnie++/${P}.tgz"
 
-SLOT="0"
 LICENSE="GPL-2"
-# I think this should work on other than x86 platforms (by sandymac)
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-IUSE=""
-DEPEND="virtual/glibc"
+SLOT="0"
+KEYWORDS="x86 ppc ~sparc alpha ~amd64"
+IUSE="debug"
 
-src_compile() {
-	local myconf=""
-	[ "$DEBUG" == "true" ] && myconf="--with-debug --disable-stripping"
+DEPEND="virtual/libc"
 
-	econf ${myconf}
+src_compile() {
+	econf \
+		`use_with debug` \
+		`use_enable !debug stripping` \
+		|| die
 	emake || die "emake failed"
 	emake zcav || die "emake zcav failed" # see #9073
 }
 
 src_install() {
-	dosbin bonnie++ zcav
-	dobin bon_csv2html bon_csv2txt
+	dosbin bonnie++ zcav || die
+	dobin bon_csv2html bon_csv2txt || die
 	doman bon_csv2html.1 bon_csv2txt.1 bonnie++.8 zcav.8
 	dohtml readme.html
-	dodoc changelog.txt copyright.txt credits.txt
+	dodoc changelog.txt credits.txt
 }
diff --git a/app-benchmarks/bonnie++/bonnie++-1.93c.ebuild b/app-benchmarks/bonnie++/bonnie++-1.93c.ebuild
index 2ce61e951db0..7e3aab4a7897 100644
--- a/app-benchmarks/bonnie++/bonnie++-1.93c.ebuild
+++ b/app-benchmarks/bonnie++/bonnie++-1.93c.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/app-benchmarks/bonnie++/bonnie++-1.93c.ebuild,v 1.1 2004/07/22 17:24:09 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bonnie++/bonnie++-1.93c.ebuild,v 1.1.1.1 2005/11/30 09:36:35 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="Hard drive bottleneck testing benchmark suite."
 HOMEPAGE="http://www.coker.com.au/bonnie++/"
@@ -8,15 +10,21 @@ SRC_URI="http://www.coker.com.au/bonnie++/experimental/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc alpha ~amd64"
+KEYWORDS="alpha amd64 ia64 ppc ~sparc x86"
 IUSE="debug"
 
-DEPEND="virtual/libc"
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-64bit.patch
+}
 
 src_compile() {
 	econf \
-		`use_with debug` \
-		`use_enable !debug stripping` \
+		$(use_with debug) \
+		--disable-stripping \
 		|| die
 	emake || die "emake failed"
 	emake zcav || die "emake zcav failed" # see #9073
diff --git a/app-benchmarks/bonnie/ChangeLog b/app-benchmarks/bonnie/ChangeLog
index 5d732b35cced..99458d288b8e 100644
--- a/app-benchmarks/bonnie/ChangeLog
+++ b/app-benchmarks/bonnie/ChangeLog
@@ -1,9 +1,39 @@
 # ChangeLog for app-benchmarks/bonnie
-# Copyright 2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bonnie/ChangeLog,v 1.1 2003/02/11 18:57:16 sethbc Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bonnie/ChangeLog,v 1.1.1.1 2005/11/30 09:36:35 chriswhite Exp $
+
+  31 Mar 2005; Aron Griffis <agriffis@gentoo.org> bonnie-2.0.6.ebuild:
+  stable on ia64
+
+  18 Dec 2004; Simon Stelling <blubb@gentoo.org> bonnie-2.0.6.ebuild:
+  was testing for a long time, marking stable on amd64
+
+  10 Aug 2004; Tom Gall <tgall@gentoo.org> bonnie-2.0.6.ebuild:
+  stable on ppc64, bug #58081
+
+  10 Jun 2004; Stephen P. Becker <geoman@gentoo.org> bonnie-2.0.6.ebuild:
+  Added ~mips keyword.
+
+  30 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> bonnie-2.0.6.ebuild:
+  Adding amd64 keyword. Closing #42977.
+
+  29 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> bonnie-2.0.6.ebuild:
+  inherit eutils for epatch
+
+  08 Oct 2003; MATSUU Takuto <matsuu@gentoo.org> bonnie-2.0.6.ebuild:
+  Stable on sparc
+
+  03 Oct 2003; Aron Griffis <agriffis@gentoo.org> bonnie-2.0.6.ebuild:
+  Stable on alpha
+
+  12 Oct 2003; Chuck Short <zul@gentoo.org> bonnie-2.0.6.ebuild:
+  Added ~ia64 to keywords.
 
 *bonnie-2.0.6 (07 Jan 2003)
 
+  28 Mar 2003; Pieter Van den Abeele <pvdabeel@gentoo.org>: bonnie-2.0.6.ebuild
+  Moved to stable on ppc
+
   07 Jan 2003; Seth Chandler <sethbc@gentoo.org>: bonnie-2.0.6.ebuild
   Initial import of bonnie. thanks to Thomas T. Veldhouse 
   <veldy@veldy.net>
diff --git a/app-benchmarks/bonnie/Manifest b/app-benchmarks/bonnie/Manifest
index e69de29bb2d1..339c188b23ff 100644
--- a/app-benchmarks/bonnie/Manifest
+++ b/app-benchmarks/bonnie/Manifest
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 622dd0a25a56cd6a3de317dcd2433876 bonnie-2.0.6.ebuild 800
+MD5 7a0a0944383277adcdec28b29b8bd480 ChangeLog 1397
+MD5 9a551c719a5f13997e6a2f2375a93721 metadata.xml 164
+MD5 f23bd5149955b47a9739ac6279998698 files/bonnie_man.patch 350
+MD5 c72a42518e23fdc675ed7b0a4bee0045 files/Makefile.patch 248
+MD5 4f5d7854c5b9e58a36722c7b932ba53d files/digest-bonnie-2.0.6 56
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCVtC7EZCkKN40op4RAjnVAJ9DG53E5yDhz5FpBEMmVgcDKCe1agCdE8lu
+nEziRI0wJx7SSGNP8tbCYe8=
+=n+S0
+-----END PGP SIGNATURE-----
diff --git a/app-benchmarks/bonnie/bonnie-2.0.6.ebuild b/app-benchmarks/bonnie/bonnie-2.0.6.ebuild
index 94aa47f435e3..55b35b8748fc 100644
--- a/app-benchmarks/bonnie/bonnie-2.0.6.ebuild
+++ b/app-benchmarks/bonnie/bonnie-2.0.6.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/app-benchmarks/bonnie/bonnie-2.0.6.ebuild,v 1.1 2003/02/11 18:57:16 sethbc Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bonnie/bonnie-2.0.6.ebuild,v 1.1.1.1 2005/11/30 09:36:35 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="Performance Test of Filesystem I/O using standard C library calls."
 HOMEPAGE="http://www.textuality.com/bonnie/"
@@ -8,7 +10,7 @@ SRC_URI="http://www.textuality.com/bonnie/bonnie.tar.gz"
 
 LICENSE="bonnie"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="x86 ppc sparc alpha ia64 amd64 ~mips ppc64"
 IUSE=""
 DEPEND=""
 RDEPEND=""
@@ -16,9 +18,9 @@ RDEPEND=""
 S=${WORKDIR}
 
 src_unpack() {
- 	unpack ${A} || die
-	patch -p0 < ${FILESDIR}/bonnie_man.patch || die
-	patch -p0 < ${FILESDIR}/Makefile.patch || die
+	unpack ${A} || die
+	epatch ${FILESDIR}/bonnie_man.patch
+	epatch ${FILESDIR}/Makefile.patch
 }
 
 src_compile() {
diff --git a/app-benchmarks/contest/ChangeLog b/app-benchmarks/contest/ChangeLog
index bdaadbf317b8..550e8db83ed7 100644
--- a/app-benchmarks/contest/ChangeLog
+++ b/app-benchmarks/contest/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-benchmarks/contest
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/contest/ChangeLog,v 1.1 2004/02/06 23:10:06 pyrania Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/contest/ChangeLog,v 1.1.1.1 2005/11/30 09:36:36 chriswhite Exp $
+
+  08 Jul 2005; David Holm <dholm@gentoo.org> contest-0.61.ebuild:
+  Added to ~ppc.
+
+  12 Apr 2004; Chris Aniszczyk <zx@gentoo.org> contest-0.61.ebuild:
+  Add missing IUSE
 
 *contest-0.61 (07 Feb 2004)
 
diff --git a/app-benchmarks/contest/Manifest b/app-benchmarks/contest/Manifest
index f143024e89b0..64aae7e331b7 100644
--- a/app-benchmarks/contest/Manifest
+++ b/app-benchmarks/contest/Manifest
@@ -1,2 +1,4 @@
-MD5 36cddcca1b71c4768f14a35d3a0680e3 contest-0.61.ebuild 664
+MD5 8d3703bdf5ae9f064552e1abe5336da1 ChangeLog 544
+MD5 76bf3d936f861cef7644127d96a68fd7 contest-0.61.ebuild 761
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
 MD5 eee765df455aa16fef5a368b4f24a0e6 files/digest-contest-0.61 63
diff --git a/app-benchmarks/contest/contest-0.61.ebuild b/app-benchmarks/contest/contest-0.61.ebuild
index b4743922fe76..fd2c63fe3050 100644
--- a/app-benchmarks/contest/contest-0.61.ebuild
+++ b/app-benchmarks/contest/contest-0.61.ebuild
@@ -1,13 +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/app-benchmarks/contest/contest-0.61.ebuild,v 1.1 2004/02/06 23:10:06 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/contest/contest-0.61.ebuild,v 1.1.1.1 2005/11/30 09:36:36 chriswhite Exp $
 
 DESCRIPTION="Test system responsiveness for compare different kernels"
 HOMEPAGE="http://members.optusnet.com.au/ckolivas/contest/"
 SRC_URI="http://members.optusnet.com.au/ckolivas/contest/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
+IUSE=""
 
 RDEPEND=">=app-benchmarks/dbench-2.0"
 
@@ -23,8 +25,7 @@ src_compile() {
 }
 
 src_install() {
-	into /usr
-	dobin contest
+	dobin contest || die
 	doman contest.1
-	dodoc COPYING README
+	dodoc README
 }
diff --git a/app-benchmarks/cpuburn/ChangeLog b/app-benchmarks/cpuburn/ChangeLog
index fa71744ff8f7..aed4f3800623 100644
--- a/app-benchmarks/cpuburn/ChangeLog
+++ b/app-benchmarks/cpuburn/ChangeLog
@@ -1,7 +1,24 @@
 # ChangeLog for app-benchmarks/cpuburn
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/cpuburn/ChangeLog,v 1.1 2002/10/23 13:48:59 vapier Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/cpuburn/ChangeLog,v 1.1.1.1 2005/11/30 09:36:35 chriswhite Exp $
 
+  29 May 2005; Marcus D. Hanwell <marcus@gentoo.org> cpuburn-1.4.ebuild:
+  Stable on amd64.
+
+  25 Mar 2005; Daniel Goller <morfic@gentoo.org> +metadata.xml:
+  add metadata.xml
+
+  25 Mar 2005; <blubb@gentoo.org> cpuburn-1.4.ebuild:
+  added ~amd64
+
+  29 Sep 2004; Mike Frysinger <vapier@gentoo.org> cpuburn-1.4.ebuild:
+  Compiled with -m32 on amd64 systems #65719 by Rick Warner.
+
+  12 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> cpuburn-1.4.ebuild:
+  Don't assign default to S; header fix
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *cpuburn-1.4 (23 Oct 2002)
 
   23 Oct 2002; Mike Frysinger <vapier@gentoo.org> :
diff --git a/app-benchmarks/cpuburn/Manifest b/app-benchmarks/cpuburn/Manifest
index e69de29bb2d1..1b5020ed39f3 100644
--- a/app-benchmarks/cpuburn/Manifest
+++ b/app-benchmarks/cpuburn/Manifest
@@ -0,0 +1,4 @@
+MD5 9d7d74beee800930c8a61454e913ad35 cpuburn-1.4.ebuild 930
+MD5 9c0734f115144938856be80122777142 metadata.xml 481
+MD5 c181244f0212dbfbc81f7d467b5e56b5 ChangeLog 915
+MD5 6cf0a4c748c883846c78a58b0173aa80 files/digest-cpuburn-1.4 61
diff --git a/app-benchmarks/cpuburn/cpuburn-1.4.ebuild b/app-benchmarks/cpuburn/cpuburn-1.4.ebuild
index c2c754374b1e..b2aa074af5a6 100644
--- a/app-benchmarks/cpuburn/cpuburn-1.4.ebuild
+++ b/app-benchmarks/cpuburn/cpuburn-1.4.ebuild
@@ -1,28 +1,30 @@
-# 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/app-benchmarks/cpuburn/cpuburn-1.4.ebuild,v 1.1 2002/10/23 13:48:59 vapier Exp $
-
-DESCRIPTION="This program is designed to heavily load CPU chips [testing purposes]"
-HOMEPAGE="http://users.ev1.net/~redelm/"
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/cpuburn/cpuburn-1.4.ebuild,v 1.1.1.1 2005/11/30 09:36:35 chriswhite Exp $
 
 MY_P="${PV/./_}"
-SRC_URI="http://users.ev1.net/~redelm/cpuburn_${MY_P}_tar.gz"
-S="${WORKDIR}/${P}"
+DESCRIPTION="designed to heavily load CPU chips [testing purposes]"
+HOMEPAGE="http://pages.sbcglobal.net/redelm/"
+SRC_URI="http://pages.sbcglobal.net/redelm/cpuburn_${MY_P}_tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="-* amd64 x86"
 IUSE=""
-KEYWORDS="~x86 -ppc -sparc -sparc64 -alpha"
-
 RESTRICT="nostrip"
+
 DEPEND="sys-devel/gcc"
-RDEPEND=""
+RDEPEND="amd64? ( >=app-emulation/emul-linux-x86-baselibs-1.0 )"
 
 src_unpack() {
-	#for some reason he has it _tar instead of .tar ...
+	# for some reason he has it _tar instead of .tar ...
 	unpack ${A}
-	cd ${WORKDIR}
-	tar -xf cpuburn_${MY_P}_tar
+	tar -xf cpuburn_${MY_P}_tar || die
+
+	if use amd64 ; then	#65719
+		cd ${S}
+		sed -i 's:gcc -s:gcc -m32 -s:' Makefile || die "sed failed"
+	fi
 }
 
 src_compile() {
@@ -31,5 +33,5 @@ src_compile() {
 
 src_install() {
 	dodoc Design README
-	dobin burn{BX,K6,K7,MMX,P5,P6}
+	dobin burn{BX,K6,K7,MMX,P5,P6} || die
 }
diff --git a/app-benchmarks/dbench/ChangeLog b/app-benchmarks/dbench/ChangeLog
index 97681d6a8d93..fa3b6e78a5ba 100644
--- a/app-benchmarks/dbench/ChangeLog
+++ b/app-benchmarks/dbench/ChangeLog
@@ -1,9 +1,46 @@
 # ChangeLog for app-benchmarks/dbench
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/dbench/ChangeLog,v 1.1 2002/07/09 13:15:06 aliz Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/dbench/ChangeLog,v 1.1.1.1 2005/11/30 09:36:37 chriswhite Exp $
+
+  18 Dec 2004; Simon Stelling <blubb@gentoo.org> dbench-2.0.ebuild:
+  was testing for a long time, marking stable on amd64
+
+  12 Dec 2004; Jason Wever <weeve@gentoo.org> dbench-2.0.ebuild:
+  Stable on sparc.
+
+  28 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> dbench-2.0.ebuild:
+  Added to ~sparc.
+
+  24 Sep 2004; Sven Wegener <swegener@gentoo.org> -dbench-1.3.ebuild:
+  Removed old ebuild.
+
+  12 Apr 2004; Chris Aniszczyk <zx@gentoo.org> dbench-2.0.ebuild,
+  metadata.xml:
+  Add missing IUSE
+
+  12 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> dbench-1.3.ebuild,
+  dbench-2.0.ebuild:
+  Don't assign default to S; header fix
+
+  02 Oct 2003; Brad House <brad_mssw@gentoo.org> dbench-2.0.ebuild:
+  add ~amd64 flag
+
+*dbench-2.0 (25 Jul 2002)
+
+  14 Aug 2002; Pieter Van den Abeele <pvdabeel@gentoo.org> :
+
+  Added ppc keyword
+
+  25 Jul 2002; Achim Gottinger <achim@gentoo.org> :
+
+  New Version added man page and results.txt to the docs.
 
 *dbench-1.3 (09 Jul 2002)
 
+  15 Jul 2002; Owen Stampflee <owen@gentoo.org> :
+
+  Added PPC to KEYWORDS and fixed a syntax error.
+
   09 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> ChangeLog :
 
   Added ChangeLog.
diff --git a/app-benchmarks/dbench/Manifest b/app-benchmarks/dbench/Manifest
index e69de29bb2d1..b116c841e778 100644
--- a/app-benchmarks/dbench/Manifest
+++ b/app-benchmarks/dbench/Manifest
@@ -0,0 +1,4 @@
+MD5 87732ce3e520526f37501c3190daea9c ChangeLog 1374
+MD5 dbbbbdad0855ecc5ade71a4e67bc1523 dbench-2.0.ebuild 853
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 a142bb2058c79ef4a6ee2ab38def85e1 files/digest-dbench-2.0 62
diff --git a/app-benchmarks/dbench/dbench-2.0.ebuild b/app-benchmarks/dbench/dbench-2.0.ebuild
index 758641842c80..8b27f83d8ba1 100644
--- a/app-benchmarks/dbench/dbench-2.0.ebuild
+++ b/app-benchmarks/dbench/dbench-2.0.ebuild
@@ -1,22 +1,20 @@
-# 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/app-benchmarks/dbench/dbench-2.0.ebuild,v 1.1 2002/07/25 12:11:11 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/dbench/dbench-2.0.ebuild,v 1.1.1.1 2005/11/30 09:36:37 chriswhite Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Popular filesystem benchmark"
 SRC_URI="ftp://samba.org/pub/tridge/dbench/${P}.tar.gz"
 HOMEPAGE="ftp://samba.org/pub/tridge/dbench/"
-DEPEND="virtual/glibc sys-apps/sed"
-
-KEYWORDS="x86"
-SLOT=0
+SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="x86 ppc amd64 sparc"
+IUSE=""
+DEPEND="sys-apps/sed"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	cp Makefile Makefile.orig
-	sed -e "s:-O2 -Wall:${CFLAGS}:g" Makefile.orig > Makefile
+	sed -i -e "s:-O2 -Wall:${CFLAGS}:g" Makefile
 }
 
 src_compile() {
diff --git a/app-benchmarks/httperf/ChangeLog b/app-benchmarks/httperf/ChangeLog
index fbdecb1f3903..284d0e479995 100644
--- a/app-benchmarks/httperf/ChangeLog
+++ b/app-benchmarks/httperf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-benchmarks/httperf
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/httperf/ChangeLog,v 1.1 2005/08/17 20:51:18 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/httperf/ChangeLog,v 1.1.1.1 2005/11/30 09:36:36 chriswhite Exp $
+
+  01 Oct 2005; Simon Stelling <blubb@gentoo.org> httperf-0.8.ebuild:
+  added ~amd64 keyword
+
+  26 Sep 2005; Aaron Walker <ka0ttic@gentoo.org> httperf-0.8.ebuild:
+  Parallel makes are broken, bug #106921.
 
 *httperf-0.8 (17 Aug 2005)
 
diff --git a/app-benchmarks/httperf/Manifest b/app-benchmarks/httperf/Manifest
index 2ea05c2ae9db..baf16ec58310 100644
--- a/app-benchmarks/httperf/Manifest
+++ b/app-benchmarks/httperf/Manifest
@@ -1,5 +1,6 @@
-MD5 18ead5d66bf5b9604a8b636ddbea61a7 httperf-0.8.ebuild 879
+MD5 eb2ddf5c5dbc4decad2550017367cbf8 ChangeLog 652
+MD5 0154bdf8df5def73a780484e96b5c558 httperf-0.8.ebuild 1016
 MD5 895c658c1644917118d147978f7d1147 metadata.xml 945
+MD5 44858ef0273b02f6bb71ec6aca26c0a7 files/digest-httperf-0.8 63
 MD5 81630570d60ade0eaf6caad7ee4a1c4a files/httperf-0.8-optional-ssl.diff 694
 MD5 a719ff22f9a66c55067ea922e45d13a0 files/httperf-0.8-respect-DESTDIR.diff 712
-MD5 44858ef0273b02f6bb71ec6aca26c0a7 files/digest-httperf-0.8 63
diff --git a/app-benchmarks/httperf/httperf-0.8.ebuild b/app-benchmarks/httperf/httperf-0.8.ebuild
index 7b30738808d0..206929874ea8 100644
--- a/app-benchmarks/httperf/httperf-0.8.ebuild
+++ b/app-benchmarks/httperf/httperf-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/app-benchmarks/httperf/httperf-0.8.ebuild,v 1.1 2005/08/17 20:51:18 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/httperf/httperf-0.8.ebuild,v 1.1.1.1 2005/11/30 09:36:36 chriswhite Exp $
 
 inherit eutils
 
@@ -10,12 +10,14 @@ SRC_URI="ftp://ftp.hpl.hp.com/pub/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~mips ~sparc ~x86"
+KEYWORDS="~amd64 ~mips ~sparc ~x86"
 IUSE="debug ssl"
 
 DEPEND=""
 RDEPEND=""
 
+MAKEOPTS="${MAKEOPTS} -j1"
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
diff --git a/app-benchmarks/iozone/ChangeLog b/app-benchmarks/iozone/ChangeLog
index b816405cf79d..03b4fc05e5f9 100644
--- a/app-benchmarks/iozone/ChangeLog
+++ b/app-benchmarks/iozone/ChangeLog
@@ -1,6 +1,115 @@
 # ChangeLog for app-benchmarks/iozone
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/iozone/ChangeLog,v 1.1 2004/05/13 04:56:40 dragonheart Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/iozone/ChangeLog,v 1.1.1.1 2005/11/30 09:36:34 chriswhite Exp $
+
+*iozone-3.254 (13 Nov 2005)
+
+  13 Nov 2005; Daniel Black <dragonheart@gentoo.org> +iozone-3.254.ebuild:
+  version bump
+
+*iozone-3.248 (04 Sep 2005)
+
+  04 Sep 2005; Daniel Black <dragonheart@gentoo.org> +iozone-3.248.ebuild:
+  version bump
+
+  23 Aug 2005; Aron Griffis <agriffis@gentoo.org> iozone-3.242.ebuild:
+  stable on ia64
+
+  07 Aug 2005; Simon Stelling <blubb@gentoo.org> iozone-3.242.ebuild:
+  stable on amd64
+
+  31 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org> iozone-3.242.ebuild:
+  ppc stable
+
+*iozone-3.247 (30 Jul 2005)
+
+  30 Jul 2005; Daniel Black <dragonheart@gentoo.org> iozone-3.242.ebuild,
+  +iozone-3.247.ebuild:
+  version bump. +3.242 x86 stable
+
+*iozone-3.242 (25 Jun 2005)
+
+  25 Jun 2005; Daniel Black <dragonheart@gentoo.org> +iozone-3.242.ebuild:
+  version bump
+
+  21 Apr 2005; Simon Stelling <blubb@gentoo.org> iozone-3.226-r1.ebuild:
+  stable on amd64
+
+  31 Mar 2005; Aron Griffis <agriffis@gentoo.org> iozone-3.226-r1.ebuild:
+  stable on ia64
+
+  20 Feb 2005; Aron Griffis <agriffis@gentoo.org> iozone-3.226-r1.ebuild:
+  add ~ia64
+
+  09 Jan 2005; Daniel Black <dragonheart@gentoo.org> -files/3.221-gcc.patch,
+  -iozone-3.221-r1.ebuild, -iozone-3.221.ebuild, iozone-3.226-r1.ebuild,
+  -iozone-3.226.ebuild:
+  x86 and ppc stable. Removed old versions
+
+*iozone-3.226-r1 (09 Jan 2005)
+
+  09 Jan 2005; Markus Rothe <corsair@gentoo.org>
+  +files/iozone-3.226-ppc64.patch, +iozone-3.226-r1.ebuild:
+  Added ppc64 make rule patch
+
+*iozone-3.226 (25 Nov 2004)
+
+  25 Nov 2004; Daniel Black <dragonheart@gentoo.org> -iozone-3.222.ebuild,
+  +iozone-3.226.ebuild:
+  version bump as per bug #72154. Thanks to Daniel Webert
+  <rockoo@rockoo.homelinux.org>
+
+*iozone-3.222 (28 Oct 2004)
+
+  28 Oct 2004; Daniel Black <dragonheart@gentoo.org> -iozone-3.217.ebuild,
+  -iozone-3.218.ebuild, iozone-3.221-r1.ebuild, iozone-3.221.ebuild,
+  +iozone-3.222.ebuild:
+  removed old version. x86 stable for 3.221-r1. Version bump to 3.222. Fixed bug
+  #68977 thanks to SpanKY
+
+  05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  iozone-3.217.ebuild, iozone-3.218.ebuild, iozone-3.221.ebuild:
+  Masked iozone-3.221.ebuild stable for ppc
+
+  05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  iozone-3.217.ebuild, iozone-3.218.ebuild:
+  Masked iozone-3.218.ebuild stable for ppc
+
+  05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  iozone-3.217.ebuild:
+  Masked iozone-3.217.ebuild stable for ppc
+
+*iozone-3.221-r1 (12 Sep 2004)
+
+  12 Sep 2004; Daniel Black <dragonheart@gentoo.org> +files/3.221-gcc.patch,
+  +iozone-3.221-r1.ebuild, iozone-3.221.ebuild:
+  x86 stable. Revision bump adds patch to (hopefully) fix bug #59793. Thanks to
+  Alex Rostovtsev <tetromino@gmail.com> for characterizing the problem
+
+  07 Sep 2004; <blubb@gentoo.org> iozone-3.221.ebuild:
+  added ~amd64 keyword
+
+*iozone-3.221 (21 Jul 2004)
+
+  21 Jul 2004; Daniel Black <dragonheart@gentoo.org> +iozone-3.221.ebuild:
+  version bump as per bug #57729. Thanks to rockoo@rockoo.homelinux.org
+
+  18 Jul 2004; Daniel Black <dragonheart@gentoo.org> iozone-3.218.ebuild:
+  x86 stable
+
+  22 Jun 2004; Gustavo Zacarias <gustavoz@gentoo.org> iozone-3.218.ebuild:
+  Keyworded ~sparc wrt #53521
+
+  15 Jun 2004; Daniel Black <dragonheart@gentoo.org> iozone-3.217.ebuild:
+  x86 stable
+
+*iozone-3.218 (13 Jun 2004)
+
+  13 Jun 2004; Daniel Black <dragonheart@gentoo.org> +iozone-3.218.ebuild:
+  version bump notified by Daniel Webert <daniel_webert@web.de> in bug #53521
+
+  13 May 2004; David Holm <dholm@gentoo.org> iozone-3.217.ebuild:
+  Added to ~ppc.
 
 *iozone-3.217 (13 May 2004)
 
diff --git a/app-benchmarks/iozone/Manifest b/app-benchmarks/iozone/Manifest
index 403966c8c965..4f818b203145 100644
--- a/app-benchmarks/iozone/Manifest
+++ b/app-benchmarks/iozone/Manifest
@@ -1,2 +1,23 @@
-MD5 918230f155e4d57851e17fe8f45f6808 iozone-3.217.ebuild 794
-MD5 e656883c1b06fd737e3f145ee18fb5b5 files/digest-iozone-3.217 61
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c6dab50be4dda065afb48e1e6dcea80e ChangeLog 3947
+MD5 12fc9646500c0b8c87299cfd1e222779 files/digest-iozone-3.226-r1 61
+MD5 bfb280e0a5ed84a1079d5bacb7c09423 files/digest-iozone-3.242 61
+MD5 a83eacd4a0113b467d5d88aef021cf49 files/digest-iozone-3.247 61
+MD5 8c13cfbfeee6a903b2908add7f6b7ae8 files/digest-iozone-3.248 61
+MD5 23f034922f989324a48c2a7993969a93 files/digest-iozone-3.254 61
+MD5 28d68364294fafbeadf3f599f4ae4abd files/iozone-3.226-ppc64.patch 1484
+MD5 956c35cd4b9c426556c994ee85e080c8 iozone-3.226-r1.ebuild 2144
+MD5 80be06d700b56905946571965479f36f iozone-3.242.ebuild 2062
+MD5 cb84c2708451fa1a55d354190c856af0 iozone-3.247.ebuild 2069
+MD5 0e64306cd100a3e9ab0255a2b68fa1d2 iozone-3.248.ebuild 2069
+MD5 b6ef7fb087cff013ce4662a4ac99b715 iozone-3.254.ebuild 2069
+MD5 6d796b061ed1c1337ef157a5f74dab35 metadata.xml 403
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDdzCImdTrptrqvGERAnkNAJ0X9dc6yUYflzf2JT3VznnmqOmZwwCfSgs9
+0x8aAECZZlmMMD3JU9pXhmM=
+=Uxjo
+-----END PGP SIGNATURE-----
diff --git a/app-benchmarks/iozone/iozone-3.226-r1.ebuild b/app-benchmarks/iozone/iozone-3.226-r1.ebuild
index 88ec0c8d42c7..fa62bfd62f86 100644
--- a/app-benchmarks/iozone/iozone-3.226-r1.ebuild
+++ b/app-benchmarks/iozone/iozone-3.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/app-benchmarks/iozone/iozone-3.226-r1.ebuild,v 1.1 2005/01/09 11:40:12 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/iozone/iozone-3.226-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:34 chriswhite Exp $
 
 # TODO
 #        ->   linux-arm            (32bit)   <-
@@ -27,7 +27,7 @@ SRC_URI="http://www.iozone.org/src/current/${PN}${PV/./_}.tar"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ppc ~ppc64 ~sparc x86 ia64"
 IUSE=""
 
 DEPEND="sys-devel/gcc
@@ -56,7 +56,7 @@ src_compile() {
 		ppc)		PLATFORM="linux-powerpc";;
 		ppc64)		PLATFORM="linux-powerpc64";;
 		amd64)		PLATFORM="linux-AMD64";;
-		ia64)		PLATFORM="linux-IA64";;
+		ia64)		PLATFORM="linux-ia64";;
 		s390)		PLATFORM="linux-S390";;
 		x86-fbsd)	PLATFORM="freebsd";;
 		*)			PLATFORM="linux-${ARCH}";;
diff --git a/app-benchmarks/iozone/iozone-3.242.ebuild b/app-benchmarks/iozone/iozone-3.242.ebuild
index b7a151d34d9b..083b0ca1edf0 100644
--- a/app-benchmarks/iozone/iozone-3.242.ebuild
+++ b/app-benchmarks/iozone/iozone-3.242.ebuild
@@ -1,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-benchmarks/iozone/iozone-3.242.ebuild,v 1.1 2005/06/25 14:24:25 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/iozone/iozone-3.242.ebuild,v 1.1.1.1 2005/11/30 09:36:35 chriswhite Exp $
 
 # TODO
 #        ->   linux-arm            (32bit)   <-
@@ -27,7 +27,7 @@ SRC_URI="http://www.iozone.org/src/current/${PN}${PV/./_}.tar"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ia64 ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND="sys-devel/gcc
diff --git a/app-benchmarks/iozone/iozone-3.247.ebuild b/app-benchmarks/iozone/iozone-3.247.ebuild
index 7ea689867ddb..aba2e43c9bec 100644
--- a/app-benchmarks/iozone/iozone-3.247.ebuild
+++ b/app-benchmarks/iozone/iozone-3.247.ebuild
@@ -1,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-benchmarks/iozone/iozone-3.247.ebuild,v 1.1 2005/07/30 09:51:35 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/iozone/iozone-3.247.ebuild,v 1.1.1.1 2005/11/30 09:36:35 chriswhite Exp $
 
 # TODO
 #        ->   linux-arm            (32bit)   <-
diff --git a/app-benchmarks/iozone/iozone-3.248.ebuild b/app-benchmarks/iozone/iozone-3.248.ebuild
index 552f5a92148d..574d6b51510a 100644
--- a/app-benchmarks/iozone/iozone-3.248.ebuild
+++ b/app-benchmarks/iozone/iozone-3.248.ebuild
@@ -1,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-benchmarks/iozone/iozone-3.248.ebuild,v 1.1 2005/09/04 12:57:29 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/iozone/iozone-3.248.ebuild,v 1.1.1.1 2005/11/30 09:36:35 chriswhite Exp $
 
 # TODO
 #        ->   linux-arm            (32bit)   <-
diff --git a/app-benchmarks/iozone/iozone-3.254.ebuild b/app-benchmarks/iozone/iozone-3.254.ebuild
index 35c34fd85344..5ec370d31c87 100644
--- a/app-benchmarks/iozone/iozone-3.254.ebuild
+++ b/app-benchmarks/iozone/iozone-3.254.ebuild
@@ -1,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-benchmarks/iozone/iozone-3.254.ebuild,v 1.1 2005/11/13 12:24:26 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/iozone/iozone-3.254.ebuild,v 1.1.1.1 2005/11/30 09:36:35 chriswhite Exp $
 
 # TODO
 #        ->   linux-arm            (32bit)   <-
diff --git a/app-benchmarks/jmeter/ChangeLog b/app-benchmarks/jmeter/ChangeLog
index 8ac3292c6861..c76a7a1a08e2 100644
--- a/app-benchmarks/jmeter/ChangeLog
+++ b/app-benchmarks/jmeter/ChangeLog
@@ -1,9 +1,81 @@
 # ChangeLog for app-benchmarks/jmeter
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/ChangeLog,v 1.1 2003/03/16 10:42:10 absinthe Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/ChangeLog,v 1.1.1.1 2005/11/30 09:36:36 chriswhite Exp $
+
+  19 Nov 2005; Saleem Abdulrasool <compnerd@gentoo.org> jmeter-1.9.1.ebuild:
+  Fixing typo in ebuild; Resolves bug #110302
+
+  26 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> jmeter-2.0.1.ebuild,
+  jmeter-2.0.1-r1.ebuild:
+  Fix cp -a usage for Gentoo/FreeBSD.
+
+  04 Apr 2005; Thomas Matthijs <axxo@gentoo.org> jmeter-2.0.1-r1.ebuild:
+  change dep to reflect commons-httpclient slotting
+
+  29 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> jmeter-2.0.1-r1.ebuild:
+  moved from dev-java/oro to dev-java/jakarta-oro dependency. see #71337.
+
+  03 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> jmeter-2.0.1-r1.ebuild:
+  updated to reflect the new jdom slots
+
+  29 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> jmeter-2.0.1-r1.ebuild:
+  update to reflect the new rhino slots.
+
+  14 Dec 2004; Thomas Matthijs <axxo@gentoo.org> jmeter-1.9.1.ebuild,
+  jmeter-2.0.1.ebuild:
+  fix deps 74389
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> jmeter-1.9.1.ebuild,
+  jmeter-2.0.1-r1.ebuild, jmeter-2.0.1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
+
+  12 Oct 2004; Thomas Matthijs <axxo@gentoo.org> jmeter-1.9.1.ebuild,
+  jmeter-2.0.1.ebuild:
+  Fixed jikes deps. disabled jikes in 2.0.1 as it doesn't compile, patches are
+  welcome on bugs.gentoo.org
+
+*jmeter-2.0.1-r1 (12 Sep 2004)
+
+  12 Sep 2004; Thomas Matthijs <axxo@gentoo.org> +jmeter-2.0.1-r1.ebuild:
+  changes to stop using packed jars, work in progress, see bug 63309 for more
+  information
+
+  23 Aug 2004; Chris Aniszczyk <zx@gentoo.org>
+  -files/jmeter-1.8.1-gentoo.diff, -jmeter-1.8.1.ebuild:
+  Clean up
+
+*jmeter-2.0.1 (23 Aug 2004)
+
+  23 Aug 2004; Chris Aniszczyk <zx@gentoo.org> +jmeter-2.0.1.ebuild:
+  Version bump. Closes #60052
+
+  05 Apr 2004; Chris Aniszczyk <zx@gentoo.org> jmeter-1.8.1.ebuild:
+  inherit eutils due to epatch
+
+  15 Mar 2004; Seemant Kulleen <seemant@gentoo.org> jmeter-1.8.1.ebuild:
+  fix bug #47712 by Michael Sterret <mr_bones_@gentoo.org>
+
+*jmeter-1.9.1 (28 Feb 2004)
+
+  28 Feb 2004; Chris Aniszczyk <zx@gentoo.org> jmeter-1.9.1.ebuild:
+  Version bump + we can build from source ;)
+
+  15 Dec 2003; Adrian Almenar <strider@gentoo.org> jmeter-1.8.1.ebuild:
+  Fixes bug #35733. Cannot find patch. Masked packages on arches where sun-jdk doesnt work.
+  Added metadata.xml.
+
+  05 Dec 2003; Jason Wever <weeve@gentoo.org> jmeter-1.8.1.ebuild:
+  Masked on sparc because there is no sun jdk for linux/sparc.
 
 *jmeter-1.8.1 (16 Mar 2003)
 
+  06 Apr 2003; Dylan Carlson <absinthe@gentoo.org> jmeter-1.8.1.ebuild:
+  ppc sparc moved to stable.
+
+  03 Apr 2003; Dylan Carlson <absinthe@gentoo.org> jmeter-1.8.1.ebuild:
+  moved x86 to stable.
+
   16 Mar 2003; Dylan Carlson <absinthe@gentoo.org> jmeter-1.8.1.ebuild,
   files/jmeter-1.8.1-gentoo.diff:
   Initial import.
diff --git a/app-benchmarks/jmeter/Manifest b/app-benchmarks/jmeter/Manifest
index e69de29bb2d1..462e022e4732 100644
--- a/app-benchmarks/jmeter/Manifest
+++ b/app-benchmarks/jmeter/Manifest
@@ -0,0 +1,6 @@
+MD5 50f49c3957ef7be8ccb32cd13fa8d330 ChangeLog 3656
+MD5 a62f7266e5fa7c30d2b82af95a3fea55 files/digest-jmeter-1.9.1 74
+MD5 93ea369264f1330ccbcbe9b6b2da7424 files/digest-jmeter-2.0.1 74
+MD5 c4ba8d1094836387fa3c49f2995e3dd1 jmeter-1.9.1.ebuild 1063
+MD5 8843e93331b00587a638dff7772c018e jmeter-2.0.1.ebuild 1171
+MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
diff --git a/app-benchmarks/jmeter/jmeter-1.9.1.ebuild b/app-benchmarks/jmeter/jmeter-1.9.1.ebuild
index 8e2710bdd68d..10f231e6eb1e 100644
--- a/app-benchmarks/jmeter/jmeter-1.9.1.ebuild
+++ b/app-benchmarks/jmeter/jmeter-1.9.1.ebuild
@@ -1,15 +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/app-benchmarks/jmeter/jmeter-1.9.1.ebuild,v 1.1 2004/02/26 05:17:17 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/jmeter-1.9.1.ebuild,v 1.1.1.1 2005/11/30 09:36:36 chriswhite Exp $
+
+inherit java-pkg
 
 DESCRIPTION="Load test and measure performance on HTTP/FTP services, and databases."
 HOMEPAGE="http://jakarta.apache.org/jmeter/index.html"
 SRC_URI="mirror://apache/jakarta/jmeter/source/jakarta-${P}.src.tgz"
-DEPEND=">=virtual/jdk-1.3"
-RDEPEND=">=virtual/jdk-1.3"
+DEPEND=">=virtual/jdk-1.3
+	dev-java/ant
+	jikes? ( dev-java/jikes )"
+RDEPEND=">=virtual/jre-1.3"
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="doc jikes"
 
 S=${WORKDIR}/jakarta-${P}
@@ -17,15 +21,15 @@ S=${WORKDIR}/jakarta-${P}
 src_compile () {
 	local antflags="package"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	use doc && antflags="${antflags} alldocs"
-	ant ${antflags}
+	use doc && antflags="${antflags} all-docs"
+	ant ${antflags} || die "build failed"
 }
 
-src_install () {
+src_install() {
 	# Can't think of a better way to deal with this for now...
 	DIROPTIONS="--mode=0775"
 	dodir /opt/${PN}
-	cp -ar bin/ lib/ ${D}/opt/${PN}/
+	cp -ar bin/ lib/ ${D}/opt/${PN}/ || die "failed to install"
 	dodoc README
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
diff --git a/app-benchmarks/jmeter/jmeter-2.0.1.ebuild b/app-benchmarks/jmeter/jmeter-2.0.1.ebuild
index 1e145bfd386b..de876354367d 100644
--- a/app-benchmarks/jmeter/jmeter-2.0.1.ebuild
+++ b/app-benchmarks/jmeter/jmeter-2.0.1.ebuild
@@ -1,32 +1,42 @@
-# Copyright 1999-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-benchmarks/jmeter/jmeter-2.0.1.ebuild,v 1.1 2004/08/23 22:02:07 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/jmeter-2.0.1.ebuild,v 1.1.1.1 2005/11/30 09:36:36 chriswhite Exp $
+
+inherit java-pkg
 
 DESCRIPTION="Load test and measure performance on HTTP/FTP services and databases."
 HOMEPAGE="http://jakarta.apache.org/jmeter"
 SRC_URI="mirror://apache/jakarta/jmeter/source/jakarta-${P}_src.tgz"
 DEPEND=">=virtual/jdk-1.3
+	dev-java/ant
 	doc? ( >=dev-java/velocity-1.4 )"
-RDEPEND=">=virtual/jdk-1.3"
+	# jikes ( dev-java/jikes"
+RDEPEND=">=virtual/jre-1.3"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="doc jikes"
+IUSE="doc" # jikes"
 
 S=${WORKDIR}/jakarta-${P}
 
-src_compile () {
+src_unpack() {
+	unpack ${A}
+	cd ${S}/lib
+	use doc && java-pkg_jarfrom velocity
+}
+
+src_compile() {
 	local antflags="package"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	#Does not compile with jikes, patches welcome at bugs.gentoo.org
+	#use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 	use doc && antflags="${antflags} docs-all"
-	use doc && cp /usr/share/velocity/lib/velocity-*.jar $S/lib
 	ant ${antflags} || die "compile problem"
 }
 
-src_install () {
+src_install() {
 	DIROPTIONS="--mode=0775"
 	dodir /opt/${PN}
-	cp -ar bin/ lib/ printable_docs/ ${D}/opt/${PN}/
+	cp -pPR bin/ lib/ printable_docs/ ${D}/opt/${PN}/
 	dodoc README
-	use doc && dohtml -r docs/*
+	use doc && java-pkg_dohtml -r docs/*
 }
diff --git a/app-benchmarks/lmbench/ChangeLog b/app-benchmarks/lmbench/ChangeLog
index 50f1c06b6cc9..597fe06e0779 100644
--- a/app-benchmarks/lmbench/ChangeLog
+++ b/app-benchmarks/lmbench/ChangeLog
@@ -1,6 +1,32 @@
 # ChangeLog for app-benchmarks/lmbench
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/lmbench/ChangeLog,v 1.1 2004/02/08 01:34:00 dragonheart Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/lmbench/ChangeLog,v 1.1.1.1 2005/11/30 09:36:35 chriswhite Exp $
+
+  15 May 2005; Marcelo Goes <vanquirius@gentoo.org> lmbench-3.0_alpha3.ebuild:
+  Use toolchain-funcs.eclass instead of gcc.eclass for bug 92745. Also, avoiding
+  file collision with /usr/bin/line and sys-apps/util-linux.
+
+  21 Apr 2005; Simon Stelling <blubb@gentoo.org> lmbench-3.0_alpha3.ebuild:
+  stable on amd64
+
+  05 Jun 2004; Jason Wever <weeve@gentoo.org> :
+  Added ~sparc keyword.
+
+  13 May 2004; Ferris McCormick <fmccor@gentoo.org> lmbench-3.0_alpha3.ebuild:
+  Added sparc keyword.
+
+  09 May 2004; Daniel Ahlberg <aliz@gentoo.org> lmbench-3.0_alpha3.ebuild:
+  Added amd64 keyword, closing #50472.
+
+  14 Apr 2004; Daniel Black <dragonheart@gentoo.org>
+  lmbench-3.0_alpha3.ebuild:
+  Stable on x86 ppc
+
+  17 Feb 2004; David Holm <dholm@gentoo.org> lmbench-3.0_alpha3.ebuild:
+  Added to ~ppc.
+
+  08 Feb 2004; Daniel Black <dragonheart@gentoo.org> lmbench-3.0_alpha3.ebuild:
+  Fixed for non-root users hopefully.
 
 *lmbench-3.0_alpha3 (08 Feb 2004)
 
diff --git a/app-benchmarks/lmbench/Manifest b/app-benchmarks/lmbench/Manifest
index 4040c631832e..81b9967159ac 100644
--- a/app-benchmarks/lmbench/Manifest
+++ b/app-benchmarks/lmbench/Manifest
@@ -1,4 +1,6 @@
-MD5 ac2c0bfb82b1698d45b2880eb8898522 lmbench-3.0_alpha3.ebuild 2663
-MD5 1cddbfe67828e96db956b8b6535f44c0 files/bc-config 646
-MD5 25a33fad490151f7d1e8522b7795da7f files/bc_lm.pl 3196
+MD5 76333fc9cef3a061ee8fc44b6324ea30 lmbench-3.0_alpha3.ebuild 1427
+MD5 bdf5d7e5d90cdf04dea2602e697c359c ChangeLog 1348
+MD5 1067597d6549e1545b84a9d379901ae4 metadata.xml 412
 MD5 79c7cffe8649099fd090204cd546db39 files/digest-lmbench-3.0_alpha3 64
+MD5 25a33fad490151f7d1e8522b7795da7f files/bc_lm.pl 3196
+MD5 1cddbfe67828e96db956b8b6535f44c0 files/bc-config 646
diff --git a/app-benchmarks/lmbench/lmbench-3.0_alpha3.ebuild b/app-benchmarks/lmbench/lmbench-3.0_alpha3.ebuild
index e789f8a4b647..a09d2cdd4f98 100644
--- a/app-benchmarks/lmbench/lmbench-3.0_alpha3.ebuild
+++ b/app-benchmarks/lmbench/lmbench-3.0_alpha3.ebuild
@@ -1,40 +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/app-benchmarks/lmbench/lmbench-3.0_alpha3.ebuild,v 1.1 2004/02/08 01:34:00 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/lmbench/lmbench-3.0_alpha3.ebuild,v 1.1.1.1 2005/11/30 09:36:35 chriswhite Exp $
 
-MY_P=${P/_alpha/-a}
+inherit toolchain-funcs
 
+MY_P=${P/_alpha/-a}
 DESCRIPTION="Suite of simple, portable benchmarks"
-
 HOMEPAGE="http://www.bitmover.com/lmbench/whatis_lmbench.html"
-
 SRC_URI="ftp://ftp.bitmover.com/lmbench/${MY_P}.tgz"
 
 LICENSE="GPL-2"
-
 SLOT="0"
-
-KEYWORDS="~x86"
-
+KEYWORDS="x86 ppc amd64 ~sparc"
 IUSE=""
 
-DEPEND="virtual/glibc"
-
-#RDEPEND=""
+DEPEND="virtual/libc"
 
 S=${WORKDIR}/${MY_P}
 
 src_compile() {
-
 	sed -e "s#^my \$distro =.*#my \$distro = \"`uname -r`\";#" \
 		-e 's#^@files =#chdir "/usr/share/lmbench"; @files =#' \
 		-e "s#../../CONFIG#/etc/bc-config#g" ${FILESDIR}/bc_lm.pl > bc_lm.pl
 
-	emake CC=${CC} MAKE=make OS=`scripts/os` build || die
+	emake CC=$(tc-getCC) MAKE=make OS=`scripts/os` build || die
 }
 
 src_install() {
-
 	cd src ; make BASE=${D}/usr install || die
 
 	dodir /usr/share
@@ -49,6 +41,14 @@ src_install() {
 
 	dodir /usr/share/lmbench
 	dodir /usr/share/lmbench/src
+	cp src/webpage-lm.tar ${D}/usr/share/lmbench/src
 	cp -R scripts ${D}/usr/share/lmbench
 
+	dodir /usr/share/lmbench/results
+	chmod 777 ${D}/usr/share/lmbench/results
+	dodir /usr/share/lmbench/bin
+	chmod 777 ${D}/usr/share/lmbench/bin
+
+	# avoid file collision with sys-apps/util-linux
+	mv ${D}/usr/bin/line ${D}/usr/bin/line.lmbench
 }
diff --git a/app-benchmarks/ltp/ChangeLog b/app-benchmarks/ltp/ChangeLog
index 75116dc82982..9747a5544ffc 100644
--- a/app-benchmarks/ltp/ChangeLog
+++ b/app-benchmarks/ltp/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for app-benchmarks/ltp
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/ltp/ChangeLog,v 1.1 2004/11/06 23:34:10 dragonheart Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/ltp/ChangeLog,v 1.1.1.1 2005/11/30 09:36:35 chriswhite Exp $
+
+  25 Sep 2005; Daniel Black <dragonheart@gentoo.org> ltp-20041104.ebuild,
+  ltp-20041203.ebuild:
+  fixed to use treecopy for BSD compatibility - bug #106443 - thanks Diego
+
+  07 Aug 2005; Simon Stelling <blubb@gentoo.org> ltp-20041203.ebuild:
+  added ~amd64 keyword
+
+  08 Jul 2005; David Holm <dholm@gentoo.org> ltp-20041203.ebuild:
+  Added to ~ppc.
+
+*ltp-20041203 (04 Dec 2004)
+
+  04 Dec 2004; Daniel Black <dragonheart@gentoo.org>
+  +files/ltp-20041203-ballista-paths.patch, +files/ltp-ballista-paths.patch,
+  ltp-20041104.ebuild, +ltp-20041203.ebuild:
+  version bump and more patches added. Bug #71034 by BlaisorBlade
+  <blaisorblade_spam@yahoo.it>. Patches by Marien Zwart <m_zwart@123mail.org>
 
 *ltp-20041104 (07 Nov 2004)
 
diff --git a/app-benchmarks/ltp/Manifest b/app-benchmarks/ltp/Manifest
index 91dbbad58867..377622814681 100644
--- a/app-benchmarks/ltp/Manifest
+++ b/app-benchmarks/ltp/Manifest
@@ -1,4 +1,20 @@
-MD5 cfb875812745227387e6cf110aa67f21 ltp-20041104.ebuild 986
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 74a2723b6f19ea4f80877c1f1691823e ltp-20041104.ebuild 1166
+MD5 f592f012ff1df95e9b2dcd743df2405b metadata.xml 402
+MD5 710c6791e8777eae127f24625fa97485 ChangeLog 1196
+MD5 22e4f09bf12f55f1e546a1ab4c7fafed ltp-20041203.ebuild 1184
 MD5 e2a7ff766a942e7a6a8e299cb74edacb files/runltp-path.patch 387
 MD5 e4bb569a7ad39bd83b66430469168d6b files/IDcheck-noninteractive.patch 729
 MD5 d1ba3a9b21ea0697d2b92b74e9147231 files/digest-ltp-20041104 67
+MD5 e17b3facc501915809ff69e8f9a12056 files/ltp-ballista-paths.patch 8166
+MD5 acbebd9bb97c2f8b55f62c4c87a48deb files/digest-ltp-20041203 67
+MD5 1c87578ced34310bd048cc03c9ac45c4 files/ltp-20041203-ballista-paths.patch 6203
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDOv97mdTrptrqvGERAsuJAJ9E6rrv+XF2/uI3aTnzxBwF10nXxgCfZRXP
+jarErefsQHwHZpDMTZ0CVgQ=
+=p105
+-----END PGP SIGNATURE-----
diff --git a/app-benchmarks/ltp/files/ltp-20041203-ballista-paths.patch b/app-benchmarks/ltp/files/ltp-20041203-ballista-paths.patch
index 2977ee1ce359..bb425f168163 100644
--- a/app-benchmarks/ltp/files/ltp-20041203-ballista-paths.patch
+++ b/app-benchmarks/ltp/files/ltp-20041203-ballista-paths.patch
@@ -103,7 +103,7 @@ diff -ru ltp-full-20041203/testcases/ballista/ballista/perllib/LWP/Debug.pm ltp-
 -#!/usr/local/bin/perl -w
 +#!/usr/bin/env perl -w
  #
- # $Id: ltp-20041203-ballista-paths.patch,v 1.1 2004/12/04 05:02:56 dragonheart Exp $
+ # $Id: ltp-20041203-ballista-paths.patch,v 1.1.1.1 2005/11/30 09:36:36 chriswhite Exp $
  #
 diff -ru ltp-full-20041203/testcases/ballista/create.sh ltp-full-20041203.mod/testcases/ballista/create.sh
 --- ltp-full-20041203/testcases/ballista/create.sh	2004-10-06 07:45:09.000000000 +0930
diff --git a/app-benchmarks/ltp/files/ltp-ballista-paths.patch b/app-benchmarks/ltp/files/ltp-ballista-paths.patch
index 9afef621cd9b..a7eb12e38e41 100644
--- a/app-benchmarks/ltp/files/ltp-ballista-paths.patch
+++ b/app-benchmarks/ltp/files/ltp-ballista-paths.patch
@@ -155,7 +155,7 @@ diff -ur ltp-full-20041104/testcases/ballista/ballista/perllib/LWP/Debug.pm ltp-
 -#!/usr/local/bin/perl -w
 +#!/usr/bin/env perl -w
  #
- # $Id: ltp-ballista-paths.patch,v 1.1 2004/12/04 05:02:56 dragonheart Exp $
+ # $Id: ltp-ballista-paths.patch,v 1.1.1.1 2005/11/30 09:36:35 chriswhite Exp $
  #
 diff -ur ltp-full-20041104/testcases/ballista/create.sh ltp-dirty/testcases/ballista/create.sh
 --- ltp-full-20041104/testcases/ballista/create.sh	2004-10-18 18:11:21.000000000 +0200
diff --git a/app-benchmarks/ltp/ltp-20041104.ebuild b/app-benchmarks/ltp/ltp-20041104.ebuild
index 5f2cdfbbe245..fc91387de12f 100644
--- a/app-benchmarks/ltp/ltp-20041104.ebuild
+++ b/app-benchmarks/ltp/ltp-20041104.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/app-benchmarks/ltp/ltp-20041104.ebuild,v 1.1 2004/11/06 23:34:10 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/ltp/ltp-20041104.ebuild,v 1.1.1.1 2005/11/30 09:36:35 chriswhite Exp $
 
-inherit eutils
+inherit eutils portability
 
 MY_P="${PN}-full-${PV}"
 S="${WORKDIR}/${MY_P}"
@@ -24,7 +24,9 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/IDcheck-noninteractive.patch
 	epatch ${FILESDIR}/runltp-path.patch
+	epatch ${FILESDIR}/ltp-ballista-paths.patch
 }
+
 src_compile() {
 	emake || die "emake failed"
 }
@@ -33,7 +35,7 @@ src_install() {
 	make install || die "install failed"
 
 	mkdir -p ${D}/usr/libexec/ltp/testcases ${D}/usr/bin/ || die "mkdir failed"
-	cp --parents -r testcases/bin pan/pan runtest ver_linux IDcheck.sh ${D}/usr/libexec/ltp || die "cp failed"
+	treecopy testcases pan/pan runtest ver_linux IDcheck.sh ${D}/usr/libexec/ltp || die "cp failed"
 	cp runltp runalltests.sh ${D}/usr/bin || die "cp failed"
 
 	# TODO: fix this so it works from "outside" the source tree
diff --git a/app-benchmarks/ltp/ltp-20041203.ebuild b/app-benchmarks/ltp/ltp-20041203.ebuild
index 0e028979a5be..2b2a97e9bebc 100644
--- a/app-benchmarks/ltp/ltp-20041203.ebuild
+++ b/app-benchmarks/ltp/ltp-20041203.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/app-benchmarks/ltp/ltp-20041203.ebuild,v 1.1 2004/12/04 05:02:55 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/ltp/ltp-20041203.ebuild,v 1.1.1.1 2005/11/30 09:36:35 chriswhite Exp $
 
-inherit eutils
+inherit eutils portability
 
 MY_P="${PN}-full-${PV}"
 S="${WORKDIR}/${MY_P}"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/ltp/${MY_P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 IUSE=""
 
@@ -35,7 +35,7 @@ src_install() {
 	make install || die "install failed"
 
 	mkdir -p ${D}/usr/libexec/ltp/testcases ${D}/usr/bin/ || die "mkdir failed"
-	cp --parents -r testcases pan/pan runtest ver_linux IDcheck.sh ${D}/usr/libexec/ltp || die "cp failed"
+	treecopy testcases pan/pan runtest ver_linux IDcheck.sh ${D}/usr/libexec/ltp || die "cp failed"
 	cp runltp runalltests.sh ${D}/usr/bin || die "cp failed"
 
 	# TODO: fix this so it works from "outside" the source tree
diff --git a/app-benchmarks/metadata.xml b/app-benchmarks/metadata.xml
index da1f07a8c37e..469a5b8b6769 100644
--- a/app-benchmarks/metadata.xml
+++ b/app-benchmarks/metadata.xml
@@ -4,5 +4,23 @@
 	<longdescription lang="en">
 		The app-benchmarks category contains benchmarking software.
 	</longdescription>
+	<longdescription lang="es">
+		La categoría app-benchmarks contiene programas para pruebas.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie app-benchmarks enthält Benchmark-Software.
+	</longdescription>
+	<longdescription lang="ja">
+		app-benchmarksカテゴリにはベンチマークソフトウェアが含まれます。
+	</longdescription>
+	<longdescription lang="nl">
+		De app-benchmarks categorie bevat benchmarking applicaties.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm app-benchmarks chứa các ứng dụng benchmark.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria app-benchmarks contiene programmi per l'analisi delle prestazioni.
+	</longdescription>
 </catmetadata>
 
diff --git a/app-benchmarks/nbench/ChangeLog b/app-benchmarks/nbench/ChangeLog
index 9dac31a4fb1a..7c95d476c5ee 100644
--- a/app-benchmarks/nbench/ChangeLog
+++ b/app-benchmarks/nbench/ChangeLog
@@ -1,6 +1,32 @@
-# ChangeLog for sys-apps/nbench
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/nbench/ChangeLog,v 1.1 2004/11/07 23:32:37 morfic Exp $
+# ChangeLog for app-benchmarks/nbench
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/nbench/ChangeLog,v 1.1.1.1 2005/11/30 09:36:34 chriswhite Exp $
+
+  09 Sep 2005; Aron Griffis <agriffis@gentoo.org> nbench-2.2.2.ebuild:
+  Mark 2.2.2 stable on alpha
+
+  31 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org> nbench-2.2.2.ebuild:
+  ppc stable
+
+  20 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> nbench-2.2.2.ebuild:
+  Stable on sparc
+
+  19 Jul 2005; MATSUU Takuto <matsuu@gentoo.org> nbench-2.2.2.ebuild:
+  Stable on x86, amd64 and sh.
+
+  29 Mar 2005; Guy Martin <gmsoft@gentoo.org> nbench-2.2.2.ebuild:
+  Stable on hppa.
+
+  13 Mar 2005; Tavis Ormandy <taviso@gentoo.org> nbench-2.2.2.ebuild:
+  add ~alpha keyword
+
+*nbench-2.2.2 (30 Dec 2004)
+
+  30 Dec 2004; MATSUU Takuto <matsuu@gentoo.org> +nbench-2.2.2.ebuild:
+  Version bumped.
+
+  18 Nov 2004; Daniel Goller <morfic@gentoo.org> nbench-2.2.1.ebuild:
+  Added support for LDFLAGS
 
 *nbench-2.2.1 (07 Nov 2004)
 
diff --git a/app-benchmarks/nbench/Manifest b/app-benchmarks/nbench/Manifest
index be50996e2b1e..b68c51948ea2 100644
--- a/app-benchmarks/nbench/Manifest
+++ b/app-benchmarks/nbench/Manifest
@@ -1,4 +1,6 @@
-MD5 29cb89aa4801ec6bb3e1d1efc13b620a ChangeLog 1112
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 862b22ea5882d33204e4eb217926cccb nbench-2.2.1.ebuild 911
+MD5 92efe16958b7ebba4cadd28d8e7ba3ab ChangeLog 2081
+MD5 3e82002a2c01f3f8f2d2f77ca7eca8a3 nbench-2.2.2.ebuild 968
+MD5 186c07859da3429d6257a0f05ef8689b nbench-2.2.1.ebuild 956
+MD5 c8f60a4dafe846f33033a3fd7241e562 files/digest-nbench-2.2.2 69
 MD5 5c6e1c5a2f7f22dc451ad34130730183 files/digest-nbench-2.2.1 69
diff --git a/app-benchmarks/nbench/nbench-2.2.1.ebuild b/app-benchmarks/nbench/nbench-2.2.1.ebuild
index 4a50cd08e792..38816da60360 100644
--- a/app-benchmarks/nbench/nbench-2.2.1.ebuild
+++ b/app-benchmarks/nbench/nbench-2.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/app-benchmarks/nbench/nbench-2.2.1.ebuild,v 1.1 2004/11/07 23:32:37 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/nbench/nbench-2.2.1.ebuild,v 1.1.1.1 2005/11/30 09:36:34 chriswhite Exp $
 
 MY_P="${PN}-byte-${PV}"
 DESCRIPTION="Linux/Unix of release 2 of BYTE Magazine's BYTEmark benchmark"
@@ -22,7 +22,7 @@ src_compile() {
 
 	sed -i -e 's:inpath="NNET.DAT":inpath="/usr/share/nbench/NNET.DAT":' nbench1.h || die
 
-	make CFLAGS="${CFLAGS}" || die
+	make LINKFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS}" || die "make failed"
 }
 
 src_install() {
diff --git a/app-benchmarks/nbench/nbench-2.2.2.ebuild b/app-benchmarks/nbench/nbench-2.2.2.ebuild
index 024047cf17fc..02322ea88f47 100644
--- a/app-benchmarks/nbench/nbench-2.2.2.ebuild
+++ b/app-benchmarks/nbench/nbench-2.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/app-benchmarks/nbench/nbench-2.2.2.ebuild,v 1.1 2004/12/30 04:38:04 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/nbench/nbench-2.2.2.ebuild,v 1.1.1.1 2005/11/30 09:36:34 chriswhite Exp $
 
 MY_P="${PN}-byte-${PV}"
 DESCRIPTION="Linux/Unix of release 2 of BYTE Magazine's BYTEmark benchmark"
@@ -9,7 +9,7 @@ SRC_URI="http://www.tux.org/~mayer/linux/${MY_P}.tar.gz"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~sparc ~mips ~ppc"
+KEYWORDS="alpha amd64 hppa ~mips ppc sh sparc x86"
 IUSE=""
 
 DEPEND="virtual/libc"
diff --git a/app-benchmarks/piozone/ChangeLog b/app-benchmarks/piozone/ChangeLog
index 73fc31cfd78b..a276d4e0c645 100644
--- a/app-benchmarks/piozone/ChangeLog
+++ b/app-benchmarks/piozone/ChangeLog
@@ -1,10 +1,29 @@
 # ChangeLog for app-benchmarks/piozone
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/piozone/ChangeLog,v 1.1 2003/08/11 20:11:43 mholzer Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/piozone/ChangeLog,v 1.1.1.1 2005/11/30 09:36:37 chriswhite Exp $
+
+  29 May 2005; Marcus D. Hanwell <marcus@gentoo.org> piozone-1.0-r2.ebuild:
+  Stable on amd64.
+
+  30 Mar 2005; Homer Parker <hparker@gentoo.org> piozone-1.0-r2.ebuild:
+  add ~amd64 to close #85039
+
+  05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  piozone-1.0-r2.ebuild:
+  Masked piozone-1.0-r2.ebuild stable for ppc
+
+  13 Apr 2004; David Holm <dholm@gentoo.org> piozone-1.0-r2.ebuild:
+  Added to ~ppc.
+
+  29 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> piozone-1.0-r2.ebuild:
+  inherit eutils for epatch
+
+  12 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> piozone-1.0-r2.ebuild:
+  don't assign default to S; header fix; tidy
 
 *piozone-1.0-r2 (12 Aug 2003)
 
   12 Aug 2003; Martin Holzer <mholzer@gentoo.org> piozone-1.0-r2.ebuild,
   files/piozone-1.0-gentoo.diff:
-  Initial version. Submitted by Marcelo G�es <blueboard@terra.com.br> in #24250
+  Initial version. Submitted by Marcelo Góes <blueboard@terra.com.br> in #24250
 
diff --git a/app-benchmarks/piozone/Manifest b/app-benchmarks/piozone/Manifest
index 4f6aa1679ad9..f20ec765559e 100644
--- a/app-benchmarks/piozone/Manifest
+++ b/app-benchmarks/piozone/Manifest
@@ -1,4 +1,15 @@
-MD5 aae42527f0ae00ce65073446cf3fd499 piozone-1.0-r2.ebuild 516
-MD5 730e8f5bd3177b22bffc176313cf448e piozone/Manifest 203
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 16e1a561300b8d0ba04c1a6627074c7c piozone-1.0-r2.ebuild 639
+MD5 4beeace72eeaac9cc310c3d9986cb5b0 ChangeLog 1082
+MD5 9a551c719a5f13997e6a2f2375a93721 metadata.xml 164
 MD5 73b1ff1f26935da8082864a001906694 files/digest-piozone-1.0-r2 61
 MD5 56e97e8f7a92632f15dc043ee01225f9 files/piozone-1.0-gentoo.diff 1495
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCmkEGntT9W3vfTuoRAqqcAKCtYjVIROND89mnVCN66Ihp9xV9YQCbB0vD
+droFXgeY7mVLDcF2vd7Wufo=
+=KZBy
+-----END PGP SIGNATURE-----
diff --git a/app-benchmarks/piozone/piozone-1.0-r2.ebuild b/app-benchmarks/piozone/piozone-1.0-r2.ebuild
index 2f1a3bb8c467..e331af6a70e5 100644
--- a/app-benchmarks/piozone/piozone-1.0-r2.ebuild
+++ b/app-benchmarks/piozone/piozone-1.0-r2.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 :$
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/piozone/piozone-1.0-r2.ebuild,v 1.1.1.1 2005/11/30 09:36:37 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="A hard-disk benchmarking tool."
 HOMEPAGE="http://www2.lysator.liu.se/~pen/piozone/"
+SRC_URI="ftp://ftp.lysator.liu.se/pub/unix/piozone/${P}.tar.gz"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
 
 DEPEND="sys-devel/gcc"
-	   
-IUSE=""
-SLOT="0"
-KEYWORDS="~x86"
-S=${WORKDIR}/${P}
-SRC_URI="ftp://ftp.lysator.liu.se/pub/unix/${PN}/${P}.tar.gz"
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-benchmarks/pipebench/ChangeLog b/app-benchmarks/pipebench/ChangeLog
index 2d75d051da8c..2534f2d70480 100644
--- a/app-benchmarks/pipebench/ChangeLog
+++ b/app-benchmarks/pipebench/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-benchmarks/pipebench
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/pipebench/ChangeLog,v 1.1 2004/04/18 19:07:22 usata Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/pipebench/ChangeLog,v 1.1.1.1 2005/11/30 09:36:35 chriswhite Exp $
+
+  07 Aug 2005; Simon Stelling <blubb@gentoo.org> pipebench-0.40.ebuild:
+  added ~amd64 keyword
+
+  03 Sep 2004; David Holm <dholm@gentoo.org> pipebench-0.40.ebuild:
+  Added to ~ppc.
+
+  01 Sep 2004; Tom Gall <tgall@gentoo.org> pipebench-0.40.ebuild:
+  added ~ppc64, bug #61790
 
 *pipebench-0.40 (19 Apr 2004)
 
diff --git a/app-benchmarks/pipebench/Manifest b/app-benchmarks/pipebench/Manifest
index 19d12ce6e69a..16844d30a521 100644
--- a/app-benchmarks/pipebench/Manifest
+++ b/app-benchmarks/pipebench/Manifest
@@ -1,2 +1,4 @@
-MD5 ede0f703aa5e1e0758d7b30bcc71d64c pipebench-0.40.ebuild 999
+MD5 26ef391e3b0cf12ff5bd09834c536079 ChangeLog 691
+MD5 9a551c719a5f13997e6a2f2375a93721 metadata.xml 164
+MD5 5bbde2f5a860341a18297a8abe836925 pipebench-0.40.ebuild 917
 MD5 f5c420076e6845e62a7e78e1595050fb files/digest-pipebench-0.40 65
diff --git a/app-benchmarks/pipebench/pipebench-0.40.ebuild b/app-benchmarks/pipebench/pipebench-0.40.ebuild
index 8c666cdbc3a4..b16d0688e4fa 100644
--- a/app-benchmarks/pipebench/pipebench-0.40.ebuild
+++ b/app-benchmarks/pipebench/pipebench-0.40.ebuild
@@ -1,24 +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/app-benchmarks/pipebench/pipebench-0.40.ebuild,v 1.1 2004/04/18 19:07:22 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/pipebench/pipebench-0.40.ebuild,v 1.1.1.1 2005/11/30 09:36:35 chriswhite Exp $
 
 DESCRIPTION="Measures the speed of stdin/stdout communication"
-
 HOMEPAGE="http://www.habets.pp.se/synscan/programs.php?prog=pipebench"
-
 SRC_URI="ftp://ftp.habets.pp.se/pub/synscan/${P}.tar.gz"
 
 LICENSE="GPL-2"
-
 SLOT="0"
-
-KEYWORDS="~x86"
-
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
-#Add make.conf CFLAGS, add the ${D} and fix the install dirs here (no /.configure).
 src_unpack() {
 	unpack ${P}.tar.gz
 	cd ${S} || die "Manual configure failed"
@@ -37,5 +31,5 @@ src_compile() {
 src_install() {
 	dodir /usr/{bin,share/man/man1}
 	make install || die
-	dodoc README LICENSE
+	dodoc README
 }
diff --git a/app-benchmarks/siege/ChangeLog b/app-benchmarks/siege/ChangeLog
index b91cf1669c9c..03c022b0e366 100644
--- a/app-benchmarks/siege/ChangeLog
+++ b/app-benchmarks/siege/ChangeLog
@@ -1,11 +1,129 @@
 # ChangeLog for app-benchmarks/siege
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/ChangeLog,v 1.1 2002/07/20 18:29:13 blocke Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/ChangeLog,v 1.1.1.1 2005/11/30 09:36:36 chriswhite Exp $
 
-*siege-2.55 (20 Jul 2002)
+*siege-2.64-r1 (03 Nov 2005)
+*siege-2.61-r1 (03 Nov 2005)
+
+  03 Nov 2005; Aaron Walker <ka0ttic@gentoo.org> -siege-2.61.ebuild,
+  +siege-2.61-r1.ebuild, -siege-2.64.ebuild, +siege-2.64-r1.ebuild:
+  err forgot to bump revisions.
+
+  03 Nov 2005; Aaron Walker <ka0ttic@gentoo.org> siege-2.60.ebuild,
+  siege-2.61.ebuild, siege-2.64.ebuild:
+  Add some sedfu to escape certain things in the siege.config script that get
+  interpreted by bash causing what should go in ${HOME}/.siegrc to go to
+  stderr instead, bug 111057.
+
+*siege-2.64 (14 Oct 2005)
+
+  14 Oct 2005; Aaron Walker <ka0ttic@gentoo.org> -siege-2.64_beta1.ebuild,
+  +siege-2.64.ebuild:
+  Version bump; tidy 2.64_beta1.
+
+*siege-2.64_beta1 (08 Sep 2005)
+
+  08 Sep 2005; Aaron Walker <ka0ttic@gentoo.org> siege-2.61.ebuild,
+  -siege-2.63_beta3.ebuild, +siege-2.64_beta1.ebuild:
+  Version bump; 2.61 stable on mips.
+
+  11 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> siege-2.61.ebuild,
+  siege-2.63_beta3.ebuild:
+  Added ~mips.
+
+*siege-2.63_beta3 (26 May 2005)
+
+  26 May 2005; Aaron Walker <ka0ttic@gentoo.org> -siege-2.63_beta2.ebuild,
+  +siege-2.63_beta3.ebuild:
+  Version bump.
+
+*siege-2.63_beta2 (01 May 2005)
+
+  01 May 2005; Aaron Walker <ka0ttic@gentoo.org> -siege-2.63_beta1.ebuild,
+  +siege-2.63_beta2.ebuild:
+  Version bump.
+
+*siege-2.63_beta1 (23 Apr 2005)
+
+  23 Apr 2005; Aaron Walker <ka0ttic@gentoo.org> -siege-2.62_beta5.ebuild,
+  +siege-2.63_beta1.ebuild:
+  Version bump.
+
+*siege-2.62_beta5 (09 Apr 2005)
+
+  09 Apr 2005; Aaron Walker <ka0ttic@gentoo.org> +siege-2.62_beta5.ebuild:
+  Version bump.
+
+  27 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> siege-2.61.ebuild:
+  Stable on ppc.
+
+  26 Feb 2004; Konstantin Arkhipov <voxus@gentoo.org> siege-2.60.ebuild,
+  siege-2.61.ebuild:
+  Added ~amd64 keyword.
 
-  20 Jul 2002; Bruce A. Locke <blocke@shivan.org> siege-2.55.ebuild, digest-siege-2.55:
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
 
-  Initial Version
+  18 Dec 2004; Aaron Walker <ka0ttic@gentoo.org> siege-2.61.ebuild:
+  Marked stable on x86.
 
+  21 Nov 2004; Aaron Walker <ka0ttic@gentoo.org>
+  +files/siege.bash-completion, siege-2.60.ebuild, siege-2.61.ebuild:
+  Added command-line completion for siege.
 
+*siege-2.61 (20 Nov 2004)
+
+  20 Nov 2004; Aaron Walker <ka0ttic@gentoo.org> siege-2.60.ebuild,
+  +siege-2.61.ebuild, -siege-2.61_beta1.ebuild:
+  Version bump.
+
+  18 Nov 2004; Aaron Walker <ka0ttic@gentoo.org>
+  +files/siege-2.60-gentoo.diff, -siege-2.59.ebuild, siege-2.60.ebuild,
+  siege-2.61_beta1.ebuild:
+  Added patch to fix siegerc and urls.txt access violations instead of
+  einstall for bug 71558; removed 2.59 ebuild.
+
+  08 Oct 2004; Aaron Walker <ka0ttic@gentoo.org> siege-2.60.ebuild:
+  Fix access violation (bug #66758)
+
+*siege-2.61_beta1 (24 Sep 2004)
+
+  24 Sep 2004; Aaron Walker <ka0ttic@gentoo.org> +siege-2.61_beta1.ebuild:
+  Version bump.
+
+  20 Sep 2004; Aaron Walker <ka0ttic@gentoo.org>
+  -files/siege-gentoo_openssl.patch, -siege-2.55.ebuild, -siege-2.58.ebuild,
+  siege-2.60.ebuild:
+  Cleaned up 2.60; removed old ebuilds/patch
+
+  18 Sep 2004; Aaron Walker <ka0ttic@gentoo.org> siege-2.60.ebuild:
+  Versions <2.60 are pretty buggy (segfault often), so marking 2.60 stable on x86
+
+  17 Sep 2004; Aaron Walker <ka0ttic@gentoo.org> +metadata.xml:
+  Added metadata.xml
+
+  18 Sep 2004; <SeJo@gentoo.org> siege-2.60.ebuild:
+  marked stable ppc for KaOTTiC
+
+*siege-2.60 (21 Aug 2004)
+
+  21 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> +siege-2.60.ebuild:
+  Version bump, requested by Ka0ttic.
+
+  25 Apr 2004; Aron Griffis <agriffis@gentoo.org> siege-2.55.ebuild,
+  siege-2.58.ebuild, siege-2.59.ebuild:
+  Add die following econf for bug 48950
+
+*siege-2.59 (22 Feb 2004)
+
+  22 Feb 2004; Markus Nigbur <pyrania@gentoo.org> siege-2.58.ebuild,
+  siege-2.59.ebuild:
+  Marked .58 stable on x86 and version bumped to .59
+
+*siege-2.58-r1 22 Feb 2004
+
+  22 Feb 2004;  <> 
+  # INSERT ENTRY HERE
+
+*siege-2.58 (23 Dec 2003)
+*siege-2.55 (20 Jul 2002)
diff --git a/app-benchmarks/siege/Manifest b/app-benchmarks/siege/Manifest
index e69de29bb2d1..119c7a69f3c3 100644
--- a/app-benchmarks/siege/Manifest
+++ b/app-benchmarks/siege/Manifest
@@ -0,0 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1c12fd3bf518072159b08c6c469ff0e3 ChangeLog 4106
+MD5 1185a0d2d8ac987001f575f8eb302327 files/digest-siege-2.60 62
+MD5 777c4d7f0fca11bdfc849cb76422dde9 files/digest-siege-2.61-r1 62
+MD5 6f081910176735dfe5a4ab9bcc7203c2 files/digest-siege-2.64-r1 62
+MD5 9e437904b960c0cab42d691c8678774b files/siege-2.60-gentoo.diff 1740
+MD5 16fc2e7263b085c5c027844be0fdc63f files/siege.bash-completion 783
+MD5 15d8ee1460109dffd23fe7d243b750bd metadata.xml 257
+MD5 58eac526181cbc7c3337fdaea49ab8ab siege-2.60.ebuild 1460
+MD5 019e0f9aa2b1a87a40e64af38cbb1579 siege-2.61-r1.ebuild 1473
+MD5 2563ad7345d9ca9ffcd5a1f566523858 siege-2.64-r1.ebuild 1755
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDaodpEZCkKN40op4RAlIpAJ9dJFy+iD2qoKonlrX9iHVJdAnUngCfWfxy
+p9+/DDq6uN+jrNWj5tleKsU=
+=Aw0Z
+-----END PGP SIGNATURE-----
diff --git a/app-benchmarks/siege/files/siege.bash-completion b/app-benchmarks/siege/files/siege.bash-completion
index f74cc79ecc3f..cf7f9dc86806 100644
--- a/app-benchmarks/siege/files/siege.bash-completion
+++ b/app-benchmarks/siege/files/siege.bash-completion
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/files/siege.bash-completion,v 1.1 2004/11/21 10:00:20 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/files/siege.bash-completion,v 1.1.1.1 2005/11/30 09:36:36 chriswhite Exp $
 # siege completion
 
 _siege() {
diff --git a/app-benchmarks/siege/metadata.xml b/app-benchmarks/siege/metadata.xml
index d31152aca840..7c7a729c912c 100644
--- a/app-benchmarks/siege/metadata.xml
+++ b/app-benchmarks/siege/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>benchmarks</herd>
 	<maintainer>
 		<email>ka0ttic@gentoo.org</email>
 		<name>Aaron Walker</name>
diff --git a/app-benchmarks/siege/siege-2.60.ebuild b/app-benchmarks/siege/siege-2.60.ebuild
index 0bdaca2c252e..e8cc13ccf2d7 100644
--- a/app-benchmarks/siege/siege-2.60.ebuild
+++ b/app-benchmarks/siege/siege-2.60.ebuild
@@ -1,36 +1,53 @@
-# Copyright 1999-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-benchmarks/siege/siege-2.60.ebuild,v 1.1 2004/08/21 18:16:56 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/siege-2.60.ebuild,v 1.1.1.1 2005/11/30 09:36:36 chriswhite Exp $
 
-DESCRIPTION="An http regression testing and benchmarking utility"
+inherit eutils bash-completion
+
+DESCRIPTION="A HTTP regression testing and benchmarking utility"
 HOMEPAGE="http://www.joedog.org/siege/"
-SRC_URI="ftp://sid.joedog.org/pub/siege/${P}.tar.gz"
+SRC_URI="ftp://sid.joedog.org/pub/${PN}/${P}.tar.gz"
 
-KEYWORDS="~x86 ~ppc"
-SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="x86 ppc ~amd64"
+SLOT="0"
 IUSE="ssl"
 
 DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )"
+RDEPEND="${DEPEND}
+	dev-lang/perl"
 
-src_compile() {
-	has_version '=dev-libs/openssl-0.9.7*' \
-		&& sed -i -e "s:^# include <openssl/e_os.h>::" src/ssl.h
-	local myconf
-	use ssl && myconf="--with-ssl" || myconf="--with-ssl=off"
-	econf ${myconf} || die "econf failed"
-	emake || die
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.diff
+}
 
+src_compile() {
+	einfo "Running autoreconf"
+	autoreconf || die "autoreconf failed"
+	econf $(use_with ssl) || die "econf failed"
+	emake || die "emake failed"
 }
 
 src_install() {
-	# makefile tries to install into $HOME by default... bad monkey!
-	dodir /usr/share/doc/${P}
-
-	einstall SIEGERC="${D}/usr/share/doc/${P}/siegerc-example"
-
-	# all non-html docs must be gzip'd
-	gzip ${D}/usr/share/doc/${P}/siegerc-example
+	make DESTDIR="${D}" install || die "make install failed"
+
+	# bug 111057 - siege.config utility uses ${} which gets
+	# interpreted by bash sending the contents to stderr
+	# instead of ${HOME}/.siegerc
+	sed -i -e 's|\${}|\\${}|' -e 's|\$(HOME)|\\$(HOME)|' \
+		${D}/usr/bin/siege.config
+
+	dodoc AUTHORS ChangeLog INSTALL MACHINES README KNOWNBUGS \
+		siegerc-example urls.txt || die "dodoc failed"
+	use ssl && dodoc README.https
+	dobashcompletion ${FILESDIR}/${PN}.bash-completion ${PN}
+}
 
-	dodoc AUTHORS ChangeLog INSTALL KNOWNBUGS NEWS MACHINES README
+pkg_postinst() {
+	echo
+	einfo "An example ~/.siegerc file has been installed as"
+	einfo "/usr/share/doc/${PF}/siegerc-example.gz"
+	bash-completion_pkg_postinst
 }
diff --git a/app-benchmarks/siege/siege-2.61-r1.ebuild b/app-benchmarks/siege/siege-2.61-r1.ebuild
index 3695262c2feb..29cb25d15409 100644
--- a/app-benchmarks/siege/siege-2.61-r1.ebuild
+++ b/app-benchmarks/siege/siege-2.61-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-benchmarks/siege/siege-2.61-r1.ebuild,v 1.1 2005/11/03 21:55:37 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/siege-2.61-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:36 chriswhite Exp $
 
 inherit eutils bash-completion
 
diff --git a/app-benchmarks/siege/siege-2.64-r1.ebuild b/app-benchmarks/siege/siege-2.64-r1.ebuild
index 490579ffd83e..18f93103253e 100644
--- a/app-benchmarks/siege/siege-2.64-r1.ebuild
+++ b/app-benchmarks/siege/siege-2.64-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-benchmarks/siege/siege-2.64-r1.ebuild,v 1.1 2005/11/03 21:55:37 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/siege-2.64-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:36 chriswhite Exp $
 
 inherit eutils bash-completion
 
diff --git a/app-benchmarks/stress/ChangeLog b/app-benchmarks/stress/ChangeLog
index 82739cc8f34f..14326942b86a 100644
--- a/app-benchmarks/stress/ChangeLog
+++ b/app-benchmarks/stress/ChangeLog
@@ -1,9 +1,84 @@
-# ChangeLog for app-benchmark/stress
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/stress/ChangeLog,v 1.1 2002/12/08 17:58:15 method Exp $
+# ChangeLog for app-benchmarks/stress
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/stress/ChangeLog,v 1.1.1.1 2005/11/30 09:36:37 chriswhite Exp $
 
-*stress-0.17pre7 (08 DEC 2002))
+  03 Sep 2005; Markus Rothe <corsair@gentoo.org> stress-0.18.6.ebuild:
+  Stable on ppc64
 
-  08 DEC 2002; Joshua Brindle <method@gentoo.org> stress-0.17pre7.ebuild:
+  02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> stress-0.18.6.ebuild:
+  Stable on ppc.
+
+  30 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> stress-0.18.6.ebuild:
+  Stable on x86; added ~mips.
+
+  07 Aug 2005; Simon Stelling <blubb@gentoo.org> stress-0.18.6.ebuild:
+  added ~amd64 keyword
+
+  07 Jul 2005; Markus Rothe <corsair@gentoo.org> stress-0.18.4.ebuild:
+  Stable on ppc64
+
+  03 Jul 2005; Michael Hanselmann <hansmi@gentoo.org> stress-0.18.4.ebuild:
+  Stable on ppc.
+
+*stress-0.18.6 (01 Jul 2005)
+
+  01 Jul 2005; Aaron Walker <ka0ttic@gentoo.org> stress-0.18.4.ebuild,
+  +stress-0.18.6.ebuild:
+  Version bump; marked 0.18.4 stable on x86.
+
+*stress-0.18.4 (09 Apr 2005)
+
+  09 Apr 2005; Aaron Walker <ka0ttic@gentoo.org> stress-0.18.1.ebuild,
+  +stress-0.18.4.ebuild:
+  Version bump for bug 88424. Added static support for bug 81279. Use make
+  install over einstall for bug 71559.
+
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org> stress-0.18.1.ebuild:
+  Stable on ppc64
+
+  03 Nov 2004; Markus Rothe <corsair@gentoo.org> stress-0.18.1.ebuild:
+  Marked ~ppc64; bug #69909
+
+  05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  stress-0.18.1.ebuild:
+  Masked stress-0.18.1.ebuild stable for ppc
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> stress-0.18.1.ebuild:
+  Add die following econf for bug 48950
+
+  12 Aug 2003; Martin Holzer <mholzer@gentoo.org> stress-0.18.1.ebuild:
+  Marked x86 stable.
+
+*stress-0.18.1 (05 Aug 2003)
+
+  05 Aug 2003; Martin Holzer <mholzer@gentoo.org> stress-0.18.1.ebuild:
+  Version bumped.
+
+*stress-0.17.2 (28 Jun 2003)
+
+  05 Aug 2003; Martin Holzer <mholzer@gentoo.org> stress-0.17.2.ebuild:
+  Marked x86 stable.
+
+  28 Jun 2003; Martin Holzer <mholzer@gentoo.org> stress-0.17.2.ebuild:
+  Version bumped.
+
+*stress-0.17 (01 Jun 2003)
+
+  01 Jun 2003; Martin Holzer <mholzer@gentoo.org> stress-0.17.ebuild,
+  stress-0.17_pre16.ebuild, stress-0.17_pre7.ebuild:
+  Cleanup & version bumped. Closes #21964.
+
+*stress-0.17_pre16 (28 Apr 2003)
+
+  28 Apr 2003; Joshua Brindle <method@gentoo.org> Manifest,
+  stress-0.17_pre16.ebuild:
+  Version bump
+
+*stress-0.17pre7 (08 Dec 2002)
+
+  28 Mar 2003; Pieter Van den Abeele <pvdabeel@gentoo.org> stress-0.17pre7.ebuild:
+  Moved to ~ppc
+
+  08 Dec 2002; Joshua Brindle <method@gentoo.org> stress-0.17pre7.ebuild:
   Initial import.  Ebuild submitted by Donald Giuliano <guido@ou.edu> 
   free, so the best we can hope (and expect!) to receive is credit.
diff --git a/app-benchmarks/stress/Manifest b/app-benchmarks/stress/Manifest
index d5d8ffb15b03..99ddc189764b 100644
--- a/app-benchmarks/stress/Manifest
+++ b/app-benchmarks/stress/Manifest
@@ -1,5 +1,8 @@
-MD5 408b1f28365e579330e612e365402703 stress-0.17_pre7.ebuild 630
-MD5 8579bca516a2da20674c6983cdea8a4a stress-0.17_pre16.ebuild 631
-MD5 b70b2cfe395386b5583229e7b26c0153 ChangeLog 571
-MD5 2a9eed914a2ed4e882f07a1b4f094ca1 files/digest-stress-0.17_pre16 68
-MD5 ab7a16fda496e20af4c0ae5c468971ea files/digest-stress-0.17_pre7 66
+MD5 6e31b00162533da4c808b9e235065405 ChangeLog 2735
+MD5 9a551c719a5f13997e6a2f2375a93721 metadata.xml 164
+MD5 4f6e1ad6d642809ef09da3ba3dafa4bc stress-0.18.1.ebuild 666
+MD5 7161d58800faefca66019bf578c78fb3 stress-0.18.4.ebuild 808
+MD5 42349588f9d9401a6e65a338a9640b91 stress-0.18.6.ebuild 821
+MD5 ec9695d4d01d924951995ed39fe7b7f9 files/digest-stress-0.18.1 65
+MD5 e46996b0cd4ebcecf557b1cb56a0cf6b files/digest-stress-0.18.4 65
+MD5 b0e5a3aac816d3a0c336247c14d2503c files/digest-stress-0.18.6 65
diff --git a/app-benchmarks/stress/stress-0.18.1.ebuild b/app-benchmarks/stress/stress-0.18.1.ebuild
index d3ec254c910d..7b417374c991 100644
--- a/app-benchmarks/stress/stress-0.18.1.ebuild
+++ b/app-benchmarks/stress/stress-0.18.1.ebuild
@@ -1,26 +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/app-benchmarks/stress/stress-0.18.1.ebuild,v 1.1 2003/08/04 18:14:03 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/stress/stress-0.18.1.ebuild,v 1.1.1.1 2005/11/30 09:36:37 chriswhite Exp $
 
-MY_P=${PN}-${PV/_/}
+MY_P="${PN}-${PV/_/}"
 S="${WORKDIR}/${MY_P}"
 DESCRIPTION="Imposes stressful loads on different aspects of the system."
 HOMEPAGE="http://weather.ou.edu/~apw/projects/stress"
-SRC_URI="http://weather.ou.edu/~apw/projects/${PN}/${MY_P}.tar.gz"
+SRC_URI="http://weather.ou.edu/~apw/projects/stress/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86 ~sparc ppc ppc64"
 IUSE=""
-KEYWORDS="~x86 ~sparc ~ppc"
 
-DEPEND=""
-RDEPEND=""
-
-src_compile() {
-	econf
-	emake || die
-}
+DEPEND="virtual/libc"
 
 src_install() {
-	einstall
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc ChangeLog AUTHORS README
 }
diff --git a/app-benchmarks/stress/stress-0.18.4.ebuild b/app-benchmarks/stress/stress-0.18.4.ebuild
index 4df96fbd4f48..2de9a7983d2b 100644
--- a/app-benchmarks/stress/stress-0.18.4.ebuild
+++ b/app-benchmarks/stress/stress-0.18.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-benchmarks/stress/stress-0.18.4.ebuild,v 1.1 2005/04/09 03:59:34 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/stress/stress-0.18.4.ebuild,v 1.1.1.1 2005/11/30 09:36:37 chriswhite Exp $
 
 inherit flag-o-matic
 
@@ -12,7 +12,7 @@ SRC_URI="http://weather.ou.edu/~apw/projects/stress/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~ppc64"
+KEYWORDS="ppc ppc64 ~sparc x86"
 IUSE="static"
 
 DEPEND="virtual/libc"
diff --git a/app-benchmarks/stress/stress-0.18.6.ebuild b/app-benchmarks/stress/stress-0.18.6.ebuild
index 74b25c6f2473..dd293566c08d 100644
--- a/app-benchmarks/stress/stress-0.18.6.ebuild
+++ b/app-benchmarks/stress/stress-0.18.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-benchmarks/stress/stress-0.18.6.ebuild,v 1.1 2005/07/01 03:20:09 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/stress/stress-0.18.6.ebuild,v 1.1.1.1 2005/11/30 09:36:37 chriswhite Exp $
 
 inherit flag-o-matic
 
@@ -12,7 +12,7 @@ SRC_URI="http://weather.ou.edu/~apw/projects/stress/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~ppc64"
+KEYWORDS="~amd64 ~mips ppc ppc64 ~sparc x86"
 IUSE="static"
 
 DEPEND="virtual/libc"
diff --git a/app-benchmarks/tiobench/ChangeLog b/app-benchmarks/tiobench/ChangeLog
index e370924b7ab6..0c5a4e206cb1 100644
--- a/app-benchmarks/tiobench/ChangeLog
+++ b/app-benchmarks/tiobench/ChangeLog
@@ -1,6 +1,39 @@
 # ChangeLog for app-benchmarks/tiobench
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/tiobench/ChangeLog,v 1.1 2003/11/15 08:21:20 mr_bones_ Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/tiobench/ChangeLog,v 1.1.1.1 2005/11/30 09:36:37 chriswhite Exp $
+
+  16 May 2005; Sven Wegener <swegener@gentoo.org> -tiobench-0.3.3-r1.ebuild,
+  tiobench-0.3.3-r2.ebuild:
+  Marked 0.3.3-r2 stable on all arches that 0.3.3-r1 is stable on. Only change
+  is a patch that adjusts the ouput format.
+
+  26 Mar 2005; Sven Wegener <swegener@gentoo.org>
+  files/0.3.3-column-description-fix.patch:
+  Fixed patch to not cause sandbox violations, bug #86791.
+
+*tiobench-0.3.3-r2 (22 Mar 2005)
+
+  22 Mar 2005; Sven Wegener <swegener@gentoo.org>
+  +files/0.3.3-column-description-fix.patch, +tiobench-0.3.3-r2.ebuild:
+  Fixed column description to be displayed for every table. Thanks to
+  Christian <evilninja@gmx.net> in bug #85362.
+
+  18 Dec 2004; Simon Stelling <blubb@gentoo.org> tiobench-0.3.3-r1.ebuild:
+  was testing for a long time, marking stable on amd64
+
+  24 Sep 2004; Sven Wegener <swegener@gentoo.org> -tiobench-0.3.3.ebuild:
+  Removed old ebuild.
+
+  27 Aug 2004; Tom Gall <tgall@gentoo.org> tiobench-0.3.3-r1.ebuild
+  stable on ppc and ppc64
+
+  18 Jul 2004; Daniel Ahlberg <aliz@gentoo.org> :
+  Added amd64 keyword, closing #57108.
+
+*tiobench-0.3.3-r1 (03 Mar 2004)
+
+  03 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> tiobench-0.3.3.ebuild:
+  turn on large file support (bug #43000)
 
 *tiobench-0.3.3 (15 Nov 2003)
 
diff --git a/app-benchmarks/tiobench/Manifest b/app-benchmarks/tiobench/Manifest
index abdec0112a0d..ee2b03aa330e 100644
--- a/app-benchmarks/tiobench/Manifest
+++ b/app-benchmarks/tiobench/Manifest
@@ -1,2 +1,15 @@
-MD5 bba500c34eb45a472427c1c1a1728e91 tiobench-0.3.3.ebuild 818
-MD5 b0e08c271d30b5da41b55be795a8773e files/digest-tiobench-0.3.3 65
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a5ca2fdb800bd1382b2223cfe0c6eef9 tiobench-0.3.3-r2.ebuild 994
+MD5 af5f32e0ba0e47774b3919734818279e ChangeLog 1646
+MD5 fee6e15994a6028b5d4ca280c4cabe09 metadata.xml 303
+MD5 b0e08c271d30b5da41b55be795a8773e files/digest-tiobench-0.3.3-r2 65
+MD5 848cb30052a12084109f307bd7cf3cfe files/0.3.3-column-description-fix.patch 1032
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCiN79I1lqEGTUzyQRArI1AJ9kChvYfxjJztbz12UxFs3GH0nSMwCfaU63
+iBZzmv4b2KHMK0HT6H7vPq8=
+=Trp6
+-----END PGP SIGNATURE-----
diff --git a/app-benchmarks/tiobench/files/0.3.3-column-description-fix.patch b/app-benchmarks/tiobench/files/0.3.3-column-description-fix.patch
index 52b6cf8f7358..b3ebb90b33e1 100644
--- a/app-benchmarks/tiobench/files/0.3.3-column-description-fix.patch
+++ b/app-benchmarks/tiobench/files/0.3.3-column-description-fix.patch
@@ -1,5 +1,5 @@
---- /usr/sbin/tiobench.pl	2005-02-23 00:21:33.000000000 +0100
-+++ /home/evil/trash/tiobench_debian	2005-03-15 18:11:19.000000000 +0100
+--- tiobench.pl	2005-02-23 00:21:33.000000000 +0100
++++ tiobench.pl	2005-03-15 18:11:19.000000000 +0100
 @@ -168,6 +168,8 @@
                    $stat_data{$identifier}{$thread}{$size}{$block}{$field}{'stime'} ) / 
                    $stat_data{$identifier}{$thread}{$size}{$block}{$field}{'time'};
diff --git a/app-benchmarks/tiobench/tiobench-0.3.3-r2.ebuild b/app-benchmarks/tiobench/tiobench-0.3.3-r2.ebuild
index 965efad05ca8..1c8f9f35a696 100644
--- a/app-benchmarks/tiobench/tiobench-0.3.3-r2.ebuild
+++ b/app-benchmarks/tiobench/tiobench-0.3.3-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/app-benchmarks/tiobench/tiobench-0.3.3-r2.ebuild,v 1.1 2005/03/22 12:51:46 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/tiobench/tiobench-0.3.3-r2.ebuild,v 1.1.1.1 2005/11/30 09:36:36 chriswhite Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Portable, robust, fully-threaded I/O benchmark program"
 HOMEPAGE="http://tiobench.sourceforge.net/"
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~ppc64"
+KEYWORDS="x86 amd64 ppc ppc64"
 IUSE=""
 
 RDEPEND="virtual/libc
@@ -19,21 +19,17 @@ DEPEND=">=sys-apps/sed-4"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
-	epatch ${FILESDIR}/0.3.3-column-description-fix.patch
+	epatch "${FILESDIR}"/0.3.3-column-description-fix.patch
 
 	sed -i \
 		-e 's:/usr/local/bin:/usr/sbin:' tiobench.pl \
 		|| die "sed tiobench.pl failed"
-	sed -i \
-		-e '/DLARGEFILES/ s/^#//' \
-		-e "/^CFLAGS/ s:=.*:= ${CFLAGS}:" Makefile \
-		|| die "sed Makefile failed"
 }
 
 src_compile() {
-	emake || die "emake failed"
+	emake CC="$(tc-getCC)" DEFINES="-DLARGEFILES" CFLAGS="${CFLAGS}" || die "emake failed"
 }
 
 src_install() {
diff --git a/app-benchmarks/volanomark/ChangeLog b/app-benchmarks/volanomark/ChangeLog
index 103b447b2767..de44ac756720 100644
--- a/app-benchmarks/volanomark/ChangeLog
+++ b/app-benchmarks/volanomark/ChangeLog
@@ -1,6 +1,13 @@
-# ChangeLog for app-benchmarks/volcanomark
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/volanomark/ChangeLog,v 1.1 2004/02/10 04:34:42 absinthe Exp $
+# ChangeLog for app-benchmarks/volanomark
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/volanomark/ChangeLog,v 1.1.1.1 2005/11/30 09:36:36 chriswhite Exp $
+
+  14 Apr 2004; Daniel Black <dragonheart@gentoo.org>
+  volanomark-2.5.0.9.ebuild:
+  Stable on x86 amd64
+
+  11 Feb 2004; Dylan Carlson <absinthe@gentoo.org> volanomark-2.5.0.9.ebuild:
+  fixed to set correct stack sizes for x86 and amd64.
 
 *volanomark-2.5.0.9 (09 Feb 2004)
 
diff --git a/app-benchmarks/volanomark/Manifest b/app-benchmarks/volanomark/Manifest
index 74add7769be1..e9f8c01e3eb5 100644
--- a/app-benchmarks/volanomark/Manifest
+++ b/app-benchmarks/volanomark/Manifest
@@ -1,4 +1,4 @@
-MD5 3b00b3f5cff4521fb1cb4e78becd9304 volanomark-2.5.0.9.ebuild 1685
+MD5 53f4a460db5986c3c58da1d5dcab0235 ChangeLog 1075
 MD5 20df39f1c599ecdff828aef616e1e26e metadata.xml 412
-MD5 1995a5f09d09d8a193f49d1b85d2d619 ChangeLog 617
-MD5 81e522796f58f0b32c4e071f7b2f668f files/digest-volcanomark-2.5.0.9 64
+MD5 10f1f45f053980eb0dd733935bb65254 volanomark-2.5.0.9.ebuild 1893
+MD5 81e522796f58f0b32c4e071f7b2f668f files/digest-volanomark-2.5.0.9 64
diff --git a/app-benchmarks/volanomark/volanomark-2.5.0.9.ebuild b/app-benchmarks/volanomark/volanomark-2.5.0.9.ebuild
index 680400e4ce1d..21257ae137e2 100644
--- a/app-benchmarks/volanomark/volanomark-2.5.0.9.ebuild
+++ b/app-benchmarks/volanomark/volanomark-2.5.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/app-benchmarks/volanomark/volanomark-2.5.0.9.ebuild,v 1.1 2004/02/10 04:34:42 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/volanomark/volanomark-2.5.0.9.ebuild,v 1.1.1.1 2005/11/30 09:36:36 chriswhite Exp $
 
 DESCRIPTION="Java server benchmark utility"
 HOMEPAGE="http://www.volano.com/benchmarks.html"
@@ -12,7 +12,7 @@ RESTRICT="nomirror"
 
 SLOT="0"
 
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64"
 IUSE=""
 DEPEND="virtual/jre
 	>=sys-apps/sed-4
@@ -31,10 +31,18 @@ src_install() {
 	sed -i -e "s#^host=.*#cd /opt/${PN}\nhost=`hostname`#" \
 		-e 's:"$java":java:g' \
 		-e 's:! -f: -z :' \
+		-e 's:-Sn:-n:' \
 		${D}/opt/${PN}/startup.sh
 
 	sed -i -e "s#^./startup.sh#/opt/${PN}/startup.sh#g" ${D}/opt/${PN}/*.sh
 
+	# Set stack-size correctly for different arches
+	if [ "${ARCH}" == "amd64" ] ; then
+		sed -i -e 's:Xss96:Xss512:' ${D}/opt/${PN}/startup.sh
+	else
+		sed -i -e 's:Xss96:Xss128:' ${D}/opt/${PN}/startup.sh
+	fi
+
 	keepdir /opt/${PN}/logs
 }
 
diff --git a/app-benchmarks/xfbsuite/ChangeLog b/app-benchmarks/xfbsuite/ChangeLog
index b435303207e6..b1df7cec10cc 100644
--- a/app-benchmarks/xfbsuite/ChangeLog
+++ b/app-benchmarks/xfbsuite/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for app-benchmarks/xfbsuite
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/xfbsuite/ChangeLog,v 1.1 2004/04/12 19:37:06 cretin Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/xfbsuite/ChangeLog,v 1.1.1.1 2005/11/30 09:36:37 chriswhite Exp $
+
+  18 Dec 2004; Simon Stelling <blubb@gentoo.org> xfbsuite-0.9.7.6.ebuild:
+  was testing for a long time, marking stable on amd64
+
+  15 Apr 2004; David Holm <dholm@gentoo.org> xfbsuite-0.9.7.6.ebuild:
+  Where did the ~ppc go?
+
+  13 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  xfbsuite-0.9.7.3.ebuild:
+  whitespace cleanup; rm redundent dodir
+
+  13 Apr 2004; David Holm <dholm@gentoo.org> xfbsuite-0.9.7.3.ebuild:
+  Added to ~ppc.
+
+*xfbsuite-0.9.7.6 (15 Apr 2004)
+
+  15 Apr 2004; <cretin@gentoo.org> :
+  New version and gentooified ebuild
+  (note binaries are incuded so it is x86 only)
 
 *xfbsuite-0.9.7.3 (12 Apr 2004)
 
diff --git a/app-benchmarks/xfbsuite/Manifest b/app-benchmarks/xfbsuite/Manifest
index 6f95a68eef21..b50d0414d366 100644
--- a/app-benchmarks/xfbsuite/Manifest
+++ b/app-benchmarks/xfbsuite/Manifest
@@ -1,2 +1,14 @@
-MD5 683b2f4c43e79fccd83e7949ae07789b xfbsuite-0.9.7.3.ebuild 539
-MD5 8a730fea5540ef40855c87e9d34b0fb4 files/digest-xfbsuite-0.9.7.3 65
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 94cefe2b4fdf1315a38aaf6e0f984501 xfbsuite-0.9.7.6.ebuild 726
+MD5 caf5bb0d4105314f6bdd94a8f64a14e8 ChangeLog 913
+MD5 9a551c719a5f13997e6a2f2375a93721 metadata.xml 164
+MD5 337b152c9c3ab58750d141b5962696fc files/digest-xfbsuite-0.9.7.6 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCVtLJEZCkKN40op4RAoybAJ0R31JCMjvnMxmtuZrmrd0Y0FeSLwCgu/PP
+ONtz1FEr05RIB/HpknO402g=
+=eftW
+-----END PGP SIGNATURE-----
diff --git a/app-benchmarks/xfbsuite/xfbsuite-0.9.7.6.ebuild b/app-benchmarks/xfbsuite/xfbsuite-0.9.7.6.ebuild
index 47c02719a9f7..260a63b24768 100644
--- a/app-benchmarks/xfbsuite/xfbsuite-0.9.7.6.ebuild
+++ b/app-benchmarks/xfbsuite/xfbsuite-0.9.7.6.ebuild
@@ -1,7 +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: /home/cvsroot/gentoo-x86/app-benchmarks/xfbsuite-0.9.7.3, 2004/04/12 13:22:09
-
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/xfbsuite/xfbsuite-0.9.7.6.ebuild,v 1.1.1.1 2005/11/30 09:36:37 chriswhite Exp $
 
 DESCRIPTION="benchmark suite"
 HOMEPAGE="https://sourceforge.net/projects/fbsuite/"
@@ -9,10 +8,9 @@ SRC_URI="mirror://sourceforge/fbsuite/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86 ~ppc amd64"
 IUSE=""
 
-
 DEPEND="dev-lang/perl
 	dev-perl/perl-tk"
 
@@ -22,8 +20,8 @@ src_install() {
 
 	dodoc doc/Todo doc/Readme.DE
 
-	dobin bin/{xfbsuite.tk,xfbsuite.pl,xfbsuite.sh}
+	dobin bin/{xfbsuite.tk,xfbsuite.pl,xfbsuite.sh} || die
 
 	exeinto /usr/bin/xfbsuite
-	doexe bin/{stream,cachebench,nbench,NNET.DAT,bonnie++,piozone}
+	doexe bin/{stream,cachebench,nbench,NNET.DAT,bonnie++,piozone} || die
 }
diff --git a/app-mobilephone/bemused/ChangeLog b/app-mobilephone/bemused/ChangeLog
index 7dcbf239bfc6..dedabaab66fe 100644
--- a/app-mobilephone/bemused/ChangeLog
+++ b/app-mobilephone/bemused/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for app-mobilephone/bemused
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bemused/ChangeLog,v 1.1 2005/05/16 17:51:52 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bemused/ChangeLog,v 1.1.1.1 2005/11/30 09:36:34 chriswhite Exp $
 
   16 May 2005; Alin Nastac <mrness@gentoo.org> metadata.xml,
   bemused-1.73.ebuild:
diff --git a/app-mobilephone/bemused/Manifest b/app-mobilephone/bemused/Manifest
index cfaca249e6b1..d7f9b5ebf1d7 100644
--- a/app-mobilephone/bemused/Manifest
+++ b/app-mobilephone/bemused/Manifest
@@ -1,4 +1,14 @@
-MD5 6b6fb9bac038075faf3da406593c5166 bemused-1.73.ebuild 911
-MD5 4e71fb3ea78a4a77e39174f8f9c4a9dd ChangeLog 555
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 602635223f3b2efbdd50dfbe4852e645 bemused-1.73.ebuild 911
+MD5 d36d0b66ae448b8135c7af96285a9cf9 ChangeLog 578
 MD5 9672ea9b2345c8f1d48127a47e7e5de7 metadata.xml 451
 MD5 1f17e8b8c057d4da4a8cb7cd4da00c55 files/digest-bemused-1.73 74
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCiN3SjiC39V7gKu0RAtsIAJ9UAbmymhc8O72EP8BB1FQxJqPp9QCcCO+D
+cSGXgTT5CyUUt5jxHEgBLDQ=
+=V88W
+-----END PGP SIGNATURE-----
diff --git a/app-mobilephone/bemused/bemused-1.73.ebuild b/app-mobilephone/bemused/bemused-1.73.ebuild
index 8e8dc85cbb38..f3f6a0132174 100644
--- a/app-mobilephone/bemused/bemused-1.73.ebuild
+++ b/app-mobilephone/bemused/bemused-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/app-mobilephone/bemused/bemused-1.73.ebuild,v 1.1 2005/05/16 17:51:52 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bemused/bemused-1.73.ebuild,v 1.1.1.1 2005/11/30 09:36:34 chriswhite Exp $
 
 MY_P=${PN}linuxserver-${PV/./_}
 
diff --git a/app-mobilephone/bitpim/ChangeLog b/app-mobilephone/bitpim/ChangeLog
index 2394768c3545..c80f23f08710 100644
--- a/app-mobilephone/bitpim/ChangeLog
+++ b/app-mobilephone/bitpim/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for app-mobilephone/bitpim
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/ChangeLog,v 1.1 2005/05/15 08:41:48 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/ChangeLog,v 1.1.1.1 2005/11/30 09:36:33 chriswhite Exp $
+
+*bitpim-0.7.34 (23 Jul 2005)
+
+  23 Jul 2005; Alin Nastac <mrness@gentoo.org> -bitpim-0.7.27.ebuild,
+  -bitpim-0.7.32.ebuild, bitpim-0.7.33.ebuild, +bitpim-0.7.34.ebuild:
+  Mark version 0.7.33 stable on x86. Remove obsolete versions. Version bump
+  (#99986).
+
+*bitpim-0.7.33 (05 Jun 2005)
+
+  05 Jun 2005; Alin Nastac <mrness@gentoo.org> +bitpim-0.7.33.ebuild:
+  Version bump.
 
 *bitpim-0.7.32 (15 May 2005)
 
diff --git a/app-mobilephone/bitpim/Manifest b/app-mobilephone/bitpim/Manifest
index 317bb9b8f47a..87554cb2f0eb 100644
--- a/app-mobilephone/bitpim/Manifest
+++ b/app-mobilephone/bitpim/Manifest
@@ -1,6 +1,16 @@
-MD5 70088e659655698e70e3f111d09be228 bitpim-0.7.32.ebuild 739
-MD5 70088e659655698e70e3f111d09be228 bitpim-0.7.27.ebuild 739
-MD5 d9e022a6950f4f1a22b400eb71c8edd2 ChangeLog 644
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 80b60cd4a456eca5830c762a7a64973c bitpim-0.7.34.ebuild 748
+MD5 aa42f5905e2c657512ba5b3efd9f6987 bitpim-0.7.33.ebuild 747
+MD5 c1c1e40c9b27f98d06c189df38c3dd16 ChangeLog 1029
 MD5 cb01270ba9e7d80dcacf2ebbd960653c metadata.xml 553
-MD5 1868bee49ca375890ab4af5f8f95e72f files/digest-bitpim-0.7.27 71
-MD5 b3fdd349f22058da9c83c9571396c119 files/digest-bitpim-0.7.32 71
+MD5 b85ac1cda822a8d92521c1a4ef88f7b4 files/digest-bitpim-0.7.33 71
+MD5 b8b665f807f5a22fd495ace7b8080036 files/digest-bitpim-0.7.34 71
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC4rkKNSP4Vda7IdsRAjvtAJ9otN3LLvqg2aFdPs1f5SOUqYCXPgCeLgUL
+M1ercoGCLf4H2W7C3oW2hIc=
+=fX85
+-----END PGP SIGNATURE-----
diff --git a/app-mobilephone/bitpim/bitpim-0.7.33.ebuild b/app-mobilephone/bitpim/bitpim-0.7.33.ebuild
index 114d1cf002f6..af061fbaab1d 100644
--- a/app-mobilephone/bitpim/bitpim-0.7.33.ebuild
+++ b/app-mobilephone/bitpim/bitpim-0.7.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/app-mobilephone/bitpim/bitpim-0.7.33.ebuild,v 1.1 2005/06/05 09:38:55 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/bitpim-0.7.33.ebuild,v 1.1.1.1 2005/11/30 09:36:33 chriswhite Exp $
 
 inherit eutils rpm
 DESCRIPTION="BitPim is a program that allows you to view and manipulate data on selected cellular phones."
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-0.i386.rpm"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 RESTRICT="${RESTRICT} nostrip"
 DEPEND="sys-libs/lib-compat"
diff --git a/app-mobilephone/bitpim/bitpim-0.7.34.ebuild b/app-mobilephone/bitpim/bitpim-0.7.34.ebuild
index 7fb11af9a03a..581c46b53fd9 100644
--- a/app-mobilephone/bitpim/bitpim-0.7.34.ebuild
+++ b/app-mobilephone/bitpim/bitpim-0.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/app-mobilephone/bitpim/bitpim-0.7.34.ebuild,v 1.1 2005/07/23 21:39:07 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/bitpim-0.7.34.ebuild,v 1.1.1.1 2005/11/30 09:36:33 chriswhite Exp $
 
 inherit eutils rpm
 DESCRIPTION="BitPim is a program that allows you to view and manipulate data on selected cellular phones."
diff --git a/app-mobilephone/esms/ChangeLog b/app-mobilephone/esms/ChangeLog
index 09a0cf61cfe1..b724196a3a60 100644
--- a/app-mobilephone/esms/ChangeLog
+++ b/app-mobilephone/esms/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for app-mobilephone/esms
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/esms/ChangeLog,v 1.1 2005/05/15 19:06:59 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/esms/ChangeLog,v 1.1.1.1 2005/11/30 09:36:33 chriswhite Exp $
 
   15 May 2005; Alin Nastac <mrness@gentoo.org> metadata.xml:
   Moved from net-misc/esms to app-mobilephone/esms.
diff --git a/app-mobilephone/esms/Manifest b/app-mobilephone/esms/Manifest
index c7329b4f665f..1f49f7b62855 100644
--- a/app-mobilephone/esms/Manifest
+++ b/app-mobilephone/esms/Manifest
@@ -1,3 +1,14 @@
-MD5 430eb346ec3e8df370aed1288e9a7076 ChangeLog 1026
-MD5 839866faeddc3ad99a3722de5e960265 esms-0.9.5.ebuild 712
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d4a97d12d8adba47c8549b1569464bd5 esms-0.9.5.ebuild 723
+MD5 cc0cf6ea3360bdc2a31568ca26780a5a ChangeLog 1153
+MD5 cbe72e4afbbdbced9daac497fe349ff7 metadata.xml 275
 MD5 711bc5ec1003ccdfe3d926faeab426ba files/digest-esms-0.9.5 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCh53pjiC39V7gKu0RAt/LAKDYRK6gOq6uZgKMr2/7AlRAwXagNwCgqj8z
+JNbb6/mAqlCcSnBAtA4eoqk=
+=rJp8
+-----END PGP SIGNATURE-----
diff --git a/app-mobilephone/esms/esms-0.9.5.ebuild b/app-mobilephone/esms/esms-0.9.5.ebuild
index f243d8525a97..238a3e3cdb8f 100644
--- a/app-mobilephone/esms/esms-0.9.5.ebuild
+++ b/app-mobilephone/esms/esms-0.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/app-mobilephone/esms/esms-0.9.5.ebuild,v 1.1 2005/05/15 19:06:59 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/esms/esms-0.9.5.ebuild,v 1.1.1.1 2005/11/30 09:36:33 chriswhite Exp $
 
 DESCRIPTION="A small console program to send SMS messages to Spanish cellular phones"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
diff --git a/app-mobilephone/gammu/ChangeLog b/app-mobilephone/gammu/ChangeLog
index ce8e5607db0a..18894fdfaa8c 100644
--- a/app-mobilephone/gammu/ChangeLog
+++ b/app-mobilephone/gammu/ChangeLog
@@ -1,6 +1,28 @@
 # ChangeLog for app-mobilephone/gammu
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/ChangeLog,v 1.1 2005/05/14 12:56:50 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/ChangeLog,v 1.1.1.1 2005/11/30 09:36:33 chriswhite Exp $
+
+  14 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  gammu-1.01.0-r1.ebuild:
+  Stable on ppc.
+
+*gammu-1.02.0 (31 Jul 2005)
+
+  31 Jul 2005; Alin Nastac <mrness@gentoo.org> -gammu-1.00.04.ebuild,
+  gammu-1.01.0-r1.ebuild, +gammu-1.02.0.ebuild:
+  Remove obsolete version. Mark stable on x86. Version bump.
+
+*gammu-1.01.0-r1 (03 Jul 2005)
+
+  03 Jul 2005; Alin Nastac <mrness@gentoo.org>
+  +files/gammu-1.01.0-caller.patch, +gammu-1.01.0-r1.ebuild:
+  Fix problem with caller groups on Nokia 6230 (#97603).
+
+  12 Jun 2005; Lars Weiler <pylon@gentoo.org> gammu-1.01.0.ebuild:
+  Stable on ppc.
+
+  05 Jun 2005; Alin Nastac <mrness@gentoo.org> gammu-1.01.0.ebuild:
+  Stable on x86.
 
   14 May 2005; Alin Nastac <mrness@gentoo.org> metadata.xml:
   Moved from net-dialup/gammu to app-mobilephone/gammu.
diff --git a/app-mobilephone/gammu/Manifest b/app-mobilephone/gammu/Manifest
index f47d256e0349..ced174ca0eba 100644
--- a/app-mobilephone/gammu/Manifest
+++ b/app-mobilephone/gammu/Manifest
@@ -1,6 +1,9 @@
-MD5 4fddd55f7ea7178f3a938cc4dcfabe62 gammu-1.01.0.ebuild 1570
-MD5 e262d8d3006e5f4d78faac996461b796 gammu-1.00.04.ebuild 1522
-MD5 49c859e64107a76d6d31c1fec93463c0 ChangeLog 3206
+MD5 6c95de75bc61252ba025920f0a90675c gammu-1.01.0-r1.ebuild 1655
 MD5 e161c5ddb0e2ddbe68a21690f41e90e1 metadata.xml 227
+MD5 fb97a45b37c30a9a3039d6a95f715ee0 ChangeLog 3886
+MD5 e3e6f3795324467bd398bacc795372f0 gammu-1.01.0.ebuild 1572
+MD5 280865ce2303b62c5cbebaf34a78b9a9 gammu-1.02.0.ebuild 1575
 MD5 fe619bd2a9bf0758cba9ac45162c8758 files/digest-gammu-1.01.0 64
-MD5 bf5ffb3fb824c41689a9cbd8b634cd33 files/digest-gammu-1.00.04 65
+MD5 c99ecf9019c20984a405aeea6c2c6e60 files/gammu-1.01.0-caller.patch 1021
+MD5 fe619bd2a9bf0758cba9ac45162c8758 files/digest-gammu-1.01.0-r1 64
+MD5 468e231ccea93dcde78c5b1d767f6601 files/digest-gammu-1.02.0 64
diff --git a/app-mobilephone/gammu/gammu-1.01.0-r1.ebuild b/app-mobilephone/gammu/gammu-1.01.0-r1.ebuild
index 9f0edb3e505b..09bf25b6781b 100644
--- a/app-mobilephone/gammu/gammu-1.01.0-r1.ebuild
+++ b/app-mobilephone/gammu/gammu-1.01.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/app-mobilephone/gammu/gammu-1.01.0-r1.ebuild,v 1.1 2005/07/03 07:43:27 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.01.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:34 chriswhite Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gammu.net/projects/gammu.php"
 IUSE="bluetooth irda mysql nls ssl"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc x86"
 
 RDEPEND="mysql? ( dev-db/mysql )
 	ssl? ( >=dev-libs/openssl-0.9.7d )
diff --git a/app-mobilephone/gammu/gammu-1.01.0.ebuild b/app-mobilephone/gammu/gammu-1.01.0.ebuild
index 8e2aa4dea564..743ecb934ed7 100644
--- a/app-mobilephone/gammu/gammu-1.01.0.ebuild
+++ b/app-mobilephone/gammu/gammu-1.01.0.ebuild
@@ -1,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-mobilephone/gammu/gammu-1.01.0.ebuild,v 1.1 2005/05/14 12:56:50 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.01.0.ebuild,v 1.1.1.1 2005/11/30 09:36:33 chriswhite Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gammu.net/projects/gammu.php"
 IUSE="bluetooth irda mysql nls ssl"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ppc x86"
 
 RDEPEND="mysql? ( dev-db/mysql )
 	ssl? ( >=dev-libs/openssl-0.9.7d )
diff --git a/app-mobilephone/gammu/gammu-1.02.0.ebuild b/app-mobilephone/gammu/gammu-1.02.0.ebuild
index 61860801f948..558b9b81c8fc 100644
--- a/app-mobilephone/gammu/gammu-1.02.0.ebuild
+++ b/app-mobilephone/gammu/gammu-1.02.0.ebuild
@@ -1,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-mobilephone/gammu/gammu-1.02.0.ebuild,v 1.1 2005/07/31 07:43:46 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.02.0.ebuild,v 1.1.1.1 2005/11/30 09:36:33 chriswhite Exp $
 
 inherit eutils
 
diff --git a/app-mobilephone/gnocky/ChangeLog b/app-mobilephone/gnocky/ChangeLog
index f816c9b971f4..d440db1ff1b9 100644
--- a/app-mobilephone/gnocky/ChangeLog
+++ b/app-mobilephone/gnocky/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for app-mobilephone/gnocky
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnocky/ChangeLog,v 1.1 2005/10/31 10:31:50 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnocky/ChangeLog,v 1.1.1.1 2005/11/30 09:36:32 chriswhite Exp $
 
 *gnocky-0.0.3 (31 Oct 2005)
 
diff --git a/app-mobilephone/gnocky/Manifest b/app-mobilephone/gnocky/Manifest
index e376d407bae5..ae32c0f09353 100644
--- a/app-mobilephone/gnocky/Manifest
+++ b/app-mobilephone/gnocky/Manifest
@@ -1,4 +1,4 @@
-MD5 c7b0e24544b8ca7d7a927b05b7895269 gnocky-0.0.3.ebuild 685
-MD5 848ce79830cbfb619dc0f7fc60b18506 ChangeLog 243
+MD5 deedb86bcb94b3066f54b495cd39fa28 gnocky-0.0.3.ebuild 788
+MD5 216949716e76308ff13223c383a6d7e1 ChangeLog 336
 MD5 8e1fd49c29f85eea8da87d6e7de450c6 metadata.xml 165
 MD5 be5ce77ca97e95646f7c32c26b5c8ea2 files/digest-gnocky-0.0.3 64
diff --git a/app-mobilephone/gnocky/gnocky-0.0.3.ebuild b/app-mobilephone/gnocky/gnocky-0.0.3.ebuild
index 56042547f72c..161d537eef92 100644
--- a/app-mobilephone/gnocky/gnocky-0.0.3.ebuild
+++ b/app-mobilephone/gnocky/gnocky-0.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/app-mobilephone/gnocky/gnocky-0.0.3.ebuild,v 1.1 2005/10/31 10:31:50 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnocky/gnocky-0.0.3.ebuild,v 1.1.1.1 2005/11/30 09:36:32 chriswhite Exp $
 
 DESCRIPTION="GTK-2 version of gnokii"
 HOMEPAGE="http://www.gnokii.org/"
diff --git a/app-mobilephone/gnokii/ChangeLog b/app-mobilephone/gnokii/ChangeLog
index 828ae5d7a551..b7efbbd982c2 100644
--- a/app-mobilephone/gnokii/ChangeLog
+++ b/app-mobilephone/gnokii/ChangeLog
@@ -1,6 +1,97 @@
 # ChangeLog for app-mobilephone/gnokii
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/ChangeLog,v 1.1 2005/05/14 12:28:32 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/ChangeLog,v 1.1.1.1 2005/11/30 09:36:31 chriswhite Exp $
+
+  18 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> gnokii-0.6.8.ebuild:
+  Stable on hppa, ppc.
+
+  15 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> gnokii-0.6.8.ebuild:
+  Stable on sparc
+
+*gnokii-0.6.10 (15 Nov 2005)
+
+  15 Nov 2005; Alin Nastac <mrness@gentoo.org>
+  -files/gnokii-0.6.3-nounix98pty.patch,
+  -files/gnokii-0.6.4-nounix98pty.patch,
+  -files/gnokii-0.6.6-nounix98pty.patch, -gnokii-0.6.3.ebuild,
+  -gnokii-0.6.4.ebuild, -gnokii-0.6.6.ebuild, gnokii-0.6.8.ebuild,
+  +gnokii-0.6.10.ebuild:
+  Remove obsolete versions. Mark version 0.6.8 stable on x86. Version bump
+  (#112566).
+
+  13 Oct 2005; Aron Griffis <agriffis@gentoo.org> gnokii-0.6.7-r1.ebuild:
+  Mark 0.6.7-r1 stable on alpha
+
+*gnokii-0.6.8 (01 Sep 2005)
+
+  01 Sep 2005; Alin Nastac <mrness@gentoo.org>
+  +files/gnokii-0.6.8-smsd-glib2.patch, gnokii-0.6.3.ebuild,
+  gnokii-0.6.4.ebuild, gnokii-0.6.6.ebuild, gnokii-0.6.7-r1.ebuild,
+  gnokii-0.6.7-r2.ebuild, +gnokii-0.6.8.ebuild:
+  Version bump and replace DESCRIPTION (#104269).
+
+*gnokii-0.6.7-r2 (29 Aug 2005)
+
+  29 Aug 2005; Alin Nastac <mrness@gentoo.org> +gnokii-0.6.7-r2.ebuild:
+  Fix lib path for smsd database modules (#104050).
+
+  28 Aug 2005; Luis Medinas <metalgod@gentoo.org> gnokii-0.6.7-r1.ebuild:
+  Marked Stable on AMD64.
+
+  27 Aug 2005; Guy Martin <gmsoft@gentoo.org> gnokii-0.6.7-r1.ebuild:
+  Stable on hppa.
+
+  23 Aug 2005; Aron Griffis <agriffis@gentoo.org> gnokii-0.6.7-r1.ebuild:
+  stable on ia64
+
+  17 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  gnokii-0.6.7-r1.ebuild:
+  Stable on sparc
+
+  31 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  gnokii-0.6.7-r1.ebuild:
+  ppc stable
+
+  24 Jul 2005; Markus Rothe <corsair@gentoo.org> gnokii-0.6.7-r1.ebuild:
+  Stable on ppc64
+
+  24 Jul 2005; Alin Nastac <mrness@gentoo.org> -gnokii-0.6.7.ebuild,
+  gnokii-0.6.7-r1.ebuild:
+  Stable on x86.
+
+*gnokii-0.6.7-r1 (23 Jul 2005)
+
+  23 Jul 2005; Alin Nastac <mrness@gentoo.org>
+  +files/gnokii-0.6.7-smsd-glib2.patch, +gnokii-0.6.7-r1.ebuild:
+  Add dependency of glib-2 for sms daemon (#99950). Disable debug information.
+  Fix path to gnokiid in /etc/gnokiirc.
+
+  21 Jul 2005; Alin Nastac <mrness@gentoo.org> gnokii-0.6.7.ebuild:
+  Stable on x86.
+
+  13 Jun 2005; Jason Wever <weeve@gentoo.org> gnokii-0.6.6.ebuild:
+  Stable on SPARC.
+
+  12 Jun 2005; Lars Weiler <pylon@gentoo.org> gnokii-0.6.6.ebuild:
+  Stable on ppc.
+
+  06 Jun 2005; Markus Rothe <corsair@gentoo.org> gnokii-0.6.6.ebuild:
+  Stable on ppc64
+
+*gnokii-0.6.7 (05 Jun 2005)
+
+  05 Jun 2005; Alin Nastac <mrness@gentoo.org> gnokii-0.6.6.ebuild,
+  +gnokii-0.6.7.ebuild:
+  Stable on x86. Version bump with improved ebuild that checks UNIX 98 pty support.
+
+  19 May 2005; Guy Martin <gmsoft@gentoo.org> gnokii-0.6.4.ebuild:
+  Stable on hppa.
+
+*gnokii-0.6.6 (15 May 2005)
+
+  15 May 2005; Alin Nastac <mrness@gentoo.org>
+  +files/gnokii-0.6.6-nounix98pty.patch, +gnokii-0.6.6.ebuild:
+  Version bump (#92603).
 
   14 May 2005; Alin Nastac <mrness@gentoo.org> metadata.xml:
   Moved from net-dialup/gnokii to app-mobilephone/gnokii.
diff --git a/app-mobilephone/gnokii/Manifest b/app-mobilephone/gnokii/Manifest
index 36b506c0a464..45c7cca5c8f2 100644
--- a/app-mobilephone/gnokii/Manifest
+++ b/app-mobilephone/gnokii/Manifest
@@ -1,10 +1,14 @@
-MD5 a2d1265a24a7fa3a1c1350f65faa1d18 ChangeLog 4469
-MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
-MD5 c2c97c819132f0f422adf7743856b3b8 gnokii-0.6.3.ebuild 2020
-MD5 29c1ce33beced87f26ffc4f70ff23a09 gnokii-0.6.4.ebuild 2157
-MD5 a5368c4063484bca17cb363705d3caa2 files/digest-gnokii-0.6.3 66
-MD5 e7cbb30653687bd875e5eff32b913b6c files/gnokii-0.6.4-nounix98pty.patch 2259
-MD5 2f2f572bc05f2ee40468130dcdd7e946 files/gnokii-bindir.patch 461
+MD5 f596da47ea79f10b846b377ba47a6f2e gnokii-0.6.10.ebuild 2244
+MD5 01ec5e34cbf064fdf9a0862d481b01d9 metadata.xml 467
+MD5 ffccbd7fd2827d1fad4a363e49ddbfe2 ChangeLog 7514
+MD5 3f34b7adb726fab848d8be81e43dde6d gnokii-0.6.8.ebuild 2322
+MD5 cba9a4289ee030177175548bb071572d gnokii-0.6.7-r1.ebuild 2323
+MD5 438e4d861c9041a0b860bf4791a20693 gnokii-0.6.7-r2.ebuild 2329
+MD5 d35a120458debd2931e2c6f67104d9d1 files/gnokii-0.6.7-smsd-glib2.patch 779
 MD5 135df3cf24c3041ccb20a5896482ed59 files/gnokii.desktop 260
-MD5 e99ea660638e47400dc8320ea630d0b8 files/digest-gnokii-0.6.4 66
-MD5 a94c289dfef59e2ddbf2fd186d180f5f files/gnokii-0.6.3-nounix98pty.patch 2258
+MD5 c4cdcbc35ff57082908ea21d7aa1f9a3 files/digest-gnokii-0.6.7-r1 66
+MD5 c4cdcbc35ff57082908ea21d7aa1f9a3 files/digest-gnokii-0.6.7-r2 66
+MD5 95cfd5d1812300781f2310dc007ed33e files/digest-gnokii-0.6.8 66
+MD5 1ae951a2b197095da2c0d74c0067181f files/digest-gnokii-0.6.10 67
+MD5 2f2f572bc05f2ee40468130dcdd7e946 files/gnokii-bindir.patch 461
+MD5 face706c6d0985abc88c5ad34f39d3ee files/gnokii-0.6.8-smsd-glib2.patch 779
diff --git a/app-mobilephone/gnokii/files/gnokii-0.6.7-smsd-glib2.patch b/app-mobilephone/gnokii/files/gnokii-0.6.7-smsd-glib2.patch
index 27b0ae77aef0..efa7059e2b54 100644
--- a/app-mobilephone/gnokii/files/gnokii-0.6.7-smsd-glib2.patch
+++ b/app-mobilephone/gnokii/files/gnokii-0.6.7-smsd-glib2.patch
@@ -2,7 +2,7 @@ diff -Nru gnokii-0.6.7.orig/smsd/Makefile gnokii-0.6.7/smsd/Makefile
 --- gnokii-0.6.7.orig/smsd/Makefile	2005-05-16 21:55:13.000000000 +0300
 +++ gnokii-0.6.7/smsd/Makefile	2005-07-23 12:46:44.410168616 +0300
 @@ -6,14 +6,14 @@
- # $Id: gnokii-0.6.7-smsd-glib2.patch,v 1.1 2005/07/23 10:10:48 mrness Exp $
+ # $Id: gnokii-0.6.7-smsd-glib2.patch,v 1.1.1.1 2005/11/30 09:36:31 chriswhite Exp $
  #
  
 -GLIBCFLAGS = glib-config --cflags
diff --git a/app-mobilephone/gnokii/files/gnokii-0.6.8-smsd-glib2.patch b/app-mobilephone/gnokii/files/gnokii-0.6.8-smsd-glib2.patch
index 27f13712847b..f0f4c25bd9a4 100644
--- a/app-mobilephone/gnokii/files/gnokii-0.6.8-smsd-glib2.patch
+++ b/app-mobilephone/gnokii/files/gnokii-0.6.8-smsd-glib2.patch
@@ -2,7 +2,7 @@ diff -Nru gnokii-0.6.7.orig/smsd/Makefile gnokii-0.6.7/smsd/Makefile
 --- gnokii-0.6.7.orig/smsd/Makefile	2005-05-16 21:55:13.000000000 +0300
 +++ gnokii-0.6.7/smsd/Makefile	2005-07-23 12:46:44.410168616 +0300
 @@ -6,14 +6,14 @@
- # $Id: gnokii-0.6.8-smsd-glib2.patch,v 1.1 2005/09/01 17:01:52 mrness Exp $
+ # $Id: gnokii-0.6.8-smsd-glib2.patch,v 1.1.1.1 2005/11/30 09:36:31 chriswhite Exp $
  #
  
 -GLIBCFLAGS = glib-config --cflags
diff --git a/app-mobilephone/gnokii/gnokii-0.6.10.ebuild b/app-mobilephone/gnokii/gnokii-0.6.10.ebuild
index 58720a2e7dcc..b0b04ebdf03a 100644
--- a/app-mobilephone/gnokii/gnokii-0.6.10.ebuild
+++ b/app-mobilephone/gnokii/gnokii-0.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/app-mobilephone/gnokii/gnokii-0.6.10.ebuild,v 1.1 2005/11/15 05:43:22 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.10.ebuild,v 1.1.1.1 2005/11/30 09:36:30 chriswhite Exp $
 
 inherit eutils flag-o-matic linux-info
 
diff --git a/app-mobilephone/gnokii/gnokii-0.6.7-r1.ebuild b/app-mobilephone/gnokii/gnokii-0.6.7-r1.ebuild
index a51f89c95ee0..6be79ee1ef17 100644
--- a/app-mobilephone/gnokii/gnokii-0.6.7-r1.ebuild
+++ b/app-mobilephone/gnokii/gnokii-0.6.7-r1.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/app-mobilephone/gnokii/gnokii-0.6.7-r1.ebuild,v 1.1 2005/07/23 10:10:48 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.7-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:31 chriswhite Exp $
 
 inherit eutils flag-o-matic linux-info
 
-DESCRIPTION="a client that plugs into your handphone"
+DESCRIPTION="user space driver and tools for use with mobile phones"
 HOMEPAGE="http://www.gnokii.org/"
 SRC_URI="http://www.gnokii.org/download/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="nls X bluetooth irda sms postgres mysql"
 
 RDEPEND="X? ( =x11-libs/gtk+-1.2* )
diff --git a/app-mobilephone/gnokii/gnokii-0.6.7-r2.ebuild b/app-mobilephone/gnokii/gnokii-0.6.7-r2.ebuild
index 4701b243529a..9efd4f1c0344 100644
--- a/app-mobilephone/gnokii/gnokii-0.6.7-r2.ebuild
+++ b/app-mobilephone/gnokii/gnokii-0.6.7-r2.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/app-mobilephone/gnokii/gnokii-0.6.7-r2.ebuild,v 1.1 2005/08/29 06:23:33 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.7-r2.ebuild,v 1.1.1.1 2005/11/30 09:36:30 chriswhite Exp $
 
 inherit eutils flag-o-matic linux-info
 
-DESCRIPTION="a client that plugs into your handphone"
+DESCRIPTION="user space driver and tools for use with mobile phones"
 HOMEPAGE="http://www.gnokii.org/"
 SRC_URI="http://www.gnokii.org/download/${PN}/${P}.tar.bz2"
 
diff --git a/app-mobilephone/gnokii/gnokii-0.6.8.ebuild b/app-mobilephone/gnokii/gnokii-0.6.8.ebuild
index 297fc9bdf78f..d76b54ab92d0 100644
--- a/app-mobilephone/gnokii/gnokii-0.6.8.ebuild
+++ b/app-mobilephone/gnokii/gnokii-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/app-mobilephone/gnokii/gnokii-0.6.8.ebuild,v 1.1 2005/09/01 17:01:52 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.8.ebuild,v 1.1.1.1 2005/11/30 09:36:30 chriswhite Exp $
 
 inherit eutils flag-o-matic linux-info
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.gnokii.org/download/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 hppa ~ia64 ppc ~ppc64 sparc x86"
 IUSE="nls X bluetooth irda sms postgres mysql"
 
 RDEPEND="X? ( =x11-libs/gtk+-1.2* )
diff --git a/app-mobilephone/gnome-phone-manager/ChangeLog b/app-mobilephone/gnome-phone-manager/ChangeLog
index f431143d31b1..2c93d26aec36 100644
--- a/app-mobilephone/gnome-phone-manager/ChangeLog
+++ b/app-mobilephone/gnome-phone-manager/ChangeLog
@@ -1,8 +1,20 @@
 # ChangeLog for app-mobilephone/gnome-phone-manager
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnome-phone-manager/ChangeLog,v 1.1 2005/05/14 12:07:02 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnome-phone-manager/ChangeLog,v 1.1.1.1 2005/11/30 09:36:30 chriswhite Exp $
 
-*gnome-phone-manager-0.4 (14 May 2005)
+  19 Sep 2005; Alin Nastac <mrness@gentoo.org> metadata.xml,
+  gnome-phone-manager-0.4.ebuild, gnome-phone-manager-0.6.ebuild:
+  Update descriptions.
+
+*gnome-phone-manager-0.6 (10 Sep 2005)
+
+  10 Sep 2005; Carlos Silva <r3pek@gentoo.org>
+  +gnome-phone-manager-0.6.ebuild:
+  Version bump. Thx to Octavio Ruiz on bug #105423
+
+  21 Jul 2005; Alin Nastac <mrness@gentoo.org>
+  gnome-phone-manager-0.4.ebuild:
+  Stable on x86.
 
   14 May 2005; Alin Nastac <mrness@gentoo.org> metadata.xml:
   Moved from net-wireless/gnome-phone-manager to
diff --git a/app-mobilephone/gnome-phone-manager/Manifest b/app-mobilephone/gnome-phone-manager/Manifest
index a47106608b42..d6e36dd84aea 100644
--- a/app-mobilephone/gnome-phone-manager/Manifest
+++ b/app-mobilephone/gnome-phone-manager/Manifest
@@ -1,15 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 969ae0a9ea4640112bafb741a2872e4a gnome-phone-manager-0.4.ebuild 1088
-MD5 8c43b33f52e41192df9cc9b86e49fc42 ChangeLog 454
-MD5 6d73e398d4fdd67bce3170c83a79e8c7 metadata.xml 333
+MD5 1c0c23eb1108e350a24b041003f915e7 gnome-phone-manager-0.6.ebuild 1016
+MD5 c1a736ceddb52dbb731859e5a9d7b619 gnome-phone-manager-0.4.ebuild 1075
+MD5 c2c09ae7be17d094c321ae2ff261114a ChangeLog 1034
+MD5 8e68d11b191a36c6430cb32308a182c4 metadata.xml 735
 MD5 2f647a87b3c98a511f73c6e0408a2b9e files/gnome-phone-manager-0.4-gcc3.patch 1652
 MD5 50541bea837f45b13e29485e70bb06a3 files/digest-gnome-phone-manager-0.4 75
+MD5 596786c32d3fc69b6689d77546e49a52 files/digest-gnome-phone-manager-0.6 76
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCfgtejiC39V7gKu0RAo76AJ4tRFVhXtr5++QhBx8wuQ/vXmIPJACcD0sw
-UKfbuijGH+J6/S76/07T9ZM=
-=OHMf
+iD8DBQFDLx73NSP4Vda7IdsRAp/1AKCLCs6W8xfMVh4bamJMkRCe0RR+cACeKjsJ
+hEHIr6Lx/7AQo95+ZbntR2I=
+=FKdf
 -----END PGP SIGNATURE-----
diff --git a/app-mobilephone/gnome-phone-manager/gnome-phone-manager-0.4.ebuild b/app-mobilephone/gnome-phone-manager/gnome-phone-manager-0.4.ebuild
index 073952c5b38b..9838609a40a3 100644
--- a/app-mobilephone/gnome-phone-manager/gnome-phone-manager-0.4.ebuild
+++ b/app-mobilephone/gnome-phone-manager/gnome-phone-manager-0.4.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/app-mobilephone/gnome-phone-manager/gnome-phone-manager-0.4.ebuild,v 1.1 2005/05/14 12:07:02 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnome-phone-manager/gnome-phone-manager-0.4.ebuild,v 1.1.1.1 2005/11/30 09:36:30 chriswhite Exp $
 
 inherit gnome2 eutils
 
-DESCRIPTION="Gnome Phone Manager - a program created to allow you to control aspects of your mobile phone from your GNOME 2 desktop"
+DESCRIPTION="a program created to allow you to control aspects of your mobile phone from your GNOME 2 desktop"
 HOMEPAGE="http://usefulinc.com/software/phonemgr/"
 SRC_URI="http://downloads.usefulinc.com/gnome-phone-manager/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
 RDEPEND=">=gnome-base/libgnomeui-2
@@ -20,7 +20,7 @@ RDEPEND=">=gnome-base/libgnomeui-2
 	>=dev-libs/glib-2
 	=dev-libs/libsigc++-1.2.5
 	>=gnome-base/orbit-2
-	>=net-misc/gsmlib-1.11_pre041028
+	>=app-mobilephone/gsmlib-1.11_pre041028
 	>=net-wireless/bluez-libs-2
 	>=net-wireless/libbtctl-0.4.1
 	>=net-wireless/gnome-bluetooth-0.5.1"
diff --git a/app-mobilephone/gnome-phone-manager/gnome-phone-manager-0.6.ebuild b/app-mobilephone/gnome-phone-manager/gnome-phone-manager-0.6.ebuild
index e9f91ef11cc0..c362a91d2cb1 100644
--- a/app-mobilephone/gnome-phone-manager/gnome-phone-manager-0.6.ebuild
+++ b/app-mobilephone/gnome-phone-manager/gnome-phone-manager-0.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/app-mobilephone/gnome-phone-manager/gnome-phone-manager-0.6.ebuild,v 1.1 2005/09/10 01:59:52 r3pek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnome-phone-manager/gnome-phone-manager-0.6.ebuild,v 1.1.1.1 2005/11/30 09:36:30 chriswhite Exp $
 
 inherit gnome2 eutils
 
-DESCRIPTION="Gnome Phone Manager - a program created to allow you to control aspects of your mobile phone from your GNOME 2 desktop"
+DESCRIPTION="a program created to allow you to control aspects of your mobile phone from your GNOME 2 desktop"
 HOMEPAGE="http://usefulinc.com/software/phonemgr/"
 SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/${PN}/${PV}/${P}.tar.bz2 "
 
diff --git a/app-mobilephone/gnome-phone-manager/metadata.xml b/app-mobilephone/gnome-phone-manager/metadata.xml
index cb69bd8bf515..17ec3724c898 100644
--- a/app-mobilephone/gnome-phone-manager/metadata.xml
+++ b/app-mobilephone/gnome-phone-manager/metadata.xml
@@ -1,8 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version = '1.0' encoding = 'UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>mobile-phone</herd>
-<herd>gnome</herd>
-<longdescription>Phone Manager is a program created to allow you 
-to control aspects of your mobile phone from your GNOME 2 desktop.</longdescription>
+  <herd>mobile-phone</herd>
+  <herd>gnome</herd>
+  <longdescription>Phone Manager is a program created to allow you to control aspects 
+of your mobile phone from your GNOME 2 desktop.
+
+The software is in its early stages right now. Current features include:
+    * Runs in the background; indicates status on the panel notification area.
+    * Display on-screen alert when text message (SMS) arrives
+    * Text message (SMS) sending facility
+
+Phone Manager supports any mobile phone that can connect to your 
+computer as a serial port: via Bluetooth, IrDA or a serial cable.</longdescription>
 </pkgmetadata>
diff --git a/app-mobilephone/gscmxx/ChangeLog b/app-mobilephone/gscmxx/ChangeLog
index f514437a2031..3728fcacf4f0 100644
--- a/app-mobilephone/gscmxx/ChangeLog
+++ b/app-mobilephone/gscmxx/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for app-mobilephone/gscmxx
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gscmxx/ChangeLog,v 1.1 2005/05/14 13:33:53 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gscmxx/ChangeLog,v 1.1.1.1 2005/11/30 09:36:31 chriswhite Exp $
 
   14 May 2005; Alin Nastac <mrness@gentoo.org> metadata.xml:
   Moved from app-misc/gscmxx to app-mobilephone/gscmxx.
diff --git a/app-mobilephone/gscmxx/Manifest b/app-mobilephone/gscmxx/Manifest
index 911de425fe26..b799a5d2465c 100644
--- a/app-mobilephone/gscmxx/Manifest
+++ b/app-mobilephone/gscmxx/Manifest
@@ -1,5 +1,15 @@
-MD5 eb4d26962abb387cbc8577216edc401a gscmxx-0.4.1-r1.ebuild 706
-MD5 f4bc0f90cb1a0ff279c234eb836ecff8 ChangeLog 775
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 afbef8e54603db97c5af137627ad5541 gscmxx-0.4.1-r1.ebuild 709
+MD5 135256445a5e1d60a6caf186eb22e580 ChangeLog 785
 MD5 c35c6d9f49648e8eb52bf68909198daf metadata.xml 302
 MD5 62f7e7930d956c070529d31e45a336c6 files/gscmxx-0.4.1-destdir.diff 725
 MD5 1f985a2bf92e357217a41807927bd4d9 files/digest-gscmxx-0.4.1-r1 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFChf5SjiC39V7gKu0RAsiSAKCF+ED3sivyKBwzEUv2ekyb5puA9gCaArev
+vtx4MvuiW7jSuvCf/sGAZPY=
+=WQlB
+-----END PGP SIGNATURE-----
diff --git a/app-mobilephone/gscmxx/gscmxx-0.4.1-r1.ebuild b/app-mobilephone/gscmxx/gscmxx-0.4.1-r1.ebuild
index 6994271a8ee3..90df1e728028 100644
--- a/app-mobilephone/gscmxx/gscmxx-0.4.1-r1.ebuild
+++ b/app-mobilephone/gscmxx/gscmxx-0.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/app-mobilephone/gscmxx/gscmxx-0.4.1-r1.ebuild,v 1.1 2005/05/14 13:33:53 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gscmxx/gscmxx-0.4.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:31 chriswhite Exp $
 
 inherit perl-module eutils
 
diff --git a/app-mobilephone/gsmlib/ChangeLog b/app-mobilephone/gsmlib/ChangeLog
index d700605d35ca..70aab8f9aa2f 100644
--- a/app-mobilephone/gsmlib/ChangeLog
+++ b/app-mobilephone/gsmlib/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for app-mobilephone/gsmlib
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gsmlib/ChangeLog,v 1.1 2005/05/15 20:19:12 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gsmlib/ChangeLog,v 1.1.1.1 2005/11/30 09:36:30 chriswhite Exp $
+
+  17 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  gsmlib-1.11_pre041028.ebuild:
+  Stable on sparc
+
+  31 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  gsmlib-1.11_pre041028.ebuild:
+  ppc stable
+
+  21 Jul 2005; Alin Nastac <mrness@gentoo.org> gsmlib-1.11_pre041028.ebuild:
+  Stable on x86.
+
+  12 Jun 2005; Lars Weiler <pylon@gentoo.org> gsmlib-1.11_pre030826.ebuild:
+  Stable on ppc.
 
   15 May 2005; Alin Nastac <mrness@gentoo.org>
   -files/gsmlib-1.10-fd-leak-fix.patch, -files/gsmlib-1.10-include-fix.patch,
diff --git a/app-mobilephone/gsmlib/Manifest b/app-mobilephone/gsmlib/Manifest
index 60fec6ba9c4b..0054a4281e70 100644
--- a/app-mobilephone/gsmlib/Manifest
+++ b/app-mobilephone/gsmlib/Manifest
@@ -1,21 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 e384a04224c9727632f738c20aaad078 ChangeLog 1598
-MD5 dca6d30eae54d4c3d18befa3f2995c12 gsmlib-1.10.ebuild 592
-MD5 f85fd6cb65cc82899fa3645722085870 gsmlib-1.11_pre030826.ebuild 808
-MD5 a53f0ed8435cda3e9150e994afe7a269 metadata.xml 301
-MD5 5525709bb44a7b8029f8a96c524525b0 gsmlib-1.11_pre041028.ebuild 846
-MD5 ca07bc08da15e439dfee58227b2255f5 files/digest-gsmlib-1.10 63
+MD5 ede64d111ad9daedeb8b34b0d655b716 gsmlib-1.11_pre030826.ebuild 811
+MD5 000da42d4ab1227504f2505b02064951 metadata.xml 254
+MD5 7d26b4ade36bb8155f0c3cfef600655b gsmlib-1.10.ebuild 600
+MD5 b3cc0d8a91cf7adbc794a1f7905ecd86 gsmlib-1.11_pre041028.ebuild 847
+MD5 12b52250c17d03ccbff8b96e1daef8d8 ChangeLog 2206
+MD5 40a642b1fa81b93d94d9ada2cada37d0 files/digest-gsmlib-1.11_pre041028 73
 MD5 9358266ac12314de9a89dc071fbd6485 files/digest-gsmlib-1.11_pre030826 73
-MD5 2ce7eeb6838e5b5a1f2f41889a23c1bd files/gsmlib-1.10-fd-leak-fix.patch 2318
-MD5 6829c61b804c994593a2f679065225a0 files/gsmlib-1.10-include-fix.patch 407
 MD5 5cf9803b268e78717cf97deb06f9a2ce files/gsmlib-1.11-include-gcc34-fix.patch 1436
-MD5 40a642b1fa81b93d94d9ada2cada37d0 files/digest-gsmlib-1.11_pre041028 73
+MD5 ca07bc08da15e439dfee58227b2255f5 files/digest-gsmlib-1.10 63
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
+Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFB96ixRkyva5PS18kRAjxMAJ96ry/dFPBUMWxFtgGGmfNggxEzTwCfXqI4
-Mgb4DME7jT3qRphspRZS35U=
-=pP6W
+iD8DBQFDAzhFKRy60XGEcJIRAlX6AJ9TMIxknptfKzYeqscYfQepKqsCRgCgoahm
+8MUGZkJAoo1dteCCmdJ7Oxw=
+=JFm2
 -----END PGP SIGNATURE-----
diff --git a/app-mobilephone/gsmlib/gsmlib-1.10.ebuild b/app-mobilephone/gsmlib/gsmlib-1.10.ebuild
index 7a2ff585f7ac..807b00b94667 100644
--- a/app-mobilephone/gsmlib/gsmlib-1.10.ebuild
+++ b/app-mobilephone/gsmlib/gsmlib-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/app-mobilephone/gsmlib/gsmlib-1.10.ebuild,v 1.1 2005/05/15 20:19:12 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gsmlib/gsmlib-1.10.ebuild,v 1.1.1.1 2005/11/30 09:36:30 chriswhite Exp $
 
 IUSE=""
 DESCRIPTION="Library and Applications to access GSM mobile phones"
diff --git a/app-mobilephone/gsmlib/gsmlib-1.11_pre030826.ebuild b/app-mobilephone/gsmlib/gsmlib-1.11_pre030826.ebuild
index 0b452f7a2d0c..5c2635180c5c 100644
--- a/app-mobilephone/gsmlib/gsmlib-1.11_pre030826.ebuild
+++ b/app-mobilephone/gsmlib/gsmlib-1.11_pre030826.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/app-mobilephone/gsmlib/gsmlib-1.11_pre030826.ebuild,v 1.1 2005/05/15 20:19:12 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gsmlib/gsmlib-1.11_pre030826.ebuild,v 1.1.1.1 2005/11/30 09:36:30 chriswhite Exp $
 
 inherit eutils
 
-RESTRICT="maketest"
+RESTRICT="test"
 
 MY_A=${PN}-pre${PV%_pre*}-${PV#*_pre}
 
@@ -17,7 +17,7 @@ DEPEND=""
 IUSE=""
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="x86 ~ppc sparc ~amd64"
+KEYWORDS="~amd64 ppc sparc x86"
 
 S=${WORKDIR}/${PN}-${PV%_pre*}
 
diff --git a/app-mobilephone/gsmlib/gsmlib-1.11_pre041028.ebuild b/app-mobilephone/gsmlib/gsmlib-1.11_pre041028.ebuild
index 8611fcc2f071..af92056902ba 100644
--- a/app-mobilephone/gsmlib/gsmlib-1.11_pre041028.ebuild
+++ b/app-mobilephone/gsmlib/gsmlib-1.11_pre041028.ebuild
@@ -1,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-mobilephone/gsmlib/gsmlib-1.11_pre041028.ebuild,v 1.1 2005/05/15 20:19:12 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gsmlib/gsmlib-1.11_pre041028.ebuild,v 1.1.1.1 2005/11/30 09:36:30 chriswhite Exp $
 
 inherit eutils
 
@@ -15,9 +15,9 @@ DEPEND=""
 IUSE=""
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="~amd64 ppc sparc x86"
 
-RESTRICT="maketest"
+RESTRICT="test"
 
 S=${WORKDIR}/${PN}-${PV%_pre*}
 
diff --git a/app-mobilephone/gtkesms/ChangeLog b/app-mobilephone/gtkesms/ChangeLog
index 2294d98a3538..33d5aa155ebb 100644
--- a/app-mobilephone/gtkesms/ChangeLog
+++ b/app-mobilephone/gtkesms/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for app-mobilephone/gtkesms
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gtkesms/ChangeLog,v 1.1 2005/05/15 19:07:54 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gtkesms/ChangeLog,v 1.1.1.1 2005/11/30 09:36:32 chriswhite Exp $
 
   15 May 2005; Alin Nastac <mrness@gentoo.org> metadata.xml:
   Moved from net-misc/gtkesms to app-mobilephone/gtkesms.
@@ -22,8 +22,8 @@
   01 Jun 2002; Bruce A. Locke <blocke@shivan.org> gtkems-0.0.4.ebuild:
   GTK+ dependency fix
 
-  26 May 2002; J.Alberto S.L. <bass@gentoo.org> gtkesms-0.0.4.ebuild:
-  First relase.
-
   31 May 2002;  J.Alberto S.L. <bass@gentoo.org> gtkesms-0.0.4.ebuild:
   Fixed problem with gtk.
+
+  26 May 2002; J.Alberto S.L. <bass@gentoo.org> gtkesms-0.0.4.ebuild:
+  First relase.
diff --git a/app-mobilephone/gtkesms/Manifest b/app-mobilephone/gtkesms/Manifest
index ec06afac17ed..badf74a37b2e 100644
--- a/app-mobilephone/gtkesms/Manifest
+++ b/app-mobilephone/gtkesms/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f6b5a6bdea2dad3fd160b04d590c09af ChangeLog 882
-MD5 921be86a1205eaf8734b1f3eb8a4ddc7 gtkesms-0.0.4.ebuild 754
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 dd89b19cdda5acd35bfc38f6422f01bc files/digest-gtkesms-0.0.4 64
+MD5 781e66293c33d6542222a165e66aae52 gtkesms-0.0.4.ebuild 763
+MD5 861e83a452630913865ae7a02037b16f ChangeLog 1014
+MD5 14bca528d849f80ae3eda3901c681187 metadata.xml 237
 MD5 ff8adaa49e9d9b1bf5eaf03a313a0762 files/gtkesms.patch 578
+MD5 dd89b19cdda5acd35bfc38f6422f01bc files/digest-gtkesms-0.0.4 64
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFBXsuxI1lqEGTUzyQRAickAJ4m6t6dzjDW11WShQJpMNErTKoG1gCfd3OU
-pgff4Gb7TfKnuwdp1b6IJrk=
-=ckAv
+iD8DBQFCoum3jiC39V7gKu0RAq9GAJ9WZn1KO6DnJ3Y80Wy6ZGLl9TzdwQCeOq9Y
+5fuewK+XfwVBDuNXYjDZPSA=
+=NVLo
 -----END PGP SIGNATURE-----
diff --git a/app-mobilephone/gtkesms/gtkesms-0.0.4.ebuild b/app-mobilephone/gtkesms/gtkesms-0.0.4.ebuild
index 21b645b0eab3..338e88575ea9 100644
--- a/app-mobilephone/gtkesms/gtkesms-0.0.4.ebuild
+++ b/app-mobilephone/gtkesms/gtkesms-0.0.4.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/app-mobilephone/gtkesms/gtkesms-0.0.4.ebuild,v 1.1 2005/05/15 19:07:54 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gtkesms/gtkesms-0.0.4.ebuild,v 1.1.1.1 2005/11/30 09:36:32 chriswhite Exp $
 
 DESCRIPTION="GTK GUI for esms"
 SRC_URI="mirror://sourceforge/esms/${P}.tar.gz"
 HOMEPAGE="http://esms.sourceforge.net"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc "
+KEYWORDS="x86 sparc"
 IUSE=""
 DEPEND="=x11-libs/gtk+-1.2*
 		dev-perl/gtk-perl
diff --git a/app-mobilephone/kannel/ChangeLog b/app-mobilephone/kannel/ChangeLog
index f75dfbe662a2..33b06855a5d1 100644
--- a/app-mobilephone/kannel/ChangeLog
+++ b/app-mobilephone/kannel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-mobilephone/kannel
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kannel/ChangeLog,v 1.1 2005/05/16 22:05:25 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kannel/ChangeLog,v 1.1.1.1 2005/11/30 09:36:32 chriswhite Exp $
+
+  23 Oct 2005; Konstantin Arkhipov <voxus@gentoo.org> kannel-1.4.0.ebuild:
+  Added to ~amd64.
+
+  05 Jun 2005; Alin Nastac <mrness@gentoo.org> kannel-1.4.0.ebuild:
+  Stable on x86.
 
 *kannel-1.4.0 (16 May 2005)
 
diff --git a/app-mobilephone/kannel/Manifest b/app-mobilephone/kannel/Manifest
index 9ad82bd6285e..5a2a4164d548 100644
--- a/app-mobilephone/kannel/Manifest
+++ b/app-mobilephone/kannel/Manifest
@@ -1,5 +1,6 @@
-MD5 8e6557d777542beebd0e35c01bdc156c metadata.xml 389
-MD5 282f33428ea1f1567703030f6c463378 kannel-1.4.0.ebuild 2091
+MD5 6937888d37c0507690a2c62479eb2c62 ChangeLog 589
 MD5 a7c05f05df99dd759d119b393cbe59e0 files/digest-kannel-1.4.0 66
 MD5 b77f55cded4c364d155c302e81eb07c6 files/kannel-confd 366
 MD5 0b79d37344165b8743061f68a18959ce files/kannel-initd 1529
+MD5 5eaf56bd451ab3d093761e2781699344 kannel-1.4.0.ebuild 2220
+MD5 8e6557d777542beebd0e35c01bdc156c metadata.xml 389
diff --git a/app-mobilephone/kannel/kannel-1.4.0.ebuild b/app-mobilephone/kannel/kannel-1.4.0.ebuild
index b65183295f16..861e75142f87 100644
--- a/app-mobilephone/kannel/kannel-1.4.0.ebuild
+++ b/app-mobilephone/kannel/kannel-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/app-mobilephone/kannel/kannel-1.4.0.ebuild,v 1.1 2005/05/16 22:05:25 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kannel/kannel-1.4.0.ebuild,v 1.1.1.1 2005/11/30 09:36:32 chriswhite Exp $
 inherit eutils
 
 DESCRIPTION="Powerful SMS and WAP gateway"
@@ -9,7 +9,7 @@ SRC_URI="http://www.kannel.org/download/${PV}/gateway-${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 x86"
 IUSE="ssl mysql sqlite postgres pcre doc debug pam"
 
 RDEPEND="virtual/libc
@@ -30,6 +30,11 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/gateway-${PV}
 
+pkg_setup() {
+	enewgroup kannel
+	enewuser kannel -1 -1 /var/log/kannel kannel
+}
+
 src_unpack() {
 	unpack ${A}
 
@@ -37,7 +42,7 @@ src_unpack() {
 	#by default, use current directory for logging
 	sed -i -e 's:/tmp/::' doc/examples/kannel.conf
 	#correct doc path
-	sed -i -e "s:share/doc/kannel:share/doc/${PF}:" configure configure.in
+	sed -i -e "s:share/doc/kannel:share/doc/${P}:" configure configure.in
 }
 
 src_compile() {
@@ -57,9 +62,8 @@ src_compile() {
 	emake || die "emake failed"
 }
 
-pkg_preinst() {
-	enewgroup kannel
-	enewuser kannel -1 /bin/false /var/log/kannel kannel
+src_test() {
+	make check || die "make check failed"
 }
 
 src_install() {
@@ -84,6 +88,6 @@ src_install() {
 	newins ${FILESDIR}/kannel-confd kannel
 }
 
-src_test() {
-	make check || die "make check failed"
+pkg_preinst() {
+	pkg_setup
 }
diff --git a/app-mobilephone/kmobiletools/ChangeLog b/app-mobilephone/kmobiletools/ChangeLog
index 65944bb03969..7aa7fa4a1a82 100644
--- a/app-mobilephone/kmobiletools/ChangeLog
+++ b/app-mobilephone/kmobiletools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-mobilephone/kmobiletools
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kmobiletools/ChangeLog,v 1.1 2005/05/16 18:04:50 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kmobiletools/ChangeLog,v 1.1.1.1 2005/11/30 09:36:32 chriswhite Exp $
+
+  05 Jun 2005; Alin Nastac <mrness@gentoo.org> kmobiletools-0.4.3.1.ebuild:
+  Stable on x86.
+
+  02 Jun 2005; Marcus D. Hanwell <marcus@gentoo.org>
+  kmobiletools-0.4.3.1.ebuild:
+  Marked ~amd64, closes bug 94845.
 
   16 May 2005; Alin Nastac <mrness@gentoo.org> metadata.xml:
   Moved from kde-misc/kmobiletools to app-mobilephone/kmobiletools.
diff --git a/app-mobilephone/kmobiletools/Manifest b/app-mobilephone/kmobiletools/Manifest
index 5fc811bf77f5..2d4f1ba77e1d 100644
--- a/app-mobilephone/kmobiletools/Manifest
+++ b/app-mobilephone/kmobiletools/Manifest
@@ -1,10 +1,4 @@
-MD5 1654ab372fb9606c474ace14feecca76 kmobiletools-0.4.3.1.ebuild 530
-MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-MD5 6997499891ea4fe72dc241f395d360b8 kmobiletools-0.4.1.ebuild 523
-MD5 8da6f06f60345e526396ba2162e57e90 kmobiletools-0.4.2.ebuild 527
-MD5 b4481be6517b6baa0f9767483f65c693 ChangeLog 1074
-MD5 7ca1c14204bd1221c62e5dbc72c0b785 kmobiletools-0.4.0.ebuild 521
-MD5 397f64c4fa66082c9be34c09235e8b0d files/digest-kmobiletools-0.4.0 71
+MD5 fde1eb8ace7b1556d37f2ec764075984 kmobiletools-0.4.3.1.ebuild 543
+MD5 1ac8d8cc2a0fdd0d3aab66d6d48d1cb0 metadata.xml 451
+MD5 ccdbe9600c6ade799d4b05d457a6ab9b ChangeLog 1432
 MD5 72fcd91701a563504359dc4a4d6cf8bf files/digest-kmobiletools-0.4.3.1 73
-MD5 2f0e7ccea2f63261c97a532fae6c2571 files/digest-kmobiletools-0.4.2 71
-MD5 ee486024ea07a16276e7f51ba1f99e84 files/digest-kmobiletools-0.4.1 71
diff --git a/app-mobilephone/kmobiletools/kmobiletools-0.4.3.1.ebuild b/app-mobilephone/kmobiletools/kmobiletools-0.4.3.1.ebuild
index 49ca81ff1941..6fc982d14292 100644
--- a/app-mobilephone/kmobiletools/kmobiletools-0.4.3.1.ebuild
+++ b/app-mobilephone/kmobiletools/kmobiletools-0.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/app-mobilephone/kmobiletools/kmobiletools-0.4.3.1.ebuild,v 1.1 2005/05/16 18:04:50 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kmobiletools/kmobiletools-0.4.3.1.ebuild,v 1.1.1.1 2005/11/30 09:36:32 chriswhite Exp $
 
 inherit kde
 
@@ -10,6 +10,6 @@ HOMEPAGE="http://kmobiletools.berlios.de/"
 LICENSE="GPL-2"
 
 IUSE=""
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~amd64 ~ppc x86"
 
 need-kde 3.2
diff --git a/app-mobilephone/ksms/ChangeLog b/app-mobilephone/ksms/ChangeLog
index 7525f37ab851..5d1d4d8f5e70 100644
--- a/app-mobilephone/ksms/ChangeLog
+++ b/app-mobilephone/ksms/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for app-mobilephone/ksms
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/ksms/ChangeLog,v 1.1 2005/05/15 20:20:52 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/ksms/ChangeLog,v 1.1.1.1 2005/11/30 09:36:34 chriswhite Exp $
 
   15 May 2005; Alin Nastac <mrness@gentoo.org> metadata.xml:
   Moved from net-misc/ksms to app-mobilephone/ksms.
diff --git a/app-mobilephone/ksms/Manifest b/app-mobilephone/ksms/Manifest
index b912f237cdba..e2fb1794d9aa 100644
--- a/app-mobilephone/ksms/Manifest
+++ b/app-mobilephone/ksms/Manifest
@@ -1,5 +1,15 @@
-MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-MD5 0c6ecca2624f7fed5cbc2ad85ebf1525 ChangeLog 967
-MD5 8fd4cbbb8c69930278b94308cf01b8d5 ksms-0.1.2.4.ebuild 620
-MD5 ecc65f8ac26e4ac07e86386738599bdb files/digest-ksms-0.1.2.4 64
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d66ee50306dea64ba89dff80e7ee0d9f ChangeLog 1096
+MD5 0b7ac24556163e9422de8a1bf294bc9d ksms-0.1.2.4.ebuild 635
+MD5 0aaa351977f37d9091c513d1cffbc903 metadata.xml 305
 MD5 0a133a035198c2b1b93889e64ae59428 files/ksms-0.1.2.4-empty-store.diff 1146
+MD5 ecc65f8ac26e4ac07e86386738599bdb files/digest-ksms-0.1.2.4 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCh687jiC39V7gKu0RAmgHAJ0dheRAN7Rz1Z31MUbGgIuImoTPNgCg2aGN
+AOLoWVfuGDV4bnZxkhsCCeg=
+=IhS4
+-----END PGP SIGNATURE-----
diff --git a/app-mobilephone/ksms/ksms-0.1.2.4.ebuild b/app-mobilephone/ksms/ksms-0.1.2.4.ebuild
index a243c0af33ea..696d9f2fc724 100644
--- a/app-mobilephone/ksms/ksms-0.1.2.4.ebuild
+++ b/app-mobilephone/ksms/ksms-0.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/app-mobilephone/ksms/ksms-0.1.2.4.ebuild,v 1.1 2005/05/15 20:20:52 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/ksms/ksms-0.1.2.4.ebuild,v 1.1.1.1 2005/11/30 09:36:34 chriswhite Exp $
 
 inherit kde
 
diff --git a/app-mobilephone/linuxsms/ChangeLog b/app-mobilephone/linuxsms/ChangeLog
index 85b2d5916990..5eac7cd002b6 100644
--- a/app-mobilephone/linuxsms/ChangeLog
+++ b/app-mobilephone/linuxsms/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for app-mobilephone/linuxsms
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/linuxsms/ChangeLog,v 1.1 2005/05/15 18:49:12 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/linuxsms/ChangeLog,v 1.1.1.1 2005/11/30 09:36:32 chriswhite Exp $
 
   15 May 2005; Alin Nastac <mrness@gentoo.org> metadata.xml:
   Moved from net-misc/linuxsms to app-mobilephone/linuxsms.
diff --git a/app-mobilephone/linuxsms/Manifest b/app-mobilephone/linuxsms/Manifest
index c43d399934ac..98f845e48f18 100644
--- a/app-mobilephone/linuxsms/Manifest
+++ b/app-mobilephone/linuxsms/Manifest
@@ -1,4 +1,14 @@
-MD5 026bf37975edc0cd62c10f023c76c9dc linuxsms-0.77.ebuild 583
-MD5 26356ede614ce6e46417f6856abde006 ChangeLog 1128
-MD5 b8134f819cef7e1b81d1ad74886678d7 metadata.xml 289
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ad08a8166b15d87cf85a2b18ffecb7cf linuxsms-0.77.ebuild 621
+MD5 04f13487bfae67406b2518413d511ce0 ChangeLog 1133
+MD5 4f0ad530646bf9f95973ec0161c9ef2e metadata.xml 298
 MD5 e78ea98f264ac99405ecf93094d82e77 files/digest-linuxsms-0.77 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCh5wCjiC39V7gKu0RAnfgAKDAiAu2pynNWetNGkRWbMj4e9gm0ACfZhKl
+hV8WRvXE+ICuahOpA9ag+Nw=
+=+WOF
+-----END PGP SIGNATURE-----
diff --git a/app-mobilephone/linuxsms/linuxsms-0.77.ebuild b/app-mobilephone/linuxsms/linuxsms-0.77.ebuild
index 2f0af1423484..974ccfb91e48 100644
--- a/app-mobilephone/linuxsms/linuxsms-0.77.ebuild
+++ b/app-mobilephone/linuxsms/linuxsms-0.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/app-mobilephone/linuxsms/linuxsms-0.77.ebuild,v 1.1 2005/05/15 18:49:12 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/linuxsms/linuxsms-0.77.ebuild,v 1.1.1.1 2005/11/30 09:36:32 chriswhite Exp $
 
 DESCRIPTION="A console perl script for sending SMS to cell phones"
 HOMEPAGE="http://linuxsms.sourceforge.net/"
@@ -14,7 +14,7 @@ IUSE=""
 DEPEND=">=dev-lang/perl-5.6.1"
 
 src_install() {
-	dobin linuxsms || die
+	dobin linuxsms || die "could not install the script"
 	doman linuxsms.1
 	dodoc BUGS CHANGES README README.ES TODO
 }
diff --git a/app-mobilephone/linuxsms/metadata.xml b/app-mobilephone/linuxsms/metadata.xml
index 316a3bb5c443..b8779759e7eb 100644
--- a/app-mobilephone/linuxsms/metadata.xml
+++ b/app-mobilephone/linuxsms/metadata.xml
@@ -2,5 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>mobile-phone</herd>
-	<longdescription>Linuxsms is a cool script in Perl for send SMS to mobile phones	through a SMS gateway.</longdescription>
+	<longdescription>Linuxsms is a cool script in Perl for send SMS messages to mobile phones through a SMS gateway.</longdescription>
 </pkgmetadata>
diff --git a/app-mobilephone/metadata.xml b/app-mobilephone/metadata.xml
index 54e008b5d43f..6178fda74e9a 100644
--- a/app-mobilephone/metadata.xml
+++ b/app-mobilephone/metadata.xml
@@ -4,5 +4,18 @@
 	<longdescription lang="en">
 		The app-mobilephone category contains software for working with mobile phones.
 	</longdescription>
+	<longdescription lang="ja">
+		app-mobilephoneカテゴリにはケタイと使うソフトウェアが含まれます。
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm app-mobilephone chứa các phần mềm hoạt động với
+		điện thoại di động.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie app-mobilephone enthält Software für das Arbeiten mit Mobiltelefonen.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria app-mobilephone contiene software per la telefonia mobile.
+	</longdescription>
 </catmetadata>
 
diff --git a/app-mobilephone/moto4lin/ChangeLog b/app-mobilephone/moto4lin/ChangeLog
index d576e70c4e76..75964baaa32d 100644
--- a/app-mobilephone/moto4lin/ChangeLog
+++ b/app-mobilephone/moto4lin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-mobilephone/moto4lin
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/moto4lin/ChangeLog,v 1.1 2005/08/08 19:40:02 r3pek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/moto4lin/ChangeLog,v 1.1.1.1 2005/11/30 09:36:33 chriswhite Exp $
+
+  10 Oct 2005; Alin Nastac <mrness@gentoo.org> moto4lin-0.3.ebuild:
+  Remove INSTALL from docs.
+
+  09 Aug 2005; David Holm <dholm@gentoo.org> moto4lin-0.3.ebuild:
+  Added to ~ppc.
 
 *moto4lin-0.3 (08 Aug 2005)
 
diff --git a/app-mobilephone/moto4lin/Manifest b/app-mobilephone/moto4lin/Manifest
index e51ff248abc6..7a2dcca7fd2f 100644
--- a/app-mobilephone/moto4lin/Manifest
+++ b/app-mobilephone/moto4lin/Manifest
@@ -1,4 +1,14 @@
-MD5 10b1b2acf848da4369818d6205d9ea2a ChangeLog 286
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a592c9dcad61a091b74dc2050929a649 ChangeLog 563
+MD5 9f664d2a9528b4a175faf8ffce006668 moto4lin-0.3.ebuild 779
 MD5 a89a5701e09651b16f3f3d6246d841ff metadata.xml 226
-MD5 c7e8fcb9cad1b8fca2c8455adbf512e5 moto4lin-0.3.ebuild 663
 MD5 0c01e6e811c6ed425e2553e85bcb5503 files/digest-moto4lin-0.3 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDSr/INSP4Vda7IdsRAhYFAJ9DujYyriGENpa+Y9D3x2Svgr2i0gCggxfM
+1HSJSPreQFVF1S7ZyIL3GTI=
+=iTM/
+-----END PGP SIGNATURE-----
diff --git a/app-mobilephone/moto4lin/moto4lin-0.3.ebuild b/app-mobilephone/moto4lin/moto4lin-0.3.ebuild
index eff1597ef527..dfd7277409b1 100644
--- a/app-mobilephone/moto4lin/moto4lin-0.3.ebuild
+++ b/app-mobilephone/moto4lin/moto4lin-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/app-mobilephone/moto4lin/moto4lin-0.3.ebuild,v 1.1 2005/08/08 19:40:02 r3pek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/moto4lin/moto4lin-0.3.ebuild,v 1.1.1.1 2005/11/30 09:36:33 chriswhite Exp $
 
 DESCRIPTION="Moto4lin is file manager and seem editor for Motorola P2K phones"
 HOMEPAGE="http://moto4lin.sourceforge.net/"
@@ -8,7 +8,8 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
+IUSE=""
 
 DEPEND="dev-libs/libusb
 		x11-libs/qt"
@@ -23,6 +24,6 @@ src_compile() {
 }
 
 src_install() {
-	make INSTALL_ROOT=${D} install || die "install failed"
-	dodoc ChangeLog README INSTALL
+	make INSTALL_ROOT=${D} install || die "make install failed"
+	dodoc ChangeLog README
 }
diff --git a/app-mobilephone/obexftp/ChangeLog b/app-mobilephone/obexftp/ChangeLog
index 485891a55644..72da89368478 100644
--- a/app-mobilephone/obexftp/ChangeLog
+++ b/app-mobilephone/obexftp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-mobilephone/obexftp
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/ChangeLog,v 1.1 2005/05/15 16:47:46 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/ChangeLog,v 1.1.1.1 2005/11/30 09:36:32 chriswhite Exp $
+
+  21 Jul 2005; Alin Nastac <mrness@gentoo.org> -obexftp-0.10.6.ebuild,
+  -obexftp-0.10.7.ebuild:
+  Remove old versions.
 
   15 May 2005; Alin Nastac <mrness@gentoo.org> metadata.xml,
   -obexftp-0.10.3.ebuild, -obexftp-0.10.4.ebuild, obexftp-0.10.7-r1.ebuild:
diff --git a/app-mobilephone/obexftp/Manifest b/app-mobilephone/obexftp/Manifest
index 023084b7995e..744fb91e8442 100644
--- a/app-mobilephone/obexftp/Manifest
+++ b/app-mobilephone/obexftp/Manifest
@@ -1,9 +1,15 @@
-MD5 1a7531a4efd3b85a6904e8c13a3af122 obexftp-0.10.7-r1.ebuild 971
-MD5 02eebe5524ee48ff397261db9daa7e34 obexftp-0.10.6.ebuild 828
-MD5 d35a71597b149c026464261329e81b22 obexftp-0.10.7.ebuild 857
-MD5 b855dd30f47cac83a02f4dcc6ec69aef ChangeLog 3918
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0f94884c4d742fbf2e3badf0a3e2015d obexftp-0.10.7-r1.ebuild 975
+MD5 6a6bdaf6018a1bd6c9ae7272fa3db4c4 ChangeLog 4043
 MD5 9860ed702775ec6730786768ec7c1abb metadata.xml 337
-MD5 4f052623c34ea5070306f62688ea7e2b files/digest-obexftp-0.10.6 66
-MD5 c133b8829ba299b03a0e6ab757ab5f22 files/digest-obexftp-0.10.7 66
 MD5 520b09e250d549cadd0b0a39118225ec files/obexftp-0.10.7-t610-jpg.patch 307
 MD5 c133b8829ba299b03a0e6ab757ab5f22 files/digest-obexftp-0.10.7-r1 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC4A4QNSP4Vda7IdsRAnSpAJ9n7cqbzzjgFIJcaLxQ1AbS83ibXACfWqYt
+Gt/b1hzwecd75KjJ0Wy3zA4=
+=+b/k
+-----END PGP SIGNATURE-----
diff --git a/app-mobilephone/obexftp/obexftp-0.10.7-r1.ebuild b/app-mobilephone/obexftp/obexftp-0.10.7-r1.ebuild
index 400aaf1fb8a8..0c26db531bce 100644
--- a/app-mobilephone/obexftp/obexftp-0.10.7-r1.ebuild
+++ b/app-mobilephone/obexftp/obexftp-0.10.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-mobilephone/obexftp/obexftp-0.10.7-r1.ebuild,v 1.1 2005/05/15 16:47:46 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/obexftp-0.10.7-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:32 chriswhite Exp $
 
 inherit eutils
 
diff --git a/app-mobilephone/openobex-apps/ChangeLog b/app-mobilephone/openobex-apps/ChangeLog
index 10c29099d176..a4d70e9b0422 100644
--- a/app-mobilephone/openobex-apps/ChangeLog
+++ b/app-mobilephone/openobex-apps/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-mobilephone/openobex-apps
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/openobex-apps/ChangeLog,v 1.1 2005/07/30 16:28:43 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/openobex-apps/ChangeLog,v 1.1.1.1 2005/11/30 09:36:34 chriswhite Exp $
+
+  19 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  openobex-apps-1.0.0.ebuild:
+  Keyworded ~sparc
+
+  16 Aug 2005; Malcolm Lashley <malc@gentoo.org> openobex-apps-1.0.0.ebuild:
+  Added ~amd64 - closes bug #101305
+
+  31 Jul 2005; David Holm <dholm@gentoo.org> openobex-apps-1.0.0.ebuild:
+  Added to ~ppc.
 
 *openobex-apps-1.0.0 (30 Jul 2005)
 
diff --git a/app-mobilephone/openobex-apps/Manifest b/app-mobilephone/openobex-apps/Manifest
index 536f63bc9cbe..68f232172316 100644
--- a/app-mobilephone/openobex-apps/Manifest
+++ b/app-mobilephone/openobex-apps/Manifest
@@ -1,6 +1,16 @@
-MD5 bba6d85880b5492d46ea40089f8e239b openobex-apps-1.0.0.ebuild 940
-MD5 8366a150ffb76f4de5ca0cbdf7908f4f ChangeLog 411
-MD5 bcfd0d2d662576baafd7ac5ab6c58cae metadata.xml 368
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8ccd87448a7e71f2b05e92d9e3a72445 metadata.xml 368
+MD5 edacd101c22271bd50edfb0d50894b7d openobex-apps-1.0.0.ebuild 1077
+MD5 76141b0b93b964b74a9626273d205ffd ChangeLog 823
 MD5 24b07ddc1d28f613f17c722a55b7700d files/digest-openobex-apps-1.0.0 70
-MD5 81eade8beeebeeb548bc2d032e069736 files/add-obexserver.patch 4019
 MD5 5e2f505367cca8710e097baeb88a0870 files/openobex-apps-printf-fixes.patch 4573
+MD5 81eade8beeebeeb548bc2d032e069736 files/add-obexserver.patch 4019
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDBej0KRy60XGEcJIRArPIAJ41gP5IjEV9RDneY4DxAF1hTnZe9ACggu31
+61LirgSxzTrRM/cLq9eVNek=
+=wncG
+-----END PGP SIGNATURE-----
diff --git a/app-mobilephone/openobex-apps/openobex-apps-1.0.0.ebuild b/app-mobilephone/openobex-apps/openobex-apps-1.0.0.ebuild
index 49e72a89f71f..dd00b0bf4d0d 100644
--- a/app-mobilephone/openobex-apps/openobex-apps-1.0.0.ebuild
+++ b/app-mobilephone/openobex-apps/openobex-apps-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/app-mobilephone/openobex-apps/openobex-apps-1.0.0.ebuild,v 1.1 2005/07/30 16:28:43 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/openobex-apps/openobex-apps-1.0.0.ebuild,v 1.1.1.1 2005/11/30 09:36:34 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/openobex/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="bluetooth"
 
 DEPEND="dev-libs/openobex
@@ -40,4 +40,4 @@ pkg_postinst() {
 		einfo "2. obexserver "
 		einfo
 	fi
-}
\ No newline at end of file
+}
diff --git a/app-mobilephone/ringtonetools/ChangeLog b/app-mobilephone/ringtonetools/ChangeLog
index bde4feae72aa..2b46b4bb4abe 100644
--- a/app-mobilephone/ringtonetools/ChangeLog
+++ b/app-mobilephone/ringtonetools/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for app-mobilephone/ringtonetools
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/ringtonetools/ChangeLog,v 1.1 2005/05/15 07:45:27 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/ringtonetools/ChangeLog,v 1.1.1.1 2005/11/30 09:36:33 chriswhite Exp $
+
+  18 Oct 2005; Karol Wojtaszek <sekretarz@gentoo.org>
+  ringtonetools-2.25.ebuild:
+  ~amd64 keyworded
+
+  31 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  ringtonetools-2.24.ebuild:
+  ppc stable
+
+*ringtonetools-2.25 (21 Jul 2005)
+
+  21 Jul 2005; Alin Nastac <mrness@gentoo.org> ringtonetools-2.24.ebuild,
+  +ringtonetools-2.25.ebuild:
+  Stabilize on x86. Version bump.
 
 *ringtonetools-2.24 (15 May 2005)
 
diff --git a/app-mobilephone/ringtonetools/Manifest b/app-mobilephone/ringtonetools/Manifest
index e7513d92689d..2d80408b2f1e 100644
--- a/app-mobilephone/ringtonetools/Manifest
+++ b/app-mobilephone/ringtonetools/Manifest
@@ -1,6 +1,18 @@
-MD5 3f2dbda9902503a9d4a2410ee2f0a05b ringtonetools-2.24.ebuild 679
-MD5 9622cc7b7e973b992de2b3ffffe97342 ringtonetools-2.23.ebuild 670
-MD5 7bbac713159254f7e9b3a7dd49003bdd ChangeLog 1276
-MD5 9f4b7bdab0d7e16d6fd653428be6b131 metadata.xml 448
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 88a0bc3e7954836e60162654065537f3 ChangeLog 1658
 MD5 cd8e37aec51a49ca41c79aaf35457b05 files/digest-ringtonetools-2.23 69
 MD5 3384ef83a7b688b2929385bb8960576f files/digest-ringtonetools-2.24 69
+MD5 7a05a2ff80ea525ec5fb1b64716fdc87 files/digest-ringtonetools-2.25 69
+MD5 9f4b7bdab0d7e16d6fd653428be6b131 metadata.xml 448
+MD5 adc1df48332d62fa6e69d5c202a2d245 ringtonetools-2.23.ebuild 673
+MD5 eee52372daf857cc42a61e6bb6e6ec96 ringtonetools-2.24.ebuild 684
+MD5 318ba447e440037213b86f3f34cda4ff ringtonetools-2.25.ebuild 667
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDVUESZ/iYVBmujdURAiXCAKDWqR3H/L1o7+xhN4rOmbpixVJLqQCfVFq5
+NcnGSkorKNRTU/tcNoXFC44=
+=c5Pk
+-----END PGP SIGNATURE-----
diff --git a/app-mobilephone/ringtonetools/ringtonetools-2.23.ebuild b/app-mobilephone/ringtonetools/ringtonetools-2.23.ebuild
index 808801f655ff..6b1fb92e3608 100644
--- a/app-mobilephone/ringtonetools/ringtonetools-2.23.ebuild
+++ b/app-mobilephone/ringtonetools/ringtonetools-2.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/app-mobilephone/ringtonetools/ringtonetools-2.23.ebuild,v 1.1 2005/05/15 07:45:27 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/ringtonetools/ringtonetools-2.23.ebuild,v 1.1.1.1 2005/11/30 09:36:33 chriswhite Exp $
 
 DESCRIPTION="Ringtone Tools is a program for creating ringtones and logos for mobile phones"
 HOMEPAGE="http://ringtonetools.mikekohn.net/"
diff --git a/app-mobilephone/ringtonetools/ringtonetools-2.24.ebuild b/app-mobilephone/ringtonetools/ringtonetools-2.24.ebuild
index 8bb973cf9d19..acd46db8264a 100644
--- a/app-mobilephone/ringtonetools/ringtonetools-2.24.ebuild
+++ b/app-mobilephone/ringtonetools/ringtonetools-2.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/app-mobilephone/ringtonetools/ringtonetools-2.24.ebuild,v 1.1 2005/05/15 07:45:27 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/ringtonetools/ringtonetools-2.24.ebuild,v 1.1.1.1 2005/11/30 09:36:33 chriswhite Exp $
 
 DESCRIPTION="Ringtone Tools is a program for creating ringtones and logos for mobile phones"
 HOMEPAGE="http://ringtonetools.mikekohn.net/"
@@ -8,7 +8,7 @@ SRC_URI="http://downloads.mikekohn.net/ringtonetools/${P}.tar.gz"
 
 LICENSE="ringtonetools"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="ppc x86"
 IUSE=""
 
 DEPEND="virtual/libc"
diff --git a/app-mobilephone/ringtonetools/ringtonetools-2.25.ebuild b/app-mobilephone/ringtonetools/ringtonetools-2.25.ebuild
index 221001d741c2..a8d727d2d93f 100644
--- a/app-mobilephone/ringtonetools/ringtonetools-2.25.ebuild
+++ b/app-mobilephone/ringtonetools/ringtonetools-2.25.ebuild
@@ -1,24 +1,24 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/ringtonetools/ringtonetools-2.25.ebuild,v 1.1 2005/07/21 21:00:01 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/ringtonetools/ringtonetools-2.25.ebuild,v 1.1.1.1 2005/11/30 09:36:33 chriswhite Exp $
 
-DESCRIPTION="Ringtone Tools is a program for creating ringtones and logos for mobile phones"
+DESCRIPTION="program for creating ringtones and logos for mobile phones"
 HOMEPAGE="http://ringtonetools.mikekohn.net/"
 SRC_URI="http://downloads.mikekohn.net/ringtonetools/${P}.tar.gz"
 
 LICENSE="ringtonetools"
 SLOT="0"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND="virtual/libc"
+DEPEND=""
 
 src_compile() {
 	emake FLAGS="${CFLAGS}" || die "make failed"
 }
 
 src_install() {
-	dobin ringtonetools
+	dobin ringtonetools || die
 	dodoc docs/*
 	docinto samples
 	dodoc samples/*
diff --git a/app-mobilephone/scmxx/ChangeLog b/app-mobilephone/scmxx/ChangeLog
index 85f00f506666..fdedc04ccd3c 100644
--- a/app-mobilephone/scmxx/ChangeLog
+++ b/app-mobilephone/scmxx/ChangeLog
@@ -1,10 +1,26 @@
 # ChangeLog for app-mobilephone/scmxx
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/scmxx/ChangeLog,v 1.1 2005/05/14 13:32:54 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/scmxx/ChangeLog,v 1.1.1.1 2005/11/30 09:36:31 chriswhite Exp $
+
+*scmxx-0.8.1 (10 Oct 2005)
+
+  10 Oct 2005; Alin Nastac <mrness@gentoo.org> -scmxx-0.6.4.ebuild,
+  -scmxx-0.7.4.ebuild, scmxx-0.7.5.ebuild, scmxx-0.8.0.ebuild,
+  +scmxx-0.8.1.ebuild:
+  Remove INSTALL from docs. Remove obsolete versions. Mark ver 0.8.0 as stable
+  on x86. Version bump (#108297).
+
+*scmxx-0.8.0 (21 Jul 2005)
+
+  21 Jul 2005; Alin Nastac <mrness@gentoo.org> scmxx-0.7.5.ebuild,
+  +scmxx-0.8.0.ebuild:
+  Mark 0.7.5 stable on x86. Version bump (#99421).
+
+*scmxx-0.7.5 (14 May 2005)
 
   14 May 2005; Alin Nastac <mrness@gentoo.org> +metadata.xml,
-  -scmxx-0.6.3.7.ebuild:
-  Moved from app-misc/scmxx to app-mobilephone/scmxx.
+  -scmxx-0.6.3.7.ebuild, +scmxx-0.7.5.ebuild:
+  Moved from app-misc/scmxx to app-mobilephone/scmxx. Version bump (#86877).
 
   12 Nov 2004; Simon Stelling <blubb@gentoo.org> scmxx-0.7.4.ebuild:
   added ~amd64
diff --git a/app-mobilephone/scmxx/Manifest b/app-mobilephone/scmxx/Manifest
index 7ff359110a72..865de6bbe82a 100644
--- a/app-mobilephone/scmxx/Manifest
+++ b/app-mobilephone/scmxx/Manifest
@@ -1,7 +1,18 @@
-MD5 1657523f9b3871f118fe1eb55a296e5d ChangeLog 1029
-MD5 c5eae764bdf92d58ccaa6f094634ac20 scmxx-0.6.3.7.ebuild 757
-MD5 3c07cb84528358d78b85e66ae3b16a58 scmxx-0.6.4.ebuild 632
-MD5 965914eea645c7a199c3ff8d3bfb5cd3 scmxx-0.7.4.ebuild 640
-MD5 36ff51d2fd0a94a032d4cd4590815b90 files/digest-scmxx-0.6.3.7 65
-MD5 1eef12ab94ebfa087a3c6a72bafb781c files/digest-scmxx-0.6.4 63
-MD5 c2d3d5089aa744093a0db55255a1f689 files/digest-scmxx-0.7.4 137
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ba729a9621ca5c31531b65f5c2c4a259 scmxx-0.7.5.ebuild 656
+MD5 057a020e4c5edcc9641204933a4a07f4 scmxx-0.8.0.ebuild 668
+MD5 b97cbf492c246f22a47f6be23c098207 ChangeLog 1718
+MD5 8e1fd49c29f85eea8da87d6e7de450c6 metadata.xml 165
+MD5 4064d7ae779a65bc5e5300fb8b25e92d scmxx-0.8.1.ebuild 669
+MD5 4841a129968f6eb4e7edbf7c190fa534 files/digest-scmxx-0.7.5 64
+MD5 6743d3a18bcb5403b3f5e19ed582a2d5 files/digest-scmxx-0.8.0 64
+MD5 e29687d26cfe90ce3dac133667b07094 files/digest-scmxx-0.8.1 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDSr6ONSP4Vda7IdsRAt6LAJ43ufcKWnM5BI8yOqtVRdg+AUKVCwCcCy7e
+snSQUronvJ6ZMGVvEoYOvRY=
+=NNWy
+-----END PGP SIGNATURE-----
diff --git a/app-mobilephone/scmxx/scmxx-0.7.5.ebuild b/app-mobilephone/scmxx/scmxx-0.7.5.ebuild
index 424a07ab2b1f..c2d5da07291f 100644
--- a/app-mobilephone/scmxx/scmxx-0.7.5.ebuild
+++ b/app-mobilephone/scmxx/scmxx-0.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/app-mobilephone/scmxx/scmxx-0.7.5.ebuild,v 1.1 2005/05/14 14:50:25 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/scmxx/scmxx-0.7.5.ebuild,v 1.1.1.1 2005/11/30 09:36:31 chriswhite Exp $
 
 DESCRIPTION="Exchange data with Siemens phones"
 HOMEPAGE="http://www.hendrik-sattler.de/scmxx/"
@@ -8,15 +8,15 @@ SRC_URI="mirror://sourceforge/scmxx/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 ~amd64"
 IUSE=""
 
 DEPEND="virtual/libc"
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR=${D} install || die "make install failed"
 	exeinto /usr/lib/scmxx
 	doexe contrib/*
-	dodoc AUTHORS BUGS CHANGELOG INSTALL README TODO VERSION docs/*.txt
+	dodoc AUTHORS BUGS CHANGELOG README TODO VERSION docs/*.txt
 	newdoc docs/README README.doc
 }
diff --git a/app-mobilephone/scmxx/scmxx-0.8.0.ebuild b/app-mobilephone/scmxx/scmxx-0.8.0.ebuild
index 29d755159349..7f630cf57e33 100644
--- a/app-mobilephone/scmxx/scmxx-0.8.0.ebuild
+++ b/app-mobilephone/scmxx/scmxx-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/app-mobilephone/scmxx/scmxx-0.8.0.ebuild,v 1.1 2005/07/21 20:44:34 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/scmxx/scmxx-0.8.0.ebuild,v 1.1.1.1 2005/11/30 09:36:31 chriswhite Exp $
 
 DESCRIPTION="Exchange data with Siemens phones"
 HOMEPAGE="http://www.hendrik-sattler.de/scmxx/"
@@ -8,13 +8,13 @@ SRC_URI="mirror://sourceforge/scmxx/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 DEPEND="virtual/libc"
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR=${D} install || die "make install failed"
 
 	exeinto /usr/lib/scmxx
 	doexe contrib/*
@@ -22,5 +22,5 @@ src_install() {
 	doman docs/scmxx.*.1
 
 	rm docs/README_WIN32.txt
-	dodoc AUTHORS BUGS CHANGELOG INSTALL README TODO docs/*.txt
+	dodoc AUTHORS BUGS CHANGELOG README TODO docs/*.txt
 }
diff --git a/app-mobilephone/scmxx/scmxx-0.8.1.ebuild b/app-mobilephone/scmxx/scmxx-0.8.1.ebuild
index 7e1f34391123..78e3c2ee40a3 100644
--- a/app-mobilephone/scmxx/scmxx-0.8.1.ebuild
+++ b/app-mobilephone/scmxx/scmxx-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/app-mobilephone/scmxx/scmxx-0.8.1.ebuild,v 1.1 2005/10/10 19:18:08 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/scmxx/scmxx-0.8.1.ebuild,v 1.1.1.1 2005/11/30 09:36:31 chriswhite Exp $
 
 DESCRIPTION="Exchange data with Siemens phones"
 HOMEPAGE="http://www.hendrik-sattler.de/scmxx/"
diff --git a/app-mobilephone/sms/ChangeLog b/app-mobilephone/sms/ChangeLog
index c492c32765eb..b8d4f3019c45 100644
--- a/app-mobilephone/sms/ChangeLog
+++ b/app-mobilephone/sms/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-mobilephone/sms
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/sms/ChangeLog,v 1.1 2005/05/15 19:50:28 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/sms/ChangeLog,v 1.1.1.1 2005/11/30 09:36:32 chriswhite Exp $
+
+  13 Jul 2005; Daniel Black <dragonheart@gentoo.org> -sms-1.9.2m.ebuild,
+  sms-2.0.3.ebuild:
+  stablize current version and remove old version. bug #97187
 
   15 May 2005; Alin Nastac <mrness@gentoo.org> metadata.xml,
   -sms-2.0.2.ebuild:
diff --git a/app-mobilephone/sms/Manifest b/app-mobilephone/sms/Manifest
index 122379406b2e..e3fba1c062c1 100644
--- a/app-mobilephone/sms/Manifest
+++ b/app-mobilephone/sms/Manifest
@@ -1,6 +1,14 @@
-MD5 6bb01d7b97845ad3b64baf5f5882effc sms-1.9.2m.ebuild 795
-MD5 33083f6d0f42d33a6d8ca66ccf582e72 sms-2.0.3.ebuild 862
-MD5 7ff7053659c99f3805c495fee70081ee ChangeLog 2342
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f7b82d7996b8c9c54e0536d54a10b08b ChangeLog 2458
 MD5 0c6931ac86bfdd99e623b600cfa74821 metadata.xml 626
-MD5 d5c218a66c4b257f2c0b06daa234f78c files/digest-sms-1.9.2m 61
+MD5 52e642d8f6c3fd07f7c3a52aa03009c3 sms-2.0.3.ebuild 868
 MD5 0a3f42f5ceada89211f4a27766eff6e7 files/digest-sms-2.0.3 60
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC1ZEfmdTrptrqvGERAkE0AJ94WfRSUChGDPKdSx0DF2QnCsVyMACfX4TX
+cWfD2ch5qA16ElYKQBundFA=
+=Dl3y
+-----END PGP SIGNATURE-----
diff --git a/app-mobilephone/sms/sms-2.0.3.ebuild b/app-mobilephone/sms/sms-2.0.3.ebuild
index 05cbafc187c4..301fb8fd9ecd 100644
--- a/app-mobilephone/sms/sms-2.0.3.ebuild
+++ b/app-mobilephone/sms/sms-2.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/app-mobilephone/sms/sms-2.0.3.ebuild,v 1.1 2005/05/15 19:50:28 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/sms/sms-2.0.3.ebuild,v 1.1.1.1 2005/11/30 09:36:32 chriswhite Exp $
 
 inherit toolchain-funcs
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://ceti.pl/~miki/komputery/sms.html"
 SRC_URI="http://ceti.pl/~miki/komputery/download/sms/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="ppc x86"
 IUSE=""
 RDEPEND="virtual/libc
 	sys-libs/gdbm
diff --git a/app-mobilephone/smsclient/ChangeLog b/app-mobilephone/smsclient/ChangeLog
index 03fbe4ee0c19..c7589366d134 100644
--- a/app-mobilephone/smsclient/ChangeLog
+++ b/app-mobilephone/smsclient/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for app-mobilephone/smsclient
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/smsclient/ChangeLog,v 1.1 2005/10/18 22:28:04 r3pek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/smsclient/ChangeLog,v 1.1.1.1 2005/11/30 09:36:30 chriswhite Exp $
 
 *smsclient-2.0.8y (18 Oct 2005)
 
diff --git a/app-mobilephone/smsclient/smsclient-2.0.8y.ebuild b/app-mobilephone/smsclient/smsclient-2.0.8y.ebuild
index b504a3aa1d19..05d7b72195f4 100644
--- a/app-mobilephone/smsclient/smsclient-2.0.8y.ebuild
+++ b/app-mobilephone/smsclient/smsclient-2.0.8y.ebuild
@@ -1,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-mobilephone/smsclient/smsclient-2.0.8y.ebuild,v 1.1 2005/10/18 22:28:04 r3pek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/smsclient/smsclient-2.0.8y.ebuild,v 1.1.1.1 2005/11/30 09:36:30 chriswhite Exp $
 
 inherit eutils
 
diff --git a/app-mobilephone/smssend/ChangeLog b/app-mobilephone/smssend/ChangeLog
index 4225192c85ab..622aa0be9c01 100644
--- a/app-mobilephone/smssend/ChangeLog
+++ b/app-mobilephone/smssend/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-mobilephone/smssend
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/smssend/ChangeLog,v 1.1 2005/05/15 19:49:33 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/smssend/ChangeLog,v 1.1.1.1 2005/11/30 09:36:32 chriswhite Exp $
+
+  06 Oct 2005; Alin Nastac <mrness@gentoo.org> smssend-3.3.ebuild,
+  smssend-3.4.ebuild:
+  Remove COPYING and INSTALL from docs. Mark stable on x86.
 
   15 May 2005; Alin Nastac <mrness@gentoo.org> metadata.xml,
   -smssend-3.2.ebuild:
diff --git a/app-mobilephone/smssend/Manifest b/app-mobilephone/smssend/Manifest
index 83c3c511ee6c..762584914960 100644
--- a/app-mobilephone/smssend/Manifest
+++ b/app-mobilephone/smssend/Manifest
@@ -1,7 +1,17 @@
-MD5 0294583adf3651438bf7d09cd7802a7b smssend-3.4.ebuild 940
-MD5 67d89adc31e096e6e2d567eaded664bf smssend-3.3.ebuild 777
-MD5 f42974bbb742530ea8088057b4534110 ChangeLog 1685
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 cea5c50860974402dc20e81b94bacd80 smssend-3.4.ebuild 936
+MD5 199f581f573d17168a4c1d09ecb53622 smssend-3.3.ebuild 783
+MD5 dc060265f422e1f435ead99b7fa79d15 ChangeLog 1846
 MD5 d40efbd929fb44aee56a7e39f32cdd76 metadata.xml 222
 MD5 0aca853e97a2597cfc64a9cb6d546cae files/smssend-3.4-verizon.diff 14249
 MD5 2ddd6d84e81318fb024189b2533b7800 files/digest-smssend-3.3 63
 MD5 85e9b56fffa5b05a7a3a6acf4d89a920 files/digest-smssend-3.4 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDRL3FNSP4Vda7IdsRAs/+AJ9tkJ4w3Gxp0uQmhDOF3Qv88dNN6ACfYx9g
+9ToDBFpJTqKYbdNgyEZWmwQ=
+=XpK7
+-----END PGP SIGNATURE-----
diff --git a/app-mobilephone/smssend/smssend-3.3.ebuild b/app-mobilephone/smssend/smssend-3.3.ebuild
index b164cb4b74fe..9b794ebc16a3 100644
--- a/app-mobilephone/smssend/smssend-3.3.ebuild
+++ b/app-mobilephone/smssend/smssend-3.3.ebuild
@@ -1,30 +1,29 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/smssend/smssend-3.3.ebuild,v 1.1 2005/05/15 19:49:33 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/smssend/smssend-3.3.ebuild,v 1.1.1.1 2005/11/30 09:36:32 chriswhite Exp $
 
 DESCRIPTION="Universal SMS sender"
 HOMEPAGE="http://zekiller.skytech.org/smssend_menu_en.html"
 SRC_URI="http://zekiller.skytech.org/fichiers/${PN}/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~sparc ~ppc ~amd64"
 IUSE=""
+
 DEPEND=">=dev-libs/skyutils-2.6
 	sys-apps/grep
 	sys-apps/sed
 	sys-devel/gcc
 	virtual/libc"
-
 RDEPEND=">=dev-libs/skyutils-2.6"
 
 src_compile() {
 	econf || die "./configure failed"
-	emake || die
+	emake || die "make failed"
 }
 
 src_install () {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog COPYING INSTALL \
-	    License.txt NEWS README todo.txt
+	make DESTDIR=${D} install || die "make install failed"
+	dodoc AUTHORS ChangeLog NEWS README todo.txt
 }
-
diff --git a/app-mobilephone/smssend/smssend-3.4.ebuild b/app-mobilephone/smssend/smssend-3.4.ebuild
index d606a269c3d6..24cc94134abf 100644
--- a/app-mobilephone/smssend/smssend-3.4.ebuild
+++ b/app-mobilephone/smssend/smssend-3.4.ebuild
@@ -1,22 +1,23 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/smssend/smssend-3.4.ebuild,v 1.1 2005/05/15 19:49:34 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/smssend/smssend-3.4.ebuild,v 1.1.1.1 2005/11/30 09:36:32 chriswhite Exp $
 
 inherit eutils
 
 DESCRIPTION="Universal SMS sender"
 HOMEPAGE="http://zekiller.skytech.org/smssend_menu_en.html"
 SRC_URI="http://zekiller.skytech.org/fichiers/${PN}/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 IUSE=""
+
 DEPEND=">=dev-libs/skyutils-2.7
 	sys-apps/grep
 	sys-apps/sed
 	sys-devel/gcc
 	virtual/libc"
-
 RDEPEND=">=dev-libs/skyutils-2.7"
 
 src_unpack() {
@@ -24,17 +25,15 @@ src_unpack() {
 
 	# Patch for Verizon Wireless support
 	# absinthe@gentoo.org 12/16
-	cd ${S}
 	epatch ${FILESDIR}/${P}-verizon.diff
 }
 
 src_compile() {
 	econf || die "./configure failed"
-	emake || die
+	emake || die "make failed"
 }
 
 src_install () {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog COPYING INSTALL \
-	    License.txt NEWS README todo.txt
+	make DESTDIR=${D} install || die "make install failed"
+	dodoc AUTHORS ChangeLog NEWS README todo.txt
 }
diff --git a/app-mobilephone/vmoconv/ChangeLog b/app-mobilephone/vmoconv/ChangeLog
index abab59b9aa1f..0f95e5851c77 100644
--- a/app-mobilephone/vmoconv/ChangeLog
+++ b/app-mobilephone/vmoconv/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-mobilephone/vmoconv
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/vmoconv/ChangeLog,v 1.1 2005/05/14 14:59:52 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/vmoconv/ChangeLog,v 1.1.1.1 2005/11/30 09:36:31 chriswhite Exp $
+
+  10 Oct 2005; Alin Nastac <mrness@gentoo.org> vmoconv-1.0.ebuild:
+  Remove INSTALL and COPYING from docs.
 
   14 May 2005; Alin Nastac <mrness@gentoo.org> metadata.xml:
   Moved from app-misc/vmoconv to app-mobilephone/vmoconv.
diff --git a/app-mobilephone/vmoconv/Manifest b/app-mobilephone/vmoconv/Manifest
index e3bc0f45f980..766d9667734a 100644
--- a/app-mobilephone/vmoconv/Manifest
+++ b/app-mobilephone/vmoconv/Manifest
@@ -1,4 +1,14 @@
-MD5 f3c95c07b24cbd82c1cbef891b8c7815 vmoconv-1.0.ebuild 764
-MD5 525e2fa6e0b4a523821adb1fe74b5676 ChangeLog 550
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a2b5b64270db2d6c6de17af5f952217f vmoconv-1.0.ebuild 791
+MD5 2d017dc9142fe2f8b6f0bb747d5e0033 ChangeLog 666
 MD5 3d703bfbe760589ae8b4bdefb1df9dac metadata.xml 370
 MD5 ad51711b81f583af1b493e09c0bb8e7c files/digest-vmoconv-1.0 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDSsB0NSP4Vda7IdsRAt+xAJ9T0WvMNN3X8mn8wrq+HlOt8bNHUACeLdkm
+H9lzTWFqWvYjXNYUq5NySo0=
+=UVqg
+-----END PGP SIGNATURE-----
diff --git a/app-mobilephone/vmoconv/vmoconv-1.0.ebuild b/app-mobilephone/vmoconv/vmoconv-1.0.ebuild
index 496bcd68c5a8..64afe6880fd3 100644
--- a/app-mobilephone/vmoconv/vmoconv-1.0.ebuild
+++ b/app-mobilephone/vmoconv/vmoconv-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-mobilephone/vmoconv/vmoconv-1.0.ebuild,v 1.1 2005/05/14 14:59:52 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/vmoconv/vmoconv-1.0.ebuild,v 1.1.1.1 2005/11/30 09:36:31 chriswhite Exp $
 
 DESCRIPTION="A tool that converts Siemens phones VMO and VMI audio files to gsm and wav."
 HOMEPAGE="http://triq.net/obex/"
@@ -17,12 +17,12 @@ src_compile() {
 	econf || die
 	# ugly workaround, otherwise make tries to build binaries before
 	# necessary .la file is built
-	cd src && make libgsm.la || die
+	cd src && make libgsm.la || die "make libgsm failed"
 	cd ..
-	emake || die
+	emake || die "make failed"
 }
 
 src_install() {
 	dobin src/vmo2gsm src/gsm2vmo src/vmo2wav
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS
+	dodoc AUTHORS ChangeLog NEWS README THANKS
 }
diff --git a/app-mobilephone/wammu/ChangeLog b/app-mobilephone/wammu/ChangeLog
index e34f94cadcd1..aa9e4b694c81 100644
--- a/app-mobilephone/wammu/ChangeLog
+++ b/app-mobilephone/wammu/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for app-mobilephone/wammu
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/wammu/ChangeLog,v 1.1 2005/05/14 12:57:39 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/wammu/ChangeLog,v 1.1.1.1 2005/11/30 09:36:33 chriswhite Exp $
+
+  02 Aug 2005; Alin Nastac <mrness@gentoo.org> wammu-0.9.ebuild:
+  Fix dependencies wrt bug #101067.
+
+  01 Aug 2005; David Holm <dholm@gentoo.org> wammu-0.9.ebuild:
+  Added to ~ppc.
+
+*wammu-0.9 (31 Jul 2005)
+
+  31 Jul 2005; Alin Nastac <mrness@gentoo.org> +wammu-0.9.ebuild:
+  Version bump.
+
+  17 May 2005; Carlos Silva <r3pek@gentoo.org> wammu-0.8.ebuild:
+  Closing bug #92930
 
   14 May 2005; Alin Nastac <mrness@gentoo.org> metadata.xml:
   Moved from net-dialup/wammu to app-mobilephone/wammu.
diff --git a/app-mobilephone/wammu/Manifest b/app-mobilephone/wammu/Manifest
index 1f8220d819a5..96472c8d8b04 100644
--- a/app-mobilephone/wammu/Manifest
+++ b/app-mobilephone/wammu/Manifest
@@ -1,6 +1,18 @@
-MD5 8640796b624a6d8047e8269bc480b20e wammu-0.8.ebuild 970
-MD5 8cd5a9bf7597e6582a15f909b5fc4624 ChangeLog 749
-MD5 8e1fd49c29f85eea8da87d6e7de450c6 metadata.xml 165
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4976c2f33b1ac57dbd8cb09d44578365 ChangeLog 1133
 MD5 a3b1083e7d73df1e1ac68283527ac6e8 files/digest-wammu-0.8 61
-MD5 8eb36ebf4ee54f9cc40038ba49467ae8 files/wammu.png 3464
+MD5 763665fca5e4ffc03b7144d95b7d785b files/digest-wammu-0.9 61
 MD5 c37483be90032a3d614bf10bcb3077dd files/wammu.desktop 300
+MD5 8eb36ebf4ee54f9cc40038ba49467ae8 files/wammu.png 3464
+MD5 8e1fd49c29f85eea8da87d6e7de450c6 metadata.xml 165
+MD5 65a4413ae9a9fa8e112452d963fe5daf wammu-0.8.ebuild 981
+MD5 f61ec9afde04d74fbe7f00ad39d5229c wammu-0.9.ebuild 1141
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDCzbWI1lqEGTUzyQRAvtMAJ9FK+Snox0DZBe3+J4EjTQhbYurvgCdErRI
+SIHJdOMK5k6pNwo4GIrwCWo=
+=FfL0
+-----END PGP SIGNATURE-----
diff --git a/app-mobilephone/wammu/wammu-0.8.ebuild b/app-mobilephone/wammu/wammu-0.8.ebuild
index f442f80bfe61..e7c7fa53241b 100644
--- a/app-mobilephone/wammu/wammu-0.8.ebuild
+++ b/app-mobilephone/wammu/wammu-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/app-mobilephone/wammu/wammu-0.8.ebuild,v 1.1 2005/05/14 12:57:39 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/wammu/wammu-0.8.ebuild,v 1.1.1.1 2005/11/30 09:36:33 chriswhite Exp $
 
 inherit distutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.cihar.com/gammu/wammu/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ~amd64"
 
 RDEPEND=">=dev-lang/python-2.3.0
 	>=dev-python/wxpython-2.4.1.2
diff --git a/app-mobilephone/wammu/wammu-0.9.ebuild b/app-mobilephone/wammu/wammu-0.9.ebuild
index 7f2c44558f85..30ef0405c3a4 100644
--- a/app-mobilephone/wammu/wammu-0.9.ebuild
+++ b/app-mobilephone/wammu/wammu-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/app-mobilephone/wammu/wammu-0.9.ebuild,v 1.1 2005/07/31 08:12:00 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/wammu/wammu-0.9.ebuild,v 1.1.1.1 2005/11/30 09:36:33 chriswhite Exp $
 
 inherit distutils
 
@@ -11,13 +11,16 @@ HOMEPAGE="http://www.cihar.com/gammu/wammu/"
 SRC_URI="http://www.cihar.com/gammu/wammu/${P}.tar.bz2"
 
 LICENSE="GPL-2"
+IUSE="bluetooth gnome"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
+#gnome-bluetooth is used for additional functionality - see bug #101067
 RDEPEND=">=dev-lang/python-2.3.0
 	>=dev-python/wxpython-2.4.1.2
 	>=dev-python/python-gammu-0.7
-	app-mobilephone/gammu"
+	app-mobilephone/gammu
+	gnome? ( bluetooth? ( net-wireless/gnome-bluetooth ) )"
 DEPEND="dev-util/pkgconfig
 	${RDEPEND}"
 
diff --git a/app-mobilephone/x70talk/ChangeLog b/app-mobilephone/x70talk/ChangeLog
index 883cfc3c4a7f..0588dcadd3f2 100644
--- a/app-mobilephone/x70talk/ChangeLog
+++ b/app-mobilephone/x70talk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-mobilephone/x70talk
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/x70talk/ChangeLog,v 1.1 2005/05/15 08:42:36 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/x70talk/ChangeLog,v 1.1.1.1 2005/11/30 09:36:34 chriswhite Exp $
+
+  10 Oct 2005; Alin Nastac <mrness@gentoo.org> x70talk-0.1.4-r1.ebuild:
+  Remove COPYING from docs.
 
 *x70talk-0.1.4-r1 (15 May 2005)
 
diff --git a/app-mobilephone/x70talk/Manifest b/app-mobilephone/x70talk/Manifest
index cf97131375c6..1d6564e4b774 100644
--- a/app-mobilephone/x70talk/Manifest
+++ b/app-mobilephone/x70talk/Manifest
@@ -1,7 +1,15 @@
-MD5 8ba14911dd186e2e2034790fe9eb16dd x70talk-0.1.4.ebuild 606
-MD5 0226288fca481e9d6a585215edc12a48 metadata.xml 341
-MD5 b0676adf37976f24d6248246cbeee306 ChangeLog 1020
-MD5 eb17a5b793835f97cd5b47961038f038 x70talk-0.1.4-r1.ebuild 696
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 47921e7893d1830d7a7caa8ae9a450b9 ChangeLog 1342
+MD5 0b19074f61428a73704b9c39c12548c4 metadata.xml 369
+MD5 8833854c9a67bb70e42e348664a0c479 x70talk-0.1.4-r1.ebuild 652
 MD5 8b12fd0c382a7b845e45f197c73a537b files/digest-x70talk-0.1.4-r1 64
-MD5 8b12fd0c382a7b845e45f197c73a537b files/digest-x70talk-0.1.4 64
 MD5 a38d52fd46840d397b317cf911326a46 files/x70talk-correct-month.diff 534
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDSsD+NSP4Vda7IdsRAnDTAJ9tgcNsmOV0kPxdXKja4p4Spc+EFQCeJ6+E
+SYJGo/W+qe46kTN2ZryaSX8=
+=kBSf
+-----END PGP SIGNATURE-----
diff --git a/app-mobilephone/x70talk/x70talk-0.1.4-r1.ebuild b/app-mobilephone/x70talk/x70talk-0.1.4-r1.ebuild
index a50df2c53f01..fa5f700dffd8 100644
--- a/app-mobilephone/x70talk/x70talk-0.1.4-r1.ebuild
+++ b/app-mobilephone/x70talk/x70talk-0.1.4-r1.ebuild
@@ -1,30 +1,29 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/x70talk/x70talk-0.1.4-r1.ebuild,v 1.1 2005/05/15 08:42:36 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/x70talk/x70talk-0.1.4-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:34 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="Communicate and sync with Panasonic X70 mobile phone"
 HOMEPAGE="http://x70talk.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc"
-DEPEND="net-wireless/bluez-libs"
 IUSE=""
+
+DEPEND="net-wireless/bluez-libs"
+
 S=${WORKDIR}/${PN}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	patch -p1 < ${FILESDIR}/x70talk-correct-month.diff
-}
 
-src_compile() {
-	econf || die
-	emake || die
+	epatch ${FILESDIR}/${PN}-correct-month.diff
 }
 
 src_install() {
 	dobin x70talk
-	dodoc ChangeLog README TODO COPYING
+	dodoc ChangeLog README TODO
 }
-
diff --git a/app-mobilephone/yaps/ChangeLog b/app-mobilephone/yaps/ChangeLog
index c4e4bfc26f60..90798c4c09a2 100644
--- a/app-mobilephone/yaps/ChangeLog
+++ b/app-mobilephone/yaps/ChangeLog
@@ -1,6 +1,38 @@
 # ChangeLog for app-mobilephone/yaps
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/yaps/ChangeLog,v 1.1 2005/07/28 20:29:04 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/yaps/ChangeLog,v 1.1.1.1 2005/11/30 09:36:31 chriswhite Exp $
+
+  18 Oct 2005; Stefan Briesenick <sbriesen@gentoo.org> yaps-0.96-r1.ebuild:
+  optimized 'use capi' handling. hopefully the last time. ;-)
+
+  17 Oct 2005; Stefan Briesenick <sbriesen@gentoo.org> yaps-0.96-r1.ebuild:
+  removed 'use capi' from global scope.
+
+  16 Oct 2005; Stefan Briesenick <sbriesen@gentoo.org> yaps-0.96-r1.ebuild:
+  reverted x86 to ~x86. Sorry, my fault. Forgot to reset keywords after fixing
+  ebuild.
+
+  16 Oct 2005; Stefan Briesenick <sbriesen@gentoo.org>
+  files/yaps-0.96-gentoo.patch, metadata.xml, yaps-0.96-r1.ebuild:
+  fixing broken patch with USE flag 'capi', see #105676
+
+*yaps-0.96-r1 (15 Oct 2005)
+
+  15 Oct 2005; Alin Nastac <mrness@gentoo.org>
+  +files/yaps-0.96-gentoo.patch, +yaps-0.96-r1.ebuild:
+  Add Cityruf service to yaps.rc (#105676).
+
+  13 Oct 2005; Alin Nastac <mrness@gentoo.org> yaps-0.96.ebuild:
+  Remove COPYRIGHT and INSTALL from docs.
+
+  09 Sep 2005; Stefan Briesenick <sbriesen@gentoo.org> yaps-0.96.ebuild:
+  stable on x86.
+
+  30 Jul 2005; Stefan Briesenick <sbriesen@gentoo.org> yaps-0.96.ebuild:
+  correcting depend/rdepend for pkgconfig
+
+  29 Jul 2005; David Holm <dholm@gentoo.org> yaps-0.96.ebuild:
+  Added to ~ppc.
 
 *yaps-0.96 (28 Jul 2005)
 
diff --git a/app-mobilephone/yaps/Manifest b/app-mobilephone/yaps/Manifest
index 6538df307dec..af5588052ae9 100644
--- a/app-mobilephone/yaps/Manifest
+++ b/app-mobilephone/yaps/Manifest
@@ -1,4 +1,9 @@
-MD5 2b92710537b7eac1ccd4b92b1978353f yaps-0.96.ebuild 1598
-MD5 8cd1ba9738bbe553fc3d400dd7f7c20c files/yaps-0.96.patch 9867
+MD5 81bb5889294e25ae49808b4440d48e8c ChangeLog 1624
 MD5 5b713d70117b792c0fa6a519f8c0b208 files/digest-yaps-0.96 121
+MD5 5b713d70117b792c0fa6a519f8c0b208 files/digest-yaps-0.96-r1 121
 MD5 836bccf5ccea5152fa69261df18d3bb9 files/yaps-0.96-capiv3.patch 1820
+MD5 0c53ad04e9340b9379a31756ac378afa files/yaps-0.96-gentoo.patch 10303
+MD5 8cd1ba9738bbe553fc3d400dd7f7c20c files/yaps-0.96.patch 9867
+MD5 28d5cc02fcd84c57b54cc995fbc506e7 metadata.xml 373
+MD5 d66345ee9cdef6bffee32e267dd3dc40 yaps-0.96-r1.ebuild 1737
+MD5 69e77ba8276e4ac896dfb9ea0a5e385f yaps-0.96.ebuild 1705
diff --git a/app-mobilephone/yaps/files/yaps-0.96-gentoo.patch b/app-mobilephone/yaps/files/yaps-0.96-gentoo.patch
index 1ff61008f240..24929f21dccd 100644
--- a/app-mobilephone/yaps/files/yaps-0.96-gentoo.patch
+++ b/app-mobilephone/yaps/files/yaps-0.96-gentoo.patch
@@ -1,6 +1,5 @@
-diff -Nru yaps-0.96.orig/Config yaps-0.96/Config
---- yaps-0.96.orig/Config	1997-06-14 13:32:18.000000000 +0300
-+++ yaps-0.96/Config	2005-10-15 10:32:51.751042480 +0300
+--- Config.orig	2005-06-02 20:28:35.000000000 +0200
++++ Config	2005-10-16 15:13:32.000000000 +0200
 @@ -24,9 +24,9 @@
  #	Name of local configuration file (location is $HOME.)
  YAPS_LCFGFILE 	= .yapsrc
@@ -29,9 +28,8 @@ diff -Nru yaps-0.96.orig/Config yaps-0.96/Config
  endif
  ifdef	MATH
  LLIBS	+= -lm
-diff -Nru yaps-0.96.orig/Makefile yaps-0.96/Makefile
---- yaps-0.96.orig/Makefile	1997-06-06 14:45:35.000000000 +0300
-+++ yaps-0.96/Makefile	2005-10-15 10:32:51.752042328 +0300
+--- Makefile.orig	2005-06-02 20:33:27.000000000 +0200
++++ Makefile	2005-10-16 15:13:32.000000000 +0200
 @@ -33,19 +33,19 @@
  	lynx -cfg=/dev/null -nolist -dump $< > $@
  
@@ -56,9 +54,8 @@ diff -Nru yaps-0.96.orig/Makefile yaps-0.96/Makefile
  	fi
  
  clean:
-diff -Nru yaps-0.96.orig/yaps.rc yaps-0.96/yaps.rc
---- yaps-0.96.orig/yaps.rc	1997-06-11 20:39:06.000000000 +0300
-+++ yaps-0.96/yaps.rc	2005-10-15 10:34:40.313095952 +0300
+--- yaps.rc.orig	2005-06-02 20:28:35.000000000 +0200
++++ yaps.rc	2005-10-16 15:13:32.000000000 +0200
 @@ -9,26 +9,28 @@
  #	This is a comma seperated list of available services. This
  #	is required for autodetect the matching service for a
diff --git a/app-mobilephone/yaps/metadata.xml b/app-mobilephone/yaps/metadata.xml
index 9c5ebcb79a00..7d1862a3ffec 100644
--- a/app-mobilephone/yaps/metadata.xml
+++ b/app-mobilephone/yaps/metadata.xml
@@ -2,5 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>mobile-phone</herd>
-	<longdescription>Yet Another Pager Software (optional with CAPI support)</longdescription>
+	<maintainer>
+		<email>sbriesen@gentoo.org</email>
+		<name>Stefan Briesenick</name>
+	</maintainer>
+	<longdescription lang="en">
+		Yet Another Pager Software (optional with CAPI support).
+	</longdescription>
 </pkgmetadata>
diff --git a/app-mobilephone/yaps/yaps-0.96-r1.ebuild b/app-mobilephone/yaps/yaps-0.96-r1.ebuild
index 6a9fed80eaae..b51cfadf5b29 100644
--- a/app-mobilephone/yaps/yaps-0.96-r1.ebuild
+++ b/app-mobilephone/yaps/yaps-0.96-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-mobilephone/yaps/yaps-0.96-r1.ebuild,v 1.1 2005/10/15 07:57:30 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/yaps/yaps-0.96-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:31 chriswhite Exp $
 
 inherit eutils
 
@@ -20,19 +20,18 @@ RDEPEND="capi? ( net-dialup/capi4k-utils )
 DEPEND="${RDEPEND}
 	lua? ( dev-util/pkgconfig )"
 
-use capi && S="${S}.c2"
-
 src_unpack() {
 	unpack ${A}
+	use capi && mv -f "${S}.c2" "${S}"
+	cd "${S}"
 
 	# apply patches
-	epatch ${FILESDIR}/${P}-gentoo.patch
+	epatch "${FILESDIR}/${P}-gentoo.patch"
 	use capi \
 		&& grep 2>/dev/null -q CAPI_LIBRARY_V2 /usr/include/capiutils.h \
-		&& epatch ${FILESDIR}/${P}-capiv3.patch
+		&& epatch "${FILESDIR}/${P}-capiv3.patch"
 
 	# if specified, convert all relevant files from latin1 to UTF-8
-	cd ${S}
 	if use unicode; then
 		for i in yaps.doc; do
 			einfo "Converting '${i}' to UTF-8"
@@ -45,7 +44,7 @@ src_compile() {
 	local myconf=""
 	use lua && myconf="${myconf} LUA=True"
 	use slang && myconf="${myconf} SLANG=True"
-	emake CFLAGS="$CFLAGS" ${myconf} || die "emake failed"
+	emake CFLAGS="${CFLAGS}" ${myconf} || die "emake failed"
 }
 
 src_install() {
diff --git a/app-mobilephone/yaps/yaps-0.96.ebuild b/app-mobilephone/yaps/yaps-0.96.ebuild
index cba2ecbc72f2..1de8f677d944 100644
--- a/app-mobilephone/yaps/yaps-0.96.ebuild
+++ b/app-mobilephone/yaps/yaps-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/app-mobilephone/yaps/yaps-0.96.ebuild,v 1.1 2005/07/28 20:29:04 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/yaps/yaps-0.96.ebuild,v 1.1.1.1 2005/11/30 09:36:31 chriswhite Exp $
 
 inherit eutils
 
@@ -11,11 +11,13 @@ SRC_URI="capi? ( mirror://sourceforge/capi4yaps/${P}.c2.tgz )
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="capi lua slang unicode"
-DEPEND="capi? ( net-dialup/capi4k-utils )
+
+RDEPEND="capi? ( net-dialup/capi4k-utils )
 	slang? ( sys-libs/slang )
-	lua? ( dev-lang/lua )
+	lua? ( dev-lang/lua )"
+DEPEND="${RDEPEND}
 	lua? ( dev-util/pkgconfig )"
 
 use capi && S="${S}.c2"
@@ -53,7 +55,7 @@ src_install() {
 	keepdir /usr/lib/yaps
 	doman yaps.1
 	dohtml yaps.html
-	dodoc BUGREPORT COPYRIGHT INSTALL README yaps.lsm yaps.doc
+	dodoc BUGREPORT README yaps.lsm yaps.doc
 	docinto contrib
 	dodoc contrib/{README,m2y.pl,tap.sl}
 }
diff --git a/app-xemacs/ada/ChangeLog b/app-xemacs/ada/ChangeLog
index 2c91a0f1015b..e87049e5d21f 100644
--- a/app-xemacs/ada/ChangeLog
+++ b/app-xemacs/ada/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for app-xemacs/ada
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/ada/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/ada/ChangeLog,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> ada-1.13.ebuild:
+  Stable on ppc.
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> ada-1.13.ebuild:
+  Stable on alpha
+
+*ada-1.13 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> ada-1.11.ebuild ada-1.13.ebuild files/digest-ada-1.13 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *ada-1.11 (16 Dec 2002)
 
diff --git a/app-xemacs/ada/Manifest b/app-xemacs/ada/Manifest
index e69de29bb2d1..f5fe74890377 100644
--- a/app-xemacs/ada/Manifest
+++ b/app-xemacs/ada/Manifest
@@ -0,0 +1,5 @@
+MD5 f55efe5f05e225df4545c6150374d662 ChangeLog 705
+MD5 a7301fd8e68eb41f173c1f436cf3904a ada-1.13.ebuild 381
+MD5 81c92247f46e056da3be404b4146e345 ada-1.11.ebuild 358
+MD5 923d57ed320a0d4d9dd702fc1f26ebb2 files/digest-ada-1.13 62
+MD5 4adb44d309fb2052ee521b3776e8e613 files/digest-ada-1.11 62
diff --git a/app-xemacs/ada/ada-1.11.ebuild b/app-xemacs/ada/ada-1.11.ebuild
index f58b048d9928..8a28ec307c6f 100644
--- a/app-xemacs/ada/ada-1.11.ebuild
+++ b/app-xemacs/ada/ada-1.11.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/app-xemacs/ada/ada-1.11.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/ada/ada-1.11.ebuild,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -8,6 +8,6 @@ DESCRIPTION="Ada language support."
 PKG_CAT="standard"
 
 DEPEND=""
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/ada/ada-1.13.ebuild b/app-xemacs/ada/ada-1.13.ebuild
index 494870235736..afadaf924196 100644
--- a/app-xemacs/ada/ada-1.13.ebuild
+++ b/app-xemacs/ada/ada-1.13.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/app-xemacs/ada/ada-1.13.ebuild,v 1.1 2003/02/22 12:46:39 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/ada/ada-1.13.ebuild,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -9,7 +9,6 @@ PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="x86 ppc alpha sparc amd64"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/apel/ChangeLog b/app-xemacs/apel/ChangeLog
index fa4d910c68ab..a7aab867d569 100644
--- a/app-xemacs/apel/ChangeLog
+++ b/app-xemacs/apel/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for app-xemacs/apel
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/apel/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/apel/ChangeLog,v 1.1.1.1 2005/11/30 09:38:55 chriswhite Exp $
+
+  09 Aug 2004; Tom Gall <tgall@gentoo.org> apel-1.26.ebuild:
+  stable on ppc64, bug #57174
+
+  27 Jul 2004; Robert Coie <rac@gentoo.org> +metadata.xml, apel-1.25.ebuild,
+  apel-1.26.ebuild:
+  keywording ppc
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> apel-1.26.ebuild:
+  Stable on alpha
+
+*apel-1.26 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> apel-1.25.ebuild apel-1.26.ebuild files/digest-apel-1.26 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *apel-1.25 (16 Dec 2002)
 
diff --git a/app-xemacs/apel/Manifest b/app-xemacs/apel/Manifest
index e69de29bb2d1..f4005446f8a3 100644
--- a/app-xemacs/apel/Manifest
+++ b/app-xemacs/apel/Manifest
@@ -0,0 +1,6 @@
+MD5 b981e6db1c7289ac9136ce88eb4d78f9 ChangeLog 835
+MD5 2b17b7785adc3a84de23b61f5e9b411c apel-1.25.ebuild 438
+MD5 e3acbc281b931d1b05390882805f5709 apel-1.26.ebuild 449
+MD5 0f39d0139849956930b1a500aca9c6de metadata.xml 365
+MD5 a0d827083e338d46e32f69c7a6149805 files/digest-apel-1.25 64
+MD5 7a46d047e8e6907c55af9268a1b1d031 files/digest-apel-1.26 64
diff --git a/app-xemacs/apel/apel-1.25.ebuild b/app-xemacs/apel/apel-1.25.ebuild
index 77abb1720821..4710594bd36c 100644
--- a/app-xemacs/apel/apel-1.25.ebuild
+++ b/app-xemacs/apel/apel-1.25.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/app-xemacs/apel/apel-1.25.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/apel/apel-1.25.ebuild,v 1.1.1.1 2005/11/30 09:38:55 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -10,6 +10,6 @@ PKG_CAT="standard"
 DEPEND="app-xemacs/fsf-compat
 app-xemacs/xemacs-base
 "
+KEYWORDS="x86 ppc ~alpha sparc"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/apel/apel-1.26.ebuild b/app-xemacs/apel/apel-1.26.ebuild
index c9184a6c42f6..5d22991acf3b 100644
--- a/app-xemacs/apel/apel-1.26.ebuild
+++ b/app-xemacs/apel/apel-1.26.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/app-xemacs/apel/apel-1.26.ebuild,v 1.1 2003/02/22 12:46:39 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/apel/apel-1.26.ebuild,v 1.1.1.1 2005/11/30 09:38:55 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -10,7 +10,6 @@ PKG_CAT="standard"
 DEPEND="app-xemacs/fsf-compat
 app-xemacs/xemacs-base
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="amd64 x86 ppc alpha sparc ppc64"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/auctex/ChangeLog b/app-xemacs/auctex/ChangeLog
index 4cff0fdbf72f..2371bb75a1d5 100644
--- a/app-xemacs/auctex/ChangeLog
+++ b/app-xemacs/auctex/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for app-xemacs/auctex
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/auctex/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/auctex/ChangeLog,v 1.1.1.1 2005/11/30 09:38:55 chriswhite Exp $
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> auctex-1.33.ebuild:
+  Stable on ppc.
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> auctex-1.33.ebuild:
+  Stable on alpha
+
+*auctex-1.33 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> auctex-1.32.ebuild auctex-1.33.ebuild files/digest-auctex-1.33 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *auctex-1.32 (16 Dec 2002)
 
diff --git a/app-xemacs/auctex/Manifest b/app-xemacs/auctex/Manifest
index e69de29bb2d1..816c729a3133 100644
--- a/app-xemacs/auctex/Manifest
+++ b/app-xemacs/auctex/Manifest
@@ -0,0 +1,5 @@
+MD5 6b4d3b95a406cef57aadf64bb4abb08e auctex-1.33.ebuild 390
+MD5 c6583eff60cb35c7afc46dd4a6603b8a ChangeLog 732
+MD5 9cefc1635f1c55400c5c3b29cb3f3958 auctex-1.32.ebuild 390
+MD5 dfce812b5812bba6949d3ddb54aa02e8 files/digest-auctex-1.33 66
+MD5 4774fb631eee5b5b2a09ffdd59737e39 files/digest-auctex-1.32 66
diff --git a/app-xemacs/auctex/auctex-1.32.ebuild b/app-xemacs/auctex/auctex-1.32.ebuild
index e22bf4a68d4a..b7570af9e5a2 100644
--- a/app-xemacs/auctex/auctex-1.32.ebuild
+++ b/app-xemacs/auctex/auctex-1.32.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/app-xemacs/auctex/auctex-1.32.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/auctex/auctex-1.32.ebuild,v 1.1.1.1 2005/11/30 09:38:55 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -9,6 +9,6 @@ PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/auctex/auctex-1.33.ebuild b/app-xemacs/auctex/auctex-1.33.ebuild
index 05dce0d4141d..af9d4e5ec49b 100644
--- a/app-xemacs/auctex/auctex-1.33.ebuild
+++ b/app-xemacs/auctex/auctex-1.33.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/app-xemacs/auctex/auctex-1.33.ebuild,v 1.1 2003/02/22 12:46:39 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/auctex/auctex-1.33.ebuild,v 1.1.1.1 2005/11/30 09:38:55 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -9,7 +9,6 @@ PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="x86 ppc alpha sparc amd64"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/bbdb/ChangeLog b/app-xemacs/bbdb/ChangeLog
index 95c01f1d863e..ba48f86d038e 100644
--- a/app-xemacs/bbdb/ChangeLog
+++ b/app-xemacs/bbdb/ChangeLog
@@ -1,8 +1,20 @@
 # ChangeLog for app-xemacs/bbdb
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/bbdb/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/bbdb/ChangeLog,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
+
+  29 Sep 2005; Joseph Jezak <josejx@gentoo.org> bbdb-1.21.ebuild:
+  Marked ppc stable.
+
+  09 Aug 2004; Tom Gall <tgall@gentoo.org> bbdb-1.21.ebuild:
+  stable on ppc64, bug #57174
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> bbdb-1.21.ebuild:
+  Stable on alpha
 
 *bbdb-1.21 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> bbdb-1.21.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/bbdb/Manifest b/app-xemacs/bbdb/Manifest
index e69de29bb2d1..7bb7349a7216 100644
--- a/app-xemacs/bbdb/Manifest
+++ b/app-xemacs/bbdb/Manifest
@@ -0,0 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b724f954d9022a2626d023b316379a35 ChangeLog 665
+MD5 3121d2054ab6c481ef25ace252dd9201 bbdb-1.21.ebuild 564
+MD5 8d84939a9466557166fbcc015c6752d7 files/digest-bbdb-1.21 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDO41qcsIHjyDViGQRAlFsAJ4+5pZOAGtv0MJwq9Qgnux8jqqMAQCg1sHO
+wE8pmZnS73Lcur53rm9+V0w=
+=UtlL
+-----END PGP SIGNATURE-----
diff --git a/app-xemacs/bbdb/bbdb-1.21.ebuild b/app-xemacs/bbdb/bbdb-1.21.ebuild
index 98c1461d6cd6..3b15b7667b8d 100644
--- a/app-xemacs/bbdb/bbdb-1.21.ebuild
+++ b/app-xemacs/bbdb/bbdb-1.21.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/app-xemacs/bbdb/bbdb-1.21.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/bbdb/bbdb-1.21.ebuild,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -19,6 +19,6 @@ app-xemacs/mail-lib
 app-xemacs/xemacs-base
 app-xemacs/w3
 "
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/build/ChangeLog b/app-xemacs/build/ChangeLog
index 728b8fa3a299..251a0f859dba 100644
--- a/app-xemacs/build/ChangeLog
+++ b/app-xemacs/build/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-xemacs/build
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/build/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/build/ChangeLog,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> build-1.10.ebuild:
+  Stable on alpha
+
+*build-1.10 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> build-1.07.ebuild build-1.10.ebuild files/digest-build-1.10 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *build-1.07 (16 Dec 2002)
 
diff --git a/app-xemacs/build/Manifest b/app-xemacs/build/Manifest
index e69de29bb2d1..7c557ca0c32c 100644
--- a/app-xemacs/build/Manifest
+++ b/app-xemacs/build/Manifest
@@ -0,0 +1,5 @@
+MD5 4c5f0f2c7a867461dc78e8ed4e5ae61c ChangeLog 636
+MD5 18fcb191b7d52a677d6435ae8d12929e build-1.07.ebuild 477
+MD5 7e6b1f0bf62f151d2211d950ed46ffd3 build-1.10.ebuild 482
+MD5 03386133667ed7043835a4a3e264f40a files/digest-build-1.07 64
+MD5 00fdbc21b1270e434e2cc369477b3c60 files/digest-build-1.10 64
diff --git a/app-xemacs/build/build-1.07.ebuild b/app-xemacs/build/build-1.07.ebuild
index c6c54f68ef89..b983997e4112 100644
--- a/app-xemacs/build/build-1.07.ebuild
+++ b/app-xemacs/build/build-1.07.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/app-xemacs/build/build-1.07.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/build/build-1.07.ebuild,v 1.1.1.1 2005/11/30 09:38:54 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -13,6 +13,6 @@ app-xemacs/dired
 app-xemacs/w3
 app-xemacs/prog-modes
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/build/build-1.10.ebuild b/app-xemacs/build/build-1.10.ebuild
index 8829346e8785..73a137f7f8af 100644
--- a/app-xemacs/build/build-1.10.ebuild
+++ b/app-xemacs/build/build-1.10.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/app-xemacs/build/build-1.10.ebuild,v 1.1 2003/02/22 12:46:39 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/build/build-1.10.ebuild,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -13,7 +13,6 @@ app-xemacs/dired
 app-xemacs/w3
 app-xemacs/prog-modes
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/c-support/ChangeLog b/app-xemacs/c-support/ChangeLog
index 46e1f02ba08a..a551565c2a95 100644
--- a/app-xemacs/c-support/ChangeLog
+++ b/app-xemacs/c-support/ChangeLog
@@ -1,8 +1,17 @@
 # ChangeLog for app-xemacs/c-support
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/c-support/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/c-support/ChangeLog,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> c-support-1.16.ebuild:
+  Stable on ppc.
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> c-support-1.16.ebuild:
+  Stable on alpha
 
 *c-support-1.16 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> c-support-1.16.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/c-support/Manifest b/app-xemacs/c-support/Manifest
index e69de29bb2d1..5ea8666efd9d 100644
--- a/app-xemacs/c-support/Manifest
+++ b/app-xemacs/c-support/Manifest
@@ -0,0 +1,3 @@
+MD5 c90fe1786e9f48dd2198785530b9a1d3 c-support-1.16.ebuild 437
+MD5 20a15b96e40cb55fc6578e073feb398b ChangeLog 605
+MD5 dc1dcbccd652e575d04764376f210647 files/digest-c-support-1.16 68
diff --git a/app-xemacs/c-support/c-support-1.16.ebuild b/app-xemacs/c-support/c-support-1.16.ebuild
index c9c092a3f651..202b4b77632b 100644
--- a/app-xemacs/c-support/c-support-1.16.ebuild
+++ b/app-xemacs/c-support/c-support-1.16.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/app-xemacs/c-support/c-support-1.16.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/c-support/c-support-1.16.ebuild,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -10,6 +10,6 @@ PKG_CAT="standard"
 DEPEND="app-xemacs/cc-mode
 app-xemacs/xemacs-base
 "
+KEYWORDS="x86 ppc alpha sparc amd64"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/calc/ChangeLog b/app-xemacs/calc/ChangeLog
index fe8f93fbb441..69cbe59944c7 100644
--- a/app-xemacs/calc/ChangeLog
+++ b/app-xemacs/calc/ChangeLog
@@ -1,8 +1,23 @@
 # ChangeLog for app-xemacs/calc
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/calc/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/calc/ChangeLog,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> calc-1.23.ebuild:
+  Stable on ppc.
+
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org> calc-1.23.ebuild:
+  Stable on ppc64
+
+  01 Nov 2004; Markus Rothe <corsair@gentoo.org> calc-1.23.ebuild:
+  Marked ~ppc64; bug #67086
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> calc-1.23.ebuild:
+  Stable on alpha
 
 *calc-1.23 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> calc-1.23.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/calc/Manifest b/app-xemacs/calc/Manifest
index e69de29bb2d1..1591f22eaec8 100644
--- a/app-xemacs/calc/Manifest
+++ b/app-xemacs/calc/Manifest
@@ -0,0 +1,3 @@
+MD5 bf758919b2a33fccf152e941215a12a2 ChangeLog 757
+MD5 911e613899f1de857947343d8b07b015 calc-1.23.ebuild 385
+MD5 c65695e9b82320dbcfae44295177d1c2 files/digest-calc-1.23 65
diff --git a/app-xemacs/calc/calc-1.23.ebuild b/app-xemacs/calc/calc-1.23.ebuild
index 41038753c8e1..9c2ca34a099e 100644
--- a/app-xemacs/calc/calc-1.23.ebuild
+++ b/app-xemacs/calc/calc-1.23.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/app-xemacs/calc/calc-1.23.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/calc/calc-1.23.ebuild,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -9,6 +9,6 @@ PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
 "
+KEYWORDS="x86 ppc alpha sparc amd64 ppc64"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/calendar/ChangeLog b/app-xemacs/calendar/ChangeLog
index 10504d632881..22646a37a836 100644
--- a/app-xemacs/calendar/ChangeLog
+++ b/app-xemacs/calendar/ChangeLog
@@ -1,8 +1,23 @@
 # ChangeLog for app-xemacs/calendar
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/calendar/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/calendar/ChangeLog,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> calendar-1.19.ebuild:
+  Stable on ppc.
+
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org> calendar-1.19.ebuild:
+  Stable on ppc64
+
+  01 Nov 2004; Markus Rothe <corsair@gentoo.org> calendar-1.19.ebuild:
+  Marked ~ppc64; bug #67097
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> calendar-1.19.ebuild:
+  Stable on alpha
 
 *calendar-1.19 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> calendar-1.19.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/calendar/Manifest b/app-xemacs/calendar/Manifest
index e69de29bb2d1..889a51f62fcc 100644
--- a/app-xemacs/calendar/Manifest
+++ b/app-xemacs/calendar/Manifest
@@ -0,0 +1,3 @@
+MD5 71d9609f128d03f104e15ec00bb35b2b ChangeLog 789
+MD5 a14dcd6a65484e1e9ec0ff80155a5676 calendar-1.19.ebuild 404
+MD5 21c9c652e990401fc4e45615b4b9880c files/digest-calendar-1.19 68
diff --git a/app-xemacs/calendar/calendar-1.19.ebuild b/app-xemacs/calendar/calendar-1.19.ebuild
index c087627bf599..493d18b94cd8 100644
--- a/app-xemacs/calendar/calendar-1.19.ebuild
+++ b/app-xemacs/calendar/calendar-1.19.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/app-xemacs/calendar/calendar-1.19.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/calendar/calendar-1.19.ebuild,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -9,6 +9,6 @@ PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
 "
+KEYWORDS="x86 ppc alpha sparc amd64 ppc64"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/cc-mode/ChangeLog b/app-xemacs/cc-mode/ChangeLog
index 6880db543da3..fb15725de114 100644
--- a/app-xemacs/cc-mode/ChangeLog
+++ b/app-xemacs/cc-mode/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for app-xemacs/cc-mode
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/cc-mode/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/cc-mode/ChangeLog,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> cc-mode-1.32.ebuild:
+  Stable on ppc.
+
+  09 Aug 2004; Tom Gall <tgall@gentoo.org> cc-mode-1.32.ebuild:
+  stable on ppc64, bug #57174
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> cc-mode-1.32.ebuild:
+  Stable on alpha
+
+*cc-mode-1.32 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> cc-mode-1.31.ebuild cc-mode-1.32.ebuild files/digest-cc-mode-1.32 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *cc-mode-1.31 (16 Dec 2002)
 
diff --git a/app-xemacs/cc-mode/Manifest b/app-xemacs/cc-mode/Manifest
index e69de29bb2d1..ba49aa8d0c94 100644
--- a/app-xemacs/cc-mode/Manifest
+++ b/app-xemacs/cc-mode/Manifest
@@ -0,0 +1,5 @@
+MD5 1ac541ebe1b00026cec7b2b56ee52dd8 ChangeLog 836
+MD5 0959ef297f5695ed57abb773da90fff9 cc-mode-1.31.ebuild 421
+MD5 cf5a8d9ce31238a6d20859347a6c09a9 cc-mode-1.32.ebuild 427
+MD5 7173f9f05d150ef005d4364169493117 files/digest-cc-mode-1.31 67
+MD5 e0a39c59e95418f259dc261d55a0deab files/digest-cc-mode-1.32 67
diff --git a/app-xemacs/cc-mode/cc-mode-1.31.ebuild b/app-xemacs/cc-mode/cc-mode-1.31.ebuild
index c0c03eccd11b..725043775f10 100644
--- a/app-xemacs/cc-mode/cc-mode-1.31.ebuild
+++ b/app-xemacs/cc-mode/cc-mode-1.31.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/app-xemacs/cc-mode/cc-mode-1.31.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/cc-mode/cc-mode-1.31.ebuild,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -10,6 +10,6 @@ PKG_CAT="standard"
 DEPEND="app-xemacs/xemacs-base
 app-xemacs/mail-lib
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/cc-mode/cc-mode-1.32.ebuild b/app-xemacs/cc-mode/cc-mode-1.32.ebuild
index 87507d0d16f4..29c5b2a1b638 100644
--- a/app-xemacs/cc-mode/cc-mode-1.32.ebuild
+++ b/app-xemacs/cc-mode/cc-mode-1.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: /var/cvsroot/gentoo-x86/app-xemacs/cc-mode/cc-mode-1.32.ebuild,v 1.1 2003/02/22 12:46:39 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/cc-mode/cc-mode-1.32.ebuild,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -10,7 +10,6 @@ PKG_CAT="standard"
 DEPEND="app-xemacs/xemacs-base
 app-xemacs/mail-lib
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="amd64 x86 ppc alpha sparc ppc64"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/clearcase/ChangeLog b/app-xemacs/clearcase/ChangeLog
index 76922a2e765a..2a9c688820b3 100644
--- a/app-xemacs/clearcase/ChangeLog
+++ b/app-xemacs/clearcase/ChangeLog
@@ -1,8 +1,14 @@
 # ChangeLog for app-xemacs/clearcase
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/clearcase/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/clearcase/ChangeLog,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> clearcase-1.04.ebuild:
+  Stable on alpha
 
 *clearcase-1.04 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> clearcase-1.04.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/clearcase/Manifest b/app-xemacs/clearcase/Manifest
index e69de29bb2d1..67c9dc690ec6 100644
--- a/app-xemacs/clearcase/Manifest
+++ b/app-xemacs/clearcase/Manifest
@@ -0,0 +1,3 @@
+MD5 898a90a84b9bff6a50e3e1ddcfc9a3f7 ChangeLog 514
+MD5 4cd989916a7535ce51ec2db79037e4b7 clearcase-1.04.ebuild 493
+MD5 075f9b399f7c793a7c9b41eb3afde6da files/digest-clearcase-1.04 68
diff --git a/app-xemacs/clearcase/clearcase-1.04.ebuild b/app-xemacs/clearcase/clearcase-1.04.ebuild
index 36fa58915cf9..ca4f3143f6ac 100644
--- a/app-xemacs/clearcase/clearcase-1.04.ebuild
+++ b/app-xemacs/clearcase/clearcase-1.04.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/app-xemacs/clearcase/clearcase-1.04.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/clearcase/clearcase-1.04.ebuild,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -12,6 +12,6 @@ app-xemacs/fsf-compat
 app-xemacs/mail-lib
 app-xemacs/xemacs-base
 "
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/cookie/ChangeLog b/app-xemacs/cookie/ChangeLog
index 39c19770f5f1..27ef9080a4b4 100644
--- a/app-xemacs/cookie/ChangeLog
+++ b/app-xemacs/cookie/ChangeLog
@@ -1,8 +1,20 @@
 # ChangeLog for app-xemacs/cookie
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/cookie/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/cookie/ChangeLog,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> cookie-1.14.ebuild:
+  Stable on ppc.
+
+  09 Aug 2004; Tom Gall <tgall@gentoo.org> cookie-1.14.ebuild:
+  stable on ppc64, bug #57174
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> cookie-1.14.ebuild:
+  Stable on alpha
 
 *cookie-1.14 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> cookie-1.14.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/cookie/Manifest b/app-xemacs/cookie/Manifest
index e69de29bb2d1..9e7fb1a13367 100644
--- a/app-xemacs/cookie/Manifest
+++ b/app-xemacs/cookie/Manifest
@@ -0,0 +1,3 @@
+MD5 31fe3b74d9a7ac20de2b9798b54812bb cookie-1.14.ebuild 402
+MD5 faf3231a01032ddddd1a58177d59b370 ChangeLog 681
+MD5 7ef635f3835731638d7b340c4df42599 files/digest-cookie-1.14 65
diff --git a/app-xemacs/cookie/cookie-1.14.ebuild b/app-xemacs/cookie/cookie-1.14.ebuild
index be4dddd1b989..0dd9e8b1cd58 100644
--- a/app-xemacs/cookie/cookie-1.14.ebuild
+++ b/app-xemacs/cookie/cookie-1.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/app-xemacs/cookie/cookie-1.14.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/cookie/cookie-1.14.ebuild,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -9,6 +9,6 @@ PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
 "
+KEYWORDS="amd64 x86 ppc alpha sparc ppc64"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/crisp/ChangeLog b/app-xemacs/crisp/ChangeLog
index 2a8f1cae8d5b..9a0f33fdd8bb 100644
--- a/app-xemacs/crisp/ChangeLog
+++ b/app-xemacs/crisp/ChangeLog
@@ -1,8 +1,17 @@
 # ChangeLog for app-xemacs/crisp
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/crisp/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/crisp/ChangeLog,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> crisp-1.12.ebuild:
+  Stable on ppc.
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> crisp-1.12.ebuild:
+  Stable on alpha
 
 *crisp-1.12 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> crisp-1.12.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/crisp/Manifest b/app-xemacs/crisp/Manifest
index e69de29bb2d1..7c7689cbaa1a 100644
--- a/app-xemacs/crisp/Manifest
+++ b/app-xemacs/crisp/Manifest
@@ -0,0 +1,3 @@
+MD5 338b3922d2e83b0091a694d1e836baf4 ChangeLog 581
+MD5 2a6543a72c8f26f6860c50287e64b2d5 crisp-1.12.ebuild 364
+MD5 0f1069d898208f20b0246e33abae8665 files/digest-crisp-1.12 64
diff --git a/app-xemacs/crisp/crisp-1.12.ebuild b/app-xemacs/crisp/crisp-1.12.ebuild
index c0f864f21a00..b12f29dfb090 100644
--- a/app-xemacs/crisp/crisp-1.12.ebuild
+++ b/app-xemacs/crisp/crisp-1.12.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/app-xemacs/crisp/crisp-1.12.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/crisp/crisp-1.12.ebuild,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -8,6 +8,6 @@ DESCRIPTION="Crisp/Brief emulation."
 PKG_CAT="standard"
 
 DEPEND=""
+KEYWORDS="x86 ppc alpha sparc amd64"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/debug/ChangeLog b/app-xemacs/debug/ChangeLog
index 8ea6345e04a7..9315fa59fe21 100644
--- a/app-xemacs/debug/ChangeLog
+++ b/app-xemacs/debug/ChangeLog
@@ -1,8 +1,23 @@
 # ChangeLog for app-xemacs/debug
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/debug/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/debug/ChangeLog,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> debug-1.16.ebuild:
+  Stable on ppc.
+
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org> debug-1.16.ebuild:
+  Stable on ppc64
+
+  01 Nov 2004; Markus Rothe <corsair@gentoo.org> debug-1.16.ebuild:
+  Marked ~ppc64; bug #67094
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> debug-1.16.ebuild:
+  Stable on alpha
 
 *debug-1.16 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> debug-1.16.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/debug/Manifest b/app-xemacs/debug/Manifest
index e69de29bb2d1..4797b44625d7 100644
--- a/app-xemacs/debug/Manifest
+++ b/app-xemacs/debug/Manifest
@@ -0,0 +1,3 @@
+MD5 9d784c5fa86c6d3a2b31a16ef0f76bd7 ChangeLog 765
+MD5 b94f7821619573727801a73ef3a50da9 debug-1.16.ebuild 403
+MD5 96d60f898063d3960a5ebb65df8f240e files/digest-debug-1.16 65
diff --git a/app-xemacs/debug/debug-1.16.ebuild b/app-xemacs/debug/debug-1.16.ebuild
index 5ce8545dff08..9873eec40cbb 100644
--- a/app-xemacs/debug/debug-1.16.ebuild
+++ b/app-xemacs/debug/debug-1.16.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/app-xemacs/debug/debug-1.16.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/debug/debug-1.16.ebuild,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -9,6 +9,6 @@ PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
 "
+KEYWORDS="x86 ppc alpha sparc amd64 ppc64"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/dictionary/ChangeLog b/app-xemacs/dictionary/ChangeLog
index 617817504908..256b3a256b58 100644
--- a/app-xemacs/dictionary/ChangeLog
+++ b/app-xemacs/dictionary/ChangeLog
@@ -1,8 +1,21 @@
 # ChangeLog for app-xemacs/dictionary
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/dictionary/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/dictionary/ChangeLog,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  dictionary-1.11.ebuild:
+  Stable on ppc.
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> dictionary-1.11.ebuild:
+  Stable on alpha
 
 *dictionary-1.11 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> dictionary-1.11.ebuild :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003;  <rendhalver@gentoo.org> dictionary-1.11.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/dictionary/Manifest b/app-xemacs/dictionary/Manifest
index e69de29bb2d1..86043c810750 100644
--- a/app-xemacs/dictionary/Manifest
+++ b/app-xemacs/dictionary/Manifest
@@ -0,0 +1,3 @@
+MD5 778f08407627926bf317e6c9777f7c55 ChangeLog 704
+MD5 6e333a6d6c03ee1dc074d15567ad58ff dictionary-1.11.ebuild 415
+MD5 1a0ad8a2f561aa12e16bb4f18a255918 files/digest-dictionary-1.11 69
diff --git a/app-xemacs/dictionary/dictionary-1.11.ebuild b/app-xemacs/dictionary/dictionary-1.11.ebuild
index 35af11630318..c6c59818bf5b 100644
--- a/app-xemacs/dictionary/dictionary-1.11.ebuild
+++ b/app-xemacs/dictionary/dictionary-1.11.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/app-xemacs/dictionary/dictionary-1.11.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/dictionary/dictionary-1.11.ebuild,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -9,6 +9,6 @@ PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
 "
+KEYWORDS="x86 ppc alpha sparc amd64"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/dired/ChangeLog b/app-xemacs/dired/ChangeLog
index fb011413d234..4c6ebffed0df 100644
--- a/app-xemacs/dired/ChangeLog
+++ b/app-xemacs/dired/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for app-xemacs/dired
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/dired/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/dired/ChangeLog,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
+
+  29 Sep 2005; Joseph Jezak <josejx@gentoo.org> dired-1.13.ebuild:
+  Marked ppc stable.
+
+  09 Aug 2004; Tom Gall <tgall@gentoo.org> dired-1.13.ebuild:
+  stable on ppc64, bug #57174
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> dired-1.13.ebuild:
+  Stable on alpha
+
+*dired-1.13 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> dired-1.12.ebuild dired-1.13.ebuild files/digest-dired-1.13 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003;  <rendhalver@gentoo.org> dired-1.12.ebuild dired-1.13.ebuild files/digest-dired-1.13 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *dired-1.12 (16 Dec 2002)
 
diff --git a/app-xemacs/dired/Manifest b/app-xemacs/dired/Manifest
index e69de29bb2d1..2790cb38ad8d 100644
--- a/app-xemacs/dired/Manifest
+++ b/app-xemacs/dired/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6d94664a71d04a582ad7d00eb2506a78 ChangeLog 942
+MD5 51e37de7a3cd51dbe421b1d7aec0cb5a dired-1.12.ebuild 406
+MD5 e15388d613fd5a67efde89816e620406 dired-1.13.ebuild 412
+MD5 f6ef61d4f5b90bd1fb0cac3359b9e942 files/digest-dired-1.13 65
+MD5 104215ca71116137bd5f2157c284c57f files/digest-dired-1.12 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDO4uOcsIHjyDViGQRAteUAJ0Qqqnpfj+awPcpWlVIeN0w18tEoQCgzul9
+5szThjEtU9GdFifGtsiiJVQ=
+=mw0j
+-----END PGP SIGNATURE-----
diff --git a/app-xemacs/dired/dired-1.12.ebuild b/app-xemacs/dired/dired-1.12.ebuild
index ca28359e13f2..a3d344e37635 100644
--- a/app-xemacs/dired/dired-1.12.ebuild
+++ b/app-xemacs/dired/dired-1.12.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/app-xemacs/dired/dired-1.12.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/dired/dired-1.12.ebuild,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -10,6 +10,6 @@ PKG_CAT="standard"
 DEPEND="app-xemacs/xemacs-base
 app-xemacs/prog-modes
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/dired/dired-1.13.ebuild b/app-xemacs/dired/dired-1.13.ebuild
index 4dae8b57d42d..93994a194e49 100644
--- a/app-xemacs/dired/dired-1.13.ebuild
+++ b/app-xemacs/dired/dired-1.13.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/app-xemacs/dired/dired-1.13.ebuild,v 1.1 2003/02/22 12:46:39 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/dired/dired-1.13.ebuild,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -10,7 +10,6 @@ PKG_CAT="standard"
 DEPEND="app-xemacs/xemacs-base
 app-xemacs/prog-modes
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/docbookide/ChangeLog b/app-xemacs/docbookide/ChangeLog
index 50c4ee457084..917bd1e78a60 100644
--- a/app-xemacs/docbookide/ChangeLog
+++ b/app-xemacs/docbookide/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for app-xemacs/docbookide
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/docbookide/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/docbookide/ChangeLog,v 1.1.1.1 2005/11/30 09:38:54 chriswhite Exp $
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> docbookide-0.06.ebuild:
+  Stable on alpha
+
+*docbookide-0.06 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> docbookide-0.05.ebuild docbookide-0.06.ebuild files/digest-docbookide-0.06 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  fix depend on ispell to point to xemacs-ispell
 
 *docbookide-0.05 (16 Dec 2002)
 
diff --git a/app-xemacs/docbookide/Manifest b/app-xemacs/docbookide/Manifest
index e69de29bb2d1..dfe0de5a6629 100644
--- a/app-xemacs/docbookide/Manifest
+++ b/app-xemacs/docbookide/Manifest
@@ -0,0 +1,5 @@
+MD5 943a56ff2f37182a84ef1bd0c370c26b ChangeLog 778
+MD5 e52c6a3048abfe1aca40c94b92a763de docbookide-0.05.ebuild 444
+MD5 23cb11aa33bf37a8161c859265557f65 docbookide-0.06.ebuild 449
+MD5 d32b5a08a0873dc98356896d43f41d9e files/digest-docbookide-0.05 69
+MD5 19744e30bf6c90a392b276f244e51c78 files/digest-docbookide-0.06 69
diff --git a/app-xemacs/docbookide/docbookide-0.05.ebuild b/app-xemacs/docbookide/docbookide-0.05.ebuild
index 31c28d49a0b4..9350ad04920e 100644
--- a/app-xemacs/docbookide/docbookide-0.05.ebuild
+++ b/app-xemacs/docbookide/docbookide-0.05.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/app-xemacs/docbookide/docbookide-0.05.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/docbookide/docbookide-0.05.ebuild,v 1.1.1.1 2005/11/30 09:38:54 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -8,9 +8,10 @@ DESCRIPTION="DocBook editing support."
 PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
-app-xemacs/ispell
+app-xemacs/xemacs-ispell
 app-xemacs/mail-lib
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/docbookide/docbookide-0.06.ebuild b/app-xemacs/docbookide/docbookide-0.06.ebuild
index 7f28e4f9e9e3..f9a21a8a69ed 100644
--- a/app-xemacs/docbookide/docbookide-0.06.ebuild
+++ b/app-xemacs/docbookide/docbookide-0.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/app-xemacs/docbookide/docbookide-0.06.ebuild,v 1.1 2003/02/22 12:46:39 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/docbookide/docbookide-0.06.ebuild,v 1.1.1.1 2005/11/30 09:38:54 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -11,7 +11,7 @@ DEPEND="app-xemacs/xemacs-base
 app-xemacs/xemacs-ispell
 app-xemacs/mail-lib
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/ecb/ChangeLog b/app-xemacs/ecb/ChangeLog
index 178471324f6f..95de07d0923f 100644
--- a/app-xemacs/ecb/ChangeLog
+++ b/app-xemacs/ecb/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-xemacs/ecb
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/ecb/ChangeLog,v 1.1 2003/02/22 12:46:39 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/ecb/ChangeLog,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> ecb-1.01.ebuild:
+  Stable on alpha
 
 *ecb-1.01 (16 Dec 2002)
 
diff --git a/app-xemacs/ecb/Manifest b/app-xemacs/ecb/Manifest
index e69de29bb2d1..103ac317cc22 100644
--- a/app-xemacs/ecb/Manifest
+++ b/app-xemacs/ecb/Manifest
@@ -0,0 +1,3 @@
+MD5 11cc640148c79c03ee5f9096f54d2acf ChangeLog 506
+MD5 7a3687db6b1a55c0ce949b26a2cbde16 ecb-1.01.ebuild 586
+MD5 eca7ff6532310c34ffb5c42e93fc2df4 files/digest-ecb-1.01 63
diff --git a/app-xemacs/ecb/ecb-1.01.ebuild b/app-xemacs/ecb/ecb-1.01.ebuild
index e67f587f2b53..6f0be702b8f6 100644
--- a/app-xemacs/ecb/ecb-1.01.ebuild
+++ b/app-xemacs/ecb/ecb-1.01.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/app-xemacs/ecb/ecb-1.01.ebuild,v 1.1 2003/02/22 12:46:39 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/ecb/ecb-1.01.ebuild,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -19,7 +19,6 @@ app-xemacs/ediff
 app-xemacs/xemacs-devel
 app-xemacs/speedbar
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/ecrypto/ChangeLog b/app-xemacs/ecrypto/ChangeLog
index 830b98388bdd..26490051eb56 100644
--- a/app-xemacs/ecrypto/ChangeLog
+++ b/app-xemacs/ecrypto/ChangeLog
@@ -1,8 +1,20 @@
 # ChangeLog for app-xemacs/ecrypto
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/ecrypto/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/ecrypto/ChangeLog,v 1.1.1.1 2005/11/30 09:38:54 chriswhite Exp $
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> ecrypto-0.12.ebuild:
+  Stable on ppc.
+
+  09 Aug 2004; Tom Gall <tgall@gentoo.org> ecrypto-0.12.ebuild:
+  stable on ppc64, bug #57174
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> ecrypto-0.12.ebuild:
+  Stable on alpha
 
 *ecrypto-0.12 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> ecrypto-0.12.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/ecrypto/Manifest b/app-xemacs/ecrypto/Manifest
index e69de29bb2d1..9d4e3fbdc962 100644
--- a/app-xemacs/ecrypto/Manifest
+++ b/app-xemacs/ecrypto/Manifest
@@ -0,0 +1,3 @@
+MD5 de5904b1bd369c4dcb8ef0fc10af975e ChangeLog 688
+MD5 320c13f3c79bdbd469694707cba90409 ecrypto-0.12.ebuild 387
+MD5 e6cbc6e38f71912b1f8acef2c0afff82 files/digest-ecrypto-0.12 66
diff --git a/app-xemacs/ecrypto/ecrypto-0.12.ebuild b/app-xemacs/ecrypto/ecrypto-0.12.ebuild
index f48e7912c5f6..8b4be7774e78 100644
--- a/app-xemacs/ecrypto/ecrypto-0.12.ebuild
+++ b/app-xemacs/ecrypto/ecrypto-0.12.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/app-xemacs/ecrypto/ecrypto-0.12.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/ecrypto/ecrypto-0.12.ebuild,v 1.1.1.1 2005/11/30 09:38:54 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -8,6 +8,6 @@ DESCRIPTION="Crypto functionality in Emacs Lisp."
 PKG_CAT="standard"
 
 DEPEND=""
+KEYWORDS="amd64 x86 ppc alpha sparc ppc64"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/edebug/ChangeLog b/app-xemacs/edebug/ChangeLog
index fe5ad07a6da9..5cdb6ce9d077 100644
--- a/app-xemacs/edebug/ChangeLog
+++ b/app-xemacs/edebug/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for app-xemacs/edebug
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/edebug/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/edebug/ChangeLog,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> edebug-1.15.ebuild:
+  Stable on ppc.
+
+  09 Aug 2004; Tom Gall <tgall@gentoo.org> edebug-1.15.ebuild:
+  stable on ppc64, bug #57174
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> edebug-1.15.ebuild:
+  Stable on alpha
+
+*edebug-1.15 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> edebug-1.14.ebuild edebug-1.15.ebuild files/digest-edebug-1.15 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *edebug-1.14 (16 Dec 2002)
 
diff --git a/app-xemacs/edebug/Manifest b/app-xemacs/edebug/Manifest
index e69de29bb2d1..4f4b23d37f09 100644
--- a/app-xemacs/edebug/Manifest
+++ b/app-xemacs/edebug/Manifest
@@ -0,0 +1,5 @@
+MD5 45c3f3cf8519ad961889678fc52bf572 ChangeLog 826
+MD5 ade8eaa48f699b12265768688a3d0988 edebug-1.14.ebuild 389
+MD5 0a332ad7684cea7999a6f9e392f864e8 edebug-1.15.ebuild 395
+MD5 99fcf3f45325f9c1dbb6c8c7879c9528 files/digest-edebug-1.14 66
+MD5 120705d092744cdd2be4810ae87e53e7 files/digest-edebug-1.15 66
diff --git a/app-xemacs/edebug/edebug-1.14.ebuild b/app-xemacs/edebug/edebug-1.14.ebuild
index 0b3ffce7c138..5f89a5d1af18 100644
--- a/app-xemacs/edebug/edebug-1.14.ebuild
+++ b/app-xemacs/edebug/edebug-1.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/app-xemacs/edebug/edebug-1.14.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/edebug/edebug-1.14.ebuild,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -9,6 +9,6 @@ PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/edebug/edebug-1.15.ebuild b/app-xemacs/edebug/edebug-1.15.ebuild
index 1130bd03332b..e6d917f79c03 100644
--- a/app-xemacs/edebug/edebug-1.15.ebuild
+++ b/app-xemacs/edebug/edebug-1.15.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/app-xemacs/edebug/edebug-1.15.ebuild,v 1.1 2003/02/22 12:46:39 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/edebug/edebug-1.15.ebuild,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -9,7 +9,6 @@ PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="amd64 x86 ppc alpha sparc ppc64"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/edict/ChangeLog b/app-xemacs/edict/ChangeLog
index 36f2109e96a8..6cfa22ed28c6 100644
--- a/app-xemacs/edict/ChangeLog
+++ b/app-xemacs/edict/ChangeLog
@@ -1,8 +1,17 @@
 # ChangeLog for app-xemacs/edict
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/edict/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/edict/ChangeLog,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> edict-1.13.ebuild:
+  Stable on ppc.
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> edict-1.13.ebuild:
+  Stable on alpha
 
 *edict-1.13 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> edict-1.13.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/edict/Manifest b/app-xemacs/edict/Manifest
index e69de29bb2d1..e9e5224a1fa4 100644
--- a/app-xemacs/edict/Manifest
+++ b/app-xemacs/edict/Manifest
@@ -0,0 +1,3 @@
+MD5 ff09f6302f512e35d6ab3d1d53cb5f44 edict-1.13.ebuild 429
+MD5 4cbfcf709092ed699a32fe628c5a9d0c ChangeLog 581
+MD5 d9f41431a8ec060969a37ac861692ca9 files/digest-edict-1.13 64
diff --git a/app-xemacs/edict/edict-1.13.ebuild b/app-xemacs/edict/edict-1.13.ebuild
index bf1041b5296d..d6c536b6cd07 100644
--- a/app-xemacs/edict/edict-1.13.ebuild
+++ b/app-xemacs/edict/edict-1.13.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/app-xemacs/edict/edict-1.13.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/edict/edict-1.13.ebuild,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -10,6 +10,6 @@ PKG_CAT="mule"
 DEPEND="app-xemacs/mule-base
 app-xemacs/xemacs-base
 "
+KEYWORDS="x86 ppc alpha sparc amd64"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/ediff/ChangeLog b/app-xemacs/ediff/ChangeLog
index 2b1cec8dc2de..fd95988ca2c2 100644
--- a/app-xemacs/ediff/ChangeLog
+++ b/app-xemacs/ediff/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for app-xemacs/ediff
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/ediff/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/ediff/ChangeLog,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
+
+  29 Sep 2005; Joseph Jezak <josejx@gentoo.org> ediff-1.46.ebuild:
+  Marked ppc stable.
+
+  09 Aug 2004; Tom Gall <tgall@gentoo.org> ediff-1.46.ebuild:
+  stable on ppc64, bug #57174
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> ediff-1.46.ebuild:
+  Stable on alpha
+
+*ediff-1.46 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> ediff-1.44.ebuild ediff-1.46.ebuild files/digest-ediff-1.46 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
+  changed alpha to ~alpha
 
 *ediff-1.44 (16 Dec 2002)
 
diff --git a/app-xemacs/ediff/Manifest b/app-xemacs/ediff/Manifest
index e69de29bb2d1..4cb741284b01 100644
--- a/app-xemacs/ediff/Manifest
+++ b/app-xemacs/ediff/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8f91c374c8a13d2a3fdbc8954d79ac07 ChangeLog 840
+MD5 3337898c9d60a99c5d659bedec69199d ediff-1.46.ebuild 487
+MD5 dda10e5edc0b8e4ed844b3806e6998e7 ediff-1.44.ebuild 481
+MD5 c31ecfa212f62af9698c2874dad6d3a3 files/digest-ediff-1.44 65
+MD5 d62e231ab48b4d84cb2311c339115dd3 files/digest-ediff-1.46 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDO4omcsIHjyDViGQRAqohAKDYy98AhIVnoHc6Z1bKMGCHfYq43wCgxDfV
+TAfjH4ZknrBfWYRNW9Y2pPM=
+=+sco
+-----END PGP SIGNATURE-----
diff --git a/app-xemacs/ediff/ediff-1.44.ebuild b/app-xemacs/ediff/ediff-1.44.ebuild
index 64d36a6d8bcc..e8b1a71c5667 100644
--- a/app-xemacs/ediff/ediff-1.44.ebuild
+++ b/app-xemacs/ediff/ediff-1.44.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/app-xemacs/ediff/ediff-1.44.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/ediff/ediff-1.44.ebuild,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -14,6 +14,6 @@ app-xemacs/xemacs-base
 app-xemacs/edebug
 app-xemacs/prog-modes
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/ediff/ediff-1.46.ebuild b/app-xemacs/ediff/ediff-1.46.ebuild
index df681d093f9b..2c56dfb5e6ea 100644
--- a/app-xemacs/ediff/ediff-1.46.ebuild
+++ b/app-xemacs/ediff/ediff-1.46.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/app-xemacs/ediff/ediff-1.46.ebuild,v 1.1 2003/02/22 12:46:39 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/ediff/ediff-1.46.ebuild,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -14,7 +14,6 @@ app-xemacs/xemacs-base
 app-xemacs/edebug
 app-xemacs/prog-modes
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/edit-utils/ChangeLog b/app-xemacs/edit-utils/ChangeLog
index e3dce0636b58..eaac57fee87f 100644
--- a/app-xemacs/edit-utils/ChangeLog
+++ b/app-xemacs/edit-utils/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for app-xemacs/edit-utils
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/edit-utils/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/edit-utils/ChangeLog,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
+
+  29 Sep 2005; Joseph Jezak <josejx@gentoo.org> edit-utils-1.98.ebuild:
+  Marked ppc stable.
+
+  09 Aug 2004; Tom Gall <tgall@gentoo.org> edit-utils-1.98,ebuild:
+  stable on ppc64, bug #57174
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> edit-utils-1.98.ebuild:
+  Stable on alpha
+
+*edit-utils-1.98 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> edit-utils-1.95.ebuild edit-utils-1.98.ebuild files/digest-edit-utils-1.98 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *edit-utils-1.95 (16 Dec 2002)
 
diff --git a/app-xemacs/edit-utils/Manifest b/app-xemacs/edit-utils/Manifest
index e69de29bb2d1..484225bd7509 100644
--- a/app-xemacs/edit-utils/Manifest
+++ b/app-xemacs/edit-utils/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f4a8a2eda11097a4dab13560e894e9a8 ChangeLog 864
+MD5 0dbb41b86f721496e38d8c363b969653 edit-utils-1.95.ebuild 489
+MD5 bd8244459aab0d2a956af6b3971442de edit-utils-1.98.ebuild 519
+MD5 418d298a1bfb1fbff3a784d003cea6ec files/digest-edit-utils-1.95 70
+MD5 e9af323fed0cd4215e3753df32714cbd files/digest-edit-utils-1.98 70
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDO4mIcsIHjyDViGQRAkWQAKCD7W27H88SdjcnGfJhNpExXgXQnQCgo9HC
+ZTvw7b6w6XmkwAj6ptJqRAk=
+=utzD
+-----END PGP SIGNATURE-----
diff --git a/app-xemacs/edit-utils/edit-utils-1.95.ebuild b/app-xemacs/edit-utils/edit-utils-1.95.ebuild
index a1d89148125b..743f84cc4d5b 100644
--- a/app-xemacs/edit-utils/edit-utils-1.95.ebuild
+++ b/app-xemacs/edit-utils/edit-utils-1.95.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/app-xemacs/edit-utils/edit-utils-1.95.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/edit-utils/edit-utils-1.95.ebuild,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -12,6 +12,6 @@ app-xemacs/fsf-compat
 app-xemacs/dired
 app-xemacs/mail-lib
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/edit-utils/edit-utils-1.98.ebuild b/app-xemacs/edit-utils/edit-utils-1.98.ebuild
index 4b501ea488c5..7e7386c09c7e 100644
--- a/app-xemacs/edit-utils/edit-utils-1.98.ebuild
+++ b/app-xemacs/edit-utils/edit-utils-1.98.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/app-xemacs/edit-utils/edit-utils-1.98.ebuild,v 1.1 2003/02/22 12:46:40 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/edit-utils/edit-utils-1.98.ebuild,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -13,7 +13,6 @@ app-xemacs/fsf-compat
 app-xemacs/dired
 app-xemacs/mail-lib
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/edt/ChangeLog b/app-xemacs/edt/ChangeLog
index d7c7443f0a08..c5d2bd2620ca 100644
--- a/app-xemacs/edt/ChangeLog
+++ b/app-xemacs/edt/ChangeLog
@@ -1,8 +1,14 @@
 # ChangeLog for app-xemacs/edt
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/edt/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/edt/ChangeLog,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> edt-1.12.ebuild:
+  Stable on alpha
 
 *edt-1.12 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> edt-1.12.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/edt/Manifest b/app-xemacs/edt/Manifest
index e69de29bb2d1..a0fe0103337a 100644
--- a/app-xemacs/edt/Manifest
+++ b/app-xemacs/edt/Manifest
@@ -0,0 +1,3 @@
+MD5 0024800dd965fcfbd142d5c260a9ed12 ChangeLog 484
+MD5 abfc4d75e096d967fc24d0058f43cef2 edt-1.12.ebuild 388
+MD5 e510e002f594b867b8da97742a09f56c files/digest-edt-1.12 62
diff --git a/app-xemacs/edt/edt-1.12.ebuild b/app-xemacs/edt/edt-1.12.ebuild
index cc3c52c89d52..56630976bf4d 100644
--- a/app-xemacs/edt/edt-1.12.ebuild
+++ b/app-xemacs/edt/edt-1.12.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/app-xemacs/edt/edt-1.12.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/edt/edt-1.12.ebuild,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -9,6 +9,6 @@ PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
 "
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/efs/ChangeLog b/app-xemacs/efs/ChangeLog
index 84449a92524c..79f8eade74e2 100644
--- a/app-xemacs/efs/ChangeLog
+++ b/app-xemacs/efs/ChangeLog
@@ -1,8 +1,20 @@
 # ChangeLog for app-xemacs/efs
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/efs/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/efs/ChangeLog,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
+
+  29 Sep 2005; Joseph Jezak <josejx@gentoo.org> efs-1.29.ebuild:
+  Marked ppc stable.
+
+  09 Aug 2004; Tom Gall <tgall@gentoo.org> efs-1.29.ebuild:
+  stable on ppc64, bug #57174
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> efs-1.29.ebuild:
+  Stable on alpha
 
 *efs-1.29 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> efs-1.29.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/efs/Manifest b/app-xemacs/efs/Manifest
index e69de29bb2d1..c227134efc10 100644
--- a/app-xemacs/efs/Manifest
+++ b/app-xemacs/efs/Manifest
@@ -0,0 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 07d3cacfb33db44c8d7cbb5e437026c9 ChangeLog 658
+MD5 62abe5d60dae53480cd467710de02f1d efs-1.29.ebuild 438
+MD5 0f7642fc4c3816dc4414806edfb6a415 files/digest-efs-1.29 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDO4vKcsIHjyDViGQRAsaJAJ43cM7U9g2zSajnJhF4vrRp+JabTwCgwuJ2
+JSP3M9EAkYECyZERAAMITE8=
+=E8aP
+-----END PGP SIGNATURE-----
diff --git a/app-xemacs/efs/efs-1.29.ebuild b/app-xemacs/efs/efs-1.29.ebuild
index d74274498974..e608255a310a 100644
--- a/app-xemacs/efs/efs-1.29.ebuild
+++ b/app-xemacs/efs/efs-1.29.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/app-xemacs/efs/efs-1.29.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/efs/efs-1.29.ebuild,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -10,6 +10,6 @@ PKG_CAT="standard"
 DEPEND="app-xemacs/xemacs-base
 app-xemacs/dired
 "
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/egg-its/ChangeLog b/app-xemacs/egg-its/ChangeLog
index 99f7e0305b5b..4fd2377ee330 100644
--- a/app-xemacs/egg-its/ChangeLog
+++ b/app-xemacs/egg-its/ChangeLog
@@ -1,8 +1,14 @@
 # ChangeLog for app-xemacs/egg-its
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/egg-its/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/egg-its/ChangeLog,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> egg-its-1.26.ebuild:
+  Stable on alpha
 
 *egg-its-1.26 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> egg-its-1.26.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/egg-its/Manifest b/app-xemacs/egg-its/Manifest
index e69de29bb2d1..99677a7b78eb 100644
--- a/app-xemacs/egg-its/Manifest
+++ b/app-xemacs/egg-its/Manifest
@@ -0,0 +1,3 @@
+MD5 23edbefb4881074e17c245443d183d3a ChangeLog 504
+MD5 8c7479c0ef03cf1c548eb81f253bcb94 egg-its-1.26.ebuild 472
+MD5 d81cde8d01c2fe430c2925e7c52ef235 files/digest-egg-its-1.26 67
diff --git a/app-xemacs/egg-its/egg-its-1.26.ebuild b/app-xemacs/egg-its/egg-its-1.26.ebuild
index 98ac592325f5..05f016e1f8af 100644
--- a/app-xemacs/egg-its/egg-its-1.26.ebuild
+++ b/app-xemacs/egg-its/egg-its-1.26.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/app-xemacs/egg-its/egg-its-1.26.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/egg-its/egg-its-1.26.ebuild,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -12,6 +12,6 @@ app-xemacs/mule-base
 app-xemacs/fsf-compat
 app-xemacs/xemacs-base
 "
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/eieio/ChangeLog b/app-xemacs/eieio/ChangeLog
index 6932de1e97dd..6b25d05d1e7a 100644
--- a/app-xemacs/eieio/ChangeLog
+++ b/app-xemacs/eieio/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for app-xemacs/eieio
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/eieio/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/eieio/ChangeLog,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> eieio-1.04.ebuild:
+  Stable on ppc.
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> eieio-1.04.ebuild:
+  Stable on alpha
+
+*eieio-1.04 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> eieio-1.03.ebuild eieio-1.04.ebuild files/digest-eieio-1.04 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *eieio-1.03 (16 Dec 2002)
 
diff --git a/app-xemacs/eieio/Manifest b/app-xemacs/eieio/Manifest
index e69de29bb2d1..86ebeb5a00c3 100644
--- a/app-xemacs/eieio/Manifest
+++ b/app-xemacs/eieio/Manifest
@@ -0,0 +1,5 @@
+MD5 f06e7d142f7ff4b47be185e57a5befc6 ChangeLog 723
+MD5 17a313e3d2408f079fe62f62ec9580b8 eieio-1.03.ebuild 436
+MD5 ecf08918d577129d77e447875b74a407 eieio-1.04.ebuild 454
+MD5 b633457119cc571b056cd292239c51a0 files/digest-eieio-1.03 65
+MD5 49afa59714ea9c5fa457cab3638e827b files/digest-eieio-1.04 65
diff --git a/app-xemacs/eieio/eieio-1.03.ebuild b/app-xemacs/eieio/eieio-1.03.ebuild
index 54990f328078..2d7b84a337c2 100644
--- a/app-xemacs/eieio/eieio-1.03.ebuild
+++ b/app-xemacs/eieio/eieio-1.03.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/app-xemacs/eieio/eieio-1.03.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/eieio/eieio-1.03.ebuild,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -10,6 +10,6 @@ PKG_CAT="standard"
 DEPEND="app-xemacs/speedbar
 app-xemacs/xemacs-base
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/eieio/eieio-1.04.ebuild b/app-xemacs/eieio/eieio-1.04.ebuild
index c30e2759a3f5..e280f19adeee 100644
--- a/app-xemacs/eieio/eieio-1.04.ebuild
+++ b/app-xemacs/eieio/eieio-1.04.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/app-xemacs/eieio/eieio-1.04.ebuild,v 1.1 2003/02/22 12:46:40 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/eieio/eieio-1.04.ebuild,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -11,7 +11,6 @@ DEPEND="app-xemacs/speedbar
 app-xemacs/xemacs-base
 app-xemacs/edebug
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="alpha amd64 ppc sparc x86"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/elib/ChangeLog b/app-xemacs/elib/ChangeLog
index 275054b0a0f6..ae7be1d59b2f 100644
--- a/app-xemacs/elib/ChangeLog
+++ b/app-xemacs/elib/ChangeLog
@@ -1,8 +1,20 @@
 # ChangeLog for app-xemacs/elib
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/elib/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/elib/ChangeLog,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
+
+  29 Sep 2005; Joseph Jezak <josejx@gentoo.org> elib-1.10.ebuild:
+  Marked ppc stable.
+
+  09 Aug 2004; Tom Gall <tgall@gentoo.org> elib-1.10.ebuild:
+  stable on ppc64
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> elib-1.10.ebuild:
+  Stable on alpha
 
 *elib-1.10 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> elib-1.10.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/elib/Manifest b/app-xemacs/elib/Manifest
index e69de29bb2d1..021deffa698f 100644
--- a/app-xemacs/elib/Manifest
+++ b/app-xemacs/elib/Manifest
@@ -0,0 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ea3a866e53fa4feda036bd09ae90ca53 ChangeLog 653
+MD5 62d94641798229a71103f7baff3d9f07 elib-1.10.ebuild 384
+MD5 8cdb4afbd49b2092df08b7f691b38115 files/digest-elib-1.10 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDO4f2csIHjyDViGQRAtlEAJsFUytpf2ZaYYLzJ/4aLbitinZQ1ACcCgil
+8i8Sa1vIM2smT8k7/Mk6EFs=
+=rEsl
+-----END PGP SIGNATURE-----
diff --git a/app-xemacs/elib/elib-1.10.ebuild b/app-xemacs/elib/elib-1.10.ebuild
index 27a22b08ca42..4ffd255d1295 100644
--- a/app-xemacs/elib/elib-1.10.ebuild
+++ b/app-xemacs/elib/elib-1.10.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/app-xemacs/elib/elib-1.10.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/elib/elib-1.10.ebuild,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -8,6 +8,6 @@ DESCRIPTION="Portable Emacs Lisp utilities library."
 PKG_CAT="standard"
 
 DEPEND=""
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/emerge/ChangeLog b/app-xemacs/emerge/ChangeLog
index 12b2eeba1243..e1a285d840f2 100644
--- a/app-xemacs/emerge/ChangeLog
+++ b/app-xemacs/emerge/ChangeLog
@@ -1,8 +1,20 @@
 # ChangeLog for app-xemacs/emerge
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/emerge/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/emerge/ChangeLog,v 1.1.1.1 2005/11/30 09:38:54 chriswhite Exp $
+
+  29 Sep 2005; Joseph Jezak <josejx@gentoo.org> emerge-1.09.ebuild:
+  Marked ppc stable.
+
+  09 Aug 2004; Tom Gall <tgall@gentoo.org> emerge-1.09.ebuild:
+  stable on ppc64, bug #57174
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> emerge-1.09.ebuild:
+  Stable on alpha
 
 *emerge-1.09 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> emerge-1.09.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/emerge/Manifest b/app-xemacs/emerge/Manifest
index e69de29bb2d1..0e8c6e526789 100644
--- a/app-xemacs/emerge/Manifest
+++ b/app-xemacs/emerge/Manifest
@@ -0,0 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9d0b5ef0be037fbab8562fd69f34cf6b ChangeLog 679
+MD5 4a9f081cf322bf0b7ec8d0f5b94c6e7b emerge-1.09.ebuild 383
+MD5 2cd5698ff4a1ccac489c841628109f2a files/digest-emerge-1.09 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDO4qNcsIHjyDViGQRAupkAJ4+VfdG90ly4F6wHRvrPnF9GxmbBwCeMgG+
+WbtalaulaCVS/51UjKnlI+8=
+=d6Oz
+-----END PGP SIGNATURE-----
diff --git a/app-xemacs/emerge/emerge-1.09.ebuild b/app-xemacs/emerge/emerge-1.09.ebuild
index 53275aac0c59..488a743ef0a3 100644
--- a/app-xemacs/emerge/emerge-1.09.ebuild
+++ b/app-xemacs/emerge/emerge-1.09.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/app-xemacs/emerge/emerge-1.09.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/emerge/emerge-1.09.ebuild,v 1.1.1.1 2005/11/30 09:38:54 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -8,6 +8,6 @@ DESCRIPTION="Another interface over GNU patch."
 PKG_CAT="standard"
 
 DEPEND=""
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/eshell/ChangeLog b/app-xemacs/eshell/ChangeLog
index ca7bc99df840..afdb61ff845f 100644
--- a/app-xemacs/eshell/ChangeLog
+++ b/app-xemacs/eshell/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for app-xemacs/eshell
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/eshell/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/eshell/ChangeLog,v 1.1.1.1 2005/11/30 09:38:54 chriswhite Exp $
+
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org> eshell-1.04.ebuild:
+  Stable on ppc64
+
+  01 Nov 2004; Markus Rothe <corsair@gentoo.org> eshell-1.04.ebuild:
+  Marked ~ppc64; bug #67089
+
+  02 Oct 2004; Robert Coie <rac@gentoo.org> eshell-1.03.ebuild,
+  eshell-1.04.ebuild:
+  eterm -> xemacs-eterm renaming
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> eshell-1.04.ebuild:
+  Stable on alpha
+
+*eshell-1.04 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> eshell-1.03.ebuild eshell-1.04.ebuild files/digest-eshell-1.04 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *eshell-1.03 (16 Dec 2002)
 
diff --git a/app-xemacs/eshell/Manifest b/app-xemacs/eshell/Manifest
index e69de29bb2d1..f7d2adc56c94 100644
--- a/app-xemacs/eshell/Manifest
+++ b/app-xemacs/eshell/Manifest
@@ -0,0 +1,6 @@
+MD5 0b124315c7bd0d9b244a72e9603a24cf ChangeLog 950
+MD5 9584dd7cc168b3b5d05209bcf14db80b eshell-1.03.ebuild 438
+MD5 5f2b72ddde1fd21e38cfdb6b246452eb eshell-1.04.ebuild 449
+MD5 0f39d0139849956930b1a500aca9c6de metadata.xml 365
+MD5 726ab77b69666ff5fcb22b411d2ccad9 files/digest-eshell-1.03 66
+MD5 bc53df721b15ce2f46ad5bed890f9d20 files/digest-eshell-1.04 66
diff --git a/app-xemacs/eshell/eshell-1.03.ebuild b/app-xemacs/eshell/eshell-1.03.ebuild
index 4ae64511f61c..eb85fed98d61 100644
--- a/app-xemacs/eshell/eshell-1.03.ebuild
+++ b/app-xemacs/eshell/eshell-1.03.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/app-xemacs/eshell/eshell-1.03.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/eshell/eshell-1.03.ebuild,v 1.1.1.1 2005/11/30 09:38:54 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -8,8 +8,8 @@ DESCRIPTION="Command shell implemented entirely in Emacs Lisp"
 PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
-app-xemacs/eterm
+app-xemacs/xemacs-eterm
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/eshell/eshell-1.04.ebuild b/app-xemacs/eshell/eshell-1.04.ebuild
index 118ad8efc3a2..92aaa1d6e3e0 100644
--- a/app-xemacs/eshell/eshell-1.04.ebuild
+++ b/app-xemacs/eshell/eshell-1.04.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/app-xemacs/eshell/eshell-1.04.ebuild,v 1.1 2003/02/22 12:46:40 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/eshell/eshell-1.04.ebuild,v 1.1.1.1 2005/11/30 09:38:54 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -8,9 +8,8 @@ DESCRIPTION="Command shell implemented entirely in Emacs Lisp"
 PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
-app-xemacs/eterm
+app-xemacs/xemacs-eterm
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="x86 ~ppc alpha sparc amd64 ppc64"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/ess/ChangeLog b/app-xemacs/ess/ChangeLog
index b5a53defc5e5..2a155d18c91f 100644
--- a/app-xemacs/ess/ChangeLog
+++ b/app-xemacs/ess/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for app-xemacs/ess
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/ess/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/ess/ChangeLog,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
+
+  02 Oct 2004; Robert Coie <rac@gentoo.org> +metadata.xml, ess-1.03.ebuild:
+  eterm -> xemacs-eterm renaming
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> ess-1.03.ebuild:
+  Stable on alpha
+
+*ess-1.03 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> ess-1.02.ebuild ess-1.03.ebuild files/digest-ess-1.03 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *ess-1.02 (16 Dec 2002)
 
diff --git a/app-xemacs/ess/Manifest b/app-xemacs/ess/Manifest
index e69de29bb2d1..ecaf9e84d0ac 100644
--- a/app-xemacs/ess/Manifest
+++ b/app-xemacs/ess/Manifest
@@ -0,0 +1,6 @@
+MD5 98b5dccf2af0287cadf018926d55e19f ChangeLog 730
+MD5 dcd922d27dcb25474af3603ee95a1310 ess-1.02.ebuild 453
+MD5 f2a52f9f474338717b4bd7a640644020 ess-1.03.ebuild 523
+MD5 0f39d0139849956930b1a500aca9c6de metadata.xml 365
+MD5 49fb995bde9993e477af7343a7eebdab files/digest-ess-1.02 63
+MD5 a12c2b6ee2830d10651a4a16f7fd5e24 files/digest-ess-1.03 63
diff --git a/app-xemacs/ess/ess-1.02.ebuild b/app-xemacs/ess/ess-1.02.ebuild
index d8ae111ffbb8..45736b042fe1 100644
--- a/app-xemacs/ess/ess-1.02.ebuild
+++ b/app-xemacs/ess/ess-1.02.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/app-xemacs/ess/ess-1.02.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/ess/ess-1.02.ebuild,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -12,6 +12,6 @@ app-xemacs/mail-lib
 app-xemacs/fsf-compat
 app-xemacs/edit-utils
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/ess/ess-1.03.ebuild b/app-xemacs/ess/ess-1.03.ebuild
index 8e72d7dbbaa1..3fe6fd57e2b1 100644
--- a/app-xemacs/ess/ess-1.03.ebuild
+++ b/app-xemacs/ess/ess-1.03.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/app-xemacs/ess/ess-1.03.ebuild,v 1.1 2003/02/22 12:46:40 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/ess/ess-1.03.ebuild,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -13,9 +13,8 @@ app-xemacs/fsf-compat
 app-xemacs/edit-utils
 app-xemacs/speedbar
 app-xemacs/sh-script
-app-xemacs/eterm
+app-xemacs/xemacs-eterm
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/eudc/ChangeLog b/app-xemacs/eudc/ChangeLog
index d0e867da4cc2..cb56905811f3 100644
--- a/app-xemacs/eudc/ChangeLog
+++ b/app-xemacs/eudc/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-xemacs/eudc
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/eudc/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/eudc/ChangeLog,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> eudc-1.37.ebuild:
+  Stable on alpha
+
+*eudc-1.37 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> eudc-1.36.ebuild eudc-1.37.ebuild files/digest-eudc-1.37 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *eudc-1.36 (16 Dec 2002)
 
diff --git a/app-xemacs/eudc/Manifest b/app-xemacs/eudc/Manifest
index e69de29bb2d1..10fa0e292e43 100644
--- a/app-xemacs/eudc/Manifest
+++ b/app-xemacs/eudc/Manifest
@@ -0,0 +1,5 @@
+MD5 9e59fa51dcdda1b7b236c3fa8fc6ea4c ChangeLog 628
+MD5 45317aa29f9fc2e8a3c4a947d73b8a00 eudc-1.36.ebuild 478
+MD5 28f07da03c6c211f46619d01b5de9dda eudc-1.37.ebuild 530
+MD5 2e62241026234adf3dec422c1573aa05 files/digest-eudc-1.36 63
+MD5 9d210625c9fdae87491758f6edbbee6a files/digest-eudc-1.37 63
diff --git a/app-xemacs/eudc/eudc-1.36.ebuild b/app-xemacs/eudc/eudc-1.36.ebuild
index 18f4d7ad5555..c3fbaf823c83 100644
--- a/app-xemacs/eudc/eudc-1.36.ebuild
+++ b/app-xemacs/eudc/eudc-1.36.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/app-xemacs/eudc/eudc-1.36.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/eudc/eudc-1.36.ebuild,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -13,6 +13,6 @@ app-xemacs/bbdb
 app-xemacs/mail-lib
 app-xemacs/gnus
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/eudc/eudc-1.37.ebuild b/app-xemacs/eudc/eudc-1.37.ebuild
index f9e5505f15f9..975cee832bea 100644
--- a/app-xemacs/eudc/eudc-1.37.ebuild
+++ b/app-xemacs/eudc/eudc-1.37.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/app-xemacs/eudc/eudc-1.37.ebuild,v 1.1 2003/02/22 12:46:40 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/eudc/eudc-1.37.ebuild,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -16,7 +16,6 @@ app-xemacs/rmail
 app-xemacs/tm
 app-xemacs/apel
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/footnote/ChangeLog b/app-xemacs/footnote/ChangeLog
index c1102e55995a..0ff36b508548 100644
--- a/app-xemacs/footnote/ChangeLog
+++ b/app-xemacs/footnote/ChangeLog
@@ -1,8 +1,14 @@
 # ChangeLog for app-xemacs/footnote
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/footnote/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/footnote/ChangeLog,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> footnote-1.15.ebuild:
+  Stable on alpha
 
 *footnote-1.15 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> footnote-1.15.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/footnote/Manifest b/app-xemacs/footnote/Manifest
index e69de29bb2d1..cb73c84b1593 100644
--- a/app-xemacs/footnote/Manifest
+++ b/app-xemacs/footnote/Manifest
@@ -0,0 +1,3 @@
+MD5 7cc5a3cbebf83fc026e28f1b20065767 ChangeLog 509
+MD5 5f032ff0b016417f3acde2df64b17347 footnote-1.15.ebuild 436
+MD5 f123f49a2fdff476066822297abbde0e files/digest-footnote-1.15 67
diff --git a/app-xemacs/footnote/footnote-1.15.ebuild b/app-xemacs/footnote/footnote-1.15.ebuild
index 5ecbf2b93c69..3eaa0a5edf31 100644
--- a/app-xemacs/footnote/footnote-1.15.ebuild
+++ b/app-xemacs/footnote/footnote-1.15.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/app-xemacs/footnote/footnote-1.15.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/footnote/footnote-1.15.ebuild,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -10,6 +10,6 @@ PKG_CAT="standard"
 DEPEND="app-xemacs/mail-lib
 app-xemacs/xemacs-base
 "
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/forms/ChangeLog b/app-xemacs/forms/ChangeLog
index e64c475b2251..c32eca0c0208 100644
--- a/app-xemacs/forms/ChangeLog
+++ b/app-xemacs/forms/ChangeLog
@@ -1,8 +1,14 @@
 # ChangeLog for app-xemacs/forms
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/forms/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/forms/ChangeLog,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> forms-1.14.ebuild:
+  Stable on alpha
 
 *forms-1.14 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> forms-1.14.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/forms/Manifest b/app-xemacs/forms/Manifest
index e69de29bb2d1..b18e4ee6f301 100644
--- a/app-xemacs/forms/Manifest
+++ b/app-xemacs/forms/Manifest
@@ -0,0 +1,3 @@
+MD5 882e319dc41af981dc8dcd6f8bd7dd6f ChangeLog 494
+MD5 57eb49746635d691d13a64203ed565b2 forms-1.14.ebuild 399
+MD5 597c135a7ae7bf53cd8a1a2b34070e4a files/digest-forms-1.14 64
diff --git a/app-xemacs/forms/forms-1.14.ebuild b/app-xemacs/forms/forms-1.14.ebuild
index c2ba368383a2..4f63aa4f6c6d 100644
--- a/app-xemacs/forms/forms-1.14.ebuild
+++ b/app-xemacs/forms/forms-1.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/app-xemacs/forms/forms-1.14.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/forms/forms-1.14.ebuild,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -8,6 +8,6 @@ DESCRIPTION="Forms editing support (obsolete, use Widget instead)."
 PKG_CAT="standard"
 
 DEPEND=""
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/fortran-modes/ChangeLog b/app-xemacs/fortran-modes/ChangeLog
index 0f0488c7dda9..aaeb5214136b 100644
--- a/app-xemacs/fortran-modes/ChangeLog
+++ b/app-xemacs/fortran-modes/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-xemacs/fortran-modes
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/fortran-modes/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/fortran-modes/ChangeLog,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> fortran-modes-1.02.ebuild:
+  Stable on alpha
+
+*fortran-modes-1.02 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> fortran-modes-1.01.ebuild fortran-modes-1.02.ebuild files/digest-fortran-modes-1.02 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *fortran-modes-1.01 (16 Dec 2002)
 
diff --git a/app-xemacs/fortran-modes/Manifest b/app-xemacs/fortran-modes/Manifest
index e69de29bb2d1..892323332e22 100644
--- a/app-xemacs/fortran-modes/Manifest
+++ b/app-xemacs/fortran-modes/Manifest
@@ -0,0 +1,5 @@
+MD5 1678f294780d838678e339e3e9aef721 ChangeLog 700
+MD5 7512569d6bf9e8fd72ca4ed009b0e44d fortran-modes-1.01.ebuild 396
+MD5 45d3955b6ffc650db0f5777da5ce1c38 fortran-modes-1.02.ebuild 401
+MD5 b3d5cfac89f2f10c9aa10fe2f67ab20d files/digest-fortran-modes-1.01 72
+MD5 d9eff294ee94ea6855b1a8a8ea626e9e files/digest-fortran-modes-1.02 72
diff --git a/app-xemacs/fortran-modes/fortran-modes-1.01.ebuild b/app-xemacs/fortran-modes/fortran-modes-1.01.ebuild
index 505a661bac75..9055a1dee4df 100644
--- a/app-xemacs/fortran-modes/fortran-modes-1.01.ebuild
+++ b/app-xemacs/fortran-modes/fortran-modes-1.01.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/app-xemacs/fortran-modes/fortran-modes-1.01.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/fortran-modes/fortran-modes-1.01.ebuild,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -9,6 +9,6 @@ PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/fortran-modes/fortran-modes-1.02.ebuild b/app-xemacs/fortran-modes/fortran-modes-1.02.ebuild
index 679e7bcbd830..d0500519dd18 100644
--- a/app-xemacs/fortran-modes/fortran-modes-1.02.ebuild
+++ b/app-xemacs/fortran-modes/fortran-modes-1.02.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/app-xemacs/fortran-modes/fortran-modes-1.02.ebuild,v 1.1 2003/02/22 12:46:40 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/fortran-modes/fortran-modes-1.02.ebuild,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -9,7 +9,6 @@ PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/frame-icon/ChangeLog b/app-xemacs/frame-icon/ChangeLog
index 5508eb0a2a2c..63949ce62c30 100644
--- a/app-xemacs/frame-icon/ChangeLog
+++ b/app-xemacs/frame-icon/ChangeLog
@@ -1,8 +1,14 @@
 # ChangeLog for app-xemacs/frame-icon
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/frame-icon/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/frame-icon/ChangeLog,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> frame-icon-1.09.ebuild:
+  Stable on alpha
 
 *frame-icon-1.09 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> frame-icon-1.09.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/frame-icon/Manifest b/app-xemacs/frame-icon/Manifest
index e69de29bb2d1..6a1714c2a5cb 100644
--- a/app-xemacs/frame-icon/Manifest
+++ b/app-xemacs/frame-icon/Manifest
@@ -0,0 +1,3 @@
+MD5 705c62fd6ecf0559849af67d410eb873 ChangeLog 519
+MD5 eab08b526e28613e2fc6eaea46803617 frame-icon-1.09.ebuild 410
+MD5 4f27ca0c8d270232d5f2d2318ba8e666 files/digest-frame-icon-1.09 69
diff --git a/app-xemacs/frame-icon/frame-icon-1.09.ebuild b/app-xemacs/frame-icon/frame-icon-1.09.ebuild
index 31ab88e1464c..1206f0d8f0c0 100644
--- a/app-xemacs/frame-icon/frame-icon-1.09.ebuild
+++ b/app-xemacs/frame-icon/frame-icon-1.09.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/app-xemacs/frame-icon/frame-icon-1.09.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/frame-icon/frame-icon-1.09.ebuild,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -8,6 +8,6 @@ DESCRIPTION="Set up mode-specific icons for each frame under XEmacs"
 PKG_CAT="standard"
 
 DEPEND=""
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/fsf-compat/ChangeLog b/app-xemacs/fsf-compat/ChangeLog
index 006ab83a0c5d..6f10c8954ef5 100644
--- a/app-xemacs/fsf-compat/ChangeLog
+++ b/app-xemacs/fsf-compat/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for app-xemacs/fsf-compat
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/fsf-compat/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/fsf-compat/ChangeLog,v 1.1.1.1 2005/11/30 09:38:54 chriswhite Exp $
+
+  09 Aug 2004; Tom Gall <tgall@gentoo.org> fsf-compat-1.12.ebuild:
+  stable on ppc64, bug #57174
+
+  27 Jul 2004; Robert Coie <rac@gentoo.org> +metadata.xml,
+  fsf-compat-1.11.ebuild, fsf-compat-1.12.ebuild:
+  keywording ppc
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> fsf-compat-1.12.ebuild:
+  Stable on alpha
+
+*fsf-compat-1.12 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> fsf-compat-1.11.ebuild fsf-compat-1.12.ebuild files/digest-fsf-compat-1.12 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *fsf-compat-1.11 (16 Dec 2002)
 
diff --git a/app-xemacs/fsf-compat/Manifest b/app-xemacs/fsf-compat/Manifest
index e69de29bb2d1..301e7b225da2 100644
--- a/app-xemacs/fsf-compat/Manifest
+++ b/app-xemacs/fsf-compat/Manifest
@@ -0,0 +1,6 @@
+MD5 5f604e143e7e0c79b84a7ca014cd5e61 ChangeLog 901
+MD5 6b35f73de78c0644ee150ae703c5bef0 fsf-compat-1.11.ebuild 403
+MD5 7ab4b84bc6512a8961c610545acf876c fsf-compat-1.12.ebuild 414
+MD5 0f39d0139849956930b1a500aca9c6de metadata.xml 365
+MD5 15806c6a539e3c16e7e97c6311ce501e files/digest-fsf-compat-1.11 69
+MD5 8d91bb59184b9161508ba4e3f29d8ecc files/digest-fsf-compat-1.12 69
diff --git a/app-xemacs/fsf-compat/fsf-compat-1.11.ebuild b/app-xemacs/fsf-compat/fsf-compat-1.11.ebuild
index 146c4607aa3b..553b58b4c123 100644
--- a/app-xemacs/fsf-compat/fsf-compat-1.11.ebuild
+++ b/app-xemacs/fsf-compat/fsf-compat-1.11.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/app-xemacs/fsf-compat/fsf-compat-1.11.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/fsf-compat/fsf-compat-1.11.ebuild,v 1.1.1.1 2005/11/30 09:38:54 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -9,6 +9,6 @@ PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
 "
+KEYWORDS="x86 ppc ~alpha sparc"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/fsf-compat/fsf-compat-1.12.ebuild b/app-xemacs/fsf-compat/fsf-compat-1.12.ebuild
index 1739967741f3..10215eea9dce 100644
--- a/app-xemacs/fsf-compat/fsf-compat-1.12.ebuild
+++ b/app-xemacs/fsf-compat/fsf-compat-1.12.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/app-xemacs/fsf-compat/fsf-compat-1.12.ebuild,v 1.1 2003/02/22 12:46:40 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/fsf-compat/fsf-compat-1.12.ebuild,v 1.1.1.1 2005/11/30 09:38:54 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -9,7 +9,6 @@ PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="amd64 x86 ppc alpha sparc ppc64"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/games/ChangeLog b/app-xemacs/games/ChangeLog
index 7c8a19f96865..a466d4a76840 100644
--- a/app-xemacs/games/ChangeLog
+++ b/app-xemacs/games/ChangeLog
@@ -1,8 +1,23 @@
 # ChangeLog for app-xemacs/games
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/games/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/games/ChangeLog,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> games-1.13.ebuild:
+  Stable on ppc.
+
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org> games-1.13.ebuild:
+  Stable on ppc64
+
+  01 Nov 2004; Markus Rothe <corsair@gentoo.org> games-1.13.ebuild:
+  Marked ~ppc64; bug #67087
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> games-1.13.ebuild:
+  Stable on alpha
 
 *games-1.13 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> games-1.13.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/games/Manifest b/app-xemacs/games/Manifest
index e69de29bb2d1..c71abf71b7b8 100644
--- a/app-xemacs/games/Manifest
+++ b/app-xemacs/games/Manifest
@@ -0,0 +1,3 @@
+MD5 96e2f5b51801282a7694932a37a00ed9 games-1.13.ebuild 398
+MD5 92f607e2e210f3995762fee190c9ec89 ChangeLog 765
+MD5 da8ce6129ef0147f3cd752199653421a files/digest-games-1.13 64
diff --git a/app-xemacs/games/games-1.13.ebuild b/app-xemacs/games/games-1.13.ebuild
index 6b16d73fccb0..fa28fc22ff4c 100644
--- a/app-xemacs/games/games-1.13.ebuild
+++ b/app-xemacs/games/games-1.13.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/app-xemacs/games/games-1.13.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/games/games-1.13.ebuild,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -9,6 +9,6 @@ PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
 "
+KEYWORDS="x86 ppc alpha sparc amd64 ppc64"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/gnats/ChangeLog b/app-xemacs/gnats/ChangeLog
index 4f1bcfb1da16..fdc10464e69e 100644
--- a/app-xemacs/gnats/ChangeLog
+++ b/app-xemacs/gnats/ChangeLog
@@ -1,8 +1,17 @@
 # ChangeLog for app-xemacs/gnats
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/gnats/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/gnats/ChangeLog,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> gnats-1.15.ebuild:
+  Stable on ppc.
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> gnats-1.15.ebuild:
+  Stable on alpha
 
 *gnats-1.15 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> gnats-1.15.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/gnats/Manifest b/app-xemacs/gnats/Manifest
index e69de29bb2d1..558625e07f1e 100644
--- a/app-xemacs/gnats/Manifest
+++ b/app-xemacs/gnats/Manifest
@@ -0,0 +1,3 @@
+MD5 b68af9db64dae67d4060b2a7b8b3e4f7 ChangeLog 581
+MD5 597ad05ed67f8ff9f426ccf279b6bd95 gnats-1.15.ebuild 405
+MD5 7784960ba17e28328b3c3f66a4bd471e files/digest-gnats-1.15 65
diff --git a/app-xemacs/gnats/gnats-1.15.ebuild b/app-xemacs/gnats/gnats-1.15.ebuild
index 273d9e379cb4..99daab72fa06 100644
--- a/app-xemacs/gnats/gnats-1.15.ebuild
+++ b/app-xemacs/gnats/gnats-1.15.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/app-xemacs/gnats/gnats-1.15.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/gnats/gnats-1.15.ebuild,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -10,6 +10,7 @@ PKG_CAT="standard"
 DEPEND="app-xemacs/mail-lib
 app-xemacs/xemacs-base
 "
+KEYWORDS="x86 ppc alpha sparc amd64"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/gnus/ChangeLog b/app-xemacs/gnus/ChangeLog
index f690fe44843a..27e14e7222cd 100644
--- a/app-xemacs/gnus/ChangeLog
+++ b/app-xemacs/gnus/ChangeLog
@@ -1,6 +1,38 @@
 # ChangeLog for app-xemacs/gnus
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/gnus/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/gnus/ChangeLog,v 1.1.1.1 2005/11/30 09:38:55 chriswhite Exp $
+
+  29 Sep 2005; Joseph Jezak <josejx@gentoo.org> gnus-1.71.ebuild:
+  Marked ppc stable.
+
+  02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  02 Oct 2004; Robert Coie <rac@gentoo.org> gnus-1.64.ebuild,
+  gnus-1.65.ebuild, gnus-1.71.ebuild:
+  eterm -> xemacs-eterm renaming
+
+  09 Aug 2004; Tom Gall <tgall@gentoo.org> gnus-1.71.ebuild:
+  stable on ppc64, bug #57174
+ 
+  13 May 2004; Bryan Østergaard <kloeri@gentoo.org> gnus-1.71.ebuild:
+  Stable on alpha.
+
+*gnus-1.71 (27 Oct 2003)
+
+  27 Oct 2003; <rac@gentoo.org> gnus-1.71.ebuild:
+  Oort Gnus
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> gnus-1.65.ebuild:
+  Stable on alpha
+
+*gnus-1.65 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> gnus-1.64.ebuild gnus-1.65.ebuild files/digest-gnus-1.65 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *gnus-1.64 (16 Dec 2002)
 
diff --git a/app-xemacs/gnus/Manifest b/app-xemacs/gnus/Manifest
index e69de29bb2d1..78749520524e 100644
--- a/app-xemacs/gnus/Manifest
+++ b/app-xemacs/gnus/Manifest
@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5aad3fb5d2e5ec34d5b3035e1f30762e ChangeLog 1225
+MD5 f33d8f058523dd7845f12be27b2ef42a gnus-1.64.ebuild 551
+MD5 f6227ef62da3e9dda0e04394bde8e4e2 gnus-1.65.ebuild 580
+MD5 0f39d0139849956930b1a500aca9c6de metadata.xml 365
+MD5 bf2c3d19dfa549e3ff1d74758034b4f7 gnus-1.71.ebuild 617
+MD5 91be7e701a52b62a9eb17b92ffa4e50b files/digest-gnus-1.65 65
+MD5 4ec47b9f0631690da8f1e628f52aa8ca files/digest-gnus-1.71 66
+MD5 5cfd2f95cc9989e86953e6e7f6cbe142 files/digest-gnus-1.64 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDO4w3csIHjyDViGQRAn/kAJ9HQYH4LXunjHxmKOptTQYu2mJI0wCfby41
+6Xu6mOmy4YvYqxzmXv6Z0k4=
+=9eqZ
+-----END PGP SIGNATURE-----
diff --git a/app-xemacs/gnus/gnus-1.64.ebuild b/app-xemacs/gnus/gnus-1.64.ebuild
index 3559e438242b..b5ded8aea7aa 100644
--- a/app-xemacs/gnus/gnus-1.64.ebuild
+++ b/app-xemacs/gnus/gnus-1.64.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/app-xemacs/gnus/gnus-1.64.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/gnus/gnus-1.64.ebuild,v 1.1.1.1 2005/11/30 09:38:55 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -11,12 +11,13 @@ DEPEND="app-xemacs/w3
 app-xemacs/mh-e
 app-xemacs/mailcrypt
 app-xemacs/rmail
-app-xemacs/eterm
+app-xemacs/xemacs-eterm
 app-xemacs/mail-lib
 app-xemacs/xemacs-base
 app-xemacs/fsf-compat
 app-xemacs/ecrypto
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/gnus/gnus-1.65.ebuild b/app-xemacs/gnus/gnus-1.65.ebuild
index 22d1e4f06138..c0d492ddbb8e 100644
--- a/app-xemacs/gnus/gnus-1.65.ebuild
+++ b/app-xemacs/gnus/gnus-1.65.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/app-xemacs/gnus/gnus-1.65.ebuild,v 1.1 2003/02/22 12:46:40 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/gnus/gnus-1.65.ebuild,v 1.1.1.1 2005/11/30 09:38:55 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -11,7 +11,7 @@ DEPEND="app-xemacs/w3
 app-xemacs/mh-e
 app-xemacs/mailcrypt
 app-xemacs/rmail
-app-xemacs/eterm
+app-xemacs/xemacs-eterm
 app-xemacs/mail-lib
 app-xemacs/xemacs-base
 app-xemacs/fsf-compat
@@ -19,7 +19,7 @@ app-xemacs/ecrypto
 app-xemacs/tm
 app-xemacs/apel
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="x86 ~ppc alpha sparc"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/gnus/gnus-1.71.ebuild b/app-xemacs/gnus/gnus-1.71.ebuild
index d21702170a31..85cdbc34d8c5 100644
--- a/app-xemacs/gnus/gnus-1.71.ebuild
+++ b/app-xemacs/gnus/gnus-1.71.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/app-xemacs/gnus/gnus-1.71.ebuild,v 1.1 2003/10/27 18:38:10 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/gnus/gnus-1.71.ebuild,v 1.1.1.1 2005/11/30 09:38:55 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -11,7 +11,7 @@ DEPEND="app-xemacs/w3
 app-xemacs/mh-e
 app-xemacs/mailcrypt
 app-xemacs/rmail
-app-xemacs/eterm
+app-xemacs/xemacs-eterm
 app-xemacs/mail-lib
 app-xemacs/xemacs-base
 app-xemacs/fsf-compat
@@ -20,7 +20,7 @@ app-xemacs/tm
 app-xemacs/apel
 >=app-xemacs/net-utils-1.32
 "
-KEYWORDS="~x86 ~ppc ~alpha ~sparc"
+KEYWORDS="alpha amd64 ppc ppc64 ~sparc ~x86"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/haskell-mode/ChangeLog b/app-xemacs/haskell-mode/ChangeLog
index 894dae79f4ac..3c81be0132e4 100644
--- a/app-xemacs/haskell-mode/ChangeLog
+++ b/app-xemacs/haskell-mode/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-xemacs/haskell-mode
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/haskell-mode/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/haskell-mode/ChangeLog,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> haskell-mode-1.05.ebuild:
+  Stable on alpha
+
+*haskell-mode-1.05 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> haskell-mode-1.03.ebuild haskell-mode-1.05.ebuild files/digest-haskell-mode-1.05 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *haskell-mode-1.03 (16 Dec 2002)
 
diff --git a/app-xemacs/haskell-mode/Manifest b/app-xemacs/haskell-mode/Manifest
index e69de29bb2d1..85826dd3801b 100644
--- a/app-xemacs/haskell-mode/Manifest
+++ b/app-xemacs/haskell-mode/Manifest
@@ -0,0 +1,5 @@
+MD5 f45076b8de4325bc7942486c0e7b17d9 ChangeLog 692
+MD5 e3b07add79dbb50d806b91c3b7d4adb7 haskell-mode-1.03.ebuild 462
+MD5 6f02eaf48adea84f0c27153b805370a6 haskell-mode-1.05.ebuild 467
+MD5 ea1cba155b66f7e62a9dc0d2832d054a files/digest-haskell-mode-1.03 71
+MD5 14641bc5d4ddfbaf2fa749891872aab7 files/digest-haskell-mode-1.05 71
diff --git a/app-xemacs/haskell-mode/haskell-mode-1.03.ebuild b/app-xemacs/haskell-mode/haskell-mode-1.03.ebuild
index 259002b93347..901c469da2dc 100644
--- a/app-xemacs/haskell-mode/haskell-mode-1.03.ebuild
+++ b/app-xemacs/haskell-mode/haskell-mode-1.03.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/app-xemacs/haskell-mode/haskell-mode-1.03.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/haskell-mode/haskell-mode-1.03.ebuild,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -12,6 +12,7 @@ app-xemacs/mail-lib
 app-xemacs/xemacs-base
 app-xemacs/edit-utils
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/haskell-mode/haskell-mode-1.05.ebuild b/app-xemacs/haskell-mode/haskell-mode-1.05.ebuild
index c1326e6e300a..f00eddf9d01b 100644
--- a/app-xemacs/haskell-mode/haskell-mode-1.05.ebuild
+++ b/app-xemacs/haskell-mode/haskell-mode-1.05.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/app-xemacs/haskell-mode/haskell-mode-1.05.ebuild,v 1.1 2003/02/22 12:46:40 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/haskell-mode/haskell-mode-1.05.ebuild,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -12,7 +12,7 @@ app-xemacs/mail-lib
 app-xemacs/xemacs-base
 app-xemacs/edit-utils
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/hm-html-menus/ChangeLog b/app-xemacs/hm-html-menus/ChangeLog
index 7b34dc04f17d..f1979c460207 100644
--- a/app-xemacs/hm-html-menus/ChangeLog
+++ b/app-xemacs/hm-html-menus/ChangeLog
@@ -1,8 +1,20 @@
 # ChangeLog for app-xemacs/hm-html-menus
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/hm-html-menus/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/hm-html-menus/ChangeLog,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
+
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org> hm-html-menus-1.18.ebuild:
+  Stable on ppc64
+
+  01 Nov 2004; Markus Rothe <corsair@gentoo.org> hm-html-menus-1.18.ebuild:
+  Marked ~ppc64; bug #67090
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> hm-html-menus-1.18.ebuild:
+  Stable on alpha
 
 *hm-html-menus-1.18 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> hm-html-menus-1.18.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/hm-html-menus/Manifest b/app-xemacs/hm-html-menus/Manifest
index e69de29bb2d1..5275e59d3b95 100644
--- a/app-xemacs/hm-html-menus/Manifest
+++ b/app-xemacs/hm-html-menus/Manifest
@@ -0,0 +1,3 @@
+MD5 19e8d17d9b801c6ededa114245921f58 ChangeLog 734
+MD5 03b1261b7b64f8f7d8f143ed8ee8d503 hm-html-menus-1.18.ebuild 496
+MD5 1833f4e6842b8fb23bfaa0be81a395ac files/digest-hm-html-menus-1.18 74
diff --git a/app-xemacs/hm-html-menus/hm-html-menus-1.18.ebuild b/app-xemacs/hm-html-menus/hm-html-menus-1.18.ebuild
index 10457ad6dcb1..292ae07ba762 100644
--- a/app-xemacs/hm-html-menus/hm-html-menus-1.18.ebuild
+++ b/app-xemacs/hm-html-menus/hm-html-menus-1.18.ebuild
@@ -1,16 +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/app-xemacs/hm-html-menus/hm-html-menus-1.18.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/hm-html-menus/hm-html-menus-1.18.ebuild,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
 DESCRIPTION="HTML editing."
-SRC_URI="http://ftp.xemacs.org/packages/hm--html-menus-1.18-pkg.tar.gz"
+SRC_URI="http://ftp.xemacs.org/packages/hm--html-menus-${PV}-pkg.tar.gz"
 PKG_CAT="standard"
 
 DEPEND="app-xemacs/dired
 app-xemacs/xemacs-base
 "
+KEYWORDS="x86 ~ppc alpha sparc amd64 ppc64"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/ibuffer/ChangeLog b/app-xemacs/ibuffer/ChangeLog
index 4b62e4637519..4c60fca1abd0 100644
--- a/app-xemacs/ibuffer/ChangeLog
+++ b/app-xemacs/ibuffer/ChangeLog
@@ -1,8 +1,14 @@
 # ChangeLog for app-xemacs/ibuffer
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/ibuffer/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/ibuffer/ChangeLog,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> ibuffer-1.08.ebuild:
+  Stable on alpha
 
 *ibuffer-1.08 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> ibuffer-1.08.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/ibuffer/Manifest b/app-xemacs/ibuffer/Manifest
index e69de29bb2d1..4787379a1e7d 100644
--- a/app-xemacs/ibuffer/Manifest
+++ b/app-xemacs/ibuffer/Manifest
@@ -0,0 +1,3 @@
+MD5 c56e95a81babcbdedecbb83424622449 ChangeLog 504
+MD5 e3665d76a4356ab9ca078da1f27c79b1 ibuffer-1.08.ebuild 410
+MD5 86931163fb95fd755d7b9a0b31a9b79f files/digest-ibuffer-1.08 66
diff --git a/app-xemacs/ibuffer/ibuffer-1.08.ebuild b/app-xemacs/ibuffer/ibuffer-1.08.ebuild
index 15815c80480f..0d966870c54c 100644
--- a/app-xemacs/ibuffer/ibuffer-1.08.ebuild
+++ b/app-xemacs/ibuffer/ibuffer-1.08.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/app-xemacs/ibuffer/ibuffer-1.08.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/ibuffer/ibuffer-1.08.ebuild,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -9,6 +9,7 @@ PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
 "
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/idlwave/ChangeLog b/app-xemacs/idlwave/ChangeLog
index 41255e2fe95e..9f571df8378e 100644
--- a/app-xemacs/idlwave/ChangeLog
+++ b/app-xemacs/idlwave/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-xemacs/idlwave
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/idlwave/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/idlwave/ChangeLog,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> idlwave-1.28.ebuild:
+  Stable on alpha
+
+*idlwave-1.28 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> idlwave-1.27.ebuild idlwave-1.28.ebuild files/digest-idlwave-1.28 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *idlwave-1.27 (16 Dec 2002)
 
diff --git a/app-xemacs/idlwave/Manifest b/app-xemacs/idlwave/Manifest
index e69de29bb2d1..8b4df790fd64 100644
--- a/app-xemacs/idlwave/Manifest
+++ b/app-xemacs/idlwave/Manifest
@@ -0,0 +1,5 @@
+MD5 d2fbd5b9b4ab2714458e2b8c6d457fbd ChangeLog 652
+MD5 9ae3dab2b45d2a5364ca3be86f4db720 idlwave-1.27.ebuild 447
+MD5 51b18d1e2c0a2fda03af76041bb19bc4 idlwave-1.28.ebuild 452
+MD5 50f18544f59ed4bd3f27b669a5c15614 files/digest-idlwave-1.27 67
+MD5 adebde89e4a0b56f6fc64fd68d8ca7e6 files/digest-idlwave-1.28 67
diff --git a/app-xemacs/idlwave/idlwave-1.27.ebuild b/app-xemacs/idlwave/idlwave-1.27.ebuild
index 2d2196d0d05e..ba7c2e7dcd3a 100644
--- a/app-xemacs/idlwave/idlwave-1.27.ebuild
+++ b/app-xemacs/idlwave/idlwave-1.27.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/app-xemacs/idlwave/idlwave-1.27.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/idlwave/idlwave-1.27.ebuild,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -10,6 +10,7 @@ PKG_CAT="standard"
 DEPEND="app-xemacs/fsf-compat
 app-xemacs/xemacs-base
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/idlwave/idlwave-1.28.ebuild b/app-xemacs/idlwave/idlwave-1.28.ebuild
index 2cd340e8febf..48e441ee8ab8 100644
--- a/app-xemacs/idlwave/idlwave-1.28.ebuild
+++ b/app-xemacs/idlwave/idlwave-1.28.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/app-xemacs/idlwave/idlwave-1.28.ebuild,v 1.1 2003/02/22 12:46:40 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/idlwave/idlwave-1.28.ebuild,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -10,7 +10,7 @@ PKG_CAT="standard"
 DEPEND="app-xemacs/fsf-compat
 app-xemacs/xemacs-base
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/igrep/ChangeLog b/app-xemacs/igrep/ChangeLog
index 730a66c3f187..efde4a1b5185 100644
--- a/app-xemacs/igrep/ChangeLog
+++ b/app-xemacs/igrep/ChangeLog
@@ -1,8 +1,20 @@
 # ChangeLog for app-xemacs/igrep
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/igrep/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/igrep/ChangeLog,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
+
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org> igrep-1.10.ebuild:
+  Stable on ppc64
+
+  01 Nov 2004; Markus Rothe <corsair@gentoo.org> igrep-1.10.ebuild:
+  Marked ~ppc64; bug #67091
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> igrep-1.10.ebuild:
+  Stable on alpha
 
 *igrep-1.10 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> igrep-1.10.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/igrep/Manifest b/app-xemacs/igrep/Manifest
index e69de29bb2d1..5a858d3acf0d 100644
--- a/app-xemacs/igrep/Manifest
+++ b/app-xemacs/igrep/Manifest
@@ -0,0 +1,3 @@
+MD5 2ae323970016e5f657ab6da6096c0b2b ChangeLog 678
+MD5 05ea621965f72d595de35735324af3d9 igrep-1.10.ebuild 437
+MD5 698576938b6231dfdd14908032b28d3f files/digest-igrep-1.10 64
diff --git a/app-xemacs/igrep/igrep-1.10.ebuild b/app-xemacs/igrep/igrep-1.10.ebuild
index f5ed0828fd9e..2f351a953843 100644
--- a/app-xemacs/igrep/igrep-1.10.ebuild
+++ b/app-xemacs/igrep/igrep-1.10.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/app-xemacs/igrep/igrep-1.10.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/igrep/igrep-1.10.ebuild,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -11,6 +11,7 @@ DEPEND="app-xemacs/dired
 app-xemacs/xemacs-base
 app-xemacs/efs
 "
+KEYWORDS="x86 ~ppc alpha sparc amd64 ppc64"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/ilisp/ChangeLog b/app-xemacs/ilisp/ChangeLog
index c4f4ce68b7a6..2b764bafe917 100644
--- a/app-xemacs/ilisp/ChangeLog
+++ b/app-xemacs/ilisp/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for app-xemacs/ilisp
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/ilisp/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/ilisp/ChangeLog,v 1.1.1.1 2005/11/30 09:38:54 chriswhite Exp $
+
+  29 Sep 2005; Joseph Jezak <josejx@gentoo.org> ilisp-1.29.ebuild:
+  Marked ppc stable.
+
+  02 Oct 2004; Robert Coie <rac@gentoo.org> +metadata.xml, ilisp-1.28.ebuild,
+  ilisp-1.29.ebuild:
+  eterm -> xemacs-eterm renaming
+
+  09 Aug 2004; Tom Gall <tgall@gentoo.org> ilisp-1.29.ebuild:
+  stable on ppc64, bug #57174
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> ilisp-1.29.ebuild:
+  Stable on alpha
+
+*ilisp-1.29 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> ilisp-1.28.ebuild ilisp-1.29.ebuild files/digest-ilisp-1.29 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *ilisp-1.28 (16 Dec 2002)
 
diff --git a/app-xemacs/ilisp/Manifest b/app-xemacs/ilisp/Manifest
index e69de29bb2d1..a3673152285a 100644
--- a/app-xemacs/ilisp/Manifest
+++ b/app-xemacs/ilisp/Manifest
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 67137e8ccaa3e5d2f361dc05791dbcd0 ChangeLog 947
+MD5 0f39d0139849956930b1a500aca9c6de metadata.xml 365
+MD5 14325d569049135e206baee65101acdf ilisp-1.28.ebuild 480
+MD5 f04ba797dc6e6408b359525958996300 ilisp-1.29.ebuild 486
+MD5 cf3cf3df23555b6ac9ebe136db2b8b0e files/digest-ilisp-1.29 65
+MD5 287184b56531c24c4fd83515db98d4c0 files/digest-ilisp-1.28 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDO4rJcsIHjyDViGQRAiKVAKCCQkKsyfzWaRKMarvEEMb8vXC9KwCfRHhH
+N0QvKB2P/uIiBAKxA5wVSFA=
+=nXOX
+-----END PGP SIGNATURE-----
diff --git a/app-xemacs/ilisp/ilisp-1.28.ebuild b/app-xemacs/ilisp/ilisp-1.28.ebuild
index b386ed42a91f..246818bdbb8a 100644
--- a/app-xemacs/ilisp/ilisp-1.28.ebuild
+++ b/app-xemacs/ilisp/ilisp-1.28.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/app-xemacs/ilisp/ilisp-1.28.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/ilisp/ilisp-1.28.ebuild,v 1.1.1.1 2005/11/30 09:38:54 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -10,9 +10,10 @@ PKG_CAT="standard"
 DEPEND="app-xemacs/xemacs-base
 app-xemacs/mail-lib
 app-xemacs/fsf-compat
-app-xemacs/eterm
+app-xemacs/xemacs-eterm
 app-xemacs/sh-script
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/ilisp/ilisp-1.29.ebuild b/app-xemacs/ilisp/ilisp-1.29.ebuild
index 56e9e5355560..a349763a8966 100644
--- a/app-xemacs/ilisp/ilisp-1.29.ebuild
+++ b/app-xemacs/ilisp/ilisp-1.29.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/app-xemacs/ilisp/ilisp-1.29.ebuild,v 1.1 2003/02/22 12:46:40 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/ilisp/ilisp-1.29.ebuild,v 1.1.1.1 2005/11/30 09:38:54 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -10,10 +10,10 @@ PKG_CAT="standard"
 DEPEND="app-xemacs/xemacs-base
 app-xemacs/mail-lib
 app-xemacs/fsf-compat
-app-xemacs/eterm
+app-xemacs/xemacs-eterm
 app-xemacs/sh-script
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/jde/ChangeLog b/app-xemacs/jde/ChangeLog
index 7a15f566369d..bffd5492b56d 100644
--- a/app-xemacs/jde/ChangeLog
+++ b/app-xemacs/jde/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for app-xemacs/jde
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/jde/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/jde/ChangeLog,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
+
+  02 Oct 2004; Robert Coie <rac@gentoo.org> +metadata.xml, jde-1.38.ebuild,
+  jde-1.43.ebuild:
+  eterm -> xemacs-eterm renaming
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> jde-1.43.ebuild:
+  Stable on alpha
+
+*jde-1.43 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> jde-1.38.ebuild jde-1.43.ebuild files/digest-jde-1.43 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *jde-1.38 (16 Dec 2002)
 
diff --git a/app-xemacs/jde/Manifest b/app-xemacs/jde/Manifest
index e69de29bb2d1..9a1f82597594 100644
--- a/app-xemacs/jde/Manifest
+++ b/app-xemacs/jde/Manifest
@@ -0,0 +1,6 @@
+MD5 eb0095ade8acde479eb2e15d54a68255 ChangeLog 749
+MD5 1d26454c13863f917f24d043743c795d jde-1.38.ebuild 641
+MD5 f1f93fc955266017afb55e72f130d74e jde-1.43.ebuild 652
+MD5 0f39d0139849956930b1a500aca9c6de metadata.xml 365
+MD5 6303b4aab5d15dd3b80ecd30e6d81cee files/digest-jde-1.38 64
+MD5 2dfe623a14f741ef11c883a51e8b3b08 files/digest-jde-1.43 64
diff --git a/app-xemacs/jde/jde-1.38.ebuild b/app-xemacs/jde/jde-1.38.ebuild
index 46606c31a087..e533cb1fee08 100644
--- a/app-xemacs/jde/jde-1.38.ebuild
+++ b/app-xemacs/jde/jde-1.38.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/app-xemacs/jde/jde-1.38.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/jde/jde-1.38.ebuild,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -12,7 +12,7 @@ app-xemacs/semantic
 app-xemacs/debug
 app-xemacs/speedbar
 app-xemacs/edit-utils
-app-xemacs/eterm
+app-xemacs/xemacs-eterm
 app-xemacs/mail-lib
 app-xemacs/xemacs-base
 app-xemacs/xemacs-devel
@@ -21,6 +21,7 @@ app-xemacs/elib
 app-xemacs/sh-script
 app-xemacs/fsf-compat
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/jde/jde-1.43.ebuild b/app-xemacs/jde/jde-1.43.ebuild
index 8bfb3db4541d..e478320b29b0 100644
--- a/app-xemacs/jde/jde-1.43.ebuild
+++ b/app-xemacs/jde/jde-1.43.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/app-xemacs/jde/jde-1.43.ebuild,v 1.1 2003/02/22 12:46:40 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/jde/jde-1.43.ebuild,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -12,7 +12,7 @@ app-xemacs/semantic
 app-xemacs/debug
 app-xemacs/speedbar
 app-xemacs/edit-utils
-app-xemacs/eterm
+app-xemacs/xemacs-eterm
 app-xemacs/mail-lib
 app-xemacs/xemacs-base
 app-xemacs/xemacs-devel
@@ -21,7 +21,7 @@ app-xemacs/elib
 app-xemacs/sh-script
 app-xemacs/fsf-compat
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/latin-unity/ChangeLog b/app-xemacs/latin-unity/ChangeLog
index 7ef93f1226fe..5845088a75c5 100644
--- a/app-xemacs/latin-unity/ChangeLog
+++ b/app-xemacs/latin-unity/ChangeLog
@@ -1,8 +1,14 @@
 # ChangeLog for app-xemacs/latin-unity
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/latin-unity/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/latin-unity/ChangeLog,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> latin-unity-1.07.ebuild:
+  Stable on alpha
 
 *latin-unity-1.07 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> latin-unity-1.07.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/latin-unity/Manifest b/app-xemacs/latin-unity/Manifest
index e69de29bb2d1..9cc7d6ff1723 100644
--- a/app-xemacs/latin-unity/Manifest
+++ b/app-xemacs/latin-unity/Manifest
@@ -0,0 +1,3 @@
+MD5 c1d0f4a27f8beb7c4b5869caf1ac4097 ChangeLog 524
+MD5 4720d7e7b249dc609f6068bd31fa39dc latin-unity-1.07.ebuild 511
+MD5 59e57f143c11625f7722b57297dbcf0e files/digest-latin-unity-1.07 71
diff --git a/app-xemacs/latin-unity/latin-unity-1.07.ebuild b/app-xemacs/latin-unity/latin-unity-1.07.ebuild
index 3cf2b4d5bd4e..d4ecfc3b7b44 100644
--- a/app-xemacs/latin-unity/latin-unity-1.07.ebuild
+++ b/app-xemacs/latin-unity/latin-unity-1.07.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/app-xemacs/latin-unity/latin-unity-1.07.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/latin-unity/latin-unity-1.07.ebuild,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -13,6 +13,7 @@ app-xemacs/leim
 app-xemacs/fsf-compat
 app-xemacs/dired
 "
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/leim/ChangeLog b/app-xemacs/leim/ChangeLog
index 13b1159d95d1..552a6da53516 100644
--- a/app-xemacs/leim/ChangeLog
+++ b/app-xemacs/leim/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for app-xemacs/leim
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/leim/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/leim/ChangeLog,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> leim-1.20.ebuild:
+  Stable on ppc.
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> leim-1.20.ebuild:
+  Stable on alpha
+
+*leim-1.20 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> leim-1.19.ebuild leim-1.20.ebuild files/digest-leim-1.20 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *leim-1.19 (16 Dec 2002)
 
diff --git a/app-xemacs/leim/Manifest b/app-xemacs/leim/Manifest
index e69de29bb2d1..6961a01aed5b 100644
--- a/app-xemacs/leim/Manifest
+++ b/app-xemacs/leim/Manifest
@@ -0,0 +1,5 @@
+MD5 1028768b5171c2d76b1e230141352a79 leim-1.20.ebuild 466
+MD5 e82bdc38dd4e0dfd2a5a5d9450a37f30 ChangeLog 714
+MD5 de6e06c3aa49e2f053c7b3dee88be752 leim-1.19.ebuild 466
+MD5 1c570bf7bec6ea933e067243d1f88975 files/digest-leim-1.19 65
+MD5 350e133b312dc3aaf93bdfdb191726d7 files/digest-leim-1.20 65
diff --git a/app-xemacs/leim/leim-1.19.ebuild b/app-xemacs/leim/leim-1.19.ebuild
index 111832c14ba0..bd63967a484a 100644
--- a/app-xemacs/leim/leim-1.19.ebuild
+++ b/app-xemacs/leim/leim-1.19.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/app-xemacs/leim/leim-1.19.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/leim/leim-1.19.ebuild,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -11,6 +11,7 @@ DEPEND="app-xemacs/mule-base
 app-xemacs/fsf-compat
 app-xemacs/xemacs-base
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/leim/leim-1.20.ebuild b/app-xemacs/leim/leim-1.20.ebuild
index ac54adba18b3..49782f6e52bb 100644
--- a/app-xemacs/leim/leim-1.20.ebuild
+++ b/app-xemacs/leim/leim-1.20.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/app-xemacs/leim/leim-1.20.ebuild,v 1.1 2003/02/22 12:46:40 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/leim/leim-1.20.ebuild,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -11,7 +11,7 @@ DEPEND="app-xemacs/mule-base
 app-xemacs/fsf-compat
 app-xemacs/xemacs-base
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="alpha amd64 ppc sparc x86"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/liece/ChangeLog b/app-xemacs/liece/ChangeLog
index 1f707347b3b7..241e79ff937c 100644
--- a/app-xemacs/liece/ChangeLog
+++ b/app-xemacs/liece/ChangeLog
@@ -1,8 +1,14 @@
 # ChangeLog for app-xemacs/liece
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/liece/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/liece/ChangeLog,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> liece-1.10.ebuild:
+  Stable on alpha
 
 *liece-1.10 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> liece-1.10.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/liece/Manifest b/app-xemacs/liece/Manifest
index e69de29bb2d1..3675a0675a4c 100644
--- a/app-xemacs/liece/Manifest
+++ b/app-xemacs/liece/Manifest
@@ -0,0 +1,3 @@
+MD5 514747723ee375f53c11d234442ffcdd ChangeLog 494
+MD5 0f15ae291b902bd8b64a40032ee236b9 liece-1.10.ebuild 471
+MD5 55548f0bb9cbbee19e734851f9e375d9 files/digest-liece-1.10 65
diff --git a/app-xemacs/liece/liece-1.10.ebuild b/app-xemacs/liece/liece-1.10.ebuild
index 2c5e6e1260c5..85aee12f5e5a 100644
--- a/app-xemacs/liece/liece-1.10.ebuild
+++ b/app-xemacs/liece/liece-1.10.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/app-xemacs/liece/liece-1.10.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/liece/liece-1.10.ebuild,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -12,6 +12,7 @@ app-xemacs/mail-lib
 app-xemacs/fsf-compat
 app-xemacs/xemacs-base
 "
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/locale/ChangeLog b/app-xemacs/locale/ChangeLog
index b7244eea549d..204d75a30b32 100644
--- a/app-xemacs/locale/ChangeLog
+++ b/app-xemacs/locale/ChangeLog
@@ -1,8 +1,14 @@
 # ChangeLog for app-xemacs/locale
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/locale/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/locale/ChangeLog,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> locale-1.20.ebuild:
+  Stable on alpha
 
 *locale-1.20 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> locale-1.20.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/locale/Manifest b/app-xemacs/locale/Manifest
index e69de29bb2d1..4ab4dcad3449 100644
--- a/app-xemacs/locale/Manifest
+++ b/app-xemacs/locale/Manifest
@@ -0,0 +1,3 @@
+MD5 3a5e8570b6ca020baeae1e6f232a6745 ChangeLog 499
+MD5 4507e605ec54b5cf03fe7dd0683ad060 locale-1.20.ebuild 420
+MD5 91554aae1ffc042c6c791f65d3bef5d2 files/digest-locale-1.20 65
diff --git a/app-xemacs/locale/locale-1.20.ebuild b/app-xemacs/locale/locale-1.20.ebuild
index fcd5b7f7d24d..fb5ecab0264d 100644
--- a/app-xemacs/locale/locale-1.20.ebuild
+++ b/app-xemacs/locale/locale-1.20.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/app-xemacs/locale/locale-1.20.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/locale/locale-1.20.ebuild,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -9,6 +9,7 @@ PKG_CAT="mule"
 
 DEPEND="app-xemacs/mule-base
 "
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/lookup/ChangeLog b/app-xemacs/lookup/ChangeLog
index c168a679b813..df6d27847946 100644
--- a/app-xemacs/lookup/ChangeLog
+++ b/app-xemacs/lookup/ChangeLog
@@ -1,8 +1,14 @@
 # ChangeLog for app-xemacs/lookup
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/lookup/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/lookup/ChangeLog,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> lookup-1.13.ebuild:
+  Stable on alpha
 
 *lookup-1.13 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> lookup-1.13.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/lookup/Manifest b/app-xemacs/lookup/Manifest
index e69de29bb2d1..a0f259cb5c77 100644
--- a/app-xemacs/lookup/Manifest
+++ b/app-xemacs/lookup/Manifest
@@ -0,0 +1,3 @@
+MD5 d5035a9b1977416236cca6369f1ddfe6 ChangeLog 499
+MD5 36054d30b4976d45512572071478acbd lookup-1.13.ebuild 408
+MD5 0a068e57c28247327b9bf0fb26970c07 files/digest-lookup-1.13 66
diff --git a/app-xemacs/lookup/lookup-1.13.ebuild b/app-xemacs/lookup/lookup-1.13.ebuild
index 746608cd1d69..b7ed3c990463 100644
--- a/app-xemacs/lookup/lookup-1.13.ebuild
+++ b/app-xemacs/lookup/lookup-1.13.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/app-xemacs/lookup/lookup-1.13.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/lookup/lookup-1.13.ebuild,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -10,6 +10,7 @@ PKG_CAT="mule"
 DEPEND="app-xemacs/mule-base
 app-xemacs/cookie
 "
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/mail-lib/ChangeLog b/app-xemacs/mail-lib/ChangeLog
index 33ddf0f3b6db..20305f767195 100644
--- a/app-xemacs/mail-lib/ChangeLog
+++ b/app-xemacs/mail-lib/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for app-xemacs/mail-lib
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/mail-lib/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/mail-lib/ChangeLog,v 1.1.1.1 2005/11/30 09:38:54 chriswhite Exp $
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> mail-lib-1.56.ebuild:
+  Stable on ppc.
+
+  02 Oct 2004; Robert Coie <rac@gentoo.org> +metadata.xml,
+  mail-lib-1.54.ebuild, mail-lib-1.56.ebuild:
+  eterm -> xemacs-eterm renaming
+
+  09 Aug 2004; Tom Gall <tgall@gentoo.org> mail-lib-1.56.ebuild:
+  stable on ppc64, bug #57174
+ 
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> mail-lib-1.56.ebuild:
+  Stable on alpha
+
+*mail-lib-1.56 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> mail-lib-1.54.ebuild mail-lib-1.56.ebuild files/digest-mail-lib-1.56 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *mail-lib-1.54 (16 Dec 2002)
 
diff --git a/app-xemacs/mail-lib/Manifest b/app-xemacs/mail-lib/Manifest
index e69de29bb2d1..3854d7759f64 100644
--- a/app-xemacs/mail-lib/Manifest
+++ b/app-xemacs/mail-lib/Manifest
@@ -0,0 +1,6 @@
+MD5 241e7c19d61a6b85c2967ff2b29c2c70 mail-lib-1.54.ebuild 508
+MD5 026deda7a08547ce2444434c23291c73 mail-lib-1.56.ebuild 514
+MD5 0f39d0139849956930b1a500aca9c6de metadata.xml 365
+MD5 38547b8115b61ec4f76c919a4bd10424 ChangeLog 986
+MD5 9c44dece0802fe6448238be62077f8b1 files/digest-mail-lib-1.56 68
+MD5 aee0e20ed1441b7ab3612ed1263aed38 files/digest-mail-lib-1.54 68
diff --git a/app-xemacs/mail-lib/mail-lib-1.54.ebuild b/app-xemacs/mail-lib/mail-lib-1.54.ebuild
index aa01656972aa..90bda1dc63de 100644
--- a/app-xemacs/mail-lib/mail-lib-1.54.ebuild
+++ b/app-xemacs/mail-lib/mail-lib-1.54.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/app-xemacs/mail-lib/mail-lib-1.54.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/mail-lib/mail-lib-1.54.ebuild,v 1.1.1.1 2005/11/30 09:38:54 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
 DESCRIPTION="Fundamental lisp files for providing email support."
 PKG_CAT="standard"
 
-DEPEND="app-xemacs/eterm
+DEPEND="app-xemacs/xemacs-eterm
 app-xemacs/xemacs-base
 app-xemacs/fsf-compat
 app-xemacs/sh-script
 app-xemacs/ecrypto
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/mail-lib/mail-lib-1.56.ebuild b/app-xemacs/mail-lib/mail-lib-1.56.ebuild
index 8f864daadc79..7a733a88576f 100644
--- a/app-xemacs/mail-lib/mail-lib-1.56.ebuild
+++ b/app-xemacs/mail-lib/mail-lib-1.56.ebuild
@@ -1,19 +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/app-xemacs/mail-lib/mail-lib-1.56.ebuild,v 1.1 2003/02/22 12:46:40 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/mail-lib/mail-lib-1.56.ebuild,v 1.1.1.1 2005/11/30 09:38:54 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
 DESCRIPTION="Fundamental lisp files for providing email support."
 PKG_CAT="standard"
 
-DEPEND="app-xemacs/eterm
+DEPEND="app-xemacs/xemacs-eterm
 app-xemacs/xemacs-base
 app-xemacs/fsf-compat
 app-xemacs/sh-script
 app-xemacs/ecrypto
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="amd64 x86 ppc alpha sparc ppc64"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/mailcrypt/ChangeLog b/app-xemacs/mailcrypt/ChangeLog
index fb956bce47b9..8dbe01d114a0 100644
--- a/app-xemacs/mailcrypt/ChangeLog
+++ b/app-xemacs/mailcrypt/ChangeLog
@@ -1,8 +1,20 @@
 # ChangeLog for app-xemacs/mailcrypt
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/mailcrypt/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/mailcrypt/ChangeLog,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
+
+  29 Sep 2005; Joseph Jezak <josejx@gentoo.org> mailcrypt-2.12.ebuild:
+  Marked ppc stable.
+
+  09 Aug 2004; Tom Gall <tgall@gentoo.org> mailcrypto-2.12.ebuild:
+  stable on ppc64, bug #57174
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> mailcrypt-2.12.ebuild:
+  Stable on alpha
 
 *mailcrypt-2.12 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> mailcrypt-2.12.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/mailcrypt/Manifest b/app-xemacs/mailcrypt/Manifest
index e69de29bb2d1..49e435e443b7 100644
--- a/app-xemacs/mailcrypt/Manifest
+++ b/app-xemacs/mailcrypt/Manifest
@@ -0,0 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 11cb470d697a093df79ad5c1d06f192b ChangeLog 701
+MD5 944b30716393b2e00905449b0f2f7659 mailcrypt-2.12.ebuild 545
+MD5 5a59690f53e76d99c087ef9a2d5feacf files/digest-mailcrypt-2.12 69
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDO4xqcsIHjyDViGQRAiXjAKCeqoSbA3GEV358cSqs+H+epyB5NACdE5Q7
+0CqXlaY6vp9/BcGtWpOWWeY=
+=surm
+-----END PGP SIGNATURE-----
diff --git a/app-xemacs/mailcrypt/mailcrypt-2.12.ebuild b/app-xemacs/mailcrypt/mailcrypt-2.12.ebuild
index b8f2b84fba7e..414a6338b4b7 100644
--- a/app-xemacs/mailcrypt/mailcrypt-2.12.ebuild
+++ b/app-xemacs/mailcrypt/mailcrypt-2.12.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/app-xemacs/mailcrypt/mailcrypt-2.12.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/mailcrypt/mailcrypt-2.12.ebuild,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -16,6 +16,7 @@ app-xemacs/mh-e
 app-xemacs/rmail
 app-xemacs/vm
 "
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/metadata.xml b/app-xemacs/metadata.xml
index ce0e15f9aee7..85de17153818 100644
--- a/app-xemacs/metadata.xml
+++ b/app-xemacs/metadata.xml
@@ -4,5 +4,27 @@
 	<longdescription lang="en">
 		The app-xemacs category contains extensions for the XEmacs text editor.
 	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie app-xemacs enthält Erweiterungen für den Texteditor XEmacs.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría app-xemacs contiene extensiones para el editor de texto
+		XEmacs.
+	</longdescription>
+	<longdescription lang="ja">
+		app-xemacsカテゴリにはXEmacsテキストエディタに
+		関連した拡張パッケージが含まれます。
+	</longdescription>
+	<longdescription lang="nl">
+		De app-xemacs categorie bevat uitbreidingen voor de XEmacs text editor.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm app-xemacs chứa các phần mở rộng của trình soạn
+		thảo văn bản XEmacs.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria app-xemacs contiene estensioni per l'editor di testo
+		XEmacs.
+	</longdescription>
 </catmetadata>
 
diff --git a/app-xemacs/mew/ChangeLog b/app-xemacs/mew/ChangeLog
index ac5e6cd474ec..ac2c9348ce3f 100644
--- a/app-xemacs/mew/ChangeLog
+++ b/app-xemacs/mew/ChangeLog
@@ -1,8 +1,14 @@
 # ChangeLog for app-xemacs/mew
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/mew/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/mew/ChangeLog,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> mew-1.17.ebuild:
+  Stable on alpha
 
 *mew-1.17 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> mew-1.17.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/mew/Manifest b/app-xemacs/mew/Manifest
index e69de29bb2d1..49530bfd6a3c 100644
--- a/app-xemacs/mew/Manifest
+++ b/app-xemacs/mew/Manifest
@@ -0,0 +1,3 @@
+MD5 8ae2322b9a2af484f5e2521eeda05612 ChangeLog 484
+MD5 3a44005e16cda550cb77b5dc1ffce972 mew-1.17.ebuild 465
+MD5 9b88321e41ab5b0317b6176198dc4453 files/digest-mew-1.17 63
diff --git a/app-xemacs/mew/mew-1.17.ebuild b/app-xemacs/mew/mew-1.17.ebuild
index bddfcb91fc69..e7884b619c84 100644
--- a/app-xemacs/mew/mew-1.17.ebuild
+++ b/app-xemacs/mew/mew-1.17.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/app-xemacs/mew/mew-1.17.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/mew/mew-1.17.ebuild,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -13,6 +13,7 @@ app-xemacs/mail-lib
 app-xemacs/xemacs-base
 app-xemacs/fsf-compat
 "
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/mh-e/ChangeLog b/app-xemacs/mh-e/ChangeLog
index eca63cb790ec..dbb2fdf3eec3 100644
--- a/app-xemacs/mh-e/ChangeLog
+++ b/app-xemacs/mh-e/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for app-xemacs/mh-e
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/mh-e/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/mh-e/ChangeLog,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
+
+  29 Sep 2005; Joseph Jezak <josejx@gentoo.org> mh-e-1.17.ebuild:
+  Marked ppc stable.
+
+  09 Aug 2004; Tom Gall <tgall@gentoo.org> mh-e-1.17.ebuild:
+  stable on ppc64, bug #57174
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> mh-e-1.17.ebuild:
+  Stable on alpha
+
+*mh-e-1.17 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> mh-e-1.16.ebuild mh-e-1.17.ebuild files/digest-mh-e-1.17 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *mh-e-1.16 (16 Dec 2002)
 
diff --git a/app-xemacs/mh-e/Manifest b/app-xemacs/mh-e/Manifest
index e69de29bb2d1..eaccb3e29f7e 100644
--- a/app-xemacs/mh-e/Manifest
+++ b/app-xemacs/mh-e/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 01aae18764cf349e2a95a84630d71989 ChangeLog 804
+MD5 b136edca57fc9ba7437eb09b5d195839 mh-e-1.16.ebuild 408
+MD5 2e94dae9f832d1ad031ae6120adb7038 mh-e-1.17.ebuild 540
+MD5 dab2788f243ddd0cfede5d66e0742329 files/digest-mh-e-1.17 64
+MD5 b1e2e6cac00771d6c57744e5d02d0c36 files/digest-mh-e-1.16 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDO40OcsIHjyDViGQRAqZ5AJ9/Ca3qzgObB35bvZSgyTFNTGdAmACePxoI
+e/vCbXoNq2UrZantU2NL1QA=
+=1tx2
+-----END PGP SIGNATURE-----
diff --git a/app-xemacs/mh-e/mh-e-1.16.ebuild b/app-xemacs/mh-e/mh-e-1.16.ebuild
index 0a497fd1a06e..be4a94c1001d 100644
--- a/app-xemacs/mh-e/mh-e-1.16.ebuild
+++ b/app-xemacs/mh-e/mh-e-1.16.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/app-xemacs/mh-e/mh-e-1.16.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/mh-e/mh-e-1.16.ebuild,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -10,6 +10,7 @@ PKG_CAT="standard"
 DEPEND="app-xemacs/mail-lib
 app-xemacs/xemacs-base
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/mh-e/mh-e-1.17.ebuild b/app-xemacs/mh-e/mh-e-1.17.ebuild
index 24f81b310f99..078b48c4e442 100644
--- a/app-xemacs/mh-e/mh-e-1.17.ebuild
+++ b/app-xemacs/mh-e/mh-e-1.17.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/app-xemacs/mh-e/mh-e-1.17.ebuild,v 1.1 2003/02/22 12:46:40 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/mh-e/mh-e-1.17.ebuild,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -17,7 +17,7 @@ app-xemacs/apel
 app-xemacs/sh-script
 app-xemacs/fsf-compat
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/mine/ChangeLog b/app-xemacs/mine/ChangeLog
index 12d82d787cc5..96f48f598e87 100644
--- a/app-xemacs/mine/ChangeLog
+++ b/app-xemacs/mine/ChangeLog
@@ -1,8 +1,17 @@
 # ChangeLog for app-xemacs/mine
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/mine/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/mine/ChangeLog,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
+
+  29 Sep 2005; Joseph Jezak <josejx@gentoo.org> mine-1.14.ebuild:
+  Marked ppc stable.
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> mine-1.14.ebuild:
+  Stable on alpha
 
 *mine-1.14 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> mine-1.14.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/mine/Manifest b/app-xemacs/mine/Manifest
index e69de29bb2d1..b9ce2d3b2a75 100644
--- a/app-xemacs/mine/Manifest
+++ b/app-xemacs/mine/Manifest
@@ -0,0 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 451c8fbd21222637afea9d68daaa56b9 ChangeLog 573
+MD5 b3830faac3914ba84b44cbd9d3428ed2 mine-1.14.ebuild 378
+MD5 487a80d2e1c0f2b556c5f95e3076e965 files/digest-mine-1.14 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDO48ZcsIHjyDViGQRAk5rAJ9yT/QDa4F3lqNXwzTa5mcB2m/CLwCgswWl
+ku+ChMExuvq91wb+jP4bzCg=
+=zXEO
+-----END PGP SIGNATURE-----
diff --git a/app-xemacs/mine/mine-1.14.ebuild b/app-xemacs/mine/mine-1.14.ebuild
index b0f9e0ec0cca..71642ba865bf 100644
--- a/app-xemacs/mine/mine-1.14.ebuild
+++ b/app-xemacs/mine/mine-1.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/app-xemacs/mine/mine-1.14.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/mine/mine-1.14.ebuild,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -9,6 +9,7 @@ PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
 "
+KEYWORDS="alpha amd64 ppc sparc x86"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/misc-games/ChangeLog b/app-xemacs/misc-games/ChangeLog
index 4d598cc4e664..7d5e28e6c78b 100644
--- a/app-xemacs/misc-games/ChangeLog
+++ b/app-xemacs/misc-games/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for app-xemacs/misc-games
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/misc-games/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/misc-games/ChangeLog,v 1.1.1.1 2005/11/30 09:38:55 chriswhite Exp $
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  misc-games-1.16.ebuild:
+  Stable on ppc.
+
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org> misc-games-1.16.ebuild:
+  Stable on ppc64
+
+  01 Nov 2004; Markus Rothe <corsair@gentoo.org> misc-games-1.16.ebuild:
+  Marked ~ppc64; bug #67092
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> misc-games-1.16.ebuild:
+  Stable on alpha
+
+*misc-games-1.16 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> misc-games-1.15.ebuild misc-games-1.16.ebuild files/digest-misc-games-1.16 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *misc-games-1.15 (16 Dec 2002)
 
diff --git a/app-xemacs/misc-games/Manifest b/app-xemacs/misc-games/Manifest
index e69de29bb2d1..ea5df0333d3a 100644
--- a/app-xemacs/misc-games/Manifest
+++ b/app-xemacs/misc-games/Manifest
@@ -0,0 +1,5 @@
+MD5 9f616ff08688f67f089c417f3a517cbc ChangeLog 964
+MD5 792d68696f9a88b1575065682b5d33f8 misc-games-1.16.ebuild 413
+MD5 091c984b84ef5efca641254109148edf misc-games-1.15.ebuild 407
+MD5 9d8f762094526b0167337e7f86adb2fa files/digest-misc-games-1.16 70
+MD5 b888a37c5b644cc1843c94e3326d7a68 files/digest-misc-games-1.15 70
diff --git a/app-xemacs/misc-games/misc-games-1.15.ebuild b/app-xemacs/misc-games/misc-games-1.15.ebuild
index 050926fb4544..4af8492001f0 100644
--- a/app-xemacs/misc-games/misc-games-1.15.ebuild
+++ b/app-xemacs/misc-games/misc-games-1.15.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/app-xemacs/misc-games/misc-games-1.15.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/misc-games/misc-games-1.15.ebuild,v 1.1.1.1 2005/11/30 09:38:55 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -9,6 +9,7 @@ PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/misc-games/misc-games-1.16.ebuild b/app-xemacs/misc-games/misc-games-1.16.ebuild
index e6454e34d80c..437c6c3e9c51 100644
--- a/app-xemacs/misc-games/misc-games-1.16.ebuild
+++ b/app-xemacs/misc-games/misc-games-1.16.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/app-xemacs/misc-games/misc-games-1.16.ebuild,v 1.1 2003/02/22 12:46:40 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/misc-games/misc-games-1.16.ebuild,v 1.1.1.1 2005/11/30 09:38:55 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -9,7 +9,7 @@ PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/mmm-mode/ChangeLog b/app-xemacs/mmm-mode/ChangeLog
index 65948fa355ee..42eacfc233ef 100644
--- a/app-xemacs/mmm-mode/ChangeLog
+++ b/app-xemacs/mmm-mode/ChangeLog
@@ -1,8 +1,17 @@
 # ChangeLog for app-xemacs/mmm-mode
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/mmm-mode/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/mmm-mode/ChangeLog,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
+
+  16 Mar 2004; <rac@gentoo.org> metadata.xml, mmm-mode-1.00.ebuild:
+  keyword amd64
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> mmm-mode-1.00.ebuild:
+  Stable on alpha
 
 *mmm-mode-1.00 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> mmm-mode-1.00.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/mmm-mode/Manifest b/app-xemacs/mmm-mode/Manifest
index e69de29bb2d1..b8001c20c287 100644
--- a/app-xemacs/mmm-mode/Manifest
+++ b/app-xemacs/mmm-mode/Manifest
@@ -0,0 +1,4 @@
+MD5 75dc03d5cd25a8f89e264bbc92485b8a ChangeLog 594
+MD5 0f39d0139849956930b1a500aca9c6de metadata.xml 365
+MD5 f529ef972a46874dc5f997a68ca0415a mmm-mode-1.00.ebuild 437
+MD5 61a7846941315455eebfbc82042b8ffe files/digest-mmm-mode-1.00 68
diff --git a/app-xemacs/mmm-mode/mmm-mode-1.00.ebuild b/app-xemacs/mmm-mode/mmm-mode-1.00.ebuild
index f826c4581dfd..7d11f752197e 100644
--- a/app-xemacs/mmm-mode/mmm-mode-1.00.ebuild
+++ b/app-xemacs/mmm-mode/mmm-mode-1.00.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/app-xemacs/mmm-mode/mmm-mode-1.00.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/mmm-mode/mmm-mode-1.00.ebuild,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -10,6 +10,7 @@ PKG_CAT="standard"
 DEPEND="app-xemacs/xemacs-base
 app-xemacs/fsf-compat
 "
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/mule-base/ChangeLog b/app-xemacs/mule-base/ChangeLog
index 62b842ffa18e..fc3edfd94186 100644
--- a/app-xemacs/mule-base/ChangeLog
+++ b/app-xemacs/mule-base/ChangeLog
@@ -1,8 +1,21 @@
 # ChangeLog for app-xemacs/mule-base
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/mule-base/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/mule-base/ChangeLog,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
+
+  09 Aug 2004; Tom Gall <tgall@gentoo.org> mule-base-1.42.ebuild:
+  stable on ppc64, bug #57174
+
+  27 Jul 2004; Robert Coie <rac@gentoo.org> +metadata.xml,
+  mule-base-1.42.ebuild:
+  keywording ppc
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> mule-base-1.42.ebuild:
+  Stable on alpha
 
 *mule-base-1.42 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> mule-base-1.42.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/mule-base/Manifest b/app-xemacs/mule-base/Manifest
index e69de29bb2d1..e5f2c087a1f9 100644
--- a/app-xemacs/mule-base/Manifest
+++ b/app-xemacs/mule-base/Manifest
@@ -0,0 +1,4 @@
+MD5 e4bd617e5be51f0c3d0c21e75f5f80ce ChangeLog 713
+MD5 1da46c3a1306e7a504cbfb0ce631320a mule-base-1.42.ebuild 476
+MD5 0f39d0139849956930b1a500aca9c6de metadata.xml 365
+MD5 e3ba1f7cb15c9c1e7f4265cb95a81157 files/digest-mule-base-1.42 69
diff --git a/app-xemacs/mule-base/mule-base-1.42.ebuild b/app-xemacs/mule-base/mule-base-1.42.ebuild
index 2d7cbeb9e047..816dfdf23f08 100644
--- a/app-xemacs/mule-base/mule-base-1.42.ebuild
+++ b/app-xemacs/mule-base/mule-base-1.42.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/app-xemacs/mule-base/mule-base-1.42.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/mule-base/mule-base-1.42.ebuild,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -11,6 +11,7 @@ DEPEND="app-xemacs/fsf-compat
 app-xemacs/xemacs-base
 app-xemacs/apel
 "
+KEYWORDS="x86 ppc alpha sparc amd64 ppc64"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/mule-ucs/ChangeLog b/app-xemacs/mule-ucs/ChangeLog
index 2cf774e699d1..7fffdbb0e377 100644
--- a/app-xemacs/mule-ucs/ChangeLog
+++ b/app-xemacs/mule-ucs/ChangeLog
@@ -1,8 +1,17 @@
 # ChangeLog for app-xemacs/mule-ucs
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/mule-ucs/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/mule-ucs/ChangeLog,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
+
+  16 Mar 2004; <rac@gentoo.org> metadata.xml, mule-ucs-1.04.ebuild:
+  keyword amd64
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> mule-ucs-1.04.ebuild:
+  Stable on alpha
 
 *mule-ucs-1.04 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> mule-ucs-1.04.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/mule-ucs/Manifest b/app-xemacs/mule-ucs/Manifest
index e69de29bb2d1..032718030e7c 100644
--- a/app-xemacs/mule-ucs/Manifest
+++ b/app-xemacs/mule-ucs/Manifest
@@ -0,0 +1,4 @@
+MD5 cb8b5f41df73509c98528028594af59d ChangeLog 594
+MD5 0f39d0139849956930b1a500aca9c6de metadata.xml 365
+MD5 cef4967ee16d2be4eda3838d734497ac mule-ucs-1.04.ebuild 431
+MD5 f57e45afe694150dbdc992bee037cfeb files/digest-mule-ucs-1.04 69
diff --git a/app-xemacs/mule-ucs/mule-ucs-1.04.ebuild b/app-xemacs/mule-ucs/mule-ucs-1.04.ebuild
index b2b93ee85cf9..cc59b652ea6a 100644
--- a/app-xemacs/mule-ucs/mule-ucs-1.04.ebuild
+++ b/app-xemacs/mule-ucs/mule-ucs-1.04.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/app-xemacs/mule-ucs/mule-ucs-1.04.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/mule-ucs/mule-ucs-1.04.ebuild,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -9,6 +9,7 @@ PKG_CAT="mule"
 
 DEPEND="app-xemacs/mule-base
 "
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/net-utils/ChangeLog b/app-xemacs/net-utils/ChangeLog
index e8e2ef76b855..20a066243338 100644
--- a/app-xemacs/net-utils/ChangeLog
+++ b/app-xemacs/net-utils/ChangeLog
@@ -1,6 +1,32 @@
 # ChangeLog for app-xemacs/net-utils
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/net-utils/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/net-utils/ChangeLog,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
+
+  29 Sep 2005; Joseph Jezak <josejx@gentoo.org> net-utils-1.32.ebuild:
+  Marked ppc stable.
+
+  02 Oct 2004; Robert Coie <rac@gentoo.org> +metadata.xml,
+  net-utils-1.28.ebuild, net-utils-1.31.ebuild, net-utils-1.32.ebuild:
+  eterm -> xemacs-eterm renaming
+
+  09 Aug 2004; Tom Gall <tgall@gentoo.org> net-utils-1.32.ebuild:
+  stable on ppc64, bug #57174
+
+*net-utils-1.32 (27 Oct 2003)
+
+  27 Oct 2003; <rac@gentoo.org> net-utils-1.32.ebuild:
+  New upstream, needed for oort gnus
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> net-utils-1.31.ebuild:
+  Stable on alpha
+
+*net-utils-1.31 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> net-utils-1.28.ebuild net-utils-1.31.ebuild files/digest-net-utils-1.31 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *net-utils-1.28 (16 Dec 2002)
 
diff --git a/app-xemacs/net-utils/Manifest b/app-xemacs/net-utils/Manifest
index e69de29bb2d1..573c51b80052 100644
--- a/app-xemacs/net-utils/Manifest
+++ b/app-xemacs/net-utils/Manifest
@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5a24f16adf7802a75d30c5c615c55936 ChangeLog 1143
+MD5 0ee05961e47a02a84752dcaebf46d8c3 net-utils-1.32.ebuild 609
+MD5 0f39d0139849956930b1a500aca9c6de metadata.xml 365
+MD5 2fa50341aa8b3f3da9c4cbcc1c5e075a net-utils-1.28.ebuild 524
+MD5 320d1b969dcd7ac2c93d83cdb3909cfc net-utils-1.31.ebuild 602
+MD5 23aa71d88458a8ca86f15dc1158afd36 files/digest-net-utils-1.32 70
+MD5 950a359d53fd0bed713aefb7b7d605cb files/digest-net-utils-1.28 69
+MD5 f37e74738676b299746a99f3d9327160 files/digest-net-utils-1.31 69
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDO4v/csIHjyDViGQRAgUaAKDe5bVstW2GLG4bHQdxbWtQzXjrWwCcCfO2
+eWjPRoJdEduNM/Qwe4vbodQ=
+=9RmU
+-----END PGP SIGNATURE-----
diff --git a/app-xemacs/net-utils/net-utils-1.28.ebuild b/app-xemacs/net-utils/net-utils-1.28.ebuild
index 1c121ccd56b5..43032b05d912 100644
--- a/app-xemacs/net-utils/net-utils-1.28.ebuild
+++ b/app-xemacs/net-utils/net-utils-1.28.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/app-xemacs/net-utils/net-utils-1.28.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/net-utils/net-utils-1.28.ebuild,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -12,9 +12,10 @@ app-xemacs/efs
 app-xemacs/mail-lib
 app-xemacs/xemacs-base
 app-xemacs/fsf-compat
-app-xemacs/eterm
+app-xemacs/xemacs-eterm
 app-xemacs/sh-script
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/net-utils/net-utils-1.31.ebuild b/app-xemacs/net-utils/net-utils-1.31.ebuild
index 00d9135576dc..23ad2564d19a 100644
--- a/app-xemacs/net-utils/net-utils-1.31.ebuild
+++ b/app-xemacs/net-utils/net-utils-1.31.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/app-xemacs/net-utils/net-utils-1.31.ebuild,v 1.1 2003/02/22 12:46:40 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/net-utils/net-utils-1.31.ebuild,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -13,14 +13,14 @@ app-xemacs/efs
 app-xemacs/mail-lib
 app-xemacs/xemacs-base
 app-xemacs/fsf-compat
-app-xemacs/eterm
+app-xemacs/xemacs-eterm
 app-xemacs/sh-script
 app-xemacs/gnus
 app-xemacs/rmail
 app-xemacs/tm
 app-xemacs/apel
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="x86 ~ppc alpha sparc"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/net-utils/net-utils-1.32.ebuild b/app-xemacs/net-utils/net-utils-1.32.ebuild
index 0335ca05e69f..36fa1c81698f 100644
--- a/app-xemacs/net-utils/net-utils-1.32.ebuild
+++ b/app-xemacs/net-utils/net-utils-1.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: /var/cvsroot/gentoo-x86/app-xemacs/net-utils/net-utils-1.32.ebuild,v 1.1 2003/10/27 18:36:49 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/net-utils/net-utils-1.32.ebuild,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -13,14 +13,14 @@ app-xemacs/efs
 app-xemacs/mail-lib
 app-xemacs/xemacs-base
 app-xemacs/fsf-compat
-app-xemacs/eterm
+app-xemacs/xemacs-eterm
 app-xemacs/sh-script
 app-xemacs/gnus
 app-xemacs/rmail
 app-xemacs/tm
 app-xemacs/apel
 "
-KEYWORDS="x86 ~ppc alpha sparc"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/ocaml/ChangeLog b/app-xemacs/ocaml/ChangeLog
index bad227c9e1e1..36f7a0ef4c6e 100644
--- a/app-xemacs/ocaml/ChangeLog
+++ b/app-xemacs/ocaml/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for app-xemacs/ocaml
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/ocaml/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/ocaml/ChangeLog,v 1.1.1.1 2005/11/30 09:38:55 chriswhite Exp $
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> ocaml-0.04.ebuild:
+  Stable on ppc.
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> ocaml-0.04.ebuild:
+  Stable on alpha
+
+*ocaml-0.04 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> ocaml-0.03.ebuild ocaml-0.04.ebuild:
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *ocaml-0.03 (16 Dec 2002)
 
diff --git a/app-xemacs/ocaml/Manifest b/app-xemacs/ocaml/Manifest
index e69de29bb2d1..781aabca0743 100644
--- a/app-xemacs/ocaml/Manifest
+++ b/app-xemacs/ocaml/Manifest
@@ -0,0 +1,5 @@
+MD5 6b8d06d5c3c520b75a11166d7acc589e ocaml-0.03.ebuild 418
+MD5 4f084b5e1c51ec91d617230b1ae8c0e1 ocaml-0.04.ebuild 418
+MD5 c1d12b6a7fb727a2c607e9e783a2c85a ChangeLog 698
+MD5 5c1b647acc30700ab2a7a410ed868cb0 files/digest-ocaml-0.04 64
+MD5 95f50e8b3df5134159be5c6d77564706 files/digest-ocaml-0.03 64
diff --git a/app-xemacs/ocaml/ocaml-0.03.ebuild b/app-xemacs/ocaml/ocaml-0.03.ebuild
index 3c066a6d71ae..19abf18790e4 100644
--- a/app-xemacs/ocaml/ocaml-0.03.ebuild
+++ b/app-xemacs/ocaml/ocaml-0.03.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/app-xemacs/ocaml/ocaml-0.03.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/ocaml/ocaml-0.03.ebuild,v 1.1.1.1 2005/11/30 09:38:55 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -10,6 +10,7 @@ PKG_CAT="standard"
 DEPEND="app-xemacs/xemacs-base
 app-xemacs/fsf-compat
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/ocaml/ocaml-0.04.ebuild b/app-xemacs/ocaml/ocaml-0.04.ebuild
index 58f795c81ffc..14e75db3f3bf 100644
--- a/app-xemacs/ocaml/ocaml-0.04.ebuild
+++ b/app-xemacs/ocaml/ocaml-0.04.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/app-xemacs/ocaml/ocaml-0.04.ebuild,v 1.1 2003/02/22 12:46:40 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/ocaml/ocaml-0.04.ebuild,v 1.1.1.1 2005/11/30 09:38:55 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -10,7 +10,7 @@ PKG_CAT="standard"
 DEPEND="app-xemacs/xemacs-base
 app-xemacs/fsf-compat
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="alpha amd64 ppc sparc x86"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/os-utils/ChangeLog b/app-xemacs/os-utils/ChangeLog
index 34bd1036c843..ae35dbca400b 100644
--- a/app-xemacs/os-utils/ChangeLog
+++ b/app-xemacs/os-utils/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for app-xemacs/os-utils
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/os-utils/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/os-utils/ChangeLog,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> os-utils-1.30.ebuild:
+  Stable on ppc.
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> os-utils-1.30.ebuild:
+  Stable on alpha
+
+*os-utils-1.30 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> os-utils-1.29.ebuild os-utils-1.30.ebuild files/digest-os-utils-1.30 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *os-utils-1.29 (16 Dec 2002)
 
diff --git a/app-xemacs/os-utils/Manifest b/app-xemacs/os-utils/Manifest
index e69de29bb2d1..6d27e1dfd4fa 100644
--- a/app-xemacs/os-utils/Manifest
+++ b/app-xemacs/os-utils/Manifest
@@ -0,0 +1,5 @@
+MD5 6d78c20ad3324f95c0eb1423059c6fbe os-utils-1.29.ebuild 400
+MD5 988647ec5fc97ebcb2bf429ff50052c1 os-utils-1.30.ebuild 399
+MD5 67f0666bd4aa7aad028ba92e3a05b399 ChangeLog 750
+MD5 3cc0791935969058aa67caee2be46d10 files/digest-os-utils-1.29 68
+MD5 e53e04ecc4d93f3a83f3acf04c55f38a files/digest-os-utils-1.30 68
diff --git a/app-xemacs/os-utils/os-utils-1.29.ebuild b/app-xemacs/os-utils/os-utils-1.29.ebuild
index bbd1757178fa..2560c1da7d7d 100644
--- a/app-xemacs/os-utils/os-utils-1.29.ebuild
+++ b/app-xemacs/os-utils/os-utils-1.29.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/app-xemacs/os-utils/os-utils-1.29.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/os-utils/os-utils-1.29.ebuild,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -9,6 +9,8 @@ PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
+
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/os-utils/os-utils-1.30.ebuild b/app-xemacs/os-utils/os-utils-1.30.ebuild
index c52ff7968de1..ed82718ceb2e 100644
--- a/app-xemacs/os-utils/os-utils-1.30.ebuild
+++ b/app-xemacs/os-utils/os-utils-1.30.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/app-xemacs/os-utils/os-utils-1.30.ebuild,v 1.1 2003/02/22 12:46:40 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/os-utils/os-utils-1.30.ebuild,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -9,7 +9,7 @@ PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="alpha amd64 ppc sparc x86"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/pc/ChangeLog b/app-xemacs/pc/ChangeLog
index 5a7e6b991461..e6a3a4b4078d 100644
--- a/app-xemacs/pc/ChangeLog
+++ b/app-xemacs/pc/ChangeLog
@@ -1,8 +1,17 @@
 # ChangeLog for app-xemacs/pc
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/pc/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/pc/ChangeLog,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> pc-1.25.ebuild:
+  Stable on ppc.
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> pc-1.25.ebuild:
+  Stable on alpha
 
 *pc-1.25 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> pc-1.25.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/pc/Manifest b/app-xemacs/pc/Manifest
index e69de29bb2d1..c8f70ca0e638 100644
--- a/app-xemacs/pc/Manifest
+++ b/app-xemacs/pc/Manifest
@@ -0,0 +1,3 @@
+MD5 fcf2505bec00f612c33f655df8c2bc7e ChangeLog 563
+MD5 275a35873fb200217e84b12475a30d42 pc-1.25.ebuild 389
+MD5 048451b5009a40e47f9913ad148fe9e9 files/digest-pc-1.25 61
diff --git a/app-xemacs/pc/pc-1.25.ebuild b/app-xemacs/pc/pc-1.25.ebuild
index cdad7c56612c..7d130c6a7cd4 100644
--- a/app-xemacs/pc/pc-1.25.ebuild
+++ b/app-xemacs/pc/pc-1.25.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/app-xemacs/pc/pc-1.25.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/pc/pc-1.25.ebuild,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -9,6 +9,7 @@ PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
 "
+KEYWORDS="x86 ppc alpha sparc amd64"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/pcl-cvs/ChangeLog b/app-xemacs/pcl-cvs/ChangeLog
index 3e53f945005f..0cfb236f504a 100644
--- a/app-xemacs/pcl-cvs/ChangeLog
+++ b/app-xemacs/pcl-cvs/ChangeLog
@@ -1,8 +1,20 @@
 # ChangeLog for app-xemacs/pcl-cvs
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/pcl-cvs/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/pcl-cvs/ChangeLog,v 1.1.1.1 2005/11/30 09:38:55 chriswhite Exp $
+
+  29 Sep 2005; Joseph Jezak <josejx@gentoo.org> pcl-cvs-1.64.ebuild:
+  Marked ppc stable.
+
+  09 Aug 2004; Tom Gall <tgall@gentoo.org> pcl-cvs-1.64.ebuild:
+  stable on ppc64, bug #57174
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> pcl-cvs-1.64.ebuild:
+  Stable on alpha
 
 *pcl-cvs-1.64 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> pcl-cvs-1.64.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/pcl-cvs/Manifest b/app-xemacs/pcl-cvs/Manifest
index e69de29bb2d1..1a63217ac61f 100644
--- a/app-xemacs/pcl-cvs/Manifest
+++ b/app-xemacs/pcl-cvs/Manifest
@@ -0,0 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 231477fc7d1b5af09735763334567cab ChangeLog 686
+MD5 d71c0b2af88432341e6184b338432c33 pcl-cvs-1.64.ebuild 535
+MD5 efedf40b2f0698200ff7013f4304bdba files/digest-pcl-cvs-1.64 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDO4nScsIHjyDViGQRAtznAJ4zv0gN/gQ5seVNAxpD/57p3WDDkwCgoqWr
+G9TfRgAFHGHTn9AP1RSjpFQ=
+=gIul
+-----END PGP SIGNATURE-----
diff --git a/app-xemacs/pcl-cvs/pcl-cvs-1.64.ebuild b/app-xemacs/pcl-cvs/pcl-cvs-1.64.ebuild
index 85515015009c..51c31999ac1f 100644
--- a/app-xemacs/pcl-cvs/pcl-cvs-1.64.ebuild
+++ b/app-xemacs/pcl-cvs/pcl-cvs-1.64.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/app-xemacs/pcl-cvs/pcl-cvs-1.64.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/pcl-cvs/pcl-cvs-1.64.ebuild,v 1.1.1.1 2005/11/30 09:38:55 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -17,6 +17,7 @@ app-xemacs/edit-utils
 app-xemacs/mail-lib
 app-xemacs/prog-modes
 "
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/pcomplete/ChangeLog b/app-xemacs/pcomplete/ChangeLog
index d605e3d47e87..4a4929bfb568 100644
--- a/app-xemacs/pcomplete/ChangeLog
+++ b/app-xemacs/pcomplete/ChangeLog
@@ -1,8 +1,17 @@
 # ChangeLog for app-xemacs/pcomplete
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/pcomplete/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/pcomplete/ChangeLog,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> pcomplete-1.02.ebuild:
+  Stable on ppc.
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> pcomplete-1.02.ebuild:
+  Stable on alpha
 
 *pcomplete-1.02 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> pcomplete-1.02.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/pcomplete/Manifest b/app-xemacs/pcomplete/Manifest
index e69de29bb2d1..be674d34e705 100644
--- a/app-xemacs/pcomplete/Manifest
+++ b/app-xemacs/pcomplete/Manifest
@@ -0,0 +1,3 @@
+MD5 568dd8b3822cc550e94d9c772b191b5c ChangeLog 605
+MD5 9a35e63a103c45f18f364b255a9945bc pcomplete-1.02.ebuild 428
+MD5 f6358572e0a92833a3abc53e40d3744b files/digest-pcomplete-1.02 68
diff --git a/app-xemacs/pcomplete/pcomplete-1.02.ebuild b/app-xemacs/pcomplete/pcomplete-1.02.ebuild
index f3f502ebd60d..32bc3343b609 100644
--- a/app-xemacs/pcomplete/pcomplete-1.02.ebuild
+++ b/app-xemacs/pcomplete/pcomplete-1.02.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/app-xemacs/pcomplete/pcomplete-1.02.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/pcomplete/pcomplete-1.02.ebuild,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -10,6 +10,7 @@ PKG_CAT="standard"
 DEPEND="app-xemacs/sh-script
 app-xemacs/xemacs-base
 "
+KEYWORDS="x86 ppc alpha sparc amd64"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/perl-modes/ChangeLog b/app-xemacs/perl-modes/ChangeLog
index 8d16e02ef982..3d15af7efbd8 100644
--- a/app-xemacs/perl-modes/ChangeLog
+++ b/app-xemacs/perl-modes/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for app-xemacs/perl-modes
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/perl-modes/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/perl-modes/ChangeLog,v 1.1.1.1 2005/11/30 09:38:54 chriswhite Exp $
+
+  29 Sep 2005; Joseph Jezak <josejx@gentoo.org> perl-modes-1.04.ebuild:
+  Marked ppc stable.
+
+  15 Mar 2004; <rac@gentoo.org> perl-modes-1.04.ebuild:
+  keyword amd64
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> perl-modes-1.04.ebuild:
+  Stable on alpha
+
+*perl-modes-1.04 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> perl-modes-1.02.ebuild perl-modes-1.04.ebuild files/digest-perl-modes-1.04 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  fix depend on ispell to point to xemacs-ispell
+  changed alpha to ~alpha
 
 *perl-modes-1.02 (16 Dec 2002)
 
diff --git a/app-xemacs/perl-modes/Manifest b/app-xemacs/perl-modes/Manifest
index e69de29bb2d1..95f45daaf571 100644
--- a/app-xemacs/perl-modes/Manifest
+++ b/app-xemacs/perl-modes/Manifest
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 762780eaae1ddefdbd4d6dbc09e82cc4 ChangeLog 967
+MD5 233e20b59a303d753c9756ba70473d61 perl-modes-1.04.ebuild 477
+MD5 0f39d0139849956930b1a500aca9c6de metadata.xml 365
+MD5 39843c38bdfa50b29175d874da95d3bb perl-modes-1.02.ebuild 477
+MD5 e5df5958e2b8e460e8cdb3badb321527 files/digest-perl-modes-1.04 70
+MD5 126a4d5bc7a6ca22f524c5a3a9fecb25 files/digest-perl-modes-1.02 70
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDO47IcsIHjyDViGQRArbRAKDhcDd7AE3FQ1kVb8V7HgA2uf6WyACbBpvO
+a70e5Ggmk+fPRN36s5+ZLG4=
+=XQyb
+-----END PGP SIGNATURE-----
diff --git a/app-xemacs/perl-modes/perl-modes-1.02.ebuild b/app-xemacs/perl-modes/perl-modes-1.02.ebuild
index c2f7e5d74ccf..fcd60d201281 100644
--- a/app-xemacs/perl-modes/perl-modes-1.02.ebuild
+++ b/app-xemacs/perl-modes/perl-modes-1.02.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/app-xemacs/perl-modes/perl-modes-1.02.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/perl-modes/perl-modes-1.02.ebuild,v 1.1.1.1 2005/11/30 09:38:54 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -8,11 +8,12 @@ DESCRIPTION="Perl support."
 PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
-app-xemacs/ispell
+app-xemacs/xemacs-ispell
 app-xemacs/ps-print
 app-xemacs/edit-utils
 app-xemacs/fsf-compat
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/perl-modes/perl-modes-1.04.ebuild b/app-xemacs/perl-modes/perl-modes-1.04.ebuild
index 525511f62f17..f0fbd927f71a 100644
--- a/app-xemacs/perl-modes/perl-modes-1.04.ebuild
+++ b/app-xemacs/perl-modes/perl-modes-1.04.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/app-xemacs/perl-modes/perl-modes-1.04.ebuild,v 1.1 2003/02/22 12:46:40 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/perl-modes/perl-modes-1.04.ebuild,v 1.1.1.1 2005/11/30 09:38:54 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -13,7 +13,7 @@ app-xemacs/ps-print
 app-xemacs/edit-utils
 app-xemacs/fsf-compat
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="alpha amd64 ppc sparc x86"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/pgg/ChangeLog b/app-xemacs/pgg/ChangeLog
index 451268c0ad02..5cfcfd088b75 100644
--- a/app-xemacs/pgg/ChangeLog
+++ b/app-xemacs/pgg/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-xemacs/pgg
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/pgg/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/pgg/ChangeLog,v 1.1.1.1 2005/11/30 09:38:55 chriswhite Exp $
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> pgg-1.02.ebuild:
+  Stable on alpha
+
+*pgg-1.02 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> pgg-1.01.ebuild pgg-1.02.ebuild files/digest-pgg-1.02 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *pgg-1.01 (16 Dec 2002)
 
diff --git a/app-xemacs/pgg/Manifest b/app-xemacs/pgg/Manifest
index e69de29bb2d1..34428d0e5902 100644
--- a/app-xemacs/pgg/Manifest
+++ b/app-xemacs/pgg/Manifest
@@ -0,0 +1,5 @@
+MD5 dd0dbff75579a02a2d0a18d0cc006540 ChangeLog 620
+MD5 297f4bb6dcd31ec58d5f8e06f7679ed6 pgg-1.01.ebuild 448
+MD5 e916b48dc752053e19b85ae29abfb2f0 pgg-1.02.ebuild 453
+MD5 8ec1ec01f44f7118b780d5666a0fc80e files/digest-pgg-1.01 62
+MD5 fa41b118ebbd081296226feca6d81c71 files/digest-pgg-1.02 62
diff --git a/app-xemacs/pgg/pgg-1.01.ebuild b/app-xemacs/pgg/pgg-1.01.ebuild
index 54c14311b958..828364eff205 100644
--- a/app-xemacs/pgg/pgg-1.01.ebuild
+++ b/app-xemacs/pgg/pgg-1.01.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/app-xemacs/pgg/pgg-1.01.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/pgg/pgg-1.01.ebuild,v 1.1.1.1 2005/11/30 09:38:55 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -11,6 +11,7 @@ DEPEND="app-xemacs/xemacs-base
 app-xemacs/fsf-compat
 app-xemacs/edebug
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/pgg/pgg-1.02.ebuild b/app-xemacs/pgg/pgg-1.02.ebuild
index fad961a477da..949977a58f39 100644
--- a/app-xemacs/pgg/pgg-1.02.ebuild
+++ b/app-xemacs/pgg/pgg-1.02.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/app-xemacs/pgg/pgg-1.02.ebuild,v 1.1 2003/02/22 12:46:40 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/pgg/pgg-1.02.ebuild,v 1.1.1.1 2005/11/30 09:38:55 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -11,7 +11,7 @@ DEPEND="app-xemacs/xemacs-base
 app-xemacs/fsf-compat
 app-xemacs/edebug
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/prog-modes/ChangeLog b/app-xemacs/prog-modes/ChangeLog
index b918de922a65..1d5277bf844c 100644
--- a/app-xemacs/prog-modes/ChangeLog
+++ b/app-xemacs/prog-modes/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for app-xemacs/prog-modes
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/prog-modes/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/prog-modes/ChangeLog,v 1.1.1.1 2005/11/30 09:38:54 chriswhite Exp $
+
+  29 Sep 2005; Joseph Jezak <josejx@gentoo.org> prog-modes-1.72.ebuild:
+  Marked ppc stable.
+
+  09 Aug 2004; Tom Gall <tgall@gentoo.org> prog-modes-1.72.ebuild:
+  stable on ppc64, bug #57174
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> prog-modes-1.72.ebuild:
+  Stable on alpha
+
+*prog-modes-1.72 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> prog-modes-1.67.ebuild prog-modes-1.72.ebuild files/digest-prog-modes-1.72 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *prog-modes-1.67 (16 Dec 2002)
 
diff --git a/app-xemacs/prog-modes/Manifest b/app-xemacs/prog-modes/Manifest
index e69de29bb2d1..a2d00452f66a 100644
--- a/app-xemacs/prog-modes/Manifest
+++ b/app-xemacs/prog-modes/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 90c83281d6d66aacc96bb1d78be6c494 prog-modes-1.67.ebuild 663
+MD5 3bcae6ea45203db9b80346746a2f0547 ChangeLog 864
+MD5 1c180d91e0aee12ee4fae9286fb2b9af prog-modes-1.72.ebuild 669
+MD5 95189a8aa6dd34997cffced84cdfe9a9 files/digest-prog-modes-1.72 70
+MD5 1d0294ff43ce356af58eacce0bfd2aeb files/digest-prog-modes-1.67 70
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDO4sKcsIHjyDViGQRAhuxAKDkFnQSJllky0ZT7sGUGAB0yzftNQCgn3IS
+nAvvUUItsqrQwsQ7fjfnPr8=
+=5/Ee
+-----END PGP SIGNATURE-----
diff --git a/app-xemacs/prog-modes/prog-modes-1.67.ebuild b/app-xemacs/prog-modes/prog-modes-1.67.ebuild
index efdd4238d4a7..7bcf5cd4eb06 100644
--- a/app-xemacs/prog-modes/prog-modes-1.67.ebuild
+++ b/app-xemacs/prog-modes/prog-modes-1.67.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/app-xemacs/prog-modes/prog-modes-1.67.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/prog-modes/prog-modes-1.67.ebuild,v 1.1.1.1 2005/11/30 09:38:54 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -22,6 +22,7 @@ app-xemacs/dired
 app-xemacs/ilisp
 app-xemacs/sh-script
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/prog-modes/prog-modes-1.72.ebuild b/app-xemacs/prog-modes/prog-modes-1.72.ebuild
index a724f8fab6f8..de1e29f829ab 100644
--- a/app-xemacs/prog-modes/prog-modes-1.72.ebuild
+++ b/app-xemacs/prog-modes/prog-modes-1.72.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/app-xemacs/prog-modes/prog-modes-1.72.ebuild,v 1.1 2003/02/22 12:46:40 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/prog-modes/prog-modes-1.72.ebuild,v 1.1.1.1 2005/11/30 09:38:54 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -22,7 +22,7 @@ app-xemacs/dired
 app-xemacs/ilisp
 app-xemacs/sh-script
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/ps-print/ChangeLog b/app-xemacs/ps-print/ChangeLog
index 501a13b6077b..87c5957a2b32 100644
--- a/app-xemacs/ps-print/ChangeLog
+++ b/app-xemacs/ps-print/ChangeLog
@@ -1,8 +1,20 @@
 # ChangeLog for app-xemacs/ps-print
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/ps-print/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/ps-print/ChangeLog,v 1.1.1.1 2005/11/30 09:38:55 chriswhite Exp $
+
+  29 Sep 2005; Joseph Jezak <josejx@gentoo.org> ps-print-1.08.ebuild:
+  Marked ppc stable.
+
+  15 Mar 2004; <rac@gentoo.org> ps-print-1.08.ebuild:
+  keyword amd64
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> ps-print-1.08.ebuild:
+  Stable on alpha
 
 *ps-print-1.08 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> ps-print-1.08.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/ps-print/Manifest b/app-xemacs/ps-print/Manifest
index e69de29bb2d1..35a8bd636d51 100644
--- a/app-xemacs/ps-print/Manifest
+++ b/app-xemacs/ps-print/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7230cb16014382973eb38ca880d91d55 ChangeLog 668
+MD5 c610271681da436ebdf2abcf0f51e6dc ps-print-1.08.ebuild 403
+MD5 0f39d0139849956930b1a500aca9c6de metadata.xml 365
+MD5 6a7c695ae3be9af420aca7e41f5c0cbe files/digest-ps-print-1.08 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDO46McsIHjyDViGQRAiRHAKCLsjM/JWszIz9whDgFX7OqOp18yACguz4r
+6VxZ4xDGJpgGEW+WycwzdQw=
+=5uDI
+-----END PGP SIGNATURE-----
diff --git a/app-xemacs/ps-print/ps-print-1.08.ebuild b/app-xemacs/ps-print/ps-print-1.08.ebuild
index 3ca721c8a178..60642b66403a 100644
--- a/app-xemacs/ps-print/ps-print-1.08.ebuild
+++ b/app-xemacs/ps-print/ps-print-1.08.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/app-xemacs/ps-print/ps-print-1.08.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/ps-print/ps-print-1.08.ebuild,v 1.1.1.1 2005/11/30 09:38:55 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -9,6 +9,7 @@ PKG_CAT="standard"
 
 DEPEND="app-xemacs/text-modes
 "
+KEYWORDS="alpha amd64 ppc sparc x86"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/psgml-dtds/ChangeLog b/app-xemacs/psgml-dtds/ChangeLog
index b3adfe0a2b92..38eeae3ccdb9 100644
--- a/app-xemacs/psgml-dtds/ChangeLog
+++ b/app-xemacs/psgml-dtds/ChangeLog
@@ -1,8 +1,18 @@
 # ChangeLog for app-xemacs/psgml-dtds
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/psgml-dtds/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/psgml-dtds/ChangeLog,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
+
+  02 Oct 2004; Robert Coie <rac@gentoo.org> +metadata.xml,
+  psgml-dtds-1.02.ebuild:
+  eterm -> xemacs-eterm renaming
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> psgml-dtds-1.02.ebuild:
+  Stable on alpha
 
 *psgml-dtds-1.02 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> psgml-dtds-1.02.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/psgml-dtds/Manifest b/app-xemacs/psgml-dtds/Manifest
index e69de29bb2d1..b1c7f18cbb10 100644
--- a/app-xemacs/psgml-dtds/Manifest
+++ b/app-xemacs/psgml-dtds/Manifest
@@ -0,0 +1,4 @@
+MD5 adc402bb360acfcc8b4a5d8d75615946 ChangeLog 638
+MD5 3a83f5e72c0fb37159fa47c92a728873 psgml-dtds-1.02.ebuild 547
+MD5 0f39d0139849956930b1a500aca9c6de metadata.xml 365
+MD5 ad5b0aeb22a3bdea1d02ddccb53b080d files/digest-psgml-dtds-1.02 70
diff --git a/app-xemacs/psgml-dtds/psgml-dtds-1.02.ebuild b/app-xemacs/psgml-dtds/psgml-dtds-1.02.ebuild
index c72300c5e44d..f1b3bea6b651 100644
--- a/app-xemacs/psgml-dtds/psgml-dtds-1.02.ebuild
+++ b/app-xemacs/psgml-dtds/psgml-dtds-1.02.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/app-xemacs/psgml-dtds/psgml-dtds-1.02.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/psgml-dtds/psgml-dtds-1.02.ebuild,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -12,9 +12,10 @@ app-xemacs/psgml
 app-xemacs/edit-utils
 app-xemacs/mail-lib
 app-xemacs/fsf-compat
-app-xemacs/eterm
+app-xemacs/xemacs-eterm
 app-xemacs/sh-script
 "
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/psgml/ChangeLog b/app-xemacs/psgml/ChangeLog
index 1e5805997def..ebfa3a63ac26 100644
--- a/app-xemacs/psgml/ChangeLog
+++ b/app-xemacs/psgml/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for app-xemacs/psgml
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/psgml/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/psgml/ChangeLog,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
+
+  02 Oct 2004; Robert Coie <rac@gentoo.org> psgml-1.35.ebuild,
+  psgml-1.38.ebuild:
+  eterm -> xemacs-eterm renaming
+
+  16 Mar 2004; <rac@gentoo.org> metadata.xml, psgml-1.38.ebuild:
+  keyword amd64
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> psgml-1.38.ebuild:
+  Stable on alpha
+
+*psgml-1.38 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> psgml-1.35.ebuild psgml-1.38.ebuild files/digest-psgml-1.38 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *psgml-1.35 (16 Dec 2002)
 
diff --git a/app-xemacs/psgml/Manifest b/app-xemacs/psgml/Manifest
index e69de29bb2d1..da73c2cb513d 100644
--- a/app-xemacs/psgml/Manifest
+++ b/app-xemacs/psgml/Manifest
@@ -0,0 +1,6 @@
+MD5 6c31c91d92a83495ed5c9f46063a8ff7 ChangeLog 836
+MD5 0f39d0139849956930b1a500aca9c6de metadata.xml 365
+MD5 a4ea22982d833531ea5037ce89fda0b6 psgml-1.35.ebuild 544
+MD5 dc763c50d9b017e16496471ef02bbe93 psgml-1.38.ebuild 569
+MD5 dfa2541820ace9f07c3512d5efdc56bf files/digest-psgml-1.35 65
+MD5 b4576c80ad7942823c7e8dd6d1c7073e files/digest-psgml-1.38 66
diff --git a/app-xemacs/psgml/psgml-1.35.ebuild b/app-xemacs/psgml/psgml-1.35.ebuild
index b74de56c1dfd..7c3ad1c49677 100644
--- a/app-xemacs/psgml/psgml-1.35.ebuild
+++ b/app-xemacs/psgml/psgml-1.35.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/app-xemacs/psgml/psgml-1.35.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/psgml/psgml-1.35.ebuild,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -13,9 +13,10 @@ app-xemacs/edebug
 app-xemacs/xemacs-devel
 app-xemacs/mail-lib
 app-xemacs/fsf-compat
-app-xemacs/eterm
+app-xemacs/xemacs-eterm
 app-xemacs/sh-script
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/psgml/psgml-1.38.ebuild b/app-xemacs/psgml/psgml-1.38.ebuild
index df83369dcbe4..019e8255b8ea 100644
--- a/app-xemacs/psgml/psgml-1.38.ebuild
+++ b/app-xemacs/psgml/psgml-1.38.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/app-xemacs/psgml/psgml-1.38.ebuild,v 1.1 2003/02/22 12:46:40 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/psgml/psgml-1.38.ebuild,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -13,11 +13,11 @@ app-xemacs/edebug
 app-xemacs/xemacs-devel
 app-xemacs/mail-lib
 app-xemacs/fsf-compat
-app-xemacs/eterm
+app-xemacs/xemacs-eterm
 app-xemacs/sh-script
 app-xemacs/ps-print
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/python-modes/ChangeLog b/app-xemacs/python-modes/ChangeLog
index 8b45d54e4712..0fd995c714b3 100644
--- a/app-xemacs/python-modes/ChangeLog
+++ b/app-xemacs/python-modes/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for app-xemacs/python-modes
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/python-modes/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/python-modes/ChangeLog,v 1.1.1.1 2005/11/30 09:38:54 chriswhite Exp $
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  python-modes-1.02.ebuild:
+  Stable on ppc.
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> python-modes-1.02.ebuild:
+  Stable on alpha
+
+*python-modes-1.02 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> python-modes-1.01.ebuild python-modes-1.02.ebuild files/digest-python-modes-1.02 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *python-modes-1.01 (16 Dec 2002)
 
diff --git a/app-xemacs/python-modes/Manifest b/app-xemacs/python-modes/Manifest
index e69de29bb2d1..ff7c4596399d 100644
--- a/app-xemacs/python-modes/Manifest
+++ b/app-xemacs/python-modes/Manifest
@@ -0,0 +1,5 @@
+MD5 6d023cdba81d6fb2676bc6ca5f405c58 python-modes-1.01.ebuild 414
+MD5 8bee8e432a919d1d0c1004d2d97e6851 python-modes-1.02.ebuild 414
+MD5 f290216aaa18df03ba501486ea79fe3e ChangeLog 788
+MD5 f5ca4019fd9bcac93d5ab3fb011fb80e files/digest-python-modes-1.01 71
+MD5 c526c53555f02808fe835d0e87096405 files/digest-python-modes-1.02 71
diff --git a/app-xemacs/python-modes/python-modes-1.01.ebuild b/app-xemacs/python-modes/python-modes-1.01.ebuild
index 9c72953e5b5c..33844a4e769b 100644
--- a/app-xemacs/python-modes/python-modes-1.01.ebuild
+++ b/app-xemacs/python-modes/python-modes-1.01.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/app-xemacs/python-modes/python-modes-1.01.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/python-modes/python-modes-1.01.ebuild,v 1.1.1.1 2005/11/30 09:38:54 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -10,6 +10,7 @@ PKG_CAT="standard"
 DEPEND="app-xemacs/xemacs-base
 app-xemacs/mail-lib
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/python-modes/python-modes-1.02.ebuild b/app-xemacs/python-modes/python-modes-1.02.ebuild
index 7f259669b117..1f30df009f49 100644
--- a/app-xemacs/python-modes/python-modes-1.02.ebuild
+++ b/app-xemacs/python-modes/python-modes-1.02.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/app-xemacs/python-modes/python-modes-1.02.ebuild,v 1.1 2003/02/22 12:46:40 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/python-modes/python-modes-1.02.ebuild,v 1.1.1.1 2005/11/30 09:38:54 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -10,7 +10,7 @@ PKG_CAT="standard"
 DEPEND="app-xemacs/xemacs-base
 app-xemacs/mail-lib
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="alpha amd64 ppc sparc x86"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/reftex/ChangeLog b/app-xemacs/reftex/ChangeLog
index 32a2c6784597..d50fcb4b5d04 100644
--- a/app-xemacs/reftex/ChangeLog
+++ b/app-xemacs/reftex/ChangeLog
@@ -1,8 +1,14 @@
 # ChangeLog for app-xemacs/reftex
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/reftex/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/reftex/ChangeLog,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> reftex-1.28.ebuild:
+  Stable on alpha
 
 *reftex-1.28 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> reftex-1.28.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/reftex/Manifest b/app-xemacs/reftex/Manifest
index e69de29bb2d1..184a36269220 100644
--- a/app-xemacs/reftex/Manifest
+++ b/app-xemacs/reftex/Manifest
@@ -0,0 +1,3 @@
+MD5 1e622319bbf257e09bb065f83a39ac28 ChangeLog 499
+MD5 198ad62dfb5f9b621d1bb3f491127271 reftex-1.28.ebuild 447
+MD5 34425129c4873e543275ea11519840bf files/digest-reftex-1.28 66
diff --git a/app-xemacs/reftex/reftex-1.28.ebuild b/app-xemacs/reftex/reftex-1.28.ebuild
index 95585060e4db..8ae28a9dd8ca 100644
--- a/app-xemacs/reftex/reftex-1.28.ebuild
+++ b/app-xemacs/reftex/reftex-1.28.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/app-xemacs/reftex/reftex-1.28.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/reftex/reftex-1.28.ebuild,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -10,6 +10,7 @@ PKG_CAT="standard"
 DEPEND="app-xemacs/fsf-compat
 app-xemacs/xemacs-base
 "
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/rmail/ChangeLog b/app-xemacs/rmail/ChangeLog
index 62656086bac9..67c6d991b34b 100644
--- a/app-xemacs/rmail/ChangeLog
+++ b/app-xemacs/rmail/ChangeLog
@@ -1,8 +1,20 @@
 # ChangeLog for app-xemacs/rmail
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/rmail/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/rmail/ChangeLog,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
+
+  29 Sep 2005; Joseph Jezak <josejx@gentoo.org> rmail-1.13.ebuild:
+  Marked ppc stable.
+
+  09 Aug 2004; Tom Gall <tgall@gentoo.org> rmail-1.13.ebuild:
+  stable on ppc64, bug #57174
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> rmail-1.13.ebuild:
+  Stable on alpha
 
 *rmail-1.13 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> rmail-1.13.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/rmail/Manifest b/app-xemacs/rmail/Manifest
index e69de29bb2d1..cf54a3b11e68 100644
--- a/app-xemacs/rmail/Manifest
+++ b/app-xemacs/rmail/Manifest
@@ -0,0 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3c4b5385084826555dd4f5010649dfa4 ChangeLog 672
+MD5 12ef6f00ca77910d90b1c4f0c448e93c rmail-1.13.ebuild 447
+MD5 82cf6b29aa4cf02184fb2fde059bb0c2 files/digest-rmail-1.13 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDO4zQcsIHjyDViGQRAqLUAKCxxQJM/ehTkhsfdhkzoyYEy8C/ywCfVGIH
+QDinVf9u8d7Jha7qjyUqxcg=
+=m3Gb
+-----END PGP SIGNATURE-----
diff --git a/app-xemacs/rmail/rmail-1.13.ebuild b/app-xemacs/rmail/rmail-1.13.ebuild
index 84151f717292..230dbed844a5 100644
--- a/app-xemacs/rmail/rmail-1.13.ebuild
+++ b/app-xemacs/rmail/rmail-1.13.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/app-xemacs/rmail/rmail-1.13.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/rmail/rmail-1.13.ebuild,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -12,6 +12,7 @@ app-xemacs/apel
 app-xemacs/mail-lib
 app-xemacs/xemacs-base
 "
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/ruby-modes/ChangeLog b/app-xemacs/ruby-modes/ChangeLog
index 70b920fde463..b302df99ba35 100644
--- a/app-xemacs/ruby-modes/ChangeLog
+++ b/app-xemacs/ruby-modes/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for app-xemacs/ruby-modes
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/ruby-modes/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/ruby-modes/ChangeLog,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  ruby-modes-1.01.ebuild:
+  Stable on ppc.
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> ruby-modes-1.01.ebuild:
+  Stable on alpha
+
+*ruby-modes-1.01 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> ruby-modes-1.00.ebuild ruby-modes-1.01.ebuild files/digest-ruby-modes-1.01 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *ruby-modes-1.00 (16 Dec 2002)
 
diff --git a/app-xemacs/ruby-modes/Manifest b/app-xemacs/ruby-modes/Manifest
index e69de29bb2d1..853bfc6f1de4 100644
--- a/app-xemacs/ruby-modes/Manifest
+++ b/app-xemacs/ruby-modes/Manifest
@@ -0,0 +1,5 @@
+MD5 fa759c7bbe63403368c6b1ee18303d0e ChangeLog 770
+MD5 f7949eb7717822cd5aae50d3fca0e932 ruby-modes-1.01.ebuild 405
+MD5 7eb213b6eedb2405516eba7e6360688e ruby-modes-1.00.ebuild 388
+MD5 6c354ff8ba38634a49d4992610a6cf80 files/digest-ruby-modes-1.00 69
+MD5 143685c590780654bc0832559bad67c9 files/digest-ruby-modes-1.01 69
diff --git a/app-xemacs/ruby-modes/ruby-modes-1.00.ebuild b/app-xemacs/ruby-modes/ruby-modes-1.00.ebuild
index 29577ab5eece..b46a0b773ea9 100644
--- a/app-xemacs/ruby-modes/ruby-modes-1.00.ebuild
+++ b/app-xemacs/ruby-modes/ruby-modes-1.00.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/app-xemacs/ruby-modes/ruby-modes-1.00.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/ruby-modes/ruby-modes-1.00.ebuild,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -9,6 +9,7 @@ PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/ruby-modes/ruby-modes-1.01.ebuild b/app-xemacs/ruby-modes/ruby-modes-1.01.ebuild
index 7c93170d1279..234f62b0c77e 100644
--- a/app-xemacs/ruby-modes/ruby-modes-1.01.ebuild
+++ b/app-xemacs/ruby-modes/ruby-modes-1.01.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/app-xemacs/ruby-modes/ruby-modes-1.01.ebuild,v 1.1 2003/02/22 12:46:40 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/ruby-modes/ruby-modes-1.01.ebuild,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -10,7 +10,7 @@ PKG_CAT="standard"
 DEPEND="app-xemacs/xemacs-base
 app-xemacs/debug
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="alpha amd64 ppc sparc x86"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/sasl/ChangeLog b/app-xemacs/sasl/ChangeLog
index 6c4d62ba9b5c..5d23d7eaecaa 100644
--- a/app-xemacs/sasl/ChangeLog
+++ b/app-xemacs/sasl/ChangeLog
@@ -1,8 +1,14 @@
 # ChangeLog for app-xemacs/sasl
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/sasl/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/sasl/ChangeLog,v 1.1.1.1 2005/11/30 09:38:55 chriswhite Exp $
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> sasl-1.12.ebuild:
+  Stable on alpha
 
 *sasl-1.12 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> sasl-1.12.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/sasl/Manifest b/app-xemacs/sasl/Manifest
index e69de29bb2d1..82d26cfc0829 100644
--- a/app-xemacs/sasl/Manifest
+++ b/app-xemacs/sasl/Manifest
@@ -0,0 +1,3 @@
+MD5 bd80e7d40773d2553323b355775f04a7 ChangeLog 489
+MD5 3e21b13deb13cdf1ee2a343c31e8f32b sasl-1.12.ebuild 420
+MD5 96f2aded0a6c45c363ac958902388455 files/digest-sasl-1.12 63
diff --git a/app-xemacs/sasl/sasl-1.12.ebuild b/app-xemacs/sasl/sasl-1.12.ebuild
index 6e5854932c41..32783080afbe 100644
--- a/app-xemacs/sasl/sasl-1.12.ebuild
+++ b/app-xemacs/sasl/sasl-1.12.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/app-xemacs/sasl/sasl-1.12.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/sasl/sasl-1.12.ebuild,v 1.1.1.1 2005/11/30 09:38:55 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -9,6 +9,7 @@ PKG_CAT="standard"
 
 DEPEND="app-xemacs/ecrypto
 "
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/scheme/ChangeLog b/app-xemacs/scheme/ChangeLog
index 2d8227c20d14..59d72525d464 100644
--- a/app-xemacs/scheme/ChangeLog
+++ b/app-xemacs/scheme/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for app-xemacs/scheme
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/scheme/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/scheme/ChangeLog,v 1.1.1.1 2005/11/30 09:38:55 chriswhite Exp $
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> scheme-1.13.ebuild:
+  Stable on ppc.
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> scheme-1.13.ebuild:
+  Stable on alpha
+
+*scheme-1.13 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> scheme-1.12.ebuild scheme-1.13.ebuild files/digest-scheme-1.13 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *scheme-1.12 (16 Dec 2002)
 
diff --git a/app-xemacs/scheme/Manifest b/app-xemacs/scheme/Manifest
index e69de29bb2d1..19c4d09dbf0a 100644
--- a/app-xemacs/scheme/Manifest
+++ b/app-xemacs/scheme/Manifest
@@ -0,0 +1,5 @@
+MD5 3f6ccce259222cfc3936675a1279ae14 ChangeLog 732
+MD5 74b5967c7eb8e7da238e5c82e5a74447 scheme-1.12.ebuild 405
+MD5 c149fea151c3ba30dae1d2661f3c15dd scheme-1.13.ebuild 405
+MD5 38e69758824c5af06225146017c35125 files/digest-scheme-1.13 65
+MD5 1cc37cb3d847c24265902b459ba5baa6 files/digest-scheme-1.12 65
diff --git a/app-xemacs/scheme/scheme-1.12.ebuild b/app-xemacs/scheme/scheme-1.12.ebuild
index f4ad97803d3c..03bcbcfe30bb 100644
--- a/app-xemacs/scheme/scheme-1.12.ebuild
+++ b/app-xemacs/scheme/scheme-1.12.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/app-xemacs/scheme/scheme-1.12.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/scheme/scheme-1.12.ebuild,v 1.1.1.1 2005/11/30 09:38:55 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -9,6 +9,7 @@ PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/scheme/scheme-1.13.ebuild b/app-xemacs/scheme/scheme-1.13.ebuild
index ef247f0acd9c..e2e456e12f0c 100644
--- a/app-xemacs/scheme/scheme-1.13.ebuild
+++ b/app-xemacs/scheme/scheme-1.13.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/app-xemacs/scheme/scheme-1.13.ebuild,v 1.1 2003/02/22 12:46:40 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/scheme/scheme-1.13.ebuild,v 1.1.1.1 2005/11/30 09:38:55 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -9,7 +9,7 @@ PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="alpha amd64 ppc sparc x86"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/semantic/ChangeLog b/app-xemacs/semantic/ChangeLog
index be9a3890b013..10684d676bb0 100644
--- a/app-xemacs/semantic/ChangeLog
+++ b/app-xemacs/semantic/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-xemacs/semantic
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/semantic/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/semantic/ChangeLog,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> semantic-1.17.ebuild:
+  Stable on alpha
+
+*semantic-1.17 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> semantic-1.14.ebuild semantic-1.17.ebuild files/digest-semantic-1.17 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *semantic-1.14 (16 Dec 2002)
 
diff --git a/app-xemacs/semantic/Manifest b/app-xemacs/semantic/Manifest
index e69de29bb2d1..c6ab832c6fd5 100644
--- a/app-xemacs/semantic/Manifest
+++ b/app-xemacs/semantic/Manifest
@@ -0,0 +1,5 @@
+MD5 6ac1f35df44aef47ef516ebf9d685f7a ChangeLog 660
+MD5 51d111f941c13814de68150ec1b99349 semantic-1.14.ebuild 573
+MD5 8a6c8758f66e9889c9585dc17e333a15 semantic-1.17.ebuild 596
+MD5 e8034145123e05b8a69d19df57e8f80b files/digest-semantic-1.14 68
+MD5 5b31cd44e17f752f5b1f5ad703c5f417 files/digest-semantic-1.17 68
diff --git a/app-xemacs/semantic/semantic-1.14.ebuild b/app-xemacs/semantic/semantic-1.14.ebuild
index df7d3815f2f1..b1580c6607d3 100644
--- a/app-xemacs/semantic/semantic-1.14.ebuild
+++ b/app-xemacs/semantic/semantic-1.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/app-xemacs/semantic/semantic-1.14.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/semantic/semantic-1.14.ebuild,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -16,6 +16,7 @@ app-xemacs/texinfo
 app-xemacs/fsf-compat
 app-xemacs/cc-mode
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/semantic/semantic-1.17.ebuild b/app-xemacs/semantic/semantic-1.17.ebuild
index 449daebb5ecb..5a558c89dc97 100644
--- a/app-xemacs/semantic/semantic-1.17.ebuild
+++ b/app-xemacs/semantic/semantic-1.17.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/app-xemacs/semantic/semantic-1.17.ebuild,v 1.1 2003/02/22 12:46:40 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/semantic/semantic-1.17.ebuild,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -17,7 +17,7 @@ app-xemacs/fsf-compat
 app-xemacs/cc-mode
 app-xemacs/edebug
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/sgml/ChangeLog b/app-xemacs/sgml/ChangeLog
index 246ec54f8db4..4833d9864887 100644
--- a/app-xemacs/sgml/ChangeLog
+++ b/app-xemacs/sgml/ChangeLog
@@ -1,8 +1,14 @@
 # ChangeLog for app-xemacs/sgml
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/sgml/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/sgml/ChangeLog,v 1.1.1.1 2005/11/30 09:38:54 chriswhite Exp $
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> sgml-1.08.ebuild:
+  Stable on alpha
 
 *sgml-1.08 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> sgml-1.08.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/sgml/Manifest b/app-xemacs/sgml/Manifest
index e69de29bb2d1..83beedc057a0 100644
--- a/app-xemacs/sgml/Manifest
+++ b/app-xemacs/sgml/Manifest
@@ -0,0 +1,3 @@
+MD5 8814b400f27d6440a6e24f33280d83db ChangeLog 489
+MD5 2c35b9b4de4cf20b039a84df060e21d3 sgml-1.08.ebuild 395
+MD5 0e1cb2318e51886c68c5a43fe90f385e files/digest-sgml-1.08 63
diff --git a/app-xemacs/sgml/sgml-1.08.ebuild b/app-xemacs/sgml/sgml-1.08.ebuild
index fb857600892d..b8838a72a6fd 100644
--- a/app-xemacs/sgml/sgml-1.08.ebuild
+++ b/app-xemacs/sgml/sgml-1.08.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/app-xemacs/sgml/sgml-1.08.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/sgml/sgml-1.08.ebuild,v 1.1.1.1 2005/11/30 09:38:54 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -9,6 +9,7 @@ PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
 "
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/sh-script/ChangeLog b/app-xemacs/sh-script/ChangeLog
index e0109659fb00..b86958244914 100644
--- a/app-xemacs/sh-script/ChangeLog
+++ b/app-xemacs/sh-script/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for app-xemacs/sh-script
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/sh-script/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/sh-script/ChangeLog,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> sh-script-1.17.ebuild:
+  Stable on ppc.
+
+  09 Aug 2004; Tom Gall <tgall@gentoo.org> sh-script-1.17.ebuild:
+  stable on ppc64, bug #57174
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> sh-script-1.17.ebuild:
+  Stable on alpha
+
+*sh-script-1.17 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> sh-script-1.16.ebuild sh-script-1.17.ebuild files/digest-sh-script-1.17 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *sh-script-1.16 (16 Dec 2002)
 
diff --git a/app-xemacs/sh-script/Manifest b/app-xemacs/sh-script/Manifest
index e69de29bb2d1..9f4ae31c72ee 100644
--- a/app-xemacs/sh-script/Manifest
+++ b/app-xemacs/sh-script/Manifest
@@ -0,0 +1,5 @@
+MD5 3dddd5be3c19c2a18b00c710d3262384 ChangeLog 856
+MD5 c98fc7d9de6400019c526f0cacf632c8 sh-script-1.16.ebuild 407
+MD5 8f265a37d3cbbd99e524c94e96b45106 sh-script-1.17.ebuild 413
+MD5 c227669b3e12adf69d3f916436235eb6 files/digest-sh-script-1.17 68
+MD5 4c6f2a97543181b83ea37e2739770973 files/digest-sh-script-1.16 68
diff --git a/app-xemacs/sh-script/sh-script-1.16.ebuild b/app-xemacs/sh-script/sh-script-1.16.ebuild
index f35048904b2e..c64c82b6b4fb 100644
--- a/app-xemacs/sh-script/sh-script-1.16.ebuild
+++ b/app-xemacs/sh-script/sh-script-1.16.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/app-xemacs/sh-script/sh-script-1.16.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/sh-script/sh-script-1.16.ebuild,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -9,6 +9,7 @@ PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/sh-script/sh-script-1.17.ebuild b/app-xemacs/sh-script/sh-script-1.17.ebuild
index 47aa3bad6709..2f75e031bd44 100644
--- a/app-xemacs/sh-script/sh-script-1.17.ebuild
+++ b/app-xemacs/sh-script/sh-script-1.17.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/app-xemacs/sh-script/sh-script-1.17.ebuild,v 1.1 2003/02/22 12:46:40 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/sh-script/sh-script-1.17.ebuild,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -9,7 +9,7 @@ PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="amd64 x86 ppc alpha sparc ppc64"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/sieve/ChangeLog b/app-xemacs/sieve/ChangeLog
index 24e994575e2f..cbb26b8c0afb 100644
--- a/app-xemacs/sieve/ChangeLog
+++ b/app-xemacs/sieve/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-xemacs/sieve
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/sieve/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/sieve/ChangeLog,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> sieve-1.11.ebuild:
+  Stable on alpha
+
+*sieve-1.11 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> sieve-1.10.ebuild sieve-1.11.ebuild files/digest-sieve-1.11 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *sieve-1.10 (16 Dec 2002)
 
diff --git a/app-xemacs/sieve/Manifest b/app-xemacs/sieve/Manifest
index e69de29bb2d1..ea75f3be3d7b 100644
--- a/app-xemacs/sieve/Manifest
+++ b/app-xemacs/sieve/Manifest
@@ -0,0 +1,5 @@
+MD5 e4d52ca0c43ad5260ffeb65d25eb660c ChangeLog 636
+MD5 cda3b08fc220dd201ac5b92c4dbc0868 sieve-1.10.ebuild 457
+MD5 30fdd52b344537847cfb0faf5130c4db sieve-1.11.ebuild 462
+MD5 165ba78448c5a75f75469d5d32b9482a files/digest-sieve-1.10 64
+MD5 e6990d012b7921df526b3abdc1fad3ad files/digest-sieve-1.11 64
diff --git a/app-xemacs/sieve/sieve-1.10.ebuild b/app-xemacs/sieve/sieve-1.10.ebuild
index 4ad201807d7a..55366cd559e1 100644
--- a/app-xemacs/sieve/sieve-1.10.ebuild
+++ b/app-xemacs/sieve/sieve-1.10.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/app-xemacs/sieve/sieve-1.10.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/sieve/sieve-1.10.ebuild,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -12,6 +12,7 @@ app-xemacs/mail-lib
 app-xemacs/cc-mode
 app-xemacs/sasl
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/sieve/sieve-1.11.ebuild b/app-xemacs/sieve/sieve-1.11.ebuild
index e0df3961e5d9..915432145ca3 100644
--- a/app-xemacs/sieve/sieve-1.11.ebuild
+++ b/app-xemacs/sieve/sieve-1.11.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/app-xemacs/sieve/sieve-1.11.ebuild,v 1.1 2003/02/22 12:46:40 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/sieve/sieve-1.11.ebuild,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -12,7 +12,7 @@ app-xemacs/mail-lib
 app-xemacs/cc-mode
 app-xemacs/sasl
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/skk/ChangeLog b/app-xemacs/skk/ChangeLog
index 15acebdcd780..4a32c44e7442 100644
--- a/app-xemacs/skk/ChangeLog
+++ b/app-xemacs/skk/ChangeLog
@@ -1,8 +1,14 @@
 # ChangeLog for app-xemacs/skk
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/skk/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/skk/ChangeLog,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> skk-1.23.ebuild:
+  Stable on alpha
 
 *skk-1.23 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> skk-1.23.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/skk/Manifest b/app-xemacs/skk/Manifest
index e69de29bb2d1..a73ef413162a 100644
--- a/app-xemacs/skk/Manifest
+++ b/app-xemacs/skk/Manifest
@@ -0,0 +1,3 @@
+MD5 ddeb02beae1f2a4e0302c32cd08129c4 ChangeLog 484
+MD5 cd965be2d1c5acbc11e851ac6b00bc75 skk-1.23.ebuild 469
+MD5 fb4cc18d7ecc39fd2edb3354f9926799 files/digest-skk-1.23 64
diff --git a/app-xemacs/skk/skk-1.23.ebuild b/app-xemacs/skk/skk-1.23.ebuild
index 4ce08067aaf7..f2b2ce45142c 100644
--- a/app-xemacs/skk/skk-1.23.ebuild
+++ b/app-xemacs/skk/skk-1.23.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/app-xemacs/skk/skk-1.23.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/skk/skk-1.23.ebuild,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -13,6 +13,7 @@ app-xemacs/elib
 app-xemacs/xemacs-base
 app-xemacs/apel
 "
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/slider/ChangeLog b/app-xemacs/slider/ChangeLog
index f760c0876380..b89b4cc4ddf7 100644
--- a/app-xemacs/slider/ChangeLog
+++ b/app-xemacs/slider/ChangeLog
@@ -1,8 +1,14 @@
 # ChangeLog for app-xemacs/slider
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/slider/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/slider/ChangeLog,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> slider-1.13.ebuild:
+  Stable on alpha
 
 *slider-1.13 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> slider-1.13.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/slider/Manifest b/app-xemacs/slider/Manifest
index e69de29bb2d1..95566a88180f 100644
--- a/app-xemacs/slider/Manifest
+++ b/app-xemacs/slider/Manifest
@@ -0,0 +1,3 @@
+MD5 cf3203e92e9f5e4301d397c0d50ee33c ChangeLog 499
+MD5 265112a891952ab3aa5a4ebf886393b3 slider-1.13.ebuild 369
+MD5 e19735be21d2651bd5fd097a26101c99 files/digest-slider-1.13 65
diff --git a/app-xemacs/slider/slider-1.13.ebuild b/app-xemacs/slider/slider-1.13.ebuild
index e8b227f3e1a1..04a7f717a7e9 100644
--- a/app-xemacs/slider/slider-1.13.ebuild
+++ b/app-xemacs/slider/slider-1.13.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/app-xemacs/slider/slider-1.13.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/slider/slider-1.13.ebuild,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -8,6 +8,7 @@ DESCRIPTION="User interface tool."
 PKG_CAT="standard"
 
 DEPEND=""
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/sml-mode/ChangeLog b/app-xemacs/sml-mode/ChangeLog
index 19c19d30b190..b53e7e9d803a 100644
--- a/app-xemacs/sml-mode/ChangeLog
+++ b/app-xemacs/sml-mode/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for app-xemacs/sml-mode
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/sml-mode/ChangeLog,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/sml-mode/ChangeLog,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> sml-mode-0.07.ebuild:
+  Stable on ppc.
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> sml-mode-0.07.ebuild:
+  Stable on alpha
+
+*sml-mode-0.07 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> sml-mode-0.05.ebuild sml-mode-0.07.ebuild files/digest-sml-mode-0.07 :
+  Add ~alpha to KEYWORDS
+
+*sml-mode-0.06 (22 Feb 2003)
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *sml-mode-0.05 (16 Dec 2002)
 
diff --git a/app-xemacs/sml-mode/Manifest b/app-xemacs/sml-mode/Manifest
index e69de29bb2d1..00d8251041e7 100644
--- a/app-xemacs/sml-mode/Manifest
+++ b/app-xemacs/sml-mode/Manifest
@@ -0,0 +1,5 @@
+MD5 42cd6ae790df71da75e33d4a49c2767e ChangeLog 780
+MD5 136a479d8769c05b4f66fb1404f38aee sml-mode-0.07.ebuild 431
+MD5 b939c800fc51c2aeab782bf96a1436f7 sml-mode-0.05.ebuild 431
+MD5 b88b9e91dbade1956592953dd30bed46 files/digest-sml-mode-0.05 67
+MD5 8b0c17471b5bde392e5db6b3e8c866cb files/digest-sml-mode-0.07 67
diff --git a/app-xemacs/sml-mode/sml-mode-0.05.ebuild b/app-xemacs/sml-mode/sml-mode-0.05.ebuild
index 592d2570ab95..cd0bac6c3c34 100644
--- a/app-xemacs/sml-mode/sml-mode-0.05.ebuild
+++ b/app-xemacs/sml-mode/sml-mode-0.05.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/app-xemacs/sml-mode/sml-mode-0.05.ebuild,v 1.1 2002/12/16 12:22:47 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/sml-mode/sml-mode-0.05.ebuild,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -11,6 +11,7 @@ DEPEND="app-xemacs/xemacs-base
 app-xemacs/edebug
 app-xemacs/fsf-compat
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/sml-mode/sml-mode-0.07.ebuild b/app-xemacs/sml-mode/sml-mode-0.07.ebuild
index b7b2f15e8b66..f6c1ebb8a73b 100644
--- a/app-xemacs/sml-mode/sml-mode-0.07.ebuild
+++ b/app-xemacs/sml-mode/sml-mode-0.07.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/app-xemacs/sml-mode/sml-mode-0.07.ebuild,v 1.1 2003/02/22 12:46:40 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/sml-mode/sml-mode-0.07.ebuild,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -11,7 +11,7 @@ DEPEND="app-xemacs/xemacs-base
 app-xemacs/edebug
 app-xemacs/fsf-compat
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="alpha amd64 ppc sparc x86"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/sounds-au/ChangeLog b/app-xemacs/sounds-au/ChangeLog
index ddcb0de77062..5275ec30e675 100644
--- a/app-xemacs/sounds-au/ChangeLog
+++ b/app-xemacs/sounds-au/ChangeLog
@@ -1,8 +1,14 @@
 # ChangeLog for app-xemacs/sounds-au
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/sounds-au/ChangeLog,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/sounds-au/ChangeLog,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> sounds-au-1.10.ebuild:
+  Stable on alpha
 
 *sounds-au-1.10 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> sounds-au-1.10.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/sounds-au/Manifest b/app-xemacs/sounds-au/Manifest
index e69de29bb2d1..e6037022ab40 100644
--- a/app-xemacs/sounds-au/Manifest
+++ b/app-xemacs/sounds-au/Manifest
@@ -0,0 +1,3 @@
+MD5 f07a71cf9cf7c1375bde4e0f028770c8 ChangeLog 514
+MD5 4781c43490db2e5de1a2f573f8a53ea3 sounds-au-1.10.ebuild 378
+MD5 23c4fc8b915e37bd9a6a599c1c796b3d files/digest-sounds-au-1.10 69
diff --git a/app-xemacs/sounds-au/sounds-au-1.10.ebuild b/app-xemacs/sounds-au/sounds-au-1.10.ebuild
index c88359e9c1d6..a8d914bbf1de 100644
--- a/app-xemacs/sounds-au/sounds-au-1.10.ebuild
+++ b/app-xemacs/sounds-au/sounds-au-1.10.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/app-xemacs/sounds-au/sounds-au-1.10.ebuild,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/sounds-au/sounds-au-1.10.ebuild,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -8,6 +8,7 @@ DESCRIPTION="XEmacs Sun sound files."
 PKG_CAT="standard"
 
 DEPEND=""
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/sounds-wav/ChangeLog b/app-xemacs/sounds-wav/ChangeLog
index 2029dfcb6a20..9738e655992e 100644
--- a/app-xemacs/sounds-wav/ChangeLog
+++ b/app-xemacs/sounds-wav/ChangeLog
@@ -1,8 +1,14 @@
 # ChangeLog for app-xemacs/sounds-wav
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/sounds-wav/ChangeLog,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/sounds-wav/ChangeLog,v 1.1.1.1 2005/11/30 09:38:55 chriswhite Exp $
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> sounds-wav-1.10.ebuild:
+  Stable on alpha
 
 *sounds-wav-1.10 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> sounds-wav-1.10.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/sounds-wav/Manifest b/app-xemacs/sounds-wav/Manifest
index e69de29bb2d1..61b20d1111b0 100644
--- a/app-xemacs/sounds-wav/Manifest
+++ b/app-xemacs/sounds-wav/Manifest
@@ -0,0 +1,3 @@
+MD5 cf7794591b072bdb30d7a8f47278654b ChangeLog 519
+MD5 9d8430611ef8f70db6f8f45ac207bb4a sounds-wav-1.10.ebuild 386
+MD5 10b6b2f9bba43c166adab85d7999bf91 files/digest-sounds-wav-1.10 70
diff --git a/app-xemacs/sounds-wav/sounds-wav-1.10.ebuild b/app-xemacs/sounds-wav/sounds-wav-1.10.ebuild
index 16acad160259..bda598c4d58a 100644
--- a/app-xemacs/sounds-wav/sounds-wav-1.10.ebuild
+++ b/app-xemacs/sounds-wav/sounds-wav-1.10.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/app-xemacs/sounds-wav/sounds-wav-1.10.ebuild,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/sounds-wav/sounds-wav-1.10.ebuild,v 1.1.1.1 2005/11/30 09:38:55 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -8,6 +8,7 @@ DESCRIPTION="XEmacs Microsoft sound files."
 PKG_CAT="standard"
 
 DEPEND=""
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/speedbar/ChangeLog b/app-xemacs/speedbar/ChangeLog
index ae3ff1aa4bbf..3abaad750887 100644
--- a/app-xemacs/speedbar/ChangeLog
+++ b/app-xemacs/speedbar/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for app-xemacs/speedbar
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/speedbar/ChangeLog,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/speedbar/ChangeLog,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> speedbar-1.26.ebuild:
+  Stable on ppc.
+
+  09 Aug 2004; Tom Gall <tgall@gentoo.org> speedbar-1.26.ebuild:
+  stable on ppc64, bug #57174
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> speedbar-1.26.ebuild:
+  Stable on alpha
+
+*speedbar-1.26 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> speedbar-1.24.ebuild speedbar-1.26.ebuild files/digest-speedbar-1.26 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *speedbar-1.24 (16 Dec 2002)
 
diff --git a/app-xemacs/speedbar/Manifest b/app-xemacs/speedbar/Manifest
index e69de29bb2d1..31f5aa2d3e09 100644
--- a/app-xemacs/speedbar/Manifest
+++ b/app-xemacs/speedbar/Manifest
@@ -0,0 +1,5 @@
+MD5 2ff678a384f364df466ca5a5523f2b33 speedbar-1.26.ebuild 448
+MD5 9ca36918a1431d2a4d1b9fdc5945bd9a ChangeLog 846
+MD5 ecfbc266cf91750ca29ef1248822d6f9 speedbar-1.24.ebuild 424
+MD5 235af994b2cb2fe328b9ab2c2709596d files/digest-speedbar-1.26 68
+MD5 159a1a4e56360587a9859b5722a7baba files/digest-speedbar-1.24 68
diff --git a/app-xemacs/speedbar/speedbar-1.24.ebuild b/app-xemacs/speedbar/speedbar-1.24.ebuild
index 14f453482a04..f281ba092b4a 100644
--- a/app-xemacs/speedbar/speedbar-1.24.ebuild
+++ b/app-xemacs/speedbar/speedbar-1.24.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/app-xemacs/speedbar/speedbar-1.24.ebuild,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/speedbar/speedbar-1.24.ebuild,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -9,6 +9,7 @@ PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/speedbar/speedbar-1.26.ebuild b/app-xemacs/speedbar/speedbar-1.26.ebuild
index 10cd914b260e..a1d286c89b90 100644
--- a/app-xemacs/speedbar/speedbar-1.26.ebuild
+++ b/app-xemacs/speedbar/speedbar-1.26.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/app-xemacs/speedbar/speedbar-1.26.ebuild,v 1.1 2003/02/22 12:46:40 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/speedbar/speedbar-1.26.ebuild,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -10,7 +10,7 @@ PKG_CAT="standard"
 DEPEND="app-xemacs/xemacs-base
 app-xemacs/edebug
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/strokes/ChangeLog b/app-xemacs/strokes/ChangeLog
index e370bf37c03c..f1efb4a9a86e 100644
--- a/app-xemacs/strokes/ChangeLog
+++ b/app-xemacs/strokes/ChangeLog
@@ -1,8 +1,14 @@
 # ChangeLog for app-xemacs/strokes
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/strokes/ChangeLog,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/strokes/ChangeLog,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> strokes-1.08.ebuild:
+  Stable on alpha
 
 *strokes-1.08 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> strokes-1.08.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/strokes/Manifest b/app-xemacs/strokes/Manifest
index e69de29bb2d1..64dfde9bf0a5 100644
--- a/app-xemacs/strokes/Manifest
+++ b/app-xemacs/strokes/Manifest
@@ -0,0 +1,3 @@
+MD5 20e2346eb4e499d385b839904642468b ChangeLog 504
+MD5 dd2d1a7dad42d9be9eb6141f47f9d752 strokes-1.08.ebuild 464
+MD5 2797af80c0e9a52204f883fbdb255d8d files/digest-strokes-1.08 66
diff --git a/app-xemacs/strokes/strokes-1.08.ebuild b/app-xemacs/strokes/strokes-1.08.ebuild
index da464136e854..30f364bd7137 100644
--- a/app-xemacs/strokes/strokes-1.08.ebuild
+++ b/app-xemacs/strokes/strokes-1.08.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/app-xemacs/strokes/strokes-1.08.ebuild,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/strokes/strokes-1.08.ebuild,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -12,6 +12,7 @@ app-xemacs/edit-utils
 app-xemacs/mail-lib
 app-xemacs/xemacs-base
 "
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/supercite/ChangeLog b/app-xemacs/supercite/ChangeLog
index 187098f6e082..e2628e197fef 100644
--- a/app-xemacs/supercite/ChangeLog
+++ b/app-xemacs/supercite/ChangeLog
@@ -1,8 +1,20 @@
 # ChangeLog for app-xemacs/supercite
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/supercite/ChangeLog,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/supercite/ChangeLog,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> supercite-1.19.ebuild:
+  Stable on ppc.
+
+  09 Aug 2004; Tom Gall <tgall@gentoo.org> supercite-1.19.ebuild:
+  stable on ppc64, bug #57174
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> supercite-1.19.ebuild:
+  Stable on alpha
 
 *supercite-1.19 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> supercite-1.19.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/supercite/Manifest b/app-xemacs/supercite/Manifest
index e69de29bb2d1..b4f184cb1e8f 100644
--- a/app-xemacs/supercite/Manifest
+++ b/app-xemacs/supercite/Manifest
@@ -0,0 +1,3 @@
+MD5 d85732fd98e070948bce2b4d217d4709 supercite-1.19.ebuild 448
+MD5 edfb24002d084d161a365106b824fd1d ChangeLog 702
+MD5 a5842727697f3c010118b5c38cbd2737 files/digest-supercite-1.19 69
diff --git a/app-xemacs/supercite/supercite-1.19.ebuild b/app-xemacs/supercite/supercite-1.19.ebuild
index de4ee6c48656..5bd9b6b6bf2b 100644
--- a/app-xemacs/supercite/supercite-1.19.ebuild
+++ b/app-xemacs/supercite/supercite-1.19.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/app-xemacs/supercite/supercite-1.19.ebuild,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/supercite/supercite-1.19.ebuild,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -10,6 +10,7 @@ PKG_CAT="standard"
 DEPEND="app-xemacs/mail-lib
 app-xemacs/xemacs-base
 "
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/texinfo/ChangeLog b/app-xemacs/texinfo/ChangeLog
index cfb76d8da5be..d397ee4a49fc 100644
--- a/app-xemacs/texinfo/ChangeLog
+++ b/app-xemacs/texinfo/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for app-xemacs/texinfo
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/texinfo/ChangeLog,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/texinfo/ChangeLog,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
+
+  20 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> texinfo-1.23.ebuild:
+  Stable on ppc.
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> texinfo-1.23.ebuild:
+  Stable on alpha
+
+*texinfo-1.23 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> texinfo-1.21.ebuild texinfo-1.23.ebuild files/digest-texinfo-1.23 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *texinfo-1.21 (16 Dec 2002)
 
diff --git a/app-xemacs/texinfo/Manifest b/app-xemacs/texinfo/Manifest
index e69de29bb2d1..e706ee2db3dc 100644
--- a/app-xemacs/texinfo/Manifest
+++ b/app-xemacs/texinfo/Manifest
@@ -0,0 +1,5 @@
+MD5 2b3b2aa1aa69a3b99393afff65adecc2 texinfo-1.23.ebuild 392
+MD5 bce54c7d390a93acfb0ce52bdc3195ef ChangeLog 741
+MD5 f478bb9bb68d76f02de893e793d2dfda texinfo-1.21.ebuild 392
+MD5 0cd76df9b467406165a86ab33035a965 files/digest-texinfo-1.23 67
+MD5 192d54169604d47edb277b067d8516e7 files/digest-texinfo-1.21 67
diff --git a/app-xemacs/texinfo/texinfo-1.21.ebuild b/app-xemacs/texinfo/texinfo-1.21.ebuild
index 5036049f7573..51874be6f2c1 100644
--- a/app-xemacs/texinfo/texinfo-1.21.ebuild
+++ b/app-xemacs/texinfo/texinfo-1.21.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/app-xemacs/texinfo/texinfo-1.21.ebuild,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/texinfo/texinfo-1.21.ebuild,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -9,6 +9,7 @@ PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/texinfo/texinfo-1.23.ebuild b/app-xemacs/texinfo/texinfo-1.23.ebuild
index 58d1967b4cbe..46ec3b44c568 100644
--- a/app-xemacs/texinfo/texinfo-1.23.ebuild
+++ b/app-xemacs/texinfo/texinfo-1.23.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/app-xemacs/texinfo/texinfo-1.23.ebuild,v 1.1 2003/02/22 12:46:40 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/texinfo/texinfo-1.23.ebuild,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -9,7 +9,7 @@ PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="x86 ppc alpha sparc amd64"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/text-modes/ChangeLog b/app-xemacs/text-modes/ChangeLog
index 37a28b0cc86d..da70c7a1ea80 100644
--- a/app-xemacs/text-modes/ChangeLog
+++ b/app-xemacs/text-modes/ChangeLog
@@ -1,6 +1,34 @@
 # ChangeLog for app-xemacs/text-modes
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/text-modes/ChangeLog,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/text-modes/ChangeLog,v 1.1.1.1 2005/11/30 09:38:55 chriswhite Exp $
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  text-modes-1.58.ebuild:
+  Stable on ppc.
+
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org> text-modes-1.58.ebuild:
+  Stable on ppc64
+
+  01 Nov 2004; Markus Rothe <corsair@gentoo.org> text-modes-1.58.ebuild:
+  Marked ~ppc64; bug #67093
+
+  15 Mar 2004; <rac@gentoo.org> metadata.xml, text-modes-1.58.ebuild:
+  keyword amd64
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> text-modes-1.58.ebuild:
+  Stable on alpha
+
+*text-modes-1.58 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> text-modes-1.55.ebuild text-modes-1.58.ebuild files/digest-text-modes-1.58 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  fix depend on ispell to point to xemacs-ispell
+  changed alpha to ~alpha
 
 *text-modes-1.55 (16 Dec 2002)
 
diff --git a/app-xemacs/text-modes/Manifest b/app-xemacs/text-modes/Manifest
index e69de29bb2d1..6804983f9059 100644
--- a/app-xemacs/text-modes/Manifest
+++ b/app-xemacs/text-modes/Manifest
@@ -0,0 +1,6 @@
+MD5 0f39d0139849956930b1a500aca9c6de metadata.xml 365
+MD5 64796aabe5c7be9ff8280fb673ed894a ChangeLog 1180
+MD5 e6d6c7f3795e188aee8fa12a87e87c8f text-modes-1.58.ebuild 473
+MD5 784dd865d317b8354a7df4a92d3b3ebc text-modes-1.55.ebuild 467
+MD5 67e379f92df82a905b2fa83cc0f89640 files/digest-text-modes-1.58 70
+MD5 3b018d6b2446c46143e180b1a09234cf files/digest-text-modes-1.55 70
diff --git a/app-xemacs/text-modes/text-modes-1.55.ebuild b/app-xemacs/text-modes/text-modes-1.55.ebuild
index f32bb35d4363..ddb98c32ce02 100644
--- a/app-xemacs/text-modes/text-modes-1.55.ebuild
+++ b/app-xemacs/text-modes/text-modes-1.55.ebuild
@@ -1,16 +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/app-xemacs/text-modes/text-modes-1.55.ebuild,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/text-modes/text-modes-1.55.ebuild,v 1.1.1.1 2005/11/30 09:38:55 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
 DESCRIPTION="Miscellaneous support for editing text files."
 PKG_CAT="standard"
 
-DEPEND="app-xemacs/ispell
+DEPEND="app-xemacs/xemacs-ispell
 app-xemacs/fsf-compat
 app-xemacs/xemacs-base
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/text-modes/text-modes-1.58.ebuild b/app-xemacs/text-modes/text-modes-1.58.ebuild
index 9ad707aa959b..8758083deff8 100644
--- a/app-xemacs/text-modes/text-modes-1.58.ebuild
+++ b/app-xemacs/text-modes/text-modes-1.58.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/app-xemacs/text-modes/text-modes-1.58.ebuild,v 1.1 2003/02/22 12:46:40 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/text-modes/text-modes-1.58.ebuild,v 1.1.1.1 2005/11/30 09:38:55 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -11,7 +11,7 @@ DEPEND="app-xemacs/xemacs-ispell
 app-xemacs/fsf-compat
 app-xemacs/xemacs-base
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/textools/ChangeLog b/app-xemacs/textools/ChangeLog
index 6111b9335d8d..e6283223e3f2 100644
--- a/app-xemacs/textools/ChangeLog
+++ b/app-xemacs/textools/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-xemacs/textools
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/textools/ChangeLog,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/textools/ChangeLog,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> textools-1.14.ebuild:
+  Stable on alpha
+
+*textools-1.14 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> textools-1.13.ebuild textools-1.14.ebuild files/digest-textools-1.14 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *textools-1.13 (16 Dec 2002)
 
diff --git a/app-xemacs/textools/Manifest b/app-xemacs/textools/Manifest
index e69de29bb2d1..8b281ff5d05d 100644
--- a/app-xemacs/textools/Manifest
+++ b/app-xemacs/textools/Manifest
@@ -0,0 +1,5 @@
+MD5 8b0180904d66c1eb44879facb6550eee ChangeLog 660
+MD5 b37d0a88bee86ccbbc0eec876ef4ba40 textools-1.13.ebuild 397
+MD5 409d514af3ace2c1b9e7632c94647aa2 textools-1.14.ebuild 402
+MD5 ab5156bc8c1f311c3a818a8a0359528d files/digest-textools-1.13 67
+MD5 2af2dfc9d5e5aa09ea396ba6f9759c69 files/digest-textools-1.14 67
diff --git a/app-xemacs/textools/textools-1.13.ebuild b/app-xemacs/textools/textools-1.13.ebuild
index 364abe3290de..a8e426faf274 100644
--- a/app-xemacs/textools/textools-1.13.ebuild
+++ b/app-xemacs/textools/textools-1.13.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/app-xemacs/textools/textools-1.13.ebuild,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/textools/textools-1.13.ebuild,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -9,6 +9,7 @@ PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/textools/textools-1.14.ebuild b/app-xemacs/textools/textools-1.14.ebuild
index 0355bc28265e..e3c76663a0cc 100644
--- a/app-xemacs/textools/textools-1.14.ebuild
+++ b/app-xemacs/textools/textools-1.14.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/app-xemacs/textools/textools-1.14.ebuild,v 1.1 2003/02/22 12:46:40 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/textools/textools-1.14.ebuild,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -9,7 +9,7 @@ PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/time/ChangeLog b/app-xemacs/time/ChangeLog
index 0b501f2c7fc6..af5c2cd2b199 100644
--- a/app-xemacs/time/ChangeLog
+++ b/app-xemacs/time/ChangeLog
@@ -1,8 +1,23 @@
 # ChangeLog for app-xemacs/time
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/time/ChangeLog,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/time/ChangeLog,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
+
+  29 Sep 2005; Joseph Jezak <josejx@gentoo.org> time-1.12.ebuild:
+  Marked ppc stable.
+
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org> time-1.12.ebuild:
+  Stable on ppc64
+
+  01 Nov 2004; Markus Rothe <corsair@gentoo.org> time-1.12.ebuild:
+  Marked ~ppc64; bug #67095
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> time-1.12.ebuild:
+  Stable on alpha
 
 *time-1.12 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> time-1.12.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/time/Manifest b/app-xemacs/time/Manifest
index e69de29bb2d1..1a8fb19ac00a 100644
--- a/app-xemacs/time/Manifest
+++ b/app-xemacs/time/Manifest
@@ -0,0 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 945180c94170dd18cca81098a2be6bc7 ChangeLog 755
+MD5 1b5557748c8c4a0ff7de0a80315a659c time-1.12.ebuild 406
+MD5 e17ec8696c2cf1cfeb7593ba3b988495 files/digest-time-1.12 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDO44BcsIHjyDViGQRAthnAJ4gIIXeV9K6tWd+U/TrmV4llnVpSwCgmzQh
+6IRjf9NA/kQghWtliRNE6HU=
+=63fK
+-----END PGP SIGNATURE-----
diff --git a/app-xemacs/time/time-1.12.ebuild b/app-xemacs/time/time-1.12.ebuild
index d567bf82a119..5dbaa1368236 100644
--- a/app-xemacs/time/time-1.12.ebuild
+++ b/app-xemacs/time/time-1.12.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/app-xemacs/time/time-1.12.ebuild,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/time/time-1.12.ebuild,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -9,6 +9,7 @@ PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
 "
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/tm/ChangeLog b/app-xemacs/tm/ChangeLog
index 32c99b3c75c5..ee0fd2ab491a 100644
--- a/app-xemacs/tm/ChangeLog
+++ b/app-xemacs/tm/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for app-xemacs/tm
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/tm/ChangeLog,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/tm/ChangeLog,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
+
+  29 Sep 2005; Joseph Jezak <josejx@gentoo.org> tm-1.35.ebuild:
+  Marked ppc stable.
+
+  09 Aug 2004; Tom Gall <tgall@gentoo.org> tm-1.35.ebuild:
+  stable on ppc64, bug #57174
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> tm-1.35.ebuild:
+  Stable on alpha
+
+*tm-1.35 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> tm-1.34.ebuild tm-1.35.ebuild files/digest-tm-1.35 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *tm-1.34 (16 Dec 2002)
 
diff --git a/app-xemacs/tm/Manifest b/app-xemacs/tm/Manifest
index e69de29bb2d1..48efd52223f4 100644
--- a/app-xemacs/tm/Manifest
+++ b/app-xemacs/tm/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 bf8544bde82297d3d1b8b85b9bb9d376 ChangeLog 784
+MD5 c1ae772b5e02d1f5d73e2eb3c3605103 tm-1.35.ebuild 555
+MD5 9be708032e6c0c3d4fef24d1ee431f51 tm-1.34.ebuild 549
+MD5 e487837d8f82da4b2ae65db950c80216 files/digest-tm-1.35 62
+MD5 af767d171f9717ddf2a63f24a00b1b18 files/digest-tm-1.34 62
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDO4ydcsIHjyDViGQRAil4AKCnswy3mFChvJVoebdL/JTROpj9kgCdFppf
+Bp9+laXQE5H4rEus6gPkkSU=
+=cCYp
+-----END PGP SIGNATURE-----
diff --git a/app-xemacs/tm/tm-1.34.ebuild b/app-xemacs/tm/tm-1.34.ebuild
index fc38ef0e6f90..25f93c11a568 100644
--- a/app-xemacs/tm/tm-1.34.ebuild
+++ b/app-xemacs/tm/tm-1.34.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/app-xemacs/tm/tm-1.34.ebuild,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/tm/tm-1.34.ebuild,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -17,6 +17,7 @@ app-xemacs/apel
 app-xemacs/xemacs-base
 app-xemacs/fsf-compat
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/tm/tm-1.35.ebuild b/app-xemacs/tm/tm-1.35.ebuild
index 9136e0522ade..3ad1f41de228 100644
--- a/app-xemacs/tm/tm-1.35.ebuild
+++ b/app-xemacs/tm/tm-1.35.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/app-xemacs/tm/tm-1.35.ebuild,v 1.1 2003/02/22 12:46:40 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/tm/tm-1.35.ebuild,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -17,7 +17,7 @@ app-xemacs/apel
 app-xemacs/xemacs-base
 app-xemacs/fsf-compat
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/tooltalk/ChangeLog b/app-xemacs/tooltalk/ChangeLog
index 9d888959123a..392126cba57a 100644
--- a/app-xemacs/tooltalk/ChangeLog
+++ b/app-xemacs/tooltalk/ChangeLog
@@ -1,8 +1,14 @@
 # ChangeLog for app-xemacs/tooltalk
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/tooltalk/ChangeLog,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/tooltalk/ChangeLog,v 1.1.1.1 2005/11/30 09:38:54 chriswhite Exp $
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> tooltalk-1.13.ebuild:
+  Stable on alpha
 
 *tooltalk-1.13 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> tooltalk-1.13.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/tooltalk/Manifest b/app-xemacs/tooltalk/Manifest
index e69de29bb2d1..acfd186e6834 100644
--- a/app-xemacs/tooltalk/Manifest
+++ b/app-xemacs/tooltalk/Manifest
@@ -0,0 +1,3 @@
+MD5 6a3b271c1801682dffa7866ca4ca806b ChangeLog 509
+MD5 36add313dca4fe906fe49388272082c5 tooltalk-1.13.ebuild 388
+MD5 d68645536f1a0b3d34401ad34c24e7bb files/digest-tooltalk-1.13 66
diff --git a/app-xemacs/tooltalk/tooltalk-1.13.ebuild b/app-xemacs/tooltalk/tooltalk-1.13.ebuild
index 57c7eb5f07cd..a200f56c992f 100644
--- a/app-xemacs/tooltalk/tooltalk-1.13.ebuild
+++ b/app-xemacs/tooltalk/tooltalk-1.13.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/app-xemacs/tooltalk/tooltalk-1.13.ebuild,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/tooltalk/tooltalk-1.13.ebuild,v 1.1.1.1 2005/11/30 09:38:54 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -8,6 +8,7 @@ DESCRIPTION="Support for building with Tooltalk."
 PKG_CAT="standard"
 
 DEPEND=""
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/tpu/ChangeLog b/app-xemacs/tpu/ChangeLog
index f35aa699cf47..a447861c73f2 100644
--- a/app-xemacs/tpu/ChangeLog
+++ b/app-xemacs/tpu/ChangeLog
@@ -1,8 +1,14 @@
 # ChangeLog for app-xemacs/tpu
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/tpu/ChangeLog,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/tpu/ChangeLog,v 1.1.1.1 2005/11/30 09:38:54 chriswhite Exp $
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> tpu-1.12.ebuild:
+  Stable on alpha
 
 *tpu-1.12 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> tpu-1.12.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/tpu/Manifest b/app-xemacs/tpu/Manifest
index e69de29bb2d1..46171b185753 100644
--- a/app-xemacs/tpu/Manifest
+++ b/app-xemacs/tpu/Manifest
@@ -0,0 +1,3 @@
+MD5 4d05c1596077227db2459ace97af3307 ChangeLog 484
+MD5 68c4eae8bf9f7d1ee0770f83ebc58215 tpu-1.12.ebuild 364
+MD5 7581629898684c88d96e9d58a478921c files/digest-tpu-1.12 62
diff --git a/app-xemacs/tpu/tpu-1.12.ebuild b/app-xemacs/tpu/tpu-1.12.ebuild
index f16c0b1ed722..c054008d3d38 100644
--- a/app-xemacs/tpu/tpu-1.12.ebuild
+++ b/app-xemacs/tpu/tpu-1.12.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/app-xemacs/tpu/tpu-1.12.ebuild,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/tpu/tpu-1.12.ebuild,v 1.1.1.1 2005/11/30 09:38:54 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -8,6 +8,7 @@ DESCRIPTION="DEC EDIT/TPU support."
 PKG_CAT="standard"
 
 DEPEND=""
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/tramp/ChangeLog b/app-xemacs/tramp/ChangeLog
index 6791c32bb311..ceaaa9d7dc3e 100644
--- a/app-xemacs/tramp/ChangeLog
+++ b/app-xemacs/tramp/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-xemacs/tramp
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/tramp/ChangeLog,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/tramp/ChangeLog,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> tramp-1.11.ebuild:
+  Stable on alpha
+
+*tramp-1.11 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> tramp-1.10.ebuild tramp-1.11.ebuild files/digest-tramp-1.11 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *tramp-1.10 (16 Dec 2002)
 
diff --git a/app-xemacs/tramp/Manifest b/app-xemacs/tramp/Manifest
index e69de29bb2d1..b0832c5b330d 100644
--- a/app-xemacs/tramp/Manifest
+++ b/app-xemacs/tramp/Manifest
@@ -0,0 +1,5 @@
+MD5 ba1d943048fdef4f8aac038bc3c6f51e ChangeLog 636
+MD5 baebb2efc5c09de99ee86274b24d8f24 tramp-1.10.ebuild 518
+MD5 4a6875a6578a89be4872264343f6932a tramp-1.11.ebuild 523
+MD5 d51fa8891449626d7dcfd3925db3fa4b files/digest-tramp-1.10 65
+MD5 a52cc2338275245d622dbb25877acd93 files/digest-tramp-1.11 65
diff --git a/app-xemacs/tramp/tramp-1.10.ebuild b/app-xemacs/tramp/tramp-1.10.ebuild
index d85e48d9c667..26030cb132b8 100644
--- a/app-xemacs/tramp/tramp-1.10.ebuild
+++ b/app-xemacs/tramp/tramp-1.10.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/app-xemacs/tramp/tramp-1.10.ebuild,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/tramp/tramp-1.10.ebuild,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -16,6 +16,7 @@ app-xemacs/mail-lib
 app-xemacs/gnus
 app-xemacs/ediff
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/tramp/tramp-1.11.ebuild b/app-xemacs/tramp/tramp-1.11.ebuild
index 8c8a511beec9..6f0438b0be01 100644
--- a/app-xemacs/tramp/tramp-1.11.ebuild
+++ b/app-xemacs/tramp/tramp-1.11.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/app-xemacs/tramp/tramp-1.11.ebuild,v 1.1 2003/02/22 12:46:41 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/tramp/tramp-1.11.ebuild,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -16,7 +16,7 @@ app-xemacs/mail-lib
 app-xemacs/gnus
 app-xemacs/ediff
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/vc-cc/ChangeLog b/app-xemacs/vc-cc/ChangeLog
index d9231d89a539..753f274b3b9e 100644
--- a/app-xemacs/vc-cc/ChangeLog
+++ b/app-xemacs/vc-cc/ChangeLog
@@ -1,8 +1,14 @@
 # ChangeLog for app-xemacs/vc-cc
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/vc-cc/ChangeLog,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/vc-cc/ChangeLog,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> vc-cc-1.21.ebuild:
+  Stable on alpha
 
 *vc-cc-1.21 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> vc-cc-1.21.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/vc-cc/Manifest b/app-xemacs/vc-cc/Manifest
index e69de29bb2d1..7c407329a89e 100644
--- a/app-xemacs/vc-cc/Manifest
+++ b/app-xemacs/vc-cc/Manifest
@@ -0,0 +1,3 @@
+MD5 7a73ee4889be74a9eda617b5dbb7a923 ChangeLog 494
+MD5 a68c15552a6445710daef9f4e4874af9 vc-cc-1.21.ebuild 434
+MD5 5e2fff18cbf4e76784915488ab061748 files/digest-vc-cc-1.21 64
diff --git a/app-xemacs/vc-cc/vc-cc-1.21.ebuild b/app-xemacs/vc-cc/vc-cc-1.21.ebuild
index 251697e4abf0..c7d879e81980 100644
--- a/app-xemacs/vc-cc/vc-cc-1.21.ebuild
+++ b/app-xemacs/vc-cc/vc-cc-1.21.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/app-xemacs/vc-cc/vc-cc-1.21.ebuild,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/vc-cc/vc-cc-1.21.ebuild,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -10,6 +10,7 @@ PKG_CAT="standard"
 DEPEND="app-xemacs/dired
 app-xemacs/xemacs-base
 "
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/vc/ChangeLog b/app-xemacs/vc/ChangeLog
index 0093a86d610b..9c1c83d61524 100644
--- a/app-xemacs/vc/ChangeLog
+++ b/app-xemacs/vc/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for app-xemacs/vc
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/vc/ChangeLog,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/vc/ChangeLog,v 1.1.1.1 2005/11/30 09:38:54 chriswhite Exp $
+
+  29 Sep 2005; Joseph Jezak <josejx@gentoo.org> vc-1.35.ebuild:
+  Marked ppc stable.
+
+  09 Aug 2004; Tom Gall <tgall@gentoo.org> vc-1.35.ebuild:
+  stable on ppc64, bug #57174
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> vc-1.35.ebuild:
+  Stable on alpha
+
+*vc-1.35 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> vc-1.33.ebuild vc-1.35.ebuild files/digest-vc-1.35 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *vc-1.33 (16 Dec 2002)
 
diff --git a/app-xemacs/vc/Manifest b/app-xemacs/vc/Manifest
index e69de29bb2d1..4b71c4e18292 100644
--- a/app-xemacs/vc/Manifest
+++ b/app-xemacs/vc/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6c3f9e156bcd788a3425ce1aaf267631 ChangeLog 784
+MD5 e3f778774d416796bacd11becd48d87e vc-1.33.ebuild 446
+MD5 870b458445ed07ea38a322094337e889 vc-1.35.ebuild 452
+MD5 9df785d6d0dfae59bcb8ea8382ffe396 files/digest-vc-1.33 61
+MD5 5fd63aabe09c904c56927de289b75851 files/digest-vc-1.35 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDO4iwcsIHjyDViGQRAgvUAKDfVW1yzEH8sb6EKuqHal/IWtEVtgCfWZuz
+/YH9w5+zTI8IBM0mAPXCZB8=
+=Rsnz
+-----END PGP SIGNATURE-----
diff --git a/app-xemacs/vc/vc-1.33.ebuild b/app-xemacs/vc/vc-1.33.ebuild
index e52acd2b882b..70d08aef69e1 100644
--- a/app-xemacs/vc/vc-1.33.ebuild
+++ b/app-xemacs/vc/vc-1.33.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/app-xemacs/vc/vc-1.33.ebuild,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/vc/vc-1.33.ebuild,v 1.1.1.1 2005/11/30 09:38:54 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -12,6 +12,7 @@ app-xemacs/xemacs-base
 app-xemacs/mail-lib
 app-xemacs/ediff
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/vc/vc-1.35.ebuild b/app-xemacs/vc/vc-1.35.ebuild
index aaefa1a8a11d..b35b87701827 100644
--- a/app-xemacs/vc/vc-1.35.ebuild
+++ b/app-xemacs/vc/vc-1.35.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/app-xemacs/vc/vc-1.35.ebuild,v 1.1 2003/02/22 12:46:41 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/vc/vc-1.35.ebuild,v 1.1.1.1 2005/11/30 09:38:54 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -12,7 +12,7 @@ app-xemacs/xemacs-base
 app-xemacs/mail-lib
 app-xemacs/ediff
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/vhdl/ChangeLog b/app-xemacs/vhdl/ChangeLog
index 43d5db902461..ea85d7ed1e9b 100644
--- a/app-xemacs/vhdl/ChangeLog
+++ b/app-xemacs/vhdl/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-xemacs/vhdl
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/vhdl/ChangeLog,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/vhdl/ChangeLog,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> vhdl-1.16.ebuild:
+  Stable on alpha
+
+*vhdl-1.16 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> vhdl-1.15.ebuild vhdl-1.16.ebuild files/digest-vhdl-1.16 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *vhdl-1.15 (16 Dec 2002)
 
diff --git a/app-xemacs/vhdl/Manifest b/app-xemacs/vhdl/Manifest
index e69de29bb2d1..a5e2dd3e42df 100644
--- a/app-xemacs/vhdl/Manifest
+++ b/app-xemacs/vhdl/Manifest
@@ -0,0 +1,5 @@
+MD5 1386a151fe1adaa9545887f1818f26c3 ChangeLog 628
+MD5 8952d0a9d14bbee1fbbaca108345e564 vhdl-1.15.ebuild 483
+MD5 795ea7d583b59273edba7bfcf8b03789 vhdl-1.16.ebuild 488
+MD5 165df352bb933a74be66bcf67373afb4 files/digest-vhdl-1.15 64
+MD5 9bbccc7b95167bdaf842573919818a97 files/digest-vhdl-1.16 64
diff --git a/app-xemacs/vhdl/vhdl-1.15.ebuild b/app-xemacs/vhdl/vhdl-1.15.ebuild
index da0b67c898ff..186d18a0e268 100644
--- a/app-xemacs/vhdl/vhdl-1.15.ebuild
+++ b/app-xemacs/vhdl/vhdl-1.15.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/app-xemacs/vhdl/vhdl-1.15.ebuild,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/vhdl/vhdl-1.15.ebuild,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -14,6 +14,7 @@ app-xemacs/speedbar
 app-xemacs/ps-print
 app-xemacs/os-utils
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/vhdl/vhdl-1.16.ebuild b/app-xemacs/vhdl/vhdl-1.16.ebuild
index a744ddd6e7cb..d739cf55622b 100644
--- a/app-xemacs/vhdl/vhdl-1.16.ebuild
+++ b/app-xemacs/vhdl/vhdl-1.16.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/app-xemacs/vhdl/vhdl-1.16.ebuild,v 1.1 2003/02/22 12:46:41 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/vhdl/vhdl-1.16.ebuild,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -14,7 +14,7 @@ app-xemacs/speedbar
 app-xemacs/ps-print
 app-xemacs/os-utils
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/view-process/ChangeLog b/app-xemacs/view-process/ChangeLog
index 217de19c4241..e7c993172e40 100644
--- a/app-xemacs/view-process/ChangeLog
+++ b/app-xemacs/view-process/ChangeLog
@@ -1,8 +1,24 @@
 # ChangeLog for app-xemacs/view-process
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/view-process/ChangeLog,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/view-process/ChangeLog,v 1.1.1.1 2005/11/30 09:38:55 chriswhite Exp $
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  view-process-1.12.ebuild:
+  Stable on ppc.
+
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org> view-process-1.12.ebuild:
+  Stable on ppc64
+
+  01 Nov 2004; Markus Rothe <corsair@gentoo.org> view-process-1.12.ebuild:
+  Marked ~ppc64; bug #67096
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> view-process-1.12.ebuild:
+  Stable on alpha
 
 *view-process-1.12 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> view-process-1.12.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/view-process/Manifest b/app-xemacs/view-process/Manifest
index e69de29bb2d1..fe44007b6b21 100644
--- a/app-xemacs/view-process/Manifest
+++ b/app-xemacs/view-process/Manifest
@@ -0,0 +1,3 @@
+MD5 f686a105096a4e889c30d54e2384843b ChangeLog 823
+MD5 27a7714a48e5b958aed9e0fa9112092b view-process-1.12.ebuild 415
+MD5 4daa1923757a062f19b956e9b28b2a95 files/digest-view-process-1.12 71
diff --git a/app-xemacs/view-process/view-process-1.12.ebuild b/app-xemacs/view-process/view-process-1.12.ebuild
index a011319073d5..b6e7b5ea81fb 100644
--- a/app-xemacs/view-process/view-process-1.12.ebuild
+++ b/app-xemacs/view-process/view-process-1.12.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/app-xemacs/view-process/view-process-1.12.ebuild,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/view-process/view-process-1.12.ebuild,v 1.1.1.1 2005/11/30 09:38:55 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -9,6 +9,7 @@ PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
 "
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/viper/ChangeLog b/app-xemacs/viper/ChangeLog
index bfd6fb4b3b08..8db0a2175379 100644
--- a/app-xemacs/viper/ChangeLog
+++ b/app-xemacs/viper/ChangeLog
@@ -1,8 +1,17 @@
 # ChangeLog for app-xemacs/viper
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/viper/ChangeLog,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/viper/ChangeLog,v 1.1.1.1 2005/11/30 09:38:55 chriswhite Exp $
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> viper-1.35.ebuild:
+  Stable on ppc.
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> viper-1.35.ebuild:
+  Stable on alpha
 
 *viper-1.35 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> viper-1.35.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/viper/Manifest b/app-xemacs/viper/Manifest
index e69de29bb2d1..ffa26488d806 100644
--- a/app-xemacs/viper/Manifest
+++ b/app-xemacs/viper/Manifest
@@ -0,0 +1,3 @@
+MD5 a334d16b597a870f02d5b8f494afff69 ChangeLog 581
+MD5 a236bd54f10678a0e8ed768920221dbf viper-1.35.ebuild 387
+MD5 603f7ee28abfc0ad960c3c420f5d768b files/digest-viper-1.35 65
diff --git a/app-xemacs/viper/viper-1.35.ebuild b/app-xemacs/viper/viper-1.35.ebuild
index 7c3d82fcd02d..bf138ea5bcf2 100644
--- a/app-xemacs/viper/viper-1.35.ebuild
+++ b/app-xemacs/viper/viper-1.35.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/app-xemacs/viper/viper-1.35.ebuild,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/viper/viper-1.35.ebuild,v 1.1.1.1 2005/11/30 09:38:55 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -9,6 +9,7 @@ PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
 "
+KEYWORDS="alpha amd64 ppc sparc x86"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/vm/ChangeLog b/app-xemacs/vm/ChangeLog
index e529ba71bbfd..dc202d43800b 100644
--- a/app-xemacs/vm/ChangeLog
+++ b/app-xemacs/vm/ChangeLog
@@ -1,8 +1,20 @@
 # ChangeLog for app-xemacs/vm
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/vm/ChangeLog,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/vm/ChangeLog,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> vm-7.07.ebuild:
+  Stable on ppc.
+
+  09 Aug 2004; Tom Gall <tgall@gentoo.org> vm-7.07.ebuild:
+  stable on ppc64, bug #57174
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> vm-7.07.ebuild:
+  Stable on alpha
 
 *vm-7.07 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> vm-7.07.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/vm/Manifest b/app-xemacs/vm/Manifest
index e69de29bb2d1..bb8bc0f5f482 100644
--- a/app-xemacs/vm/Manifest
+++ b/app-xemacs/vm/Manifest
@@ -0,0 +1,3 @@
+MD5 2713d423a396ac60bb5b9864ad354cc3 ChangeLog 653
+MD5 bdea88dc2368912c0ce585b3ad21d77f vm-7.07.ebuild 402
+MD5 2310af8457614a640f85bf9c9c06e46a files/digest-vm-7.07 62
diff --git a/app-xemacs/vm/vm-7.07.ebuild b/app-xemacs/vm/vm-7.07.ebuild
index aa3be2b54201..65336ce6d177 100644
--- a/app-xemacs/vm/vm-7.07.ebuild
+++ b/app-xemacs/vm/vm-7.07.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/app-xemacs/vm/vm-7.07.ebuild,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/vm/vm-7.07.ebuild,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -10,6 +10,7 @@ PKG_CAT="standard"
 DEPEND="app-xemacs/mail-lib
 app-xemacs/xemacs-base
 "
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/w3/ChangeLog b/app-xemacs/w3/ChangeLog
index 343779c92e1d..2452a2bb3959 100644
--- a/app-xemacs/w3/ChangeLog
+++ b/app-xemacs/w3/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for app-xemacs/w3
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/w3/ChangeLog,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/w3/ChangeLog,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
+
+  29 Sep 2005; Joseph Jezak <josejx@gentoo.org> w3-1.28.ebuild:
+  Marked ppc stable.
+
+  09 Aug 2004; Tom Gall <tgall@gentoo.org> w3-1.28.ebuild:
+  stable on ppc64, bug #57174
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> w3-1.28.ebuild:
+  Stable on alpha
+
+*w3-1.28 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> w3-1.26.ebuild w3-1.28.ebuild files/digest-w3-1.28 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *w3-1.26 (16 Dec 2002)
 
diff --git a/app-xemacs/w3/Manifest b/app-xemacs/w3/Manifest
index e69de29bb2d1..3d8525ff28e8 100644
--- a/app-xemacs/w3/Manifest
+++ b/app-xemacs/w3/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e4bf562162bf3082a9cb6367a156cd48 ChangeLog 784
+MD5 dc7925b35e440e4ec26482619013f3a6 w3-1.28.ebuild 418
+MD5 122c83da2614d72b895c1faa51525107 w3-1.26.ebuild 412
+MD5 23ea1096744ea7d79010fcf620d608c1 files/digest-w3-1.28 62
+MD5 b31a1020d4bde782c6f7eec3a7d24862 files/digest-w3-1.26 62
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDO36ycsIHjyDViGQRAiQaAJ49QowVsEkL9+RGPoixbkbVLgy0cwCgydBg
+C8sQVpLk8SM5DfeUKPq8aJw=
+=i3b1
+-----END PGP SIGNATURE-----
diff --git a/app-xemacs/w3/w3-1.26.ebuild b/app-xemacs/w3/w3-1.26.ebuild
index 129b85f7b883..2e98c46eaeeb 100644
--- a/app-xemacs/w3/w3-1.26.ebuild
+++ b/app-xemacs/w3/w3-1.26.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/app-xemacs/w3/w3-1.26.ebuild,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/w3/w3-1.26.ebuild,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -11,6 +11,7 @@ DEPEND="app-xemacs/mail-lib
 app-xemacs/xemacs-base
 app-xemacs/ecrypto
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/w3/w3-1.28.ebuild b/app-xemacs/w3/w3-1.28.ebuild
index e4577b95a959..6a4440d9a766 100644
--- a/app-xemacs/w3/w3-1.28.ebuild
+++ b/app-xemacs/w3/w3-1.28.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/app-xemacs/w3/w3-1.28.ebuild,v 1.1 2003/02/22 12:46:41 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/w3/w3-1.28.ebuild,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -11,7 +11,7 @@ DEPEND="app-xemacs/mail-lib
 app-xemacs/xemacs-base
 app-xemacs/ecrypto
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/xemacs-base/ChangeLog b/app-xemacs/xemacs-base/ChangeLog
index c5cabe0ef369..26599b400703 100644
--- a/app-xemacs/xemacs-base/ChangeLog
+++ b/app-xemacs/xemacs-base/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for app-xemacs/xemacs-base
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/xemacs-base/ChangeLog,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/xemacs-base/ChangeLog,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
+
+  09 Aug 2004; Tom Gall <tgall@gentoo.org> xemacs-base-1.75.ebuild:
+  stable on ppc64, bug #57174
+
+  27 Jul 2004; Robert Coie <rac@gentoo.org> xemacs-base-1.71.ebuild,
+  xemacs-base-1.75.ebuild:
+  keywording ppc
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> xemacs-base-1.75.ebuild:
+  Stable on alpha
+
+*xemacs-base-1.75 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> xemacs-base-1.71.ebuild xemacs-base-1.75.ebuild files/digest-xemacs-base-1.75 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
 
 *xemacs-base-1.71 (16 Dec 2002)
 
diff --git a/app-xemacs/xemacs-base/Manifest b/app-xemacs/xemacs-base/Manifest
index e69de29bb2d1..a690a2e5e6c2 100644
--- a/app-xemacs/xemacs-base/Manifest
+++ b/app-xemacs/xemacs-base/Manifest
@@ -0,0 +1,6 @@
+MD5 56b02da78081fe802a85c9219275b7e0 ChangeLog 897
+MD5 845b775d9ef684e5a65634f2397674a9 xemacs-base-1.71.ebuild 412
+MD5 bd8f145c3641d41b0c32d2777014d4fe xemacs-base-1.75.ebuild 423
+MD5 0f39d0139849956930b1a500aca9c6de metadata.xml 365
+MD5 b2f8dae03162b0b9c29d281e64d08c44 files/digest-xemacs-base-1.71 71
+MD5 d40d6be1d3924e4d94de40bd16ecd788 files/digest-xemacs-base-1.75 71
diff --git a/app-xemacs/xemacs-base/xemacs-base-1.71.ebuild b/app-xemacs/xemacs-base/xemacs-base-1.71.ebuild
index 33abc68b5444..5dee87974725 100644
--- a/app-xemacs/xemacs-base/xemacs-base-1.71.ebuild
+++ b/app-xemacs/xemacs-base/xemacs-base-1.71.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/app-xemacs/xemacs-base/xemacs-base-1.71.ebuild,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/xemacs-base/xemacs-base-1.71.ebuild,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -8,6 +8,7 @@ DESCRIPTION="Fundamental XEmacs support, you almost certainly need this."
 PKG_CAT="standard"
 
 DEPEND=""
+KEYWORDS="x86 ppc ~alpha sparc"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/xemacs-base/xemacs-base-1.75.ebuild b/app-xemacs/xemacs-base/xemacs-base-1.75.ebuild
index 8337f2704726..57f2bcb7b1af 100644
--- a/app-xemacs/xemacs-base/xemacs-base-1.75.ebuild
+++ b/app-xemacs/xemacs-base/xemacs-base-1.75.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/app-xemacs/xemacs-base/xemacs-base-1.75.ebuild,v 1.1 2003/02/22 12:46:41 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/xemacs-base/xemacs-base-1.75.ebuild,v 1.1.1.1 2005/11/30 09:38:53 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -8,7 +8,7 @@ DESCRIPTION="Fundamental XEmacs support, you almost certainly need this."
 PKG_CAT="standard"
 
 DEPEND=""
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="amd64 x86 ppc alpha sparc ppc64"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/xemacs-devel/ChangeLog b/app-xemacs/xemacs-devel/ChangeLog
index 50795d7faf99..bef57d134514 100644
--- a/app-xemacs/xemacs-devel/ChangeLog
+++ b/app-xemacs/xemacs-devel/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for app-xemacs/xemacs-devel
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/xemacs-devel/ChangeLog,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/xemacs-devel/ChangeLog,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
+
+  29 Sep 2005; Joseph Jezak <josejx@gentoo.org> xemacs-devel-1.50.ebuild:
+  Marked ppc stable.
+
+  09 Aug 2004; Tom Gall <tgall@gentoo.org> xemacs-devel-1.50.ebuild:
+  stable on ppc64
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> xemacs-devel-1.50.ebuild:
+  Stable on alpha
+
+*xemacs-devel-1.50 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> xemacs-devel-1.48.ebuild xemacs-devel-1.50.ebuild files/digest-xemacs-devel-1.50 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  fix depend on ispell to point to xemacs-ispell
+  changed alpha to ~alpha
 
 *xemacs-devel-1.48 (16 Dec 2002)
 
diff --git a/app-xemacs/xemacs-devel/Manifest b/app-xemacs/xemacs-devel/Manifest
index e69de29bb2d1..b1cc66721849 100644
--- a/app-xemacs/xemacs-devel/Manifest
+++ b/app-xemacs/xemacs-devel/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 44495044649f30cfdaf714cc8d1be5c6 ChangeLog 1000
+MD5 64cb3d1db260199112461dcf67f71772 xemacs-devel-1.50.ebuild 522
+MD5 a0f85f6a750ca4f57b015ebe94a5ab8a xemacs-devel-1.48.ebuild 469
+MD5 8f25a8bb7e283853c60dd51bebccaea0 files/digest-xemacs-devel-1.50 72
+MD5 1e9d3a9f426123031f36467ef53c4f72 files/digest-xemacs-devel-1.48 72
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDO4kpcsIHjyDViGQRAthwAJ43aMRrjQNYhZ7Shj04j8eafPrPYACg6T7e
+0D/mLDK01GgS2OU2RVNXlAA=
+=NZXS
+-----END PGP SIGNATURE-----
diff --git a/app-xemacs/xemacs-devel/xemacs-devel-1.48.ebuild b/app-xemacs/xemacs-devel/xemacs-devel-1.48.ebuild
index c6199689437f..7257e15c1eca 100644
--- a/app-xemacs/xemacs-devel/xemacs-devel-1.48.ebuild
+++ b/app-xemacs/xemacs-devel/xemacs-devel-1.48.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/app-xemacs/xemacs-devel/xemacs-devel-1.48.ebuild,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/xemacs-devel/xemacs-devel-1.48.ebuild,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -8,10 +8,11 @@ DESCRIPTION="Emacs Lisp developer support."
 PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
-app-xemacs/ispell
+app-xemacs/xemacs-ispell
 app-xemacs/mail-lib
 app-xemacs/gnus
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/xemacs-devel/xemacs-devel-1.50.ebuild b/app-xemacs/xemacs-devel/xemacs-devel-1.50.ebuild
index 0cbf244e9a52..2f6d734e8c10 100644
--- a/app-xemacs/xemacs-devel/xemacs-devel-1.50.ebuild
+++ b/app-xemacs/xemacs-devel/xemacs-devel-1.50.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/app-xemacs/xemacs-devel/xemacs-devel-1.50.ebuild,v 1.1 2003/02/22 12:46:41 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/xemacs-devel/xemacs-devel-1.50.ebuild,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -15,7 +15,7 @@ app-xemacs/rmail
 app-xemacs/tm
 app-xemacs/apel
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/xemacs-eterm/ChangeLog b/app-xemacs/xemacs-eterm/ChangeLog
index ff11bae398dd..dccaed6eb791 100644
--- a/app-xemacs/xemacs-eterm/ChangeLog
+++ b/app-xemacs/xemacs-eterm/ChangeLog
@@ -1,9 +1,19 @@
 # ChangeLog for app-xemacs/xemacs-eterm
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/xemacs-eterm/ChangeLog,v 1.1 2003/06/13 05:00:53 rac Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/xemacs-eterm/ChangeLog,v 1.1.1.1 2005/11/30 09:38:55 chriswhite Exp $
 
-*xemacs-eterm-1.13 (12 Jun 2003)
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  xemacs-eterm-1.13.ebuild:
+  Stable on ppc.
 
-  12 Jun 2003; <rac@gentoo.org> xemacs-eterm-1.13.ebuild:
-  Moved from eterm to avoid conflict with x11-terms/eterm
+  09 Aug 2004; Tom Gall <tgall@gentoo.org> eterm-1.13.ebuild:
+  stable on ppc64, bug #57174
+ 
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> eterm-1.13.ebuild:
+  Stable on alpha
+
+*eterm-1.13 (15 Jun 2003)
+
+  15 Jun 2003; <rac@gentoo.org> eterm-1.13.ebuild:
+  Resurrect pending portage patch for ambiguous package name handling
 
diff --git a/app-xemacs/xemacs-eterm/Manifest b/app-xemacs/xemacs-eterm/Manifest
index 2acc97fc21bd..5adc4781dd46 100644
--- a/app-xemacs/xemacs-eterm/Manifest
+++ b/app-xemacs/xemacs-eterm/Manifest
@@ -1,2 +1,3 @@
-MD5 2142ac454607000d051a152beb9ca06d xemacs-eterm-1.13.ebuild 481
+MD5 0f394be563262ae5408e5129c92e58d0 ChangeLog 650
+MD5 ce83879171559983c3d8af78de99ded0 xemacs-eterm-1.13.ebuild 491
 MD5 6652ced118703656fed04c2372b56a0d files/digest-xemacs-eterm-1.13 66
diff --git a/app-xemacs/xemacs-eterm/xemacs-eterm-1.13.ebuild b/app-xemacs/xemacs-eterm/xemacs-eterm-1.13.ebuild
index 05e0c5a4e555..684689560b3e 100644
--- a/app-xemacs/xemacs-eterm/xemacs-eterm-1.13.ebuild
+++ b/app-xemacs/xemacs-eterm/xemacs-eterm-1.13.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/app-xemacs/xemacs-eterm/xemacs-eterm-1.13.ebuild,v 1.1 2003/06/13 05:00:53 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/xemacs-eterm/xemacs-eterm-1.13.ebuild,v 1.1.1.1 2005/11/30 09:38:55 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -8,11 +8,9 @@ DESCRIPTION="Terminal emulation."
 PKG_CAT="standard"
 
 MY_PN=${PN/xemacs-/}
-
 SRC_URI="ftp://ftp.xemacs.org/packages/${MY_PN}-${PV}-pkg.tar.gz"
 
 DEPEND="app-xemacs/xemacs-base"
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="amd64 x86 ppc alpha sparc ppc64"
 
 inherit xemacs-packages
-
diff --git a/app-xemacs/xemacs-ispell/ChangeLog b/app-xemacs/xemacs-ispell/ChangeLog
index 5bf6fed329eb..851c82e44bfb 100644
--- a/app-xemacs/xemacs-ispell/ChangeLog
+++ b/app-xemacs/xemacs-ispell/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-xemacs/xemacs-ispell
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/xemacs-ispell/ChangeLog,v 1.1 2003/02/20 11:25:05 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/xemacs-ispell/ChangeLog,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  xemacs-ispell-1.24.ebuild:
+  Stable on ppc.
+
+  09 Aug 2004; Tom Gall <tgall@gentoo.org> xemacs-ispell-1.24.ebuild:
+  stable on ppc64, bug #57174
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> xemacs-ispell-1.24.ebuild:
+  Stable on alpha
 
 *xemacs-ispell-1.24 (20 Feb 2003)
 
diff --git a/app-xemacs/xemacs-ispell/Manifest b/app-xemacs/xemacs-ispell/Manifest
index e69de29bb2d1..9ff77a7d64fa 100644
--- a/app-xemacs/xemacs-ispell/Manifest
+++ b/app-xemacs/xemacs-ispell/Manifest
@@ -0,0 +1,3 @@
+MD5 41143f1109e1b572d65536d037ed5021 ChangeLog 685
+MD5 22152bd0cbcabe587f1b5a2785e0cb8f xemacs-ispell-1.24.ebuild 484
+MD5 d19f26e21212706bb2bfc4488abd6f56 files/digest-xemacs-ispell-1.24 66
diff --git a/app-xemacs/xemacs-ispell/xemacs-ispell-1.24.ebuild b/app-xemacs/xemacs-ispell/xemacs-ispell-1.24.ebuild
index a69bdcb525b1..26d1cb6cd35a 100644
--- a/app-xemacs/xemacs-ispell/xemacs-ispell-1.24.ebuild
+++ b/app-xemacs/xemacs-ispell/xemacs-ispell-1.24.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/app-xemacs/xemacs-ispell/xemacs-ispell-1.24.ebuild,v 1.1 2003/02/20 11:25:05 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/xemacs-ispell/xemacs-ispell-1.24.ebuild,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -12,7 +12,7 @@ MY_PN=${PN/xemacs-/}
 SRC_URI="ftp://ftp.xemacs.org/packages/${MY_PN}-${PV}-pkg.tar.gz"
 
 DEPEND=""
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/xemacs-packages-sumo/ChangeLog b/app-xemacs/xemacs-packages-sumo/ChangeLog
index bb42dfe77d3a..832d1abeadd6 100644
--- a/app-xemacs/xemacs-packages-sumo/ChangeLog
+++ b/app-xemacs/xemacs-packages-sumo/ChangeLog
@@ -1,6 +1,23 @@
-# ChangeLog for app-editors/xemacs-packages-sumo
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/xemacs-packages-sumo/ChangeLog,v 1.1 2004/08/29 04:50:08 rac Exp $
+# ChangeLog for app-xemacs/xemacs-packages-sumo
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/xemacs-packages-sumo/ChangeLog,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
+
+  10 Oct 2005; <dang@gentoo.org> xemacs-packages-sumo-2003.11.13.ebuild:
+  Marked ~amd64
+
+  02 Jan 2005; 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.
+
+  03 Sep 2004; David Holm <dholm@gentoo.org>
+  xemacs-packages-sumo-2003.11.13.ebuild:
+  Added to ~ppc.
+
+  28 Aug 2004; Robert Coie <rac@gentoo.org>
+  xemacs-packages-sumo-2003.11.13.ebuild:
+  Add virtual/xemacs dependency. Bug 55855
 
 *xemacs-packages-sumo-2003.11.13 (28 Aug 2004)
 
@@ -18,7 +35,7 @@
   xemacs-packages-sumo-2003.11.13.ebuild:
   Fix use invocation
 
-  04 May 2004; Bryan �stergaard <kloeri@gentoo.org>
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org>
   xemacs-packages-sumo-2003.11.13.ebuild:
   Stable on alpha.
 
diff --git a/app-xemacs/xemacs-packages-sumo/Manifest b/app-xemacs/xemacs-packages-sumo/Manifest
index 1ccef6e9a747..747f9bff934d 100644
--- a/app-xemacs/xemacs-packages-sumo/Manifest
+++ b/app-xemacs/xemacs-packages-sumo/Manifest
@@ -1,10 +1,20 @@
-MD5 abb8a464aa6e8209db88947b5dd4fa86 xemacs-packages-sumo-2003.04.14.ebuild 1003
-MD5 91af538d84c48baaa69aee2b57942bc4 xemacs-packages-sumo-2003.06.29.ebuild 1003
-MD5 c83fc6b27225da7bb0c22652fd4f186d xemacs-packages-sumo-2003.08.31.ebuild 1002
-MD5 5bbd973cb1c6e3d0a042b72c14202017 xemacs-packages-sumo-2003.11.13.ebuild 1003
-MD5 54048d4f572d7ddb8dbe8d733042d4c2 ChangeLog 2621
-MD5 ae4bc626a0e60a274f0edcd798d9ad7f metadata.xml 252
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 863a8337568c40b80f846af1ce2dea6a ChangeLog 3486
 MD5 123706b91a161701cfa75c4f046b47a6 files/digest-xemacs-packages-sumo-2003.04.14 158
 MD5 000199e7085ae7f2a965a46d92ba8cc6 files/digest-xemacs-packages-sumo-2003.06.29 158
 MD5 ef504c5661092407b7150a3761aa6f4e files/digest-xemacs-packages-sumo-2003.08.31 158
-MD5 51c024ab16fd1ae87402597c47d68db4 files/digest-xemacs-packages-sumo-2003.11.13 158
+MD5 e90fe61209e740b8681b857cea2aa49e files/digest-xemacs-packages-sumo-2003.11.13 158
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 dc08d14db108901ada27c95b1bcb8767 xemacs-packages-sumo-2003.04.14.ebuild 1004
+MD5 4b347a6b2dcfe9f3c1c9d9f3d0b77d38 xemacs-packages-sumo-2003.06.29.ebuild 1004
+MD5 fafdbd52fb2b47bd90eac05f8ed793d1 xemacs-packages-sumo-2003.08.31.ebuild 1003
+MD5 857047639ed0bd950e0c1bf53c5e2359 xemacs-packages-sumo-2003.11.13.ebuild 1025
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDSscMomPajV0RnrERApWJAJ9/xkrks3fDWniV2V3siV8dVv/1HQCdGQVD
+04UK/mRuyaFKlgc9gL3hAUQ=
+=yFit
+-----END PGP SIGNATURE-----
diff --git a/app-xemacs/xemacs-packages-sumo/files/digest-xemacs-packages-sumo-2003.11.13 b/app-xemacs/xemacs-packages-sumo/files/digest-xemacs-packages-sumo-2003.11.13
index 37bb3acebfa2..e4b992082282 100644
--- a/app-xemacs/xemacs-packages-sumo/files/digest-xemacs-packages-sumo-2003.11.13
+++ b/app-xemacs/xemacs-packages-sumo/files/digest-xemacs-packages-sumo-2003.11.13
@@ -1,2 +1,2 @@
-MD5 fad0d46219cdbdcb5e4d6b2bf18d0282 xemacs-sumo-2003-11-13.tar.bz2 22362889
 MD5 725845c8c769a3e422a9816313d4ad25 xemacs-mule-sumo-2003-11-13.tar.bz2 5031914
+MD5 fad0d46219cdbdcb5e4d6b2bf18d0282 xemacs-sumo-2003-11-13.tar.bz2 22362889
diff --git a/app-xemacs/xemacs-packages-sumo/metadata.xml b/app-xemacs/xemacs-packages-sumo/metadata.xml
index 47ec49344c32..20ce219711a2 100644
--- a/app-xemacs/xemacs-packages-sumo/metadata.xml
+++ b/app-xemacs/xemacs-packages-sumo/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>no-herd</herd>
-<maintainer>
-  <email>agenkin@gentoo.org</email>
-  <name>Arcady Genkin</name>
-</maintainer>
 </pkgmetadata>
diff --git a/app-xemacs/xemacs-packages-sumo/xemacs-packages-sumo-2003.04.14.ebuild b/app-xemacs/xemacs-packages-sumo/xemacs-packages-sumo-2003.04.14.ebuild
index b06e392134af..03179bcc12c6 100644
--- a/app-xemacs/xemacs-packages-sumo/xemacs-packages-sumo-2003.04.14.ebuild
+++ b/app-xemacs/xemacs-packages-sumo/xemacs-packages-sumo-2003.04.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/app-xemacs/xemacs-packages-sumo/xemacs-packages-sumo-2003.04.14.ebuild,v 1.1 2004/08/29 04:50:08 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/xemacs-packages-sumo/xemacs-packages-sumo-2003.04.14.ebuild,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
 
 DESCRIPTION="The SUMO bundle of ELISP packages for Xemacs"
 HOMEPAGE="http://www.xemacs.org"
diff --git a/app-xemacs/xemacs-packages-sumo/xemacs-packages-sumo-2003.06.29.ebuild b/app-xemacs/xemacs-packages-sumo/xemacs-packages-sumo-2003.06.29.ebuild
index 0afd106d6215..35900d49cdce 100644
--- a/app-xemacs/xemacs-packages-sumo/xemacs-packages-sumo-2003.06.29.ebuild
+++ b/app-xemacs/xemacs-packages-sumo/xemacs-packages-sumo-2003.06.29.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-xemacs/xemacs-packages-sumo/xemacs-packages-sumo-2003.06.29.ebuild,v 1.1 2004/08/29 04:50:08 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/xemacs-packages-sumo/xemacs-packages-sumo-2003.06.29.ebuild,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
 
 DESCRIPTION="The SUMO bundle of ELISP packages for Xemacs"
 HOMEPAGE="http://www.xemacs.org"
diff --git a/app-xemacs/xemacs-packages-sumo/xemacs-packages-sumo-2003.08.31.ebuild b/app-xemacs/xemacs-packages-sumo/xemacs-packages-sumo-2003.08.31.ebuild
index d1bfcca14bb6..be587b01040c 100644
--- a/app-xemacs/xemacs-packages-sumo/xemacs-packages-sumo-2003.08.31.ebuild
+++ b/app-xemacs/xemacs-packages-sumo/xemacs-packages-sumo-2003.08.31.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-xemacs/xemacs-packages-sumo/xemacs-packages-sumo-2003.08.31.ebuild,v 1.1 2004/08/29 04:50:08 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/xemacs-packages-sumo/xemacs-packages-sumo-2003.08.31.ebuild,v 1.1.1.1 2005/11/30 09:38:52 chriswhite Exp $
 
 DESCRIPTION="The SUMO bundle of ELISP packages for Xemacs"
 HOMEPAGE="http://www.xemacs.org"
diff --git a/app-xemacs/xemacs-packages-sumo/xemacs-packages-sumo-2003.11.13.ebuild b/app-xemacs/xemacs-packages-sumo/xemacs-packages-sumo-2003.11.13.ebuild
index 0ad822b9396d..bed0f62080fc 100644
--- a/app-xemacs/xemacs-packages-sumo/xemacs-packages-sumo-2003.11.13.ebuild
+++ b/app-xemacs/xemacs-packages-sumo/xemacs-packages-sumo-2003.11.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/app-xemacs/xemacs-packages-sumo/xemacs-packages-sumo-2003.11.13.ebuild,v 1.1 2004/08/29 04:50:08 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/xemacs-packages-sumo/xemacs-packages-sumo-2003.11.13.ebuild,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
 
 DESCRIPTION="The SUMO bundle of ELISP packages for Xemacs"
 HOMEPAGE="http://www.xemacs.org"
@@ -9,14 +9,14 @@ SRC_URI="http://ftp.xemacs.org/pub/packages/xemacs-sumo-${PV//./-}.tar.bz2
 	mule? ( http://ftp.xemacs.org/pub/packages/xemacs-mule-sumo-${PV//./-}.tar.bz2
 		http://ftp.xemacs.org/pub/Attic/packages/oldsumo/xemacs-mule-sumo-${PV//./-}.tar.bz2 )"
 
-DEPEND="app-arch/tar app-arch/bzip2"
+DEPEND="app-arch/tar app-arch/bzip2 virtual/xemacs"
 RDEPEND=""
 S="${WORKDIR}"
 
 IUSE="mule"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc alpha"
+KEYWORDS="alpha ~amd64 ~ppc ~sparc ~x86"
 
 src_compile() {
 	true
diff --git a/app-xemacs/xslide/ChangeLog b/app-xemacs/xslide/ChangeLog
index fe45543a181d..74a34d7a1b7c 100644
--- a/app-xemacs/xslide/ChangeLog
+++ b/app-xemacs/xslide/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for app-xemacs/xslide
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/xslide/ChangeLog,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/xslide/ChangeLog,v 1.1.1.1 2005/11/30 09:38:55 chriswhite Exp $
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> xslide-1.04.ebuild:
+  Stable on ppc.
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> xslide-1.04.ebuild:
+  Stable on alpha
+
+*xslide-1.04 (22 Feb 2003)
+
+  22 Feb 2003;  <rendhalver@gentoo.org> xslide-1.03.ebuild xslide-1.04.ebuild files/digest-xslide-1.04 :
+  Add ~alpha to KEYWORDS
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  new stable ebuild
+
+  22 Feb 2003; Rendhalver <rendhalver@gentoo.org> :
+  fix depend on ispell to point to xemacs-ispell
+  changed alpha to ~alpha
 
 *xslide-1.03 (16 Dec 2002)
 
diff --git a/app-xemacs/xslide/Manifest b/app-xemacs/xslide/Manifest
index e69de29bb2d1..4c2523e96b48 100644
--- a/app-xemacs/xslide/Manifest
+++ b/app-xemacs/xslide/Manifest
@@ -0,0 +1,5 @@
+MD5 ad86432507ad6747acf39a0c0ed67430 xslide-1.03.ebuild 432
+MD5 9701b13e220a2040001e2e0bd63f83f4 xslide-1.04.ebuild 432
+MD5 8b9db867489769f89ed3bfd609633c7d ChangeLog 860
+MD5 ff8622ba8ea88c9326601743f83d485d files/digest-xslide-1.04 65
+MD5 d99b95627cb3f5c235f2393f6b64b580 files/digest-xslide-1.03 65
diff --git a/app-xemacs/xslide/xslide-1.03.ebuild b/app-xemacs/xslide/xslide-1.03.ebuild
index a1d224847c2a..ac8488e9c895 100644
--- a/app-xemacs/xslide/xslide-1.03.ebuild
+++ b/app-xemacs/xslide/xslide-1.03.ebuild
@@ -1,16 +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/app-xemacs/xslide/xslide-1.03.ebuild,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/xslide/xslide-1.03.ebuild,v 1.1.1.1 2005/11/30 09:38:55 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
 DESCRIPTION="XSL editing support."
 PKG_CAT="standard"
 
-DEPEND="app-xemacs/ispell
+DEPEND="app-xemacs/xemacs-ispell
 app-xemacs/mail-lib
 app-xemacs/xemacs-base
 "
+KEYWORDS="x86 ~ppc ~alpha sparc"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/xslide/xslide-1.04.ebuild b/app-xemacs/xslide/xslide-1.04.ebuild
index c77bf5ad6bc5..7cf20923877e 100644
--- a/app-xemacs/xslide/xslide-1.04.ebuild
+++ b/app-xemacs/xslide/xslide-1.04.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/app-xemacs/xslide/xslide-1.04.ebuild,v 1.1 2003/02/22 12:46:41 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/xslide/xslide-1.04.ebuild,v 1.1.1.1 2005/11/30 09:38:55 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -11,7 +11,7 @@ DEPEND="app-xemacs/xemacs-ispell
 app-xemacs/mail-lib
 app-xemacs/xemacs-base
 "
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="alpha amd64 ppc sparc x86"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/xslt-process/ChangeLog b/app-xemacs/xslt-process/ChangeLog
index ec5bc773d788..d2a277f5a2f3 100644
--- a/app-xemacs/xslt-process/ChangeLog
+++ b/app-xemacs/xslt-process/ChangeLog
@@ -1,8 +1,18 @@
 # ChangeLog for app-xemacs/xslt-process
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/xslt-process/ChangeLog,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/xslt-process/ChangeLog,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
+
+  02 Oct 2004; Robert Coie <rac@gentoo.org> +metadata.xml,
+  xslt-process-1.11.ebuild:
+  eterm -> xemacs-eterm renaming
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> xslt-process-1.11.ebuild:
+  Stable on alpha
 
 *xslt-process-1.11 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> xslt-process-1.11.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/xslt-process/Manifest b/app-xemacs/xslt-process/Manifest
index e69de29bb2d1..fa09d9eb0f6e 100644
--- a/app-xemacs/xslt-process/Manifest
+++ b/app-xemacs/xslt-process/Manifest
@@ -0,0 +1,4 @@
+MD5 18ae0580ad57cece015c5f0d5e652ece ChangeLog 650
+MD5 5b68b5ad27bfe2d6adf3d7d456c06d8b xslt-process-1.11.ebuild 666
+MD5 0f39d0139849956930b1a500aca9c6de metadata.xml 365
+MD5 cae5004952f5fc7d2a07efaff3b05254 files/digest-xslt-process-1.11 72
diff --git a/app-xemacs/xslt-process/xslt-process-1.11.ebuild b/app-xemacs/xslt-process/xslt-process-1.11.ebuild
index 7e59b79e2595..278daeccfc78 100644
--- a/app-xemacs/xslt-process/xslt-process-1.11.ebuild
+++ b/app-xemacs/xslt-process/xslt-process-1.11.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/app-xemacs/xslt-process/xslt-process-1.11.ebuild,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/xslt-process/xslt-process-1.11.ebuild,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -13,7 +13,7 @@ app-xemacs/semantic
 app-xemacs/debug
 app-xemacs/speedbar
 app-xemacs/edit-utils
-app-xemacs/eterm
+app-xemacs/xemacs-eterm
 app-xemacs/mail-lib
 app-xemacs/xemacs-base
 app-xemacs/elib
@@ -22,6 +22,7 @@ app-xemacs/sh-script
 app-xemacs/fsf-compat
 app-xemacs/xemacs-devel
 "
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/zenirc/ChangeLog b/app-xemacs/zenirc/ChangeLog
index e11a4e07f177..1cb7515a4184 100644
--- a/app-xemacs/zenirc/ChangeLog
+++ b/app-xemacs/zenirc/ChangeLog
@@ -1,8 +1,17 @@
 # ChangeLog for app-xemacs/zenirc
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/zenirc/ChangeLog,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/zenirc/ChangeLog,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
+
+  31 Mar 2004; Travis Tilley <lv@gentoo.org> zenirc-1.13.ebuild:
+  added ~amd64 to KEYWORDS
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> zenirc-1.13.ebuild:
+  Stable on alpha
 
 *zenirc-1.13 (16 Dec 2002)
 
+  22 Feb 2003;  <rendhalver@gentoo.org> zenirc-1.13.ebuild :
+  Add ~alpha to KEYWORDS
+
   16 Dec 2002; Rendhalver [Peter Brown] <rendhalver@gentoo.org> :
   Initial import.
diff --git a/app-xemacs/zenirc/Manifest b/app-xemacs/zenirc/Manifest
index e69de29bb2d1..38fe99ad257a 100644
--- a/app-xemacs/zenirc/Manifest
+++ b/app-xemacs/zenirc/Manifest
@@ -0,0 +1,3 @@
+MD5 b6a4581561c90c0d9c8a851522732b98 ChangeLog 592
+MD5 34c15d7645e77487feeed5e1421c0424 zenirc-1.13.ebuild 368
+MD5 b64cbad315fd8f051c46e2ce6456bc16 files/digest-zenirc-1.13 66
diff --git a/app-xemacs/zenirc/zenirc-1.13.ebuild b/app-xemacs/zenirc/zenirc-1.13.ebuild
index 0c0651fa117c..6cd2b9dc2b8a 100644
--- a/app-xemacs/zenirc/zenirc-1.13.ebuild
+++ b/app-xemacs/zenirc/zenirc-1.13.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/app-xemacs/zenirc/zenirc-1.13.ebuild,v 1.1 2002/12/16 12:22:48 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/zenirc/zenirc-1.13.ebuild,v 1.1.1.1 2005/11/30 09:38:51 chriswhite Exp $
 
 SLOT="0"
 IUSE=""
@@ -8,6 +8,7 @@ DESCRIPTION="ZENIRC IRC Client."
 PKG_CAT="standard"
 
 DEPEND=""
+KEYWORDS="x86 ~ppc alpha sparc amd64"
 
 inherit xemacs-packages
 
diff --git a/games-roguelike/adom/ChangeLog b/games-roguelike/adom/ChangeLog
index 01ff4a42be4c..f49572f260b6 100644
--- a/games-roguelike/adom/ChangeLog
+++ b/games-roguelike/adom/ChangeLog
@@ -1,6 +1,21 @@
-# ChangeLog for app-games/adom
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/adom/ChangeLog,v 1.1 2003/09/10 04:59:58 vapier Exp $
+# ChangeLog for games-roguelike/adom
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/adom/ChangeLog,v 1.1.1.1 2005/11/30 09:38:47 chriswhite Exp $
+
+  26 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> adom-1.1.1-r1.ebuild:
+  Making games last on inherit line.
+
+  26 Sep 2005; <dang@gentoo.org> adom-1.1.1-r1.ebuild:
+  Marked stable on amd64
+
+  10 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> adom-1.1.1-r1.ebuild:
+  Adding amd64 keyword. Closing #44158.
+
+*adom-1.1.1-r1 (18 Sep 2003)
+
+  18 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump to move statedir to proper place (GAMES_DATADIR to 
+  GAMES_STATEDIR) #28699.
 
 *adom-1.1.1 (11 Jul 2003)
 
diff --git a/games-roguelike/adom/Manifest b/games-roguelike/adom/Manifest
index a8a6f206ae21..b8f062008a76 100644
--- a/games-roguelike/adom/Manifest
+++ b/games-roguelike/adom/Manifest
@@ -1,3 +1,4 @@
-MD5 34b564d4ab84239b6709486db40bba12 ChangeLog 370
-MD5 4ccf472dd16e31ac44de839cd815fb4e adom-1.1.1.ebuild 796
-MD5 d070375db255e71a004c837e89f7969c files/digest-adom-1.1.1 65
+MD5 b4170d6d958e45f45d4684adeeccb952 adom-1.1.1-r1.ebuild 877
+MD5 ea59828fa76ae572475a01fa86108f45 ChangeLog 857
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 d070375db255e71a004c837e89f7969c files/digest-adom-1.1.1-r1 65
diff --git a/games-roguelike/adom/adom-1.1.1-r1.ebuild b/games-roguelike/adom/adom-1.1.1-r1.ebuild
index de97cde90172..faf9e0168b1d 100644
--- a/games-roguelike/adom/adom-1.1.1-r1.ebuild
+++ b/games-roguelike/adom/adom-1.1.1-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-roguelike/adom/adom-1.1.1-r1.ebuild,v 1.1 2003/09/18 20:31:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/adom/adom-1.1.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:47 chriswhite Exp $
 
-inherit games eutils
+inherit eutils games
 
 DESCRIPTION="Ancient Domains Of Mystery rogue-like game"
 HOMEPAGE="http://www.adom.de/"
@@ -10,20 +10,21 @@ SRC_URI="http://www.adom.de/adom/download/linux/${P//.}-elf.tar.gz"
 
 LICENSE="adom"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="amd64 x86"
+IUSE=""
 
-DEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.0"
+DEPEND="virtual/libc
+	>=sys-libs/ncurses-5.0
+	amd64? ( app-emulation/emul-linux-x86-baselibs )"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
 src_install() {
-	exeinto ${GAMES_PREFIX_OPT}/bin
+	exeinto "${GAMES_PREFIX_OPT}/bin"
 	doexe adom
 
-	dodir ${GAMES_STATEDIR}/${PN}
-	keepdir ${GAMES_STATEDIR}/${PN}
-	echo ${GAMES_STATEDIR}/${PN} > adom_ds.cfg
+	keepdir "${GAMES_STATEDIR}/${PN}"
+	echo "${GAMES_STATEDIR}/${PN}" > adom_ds.cfg
 	insinto /etc
 	doins adom_ds.cfg
 
@@ -31,5 +32,5 @@ src_install() {
 	dodoc adomfaq.txt manual.doc readme.1st
 
 	prepgamesdirs
-	fperms g+w ${GAMES_STATEDIR}/${PN}
+	fperms g+w "${GAMES_STATEDIR}/${PN}"
 }
diff --git a/games-roguelike/adom/metadata.xml b/games-roguelike/adom/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-roguelike/adom/metadata.xml
+++ b/games-roguelike/adom/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-roguelike/angband/ChangeLog b/games-roguelike/angband/ChangeLog
index 86b6b7e62314..cc89cb81232f 100644
--- a/games-roguelike/angband/ChangeLog
+++ b/games-roguelike/angband/ChangeLog
@@ -1,11 +1,45 @@
-# ChangeLog for app-games/angband
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/angband/ChangeLog,v 1.1 2003/09/10 04:59:58 vapier Exp $
+# ChangeLog for games-roguelike/angband
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/angband/ChangeLog,v 1.1.1.1 2005/11/30 09:38:46 chriswhite Exp $
 
-  09 Jun 2003; <msterret@gentoo.org> angband-3.0.3.ebuild:
+  29 Oct 2005; Fabian Groffen <grobian@gentoo.org> angband-3.0.5.ebuild:
+  Marked ~ppc-macos (bug #106116)
+
+  27 Oct 2005; Luis Medinas <metalgod@gentoo.org> angband-3.0.5.ebuild:
+  Marked Stable on amd64.
+
+  12 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> angband-3.0.5.ebuild:
+  Stable on sparc
+
+  18 Oct 2004; Gustavo Zacarias <gustavoz@gentoo.org> angband-3.0.5.ebuild:
+  Keyworded ~sparc wrt #67950
+
+  23 Sep 2004; Michael Sterrett <mr_bones_@gentoo.org> angband-3.0.5.ebuild:
+  restore missing ~amd64 keyword
+
+*angband-3.0.5 (06 Jun 2004)
+
+  06 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> angband-3.0.5.ebuild:
+  version bump (bug #51896)
+
+  30 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> angband-3.0.3.ebuild:
+  don't RDEPEND on sed; error check sed; virtual/x11; tidy
+
+  10 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> angband-3.0.4.ebuild:
+  chown foo.bar -> chown foo:bar (bug #44294)
+
+  10 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> angband-3.0.3.ebuild:
+  Adding amd64 keyword. Closing #44152.
+
+*angband-3.0.4 (08 Mar 2004)
+
+  08 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> angband-3.0.4.ebuild:
+  version bump (bug #44102 includes detailed changelog)
+
+  09 Jun 2003; <mr_bones_@gentoo.org> angband-3.0.3.ebuild:
   don't mangle myconf when USE=-X; removed DOCDIR (unused)
 
-  09 Jun 2003; <msterret@gentoo.org> angband-3.0.3.ebuild:
+  09 Jun 2003; <mr_bones_@gentoo.org> angband-3.0.3.ebuild:
   DEPEND on sed >= 4; check sed return value
 
 *angband-3.0.3 (19 May 2003)
diff --git a/games-roguelike/angband/Manifest b/games-roguelike/angband/Manifest
index 07406b846c50..ed91cd973628 100644
--- a/games-roguelike/angband/Manifest
+++ b/games-roguelike/angband/Manifest
@@ -1,3 +1,4 @@
-MD5 166bf6a071476d096a14cc12f5c634f9 files/digest-angband-3.0.3 66
-MD5 34844b84a0c5a39960ef8380ba9583c4 angband-3.0.3.ebuild 1104
-MD5 59b8a6d7bac1cc0c334664e5634f3bac ChangeLog 822
+MD5 a6983508558ec383e6f709e8f2860b92 angband-3.0.5.ebuild 1331
+MD5 96b051f3ecd3fcbcd4bd9bc598c80e56 ChangeLog 2019
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 664ca676ca11ddb5e8c75f01ed3d89cf files/digest-angband-3.0.5 66
diff --git a/games-roguelike/angband/angband-3.0.5.ebuild b/games-roguelike/angband/angband-3.0.5.ebuild
index 07a3fdac8845..5157a2a27d2e 100644
--- a/games-roguelike/angband/angband-3.0.5.ebuild
+++ b/games-roguelike/angband/angband-3.0.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-roguelike/angband/angband-3.0.5.ebuild,v 1.1 2004/06/06 07:46:34 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/angband/angband-3.0.5.ebuild,v 1.1.1.1 2005/11/30 09:38:46 chriswhite Exp $
 
 inherit games
 
@@ -10,10 +10,10 @@ SRC_URI="ftp://clockwork.dementia.org/${PN}/Source/${P}.tar.gz"
 
 LICENSE="Moria"
 SLOT="0"
-KEYWORDS="x86 ppc"
+KEYWORDS="amd64 ppc ~ppc-macos sparc x86"
 IUSE="X gtk"
 
-RDEPEND="virtual/glibc
+RDEPEND="virtual/libc
 	>=sys-libs/ncurses-5
 	gtk? (
 		=x11-libs/gtk+-1.2*
@@ -26,7 +26,7 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	sed -i \
 		-e "s:/games/:/:" configure \
 		|| die "sed configure failed"
@@ -51,5 +51,6 @@ src_install() {
 }
 
 pkg_postinst() {
+	games_pkg_postinst
 	chmod -R g+w "${ROOT}${GAMES_DATADIR}"/angband/lib/{apex,save,user}
 }
diff --git a/games-roguelike/angband/metadata.xml b/games-roguelike/angband/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-roguelike/angband/metadata.xml
+++ b/games-roguelike/angband/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-roguelike/crossfire-client/ChangeLog b/games-roguelike/crossfire-client/ChangeLog
index 5d917fbda063..22fc757e1099 100644
--- a/games-roguelike/crossfire-client/ChangeLog
+++ b/games-roguelike/crossfire-client/ChangeLog
@@ -1,5 +1,44 @@
-# ChangeLog for app-games/crossfire-client
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# ChangeLog for games-roguelike/crossfire-client
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/ChangeLog,v 1.1.1.1 2005/11/30 09:38:47 chriswhite Exp $
+
+*crossfire-client-1.8.0 (19 Oct 2005)
+
+  19 Oct 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +crossfire-client-1.8.0.ebuild:
+  version bump with patch from fabien Zouaoui via bug #104625
+
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+*crossfire-client-1.7.1 (09 Mar 2005)
+
+  09 Mar 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +crossfire-client-1.7.1.ebuild:
+  version bump
+
+*crossfire-client-1.7.0 (30 May 2004)
+
+  30 May 2004; Mike Frysinger <vapier@gentoo.org>
+  -crossfire-client-1.5.0.ebuild, -crossfire-client-1.6.0.ebuild,
+  +crossfire-client-1.7.0.ebuild:
+  Version bumpage.
+
+  20 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  crossfire-client-1.6.1.ebuild:
+  add cvs version of configure which doesn't check for gnome since that isn't
+  supported anymore. Should address bug #44686; removed gnome USE support; use
+  emake
+
+*crossfire-client-1.6.1 (01 Feb 2004)
+
+  01 Feb 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bump.
+
+*crossfire-client-1.6.0 (25 Oct 2003)
+
+  25 Oct 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump.
 
 *crossfire-client-1.5.0 (27 Jun 2003)
 
@@ -24,8 +63,8 @@
   23 Sep 2002; Mike Frysinger <vapier@gentoo.org> :
   Updated SRC_URI to use mirror: and LICENSE to GPL-2
 
-  17 jul 2002; Jose Alberto Su�rez L�pez <bass@gentoo.org> crossfire-client-1.2.1.ebuild :
+  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> crossfire-client-1.2.1.ebuild :
   Added KEYWORDS, SLOT.
 
-  09 May 2002; J. Alberto Su�rez L. <bass@gentoo.org> crossfire-client-1.2.1.ebuild:
+  09 May 2002; J. Alberto Suárez L. <bass@gentoo.org> crossfire-client-1.2.1.ebuild:
   Added the Crossfire-client to portage.
diff --git a/games-roguelike/crossfire-client/Manifest b/games-roguelike/crossfire-client/Manifest
index 87280c7b0f36..ca408a9084b8 100644
--- a/games-roguelike/crossfire-client/Manifest
+++ b/games-roguelike/crossfire-client/Manifest
@@ -1,4 +1,12 @@
-MD5 d8e0b6aeda4e4938606822e33edf7322 files/digest-crossfire-client-1.5.0 74
+MD5 558223609e46a54824114b9499d9d972 crossfire-client-1.7.0.ebuild 1376
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 09b03922764a438e1bf74ff3cb1891e8 crossfire-client-1.8.0.ebuild 1457
+MD5 5590c66a04e4a8c41eebeaabc1cf706f crossfire-client-1.6.1.ebuild 1416
+MD5 bb0aef5bf31f84bc7872f4d66d6c65c4 crossfire-client-1.7.1.ebuild 1458
+MD5 598bad611e5aa7f019ff4efc172b672a ChangeLog 2315
 MD5 ad1e49c4a56222488166b9c4f4091a55 files/1.5.0-errno.patch 682
-MD5 a3add6a20959912624ecefb98814b94d crossfire-client-1.5.0.ebuild 1441
-MD5 c86775e8d8951d96331c9ff01f9191d6 ChangeLog 1069
+MD5 85c1a21c69c23d3fd2540dd54a0f0fc3 files/digest-crossfire-client-1.7.0 74
+MD5 5f6e9f388a8529fb8caec99c17126fe3 files/digest-crossfire-client-1.8.0 74
+MD5 ad1e49c4a56222488166b9c4f4091a55 files/1.6.0-errno.patch 682
+MD5 28ec33590a7f24478841e039ce87f81c files/digest-crossfire-client-1.6.1 153
+MD5 88be26521277f1cf1eec6dcdfb35bcf8 files/digest-crossfire-client-1.7.1 74
diff --git a/games-roguelike/crossfire-client/crossfire-client-1.6.1.ebuild b/games-roguelike/crossfire-client/crossfire-client-1.6.1.ebuild
index 2d03a0568d8c..b19cf1843cd0 100644
--- a/games-roguelike/crossfire-client/crossfire-client-1.6.1.ebuild
+++ b/games-roguelike/crossfire-client/crossfire-client-1.6.1.ebuild
@@ -1,26 +1,36 @@
-# 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-roguelike/crossfire-client/crossfire-client-1.6.1.ebuild,v 1.1 2004/02/01 18:46:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/crossfire-client-1.6.1.ebuild,v 1.1.1.1 2005/11/30 09:38:47 chriswhite Exp $
 
-inherit games eutils
+inherit eutils games
 
 DESCRIPTION="Client for the nethack-style but more in the line of UO"
 HOMEPAGE="http://crossfire.real-time.com/"
-SRC_URI="mirror://sourceforge/crossfire/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/crossfire/${P}.tar.gz
+	mirror://gentoo/${P}.configure.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc"
-IUSE="sdl gnome gtk alsa"
+IUSE="sdl gtk alsa"
 
 DEPEND="virtual/x11
 	sdl? ( media-libs/libsdl
 		media-libs/sdl-image )
-	gnome? ( gnome-base/gnome-libs
-		media-libs/gdk-pixbuf )
-	gtk? ( =x11-libs/gtk+-1* )
+	gtk? ( =x11-libs/gtk+-1.2*
+		dev-libs/glib
+	)
 	alsa? ( media-libs/alsa-lib )
-	media-libs/libpng"
+	media-libs/libpng
+	sys-libs/zlib"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${S}
+	unpack ${P}.configure.gz
+	mv ${P}.configure configure
+	chmod a+x configure
+}
 
 src_compile() {
 	# bugs in configure script so we cant use `use_enable`
@@ -28,16 +38,15 @@ src_compile() {
 	use gtk || myconf="${myconf} --disable-gtk"
 	use sdl || myconf="${myconf} --disable-sdl"
 	use alsa || myconf="${myconf} --disable-alsa"
-	has_version '>=media-libs/alsa-lib-0.9' && myconf="${myconf} --disable-alsa --disable-sound"
-#	use gnome || myconf="${myconf} --disable-gnome"
+	has_version '>=media-libs/alsa-lib-0.9' \
+		&& myconf="${myconf} --disable-alsa --disable-sound"
 	egamesconf ${myconf} || die
-	make || die
+	emake || die "emake failed"
 }
 
 src_install() {
-	egamesinstall mandir=${T} || die
+	egamesinstall mandir="${T}" || die
 	use gtk && newman gtk/gcfclient.man gcfclient.6
-	use gnome && newman gnome/gnome-cfclient.man gnome-cfclient.6
 	newman x11/cfclient.man cfclient.6
 	dodoc CHANGES NOTES README TODO
 	prepgamesdirs
diff --git a/games-roguelike/crossfire-client/crossfire-client-1.7.0.ebuild b/games-roguelike/crossfire-client/crossfire-client-1.7.0.ebuild
index 7a0b03033a6d..6d6d697bcb32 100644
--- a/games-roguelike/crossfire-client/crossfire-client-1.7.0.ebuild
+++ b/games-roguelike/crossfire-client/crossfire-client-1.7.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-roguelike/crossfire-client/crossfire-client-1.7.0.ebuild,v 1.1 2004/05/30 08:18:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/crossfire-client-1.7.0.ebuild,v 1.1.1.1 2005/11/30 09:38:46 chriswhite Exp $
 
 inherit eutils games
 
diff --git a/games-roguelike/crossfire-client/crossfire-client-1.7.1.ebuild b/games-roguelike/crossfire-client/crossfire-client-1.7.1.ebuild
index 4ae66165b4ac..6c9b7e99c36b 100644
--- a/games-roguelike/crossfire-client/crossfire-client-1.7.1.ebuild
+++ b/games-roguelike/crossfire-client/crossfire-client-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/games-roguelike/crossfire-client/crossfire-client-1.7.1.ebuild,v 1.1 2005/03/09 07:18:13 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/crossfire-client-1.7.1.ebuild,v 1.1.1.1 2005/11/30 09:38:47 chriswhite Exp $
 
 inherit games
 
diff --git a/games-roguelike/crossfire-client/crossfire-client-1.8.0.ebuild b/games-roguelike/crossfire-client/crossfire-client-1.8.0.ebuild
index 13db788c0a59..7e8796a0555a 100644
--- a/games-roguelike/crossfire-client/crossfire-client-1.8.0.ebuild
+++ b/games-roguelike/crossfire-client/crossfire-client-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/games-roguelike/crossfire-client/crossfire-client-1.8.0.ebuild,v 1.1 2005/10/19 03:31:09 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/crossfire-client-1.8.0.ebuild,v 1.1.1.1 2005/11/30 09:38:47 chriswhite Exp $
 
 inherit games
 
diff --git a/games-roguelike/crossfire-client/files/digest-crossfire-client-1.6.1 b/games-roguelike/crossfire-client/files/digest-crossfire-client-1.6.1
index 6e4c68cc48f8..77a766079ea5 100644
--- a/games-roguelike/crossfire-client/files/digest-crossfire-client-1.6.1
+++ b/games-roguelike/crossfire-client/files/digest-crossfire-client-1.6.1
@@ -1 +1,2 @@
 MD5 609a44e079803bc48c966b1766a02863 crossfire-client-1.6.1.tar.gz 512603
+MD5 eace4167725f0aeed77190e0efcd5ee0 crossfire-client-1.6.1.configure.gz 53151
diff --git a/games-roguelike/crossfire-client/files/digest-crossfire-client-1.7.0 b/games-roguelike/crossfire-client/files/digest-crossfire-client-1.7.0
index a838314b86f0..5970b2328ea6 100644
--- a/games-roguelike/crossfire-client/files/digest-crossfire-client-1.7.0
+++ b/games-roguelike/crossfire-client/files/digest-crossfire-client-1.7.0
@@ -1,2 +1 @@
 MD5 ef405f78d54be0bf22feeef6b4fc0d73 crossfire-client-1.7.0.tar.gz 458940
-MD5 eace4167725f0aeed77190e0efcd5ee0 crossfire-client-1.6.1.configure.gz 53151
diff --git a/games-roguelike/crossfire-client/metadata.xml b/games-roguelike/crossfire-client/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-roguelike/crossfire-client/metadata.xml
+++ b/games-roguelike/crossfire-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-roguelike/falconseye/ChangeLog b/games-roguelike/falconseye/ChangeLog
index d5a99b07896d..eac4d7ce612d 100644
--- a/games-roguelike/falconseye/ChangeLog
+++ b/games-roguelike/falconseye/ChangeLog
@@ -1,17 +1,24 @@
-# ChangeLog for app-games/falconseye
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/falconseye/ChangeLog,v 1.1 2003/09/10 04:59:58 vapier Exp $
+# ChangeLog for games-roguelike/falconseye
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/falconseye/ChangeLog,v 1.1.1.1 2005/11/30 09:38:48 chriswhite Exp $
 
-  02 Aug 2003; Chris Gianelloni <wolf31o2@gentoo.org>
-  falconseye-1.9.3-r1.ebuild:
-  Fixed to use mirror://sourceforge
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  10 May 2004; Travis Tilley <lv@gentoo.org> falconseye-1.9.4a.ebuild:
+  added ~amd64 keyword
+
+*falconseye-1.9.4a (01 Dec 2003)
+
+  01 Dec 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #25621 + games.eclass support.
 
 *falconseye-1.9.3-r1 (11 Jul 2002)
 
-  17 jul 2002; Jose Alberto Su�rez L�pez <bass@gentoo.org> falconseye-1.9.3.ebuild :
+  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> falconseye-1.9.3.ebuild :
   Added LICENSE, KEYWORDS, SLOT.
 
-  17 jul 2002; Jose Alberto Su�rez L�pez <bass@gentoo.org> falconseye-1.9.3-r1.ebuild :
+  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> falconseye-1.9.3-r1.ebuild :
   Added KEYWORDS.
 
   11 Jul 2002; Dan <overridex@punkass.com> falconseye-1.9.3.ebuild-r1:
diff --git a/games-roguelike/falconseye/Manifest b/games-roguelike/falconseye/Manifest
index d62f8e7cf48a..c9063443cd0f 100644
--- a/games-roguelike/falconseye/Manifest
+++ b/games-roguelike/falconseye/Manifest
@@ -1,6 +1,11 @@
-MD5 71a370c3a98164282208f5a5ed3a4bbf ChangeLog 1555
-MD5 77137d26c8d8a2da117ac1f1a5b10293 falconseye-1.9.3-r1.ebuild 1752
+MD5 05a1be09ffcc18806256b67cc0aca7c7 falconseye-1.9.4a.ebuild 1812
+MD5 55280923eff06a02b0cc552c903f7b0d ChangeLog 1773
+MD5 cc72bedba368bca3ed7426cfca2ec07d falconseye-1.9.3-r1.ebuild 1756
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 cfd966f02e69f15b7ffe5446f962b3e9 files/1.9.4a-gentoo-paths.patch 576
 MD5 e67fd1b356a80628b1952bf2486f3d6f files/1.9.3-gzip.diff 941
-MD5 3d5c71f44784a2dec8c8b2b59cc68621 files/1.9.3-midiplayer.diff 608
-MD5 67cd326fbf752c010ddbf51784fd0d5a files/1.9.3-musicsavefix.diff 2287
+MD5 583e29ec8ffb7f937a9dd3af127ae26a files/digest-falconseye-1.9.4a 74
 MD5 318f6a0cede519e438e67777018e7477 files/digest-falconseye-1.9.3-r1 76
+MD5 67cd326fbf752c010ddbf51784fd0d5a files/1.9.3-musicsavefix.diff 2287
+MD5 3d5c71f44784a2dec8c8b2b59cc68621 files/1.9.3-midiplayer.diff 608
+MD5 832609d61cc8e7461b7e3263451a32c6 files/1.9.4a-default-options.patch 1116
diff --git a/games-roguelike/falconseye/falconseye-1.9.3-r1.ebuild b/games-roguelike/falconseye/falconseye-1.9.3-r1.ebuild
index 1d3000019820..a57cc8938831 100644
--- a/games-roguelike/falconseye/falconseye-1.9.3-r1.ebuild
+++ b/games-roguelike/falconseye/falconseye-1.9.3-r1.ebuild
@@ -1,12 +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/games-roguelike/falconseye/falconseye-1.9.3-r1.ebuild,v 1.1 2003/09/10 04:59:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/falconseye/falconseye-1.9.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:48 chriswhite Exp $
 
 DESCRIPTION="A graphical version of nethack"
 SRC_URI="mirror://sourceforge/falconseye/nethack_source_331_jtp_193.zip"
 HOMEPAGE="http://falconseye.sourceforge.net/"
 
 KEYWORDS="x86 ppc"
+IUSE=""
 LICENSE="nethack"
 SLOT="0"
 
@@ -14,7 +15,7 @@ DEPEND="media-libs/libsdl
 	dev-util/yacc
 	app-arch/unzip"
 RDEPEND="media-libs/libsdl
-	sys-apps/gzip
+	app-arch/gzip
 	media-sound/timidity++"
 
 src_unpack() {
diff --git a/games-roguelike/falconseye/falconseye-1.9.4a.ebuild b/games-roguelike/falconseye/falconseye-1.9.4a.ebuild
index a299d684942e..48873b40ca36 100644
--- a/games-roguelike/falconseye/falconseye-1.9.4a.ebuild
+++ b/games-roguelike/falconseye/falconseye-1.9.4a.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-roguelike/falconseye/falconseye-1.9.4a.ebuild,v 1.1 2003/12/02 01:20:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/falconseye/falconseye-1.9.4a.ebuild,v 1.1.1.1 2005/11/30 09:38:48 chriswhite Exp $
 
-inherit games
+inherit eutils games
 
 DESCRIPTION="A graphical version of nethack (unofficially developed version 1.94)"
 HOMEPAGE="http://falconseye.sourceforge.net/"
 SRC_URI="http://cage.ugent.be/~jdemeyer/nethack/nethack-341-jtp-194a.tar.bz2"
 
+KEYWORDS="x86 ppc ~amd64"
 LICENSE="nethack"
 SLOT="0"
-KEYWORDS="x86 ppc"
+IUSE=""
 
 DEPEND="media-libs/libsdl
 	dev-util/yacc
 	dev-util/byacc"
 RDEPEND="media-libs/libsdl
 	media-sound/timidity++
-	media-sound/mpg123"
+	virtual/mpg123"
 
 S=${WORKDIR}/nethack-341-jtp-194a
 
@@ -42,7 +43,7 @@ src_compile() {
 	cd doc
 	emake || die "doc failed"
 }
- 
+
 src_install() {
 	emake \
 		GAMEPERM=0755 \
@@ -60,4 +61,5 @@ src_install() {
 	doman doc/falconseye.6
 	dodoc ChangeLog README falcon.txt
 	prepgamesdirs
+	chmod -R g+w ${D}/${GAMES_STATEDIR}
 }
diff --git a/games-roguelike/falconseye/metadata.xml b/games-roguelike/falconseye/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-roguelike/falconseye/metadata.xml
+++ b/games-roguelike/falconseye/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-roguelike/fargoal/ChangeLog b/games-roguelike/fargoal/ChangeLog
index 76cf1b7c2361..34e9ffd8d347 100644
--- a/games-roguelike/fargoal/ChangeLog
+++ b/games-roguelike/fargoal/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for games-roguelike/fargoal
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/fargoal/ChangeLog,v 1.1 2004/01/24 09:36:11 mr_bones_ Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/fargoal/ChangeLog,v 1.1.1.1 2005/11/30 09:38:49 chriswhite Exp $
+
+  27 Jun 2005; Simon Stelling <blubb@gentoo.org> fargoal-20040629.ebuild:
+  added ~amd64 keyword
+
+*fargoal-20040629 (06 Mar 2005)
+
+  06 Mar 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  -fargoal-20030731b.ebuild, +fargoal-20040629.ebuild:
+  version bump; clean old version
+
+  17 Dec 2004; Joseph Jezak <josejx@gentoo.org> fargoal-20030731b.ebuild:
+  Marked ppc stable.
+
+  15 Mar 2004; David Holm <dholm@gentoo.org> fargoal-20030731b.ebuild:
+  Added to ~ppc.
 
 *fargoal-20030731b (24 Jan 2004)
 
diff --git a/games-roguelike/fargoal/Manifest b/games-roguelike/fargoal/Manifest
index a3a95ae66cd0..c0592ccbe062 100644
--- a/games-roguelike/fargoal/Manifest
+++ b/games-roguelike/fargoal/Manifest
@@ -1,2 +1,5 @@
-MD5 4542552f39bc3df9acfb2b88f70f751b fargoal-20030731b.ebuild 1051
-MD5 336cedc9e4543c149a20bbf8a0446ea7 files/digest-fargoal-20030731b 65
+MD5 7d0fbe7db450faa22fbaaf9245041406 ChangeLog 931
+MD5 f31c93ab8aa7478bca622286bb47f3a6 fargoal-20040629.ebuild 1430
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 de121fedce828206c2ceca8bdbc52405 files/digest-fargoal-20040629 64
+MD5 bbb65152078901fe1ae1775f6956da7b files/gentoo-home-write.patch 5709
diff --git a/games-roguelike/fargoal/fargoal-20040629.ebuild b/games-roguelike/fargoal/fargoal-20040629.ebuild
index 503a3d083e1e..57a4dffe7395 100644
--- a/games-roguelike/fargoal/fargoal-20040629.ebuild
+++ b/games-roguelike/fargoal/fargoal-20040629.ebuild
@@ -1,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-roguelike/fargoal/fargoal-20040629.ebuild,v 1.1 2005/03/06 05:49:07 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/fargoal/fargoal-20040629.ebuild,v 1.1.1.1 2005/11/30 09:38:49 chriswhite Exp $
 
 inherit eutils games
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/squidfighter/${PN}${PV}.zip"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="ppc x86"
+KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
 RDEPEND="media-libs/allegro"
diff --git a/games-roguelike/fargoal/metadata.xml b/games-roguelike/fargoal/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-roguelike/fargoal/metadata.xml
+++ b/games-roguelike/fargoal/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-roguelike/hengband/ChangeLog b/games-roguelike/hengband/ChangeLog
index 06f7479468b1..4057f345d0c9 100644
--- a/games-roguelike/hengband/ChangeLog
+++ b/games-roguelike/hengband/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for games-roguelike/hengband
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/hengband/ChangeLog,v 1.1 2003/12/27 07:43:49 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/hengband/ChangeLog,v 1.1.1.1 2005/11/30 09:38:49 chriswhite Exp $
+
+*hengband-1.6.2 (10 Jul 2005)
+
+  10 Jul 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +hengband-1.6.2.ebuild:
+  version bump (bug #65667)
+
+  03 Jun 2004; Aron Griffis <agriffis@gentoo.org> hengband-1.5.4.ebuild,
+  hengband-1.6.0.ebuild:
+  Fix use invocation
+
+*hengband-1.6.0 (03 Feb 2004)
+
+  03 Feb 2004; Michael Sterrett <mr_bones_@gentoo.org> hengband-1.6.0.ebuild:
+  version bump (bug 37713)
 
 *hengband-1.5.4 (27 Dec 2003)
 
diff --git a/games-roguelike/hengband/Manifest b/games-roguelike/hengband/Manifest
index 6c16f1dab22e..c43d482d8d01 100644
--- a/games-roguelike/hengband/Manifest
+++ b/games-roguelike/hengband/Manifest
@@ -1,3 +1,4 @@
-MD5 bb9d132e77a3a543f730c17629232cfe files/digest-hengband-1.5.4 67
-MD5 19498aec5b751d9505fa9792ab1f055c ChangeLog 395
-MD5 9c884ff462ae1d9a2d30728cbeae449e hengband-1.5.4.ebuild 1182
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 b1949f3e3e110f0ce5b26c32a9bf0c6d hengband-1.6.2.ebuild 1249
+MD5 3c4de142b0a79ce51f05dc9dd5884cbc ChangeLog 787
+MD5 f1eff52cf4e3543b2f4d27866a0163ba files/digest-hengband-1.6.2 68
diff --git a/games-roguelike/hengband/hengband-1.6.2.ebuild b/games-roguelike/hengband/hengband-1.6.2.ebuild
index 48ebc2462038..6ef57e4d3840 100644
--- a/games-roguelike/hengband/hengband-1.6.2.ebuild
+++ b/games-roguelike/hengband/hengband-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/games-roguelike/hengband/hengband-1.6.2.ebuild,v 1.1 2005/07/10 01:14:57 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/hengband/hengband-1.6.2.ebuild,v 1.1.1.1 2005/11/30 09:38:49 chriswhite Exp $
 
 inherit games
 
diff --git a/games-roguelike/hengband/metadata.xml b/games-roguelike/hengband/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-roguelike/hengband/metadata.xml
+++ b/games-roguelike/hengband/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-roguelike/ivan/ChangeLog b/games-roguelike/ivan/ChangeLog
index 0e0f55d6d38f..7b7ab36a08eb 100644
--- a/games-roguelike/ivan/ChangeLog
+++ b/games-roguelike/ivan/ChangeLog
@@ -1,6 +1,14 @@
-# ChangeLog for app-games/ivan
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/ivan/ChangeLog,v 1.1 2003/09/10 04:59:58 vapier Exp $
+# ChangeLog for games-roguelike/ivan
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/ivan/ChangeLog,v 1.1.1.1 2005/11/30 09:38:47 chriswhite Exp $
+
+*ivan-0.50 (10 Dec 2004)
+
+  10 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org> +ivan-0.50.ebuild:
+  version bump; clean older version (not gcc-3.4 happy - bug #69416)
+
+  15 Mar 2004; David Holm <dholm@gentoo.org> ivan-0.430.ebuild:
+  Added to ~ppc.
 
 *ivan-0.430 (08 Aug 2003)
 
diff --git a/games-roguelike/ivan/Manifest b/games-roguelike/ivan/Manifest
index d10250395641..7fc786d117e3 100644
--- a/games-roguelike/ivan/Manifest
+++ b/games-roguelike/ivan/Manifest
@@ -1,3 +1,4 @@
-MD5 2f0a2efa1d42bab7d1adcfec6897340b ivan-0.430.ebuild 565
-MD5 339bb490734f5f7b4f6b28b24c3c9789 ChangeLog 386
-MD5 05b47bb8b097fd0d5ef969fcea193944 files/digest-ivan-0.430 62
+MD5 100fd63b7a5530bc1490bc3f08c16ae2 ChangeLog 642
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 2c58801773517db6a2f9b6441651f935 ivan-0.50.ebuild 610
+MD5 e37cfae1e95d0608a8ccad181cb5a31c files/digest-ivan-0.50 61
diff --git a/games-roguelike/ivan/ivan-0.50.ebuild b/games-roguelike/ivan/ivan-0.50.ebuild
index 65cd0a8cbab5..fab80fd3fe7a 100644
--- a/games-roguelike/ivan/ivan-0.50.ebuild
+++ b/games-roguelike/ivan/ivan-0.50.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-roguelike/ivan/ivan-0.50.ebuild,v 1.1 2004/12/11 06:51:14 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/ivan/ivan-0.50.ebuild,v 1.1.1.1 2005/11/30 09:38:47 chriswhite Exp $
 
 inherit games
 
diff --git a/games-roguelike/ivan/metadata.xml b/games-roguelike/ivan/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-roguelike/ivan/metadata.xml
+++ b/games-roguelike/ivan/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-roguelike/metadata.xml b/games-roguelike/metadata.xml
index 36d6a0917267..9c4691cf91a1 100644
--- a/games-roguelike/metadata.xml
+++ b/games-roguelike/metadata.xml
@@ -5,5 +5,26 @@
 		The games-roguelike category contains games which resemble Rogue's
 		style.
 	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie games-roguelike enthält Spiele die sich am Stil von
+		Rogue orientieren (z.B. NetHack).
+	</longdescription>
+	<longdescription lang="es">
+		La categoría games-roguelike contiene juegos que recrean el estilo del
+		Rogue.
+	</longdescription>
+	<longdescription lang="ja">
+		games-roguelike カテゴリーにはRogueスタイルに似たゲームが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De games-roguelike categorie bevat spellen die gebaseerd zijn op de
+		stijl van Rogue, zoals bijvoorbeeld NetHack.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm games-roguelike chứa các trò chơi dạng Rogue.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria games-roguelike contiene giochi che ricreano lo stile di Rogue.
+	</longdescription>
 </catmetadata>
 
diff --git a/games-roguelike/moria/ChangeLog b/games-roguelike/moria/ChangeLog
index fbcea4b6049d..16fd6db09fbd 100644
--- a/games-roguelike/moria/ChangeLog
+++ b/games-roguelike/moria/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for games-roguelike/moria
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/moria/ChangeLog,v 1.1 2003/12/31 20:28:17 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/moria/ChangeLog,v 1.1.1.1 2005/11/30 09:38:47 chriswhite Exp $
+
+  23 Aug 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  files/5.5.2-gentoo-paths.patch:
+  fix permissions on score file (bug #103491)
+
+  17 May 2005; Michael Sterrett <mr_bones_@gentoo.org> moria-5.5.2.ebuild:
+  use toolchain-funs; tidy
+
+  30 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> moria-5.5.2.ebuild:
+  don't rdepend on sed; error check sed; use games src_compile
+
+  15 Mar 2004; David Holm <dholm@gentoo.org> moria-5.5.2.ebuild:
+  Added to ~ppc.
+
+  20 Jan 2004; Jon Portnoy <avenj@gentoo.org> moria-5.5.2.ebuild :
+  AMD64 keywords.
 
 *moria-5.5.2 (31 Dec 2003)
 
diff --git a/games-roguelike/moria/Manifest b/games-roguelike/moria/Manifest
index 17e5dd1d237d..0b8745dd2430 100644
--- a/games-roguelike/moria/Manifest
+++ b/games-roguelike/moria/Manifest
@@ -1,6 +1,6 @@
-MD5 91df8337b6fb8f876424c655811ecb05 ChangeLog 378
-MD5 06abdffcc73d1ea019324c38f2ca26ba moria-5.5.2.ebuild 1839
-MD5 a30c9d4ce8f9629d6d7323eaab258343 metadata.xml 241
-MD5 b39d7c4a2dd55ea387aad81b73b91d6d files/5.5.2-gentoo-paths.patch 2363
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 8e7fbeefbfc6e57e666111c0d73f2989 ChangeLog 919
+MD5 ad141da86968e9982fa39b65c311a826 moria-5.5.2.ebuild 1859
+MD5 b8a66bfdc4086f442e0f03dfd98715aa files/5.5.2-gentoo-paths.patch 2363
 MD5 7474a4c2af916defe5d530cd97b8cfce files/5.5.2-glibc.patch 9137
 MD5 ce7e2d9e9dbd488130b49ae8fa9ab9b2 files/digest-moria-5.5.2 122
diff --git a/games-roguelike/moria/files/5.5.2-gentoo-paths.patch b/games-roguelike/moria/files/5.5.2-gentoo-paths.patch
index 8c555adb63e6..5ce4ce4d2b4d 100644
--- a/games-roguelike/moria/files/5.5.2-gentoo-paths.patch
+++ b/games-roguelike/moria/files/5.5.2-gentoo-paths.patch
@@ -14,7 +14,7 @@
  	(cd files; cp $(LIBFILES) $(LIBDIR))
 -	(cd $(LIBDIR); chmod 444 $(LIBFILES))
 -	(cd $(LIBDIR); touch scores; chmod 644 scores)
-+	(cd $(STATEDIR); touch moriascores; chmod 644 moriascores; chown $(OWNER) moriascores; chgrp $(GROUP) moriascores)
++	(cd $(STATEDIR); touch moriascores; chmod 664 moriascores; chown $(OWNER) moriascores; chgrp $(GROUP) moriascores)
  	chown $(OWNER) $(BINDIR)/moria
  	chgrp $(GROUP) $(BINDIR)/moria
 -	(cd $(LIBDIR); chown $(OWNER) $(LIBFILES) scores)
diff --git a/games-roguelike/moria/metadata.xml b/games-roguelike/moria/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-roguelike/moria/metadata.xml
+++ b/games-roguelike/moria/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-roguelike/moria/moria-5.5.2.ebuild b/games-roguelike/moria/moria-5.5.2.ebuild
index f5ec24c46abe..a255df397e9c 100644
--- a/games-roguelike/moria/moria-5.5.2.ebuild
+++ b/games-roguelike/moria/moria-5.5.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-roguelike/moria/moria-5.5.2.ebuild,v 1.1 2003/12/31 20:28:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/moria/moria-5.5.2.ebuild,v 1.1.1.1 2005/11/30 09:38:47 chriswhite Exp $
 
-inherit games eutils gcc
+inherit eutils toolchain-funcs games
 
 DESCRIPTION="Rogue-like D&D curses game similar to nethack (BUT BETTER)"
 HOMEPAGE="http://remarque.org/~grabiner/moria.html"
@@ -14,20 +14,22 @@ SRC_URI="ftp://ftp.greyhelm.com/pub/Games/Moria/source/um${PV}.tar.Z
 
 LICENSE="Moria"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
 
-DEPEND="virtual/glibc
-	>=sys-apps/sed-4
-	>=sys-libs/ncurses-5"
+DEPEND=">=sys-libs/ncurses-5"
 
 S=${WORKDIR}/umoria
 
 src_unpack() {
+	local f
+
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
-	epatch ${FILESDIR}/${PV}-gentoo-paths.patch
-	epatch ${FILESDIR}/${PV}-glibc.patch
+	epatch \
+		"${FILESDIR}"/${PV}-gentoo-paths.patch \
+		"${FILESDIR}"/${PV}-glibc.patch
 
 	for f in source/* unix/* ; do
 		ln -s ${f} $(basename ${f})
@@ -37,7 +39,8 @@ src_unpack() {
 		-e "s:David Grabiner:root:" \
 		-e "s:GENTOO_DATADIR:${GAMES_DATADIR}/${PN}:" \
 		-e "s:GENTOO_STATEDIR:${GAMES_STATEDIR}:" \
-		config.h
+		config.h \
+		|| die "sed failed"
 	sed -i \
 		-e "/^STATEDIR =/s:=.*:=\$(DESTDIR)${GAMES_STATEDIR}:" \
 		-e "/^BINDIR = /s:=.*:=\$(DESTDIR)${GAMES_BINDIR}:" \
@@ -45,22 +48,18 @@ src_unpack() {
 		-e "/^CFLAGS = /s:=.*:=${CFLAGS}:" \
 		-e "/^OWNER = /s:=.*:=${GAMES_USER}:" \
 		-e "/^GROUP = /s:=.*:=${GAMES_GROUP}:" \
-		-e "/^CC = /s:=.*:=$(gcc-getCC):" \
-		Makefile
-}
-
-src_compile() {
-	emake || die "make failed"
+		-e "/^CC = /s:=.*:=$(tc-getCC):" \
+		Makefile \
+		|| die "sed failed"
+	mv doc/moria.6 "${S}" || die "mv failed"
 }
 
 src_install() {
-	dodir ${GAMES_BINDIR} ${GAMES_DATADIR}/${PN} ${GAMES_STATEDIR}
-	make install DESTDIR=${D} || die
+	dodir "${GAMES_BINDIR}" "${GAMES_DATADIR}/${PN}" "${GAMES_STATEDIR}"
+	make DESTDIR="${D}" install || die "make install failed"
 
-	doman doc/moria.6
-	rm doc/moria.6
-	dodoc README doc/* ${WORKDIR}/${PN}-extras/*
+	doman moria.6
+	dodoc README doc/* "${WORKDIR}"/${PN}-extras/*
 
 	prepgamesdirs
-	fperms g+w ${GAMES_STATEDIR}/moriascores
 }
diff --git a/games-roguelike/nethack/ChangeLog b/games-roguelike/nethack/ChangeLog
index 565536e47b14..38478f5972e7 100644
--- a/games-roguelike/nethack/ChangeLog
+++ b/games-roguelike/nethack/ChangeLog
@@ -1,6 +1,63 @@
-# ChangeLog for app-games/nethack
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/ChangeLog,v 1.1 2003/09/10 04:59:58 vapier Exp $
+# ChangeLog for games-roguelike/nethack
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/ChangeLog,v 1.1.1.1 2005/11/30 09:38:48 chriswhite Exp $
+
+  16 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  nethack-3.4.3-r1.ebuild:
+  Added desktop entry using make_desktop_entry and closing bug #100788.
+
+  28 Jul 2005; Caleb Tennis <caleb@gentoo.org> nethack-3.4.3-r1.ebuild:
+  made qt dep qt3 explicit per bug #100235
+
+  17 May 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  nethack-3.4.3-r1.ebuild:
+  Cleanup for bug #92745.
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  24 Sep 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  nethack-3.4.3-r1.ebuild:
+  Bring the help functionality back when using the external pager (bug #57410)
+  sed patch from Benoit Boissinot
+
+  10 Sep 2004; Michael Sterrett <mr_bones_@gentoo.org> -nethack-3.4.2.ebuild,
+  nethack-3.4.3-r1.ebuild, -nethack-3.4.3.ebuild:
+  clean older ebuilds; fix deps
+
+  31 Aug 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/3.4.3-bison.patch, nethack-3.4.3-r1.ebuild:
+  Added bison patch and closing bug #61140.
+
+*nethack-3.4.3-r1 (10 Jul 2004)
+
+  10 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  +nethack-3.4.3-r1.ebuild:
+  Work around buggy makefiles so we get to use emake
+  Set DEF_PAGER from $PAGER (bug #52122)
+  Use ${GAMES_STATEDIR} saving code in games.eclass instead of hacking it
+  in the ebuild.
+  Error check ; tidy
+
+  30 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> nethack-3.4.2.ebuild,
+  nethack-3.4.3.ebuild:
+  virtual/x11; use flag cleanup; error check sed
+
+  20 Jan 2004; Jon Portnoy <avenj@gentoo.org> :
+  AMD64 keywords.
+
+*nethack-3.4.3 (01 Jan 2003)
+
+  01 Jan 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #35558.
+
+*nethack-3.4.2 (15 Sep 2003)
+
+  17 Sep 2003; Chuck Short <zul@gentoo.org> nethack-3.4.2.ebuild:
+  Marked stable for sparc, closes bug #28449.
+
+  15 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #27875 + saved games fix #28104 + new qt ver #23149.
 
 *nethack-3.4.1-r1 (07 Aug 2003)
 
@@ -43,17 +100,17 @@
 
 *nethack-3.4.0-r3 (23 Apr 2002)
 
-  17 jul 2002; Jose Alberto Su�rez L�pez <bass@gentoo.org> nethack-3.4.0-r3.ebuild :
+  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> nethack-3.4.0-r3.ebuild :
   Added LICENSE, KEYWORDS, SLOT.
 
-  17 jul 2002; Jose Alberto Su�rez L�pez <bass@gentoo.org> nethack-3.4.0.ebuild :
+  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> nethack-3.4.0.ebuild :
   Added LICENSE, KEYWORDS, SLOT.
   23 Apr 2002; Spider <spider@gentoo.org> nethack-3.4.0-r3.ebuild:
   Fix qt dependency
 
 *nethack-3.4.0-r2 (17 Apr 2002)
 
-  17 jul 2002; Jose Alberto Su�rez L�pez <bass@gentoo.org> nethack-3.4.0-r2.ebuild :
+  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> nethack-3.4.0-r2.ebuild :
   Added LICENSE, KEYWORDS, SLOT.
   17 Apr 2002; Spider <spider@gentoo.org> nethack-3.4.0-r2.ebuild:
   Here is the bulk message from Jason Ritchie <jasonr@myrealbox.com>
@@ -77,7 +134,7 @@
 
 *nethack-3.4.0-r1 (13 Apr 2002)
 
-  17 jul 2002; Jose Alberto Su�rez L�pez <bass@gentoo.org> nethack-3.4.0-r1.ebuild :
+  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> nethack-3.4.0-r1.ebuild :
   Added LICENSE, KEYWORDS, SLOT.
   13 Apr 2002; Spider <spider@gentoo.org> nethack-3.4.0-r1.ebuild :
   Adding comment on how to get colour support thanks to Ryan Phillips
diff --git a/games-roguelike/nethack/Manifest b/games-roguelike/nethack/Manifest
index 029f97337b92..095c75007c60 100644
--- a/games-roguelike/nethack/Manifest
+++ b/games-roguelike/nethack/Manifest
@@ -1,14 +1,12 @@
-MD5 d5738a7be6385eed01de95c5a303203d files/3.4.1-GNOME-RTLD_NEXT.patch 617
-MD5 7dfa79bba03a240cb7bba2e84d8178ef files/3.4.1-GNOME-support.patch 1316
-MD5 004669e4ce554b5f7f92daaea2e2cebb files/3.4.1-QT-GNOME-support.patch 1507
+MD5 ebea7dabcf075ac6c15b37b0d71c71f4 ChangeLog 5088
+MD5 7dfa79bba03a240cb7bba2e84d8178ef files/3.4.3-GNOME-support.patch 1316
+MD5 004669e4ce554b5f7f92daaea2e2cebb files/3.4.3-QT-GNOME-support.patch 1507
+MD5 d573c7b87f4add06cf21d3770b3c2f8f files/3.4.3-QT-support.patch 792
+MD5 68200eaa7e6d116868700aab23e7e1d5 files/3.4.3-X-support.patch 920
+MD5 92e6ae792ae140b534fa7e8edb248842 files/3.4.3-bison.patch 603
+MD5 b4d0d816b1b1f1977abb48258913cf4e files/3.4.3-default-options.patch 1262
+MD5 a33605f7cde87f4aafa5c42998a9feb2 files/3.4.3-gentoo-paths.patch 576
+MD5 ed68fbd43d4e591eee4930aa4578a012 files/digest-nethack-3.4.3-r1 65
 MD5 f128c014d1efb8861cec5dae19eedb5b files/dot.nethackrc 2717
-MD5 c1f64a8da334f8dbc9817bbd95b8f879 files/3.4.1-QT-support.patch 825
-MD5 2517703c5a6cb5d151d525e4f58128b2 files/digest-nethack-3.4.1 61
-MD5 68200eaa7e6d116868700aab23e7e1d5 files/3.4.1-X-support.patch 920
-MD5 1d7c9716b1a212c5278326fa2e84efdc files/3.4.1-default-options.patch 1266
-MD5 c9f63ebc75e7872f691922a78f1c0b0b files/3.4.1-errno.patch 1901
-MD5 a33605f7cde87f4aafa5c42998a9feb2 files/3.4.1-gentoo-paths.patch 576
-MD5 2517703c5a6cb5d151d525e4f58128b2 files/digest-nethack-3.4.1-r1 61
-MD5 d9c02506e9976559405489e402b91f2c nethack-3.4.1.ebuild 3816
-MD5 60e08a834fe8b77eabbc9d93e27cc080 ChangeLog 3172
-MD5 74d2a7b022c71ee64a8d7ae23c70e316 nethack-3.4.1-r1.ebuild 4149
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 b7903fca432411fff92815a46874c27f nethack-3.4.3-r1.ebuild 5007
diff --git a/games-roguelike/nethack/metadata.xml b/games-roguelike/nethack/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-roguelike/nethack/metadata.xml
+++ b/games-roguelike/nethack/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-roguelike/nethack/nethack-3.4.3-r1.ebuild b/games-roguelike/nethack/nethack-3.4.3-r1.ebuild
index d9348e586dca..84e63d0fb694 100644
--- a/games-roguelike/nethack/nethack-3.4.3-r1.ebuild
+++ b/games-roguelike/nethack/nethack-3.4.3-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/games-roguelike/nethack/nethack-3.4.3-r1.ebuild,v 1.1 2004/07/10 09:39:36 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/nethack-3.4.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:48 chriswhite Exp $
 
-inherit eutils gcc flag-o-matic games
+inherit eutils toolchain-funcs flag-o-matic games
 
 MY_PV=${PV//.}
 DESCRIPTION="The ultimate old-school single player dungeon exploration game"
@@ -16,10 +16,9 @@ KEYWORDS="x86 ppc sparc amd64"
 IUSE="X qt gnome"
 
 DEPEND="virtual/libc
-	dev-util/yacc
 	>=sys-libs/ncurses-5.2-r5
 	X? ( virtual/x11 )
-	qt? ( x11-libs/qt )
+	qt? ( =x11-libs/qt-3* )
 	gnome? ( >=gnome-base/gnome-libs-1.4.1.4-r2 )"
 
 HACKDIR="${GAMES_DATADIR}/${PN}"
@@ -27,7 +26,7 @@ HACKDIR="${GAMES_DATADIR}/${PN}"
 src_unpack() {
 	unpack ${A}
 
-	# This copies the /sys/unix Makefile.*s to their correct places for 
+	# This copies the /sys/unix Makefile.*s to their correct places for
 	# seding and compiling.
 	cd "${S}/sys/unix"
 	source setup.sh || die
@@ -35,6 +34,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}/${PV}-gentoo-paths.patch"
 	epatch "${FILESDIR}/${PV}-default-options.patch"
+	epatch "${FILESDIR}/${PV}-bison.patch"
 
 	sed -i \
 		-e "s:GENTOO_STATEDIR:${GAMES_STATEDIR}/${PN}:" include/unixconf.h \
@@ -48,6 +48,10 @@ src_unpack() {
 			-e "115c\#define DEF_PAGER \"${PAGER}\"" \
 			include/unixconf.h \
 			|| die "setting statedir"
+		# bug #57410
+		sed -i \
+			-e "s/^DATNODLB =/DATNODLB = \$(DATHELP)/" Makefile \
+			|| die "sed Makefile failed"
 	fi
 
 	if use X ; then
@@ -69,17 +73,17 @@ src_compile() {
 		|| qtver=2
 	cd ${S}/src
 	append-flags -I../include
-	
+
 	emake \
 		QTDIR=/usr/qt/${qtver} \
-		CC="$(gcc-getCC)" \
+		CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS}" \
 		LFLAGS="-L/usr/X11R6/lib" \
 		../util/makedefs \
 		|| die "initial makedefs build failed"
 	emake \
 		QTDIR=/usr/qt/${qtver} \
-		CC="$(gcc-getCC)" \
+		CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS}" \
 		LFLAGS="-L/usr/X11R6/lib" \
 		|| die "main build failed"
@@ -89,7 +93,7 @@ src_compile() {
 
 src_install() {
 	make \
-		CC="$(gcc-getCC)" \
+		CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS}" \
 		LFLAGS="-L/usr/X11R6/lib" \
 		GAMEPERM=0755 \
@@ -155,6 +159,7 @@ src_install() {
 	local statedir="${GAMES_STATEDIR}/${PN}"
 	keepdir "${statedir}/save"
 	mv "${D}/${HACKDIR}/"{record,logfile,perm} "${D}/${statedir}/"
+	make_desktop_entry nethack "Nethack"
 
 	prepgamesdirs
 	chmod -R 660 "${D}/${statedir}"
@@ -167,5 +172,5 @@ pkg_postinst() {
 		ewarn "the qt frontend may be a little unstable with this version of qt"
 		ewarn "please see Bug 32629 for more information"
 	fi
-	einfo "you may want to look at /etc/skel/.nethackrc for interesting options"
+	einfo "You may want to look at /etc/skel/.nethackrc for interesting options"
 }
diff --git a/games-roguelike/noegnud-data/ChangeLog b/games-roguelike/noegnud-data/ChangeLog
index a76cb1a00d19..708668ff120f 100644
--- a/games-roguelike/noegnud-data/ChangeLog
+++ b/games-roguelike/noegnud-data/ChangeLog
@@ -1,6 +1,21 @@
-# ChangeLog for app-games/noegnud-data
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/noegnud-data/ChangeLog,v 1.1 2003/09/10 04:59:58 vapier Exp $
+# ChangeLog for games-roguelike/noegnud-data
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/noegnud-data/ChangeLog,v 1.1.1.1 2005/11/30 09:38:49 chriswhite Exp $
+
+  26 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  noegnud-data-0.7.1.ebuild, noegnud-data-0.8.0.ebuild:
+  Making games last on inherit line.
+
+  17 Dec 2004; Joseph Jezak <josejx@gentoo.org> noegnud-data-0.8.0.ebuild:
+  Marked ppc stable.
+
+  15 Mar 2004; David Holm <dholm@gentoo.org> noegnud-data-0.8.0.ebuild:
+  Added to ~ppc.
+
+*noegnud-data-0.8.0 (18 Sep 2003)
+
+  18 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #26551.
 
 *noegnud-data-0.7.1 (13 Jul 2003)
 
diff --git a/games-roguelike/noegnud-data/Manifest b/games-roguelike/noegnud-data/Manifest
index aef458d8e2b6..5bc63da9acdd 100644
--- a/games-roguelike/noegnud-data/Manifest
+++ b/games-roguelike/noegnud-data/Manifest
@@ -1,3 +1,6 @@
+MD5 af1be240dda33964fcabe7b754f8fa7c noegnud-data-0.7.1.ebuild 881
+MD5 95e8372e3ff705afb77eb4575b55bf31 noegnud-data-0.8.0.ebuild 934
+MD5 6cf2b8839437dc16e0b18fcd87083b43 ChangeLog 855
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 MD5 d09e58c096b1a20bb3ecc32a825c1daf files/digest-noegnud-data-0.7.1 147
-MD5 50c0b29779af97ada0ec19fd7c861abd ChangeLog 404
-MD5 7830f9f519122de71d30bb2a1a8cd8ac noegnud-data-0.7.1.ebuild 875
+MD5 51b8582db63daf1d9a9aa0845f08b1ef files/digest-noegnud-data-0.8.0 176
diff --git a/games-roguelike/noegnud-data/metadata.xml b/games-roguelike/noegnud-data/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-roguelike/noegnud-data/metadata.xml
+++ b/games-roguelike/noegnud-data/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-roguelike/noegnud-data/noegnud-data-0.7.1.ebuild b/games-roguelike/noegnud-data/noegnud-data-0.7.1.ebuild
index 15e3c4cd2e9e..acb2fa80cab4 100644
--- a/games-roguelike/noegnud-data/noegnud-data-0.7.1.ebuild
+++ b/games-roguelike/noegnud-data/noegnud-data-0.7.1.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-roguelike/noegnud-data/noegnud-data-0.7.1.ebuild,v 1.1 2003/09/10 04:59:58 vapier Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/noegnud-data/noegnud-data-0.7.1.ebuild,v 1.1.1.1 2005/11/30 09:38:49 chriswhite Exp $
 
-inherit games eutils
+inherit eutils games
 
 BASE_PV=0.7.0
 DESCRIPTION="ultimate User Interface for nethack"
@@ -13,6 +13,7 @@ SRC_URI="mirror://sourceforge/noegnud/noegnud-${BASE_PV}-src.tar.gz
 LICENSE="nethack"
 SLOT="0"
 KEYWORDS="x86"
+IUSE=""
 
 S=${WORKDIR}/noegnud-${BASE_PV}/noegnud_data
 
diff --git a/games-roguelike/noegnud-data/noegnud-data-0.8.0.ebuild b/games-roguelike/noegnud-data/noegnud-data-0.8.0.ebuild
index a3d5e78a026e..df2dfd511d19 100644
--- a/games-roguelike/noegnud-data/noegnud-data-0.8.0.ebuild
+++ b/games-roguelike/noegnud-data/noegnud-data-0.8.0.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-roguelike/noegnud-data/noegnud-data-0.8.0.ebuild,v 1.1 2003/09/19 02:40:47 vapier Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/noegnud-data/noegnud-data-0.8.0.ebuild,v 1.1.1.1 2005/11/30 09:38:49 chriswhite Exp $
 
-inherit games eutils
+inherit eutils games
 
 # for more info on these themes visit:
 # http://noegnud.sourceforge.net/downloads.shtml
@@ -18,7 +18,8 @@ SRC_URI="mirror://sourceforge/noegnud/noegnud-${PV}_data-tileset-${GUI_THEME}.ta
 
 LICENSE="nethack"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~amd64 ppc x86"
+IUSE=""
 
 S=${WORKDIR}/noegnud-${PV}/data
 
diff --git a/games-roguelike/noegnud-nethack/ChangeLog b/games-roguelike/noegnud-nethack/ChangeLog
index d9699e838037..ca0f1f4452b2 100644
--- a/games-roguelike/noegnud-nethack/ChangeLog
+++ b/games-roguelike/noegnud-nethack/ChangeLog
@@ -1,6 +1,28 @@
-# ChangeLog for app-games/noegnud-nethack
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/noegnud-nethack/ChangeLog,v 1.1 2003/09/10 04:59:58 vapier Exp $
+# ChangeLog for games-roguelike/noegnud-nethack
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/noegnud-nethack/ChangeLog,v 1.1.1.1 2005/11/30 09:38:47 chriswhite Exp $
+
+  17 Dec 2004; Joseph Jezak <josejx@gentoo.org>
+  noegnud-nethack-0.8.2.ebuild:
+  Marked ppc stable.
+
+*noegnud-nethack-0.8.3 (19 Nov 2004)
+
+  19 Nov 2004; Michael Kohl <citizen428@gentoo.org>
+  +noegnud-nethack-0.8.3.ebuild:
+  Version bump, closing bug #61602.
+
+  05 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  noegnud-nethack-0.8.2.ebuild:
+  update HOMEPAGE; tidy
+
+  15 Mar 2004; David Holm <dholm@gentoo.org> noegnud-nethack-0.8.2.ebuild:
+  Added to ~ppc.
+
+*noegnud-nethack-0.8.2 (18 Sep 2003)
+
+  18 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #26551.
 
 *noegnud-nethack-0.7.1 (13 Jul 2003)
 
diff --git a/games-roguelike/noegnud-nethack/Manifest b/games-roguelike/noegnud-nethack/Manifest
index f309fa64e678..60e5b474cc18 100644
--- a/games-roguelike/noegnud-nethack/Manifest
+++ b/games-roguelike/noegnud-nethack/Manifest
@@ -1,3 +1,8 @@
+MD5 7dfa127f49c273ef34c0f6907bac8e85 ChangeLog 997
+MD5 55bf06b303ba9a7d8e0af6c6eea684fb noegnud-nethack-0.8.2.ebuild 1962
+MD5 feb477e8d2ba5fa1adff0044415d39f7 noegnud-nethack-0.8.3.ebuild 1967
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 22e18492f9fe0b7799fe9356b5fb6c15 noegnud-nethack-0.7.1.ebuild 1507
+MD5 34a83b9229d1783a3d5bdd88406dc020 files/digest-noegnud-nethack-0.8.2 146
+MD5 508811d35758f8f298bc8e632ba67142 files/digest-noegnud-nethack-0.8.3 150
 MD5 5980dfc62f455dbda695dfdfd084b4d9 files/digest-noegnud-nethack-0.7.1 130
-MD5 27f768a6f9cea7b87660884d94baafd9 noegnud-nethack-0.7.1.ebuild 1495
-MD5 752a907932e8cb5f939b1e187e5fe7c7 ChangeLog 413
diff --git a/games-roguelike/noegnud-nethack/metadata.xml b/games-roguelike/noegnud-nethack/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-roguelike/noegnud-nethack/metadata.xml
+++ b/games-roguelike/noegnud-nethack/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-roguelike/noegnud-nethack/noegnud-nethack-0.7.1.ebuild b/games-roguelike/noegnud-nethack/noegnud-nethack-0.7.1.ebuild
index 014842347ba7..9dade16fd76e 100644
--- a/games-roguelike/noegnud-nethack/noegnud-nethack-0.7.1.ebuild
+++ b/games-roguelike/noegnud-nethack/noegnud-nethack-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/games-roguelike/noegnud-nethack/noegnud-nethack-0.7.1.ebuild,v 1.1 2003/09/10 04:59:58 vapier Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/noegnud-nethack/noegnud-nethack-0.7.1.ebuild,v 1.1.1.1 2005/11/30 09:38:47 chriswhite Exp $
 
 inherit games
 
@@ -14,13 +14,14 @@ SRC_URI="mirror://sourceforge/noegnud/noegnud-${PV}-src.tar.gz
 LICENSE="nethack"
 SLOT="0"
 KEYWORDS="x86"
+IUSE=""
 
 DEPEND="media-libs/libsdl
 	dev-util/yacc"
 RDEPEND="media-libs/libsdl
 	media-libs/sdl-image
 	virtual/opengl
-	app-games/noegnud-data"
+	games-roguelike/noegnud-data"
 
 S=${WORKDIR}/noegnud-${PV}/variants
 
diff --git a/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.2.ebuild b/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.2.ebuild
index 1cab09b49bfa..828be3cd4238 100644
--- a/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.2.ebuild
+++ b/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.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/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.2.ebuild,v 1.1 2003/09/19 02:42:35 vapier Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.2.ebuild,v 1.1.1.1 2005/11/30 09:38:47 chriswhite Exp $
 
 inherit games
 
@@ -10,48 +10,51 @@ VAR_DVER=3.4.2
 VAR_VER=${VAR_DVER//.}
 VAR_TAR=${VAR_NAME}-${VAR_VER}.tgz
 DESCRIPTION="an alternate 2D/3D graphical user interface for NetHack"
-HOMEPAGE="http://noegnud.sourceforge.net/"
+HOMEPAGE="http://www.linuxgames.co.za/noeGNUd/"
 SRC_URI="mirror://sourceforge/noegnud/noegnud-${PV}_linux_src-minimal.tar.bz2
 	mirror://sourceforge/${VAR_NAME}/${VAR_TAR}"
 
 LICENSE="nethack"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ppc ~amd64"
+IUSE=""
 
 DEPEND="media-libs/libsdl
 	dev-util/yacc"
 RDEPEND="media-libs/libsdl
 	media-libs/sdl-image
+	media-libs/sdl-mixer
 	virtual/opengl
 	games-roguelike/noegnud-data"
 
-S=${WORKDIR}/noegnud-${PV}/variants
+S="${WORKDIR}/noegnud-${PV}/variants"
 
 src_unpack() {
 	unpack noegnud-${PV}_linux_src-minimal.tar.bz2
-	ln -s ${DISTDIR}/${VAR_TAR} noegnud-${PV}/variants/tarballs/${VAR_TAR}
+	ln -s "${DISTDIR}/${VAR_TAR}" noegnud-${PV}/variants/tarballs/${VAR_TAR}
 }
 
 src_compile() {
-	make ${VAR_SNAME}${VAR_VER} PREFIX=${GAMES_PREFIX} || die
+	make ${VAR_SNAME}${VAR_VER} PREFIX="${GAMES_PREFIX}" || die "make failed"
 }
 
 src_install() {
-	make install_${VAR_SNAME}${VAR_VER} PREFIX=${D}/${GAMES_PREFIX} || die
+	make install_${VAR_SNAME}${VAR_VER} PREFIX="${D}/${GAMES_PREFIX}" \
+		|| die "make install failed"
 
-	cd ${D}/${GAMES_BINDIR}
+	cd "${D}/${GAMES_BINDIR}"
 	# we do this cause sometimes the installed package thinks it's a diff version :)
 	local tver="`ls noegnud-*-${VAR_NAME}-${VAR_DVER} | cut -d- -f2`"
 	rm noegnud-${VAR_NAME}-${VAR_DVER}
 	mv noegnud-${tver}-${VAR_NAME}-${VAR_DVER} noegnud-${VAR_NAME}
-	dosed "/^HACKDIR/s:=.*:=${GAMES_LIBDIR}/noegnud-${tver}/${VAR_NAME}-${VAR_DVER}:" ${GAMES_BINDIR}/noegnud-${VAR_NAME}
+	dosed "/^HACKDIR/s:=.*:=${GAMES_LIBDIR}/noegnud-${tver}/${VAR_NAME}-${VAR_DVER}:" "${GAMES_BINDIR}/noegnud-${VAR_NAME}"
 
-	dodir ${GAMES_DATADIR}/noegnud_data
-	cp -r ${S}/../data/* ${D}/${GAMES_DATADIR}/noegnud_data/
-	dosym ${GAMES_DATADIR}/noegnud_data ${GAMES_LIBDIR}/noegnud-${tver}/data
+	dodir "${GAMES_DATADIR}/noegnud_data"
+	cp -r "${S}/../data/"* "${D}/${GAMES_DATADIR}/noegnud_data/"
+	dosym "${GAMES_DATADIR}/noegnud_data" "${GAMES_LIBDIR}/noegnud-${tver}/data"
 
-	keepdir ${GAMES_LIBDIR}/noegnud-${tver}/${VAR_NAME}-${VAR_DVER}/save
+	keepdir "${GAMES_LIBDIR}/noegnud-${tver}/${VAR_NAME}-${VAR_DVER}/save"
 
 	prepgamesdirs
-	chmod -R g+w ${D}/${GAMES_LIBDIR}/noegnud-${tver}/${VAR_NAME}-${VAR_DVER}
+	chmod -R g+w "${D}/${GAMES_LIBDIR}/noegnud-${tver}/${VAR_NAME}-${VAR_DVER}"
 }
diff --git a/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.3.ebuild b/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.3.ebuild
index e4f5abbd92ac..602cfa9cb51f 100644
--- a/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.3.ebuild
+++ b/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.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/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.3.ebuild,v 1.1 2004/11/19 19:08:01 citizen428 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.3.ebuild,v 1.1.1.1 2005/11/30 09:38:47 chriswhite Exp $
 
 inherit games
 
diff --git a/games-roguelike/noegnud-slashem/ChangeLog b/games-roguelike/noegnud-slashem/ChangeLog
index 932d052af8ee..cb9b33168a52 100644
--- a/games-roguelike/noegnud-slashem/ChangeLog
+++ b/games-roguelike/noegnud-slashem/ChangeLog
@@ -1,6 +1,18 @@
-# ChangeLog for app-games/noegnud-slashem
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/noegnud-slashem/ChangeLog,v 1.1 2003/09/10 04:59:58 vapier Exp $
+# ChangeLog for games-roguelike/noegnud-slashem
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/noegnud-slashem/ChangeLog,v 1.1.1.1 2005/11/30 09:38:49 chriswhite Exp $
+
+  17 Dec 2004; Joseph Jezak <josejx@gentoo.org>
+  noegnud-slashem-0.8.2.ebuild:
+  Marked ppc stable.
+
+  15 Mar 2004; David Holm <dholm@gentoo.org> noegnud-slashem-0.8.2.ebuild:
+  Added to ~ppc.
+
+*noegnud-slashem-0.8.2 (18 Sep 2003)
+
+  18 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #26551.
 
 *noegnud-slashem-0.7.1 (13 Jul 2003)
 
diff --git a/games-roguelike/noegnud-slashem/Manifest b/games-roguelike/noegnud-slashem/Manifest
index 902f6dae6a25..e2f5efa46981 100644
--- a/games-roguelike/noegnud-slashem/Manifest
+++ b/games-roguelike/noegnud-slashem/Manifest
@@ -1,3 +1,4 @@
-MD5 4fb9dd33aeeb33fdf46a253c9491397b files/digest-noegnud-slashem-0.7.1 131
-MD5 ea88a846634f8bf77ae205c85ea65990 noegnud-slashem-0.7.1.ebuild 1478
-MD5 c11abf543fbd3054896d8ef31174e967 ChangeLog 413
+MD5 ae484e964f49688759dc778dd0e44ba6 ChangeLog 725
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 7c7c70f69d5a484d11e3831befcb713b noegnud-slashem-0.8.2.ebuild 2053
+MD5 165fd870bf76ebf5d0b48bc4ef844100 files/digest-noegnud-slashem-0.8.2 231
diff --git a/games-roguelike/noegnud-slashem/metadata.xml b/games-roguelike/noegnud-slashem/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-roguelike/noegnud-slashem/metadata.xml
+++ b/games-roguelike/noegnud-slashem/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-roguelike/noegnud-slashem/noegnud-slashem-0.8.2.ebuild b/games-roguelike/noegnud-slashem/noegnud-slashem-0.8.2.ebuild
index 288ec662ce03..ea3a29c13d3e 100644
--- a/games-roguelike/noegnud-slashem/noegnud-slashem-0.8.2.ebuild
+++ b/games-roguelike/noegnud-slashem/noegnud-slashem-0.8.2.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/games-roguelike/noegnud-slashem/noegnud-slashem-0.8.2.ebuild,v 1.1 2003/09/19 02:43:08 vapier Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/noegnud-slashem/noegnud-slashem-0.8.2.ebuild,v 1.1.1.1 2005/11/30 09:38:49 chriswhite Exp $
 
-inherit games
+inherit eutils games
 
 VAR_NAME=slashem
 VAR_SNAME=se
@@ -17,12 +17,14 @@ SRC_URI="mirror://sourceforge/noegnud/noegnud-${PV}_linux_src-minimal.tar.bz2
 
 LICENSE="nethack"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ppc"
+IUSE=""
 
 DEPEND="media-libs/libsdl
 	dev-util/yacc"
 RDEPEND="media-libs/libsdl
 	media-libs/sdl-image
+	media-libs/sdl-mixer
 	virtual/opengl
 	games-roguelike/noegnud-data"
 
diff --git a/games-roguelike/scourge/ChangeLog b/games-roguelike/scourge/ChangeLog
index e3b3f4a27da8..b45993b741f1 100644
--- a/games-roguelike/scourge/ChangeLog
+++ b/games-roguelike/scourge/ChangeLog
@@ -1,6 +1,54 @@
 # ChangeLog for games-roguelike/scourge
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/scourge/ChangeLog,v 1.1 2004/01/26 11:12:49 mr_bones_ Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/scourge/ChangeLog,v 1.1.1.1 2005/11/30 09:38:47 chriswhite Exp $
+
+*scourge-0.11 (05 Oct 2005)
+
+  05 Oct 2005; Michael Sterrett <mr_bones_@gentoo.org> +scourge-0.11.ebuild:
+  version bump
+
+*scourge-0.10.1 (31 Jul 2005)
+
+  31 Jul 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/0.10.1-datadir.patch, +scourge-0.10.1.ebuild:
+  version bump; fix bug #100192
+
+  23 Jun 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/0.10-64bit.patch, scourge-0.10.ebuild:
+  Add patch from David Leverton to fix build on amd64 (bug #96814)
+
+*scourge-0.10 (22 Jun 2005)
+
+  22 Jun 2005; Michael Sterrett <mr_bones_@gentoo.org> +scourge-0.10.ebuild:
+  version bump - bug #95893 with patch from Anton Romanov
+
+  22 Jun 2005; Michael Sterrett <mr_bones_@gentoo.org> -scourge-0.1.ebuild,
+  -scourge-0.6.ebuild, -scourge-0.7.ebuild:
+  clean old versions
+
+*scourge-0.8 (28 Jan 2005)
+
+  28 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org> +scourge-0.8.ebuild:
+  Version bumped to 0.8 and closing bug #76891.
+
+*scourge-0.7 (20 Nov 2004)
+
+  20 Nov 2004; Michael Sterrett <mr_bones_@gentoo.org> +scourge-0.7.ebuild:
+  version bump
+
+  20 Nov 2004; Michael Sterrett <mr_bones_@gentoo.org> scourge-0.6.ebuild:
+  update deps (bug #68666)
+
+*scourge-0.6 (15 Oct 2004)
+
+  15 Oct 2004; Michael Sterrett <mr_bones_@gentoo.org> +scourge-0.6.ebuild:
+  version bump (bug #66806) - ebuild submitted by Jamis Buck
+
+  18 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> scourge-0.1.ebuild:
+  don't RDEPEND on sed
+
+  15 Mar 2004; David Holm <dholm@gentoo.org> scourge-0.1.ebuild:
+  Added to ~ppc.
 
 *scourge-0.1 (26 Jan 2004)
 
diff --git a/games-roguelike/scourge/Manifest b/games-roguelike/scourge/Manifest
index 7fce83017292..dc683d8bd424 100644
--- a/games-roguelike/scourge/Manifest
+++ b/games-roguelike/scourge/Manifest
@@ -1,2 +1,7 @@
-MD5 e3d0a7bec3c423b560f6ee517e00046b scourge-0.1.ebuild 788
-MD5 2feb34e8daadb3f37513752485694576 files/digest-scourge-0.1 64
+MD5 6f1f46e650cd166271dea04cec452ba5 scourge-0.10.1.ebuild 1136
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 280123cffef11c58e6e4027bf699454c scourge-0.11.ebuild 1002
+MD5 722a7ed13ae97ea9f0f12d0f347715f9 ChangeLog 1853
+MD5 245638b62aa670cfa3179f6d7f5a25b8 files/0.10.1-datadir.patch 379
+MD5 5202e5cd3b7ba1aa5ac7d13b0303e42e files/digest-scourge-0.11 66
+MD5 0fa66f24e38be0ab929d63e8d85ebc9e files/digest-scourge-0.10.1 68
diff --git a/games-roguelike/scourge/metadata.xml b/games-roguelike/scourge/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-roguelike/scourge/metadata.xml
+++ b/games-roguelike/scourge/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-roguelike/scourge/scourge-0.10.1.ebuild b/games-roguelike/scourge/scourge-0.10.1.ebuild
index 8301f036b5c0..50681427cd34 100644
--- a/games-roguelike/scourge/scourge-0.10.1.ebuild
+++ b/games-roguelike/scourge/scourge-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/games-roguelike/scourge/scourge-0.10.1.ebuild,v 1.1 2005/07/31 05:32:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/scourge/scourge-0.10.1.ebuild,v 1.1.1.1 2005/11/30 09:38:47 chriswhite Exp $
 
 inherit flag-o-matic eutils games
 
diff --git a/games-roguelike/scourge/scourge-0.11.ebuild b/games-roguelike/scourge/scourge-0.11.ebuild
index ef565b32aea1..c9971f68feae 100644
--- a/games-roguelike/scourge/scourge-0.11.ebuild
+++ b/games-roguelike/scourge/scourge-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/games-roguelike/scourge/scourge-0.11.ebuild,v 1.1 2005/10/05 20:52:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/scourge/scourge-0.11.ebuild,v 1.1.1.1 2005/11/30 09:38:47 chriswhite Exp $
 
 inherit eutils games
 
diff --git a/games-roguelike/slashem/ChangeLog b/games-roguelike/slashem/ChangeLog
index 897825a513e2..58939c3065d0 100644
--- a/games-roguelike/slashem/ChangeLog
+++ b/games-roguelike/slashem/ChangeLog
@@ -1,6 +1,40 @@
-# ChangeLog for app-games/slashem
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/slashem/ChangeLog,v 1.1 2003/09/10 04:59:58 vapier Exp $
+# ChangeLog for games-roguelike/slashem
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/slashem/ChangeLog,v 1.1.1.1 2005/11/30 09:38:49 chriswhite Exp $
+
+  09 Jul 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/0.0.7E6/Gentoo.configure, slashem-0.0.760.ebuild:
+  Add fix by Pekka Rousu since the path to gzip binary is diff from default
+  #98318.
+
+  27 Jan 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/0.0.7E6/va_copy.patch, slashem-0.0.760.ebuild:
+  Added patch for gcc-3.4 from OKUMURA N. Shin-ya (bug #76509)
+
+*slashem-0.0.760 (26 Dec 2004)
+
+  26 Dec 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/0.0.7E6/GTK.configure, +files/0.0.7E6/Proxy.configure,
+  +files/0.0.7E6/X11.configure, +files/0.0.7E6/dot.slashemrc,
+  +files/0.0.7E6/gentoo-paths.patch, +files/0.0.7E6/gnome.configure,
+  +files/0.0.7E6/makefile.patch, +files/0.0.7E6/opengl.configure,
+  +files/0.0.7E6/prepare-gui.configure, +files/0.0.7E6/proxy.slashemrc,
+  +files/0.0.7E6/qt.configure, +files/0.0.7E6/sdl.configure,
+  +slashem-0.0.760.ebuild:
+  Version bump #43500 by Pekka Rousu.
+
+  17 Dec 2004; Joseph Jezak <josejx@gentoo.org> slashem-0.0.648.ebuild:
+  Marked ppc stable.
+
+  30 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> slashem-0.0.648.ebuild:
+  virtual/x11; error check sed; tidy DEPEND; tidy use; append-flags into
+  src_unpack
+
+  15 Mar 2004; David Holm <dholm@gentoo.org> slashem-0.0.648.ebuild:
+  Added to ~ppc.
+
+  20 Jan 2004; Jon Portnoy <avenj@gentoo.org> slashem-0.0.648.ebuild :
+  AMD64 keywords.
 
 *slashem-0.0.648 (14 Aug 2003)
 
diff --git a/games-roguelike/slashem/Manifest b/games-roguelike/slashem/Manifest
index 3f559b3c5c0d..4d5a96e94024 100644
--- a/games-roguelike/slashem/Manifest
+++ b/games-roguelike/slashem/Manifest
@@ -1,11 +1,36 @@
-MD5 7042d07dab18e8ce6bf5f99c2497db44 files/0.0.6E4F8-errno.patch 4788
-MD5 c0702cf01cb9b34fb41418616181e7e8 files/0.0.6E4F8-gentoo-paths.patch 818
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 b20ea020e376e49bf054d718db45fe34 slashem-0.0.760.ebuild 4579
+MD5 4c1c791d8d418a25805cd92917235e54 ChangeLog 1818
 MD5 a7d2ae8f086e4eaf658e35e261ac9766 files/0.0.6E4F8-makefile.patch 6981
+MD5 7042d07dab18e8ce6bf5f99c2497db44 files/0.0.6E4F8-errno.patch 4788
 MD5 18340044152321018649d5b65c31278b files/X11.configure 630
-MD5 9393ce3bf57372ec847503f8c806a072 files/digest-slashem-0.0.648 120
+MD5 c0702cf01cb9b34fb41418616181e7e8 files/0.0.6E4F8-gentoo-paths.patch 818
 MD5 7e5fae501e9a74fb3bc3eb1569308cdc files/dot.slashemrc 3491
+MD5 07f0de2a5c98da1af7a9e3ca3ce377fd files/qt.configure 182
 MD5 582f28b3c2d30a80415ff9c92ca6e77b files/gnome.configure 275
 MD5 b38854e3518f58d3deb1751abf1049d9 files/gtk.configure 238
-MD5 07f0de2a5c98da1af7a9e3ca3ce377fd files/qt.configure 182
-MD5 7721189d4a5a7ff05a3873430d1dc5d0 ChangeLog 464
-MD5 f2bdd6a783b0fb49828f7ac2dcb0382f slashem-0.0.648.ebuild 4368
+MD5 0cc7bbd2fbdb25cb8319834963f723ba files/digest-slashem-0.0.760 119
+MD5 904e9a3b63565bebc075ee2e49c0fa6f files/0.0.7E6/va_copy.patch 637
+MD5 6cca35560986e700c5cd8b07e571790e files/0.0.7E6/X11.configure 400
+MD5 5cd69b99d18037476dceab4956fee07a files/0.0.7E6/Gentoo.configure 90
+MD5 a27b3edac6eefbb0c4e45ef0474125ee files/0.0.7E6/dot.slashemrc 3721
+MD5 57e259af161fb4cd14a21274e271a075 files/0.0.7E6/GTK.configure 426
+MD5 383053d0044677bb32c98ccc1851258c files/0.0.7E6/opengl.configure 151
+MD5 517442a1ef6bed1c0a4547422d3fe256 files/0.0.7E6/sdl.configure 258
+MD5 4a10db62e5c14c0a33073f355e22b371 files/0.0.7E6/Proxy.configure 395
+MD5 1c4bea59f5c12d1fb16c3bb9854805e9 files/0.0.7E6/qt.configure 414
+MD5 3ccc6578d2395a9e31cf14cf97234921 files/0.0.7E6/proxy.slashemrc 207
+MD5 a390d1fc8a476b52da0e6e45e01001b1 files/0.0.7E6/gnome.configure 380
+MD5 c0702cf01cb9b34fb41418616181e7e8 files/0.0.7E6/gentoo-paths.patch 818
+MD5 b9c67a0a6c43921a62aeab60b9b635c4 files/0.0.7E6/prepare-gui.configure 1466
+MD5 4f096566a3684ce493ef00b49d0c08cd files/0.0.7E6/makefile.patch 1258
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC0Fg9gIKl8Uu19MoRAtWeAJoCSTCG9p204rnO9UkvEjCWccGr8wCfQNjO
+3ELVywGruC63wQUWJuxHcfU=
+=XSWW
+-----END PGP SIGNATURE-----
diff --git a/games-roguelike/slashem/metadata.xml b/games-roguelike/slashem/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-roguelike/slashem/metadata.xml
+++ b/games-roguelike/slashem/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-roguelike/slashem/slashem-0.0.760.ebuild b/games-roguelike/slashem/slashem-0.0.760.ebuild
index fca76e3f1055..5d1fdf1ff8a7 100644
--- a/games-roguelike/slashem/slashem-0.0.760.ebuild
+++ b/games-roguelike/slashem/slashem-0.0.760.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-roguelike/slashem/slashem-0.0.760.ebuild,v 1.1 2004/12/27 03:52:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/slashem/slashem-0.0.760.ebuild,v 1.1.1.1 2005/11/30 09:38:49 chriswhite Exp $
 
 inherit eutils flag-o-matic games
 
@@ -17,18 +17,16 @@ SRC_URI="mirror://sourceforge/slashem/${SE_PN}
 
 LICENSE="nethack"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="X qt gnome sdl opengl"
+KEYWORDS="amd64 ppc x86"
+IUSE="X gnome sdl opengl"
 
-RDEPEND="virtual/libc
-	>=sys-libs/ncurses-5.2-r5
+#	qt? ( =x11-libs/qt-2* ) this version has overflow bugs #79720
+RDEPEND=">=sys-libs/ncurses-5.2-r5
 	X? ( virtual/x11 )
-	qt? ( =x11-libs/qt-2* )
 	gnome? ( >=gnome-base/gnome-libs-1.4.1.4-r2 )
 	opengl? ( virtual/opengl )
 	sdl? ( media-libs/libsdl )"
 DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
 	dev-util/yacc"
 
 HACKDIR=${GAMES_STATEDIR}/${PN}
@@ -36,9 +34,8 @@ S=${WORKDIR}/slashem-${SE_FIXVER}
 
 src_unpack() {
 	unpack ${SE_PN}
-	cd ${S}
-	epatch ${FILESDIR}/${SE_VER}/makefile.patch
-	epatch ${FILESDIR}/${SE_VER}/gentoo-paths.patch
+	cd "${S}"
+	epatch ${FILESDIR}/${SE_VER}/*.patch
 	sed -i \
 		-e "s:GENTOO_STATEDIR:${GAMES_STATEDIR}/${PN}:" \
 		include/unixconf.h \
@@ -53,18 +50,16 @@ src_unpack() {
 
 	unpack ${SE_CONF}
 	cp -f ${FILESDIR}/${SE_VER}/*.configure . || die
-	./config RedHat9 ../..
-	./config FHS20 ../..
-	./config prepare-gui ../..
-	./config Proxy ../..
+	for c in RedHat9 FHS20 Gentoo prepare-gui Proxy ; do
+		./config ${c} ../..
+	done
 
 	if use X ; then
 		./config X11 ../.. || die "X config"
-		for v in qt gnome sdl opengl ; do
+		for v in gnome sdl opengl ; do #qt
 			use ${v} && { ./config ${v} ../.. || die "${v} config"; }
 		done
 	fi
-return 0
 
 	cd ${S}
 	sed -i \
@@ -96,10 +91,9 @@ src_install() {
 		FILE_AREA_UNSHARE=${D}/${GAMES_LIBDIR}/${PN} \
 		FILE_AREA_DOC=${D}/usr/share/doc/${PF} \
 		install || die "make install failed"
-
 	dodoc doc/*.txt
 	dodoc dat/license
-	doman doc/*.6
+	doman doc/slashem.6
 
 	# The final /usr/bin/slashem is a sh script.  This fixes the hard-coded
 	# HACKDIR directory so it doesn't point to ${D}/usr/share/slashemdir
@@ -136,7 +130,7 @@ src_install() {
 
 	local windowtypes="tty"
 	use gnome  && windowtypes="${windowtypes} gnome"
-	use qt     && windowtypes="${windowtypes} qt"
+	#use qt     && windowtypes="${windowtypes} qt"
 	use X      && windowtypes="${windowtypes} x11"
 	use sdl    && windowtypes="${windowtypes} sdl"
 	use opengl && windowtypes="${windowtypes} gl"
diff --git a/games-roguelike/tome/ChangeLog b/games-roguelike/tome/ChangeLog
index 37c74f47bd03..97f70d86a6c8 100644
--- a/games-roguelike/tome/ChangeLog
+++ b/games-roguelike/tome/ChangeLog
@@ -1,6 +1,79 @@
-# ChangeLog for app-games/tome
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/ChangeLog,v 1.1 2003/09/10 04:59:58 vapier Exp $
+# ChangeLog for games-roguelike/tome
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/ChangeLog,v 1.1.1.1 2005/11/30 09:38:49 chriswhite Exp $
+
+  20 Sep 2005; Kito <kito@gentoo.org> tome-2.3.1.ebuild:
+  ~ppc-macos. Closes Bug 106571
+
+  30 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> tome-2.3.1.ebuild:
+  Stable on ppc.
+
+*tome-2.3.1 (20 Jan 2005)
+
+  20 Jan 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/2.3.1-gentoo-paths.patch, -tome-2.2.5-r1.ebuild, -tome-2.2.6.ebuild,
+  -tome-2.2.7.ebuild, +tome-2.3.1.ebuild:
+  version bump; clean older versions
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  17 Dec 2004; Joseph Jezak <josejx@gentoo.org> tome-2.2.7-r1.ebuild:
+  Marked ppc stable.
+
+*tome-2.3.0 (10 Dec 2004)
+
+  10 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/2.3.0-gentoo-paths.patch, +tome-2.3.0.ebuild:
+  version bump (bug #73849)
+
+  25 Sep 2004; Michael Sterrett <mr_bones_@gentoo.org> tome-2.2.7-r1.ebuild:
+  Enable text mode again - #bug #53640
+
+*tome-2.2.7-r1 (25 Jun 2004)
+
+  25 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> +tome-2.2.7-r1.ebuild:
+  rev bump for the upgrade
+
+  25 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/2.2.7-gentoo-paths.patch, tome-2.2.7.ebuild:
+  Restore the patching of the source (bug #53636)
+
+  03 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> tome-2.2.3.ebuild,
+  tome-2.2.5.ebuild:
+  clean older ebuilds
+
+*tome-2.2.7 (03 Jun 2004)
+
+  03 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> tome-2.2.7.ebuild:
+  version bump (bug #52560)
+
+*tome-2.2.6 (14 Apr 2004)
+
+  14 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> tome-2.2.6.ebuild,
+  files/2.2.6-gentoo-paths.patch:
+  version bump (bug #47185)
+
+  30 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> tome-1.0.0.ebuild:
+  remove version 1
+
+  10 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> tome-2.2.5-r1.ebuild:
+  Adding amd64 keyword. Closing #44154.
+
+*tome-2.2.5-r1 (14 Jan 2004)
+
+  14 Jan 2004; Mike Frysinger <vapier@gentoo.org> :
+  Move scores file out of /usr/share and into /var/games #37594.
+
+*tome-2.2.5 (01 Jan 2004)
+
+  01 Jan 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bumpage #36798.
+
+*tome-2.2.3 (13 Oct 2003)
+
+  13 Oct 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bumpage #30817 to also fix permissions #26334.
 
 *tome-2.2.2 (28 Jul 2003)
 
@@ -47,5 +120,5 @@
 
 *tome-1.0.0 (1 Aug 2002)
 
-  1 Aug 2002; Jose Alberto Su�rez L�pez <bass@gentoo.org> tome-1.0.0.ebuild:
+  1 Aug 2002; Jose Alberto Suárez López <bass@gentoo.org> tome-1.0.0.ebuild:
   First release.
diff --git a/games-roguelike/tome/Manifest b/games-roguelike/tome/Manifest
index 7ada55d9aedc..eb50dea27a08 100644
--- a/games-roguelike/tome/Manifest
+++ b/games-roguelike/tome/Manifest
@@ -1,11 +1,13 @@
-MD5 8e844d3eb9a4ddff40c3023b315afbca ChangeLog 1676
-MD5 0ba345df0450737039eb1228fb180e6d tome-1.0.0.ebuild 854
-MD5 156ff921924ffca71b63831bdfbd89ea tome-2.0.0.ebuild 942
-MD5 a8f67b5f6c4ae8de1ec9f3481b7010e2 tome-2.1.0.ebuild 1075
-MD5 c4987715f0d1543bf76a2aa0b49e35a2 tome-2.2.1.ebuild 1389
-MD5 a435d9df9b1a3ac1742e3234d742362f tome-2.2.2.ebuild 1356
-MD5 5febc7a1e153cf2a764178addf34e891 files/digest-tome-1.0.0 62
-MD5 1b4b1dc015a686153a26274633ec38c9 files/digest-tome-2.0.0 62
-MD5 8ea3fc31ec761cfb3238ad54857bc2f7 files/digest-tome-2.1.0 62
-MD5 cb208a82164375060b21cac1bbd4cb4c files/digest-tome-2.2.1 62
-MD5 334beabe3e15932618a421f7881ee8b1 files/digest-tome-2.2.2 62
+MD5 07a46443d3c12629ada2c799c3b20f4d ChangeLog 3882
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 b719041e3fd6c4be815fe31ade777dd4 tome-2.2.7-r1.ebuild 1919
+MD5 fdef338c401de8078c0e85fedd68c1db tome-2.3.0.ebuild 2057
+MD5 2ab48eeec500b98a8c331b97f9e8f33a tome-2.3.1.ebuild 2023
+MD5 23dd9f8f71868b8ab82d8bbbc79ad740 files/2.2.5-gentoo-paths.patch 1172
+MD5 23dd9f8f71868b8ab82d8bbbc79ad740 files/2.2.6-gentoo-paths.patch 1172
+MD5 23dd9f8f71868b8ab82d8bbbc79ad740 files/2.2.7-gentoo-paths.patch 1172
+MD5 23dd9f8f71868b8ab82d8bbbc79ad740 files/2.3.0-gentoo-paths.patch 1172
+MD5 23dd9f8f71868b8ab82d8bbbc79ad740 files/2.3.1-gentoo-paths.patch 1172
+MD5 a23d89bdd5d10666dd7030963ba64983 files/digest-tome-2.2.7-r1 66
+MD5 bc7421839b9c27fba54b183115f428f9 files/digest-tome-2.3.0 66
+MD5 19ef7a007b17565e9e75a93add629aa8 files/digest-tome-2.3.1 66
diff --git a/games-roguelike/tome/metadata.xml b/games-roguelike/tome/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-roguelike/tome/metadata.xml
+++ b/games-roguelike/tome/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-roguelike/tome/tome-2.2.7-r1.ebuild b/games-roguelike/tome/tome-2.2.7-r1.ebuild
index 6aabaae9a95f..8a3b7a9b828a 100644
--- a/games-roguelike/tome/tome-2.2.7-r1.ebuild
+++ b/games-roguelike/tome/tome-2.2.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/games-roguelike/tome/tome-2.2.7-r1.ebuild,v 1.1 2004/06/25 09:38:20 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/tome-2.2.7-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:49 chriswhite Exp $
 
 inherit eutils games
 
@@ -11,10 +11,10 @@ SRC_URI="http://t-o-m-e.net/dl/src/tome-${MY_PV}-src.tar.bz2"
 
 LICENSE="Moria"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~amd64"
+KEYWORDS="x86 ppc ~amd64"
 IUSE=""
 
-RDEPEND="virtual/glibc
+RDEPEND="virtual/libc
 	dev-lang/lua
 	>=sys-libs/ncurses-5
 	virtual/x11"
@@ -31,6 +31,12 @@ src_unpack() {
 	sed -i \
 		-e "s:GENTOO_DIR:${GAMES_STATEDIR}:" files.c init2.c \
 		|| die "sed failed"
+	#bug #53640
+	sed -i \
+		-e "s:-DUSE_X11:-DUSE_GCU -DUSE_X11:" \
+		-e "s:-lX11:-lncurses -lX11:" \
+		makefile \
+		|| die "sed failed"
 	find "${S}" -name .cvsignore -exec rm -f \{\} \;
 }
 
diff --git a/games-roguelike/tome/tome-2.3.0.ebuild b/games-roguelike/tome/tome-2.3.0.ebuild
index 4946b76246ac..65185b10198d 100644
--- a/games-roguelike/tome/tome-2.3.0.ebuild
+++ b/games-roguelike/tome/tome-2.3.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/games-roguelike/tome/tome-2.3.0.ebuild,v 1.1 2004/12/11 05:40:32 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/tome-2.3.0.ebuild,v 1.1.1.1 2005/11/30 09:38:49 chriswhite Exp $
 
 inherit eutils games
 
diff --git a/games-roguelike/tome/tome-2.3.1.ebuild b/games-roguelike/tome/tome-2.3.1.ebuild
index 3193aa606351..1fe1f006c1e4 100644
--- a/games-roguelike/tome/tome-2.3.1.ebuild
+++ b/games-roguelike/tome/tome-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/games-roguelike/tome/tome-2.3.1.ebuild,v 1.1 2005/01/20 05:47:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/tome-2.3.1.ebuild,v 1.1.1.1 2005/11/30 09:38:49 chriswhite Exp $
 
 inherit eutils games
 
@@ -11,7 +11,7 @@ SRC_URI="http://t-o-m-e.net/dl/src/tome-${MY_PV}-src.tar.bz2"
 
 LICENSE="Moria"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ppc ~ppc-macos x86"
 IUSE=""
 
 DEPEND="virtual/libc
diff --git a/games-roguelike/zangband/ChangeLog b/games-roguelike/zangband/ChangeLog
index 52139ec2e624..f7d822cac435 100644
--- a/games-roguelike/zangband/ChangeLog
+++ b/games-roguelike/zangband/ChangeLog
@@ -1,6 +1,19 @@
-# ChangeLog for app-games/zangband
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/zangband/ChangeLog,v 1.1 2003/09/10 04:59:58 vapier Exp $
+# ChangeLog for games-roguelike/zangband
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/zangband/ChangeLog,v 1.1.1.1 2005/11/30 09:38:49 chriswhite Exp $
+
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+*zangband-2.7.4b (01 Feb 2004)
+
+  01 Feb 2004; Michael Sterrett <mr_bones_@gentoo.org> zangband-2.7.4b.ebuild:
+  bug-fix version bump (bug 39941)
+
+*zangband-2.7.4 (25 Nov 2003)
+
+  25 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org> zangband-2.7.4.ebuild:
+  version bump (bug 34315)
 
   10 Jun 2003; <msterret@gentoo.org> zangband-2.7.3.ebuild:
   DEPEND on sed >= 4
@@ -13,7 +26,7 @@
 
 *zangband-2.7.2 (16 Mar 2003)
 
-  16 Mar 2003; Jos� Alberto Su�rez L�pez <bass@gentoo.org> zangband-2.7.2.ebuild:
+  16 Mar 2003; José Alberto Suárez López <bass@gentoo.org> zangband-2.7.2.ebuild:
   bumped version and use game.eclass
 
 *zangband-2.7.1 (15 Jul 2002)
diff --git a/games-roguelike/zangband/Manifest b/games-roguelike/zangband/Manifest
index b52589bf42e7..d9c66925b738 100644
--- a/games-roguelike/zangband/Manifest
+++ b/games-roguelike/zangband/Manifest
@@ -1,3 +1,14 @@
-MD5 4eb90a8a0e205c79269fc8900e12ccf7 ChangeLog 1187
-MD5 3cf5421538bd68513c2634206b0a41a1 zangband-2.7.3.ebuild 1658
-MD5 1a295dc9c335ddfe6e7b11b575204879 files/digest-zangband-2.7.3 67
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3a1067c628b79df296a773de3be37779 zangband-2.7.4b.ebuild 1709
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 59ec52dc1283acf9ceb46e3fd64c18d8 ChangeLog 1586
+MD5 bde937fbf2d628a95977ed6be5e98d87 files/digest-zangband-2.7.4b 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDK0VnLLFUmVNQ7rkRAlCOAJ4lI0LTwAaIdfYdJzSWqcw3GCQ/3QCeJBIU
+2TECIvvveriRM3JUYdhGIVU=
+=fYse
+-----END PGP SIGNATURE-----
diff --git a/games-roguelike/zangband/metadata.xml b/games-roguelike/zangband/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-roguelike/zangband/metadata.xml
+++ b/games-roguelike/zangband/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-roguelike/zangband/zangband-2.7.4b.ebuild b/games-roguelike/zangband/zangband-2.7.4b.ebuild
index 2176d9bb2002..41d02df795f4 100644
--- a/games-roguelike/zangband/zangband-2.7.4b.ebuild
+++ b/games-roguelike/zangband/zangband-2.7.4b.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-roguelike/zangband/zangband-2.7.4b.ebuild,v 1.1 2004/02/01 10:27:13 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/zangband/zangband-2.7.4b.ebuild,v 1.1.1.1 2005/11/30 09:38:49 chriswhite Exp $
 
 inherit games
 
diff --git a/games-sports/billardgl/ChangeLog b/games-sports/billardgl/ChangeLog
index f80431dc4116..eeaacb26f9e9 100644
--- a/games-sports/billardgl/ChangeLog
+++ b/games-sports/billardgl/ChangeLog
@@ -1,6 +1,17 @@
-# ChangeLog for app-games/billardgl
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/billardgl/ChangeLog,v 1.1 2003/09/11 12:26:35 vapier Exp $
+# ChangeLog for games-sports/billardgl
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-sports/billardgl/ChangeLog,v 1.1.1.1 2005/11/30 09:39:02 chriswhite Exp $
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  20 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  billardgl-1.75-r1.ebuild:
+  don't rdepend on sed; sed in unpack; error check; IUSE; header fix
+
+  28 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org>
+  billardgl-1.75-r1.ebuild:
+  added amd64 per bug 34520
 
   03 Sep 2003; Michael Sterrett <msterret@gentoo.org>
   billardgl-1.75-r1.ebuild:
@@ -15,7 +26,7 @@
   29 Nov 2002; Mike Frysinger <vapier@gentoo.org> :
   Added games eclass support
 
-  17 jul 2002; Jose Alberto Su�rez L�pez <bass@gentoo.org> billardgl-1.75.ebuild :
+  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> billardgl-1.75.ebuild :
   Added LICENSE, KEYWORDS, SLOT.
   Fixed install problem
 
@@ -26,7 +37,7 @@
 
 *billardgl-1.7.0 (20 Apr 2002)
 
-  17 jul 2002; Jose Alberto Su�rez L�pez <bass@gentoo.org> billardgl-1.70.ebuild :
+  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> billardgl-1.70.ebuild :
   Added LICENSE, KEYWORDS, SLOT.
   Typo in ebuild.  Homepage would not display
 
diff --git a/games-sports/billardgl/Manifest b/games-sports/billardgl/Manifest
index c07d8795263b..f244a4d694e5 100644
--- a/games-sports/billardgl/Manifest
+++ b/games-sports/billardgl/Manifest
@@ -1,3 +1,4 @@
-MD5 3abfa4d814fdd7d19d92decf12dcba61 ChangeLog 1559
-MD5 0efef30c77d2e9a9e0ef73348688032f billardgl-1.75-r1.ebuild 886
+MD5 56cce2f5c999aa2489ce46f903e9208f ChangeLog 1929
+MD5 0e52165e72917e5507f28c2325a2a768 billardgl-1.75-r1.ebuild 1090
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 MD5 f211ce963bfb4ecfb03e07f7358f8a55 files/digest-billardgl-1.75-r1 66
diff --git a/games-sports/billardgl/billardgl-1.75-r1.ebuild b/games-sports/billardgl/billardgl-1.75-r1.ebuild
index f5bb87f5e475..98bab0fca95f 100644
--- a/games-sports/billardgl/billardgl-1.75-r1.ebuild
+++ b/games-sports/billardgl/billardgl-1.75-r1.ebuild
@@ -1,36 +1,43 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc. and Jordan Armstrong
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/billardgl/billardgl-1.75-r1.ebuild,v 1.1 2003/09/11 12:26:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/billardgl/billardgl-1.75-r1.ebuild,v 1.1.1.1 2005/11/30 09:39:02 chriswhite Exp $
 
 inherit games
 
 DESCRIPTION="A OpenGL billards game"
-SRC_URI="mirror://sourceforge/billardgl/BillardGL-${PV}.tar.gz"
 HOMEPAGE="http://www.billardgl.de/"
+SRC_URI="mirror://sourceforge/billardgl/BillardGL-${PV}.tar.gz"
 
-KEYWORDS="x86 ppc"
 LICENSE="GPL-2"
+KEYWORDS="amd64 x86 ppc"
 SLOT="0"
+IUSE=""
 
-DEPEND="virtual/x11
+RDEPEND="virtual/x11
 	virtual/opengl
 	virtual/glu
-	virtual/glut
+	virtual/glut"
+DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
-S=${WORKDIR}/BillardGL-${PV}/src
+S="${WORKDIR}/BillardGL-${PV}/src"
 
-src_compile() {
+src_unpack() {
+	unpack ${A}
+	cd ${S}
 	sed -i \
 		-e "s:/usr/share/BillardGL/:${GAMES_DATADIR}/BillardGL/:" Namen.h || \
 			die "sed Namen.h failed"
-	emake || die "emake failed"
+	sed -i \
+		-e "/^CFLAGS/ s:-pipe -Wall -W:${CFLAGS}:" \
+		-e "/^CXXFLAGS/ s:-pipe -Wall -W:${CXXFLAGS}:" Makefile \
+			|| die "sed Makefile failed"
 }
 
 src_install() {
-	dogamesbin BillardGL
+	dogamesbin BillardGL || die "dogamesbin failed"
 	dodir ${GAMES_DATADIR}/BillardGL
-	mv lang Texturen ${D}/${GAMES_DATADIR}/BillardGL
+	cp -r lang/ Texturen/ "${D}/${GAMES_DATADIR}/BillardGL" || die "cp failed"
 	dodoc README
 	prepgamesdirs
 }
diff --git a/games-sports/billardgl/metadata.xml b/games-sports/billardgl/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-sports/billardgl/metadata.xml
+++ b/games-sports/billardgl/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-sports/bygfoot/ChangeLog b/games-sports/bygfoot/ChangeLog
index be0083fc9666..c9a5b11e644a 100644
--- a/games-sports/bygfoot/ChangeLog
+++ b/games-sports/bygfoot/ChangeLog
@@ -1,6 +1,33 @@
 # ChangeLog for games-sports/bygfoot
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/bygfoot/ChangeLog,v 1.1 2005/06/08 20:41:24 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/bygfoot/ChangeLog,v 1.1.1.1 2005/11/30 09:39:02 chriswhite Exp $
+
+*bygfoot-1.9.2 (16 Oct 2005)
+
+  16 Oct 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +bygfoot-1.9.2.ebuild:
+  version bump
+
+*bygfoot-1.9.1 (12 Sep 2005)
+
+  12 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +bygfoot-1.9.1.ebuild:
+  version bump
+
+*bygfoot-1.8.2 (19 Jun 2005)
+
+  19 Jun 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +bygfoot-1.8.2.ebuild:
+  version bump
+
+  15 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org> bygfoot-1.8.1.ebuild:
+  Removed INSTALL file.
+
+  09 Jun 2005; David Holm <dholm@gentoo.org> bygfoot-1.8.1.ebuild:
+  Added to ~ppc.
+
+  08 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org> bygfoot-1.8.1.ebuild:
+  Removed trailing whitespace.
 
 *bygfoot-1.8.1 (08 Jun 2005)
 
diff --git a/games-sports/bygfoot/Manifest b/games-sports/bygfoot/Manifest
index 4e1409d5468f..14811eb727db 100644
--- a/games-sports/bygfoot/Manifest
+++ b/games-sports/bygfoot/Manifest
@@ -1,2 +1,8 @@
-MD5 adc504d6aeb732de2f7b0f5bd7e92527 bygfoot-1.8.1.ebuild 965
-MD5 f71ade099de0bbf385c53bfe555d3373 files/digest-bygfoot-1.8.1 66
+MD5 a7f98f3bf4f5cbb923292fcf796dfcbe bygfoot-1.9.1.ebuild 1252
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 a31ed499172b2841e3c04692e9ae3065 bygfoot-1.9.2.ebuild 1252
+MD5 32c070dcf0fdda5ac767f6ac1ec03d32 bygfoot-1.8.2.ebuild 835
+MD5 9ba2040230e6339953d1351e29e0395a ChangeLog 1210
+MD5 d7e9e93868b00bb6d62010f1adda4ff6 files/digest-bygfoot-1.9.1 66
+MD5 17ef8a45e960143092beaa30e55733cd files/digest-bygfoot-1.9.2 66
+MD5 4dec3ea79f46ac6b28360da40f932d9a files/digest-bygfoot-1.8.2 66
diff --git a/games-sports/bygfoot/bygfoot-1.8.2.ebuild b/games-sports/bygfoot/bygfoot-1.8.2.ebuild
index 33ff9c3f398f..784a435bc467 100644
--- a/games-sports/bygfoot/bygfoot-1.8.2.ebuild
+++ b/games-sports/bygfoot/bygfoot-1.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/games-sports/bygfoot/bygfoot-1.8.2.ebuild,v 1.1 2005/06/19 05:38:32 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/bygfoot/bygfoot-1.8.2.ebuild,v 1.1.1.1 2005/11/30 09:39:02 chriswhite Exp $
 
 inherit eutils games
 
@@ -10,23 +10,18 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
-# Other depends would be (and why not listed):
-# * pkgconfig > 0.9.0 - Oldest ebuild is 0.12.0
-# * glib2, pango, atk - Depends from gtk+2
-# * freetype2 - Depends from pango
 RDEPEND=">=x11-libs/gtk+-2.0"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_install() {
-	dogamesbin src/bygfoot \
-		b-u/bygfoot-update-gui || die "Installation of bygfoot failed."
+	dogamesbin src/bygfoot b-u/bygfoot-update-gui || die "dobin failed"
 	dodoc AUTHORS ChangeLog README TODO UPDATE
 	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r support_files/ || die "Installation of game data failed."
+	doins -r support_files/ || die "game data failed"
 	newicon support_files/pixmaps/football.png ${PN}.png
 	make_desktop_entry ${PN} "Bygfoot"
 	prepgamesdirs
diff --git a/games-sports/bygfoot/bygfoot-1.9.1.ebuild b/games-sports/bygfoot/bygfoot-1.9.1.ebuild
index fded3919cebd..e4bac997f8e0 100644
--- a/games-sports/bygfoot/bygfoot-1.9.1.ebuild
+++ b/games-sports/bygfoot/bygfoot-1.9.1.ebuild
@@ -1,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-sports/bygfoot/bygfoot-1.9.1.ebuild,v 1.1 2005/09/12 07:47:26 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/bygfoot/bygfoot-1.9.1.ebuild,v 1.1.1.1 2005/11/30 09:39:02 chriswhite Exp $
 
 inherit eutils games
 
diff --git a/games-sports/bygfoot/bygfoot-1.9.2.ebuild b/games-sports/bygfoot/bygfoot-1.9.2.ebuild
index 463667034073..76ba51df3916 100644
--- a/games-sports/bygfoot/bygfoot-1.9.2.ebuild
+++ b/games-sports/bygfoot/bygfoot-1.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/games-sports/bygfoot/bygfoot-1.9.2.ebuild,v 1.1 2005/10/16 23:24:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/bygfoot/bygfoot-1.9.2.ebuild,v 1.1.1.1 2005/11/30 09:39:02 chriswhite Exp $
 
 inherit eutils games
 
diff --git a/games-sports/foobillard/ChangeLog b/games-sports/foobillard/ChangeLog
index adf848f872e5..5d2412abc53c 100644
--- a/games-sports/foobillard/ChangeLog
+++ b/games-sports/foobillard/ChangeLog
@@ -1,6 +1,29 @@
-# ChangeLog for app-games/foobillard
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/foobillard/ChangeLog,v 1.1 2003/09/11 12:26:35 vapier Exp $
+# ChangeLog for games-sports/foobillard
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-sports/foobillard/ChangeLog,v 1.1.1.1 2005/11/30 09:39:02 chriswhite Exp $
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  03 Jun 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/foobillard-3.0a-no_nvidia.patch, foobillard-3.0a.ebuild:
+  Added to patch to fix compile on non-nvidia hardware and closing bug #52600.
+
+  02 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> foobillard-3.0a.ebuild:
+  Attempt to address bug #52600
+
+*foobillard-3.0a (29 May 2004)
+
+  29 May 2004; Michael Sterrett <mr_bones_@gentoo.org> foobillard-3.0a.ebuild:
+  version bump; bug #50086
+
+  29 May 2004; Michael Sterrett <mr_bones_@gentoo.org> foobillard-2.9.ebuild:
+  tidy; error messages
+
+*foobillard-2.9 (09 Nov 2003)
+
+  09 Nov 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump.
 
 *foobillard-2.8 (17 Jul 2003)
 
@@ -27,7 +50,7 @@
 
 *foobillard-1.5 (21 Jun 2002)
 
-  17 jul 2002; Jose Alberto Su�rez L�pez <bass@gentoo.org> foobillard-1.5.ebuild :
+  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> foobillard-1.5.ebuild :
   Added KEYWORDS, SLOT.
 
   21 Jun 2002; Ryan Phillips <rphillips@gentoo.org> ChangeLog :
diff --git a/games-sports/foobillard/Manifest b/games-sports/foobillard/Manifest
index efd97b382063..48a8bc116a4d 100644
--- a/games-sports/foobillard/Manifest
+++ b/games-sports/foobillard/Manifest
@@ -1,3 +1,15 @@
-MD5 7e9ec0cee63a42f327ed7d5de7127028 files/digest-foobillard-2.8 67
-MD5 c74384fe6e53b03fa048b7cbedb3c3f2 foobillard-2.8.ebuild 1122
-MD5 d304baf99b4e4907fef2c7e3fa73123e ChangeLog 1443
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 bc8b22fed3e37c1cd4597e480d87069b ChangeLog 2200
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 3add3889f7af472f0e374e626533974d foobillard-3.0a.ebuild 1336
+MD5 11223d31662deec372e491cf27384d31 files/digest-foobillard-3.0a 68
+MD5 8eaf137a771395b81cfdbe6796fc612c files/foobillard-3.0a-no_nvidia.patch 770
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFB21V7roRuSHgZdywRAsX+AJ4vckrK7cosd95faiI+J067dQkYCgCgj1pd
+bjwyU9Z1l7avMQesjoLXP00=
+=6FhW
+-----END PGP SIGNATURE-----
diff --git a/games-sports/foobillard/foobillard-3.0a.ebuild b/games-sports/foobillard/foobillard-3.0a.ebuild
index c5742e3bc3b8..534bed97ef43 100644
--- a/games-sports/foobillard/foobillard-3.0a.ebuild
+++ b/games-sports/foobillard/foobillard-3.0a.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/games-sports/foobillard/foobillard-3.0a.ebuild,v 1.1 2004/05/30 05:27:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/foobillard/foobillard-3.0a.ebuild,v 1.1.1.1 2005/11/30 09:39:02 chriswhite Exp $
 
-inherit games
+inherit eutils games
 
 DESCRIPTION="8ball, 9ball, snooker and carambol game"
 HOMEPAGE="http://foobillard.sunsite.dk/"
 SRC_URI="http://foobillard.sunsite.dk/dnl/${P}.tar.gz"
 
-KEYWORDS="x86 ppc amd64"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
 IUSE="sdl"
 
 DEPEND="virtual/x11
@@ -24,18 +24,22 @@ DEPEND="virtual/x11
 			virtual/glut )
 	)"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-no_nvidia.patch
+}
+
 src_compile() {
 	local myconf=""
 	[ "$(ls /usr/include/GL/gl.h -al | awk '{print $NF}' | cut -d/ -f5)" == "nvidia" ] \
-		&& myconf="--enable-nvidia" \
-		|| myconf="--disable-nvidia"
-	myconf="${myconf} $(use_enable sdl SDL)"
-	use sdl \
-		&& myconf="${myconf} --disable-glut" \
-		|| myconf="${myconf} --enable-glut"
+		&& myconf="--enable-nvidia=yes" \
+		|| myconf="--enable-nvidia=no"
 
 	egamesconf \
 		--enable-sound \
+		$(use_enable sdl SDL) \
+		$(use_enable !sdl glut) \
 		${myconf} \
 		|| die
 	emake || die "emake failed"
@@ -44,5 +48,11 @@ src_compile() {
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS ChangeLog README README.FONTS
+	doman foobillard.6
+
+	insinto /usr/share/pixmaps
+	newins data/full_symbol.png foobillard.png
+	make_desktop_entry foobillard Foobillard foobillard.png
+
 	prepgamesdirs
 }
diff --git a/games-sports/foobillard/metadata.xml b/games-sports/foobillard/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-sports/foobillard/metadata.xml
+++ b/games-sports/foobillard/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-sports/foosball/ChangeLog b/games-sports/foosball/ChangeLog
index dc3a524b9ced..6428ceb56c6f 100644
--- a/games-sports/foosball/ChangeLog
+++ b/games-sports/foosball/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-sports/foosball
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/foosball/ChangeLog,v 1.1 2003/10/25 09:58:56 vapier Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-sports/foosball/ChangeLog,v 1.1.1.1 2005/11/30 09:39:02 chriswhite Exp $
+
+  05 Nov 2004; Joseph Jezak <josejx@gentoo.org> foosball-0.92.ebuild:
+  Added ~ppc.
 
 *foosball-0.92 (25 Oct 2003)
 
diff --git a/games-sports/foosball/Manifest b/games-sports/foosball/Manifest
index 104312b123a9..2818330322b6 100644
--- a/games-sports/foosball/Manifest
+++ b/games-sports/foosball/Manifest
@@ -1,4 +1,4 @@
-MD5 e825af4814d01e323cae13d430b9662e files/digest-foosball-0.92 65
-MD5 3cff8bddbd1fff97d41a5a7d436813c8 foosball-0.92.ebuild 575
-MD5 4f6de68452b7df6eddc24a641f6343a0 ChangeLog 349
+MD5 b3044b70daba7504cecb7e17a7ae3388 ChangeLog 425
+MD5 e1d8ecef95aed81c0fae1d1f2c17e488 foosball-0.92.ebuild 609
 MD5 4f50e05efec6b03cf0e827692a663f63 metadata.xml 410
+MD5 e825af4814d01e323cae13d430b9662e files/digest-foosball-0.92 65
diff --git a/games-sports/foosball/foosball-0.92.ebuild b/games-sports/foosball/foosball-0.92.ebuild
index 83a91406e60f..81e9bf69807b 100644
--- a/games-sports/foosball/foosball-0.92.ebuild
+++ b/games-sports/foosball/foosball-0.92.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-sports/foosball/foosball-0.92.ebuild,v 1.1 2003/10/25 09:58:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/foosball/foosball-0.92.ebuild,v 1.1.1.1 2005/11/30 09:39:02 chriswhite Exp $
 
 inherit games
 
@@ -10,11 +10,13 @@ SRC_URI="http://www.autismuk.freeserve.co.uk/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ~amd64 ~ppc"
+IUSE=""
 
 DEPEND="media-libs/libsdl"
 
 src_install() {
-	emake install DESTDIR=${D} || die
+	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS ChangeLog README TODO
+	prepgamesdirs
 }
diff --git a/games-sports/gracer/ChangeLog b/games-sports/gracer/ChangeLog
index 5e9da9238d1b..ad6514139448 100644
--- a/games-sports/gracer/ChangeLog
+++ b/games-sports/gracer/ChangeLog
@@ -1,6 +1,31 @@
-# ChangeLog for app-games/gracer
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/gracer/ChangeLog,v 1.1 2003/09/11 12:26:35 vapier Exp $
+# ChangeLog for games-sports/gracer
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-sports/gracer/ChangeLog,v 1.1.1.1 2005/11/30 09:39:02 chriswhite Exp $
+
+  26 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> gracer-0.1.5.ebuild:
+  Making games last on inherit line.
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> gracer-0.1.5.ebuild:
+  Stable on ppc.
+
+  15 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> gracer-0.1.5.ebuild:
+  Stable on sparc
+
+  05 Nov 2004; Joseph Jezak <josejx@gentoo.org> +files/gracer-gcc-3.4.patch,
+  gracer-0.1.5.ebuild:
+  Added ~ppc and gcc 3.4 fixes.
+
+  28 Jun 2004; Jason Eric Huebel <jhuebel@gentoo.org> gracer-0.1.5.ebuild:
+  gnuconfig_update, ~amd64
+
+  12 Apr 2004; Jason Wever <weeve@gentoo.org> gracer-0.1.5.ebuild:
+  Added ~sparc keyword.
+
+  23 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> gracer-0.1.5.ebuild:
+  don't rdepend on sed
+
+  12 Dec 2003; Michael Sterrett <mr_bones_@gentoo.org> gracer-0.1.5.ebuild:
+  more error checking/messages
 
   29 Jul 2003; Michael Sterrett <msterret@gentoo.org> gracer-0.1.5.ebuild:
   depend on sed >=4
diff --git a/games-sports/gracer/Manifest b/games-sports/gracer/Manifest
index 000f93314dcb..87cc6558e426 100644
--- a/games-sports/gracer/Manifest
+++ b/games-sports/gracer/Manifest
@@ -1,4 +1,6 @@
-MD5 da701b428613a3064d734d0fbe10dc2b gracer-0.1.5.ebuild 1041
-MD5 7d4c79d23fc5bab84c8ebb7f8a295f6c files/digest-gracer-0.1.5 64
+MD5 9c7d9e69935c2e2118ee99aeaae67b50 gracer-0.1.5.ebuild 1258
+MD5 5508bfd641572ad914e21efbca9a8c52 ChangeLog 1270
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 MD5 f978345d5296e011b2bfbd03e2820588 files/0.1.5-gldefs.patch 1068
-MD5 a840f23631f8d0d7f16c5d9bc4fa86c6 ChangeLog 436
+MD5 7d4c79d23fc5bab84c8ebb7f8a295f6c files/digest-gracer-0.1.5 64
+MD5 24914a3740a023f755f840b31eba9a98 files/gracer-gcc-3.4.patch 1755
diff --git a/games-sports/gracer/gracer-0.1.5.ebuild b/games-sports/gracer/gracer-0.1.5.ebuild
index aa37f98a615c..af2fad1ff298 100644
--- a/games-sports/gracer/gracer-0.1.5.ebuild
+++ b/games-sports/gracer/gracer-0.1.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/games-sports/gracer/gracer-0.1.5.ebuild,v 1.1 2003/09/11 12:26:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/gracer/gracer-0.1.5.ebuild,v 1.1.1.1 2005/11/30 09:39:02 chriswhite Exp $
 
-inherit games eutils
+inherit gnuconfig eutils games
 
 DESCRIPTION="3D motor sports simulator"
 HOMEPAGE="http://gracer.sourceforge.net/"
@@ -10,39 +10,44 @@ SRC_URI="mirror://sourceforge/gracer/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 sparc ~amd64 ppc"
 IUSE="gif jpeg png joystick"
 
-DEPEND="virtual/x11
+RDEPEND="virtual/x11
 	virtual/glu
-	virtual/opengl
 	virtual/glut
+	virtual/opengl
 	dev-lang/tcl
-	>=sys-apps/sed-4
 	gif? ( media-libs/giflib )
 	jpeg? ( media-libs/jpeg )
 	png? ( media-libs/libpng )
 	media-libs/plib"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${PV}-gldefs.patch
+	epatch "${FILESDIR}/${PV}-gldefs.patch"
+	epatch ${FILESDIR}/${PN}-gcc-3.4.patch
 }
 
 src_compile() {
+	gnuconfig_update
 	egamesconf \
 		`use_enable joystick` \
 		`use_enable gif` \
 		`use_enable jpeg` \
 		`use_enable png` \
-		|| die
-	sed -i 's:-lplibsl:-lplibsl -lplibul:' `find -name Makefile`
-	emake || die
+			|| die
+	sed -i \
+		-e 's:-lplibsl:-lplibsl -lplibul:' `find -name Makefile` \
+			|| die "sed Makefiles failed"
+	emake || die "emake failed"
 }
 
 src_install() {
-	make install DESTDIR=${D} || die
-	dodoc AUTHORS ChangeLog NEWS README
+	make DESTDIR=${D} install           || die "make install failed"
+	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
 	prepgamesdirs
 }
diff --git a/games-sports/gracer/metadata.xml b/games-sports/gracer/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-sports/gracer/metadata.xml
+++ b/games-sports/gracer/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-sports/metadata.xml b/games-sports/metadata.xml
index 965d864eb95a..c019b5be3fa1 100644
--- a/games-sports/metadata.xml
+++ b/games-sports/metadata.xml
@@ -4,5 +4,23 @@
 	<longdescription lang="en">
 		The games-sports category contains sports games.
 	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie games-sports enthält Sportspiele.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría games-sports contiene juegos de deporte.
+	</longdescription>
+	<longdescription lang="ja">
+		games-sportsカテゴリーにはスポーツ・ゲームが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De games-sports categorie bevat sportspellen.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm games-sports chứa các trò chơi thể thao.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria games-sports contiene giochi sportivi.
+	</longdescription>
 </catmetadata>
 
diff --git a/games-sports/miniracer/ChangeLog b/games-sports/miniracer/ChangeLog
index 7355e53fc577..45995b017038 100644
--- a/games-sports/miniracer/ChangeLog
+++ b/games-sports/miniracer/ChangeLog
@@ -1,10 +1,10 @@
 # ChangeLog for games-sports/miniracer
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/miniracer/ChangeLog,v 1.1 2005/06/01 03:44:06 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/miniracer/ChangeLog,v 1.1.1.1 2005/11/30 09:39:02 chriswhite Exp $
 
 *miniracer-1.04 (01 Jun 2005)
 
   01 Jun 2005; Michael Sterrett <mr_bones_@gentoo.org> +metadata.xml,
   +miniracer-1.04.ebuild:
-  initial commit - ebuild submitted by Matija Suklje via bug #93056
+  initial commit - ebuild submitted by Christoph Brill (egore) via bug #93056
 
diff --git a/games-sports/miniracer/Manifest b/games-sports/miniracer/Manifest
index 9e4ccafb788a..8dc19db523f5 100644
--- a/games-sports/miniracer/Manifest
+++ b/games-sports/miniracer/Manifest
@@ -1,2 +1,4 @@
-MD5 db4b7ba0841c23232929aedf6041baed miniracer-1.04.ebuild 920
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 1d3e49081315b095ad9e0a662d267d2d ChangeLog 426
+MD5 b4414d680060c0a1530fc6deddd14752 miniracer-1.04.ebuild 1058
 MD5 81b022d5b4771990abe58744bcd17e66 files/digest-miniracer-1.04 67
diff --git a/games-sports/miniracer/miniracer-1.04.ebuild b/games-sports/miniracer/miniracer-1.04.ebuild
index bad76e952444..1f6d72a27f7c 100644
--- a/games-sports/miniracer/miniracer-1.04.ebuild
+++ b/games-sports/miniracer/miniracer-1.04.ebuild
@@ -1,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-sports/miniracer/miniracer-1.04.ebuild,v 1.1 2005/06/01 03:44:06 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/miniracer/miniracer-1.04.ebuild,v 1.1.1.1 2005/11/30 09:39:02 chriswhite Exp $
 
 inherit games
 
diff --git a/games-sports/race/ChangeLog b/games-sports/race/ChangeLog
index 9640da71254d..7cd09a99cb70 100644
--- a/games-sports/race/ChangeLog
+++ b/games-sports/race/ChangeLog
@@ -1,6 +1,15 @@
-# ChangeLog for app-games/race
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/race/ChangeLog,v 1.1 2003/09/11 12:26:35 vapier Exp $
+# ChangeLog for games-sports/race
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-sports/race/ChangeLog,v 1.1.1.1 2005/11/30 09:39:02 chriswhite Exp $
+
+  17 May 2005; Chris Gianelloni <wolf31o2@gentoo.org> race-0.5.ebuild:
+  Cleanup for bug #92745.
+
+  04 Feb 2004; David Holm <dholm@gentoo.org> race-0.5.ebuild:
+  Added to ~ppc.
+
+  22 Oct 2003; Michael Sterrett <mr_bones_@gentoo.org> race-0.5.ebuild:
+  use sed-4; cleaner install; more error checking and messages
 
 *race-0.5 (30 Jul 2003)
 
diff --git a/games-sports/race/Manifest b/games-sports/race/Manifest
index dce732265152..73709aa6204f 100644
--- a/games-sports/race/Manifest
+++ b/games-sports/race/Manifest
@@ -1,4 +1,5 @@
-MD5 670bc20849dedca09c980cb7bc67114f race-0.5.ebuild 972
-MD5 f7ccf6058ee9a01cfbd5e475d8c2e834 files/digest-race-0.5 61
+MD5 95ab70c106b2ed3d34826b576a1ee08e ChangeLog 643
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 a48f902a60b8d276388f861de24c4582 race-0.5.ebuild 1173
 MD5 e8ca685e0adb1972e290852a3583ca47 files/0.5-gentoo.patch 3224
-MD5 4b499efd82a61c36972b793d0398c14e ChangeLog 330
+MD5 f7ccf6058ee9a01cfbd5e475d8c2e834 files/digest-race-0.5 61
diff --git a/games-sports/race/metadata.xml b/games-sports/race/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-sports/race/metadata.xml
+++ b/games-sports/race/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-sports/race/race-0.5.ebuild b/games-sports/race/race-0.5.ebuild
index a253e194b489..b16deff0426e 100644
--- a/games-sports/race/race-0.5.ebuild
+++ b/games-sports/race/race-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/games-sports/race/race-0.5.ebuild,v 1.1 2003/09/11 12:26:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/race/race-0.5.ebuild,v 1.1.1.1 2005/11/30 09:39:02 chriswhite Exp $
 
-inherit games gcc eutils
+inherit eutils toolchain-funcs games
 
 DESCRIPTION="OpenGL Racing Game"
 HOMEPAGE="http://projectz.org/?id=70"
@@ -10,9 +10,10 @@ SRC_URI="ftp://users.freebsd.org.uk/pub/foobar2k/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~amd64 ppc x86"
+IUSE=""
 
-DEPEND="virtual/opengl
+RDEPEND="virtual/opengl
 	virtual/glu
 	media-libs/libsdl
 	media-libs/sdl-image
@@ -25,19 +26,20 @@ src_unpack() {
 	sed -i \
 		-e "s:GENTOO_DATADIR:${GAMES_DATADIR}/${PN}:g" \
 		-e "s:GENTOO_CONFDIR:${GAMES_SYSCONFDIR}:g" \
-		*.c
+		*.c || die "sed failed"
+	find "${S}"/data/ -type d -name .xvpics -print0 | xargs -0 rm -r
 }
 
 src_compile() {
-	emake CC="$(gcc-getCC) ${CFLAGS}" || die
+	emake CC="$(tc-getCC) ${CFLAGS}" || die "emake failed"
 }
 
 src_install() {
-	dogamesbin race
+	dogamesbin race || die "dogamesbin failed"
 	insinto ${GAMES_SYSCONFDIR}
-	newins config race.conf
+	newins config race.conf || die "newins failed"
 	dodir ${GAMES_DATADIR}/${PN}
-	mv data/* ${D}/${GAMES_DATADIR}/${PN}/
+	cp -r data/* ${D}/${GAMES_DATADIR}/${PN}/ || die "cp failed"
 	dodoc README
 	prepgamesdirs
 }
diff --git a/games-sports/racer-bin/ChangeLog b/games-sports/racer-bin/ChangeLog
index fc43e8534f19..59fc14c17879 100644
--- a/games-sports/racer-bin/ChangeLog
+++ b/games-sports/racer-bin/ChangeLog
@@ -1,6 +1,10 @@
-# ChangeLog for app-games/racer-bin
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/racer-bin/ChangeLog,v 1.1 2003/09/11 12:26:35 vapier Exp $
+# ChangeLog for games-sports/racer-bin
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-sports/racer-bin/ChangeLog,v 1.1.1.1 2005/11/30 09:39:02 chriswhite Exp $
+
+  31 Oct 2003; Michael Sterrett <mr_bones_@gentoo.org>
+  racer-bin-0.5.0-r1.ebuild:
+  more error checking/messages; local variables; fix permissions for bug 31694
 
   12 Jul 2003; Michael Sterrett <msterret@gentoo.org>
   racer-bin-0.5.0-r1.ebuild:
diff --git a/games-sports/racer-bin/Manifest b/games-sports/racer-bin/Manifest
index 3c845d64f5cf..8a94502d48b8 100644
--- a/games-sports/racer-bin/Manifest
+++ b/games-sports/racer-bin/Manifest
@@ -1,4 +1,5 @@
-MD5 5876e93b4c202590b8d54994f2d35515 ChangeLog 840
-MD5 f9d05d90266bf7f644fb3abd771f47e6 racer-bin-0.5.0-r1.ebuild 1316
+MD5 f7920b4a5797c1c2bceae729bb244378 ChangeLog 1001
+MD5 3789e8083a1752089d4d915f44b4c56d racer-bin-0.5.0-r1.ebuild 1684
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 5dc15226d73e53365a3626b8a5b28d67 files/digest-racer-bin-0.5.0-r1 129
 MD5 eb49db94f23e77efd23b9f5bb0aea6ac files/racer-skel 108
-MD5 ec793a18da62c3b624926d6f67647d50 files/digest-racer-bin-0.5.0-r1 248
diff --git a/games-sports/racer-bin/files/digest-racer-bin-0.5.0-r1 b/games-sports/racer-bin/files/digest-racer-bin-0.5.0-r1
index 5e911a1758d5..7af4aa09994a 100644
--- a/games-sports/racer-bin/files/digest-racer-bin-0.5.0-r1
+++ b/games-sports/racer-bin/files/digest-racer-bin-0.5.0-r1
@@ -1,4 +1,2 @@
-MD5 12b8d06aa01b5c99f3b11a1ee8d767b8 /files/racer 37
-MD5 a832f6b1d33fa327332ebf9b666a16c2 /racer-bin-0.5.0.ebuild 1000
 MD5 9c6f4b03f8ebf9913e0a714ae23efe55 rr_data0.5.0.tgz 8197224
 MD5 2b08290c63b8fa7fa707abdb6cd20db8 rr_bin_linux0.5.0.tgz 2015099
diff --git a/games-sports/racer-bin/metadata.xml b/games-sports/racer-bin/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-sports/racer-bin/metadata.xml
+++ b/games-sports/racer-bin/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-sports/racer-bin/racer-bin-0.5.0-r1.ebuild b/games-sports/racer-bin/racer-bin-0.5.0-r1.ebuild
index 5433ee25c42d..85a9411b28bb 100644
--- a/games-sports/racer-bin/racer-bin-0.5.0-r1.ebuild
+++ b/games-sports/racer-bin/racer-bin-0.5.0-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-sports/racer-bin/racer-bin-0.5.0-r1.ebuild,v 1.1 2003/09/11 12:26:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/racer-bin/racer-bin-0.5.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:39:02 chriswhite Exp $
 
 inherit games
 
@@ -12,13 +12,14 @@ SRC_URI="http://download.tdconline.dk/pub/boomtown/racesimcentral/rr_data${PV}.t
 LICENSE="Racer"
 SLOT="0"
 KEYWORDS="-* x86"
+IUSE=""
 
 RDEPEND="virtual/opengl
 	media-libs/libsdl
 	sys-libs/lib-compat
 	>=media-libs/fmod-3.61"
 
-S=${WORKDIR}/racer${PV}
+S="${WORKDIR}/racer${PV}"
 
 src_compile() {
 	einfo "Binary package. Nothing to compile"
@@ -26,20 +27,34 @@ src_compile() {
 
 src_install( ) {
 	local dir=${GAMES_PREFIX_OPT}/${PN}
-	dodir ${dir}
-
-	dodoc *.txt ; rm *.txt
-	cp -R ${S}/* ${D}/${dir}/
-
-	sed -e "s:GENTOO_DIR:${dir}:" ${FILESDIR}/racer-skel > racer-skel
-	for bin in carlab gplex modeler pacejka racer tracked ; do
-		newgamesbin racer-skel ${bin}
-		dosed "s:GENTOO_BIN:${bin}:" ${GAMES_BINDIR}/${bin}
+	local f
+	dodir ${dir} || die "dodir failed"
+
+	dodoc *.txt || die "dodoc failed"
+	rm -f *.txt
+	cp -R ${S}/* "${D}/${dir}/" || die "cp failed"
+
+	sed -e "s:GENTOO_DIR:${dir}:" "${FILESDIR}/racer-skel" > racer-skel \
+		|| die "sed failed"
+
+	for f in carlab gplex modeler pacejka racer tracked
+	do
+		newgamesbin racer-skel ${f} || \
+			die "newgamesbin ${f} failed"
+		dosed "s:GENTOO_BIN:${f}:" ${GAMES_BINDIR}/${f} || \
+			die "dosed ${f} failed"
 	done
 
 	local libfmod=`find /usr/lib/ -name 'libfmod-*so' -maxdepth 1 -type f -printf '%f'`
 	dosym /usr/lib/${libfmod} ${dir}/bin/libfmod-3.61.so
 	dosym /usr/lib/${libfmod} ${dir}/bin/libfmod-3.5.so
 
+	# Fix up some permissions for bug 31694
+	for f in racer.ini data/drivers/default/driver.ini data/tracks/carlswood_nt/bestlaps.ini
+	do
+		fperms 664 ${dir}/${f} || \
+			die "fperms ${f} failed"
+	done
+
 	prepgamesdirs
 }
diff --git a/games-sports/ski/ChangeLog b/games-sports/ski/ChangeLog
index 9a3ca52e2b3b..3bbd0395e29a 100644
--- a/games-sports/ski/ChangeLog
+++ b/games-sports/ski/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-sports/ski
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/ski/ChangeLog,v 1.1 2004/01/04 20:53:02 mr_bones_ Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-sports/ski/ChangeLog,v 1.1.1.1 2005/11/30 09:39:01 chriswhite Exp $
+
+  05 Nov 2004; Joseph Jezak <josejx@gentoo.org> ski-6.5.ebuild:
+  Added ~ppc.
+
+*ski-6.5 (12 Jan 2004)
+
+  12 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org> ski-6.5.ebuild:
+  version bump
 
 *ski-6.3 (04 Jan 2004)
 
diff --git a/games-sports/ski/Manifest b/games-sports/ski/Manifest
index 2e1247156b46..a8de2ad0f9d4 100644
--- a/games-sports/ski/Manifest
+++ b/games-sports/ski/Manifest
@@ -1,2 +1,6 @@
-MD5 8f7781764c59a856efc33367fc1aac8e ski-6.3.ebuild 509
+MD5 a2b82c68ff453c070463c32a7704aee5 ChangeLog 566
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 35ec6daae733a7b7dd1e4cfad721fa29 ski-6.3.ebuild 596
+MD5 5fed4534d37f1e2d5ba8940d7fc8eb88 ski-6.5.ebuild 606
 MD5 546856f0ef6450c18f858aee740c05af files/digest-ski-6.3 58
+MD5 314cfd26f9f66340e9040c16ad65eaff files/digest-ski-6.5 58
diff --git a/games-sports/ski/metadata.xml b/games-sports/ski/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-sports/ski/metadata.xml
+++ b/games-sports/ski/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-sports/ski/ski-6.3.ebuild b/games-sports/ski/ski-6.3.ebuild
index c12661083ddd..40fc2d6f7eb2 100644
--- a/games-sports/ski/ski-6.3.ebuild
+++ b/games-sports/ski/ski-6.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/games-sports/ski/ski-6.3.ebuild,v 1.1 2004/01/04 20:53:02 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/ski/ski-6.3.ebuild,v 1.1.1.1 2005/11/30 09:39:01 chriswhite Exp $
 
 inherit games
 
diff --git a/games-sports/ski/ski-6.5.ebuild b/games-sports/ski/ski-6.5.ebuild
index f77cf817c547..7f3971aa88f9 100644
--- a/games-sports/ski/ski-6.5.ebuild
+++ b/games-sports/ski/ski-6.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/games-sports/ski/ski-6.5.ebuild,v 1.1 2004/01/13 00:45:30 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/ski/ski-6.5.ebuild,v 1.1.1.1 2005/11/30 09:39:01 chriswhite Exp $
 
 inherit games
 
@@ -8,7 +8,7 @@ DESCRIPTION="A simple text-mode skiing game"
 HOMEPAGE="http://www.catb.org/~esr/ski/"
 SRC_URI="http://www.catb.org/~esr/ski/${P}.tar.gz"
 
-KEYWORDS="x86"
+KEYWORDS="x86 ~amd64 ~ppc"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
diff --git a/games-sports/torcs/ChangeLog b/games-sports/torcs/ChangeLog
index 6dc4dd9409ec..cea728a91a21 100644
--- a/games-sports/torcs/ChangeLog
+++ b/games-sports/torcs/ChangeLog
@@ -1,6 +1,36 @@
-# ChangeLog for app-games/torcs
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/torcs/ChangeLog,v 1.1 2003/09/11 12:26:35 vapier Exp $
+# ChangeLog for games-sports/torcs
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-sports/torcs/ChangeLog,v 1.1.1.1 2005/11/30 09:39:02 chriswhite Exp $
+
+  07 Nov 2005; Michael Sterrett <mr_bones_@gentoo.org> torcs-1.2.4.ebuild:
+  stable for x86
+
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+*torcs-1.2.4 (27 Aug 2005)
+
+  27 Aug 2005; Michael Sterrett <mr_bones_@gentoo.org> +torcs-1.2.4.ebuild:
+  version bump
+
+*torcs-1.2.3 (17 Jul 2005)
+
+  17 Jul 2005; Mike Frysinger <vapier@gentoo.org> +torcs-1.2.3.ebuild:
+  Version bump #80983 by Kåre Baastrup et al.
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  23 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> torcs-1.2.1.ebuild:
+  don't rdepend on sed
+
+  27 Feb 2004; Michael Sterrett <mr_bones_@gentoo.org> torcs-1.2.2.ebuild:
+  MAKEOPTS="-j1" to fix bug #43071
+
+*torcs-1.2.2 (26 Feb 2004)
+
+  26 Feb 2004; Michael Sterrett <mr_bones_@gentoo.org> torcs-1.2.2.ebuild:
+  version bump; ebuild submitted by hodak@nemo.physics.ncsu.edu via bug #41599
 
 *torcs-1.2.1 (16 Jul 2003)
 
@@ -15,7 +45,7 @@
   30 Jun 2003; Michael Sterrett <msterret@gentoo.org> torcs-1.0.0-r1.ebuild:
   use sed -i; sed things in unpack instead of compile; tidy
 
-  17 jul 2002; Jose Alberto Su�rez L�pez <bass@gentoo.org> torcs-1.0.0-r1.ebuild :
+  17 jul 2002; Jose Alberto Suarez Lopez <bass@gentoo.org> torcs-1.0.0-r1.ebuild :
   Added LICENSE, KEYWORDS, SLOT.
 
   7 May 2002; Spider <spider@gentoo.org> torcs-1.0.0-r1.ebuild :
diff --git a/games-sports/torcs/Manifest b/games-sports/torcs/Manifest
index 1aae7e9308a2..37d32a52ef6b 100644
--- a/games-sports/torcs/Manifest
+++ b/games-sports/torcs/Manifest
@@ -1,3 +1,6 @@
-MD5 f1cf989071a4da657bd3a2a1412e8bc7 files/digest-torcs-1.2.1 448
-MD5 bd5d48ad410ae4a5caeeb023d6ced55d ChangeLog 1190
-MD5 2ba2938dc4c6636237aefb532df401fd torcs-1.2.1.ebuild 1276
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 76968f94b4deb2295f5205fb0318752c torcs-1.2.4.ebuild 1095
+MD5 8f2a47f244f76762f7e0fa36a2dee428 ChangeLog 2159
+MD5 fffbf3e75c353b0eaa63846b0148fa3e torcs-1.2.2.ebuild 2149
+MD5 b85e0df5b41ce02ced5db2128a159a6a files/digest-torcs-1.2.4 67
+MD5 ed4ac123405f9d16d8e88fe36d37bcd6 files/digest-torcs-1.2.2 1394
diff --git a/games-sports/torcs/metadata.xml b/games-sports/torcs/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-sports/torcs/metadata.xml
+++ b/games-sports/torcs/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-sports/torcs/torcs-1.2.2.ebuild b/games-sports/torcs/torcs-1.2.2.ebuild
index 28d5f0bc0f60..1f4bbd6facb5 100644
--- a/games-sports/torcs/torcs-1.2.2.ebuild
+++ b/games-sports/torcs/torcs-1.2.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/games-sports/torcs/torcs-1.2.2.ebuild,v 1.1 2004/02/26 10:36:53 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/torcs/torcs-1.2.2.ebuild,v 1.1.1.1 2005/11/30 09:39:02 chriswhite Exp $
 
 inherit games
 
@@ -38,14 +38,18 @@ RDEPEND=">=media-libs/plib-1.6
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
-HOME="${T}"
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	sed -i \
-		-e "/^datadir =/s:=.*:= ${GAMES_DATADIR}/${PN}:" Make-config.in \
-			|| die "sed Make-config.in failed"
+		-e "/^datadir =/s:=.*:= ${GAMES_DATADIR}/${PN}:" \
+		Make-config.in \
+		|| die "sed Make-config.in failed"
+}
+
+src_compile() {
+	egamesconf || die
+	env HOME="${T}" emake -j1 || die
 }
 
 src_install() {
@@ -53,7 +57,7 @@ src_install() {
 	dosed "s:DATADIR=.*:DATADIR=${GAMES_DATADIR}/${PN}:" ${GAMES_BINDIR}/torcs
 	cp -r ${WORKDIR}/{cars,categories,data,menu,tracks} \
 		"${D}/${GAMES_DATADIR}/${PN}/" \
-			|| die "cp failed"
+		|| die "cp failed"
 	dodoc README.linux
 	dohtml *.html *.png
 	prepgamesdirs
diff --git a/games-sports/torcs/torcs-1.2.4.ebuild b/games-sports/torcs/torcs-1.2.4.ebuild
index 47c0c1a62ebe..01a4381f81cf 100644
--- a/games-sports/torcs/torcs-1.2.4.ebuild
+++ b/games-sports/torcs/torcs-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/games-sports/torcs/torcs-1.2.4.ebuild,v 1.1 2005/08/27 23:54:15 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/torcs/torcs-1.2.4.ebuild,v 1.1.1.1 2005/11/30 09:39:02 chriswhite Exp $
 
 inherit games
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/torcs/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 DEPEND=">=media-libs/plib-1.8.3
diff --git a/games-sports/trigger/ChangeLog b/games-sports/trigger/ChangeLog
index 4c44eb39fc2f..8b8f06f8c606 100644
--- a/games-sports/trigger/ChangeLog
+++ b/games-sports/trigger/ChangeLog
@@ -1,6 +1,32 @@
 # ChangeLog for games-sports/trigger
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/trigger/ChangeLog,v 1.1 2004/10/20 07:59:57 mr_bones_ Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-sports/trigger/ChangeLog,v 1.1.1.1 2005/11/30 09:39:01 chriswhite Exp $
+
+  30 Jul 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/trigger-0.5.1c-glx-check.patch, trigger-0.5.1c.ebuild:
+  Refine the glx version check #100374 by David Grant.
+
+  26 Jul 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  trigger-0.5.1c.ebuild:
+  mention ~/.trigger/trigger.config in pkg_postinst
+
+  26 Jul 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  -trigger-0.5.0.ebuild, -trigger-0.5.1.ebuild:
+  clean old versions
+
+*trigger-0.5.1c (09 May 2005)
+
+  09 May 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +trigger-0.5.1c.ebuild:
+  version bump (bug #91933)
+
+  19 Dec 2004; Simon Stelling <blubb@gentoo.org> trigger-0.5.1.ebuild:
+  added ~amd64
+
+*trigger-0.5.1 (13 Dec 2004)
+
+  13 Dec 2004; Mike Frysinger <vapier@gentoo.org> +trigger-0.5.1.ebuild:
+  Version bump.
 
 *trigger-0.5.0 (20 Oct 2004)
 
diff --git a/games-sports/trigger/Manifest b/games-sports/trigger/Manifest
index f8688a547a1e..e19b5a9bc6d3 100644
--- a/games-sports/trigger/Manifest
+++ b/games-sports/trigger/Manifest
@@ -1,2 +1,15 @@
-MD5 f67831f570c706f515a67039ef02d562 trigger-0.5.0.ebuild 1312
-MD5 6335900eb78af89bd529db3b03af3cc0 files/digest-trigger-0.5.0 142
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 336c4b59fb55032317d71c5c05f80571 trigger-0.5.1c.ebuild 1389
+MD5 22912a8b6736c76adf016c8d33c52bbe ChangeLog 1180
+MD5 e39a2359502dafc730380be78246173f files/digest-trigger-0.5.1c 144
+MD5 fab012ed7b17d5eeb472e71a6c9c7c06 files/trigger-0.5.1c-glx-check.patch 590
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC7Hi9gIKl8Uu19MoRAjyuAJ4hpENqUnV0Xt+wIVqJgDbDP83vogCcDl+7
++cQkGVx+NigwItpbB6YzJxw=
+=7nuf
+-----END PGP SIGNATURE-----
diff --git a/games-sports/trigger/files/trigger-0.5.1c-glx-check.patch b/games-sports/trigger/files/trigger-0.5.1c-glx-check.patch
index 6eaef541beff..185a407b0fb7 100644
--- a/games-sports/trigger/files/trigger-0.5.1c-glx-check.patch
+++ b/games-sports/trigger/files/trigger-0.5.1c-glx-check.patch
@@ -4,7 +4,7 @@ http://bugs.gentoo.org/100374
 
 --- src/pengine/glew.c
 +++ src/pengine/glew.c
-@@ -5737,7 +5737,7 @@
+@@ -5737,13 +5737,13 @@
    s = glGetString(GL_VERSION);
    if (!s) return GLEW_ERROR_NO_GL_VERSION;
    i = _glewStrCLen(s, '.')+1;
@@ -13,3 +13,10 @@ http://bugs.gentoo.org/100374
    {
      return GLEW_ERROR_GL_VERSION_10_ONLY;
    }
+   else
+   {
+-    if (s[i] >= '5')
++    if (s[0] >= '2' || s[i] >= '5')
+     {
+       GLEW_VERSION_1_1 = GL_TRUE;
+       GLEW_VERSION_1_2 = GL_TRUE;
diff --git a/games-sports/trigger/trigger-0.5.1c.ebuild b/games-sports/trigger/trigger-0.5.1c.ebuild
index 91c02a9916a3..c97f442e23cd 100644
--- a/games-sports/trigger/trigger-0.5.1c.ebuild
+++ b/games-sports/trigger/trigger-0.5.1c.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-sports/trigger/trigger-0.5.1c.ebuild,v 1.1 2005/05/09 00:11:55 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/trigger/trigger-0.5.1c.ebuild,v 1.1.1.1 2005/11/30 09:39:01 chriswhite Exp $
 
-inherit games
+inherit eutils games
 
 PSOURCE="${P}-src"
 PDATA="${P}-data"
@@ -27,6 +27,12 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${PSOURCE}
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-glx-check.patch
+}
+
 src_compile() {
 	egamesconf --datadir="${GAMES_DATADIR}/${PN}" || die
 	jam || "jam failed"
@@ -43,3 +49,10 @@ src_install() {
 	dodoc ../${PDATA}/{README.txt,README-stereo.txt}
 	prepgamesdirs
 }
+
+pkg_postinst() {
+	games_pkg_postinst
+	einfo "After running ${PN} for the first time, a config file is"
+	einfo "available in ~/.trigger/trigger.config"
+	echo
+}
diff --git a/games-sports/trophy/ChangeLog b/games-sports/trophy/ChangeLog
index 2b1c0af25c07..39c358de0bfa 100644
--- a/games-sports/trophy/ChangeLog
+++ b/games-sports/trophy/ChangeLog
@@ -1,6 +1,10 @@
-# ChangeLog for app-games/trophy
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/trophy/ChangeLog,v 1.1 2003/09/11 12:26:35 vapier Exp $
+# ChangeLog for games-sports/trophy
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-sports/trophy/ChangeLog,v 1.1.1.1 2005/11/30 09:39:02 chriswhite Exp $
+
+  25 Mar 2005; Michael Sterrett <mr_bones_@gentoo.org> trophy-1.1.3.ebuild:
+  add patch from debian for gcc-34 support (bug #84329); add icon, man page
+  (also from debian); add desktop entry; tidy
 
 *trophy-1.1.3 (31 Aug 2003)
 
diff --git a/games-sports/trophy/Manifest b/games-sports/trophy/Manifest
index fbbf5efcbc60..7276a3260def 100644
--- a/games-sports/trophy/Manifest
+++ b/games-sports/trophy/Manifest
@@ -1,3 +1,4 @@
-MD5 151be9101f56c25215330c6d473bdb51 files/digest-trophy-1.1.3 69
-MD5 3759b811c792b50620f47f70f1ab2783 trophy-1.1.3.ebuild 996
-MD5 8637ccc2ae2ab8c6dfb2355ff43bbddc ChangeLog 383
+MD5 a4331eac77bdfcee644ccb06fe42cd48 ChangeLog 580
+MD5 f4c10886ae82cc61f65dbc48d9f4e5d6 trophy-1.1.3.ebuild 1483
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 65452e9d6da090321d5c8e4551fad3d4 files/digest-trophy-1.1.3 134
diff --git a/games-sports/trophy/files/digest-trophy-1.1.3 b/games-sports/trophy/files/digest-trophy-1.1.3
index 1374be9d805d..d9051a963c0b 100644
--- a/games-sports/trophy/files/digest-trophy-1.1.3
+++ b/games-sports/trophy/files/digest-trophy-1.1.3
@@ -1 +1,2 @@
 MD5 45a8c6eec9ab5d110660a32416d1ec8f trophy-1.1.3-src.tar.gz 9330835
+MD5 b58571da1a90f378fcf911d1555fc710 trophy_1.1.3-2.diff.gz 6507
diff --git a/games-sports/trophy/metadata.xml b/games-sports/trophy/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-sports/trophy/metadata.xml
+++ b/games-sports/trophy/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-sports/trophy/trophy-1.1.3.ebuild b/games-sports/trophy/trophy-1.1.3.ebuild
index 29d02accd12c..c4e522f0dcd9 100644
--- a/games-sports/trophy/trophy-1.1.3.ebuild
+++ b/games-sports/trophy/trophy-1.1.3.ebuild
@@ -1,45 +1,57 @@
-# 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-sports/trophy/trophy-1.1.3.ebuild,v 1.1 2003/09/11 12:26:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/trophy/trophy-1.1.3.ebuild,v 1.1.1.1 2005/11/30 09:39:02 chriswhite Exp $
 
-inherit games
+inherit eutils flag-o-matic games
 
 MY_P="${P}-src"
-S="${WORKDIR}/${MY_P}"
 DESCRIPTION="2D Racing Game"
 HOMEPAGE="http://trophy.sourceforge.net/"
-SRC_URI="mirror://sourceforge/trophy/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/trophy/${MY_P}.tar.gz
+	mirror://debian/pool/main/t/trophy/${PN}_${PV}-2.diff.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="amd64 x86"
+IUSE=""
 
-DEPEND="=clanlib-0.6.5*
-	>=hermes-1.3.2
-	>=zlib-1.1.3"
+DEPEND="=dev-games/clanlib-0.6.5*
+	>=media-libs/hermes-1.3.2
+	>=sys-libs/zlib-1.1.3"
 
-pkg_setup() {
-	clanlib-config 0.6.5
-}
+S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
+	epatch "${WORKDIR}/${PN}_${PV}-2.diff"
 	find -name ".cvsignore" -exec rm -f \{\} \;
+	sed -i \
+		-e '/^EXTERN_LIBS/s:= := ${LDFLAGS} :' \
+		-e 's:-O3::' \
+		trophy/Makefile.in \
+		|| die "sed failed"
 }
 
 src_compile() {
 	cd trophy
 	autoconf || die "autoconf failed"
+	append-flags -I${ROOT}/usr/include/clanlib-0.6.5
+	append-ldflags -L${ROOT}/usr/lib/clanlib-0.6.5
 	egamesconf || die
 	emake || die "emake failed"
 }
 
 src_install() {
-	dogamesbin trophy/trophy
-	dodir ${GAMES_DATADIR}/trophy/resources
-	cp -R trophy/resources/* ${D}${GAMES_DATADIR}/trophy/resources
-	cp trophy/resources.scr ${D}${GAMES_DATADIR}/trophy/
+	dogamesbin trophy/trophy || die
+	dodir "${GAMES_DATADIR}/trophy/resources"
+	cp -R trophy/resources/* "${D}${GAMES_DATADIR}/trophy/resources" \
+		|| die "cp failed"
+	cp trophy/resources.scr "${D}${GAMES_DATADIR}/trophy/" \
+		|| die "cp failed"
 	dodoc AUTHORS README TODO ChangeLog
+	doman debian/trophy.6
+	doicon debian/trophy.xpm
+	make_desktop_entry trophy Trophy trophy.xpm
 	prepgamesdirs
 }
diff --git a/games-strategy/asc/ChangeLog b/games-strategy/asc/ChangeLog
index f0b3d38a4d7d..f2634dd2f641 100644
--- a/games-strategy/asc/ChangeLog
+++ b/games-strategy/asc/ChangeLog
@@ -1,6 +1,70 @@
-# ChangeLog for app-games/asc
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/asc/ChangeLog,v 1.1 2003/09/10 05:27:31 vapier Exp $
+# ChangeLog for games-strategy/asc
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/asc/ChangeLog,v 1.1.1.1 2005/11/30 09:36:44 chriswhite Exp $
+
+  24 Aug 2005; Michael Sterrett <mr_bones_@gentoo.org> -asc-1.15.1.0.ebuild,
+  -asc-1.15.2.1.ebuild, -asc-1.15.3.0.ebuild, -asc-1.16.0.0.ebuild,
+  -asc-1.16.1.0.ebuild:
+  clean older ebuilds
+
+  24 Aug 2005; Michael Sterrett <mr_bones_@gentoo.org> asc-1.16.2.0.ebuild:
+  stable for x86
+
+*asc-1.16.2.0 (08 Aug 2005)
+
+  08 Aug 2005; Michael Sterrett <mr_bones_@gentoo.org> +asc-1.16.2.0.ebuild:
+  version bump
+
+*asc-1.16.1.0 (18 Jul 2005)
+
+  18 Jul 2005; Michael Sterrett <mr_bones_@gentoo.org> +asc-1.16.1.0.ebuild:
+  version bump - ebuild submitted by Robert Schuster via bug #99423
+
+*asc-1.16.0.0 (04 May 2005)
+
+  04 May 2005; Michael Sterrett <mr_bones_@gentoo.org> +asc-1.16.0.0.ebuild:
+  version bump
+
+*asc-1.15.3.0 (14 Feb 2005)
+
+  14 Feb 2005; Michael Sterrett <mr_bones_@gentoo.org> +asc-1.15.3.0.ebuild:
+  version bump
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*asc-1.15.2.1 (01 Dec 2004)
+
+  01 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org> +asc-1.15.2.1.ebuild:
+  version bump
+
+*asc-1.15.1.0 (15 Oct 2004)
+
+  15 Oct 2004; Michael Sterrett <mr_bones_@gentoo.org> +asc-1.15.1.0.ebuild:
+  version bump (bug #67005)
+
+  24 Sep 2004; Michael Sterrett <mr_bones_@gentoo.org> -asc-1.13.8.0.ebuild,
+  -asc-1.14.0.0.ebuild:
+  clean older versions
+
+  24 Sep 2004; Michael Sterrett <mr_bones_@gentoo.org> asc-1.15.0.0.ebuild:
+  no need to depend on media-libs/paragui if we're not using it
+
+  21 Sep 2004; Michael Sterrett <mr_bones_@gentoo.org> asc-1.15.0.0.ebuild:
+  Added --disable-paragui for bug #61154
+
+  24 Jun 2004; Chris Gianelloni <wolf31o2@gentoo.org> asc-1.15.0.0.ebuild:
+  Changed DEPEND for libsigc and closing bug #55004.
+
+*asc-1.15.0.0 (23 Jun 2004)
+
+  23 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> +asc-1.15.0.0.ebuild:
+  version bump (bug #54845)
+
+*asc-1.14.0.0 (06 Mar 2004)
+
+  06 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> asc-1.14.0.0.ebuild:
+  version bump (bug #43707)
 
 *asc-1.13.8.0 (25 Aug 2003)
 
@@ -33,7 +97,7 @@
   31 Jul 2002; J.Alberto S. L. <bass@gentoo.org> asc-1.10.2.ebuild-r1:
   Fix #4488 adding '--disable-paraguitest' to configure.
 
-  17 jul 2002; Jose Alberto Su�rez L�pez <bass@gentoo.org> asc-1.10.2.ebuild :
+  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> asc-1.10.2.ebuild :
   Added KEYWORDS.
 
   7 May 2002; Spider <spider@gentoo.org> asc-1.10.2.ebuild :
diff --git a/games-strategy/asc/Manifest b/games-strategy/asc/Manifest
index 4b5eac493f39..0e5aaafc874f 100644
--- a/games-strategy/asc/Manifest
+++ b/games-strategy/asc/Manifest
@@ -1,7 +1,6 @@
-MD5 7874f9964931627ef1b4c1194ebab09f ChangeLog 1855
-MD5 7107717fc59ad1c187f7c5d4cc6fd179 asc-1.13.5.1.ebuild 818
-MD5 7de1a299c32f061019274067b6f56d1a asc-1.13.7.ebuild 1152
-MD5 03ffa389c68558f6848707f67500ca35 asc-1.13.8.0.ebuild 1179
-MD5 ad2db9452b5222bf9e38bd77b67770e8 files/digest-asc-1.13.5.1 72
-MD5 e9372d3da988154fb04077ec52d97798 files/digest-asc-1.13.7 255
-MD5 c0fb0782ebad228be904ece172d4393f files/digest-asc-1.13.8.0 257
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 b518fd7a3544432b96fc8e816c0d1a0e asc-1.15.0.0.ebuild 1411
+MD5 9dfa5d8d82a6ff2858c18f4dc57fc651 asc-1.16.2.0.ebuild 1201
+MD5 0abb89926b9baee78253def80c231e7e ChangeLog 3830
+MD5 69e8595ca135fde8e3d676e97fc065dc files/digest-asc-1.16.2.0 80
+MD5 5d6d0477b40fe3370934e5e3330b3d3e files/digest-asc-1.15.0.0 257
diff --git a/games-strategy/asc/asc-1.15.0.0.ebuild b/games-strategy/asc/asc-1.15.0.0.ebuild
index 3e3906006c80..625e000d65d0 100644
--- a/games-strategy/asc/asc-1.15.0.0.ebuild
+++ b/games-strategy/asc/asc-1.15.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/games-strategy/asc/asc-1.15.0.0.ebuild,v 1.1 2004/06/24 00:09:32 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/asc/asc-1.15.0.0.ebuild,v 1.1.1.1 2005/11/30 09:36:44 chriswhite Exp $
 
 inherit games
 
@@ -16,14 +16,13 @@ SLOT="0"
 KEYWORDS="x86"
 IUSE=""
 
-RDEPEND="virtual/glibc
+RDEPEND="virtual/libc
 	app-arch/bzip2
 	>=media-libs/libsdl-1.2
 	media-libs/sdl-image
 	media-libs/sdl-mixer
 	>=media-libs/sdlmm-0.1.8
-	>=dev-libs/libsigc++-1.2
-	>=media-libs/paragui-1.0.1"
+	=dev-libs/libsigc++-1.2*"
 DEPEND="${RDEPEND}
 	app-arch/zip"
 
@@ -34,11 +33,14 @@ src_unpack() {
 
 src_compile() {
 	# Added --disable-paraguitest for bugs 26402 and 4488
+	# Added --disable-paragui for bug 61154 since it's not really used much
+	# and the case is well documented at http://www.asc-hq.org/
 	egamesconf \
-		--datadir="${GAMES_DATADIR_BASE}" \
 		--disable-dependency-tracking \
 		--disable-paraguitest \
-			|| die
+		--disable-paragui \
+		--datadir="${GAMES_DATADIR_BASE}" \
+		|| die
 	emake || die "emake failed"
 }
 
diff --git a/games-strategy/asc/asc-1.16.2.0.ebuild b/games-strategy/asc/asc-1.16.2.0.ebuild
index a60821f69a0d..111568a8bf79 100644
--- a/games-strategy/asc/asc-1.16.2.0.ebuild
+++ b/games-strategy/asc/asc-1.16.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/games-strategy/asc/asc-1.16.2.0.ebuild,v 1.1 2005/08/08 06:27:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/asc/asc-1.16.2.0.ebuild,v 1.1.1.1 2005/11/30 09:36:44 chriswhite Exp $
 
 inherit games
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/asc-hq/asc-source+music-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND="app-arch/bzip2
diff --git a/games-strategy/asc/metadata.xml b/games-strategy/asc/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-strategy/asc/metadata.xml
+++ b/games-strategy/asc/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-strategy/attal/ChangeLog b/games-strategy/attal/ChangeLog
index b60ec0b2d255..e2bd1b1f4b64 100644
--- a/games-strategy/attal/ChangeLog
+++ b/games-strategy/attal/ChangeLog
@@ -1,11 +1,65 @@
-# ChangeLog for app-games/attal
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/attal/ChangeLog,v 1.1 2003/09/10 05:27:31 vapier Exp $
+# ChangeLog for games-strategy/attal
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/attal/ChangeLog,v 1.1.1.1 2005/11/30 09:36:39 chriswhite Exp $
 
-  26 Aug 2003; Michael Sterrett <msterret@gentoo.org> attal-0.7.0.ebuild:
-  fix url. bug 27378
+*attal-0.9.4 (10 Oct 2005)
+
+  10 Oct 2005; Michael Sterrett <mr_bones_@gentoo.org> +attal-0.9.4.ebuild:
+  version bump
+
+  26 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> attal-0.8.1.ebuild,
+  attal-0.9.2.ebuild:
+  Making games last on inherit line.
+
+  07 Jul 2005; Caleb Tennis <caleb@gentoo.org> attal-0.8.1.ebuild,
+  attal-0.9.2.ebuild, attal-0.9.3.ebuild:
+  Fix qt dep
+
+  01 Jul 2005; Caleb Tennis <caleb@gentoo.org> attal-0.8.1.ebuild,
+  attal-0.9.2.ebuild, attal-0.9.3.ebuild:
+  Fix qmake dir per bug #97535
+
+  12 Jun 2005; Sven Wegener <swegener@gentoo.org> attal-0.8.1.ebuild,
+  attal-0.9.2.ebuild, attal-0.9.3.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+*attal-0.9.3 (03 Jun 2005)
+
+  03 Jun 2005; Michael Sterrett <mr_bones_@gentoo.org> +attal-0.9.3.ebuild:
+  version bump
+
+*attal-0.9.3 (03 Jun 2005)
+
+  03 Jun 2005; Michael Sterrett <mr_bones_@gentoo.org> +attal-0.9.3.ebuild:
+  version bump
+
+*attal-0.9.2 (03 Jan 2005)
+
+  03 Jan 2005; Mike Frysinger <vapier@gentoo.org> +attal-0.9.2.ebuild:
+  Version bump #65237 by James Rose.
+
+  16 Jul 2004; David Holm <dholm@gentoo.org> attal-0.8.1.ebuild:
+  Added to ~ppc.
+
+*attal-0.8.1 (09 Jul 2004)
+
+  09 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> +attal-0.8.1.ebuild:
+  version bump (bug #56495)
+
+*attal-0.7.2 (14 Jan 2004)
+
+  14 Jan 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #37754 by Daniel Fullmer.
+
+*attal-0.7.1 (03 Dec 2003)
+
+  03 Dec 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump to fix #34857.
 
 *attal-0.7.0 (19 Jul 2003)
 
+  26 Aug 2003; Michael Sterrett <msterret@gentoo.org> attal-0.7.0.ebuild:
+  Fix url #27378.
+
   19 Jul 2003; Mike Frysinger <vapier@gentoo.org> :
   Initial import.  Ebuild submitted by me.
diff --git a/games-strategy/attal/Manifest b/games-strategy/attal/Manifest
index ca1296d4d7fe..66be487fe3ee 100644
--- a/games-strategy/attal/Manifest
+++ b/games-strategy/attal/Manifest
@@ -1,3 +1,7 @@
-MD5 b7d66da20c93fca142b8de691a5a6576 ChangeLog 433
-MD5 6e10ee81c5c86bd6d9c22d70e1d206da attal-0.7.0.ebuild 1451
-MD5 7545ac2d3b584f67ba1cb78345fb50db files/digest-attal-0.7.0 127
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 b88954c0e1374dd745c4c3f4cf06ab54 attal-0.9.4.ebuild 1652
+MD5 58f0441145a6af228eb92061fabace12 ChangeLog 1945
+MD5 e7d96ecaa21ce83b7dde3ddc05b4c0e9 attal-0.9.3.ebuild 1846
+MD5 bc43ed577df6439f1a168a4441031b6c files/0.8.1-gcc34.patch 436
+MD5 5e4899bfee7e24bbf648aef045222196 files/digest-attal-0.9.3 135
+MD5 95b5c9723295ad8d5b134c3c46a463ed files/digest-attal-0.9.4 135
diff --git a/games-strategy/attal/attal-0.9.3.ebuild b/games-strategy/attal/attal-0.9.3.ebuild
index d6fe5333202e..30a0c7ef5835 100644
--- a/games-strategy/attal/attal-0.9.3.ebuild
+++ b/games-strategy/attal/attal-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/games-strategy/attal/attal-0.9.3.ebuild,v 1.1 2005/06/03 05:36:12 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/attal/attal-0.9.3.ebuild,v 1.1.1.1 2005/11/30 09:36:39 chriswhite Exp $
 
 inherit eutils flag-o-matic games
 
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="ppc x86"
 IUSE=""
 
-DEPEND=">=x11-libs/qt-3*"
+DEPEND="=x11-libs/qt-3*"
 
 S=${WORKDIR}/${MY_P}
 
@@ -31,7 +31,7 @@ src_unpack() {
 		-e "s:\"\./:\"${GAMES_DATADIR}/${PN}/:" \
 		libCommon/displayHelp.cpp \
 		|| die "sed failed"
-	qmake -o Makefile Makefile.pro || die "qmake failed"
+	${QTDIR}/bin/qmake -o Makefile Makefile.pro || die "qmake failed"
 	sed -i \
 		"s:\./themes/:${GAMES_DATADIR}/${PN}/themes/:" \
 		`grep -Rl '\./themes/' *` \
diff --git a/games-strategy/attal/attal-0.9.4.ebuild b/games-strategy/attal/attal-0.9.4.ebuild
index aa281523ea21..ea4088ddfe20 100644
--- a/games-strategy/attal/attal-0.9.4.ebuild
+++ b/games-strategy/attal/attal-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/games-strategy/attal/attal-0.9.4.ebuild,v 1.1 2005/10/10 07:01:31 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/attal/attal-0.9.4.ebuild,v 1.1.1.1 2005/11/30 09:36:39 chriswhite Exp $
 
 inherit eutils flag-o-matic games
 
diff --git a/games-strategy/attal/metadata.xml b/games-strategy/attal/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-strategy/attal/metadata.xml
+++ b/games-strategy/attal/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-strategy/boson/ChangeLog b/games-strategy/boson/ChangeLog
index 50c55a041844..5300559465f6 100644
--- a/games-strategy/boson/ChangeLog
+++ b/games-strategy/boson/ChangeLog
@@ -1,6 +1,49 @@
-# ChangeLog for app-games/boson
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/boson/ChangeLog,v 1.1 2003/09/10 05:27:31 vapier Exp $
+# ChangeLog for games-strategy/boson
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/boson/ChangeLog,v 1.1.1.1 2005/11/30 09:36:38 chriswhite Exp $
+
+  18 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> boson-0.11.ebuild:
+  Stable on ppc.
+
+  03 Nov 2005; Michael Sterrett <mr_bones_@gentoo.org> boson-0.11.ebuild:
+  stable for x86
+
+*boson-0.11 (03 Sep 2005)
+
+  03 Sep 2005; Mike Frysinger <vapier@gentoo.org> +boson-0.11.ebuild:
+  Version bump #104656 by Jose Marino.
+
+  21 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> boson-0.10.ebuild:
+  Stable on ppc.
+
+  25 Jan 2005; Gregorio Guidi <greg_g@gentoo.org> boson-0.10.ebuild:
+  Use properly the kde eclasses, and do not install in KDEDIR.
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> boson-0.9.1.ebuild:
+  Changed deps on kdegames, kdemultimedia to accept kdegames-meta and
+  kdemultimedia-meta, the split 'meta' packages. This dep will be narrowed
+  down in the future to the precise split packages required.
+
+  03 Jul 2004; Carsten Lohrke <carlo@gentoo.org> boson-0.10.ebuild,
+  boson-0.9.1.ebuild:
+  QA: need-kde after R/DEPEND
+
+*boson-0.10 (10 May 2004)
+
+  10 May 2004; Michael Sterrett <mr_bones_@gentoo.org> boson-0.10.ebuild:
+  version bump; dep patch from David Holm via bug #49921
+
+*boson-0.9.1 (16 Nov 2003)
+
+  16 Nov 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump.
+
+*boson-0.9 (04 Nov 2003)
+
+  04 Nov 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #32680.
+
+*boson-0.8 (21 Jun 2003)
 
   03 Sep 2003; Michael Sterrett <msterret@gentoo.org> boson-0.8.ebuild:
   added Gentoo Technologies, Inc. to Copyright line
@@ -8,8 +51,6 @@
   31 Aug 2003; Michael Sterrett <msterret@gentoo.org> boson-0.8.ebuild:
   inherit kde-base -> inherit kde; error message for emake
 
-*boson-0.8 (21 Jun 2003)
-
   21 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
   Version bump for #18553.
 
diff --git a/games-strategy/boson/Manifest b/games-strategy/boson/Manifest
index 9ba4856a4c6a..3bcfed3d684e 100644
--- a/games-strategy/boson/Manifest
+++ b/games-strategy/boson/Manifest
@@ -1,3 +1,6 @@
-MD5 f00f40a6ba5ffb266717d230b4d5a488 ChangeLog 1156
-MD5 8a5a6084b4eb17efc0637d6f60d44f3b boson-0.8.ebuild 1039
-MD5 3bd1cabd68c370c250e5b5ce7c59008c files/digest-boson-0.8 137
+MD5 2536460603d11ba6b83e75e7ffffeb18 boson-0.10.ebuild 789
+MD5 9fd5d28a696860e2970c44565c52794e boson-0.11.ebuild 789
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 7057cef9b239b48d51149872b0469e08 ChangeLog 2452
+MD5 43f16f935098f0d6b11972aa820adbef files/digest-boson-0.10 69
+MD5 47de16314e87d8d2e20c957b7bc51c5c files/digest-boson-0.11 69
diff --git a/games-strategy/boson/boson-0.10.ebuild b/games-strategy/boson/boson-0.10.ebuild
index 417d3bbad836..030ec0ca1f73 100644
--- a/games-strategy/boson/boson-0.10.ebuild
+++ b/games-strategy/boson/boson-0.10.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc. and Thomas Capricelli <orzel@kde.org>
+# Copyright 1999-2005 Gentoo Foundation and Thomas Capricelli <orzel@kde.org>
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/boson/boson-0.10.ebuild,v 1.1 2004/05/10 21:00:51 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/boson/boson-0.10.ebuild,v 1.1.1.1 2005/11/30 09:36:38 chriswhite Exp $
 
 inherit kde
-need-kde 3
 
 DESCRIPTION="real-time strategy game, with the feeling of Command&Conquer(tm) (needs at least 2 ppl to play)"
 HOMEPAGE="http://boson.sourceforge.net/"
@@ -11,27 +10,20 @@ SRC_URI="mirror://sourceforge/boson/boson-all-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc -sparc"
+KEYWORDS="x86 ppc -sparc"
 IUSE="opengl"
 
 DEPEND="media-libs/lib3ds
 	>=media-libs/openal-20040303
+	kde-base/arts
 	opengl? ( virtual/opengl )"
+need-kde 3
 
-S="${WORKDIR}/${PN}-all-${PV}"
+S=${WORKDIR}/${PN}-all-${PV}
 
 src_compile() {
-	./configure \
-		--disable-debug \
-		--with-xinerama \
-		`use_with opengl gl` \
-		--host=${CHOST} \
-		--prefix=${KDEDIR} \
-		|| die "./configure failed"
-	emake -j1 || die "emake failed"
-}
+	myconf="$(use_with opengl gl)"
+	MAKEOPTS="${MAKEOPTS} -j1"
 
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
+	kde_src_compile
 }
diff --git a/games-strategy/boson/boson-0.11.ebuild b/games-strategy/boson/boson-0.11.ebuild
index d3e47595c903..40b54bea4e87 100644
--- a/games-strategy/boson/boson-0.11.ebuild
+++ b/games-strategy/boson/boson-0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation and Thomas Capricelli <orzel@kde.org>
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/boson/boson-0.11.ebuild,v 1.1 2005/09/03 03:39:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/boson/boson-0.11.ebuild,v 1.1.1.1 2005/11/30 09:36:38 chriswhite Exp $
 
 inherit kde
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/boson/boson-all-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc -sparc ~x86"
+KEYWORDS="ppc -sparc x86"
 IUSE="opengl"
 
 DEPEND="media-libs/lib3ds
diff --git a/games-strategy/boson/metadata.xml b/games-strategy/boson/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-strategy/boson/metadata.xml
+++ b/games-strategy/boson/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-strategy/castle-combat/ChangeLog b/games-strategy/castle-combat/ChangeLog
index 4d0c50025069..ebf7115dc728 100644
--- a/games-strategy/castle-combat/ChangeLog
+++ b/games-strategy/castle-combat/ChangeLog
@@ -1,6 +1,17 @@
-# ChangeLog for app-games/castle-combat
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/castle-combat/ChangeLog,v 1.1 2003/09/10 05:27:31 vapier Exp $
+# ChangeLog for games-strategy/castle-combat
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/castle-combat/ChangeLog,v 1.1.1.1 2005/11/30 09:36:44 chriswhite Exp $
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org>
+  castle-combat-0.7.4.ebuild:
+  Stable on ppc.
+
+  08 Nov 2004; Joseph Jezak <josejx@gentoo.org> castle-combat-0.7.4.ebuild:
+  Added ~ppc.
+
+  03 May 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  castle-combat-0.7.4.ebuild:
+  IUSE; tidy
 
   12 Jul 2003; Michael Sterrett <msterret@gentoo.org>
   castle-combat-0.7.4.ebuild:
diff --git a/games-strategy/castle-combat/Manifest b/games-strategy/castle-combat/Manifest
index 935a9083a170..8a5c61e3734a 100644
--- a/games-strategy/castle-combat/Manifest
+++ b/games-strategy/castle-combat/Manifest
@@ -1,3 +1,4 @@
-MD5 c20a365ca7b572f673ca752a55f0c0cf castle-combat-0.7.4.ebuild 1040
-MD5 7500ddb36ab91a68a32c1c743f9ef624 ChangeLog 563
+MD5 9362b0596d378c78447f4d8919f2bdcb castle-combat-0.7.4.ebuild 1026
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 b20a553f8f7c966acb4d1f07de8efdfa ChangeLog 854
 MD5 37e5708f0a9f145368ab18e210450934 files/digest-castle-combat-0.7.4 72
diff --git a/games-strategy/castle-combat/castle-combat-0.7.4.ebuild b/games-strategy/castle-combat/castle-combat-0.7.4.ebuild
index 0ac1a32ae254..7d32cd3fc793 100644
--- a/games-strategy/castle-combat/castle-combat-0.7.4.ebuild
+++ b/games-strategy/castle-combat/castle-combat-0.7.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/games-strategy/castle-combat/castle-combat-0.7.4.ebuild,v 1.1 2003/09/10 05:27:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/castle-combat/castle-combat-0.7.4.ebuild,v 1.1.1.1 2005/11/30 09:36:44 chriswhite Exp $
 
 inherit games
 
@@ -10,9 +10,10 @@ SRC_URI="http://user.cs.tu-berlin.de/~karlb/castle-combat/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86"
+KEYWORDS="x86 ppc"
+IUSE=""
 
-RDEPEND="virtual/glibc
+RDEPEND="virtual/libc
 	sys-libs/zlib
 	media-libs/libpng
 	media-libs/libsdl
@@ -26,16 +27,13 @@ src_unpack() {
 	cd ${S}
 	# dist file seems to include a copy of SDL_net.  Take it out so we link
 	# against the system copy instead.
-	sed -i -e "s/SDL_net//" src/Makefile.in || die "sed src/Makefile.in failed"
-}
-
-src_compile() {
-	egamesconf || die
-	emake || die
+	sed -i \
+		-e "s/SDL_net//" src/Makefile.in \
+			|| die "sed src/Makefile.in failed"
 }
 
 src_install() {
-	make install DESTDIR=${D} || die
+	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS ChangeLog README TODO || die "dodoc failed"
 	prepgamesdirs
 }
diff --git a/games-strategy/castle-combat/metadata.xml b/games-strategy/castle-combat/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-strategy/castle-combat/metadata.xml
+++ b/games-strategy/castle-combat/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-strategy/crimson/ChangeLog b/games-strategy/crimson/ChangeLog
index 68c492c768c9..f273599c4421 100644
--- a/games-strategy/crimson/ChangeLog
+++ b/games-strategy/crimson/ChangeLog
@@ -1,6 +1,86 @@
-# ChangeLog for app-games/crimson
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/crimson/ChangeLog,v 1.1 2003/09/10 05:27:31 vapier Exp $
+# ChangeLog for games-strategy/crimson
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/crimson/ChangeLog,v 1.1.1.1 2005/11/30 09:36:42 chriswhite Exp $
+
+*crimson-0.4.9 (15 Oct 2005)
+
+  15 Oct 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +crimson-0.4.9.ebuild:
+  version bump
+
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+*crimson-0.4.8 (09 Jun 2005)
+
+  09 Jun 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +crimson-0.4.8.ebuild:
+  version bump
+
+  04 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> crimson-0.4.7.ebuild:
+  Stable on sparc
+
+  28 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org> crimson-0.4.6.ebuild:
+  Stable on sparc
+
+*crimson-0.4.7 (22 Feb 2005)
+
+  22 Feb 2005; Michael Sterrett <mr_bones_@gentoo.org> +crimson-0.4.7.ebuild:
+  version bump
+
+  31 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> crimson-0.4.6.ebuild:
+  Keyworded ~sparc
+
+*crimson-0.4.6 (21 Jan 2005)
+
+  21 Jan 2005; Michael Sterrett <mr_bones_@gentoo.org> +crimson-0.4.6.ebuild:
+  version bump (bug #78710)
+
+  07 Nov 2004; Joseph Jezak <josejx@gentoo.org> crimson-0.4.5.ebuild:
+  Marked ppc stable.
+
+*crimson-0.4.5 (16 Oct 2004)
+
+  16 Oct 2004; Michael Sterrett <mr_bones_@gentoo.org> +crimson-0.4.5.ebuild:
+  version bump (bug #67571)
+
+*crimson-0.4.4 (25 Sep 2004)
+
+  25 Sep 2004; Michael Sterrett <mr_bones_@gentoo.org> +crimson-0.4.4.ebuild:
+  version bump
+
+  28 Aug 2004; David Holm <dholm@gentoo.org> crimson-0.4.3.ebuild:
+  Added to ~ppc.
+
+*crimson-0.4.3 (06 Aug 2004)
+
+  06 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org> +crimson-0.4.3.ebuild:
+  version bump
+
+  04 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> crimson-0.4.0.ebuild:
+  clean older ebuild
+
+*crimson-0.4.2 (10 May 2004)
+
+  10 May 2004; Michael Sterrett <mr_bones_@gentoo.org> crimson-0.4.2.ebuild:
+  version bump
+
+  19 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> crimson-0.3.5.ebuild,
+  crimson-0.3.6.ebuild, crimson-0.3.7.ebuild:
+  clean out 0.3
+
+*crimson-0.4.0 (24 Feb 2004)
+
+  24 Feb 2004; Michael Sterrett <mr_bones_@gentoo.org> crimson-0.4.0.ebuild:
+  version bump
+
+  12 Dec 2003; Jon Portnoy <avenj@gentoo.org> :
+  AMD64 keywords.
+
+*crimson-0.3.7 (13 Oct 2003)
+
+  13 Oct 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump.
 
 *crimson-0.3.6 (04 Sep 2003)
 
@@ -22,4 +102,4 @@
 *crimson-0.3.0 (07 Mar 2003)
 
   07 Mar 2003; Mike Frysinger <vapier@gentoo.org> :
-  Initial import.  Ebuild submitted by Sami N��t�nen <sami.naatanen@kolumbus.fi> #15359.
+  Initial import.  Ebuild submitted by Sami Näätänen <sami.naatanen@kolumbus.fi> #15359.
diff --git a/games-strategy/crimson/Manifest b/games-strategy/crimson/Manifest
index 1e1ad25be79d..9fb01a814fc2 100644
--- a/games-strategy/crimson/Manifest
+++ b/games-strategy/crimson/Manifest
@@ -1,5 +1,6 @@
-MD5 5907935d07bddc00664d584f79e85d41 ChangeLog 844
-MD5 9da2e4774b5d7fc8352ee1e5a77ef766 crimson-0.3.6.ebuild 1122
-MD5 e1f86d30834f3ee173a24a904af487de crimson-0.3.5.ebuild 1114
-MD5 4b64ed31d5393441841c632c6966b4ab files/digest-crimson-0.3.6 66
-MD5 571a373b01d27d864351481dd6ca1d2b files/digest-crimson-0.3.5 66
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 c893b38a7c739adf4efcc95d058b58e5 crimson-0.4.8.ebuild 1400
+MD5 0bfaf9b8aa20bf6ac0927881dee5399f ChangeLog 2972
+MD5 13e4a71ae43273373505dbde91dd9ae6 crimson-0.4.9.ebuild 1400
+MD5 23e139bdaf8dfed3ecdaeed1968d9605 files/digest-crimson-0.4.8 66
+MD5 b9e29c0e98315d302745f0ffa3708abd files/digest-crimson-0.4.9 66
diff --git a/games-strategy/crimson/crimson-0.4.8.ebuild b/games-strategy/crimson/crimson-0.4.8.ebuild
index 33a219815b4f..332c2ac9a76e 100644
--- a/games-strategy/crimson/crimson-0.4.8.ebuild
+++ b/games-strategy/crimson/crimson-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/games-strategy/crimson/crimson-0.4.8.ebuild,v 1.1 2005/06/09 02:43:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/crimson/crimson-0.4.8.ebuild,v 1.1.1.1 2005/11/30 09:36:42 chriswhite Exp $
 
 inherit eutils games
 
diff --git a/games-strategy/crimson/crimson-0.4.9.ebuild b/games-strategy/crimson/crimson-0.4.9.ebuild
index 90244bcbe035..d4a240c27267 100644
--- a/games-strategy/crimson/crimson-0.4.9.ebuild
+++ b/games-strategy/crimson/crimson-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/games-strategy/crimson/crimson-0.4.9.ebuild,v 1.1 2005/10/15 03:02:45 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/crimson/crimson-0.4.9.ebuild,v 1.1.1.1 2005/11/30 09:36:42 chriswhite Exp $
 
 inherit eutils games
 
diff --git a/games-strategy/crimson/metadata.xml b/games-strategy/crimson/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-strategy/crimson/metadata.xml
+++ b/games-strategy/crimson/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-strategy/darwinia-demo/ChangeLog b/games-strategy/darwinia-demo/ChangeLog
index 84759d4783b5..8cafaf662668 100644
--- a/games-strategy/darwinia-demo/ChangeLog
+++ b/games-strategy/darwinia-demo/ChangeLog
@@ -1,6 +1,28 @@
 # ChangeLog for games-strategy/darwinia-demo
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/darwinia-demo/ChangeLog,v 1.1 2005/09/09 14:40:08 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/darwinia-demo/ChangeLog,v 1.1.1.1 2005/11/30 09:36:40 chriswhite Exp $
+
+  18 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  darwinia-demo-1.3.0.ebuild:
+  Changed icon/desktop entry to remove collision when I add the full game.
+
+*darwinia-demo-1.3.0 (14 Nov 2005)
+
+  14 Nov 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +darwinia-demo-1.3.0.ebuild:
+  version bump
+
+  21 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  darwinia-demo-1.2.1.ebuild:
+  Added addition dir variable to games_make_wrapper for bug #109793.
+
+  21 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  darwinia-demo-1.2.1.ebuild:
+  Changed check_license to explicitly list license to check.
+
+  11 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  darwinia-demo-1.2.1.ebuild:
+  Marking ~amd64 and changing dolib -> doexe so it works on amd64.
 
 *darwinia-demo-1.2.1 (09 Sep 2005)
 
diff --git a/games-strategy/darwinia-demo/Manifest b/games-strategy/darwinia-demo/Manifest
index 150ca3f6c790..86423d833a41 100644
--- a/games-strategy/darwinia-demo/Manifest
+++ b/games-strategy/darwinia-demo/Manifest
@@ -1,4 +1,6 @@
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 4f3c3e42fd3dc2beb28ca178b0617622 darwinia-demo-1.2.1.ebuild 1271
-MD5 f02d7fa1f21030e5162962f7df8f763a ChangeLog 743
+MD5 366b9ae40cefdc8390b90a179815af2a ChangeLog 1195
+MD5 38cfbdcb8228d0f101b563e72ec5e4c8 darwinia-demo-1.2.1.ebuild 1229
+MD5 da4635291d33b4bc448a71108a5606a6 darwinia-demo-1.3.0.ebuild 1331
 MD5 6fe9b0615e7cc2f7f599160298036626 files/digest-darwinia-demo-1.2.1 69
+MD5 5d81ea80171d9fb2c115bdcbb82087f3 files/digest-darwinia-demo-1.3.0 70
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
diff --git a/games-strategy/darwinia-demo/darwinia-demo-1.2.1.ebuild b/games-strategy/darwinia-demo/darwinia-demo-1.2.1.ebuild
index 74667cef58bd..dbc7a2bbb344 100644
--- a/games-strategy/darwinia-demo/darwinia-demo-1.2.1.ebuild
+++ b/games-strategy/darwinia-demo/darwinia-demo-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/games-strategy/darwinia-demo/darwinia-demo-1.2.1.ebuild,v 1.1 2005/09/09 14:40:08 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/darwinia-demo/darwinia-demo-1.2.1.ebuild,v 1.1.1.1 2005/11/30 09:36:40 chriswhite Exp $
 
 inherit eutils games
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.introversion.co.uk/darwinia/downloads/${P}.sh"
 
 LICENSE="Introversion"
 SLOT="0"
-KEYWORDS="-* ~x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 RESTRICT="nostrip"
 
@@ -19,7 +19,7 @@ dir=${GAMES_PREFIX_OPT}/${PN}
 Ddir=${D}/${dir}
 
 pkg_setup() {
-	check_license
+	check_license Introversion
 	games_pkg_setup
 }
 
@@ -28,20 +28,18 @@ src_unpack() {
 }
 
 src_install() {
-	dodir ${dir} ${GAMES_BINDIR} || die "failed to create dirs"
-	into ${dir}
-	dolib lib/lib{gcc_s.so.1,SDL-1.2.so.0,vorbis{.so.0,file.so.3},ogg.so.0} \
+	exeinto "${dir}/lib"
+	doexe lib/lib{gcc_s.so.1,SDL-1.2.so.0,vorbis{.so.0,file.so.3},ogg.so.0} \
 		|| die "Copying libraries"
-	exeinto ${dir}/lib
 	doexe lib/{darwinia.bin.x86,open-www.sh} || die "copying executables"
-	insinto ${dir}/lib
+	insinto "${dir}/lib"
 	doins lib/{sounds,main,language}.dat || die "copying data files"
-	insinto ${dir}
+	insinto "${dir}"
 	dodoc README || die "copying docs"
 
-	exeinto ${dir}
+	exeinto "${dir}"
 	doexe bin/Linux/x86/darwinia || die "couldn't do exe"
 
-	games_make_wrapper darwinia-demo ./darwinia ${dir}
+	games_make_wrapper darwinia-demo ./darwinia "${dir}" "${dir}"
 	prepgamesdirs
 }
diff --git a/games-strategy/darwinia-demo/darwinia-demo-1.3.0.ebuild b/games-strategy/darwinia-demo/darwinia-demo-1.3.0.ebuild
index a1fcf0bbea08..cb2e59069e3a 100644
--- a/games-strategy/darwinia-demo/darwinia-demo-1.3.0.ebuild
+++ b/games-strategy/darwinia-demo/darwinia-demo-1.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/games-strategy/darwinia-demo/darwinia-demo-1.3.0.ebuild,v 1.1 2005/11/14 03:35:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/darwinia-demo/darwinia-demo-1.3.0.ebuild,v 1.1.1.1 2005/11/30 09:36:40 chriswhite Exp $
 
 inherit eutils games
 
@@ -40,7 +40,7 @@ src_install() {
 	doexe bin/Linux/x86/darwinia || die "couldn't do exe"
 
 	games_make_wrapper darwinia-demo ./darwinia "${dir}" "${dir}"
-	newicon darwinian.png darwinia.png
-	make_desktop_entry darwinia-demo "Darwinia" darwinia.png
+	newicon darwinian.png darwinia-demo.png
+	make_desktop_entry darwinia-demo "Darwinia (Demo)" darwinia-demo.png
 	prepgamesdirs
 }
diff --git a/games-strategy/dominions2-demo-bin/ChangeLog b/games-strategy/dominions2-demo-bin/ChangeLog
index db4153ccf7cf..04e269f8fe43 100644
--- a/games-strategy/dominions2-demo-bin/ChangeLog
+++ b/games-strategy/dominions2-demo-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/dominions2-demo-bin
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/dominions2-demo-bin/ChangeLog,v 1.1 2004/08/08 07:14:18 mr_bones_ Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/dominions2-demo-bin/ChangeLog,v 1.1.1.1 2005/11/30 09:36:39 chriswhite Exp $
+
+  21 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  dominions2-demo-bin-2.08.ebuild:
+  Added addition dir variable to games_make_wrapper for bug #109793.
 
 *dominions2-demo-bin-2.08 (08 Aug 2004)
 
diff --git a/games-strategy/dominions2-demo-bin/Manifest b/games-strategy/dominions2-demo-bin/Manifest
index 26a66d417f0f..32b41caa1b2c 100644
--- a/games-strategy/dominions2-demo-bin/Manifest
+++ b/games-strategy/dominions2-demo-bin/Manifest
@@ -1,2 +1,4 @@
-MD5 9b8bd67c2c11a380141b8252395611b4 dominions2-demo-bin-2.08.ebuild 912
+MD5 054e92649526038df00f22a1b9c78805 ChangeLog 578
+MD5 5fc11c744651601c7fcbfd8dab42a923 dominions2-demo-bin-2.08.ebuild 942
 MD5 6c738ad5cc474bd11363e52bc5a6fc8a files/digest-dominions2-demo-bin-2.08 69
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
diff --git a/games-strategy/dominions2-demo-bin/dominions2-demo-bin-2.08.ebuild b/games-strategy/dominions2-demo-bin/dominions2-demo-bin-2.08.ebuild
index 506d546fe4ba..28fb11bf4685 100644
--- a/games-strategy/dominions2-demo-bin/dominions2-demo-bin-2.08.ebuild
+++ b/games-strategy/dominions2-demo-bin/dominions2-demo-bin-2.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/games-strategy/dominions2-demo-bin/dominions2-demo-bin-2.08.ebuild,v 1.1 2004/08/08 07:14:18 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/dominions2-demo-bin/dominions2-demo-bin-2.08.ebuild,v 1.1.1.1 2005/11/30 09:36:39 chriswhite Exp $
 
 inherit games
 
@@ -21,6 +21,8 @@ DEPEND="virtual/x11
 	kde-base/arts"
 
 S="${WORKDIR}/dominions2demo"
+dir="${GAMES_PREFIX_OPT}/${PN}"
+Ddir="${D}/${dir}"
 
 src_unpack() {
 	unpack ${A}
@@ -29,8 +31,8 @@ src_unpack() {
 }
 
 src_install() {
-	dodir "${GAMES_PREFIX_OPT}/${PN}"
-	cp -R "${S}/"* "${D}${GAMES_PREFIX_OPT}/${PN}" || die "cp failed"
-	games_make_wrapper dominions2-demo ./dom2demo "${GAMES_PREFIX_OPT}/${PN}"
+	dodir "${dir}"
+	cp -r "${S}/"* "${Ddir}" || die "cp failed"
+	games_make_wrapper dominions2-demo ./dom2demo "${dir}" "${dir}"
 	prepgamesdirs
 }
diff --git a/games-strategy/dominions2/ChangeLog b/games-strategy/dominions2/ChangeLog
index 78e01c2eb636..c40ebe2b7f26 100644
--- a/games-strategy/dominions2/ChangeLog
+++ b/games-strategy/dominions2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/dominions2
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/dominions2/ChangeLog,v 1.1 2005/10/05 15:58:31 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/dominions2/ChangeLog,v 1.1.1.1 2005/11/30 09:36:40 chriswhite Exp $
+
+  21 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  dominions2-2.16.ebuild:
+  Added addition dir variable to games_make_wrapper for bug #109793.
 
 *dominions2-2.16 (05 Oct 2005)
 
diff --git a/games-strategy/dominions2/Manifest b/games-strategy/dominions2/Manifest
index 9b490f79f30e..e7eb47b45911 100644
--- a/games-strategy/dominions2/Manifest
+++ b/games-strategy/dominions2/Manifest
@@ -1,3 +1,4 @@
-MD5 10d8ac4f5dcb1dd87a9272b578d55418 dominions2-2.16.ebuild 2317
-MD5 5b8fa893f801401c25f87a65853af1bf files/dominions2.png 1135
-MD5 c33825291deaf5e9c93c18ca06557e7f files/digest-dominions2-2.16 270
+MD5 9828e84a130d6ab8cc882d6ebc2e979a ChangeLog 637
+MD5 d7789e4c864407e3cfef4c25ff5e119a dominions2-2.16.ebuild 2824
+MD5 0e045212231581f0caa3ca2a96292bd6 files/digest-dominions2-2.16 327
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
diff --git a/games-strategy/dominions2/dominions2-2.16.ebuild b/games-strategy/dominions2/dominions2-2.16.ebuild
index 7f3734d7ba5c..37452c79fb0d 100644
--- a/games-strategy/dominions2/dominions2-2.16.ebuild
+++ b/games-strategy/dominions2/dominions2-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/games-strategy/dominions2/dominions2-2.16.ebuild,v 1.1 2005/10/05 15:58:31 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/dominions2/dominions2-2.16.ebuild,v 1.1.1.1 2005/11/30 09:36:40 chriswhite Exp $
 
 inherit eutils games
 
@@ -10,7 +10,7 @@ SRC_URI="x86? (
 		http://www.shrapnelgames.com/downloads/dompatch${PV/\./}_linux_x86.tgz )
 	amd64? (
 		http://www.shrapnelgames.com/downloads/dompatch${PV/\./}_linux_x86.tgz )
-	ppc? ( 
+	ppc? (
 		http://www.shrapnelgames.com/downloads/dompatch${PV/\./}_linux_ppc.tgz )
 	doc? ( http://www.shrapnelgames.com/downloads/DOM2_Walkthrough.pdf
 		http://www.shrapnelgames.com/downloads/manual_addenda.pdf )
@@ -31,6 +31,9 @@ DEPEND="virtual/x11
 	amd64? ( app-emulation/emul-linux-x86-xlibs
 		app-emulation/emul-linux-x86-sdl )"
 
+dir="${GAMES_PREFIX_OPT}/${PN}"
+Ddir="${D}/${dir}"
+
 src_unpack() {
 	mkdir -p ${S}/patch
 	cd ${S}/patch
@@ -47,9 +50,7 @@ src_install() {
 	cdrom_get_cds dom2icon.ico
 	einfo "Copying files to harddisk... this may take a while..."
 
-	DOM2DIR="${GAMES_PREFIX_OPT}/${PN}"
-	dodir ${DOM2DIR}
-	exeinto ${DOM2DIR}
+	exeinto "${dir}"
 	if use amd64 || use x86
 	then
 		doexe ${CDROM_ROOT}/bin_lin/x86/dom2* || die "doexe failed"
@@ -57,7 +58,7 @@ src_install() {
 	then
 		doexe ${CDROM_ROOT}/bin_lin/ppc/dom2* || die "doexe failed"
 	fi
-	insinto ${DOM2DIR}
+	insinto "${dir}"
 	doins -r ${CDROM_ROOT}/dominions2.app/Contents/Resources/* || \
 		die "doins failed"
 	dodoc ${CDROM_ROOT}/doc/* || die "dodoc failed"
@@ -85,7 +86,7 @@ src_install() {
 	# update times
 	find ${D} -exec touch '{}' \;
 
-	games_make_wrapper dominions2 ./dom2 ${DOM2DIR}
+	games_make_wrapper dominions2 ./dom2 "${dir}" "${dir}"
 	make_desktop_entry dominions2 "Dominions II" dominions2.png
 
 	prepgamesdirs
diff --git a/games-strategy/dopewars/ChangeLog b/games-strategy/dopewars/ChangeLog
index 56208cdd9786..0bdcc1d448f5 100644
--- a/games-strategy/dopewars/ChangeLog
+++ b/games-strategy/dopewars/ChangeLog
@@ -1,7 +1,46 @@
-# ChangeLog for app-games/dopewars
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/dopewars/ChangeLog,v 1.1 2003/09/10 05:27:31 vapier Exp $
+# ChangeLog for games-strategy/dopewars
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/dopewars/ChangeLog,v 1.1.1.1 2005/11/30 09:36:43 chriswhite Exp $
 
+  20 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  dopewars-1.5.10.ebuild:
+  remove gtk2 use flag
+
+*dopewars-1.5.10 (26 May 2005)
+
+  26 May 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +dopewars-1.5.10.ebuild:
+  version bump
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  03 Jun 2004; Aron Griffis <agriffis@gentoo.org> dopewars-1.5.9.ebuild:
+  Fix use invocation
+
+  23 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> dopewars-1.5.9.ebuild:
+  don't rdepend on sed
+
+  05 Jan 2004; Jon Portnoy <avenj@gentoo.org> dopewars-1.5.9.ebuild :
+  AMD64 keywords.
+
+  28 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org> dopewars-1.5.9.ebuild:
+  fix gtk2 USE flag usage (bug 34562); fix in-game docs; fix hiscore file; more
+  error checking/messages
+
+  27 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org> dopewars-1.5.9.ebuild:
+  be less specific about glib (bug 34562)
+
+  21 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org> dopewars-1.5.8.ebuild,
+  files/dopewars-1.5.8-gentoo.diff:
+  clean version 1.5.8 from portage
+
+  21 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org> dopewars-1.5.9.ebuild:
+  fix gtk2 USE handling per Spider; mark stable on ppc
+
+  17 Oct 2003; L. Boshell <leonardop@gentoo.org> dopewars-1.5.9.ebuild:
+  Marking stable on x86.
+  
 *dopewars-1.5.9 (14 Jul 2003)
 
   14 Jul 2003; Mike Frysinger <vapier@gentoo.org> :
@@ -19,7 +58,7 @@
 
 *dopewars-1.5.7 (25 Jun 2002)
 
-  17 jul 2002; Jose Alberto Su�rez L�pez <bass@gentoo.org> dopewars-1.5.7.ebuild :
+  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> dopewars-1.5.7.ebuild :
   Added KEYWORDS.
 
   25 Jun 2002; Seemant Kuulleen <seemant@gentoo.org> dopewars-1.5.7.ebuild
@@ -29,7 +68,7 @@
 
 *dopewars-1.5.4-r1 (7 May 2002)
 
-  17 jul 2002; Jose Alberto Su�rez L�pez <bass@gentoo.org> dopewars-1.5.4-r1.ebuild :
+  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> dopewars-1.5.4-r1.ebuild :
   Added KEYWORDS, SLOT.
   7 May 2002; Spider <spider@gentoo.org> dopewars-1.5.4-r1.ebuild dopewars-1.5.4.ebuild:
   fix sourceforge mirroring.
diff --git a/games-strategy/dopewars/Manifest b/games-strategy/dopewars/Manifest
index 559075db06b0..65d33c14615b 100644
--- a/games-strategy/dopewars/Manifest
+++ b/games-strategy/dopewars/Manifest
@@ -1,6 +1,4 @@
-MD5 bcd94482fb7995c6396896c57f036ff7 ChangeLog 2962
-MD5 1f989e4c3e54358c9a88ea1e457612cc dopewars-1.5.8.ebuild 1707
-MD5 34ac404f6534ebbe82cd454d3da4898e dopewars-1.5.9.ebuild 1408
-MD5 1ab4cc079a4ef8685f70383c30bce826 files/digest-dopewars-1.5.8 67
-MD5 b4e1fd58eb803016ca67302b2caf8d7a files/dopewars-1.5.8-gentoo.diff 2125
-MD5 ba5b960a65c5fa58ba14cd1fefc64ffe files/digest-dopewars-1.5.9 67
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 7444e1b5b8dfa6d5c74511f5e718df73 dopewars-1.5.10.ebuild 1625
+MD5 991565498232c9067cb11d4199e6381f ChangeLog 4286
+MD5 5e44299c2480057ccce98f6a4870c8bb files/digest-dopewars-1.5.10 68
diff --git a/games-strategy/dopewars/dopewars-1.5.10.ebuild b/games-strategy/dopewars/dopewars-1.5.10.ebuild
index c0a06790b675..047b70c0a83d 100644
--- a/games-strategy/dopewars/dopewars-1.5.10.ebuild
+++ b/games-strategy/dopewars/dopewars-1.5.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-strategy/dopewars/dopewars-1.5.10.ebuild,v 1.1 2005/05/26 02:46:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/dopewars/dopewars-1.5.10.ebuild,v 1.1.1.1 2005/11/30 09:36:43 chriswhite Exp $
 
 inherit games
 
@@ -11,16 +11,12 @@ SRC_URI="mirror://sourceforge/dopewars/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="nls ncurses gtk gtk2 gnome esd sdl"
+IUSE="nls ncurses gtk gnome esd sdl"
 
-DEPEND="virtual/libc
-	ncurses? ( >=sys-libs/ncurses-5.2 )
+DEPEND="ncurses? ( >=sys-libs/ncurses-5.2 )
 	esd? ( media-sound/esound )
 	gtk? (
-		|| (
-			gtk2? ( =x11-libs/gtk+-2* )
-			=x11-libs/gtk+-1.2*
-		)
+		=x11-libs/gtk+-2*
 		dev-libs/glib
 	)
 	nls? ( sys-devel/gettext )
@@ -45,7 +41,7 @@ src_compile() {
 	local myservconf
 
 	if use gtk ; then
-		myservconf="--enable-gui-server $(use_enable gtk2 glib2)"
+		myservconf="--enable-gui-server $(use_enable gtk glib2)"
 	else
 		myservconf="--disable-gui-client --disable-glibtest --disable-gtktest"
 	fi
diff --git a/games-strategy/dopewars/metadata.xml b/games-strategy/dopewars/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-strategy/dopewars/metadata.xml
+++ b/games-strategy/dopewars/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-strategy/freeciv/ChangeLog b/games-strategy/freeciv/ChangeLog
index b8897a9bfb48..396f02a977c9 100644
--- a/games-strategy/freeciv/ChangeLog
+++ b/games-strategy/freeciv/ChangeLog
@@ -1,6 +1,142 @@
-# ChangeLog for app-games/freeciv
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.1 2003/09/10 05:27:31 vapier Exp $
+# ChangeLog for games-strategy/freeciv
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.1.1.1 2005/11/30 09:36:41 chriswhite Exp $
+
+*freeciv-2.0.7 (07 Nov 2005)
+
+  07 Nov 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +freeciv-2.0.7.ebuild:
+  version bump
+
+*freeciv-2.0.6 (28 Sep 2005)
+
+  28 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +freeciv-2.0.6.ebuild:
+  version bump
+
+  20 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  -freeciv-1.14.2.ebuild:
+  remove freeciv-1 now that freeciv-2 is well established
+
+  20 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org> freeciv-2.0.5.ebuild:
+  remove gtk2 use flag; fix src_install; tidy
+
+  19 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  -freeciv-2.0.3.ebuild, -freeciv-2.0.4.ebuild:
+  clean old versions
+
+  10 Sep 2005; Aron Griffis <agriffis@gentoo.org> freeciv-2.0.5.ebuild:
+  Mark 2.0.5 stable on alpha
+
+*freeciv-2.0.5 (04 Sep 2005)
+
+  04 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +freeciv-2.0.5.ebuild:
+  version bump
+
+*freeciv-2.0.4 (30 Jul 2005)
+
+  30 Jul 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  -freeciv-1.14.1.ebuild, freeciv-1.14.2.ebuild, -freeciv-2.0.1.ebuild,
+  -freeciv-2.0.2.ebuild, freeciv-2.0.3.ebuild, +freeciv-2.0.4.ebuild:
+  version bump; clean older ebuilds
+
+*freeciv-2.0.3 (13 Jul 2005)
+
+  13 Jul 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +freeciv-2.0.3.ebuild:
+  version bump
+
+*freeciv-2.0.2 (19 Jun 2005)
+
+  19 Jun 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +freeciv-2.0.2.ebuild:
+  version bump
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> freeciv-2.0.1.ebuild:
+  Stable on ppc.
+
+  15 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org> freeciv-1.14.1.ebuild,
+  freeciv-1.14.2.ebuild, freeciv-2.0.1.ebuild:
+  Removed INSTALL file.
+
+  08 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> freeciv-2.0.1.ebuild:
+  Stable on sparc
+
+  05 Jun 2005; Marcus D. Hanwell <marcus@gentoo.org> freeciv-2.0.1.ebuild:
+  Stable on amd64.
+
+  05 Jun 2005; Michael Sterrett <mr_bones_@gentoo.org> freeciv-2.0.1.ebuild:
+  stable on x86
+
+  17 May 2005; Jose Luis Rivero <yoswink@gentoo.org> freeciv-2.0.1.ebuild:
+  Keyworded ~alpha
+
+  16 May 2005; Jose Luis Rivero <yoswink@gentoo.org> freeciv-1.14.2.ebuild:
+  Keyworded ~alpha
+
+*freeciv-2.0.1 (01 May 2005)
+
+  01 May 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +freeciv-2.0.1.ebuild:
+  version bump (bug #67109) - ebuild submitted by TGL
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  23 Nov 2004; Michael Sterrett <mr_bones_@gentoo.org> freeciv-1.14.2.ebuild:
+  removed unused ogg/vorbis dep for gtk
+
+*freeciv-1.14.2 (11 Sep 2004)
+
+  11 Sep 2004; Michael Sterrett <mr_bones_@gentoo.org> +freeciv-1.14.2.ebuild:
+  version bump (bug #63552)
+
+  03 Jun 2004; Aron Griffis <agriffis@gentoo.org> freeciv-1.14.1.ebuild:
+  Fix use invocation
+
+  27 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> freeciv-1.14.1.ebuild:
+  remove unused sdl from IUSE
+
+  19 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> freeciv-1.14.1.ebuild:
+  fix ugly depend screw up with readline
+
+  03 Feb 2004; Michael Sterrett <mr_bones_@gentoo.org> freeciv-1.14.1.ebuild:
+  locale fix for bug 40253; add USE readline support
+
+  28 Jan 2004; <gustavoz@gentoo.org> freeciv-1.14.1.ebuild:
+  marked stable on sparc
+
+  21 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org> freeciv-1.14.1.ebuild:
+  replace deprecated USE flag structure with supported method
+
+  06 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org> freeciv-1.14.1.ebuild:
+  added install of stdsounds2 from the freeciv site (to address bug 36178)
+
+*freeciv-1.14.1 (03 Jan 2004)
+
+  03 Jan 2004; Mike Frysinger <vapier@gentooo.org> :
+  Version bump + clean up #35803.
+
+  21 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org>
+  freeciv-1.15.0_alpha20030901.ebuild:
+  remove misnamed cvs snap
+
+*freeciv-1.14.1_beta4 (21 Nov 2003)
+
+  21 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org>
+  freeciv-1.14.1_beta4.ebuild:
+  add beta version with better gtk2 handling
+
+  13 Oct 2003; Jason Wever <weeve@gentoo.org>
+  freeciv-1.15.0_alpha20030901.ebuild:
+  Added ~sparc keyword.
+
+*freeciv-1.14.1_beta1 (17 Sep 2003)
+
+  17 Sep 2003; Michael Sterrett <msterret@gentoo.org>
+  freeciv-1.14.1_beta1.ebuild:
+  Add the beta for Gentoo testing pleasure.
 
 *freeciv-1.15.0_alpha20030901 (01 Sep 2003)
 
@@ -31,7 +167,7 @@
 
 *freeciv-1.12.0-r2 (29 Mar 2002)
 
-  17 jul 2002; Jose Alberto Su�rez L�pez <bass@gentoo.org> freeciv-1.12.0-r2.ebuild :
+  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> freeciv-1.12.0-r2.ebuild :
   Added LICENSE, KEYWORDS.
 
   29 Mar 2002; Seemant Kulleen <seemant@gentoo.org> freeciv-1.12.0-r2.ebuild :
@@ -42,7 +178,7 @@
 
 *freeciv-1.12.0-r1 (1 Feb 2002)
 
-  17 jul 2002; Jose Alberto Su�rez L�pez <bass@gentoo.org> freeciv-1.12.0-r1.ebuild :
+  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> freeciv-1.12.0-r1.ebuild :
   Added LICENSE, KEYWORDS.
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 81bbb928283b..f15218f7ab74 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,13 +1,8 @@
-MD5 62d4094a3c4f274d9f7ab3a322b9d92c freeciv-1.14.0-r1.ebuild 1711
-MD5 a85dd836d04526239548f8d2a1465d50 freeciv-1.14.0.ebuild 1280
-MD5 70704386f7de7dd0a3572da91935554a freeciv-1.12.0-r2.ebuild 1271
-MD5 d669cb0315d20e9cf7dddf0ec91c7838 freeciv-1.15.0_alpha20030901.ebuild 2213
-MD5 8b5942bff3baeb1cf383e6d0487152fb freeciv-1.12.0-r1.ebuild 1187
-MD5 c385078d6fe8a5dc85c65391f4d858ae ChangeLog 2143
-MD5 0d10cce7ee406dfe2f88999c51204a3a freeciv-1.13.0.ebuild 1275
-MD5 42c13947baf4642e3d9dc8e1477660a8 files/digest-freeciv-1.12.0-r1 68
-MD5 42c13947baf4642e3d9dc8e1477660a8 files/digest-freeciv-1.12.0-r2 68
-MD5 a58905cf82fbffcfc85d0b05eb830f7f files/digest-freeciv-1.14.0-r1 68
-MD5 c28ea40a1cb548166d59f5f08cbc82c5 files/digest-freeciv-1.15.0_alpha20030901 72
-MD5 89d3f26787cf425f3c81868bee1827d6 files/digest-freeciv-1.13.0 68
-MD5 a58905cf82fbffcfc85d0b05eb830f7f files/digest-freeciv-1.14.0 68
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 7f5ab55771584dc457c6f112d416e7a9 freeciv-2.0.5.ebuild 4299
+MD5 e36c2ec015e11570c7ad9e8950d3cc3b freeciv-2.0.7.ebuild 4304
+MD5 7e592550ae9720139a90b9d9b155b877 freeciv-2.0.6.ebuild 4304
+MD5 12dcd14dd88878ed2ab54f207efc44fd ChangeLog 6304
+MD5 7b03506340a683cb71edfc8a8f9fa1d6 files/digest-freeciv-2.0.5 129
+MD5 8ea95c6343835c2bf19054abdea04085 files/digest-freeciv-2.0.7 129
+MD5 4ce4efd98429501807abbaa1341c7dad files/digest-freeciv-2.0.6 129
diff --git a/games-strategy/freeciv/freeciv-2.0.5.ebuild b/games-strategy/freeciv/freeciv-2.0.5.ebuild
index deca733d2364..cc15f7cab042 100644
--- a/games-strategy/freeciv/freeciv-2.0.5.ebuild
+++ b/games-strategy/freeciv/freeciv-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/games-strategy/freeciv/freeciv-2.0.5.ebuild,v 1.1 2005/09/04 01:51:02 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.0.5.ebuild,v 1.1.1.1 2005/11/30 09:36:41 chriswhite Exp $
 
 inherit games
 
@@ -16,27 +16,22 @@ SRC_URI="ftp://ftp.freeciv.org/pub/freeciv/stable/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc sparc x86"
-IUSE="alsa dedicated esd gtk gtk2 nls readline sdl Xaw3d"
+KEYWORDS="alpha amd64 ppc sparc x86"
+IUSE="alsa dedicated esd gtk nls readline sdl Xaw3d"
 
 RDEPEND="sys-libs/zlib
 	readline? ( sys-libs/readline )
 	!dedicated? (
 		virtual/x11
 		gtk? (
-			gtk2? (
-				>=x11-libs/gtk+-2.0.0
-				>=dev-libs/glib-2.0.0
-				>=dev-libs/atk-1.0.3
-				>=x11-libs/pango-1.0.5
-			)
-			!gtk2? (
-				=x11-libs/gtk+-1*
-				>=dev-libs/glib-1.2.5
-				>=media-libs/imlib-1.9.2
-			)
+			>=x11-libs/gtk+-2.0.0
+			>=dev-libs/glib-2.0.0
+			>=dev-libs/atk-1.0.3
+			>=x11-libs/pango-1.0.5
+		)
+		!gtk? (
+			Xaw3d? ( x11-libs/Xaw3d )
 		)
-		!gtk? ( Xaw3d? ( x11-libs/Xaw3d ) )
 		alsa? (
 			>=media-libs/alsa-lib-1.0
 			>=media-libs/audiofile-0.2
@@ -56,11 +51,7 @@ pkg_setup() {
 	games_pkg_setup
 	if ! use dedicated ; then
 		if use gtk ; then
-			if use gtk2 ; then
-				einfo "The Freeciv Client will be built with the GTK+-2 toolkit"
-			else
-				einfo "The Freeciv Client will be built with the GTK+-1.2 toolkit"
-			fi
+			einfo "The Freeciv Client will be built with the GTK+-2 toolkit"
 		elif use Xaw3d ; then
 			einfo "The Freeciv Client will be built with the Xaw3d toolkit"
 		else
@@ -78,7 +69,6 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	return 0
 
 	# install locales in /usr/share/locale
 	sed -i \
@@ -116,9 +106,7 @@ src_compile() {
 		myclient="xaw"
 		use Xaw3d && myclient="xaw3d"
 		if use gtk ; then
-			use gtk2 \
-				&& myclient="gtk-2.0" \
-				|| myclient="gtk"
+			myclient="gtk-2.0"
 		fi
 		#FIXME --enable-{alsa,esd,sdl-mixer} actually disable them...
 		#FIXME   ==> use --disable-* only, and autodetect to enable.
diff --git a/games-strategy/freeciv/freeciv-2.0.6.ebuild b/games-strategy/freeciv/freeciv-2.0.6.ebuild
index ce93288f1eb3..2504eefe2123 100644
--- a/games-strategy/freeciv/freeciv-2.0.6.ebuild
+++ b/games-strategy/freeciv/freeciv-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/games-strategy/freeciv/freeciv-2.0.6.ebuild,v 1.1 2005/09/28 17:20:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.0.6.ebuild,v 1.1.1.1 2005/11/30 09:36:41 chriswhite Exp $
 
 inherit games
 
diff --git a/games-strategy/freeciv/freeciv-2.0.7.ebuild b/games-strategy/freeciv/freeciv-2.0.7.ebuild
index 3a8402435f2d..93aa1374cc8c 100644
--- a/games-strategy/freeciv/freeciv-2.0.7.ebuild
+++ b/games-strategy/freeciv/freeciv-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/games-strategy/freeciv/freeciv-2.0.7.ebuild,v 1.1 2005/11/07 09:11:35 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.0.7.ebuild,v 1.1.1.1 2005/11/30 09:36:40 chriswhite Exp $
 
 inherit games
 
diff --git a/games-strategy/freeciv/metadata.xml b/games-strategy/freeciv/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-strategy/freeciv/metadata.xml
+++ b/games-strategy/freeciv/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-strategy/freecnc/ChangeLog b/games-strategy/freecnc/ChangeLog
index a0283b652fb7..792cd5aace12 100644
--- a/games-strategy/freecnc/ChangeLog
+++ b/games-strategy/freecnc/ChangeLog
@@ -1,6 +1,18 @@
-# ChangeLog for app-games/freecnc
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecnc/ChangeLog,v 1.1 2003/09/10 05:27:31 vapier Exp $
+# ChangeLog for games-strategy/freecnc
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecnc/ChangeLog,v 1.1.1.1 2005/11/30 09:36:42 chriswhite Exp $
+
+  16 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org> freecnc-0.2.0.ebuild,
+  freecnc-0.2.1.31072003.ebuild:
+  needs app-arch/unzip; tidy
+
+  08 Nov 2004; Joseph Jezak <josejx@gentoo.org>
+  freecnc-0.2.1.31072003.ebuild:
+  Added ~ppc.
+
+  03 Jun 2004; Aron Griffis <agriffis@gentoo.org> freecnc-0.2.0.ebuild,
+  freecnc-0.2.1.31072003.ebuild:
+  Fix use invocation
 
 *freecnc-0.2.1.31072003 (31 Jul 2003)
 
diff --git a/games-strategy/freecnc/Manifest b/games-strategy/freecnc/Manifest
index a23f4b48316c..e596011cf04d 100644
--- a/games-strategy/freecnc/Manifest
+++ b/games-strategy/freecnc/Manifest
@@ -1,12 +1,14 @@
-MD5 f9510f847b3067f9bff3481286d2d647 freecnc-0.2.0.ebuild 2027
+MD5 aa7817fcc6fa9bcb0fa6d1ecc19400b8 freecnc-0.2.1.31072003.ebuild 2258
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 1fd1a9673df3e8ba822f61ed9290b139 freecnc-0.2.0.ebuild 2222
+MD5 c1367cb0182bffdf9207a7fad503c5fb ChangeLog 858
+MD5 190952f0b1cd7f8ebd7385c01e0b70db files/freecnc 44
 MD5 7705eafc118ebb753d4b8a80fe7e333c files/digest-freecnc-0.2.0 189
 MD5 97801c0bb7df9499db0b530110aaa510 files/0.2.0-makefile-cflags.patch 4220
-MD5 929803ba179a8f6e0996f29dfc33dcdc files/0.2.0-remove-root.patch 636
+MD5 bb8ca96dac9e2f1f139629d437ff6e7a files/0.2.1.31072003-gentoo-paths.patch 1583
 MD5 deb5d60f8269a27307f92372b65f2600 files/0.2.0-gentoo-paths.patch 980
-MD5 190952f0b1cd7f8ebd7385c01e0b70db files/freecnc 44
+MD5 da57fef460c5cba4a6aaf3490242a0e4 files/freecnc-0.2.0-endian.patch 3042
+MD5 a95fe9ff48a57f7d2afaf10e0932faab files/0.2.1.31072003-remove-root.patch 555
 MD5 caea2862781d0a98c4c8eb0b932aa47d files/digest-freecnc-0.2.1.31072003 198
 MD5 368b1fb21ec956e33e0cea243ba89448 files/0.2.1.31072003-makefile-cflags.patch 478
-MD5 a95fe9ff48a57f7d2afaf10e0932faab files/0.2.1.31072003-remove-root.patch 555
-MD5 4db884f5f9409f52d2deed038e7c7518 files/0.2.1.31072003-gentoo-paths.patch 1592
-MD5 2b6f843f216f7d55e9e9ccc4d08f8e12 freecnc-0.2.1.31072003.ebuild 2139
-MD5 6580c86f664fc2083bf0a1571a19817a ChangeLog 491
+MD5 929803ba179a8f6e0996f29dfc33dcdc files/0.2.0-remove-root.patch 636
diff --git a/games-strategy/freecnc/files/0.2.1.31072003-gentoo-paths.patch b/games-strategy/freecnc/files/0.2.1.31072003-gentoo-paths.patch
index b134072c04d8..7b640b31f13e 100644
--- a/games-strategy/freecnc/files/0.2.1.31072003-gentoo-paths.patch
+++ b/games-strategy/freecnc/files/0.2.1.31072003-gentoo-paths.patch
@@ -35,7 +35,7 @@
 -    lf = new char[strlen(binpath)+strlen("audplay.log")+2];
 -    sprintf(lf, "%s/audplay.log", binpath);
 +    lf = new char[strlen("GENTOO_LOGDIR")+strlen("audplay.log")+2];
-+    sprintf(lf, "GENTOO_LOGDIR/audplay.log", binpath);
++    sprintf(lf, "GENTOO_LOGDIR/audplay.log");
      VFS_PreInit(binpath);
      logger = new Logger(lf,0);
      delete[] lf;
diff --git a/games-strategy/freecnc/freecnc-0.2.0.ebuild b/games-strategy/freecnc/freecnc-0.2.0.ebuild
index 3db361d1ca99..ec29717c0aa3 100644
--- a/games-strategy/freecnc/freecnc-0.2.0.ebuild
+++ b/games-strategy/freecnc/freecnc-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/games-strategy/freecnc/freecnc-0.2.0.ebuild,v 1.1 2003/09/10 05:27:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecnc/freecnc-0.2.0.ebuild,v 1.1.1.1 2005/11/30 09:36:42 chriswhite Exp $
 
 inherit games flag-o-matic eutils
 
@@ -15,50 +15,55 @@ SLOT="0"
 KEYWORDS="x86"
 IUSE="zlib nocd"
 
-DEPEND="media-libs/libsdl
+RDEPEND="media-libs/libsdl
 	media-libs/sdl-net
 	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
 
 S=${WORKDIR}/freecnc++
 
 src_unpack() {
 	unpack freecnc++-${PV}-src.tar.bz2
-	if [ `use nocd` ] ; then
+	if use nocd ; then
 		mkdir data ; cd data
 		unpack cc1demo1.zip cc1demo2.zip
 		for f in * ; do
 			mv ${f} `echo ${f} | awk '{print tolower($1)}'` || die "moving $f"
 		done
 	fi
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-makefile-cflags.patch
-	epatch ${FILESDIR}/${PV}-remove-root.patch
-	epatch ${FILESDIR}/${PV}-gentoo-paths.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${PV}-makefile-cflags.patch \
+		"${FILESDIR}"/${PV}-remove-root.patch \
+		"${FILESDIR}"/${PV}-gentoo-paths.patch \
+		"${FILESDIR}"/${P}-endian.patch
+	rm -f src/include/endian.h
 	sed -i \
 		-e "s:GENTOO_LOGDIR:${GAMES_LOGDIR}:" \
 		-e "s:GENTOO_CONFDIR:${GAMES_SYSCONFDIR}/${PN}/:" \
 		-e "s:GENTOO_DATADIR:${GAMES_DATADIR}/${PN}/:" \
-		src/{freecnc,vfs/vfs}.cpp
+		src/freecnc.cpp src/vfs/vfs.cpp \
+		|| die "sed failed"
 }
 
 src_compile() {
-	make EXTRACFLAGS="${CFLAGS}" || die
+	emake EXTRACFLAGS="${CFLAGS}" || die "emake failed"
 }
 
 src_install() {
-	exeinto ${GAMES_LIBDIR}/${PN}
+	exeinto "${GAMES_LIBDIR}"/${PN}
 	doexe freecnc *.vfs
-	dogamesbin ${FILESDIR}/freecnc
+	dogamesbin "${FILESDIR}"/freecnc || die "dogamesbin failed"
 	dosed "s:GENTOO_DIR:${GAMES_LIBDIR}/${PN}:" ${GAMES_BINDIR}/freecnc
-	insinto ${GAMES_DATADIR}/${PN}/conf
+	insinto "${GAMES_DATADIR}"/${PN}/conf
 	doins conf/*
-	insinto ${GAMES_SYSCONFDIR}/${PN}
+	insinto "${GAMES_SYSCONFDIR}"/${PN}
 	doins conf/*
 	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-	if [ `use nocd` ] ; then
-		cd ${WORKDIR}/data
-		insinto ${GAMES_DATADIR}/${PN}
-		doins *.mix *.aud
+	if use nocd ; then
+		cd "${WORKDIR}"/data
+		insinto "${GAMES_DATADIR}"/${PN}
+		doins *.mix *.aud || die "doins failed"
 		dodoc *.txt
 	fi
 	prepgamesdirs
diff --git a/games-strategy/freecnc/freecnc-0.2.1.31072003.ebuild b/games-strategy/freecnc/freecnc-0.2.1.31072003.ebuild
index cd6da7cfd452..6692037461f4 100644
--- a/games-strategy/freecnc/freecnc-0.2.1.31072003.ebuild
+++ b/games-strategy/freecnc/freecnc-0.2.1.31072003.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-strategy/freecnc/freecnc-0.2.1.31072003.ebuild,v 1.1 2003/09/10 05:27:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecnc/freecnc-0.2.1.31072003.ebuild,v 1.1.1.1 2005/11/30 09:36:42 chriswhite Exp $
 
-inherit games flag-o-matic eutils
+inherit flag-o-matic eutils games
 
 DESCRIPTION="SDL-rewrite of the classical real time strategy hit Command & Conquer"
 HOMEPAGE="http://freecnc-sf.holarse.net/"
@@ -13,53 +13,56 @@ SRC_URI="mirror://gentoo/freecnc++-${PV}-src.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 IUSE="zlib nocd"
 
-DEPEND="media-libs/libsdl
+RDEPEND="media-libs/libsdl
 	media-libs/sdl-net
 	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
 
 S=${WORKDIR}/freecnc++
 
 src_unpack() {
 	unpack freecnc++-${PV}-src.tar.bz2
-	if [ `use nocd` ] ; then
+	if use nocd ; then
 		mkdir data ; cd data
 		unpack cc1demo1.zip cc1demo2.zip
 		for f in * ; do
 			mv ${f} `echo ${f} | awk '{print tolower($1)}'` || die "moving $f"
 		done
 	fi
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-makefile-cflags.patch
-	epatch ${FILESDIR}/${PV}-remove-root.patch
-	epatch ${FILESDIR}/${PV}-gentoo-paths.patch
+	cd "${S}"
+	epatch ${FILESDIR}/${PV}-makefile-cflags.patch \
+		${FILESDIR}/${PV}-remove-root.patch \
+		${FILESDIR}/${PV}-gentoo-paths.patch
 	sed -i \
 		-e "s:GENTOO_LOGDIR:${GAMES_LOGDIR}:" \
 		-e "s:GENTOO_CONFDIR:${GAMES_SYSCONFDIR}/${PN}/:" \
 		-e "s:GENTOO_DATADIR:${GAMES_DATADIR}/${PN}/:" \
-		src/{freecnc,vfs/vfs}.cpp tools/audplay/audplay.cpp
+		src/{freecnc,vfs/vfs}.cpp tools/audplay/audplay.cpp \
+		|| die "sed failed"
 }
 
 src_compile() {
-	make linux EXTRACFLAGS="${CFLAGS}" || die
+	emake linux EXTRACFLAGS="${CFLAGS}" || die "emake failed"
 }
 
 src_install() {
-	exeinto ${GAMES_LIBDIR}/${PN}
-	doexe freecnc *.vfs audplay shpview tmpinied
-	dogamesbin ${FILESDIR}/freecnc
+	exeinto "${GAMES_LIBDIR}"/${PN}
+	doexe freecnc *.vfs audplay shpview tmpinied || die "doexe failed"
+	dogamesbin "${FILESDIR}"/freecnc
 	dosed "s:GENTOO_DIR:${GAMES_LIBDIR}/${PN}:" ${GAMES_BINDIR}/freecnc
-	insinto ${GAMES_DATADIR}/${PN}/conf
+	insinto "${GAMES_DATADIR}"/${PN}/conf
 	doins conf/*
-	insinto ${GAMES_SYSCONFDIR}/${PN}
+	insinto "${GAMES_SYSCONFDIR}"/${PN}
 	doins conf/*
 	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-	if [ `use nocd` ] ; then
-		cd ${WORKDIR}/data
-		insinto ${GAMES_DATADIR}/${PN}
-		doins *.mix *.aud
+	if use nocd ; then
+		cd "${WORKDIR}"/data
+		insinto "${GAMES_DATADIR}"/${PN}
+		doins *.mix *.aud || die "doins failed"
 		dodoc *.txt
 	fi
 	prepgamesdirs
diff --git a/games-strategy/freecnc/metadata.xml b/games-strategy/freecnc/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-strategy/freecnc/metadata.xml
+++ b/games-strategy/freecnc/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-strategy/freecol/ChangeLog b/games-strategy/freecol/ChangeLog
index 16e40b7eb204..75f2576af26d 100644
--- a/games-strategy/freecol/ChangeLog
+++ b/games-strategy/freecol/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for games-strategy/freecol
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecol/ChangeLog,v 1.1 2004/12/09 08:30:06 mr_bones_ Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecol/ChangeLog,v 1.1.1.1 2005/11/30 09:36:40 chriswhite Exp $
+
+*freecol-0.4.0 (24 Jun 2005)
+
+  24 Jun 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +freecol-0.4.0.ebuild:
+  version bump (bug #96905)
+
+  09 May 2005; David Holm <dholm@gentoo.org> freecol-0.3.0.ebuild:
+  Added to ~ppc.
 
 *freecol-0.3.0 (09 Dec 2004)
 
diff --git a/games-strategy/freecol/Manifest b/games-strategy/freecol/Manifest
index e714c17dafd2..5c82dac1f864 100644
--- a/games-strategy/freecol/Manifest
+++ b/games-strategy/freecol/Manifest
@@ -1,2 +1,16 @@
-MD5 13bcf9af66075c537272aeb602504a29 freecol-0.3.0.ebuild 1079
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a6cfe68f412042b2001c6f0c126b4791 ChangeLog 633
 MD5 dc6a4d04e026d9776e432d2dbd24e53e files/digest-freecol-0.3.0 70
+MD5 92bb30eafb73ec91288034215826b0cd files/digest-freecol-0.4.0 70
+MD5 ddd133776f3f1f61955e05ed3e4e44db freecol-0.3.0.ebuild 1284
+MD5 78f9d8e71125c63193760e01422ca6bb freecol-0.4.0.ebuild 1293
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCzzvAI1lqEGTUzyQRAps7AJsGw5fInI1qkoi90SueYOnZBNQpgACgjYAB
+JBPJs/u9vDLTbpf08GDzJ+Q=
+=xQa2
+-----END PGP SIGNATURE-----
diff --git a/games-strategy/freecol/freecol-0.3.0.ebuild b/games-strategy/freecol/freecol-0.3.0.ebuild
index 6efa0b804df5..48dba9d848cb 100644
--- a/games-strategy/freecol/freecol-0.3.0.ebuild
+++ b/games-strategy/freecol/freecol-0.3.0.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-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-strategy/freecol/freecol-0.3.0.ebuild,v 1.1 2004/12/09 08:30:06 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecol/freecol-0.3.0.ebuild,v 1.1.1.1 2005/11/30 09:36:40 chriswhite Exp $
 
 inherit games
 
 DESCRIPTION="An open source clone of the game Colonization"
 HOMEPAGE="http://freecol.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${PV}-src.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
-KEYWORDS="x86"
+KEYWORDS="x86 ~ppc"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
@@ -20,13 +20,14 @@ DEPEND=">=virtual/jdk-1.4
 S="${WORKDIR}/${PN}"
 
 pkg_setup() {
-	if [ -z "$JAVA_HOME" ]; then
+	if [ -z "${JAVA_HOME}" ]; then
 		einfo
-		einfo "\$JAVA_HOME not set!"
+		einfo "\${JAVA_HOME} not set!"
 		einfo "Please use java-config to configure your JVM and try again."
 		einfo
-		die "\$JAVA_HOME not set."
+		die "\${JAVA_HOME} not set."
 	fi
+	games_pkg_setup
 }
 
 src_unpack() {
diff --git a/games-strategy/freecol/freecol-0.4.0.ebuild b/games-strategy/freecol/freecol-0.4.0.ebuild
index bf6e0eb47f83..f0f18eedcebd 100644
--- a/games-strategy/freecol/freecol-0.4.0.ebuild
+++ b/games-strategy/freecol/freecol-0.4.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/games-strategy/freecol/freecol-0.4.0.ebuild,v 1.1 2005/06/24 04:21:32 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecol/freecol-0.4.0.ebuild,v 1.1.1.1 2005/11/30 09:36:40 chriswhite Exp $
 
 inherit games
 
 DESCRIPTION="An open source clone of the game Colonization"
 HOMEPAGE="http://freecol.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${PV}-src.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 KEYWORDS="~ppc x86"
 SLOT="0"
@@ -20,12 +20,12 @@ DEPEND=">=virtual/jdk-1.4
 S=${WORKDIR}/${PN}
 
 pkg_setup() {
-	if [ -z "$JAVA_HOME" ]; then
+	if [ -z "${JAVA_HOME}" ]; then
 		einfo
-		einfo "\$JAVA_HOME not set!"
+		einfo "\${JAVA_HOME} not set!"
 		einfo "Please use java-config to configure your JVM and try again."
 		einfo
-		die "\$JAVA_HOME not set."
+		die "\${JAVA_HOME} not set."
 	fi
 	games_pkg_setup
 }
diff --git a/games-strategy/freecraft-fcmp/ChangeLog b/games-strategy/freecraft-fcmp/ChangeLog
index deb3db0dc84d..06d8c72610d0 100644
--- a/games-strategy/freecraft-fcmp/ChangeLog
+++ b/games-strategy/freecraft-fcmp/ChangeLog
@@ -1,6 +1,12 @@
-# ChangeLog for app-games/freecraft-fcmp
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecraft-fcmp/ChangeLog,v 1.1 2003/09/10 05:27:31 vapier Exp $
+# ChangeLog for games-strategy/freecraft-fcmp
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecraft-fcmp/ChangeLog,v 1.1.1.1 2005/11/30 09:36:41 chriswhite Exp $
+
+  09 May 2005; David Holm <dholm@gentoo.org> freecraft-fcmp-1.18-r1.ebuild:
+  Added to ~ppc.
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
 
   12 Jul 2003; Michael Sterrett <msterret@gentoo.org>
   freecraft-fcmp-1.18-r1.ebuild:
@@ -13,12 +19,12 @@
 
 *freecraft-fcmp-1.18 (18 Mar 2003)
 
-  18 Mar 2003; J. Alberto Su�rez L�pez <bass@gentoo.org> freecraft-fcmp-1.18.ebuild :
+  18 Mar 2003; J. Alberto Suárez López <bass@gentoo.org> freecraft-fcmp-1.18.ebuild :
   Bumped version.
 
 *freecraft-fcmp-1.17.2 (16 Aug 2002)
 
-  16 Aug 2002; J. Alberto Su�rez L�pez <bass@gentoo.org> freecraft-fcmp-1.17.2.ebuild :
+  16 Aug 2002; J. Alberto Suárez López <bass@gentoo.org> freecraft-fcmp-1.17.2.ebuild :
   New version
 
 *freecraft-fcmp-1.17 (20 Jun 2002)
@@ -26,7 +32,7 @@
   18 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> freecraft-fcmp.1.17.ebuild :
   Updated to mirror://sourceforge in SRC_URI.
 
-  17 jul 2002; Jose Alberto Su�rez L�pez <bass@gentoo.org> freecraft-fcmp-1.17.ebuild :
+  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> freecraft-fcmp-1.17.ebuild :
   Added KEYWORDS.
 
   20 Jun 2002; Gabriele Giorgetti <stroke@gentoo.org> freecraft-fcmp-1.17.ebuild:
diff --git a/games-strategy/freecraft-fcmp/Manifest b/games-strategy/freecraft-fcmp/Manifest
index 0c8925f75cad..93accaafe8e2 100644
--- a/games-strategy/freecraft-fcmp/Manifest
+++ b/games-strategy/freecraft-fcmp/Manifest
@@ -1,3 +1,4 @@
+MD5 ce9c47931ba2c91b860a5d13c83ab00c ChangeLog 1464
+MD5 30cc3da37d4ee52528d1b586c5e3e244 freecraft-fcmp-1.18-r1.ebuild 1075
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 MD5 44991d9a8d1378393318b04fc7746791 files/digest-freecraft-fcmp-1.18-r1 135
-MD5 fa10f7b30bfc7c9133adaba7846a225c freecraft-fcmp-1.18-r1.ebuild 858
-MD5 705bd0e7b2618fdbf9dc414a9b8d8295 ChangeLog 1261
diff --git a/games-strategy/freecraft-fcmp/freecraft-fcmp-1.18-r1.ebuild b/games-strategy/freecraft-fcmp/freecraft-fcmp-1.18-r1.ebuild
index a664bf0569a3..d9ccef3627ae 100644
--- a/games-strategy/freecraft-fcmp/freecraft-fcmp-1.18-r1.ebuild
+++ b/games-strategy/freecraft-fcmp/freecraft-fcmp-1.18-r1.ebuild
@@ -1,25 +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/games-strategy/freecraft-fcmp/freecraft-fcmp-1.18-r1.ebuild,v 1.1 2003/09/10 05:27:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecraft-fcmp/freecraft-fcmp-1.18-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:41 chriswhite Exp $
 
 inherit games
 
 FCMP_VER=030311
 MUSIC_VER=030226
 DESCRIPTION="A collection of graphic/sound files to replace the data files from a real WarCraft CD"
-SRC_URI="mirror://sourceforge/freecraft/fcmp-${FCMP_VER}.tar.gz
-	music? ( mirror://sourceforge/freecraft/music-pack-${MUSIC_VER}.tar.gz )"
-HOMEPAGE="http://freecraft.sourceforge.org/"
+HOMEPAGE="http://www.freecraft.org/"
+SRC_URI="fcmp-${FCMP_VER}.tar.gz
+	music? ( music-pack-${MUSIC_VER}.tar.gz )"
 
-KEYWORDS="x86"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86 ~ppc"
 IUSE="music"
+RESTRICT="fetch"
 
-DEPEND="=app-games/freecraft-1.18*"
+DEPEND="=games-strategy/freecraft-1.18*"
 
 S=${WORKDIR}
 
+pkg_nofetch() {
+	einfo "Due to a Ceast and Desist given by Blizzard,"
+	einfo "you must obtain the sources for this game yourself."
+	einfo "For more information, please visit: ${HOMEPAGE}"
+	einfo "Also, you'll have to place the files ${A}"
+	einfo "into ${DISTDIR}"
+}
+
 src_install() {
 	dohtml data/ChangeLog.html && rm data/ChangeLog.html
 	dodir ${GAMES_DATADIR}/freecraft/
diff --git a/games-strategy/freecraft-fcmp/metadata.xml b/games-strategy/freecraft-fcmp/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-strategy/freecraft-fcmp/metadata.xml
+++ b/games-strategy/freecraft-fcmp/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-strategy/freecraft/ChangeLog b/games-strategy/freecraft/ChangeLog
index 8d66c2606a69..d95c3b391385 100644
--- a/games-strategy/freecraft/ChangeLog
+++ b/games-strategy/freecraft/ChangeLog
@@ -1,29 +1,61 @@
-# ChangeLog for app-games/freecraft
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecraft/ChangeLog,v 1.1 2003/09/10 05:27:31 vapier Exp $
+# ChangeLog for games-strategy/freecraft
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecraft/ChangeLog,v 1.1.1.1 2005/11/30 09:36:44 chriswhite Exp $
+
+  26 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  freecraft-1.18-r3.ebuild:
+  Making games last on inherit line.
+
+  09 May 2005; David Holm <dholm@gentoo.org> freecraft-1.18-r3.ebuild:
+  Added to ~ppc.
+
+  29 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  freecraft-1.18-r3.ebuild:
+  fix HOMEPAGE
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  06 Sep 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  freecraft-1.18-r3.ebuild:
+  update HOMEPAGE; error check; tidy
+
+*freecraft-1.18-r3 (22 Jan 2004)
+
+  18 Apr 2004; Mike Frysinger <vapier@gentoo.org> :
+  Make sure freecraft and freecraft-fcmp dont clobber each other when
+  freecraft is upgraded #39278 by Arnaud JEANSEN.
+
+  22 Jan 2004; Mike Frysinger <vapier@gentoo.org> :
+  Stupid wrapper script #38580.
+
+*freecraft-1.18-r2 (17 Jan 2004)
+
+  17 Jan 2004; Mike Frysinger <vapier@gentoo.org> :
+  Fix wrapper script #38152.
+
+*freecraft-1.18-r1 (20 Jun 2003)
 
   12 Jul 2003; Michael Sterrett <msterret@gentoo.org>
   freecraft-1.18-r1.ebuild:
   fix DESCRIPTION
 
-*freecraft-1.18-r1 (20 Jun 2003)
-
   20 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
   Cleaned up + add games.eclass support + rework runscript.
 
 *freecraft-1.18 (18 Mar 2003)
 
-  28 Mar 2003; Jose Alberto Su�rez L�pez <bass@gentoo.org> freecraft-1.18.ebuild:
+  28 Mar 2003; Jose Alberto Suárez López <bass@gentoo.org> freecraft-1.18.ebuild:
   Bump version.
 
 *freecraft-1.17.2 (31 Jul 2002)
 
-  22 Jul 2002; Jose Alberto Su�rez L�pez <bass@gentoo.org> freecraft-1.17.2.ebuild:
+  22 Jul 2002; Jose Alberto Suárez López <bass@gentoo.org> freecraft-1.17.2.ebuild:
   Bump version.
 
 *freecraft-1.17.1 (28 Jun 2002)
 
-  17 jul 2002; Jose Alberto Su�rez L�pez <bass@gentoo.org> freecraft-1.17.1.ebuild :
+  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> freecraft-1.17.1.ebuild :
   Added KEYWORDS.
 
   28 Jun 2002; Brandon Low <lostlogic@gentoo.org> freecraft-1.17.1.ebuild :
diff --git a/games-strategy/freecraft/Manifest b/games-strategy/freecraft/Manifest
index 0755e2d7e486..5eb4dc0c8c51 100644
--- a/games-strategy/freecraft/Manifest
+++ b/games-strategy/freecraft/Manifest
@@ -1,5 +1,6 @@
-MD5 26fcca4042bfb33bb7fa5c0c79440982 ChangeLog 1467
-MD5 5d497d878af671fafdd6af9ba7355222 freecraft-1.18-r1.ebuild 1836
+MD5 dbec7aa4b69402d8b282dad608684336 freecraft-1.18-r3.ebuild 2642
+MD5 d592e190b94274119dfc7be395cc9cc9 ChangeLog 2416
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 6c27ce2218d486e19d552a2ae7781c17 files/digest-freecraft-1.18-r3 73
+MD5 0e6f6ecc763f6ca1565717fa90296b45 files/freecraft 493
 MD5 c7be4012a9ba721244dec67d4abc2e53 files/1.18-setup.patch 1057
-MD5 6c27ce2218d486e19d552a2ae7781c17 files/digest-freecraft-1.18-r1 73
-MD5 1c4f64fa279e68a8cf4508221d6fffe4 files/playfreecraft 474
diff --git a/games-strategy/freecraft/files/freecraft b/games-strategy/freecraft/files/freecraft
index 542146588d6f..49e7734f744f 100644
--- a/games-strategy/freecraft/files/freecraft
+++ b/games-strategy/freecraft/files/freecraft
@@ -12,4 +12,4 @@ if [ ! -d GENTOO_DATADIR/data/music ] ; then
 	exit 1
 fi
 
-freecraft -d GENTOO_DATADIR/data "$@"
+exec GENTOO_LIBDIR/freecraft -d GENTOO_DATADIR/data "$@"
diff --git a/games-strategy/freecraft/freecraft-1.18-r3.ebuild b/games-strategy/freecraft/freecraft-1.18-r3.ebuild
index 4fc5742058d9..73e1981dad59 100644
--- a/games-strategy/freecraft/freecraft-1.18-r3.ebuild
+++ b/games-strategy/freecraft/freecraft-1.18-r3.ebuild
@@ -1,24 +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-strategy/freecraft/freecraft-1.18-r3.ebuild,v 1.1 2004/01/22 18:16:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecraft/freecraft-1.18-r3.ebuild,v 1.1.1.1 2005/11/30 09:36:44 chriswhite Exp $
 
-inherit games eutils
+inherit eutils games
 
 MY_P=${PN}-030311
 DESCRIPTION="realtime strategy game engine for games like Warcraft/Starcraft/etc."
-HOMEPAGE="http://www.freecraft.org/"
+HOMEPAGE="http://www.math.sfu.ca/~cbm/cd/"
 SRC_URI="${MY_P}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ~ppc"
+IUSE=""
 RESTRICT="fetch"
 
 DEPEND=">=media-libs/libpng-1.2.3
 	>=media-libs/libsdl-1.2.4
 	sys-libs/zlib"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 pkg_nofetch() {
 	einfo "Due to a Ceast and Desist given by Blizzard,"
@@ -30,8 +31,8 @@ pkg_nofetch() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-setup.patch
+	cd "${S}"
+	epatch "${FILESDIR}/${PV}-setup.patch"
 	env GENTOO_CFLAGS="${CFLAGS}" ./setup || die
 }
 
@@ -41,38 +42,48 @@ src_compile() {
 }
 
 src_install() {
-	exeinto ${GAMES_LIBDIR}/${PN}
-	doexe freecraft
-	dogamesbin ${FILESDIR}/freecraft
-	dosed "s:GENTOO_DATADIR:${GAMES_DATADIR}/${PN}:" ${GAMES_BINDIR}/freecraft
-	dosed "s:GENTOO_LIBDIR:${GAMES_LIBDIR}/${PN}:" ${GAMES_BINDIR}/freecraft
+	exeinto "${GAMES_LIBDIR}/${PN}"
+	doexe freecraft || die "doexe failed"
+	dogamesbin "${FILESDIR}/freecraft" || die "dogamesbin failed"
+	sed -i \
+		-e  "s:GENTOO_DATADIR:${GAMES_DATADIR}/${PN}:" \
+		-e  "s:GENTOO_LIBDIR:${GAMES_LIBDIR}/${PN}:" \
+		"${D}${GAMES_BINDIR}/freecraft" \
+		|| die "sed failed"
 
-	exeinto ${GAMES_DATADIR}/${PN}/tools
-	doexe tools/{build.sh,aledoc,startool,wartool}
+	exeinto "${GAMES_DATADIR}/${PN}/tools"
+	doexe tools/{build.sh,aledoc,startool,wartool} || die "doexe failed"
 
-	dodir ${GAMES_DATADIR}/${PN}/
-	cp -r data ${D}/${GAMES_DATADIR}/${PN}/
-
-	insinto ${GAMES_DATADIR}/${PN}/contrib
-	cp -r contrib ${D}/${GAMES_DATADIR}/${PN}/
+	dodir "${GAMES_DATADIR}/${PN}"
+	cp -r contrib data "${D}/${GAMES_DATADIR}/${PN}/" || die "cp failed"
 
 	dohtml -r doc
 	dodoc README
 
 	prepgamesdirs
+
+	# make sure we dont clobber files freecraft and freecraft-fcmp share #39278
+	local fcmpver="$(best_version games-strategy/freecraft-fcmp)"
+	if [ ! -z "${fcmpver}" ] ; then
+		cd "${D}/${GAMES_DATADIR}/${PN}/data/ccl"
+		for f in $(grep ${GAMES_DATADIR}/${PN}/data/ccl/ /var/db/pkg/${fcmpver}/CONTENTS) ; do
+			[ -d "${f}" ] && continue
+			[ -e "${f}" -a -e "${D}/${f}" ] && rm "${D}/${f}"
+		done
+	fi
 }
 
 pkg_postinst() {
+	games_pkg_postinst
+	echo
 	einfo "Freecraft is now installed but in order to actually play"
 	einfo "you will need to either use a Warcraft CD or install the"
 	einfo "freecraft-fcmp ebuild.  To use a Warcraft CD:"
 	einfo " 1 mount the cd as /mnt/cdrom"
-	einfo " 2 cd ${GAMES_DATADIR}"
+	einfo " 2 cd ${GAMES_DATADIR}/${PN}"
 	einfo " 3 run tools/build.sh"
 	einfo "This will extract the data files to the correct place."
 	einfo "Note that the CD is still needed for the music.  To"
-	einfo "start a game just run \`playfreecraft\`."
-	einfo "For more info, review \`freecraft --help\`."
-
-	games_pkg_postinst
+	einfo "start a game just run \"playfreecraft\"."
+	einfo "For more info, review \"freecraft --help\"."
 }
diff --git a/games-strategy/freecraft/metadata.xml b/games-strategy/freecraft/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-strategy/freecraft/metadata.xml
+++ b/games-strategy/freecraft/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-strategy/freelords/ChangeLog b/games-strategy/freelords/ChangeLog
index 87e46407058a..7e235e32e7ff 100644
--- a/games-strategy/freelords/ChangeLog
+++ b/games-strategy/freelords/ChangeLog
@@ -1,9 +1,72 @@
-# ChangeLog for app-games/freelords
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freelords/ChangeLog,v 1.1 2003/09/10 05:27:31 vapier Exp $
+# ChangeLog for games-strategy/freelords
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freelords/ChangeLog,v 1.1.1.1 2005/11/30 09:36:41 chriswhite Exp $
+
+*freelords-0.3.6 (14 Nov 2005)
+
+  14 Nov 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +freelords-0.3.6.ebuild:
+  version bump
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  freelords-0.3.4.ebuild:
+  Stable on ppc.
+
+*freelords-0.3.5 (16 Apr 2005)
+
+  16 Apr 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +freelords-0.3.5.ebuild:
+  version bump
+
+  13 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/freelords-0.3.3-gcc-3.4.patch, -freelords-0.3.3.ebuild,
+  freelords-0.3.4.ebuild:
+  clean older ebuild; fix dep (patch from Nathan Skillen via bug #74271)
+
+*freelords-0.3.4 (19 Nov 2004)
+
+  19 Nov 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  +freelords-0.3.4.ebuild:
+  version bump - contributions from Bryan Duff via bug #69865
+
+  08 Nov 2004; Joseph Jezak <josejx@gentoo.org>
+  +files/freelords-0.3.3-gcc-3.4.patch, freelords-0.3.3.ebuild:
+  Fixed compiling with gcc 3.4 and added ~ppc.
+
+  24 Sep 2004; Michael Sterrett <mr_bones_@gentoo.org> freelords-0.3.3.ebuild:
+  tidy deps: doesn't like media-libs/paragui-1.1
+
+  24 Sep 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/0.2.3-gcc3.patch, -freelords-0.3.1.ebuild:
+  clean older version
+
+*freelords-0.3.3 (07 Aug 2004)
+
+  07 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  +freelords-0.3.3.ebuild:
+  version bump
+
+  05 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> freelords-0.3.ebuild:
+  clean older version
+
+  23 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> freelords-0.3.1.ebuild:
+  don't rdepend on pkgconfig and sed
+
+*freelords-0.3.1 (04 Jan 2004)
+
+  04 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org> freelords-0.3.1.ebuild:
+  version bump
+
+*freelords-0.3 (25 Oct 2003)
+
+  25 Oct 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bumpage.
 
 *freelords-0.2.3 (14 Jul 2003)
 
+  13 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Added a gcc3 patch #28640.
+
   14 Jul 2003; Mike Frysinger <vapier@gentoo.org> :
   Version bump.  This one installs w/Makefile since they updated the package.
 
diff --git a/games-strategy/freelords/Manifest b/games-strategy/freelords/Manifest
index cbf8ea3d84e4..0bb5320075a7 100644
--- a/games-strategy/freelords/Manifest
+++ b/games-strategy/freelords/Manifest
@@ -1,6 +1,9 @@
-MD5 4a88aa0693083d0e689177d8abad5220 ChangeLog 558
-MD5 7a316064d46f279e4bc9f25676b69673 freelords-0.2.2.ebuild 1181
-MD5 18b21849eda86099b392afffec47ae91 freelords-0.2.3.ebuild 1133
-MD5 bc10e58a3f3cedba5a5517c44e60a440 files/digest-freelords-0.2.2 67
-MD5 a129248166e9830dd7ab2bb7a72c9e89 files/digest-freelords-0.2.3 67
+MD5 8e6f3d54d163ba9d924e8df794ee77c0 freelords-0.3.5.ebuild 1491
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 b40c96132d0344380af85522c934a26e freelords-0.3.4.ebuild 1511
+MD5 4a804fe4d9ecf95bff4aab69a8c3ad8a ChangeLog 2395
+MD5 0088777e7635102cc7713ff4905746de freelords-0.3.6.ebuild 1491
+MD5 9b067113cc0e53c706f951a9384dc4d4 files/digest-freelords-0.3.6 69
+MD5 6ef80ef4d03f0404bcfbc6ca368861e8 files/digest-freelords-0.3.4 69
 MD5 ab1b855445f4e0f4ccbc46662e0bf206 files/freelordsrc 147
+MD5 e89ea9667350d221572b0bbd5b68ef50 files/digest-freelords-0.3.5 69
diff --git a/games-strategy/freelords/freelords-0.3.4.ebuild b/games-strategy/freelords/freelords-0.3.4.ebuild
index ea64dce1430b..f8da8559015e 100644
--- a/games-strategy/freelords/freelords-0.3.4.ebuild
+++ b/games-strategy/freelords/freelords-0.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/games-strategy/freelords/freelords-0.3.4.ebuild,v 1.1 2004/11/19 21:55:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freelords/freelords-0.3.4.ebuild,v 1.1.1.1 2005/11/30 09:36:41 chriswhite Exp $
 
 inherit eutils games
 
@@ -8,7 +8,7 @@ DESCRIPTION="Free Warlords clone"
 HOMEPAGE="http://www.freelords.org/"
 SRC_URI="mirror://sourceforge/freelords/${P}.tar.bz2"
 
-KEYWORDS="x86 ~ppc"
+KEYWORDS="ppc x86"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="nls"
@@ -18,7 +18,7 @@ RDEPEND="dev-libs/expat
 	>=media-libs/sdl-image-1.2
 	>=media-libs/freetype-2
 	=media-libs/paragui-1.0*
-	>=dev-libs/libsigc++-1.2"
+	=dev-libs/libsigc++-1.2*"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	dev-util/pkgconfig
diff --git a/games-strategy/freelords/freelords-0.3.5.ebuild b/games-strategy/freelords/freelords-0.3.5.ebuild
index a1ef26bc0987..015af4ce8b35 100644
--- a/games-strategy/freelords/freelords-0.3.5.ebuild
+++ b/games-strategy/freelords/freelords-0.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/games-strategy/freelords/freelords-0.3.5.ebuild,v 1.1 2005/04/16 20:12:41 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freelords/freelords-0.3.5.ebuild,v 1.1.1.1 2005/11/30 09:36:41 chriswhite Exp $
 
 inherit eutils games
 
@@ -18,6 +18,7 @@ RDEPEND="dev-libs/expat
 	>=media-libs/sdl-image-1.2
 	>=media-libs/freetype-2
 	>=media-libs/paragui-1.1.8
+	!=media-libs/paragui-1.0*
 	=dev-libs/libsigc++-1.2*"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
diff --git a/games-strategy/freelords/freelords-0.3.6.ebuild b/games-strategy/freelords/freelords-0.3.6.ebuild
index e4bb3e4809c5..de5be1782e3f 100644
--- a/games-strategy/freelords/freelords-0.3.6.ebuild
+++ b/games-strategy/freelords/freelords-0.3.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-strategy/freelords/freelords-0.3.6.ebuild,v 1.1 2005/11/14 03:20:21 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freelords/freelords-0.3.6.ebuild,v 1.1.1.1 2005/11/30 09:36:41 chriswhite Exp $
 
 inherit eutils games
 
diff --git a/games-strategy/freelords/metadata.xml b/games-strategy/freelords/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-strategy/freelords/metadata.xml
+++ b/games-strategy/freelords/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-strategy/glest/ChangeLog b/games-strategy/glest/ChangeLog
index 6648b2541062..33c019b26ddb 100644
--- a/games-strategy/glest/ChangeLog
+++ b/games-strategy/glest/ChangeLog
@@ -1,6 +1,34 @@
 # ChangeLog for games-strategy/glest
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/glest/ChangeLog,v 1.1 2005/04/10 04:42:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/glest/ChangeLog,v 1.1.1.1 2005/11/30 09:36:44 chriswhite Exp $
+
+*glest-1.2.1.2 (09 Nov 2005)
+
+  09 Nov 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +glest-1.2.1.2.ebuild:
+  version bump - ebuild supplied by fabien Zouaoui via bug #110906
+
+  25 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/glest-1.0.10_p7-fake-checkGlCaps.patch, -glest-1.0.10_p7.ebuild:
+  clean older version
+
+  17 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org> glest-1.1.0.ebuild:
+  install linux config file instead of windows config file. (bug #103797)
+
+*glest-1.1.0 (20 Aug 2005)
+
+  20 Aug 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/glest-1.1.0-fake-checkGlCaps.patch, files/glest,
+  +glest-1.1.0.ebuild:
+  Version bump #98617 by Dennis Schridde.
+
+  13 Jun 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/glest-1.0.10_p7-fake-checkGlCaps.patch, glest-1.0.10_p7.ebuild:
+  Add a hack workaround since function seems to be rewritten in upstream CVS
+  and it currently doesnt parse NVIDIA version properly #95696.
+
+  12 Apr 2005; David Holm <dholm@gentoo.org> glest-1.0.10_p7.ebuild:
+  Added to ~ppc.
 
 *glest-1.0.10_p7 (10 Apr 2004)
 
diff --git a/games-strategy/glest/Manifest b/games-strategy/glest/Manifest
index d4544f3ba3ee..2cd3143bafaa 100644
--- a/games-strategy/glest/Manifest
+++ b/games-strategy/glest/Manifest
@@ -1,2 +1,8 @@
-MD5 b72e8199995ea07333544ed699ed4266 glest-1.0.10_p7.ebuild 2147
-MD5 704449ca017fe5f35a53024e3daa2a4c files/digest-glest-1.0.10_p7 306
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 842b20ea2ea3654138f6cdc9a0dfab45 glest-1.2.1.2.ebuild 2649
+MD5 9851b926b3d0cf2e8392244cf74df154 ChangeLog 1403
+MD5 61f8be88e160a236535d51d7fff8d1da glest-1.1.0.ebuild 2381
+MD5 34b0cb001c745a9991f7168d297c0e45 files/glest 488
+MD5 db5c350e24bf74413a314d023e375ce3 files/glest-1.1.0-fake-checkGlCaps.patch 322
+MD5 91226a67fca5c8d33e0b6c9e70984a21 files/digest-glest-1.1.0 298
+MD5 fece815f8c0a8e8641301a3ee504a8ae files/digest-glest-1.2.1.2 312
diff --git a/games-strategy/glest/files/glest b/games-strategy/glest/files/glest
index de0c3985cf0c..f4e7ffe48b72 100644
--- a/games-strategy/glest/files/glest
+++ b/games-strategy/glest/files/glest
@@ -6,9 +6,10 @@ GLESTDIR="$GAMESDIR/glest"
 if [ ! -d ~/.glest ]; then
 	mkdir ~/.glest
 fi
-for d in data Tech map tileset lib/glest ; do
-	if [ ! -L ~/.glest/${d} ] ; then
-		ln -s "${GLESTDIR}"/${d} ~/.glest/${d##*/}
+for d in "${GLESTDIR}"/* lib/glest ; do
+	s=${d##*/}
+	if [ ! -L ~/.glest/${s} ] ; then
+		ln -s "${d}" ~/.glest/${s}
 	fi
 done
 if [ ! -e ~/.glest/glest.ini ] ; then
diff --git a/games-strategy/glest/glest-1.1.0.ebuild b/games-strategy/glest/glest-1.1.0.ebuild
index 54cc05bb0548..5c11e2ec04b7 100644
--- a/games-strategy/glest/glest-1.1.0.ebuild
+++ b/games-strategy/glest/glest-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/games-strategy/glest/glest-1.1.0.ebuild,v 1.1 2005/08/20 02:06:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/glest/glest-1.1.0.ebuild,v 1.1.1.1 2005/11/30 09:36:44 chriswhite Exp $
 
 inherit eutils games
 
@@ -53,21 +53,34 @@ src_compile() {
 
 src_install() {
 	dogamesbin "${FILESDIR}"/glest || die "couldn't install launcher"
-	dosed "s:GENTOO_DATADIR:${GAMES_DATADIR}:" "${GAMES_BINDIR}"/glest
+	sed -i \
+		-e "s:GENTOO_DATADIR:${GAMES_DATADIR}:" \
+		"${D}${GAMES_BINDIR}"/glest \
+		|| die "sed failed"
 
 	exeinto "${GAMES_DATADIR}"/${PN}/lib
 	doexe glest || die "doexe failed"
 
+	insinto "${GAMES_DATADIR}"/${PN}/config
+	doins glest.ini || die "config copy failed"
+
 	cd "${WORKDIR}"/glest_game
 	insinto "${GAMES_DATADIR}"/${PN}
 	doins -r techs data maps tilesets || die "data copy failed"
-	insinto "${GAMES_DATADIR}"/${PN}/config
-	doins glest.ini || die "config copy failed"
 	dodoc readme.txt
 
-	use linguas_de && cp "${DISTDIR}"/german.lng "${D}/${GAMES_DATADIR}"/${PN}/data/lang/
-	use linguas_ru && cp "${DISTDIR}"/russian.lng "${D}/${GAMES_DATADIR}"/${PN}/data/lang/
-	use linguas_dk && cp "${DISTDIR}"/dansk.lng "${D}/${GAMES_DATADIR}"/${PN}/data/lang/
+	if use linguas_de ; then
+		cp "${DISTDIR}"/german.lng "${D}/${GAMES_DATADIR}"/${PN}/data/lang/ \
+			|| die "cp failed"
+	fi
+	if use linguas_ru ; then
+		cp "${DISTDIR}"/russian.lng "${D}/${GAMES_DATADIR}"/${PN}/data/lang/ \
+			|| die "cp failed"
+	fi
+	if use linguas_dk ; then
+		cp "${DISTDIR}"/dansk.lng "${D}/${GAMES_DATADIR}"/${PN}/data/lang/ \
+			|| die "cp failed"
+	fi
 
 	make_desktop_entry glest Glest
 
diff --git a/games-strategy/glest/glest-1.2.1.2.ebuild b/games-strategy/glest/glest-1.2.1.2.ebuild
index 4b8532931e76..6231ca35be57 100644
--- a/games-strategy/glest/glest-1.2.1.2.ebuild
+++ b/games-strategy/glest/glest-1.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/games-strategy/glest/glest-1.2.1.2.ebuild,v 1.1 2005/11/09 02:51:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/glest/glest-1.2.1.2.ebuild,v 1.1.1.1 2005/11/30 09:36:44 chriswhite Exp $
 
 inherit eutils games
 
diff --git a/games-strategy/glob2/ChangeLog b/games-strategy/glob2/ChangeLog
index b72b5ea82654..8e248aec81ce 100644
--- a/games-strategy/glob2/ChangeLog
+++ b/games-strategy/glob2/ChangeLog
@@ -1,8 +1,92 @@
 # ChangeLog for games-strategy/glob2
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/glob2/ChangeLog,v 1.1 2004/02/21 21:36:25 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/glob2/ChangeLog,v 1.1.1.1 2005/11/30 09:36:43 chriswhite Exp $
 
-*glob2-0.8.3 (21 Feb 2004)
+  12 Oct 2005; Michael Sterrett <mr_bones_@gentoo.org> glob2-0.8.15.ebuild:
+  add desktop entry support (bug #109043)
+
+  17 May 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/glob2-0.8.11-configure_speex.patch, -glob2-0.8.10.ebuild,
+  -glob2-0.8.11.ebuild:
+  clean older versions
+
+  17 May 2005; Tobias Scherbaum <dertobi123@gentoo.org> glob2-0.8.15.ebuild:
+  Marked ppc stable.
+
+*glob2-0.8.15 (16 May 2005)
+
+  16 May 2005; Michael Sterrett <mr_bones_@gentoo.org> +glob2-0.8.15.ebuild:
+  version bump
+
+  29 Jan 2005; Michael Sterrett <mr_bones_@gentoo.org> -glob2-0.8.9.ebuild:
+  clean old ebuild
+
+*glob2-0.8.11 (29 Jan 2005)
+
+  29 Jan 2005; Eric Shattow <jnc@gentoo.org>
+  +files/glob2-0.8.11-configure_speex.patch, +glob2-0.8.11.ebuild:
+  Version bump. closes #78412.
+
+  30 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org> glob2-0.8.10.ebuild:
+  David Philippi claims filter-flags isn't needed (bug #76145)
+
+*glob2-0.8.10 (30 Dec 2004)
+
+  30 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org> +glob2-0.8.10.ebuild:
+  version bump
+
+  07 Nov 2004; Joseph Jezak <josejx@gentoo.org> glob2-0.8.9.ebuild:
+  Marked ppc stable.
+
+  15 Oct 2004; Michael Sterrett <mr_bones_@gentoo.org> glob2-0.8.9.ebuild:
+  Turn down the assert checking a bit for people with lesser sound cards (bug
+  #67718)
+
+*glob2-0.8.9 (14 Oct 2004)
+
+  14 Oct 2004; Michael Sterrett <mr_bones_@gentoo.org> +glob2-0.8.9.ebuild:
+  version bump (bug #66791)
+
+*glob2-0.8.8 (17 Sep 2004)
+
+  17 Sep 2004; Michael Sterrett <mr_bones_@gentoo.org> +glob2-0.8.8.ebuild:
+  version bump (bug #64150)
+
+  10 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org> :
+  version bump (bug #59923)
+
+  15 Jun 2004; <malc@gentoo.org> glob2-0.8.6.ebuild:
+  Add keyword ~amd64, fixes bug #53988
+
+  14 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> glob2-0.8.6.ebuild:
+  explicitly give the path for vorbis (bug #46352)
+
+  09 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> glob2-0.8.2.ebuild,
+  glob2-0.8.4.ebuild:
+  clean older ebuilds
+
+*glob2-0.8.6 (09 Jun 2004)
+
+  09 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> glob2-0.8.6.ebuild:
+  version bump
+
+*glob2-0.8.5 (01 Apr 2004)
+
+  01 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> glob2-0.8.5.ebuild:
+  version bump (bug #46397)
+
+  23 Mar 2004; David Holm <dholm@gentoo.org> glob2-0.8.4.ebuild:
+  Added to ~ppc.
+
+*glob2-0.8.4 (22 Mar 2004)
+
+  22 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> glob2-0.8.4.ebuild:
+  version bump
+
+  10 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> glob2-0.8.2.ebuild:
+  improve deps (bug #44288)
+
+*glob2-0.8.2 (21 Feb 2004)
 
   21 Feb 2004; Mike Frysinger <vapier@gentoo.org> :
   Initial import.  Ebuild submitted by me for #24206.
diff --git a/games-strategy/glob2/Manifest b/games-strategy/glob2/Manifest
index 7daf19c881ef..3f211449bb22 100644
--- a/games-strategy/glob2/Manifest
+++ b/games-strategy/glob2/Manifest
@@ -1,4 +1,4 @@
-MD5 779525e90c2290d87ef238899d95a04d glob2-0.8.2.ebuild 744
-MD5 67766c04790525af71ebb3123dba9ab6 files/digest-glob2-0.8.2 64
-MD5 177a85816aca5c7d52e4e86d1dfa37ad ChangeLog 356
 MD5 be3faa436a456146cab34d1a7ba5e534 metadata.xml 546
+MD5 25d510561aad18df0279755d4000097b ChangeLog 2895
+MD5 bad48144211e306ea91a7571e7982fc9 glob2-0.8.15.ebuild 1073
+MD5 222d938fd35ab1fb95eaf828c73203d5 files/digest-glob2-0.8.15 65
diff --git a/games-strategy/glob2/glob2-0.8.15.ebuild b/games-strategy/glob2/glob2-0.8.15.ebuild
index 87829e7732dd..a44beeb2c84f 100644
--- a/games-strategy/glob2/glob2-0.8.15.ebuild
+++ b/games-strategy/glob2/glob2-0.8.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/games-strategy/glob2/glob2-0.8.15.ebuild,v 1.1 2005/05/16 17:15:58 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/glob2/glob2-0.8.15.ebuild,v 1.1.1.1 2005/11/30 09:36:43 chriswhite Exp $
 
 inherit games
 
@@ -10,7 +10,7 @@ SRC_URI="http://epfl.ysagoon.com/~glob2/data/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
 DEPEND="virtual/opengl
@@ -36,5 +36,6 @@ src_compile() {
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS README TODO
+	make_desktop_entry glob2 "Globulation 2"
 	prepgamesdirs
 }
diff --git a/games-strategy/heroes3/ChangeLog b/games-strategy/heroes3/ChangeLog
index 1e6edfd239bf..123d2d8ca7de 100644
--- a/games-strategy/heroes3/ChangeLog
+++ b/games-strategy/heroes3/ChangeLog
@@ -1,6 +1,37 @@
 # ChangeLog for games-strategy/heroes3
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/heroes3/ChangeLog,v 1.1 2004/09/29 23:43:45 wolf31o2 Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/heroes3/ChangeLog,v 1.1.1.1 2005/11/30 09:36:42 chriswhite Exp $
+
+  21 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  heroes3-1.3.1a-r1.ebuild:
+  Added addition dir variable to games_make_wrapper for bug #109793.
+
+  27 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  heroes3-1.3.1a-r1.ebuild:
+  Changed to use new lokigames mirror:// setup.
+
+  21 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  heroes3-1.3.1a-r1.ebuild:
+  Changed check_license to explicitly list license to check.
+
+  25 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  -heroes3-1.3.1a.ebuild, heroes3-1.3.1a-r1.ebuild:
+  Marking stable on x86 and removing older versions.
+
+  05 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  heroes3-1.3.1a-r1.ebuild:
+  Changed if statement to use proper syntax.
+
+  25 Feb 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  heroes3-1.3.1a-r1.ebuild:
+  patch from Ron Kracht (bug #83252)
+
+*heroes3-1.3.1a-r1 (22 Feb 2005)
+
+  22 Feb 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  +heroes3-1.3.1a-r1.ebuild:
+  Updated to use lib-compat-loki. Ebuild by Alex Linke
+  <incubation.11@freenet.de> and submitted to bug #71044.
 
 *heroes3-1.3.1a (29 Sep 2004)
 
diff --git a/games-strategy/heroes3/Manifest b/games-strategy/heroes3/Manifest
index 398f7dbb0479..5126ca58d4a6 100644
--- a/games-strategy/heroes3/Manifest
+++ b/games-strategy/heroes3/Manifest
@@ -1,3 +1,4 @@
-MD5 34b8e51cdaebdde59dbe921dd232e3a8 heroes3-1.3.1a.ebuild 2832
+MD5 9d71e187268673ded8dc265b67adb972 ChangeLog 1477
+MD5 448d580609f09736aaa5f762b631e813 files/digest-heroes3-1.3.1a-r1 142
+MD5 f43f915f905eb5d1a25d37a7580812a9 heroes3-1.3.1a-r1.ebuild 3205
 MD5 11a7e1491b1ac042ac7216b26b4ad1fb metadata.xml 254
-MD5 448d580609f09736aaa5f762b631e813 files/digest-heroes3-1.3.1a 142
diff --git a/games-strategy/heroes3/heroes3-1.3.1a-r1.ebuild b/games-strategy/heroes3/heroes3-1.3.1a-r1.ebuild
index 06106dbf39a2..1fa43a75017f 100644
--- a/games-strategy/heroes3/heroes3-1.3.1a-r1.ebuild
+++ b/games-strategy/heroes3/heroes3-1.3.1a-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-strategy/heroes3/heroes3-1.3.1a-r1.ebuild,v 1.1 2005/02/23 02:54:50 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/heroes3/heroes3-1.3.1a-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:42 chriswhite Exp $
 
 # 	[x] Base Install Required (+4 MB) 
 #	[x] Scenarios (+7 MB)
@@ -14,15 +14,13 @@ inherit games
 IUSE="nocd maps music sounds videos"
 DESCRIPTION="Heroes of Might and Magic III : The Restoration of Erathia - turn-based 2-D medieval combat"
 HOMEPAGE="http://www.lokigames.com/products/heroes3/"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 # Since I do not have a PPC machine to test with, I will leave the PPC stuff in
 # here so someone else can stabilize loki_setupdb and loki_patch for PPC and
 # then KEYWORD this appropriately.
-SRC_URI="x86? ( ftp://ftp.planetmirror.com/pub/lokigames/updates/${PN}/${P}-cdrom-x86.run
-		ftp://snuffleupagus.animearchive.org/loki/updates/${PN}/${P}-cdrom-x86.run )
-	ppc? ( ftp://ftp.planetmirror.com/pub/lokigames/updates/${PN}/${P}-ppc.run
-		ftp://snuffleupagus.animearchive.org/loki/updates/${PN}/${P}-ppc.run )"
+SRC_URI="x86? ( mirror://lokigames/${PN}/${P}-cdrom-x86.run )
+	ppc? ( mirror://lokigames/${PN}/${P}-ppc.run )"
 
 LICENSE="LOKI-EULA"
 SLOT="0"
@@ -38,7 +36,7 @@ dir=${GAMES_PREFIX_OPT}/${PN}
 Ddir=${D}/${dir}
 
 pkg_setup() {
-	check_license || die "License check failed"
+	check_license LOKI-EULA
 	use nocd && ewarn "The full installation takes about 341 MB of space!"
 	games_pkg_setup
 }
@@ -67,26 +65,25 @@ src_install() {
 	fi
 
 	cd ${Ddir}
-	tar xf ${CDROM_ROOT}/hiscore.tar.gz || die "unpacking hiscore"
+	tar -zxf ${CDROM_ROOT}/hiscore.tar.gz || die "unpacking hiscore"
 
 	cd ${S}
 	loki_patch --verify patch.dat
 	loki_patch patch.dat ${Ddir} >& /dev/null || die "patching"
 
-	games_make_wrapper heroes3 ./heroes3 ${dir}
+	games_make_wrapper heroes3 ./heroes3 "${dir}" "${dir}"
 
 	# now, since these files are coming off a cd, the times/sizes/md5sums wont
 	# be different ... that means portage will try to unmerge some files (!)
 	# we run touch on ${D} so as to make sure portage doesnt do any such thing
 	find ${Ddir} -exec touch '{}' \;
 
-	cp ${CDROM_ROOT}/icon.xpm ${S}/heroes3.xpm
-	doicon ${S}/heroes3.xpm
+	newicon ${CDROM_ROOT}/icon.xpm heroes3.xpm
 
 	prepgamesdirs
 	make_desktop_entry heroes3 "Heroes of Might and Magic III" "heroes3.xpm"
 
-	if [ "${ARCH}" = "x86" ]; then
+	if use x86; then
 		einfo "Linking libs provided by 'sys-libs/lib-compat-loki' to '${dir}'."
 		dosym /lib/loki_ld-linux.so.2 ${dir}/ld-linux.so.2 && \
 		dosym /usr/lib/loki_libc.so.6 ${dir}/libc.so.6 && \
@@ -94,7 +91,7 @@ src_install() {
 	fi
 
 	einfo "Changing 'hiscore.dat' to be writeable for group 'games'."
-	fperms g+w ${Ddir}/data/hiscore.dat || die "fperms failed"
+	fperms g+w "${dir}/data/hiscore.dat" || die "fperms failed"
 }
 
 pkg_postinst() {
diff --git a/games-strategy/kpictorial/ChangeLog b/games-strategy/kpictorial/ChangeLog
index a2ed7120ca6b..7e51477b5166 100644
--- a/games-strategy/kpictorial/ChangeLog
+++ b/games-strategy/kpictorial/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for games-strategy/kpictorial
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/kpictorial/ChangeLog,v 1.1 2004/07/04 11:39:25 centic Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/kpictorial/ChangeLog,v 1.1.1.1 2005/11/30 09:36:42 chriswhite Exp $
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  kpictorial-0.9.1.ebuild:
+  Stable on ppc.
+
+  09 Mar 2005; Gregorio Guidi <greg_g@gentoo.org> kpictorial-0.9.1.ebuild:
+  Stable on x86.
+
+  31 Dec 2004; Jason Wever <weeve@gentoo.org> kpictorial-0.9.1.ebuild:
+  Added ~sparc keyword.
+
+  08 Nov 2004; Joseph Jezak <josejx@gentoo.org> kpictorial-0.9.1.ebuild:
+  Added ~ppc.
 
 *kpictorial-0.9.1 (04 Jul 2004)
 
diff --git a/games-strategy/kpictorial/Manifest b/games-strategy/kpictorial/Manifest
index c1cf92c9c065..15ddde26a93e 100644
--- a/games-strategy/kpictorial/Manifest
+++ b/games-strategy/kpictorial/Manifest
@@ -1,2 +1,4 @@
-MD5 b91bd7757f3c1304db7b7726c76f5ac6 kpictorial-0.9.1.ebuild 493
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 ade582b631fb4b11c5d2f75dd2b216b6 ChangeLog 763
+MD5 f8b11d6b95805b628012cdbb7f199717 kpictorial-0.9.1.ebuild 479
 MD5 69878feac07fcfd16afde20bc46e6438 files/digest-kpictorial-0.9.1 68
diff --git a/games-strategy/kpictorial/kpictorial-0.9.1.ebuild b/games-strategy/kpictorial/kpictorial-0.9.1.ebuild
index f36710059274..5c99b0fff574 100644
--- a/games-strategy/kpictorial/kpictorial-0.9.1.ebuild
+++ b/games-strategy/kpictorial/kpictorial-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/games-strategy/kpictorial/kpictorial-0.9.1.ebuild,v 1.1 2004/07/04 11:39:25 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/kpictorial/kpictorial-0.9.1.ebuild,v 1.1.1.1 2005/11/30 09:36:42 chriswhite Exp $
 
 inherit kde
 need-kde 3
@@ -10,8 +10,7 @@ HOMEPAGE="http://members.chello.at/roland.lezuo/kpictorial.html"
 SRC_URI="mirror://sourceforge/kpictorial/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="ppc ~sparc x86"
 
 SLOT="0"
 IUSE=""
-
diff --git a/games-strategy/kpictorial/metadata.xml b/games-strategy/kpictorial/metadata.xml
index b435a8440ccd..8d1e86a9cefb 100644
--- a/games-strategy/kpictorial/metadata.xml
+++ b/games-strategy/kpictorial/metadata.xml
@@ -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/games-strategy/lgeneral/ChangeLog b/games-strategy/lgeneral/ChangeLog
index e66ad5f9eb37..2cb0671f9894 100644
--- a/games-strategy/lgeneral/ChangeLog
+++ b/games-strategy/lgeneral/ChangeLog
@@ -1,6 +1,81 @@
-# ChangeLog for app-games/lgeneral
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/ChangeLog,v 1.1 2003/09/10 05:27:31 vapier Exp $
+# ChangeLog for games-strategy/lgeneral
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/ChangeLog,v 1.1.1.1 2005/11/30 09:36:38 chriswhite Exp $
+
+*lgeneral-1.2_beta9 (07 Nov 2005)
+
+  07 Nov 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +lgeneral-1.2_beta9.ebuild:
+  version bump
+
+*lgeneral-1.2_beta8 (29 Oct 2005)
+
+  29 Oct 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +lgeneral-1.2_beta8.ebuild:
+  version bump
+
+*lgeneral-1.2_beta7 (18 Oct 2005)
+
+  18 Oct 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +lgeneral-1.2_beta7.ebuild:
+  version bump
+
+  16 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/lgeneral-1.2_beta6-gcc3.patch, lgeneral-1.2_beta6.ebuild:
+  Fix by ph for build error with gcc-3.x #109476 by Mike Bonar.
+
+*lgeneral-1.2_beta6 (15 Oct 2005)
+
+  15 Oct 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/1.2_beta6-gcc4.patch, +lgeneral-1.2_beta6.ebuild:
+  version bump
+
+  11 Oct 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/1.2_beta5-gcc4.patch, lgeneral-1.2_beta5.ebuild:
+  add patch from Marien Zwart for current gcc __FUNCTION__ handling (bug
+  #106258)
+
+*lgeneral-1.2_beta5 (06 Oct 2005)
+
+  06 Oct 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +lgeneral-1.2_beta5.ebuild:
+  unstable version bump
+
+  23 Aug 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  lgeneral-1.2_beta2.ebuild:
+  cp -dpR -> cp -pPR for bug #103487.
+
+  23 Aug 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  lgeneral-1.2_beta2.ebuild:
+  cp -a -> cp -dpR for bug #103487.
+
+  15 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  lgeneral-1.1.1-r1.ebuild, lgeneral-1.2_beta2.ebuild:
+  Removed INSTALL file.
+
+  26 Jan 2005; Joseph Jezak <josejx@gentoo.org> lgeneral-1.1.1-r1.ebuild:
+  Marked ~ppc for bug #77759.
+
+  29 Dec 2004; Tom Martin <slarti@gentoo.org> lgeneral-1.2_beta2.ebuild:
+  Marked ~amd64.
+
+  23 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  lgeneral-1.2_beta2.ebuild:
+  Use pg-data as recommended by upstream.  Patch from Derek Dolney via bug #56302
+
+*lgeneral-1.2_beta2 (29 May 2004)
+
+  29 May 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  lgeneral-1.2_beta2.ebuild:
+  version bump - seems to fix bug #41173 as well.
+
+  05 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  lgeneral-1.1.1-r1.ebuild, files/1.1.1-netbsd-audio.patch:
+  audio patch from netbsd
+
+  20 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  lgeneral-1.1.1-r1.ebuild:
+  IUSE; error messages
 
 *lgeneral-1.1.1-r1 (12 Dec 2002)
 
diff --git a/games-strategy/lgeneral/Manifest b/games-strategy/lgeneral/Manifest
index e8e11ab08c5b..87471272adb4 100644
--- a/games-strategy/lgeneral/Manifest
+++ b/games-strategy/lgeneral/Manifest
@@ -1,3 +1,13 @@
-MD5 a11308aded108a0655d2bd32d877a2de ChangeLog 1570
-MD5 4a27b88e34433aa02ee511be9567fc56 lgeneral-1.1.1-r1.ebuild 940
+MD5 92d8aae6551aa19229080bfcb10c8385 lgeneral-1.2_beta8.ebuild 1601
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 cca6898907a4441d1f2c7e1a76b6b585 lgeneral-1.2_beta2.ebuild 1481
+MD5 128afa83e71a3141c957a56313b92000 lgeneral-1.1.1-r1.ebuild 1113
+MD5 c92bcf37b49f4d6be349583487e658df lgeneral-1.2_beta9.ebuild 1616
+MD5 c407e1590daa8a5fb4ede173f7ca0f16 lgeneral-1.2_beta7.ebuild 1601
+MD5 5a1250b01cebbd593d3b144b1a61ba56 ChangeLog 3831
+MD5 5706fe2761ce54d1193998d40a3752fe files/digest-lgeneral-1.2_beta7 130
+MD5 77fda12a372abfd55040151b84dd2d7b files/1.1.1-netbsd-audio.patch 813
+MD5 a439ff98a9b35e8e232647449c5de2a0 files/digest-lgeneral-1.2_beta2 129
+MD5 be0dc4564f6bc9318fec0458abcebfc2 files/digest-lgeneral-1.2_beta9 130
+MD5 f15a7bddef19b7788bc04b91a6164457 files/digest-lgeneral-1.2_beta8 130
 MD5 9bd18133cff27a13ac0c62fe2ebeba33 files/digest-lgeneral-1.1.1-r1 138
diff --git a/games-strategy/lgeneral/files/digest-lgeneral-1.2_beta2 b/games-strategy/lgeneral/files/digest-lgeneral-1.2_beta2
index 47ff8d7d5040..ba55a08fbe47 100644
--- a/games-strategy/lgeneral/files/digest-lgeneral-1.2_beta2
+++ b/games-strategy/lgeneral/files/digest-lgeneral-1.2_beta2
@@ -1,2 +1,2 @@
 MD5 093964e5918e530bed4e404b8e53dea0 lgeneral-1.2beta-2.tar.gz 878853
-MD5 786feb83f163834a22e3e85e1970145f lgeneral-data-1.1.3.tar.gz 1073781
+MD5 17b15c7cdd31547d061522d1e35da6e9 pg-data.tar.gz 410454
diff --git a/games-strategy/lgeneral/lgeneral-1.1.1-r1.ebuild b/games-strategy/lgeneral/lgeneral-1.1.1-r1.ebuild
index 76c3f810a54d..917427825833 100644
--- a/games-strategy/lgeneral/lgeneral-1.1.1-r1.ebuild
+++ b/games-strategy/lgeneral/lgeneral-1.1.1-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-strategy/lgeneral/lgeneral-1.1.1-r1.ebuild,v 1.1 2003/09/10 05:27:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/lgeneral-1.1.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:38 chriswhite Exp $
 
-inherit games
+inherit eutils games
 
 DATA=lgeneral-data-1.1.3
 
@@ -13,26 +13,31 @@ SRC_URI="mirror://sourceforge/lgeneral/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ~ppc"
+IUSE=""
 
 DEPEND=">=media-libs/libsdl-1.2.4
 	>=media-libs/sdl-mixer-1.2.3"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch "${FILESDIR}/${PV}-netbsd-audio.patch"
+}
+
 src_compile() {
 	egamesconf --datadir=${GAMES_DATADIR}/../
-	emake || die
+	emake || die "emake failed"
 
 	cd ${WORKDIR}/${DATA}
 	egamesconf --datadir=${GAMES_DATADIR}/../
-	emake || die
+	emake || die "emake failed (data)"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYING ChangeLog INSTALL README TODO
-
+	make DESTDIR=${D} install || die "make install failed"
+	dodoc AUTHORS ChangeLog README TODO
 	cd ${WORKDIR}/${DATA}
-	make DESTDIR=${D} install || die
-
+	make DESTDIR=${D} install || die "make install failed (data)"
 	prepgamesdirs
 }
diff --git a/games-strategy/lgeneral/lgeneral-1.2_beta2.ebuild b/games-strategy/lgeneral/lgeneral-1.2_beta2.ebuild
index 35f9c744258d..6a9def3156ee 100644
--- a/games-strategy/lgeneral/lgeneral-1.2_beta2.ebuild
+++ b/games-strategy/lgeneral/lgeneral-1.2_beta2.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/games-strategy/lgeneral/lgeneral-1.2_beta2.ebuild,v 1.1 2004/05/29 07:37:27 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/lgeneral-1.2_beta2.ebuild,v 1.1.1.1 2005/11/30 09:36:38 chriswhite Exp $
 
 inherit eutils games
 
-DATA=lgeneral-data-1.1.3
+DATA=pg-data
 MY_P="${P/_/}"
 MY_P="${MY_P/beta/beta-}"
 DESCRIPTION="A Panzer General clone written in SDL"
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/lgeneral/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ~amd64"
 IUSE=""
 
 DEPEND=">=media-libs/libsdl-1.2.4
@@ -22,19 +22,33 @@ DEPEND=">=media-libs/libsdl-1.2.4
 
 S="${WORKDIR}/${MY_P}"
 
+src_unpack() {
+	unpack ${A}
+	# Build a temporary lgc-pg that knows about /var/tmp/portage in work/lgc-pg:
+	cp -pPR "${S}" "${WORKDIR}/lgc-pg" || die "cp failed."
+}
+
 src_compile() {
-	egamesconf --datadir="${GAMES_DATADIR}/../"
+	egamesconf --datadir="${GAMES_DATADIR}/../" || die
 	emake || die "emake failed"
 
-	cd "${WORKDIR}/${DATA}"
-	egamesconf --datadir="${GAMES_DATADIR}/../"
-	emake || die "emake failed (data)"
+	# Build the temporary lgc-pg:
+	cd "${WORKDIR}/lgc-pg"
+	egamesconf --datadir="${D}/${GAMES_DATADIR_BASE}" || die
+	cd lgc-pg
+	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog INSTALL README TODO
-	cd "${WORKDIR}/${DATA}"
-	make DESTDIR="${D}" install || die "make install failed (data)"
+	make DESTDIR="${D}" install || die "make install failed."
+	keepdir "${GAMES_DATADIR}/${PN}/"{ai_modules,music}
+
+	# Generate scenario data:
+	"${WORKDIR}/lgc-pg/lgc-pg/lgc-pg" \
+		-s "${WORKDIR}/${DATA}" \
+		-d "${D}/${GAMES_DATADIR}/lgeneral" \
+		|| die "Failed to generate scenario data."
+
+	dodoc AUTHORS ChangeLog README.lgeneral README.lgc-pg TODO
 	prepgamesdirs
 }
diff --git a/games-strategy/lgeneral/lgeneral-1.2_beta7.ebuild b/games-strategy/lgeneral/lgeneral-1.2_beta7.ebuild
index 2b991440db8a..0e08a046d499 100644
--- a/games-strategy/lgeneral/lgeneral-1.2_beta7.ebuild
+++ b/games-strategy/lgeneral/lgeneral-1.2_beta7.ebuild
@@ -1,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-strategy/lgeneral/lgeneral-1.2_beta7.ebuild,v 1.1 2005/10/18 03:55:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/lgeneral-1.2_beta7.ebuild,v 1.1.1.1 2005/11/30 09:36:38 chriswhite Exp $
 
 inherit eutils games
 
diff --git a/games-strategy/lgeneral/lgeneral-1.2_beta8.ebuild b/games-strategy/lgeneral/lgeneral-1.2_beta8.ebuild
index 20b1095d9983..07f73e2fd3eb 100644
--- a/games-strategy/lgeneral/lgeneral-1.2_beta8.ebuild
+++ b/games-strategy/lgeneral/lgeneral-1.2_beta8.ebuild
@@ -1,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-strategy/lgeneral/lgeneral-1.2_beta8.ebuild,v 1.1 2005/10/29 21:50:21 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/lgeneral-1.2_beta8.ebuild,v 1.1.1.1 2005/11/30 09:36:38 chriswhite Exp $
 
 inherit eutils games
 
diff --git a/games-strategy/lgeneral/lgeneral-1.2_beta9.ebuild b/games-strategy/lgeneral/lgeneral-1.2_beta9.ebuild
index 1990ea4af662..b6b2a1e46f5d 100644
--- a/games-strategy/lgeneral/lgeneral-1.2_beta9.ebuild
+++ b/games-strategy/lgeneral/lgeneral-1.2_beta9.ebuild
@@ -1,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-strategy/lgeneral/lgeneral-1.2_beta9.ebuild,v 1.1 2005/11/07 07:48:21 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/lgeneral-1.2_beta9.ebuild,v 1.1.1.1 2005/11/30 09:36:38 chriswhite Exp $
 
 inherit eutils games
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/lgeneral/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~x86"
 IUSE=""
 
 DEPEND=">=media-libs/libsdl-1.2.4
@@ -46,7 +46,7 @@ src_install() {
 	keepdir "${GAMES_DATADIR}/${PN}/"{ai_modules,music,terrain}
 
 	# Generate scenario data:
-	"${WORKDIR}/lgc-pg/lgc-pg/lgc-pg" \
+	SDL_VIDEODRIVER=dummy "${WORKDIR}/lgc-pg/lgc-pg/lgc-pg" \
 		-s "${WORKDIR}/${DATA}" \
 		-d "${D}/${GAMES_DATADIR}/lgeneral" \
 		|| die "Failed to generate scenario data."
diff --git a/games-strategy/lgeneral/metadata.xml b/games-strategy/lgeneral/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-strategy/lgeneral/metadata.xml
+++ b/games-strategy/lgeneral/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-strategy/liquidwar/ChangeLog b/games-strategy/liquidwar/ChangeLog
index 63ab07443fd6..7672d7399aae 100644
--- a/games-strategy/liquidwar/ChangeLog
+++ b/games-strategy/liquidwar/ChangeLog
@@ -1,6 +1,35 @@
-# ChangeLog for app-games/liquidwar
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/liquidwar/ChangeLog,v 1.1 2003/09/10 05:27:31 vapier Exp $
+# ChangeLog for games-strategy/liquidwar
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/liquidwar/ChangeLog,v 1.1.1.1 2005/11/30 09:36:44 chriswhite Exp $
+
+  03 Sep 2005; Luis Medinas <metalgod@gentoo.org> liquidwar-5.6.2.ebuild:
+  Added ~amd64 keywords.
+
+  02 Jan 2005; Mike Frysinger <vapier@gentoo.org> liquidwar-5.6.2.ebuild:
+  Pass --disable-target-opt since all it does is add -mcpu to CFLAGS #76338 by
+  Simon Stelling.
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  07 Nov 2004; Joseph Jezak <josejx@gentoo.org> liquidwar-5.6.2.ebuild:
+  Marked ppc stable.
+
+  09 Apr 2004; David Holm <dholm@gentoo.org> liquidwar-5.6.2.ebuild:
+  Added to ~ppc.
+
+*liquidwar-5.6.2 (08 Apr 2004)
+
+  08 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> liquidwar-5.6.2.ebuild:
+  version bump
+
+*liquidwar-5.6.1 (12 Jan 2004)
+
+  12 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org> liquidwar-5.6.1.ebuild:
+  version bump (bug 37917)
+
+  06 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org> liquidwar-5.5.9.ebuild:
+  turn off the messages from the Makefile; more error checking/messages
 
 *liquidwar-5.5.9 (05 Jun 2003)
 
@@ -29,7 +58,7 @@
  
 *liquidwar-5.5.3.ebuild (17 julio 2002)
 
-  17 jul 2002; Jose Alberto Su�rez L�pez <bass@gentoo.org> Changelog :
+  17 jul 2002; Jose Alberto Suárez López <bass@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/games-strategy/liquidwar/Manifest b/games-strategy/liquidwar/Manifest
index 11d13becf01e..c9c73c7a0bf6 100644
--- a/games-strategy/liquidwar/Manifest
+++ b/games-strategy/liquidwar/Manifest
@@ -1,5 +1,14 @@
-MD5 6f6adf93a11eb27624ca18082f1d3f15 ChangeLog 1405
-MD5 e52e783ea072f42cc767331c0c5ab705 liquidwar-5.5.8.ebuild 716
-MD5 415cce646738e3d302568eca6a48535b liquidwar-5.5.9.ebuild 836
-MD5 2dd2c7dde8d981f363fad2bf89ec36db files/digest-liquidwar-5.5.8 68
-MD5 02931807e4cf05dc7adf7d9623aaac31 files/digest-liquidwar-5.5.9 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5b56afb02d5d6d75dccb640070141bbf ChangeLog 2386
+MD5 be828dad0dc957c423c04a5931bf052b liquidwar-5.6.2.ebuild 1568
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 baa58ba47700f8e6b8525f9d35093e57 files/digest-liquidwar-5.6.2 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDGbvjwUpWvClEHQoRAgFqAJ9R/4FuWbRQz4NYxphNdZDQE4K9CQCfTnUt
+MGxC8N6kG2aEEvyYk26XGIo=
+=QZHs
+-----END PGP SIGNATURE-----
diff --git a/games-strategy/liquidwar/liquidwar-5.6.2.ebuild b/games-strategy/liquidwar/liquidwar-5.6.2.ebuild
index 4fc550d928d6..42de730cc362 100644
--- a/games-strategy/liquidwar/liquidwar-5.6.2.ebuild
+++ b/games-strategy/liquidwar/liquidwar-5.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/games-strategy/liquidwar/liquidwar-5.6.2.ebuild,v 1.1 2004/04/08 23:27:03 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/liquidwar/liquidwar-5.6.2.ebuild,v 1.1.1.1 2005/11/30 09:36:44 chriswhite Exp $
 
 inherit flag-o-matic games
 
@@ -8,9 +8,9 @@ DESCRIPTION="unique multiplayer wargame"
 HOMEPAGE="http://www.ufoot.org/liquidwar/"
 SRC_URI="http://liquidwar.sunsite.dk/archive/${P}.tar.gz"
 
-KEYWORDS="x86"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~amd64 ppc x86"
 IUSE="nls"
 
 RDEPEND=">media-libs/allegro-4.0"
@@ -19,7 +19,7 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	sed -i \
 		-e 's:/games::' \
 		-e '/^MANDIR/ s:=.*:= $(mandir)/man6:' \
@@ -29,25 +29,29 @@ src_unpack() {
 		-e '/^GAMEDIR/ s/exec_prefix/bindir/' \
 		-e 's:$(DOCDIR)/txt:$(DOCDIR):g' \
 		-e 's:$(GMAKE):$(MAKE):' \
-		-e '/^DOCDIR/ s:=.*:= /usr/share/doc/$(P):' Makefile.in \
-			|| die 'sed Makefile.in failed'
+		-e '/^DOCDIR/ s:=.*:= /usr/share/doc/$(PF):' Makefile.in \
+		|| die 'sed Makefile.in failed'
 	sed -i \
 		-e '/^GAMEDIR/ s/$(exec_prefix)/@bindir@/' \
 		-e 's:/games::' src/Makefile.in \
-			|| die "sed src/Makefile.in failed"
+		|| die "sed src/Makefile.in failed"
 }
 
 src_compile() {
 	# Fixes build problem with gcc3 and -march=pentium4
-	replace-flags "-march=pentium4" "-march=pentium3"
-	egamesconf --disable-doc-ps --disable-doc-pdf || die
+	replace-cpu-flags pentium4 pentium3
+	egamesconf \
+		--disable-doc-ps \
+		--disable-doc-pdf \
+		--disable-target-opt \
+		|| die
 	emake || die "emake failed"
 }
 
 src_install() {
 	make DESTDIR="${D}" install_nolink || die "make install failed"
-	rm -f "${D}/usr/share/doc/${P}/COPYING"
-	use nls || rm -f "${D}/usr/share/doc/${P}/README.*"
-	gzip -9 "${D}/usr/share/doc/${P}/"{[A-Z]*,*txt}
+	rm -f "${D}"/usr/share/doc/${PF}/COPYING
+	use nls || rm -f "${D}"/usr/share/doc/${PF}/README.*
+	prepalldocs
 	prepgamesdirs
 }
diff --git a/games-strategy/liquidwar/metadata.xml b/games-strategy/liquidwar/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-strategy/liquidwar/metadata.xml
+++ b/games-strategy/liquidwar/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-strategy/magnant/ChangeLog b/games-strategy/magnant/ChangeLog
index 4a2f25cbd2ab..7690328d8087 100644
--- a/games-strategy/magnant/ChangeLog
+++ b/games-strategy/magnant/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for games-strategy/magnant
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/magnant/ChangeLog,v 1.1 2005/10/26 00:36:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/magnant/ChangeLog,v 1.1.1.1 2005/11/30 09:36:42 chriswhite Exp $
 
 *magnant-2.00 (Oct 25 2005)
 
diff --git a/games-strategy/magnant/Manifest b/games-strategy/magnant/Manifest
index f4b905df937c..40c32383a5d3 100644
--- a/games-strategy/magnant/Manifest
+++ b/games-strategy/magnant/Manifest
@@ -1,3 +1,4 @@
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 b68d95fef0f2279e96160b5429025280 magnant-2.00.ebuild 1001
+MD5 c43ceb290ba190bc0de9c834b4657723 ChangeLog 348
 MD5 8f7f9fcf2d1539b169755c83431a4131 files/digest-magnant-2.00 74
-MD5 ceada51cb6ca434340e790d688842fc5 files/magnant 62
-MD5 b3a794b69320abc38583d7e0c5879f2e magnant-2.00.ebuild 683
diff --git a/games-strategy/magnant/magnant-2.00.ebuild b/games-strategy/magnant/magnant-2.00.ebuild
index d7a61069e66b..45d9dc1021d8 100644
--- a/games-strategy/magnant/magnant-2.00.ebuild
+++ b/games-strategy/magnant/magnant-2.00.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-strategy/magnant/magnant-2.00.ebuild,v 1.1 2005/10/26 00:36:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/magnant/magnant-2.00.ebuild,v 1.1.1.1 2005/11/30 09:36:42 chriswhite Exp $
 
-inherit games eutils
+inherit eutils games
 
 DESCRIPTION="Trading Card Game where cards are used in a Real Time Strategy Environment"
 HOMEPAGE="http://linux.insectwar.com/"
@@ -32,7 +32,7 @@ src_install() {
 	insinto "${GAMES_DATADIR}"/${PN}
 	doins -r data/* || die
 
-	games_make_wrapper magnant "stratagus -d '${GAMES_DATADIR}'/${PN}" "${dir}"
+	games_make_wrapper magnant "stratagus -d '${GAMES_DATADIR}'/${PN}"
 	doicon magnant.xpm
 	make_desktop_entry magnant "Magnant" magnant.xpm
 
diff --git a/games-strategy/majesty-demo/ChangeLog b/games-strategy/majesty-demo/ChangeLog
index b2ddc1c65bb6..9082ef133ec0 100644
--- a/games-strategy/majesty-demo/ChangeLog
+++ b/games-strategy/majesty-demo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-strategy/majesty-demo
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/majesty-demo/ChangeLog,v 1.1 2005/02/23 03:38:43 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/majesty-demo/ChangeLog,v 1.1.1.1 2005/11/30 09:36:41 chriswhite Exp $
+
+  21 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  majesty-demo-1.0.0.ebuild:
+  Added addition dir variable to games_make_wrapper for bug #109793.
+
+  09 May 2005; David Holm <dholm@gentoo.org> majesty-demo-1.0.0.ebuild:
+  Added to ~ppc.
 
 *majesty-demo-1.0.0 (22 Feb 2005)
 
diff --git a/games-strategy/majesty-demo/Manifest b/games-strategy/majesty-demo/Manifest
index e69de29bb2d1..b65a7b044b75 100644
--- a/games-strategy/majesty-demo/Manifest
+++ b/games-strategy/majesty-demo/Manifest
@@ -0,0 +1,4 @@
+MD5 3d785fdc54091c4508e14f346b71dd4e ChangeLog 660
+MD5 bbebeb38c7936145c78bc62c84dd672d files/digest-majesty-demo-1.0.0 63
+MD5 1d789ade3dbfdc2d5ede4c3a2026e776 majesty-demo-1.0.0.ebuild 1261
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
diff --git a/games-strategy/majesty-demo/majesty-demo-1.0.0.ebuild b/games-strategy/majesty-demo/majesty-demo-1.0.0.ebuild
index 89c1f4fa46b5..2f31690ded0e 100644
--- a/games-strategy/majesty-demo/majesty-demo-1.0.0.ebuild
+++ b/games-strategy/majesty-demo/majesty-demo-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/games-strategy/majesty-demo/majesty-demo-1.0.0.ebuild,v 1.1 2005/02/23 03:38:43 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/majesty-demo/majesty-demo-1.0.0.ebuild,v 1.1.1.1 2005/11/30 09:36:41 chriswhite Exp $
 
 inherit eutils games
 
@@ -10,7 +10,7 @@ SRC_URI="http://demos.linuxgamepublishing.com/majesty/majesty_demo.run"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~amd64 ~x86" # ~ppc
+KEYWORDS="~amd64 ~x86 ~ppc"
 IUSE=""
 
 RDEPEND="virtual/x11"
@@ -38,7 +38,7 @@ src_install() {
 	elif use ppc; then
 		doexe bin/Linux/ppc/glibc-2.1/maj_demo || die "doexe"
 	fi
-	games_make_wrapper maj_demo ./maj_demo ${dir}
+	games_make_wrapper maj_demo ./maj_demo "${dir}" "${dir}"
 	prepgamesdirs
 	make_desktop_entry maj_demo "Majesty Demo" ${PN}.xpm
 }
diff --git a/games-strategy/metadata.xml b/games-strategy/metadata.xml
index 1c7bfe78bbd7..149a2cd3539f 100644
--- a/games-strategy/metadata.xml
+++ b/games-strategy/metadata.xml
@@ -4,5 +4,23 @@
 	<longdescription lang="en">
 		The games-strategy category contains strategy games.
 	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie games-strategy enthält Strategiespiele.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría games-strategy contiene juegos de estrategia.
+	</longdescription>
+	<longdescription lang="ja">
+		games-strategyカテゴリーにはストラテジー・ゲームが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De games-strategy categorie bevat strategiespellen.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm games-strategy chứa các trò chơi chiến thuật.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria games-strategy contiene giochi strategici.
+	</longdescription>
 </catmetadata>
 
diff --git a/games-strategy/mindrover-demo/ChangeLog b/games-strategy/mindrover-demo/ChangeLog
index b07dc04a51a3..6626acdffd18 100644
--- a/games-strategy/mindrover-demo/ChangeLog
+++ b/games-strategy/mindrover-demo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/mindrover-demo
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/mindrover-demo/ChangeLog,v 1.1 2005/06/17 17:53:29 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/mindrover-demo/ChangeLog,v 1.1.1.1 2005/11/30 09:36:43 chriswhite Exp $
+
+  21 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  mindrover-demo-1.07b.ebuild:
+  Added addition dir variable to games_make_wrapper for bug #109793.
 
 *mindrover-demo-1.07b (17 Jun 2005)
 
diff --git a/games-strategy/mindrover-demo/Manifest b/games-strategy/mindrover-demo/Manifest
index 44b022855a7a..29e3d258e374 100644
--- a/games-strategy/mindrover-demo/Manifest
+++ b/games-strategy/mindrover-demo/Manifest
@@ -1,2 +1,4 @@
-MD5 1936781699c19ad6340b9a6d776cbc28 mindrover-demo-1.07b.ebuild 1247
+MD5 18023d15485837a41dbae6a8b0fdcca9 ChangeLog 581
 MD5 8c2852862997d7de1fe42e08003ed03f files/digest-mindrover-demo-1.07b 65
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 104c06c875143f83ac76be6668ba7bca mindrover-demo-1.07b.ebuild 1361
diff --git a/games-strategy/mindrover-demo/mindrover-demo-1.07b.ebuild b/games-strategy/mindrover-demo/mindrover-demo-1.07b.ebuild
index 0ccf96361c01..c2c2ae5cc88e 100644
--- a/games-strategy/mindrover-demo/mindrover-demo-1.07b.ebuild
+++ b/games-strategy/mindrover-demo/mindrover-demo-1.07b.ebuild
@@ -1,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-strategy/mindrover-demo/mindrover-demo-1.07b.ebuild,v 1.1 2005/06/17 17:53:29 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/mindrover-demo/mindrover-demo-1.07b.ebuild,v 1.1.1.1 2005/11/30 09:36:43 chriswhite Exp $
 
 inherit eutils games
 
@@ -42,7 +42,7 @@ src_install() {
 		bin/Linux/x86/glibc-2.1/lib/libopenal.so.0.0.6 || die "doexe failed"
 	dosym ${dir}/libopenal.so.0.0.6 ${dir}/libopenal.so.0
 
-	games_make_wrapper ${PN} ./mindrover_demo ${dir}
+	games_make_wrapper ${PN} ./mindrover_demo "${dir}" "${dir}"
 
 	prepgamesdirs
 	make_desktop_entry ${PN} "Mindrover: Europa Project (Demo)" ${PN}.xpm
diff --git a/games-strategy/mylink/ChangeLog b/games-strategy/mylink/ChangeLog
index 76bd88148eab..287b21392bfe 100644
--- a/games-strategy/mylink/ChangeLog
+++ b/games-strategy/mylink/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for games-strategy/mylink
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/mylink/ChangeLog,v 1.1 2003/12/29 04:46:08 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/mylink/ChangeLog,v 1.1.1.1 2005/11/30 09:36:39 chriswhite Exp $
+
+  24 May 2005; Michael Cummings <mcummings@gentoo.org> mylink-0.93.ebuild:
+  dev-perl/Digest-MD5 => perl-core/Digest-MD5
+
+  09 May 2005; David Holm <dholm@gentoo.org> mylink-0.93.ebuild:
+  Added to ~ppc.
+
+  31 Jan 2005; Michael Sterrett <mr_bones_@gentoo.org> mylink-0.93.ebuild:
+  fix dep for bug #80245
 
 *mylink-0.93 (28 Dec 2003)
 
diff --git a/games-strategy/mylink/Manifest b/games-strategy/mylink/Manifest
index dc7e25770e98..fc7ab5685206 100644
--- a/games-strategy/mylink/Manifest
+++ b/games-strategy/mylink/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 33c5ceaf85e2f67219dc4357a3531d0e ChangeLog 698
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 5a28c6ea2af3c76b9ffcda252a65ae04 mylink-0.93.ebuild 1385
 MD5 1e1d9ef1965d5fde083472a0d28c616d files/0.93-path.patch 605
 MD5 e4ea537bc07ee435b059ad298ebd653e files/digest-mylink-0.93 64
-MD5 2ff46a9fff844a018bc4654fa9dab31c mylink-0.93.ebuild 1414
-MD5 cf02d3a66a667f2cb18eb58b0b60dc13 ChangeLog 398
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCk03xtG5z4I8BtQoRAsMGAJ9v8TeUGQvrmFD9yK2CyKJUyfwv7gCfUYZU
+qvojK7IFwr/6w4pVjJmX21I=
+=XXDz
+-----END PGP SIGNATURE-----
diff --git a/games-strategy/mylink/metadata.xml b/games-strategy/mylink/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-strategy/mylink/metadata.xml
+++ b/games-strategy/mylink/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-strategy/mylink/mylink-0.93.ebuild b/games-strategy/mylink/mylink-0.93.ebuild
index 62bcd60b6415..7b5dc3aeecb3 100644
--- a/games-strategy/mylink/mylink-0.93.ebuild
+++ b/games-strategy/mylink/mylink-0.93.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/games-strategy/mylink/mylink-0.93.ebuild,v 1.1 2003/12/29 04:46:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/mylink/mylink-0.93.ebuild,v 1.1.1.1 2005/11/30 09:36:39 chriswhite Exp $
 
-inherit games eutils
+inherit eutils games
 
 DESCRIPTION="a free Uplink clone"
-HOMEPAGE="http://home.as-netz.de/gblech/klasse10/misc/mylink/mylink.html"
+HOMEPAGE="http://home.as-netz.de/gblech/mylink/"
 SRC_URI="http://home.as-netz.de/gblech/klasse10/misc/mylink/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ~ppc"
+IUSE=""
 
 DEPEND=">=dev-lang/perl-5.8.0
 	>=dev-lang/tk-8.3.4
-	dev-perl/Data-Dumper
-	dev-perl/Digest-MD5
+	dev-perl/perl-tk
+	perl-core/Digest-MD5
 	dev-perl/libwww-perl
 	dev-perl/frontier-rpc"
 
-S=${WORKDIR}/MyLink
+S="${WORKDIR}/MyLink"
 
 src_unpack() {
 	unpack ${A}
@@ -38,11 +39,11 @@ src_unpack() {
 }
 
 src_install() {
-	local dir=${GAMES_DATADIR}/${PN}
-	dodir ${dir}
-	cp -r *.pm *.txt database.db data graphics ${D}/${dir}/
+	local dir="${GAMES_DATADIR}/${PN}"
+	dodir "${dir}"
+	cp -r *.pm *.txt database.db data graphics "${D}/${dir}/"
 	newgamesbin MyLinkd.pl MyLinkd
 	newgamesbin MyLinkTk.pl MyLinkTk
 	prepgamesdirs
-	fperms g+w ${GAMES_DATADIR}/${PN}/database.db
+	fperms g+w "${GAMES_DATADIR}/${PN}/database.db"
 }
diff --git a/games-strategy/netherearth/ChangeLog b/games-strategy/netherearth/ChangeLog
index 9158c1c1c219..40a2847709cb 100644
--- a/games-strategy/netherearth/ChangeLog
+++ b/games-strategy/netherearth/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for games-strategy/netherearth
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/netherearth/ChangeLog,v 1.1 2005/09/08 18:27:06 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/netherearth/ChangeLog,v 1.1.1.1 2005/11/30 09:36:40 chriswhite Exp $
 
 *netherearth-0.52 (08 Sep 2005)
 
diff --git a/games-strategy/netherearth/Manifest b/games-strategy/netherearth/Manifest
index ed9c22f38160..29fa1010ec9a 100644
--- a/games-strategy/netherearth/Manifest
+++ b/games-strategy/netherearth/Manifest
@@ -1,7 +1,7 @@
-MD5 995b75646bc29cc8fa81b02ec62354e8 netherearth-0.51.ebuild 1947
-MD5 571e2184d82d9d4bec1075eb25d44cb7 netherearth-0.52.ebuild 1897
-MD5 743a943130080746a237aaca99a32f1d files/Makefile 1003
+MD5 9dfa6fe4146063c9a1a5496fbc503f26 metadata.xml 507
+MD5 1fadcc9d6d7199fb831fa536881ac105 ChangeLog 543
+MD5 e1a494e21aa4600f95df907513bc121f netherearth-0.52.ebuild 2063
 MD5 20198e78dc33ad3838798bfc53120260 files/netherearth-0.52-linux.patch 1255
-MD5 eaafb11314df445e9792778c9741d7e1 files/netherearth-0.52-gentoo-paths.patch 4356
-MD5 315a01de07c8627c8c0ce943ba4c265a files/digest-netherearth-0.51 124
 MD5 a617f2b3f264865654c4c847ff7eb11c files/digest-netherearth-0.52 118
+MD5 743a943130080746a237aaca99a32f1d files/Makefile 1003
+MD5 eaafb11314df445e9792778c9741d7e1 files/netherearth-0.52-gentoo-paths.patch 4356
diff --git a/games-strategy/netherearth/netherearth-0.52.ebuild b/games-strategy/netherearth/netherearth-0.52.ebuild
index 729ed3e18244..8b04506a501c 100644
--- a/games-strategy/netherearth/netherearth-0.52.ebuild
+++ b/games-strategy/netherearth/netherearth-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/games-strategy/netherearth/netherearth-0.52.ebuild,v 1.1 2005/09/08 18:27:06 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/netherearth/netherearth-0.52.ebuild,v 1.1.1.1 2005/11/30 09:36:40 chriswhite Exp $
 
 inherit eutils games
 
@@ -60,13 +60,13 @@ src_unpack() {
 }
 
 src_install() {
-	dogamesbin nether_earth
+	dogamesbin nether_earth || die "dogamesbin failed"
 
 	cd "${data}"
 
 	# Install all game data
 	insinto "${DATA_DIR}"
-	doins -r maps models sound textures
+	doins -r maps models sound textures || die "doins failed"
 
 	dodoc readme.txt
 
diff --git a/games-strategy/netpanzer/ChangeLog b/games-strategy/netpanzer/ChangeLog
index 64e575f421c8..50873b8ac3f8 100644
--- a/games-strategy/netpanzer/ChangeLog
+++ b/games-strategy/netpanzer/ChangeLog
@@ -1,6 +1,88 @@
 # ChangeLog for games-strategy/netpanzer
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/netpanzer/ChangeLog,v 1.1 2003/10/22 01:36:22 mr_bones_ Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/netpanzer/ChangeLog,v 1.1.1.1 2005/11/30 09:36:37 chriswhite Exp $
+
+*netpanzer-0.8-r1 (14 Jul 2005)
+
+  14 Jul 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/netpanzer-0.8-min-size-check.patch,
+  +files/netpanzer-0.8-robust.patch, +netpanzer-0.8-r1.ebuild:
+  Fix DoS in server #98922 by Stefan Cornelius.
+
+  01 Jul 2005; Ferris McCormick <fmccor@gentoo.org> netpanzer-0.8.ebuild:
+  Add ~sparc keyword --- Users report success running it, and it does build
+  and does run well enough for testing.  Note that this is an SDL application,
+  and for sparc systems using Creator or Elite graphics, the xaa-enabled
+  version of the xorg sunffb driver is required.
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> netpanzer-0.8.ebuild:
+  Stable on ppc.
+
+  22 Feb 2005; Chris Gianelloni <wolf31o2@gentoo.org> +files/netpanzer-ded,
+  +files/netpanzer-ded.ini, +files/netpanzer.rc:
+  Added init script, dedicated script, and ini file from bug #69946 to close
+  bug #81984.
+
+*netpanzer-0.8 (11 Feb 2005)
+
+  11 Feb 2005; Michael Sterrett <mr_bones_@gentoo.org> +netpanzer-0.8.ebuild:
+  version bump (bug #79742) - ebuild updates from Robert Schuster
+
+*netpanzer-0.2.0_rc4 (23 Jan 2005)
+
+  23 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  +netpanzer-0.2.0_rc4.ebuild:
+  Bumped to 2.0_rc4 and added ~amd64 to KEYWORDS.  Closing bug #69946.
+
+  04 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  netpanzer-0.1.5-r1.ebuild:
+  needs wxGTK to build even if it isn't used (bug #59113)
+
+  03 Aug 2004; David Holm <dholm@gentoo.org> netpanzer-0.1.5-r1.ebuild:
+  Added to ~ppc.
+
+*netpanzer-0.1.5-r1 (25 Jul 2004)
+
+  25 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  +netpanzer-0.1.5-r1.ebuild:
+  Skip creation of netpanzereditor since it's not ready yet (bug #57332); tidy
+
+  24 May 2004; Michael Sterrett <mr_bones_@gentoo.org> netpanzer-0.1.5.ebuild:
+  more docs installed (bug #51519)
+
+  05 May 2004; Michael Sterrett <mr_bones_@gentoo.org> netpanzer-0.1.5.ebuild,
+  files/physfs.patch:
+  add a patch to work around the broken version checking for libphysfs (bug
+  #48831)
+
+*netpanzer-0.1.5 (05 Mar 2004)
+
+  05 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> netpanzer-0.1.5.ebuild:
+  version bump (bug #43461)
+
+  05 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> netpanzer-0.1.4.ebuild:
+  incorporate changes from bug #42431 submitted ebuild from Matze Braun that I
+  missed before
+
+*netpanzer-0.1.4 (22 Feb 2004)
+
+  22 Feb 2004; Michael Sterrett <mr_bones_@gentoo.org> netpanzer-0.1.2.ebuild,
+  netpanzer-0.1.3.ebuild, netpanzer-0.1.4.ebuild:
+  version bump (bug #42431)
+
+  22 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org> netpanzer-0.1.1.ebuild:
+  tidy oldest version
+
+*netpanzer-0.1.3 (05 Jan 2004)
+
+  05 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org> netpanzer-0.1.1.ebuild,
+  netpanzer-0.1.2.ebuild, netpanzer-0.1.3.ebuild:
+  version bump with ebuild updates by Matze Braun via bug 37340
+
+*netpanzer-0.1.2 (19 Nov 2003)
+
+  19 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org> netpanzer-0.1.2.ebuild:
+  version bump; mark stable; ebuild submitted by Matze Braun via bug 33551
 
 *netpanzer-0.1.1 (21 Oct 2003)
 
diff --git a/games-strategy/netpanzer/Manifest b/games-strategy/netpanzer/Manifest
index 37350bf175bd..e98144904952 100644
--- a/games-strategy/netpanzer/Manifest
+++ b/games-strategy/netpanzer/Manifest
@@ -1,2 +1,22 @@
-MD5 e2662356ea10a9435dcda92b0ad6feb7 netpanzer-0.1.1.ebuild 769
-MD5 445b8fd897674545f22a41398d72e1aa files/digest-netpanzer-0.1.1 139
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 00d7302016b989bd8a8f1cca48f6967b netpanzer-0.8.ebuild 1957
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 c1d25b73c6d0c16bad58ceaf594297e8 netpanzer-0.8-r1.ebuild 2020
+MD5 0b214dc61d9bf3a083226965821d8bf2 ChangeLog 3424
+MD5 a254cf85014dab1f14a620fc3549355f files/netpanzer.rc 891
+MD5 616b3d065523e34fd3e0d5d8ada5d053 files/netpanzer-0.8-min-size-check.patch 1385
+MD5 52b3f20dca70a177cc63da9903b5f5fb files/physfs.patch 553
+MD5 b31fb3b6d8c97b5f87ef8a825a60db2e files/digest-netpanzer-0.8-r1 139
+MD5 31c24932718cd34666bf4e1b800772fb files/netpanzer-ded.ini 1261
+MD5 b31fb3b6d8c97b5f87ef8a825a60db2e files/digest-netpanzer-0.8 139
+MD5 c40c9070d28732d4ca56e37277e5807f files/netpanzer-0.8-robust.patch 8203
+MD5 e45870d0456ec36ed692b70fada22bb5 files/netpanzer-ded 353
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC1c0VgIKl8Uu19MoRAs5aAJ9x+GAuyC9QE8aLr6TUxxuQV2IzGQCePQIQ
+uSAgwmU1x3Xj/f02Yx5nnsQ=
+=8myL
+-----END PGP SIGNATURE-----
diff --git a/games-strategy/netpanzer/files/netpanzer.rc b/games-strategy/netpanzer/files/netpanzer.rc
index 5e13e5ed698a..d97a14434198 100644
--- a/games-strategy/netpanzer/files/netpanzer.rc
+++ b/games-strategy/netpanzer/files/netpanzer.rc
@@ -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/games-strategy/netpanzer/files/netpanzer.rc,v 1.1 2005/02/23 01:57:05 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/netpanzer/files/netpanzer.rc,v 1.1.1.1 2005/11/30 09:36:38 chriswhite Exp $
 
 depend() {
 	need net
diff --git a/games-strategy/netpanzer/metadata.xml b/games-strategy/netpanzer/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-strategy/netpanzer/metadata.xml
+++ b/games-strategy/netpanzer/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-strategy/netpanzer/netpanzer-0.8-r1.ebuild b/games-strategy/netpanzer/netpanzer-0.8-r1.ebuild
index a8a716d21e68..76f4de3fc5e6 100644
--- a/games-strategy/netpanzer/netpanzer-0.8-r1.ebuild
+++ b/games-strategy/netpanzer/netpanzer-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/games-strategy/netpanzer/netpanzer-0.8-r1.ebuild,v 1.1 2005/07/14 02:24:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/netpanzer/netpanzer-0.8-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:37 chriswhite Exp $
 
 inherit eutils games
 
diff --git a/games-strategy/netpanzer/netpanzer-0.8.ebuild b/games-strategy/netpanzer/netpanzer-0.8.ebuild
index 270979388a6d..515725ed6f8d 100644
--- a/games-strategy/netpanzer/netpanzer-0.8.ebuild
+++ b/games-strategy/netpanzer/netpanzer-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/games-strategy/netpanzer/netpanzer-0.8.ebuild,v 1.1 2005/02/11 21:08:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/netpanzer/netpanzer-0.8.ebuild,v 1.1.1.1 2005/11/30 09:36:37 chriswhite Exp $
 
 inherit eutils games
 
@@ -12,7 +12,7 @@ SRC_URI="http://download.berlios.de/netpanzer/netpanzer-${PV}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="~amd64 ppc ~sparc x86"
 IUSE="dedicated"
 
 RDEPEND="dedicated? ( app-misc/screen )
@@ -45,7 +45,7 @@ src_install() {
 	jam -sDESTDIR=${D} -sappdocdir=/usr/share/doc/${PF} install || die "jam install failed (data package)"
 
 	if use dedicated ; then
-		newinitd "${FILESDIR}/netpanzer.rc" netpanzer || die "newexe failed"
+		newinitd "${FILESDIR}/netpanzer.rc" netpanzer || die "newinitd failed"
 		sed -i \
 			-e "s:GAMES_USER_DED:${GAMES_USER_DED}:" \
 			-e "s:GENTOO_DIR:${GAMES_BINDIR}:" \
@@ -53,9 +53,9 @@ src_install() {
 			|| die "sed failed"
 
 		insinto /etc
-		doins "${FILESDIR}/netpanzer-ded.ini" || die "newins failed"
+		doins "${FILESDIR}/netpanzer-ded.ini" || die "doins failed"
 		exeinto "${GAMES_BINDIR}"
-		doexe "${FILESDIR}/netpanzer-ded" || die "newexe failed"
+		doexe "${FILESDIR}/netpanzer-ded" || die "doexe failed"
 		sed -i \
 			-e "s:GENTOO_DIR:${GAMES_BINDIR}:" \
 			"${D}${GAMES_BINDIR}/netpanzer-ded" \
diff --git a/games-strategy/scorched3d/ChangeLog b/games-strategy/scorched3d/ChangeLog
index 0a855e7a31dd..12c88bea7820 100644
--- a/games-strategy/scorched3d/ChangeLog
+++ b/games-strategy/scorched3d/ChangeLog
@@ -1,6 +1,106 @@
-# ChangeLog for app-games/scorched3d
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.1 2003/09/10 05:27:31 vapier Exp $
+# ChangeLog for games-strategy/scorched3d
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.1.1.1 2005/11/30 09:36:38 chriswhite Exp $
+
+  28 Oct 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/smoke-orange.bmp, scorched3d-39.1.ebuild:
+  add missing texture (bug #105237)
+
+  20 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  scorched3d-38.1.ebuild, scorched3d-39.ebuild, scorched3d-39.1.ebuild:
+  remove gtk2 use flag
+
+  17 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
+  scorched3d-39.1.ebuild:
+  Stable on ppc.
+
+*scorched3d-39.1 (30 Aug 2005)
+
+  30 Aug 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +scorched3d-39.1.ebuild:
+  version bump
+
+  17 Aug 2005; Michael Sterrett <mr_bones_@gentoo.org> scorched3d-39.ebuild:
+  stable for x86
+
+  10 Aug 2005; Michael Sterrett <mr_bones_@gentoo.org> scorched3d-39.ebuild:
+  upstream patch for compile with USE=mysql (bug #101903)
+
+*scorched3d-39 (09 Aug 2005)
+
+  09 Aug 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +scorched3d-39.ebuild:
+  version bump
+
+  18 Mar 2005; Michael Sterrett <mr_bones_@gentoo.org> scorched3d-38.1.ebuild:
+  add opengl dep
+
+  03 Mar 2005; Michael Sterrett <mr_bones_@gentoo.org> scorched3d-38.1.ebuild:
+  fix wxGTK dep (bug #83989)
+
+*scorched3d-38.1 (13 Feb 2005)
+
+  13 Feb 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +scorched3d-38.1.ebuild:
+  version bump
+
+  11 Feb 2005; Michael Sterrett <mr_bones_@gentoo.org> -files/37-GLEXT.patch,
+  -scorched3d-37.2.ebuild:
+  clean old files
+
+  14 Dec 2004; Simon Stelling <blubb@gentoo.org> scorched3d-38.ebuild:
+  added ~amd64
+
+  08 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org> scorched3d-38.ebuild:
+  another shot at bug #73527
+
+  06 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org> scorched3d-38.ebuild:
+  wxGTK checking fix supplied by Kristiaan Lenaerts via bug #73527
+
+*scorched3d-38 (05 Dec 2004)
+
+  05 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org> +scorched3d-38.ebuild:
+  version bump
+
+  04 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  -scorched3d-37.1.ebuild, scorched3d-37.2.ebuild, -scorched3d-37.ebuild:
+  Address issue with wxGTK and unicode (bug #55967) - Thanks to eradicator
+  for the code from bug #39669.  Cleaned old versions
+
+*scorched3d-37.2 (01 Jun 2004)
+
+  01 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> scorched3d-37.2.ebuild:
+  version bump (bug #52460) - docs patch from Gustavo Felisberto
+
+*scorched3d-37.1 (07 Apr 2004)
+
+  07 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> scorched3d-37.1.ebuild:
+  version bump
+
+  04 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> scorched3d-36.1.ebuild,
+  scorched3d-36.2.ebuild, scorched3d-36.ebuild:
+  removed version 36
+
+  04 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> scorched3d-37.ebuild:
+  version bump (bug #46073); patch from upstream submitted by BigBug
+
+  16 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org> scorched3d-36.2.ebuild:
+  Add new mysql support to ebuild
+
+*scorched3d-36.2 (16 Jan 2004)
+
+  16 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org> scorched3d-36.2.ebuild:
+  version bump (bug 38282)
+
+*scorched3d-36.1 (01 Jan 2004)
+
+  01 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org> scorched3d-36.1.ebuild:
+  version bump
+
+*scorched3d-36 (08 Dec 2003)
+
+  08 Dec 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bumpage.
 
 *scorched3d-35 (06 Aug 2003)
 
diff --git a/games-strategy/scorched3d/Manifest b/games-strategy/scorched3d/Manifest
index 69277d753793..7cf527131c72 100644
--- a/games-strategy/scorched3d/Manifest
+++ b/games-strategy/scorched3d/Manifest
@@ -1,4 +1,5 @@
-MD5 79dd83cf72c04762c0db8fac7c8712b0 files/35-gcc3.patch 1131
-MD5 56dd0f8a5f1c10a9774a30fa2973a15d files/digest-scorched3d-35 71
-MD5 da3aa9d6c3e8372c764cf99907cbe2c8 ChangeLog 441
-MD5 f3ffeafa1a5c1544a95086159cae57d3 scorched3d-35.ebuild 1360
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 35d2e19576bc0d2216d688e607ecdebe scorched3d-39.1.ebuild 1412
+MD5 18cb43369904c19ffb8ce5a1f0590717 ChangeLog 3589
+MD5 0b9eb4edfdc09aeaa2ea34752ac22e78 files/smoke-orange.bmp 12342
+MD5 7a975757e08c4e4758e400893c342a26 files/digest-scorched3d-39.1 73
diff --git a/games-strategy/scorched3d/metadata.xml b/games-strategy/scorched3d/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-strategy/scorched3d/metadata.xml
+++ b/games-strategy/scorched3d/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-strategy/scorched3d/scorched3d-39.1.ebuild b/games-strategy/scorched3d/scorched3d-39.1.ebuild
index 12c95b2078c6..7850ecc3f6c1 100644
--- a/games-strategy/scorched3d/scorched3d-39.1.ebuild
+++ b/games-strategy/scorched3d/scorched3d-39.1.ebuild
@@ -1,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-strategy/scorched3d/scorched3d-39.1.ebuild,v 1.1 2005/08/30 23:28:30 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-39.1.ebuild,v 1.1.1.1 2005/11/30 09:36:38 chriswhite Exp $
 
 inherit wxwidgets games
 
@@ -10,8 +10,8 @@ SRC_URI="mirror://sourceforge/scorched3d/Scorched3D-${PV}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="gtk2 mysql"
+KEYWORDS="~amd64 ppc x86"
+IUSE="mysql"
 
 DEPEND="virtual/opengl
 	>=media-libs/openal-20050504
@@ -24,21 +24,13 @@ DEPEND="virtual/opengl
 S=${WORKDIR}/scorched
 
 pkg_setup() {
-	if use gtk2; then
-		need-wxwidgets gtk2 || die "You need to emerge wxGTK with USE='gtk2'"
-	else
-		need-wxwidgets gtk || die "No gtk1 version of x11-libs/wxGTK found"
-	fi
+	need-wxwidgets gtk2 || die "You need to emerge wxGTK with USE='gtk2'"
 	games_pkg_setup
 }
 
 src_compile() {
 	# work around portage bug: described in bug #73527
-	if use gtk2; then
-		need-wxwidgets gtk2 || die "You need to emerge wxGTK with USE='gtk2'"
-	else
-		need-wxwidgets gtk || die "No gtk1 version of x11-libs/wxGTK found"
-	fi
+	need-wxwidgets gtk2 || die "You need to emerge wxGTK with USE='gtk2'"
 	egamesconf \
 		--disable-dependency-tracking \
 		--exec_prefix="${GAMES_PREFIX}" \
@@ -51,5 +43,7 @@ src_compile() {
 
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
+	insinto "${GAMES_DATADIR}/scorched3d/data/globalmods/apoc/data/textures/explode/"
+	doins "${FILESDIR}/smoke-orange.bmp" || die "doins failed" #bug #105237
 	prepgamesdirs
 }
diff --git a/games-strategy/smac/ChangeLog b/games-strategy/smac/ChangeLog
index c4b56cc05ea3..684c7d1c1fa9 100644
--- a/games-strategy/smac/ChangeLog
+++ b/games-strategy/smac/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-strategy/smac
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/smac/ChangeLog,v 1.1 2005/09/09 01:56:57 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/smac/ChangeLog,v 1.1.1.1 2005/11/30 09:36:43 chriswhite Exp $
+
+  21 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org> smac-6.0a.ebuild:
+  Added addition dir variable to games_make_wrapper for bug #109793.
+
+  27 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> smac-6.0a.ebuild:
+  Changed to use new lokigames mirror:// setup.
 
 *smac-6.0a (09 Sep 2005)
 
diff --git a/games-strategy/smac/Manifest b/games-strategy/smac/Manifest
index fdd4b98a0a92..3c1d0c3bd843 100644
--- a/games-strategy/smac/Manifest
+++ b/games-strategy/smac/Manifest
@@ -1,4 +1,4 @@
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 5280bbc4e86cd355780c534fc779e392 smac-6.0a.ebuild 2553
-MD5 8c88cf50db2c11e1610397f1c8d6f9ca ChangeLog 445
+MD5 7eeabd61cfb513d8028e269395cbde48 ChangeLog 708
 MD5 3b8cb21212b3ca49eb93ea8bc2b3ab8b files/digest-smac-6.0a 63
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 5c1013749b326882720f60bb8192016f smac-6.0a.ebuild 2547
diff --git a/games-strategy/smac/smac-6.0a.ebuild b/games-strategy/smac/smac-6.0a.ebuild
index abdbc1421c51..c312a856ff9c 100644
--- a/games-strategy/smac/smac-6.0a.ebuild
+++ b/games-strategy/smac/smac-6.0a.ebuild
@@ -1,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-strategy/smac/smac-6.0a.ebuild,v 1.1 2005/09/09 01:56:57 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/smac/smac-6.0a.ebuild,v 1.1.1.1 2005/11/30 09:36:43 chriswhite Exp $
 
 inherit games
 
@@ -8,7 +8,7 @@ IUSE="videos"
 
 DESCRIPTION="Sid Meier's Alpha Centauri"
 HOMEPAGE="http://www.lokigames.com/products/smac/"
-SRC_URI="ftp://sunsite.dk/mirrors/lokigames/updates/${PN}/${P}-x86.run"
+SRC_URI="mirror://lokigames/${PN}/${P}-x86.run"
 
 LICENSE="LOKI-EULA"
 SLOT="0"
@@ -68,8 +68,8 @@ src_install() {
 	insinto /usr/share/pixmaps
 	newins ${CDROM_ROOT}/icon.xpm smac.xpm
 
-	games_make_wrapper ${PN} ./${PN} "${dir}"
-	games_make_wrapper ${PN}x ./${PN}x "${dir}"
+	games_make_wrapper ${PN} ./${PN} "${dir}" "${dir}"
+	games_make_wrapper ${PN}x ./${PN}x "${dir}" "${dir}"
 	prepgamesdirs
 
 	einfo "Linking libs provided by 'sys-libs/lib-compat-loki' to '${dir}'."
diff --git a/games-strategy/spacehulk/ChangeLog b/games-strategy/spacehulk/ChangeLog
index f627b868ac0a..79620d7d0462 100644
--- a/games-strategy/spacehulk/ChangeLog
+++ b/games-strategy/spacehulk/ChangeLog
@@ -1,6 +1,19 @@
-# ChangeLog for app-games/spacehulk
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/spacehulk/ChangeLog,v 1.1 2003/09/10 05:27:31 vapier Exp $
+# ChangeLog for games-strategy/spacehulk
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/spacehulk/ChangeLog,v 1.1.1.1 2005/11/30 09:36:41 chriswhite Exp $
+
+  07 Jul 2005; Caleb Tennis <caleb@gentoo.org> spacehulk-1.4.5.ebuild,
+  spacehulk-1.4.99.ebuild:
+  Fix qt dep
+
+  08 Nov 2004; Joseph Jezak <josejx@gentoo.org> spacehulk-1.4.5.ebuild:
+  Added ~ppc.
+
+*spacehulk-1.4.99 (08 Nov 2003)
+
+  08 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org>
+  spacehulk-1.4.99.ebuild:
+  version bump
 
 *spacehulk-1.4.5 (28 Aug 2003)
 
diff --git a/games-strategy/spacehulk/Manifest b/games-strategy/spacehulk/Manifest
index 6cdfb59a1f84..bf5c3b7d4da5 100644
--- a/games-strategy/spacehulk/Manifest
+++ b/games-strategy/spacehulk/Manifest
@@ -1,7 +1,6 @@
-MD5 584a5d08b2f8e97297304d0d7b3a7331 spacehulk-1.4.3.ebuild 922
-MD5 c878af969bd0d2a56c2005c9169f09cc ChangeLog 658
-MD5 977cc09b18a1dc97734d79d7133abb27 spacehulk-1.4.4.ebuild 922
-MD5 3a170f7f61961aa761f678fa919929a8 spacehulk-1.4.5.ebuild 922
-MD5 3da58dc2f4e345288ee5bbe8058f93be files/digest-spacehulk-1.4.3 143
-MD5 ae56cfc18bb656e1e2e006662d51af3a files/digest-spacehulk-1.4.4 143
+MD5 5783a83d20cefd48a96838bc794a1b56 spacehulk-1.4.99.ebuild 968
+MD5 2dc4e3f34ba25db6f24c5045dff19e84 spacehulk-1.4.5.ebuild 920
+MD5 29068244934dad328c8365615652bec6 ChangeLog 986
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 6a777a8b96b9efc8bdb443eafeba5a94 files/digest-spacehulk-1.4.99 144
 MD5 53ae55592eaade1f769f85a7921384cb files/digest-spacehulk-1.4.5 143
diff --git a/games-strategy/spacehulk/metadata.xml b/games-strategy/spacehulk/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-strategy/spacehulk/metadata.xml
+++ b/games-strategy/spacehulk/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-strategy/spacehulk/spacehulk-1.4.5.ebuild b/games-strategy/spacehulk/spacehulk-1.4.5.ebuild
index 1172314646e4..b255ceb9dc70 100644
--- a/games-strategy/spacehulk/spacehulk-1.4.5.ebuild
+++ b/games-strategy/spacehulk/spacehulk-1.4.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/games-strategy/spacehulk/spacehulk-1.4.5.ebuild,v 1.1 2003/09/10 05:27:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/spacehulk/spacehulk-1.4.5.ebuild,v 1.1.1.1 2005/11/30 09:36:41 chriswhite Exp $
 
 inherit games
 
@@ -9,11 +9,11 @@ HOMEPAGE="http://perso.enst.fr/~vinot/spacehulk/"
 SRC_URI="http://freesoftware.fsf.org/download/spacehulk/main.pkg/${PV}/${P}.tar.gz
 	http://freesoftware.fsf.org/download/spacehulk/themespack.pkg/1.0/spacehulk-themespack-1.0.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="x86"
+KEYWORDS="x86 ~ppc"
 SLOT="0"
 IUSE="xinerama"
 
-DEPEND=">=x11-libs/qt-3
+DEPEND="=x11-libs/qt-3*
 	sys-libs/zlib
 	media-libs/libpng
 	media-libs/jpeg
diff --git a/games-strategy/spacehulk/spacehulk-1.4.99.ebuild b/games-strategy/spacehulk/spacehulk-1.4.99.ebuild
index 042055dacf56..b946bcb8f276 100644
--- a/games-strategy/spacehulk/spacehulk-1.4.99.ebuild
+++ b/games-strategy/spacehulk/spacehulk-1.4.99.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-strategy/spacehulk/spacehulk-1.4.99.ebuild,v 1.1 2003/11/09 03:13:16 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/spacehulk/spacehulk-1.4.99.ebuild,v 1.1.1.1 2005/11/30 09:36:41 chriswhite Exp $
 
-inherit games
+inherit games kde-functions
 
 DESCRIPTION="A boardgame in the world of Warhammer 40k"
 HOMEPAGE="http://r.vinot.free.fr/spacehulk/"
@@ -14,20 +14,23 @@ KEYWORDS="x86"
 SLOT="0"
 IUSE="xinerama"
 
-DEPEND=">=x11-libs/qt-3
+DEPEND="=x11-libs/qt-3*
 	sys-libs/zlib
 	media-libs/libpng
 	media-libs/jpeg
 	media-libs/nas"
 
 src_compile() {
-	egamesconf `use_with xinerama` || die
-	emake                          || die "emake failed"
+	set-qtdir 3
+	egamesconf \
+		`use_with xinerama` \
+		|| die
+	emake || die "emake failed"
 }
 
 src_install() {
-	egamesinstall                                       || die
-	cp -R ../themes/* ${D}${GAMES_DATADIR}/${PN}/themes || die "cp failed"
-	dodoc AUTHORS ChangeLog README TODO                 || die "dodoc failed"
+	egamesinstall || die
+	cp -R ../themes/* "${D}${GAMES_DATADIR}/${PN}/themes" || die "cp failed"
+	dodoc AUTHORS ChangeLog README TODO
 	prepgamesdirs
 }
diff --git a/games-strategy/tornado/ChangeLog b/games-strategy/tornado/ChangeLog
index 50baf190f0e4..ec5b52ef13b1 100644
--- a/games-strategy/tornado/ChangeLog
+++ b/games-strategy/tornado/ChangeLog
@@ -1,6 +1,29 @@
-# ChangeLog for app-games/tornado
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/tornado/ChangeLog,v 1.1 2003/09/12 01:53:52 msterret Exp $
+# ChangeLog for games-strategy/tornado
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/tornado/ChangeLog,v 1.1.1.1 2005/11/30 09:36:38 chriswhite Exp $
+
+  14 May 2005; Jan Brinkmann <luckyduck@gentoo.org> tornado-1.3.ebuild:
+  stable on amd64 and ppc
+
+  09 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> tornado-1.2.1a.ebuild:
+  added ~amd64 to 1.2.1a. fixes bug #67754.
+
+  14 Dec 2004; Simon Stelling <blubb@gentoo.org> tornado-1.3.ebuild:
+  added ~amd64
+
+  02 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org> tornado-1.3.ebuild:
+  stable for x86
+
+  25 Nov 2004; Joseph Jezak <josejx@gentoo.org> tornado-1.2.1a.ebuild:
+  Marked ppc stable.
+
+*tornado-1.3 (19 Nov 2004)
+
+  19 Nov 2004; Michael Kohl <citizen428@gentoo.org> +tornado-1.3.ebuild:
+  Version bump.
+
+  30 Apr 2004; David Holm <dholm@gentoo.org> tornado-1.2.1a.ebuild:
+  Added to ~ppc.
 
 *tornado-1.2.1a (05 Sep 2003)
 
diff --git a/games-strategy/tornado/Manifest b/games-strategy/tornado/Manifest
index fd0e36eabad7..a33c3fa4638e 100644
--- a/games-strategy/tornado/Manifest
+++ b/games-strategy/tornado/Manifest
@@ -1,3 +1,4 @@
-MD5 33e4b1ca261fad083f6b2c8d19f3b145 tornado-1.2.1a.ebuild 1115
-MD5 e5b0200c5605d6793f275c3dcd3b2db5 ChangeLog 413
-MD5 3ae493c92807e676ee29bf2bcdb95283 files/digest-tornado-1.2.1a 65
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 1e3364a300ee7aa9884a786cf845b5af tornado-1.3.ebuild 1068
+MD5 164c4f5b535a5ed016b6d2e13eac5cb5 ChangeLog 1110
+MD5 92951a813f97524acb84295187e6e655 files/digest-tornado-1.3 62
diff --git a/games-strategy/tornado/metadata.xml b/games-strategy/tornado/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-strategy/tornado/metadata.xml
+++ b/games-strategy/tornado/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-strategy/tornado/tornado-1.3.ebuild b/games-strategy/tornado/tornado-1.3.ebuild
index 807a1b735f4f..21ede83a5f7d 100644
--- a/games-strategy/tornado/tornado-1.3.ebuild
+++ b/games-strategy/tornado/tornado-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/games-strategy/tornado/tornado-1.3.ebuild,v 1.1 2004/11/19 17:01:52 citizen428 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/tornado/tornado-1.3.ebuild,v 1.1.1.1 2005/11/30 09:36:38 chriswhite Exp $
 
 inherit games
 
@@ -10,12 +10,10 @@ SRC_URI="http://home.kcore.de/~kiza/linux/tornado/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc amd64"
 IUSE=""
 
-RDEPEND=">=sys-libs/ncurses-5.3"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
+DEPEND=">=sys-libs/ncurses-5.3"
 
 src_unpack() {
 	unpack ${A}
@@ -36,8 +34,8 @@ src_install() {
 	dogamesbin tornado || die
 	doman doc/man/tornado.6
 	dodoc AUTHOR CREDITS Changelog README TODO
-	insinto ${GAMES_STATEDIR}
+	insinto "${GAMES_STATEDIR}"
 	doins tornado.scores
 	prepgamesdirs
-	fperms 664 ${GAMES_STATEDIR}/tornado.scores
+	fperms 664 "${GAMES_STATEDIR}/tornado.scores"
 }
diff --git a/games-strategy/triplea/ChangeLog b/games-strategy/triplea/ChangeLog
index d7459e25d27c..81ccd5ac90ff 100644
--- a/games-strategy/triplea/ChangeLog
+++ b/games-strategy/triplea/ChangeLog
@@ -1,6 +1,75 @@
 # ChangeLog for games-strategy/triplea
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/triplea/ChangeLog,v 1.1 2004/03/09 10:27:00 mr_bones_ Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/triplea/ChangeLog,v 1.1.1.1 2005/11/30 09:36:39 chriswhite Exp $
+
+  09 Nov 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  triplea-0.6.0.1.ebuild:
+  stable for x86; restored dropped ppc keyword
+
+  23 Sep 2005; Luis Medinas <metalgod@gentoo.org> triplea-0.6.0.1.ebuild:
+  Added ~amd64 keyword. Bug #106411
+
+  24 Aug 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  triplea-0.5.1.1.ebuild, triplea-0.6.0.1.ebuild:
+  Add inherit eutils.
+
+*triplea-0.6.0.1 (14 Jul 2005)
+
+  14 Jul 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/triplea-0.6.0.1-gentoo.patch, +triplea-0.6.0.1.ebuild:
+  version bump - ebuild supplied by Thomas Matthijs via bug #96647
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> triplea-0.4.8.ebuild:
+  Stable on ppc.
+
+*triplea-0.5.1.1 (30 Jan 2005)
+
+  30 Jan 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/triplea-0.5.1.1.patch, +triplea-0.5.1.1.ebuild:
+  version bump (bug #71243) with patch from Thomas Matthijs to fix the game
+  saving code.
+
+  09 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org> triplea-0.4.8.ebuild:
+  fix deps and wrapper per bug #68134
+
+  24 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> triplea-0.4.8.ebuild:
+  save games in HomeDir patch from Will McQueen via bug #57062
+
+*triplea-0.4.8 (30 Jun 2004)
+
+  30 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> +triplea-0.4.8.ebuild:
+  version bump (bug #55702)
+
+*triplea-0.4.3 (10 May 2004)
+
+  10 May 2004; Michael Sterrett <mr_bones_@gentoo.org> triplea-0.4.3.ebuild:
+  version bump (bug #50602)
+
+  07 May 2004; David Holm <dholm@gentoo.org> triplea-0.4.1.ebuild:
+  Added to ~ppc.
+
+  05 May 2004; <SeJo@gentoo.org> triplea-0.3.3.ebuild:
+  added ~ppc keyword
+
+*triplea-0.4.1 (21 Apr 2004)
+
+  21 Apr 2004; Dylan Carlson <absinthe@gentoo.org> +triplea-0.4.1.ebuild:
+  Version bump. Added amd64 to KEYWORDS.
+
+*triplea-0.3.3-r1 (10 Apr 2004)
+
+  10 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  triplea-0.3.3-r1.ebuild:
+  Repair bad path in .ant.properties (bug #47437); patch from Peter Molnar
+
+  30 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> triplea-0.3.3.ebuild:
+  mark stable for x86
+
+  26 Mar 2004; David Holm <dholm@gentoo.org> triplea-0.3.3.ebuild:
+  Backed out of ~ppc while waiting for portage upgrade.
+
+  09 Mar 2004; David Holm <dholm@gentoo.org> triplea-0.3.3.ebuild:
+  Added to ~ppc.
 
 *triplea-0.3.3 (09 Mar 2004)
 
diff --git a/games-strategy/triplea/Manifest b/games-strategy/triplea/Manifest
index 40e5d6ff5689..75c21d1061d1 100644
--- a/games-strategy/triplea/Manifest
+++ b/games-strategy/triplea/Manifest
@@ -1,2 +1,10 @@
-MD5 72cc00ba47ea18e304c141bcbe8c7f86 triplea-0.3.3.ebuild 1983
-MD5 1d829a95d4fbf750dfea9a0743082592 files/digest-triplea-0.3.3 70
+MD5 02b0891d8f006d387fc71f6acb03adea triplea-0.5.1.1.ebuild 2126
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 6b98bd0909e9308dad276dc65fe73659 triplea-0.6.0.1.ebuild 1879
+MD5 d43df205b3fd3057cb8b2919db6171e7 triplea-0.4.8.ebuild 1978
+MD5 330a71855aa17069692d3a3b9af883e8 ChangeLog 2665
+MD5 c8d37e2b98977adc8b30d8ff6249486f files/triplea-0.6.0.1-gentoo.patch 1956
+MD5 7ffbd6e44e385dd4730e14206aae6cd8 files/triplea-0.5.1.1.patch 3254
+MD5 9a6bab7f4d8f6d017eb9fd91481706d1 files/digest-triplea-0.5.1.1 72
+MD5 b609ff3eb027151169803aa25b5edd75 files/digest-triplea-0.4.8 70
+MD5 e24d20d31aa44732ab64d3f599dd253f files/digest-triplea-0.6.0.1 72
diff --git a/games-strategy/triplea/triplea-0.4.8.ebuild b/games-strategy/triplea/triplea-0.4.8.ebuild
index 7bc90b27f0a3..657ff3fd399e 100644
--- a/games-strategy/triplea/triplea-0.4.8.ebuild
+++ b/games-strategy/triplea/triplea-0.4.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/games-strategy/triplea/triplea-0.4.8.ebuild,v 1.1 2004/07/01 05:27:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/triplea/triplea-0.4.8.ebuild,v 1.1.1.1 2005/11/30 09:36:39 chriswhite Exp $
 
 inherit games
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://triplea.sf.net"
 SRC_URI="mirror://sourceforge/${PN}/${PN}_source_${MY_PV}.zip"
 
 LICENSE="GPL-2"
-KEYWORDS="x86 amd64 ~ppc"
+KEYWORDS="amd64 ppc x86"
 SLOT="0"
 IUSE="jikes"
 
@@ -19,9 +19,8 @@ RDEPEND="|| (
 	>=virtual/jdk-1.4
 	>=virtual/jre-1.4 )"
 DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
 	app-arch/unzip
-	>=dev-java/ant-1.4.1
+	>=dev-java/ant-core-1.4.1
 	dev-java/junit
 	jikes? ( >=dev-java/jikes-1.17 )"
 
@@ -29,7 +28,7 @@ S="${WORKDIR}/${PN}_${MY_PV}"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	# The sourcecode currently assumes the game is being run from a directory
 	# one level below the installation root.
@@ -37,9 +36,9 @@ src_unpack() {
 		#!/bin/sh
 
 		cd "${GAMES_DATADIR}/${PN}/lib"
-		java -mx96M -cp \\
-		    ../data:../lib/plastic-1.2.0.jar:../lib/${P}.jar \\
-		    games.strategy.engine.framework.GameRunner
+		java -cp \\
+			../data:../lib/plastic-1.2.0.jar:../lib/${P}.jar \\
+			games.strategy.engine.framework.GameRunner
 	EOF
 
 	# Repair bad path in .ant.properties (bug #47437)
@@ -47,7 +46,9 @@ src_unpack() {
 		-e "/^junit.jar/s:=.*:=/usr/share/junit/lib/junit.jar:" \
 			.ant.properties \
 			|| die "sed .ant.properties failed"
-
+	# The default savedGames directory is in the install root.  This
+	# sets it to use the users home directory.
+	echo "triplea.saveGamesInHomeDir=true" > data/triplea.properties
 }
 
 src_compile() {
diff --git a/games-strategy/triplea/triplea-0.5.1.1.ebuild b/games-strategy/triplea/triplea-0.5.1.1.ebuild
index 801b8685f9aa..0c8311170d84 100644
--- a/games-strategy/triplea/triplea-0.5.1.1.ebuild
+++ b/games-strategy/triplea/triplea-0.5.1.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/games-strategy/triplea/triplea-0.5.1.1.ebuild,v 1.1 2005/01/30 08:08:02 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/triplea/triplea-0.5.1.1.ebuild,v 1.1.1.1 2005/11/30 09:36:39 chriswhite Exp $
 
-inherit java-utils java-pkg games
+inherit eutils java-utils java-pkg games
 
 MY_PV=${PV//\./_}
 DESCRIPTION="An open source clone of the popular Axis and Allies boardgame"
diff --git a/games-strategy/triplea/triplea-0.6.0.1.ebuild b/games-strategy/triplea/triplea-0.6.0.1.ebuild
index f5f0dd7b3095..22d898519296 100644
--- a/games-strategy/triplea/triplea-0.6.0.1.ebuild
+++ b/games-strategy/triplea/triplea-0.6.0.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/games-strategy/triplea/triplea-0.6.0.1.ebuild,v 1.1 2005/07/14 07:16:27 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/triplea/triplea-0.6.0.1.ebuild,v 1.1.1.1 2005/11/30 09:36:39 chriswhite Exp $
 
-inherit java-utils java-pkg games
+inherit eutils java-utils java-pkg games
 
 MY_PV=${PV//\./_}
 DESCRIPTION="An open source clone of the popular Axis and Allies boardgame"
@@ -10,7 +10,7 @@ HOMEPAGE="http://triplea.sf.net"
 SRC_URI="mirror://sourceforge/${PN}/${PN}_source_${MY_PV}.zip"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc x86"
 SLOT="0"
 IUSE="doc jikes"
 
@@ -19,6 +19,7 @@ RDEPEND=">=virtual/jre-1.4
 	dev-java/backport-util-concurrent"
 
 DEPEND=">=virtual/jdk-1.4
+	dev-java/ant-core
 	app-arch/unzip
 	jikes? ( >=dev-java/jikes-1.17 )
 	${RDEPEND}"
diff --git a/games-strategy/ufo-ai/ChangeLog b/games-strategy/ufo-ai/ChangeLog
index 64cb66cb9eaf..5f0ce9e581da 100644
--- a/games-strategy/ufo-ai/ChangeLog
+++ b/games-strategy/ufo-ai/ChangeLog
@@ -1,6 +1,34 @@
 # ChangeLog for games-strategy/ufo-ai
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ChangeLog,v 1.1 2004/03/11 02:26:22 wolf31o2 Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ChangeLog,v 1.1.1.1 2005/11/30 09:36:42 chriswhite Exp $
+
+  24 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  ufo-ai-0.10.040218.ebuild:
+  Fix error case; tidy
+
+  16 May 2004; Mike Frysinger <vapier@gentoo.org> ufo-ai-0.10.040218.ebuild:
+  Make sure to filter-flags -fstack-protector #51116 by Alexander Kahl/Peter
+  Jensen
+
+  11 Mar 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  ufo-ai-0.10.040218.ebuild:
+  Cleaning up redundant pkg_postinst.
+
+  11 Mar 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  ufo-ai-0.10.040218.ebuild:
+  Fixed errors using ${ARCH} and adding back absolute paths.
+
+  11 Mar 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  ufo-ai-0.10.040218.ebuild:
+  Adding S=.
+
+  11 Mar 2004; David Holm <dholm@gentoo.org> ufo-ai-0.10.040218.ebuild,
+  files/0.10.040218-Makefile.patch:
+  Added ppc support.
+
+  11 Mar 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  ufo-ai-0.10.040218.ebuild:
+  Fixing up ebuild to use complete paths and .  Closing bug #44327.
 
 *ufo-ai-0.10.040218 (10 Mar 2004)
 
diff --git a/games-strategy/ufo-ai/Manifest b/games-strategy/ufo-ai/Manifest
index b16eee6b8231..54d641d620b8 100644
--- a/games-strategy/ufo-ai/Manifest
+++ b/games-strategy/ufo-ai/Manifest
@@ -1,3 +1,15 @@
-MD5 435190466b5708f71fc1bc16fd43a11c ufo-ai-0.10.040218.ebuild 945
-MD5 1d3e244409fa8c09b2b88c4a9ee455bd files/0.10.040218-Makefile.patch 1221
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4495fa75bf9fb8dae051c21df8886557 ChangeLog 1378
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 2fb86bb5b3bc76d9b4d9b896a386281a ufo-ai-0.10.040218.ebuild 1444
+MD5 6ca39990b18a4bf10c112bb43983024e files/0.10.040218-Makefile.patch 1759
 MD5 741c23ff1ac99c9aaf9ffead77cf26c4 files/digest-ufo-ai-0.10.040218 135
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBiCeWHTu7gpaalycRAuStAKCEN7ozbEIC1mtYxIw9AH5TCisP1wCgiyzH
+W7VwX69k+qpP+zRmKC0P+1s=
+=1qxc
+-----END PGP SIGNATURE-----
diff --git a/games-strategy/ufo-ai/files/0.10.040218-Makefile.patch b/games-strategy/ufo-ai/files/0.10.040218-Makefile.patch
index bb0b47492da3..38d713b2a3ea 100644
--- a/games-strategy/ufo-ai/files/0.10.040218-Makefile.patch
+++ b/games-strategy/ufo-ai/files/0.10.040218-Makefile.patch
@@ -1,6 +1,21 @@
---- Makefile.orig	2004-02-18 16:37:38.000000000 -0500
-+++ Makefile	2004-03-07 00:56:10.980247752 -0500
-@@ -54,8 +54,8 @@
+--- Makefile.orig	2004-03-11 13:22:44.000000000 +0100
++++ Makefile	2004-03-11 13:25:04.000000000 +0100
+@@ -20,9 +20,14 @@
+ ARCH=axp
+ RPMARCH=alpha
+ else
++ifneq (,$(findstring ppc,$(shell uname -m)))
++ARCH=ppc
++RPMARCH=ppc
++else
+ ARCH=i386
+ RPMARCH=i386
+ endif
++endif
+ NOARCH=noarch
+ 
+ MOUNT_DIR=..
+@@ -54,8 +59,8 @@
  RELEASE_CFLAGS=$(BASE_CFLAGS) -O6 -ffast-math -funroll-loops \
  	-fomit-frame-pointer -fexpensive-optimizations
  else
@@ -11,7 +26,7 @@
  endif
  
  DEBUG_CFLAGS=$(BASE_CFLAGS) -g
-@@ -64,9 +64,9 @@
+@@ -64,9 +69,9 @@
  XLDFLAGS=-L/usr/X11R6/lib -lX11 -lXext -lXxf86dga
  XCFLAGS=
  
@@ -24,7 +39,7 @@
  
  SHLIBEXT=so
  
-@@ -100,6 +100,8 @@
+@@ -100,6 +105,8 @@
  	$(BUILDDIR)/ref_gl.$(SHLIBEXT)
  endif
  
@@ -33,3 +48,14 @@
  build_debug:
  	@-mkdir $(BUILD_DEBUG_DIR) \
  		$(BUILD_DEBUG_DIR)/client \
+--- sys_linux.c.orig	2004-03-11 13:22:48.000000000 +0100
++++ sys_linux.c	2004-03-11 13:22:53.000000000 +0100
+@@ -223,6 +223,8 @@
+ 	const char *gamename = "gamei386.so";

+ #elif defined __alpha__

+ 	const char *gamename = "gameaxp.so";

++#elif defined __powerpc__

++	const char *gamename = "gameppc.so";

+ #else

+ #error Unknown arch

+ #endif

diff --git a/games-strategy/ufo-ai/ufo-ai-0.10.040218.ebuild b/games-strategy/ufo-ai/ufo-ai-0.10.040218.ebuild
index afca1a2002e5..33969c889cf3 100644
--- a/games-strategy/ufo-ai/ufo-ai-0.10.040218.ebuild
+++ b/games-strategy/ufo-ai/ufo-ai-0.10.040218.ebuild
@@ -1,48 +1,55 @@
-# 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-strategy/ufo-ai/ufo-ai-0.10.040218.ebuild,v 1.1 2004/03/11 02:26:22 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ufo-ai-0.10.040218.ebuild,v 1.1.1.1 2005/11/30 09:36:42 chriswhite Exp $
 
-inherit games
+inherit eutils games flag-o-matic
 
 DESCRIPTION="UFO: Alien Invasion - X-COM inspired strategy game"
+HOMEPAGE="http://www.ufoai.net/"
 SRC_URI="http://n.ethz.ch/student/dbeyeler/download/ufoai_source_040218.zip
-	     http://people.ee.ethz.ch/~baepeter/linux_ufoaidemo.zip"
-HOMEPAGE="http://ufo.myexp.de/"
+	http://people.ee.ethz.ch/~baepeter/linux_ufoaidemo.zip"
 
-KEYWORDS="~x86"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
 IUSE=""
 
-DEPEND="virtual/glibc
-	    virtual/x11
-		media-libs/jpeg
-		media-libs/libvorbis
-		media-libs/libogg"
+RDEPEND="virtual/libc
+	virtual/x11
+	media-libs/jpeg
+	media-libs/libvorbis
+	media-libs/libogg"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S="${WORKDIR}"
 
 src_unpack() {
 	unpack ${A}
 	cd source/linux
-	epatch ${FILESDIR}/${PV}-Makefile.patch
+	epatch "${FILESDIR}/${PV}-Makefile.patch"
 }
 
 src_compile() {
-	cd source/linux
-	make build_release \
-		 OPTCFLAGS="${CFLAGS}" \
-		 || die "make failed"
-	cd ../..
+	filter-flags -fstack-protector #51116
+	cd "${S}/source/linux"
+	emake build_release \
+		OPTCFLAGS="${CFLAGS}" \
+		|| die "emake failed"
 }
 
 src_install() {
-	dodir ${GAMES_DATADIR}/${PN}
-	cp -rf ufo/* ${D}${GAMES_DATADIR}/${PN}
-	cd source/linux/releasei386-glibc
-	exeinto ${GAMES_DATADIR}/${PN}
-	doexe ref_gl.so ref_glx.so ufo
-	exeinto ${GAMES_DATADIR}/${PN}/base
-	doexe gamei386.so
-	games_make_wrapper ufo-ai ./ufo ${GAMES_DATADIR}/${PN}
+	dodir "${GAMES_DATADIR}/${PN}"
+	cp -rf "${S}/ufo/"* "${D}${GAMES_DATADIR}/${PN}" || die "copying data"
+	if use x86 ; then
+		ARCH=i386
+	fi
+	exeinto "${GAMES_DATADIR}/${PN}"
+	doexe "${S}/source/linux/release${ARCH}-glibc/"{ref_gl.so,ref_glx.so,ufo} \
+		|| die "doexe ufo"
+	exeinto "${GAMES_DATADIR}/${PN}/base"
+	doexe "${S}/source/linux/release${ARCH}-glibc/game${ARCH}.so" \
+		|| die "doexe game${ARCH}.so"
+	games_make_wrapper ufo-ai ./ufo "${GAMES_DATADIR}/${PN}"
 	prepgamesdirs
 }
-
diff --git a/games-strategy/ufo2000/ChangeLog b/games-strategy/ufo2000/ChangeLog
index 026911a46971..f9ce2aa8d1b5 100644
--- a/games-strategy/ufo2000/ChangeLog
+++ b/games-strategy/ufo2000/ChangeLog
@@ -1,6 +1,54 @@
 # ChangeLog for games-strategy/ufo2000
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo2000/ChangeLog,v 1.1 2004/01/23 02:27:28 mr_bones_ Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo2000/ChangeLog,v 1.1.1.1 2005/11/30 09:36:39 chriswhite Exp $
+
+  06 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  ufo2000-0.6.627.ebuild:
+  oggvorbis -> vorbis for bug #94254.
+
+  15 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  ufo2000-0.6.627.ebuild:
+  Removed INSTALL file.
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  ufo2000-0.6.627.ebuild:
+  Stable on ppc.
+
+  03 Mar 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  -ufo2000-0.4.0.334.ebuild, -ufo2000-0.4.0.353.ebuild,
+  ufo2000-0.6.627.ebuild:
+  clean old ebuilds; tidy
+
+*ufo2000-0.6.627 (26 Jan 2005)
+
+  26 Jan 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +ufo2000-0.6.627.ebuild:
+  version bump - ebuild submitted by Serge Semashko via bug #72733
+
+  03 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  ufo2000-0.4.0_beta321.ebuild, ufo2000-0.4.0_beta324.ebuild:
+  removed beta ebuilds
+
+*ufo2000-0.4.0.353 (03 Apr 2004)
+
+  03 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  ufo2000-0.4.0.353.ebuild:
+  version bump; ebuild submitted by Serge Semashko via bug #46386
+
+  21 Mar 2004; David Holm <dholm@gentoo.org> ufo2000-0.4.0.334.ebuild:
+  Added to ~ppc.
+
+*ufo2000-0.4.0.334 (12 Feb 2004)
+
+  12 Feb 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  ufo2000-0.4.0.334.ebuild:
+  version bump (bug #41325); music patch from Serge Semashko
+
+*ufo2000-0.4.0_beta324 (30 Jan 2004)
+
+  30 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  ufo2000-0.4.0_beta324.ebuild:
+  version bump
 
 *ufo2000-0.4.0_beta321 (22 Jan 2004)
 
diff --git a/games-strategy/ufo2000/Manifest b/games-strategy/ufo2000/Manifest
index c6d6e2b9f8dd..0210c80d6693 100644
--- a/games-strategy/ufo2000/Manifest
+++ b/games-strategy/ufo2000/Manifest
@@ -1,2 +1,4 @@
-MD5 9e4fbd47d246e02c2aa293d76f324f0a ufo2000-0.4.0_beta321.ebuild 2009
-MD5 00629ee0761fe807f7e99f415820364d files/digest-ufo2000-0.4.0_beta321 192
+MD5 13e2ada127d5ffa0af475b757c0b9847 ufo2000-0.6.627.ebuild 2455
+MD5 fada660ae3da582985c39c1efed860b6 ChangeLog 1861
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 e283cd0a1d6f97ef8ed3e3380936accb files/digest-ufo2000-0.6.627 258
diff --git a/games-strategy/ufo2000/metadata.xml b/games-strategy/ufo2000/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-strategy/ufo2000/metadata.xml
+++ b/games-strategy/ufo2000/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-strategy/ufo2000/ufo2000-0.6.627.ebuild b/games-strategy/ufo2000/ufo2000-0.6.627.ebuild
index e091825ec36c..452570fc424e 100644
--- a/games-strategy/ufo2000/ufo2000-0.6.627.ebuild
+++ b/games-strategy/ufo2000/ufo2000-0.6.627.ebuild
@@ -1,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-strategy/ufo2000/ufo2000-0.6.627.ebuild,v 1.1 2005/01/27 01:40:41 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo2000/ufo2000-0.6.627.ebuild,v 1.1.1.1 2005/11/30 09:36:39 chriswhite Exp $
 
 inherit games
 
@@ -9,18 +9,18 @@ HOMEPAGE="http://ufo2000.sourceforge.net/"
 SRC_URI="http://ufo2000.lxnt.info/files/${P}-src.tar.bz2
 	ftp://ftp.microprose.com/pub/mps-online/x-com/xcomdemo.zip
 	ftp://ftp.microprose.com/pub/mps-online/demos/terror.zip
-	oggvorbis? ( http://ufo2000.lxnt.info/files/ufo2000-music-20041222.zip )"
+	vorbis? ( http://ufo2000.lxnt.info/files/ufo2000-music-20041222.zip )"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* x86 ~ppc"
-IUSE="oggvorbis"
+KEYWORDS="-* ppc x86"
+IUSE="vorbis"
 
 RDEPEND="virtual/libc
 	dev-libs/expat
 	>=dev-games/hawknl-1.66
 	>=media-libs/allegro-4.0.0
-	oggvorbis? ( >=media-libs/aldumb-0.9.2
+	vorbis? ( >=media-libs/aldumb-0.9.2
 		media-libs/libogg
 		media-libs/libvorbis )"
 DEPEND="${RDEPEND}
@@ -40,7 +40,7 @@ src_unpack() {
 	unzip -qLL TFTD.ZIP || die "unzip failed"
 	rm TFTD.ZIP
 
-	if use oggvorbis ; then
+	if use vorbis ; then
 		cd "${S}/newmusic"
 		unpack ufo2000-music-20041222.zip
 	fi
@@ -49,7 +49,7 @@ src_unpack() {
 src_compile() {
 	local myconf
 
-	use oggvorbis && myconf="dumbogg=1"
+	use vorbis && myconf="dumbogg=1"
 
 	emake \
 		DATA_DIR="${GAMES_DATADIR}/${PN}" \
@@ -71,7 +71,7 @@ src_install() {
 		"${D}/${GAMES_DATADIR}/${PN}/XCOM/readme.txt"
 	echo "Please copy data files from TFTD here" > \
 		"${D}/${GAMES_DATADIR}/${PN}/TFTD/readme.txt"
-	dodoc *.txt INSTALL AUTHORS ChangeLog || die "dodoc failed"
+	dodoc *.txt AUTHORS ChangeLog || die "dodoc failed"
 	prepgamesdirs
 }
 
diff --git a/games-strategy/uqm/ChangeLog b/games-strategy/uqm/ChangeLog
index ddc114556d23..d7922b230cec 100644
--- a/games-strategy/uqm/ChangeLog
+++ b/games-strategy/uqm/ChangeLog
@@ -1,10 +1,51 @@
-# ChangeLog for app-games/uqm
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/uqm/ChangeLog,v 1.1 2003/09/10 05:27:31 vapier Exp $
+# ChangeLog for games-strategy/uqm
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/uqm/ChangeLog,v 1.1.1.1 2005/11/30 09:36:42 chriswhite Exp $
+
+  06 Oct 2005; Michael Sterrett <mr_bones_@gentoo.org> -uqm-0.3-r2.ebuild:
+  clean older version
+
+  27 May 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  files/digest-uqm-0.4.0, Manifest:
+  Fixing diget for bug #94165.
+
+*uqm-0.4.0 (27 May 2005)
+
+  27 May 2005; Michael Sterrett <mr_bones_@gentoo.org> +uqm-0.4.0.ebuild:
+  version bump (bug #93491) - ebuild patch from Robert Zaleski
+
+  09 Feb 2005; Michael Sterrett <mr_bones_@gentoo.org> uqm-0.3-r2.ebuild:
+  more use flag knobs to support specific content install (bug #67045) -
+  ebuild mods from John Croisant
+
+  25 Nov 2004; Joseph Jezak <josejx@gentoo.org> uqm-0.3-r2.ebuild:
+  Markked ppc stable.
+
+*uqm-0.3-r2 (06 Mar 2004)
+
+  06 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> uqm-0.3-r2.ebuild:
+  Addition of remixed addon music.  patch from Eldad Zack via bug #43875
+
+*uqm-0.3-r1 (26 Feb 2004)
+
+  26 Feb 2004; Michael Sterrett <mr_bones_@gentoo.org> uqm-0.3-r1.ebuild:
+  fix up data directory location (/usr/games/share -> /usr/share/games)
+
+  16 Sep 2003; Michael Sterrett <msterret@gentoo.org> uqm-0.3.ebuild:
+  Mark stable
+
+*uqm-0.3 (15 Sep 2003)
+
+  15 Sep 2003; Michael Sterrett <msterret@gentoo.org> uqm-0.2.ebuild,
+  uqm-0.3.ebuild:
+  sys-apps/textutils -> coreutils
+
+  11 Sep 2003; Michael Sterrett <msterret@gentoo.org> :
+  version bump; change last entry to be more correct
 
 *uqm-0.2 (09 Jul 2003)
 
   09 Jul 2003; Michael Sterrett <msterret@gentoo.org> uqm-0.2.ebuild:
-  initial commit.  ebuild based on the one provided by Regan Myers in bug 12153
-  and vapier's continued work on it as well.
+  initial commit.  ebuild based on the one provided by Martti Rannanjarvi
+  in bug 12153 and vapier's continued work on it as well.
 
diff --git a/games-strategy/uqm/Manifest b/games-strategy/uqm/Manifest
index 7b6ebbac0982..ac2d46b1dbba 100644
--- a/games-strategy/uqm/Manifest
+++ b/games-strategy/uqm/Manifest
@@ -1,3 +1,4 @@
-MD5 b64f4e5554e306df836627f4b59c7d5c uqm-0.2.ebuild 2012
-MD5 4167035a011da1a29455be82f9cdf591 ChangeLog 430
-MD5 c11ab9abbb79bb9cf614402daa6d3bcf files/digest-uqm-0.2 261
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 7797fbfacf289faafe1efa5e7354dce6 uqm-0.4.0.ebuild 3263
+MD5 2377cd2f60ca09d58ae11ae4b87e0820 ChangeLog 1786
+MD5 a6c1b54df8b63f6ce19a0b480af8e461 files/digest-uqm-0.4.0 471
diff --git a/games-strategy/uqm/files/digest-uqm-0.4.0 b/games-strategy/uqm/files/digest-uqm-0.4.0
index bc4d22d19805..d3e407d12ffa 100644
--- a/games-strategy/uqm/files/digest-uqm-0.4.0
+++ b/games-strategy/uqm/files/digest-uqm-0.4.0
@@ -1,4 +1,4 @@
-MD5 17c2007297c9549916c452598dfc4235 uqm-0.4.0-source.tar.gz 1198621
+MD5 5f92d7307b3b2e32f4384e29131ecbc5 uqm-0.4.0-source.tar.gz 1198714
 MD5 f8daed517466d68805393e02a12fd642 uqm-0.4.0-content.uqm 11695898
 MD5 9073251b0d96393441f0b40016010576 uqm-0.4.0-3domusic.uqm 18980505
 MD5 52a084cfaa0bc7fcc63a295feb8cbd28 uqm-0.4.0-voice.uqm 114823413
diff --git a/games-strategy/uqm/metadata.xml b/games-strategy/uqm/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-strategy/uqm/metadata.xml
+++ b/games-strategy/uqm/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-strategy/uqm/uqm-0.4.0.ebuild b/games-strategy/uqm/uqm-0.4.0.ebuild
index 2ef039ee9927..8c7598c0f696 100644
--- a/games-strategy/uqm/uqm-0.4.0.ebuild
+++ b/games-strategy/uqm/uqm-0.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/games-strategy/uqm/uqm-0.4.0.ebuild,v 1.1 2005/05/27 04:12:25 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/uqm/uqm-0.4.0.ebuild,v 1.1.1.1 2005/11/30 09:36:42 chriswhite Exp $
 
 inherit games
 
@@ -16,11 +16,10 @@ SRC_URI="mirror://sourceforge/sc2/${P}-source.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE="opengl music voice remix"
+KEYWORDS="ppc x86"
+IUSE="music opengl remix voice"
 
-RDEPEND="virtual/libc
-	virtual/x11
+RDEPEND="virtual/x11
 	media-libs/libvorbis
 	media-libs/jpeg
 	media-libs/libpng
@@ -61,7 +60,6 @@ src_unpack() {
 	sed -i \
 		-e "s/-O3/${CFLAGS}/" build/unix/build.config \
 		|| die "sed build.config failed"
-EOF
 }
 
 src_compile() {
@@ -71,7 +69,7 @@ src_compile() {
 src_install() {
 	# Using the included install scripts seems quite painful.
 	# This manual install is totally fragile but maybe they'll
-	# use a sane build system.
+	# use a sane build system for the next release.
 	newgamesbin uqm-wrapper uqm || die "newgamesbin failed"
 	exeinto "${GAMES_LIBDIR}/${PN}"
 	doexe uqm || die "doexe failed"
diff --git a/games-strategy/warzone2100/ChangeLog b/games-strategy/warzone2100/ChangeLog
index 4e30d829f028..e5aab0cb6bdb 100644
--- a/games-strategy/warzone2100/ChangeLog
+++ b/games-strategy/warzone2100/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-strategy/warzone2100
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/warzone2100/ChangeLog,v 1.1 2005/10/12 00:34:11 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/warzone2100/ChangeLog,v 1.1.1.1 2005/11/30 09:36:39 chriswhite Exp $
+
+  15 Nov 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/warzone2100-0.2.2-headers.patch, warzone2100-0.2.2.ebuild:
+  fix compile with USE=-mp3.  Patch from Harald van Dijk via bug #112483
+
+  12 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  warzone2100-0.2.2.ebuild:
+  Cleaning up sed line.
 
 *warzone2100-0.2.2 (12 Oct 2005)
 
diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest
index 845e142a7636..a71aab263890 100644
--- a/games-strategy/warzone2100/Manifest
+++ b/games-strategy/warzone2100/Manifest
@@ -1,3 +1,6 @@
-MD5 9e76c302897e454e4f4812dc1b3322e5 files/0.2.2-clparse.c.patch 413
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 ad318b50284cf0ef5470b43291800901 warzone2100-0.2.2.ebuild 1541
+MD5 7e6c462fa217d2eabe2b7923061970df ChangeLog 835
+MD5 b102bdfd896bca6763c9494325976068 files/warzone2100-0.2.2-headers.patch 337
 MD5 c2760647a592be7a727446029eff8d0c files/digest-warzone2100-0.2.2 72
-MD5 55a5d81dacdb1befb3a3293fd897db77 warzone2100-0.2.2.ebuild 1293
+MD5 9e76c302897e454e4f4812dc1b3322e5 files/0.2.2-clparse.c.patch 413
diff --git a/games-strategy/warzone2100/warzone2100-0.2.2.ebuild b/games-strategy/warzone2100/warzone2100-0.2.2.ebuild
index ff0ddca087ed..9cd69f6af109 100644
--- a/games-strategy/warzone2100/warzone2100-0.2.2.ebuild
+++ b/games-strategy/warzone2100/warzone2100-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/games-strategy/warzone2100/warzone2100-0.2.2.ebuild,v 1.1 2005/10/12 00:34:11 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/warzone2100/warzone2100-0.2.2.ebuild,v 1.1.1.1 2005/11/30 09:36:40 chriswhite Exp $
 
 inherit eutils games
 
@@ -23,16 +23,19 @@ DEPEND=">=media-libs/libsdl-1.2.8
 src_unpack() {
 	unpack ${A}
 
-	sed s:DATADIR:"$GAMES_DATADIR"/${PN}/: \
+	sed -e "s:DATADIR:${GAMES_DATADIR}/${PN}/:" \
 		"${FILESDIR}"/${PV}-clparse.c.patch > \
-		${T}/${PV}-clparse.c.patch \
-	|| die "sed failed"
-
-	sed -i 's: -m32::' ${S}/configure || die
-	sed -i 's:-m32::' ${S}/makerules/common.mk || die
-
-	cd ${S}
-	epatch ${T}/${PV}-clparse.c.patch || die "epatch failed"
+		"${T}"/${PV}-clparse.c.patch \
+		|| die "sed failed"
+
+	cd "${S}"
+	sed -i \
+		-e 's: -m32::' configure || die
+	sed -i \
+		-e 's:-m32::' makerules/common.mk || die
+	epatch \
+		"${T}"/${PV}-clparse.c.patch \
+		"${FILESDIR}"/${P}-headers.patch
 }
 
 src_compile() {
@@ -43,7 +46,7 @@ src_compile() {
 		$(use_with mp3) \
 		CFLAGS="${CFLAGS}" \
 		CPPFLAGS="${CXXFLAGS}" \
-	|| die "egamesconf failed"
+		|| die "egamesconf failed"
 	emake || die "emake failed"
 }
 
@@ -52,6 +55,5 @@ src_install() {
 	insinto "${GAMES_DATADIR}"/${PN}
 	doins -r data/* || die "install data failed"
 	dodoc AUTHORS CHANGELOG README || "install doc failed"
-
 	prepgamesdirs
 }
diff --git a/games-strategy/wesnoth/ChangeLog b/games-strategy/wesnoth/ChangeLog
index 8e9e720d5bf5..314e4f3205eb 100644
--- a/games-strategy/wesnoth/ChangeLog
+++ b/games-strategy/wesnoth/ChangeLog
@@ -1,6 +1,309 @@
 # ChangeLog for games-strategy/wesnoth
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.1 2003/10/22 21:21:07 mr_bones_ Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.1.1.1 2005/11/30 09:36:41 chriswhite Exp $
+
+  18 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> wesnoth-1.0.1.ebuild:
+  Stable on ppc.
+
+  14 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> wesnoth-1.0.1.ebuild:
+  Stable on sparc
+
+  14 Nov 2005; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-1.0.1.ebuild:
+  stable for x86
+
+  07 Nov 2005; Brent Baude <ranger@gentoo.org> wesnoth-1.0.1.ebuild:
+  Marking wesnoth-1.0.1 ~ppc64 per bug 111430
+
+*wesnoth-1.0.1 (20 Oct 2005)
+
+  20 Oct 2005; Michael Sterrett <mr_bones_@gentoo.org> +files/wesnothd.rc,
+  +wesnoth-1.0.1.ebuild:
+  version bump
+
+*wesnoth-0.9.7 (08 Sep 2005)
+
+  08 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +wesnoth-0.9.7.ebuild:
+  version bump
+
+*wesnoth-0.9.6 (29 Aug 2005)
+
+  29 Aug 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +wesnoth-0.9.6.ebuild:
+  version bump
+
+  28 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org> wesnoth-0.9.5.ebuild:
+  Stable on amd64, closes bug 103542.
+
+  20 Aug 2005; Jason Wever <weeve@gentoo.org> wesnoth-0.9.5.ebuild:
+  Stable on SPARC.
+
+  19 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> wesnoth-0.9.5.ebuild:
+  Stable on ppc.
+
+  19 Aug 2005; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-0.9.4.ebuild,
+  wesnoth-0.9.5.ebuild:
+  filter -fstack-protector again for bug #88899 - Upstream says it's a gcc-3
+  issue that is addressed in gcc-4.
+
+  17 Aug 2005; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-0.9.5.ebuild:
+  stable for x86
+
+  09 Aug 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  -wesnoth-0.9.1.ebuild, -wesnoth-0.9.2.ebuild, -wesnoth-0.9.3.ebuild:
+  clean old versions
+
+*wesnoth-0.9.5 (09 Aug 2005)
+
+  09 Aug 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +wesnoth-0.9.5.ebuild:
+  version bump
+
+*wesnoth-0.9.4 (24 Jul 2005)
+
+  24 Jul 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +wesnoth-0.9.4.ebuild:
+  version bump
+
+*wesnoth-0.9.3 (30 Jun 2005)
+
+  30 Jun 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +wesnoth-0.9.3.ebuild:
+  version bump
+
+  08 Jun 2005; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-0.9.2.ebuild:
+  Fix error in packaging (bug #95466)
+
+*wesnoth-0.9.2 (07 Jun 2005)
+
+  07 Jun 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +wesnoth-0.9.2.ebuild:
+  version bump
+
+  17 May 2005; Chris Gianelloni <wolf31o2@gentoo.org> wesnoth-0.8.10.ebuild,
+  wesnoth-0.8.11.ebuild, wesnoth-0.9.0.ebuild, wesnoth-0.9.1.ebuild:
+  Cleanup for bug #92745.
+
+*wesnoth-0.9.1 (26 Apr 2005)
+
+  26 Apr 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +wesnoth-0.9.1.ebuild:
+  version bump
+
+*wesnoth-0.9.0 (11 Apr 2005)
+
+  11 Apr 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +wesnoth-0.9.0.ebuild:
+  version bump
+
+*wesnoth-0.8.11 (22 Feb 2005)
+
+  22 Feb 2005; Michael Sterrett <mr_bones_@gentoo.org> +wesnoth-0.8.11.ebuild:
+  version bump
+
+*wesnoth-0.8.7 (12 Feb 2005)
+
+  12 Feb 2005; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-0.8.10.ebuild,
+  -wesnoth-0.8.7.ebuild, -wesnoth-0.8.8.ebuild, -wesnoth-0.8.9.ebuild:
+  filter more flags (bug #81749); clean old ebuilds
+
+*wesnoth-0.8.10 (07 Feb 2005)
+
+  07 Feb 2005; Michael Sterrett <mr_bones_@gentoo.org> +wesnoth-0.8.10.ebuild:
+  version bump
+
+*wesnoth-0.8.9 (01 Feb 2005)
+
+  01 Feb 2005; Michael Sterrett <mr_bones_@gentoo.org> +wesnoth-0.8.9.ebuild:
+  version bump (bug #79562); switch to lite use flag
+
+  20 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/0.8.4-conf.patch, -files/0.8.5-conf.patch, -wesnoth-0.8.1.ebuild,
+  -wesnoth-0.8.2.ebuild, -wesnoth-0.8.4.ebuild, -wesnoth-0.8.5.ebuild,
+  -wesnoth-0.8.ebuild:
+  clean old ebuilds
+
+*wesnoth-0.8.8 (05 Dec 2004)
+
+  05 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org> +wesnoth-0.8.8.ebuild:
+  version bump
+
+  02 Nov 2004; Michael Sterrett <mr_bones_@gentoo.org> :
+  version bump
+
+*wesnoth-0.8.5 (05 Oct 2004)
+
+  05 Oct 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/0.8.5-conf.patch, +wesnoth-0.8.5.ebuild:
+  version bump
+
+  12 Sep 2004; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-0.8.4.ebuild:
+  use mirror: in SRC_URI; tidy
+
+*wesnoth-0.8.4 (11 Sep 2004)
+
+  11 Sep 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/0.8.4-conf.patch, +wesnoth-0.8.4.ebuild:
+  version bump; patched source to fix autotool mess from upstream
+
+  16 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-0.8.2.ebuild:
+  enable lite install knob (bug #60570)
+
+  15 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org> -wesnoth-0.7.10.ebuild,
+  -wesnoth-0.7.11.ebuild:
+  clean version 0.7
+
+*wesnoth-0.8.2 (15 Aug 2004)
+
+  15 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org> +wesnoth-0.8.2.ebuild:
+  version bump
+
+*wesnoth-0.8.1 (03 Aug 2004)
+
+  03 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org> +wesnoth-0.8.1.ebuild:
+  version bump
+
+*wesnoth-0.8 (04 Jul 2004)
+
+  04 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> +wesnoth-0.8.ebuild:
+  version bump
+
+*wesnoth-0.7.11 (28 Jun 2004)
+
+  28 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> +wesnoth-0.7.11.ebuild:
+  version bump
+
+*wesnoth-0.7.10 (21 Jun 2004)
+
+  21 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-0.7.10.ebuild:
+  version bump
+
+  11 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-0.7.6.ebuild,
+  wesnoth-0.7.7.ebuild:
+  clean older ebuilds
+
+*wesnoth-0.7.9 (11 Jun 2004)
+
+  11 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-0.7.9.ebuild:
+  version bump
+
+*wesnoth-0.7.8 (27 May 2004)
+
+  27 May 2004; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-0.7.8.ebuild:
+  version bump
+
+*wesnoth-0.7.7 (24 May 2004)
+
+  24 May 2004; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-0.7.7.ebuild:
+  version bump
+
+  03 May 2004; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-0.7.1.ebuild,
+  wesnoth-0.7.2.ebuild, wesnoth-0.7.ebuild:
+  clean older ebuilds
+
+*wesnoth-0.7.6 (03 May 2004)
+
+  03 May 2004; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-0.7.6.ebuild:
+  version bump; unsigned char issue is supposed to be fixed upstream so the
+  work around was removed.
+
+*wesnoth-0.7.5 (25 Apr 2004)
+
+  25 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-0.7.5.ebuild:
+  version bump
+
+  20 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-0.7.3.ebuild:
+  Work around for broken compile on ppc from Ernst Persson via bug #48326; tidy
+
+*wesnoth-0.7.3 (18 Apr 2004)
+
+  18 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-0.7.3.ebuild:
+  version bump
+
+*wesnoth-0.7.2 (09 Apr 2004)
+
+  09 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-0.7.2.ebuild:
+  version bump; added gnome and kde USE.
+
+  03 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  wesnoth-0.6.99.1.ebuild, wesnoth-0.6.99.2.ebuild, wesnoth-0.6.99.3.ebuild,
+  wesnoth-0.6.99.4.ebuild, wesnoth-0.6.99.5.ebuild:
+  cleaned version 0.6 from portage
+
+*wesnoth-0.7.1 (03 Apr 2004)
+
+  03 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-0.7.1.ebuild:
+  version bump
+
+*wesnoth-0.7 (19 Mar 2004)
+
+  19 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-0.7.ebuild:
+  version bump (bug #45171)
+
+  19 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org> wesnoth-0.6.99.5.ebuild:
+  ~sparc lovin
+
+  17 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  wesnoth-0.6.99.5.ebuild:
+  use emake -j1 (bug #44831)
+
+*wesnoth-0.6.99.5 (15 Mar 2004)
+
+  15 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  wesnoth-0.6.99.5.ebuild:
+  version bump (bug #44793)
+
+*wesnoth-0.6.99.4 (21 Feb 2004)
+
+  21 Feb 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  wesnoth-0.6.99.4.ebuild:
+  version bump
+
+*wesnoth-0.6.99.3 (16 Feb 2004)
+
+  16 Feb 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  wesnoth-0.6.99.3.ebuild:
+  version bump (bug #41619)
+
+*wesnoth-0.6.99.2 (06 Feb 2004)
+
+  06 Feb 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  wesnoth-0.6.99.2.ebuild:
+  version bump (bug #40458)
+
+*wesnoth-0.6.99.1 (28 Jan 2004)
+
+  28 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  wesnoth-0.6.99.1.ebuild:
+  version bump
+
+  17 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> :
+  manifest fix
+
+  16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> wesnoth-0.6.1.ebuild:
+  set ppc in keywords
+
+*wesnoth-0.6.1 (03 Jan 2004)
+
+  03 Jan 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #36148 #35909.  Thanks to Russell Valentine <russ_allegro@yahoo.com>
+  and Arndt Faulhaber <arndt.faulhaber@diagnosdata.com>.
+
+*wesnoth-0.5.1 (10 Nov 2003)
+
+  29 Nov 2003; Brad House <brad_mssw@gentoo.org> wesnoth-0.5.1.ebuild:
+  mark stable on amd64
+
+  10 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-0.5.1.ebuild:
+  version bump
+
+  01 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-0.5.ebuild:
+  add DEPEND on sdl-net
+
+*wesnoth-0.5 (31 Oct 2003)
+
+  31 Oct 2003; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-0.5.ebuild:
+  version bump
 
 *wesnoth-0.4.8 (22 Oct 2003)
 
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 96adcced8893..8f879209ed78 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,2 +1,7 @@
-MD5 292c797279011cda4928915ba98d5449 wesnoth-0.4.8.ebuild 825
-MD5 12449f4d45609424ab20eb79f5f77baf files/digest-wesnoth-0.4.8 66
+MD5 cc7df35fb62710f5383ce7e99ea7630a wesnoth-1.0.1.ebuild 1982
+MD5 57059bb5bc220cf8bcc5756fc97f55e5 wesnoth-0.9.7.ebuild 1304
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 8167495ae661ad40ea430db2c9f3be2e ChangeLog 9020
+MD5 6a73a3191925d45024cf48879c799e0e files/digest-wesnoth-1.0.1 67
+MD5 fb1fa5b4b8d2cf8cb254199744d05a69 files/digest-wesnoth-0.9.7 67
+MD5 2238ca275d6ab646096d612c46b1eb05 files/wesnothd.rc 619
diff --git a/games-strategy/wesnoth/files/wesnothd.rc b/games-strategy/wesnoth/files/wesnothd.rc
index aefd0ccf3141..daca02b3be0d 100644
--- a/games-strategy/wesnoth/files/wesnothd.rc
+++ b/games-strategy/wesnoth/files/wesnothd.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/games-strategy/wesnoth/files/wesnothd.rc,v 1.1 2005/10/20 20:16:27 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/files/wesnothd.rc,v 1.1.1.1 2005/11/30 09:36:41 chriswhite Exp $
 
 depend() {
 	use net
diff --git a/games-strategy/wesnoth/metadata.xml b/games-strategy/wesnoth/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-strategy/wesnoth/metadata.xml
+++ b/games-strategy/wesnoth/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-strategy/wesnoth/wesnoth-0.9.7.ebuild b/games-strategy/wesnoth/wesnoth-0.9.7.ebuild
index 9a62025bd01e..db145fb62ff4 100644
--- a/games-strategy/wesnoth/wesnoth-0.9.7.ebuild
+++ b/games-strategy/wesnoth/wesnoth-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/games-strategy/wesnoth/wesnoth-0.9.7.ebuild,v 1.1 2005/09/09 04:31:13 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-0.9.7.ebuild,v 1.1.1.1 2005/11/30 09:36:41 chriswhite Exp $
 
 inherit eutils toolchain-funcs flag-o-matic games
 
diff --git a/games-strategy/wesnoth/wesnoth-1.0.1.ebuild b/games-strategy/wesnoth/wesnoth-1.0.1.ebuild
index 22e6674c2840..cbdd315a9234 100644
--- a/games-strategy/wesnoth/wesnoth-1.0.1.ebuild
+++ b/games-strategy/wesnoth/wesnoth-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-strategy/wesnoth/wesnoth-1.0.1.ebuild,v 1.1 2005/10/20 20:16:27 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.0.1.ebuild,v 1.1.1.1 2005/11/30 09:36:41 chriswhite Exp $
 
 inherit eutils toolchain-funcs flag-o-matic games
 
@@ -8,22 +8,21 @@ MY_PV=${PV/_/}
 DESCRIPTION="A fantasy turn-based strategy game"
 HOMEPAGE="http://www.wesnoth.org/"
 SRC_URI="mirror://sourceforge/wesnoth/${PN}-${MY_PV}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ppc ~ppc64 sparc x86"
 IUSE="dedicated editor gnome kde lite nls server tools"
 
-RDEPEND=">=media-libs/libsdl-1.2.7
+DEPEND=">=media-libs/libsdl-1.2.7
 	!dedicated? (virtual/x11
 	>=media-libs/freetype-2 )
 	>=media-libs/sdl-mixer-1.2
 	>=media-libs/sdl-image-1.2
 	media-libs/sdl-net
 	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	sys-apps/sed"
+
+S=${WORKDIR}/${PN}-${MY_PV}
 
 src_unpack() {
 	unpack ${A}
diff --git a/games-strategy/widelands/ChangeLog b/games-strategy/widelands/ChangeLog
index 4f4b05d12a1e..958d6b6fb148 100644
--- a/games-strategy/widelands/ChangeLog
+++ b/games-strategy/widelands/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for games-strategy/widelands
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/ChangeLog,v 1.1 2005/05/05 02:49:53 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/ChangeLog,v 1.1.1.1 2005/11/30 09:36:43 chriswhite Exp $
+
+  29 Oct 2005; Luca Barbato <lu_zero@gentoo.org> widelands-0.0.9.ebuild:
+  fixed ppc osdep, still broken on gcc4
+
+  15 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  widelands-0.0.9.ebuild:
+  Removed COPYING file.
+
+  05 May 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  widelands-0.0.9.ebuild:
+  tidy ebuild
+
+  05 May 2005; Chris Gianelloni <wolf31o2@gentoo.org> :
+  Added Manifest (bad wolfie) and closing bug #91537.
 
 *widelands-0.0.9 (05 May 2005)
 
diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest
index fc91ad47d884..e42cd7c6dc45 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -1,5 +1,5 @@
-MD5 a523d77b9e3c0a7c7cce43d44c3b43c9 widelands-0.0.9.ebuild 1158
-MD5 1ccd485a47c4f7a573a8620e446ee70d ChangeLog 621
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 f5894b5e393e51400a447083d859dfd5 ChangeLog 1046
 MD5 4de0ba8b5543e6d848c86838244852e6 files/digest-widelands-0.0.9 73
 MD5 839d74b86a5e329cbfb77e61c65d6921 files/widelands-0.0.9-amd64.patch 425
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 5973bcdbf97557cad2aaa063f7ba32e0 widelands-0.0.9.ebuild 1169
diff --git a/games-strategy/widelands/widelands-0.0.9.ebuild b/games-strategy/widelands/widelands-0.0.9.ebuild
index c97849612807..c11698224df5 100644
--- a/games-strategy/widelands/widelands-0.0.9.ebuild
+++ b/games-strategy/widelands/widelands-0.0.9.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-strategy/widelands/widelands-0.0.9.ebuild,v 1.1 2005/05/05 02:49:53 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/widelands-0.0.9.ebuild,v 1.1.1.1 2005/11/30 09:36:43 chriswhite Exp $
 
-inherit games
+inherit eutils games
 
 DESCRIPTION="A game similar to Settlers 2"
 HOMEPAGE="http://widelands.sourceforge.net/"
@@ -10,8 +10,9 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-b${PV:4:4}-source.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="debug"
+
 DEPEND="media-libs/libsdl
 	media-libs/sdl-image
 	media-libs/sdl-net
@@ -20,13 +21,12 @@ DEPEND="media-libs/libsdl
 	media-libs/jpeg
 	media-libs/libpng"
 
-S="${WORKDIR}/${PN}"
-dir="${GAMES_DATADIR}/${PN}"
-Ddir=${D}/${dir}
+S=${WORKDIR}/${PN}
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/${P}-amd64.patch || die
+	epatch "${FILESDIR}/${P}-amd64.patch"
+	sed -i -e "s:__ppc__:__PPC__:g" ${S}/src/machdep.h
 }
 
 src_compile() {
@@ -36,13 +36,14 @@ src_compile() {
 }
 
 src_install() {
-	dodir ${dir}
-	insinto ${dir}
-	exeinto ${dir}
-	doins -r fonts maps pics tribes worlds campaigns README COPYING \
-		|| die "copying data files"
+	local dir=${GAMES_DATADIR}/${PN}
+
+	insinto "${dir}"
+	doins -r fonts maps pics tribes worlds campaigns README \
+		|| die "doins failed"
+	exeinto "${dir}"
 	doexe ${PN} || die "copying widelands"
-	games_make_wrapper widelands ./widelands ${dir}
-	dodoc AUTHORS COPYING ChangeLog README
+	games_make_wrapper widelands ./widelands "${dir}"
+	dodoc AUTHORS ChangeLog README
 	prepgamesdirs
 }
diff --git a/games-strategy/wormux/ChangeLog b/games-strategy/wormux/ChangeLog
index f35bbc82bd44..839740f104d6 100644
--- a/games-strategy/wormux/ChangeLog
+++ b/games-strategy/wormux/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for games-strategy/wormux
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/wormux/ChangeLog,v 1.1 2004/12/16 22:34:09 vapier Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wormux/ChangeLog,v 1.1.1.1 2005/11/30 09:36:43 chriswhite Exp $
+
+*wormux-0.5.1 (02 Jul 2005)
+
+  02 Jul 2005; Mike Frysinger <vapier@gentoo.org> +wormux-0.5.1.ebuild:
+  Version bump #97724 by Slobodan D. Sredojevic.
+
+  09 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> wormux-0.5.0.ebuild:
+  added ~amd64 KEYWORD, fixes #84531
+
+  01 Mar 2005; Michael Sterrett <mr_bones_@gentoo.org> wormux-0.5.0.ebuild:
+  ppc has not clanlib; stable for x86
 
 *wormux-0.5.0 (16 Dec 2004)
 
diff --git a/games-strategy/wormux/Manifest b/games-strategy/wormux/Manifest
index 934127085e33..b0f40cb31ca6 100644
--- a/games-strategy/wormux/Manifest
+++ b/games-strategy/wormux/Manifest
@@ -1,2 +1,14 @@
-MD5 7238f295e7cf043adf4c9018b87a829c wormux-0.5.0.ebuild 1154
-MD5 47eeba14c04c6ee99e7b1f99dfad9efa files/digest-wormux-0.5.0 71
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 58047b5023219c15159604df05ecbdfb ChangeLog 740
+MD5 cdaf4177319790e279b8007613c45aad files/digest-wormux-0.5.1 71
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 d12b54043b102912ee9d9a8ab45de0b4 wormux-0.5.1.ebuild 1067
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDatOogIKl8Uu19MoRAvSNAJ9bOR5XojFeEUHD7lowcQ5nrB5XhgCdF2RT
+H9FVDvBSlfcmb+ZgF/g8Gjc=
+=lwFg
+-----END PGP SIGNATURE-----
diff --git a/games-strategy/wormux/wormux-0.5.1.ebuild b/games-strategy/wormux/wormux-0.5.1.ebuild
index ec0504243f42..4490ac10e57a 100644
--- a/games-strategy/wormux/wormux-0.5.1.ebuild
+++ b/games-strategy/wormux/wormux-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/games-strategy/wormux/wormux-0.5.1.ebuild,v 1.1 2005/07/02 19:35:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wormux/wormux-0.5.1.ebuild,v 1.1.1.1 2005/11/30 09:36:43 chriswhite Exp $
 
 inherit eutils games
 
diff --git a/games-strategy/xarchon/ChangeLog b/games-strategy/xarchon/ChangeLog
index b75a332c0499..4dbfb84fc438 100644
--- a/games-strategy/xarchon/ChangeLog
+++ b/games-strategy/xarchon/ChangeLog
@@ -1,6 +1,18 @@
-# ChangeLog for app-games/xarchon
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/xarchon/ChangeLog,v 1.1 2003/09/10 05:27:31 vapier Exp $
+# ChangeLog for games-strategy/xarchon
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/xarchon/ChangeLog,v 1.1.1.1 2005/11/30 09:36:42 chriswhite Exp $
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> xarchon-0.60.ebuild:
+  Stable on ppc.
+
+  12 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org> xarchon-0.60.ebuild:
+  no bugs reported for 375 days.  Marking stable for x86
+
+  03 Jun 2004; Aron Griffis <agriffis@gentoo.org> xarchon-0.50.ebuild:
+  Fix use invocation
+
+  13 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> xarchon-0.60.ebuild:
+  games eclass inherits eutils already; error check sed; use flag tidy
 
 *xarchon-0.60 (31 Jul 2003)
 
diff --git a/games-strategy/xarchon/Manifest b/games-strategy/xarchon/Manifest
index 4aa06213887b..3cce352b47fe 100644
--- a/games-strategy/xarchon/Manifest
+++ b/games-strategy/xarchon/Manifest
@@ -1,5 +1,6 @@
-MD5 689a185cbdfa51ad46911e3703f8e7bc xarchon-0.50.ebuild 881
-MD5 8bfbd70aee2831c6c7a4587cad2f6011 files/digest-xarchon-0.50 64
+MD5 6cba5f2a8e61a98b534d6d95fcca1114 xarchon-0.60.ebuild 1219
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 ef441dd5bd36d9e0a8af44b3856a2922 ChangeLog 966
+MD5 f4340c7f6fe5767f577b0b5e265081d2 xarchon-0.50.ebuild 877
 MD5 50a9df5dead133494d2506a91264661e files/digest-xarchon-0.60 133
-MD5 7b47ee1986da190e2e61cd6c95042ec6 ChangeLog 497
-MD5 e41139467a7a76e6ff4a047cc5d28bea xarchon-0.60.ebuild 1126
+MD5 8bfbd70aee2831c6c7a4587cad2f6011 files/digest-xarchon-0.50 64
diff --git a/games-strategy/xarchon/metadata.xml b/games-strategy/xarchon/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-strategy/xarchon/metadata.xml
+++ b/games-strategy/xarchon/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-strategy/xarchon/xarchon-0.50.ebuild b/games-strategy/xarchon/xarchon-0.50.ebuild
index a1912f34aceb..ee9a3f4283a8 100644
--- a/games-strategy/xarchon/xarchon-0.50.ebuild
+++ b/games-strategy/xarchon/xarchon-0.50.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-strategy/xarchon/xarchon-0.50.ebuild,v 1.1 2003/09/10 05:27:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/xarchon/xarchon-0.50.ebuild,v 1.1.1.1 2005/11/30 09:36:42 chriswhite Exp $
 
 inherit games
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.seul.org/pub/xarchon/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ppc"
 IUSE="esd joystick"
 
 DEPEND="virtual/x11
@@ -20,7 +20,7 @@ DEPEND="virtual/x11
 
 src_compile() {
 	local mysndconf
-	[ `use esd` ] \
+	use esd \
 		&& mysndconf="--with-esd-prefix=/usr" \
 		|| mysndconf="--disable-sound"
 	egamesconf \
diff --git a/games-strategy/xarchon/xarchon-0.60.ebuild b/games-strategy/xarchon/xarchon-0.60.ebuild
index f61e5de7e61c..0f07b5139736 100644
--- a/games-strategy/xarchon/xarchon-0.60.ebuild
+++ b/games-strategy/xarchon/xarchon-0.60.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-strategy/xarchon/xarchon-0.60.ebuild,v 1.1 2003/09/10 05:27:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/xarchon/xarchon-0.60.ebuild,v 1.1.1.1 2005/11/30 09:36:42 chriswhite Exp $
 
-inherit games eutils
+inherit eutils games
 
 DESCRIPTION="modelled after the golden oldie Archon game"
 HOMEPAGE="http://xarchon.seul.org/"
@@ -12,33 +12,37 @@ SRC_URI="ftp://ftp.seul.org/pub/xarchon/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc"
 IUSE="esd joystick" # also has qt support but it fails :/
 
-DEPEND="virtual/x11
+RDEPEND="virtual/x11
 	=x11-libs/gtk+-1*
 	<dev-util/glade-2
 	esd? ( media-sound/esound )"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${WORKDIR}/${P}-gtk.patch
-	sed -i 's:gtk12-config:gtk-config:' configure
+	epatch "${WORKDIR}/${P}-gtk.patch"
+	sed -i \
+		-e 's:gtk12-config:gtk-config:' configure \
+			|| die "sed configure failed"
 }
 
 src_compile() {
 	local mysndconf
-	[ `use esd` ] \
+	use esd \
 		&& mysndconf="--with-esd-prefix=/usr" \
 		|| mysndconf="--disable-sound"
 	egamesconf \
 		--enable-network \
-		`use_enable joystick` \
+		$(use_enable joystick) \
 		--with-default-gtk \
 		${mysndconf} \
-		|| die
-	emake || die
+			|| die
+	emake || die "emake failed"
 }
 
 src_install() {
diff --git a/games-strategy/xbattle/ChangeLog b/games-strategy/xbattle/ChangeLog
index f3c530004a02..274fa615560a 100644
--- a/games-strategy/xbattle/ChangeLog
+++ b/games-strategy/xbattle/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-strategy/xbattle
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/xbattle/ChangeLog,v 1.1 2003/09/26 04:55:49 msterret Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/xbattle/ChangeLog,v 1.1.1.1 2005/11/30 09:36:37 chriswhite Exp $
+
+  29 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org> xbattle-5.4.1.ebuild:
+  official homepage went away so use a replacement (bug #72885); tidy
 
 *xbattle-5.4.1 (25 Sep 2003)
 
diff --git a/games-strategy/xbattle/Manifest b/games-strategy/xbattle/Manifest
index 3442cc774be8..f41c13818f39 100644
--- a/games-strategy/xbattle/Manifest
+++ b/games-strategy/xbattle/Manifest
@@ -1,2 +1,4 @@
-MD5 4a8e9628bbb1dc48306038c613fc59d6 xbattle-5.4.1.ebuild 928
+MD5 fb547543369f8151587615ac1ae63cd6 ChangeLog 556
+MD5 053adb5a213c70eef1becc4974c7ade4 metadata.xml 1360
+MD5 7e85ed0a9699eb7cd8d0fb7ff21eca1e xbattle-5.4.1.ebuild 1321
 MD5 9430b48ce6fae1abaa361a27350a99e0 files/digest-xbattle-5.4.1 65
diff --git a/games-strategy/xbattle/metadata.xml b/games-strategy/xbattle/metadata.xml
index 7e72e513cfe1..e46af3a374bc 100644
--- a/games-strategy/xbattle/metadata.xml
+++ b/games-strategy/xbattle/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>games</herd>
 <maintainer>
-<email>msterret@gentoo.org</email>
+<email>mr_bones_@gentoo.org</email>
 <name>Michael Sterrett</name>
 </maintainer>
 <longdescription>
diff --git a/games-strategy/xbattle/xbattle-5.4.1.ebuild b/games-strategy/xbattle/xbattle-5.4.1.ebuild
index 606348d0cc70..be656554c3c8 100644
--- a/games-strategy/xbattle/xbattle-5.4.1.ebuild
+++ b/games-strategy/xbattle/xbattle-5.4.1.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/games-strategy/xbattle/xbattle-5.4.1.ebuild,v 1.1 2003/09/26 04:55:49 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/xbattle/xbattle-5.4.1.ebuild,v 1.1.1.1 2005/11/30 09:36:37 chriswhite Exp $
 
 inherit games
 
 DESCRIPTION="A multi-player game of strategy and coordination"
-HOMEPAGE="http://cns-web.bu.edu/pub/xpip/html/xbattle.html"
+HOMEPAGE="http://www.cgl.uwaterloo.ca/~jdsteele/xbattle.html"
 SRC_URI="ftp://cns-ftp.bu.edu/pub/xbattle/${P}.tar.gz"
 
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64"
 LICENSE="xbattle"
 SLOT="0"
+KEYWORDS="x86 ppc sparc mips alpha hppa amd64 ia64"
 IUSE=""
 
-RDEPEND="virtual/x11"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
+DEPEND="virtual/x11"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	sed -i \
-		-e "s:/export/home/lesher/:${GAMES_DATADIR}/${PN}/:" Imakefile || \
-			die "sed Imakefile failed"
+		-e "s:/export/home/lesher/:${GAMES_DATADIR}/${PN}/:" Imakefile \
+		|| die "sed Imakefile failed"
 }
 
 src_compile() {
@@ -32,13 +30,13 @@ src_compile() {
 }
 
 src_install() {
-	dogamesbin xbattle                      || die "dogamesbin failed"
+	dogamesbin xbattle || die "dogamesbin failed"
 	newgamesbin tutorial1 xbattle-tutorial1 || die "newgamesbin failed"
 	newgamesbin tutorial2 xbattle-tutorial2 || die "newgamesbin failed"
-	dodir ${GAMES_DATADIR}/${PN}            || die "dodir failed"
-	cp -r xbas/ xbos/ xbts/ ${D}${GAMES_DATADIR}/${PN}/ || die "cp failed"
-	newman xbattle.man xbattle.6            || die "newman failed"
-	dodoc README xbattle.dot                || die "dodoc failed"
+	dodir "${GAMES_DATADIR}/${PN}"
+	cp -r xbas/ xbos/ xbts/ "${D}${GAMES_DATADIR}/${PN}/" || die "cp failed"
+	newman xbattle.man xbattle.6
+	dodoc README xbattle.dot
 	prepgamesdirs
 }
 
diff --git a/games-strategy/xconq/ChangeLog b/games-strategy/xconq/ChangeLog
index f1f11cd86871..18620ddcfcf7 100644
--- a/games-strategy/xconq/ChangeLog
+++ b/games-strategy/xconq/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for games-strategy/xconq
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/xconq/ChangeLog,v 1.1 2003/12/12 06:11:55 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/xconq/ChangeLog,v 1.1.1.1 2005/11/30 09:36:42 chriswhite Exp $
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> xconq-7.4.1.ebuild:
+  Stable on ppc.
+
+  30 Nov 2004; Michael Sterrett <mr_bones_@gentoo.org> xconq-7.4.1.ebuild:
+  add eutils for epatch
+
+  08 Nov 2004; Joseph Jezak <josejx@gentoo.org> +files/xconq-gcc-3.4.patch,
+  xconq-7.4.1.ebuild:
+  Fixed compiling with gcc 3.4 and addded ~ppc.
 
 *xconq-7.4.1 (12 Dec 2003)
 
diff --git a/games-strategy/xconq/Manifest b/games-strategy/xconq/Manifest
index 8c40113ad273..5929eabee22b 100644
--- a/games-strategy/xconq/Manifest
+++ b/games-strategy/xconq/Manifest
@@ -1,3 +1,5 @@
+MD5 5f7a93735004fa2be6c81b87469cb62d xconq-7.4.1.ebuild 973
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 899eeb97cd4ba04797b361e8aa0a8a77 ChangeLog 686
+MD5 678926da0bc080c8b9c755516e553ddb files/xconq-gcc-3.4.patch 223
 MD5 11e6b9f0b9deabfd09b8d9282236896a files/digest-xconq-7.4.1 64
-MD5 dab9a21963e53dbe3dbca1490ad26514 xconq-7.4.1.ebuild 883
-MD5 4824afbaaf402f5c36699e1cb68eafa9 ChangeLog 356
diff --git a/games-strategy/xconq/metadata.xml b/games-strategy/xconq/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-strategy/xconq/metadata.xml
+++ b/games-strategy/xconq/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-strategy/xconq/xconq-7.4.1.ebuild b/games-strategy/xconq/xconq-7.4.1.ebuild
index bc7ee13eb43c..f0c43f0fa637 100644
--- a/games-strategy/xconq/xconq-7.4.1.ebuild
+++ b/games-strategy/xconq/xconq-7.4.1.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-strategy/xconq/xconq-7.4.1.ebuild,v 1.1 2003/12/12 06:11:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/xconq/xconq-7.4.1.ebuild,v 1.1.1.1 2005/11/30 09:36:42 chriswhite Exp $
 
-inherit games
+inherit eutils games
 
 DESCRIPTION="a general strategy game system"
 HOMEPAGE="http://sources.redhat.com/xconq/"
@@ -10,12 +10,19 @@ SRC_URI="ftp://sources.redhat.com/pub/xconq/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ppc"
+IUSE=""
 
 DEPEND="virtual/x11
 	dev-lang/tk
 	dev-lang/tcl"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-gcc-3.4.patch
+}
+
 src_compile() {
 	egamesconf \
 		--enable-alternate-scoresdir=${GAMES_STATEDIR}/${PN}/scores \
diff --git a/games-strategy/xscorch/ChangeLog b/games-strategy/xscorch/ChangeLog
index 600bc000ec52..de17c9202d86 100644
--- a/games-strategy/xscorch/ChangeLog
+++ b/games-strategy/xscorch/ChangeLog
@@ -1,6 +1,35 @@
-# ChangeLog for app-games/xscorch
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/xscorch/ChangeLog,v 1.1 2003/09/10 05:27:31 vapier Exp $
+# ChangeLog for games-strategy/xscorch
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/xscorch/ChangeLog,v 1.1.1.1 2005/11/30 09:36:37 chriswhite Exp $
+
+*xscorch-0.2.0-r1 (31 Aug 2005)
+
+  31 Aug 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  -xscorch-0.1.15.ebuild, -xscorch-0.2.0.ebuild, +xscorch-0.2.0-r1.ebuild:
+  rev bump to force out the latest patch; tidy old ebuilds
+
+  31 Aug 2005; Michael Sterrett <mr_bones_@gentoo.org> xscorch-0.2.0.ebuild:
+  upstream patch reported by Heinz Striebeck via bug #104402
+
+  26 May 2005; Michael Sterrett <mr_bones_@gentoo.org> xscorch-0.2.0.ebuild:
+  add 64bit patch from upstream; tidy
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*xscorch-0.2.0 (26 Mar 2004)
+
+  26 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> xscorch-0.2.0.ebuild:
+  version bump
+
+  10 Mar 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  xscorch-0.1.16_rc2.ebuild:
+  Added ~amd64 keyword.  Closing bug #44282.
+
+  02 Oct 2003; Michael Sterrett <mr_bones_@gentoo.org>
+  xscorch-0.1.16_rc2.ebuild:
+  make it so xscorch can find an uncompressed man page so it can display its
+  tooltips correctly (bug 30181); add more error messages and checking.
 
 *xscorch-0.1.16_rc2 (05 Sep 2003)
 
@@ -17,7 +46,7 @@
   04 May 2003; Graham Forest <vladimir@gentoo.org> xscorch-0.1.15.ebuild:
   set ~ppc in keywords
 
-  17 jul 2002; Jose Alberto Su�rez L�pez <bass@gentoo.org> xscorch-0.1.15.ebuild :
+  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> xscorch-0.1.15.ebuild :
   Added KEYWORDS.
 
   12 Jul 2002; Ryan Phillips <rphillips@gentoo.org> xscorch-0.1.15.ebuild:
@@ -26,7 +55,7 @@
   
 *xscorch-0.1.14 (15 Jun 2002)
 
-  17 jul 2002; Jose Alberto Su�rez L�pez <bass@gentoo.org> xscorch-0.1.14.ebuild :
+  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> xscorch-0.1.14.ebuild :
   Added KEYWORDS.
 
   15 Jun 2002; Gabriele Giorgetti <stroke@gentoo.org> ChangeLog:
diff --git a/games-strategy/xscorch/Manifest b/games-strategy/xscorch/Manifest
index cd68637dbcb6..b6ba0d1e3d8d 100644
--- a/games-strategy/xscorch/Manifest
+++ b/games-strategy/xscorch/Manifest
@@ -1,5 +1,6 @@
-MD5 cdf1d489def308bede457b7e960ad3c8 ChangeLog 1170
-MD5 ade38f1e0338ac5c7ceb0d6b04957bf1 xscorch-0.1.15.ebuild 1029
-MD5 df519f15bd484f55656ca4c04bbeeb7a xscorch-0.1.16_rc2.ebuild 1268
-MD5 55df04a5274350d9163f058c65509b99 files/digest-xscorch-0.1.15 66
+MD5 e9c1b03130f1e4097670bad914a1bde2 xscorch-0.1.16_rc2.ebuild 1711
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 35bc7eca7915960de47f525715ef11a7 xscorch-0.2.0-r1.ebuild 1255
+MD5 e77db4501fb3dcd07bae9f941abfd3e0 ChangeLog 2246
+MD5 daa9dfffa0af54f855833637f762e497 files/digest-xscorch-0.2.0-r1 212
 MD5 21b333517732c38ac13aff581866c2ba files/digest-xscorch-0.1.16_rc2 145
diff --git a/games-strategy/xscorch/metadata.xml b/games-strategy/xscorch/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-strategy/xscorch/metadata.xml
+++ b/games-strategy/xscorch/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-strategy/xscorch/xscorch-0.1.16_rc2.ebuild b/games-strategy/xscorch/xscorch-0.1.16_rc2.ebuild
index c95fb5e227f0..89d2b0df387b 100644
--- a/games-strategy/xscorch/xscorch-0.1.16_rc2.ebuild
+++ b/games-strategy/xscorch/xscorch-0.1.16_rc2.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/games-strategy/xscorch/xscorch-0.1.16_rc2.ebuild,v 1.1 2003/09/10 05:27:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/xscorch/xscorch-0.1.16_rc2.ebuild,v 1.1.1.1 2005/11/30 09:36:37 chriswhite Exp $
 
-inherit games
+inherit eutils games
 
 S="${WORKDIR}/xscorch-0.1.15"
 DESCRIPTION="clone of the classic DOS game, 'Scorched Earth'"
@@ -12,21 +12,31 @@ SRC_URI="http://chaos2.org/xscorch/${PN}-0.1.15.tar.gz
 	http://chaos2.org/xscorch/xscorch-0.1.15-0.1.16pre2.patch.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~alpha"
+KEYWORDS="~x86 ~ppc ~alpha ~amd64"
 SLOT="0"
 
 IUSE="gtk mikmod readline gnome"
 
-DEPEND="virtual/x11
+RDEPEND="virtual/x11
 	gtk? ( =x11-libs/gtk+-1* )
 	mikmod? ( >=media-libs/libmikmod-3.1.5 )
 	readline? ( sys-libs/readline )
 	gnome? ( gnome-base/gnome-libs )"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
 
 src_unpack() {
+	local HELPFILE="${GAMES_DATADIR}/${PN}/xscorch.help"
+
 	unpack ${A}
 	cd ${WORKDIR}
 	epatch xscorch-0.1.15-0.1.16pre2.patch
+	cp ${S}/doc/xscorch.6 ${S}/xscorch.help || \
+		die "xscorch.help creation failed"
+	sed -i \
+		-e "/SC_GROFF_MANUAL_FILE/ s:@mandir@/man6/xscorch.6:${HELPFILE}:" \
+			${S}/xscorch.h.in || die "sed xscorch.h.in failed"
+
 }
 
 src_compile() {
@@ -45,7 +55,9 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
+	make DESTDIR=${D} install || die "make install failed"
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins xscorch.help || die "doins failed"
+	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
 	prepgamesdirs
 }
diff --git a/games-strategy/xscorch/xscorch-0.2.0-r1.ebuild b/games-strategy/xscorch/xscorch-0.2.0-r1.ebuild
index a3562589c743..476a17188c81 100644
--- a/games-strategy/xscorch/xscorch-0.2.0-r1.ebuild
+++ b/games-strategy/xscorch/xscorch-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/games-strategy/xscorch/xscorch-0.2.0-r1.ebuild,v 1.1 2005/08/31 20:29:58 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/xscorch/xscorch-0.2.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:37 chriswhite Exp $
 
 inherit eutils games
 
@@ -12,7 +12,7 @@ SRC_URI="http://xscorch.org./releases/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ppc x86"
+KEYWORDS="alpha ~amd64 ppc x86"
 IUSE="gnome gtk mikmod"
 
 DEPEND="gtk? ( =x11-libs/gtk+-1* )
diff --git a/header.txt b/header.txt
index 0a94975cbb65..5a1c9a4776dc 100644
--- a/header.txt
+++ b/header.txt
@@ -1,5 +1,4 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $header$
-
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
 
diff --git a/media-gfx/DFBPoint/ChangeLog b/media-gfx/DFBPoint/ChangeLog
index 10669f46cb7c..d991f69dad54 100644
--- a/media-gfx/DFBPoint/ChangeLog
+++ b/media-gfx/DFBPoint/ChangeLog
@@ -1,5 +1,26 @@
-# ChangeLog for media-video/DFBSee-0.7.2.ebuild
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# ChangeLog for media-gfx/DFBPoint
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/DFBPoint/ChangeLog,v 1.1.1.1 2005/11/30 09:37:41 chriswhite Exp $
+
+  10 Aug 2005; Luis Medinas <metalgod@gentoo.org> DFBPoint-0.7.2.ebuild:
+  Marked Testing on AMD64.
+
+  21 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> DFBPoint-0.7.2.ebuild:
+  tidy; error check cp
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  DFBPoint-0.7.2.ebuild:
+  virtual/glibc -> virtual/libc
+
+  02 Jan 2004; Sven Blumenstein <bazik@gentoo.org> DFBPoint-0.7.2.ebuild:
+  Masked on sparc as DEPEND dev-libs/DirectFB is -sparc.
+
+  09 Oct 2003; Brandy Westcott brandy@gentoo.org DFBPoint-0.7.2.ebuild,
+  metadata.xml:
+  Changed virtual/x11 dependency to virtual/glibc. We don't need X for DFBPoint.
+
+  12 Jun 2003; <msterret@gentoo.org> DFBPoint-0.7.2.ebuild:
+  add Header
 
 *DFBPoint-0.7.2 (12 Jun 2002)
 
diff --git a/media-gfx/DFBPoint/DFBPoint-0.7.2.ebuild b/media-gfx/DFBPoint/DFBPoint-0.7.2.ebuild
index 117a39593b11..8abd2d8180d0 100644
--- a/media-gfx/DFBPoint/DFBPoint-0.7.2.ebuild
+++ b/media-gfx/DFBPoint/DFBPoint-0.7.2.ebuild
@@ -1,33 +1,30 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
- 
-S=${WORKDIR}/${P}
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/DFBPoint/DFBPoint-0.7.2.ebuild,v 1.1.1.1 2005/11/30 09:37:41 chriswhite Exp $
+
 DESCRIPTION="DFBPoint is presentation program based on DirectFB"
-SRC_URI="http://www.directfb.org/download/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.directfb.org/dfbpoint.xml"
+SRC_URI="http://www.directfb.org/download/${PN}/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+SLOT="0"
+KEYWORDS="~amd64 -sparc x86"
+IUSE=""
 
-DEPEND="virtual/x11 dev-libs/DirectFB"
-RDEPEND="${DEPEND}"
+DEPEND="virtual/libc
+	dev-libs/DirectFB"
 
 src_install () {
-	
-	make DESTDIR=${D} install || die
-	
+	make DESTDIR=${D} install || die "make install failed"
+
 	dodir /usr/share/DFBPoint/
-	cp dfbpoint.dtd ${D}/usr/share/DFBPoint/
-	
-	dodoc AUTHORS COPYING ChangeLog INSTALL README NEWS
-	
+	cp dfbpoint.dtd ${D}/usr/share/DFBPoint/ || die "cp failed"
+
+	dodoc AUTHORS ChangeLog INSTALL README NEWS
+
 	dodir /usr/share/DFBPoint/examples/
 	cd examples
-	cp bg.png ${D}/usr/share/DFBPoint/examples/
-	cp bullet.png ${D}/usr/share/DFBPoint/examples/
-	cp decker.ttf ${D}/usr/share/DFBPoint/examples/
-	cp test.xml ${D}/usr/share/DFBPoint/examples/
-	cp wilber_stoned.png ${D}/usr/share/DFBPoint/examples/
-	cp -R guadec/ ${D}/usr/share/DFBPoint/examples/
+	cp bg.png bullet.png decker.ttf test.xml wilber_stoned.png \
+		${D}/usr/share/DFBPoint/examples/ || die "cp failed"
+	cp -R guadec/ ${D}/usr/share/DFBPoint/examples/ || die "cp failed"
 }
diff --git a/media-gfx/DFBPoint/Manifest b/media-gfx/DFBPoint/Manifest
index e69de29bb2d1..e4364a92488c 100644
--- a/media-gfx/DFBPoint/Manifest
+++ b/media-gfx/DFBPoint/Manifest
@@ -0,0 +1,4 @@
+MD5 b8da245b0c78f9dc44c6470b9857761b ChangeLog 1118
+MD5 8f815867a0d34b832b330ac0fc13a9ff DFBPoint-0.7.2.ebuild 953
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 3ce51fa3f0afb8d2cc23666ee084078d files/digest-DFBPoint-0.7.2 66
diff --git a/media-gfx/album/ChangeLog b/media-gfx/album/ChangeLog
index aaafb9154f2a..a830d4d4e95f 100644
--- a/media-gfx/album/ChangeLog
+++ b/media-gfx/album/ChangeLog
@@ -1,6 +1,60 @@
 # ChangeLog for media-gfx/album
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/album/ChangeLog,v 1.1 2003/02/28 10:04:33 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/album/ChangeLog,v 1.1.1.1 2005/11/30 09:37:37 chriswhite Exp $
+
+*album-3.10 (12 Nov 2005)
+
+  12 Nov 2005; Marcelo Goes <vanquirius@gentoo.org> -album-2.44.ebuild,
+  -album-3.00.ebuild, album-3.07.ebuild, +album-3.10.ebuild:
+  3.07 x86 stable, 3.10 version bump.
+
+  09 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> album-3.07.ebuild:
+  Add ~amd64 keyword. See bug 49688. Thanks to all testers.
+
+*album-3.07 (13 Aug 2005)
+
+  13 Aug 2005; Marcelo Goes <vanquirius@gentoo.org> +album-3.07.ebuild:
+  Version bump. Adding ffmpeg USE flag for video thumbnail support. Fixes bug
+  73756. Thanks to Fridtjof Busse <gentoo@fbunet.de> and Igor
+  <igor47@uchicago.edu>.
+
+  03 Jun 2005; Luca Barbato <lu_zero@gentoo.org> metadata.xml:
+  Metadata fix
+
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org> album-3.05.ebuild:
+  Stable on ppc64
+
+  02 Nov 2004; Markus Rothe <corsair@gentoo.org> album-3.05.ebuild:
+  Marked ~ppc64; bug #49688
+
+  28 Aug 2004; David Holm <dholm@gentoo.org> album-3.05.ebuild:
+  Added to ~ppc.
+
+*album-3.05 (05 Aug 2004)
+
+  05 Aug 2004; Martin Holzer <mholzer@gentoo.org> +album-3.05.ebuild:
+  Version bumped. Closes 55513
+
+  04 Aug 2004;  Martin Holzer <mholzer@gentoo.org> +album-3.00.ebuild
+  Version bumped.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> album-2.37.ebuild,
+  album-2.44.ebuild, album-2.52.ebuild:
+  virtual/glibc -> virtual/libc
+
+*album-2.52 (31 Jan 2004)
+
+  31 Jan 2004; Martin Holzer <mholzer@gentoo.org> album-2.52.ebuild,
+  metadata.xml:
+  Version bumped. Closes 39936.
+
+  07 Jun 2003; <rac@gentoo.org> album-2.44.ebuild:
+  Add IUSE
+
+*album-2.44 (19 Mar 2003)
+
+  19 Mar 2003; <rac@gentoo.org> album-2.44.ebuild:
+  Upstream version bump to 2.44, spotted by kcarlson on the forums.
 
 *album-2.37 (28 Feb 2003)
 
diff --git a/media-gfx/album/Manifest b/media-gfx/album/Manifest
index e69de29bb2d1..551046e56f64 100644
--- a/media-gfx/album/Manifest
+++ b/media-gfx/album/Manifest
@@ -0,0 +1,10 @@
+MD5 96fbfe0480e484edae519586ed662656 ChangeLog 2033
+MD5 ad799894df8b147b9ec85016e75867e4 album-2.52.ebuild 855
+MD5 869c6383bbb867dfe243c9b20e92dc96 album-3.05.ebuild 853
+MD5 2804724ea391fecfaf761504012e7f74 album-3.07.ebuild 901
+MD5 57b661e096435bdd109c2b4539a6754a album-3.10.ebuild 902
+MD5 6d281915e77f26a18007882af4c15c17 files/digest-album-2.52 61
+MD5 770fcb7e1b0874e8d067c1b63caae029 files/digest-album-3.05 61
+MD5 e124b73f09a588f2a2f1125343f0a5ff files/digest-album-3.07 61
+MD5 06f7ba4d6c5324c623c4dd70697a4f53 files/digest-album-3.10 62
+MD5 94328d8f5876abf1b939df3dc0b22c14 metadata.xml 223
diff --git a/media-gfx/album/album-2.52.ebuild b/media-gfx/album/album-2.52.ebuild
index 13198275a411..dece532111d6 100644
--- a/media-gfx/album/album-2.52.ebuild
+++ b/media-gfx/album/album-2.52.ebuild
@@ -1,5 +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/media-gfx/album/album-2.52.ebuild,v 1.1.1.1 2005/11/30 09:37:37 chriswhite Exp $
 
 DESCRIPTION="HTML photo album generator"
 HOMEPAGE="http://MarginalHacks.com/Hacks/album/"
@@ -7,10 +8,10 @@ SRC_URI="http://marginalhacks.com/bin/album.versions/${P}.tar.gz"
 
 LICENSE="marginalhacks"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 RDEPEND="dev-lang/perl
 	media-gfx/imagemagick
 	media-gfx/jhead"
diff --git a/media-gfx/album/album-3.05.ebuild b/media-gfx/album/album-3.05.ebuild
index bc3e18adfecb..ca5166bbe021 100644
--- a/media-gfx/album/album-3.05.ebuild
+++ b/media-gfx/album/album-3.05.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/media-gfx/album/album-3.05.ebuild,v 1.1 2004/08/05 17:19:30 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/album/album-3.05.ebuild,v 1.1.1.1 2005/11/30 09:37:37 chriswhite Exp $
 
 DESCRIPTION="HTML photo album generator"
 HOMEPAGE="http://MarginalHacks.com/Hacks/album/"
@@ -8,7 +8,7 @@ SRC_URI="http://marginalhacks.com/bin/album.versions/${P}.tar.gz"
 
 LICENSE="marginalhacks"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc ppc64"
 IUSE=""
 
 DEPEND="virtual/libc"
diff --git a/media-gfx/album/album-3.07.ebuild b/media-gfx/album/album-3.07.ebuild
index 95e24b695a1a..ee37916c7e59 100644
--- a/media-gfx/album/album-3.07.ebuild
+++ b/media-gfx/album/album-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/media-gfx/album/album-3.07.ebuild,v 1.1 2005/08/13 20:49:55 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/album/album-3.07.ebuild,v 1.1.1.1 2005/11/30 09:37:37 chriswhite Exp $
 
 DESCRIPTION="HTML photo album generator"
 HOMEPAGE="http://MarginalHacks.com/Hacks/album/"
@@ -8,14 +8,14 @@ SRC_URI="http://marginalhacks.com/bin/album.versions/${P}.tar.gz"
 
 LICENSE="marginalhacks"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~ppc64"
+KEYWORDS="x86 ~amd64 ~ppc ~ppc64"
 IUSE="ffmpeg"
 
 DEPEND="virtual/libc"
 RDEPEND="dev-lang/perl
 	media-gfx/imagemagick
 	media-gfx/jhead
-	ffmpeg ( media-video/ffmpeg )"
+	ffmpeg? ( media-video/ffmpeg )"
 
 src_install() {
 	dobin album
diff --git a/media-gfx/album/album-3.10.ebuild b/media-gfx/album/album-3.10.ebuild
index 277be37c3a41..fd73fbf4a9b8 100644
--- a/media-gfx/album/album-3.10.ebuild
+++ b/media-gfx/album/album-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/media-gfx/album/album-3.10.ebuild,v 1.1 2005/11/12 14:37:12 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/album/album-3.10.ebuild,v 1.1.1.1 2005/11/30 09:37:37 chriswhite Exp $
 
 DESCRIPTION="HTML photo album generator"
 HOMEPAGE="http://MarginalHacks.com/Hacks/album/"
diff --git a/media-gfx/album/metadata.xml b/media-gfx/album/metadata.xml
index c90d8d48bd03..d90b5212c1be 100644
--- a/media-gfx/album/metadata.xml
+++ b/media-gfx/album/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>media-gfx</herd>
+<herd>graphics</herd>
 <maintainer>
 <email>graphics@gentoo.org</email>
 </maintainer>
diff --git a/media-gfx/aoi/ChangeLog b/media-gfx/aoi/ChangeLog
index 34c36854bfa1..47c2cfa6ed6d 100644
--- a/media-gfx/aoi/ChangeLog
+++ b/media-gfx/aoi/ChangeLog
@@ -1,6 +1,44 @@
 # ChangeLog for media-gfx/aoi
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/aoi/ChangeLog,v 1.1 2003/05/15 09:34:24 absinthe Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/aoi/ChangeLog,v 1.1.1.1 2005/11/30 09:37:40 chriswhite Exp $
+
+  15 Sep 2005; Mark Loeser <halcy0n@gentoo.org> aoi-1.4.ebuild,
+  aoi-1.6.ebuild:
+  Add app-arch/unzip to DEPEND; bug #69831
+
+  30 Jul 2004; Thomas Matthijs <axxo@gentoo.org> aoi-1.4.ebuild,
+  aoi-1.6.ebuild:
+  move dev-java/jmf dev-java/jmf-bin
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org> aoi-1.4.ebuild,
+  aoi-1.6.ebuild:
+  Fix use invocation
+
+  05 May 2004; <SeJo@gentoo.org> aoi-1.6.ebuild:
+  added ~ppc keyword
+
+  26 Mar 2004; David Holm <dholm@gentoo.org> aoi-1.4.ebuild, aoi-1.6.ebuild:
+  Backed out of ppc and ~ppc while waiting fort portage upgrade.
+
+  25 Mar 2004; Joshua Kinard <kumba@gentoo.org> aoi-1.4.ebuild,
+  aoi-1.6.ebuild:
+  As far as I know, mips doesn't have a JDK available to it, thus this creates a
+  dependency issue for this package. Removing mips keywords until further
+  notice.
+
+  17 Feb 2004; Gustavo Zacarias <gustavoz@gentoo.org> aoi-1.4.ebuild,
+  aoi-1.6.ebuild:
+  unkeyworded hppa, we don't have jdk
+
+  17 Feb 2004; Aron Griffis <agriffis@gentoo.org> aoi-1.4.ebuild,
+  aoi-1.6.ebuild:
+  Remove alpha keywords because this package eventually depends on >=jdk-1.4,
+  which we don't have on alpha
+
+*aoi-1.6 (10 Oct 2003)
+
+  10 Oct 2003; Brandy Westcott brandy@gentoo.org aoi-1.6.ebuild:
+  Version bump to 1.6. Initial ebuild to install AoI from source.
 
 *aoi-1.4 (15 May 2003)
 
diff --git a/media-gfx/aoi/Manifest b/media-gfx/aoi/Manifest
index 1fc52615c32c..01433ea0791e 100644
--- a/media-gfx/aoi/Manifest
+++ b/media-gfx/aoi/Manifest
@@ -1,3 +1,17 @@
-MD5 b37da5f67417bbbe0b1c30c43aa63048 aoi-1.4.ebuild 1165
-MD5 d048ab08a31ac6d214e9ef8139b4f23f files/aoi 865
-MD5 91562cc0dad829334dce432a36bfd116 files/digest-aoi-1.4 65
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 93a4f54b2cc95c3b2e55f7108385c384 ChangeLog 1614
+MD5 0755b5b6b83c178025bf0196d4b6d8f8 aoi-1.4.ebuild 1231
+MD5 3e498ceae95cb1123df1d498852a1b73 aoi-1.6.ebuild 1422
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 727b608356405769368445d94052541c files/aoi 857
+MD5 3ecf40985d61919e8ca250e839e013a3 files/digest-aoi-1.4 121
+MD5 4ec032a15afd71be0cd9cc75ea3685ed files/digest-aoi-1.6 114
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDKdXtCRZPokWLroQRAhs7AKCkg7lTl9vwpkf4PG7qpT4UfFNzLQCfQiSi
+R1TwPrgXL73B4LtypLwWnA4=
+=ep6b
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/aoi/aoi-1.4.ebuild b/media-gfx/aoi/aoi-1.4.ebuild
index 882f3e3abf61..00298c1d788d 100644
--- a/media-gfx/aoi/aoi-1.4.ebuild
+++ b/media-gfx/aoi/aoi-1.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/media-gfx/aoi/aoi-1.4.ebuild,v 1.1 2003/05/15 09:34:25 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/aoi/aoi-1.4.ebuild,v 1.1.1.1 2005/11/30 09:37:40 chriswhite Exp $
 
 inherit java-pkg
 
@@ -10,12 +10,12 @@ DESCRIPTION="A free, open-source 3D modelling and rendering studio."
 SRC_URI="mirror://sourceforge/${PN}/${At}
 	doc? ( http://aoi.sourceforge.net/docs/downloads/manual.zip )"
 HOMEPAGE="http://aoi.sourceforge.net/index"
-KEYWORDS="x86 ppc sparc alpha mips hppa"
+KEYWORDS="x86 sparc"
 LICENSE="GPL-2"
 SLOT="0"
-DEPEND=""
+DEPEND="app-arch/unzip"
 RDEPEND=">=virtual/jdk-1.2
-	quicktime? ( dev-java/jmf )"
+	quicktime? ( dev-java/jmf-bin )"
 IUSE="doc quicktime"
 
 src_unpack() {
@@ -33,11 +33,11 @@ src_install() {
 	use quicktime && DEP_APPEND="jmf"
 	dobin ${FILESDIR}/aoi
 	dodoc HISTORY LICENSE README
-	if [ -n "`use doc`" ] ; then
+	if use doc ; then
 		mv ${WORKDIR}/AoI\ Manual/ ${WORKDIR}/aoi_manual/
 		dohtml -r ${WORKDIR}/aoi_manual/
 	fi
-	java-pkg_dojar ArtOfIllusion.jar 
+	java-pkg_dojar ArtOfIllusion.jar
 	JARDESTTREE="lib/Plugins"
 	java-pkg_dojar Plugins/*.jar
 }
diff --git a/media-gfx/aoi/aoi-1.6.ebuild b/media-gfx/aoi/aoi-1.6.ebuild
index 0e42aa1f0cf4..7316f4790303 100644
--- a/media-gfx/aoi/aoi-1.6.ebuild
+++ b/media-gfx/aoi/aoi-1.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/media-gfx/aoi/aoi-1.6.ebuild,v 1.1 2003/10/10 11:09:26 brandy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/aoi/aoi-1.6.ebuild,v 1.1.1.1 2005/11/30 09:37:40 chriswhite Exp $
 
 inherit java-pkg
 
@@ -10,12 +10,12 @@ DESCRIPTION="A free, open-source 3D modelling and rendering studio."
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
 	doc? ( http://aoi.sourceforge.net/docs/downloads/manual.zip )"
 HOMEPAGE="http://aoi.sourceforge.net/index"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa"
+KEYWORDS="~x86 ~sparc ~ppc"
 LICENSE="GPL-2"
 SLOT="0"
-DEPEND=""
+DEPEND="app-arch/unzip"
 RDEPEND=">=virtual/jdk-1.2
-	dev-java/jmf
+	dev-java/jmf-bin
 	dev-java/ant"
 IUSE="doc"
 
@@ -39,7 +39,7 @@ src_install() {
 	DEP_APPEND="jmf"
 	dobin ${FILESDIR}/aoi
 	dodoc HISTORY LICENSE README-source
-	if [ -n "`use doc`" ] ; then
+	if use doc ; then
 		mv ${WORKDIR}/AoI\ Manual/ ${WORKDIR}/aoi_manual/
 		dohtml -r ${WORKDIR}/aoi_manual/
 	fi
diff --git a/media-gfx/aoi/files/aoi b/media-gfx/aoi/files/aoi
index a2c7979bd995..78443954e42e 100644
--- a/media-gfx/aoi/files/aoi
+++ b/media-gfx/aoi/files/aoi
@@ -2,7 +2,7 @@
 # Art Of Illusion Launch Script
 # Author: Dylan Carlson
 # May 2003
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/aoi/files/aoi,v 1.1 2003/05/15 09:34:25 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/aoi/files/aoi,v 1.1.1.1 2005/11/30 09:37:40 chriswhite Exp $
 
 JAVA_HOME=`/usr/bin/java-config --jdk-home`
 if [ -z "${JAVA_HOME}" ] ; then
@@ -28,5 +28,4 @@ else
 	echo " "
 fi
 
-cd /usr/share/aoi
-${JAVA_HOME}/bin/java -Xmx128M -jar lib/ArtOfIllusion.jar $*
+${JAVA_HOME}/bin/java -Xmx128M -jar /usr/share/aoi/lib/ArtOfIllusion.jar $*
diff --git a/media-gfx/aoi/files/digest-aoi-1.4 b/media-gfx/aoi/files/digest-aoi-1.4
index 3fddc40ec409..8cb4b39fda97 100644
--- a/media-gfx/aoi/files/digest-aoi-1.4
+++ b/media-gfx/aoi/files/digest-aoi-1.4
@@ -1 +1,2 @@
 MD5 1cea2fa2ee18c9ca933637ba9bc582be artofillusion14.zip 1714885
+MD5 2137b19fe2ea2aaeefa35f9e50519c28 manual.zip 7370510
diff --git a/media-gfx/aqsis/ChangeLog b/media-gfx/aqsis/ChangeLog
index 9f6146381165..833b6f6df7a4 100644
--- a/media-gfx/aqsis/ChangeLog
+++ b/media-gfx/aqsis/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/aqsis
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/aqsis/ChangeLog,v 1.1 2005/01/13 09:22:30 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/aqsis/ChangeLog,v 1.1.1.1 2005/11/30 09:37:47 chriswhite Exp $
+
+*aqsis-1.0.0 (20 Jan 2005)
+
+  20 Jan 2005; Luca Barbato <lu_zero@gentoo.org> +aqsis-1.0.0.ebuild:
+  New version
 
 *aqsis-0.9.3 (13 Jan 2005)
 
diff --git a/media-gfx/aqsis/Manifest b/media-gfx/aqsis/Manifest
index da9aa107ec5b..6689c431df28 100644
--- a/media-gfx/aqsis/Manifest
+++ b/media-gfx/aqsis/Manifest
@@ -1,4 +1,6 @@
-MD5 5fe4796d0cdad9a99b9af6cb3194dc34 ChangeLog 247
+MD5 f2b643fb7199c978e8bcceaa6ca8e8dd ChangeLog 448
 MD5 5fc54c5d01402d0610fafa96961bb8e0 metadata.xml 161
-MD5 254fbc88ed8339f2e11b91300a5b4362 aqsis-0.9.3.ebuild 517
+MD5 c48081d35ff12ad583a438954b272bb9 aqsis-1.0.0.ebuild 614
+MD5 120537b6e1f917b24b489c88c54505a1 aqsis-0.9.3.ebuild 614
 MD5 82516d35f1f77581663b4459b5cc15d5 files/digest-aqsis-0.9.3 64
+MD5 509d2cf31f1fa1da18c06454e9c7b1f6 files/digest-aqsis-1.0.0 64
diff --git a/media-gfx/aqsis/aqsis-0.9.3.ebuild b/media-gfx/aqsis/aqsis-0.9.3.ebuild
index 5205f7274244..80375423449c 100644
--- a/media-gfx/aqsis/aqsis-0.9.3.ebuild
+++ b/media-gfx/aqsis/aqsis-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/media-gfx/aqsis/aqsis-0.9.3.ebuild,v 1.1 2005/01/13 09:22:30 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/aqsis/aqsis-0.9.3.ebuild,v 1.1.1.1 2005/11/30 09:37:47 chriswhite Exp $
 
 DESCRIPTION="Aqsis - a high-quality RenderMan compliant REYES render engine"
 HOMEPAGE="http://www.aqsis.com"
diff --git a/media-gfx/aqsis/aqsis-1.0.0.ebuild b/media-gfx/aqsis/aqsis-1.0.0.ebuild
index 47565bb6ac66..81f5b44024aa 100644
--- a/media-gfx/aqsis/aqsis-1.0.0.ebuild
+++ b/media-gfx/aqsis/aqsis-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/media-gfx/aqsis/aqsis-1.0.0.ebuild,v 1.1 2005/01/20 22:41:00 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/aqsis/aqsis-1.0.0.ebuild,v 1.1.1.1 2005/11/30 09:37:47 chriswhite Exp $
 
 DESCRIPTION="Aqsis - a high-quality RenderMan compliant REYES render engine"
 HOMEPAGE="http://www.aqsis.com"
diff --git a/media-gfx/autopano-sift/ChangeLog b/media-gfx/autopano-sift/ChangeLog
index 56ed396a1eb1..0ec1ff5c9fe6 100644
--- a/media-gfx/autopano-sift/ChangeLog
+++ b/media-gfx/autopano-sift/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for media-gfx/autopano-sift
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/autopano-sift/ChangeLog,v 1.1 2005/08/10 23:02:04 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/autopano-sift/ChangeLog,v 1.1.1.1 2005/11/30 09:37:32 chriswhite Exp $
+
+  19 Oct 2005; Mark Loeser <halcy0n@gentoo.org> autopano-sift-2.3.ebuild:
+  Moved inherit to top; bug #109842
+
+  17 Oct 2005; Mark Loeser <halcy0n@gentoo.org> autopano-sift-2.3.ebuild:
+  Fixed file collision, stable on x86
+
+  19 Sep 2005; Mark Loeser <halcy0n@gentoo.org> autopano-sift-2.3.ebuild:
+  Fixed deps for glade-sharp and gtk-sharp. bug #106508
+
+  18 Sep 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  autopano-sift-2.3.ebuild:
+  Added ~ppc Keyword
+
+  23 Aug 2005; Homer Parker <hparker@gentoo.org> autopano-sift-2.3.ebuild:
+  Marked ~amd64.
 
 *autopano-sift-2.3 (10 Aug 2005)
 
diff --git a/media-gfx/autopano-sift/Manifest b/media-gfx/autopano-sift/Manifest
index 7bb50d1bfa9f..dc48719d8069 100644
--- a/media-gfx/autopano-sift/Manifest
+++ b/media-gfx/autopano-sift/Manifest
@@ -1,5 +1,15 @@
-MD5 07a908d8401b777496c86201d3de7e0a autopano-sift-2.3.ebuild 1086
-MD5 c836299e3ca9efee2a4f1c97875bba76 metadata.xml 384
-MD5 3cea98e8a8f6277bb40cd9b981c548da ChangeLog 323
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 58496b736d2939000271934a9c075318 ChangeLog 973
+MD5 eb821fa87990ed912911f4dc62e1bc49 autopano-sift-2.3.ebuild 1220
+MD5 c073bbed555060fa2e9480e18c6e8f1a files/autopano 69
 MD5 ccbf46e7346bb84f417ab7ee4f1a3d0c files/digest-autopano-sift-2.3 69
-MD5 7c571f17d20a7f7ec9f56e2fe6e514f9 files/autopano 68
+MD5 c836299e3ca9efee2a4f1c97875bba76 metadata.xml 384
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDVp6bCRZPokWLroQRAq6hAKDaSCxWIYjPO46B66rj5DrX7w+gwQCguhFJ
+2c7r8tnlkaJFgdwYoCtv2GU=
+=BdlH
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/autopano-sift/autopano-sift-2.3.ebuild b/media-gfx/autopano-sift/autopano-sift-2.3.ebuild
index 7335394793ab..88c41a3bb550 100644
--- a/media-gfx/autopano-sift/autopano-sift-2.3.ebuild
+++ b/media-gfx/autopano-sift/autopano-sift-2.3.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/media-gfx/autopano-sift/autopano-sift-2.3.ebuild,v 1.1 2005/08/10 23:02:04 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/autopano-sift/autopano-sift-2.3.ebuild,v 1.1.1.1 2005/11/30 09:37:32 chriswhite Exp $
+
+inherit mono eutils
 
 DESCRIPTION="SIFT algorithm for automatic panorama creation"
 HOMEPAGE="http://user.cs.tu-berlin.de/~nowozin/autopano-sift/"
 SRC_URI="http://user.cs.tu-berlin.de/~nowozin/autopano-sift/${P}.tar.gz"
 LICENSE="GPL-2"
 
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc x86"
 SLOT="0"
 IUSE=""
 
-inherit mono eutils
-
-DEPEND=">=dev-lang/mono-1.0
-	>=dev-dotnet/glade-sharp-1.0.4
-	>=dev-dotnet/gtk-sharp-1.0.4-r1
-	>=dev-dotnet/libgdiplus-1.0.4-r1"
+DEPEND="dev-lang/mono
+	<dev-dotnet/glade-sharp-2
+	<dev-dotnet/gtk-sharp-2
+	dev-dotnet/libgdiplus"
 
 src_unpack() {
 	unpack ${A}
@@ -48,6 +48,7 @@ src_install() {
 
 	dodoc README CHANGES LICENSE
 	cd ${S}/doc
+	rm -f template.1 autopano-complete.old.*
 	dodoc *.pdf *.txt
 	doman *.1 *.7
 }
diff --git a/media-gfx/autopano-sift/files/autopano b/media-gfx/autopano-sift/files/autopano
index d542a9207bf3..b91de685b3e7 100644
--- a/media-gfx/autopano-sift/files/autopano
+++ b/media-gfx/autopano-sift/files/autopano
@@ -1,2 +1,3 @@
 #!/bin/sh
 exec mono "/usr/lib/autopano-sift/${0##*/}.exe" ${1+"$@"}
+
diff --git a/media-gfx/autotrace/ChangeLog b/media-gfx/autotrace/ChangeLog
index 5224d6f4ee3e..4b20a06a93e5 100644
--- a/media-gfx/autotrace/ChangeLog
+++ b/media-gfx/autotrace/ChangeLog
@@ -1,6 +1,63 @@
 # ChangeLog for media-gfx/autotrace
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/autotrace/ChangeLog,v 1.1 2002/07/09 12:16:05 aliz Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/autotrace/ChangeLog,v 1.1.1.1 2005/11/30 09:37:47 chriswhite Exp $
+
+  23 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  autotrace-0.31.1-r1.ebuild:
+  Stable on sparc
+
+  03 Jun 2005; Luca Barbato <lu_zero@gentoo.org> metadata.xml:
+  Metadata fix
+
+  18 Feb 2005; Aron Griffis <agriffis@gentoo.org>
+  autotrace-0.31.1-r1.ebuild:
+  stable on x86 amd64 ia64 for fontforge
+
+  21 Dec 2004; Karol Wojtaszek <sekretarz@gentoo.org>
+  autotrace-0.31.1-r1.ebuild:
+  Fixed small bug regarding imagemagick, bug #75083
+
+  07 Nov 2004; Karol Wojtaszek <sekretarz@gentoo.org>
+  +files/autotrace-imagemagick.patch, autotrace-0.31.1-r1.ebuild:
+  Now autotrace can be compiled with imagemagick-6* support, bug #69969
+
+  29 Aug 2004; Mamoru KOMACHI <usata@gentoo.org> autotrace-0.31.1-r1.ebuild:
+  Stable on ppc to support fontforge.
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> autotrace-0.31.1-r1.ebuild,
+  autotrace-0.31.1.ebuild:
+  Typo in DESCRIPTION: grahics -> graphics. Bug 59717.
+
+  12 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  autotrace-0.31.1-r1.ebuild:
+  Added ~sparc
+
+  18 May 2004; Danny van Dyk <kugelfang@gentoo.org>
+  autotrace-0.31.1-r1.ebuild:
+  Marked ~amd64.
+
+  21 Mar 2004; David Holm <dholm@gentoo.org> autotrace-0.31.1-r1.ebuild:
+  Added to ~ppc.
+
+  02 Feb 2004; Martin Holzer <mholzer@gentoo.org> autotrace-0.31.1-r1.ebuild,
+  autotrace-0.31.1.ebuild:
+  adding media-libs/libexif to depend. Closes 39695
+
+  03 Dec 2003; Aron Griffis <agriffis@gentoo.org> autotrace-0.31.1-r1.ebuild:
+  Stable on alpha to support lilypond-1.8.2
+
+  16 Sep 2003; Aron Griffis <agriffis@gentoo.org> autotrace-0.31.1-r1.ebuild:
+  Add ~alpha
+
+*autotrace-0.31.1-r1 (28 Jul 2003)
+
+  28 Jul 2003; Martin Holzer <mholzer@gentoo.org> autotrace-0.31.1-r1.ebuild:
+  Iuse added. Closes #24770.
+
+*autotrace-0.31.1 (09 Mar 2003)
+
+  09 Mar 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump.
 
   23 May 2002; George Shapovalov <george@gentoo.org> Changelog, autotrace-0.30.ebuild :
   added to cvs
diff --git a/media-gfx/autotrace/Manifest b/media-gfx/autotrace/Manifest
index e69de29bb2d1..7d721939f706 100644
--- a/media-gfx/autotrace/Manifest
+++ b/media-gfx/autotrace/Manifest
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d6d91f6594f81f5a277c2d0baf3b8d4b autotrace-0.31.1.ebuild 672
+MD5 94328d8f5876abf1b939df3dc0b22c14 metadata.xml 223
+MD5 098b6d83a85e7f2045a1f45837044260 autotrace-0.31.1-r1.ebuild 1053
+MD5 a9c51cc6248bb7cb6567f2a4f1e187df ChangeLog 2319
+MD5 f142e4322a72c3246f11a99b53e2d702 files/digest-autotrace-0.31.1 68
+MD5 e5551f2f94c0ff55ce8a6394e574dcc5 files/autotrace-imagemagick.patch 962
+MD5 f142e4322a72c3246f11a99b53e2d702 files/digest-autotrace-0.31.1-r1 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDC4fSKRy60XGEcJIRAv7BAJ9z+cEaDW7mdU42jfRl6JOI+9ZQDwCgs9fb
+NduSoPIZ20hzJmEQKa9rW8o=
+=w9RH
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/autotrace/autotrace-0.31.1-r1.ebuild b/media-gfx/autotrace/autotrace-0.31.1-r1.ebuild
index f5c9ab5b072e..0041c83947b0 100644
--- a/media-gfx/autotrace/autotrace-0.31.1-r1.ebuild
+++ b/media-gfx/autotrace/autotrace-0.31.1-r1.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/media-gfx/autotrace/autotrace-0.31.1-r1.ebuild,v 1.1 2003/07/28 21:38:52 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/autotrace/autotrace-0.31.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:47 chriswhite Exp $
+
+inherit eutils
 
 IUSE="png flash imagemagick"
 
-DESCRIPTION="Converts Bitmaps to vector-grahics"
+DESCRIPTION="Converts Bitmaps to vector-graphics"
 SRC_URI="mirror://sourceforge/autotrace/${P}.tar.gz"
+RESTRICT="nomirror"
 HOMEPAGE="http://autotrace.sourceforge.net/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 alpha ppc amd64 sparc ia64"
 
 DEPEND=">=x11-libs/gtkDPS-0.3.3
+	media-libs/libexif
 	>=x11-libs/gtk+-1.2.10-r4
 	png? ( >=media-libs/libpng-1.2.5-r4 )
 	flash? ( >=media-libs/ming-0.2a )
 	imagemagick? ( >=media-gfx/imagemagick-5.5.6-r1 )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PN}-imagemagick.patch
+	autoconf
+}
+
 src_compile() {
 	local myconf=""
 	use imagemagick || myconf="--without-magick"
@@ -27,6 +39,6 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} install || die
-	
-	dodoc AUTHORS COPYING ChangeLog NEWS README 
+
+	dodoc AUTHORS COPYING ChangeLog NEWS README
 }
diff --git a/media-gfx/autotrace/autotrace-0.31.1.ebuild b/media-gfx/autotrace/autotrace-0.31.1.ebuild
index 99a2dfb7ad8f..b7422b8c3c2f 100644
--- a/media-gfx/autotrace/autotrace-0.31.1.ebuild
+++ b/media-gfx/autotrace/autotrace-0.31.1.ebuild
@@ -1,16 +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/media-gfx/autotrace/autotrace-0.31.1.ebuild,v 1.1 2003/03/09 20:17:42 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/autotrace/autotrace-0.31.1.ebuild,v 1.1.1.1 2005/11/30 09:37:47 chriswhite Exp $
 
-DESCRIPTION="Converts Bitmaps to vector-grahics"
+DESCRIPTION="Converts Bitmaps to vector-graphics"
 SRC_URI="mirror://sourceforge/autotrace/${P}.tar.gz"
+RESTRICT="nomirror"
 HOMEPAGE="http://autotrace.sourceforge.net/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86"
+IUSE=""
 
 DEPEND=">=x11-libs/gtkDPS-0.3.3
+	media-libs/libexif
 	>=x11-libs/gtk+-1.2.10-r4"
 
 src_compile() {
@@ -20,6 +23,6 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} install || die
-	
-	dodoc AUTHORS COPYING ChangeLog NEWS README 
+
+	dodoc AUTHORS COPYING ChangeLog NEWS README
 }
diff --git a/media-gfx/autotrace/metadata.xml b/media-gfx/autotrace/metadata.xml
index c90d8d48bd03..d90b5212c1be 100644
--- a/media-gfx/autotrace/metadata.xml
+++ b/media-gfx/autotrace/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>media-gfx</herd>
+<herd>graphics</herd>
 <maintainer>
 <email>graphics@gentoo.org</email>
 </maintainer>
diff --git a/media-gfx/aview/ChangeLog b/media-gfx/aview/ChangeLog
index ce5875eae6f1..ab7d0390ee6e 100644
--- a/media-gfx/aview/ChangeLog
+++ b/media-gfx/aview/ChangeLog
@@ -1,9 +1,27 @@
 # ChangeLog for media-gfx/aview
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/aview/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/media-gfx/aview/ChangeLog,v 1.1.1.1 2005/11/30 09:37:29 chriswhite Exp $
+
+  16 Aug 2005; Mark Loeser <halcy0n@gentoo.org>
+  +files/aview-1.3.0_rc1-filename-spaces.patch, aview-1.3.0_rc1.ebuild:
+  Adding patch to fix using asciiview with files that have spaces in the name,
+  thanks to kyberneticist AT yahoo DOT com for the patch; bug #39207
+
+  19 Jun 2005; Simon Stelling <blubb@gentoo.org> aview-1.3.0_rc1.ebuild:
+  stable on amd64
+
+  01 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> aview-1.3.0_rc1.ebuild:
+  added ~amd64 to KEYWORDS. fixes #83701
+
+  08 Jul 2003; Martin Holzer <mholzer@gentoo.org> aview-1.3.0_rc1.ebuild:
+  Changed Desc. Closes #24074.
 
 *aview-1.3.0_rc1 (1 Feb 2002)
 
+  08 Aug 2002; Mark Guertin <gerk@gentoo.org> aview-1.3.0_rc1.ebuild :
+  Fixed broken ${S}, and added to this ChangeLog (no one else has even though
+  the file has been updated several times), 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/media-gfx/aview/Manifest b/media-gfx/aview/Manifest
index e69de29bb2d1..b43df0989f40 100644
--- a/media-gfx/aview/Manifest
+++ b/media-gfx/aview/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 669e25bf9d9a5ea65a36d7ad4d10998b ChangeLog 1468
+MD5 bd8578f6db458e58c50e5ff5993d1718 aview-1.3.0_rc1.ebuild 730
+MD5 0b4ea11951fb5f19ca00548a78ccf32f files/digest-aview-1.3.0_rc1 65
+MD5 657dfc4010733a411dab5596795e1ce7 files/aview-1.3.0_rc1-filename-spaces.patch 1393
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDAUIbCRZPokWLroQRAguOAJ9qzb2ABEpPc6/2QTblo2CpRkSKggCfV7vO
+NKwz0+aTdaexRqUBdzziXTo=
+=8c7V
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/aview/aview-1.3.0_rc1.ebuild b/media-gfx/aview/aview-1.3.0_rc1.ebuild
index 211f32ae2ab0..02976df1a2c1 100644
--- a/media-gfx/aview/aview-1.3.0_rc1.ebuild
+++ b/media-gfx/aview/aview-1.3.0_rc1.ebuild
@@ -1,30 +1,32 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/aview/aview-1.3.0_rc1.ebuild,v 1.1 2001/10/22 20:35:22 azarah Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/aview/aview-1.3.0_rc1.ebuild,v 1.1.1.1 2005/11/30 09:37:29 chriswhite Exp $
 
-MY_P="`echo ${P} |sed -e 's:_::'`"
-S="${WORKDIR}/`echo ${MY_P} |sed -e 's:rc.::'`"
-DESCRIPTION="An ASCII PNG-Viewer"
-SRC_URI="http://prdownloads.sourceforge.net/aa-project/${MY_P}.tar.gz"
-HOMEPAGE="http://aa-project.sourceforge.net/aview/" 
+inherit eutils
 
-DEPEND=">=media-libs/aalib-1.4_rc4"
+MY_P=${P/_/}
+S=${WORKDIR}/${MY_P/rc*/}
+DESCRIPTION="An ASCII Image Viewer"
+SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
+HOMEPAGE="http://aa-project.sourceforge.net/aview/"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
 
-src_compile() {
+DEPEND=">=media-libs/aalib-1.4_rc4"
 
-	./configure --prefix=/usr --host=${CHOST} || die
+src_compile() {
+	epatch ${FILESDIR}/${P}-filename-spaces.patch
+	econf || die
 	make aview || die
 }
 
 src_install() {
-
 	into /usr
 	dobin aview asciiview
-    
-	doman *.1 
+
+	doman *.1
 	dodoc ANNOUNCE COPYING ChangeLog README* TODO
 }
-
-
diff --git a/media-gfx/aview/files/digest-aview-1.3.0_rc1 b/media-gfx/aview/files/digest-aview-1.3.0_rc1
index 78a88c0a6594..58552ee0023c 100644
--- a/media-gfx/aview/files/digest-aview-1.3.0_rc1
+++ b/media-gfx/aview/files/digest-aview-1.3.0_rc1
@@ -1 +1 @@
-MD5 093f298e7787591e229b59d039c72f4d aview-1.3.0rc1.tar.gz 61440
+MD5 093f298e7787591e229b59d039c72f4d aview-1.3.0rc1.tar.gz 54317
diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index a2102cee68bf..926e7e7f9a97 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,13 +1,279 @@
 # ChangeLog for media-gfx/blender
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/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/media-gfx/blender/ChangeLog,v 1.1.1.1 2005/11/30 09:37:44 chriswhite Exp $
 
-*blender-2.22 (1 Feb 2002)
+  02 Nov 2005; Jory A. Pratt <anarchy@gentoo.org>
+  +files/blender-2.37a-x86_64.patch:
+  patch added wrt bug #111237
+
+  31 Oct 2005; Simon Stelling <blubb@gentoo.org>
+  +files/blender-2.37a-gcc-4.0.patch, blender-2.37a.ebuild:
+  adding patch to make blender work with gcc 4.0
+
+  23 Aug 2005; Luca Barbato <lu_zero@gentoo.org> blender-2.37a.ebuild:
+  BSD support
+
+  02 Aug 2005; Luca Barbato <lu_zero@gentoo.org> blender-2.37a.ebuild:
+  Make sure blender can build, the newer scons are problematic
+
+*blender-2.37a (17 Jun 2005)
+
+  17 Jun 2005; Luca Barbato <lu_zero@gentoo.org>
+  +files/blender-2.37a-dirs.patch, +blender-2.37a.ebuild:
+  New version
+
+  16 Jun 2005; Luca Barbato <lu_zero@gentoo.org> blender-2.37.ebuild:
+  Minor change, as requested in bug #96105
+
+  14 Jun 2005; Ferris McCormick <fmccor@gentoo.org> blender-2.37.ebuild:
+  Add ~sparc keyword.  Blender builds on sparc without incident, and
+  appears to run.  In the past, there have been endian problems with
+  blender and loading .blend files, and I have not tested this.  I
+  built blender in response to a (non-sparc) user question regarding
+  the necessity of emerging mesa as a separate package in order to
+  build blender.  (1) You don't have to; (2) blender does build and
+  run on sparc, and it's a nice program.  Hence, the ~sparc.
+
+  12 Jun 2005; Marcus D. Hanwell <marcus@gentoo.org> blender-2.36-r1.ebuild:
+  Stable on amd64.
+
+  03 Jun 2005; Luca Barbato <lu_zero@gentoo.org> metadata.xml:
+  Metadata fix
+
+  02 Jun 2005; Luca Barbato <lu_zero@gentoo.org> blender-2.37.ebuild:
+  Missing cvs header
+
+*blender-2.37 (01 Jun 2005)
+
+  01 Jun 2005; Luca Barbato <lu_zero@gentoo.org>
+  +files/blender-2.37-dirs.patch, +blender-2.37.ebuild:
+  New version and some cleanups
+
+  26 Apr 2005; Luca Barbato <lu_zero@gentoo.org> blender-2.36-r1.ebuild:
+  inheriting python eclass
+
+  07 Apr 2005; Marcus D. Hanwell <cryos@gentoo.org> blender-2.36-r1.ebuild:
+  Added ~amd64 back into KEYWORDS.
+
+  28 Feb 2005; Luca Barbato <lu_zero@gentoo.org> blender-2.36-r1.ebuild:
+  Marked ppc
+
+  28 Feb 2005; Luca Barbato <lu_zero@gentoo.org> blender-2.36-r1.ebuild:
+  Marked x86
+
+  22 Jan 2005; Michael Sterrett <mr_bones_@gentoo.org> blender-2.36-r1.ebuild:
+  fix use invocation
+
+  04 Jan 2005; Luca Barbato <lu_zero@gentoo.org> blender-2.36-r1.ebuild:
+  Minor fix
+
+*blender-2.36-r1 (03 Jan 2005)
+
+  03 Jan 2005; Luca Barbato <lu_zero@gentoo.org> +blender-2.36-r1.ebuild,
+  +files/blender-2.36-dirs.patch:
+  Make it use saner paths, added back plugins, scripts and internationalization
+
+  03 Jan 2005; Luca Barbato <lu_zero@gentoo.org> -files/blender-2.12,
+  -files/blender-2.31a-plugins.patch, -blender-2.33a.ebuild.
+  -files/configure-fix-2.30.patch, -files/configure-fix-2.31.patch,
+  -files/configure-fix-2.31a.patch, -blender-2.30.ebuild,
+  -blender-2.31.ebuild, -blender-2.31a.ebuild, -blender-2.32.ebuild:
+  Cleanups
+
+*blender-2.36 (25 Dec 2004)
+
+  25 Dec 2004; Luca Barbato <lu_zero@gentoo.org> +blender-2.36.ebuild:
+  New version
+
+*blender-2.34-r1 (24 Dec 2004)
+
+  24 Dec 2004; Luca Barbato <lu_zero@gentoo.org> +blender-2.34-r1.ebuild:
+  Added back plugins and scripts
+
+  16 Nov 2004; Luca Barbato <lu_zero@gentoo.org> blender-2.35.ebuild:
+  Fixed keywords
+
+*blender-2.35 (16 Nov 2004)
+
+  16 Nov 2004; Luca Barbato <lu_zero@gentoo.org> +blender-2.35.ebuild:
+  New version
+
+  28 Oct 2004; Sven Wegener <swegener@gentoo.org> :
+  Removed stray digests.
+
+  28 Oct 2004; Luca Barbato <lu_zero@gentoo.org> -blender-2.23-r1.ebuild,
+  -blender-2.26.ebuild, -blender-2.27.ebuild, -blender-2.28.ebuild,
+  -blender-2.28a.ebuild, -blender-2.28c.ebuild, blender-2.30.ebuild,
+  blender-2.31.ebuild, blender-2.31a.ebuild, blender-2.32.ebuild,
+  blender-2.33a.ebuild, blender-2.34.ebuild:
+  Marked x86 and ppc, global cleanup
+
+  09 Aug 2004; Luca Barbato <lu_zero@gentoo.org> blender-2.34.ebuild:
+  Forcing blender-game, otherwise blender won't build
+
+*blender-2.34 (07 Aug 2004)
+
+  07 Aug 2004; Luca Barbato <lu_zero@gentoo.org> +blender-2.34.ebuild:
+  New version
+
+  21 Jul 2004; Luca Barbato <lu_zero@gentoo.org> :
+  Missing digest added
+
+  20 Jul 2004; Luca Barbato <lu_zero@gentoo.org> blender-2.33a.ebuild:
+  Typo in the patch URI
+
+  19 Jul 2004; Luca Barbato <lu_zero@gentoo.org> blender-2.28c.ebuild,
+  blender-2.33a.ebuild:
+  New version eventually ~arch, minor fix on IUSE
+
+  13 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> blender-2.33a.ebuild:
+  header fix; replace-flags in src_compile; whitespace cleanup
+
+*blender-2.33a (12 Jul 2004)
+
+  12 Jul 2004; Luca Barbato <lu_zero@gentoo.org> +blender-2.33a.ebuild:
+  Version bumped and marked -* since it has a feature regression
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org> blender-2.28.ebuild,
+  blender-2.28a.ebuild, blender-2.28c.ebuild:
+  Fix use invocation
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> blender-2.28c.ebuild,
+  blender-2.30.ebuild, blender-2.31.ebuild, blender-2.31a.ebuild,
+  blender-2.32.ebuild:
+  Add inherit eutils
 
-  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.
+  09 Apr 2004; Luca Barbato <lu_zero@gentoo.org> blender-2.32.ebuild:
+  Added a missing useflag to the IUSE, thanks to Carlo <current@myrealbox.com>
+  for pointing it at bug #47244
+
+  21 Mar 2004; Martin Holzer <mholzer@gentoo.org> blender-2.26.ebuild,
+  blender-2.28.ebuild, blender-2.28a.ebuild, blender-2.28c.ebuild,
+  blender-2.30.ebuild, blender-2.31.ebuild, blender-2.31a.ebuild,
+  blender-2.32.ebuild:
+  adding categorie. see 45110 for details
+
+  07 Mar 2004; Jon Portnoy <avenj@gentoo.org> :
+  Removed AMD64 keywords from all versions prior to 2.32. 
+  Added !amd64() contruct for dev-games/ode.
+
+  18 Feb 2004; <augustus@gentoo.org> blender-2.32.ebuild:
+  Made 2.32 testing ~amd64.
+
+*blender-2.32 (04 Feb 2004)
+
+  04 Feb 2004; Luca Barbato <lu_zero@gentoo.org> blender-2.32.ebuild,
+  files/blender-2.32.patch:
+  New blender release
+
+  07 Dec 2003; Brandy Westcott brandy@gentoo.org blender-2.31a.ebuild:
+  Added blender.desktop file.
+
+*blender-2.31a (05 Dec 2003)
+
+  05 Dec 2003; Brandy Westcott brandy@gentoo.org blender-2.31a.ebuild:
+  Bumped to 2.31a; added patch so we can compile plugins.
+
+  04 Dec 2003; Brandy Westcott brandy@gentoo.org
+  files/configure-fix-2.31.patch:
+  Fixed configure-fix-2.31.patch header. Thanks to ferret
+  <james.noble@worc.ox.ac.uk> to pointing this out.
+
+*blender-2.31 (04 Dec 2003)
+
+  04 Dec 2003; Luca Barbato <lu_zero@gentoo.org> blender-2.28c.ebuild,
+  blender-2.31.ebuild, files/configure-fix-2.31.patch:
+  new version, thanks to Bjarke Freund-Hansen <gentoo-bugzilla@rocekiller.dk>
+  and Tarmo Tänav <sn4ip3r@estprog.ee>
+
+  08 Nov 2003; Brad House <brad_mssw@gentoo.org> blender-2.30.ebuild:
+  add ~amd64 flag
+
+*blender-2.30 (07 Nov 2003)
+
+  07 Nov 2003; Philip Walls <malverian@gentoo.org> blender-2.30.ebuild 
+  files/configure-fix-2.30.patch metadata.xml:
+  Version bump, changed to "use foo && ..." instead of ifs. Thanks to 
+  Dan Bryant <dan@omega.blackdaemon.net> in bug #32585 for configure 
+  patch. Cleaned up ChangeLog.
+
+*blender-2.28c (11 Oct 2003)
+
+  30 Oct 2003; Luca Barbato <lu_zero@gentoo.org> blender-2.28c.ebuild:
+  Moved to stable
+
+  11 Oct 2003; Luca Barbato <lu_zero@gentoo.org> blender-2.28c.ebuild, 
+  blender-2.27.ebuild :
+  Minor fixes, blender-2.27 bumped to stable for ppc and x86
+
+  11 Oct 2003; Bart Lauwers <blauwers@gentoo.org> blender-2.28c.ebuild :
+  Version bump.
+
+*blender-2.28a (26 Jul 2003)
+
+  30 Sep 2003; Michael Sterrett <mr_bones_@gentoo.org> blender-2.28.ebuild,
+  blender-2.28a.ebuild:
+  Massive whitespace cleanup
+
+  30 Sep 2003; Luca Barbato <lu_zero@gentoo.org> blender-2.28a.ebuild :
+  Version bump.
+
+  26 Jul 2003; Luca Barbato <lu_zero@gentoo.org> blender-2.28.ebuild :
+  Version bump.
+
+*blender-2.27 (25 May 2003)
+
+  25 May 2003; Thomas Raschbacher <lordvan@gentoo.org> blender-2.27.ebuild:
+  Version bump
+	
+*blender-2.26 (12 Feb 2003)
+
+  27 May 2003; Hanno Boeck <hanno@gentoo.org> blender-2.26.ebuild,
+  blender-2.27.ebuild:
+  Changed license, it must be GPL-2 or BL, not both.
+
+  18 Apr 2003; Philip Walls <malverian@gentoo.org> blender-2.26.ebuild :
+  Strip Pentium4 -march flag. Fixes bug #19526
+
+  12 Feb 2003; Hanno Boeck <hanno@gentoo.org> blender-2.26.ebuild :
+  Version bump.
+
+*blender-2.26_pre20030109 (10 Jan 2003)
+
+  12 Jan 2003; Martin Holzer <mholzer@gentoo.org> :
+  Changed Homepage. Closes #13707
+
+  10 Jan 2003; Kain <kain@kain.org> : blender-2.26_pre20030109.ebuild
+  files/digest-blender-2.26_pre20030109
+  Blender CVS snapshot source build for 2.26.  I figured this would be decent
+  to work with, since Blender CVS is in feature freeze at the moment.  This
+  blender works with autoconf and has GCC-3 fixes, so it builds (and runs!)
+  for me on PPC and x86.  Testers wanted.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*blender-2.23-r1 (13 Feb 2003)
+ 
+  12 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
+*blender-2.23 (15 Oct 2002)
+
+  15 Oct 2002; Matt Keadle <mkeadle@gentoo.org> blender-2.23-r1.ebuild
+  files/digest-blender-2.23-r1
+
+  Added sys-libs/lib-compat to RDEPEND
+
+*blender-2.23 (19 August 2002)
+
+  19 August 2002; Sascha Schwabbauer <cybersystem@gentoo.org> ChangeLog, blender-2.23.ebuild :
+
+  Added -ppc to the keywords.
+
+*blender-2.23 (15 Jun 2002)
+
+  15 Jun 2002; Daniel Robbins <drobbins@gentoo.org> : The final Blender release;
+  no longer mirrored at blender.nl so we now download it from an unofficial mirror
+  (since there's no longer an official one :/ )
+
+*blender-2.22 (1 Feb 2002)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 4000099c585b..707299c7d378 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,6 +1,25 @@
-MD5 eff1b457ab26860671920560a7992d09 ChangeLog 1643
-MD5 b85001a84dca16ebd1b349e4bd715e06 blender-2.23-r1.ebuild 1098
-MD5 a6dc64f7ead89699b6ac9144744a9af0 blender-2.26.ebuild 648
-MD5 a855ab3ef355897d6896804f54ce21bd files/blender-2.12 36
-MD5 da440d4ab4dddbda368a23ea4d62f97e files/digest-blender-2.23-r1 154
-MD5 6534f3035e2370d87c8c3cb943c5a119 files/digest-blender-2.26 66
+MD5 f2b66dd4a5c511c57b67265e66775ac6 ChangeLog 9672
+MD5 748a22317a9c9448af9e97a5a2900155 blender-2.34-r1.ebuild 2912
+MD5 c2f4a5861dcc36216ddc1e7592141dd1 blender-2.34.ebuild 2800
+MD5 36142769a0a67d234b09973eb7117367 blender-2.35.ebuild 2801
+MD5 8a390c3a50c2abbcfa3fbbb7b87a8c54 blender-2.36-r1.ebuild 3309
+MD5 99ad2f8fe7c190a54f498946071a613b blender-2.36.ebuild 2929
+MD5 1c05b0353b0755a5bd402b6c2e588d62 blender-2.37.ebuild 3344
+MD5 d51cb30c4d20fadbeaea8fb4561dc8de blender-2.37a.ebuild 3466
+MD5 705b95605426ad9d562457fdbbff5460 files/blender-2.32.patch 2562
+MD5 ee3557021be75082093de0d643b32260 files/blender-2.36-dirs.patch 1970
+MD5 bcc3b86202d4c6bb85ef9cef08bfcf9e files/blender-2.37-dirs.patch 725
+MD5 bcc3b86202d4c6bb85ef9cef08bfcf9e files/blender-2.37a-dirs.patch 725
+MD5 3cab957d0ff2afbbbd4f47b95aec94c8 files/blender-2.37a-gcc-4.0.patch 5059
+MD5 3cab957d0ff2afbbbd4f47b95aec94c8 files/blender-2.37a-x86_64.patch 5059
+MD5 b8e304980dc2bfd9a7157037d6ead44b files/blender.desktop 197
+MD5 d95ef10fee53b71576c6da6c8163e748 files/blender.png 2119
+MD5 b5356307d35d0bfe73149428cafe23ff files/configure-fix.patch 754
+MD5 ef66b38c216b9ab1d78968353025116f files/digest-blender-2.34 66
+MD5 ef66b38c216b9ab1d78968353025116f files/digest-blender-2.34-r1 66
+MD5 2fbf0a94ba625bce0c2af487d90cf7f5 files/digest-blender-2.35 66
+MD5 f65e9e32429f06fd611b9902f9d7852b files/digest-blender-2.36 65
+MD5 f65e9e32429f06fd611b9902f9d7852b files/digest-blender-2.36-r1 65
+MD5 2ba439f544d1a154d6ab27d68cd059fc files/digest-blender-2.37 65
+MD5 052c6c1c8bb6f7abaef2c5a615d6995e files/digest-blender-2.37a 66
+MD5 493f38fb63d60a1ce275fdd2ea43d6e9 metadata.xml 587
diff --git a/media-gfx/blender/blender-2.34-r1.ebuild b/media-gfx/blender/blender-2.34-r1.ebuild
index b43846ae4ba7..3af2d4b484d2 100644
--- a/media-gfx/blender/blender-2.34-r1.ebuild
+++ b/media-gfx/blender/blender-2.34-r1.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/media-gfx/blender/blender-2.34-r1.ebuild,v 1.1 2004/12/24 14:45:31 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.34-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:44 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
 #IUSE="sdl jpeg png mozilla truetype static fmod"
 IUSE=""  #blender-game" # blender-plugin"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="3D Creation/Animation/Publishing System"
 HOMEPAGE="http://www.blender.org/"
 SRC_URI="http://download.blender.org/source/${P}.tar.bz2"
@@ -30,8 +29,6 @@ RDEPEND="virtual/x11
 DEPEND="dev-util/scons
 	${RDEPEND}"
 
-
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}/release/plugins
diff --git a/media-gfx/blender/blender-2.34.ebuild b/media-gfx/blender/blender-2.34.ebuild
index 85d2035f447e..e6e167862273 100644
--- a/media-gfx/blender/blender-2.34.ebuild
+++ b/media-gfx/blender/blender-2.34.ebuild
@@ -1,20 +1,19 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.34.ebuild,v 1.1 2004/08/08 15:20:57 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.34.ebuild,v 1.1.1.1 2005/11/30 09:37:44 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
 #IUSE="sdl jpeg png mozilla truetype static fmod"
-IUSE="blender-game" # blender-plugin"
+IUSE=""  #blender-game" # blender-plugin"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="3D Creation/Animation/Publishing System"
 HOMEPAGE="http://www.blender.org/"
 SRC_URI="http://download.blender.org/source/${P}.tar.bz2"
 
 SLOT="0"
-LICENSE="GPL-2 | BL"
-KEYWORDS="~ppc ~x86 ~amd64"
+LICENSE="|| (GPL-2 BL)"
+KEYWORDS="ppc x86 ~amd64"
 
 RDEPEND="virtual/x11
 	media-libs/libsdl
@@ -30,8 +29,6 @@ RDEPEND="virtual/x11
 DEPEND="dev-util/scons
 	${RDEPEND}"
 
-
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}/release/plugins
@@ -66,15 +63,15 @@ src_compile() {
 	#use static && myconf="${myconf} --enable-blenderstatic"
 
 	# Build the game engine
-	use blender-game && \
-	( einfo "enabling game engine"
+#	use blender-game && \
+	einfo "enabling game engine"
 	sed -i -e "s:BUILD_GAMEENGINE = 'false':BUILD_GAMEENGINE = 'true':" \
-	config.opts )
+	config.opts
 
-	use blender-game || \
-	( einfo "disabling game engine"
-	sed -i -e "s:BUILD_GAMEENGINE = 'true':BUILD_GAMEENGINE = 'false':" \
-	${S}/config.opts )
+#	use blender-game || \
+#	( einfo "disabling game engine"
+#	sed -i -e "s:BUILD_GAMEENGINE = 'true':BUILD_GAMEENGINE = 'false':" \
+#	${S}/config.opts )
 
 	# Build the plugin
 #	use blender-plugin && \
@@ -97,7 +94,6 @@ src_compile() {
 src_install() {
 	exeinto /usr/bin/
 	doexe ${S}/blender
-	use blender-game && \
 	doexe ${S}/blenderplayer
 #	einstall || die
 
diff --git a/media-gfx/blender/blender-2.35.ebuild b/media-gfx/blender/blender-2.35.ebuild
index d125f68a4ae1..d31abbc09078 100644
--- a/media-gfx/blender/blender-2.35.ebuild
+++ b/media-gfx/blender/blender-2.35.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/media-gfx/blender/blender-2.35.ebuild,v 1.1 2004/11/16 10:27:54 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.35.ebuild,v 1.1.1.1 2005/11/30 09:37:44 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
@@ -13,7 +13,7 @@ SRC_URI="http://download.blender.org/source/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="|| (GPL-2 BL)"
-KEYWORDS="ppc x86 ~amd64"
+KEYWORDS="~ppc ~x86 ~amd64"
 
 RDEPEND="virtual/x11
 	media-libs/libsdl
@@ -29,8 +29,6 @@ RDEPEND="virtual/x11
 DEPEND="dev-util/scons
 	${RDEPEND}"
 
-
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}/release/plugins
diff --git a/media-gfx/blender/blender-2.36-r1.ebuild b/media-gfx/blender/blender-2.36-r1.ebuild
index 60fdf7d1b845..eed89f9269ed 100644
--- a/media-gfx/blender/blender-2.36-r1.ebuild
+++ b/media-gfx/blender/blender-2.36-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/media-gfx/blender/blender-2.36-r1.ebuild,v 1.1 2005/01/03 12:41:13 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.36-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:45 chriswhite Exp $
 
-inherit flag-o-matic eutils
+inherit flag-o-matic eutils python
 
 #IUSE="sdl jpeg png mozilla truetype static fmod"
 IUSE="nls"  #blender-game" # blender-plugin"
@@ -13,7 +13,7 @@ SRC_URI="http://download.blender.org/source/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="|| (GPL-2 BL)"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="virtual/x11
 	media-libs/libsdl
@@ -75,7 +75,7 @@ src_compile() {
 	sed -i -e "s:BUILD_GAMEENGINE.*$:BUILD_GAMEENGINE = 'true':" \
 	config.opts
 
-	if [ "`use nls`" ];
+	if use nls ;
 	then
 		einfo "enabling internationalization"
 		sed -i -e "s:USE_INTERNATIONAL.*$:USE_INTERNATIONAL = 'true':" \
@@ -123,3 +123,10 @@ src_install() {
 	dodoc COPYING INSTALL README
 
 }
+
+pkg_preinst(){
+	if [ -h "/usr/lib/blender/plugins/include" ];
+	then
+		rm -f /usr/lib/blender/plugins/include
+	fi
+}
diff --git a/media-gfx/blender/blender-2.36.ebuild b/media-gfx/blender/blender-2.36.ebuild
index bea63d7b1131..87ccecc1f794 100644
--- a/media-gfx/blender/blender-2.36.ebuild
+++ b/media-gfx/blender/blender-2.36.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/media-gfx/blender/blender-2.36.ebuild,v 1.1 2004/12/25 02:26:49 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.36.ebuild,v 1.1.1.1 2005/11/30 09:37:44 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
diff --git a/media-gfx/blender/blender-2.37.ebuild b/media-gfx/blender/blender-2.37.ebuild
index 5d982e92f400..03fb828026e3 100644
--- a/media-gfx/blender/blender-2.37.ebuild
+++ b/media-gfx/blender/blender-2.37.ebuild
@@ -1,3 +1,7 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.37.ebuild,v 1.1.1.1 2005/11/30 09:37:44 chriswhite Exp $
+
 inherit flag-o-matic eutils python
 
 #IUSE="sdl jpeg png mozilla truetype static fmod"
@@ -9,7 +13,7 @@ SRC_URI="http://download.blender.org/source/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="|| (GPL-2 BL)"
-KEYWORDS="~ppc ~x86 ~amd64"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 RDEPEND="virtual/x11
 	media-libs/libsdl
@@ -43,7 +47,6 @@ src_unpack() {
 src_compile() {
 	local myconf=""
 
-	replace-flags -march=pentium4 -march=pentium3
 	scons -q
 
 	# SDL Support
diff --git a/media-gfx/blender/blender-2.37a.ebuild b/media-gfx/blender/blender-2.37a.ebuild
index 167281af8cbc..be263c9c0b87 100644
--- a/media-gfx/blender/blender-2.37a.ebuild
+++ b/media-gfx/blender/blender-2.37a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.37a.ebuild,v 1.1 2005/06/17 12:48:52 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.37a.ebuild,v 1.1.1.1 2005/11/30 09:37:45 chriswhite Exp $
 
 inherit flag-o-matic eutils python
 
@@ -27,7 +27,7 @@ RDEPEND="virtual/x11
 	>=media-gfx/yafray-0.0.7
 	nls? ( >=media-libs/ftgl-2.1 )"
 
-DEPEND="dev-util/scons
+DEPEND="=dev-util/scons-0.96.1
 	${RDEPEND}"
 
 S=${WORKDIR}/${PN}
@@ -37,9 +37,10 @@ src_unpack() {
 	cd ${S}/release/plugins
 	chmod 755 bmake
 	rm -fR include
-	cp -a ${S}/source/blender/blenpluginapi include
+	cp -pPR ${S}/source/blender/blenpluginapi include
 	cd ${S}
 	epatch ${FILESDIR}/${P}-dirs.patch
+	epatch ${FILESDIR}/${P}-x86_64.patch
 	mkdir -p ${WORKDIR}/build/linux2/{extern,intern,source}
 }
 
@@ -80,7 +81,7 @@ src_compile() {
 		einfo "enabling internationalization"
 		sed -i -e "s:USE_INTERNATIONAL.*$:USE_INTERNATIONAL = 'true':" \
 		-e "s:FTGL_INCLUDE.*$:FTGL_INCLUDE = ['/usr/include/FTGL']:"	\
-		-e "s:FTGL_LIBPATH.*$:FTGL_LIBPATH = ['/usr/lib']:"				\
+		-e "s:FTGL_LIBPATH.*$:FTGL_LIBPATH = ['/usr/$(get_libdir)']:"				\
 		config.opts
 	fi
 
@@ -108,13 +109,14 @@ src_install() {
 	doexe ${S}/blenderplayer
 
 
-	exeinto /usr/lib/${PN}/textures
+	exeinto /usr/$(get_libdir)/${PN}/textures
 	doexe ${S}/release/plugins/texture/*.so
-	exeinto /usr/lib/${PN}/sequences
+	exeinto /usr/$(get_libdir)/${PN}/sequences
 	doexe ${S}/release/plugins/sequence/*.so
-	cp -a ${S}/release/{bpydata,plugins,scripts} ${D}/usr/lib/${PN}
+	cp -pPR ${S}/release/{bpydata,plugins,scripts} ${D}/usr/$(get_libdir)/${PN}
 	use nls && \
-	cp -a ${S}/bin/.blender/{.Blanguages,.bfont.ttf,locale} ${D}/usr/lib/${PN}
+	cp -pPR ${S}/bin/.blender/{.Blanguages,.bfont.ttf,locale}
+	${D}/usr/$(get_libdir)/${PN}
 	insinto /usr/share/pixmaps
 	doins ${FILESDIR}/${PN}.png
 	insinto /usr/share/applications
@@ -125,8 +127,8 @@ src_install() {
 }
 
 pkg_preinst(){
-	if [ -h "/usr/lib/blender/plugins/include" ];
+	if [ -h "/usr/$(get_libdir)/blender/plugins/include" ];
 	then
-		rm -f /usr/lib/blender/plugins/include
+		rm -f /usr/$(get_libdir)/blender/plugins/include
 	fi
 }
diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml
index df1e956a3be3..04ace02b2429 100644
--- a/media-gfx/blender/metadata.xml
+++ b/media-gfx/blender/metadata.xml
@@ -3,7 +3,7 @@
 
 <pkgmetadata>
 
-	<herd>gfx-3d</herd>
+	<herd>graphics</herd>
 
 	<maintainer>
 		<email>malverian@gentoo.org</email>
diff --git a/media-gfx/bootsplash-themes-livecd/ChangeLog b/media-gfx/bootsplash-themes-livecd/ChangeLog
index 42328234bbe6..6ee3c9072860 100644
--- a/media-gfx/bootsplash-themes-livecd/ChangeLog
+++ b/media-gfx/bootsplash-themes-livecd/ChangeLog
@@ -1,6 +1,84 @@
 # ChangeLog for media-gfx/bootsplash-themes-livecd
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash-themes-livecd/ChangeLog,v 1.1 2004/05/19 20:27:17 wolf31o2 Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash-themes-livecd/ChangeLog,v 1.1.1.1 2005/11/30 09:37:13 chriswhite Exp $
+
+  02 May 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  bootsplash-themes-livecd-2004.0.ebuild,
+  bootsplash-themes-livecd-2004.1.ebuild,
+  bootsplash-themes-livecd-2004.2-r4.ebuild,
+  bootsplash-themes-livecd-2004.3-r1.ebuild:
+  Changing description and closing bug #90987.
+
+  14 Oct 2004; David Holm <dholm@gentoo.org>
+  bootsplash-themes-livecd-2004.3-r1.ebuild:
+  Added to ~ppc.
+
+*bootsplash-themes-livecd-2004.3-r1 (06 Oct 2004)
+
+  06 Oct 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  bootsplash-themes-livecd-2004.0.ebuild,
+  bootsplash-themes-livecd-2004.1.ebuild,
+  bootsplash-themes-livecd-2004.2-r4.ebuild,
+  +bootsplash-themes-livecd-2004.3-r1.ebuild,
+  -bootsplash-themes-livecd-2004.3.ebuild:
+  Fixed sources path and updating config file for 2004.3 theme. Closing bug
+  #66479.
+
+*bootsplash-themes-livecd-2004.3 (22 Sep 2004)
+
+  22 Sep 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  bootsplash-themes-livecd-2004.0.ebuild,
+  bootsplash-themes-livecd-2004.1.ebuild,
+  -bootsplash-themes-livecd-2004.2-r3.ebuild,
+  +bootsplash-themes-livecd-2004.2-r4.ebuild,
+  +bootsplash-themes-livecd-2004.3.ebuild:
+  Moving sources in my dev space, making 2004.2 images high quality, and adding
+  initial 2004.3 images.
+
+  25 Jun 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  bootsplash-themes-livecd-2004.0.ebuild,
+  bootsplash-themes-livecd-2004.1.ebuild:
+  Fixing S variable and closing bug #55158.
+
+*bootsplash-themes-livecd-2004.2-r3 (15 Jun 2004)
+
+  15 Jun 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  -bootsplash-themes-livecd-2004.2-r1.ebuild,
+  -bootsplash-themes-livecd-2004.2-r2.ebuild,
+  +bootsplash-themes-livecd-2004.2-r3.ebuild:
+  Fixing problems with the -r2 release and adding -r3, which should fix all
+  previous releases.
+
+*bootsplash-themes-livecd-2004.2-r2 (07 Jun 2004)
+
+  07 Jun 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  +bootsplash-themes-livecd-2004.2-r2.ebuild:
+  Updated to fix font burriness.
+
+  03 Jun 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  -bootsplash-themes-livecd-2004.2.ebuild:
+  Removing 2004.2 ebuild with improper fonts. I also had added SLOTs to the
+  ebuilds on the last update, so closing bug #52433.
+
+*bootsplash-themes-livecd-2004.2-r1 (03 Jun 2004)
+
+  03 Jun 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  bootsplash-themes-livecd-2004.0.ebuild,
+  bootsplash-themes-livecd-2004.1.ebuild,
+  +bootsplash-themes-livecd-2004.2-r1.ebuild,
+  bootsplash-themes-livecd-2004.2.ebuild:
+  Fixing some livecd issues and updating 2004.2 to use proper fonts.
+
+*bootsplash-themes-livecd-2004.2 (26 May 2004)
+
+  26 May 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  +bootsplash-themes-livecd-2004.2.ebuild:
+  Added 2004.2 splash screens.
+
+  20 May 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  bootsplash-themes-livecd-2004.0.ebuild,
+  bootsplash-themes-livecd-2004.1.ebuild:
+  Moving SRC_URI.
 
 *bootsplash-themes-livecd-2004.0 (19 May 2004)
 
diff --git a/media-gfx/bootsplash-themes-livecd/Manifest b/media-gfx/bootsplash-themes-livecd/Manifest
index af7a5a9a1bf3..6dcfc7668990 100644
--- a/media-gfx/bootsplash-themes-livecd/Manifest
+++ b/media-gfx/bootsplash-themes-livecd/Manifest
@@ -1,4 +1,10 @@
-MD5 3d78a21dda1139259cde8462db76f56a bootsplash-themes-livecd-2004.1.ebuild 781
-MD5 3d78a21dda1139259cde8462db76f56a bootsplash-themes-livecd-2004.0.ebuild 781
+MD5 5203fe6d50946e5760251a762a7d17d0 bootsplash-themes-livecd-2004.1.ebuild 835
+MD5 b58612460b1de7baea89edd4e513a06f bootsplash-themes-livecd-2004.0.ebuild 835
+MD5 7b42155cf9ecec9c7f273ff0761db081 ChangeLog 3305
+MD5 d86e5b5e47260e5a965eae2afe6d6d40 metadata.xml 159
+MD5 e8f96b0be0efda2e0d56ccd77309d6d9 bootsplash-themes-livecd-2004.3-r1.ebuild 827
+MD5 4adeabac7874665d33ecf4e682ef0724 bootsplash-themes-livecd-2004.2-r4.ebuild 820
 MD5 ba9d58e94814ef84fb557e5da1a9179e files/digest-bootsplash-themes-livecd-2004.0 84
 MD5 0a71da624fab2230f950a40364d96500 files/digest-bootsplash-themes-livecd-2004.1 84
+MD5 06b3b7e760e7fd3cc2035e5cc947834e files/digest-bootsplash-themes-livecd-2004.2-r4 88
+MD5 dce64a0a917517197ddfa3e482ab2d54 files/digest-bootsplash-themes-livecd-2004.3-r1 88
diff --git a/media-gfx/bootsplash-themes-livecd/bootsplash-themes-livecd-2004.0.ebuild b/media-gfx/bootsplash-themes-livecd/bootsplash-themes-livecd-2004.0.ebuild
index 44a5834138ae..5556da3bb537 100644
--- a/media-gfx/bootsplash-themes-livecd/bootsplash-themes-livecd-2004.0.ebuild
+++ b/media-gfx/bootsplash-themes-livecd/bootsplash-themes-livecd-2004.0.ebuild
@@ -1,28 +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/media-gfx/bootsplash-themes-livecd/bootsplash-themes-livecd-2004.0.ebuild,v 1.1 2004/05/19 20:27:17 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash-themes-livecd/bootsplash-themes-livecd-2004.0.ebuild,v 1.1.1.1 2005/11/30 09:37:13 chriswhite Exp $
 
 IUSE="livecd"
-S=${WORKDIR}/${PF}
-DESCRIPTION="Gentoo ${PV} theme for bootsplash consoles"
+S=${WORKDIR}/bootsplash-themes-livecd-${PV}
+DESCRIPTION="Gentoo theme for bootsplash consoles"
 HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${PF}.tar.bz2
-	http://dev.gentoo.org/~wolf31o2/${PF}.tar.bz2"
+SRC_URI="http://dev.gentoo.org/~wolf31o2/sources/${PN}/${PF}.tar.bz2"
 
-SLOT="0"
+SLOT=${PV}
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64"
 
 DEPEND=">=media-gfx/bootsplash-0.6-r16"
 
 src_install() {
-	cp -r * ${D}/etc/bootsplash/themes/livecd-${PV}
+	dodir /etc/bootsplash/livecd-${PV}
+	cp -r ${S}/* ${D}/etc/bootsplash/livecd-${PV}
 
-	# link default config for boot images if not already set
-	if [ ! -e ${ROOT}/etc/bootsplash/default ]; then
-		use livecd \
-			&& dosym ./livecd-${PV} /etc/bootsplash/default \
-			|| dosym ./gentoo /etc/bootsplash/default
-	fi
-	use livecd && dosed "s:gentoo:livecd-${PV}:" /etc/conf.d/bootsplash
+	# link default config for livecd images if USE=livecd set
+	use livecd \
+		&& cd ${D}/etc/bootsplash \
+		&& rm default \
+		&& dosym ./livecd-${PV} /etc/bootsplash/default
 }
diff --git a/media-gfx/bootsplash-themes-livecd/bootsplash-themes-livecd-2004.1.ebuild b/media-gfx/bootsplash-themes-livecd/bootsplash-themes-livecd-2004.1.ebuild
index 095f008ab234..6a3a9bed2cb7 100644
--- a/media-gfx/bootsplash-themes-livecd/bootsplash-themes-livecd-2004.1.ebuild
+++ b/media-gfx/bootsplash-themes-livecd/bootsplash-themes-livecd-2004.1.ebuild
@@ -1,28 +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/media-gfx/bootsplash-themes-livecd/bootsplash-themes-livecd-2004.1.ebuild,v 1.1 2004/05/19 20:27:17 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash-themes-livecd/bootsplash-themes-livecd-2004.1.ebuild,v 1.1.1.1 2005/11/30 09:37:13 chriswhite Exp $
 
 IUSE="livecd"
-S=${WORKDIR}/${PF}
-DESCRIPTION="Gentoo ${PV} theme for bootsplash consoles"
+S=${WORKDIR}/bootsplash-themes-livecd-${PV}
+DESCRIPTION="Gentoo theme for bootsplash consoles"
 HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${PF}.tar.bz2
-	http://dev.gentoo.org/~wolf31o2/${PF}.tar.bz2"
+SRC_URI="http://dev.gentoo.org/~wolf31o2/sources/${PN}/${PF}.tar.bz2"
 
-SLOT="0"
+SLOT=${PV}
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64"
 
 DEPEND=">=media-gfx/bootsplash-0.6-r16"
 
 src_install() {
-	cp -r * ${D}/etc/bootsplash/themes/livecd-${PV}
+	dodir /etc/bootsplash/livecd-${PV}
+	cp -r ${S}/* ${D}/etc/bootsplash/livecd-${PV}
 
-	# link default config for boot images if not already set
-	if [ ! -e ${ROOT}/etc/bootsplash/default ]; then
-		use livecd \
-			&& dosym ./livecd-${PV} /etc/bootsplash/default \
-			|| dosym ./gentoo /etc/bootsplash/default
-	fi
-	use livecd && dosed "s:gentoo:livecd-${PV}:" /etc/conf.d/bootsplash
+	# link default config for livecd images if USE=livecd set
+	use livecd \
+		&& cd ${D}/etc/bootsplash \
+		&& rm default \
+		&& dosym ./livecd-${PV} /etc/bootsplash/default
 }
diff --git a/media-gfx/bootsplash-themes-livecd/bootsplash-themes-livecd-2004.2-r4.ebuild b/media-gfx/bootsplash-themes-livecd/bootsplash-themes-livecd-2004.2-r4.ebuild
index c7bfda01282e..ea0cd9fcfaf2 100644
--- a/media-gfx/bootsplash-themes-livecd/bootsplash-themes-livecd-2004.2-r4.ebuild
+++ b/media-gfx/bootsplash-themes-livecd/bootsplash-themes-livecd-2004.2-r4.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/media-gfx/bootsplash-themes-livecd/bootsplash-themes-livecd-2004.2-r4.ebuild,v 1.1 2004/09/22 20:42:55 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash-themes-livecd/bootsplash-themes-livecd-2004.2-r4.ebuild,v 1.1.1.1 2005/11/30 09:37:13 chriswhite Exp $
 
 IUSE="livecd"
 S=${WORKDIR}/livecd-${PV}
-DESCRIPTION="Gentoo ${PV} theme for bootsplash consoles"
+DESCRIPTION="Gentoo theme for bootsplash consoles"
 HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${PF}.tar.bz2
-	http://dev.gentoo.org/~wolf31o2/sources/${P}/${PF}.tar.bz2"
+SRC_URI="http://dev.gentoo.org/~wolf31o2/sources/${PN}/${PF}.tar.bz2"
 
 SLOT=${PV}
 LICENSE="GPL-2"
diff --git a/media-gfx/bootsplash-themes-livecd/bootsplash-themes-livecd-2004.3-r1.ebuild b/media-gfx/bootsplash-themes-livecd/bootsplash-themes-livecd-2004.3-r1.ebuild
index 1364a43850ae..e12a869d0a01 100644
--- a/media-gfx/bootsplash-themes-livecd/bootsplash-themes-livecd-2004.3-r1.ebuild
+++ b/media-gfx/bootsplash-themes-livecd/bootsplash-themes-livecd-2004.3-r1.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/media-gfx/bootsplash-themes-livecd/bootsplash-themes-livecd-2004.3-r1.ebuild,v 1.1 2004/10/06 20:14:11 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash-themes-livecd/bootsplash-themes-livecd-2004.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:13 chriswhite Exp $
 
 IUSE="livecd"
 S=${WORKDIR}/livecd-${PV}
-DESCRIPTION="Gentoo ${PV} theme for bootsplash consoles"
+DESCRIPTION="Gentoo theme for bootsplash consoles"
 HOMEPAGE="http://www.gentoo.org/"
 SRC_URI="http://dev.gentoo.org/~wolf31o2/sources/${PN}/${PF}.tar.bz2"
 
 SLOT=${PV}
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86 ~amd64 ~ppc"
 
 DEPEND=">=media-gfx/bootsplash-0.6-r16"
 
diff --git a/media-gfx/bootsplash-themes/ChangeLog b/media-gfx/bootsplash-themes/ChangeLog
index 987a97990a04..a221b2372fcb 100644
--- a/media-gfx/bootsplash-themes/ChangeLog
+++ b/media-gfx/bootsplash-themes/ChangeLog
@@ -1,6 +1,32 @@
 # ChangeLog for media-gfx/bootsplash-themes
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash-themes/ChangeLog,v 1.1 2004/08/22 14:43:32 spock Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash-themes/ChangeLog,v 1.1.1.1 2005/11/30 09:37:28 chriswhite Exp $
+
+  26 Aug 2005; Michał Januszewski <spock@gentoo.org>
+  -bootsplash-themes-20040821.ebuild, bootsplash-themes-20040821-r1.ebuild:
+  Changed 'chown root:root' to 'chown root:0' (bug #103563). Removed old ebuild.
+
+  07 Jul 2005; Michał Januszewski <spock@gentoo.org>
+  bootsplash-themes-20040821-r1.ebuild:
+  Marked stable on x86.
+
+*bootsplash-themes-20040821-r1 (16 May 2005)
+
+  16 May 2005; Michał Januszewski <spock@gentoo.org>
+  +bootsplash-themes-20040821-r1.ebuild:
+  Added experimental support for media-gfx/splashutils.
+
+  10 Apr 2005; Simon Stelling <blubb@gentoo.org>
+  bootsplash-themes-20040821.ebuild:
+  added ~amd64
+
+  12 Jan 2005; Michal Januszewski <spock@gentoo.org>
+  bootsplash-themes-20040821.ebuild:
+  Marked stable on x86.
+
+  29 Aug 2004; David Holm <dholm@gentoo.org>
+  bootsplash-themes-20040821.ebuild:
+  Added to ~ppc.
 
 *bootsplash-themes-20040821 (22 Aug 2004)
 
diff --git a/media-gfx/bootsplash-themes/Manifest b/media-gfx/bootsplash-themes/Manifest
index 5eecd45ceec2..a166c98e3a45 100644
--- a/media-gfx/bootsplash-themes/Manifest
+++ b/media-gfx/bootsplash-themes/Manifest
@@ -1,2 +1,14 @@
-MD5 1f0cded01de544343881d90b4f9403d4 bootsplash-themes-20040821.ebuild 4768
-MD5 35edc9d865e3400b0b27e019c73ccaf8 files/digest-bootsplash-themes-20040821 7564
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c927949c89ee32096392855ee324914b bootsplash-themes-20040821-r1.ebuild 8172
+MD5 7b5753eeac492a254eec23f67bda3236 ChangeLog 1240
+MD5 cfe1b5f88cc51ac6ffc42809178d2a06 metadata.xml 221
+MD5 35edc9d865e3400b0b27e019c73ccaf8 files/digest-bootsplash-themes-20040821-r1 7564
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDD1ffchej4aZK9/cRAlcTAJwMx0EzQxMWR2A75E9U4cjekpQg9ACbBVRY
+vST6R8oNgNBqAmKe0zcFJXI=
+=Uwcx
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/bootsplash-themes/bootsplash-themes-20040821-r1.ebuild b/media-gfx/bootsplash-themes/bootsplash-themes-20040821-r1.ebuild
index e763704276ea..4a89382736b0 100644
--- a/media-gfx/bootsplash-themes/bootsplash-themes-20040821-r1.ebuild
+++ b/media-gfx/bootsplash-themes/bootsplash-themes-20040821-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/media-gfx/bootsplash-themes/bootsplash-themes-20040821-r1.ebuild,v 1.1 2005/05/16 16:53:59 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash-themes/bootsplash-themes-20040821-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:28 chriswhite Exp $
 
 DESCRIPTION="A collection of Bootsplash themes"
 HOMEPAGE="http://www.bootsplash.de/"
@@ -119,10 +119,10 @@ SRC_URI="${THEME_URI}/Theme-73labAllstar.tar.bz2
 	${THEME_URI}/Theme-WarmAqua.tar.bz2"
 SLOT="0"
 LICENSE="freedist"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="x86 ~ppc ~amd64"
 IUSE=""
 
-RDEPEND="|| ( media-gfx/bootsplash >=media-gfx/splashutils-1.1.9.6 )" 
+RDEPEND="|| ( media-gfx/bootsplash >=media-gfx/splashutils-1.1.9.6 )"
 DEPEND="net-misc/wget ${RDEPEND}"
 S="${WORKDIR}"
 
@@ -164,9 +164,9 @@ src_install() {
 		dodir /etc/bootsplash
 		mypath="/etc/bootsplash"
 	fi
-	
+
 	cd ${S}
-	
+
 	if has_version "media-gfx/splashutils" ; then
 		for i in * ; do
 			einfo "Converting ${i}"
@@ -190,7 +190,7 @@ src_install() {
 		mv * "${D}/etc/bootsplash"
 	fi
 
-	chown -R root:root "${D}/${mypath}"
+	chown -R root:0 "${D}/${mypath}"
 	chmod -R o-w "${D}/${mypath}"
 }
 
@@ -200,7 +200,7 @@ pkg_postinst() {
 	einfo "might not work properly on your system, some might not support verbose"
 	einfo "or silent mode, or might only support a single resolution."
 	echo ""
-	
+
 	if has_version "media-gfx/splashutils" ; then
 		einfo "The themes have been automatically converted to a format recognized"
 		einfo "by splashutils. Note that the conversion process is purely automatical"
diff --git a/media-gfx/bootsplash/ChangeLog b/media-gfx/bootsplash/ChangeLog
index d023d3bf2b8a..8c5733fc3938 100644
--- a/media-gfx/bootsplash/ChangeLog
+++ b/media-gfx/bootsplash/ChangeLog
@@ -1,6 +1,320 @@
-# ChangeLog for media-gfx/bootsplash 
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash/ChangeLog,v 1.1 2003/01/16 04:02:41 tad Exp $
+# ChangeLog for media-gfx/bootsplash
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash/ChangeLog,v 1.1.1.1 2005/11/30 09:37:27 chriswhite Exp $
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  bootsplash-0.6.1-r7.ebuild:
+  Stable on ppc.
+
+  02 May 2005; Michał Januszewski <spock@gentoo.org>
+  bootsplash-0.6.1-r7.ebuild:
+  Install bootanim (fix for bug #88564).
+
+  07 Apr 2005; Simon Stelling <blubb@gentoo.org> bootsplash-0.6.1-r7.ebuild:
+  stable on amd64
+
+  12 Jan 2005; Michal Januszewski <spock@gentoo.org>
+  bootsplash-0.6.1-r6.ebuild, bootsplash-0.6.1-r7.ebuild:
+  Marked stable on x86.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org>
+  bootsplash-0.6.1-r4.ebuild:
+  Stable on amd64.
+
+*bootsplash-0.6.1-r7 (11 Oct 2004)
+
+  11 Oct 2004; <dams@gentoo.org> +files/0.6.1-r7-default_theme.patch,
+  bootsplash-0.6-r16.ebuild, +bootsplash-0.6.1-r7.ebuild:
+  added patch to set the DEFAULT_THEME to default
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  04 Sep 2004; Michal Januszewski <spock@gentoo.org>
+  -bootsplash-0.6.1-r5.ebuild:
+  Removed old ebuild.
+
+*bootsplash-0.6.1-r6 (22 Aug 2004)
+
+  22 Aug 2004; Michal Januszewski <spock@gentoo.org>
+  +bootsplash-0.6.1-r6.ebuild:
+  Added a patch for 2.6.8.1. Closed bug #58544.
+
+*bootsplash-0.6.1-r5 (06 Aug 2004)
+
+  06 Aug 2004; Michal Januszewski <spock@gentoo.org>
+  bootsplash-0.6-r16.ebuild, bootsplash-0.6.1-r4.ebuild,
+  +bootsplash-0.6.1-r5.ebuild:
+  Added splashpbm, updated the helper scripts to work with the new
+  splash<->rc-scripts interface (too be introduced soon), fixed
+  bootsplash_resize, added dependecies on lcms. Closes bugs #57466, #57050,
+  #59298. Sorry, but no 2.6.8 patch this time.
+
+  04 Aug 2004; Michal Januszewski <spock@gentoo.org>
+  -bootsplash-0.6.1-r1.ebuild, -bootsplash-0.6.1-r2.ebuild,
+  -bootsplash-0.6.1-r3.ebuild, -bootsplash-0.6.1.ebuild:
+  Removed old ebuilds.
+
+  20 Jul 2004; Michal Januszewski <spock@gentoo.org>
+  bootsplash-0.6.1-r1.ebuild, bootsplash-0.6.1-r3.ebuild,
+  bootsplash-0.6.1-r4.ebuild, bootsplash-0.6.1.ebuild:
+  Stable on x86.
+
+*bootsplash-0.6.1-r4 (03 Jul 2004)
+
+  03 Jul 2004; Michal Januszewski <spock@gentoo.org>
+  +bootsplash-0.6.1-r4.ebuild:
+  Yet another release. This time I've hopefully fixed all non-x86 bugs. 24bpp &
+  16bpp should work fine on PPCs now. I've added ~pcc to KEYWORDS, so please
+  test it. This release incorporates fixes from bugs #55744 and #55877. Thanks
+  to Ming Zhao and DiskBreaker for patches from these bugs.
+
+*bootsplash-0.6.1-r3 (29 Jun 2004)
+
+  29 Jun 2004; Michal Januszewski <spock@gentoo.org>
+  +bootsplash-0.6.1-r3.ebuild:
+  Fixed 24bpp mode problems, added support for 15bpp and DIRECTCOLOR modes.
+  Radeonfb users should be happy now :)
+
+*bootsplash-0.6.1-r2 (26 Jun 2004)
+
+  26 Jun 2004; Michal Januszewski <spock@gentoo.org>
+  +bootsplash-0.6.1-r2.ebuild:
+  A release with experimental new features. I've added support for 32bpp modes
+  (24bpp might work too, but I didn't have a chance to test it) and removed all
+  references to vesafb. This means you should now be able to use bootsplash with
+  other framebuffer drivers. I've tested it with rivafb and it worked fine. The
+  only drawback is that the console becomes slower, as bootsplash can't take
+  advantage of any accelerated routines (yet :)).
+
+*bootsplash-0.6.1-r1 (22 Jun 2004)
+
+  22 Jun 2004; Michal Januszewski <spock@gentoo.org>
+  +bootsplash-0.6.1-r1.ebuild:
+  Bugfix release. Fixes problem with Kconfig for x86_64 users. Features a new,
+  more user-friendly bootsplash_initrdgen script.
+
+  03 Jun 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  bootsplash-0.6-r16.ebuild:
+  Marking stable for 2004.2 LiveCD... blame me if it breaks... ;]
+
+*bootsplash-0.6.1 (30 May 2004)
+
+  30 May 2004; Michal Januszewski <spock@gentoo.org> +bootsplash-0.6.1.ebuild:
+  This release features: 2.6.7 kernels support, fix for splash_renderc kernel
+  oops, bootsplash data splitted into 3 files to avoid unnecessary downloads.
+
+  20 May 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  bootsplash-0.6-r16.ebuild:
+  Moving SRC_URI.
+
+*bootsplash-0.6-r16 (19 May 2004)
+
+  19 May 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  +bootsplash-0.6-r16.ebuild:
+  Added -r16 which removes livecd themes due to new bootsplash-themes-livecd
+  ebuilds.
+
+  26 Apr 2004; Martin Holzer <mholzer@gentoo.org> bootsplash-0.6-r10.ebuild,
+  bootsplash-0.6-r13.ebuild, bootsplash-0.6-r14.ebuild,
+  bootsplash-0.6-r15.ebuild, bootsplash-0.6-r8.ebuild:
+  added mirror://gentoo as primary
+
+*bootsplash-0.6-r15 (25 Apr 2004)
+
+  25 Apr 2004; Michal Januszewski <spock@gentoo.org>
+  +bootsplash-0.6-r15.ebuild:
+  New version. Updated the kernel patches (>=2.4.25, 2.6.6-rc2 - a fix for the
+  config system), fixed a few minor bugs (including #47888). This will hopefully
+  be the last release before 0.6.1.
+
+  14 Apr 2004; Michal Januszewski <spock@gentoo.org>
+  bootsplash-0.6-r10.ebuild, bootsplash-0.6-r11.ebuild,
+  bootsplash-0.6-r12.ebuild, bootsplash-0.6-r13.ebuild,
+  bootsplash-0.6-r14.ebuild, bootsplash-0.6-r3.ebuild,
+  bootsplash-0.6-r8.ebuild, bootsplash-0.6-r9.ebuild:
+  Removed ppc from all ebuilds, as bootsplash currently only works with
+  vesafb, and vesafb does not work on PPCs.
+
+  13 Apr 2004; Michal Januszewski <spock@gentoo.org>
+  bootsplash-0.6-r13.ebuild, bootsplash-0.6-r14.ebuild:
+  Moved to stable on x86.
+
+  13 Apr 2004; Michal Januszewski <spock@gentoo.org>
+  bootsplash-0.6-r10.ebuild, bootsplash-0.6-r11.ebuild,
+  bootsplash-0.6-r12.ebuild, bootsplash-0.6-r13.ebuild,
+  bootsplash-0.6-r14.ebuild, bootsplash-0.6-r9.ebuild:
+  Added 'livecd' to IUSE.
+
+*bootsplash-0.6-r14 (07 Apr 2004)
+
+  07 Apr 2004; Michal Januszewski <spock@gentoo.org>
+  bootsplash-0.6-r14.ebuild:
+  Added the new 2004.1 bootsplash pics.
+
+*bootsplash-0.6-r13 (04 Apr 2004)
+
+  04 Apr 2004; Michal Januszewski <spock@gentoo.org>
+  bootsplash-0.6-r13.ebuild:
+  Here's a new version of bootsplash, it includes some new fixes and has all the
+  features of -r11 and -r12. This bootsplash revision is no longer dependent on
+  baselayout-1.8.6.13-r1.
+
+  28 Mar 2004; Michal Januszewski <spock@gentoo.org>
+  bootsplash-0.6-r10.ebuild, bootsplash-0.6-r11.ebuild,
+  bootsplash-0.6-r12.ebuild:
+  Marked -r11 as unstable due to a dependency on a basalayout version which is
+  still in ~x86. Backported a little fix to -r10. This closes #45924.
+
+  27 Mar 2004; Michal Januszewski <spock@gentoo.org>
+  bootsplash-0.6-r10.ebuild, bootsplash-0.6-r11.ebuild,
+  bootsplash-0.6-r12.ebuild, bootsplash-0.6-r3.ebuild,
+  bootsplash-0.6-r8.ebuild, bootsplash-0.6-r9.ebuild:
+  Ebuild clean-ups, added empty IUSE vars.
+
+  20 Mar 2004; Michal Januszewski <spock@gentoo.org>
+  bootsplash-0.6-r10.ebuild, bootsplash-0.6-r11.ebuild:
+  Bump to stable.
+
+*bootsplash-0.6-r12 (20 Mar 2004)
+
+  20 Mar 2004; Michal Januszewski <spock@gentoo.org>
+  bootsplash-0.6-r12.ebuild:
+  Added support for 2.6.5 kernels (up to -rc2), fixed some minor issues with
+  chvt.
+
+  06 Mar 2004; Michal Januszewski <spock@gentoo.org>
+  bootsplash-0.6-r11.ebuild, bootsplash-0.6-r9.ebuild:
+  Bump to stable, removed unnecessary trailing spaces form the latest ebuild.
+
+*bootsplash-0.6-r11 (06 Mar 2004)
+
+  06 Mar 2004; Michal Januszewski <spock@gentoo.org>
+  bootsplash-0.6-r11.ebuild:
+  This revision introduces the bootsplash_resize script and closes bug #43346.
+
+*bootsplash-0.6-r10 (02 Mar 2004)
+
+  02 Mar 2004; Michal Januszewski <spock@gentoo.org>
+  bootsplash-0.6-r10.ebuild:
+  This revision includes a new version (3.1.4) of the Bootsplash patch, fixes a
+  minor issue with the compilation of progress.c and closes bugs #43476, #42114
+  and #42906.
+
+  01 Mar 2004; Michal Januszewski <spock@gentoo.org> bootsplash-0.6-r8.ebuild:
+  Bump to stable.
+
+  23 Feb 2004; Seemant Kulleen <seemant@gentoo.org> bootsplash-0.6-r4.ebuild,
+  bootsplash-0.6-r5.ebuild, bootsplash-0.6-r6.ebuild:
+  removed intermediary dated versions
+
+*bootsplash-0.6-r9 (23 Feb 2004)
+
+  23 Feb 2004; Seemant Kulleen <seemant@gentoo.org> bootsplash-0.6-r9.ebuild:
+  New bootsplash piccies for the 2004.0 livecd. Also, clean up of the syntax --
+  except, for the eval line -- doesn't seem to have any purpose in this ebuild,
+  but not sure. Spock or TaD need to weigh in on that.
+
+*bootsplash-0.6-r8 (18 Feb 2004)
+
+  18 Feb 2004; Michal Januszewski <spock@gentoo.org> bootsplash-0.6-r8.ebuild:
+  Yes, they broke it, again! ;) The new 2.6.3_rc4 kernel introduces some new
+  patches, which make the system freeze during boot-time when Bootsplash is
+  used. This revision of the Bootsplash package fixes this issue.
+
+  18 Feb 2004; Michal Januszewski <spock@gentoo.org> bootsplash-0.6-r5.ebuild,
+  bootsplash-0.6-r6.ebuild, bootsplash-0.6-r7.ebuild:
+  Marked stable on x86.
+
+*bootsplash-0.6-r7 (16 Feb 2004)
+
+  16 Feb 2004; Michal Januszewski <spock@gentoo.org> bootsplash-0.6-r7.ebuild:
+  Fixed oopses with >=2.6.3 kernels.
+
+*bootsplash-0.6-r6 (15 Feb 2004)
+
+  15 Feb 2004; Michal Januszewski <spock@gentoo.org> bootsplash-0.6-r6.ebuild,
+  metadata.xml:
+  New revision, includes the patch for 2.6.3 kernels and has an updated patching
+  system.
+
+  15 Feb 2004; Michal Januszewski <spock@gentoo.org> bootsplash-0.6-r5.ebuild:
+  Added a statically linked version of fbmngplay, closes #41476.
+
+  06 Feb 2004; Michal Januszewski <spock@gentoo.org> bootsplash-0.6-r4.ebuild,
+  bootsplash-0.6-r5.ebuild:
+  Fixed a stupid Bash syntax error, closes #40583.
+
+  01 Feb 2004; Brad House <brad_mssw@gentoo.org> bootsplash-0.6-r5.ebuild:
+  stable on amd64
+
+*bootsplash-0.6-r5 (26 Jan 2004)
+
+  26 Jan 2004; Michal Januszewski <spock@gentoo.org>
+  bootsplash-0.6-r5.ebuild:
+  Added support for user-defined boot messages and user-specified font for
+  silent bootplash, added an option to specify different configs for selected
+  ttys (closes bug #27682), added the 'progress' program, added devfs support
+  for all bootplash utils (closes bug #39411, thanks to ferret for the patch).
+
+*bootsplash-0.6-r4 (17 Jan 2004)
+
+  17 Jan 2004; Michal Januszewski <spock@gentoo.org>
+  bootsplash-0.6-r4.ebuild, metadata.xml:
+  Added support for 2.6 kernels, fixed a few minor issues with silent mode,
+  added the BOOTSPLASH_TTYS variable.
+
+  12 Jan 2004; Brad House <brad_mssw@gentoo.org> bootsplash-0.6-r2.ebuild:
+  mark stable
+
+*bootsplash-0.6-r3 (10 Jan 2004)
+
+  10 Jan 2004; Troy Dack <tad@gentoo.org> bootsplash-0.6-r3.ebuild:
+  Progress bar fixed, add 'splash=silent' to your kernel boot options. Closes
+  Bugs #33589 #21019 #33589 #34233. Big thankyou to Tyler Trafford
+  <ttrafford@acm.org> for the patches.
+
+  04 Jan 2004; Brad House <brad_mssw@gentoo.org> bootsplash-0.6-r2.ebuild:
+  mark stable on amd64
+
+  24 Oct 2003; Brad House <brad_mssw@gentoo.org> bootsplash-0.6-r2.ebuild:
+  add ~amd64 flag
+
+*bootsplash-0.6-r2 (18 Aug 2003)
+
+  18 Aug 2003; Troy Dack <tad@gentoo.org> bootsplash-0.6-r2.ebuild:
+  Bump to -r2. Fixes Bugs #20497, #26245, #20964.
+
+*bootsplash-0.6-r1
+  23 Jun 2003; Troy Dack <tad@gentoo.org> :
+  Fix rc script depend issues. Close Bug #21419
+
+*bootsplash-0.5 (07 Apr 2003)
+
+  21 Apr 2003; tad bootsplash-0.5.ebuild:
+  Version bump. Fixes .cfg errors, and incorrect initrd files
+
+  07 Apr 2003; Troy Dack <tad@gentoo.org> bootsplash-0.5.ebuild:
+  New kernel patch, new splash images. Now with a "silent" image and 
+  a graphical progress bar.
+
+*bootsplash-0.4-r1 (20 Mar 2003)
+
+  20 Mar 2003; Troy Dack <tad@gentoo.org> bootsplash-0.4-r1.ebuild,
+  files/bootsplash:
+  Version bump. rc scripts added, installs into ${PN} instead of ${P},
+  config file symlinks now more appropriate.
+
+*bootsplash-0.4-r0 (19 JAN 2003)
+
+  19 JAN 2003; Troy Dack <tad@gentoo.org> bootsplash-0.4.ebuild:
+  Version bump.  bootsplash-config removed, deprecated.  Console
+  text colour can now be changed.
+
+*bootsplash-0.3-r0 (17 JAN 2003)
+
+  17 JAN 2003; Troy Dack <tad@gentoo.org> bootsplash-0.3.ebuild:
+  Version bump.  800x600 images added.
 
 *bootsplash-0.2-r0 (16 JAN 2003)
 
diff --git a/media-gfx/bootsplash/Manifest b/media-gfx/bootsplash/Manifest
index e69de29bb2d1..61c927d4f7a3 100644
--- a/media-gfx/bootsplash/Manifest
+++ b/media-gfx/bootsplash/Manifest
@@ -0,0 +1,11 @@
+MD5 01b612a01dc3cb3bbf01a16c6ead3930 bootsplash-0.6.1-r6.ebuild 3076
+MD5 a93cb3db61c532b39e8c461c713a25f8 bootsplash-0.6.1-r4.ebuild 2973
+MD5 d94d306da3804e41296e1bf04c7c9cae metadata.xml 255
+MD5 01dfc98e2b6dcd453785a77e52adfaf5 ChangeLog 12047
+MD5 e82fa0ea2fa87ab46e6c42f200791134 bootsplash-0.6-r16.ebuild 6690
+MD5 e69c477baeb2fde1ce0b76bd640efda9 bootsplash-0.6.1-r7.ebuild 3235
+MD5 62e182a70b6535d721dffdf34051c48e files/0.6.1-r7-default_theme.patch 406
+MD5 3f2697605cd4c22d7ec6a8a56e562da4 files/digest-bootsplash-0.6.1-r4 232
+MD5 e07733044709e48e34df036d69dc9f3a files/digest-bootsplash-0.6-r16 71
+MD5 00168dc069b71a54b9a8fcb10e0c4752 files/digest-bootsplash-0.6.1-r7 232
+MD5 00168dc069b71a54b9a8fcb10e0c4752 files/digest-bootsplash-0.6.1-r6 232
diff --git a/media-gfx/bootsplash/bootsplash-0.6-r16.ebuild b/media-gfx/bootsplash/bootsplash-0.6-r16.ebuild
index a2a3503b8772..c1840f56dc4f 100644
--- a/media-gfx/bootsplash/bootsplash-0.6-r16.ebuild
+++ b/media-gfx/bootsplash/bootsplash-0.6-r16.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/media-gfx/bootsplash/bootsplash-0.6-r16.ebuild,v 1.1 2004/05/19 20:24:02 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash/bootsplash-0.6-r16.ebuild,v 1.1.1.1 2005/11/30 09:37:27 chriswhite Exp $
 
 IUSE=""
 S=${WORKDIR}/${PF}
 DESCRIPTION="Graphical backgrounds for frame buffer consoles"
 HOMEPAGE="http://www.bootsplash.org/ http://linux.tkdack.com/"
 SRC_URI="mirror://gentoo/${PF}.tar.bz2
-	http://dev.gentoo.org/~wolf31o2/${PF}.tar.bz2"
+	http://dev.gentoo.org/~wolf31o2/livecd/${PF}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64"
 
 DEPEND=">=media-libs/freetype-2
-	media-libs/libmng"
+	media-libs/libmng
+	media-libs/lcms"
 
 src_compile() {
 	# compile utils
diff --git a/media-gfx/bootsplash/bootsplash-0.6.1-r4.ebuild b/media-gfx/bootsplash/bootsplash-0.6.1-r4.ebuild
index 9b7a47694935..4fb4511aa7e5 100644
--- a/media-gfx/bootsplash/bootsplash-0.6.1-r4.ebuild
+++ b/media-gfx/bootsplash/bootsplash-0.6.1-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/media-gfx/bootsplash/bootsplash-0.6.1-r4.ebuild,v 1.1 2004/07/03 09:16:00 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash/bootsplash-0.6.1-r4.ebuild,v 1.1.1.1 2005/11/30 09:37:27 chriswhite Exp $
 
 IUSE=""
 S=${WORKDIR}
@@ -11,10 +11,11 @@ SRC_URI="http://dev.gentoo.org/~spock/portage/distfiles/${PN}-core-0.6.1-r4.tar.
 	http://dev.gentoo.org/~spock/portage/distfiles/${PN}-kernel-0.6.1-r4.tar.bz2"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="x86 amd64 ~ppc"
 
 DEPEND=">=media-libs/freetype-2
-	media-libs/libmng"
+	media-libs/libmng
+	media-libs/lcms"
 
 src_compile() {
 	# compile utils
diff --git a/media-gfx/bootsplash/bootsplash-0.6.1-r6.ebuild b/media-gfx/bootsplash/bootsplash-0.6.1-r6.ebuild
index dcd1c1f6e0a6..e36c798d59ac 100644
--- a/media-gfx/bootsplash/bootsplash-0.6.1-r6.ebuild
+++ b/media-gfx/bootsplash/bootsplash-0.6.1-r6.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/media-gfx/bootsplash/bootsplash-0.6.1-r6.ebuild,v 1.1 2004/08/21 23:13:29 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash/bootsplash-0.6.1-r6.ebuild,v 1.1.1.1 2005/11/30 09:37:27 chriswhite Exp $
 
 IUSE=""
 S=${WORKDIR}
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${PN}-core-0.6.1-r6.tar.bz2
 	mirror://gentoo/${PN}-kernel-0.6.1-r6.tar.bz2"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="x86 ~amd64 ~ppc"
 
 DEPEND=">=media-libs/freetype-2
 	media-libs/libmng
diff --git a/media-gfx/bootsplash/bootsplash-0.6.1-r7.ebuild b/media-gfx/bootsplash/bootsplash-0.6.1-r7.ebuild
index 82eb8d793121..0ce0de06e4bf 100644
--- a/media-gfx/bootsplash/bootsplash-0.6.1-r7.ebuild
+++ b/media-gfx/bootsplash/bootsplash-0.6.1-r7.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/media-gfx/bootsplash/bootsplash-0.6.1-r7.ebuild,v 1.1 2004/10/11 16:30:14 dams Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash/bootsplash-0.6.1-r7.ebuild,v 1.1.1.1 2005/11/30 09:37:27 chriswhite Exp $
+
+inherit eutils
 
 IUSE=""
 S=${WORKDIR}
@@ -11,7 +13,7 @@ SRC_URI="mirror://gentoo/${PN}-core-0.6.1-r6.tar.bz2
 	mirror://gentoo/${PN}-kernel-0.6.1-r6.tar.bz2"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="amd64 ppc x86"
 
 DEPEND=">=media-libs/freetype-2
 	media-libs/libmng
@@ -20,8 +22,6 @@ DEPEND=">=media-libs/freetype-2
 
 PATCHS="${FILESDIR}/0.6.1-r7-default_theme.patch"
 
-inherit eutils
-
 src_compile() {
 	# compile utils
 	# the util builds but the rc scripts have not been modified
@@ -44,7 +44,7 @@ src_install() {
 	doexe utils/fbtruetype/fbtruetype{,.static}
 	doexe misc/bootsplash_resize
 	newexe utils/splashutils/splash splash.bin
-	doexe misc/splash
+	doexe misc/{splash,bootanim}
 	doexe utils/splashutils/{fbresolution,getkey,progress,splashpbm}
 
 	insinto /sbin
diff --git a/media-gfx/bootsplash/metadata.xml b/media-gfx/bootsplash/metadata.xml
index 13021607759c..daa8053eefc4 100644
--- a/media-gfx/bootsplash/metadata.xml
+++ b/media-gfx/bootsplash/metadata.xml
@@ -4,6 +4,6 @@
 <herd>no-herd</herd>
 <maintainer>
   <email>spock@gentoo.org</email>
-  <name>Michal 'Spock' Januszewski</name>
+  <name>Michal Januszewski</name>
 </maintainer>
 </pkgmetadata>
diff --git a/media-gfx/cfe/ChangeLog b/media-gfx/cfe/ChangeLog
index a9561968bc68..7e509b92f22f 100644
--- a/media-gfx/cfe/ChangeLog
+++ b/media-gfx/cfe/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/cfe
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/cfe/ChangeLog,v 1.1 2005/05/03 12:20:53 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/cfe/ChangeLog,v 1.1.1.1 2005/11/30 09:37:26 chriswhite Exp $
+
+  22 Jul 2005; David Holm <dholm@gentoo.org> cfe-0.12.ebuild:
+  Added to ~ppc.
 
 *cfe-0.12 (03 May 2005)
 
diff --git a/media-gfx/cfe/Manifest b/media-gfx/cfe/Manifest
index 4baff93117b8..c32bb8082344 100644
--- a/media-gfx/cfe/Manifest
+++ b/media-gfx/cfe/Manifest
@@ -1,2 +1,4 @@
-MD5 34af6d5a2669551e7428a9fa0445e81e cfe-0.12.ebuild 414
+MD5 67a0645c79e99b18586d3b2a022738f1 ChangeLog 476
+MD5 4f2b38498b0c60f04add05bc19226c5c cfe-0.12.ebuild 741
+MD5 295674d4bed87f5a7c2796e032ed561e metadata.xml 158
 MD5 5c3f3f9101c232ae3e2c1083d81fe34b files/digest-cfe-0.12 59
diff --git a/media-gfx/cfe/cfe-0.12.ebuild b/media-gfx/cfe/cfe-0.12.ebuild
index c124b6711596..cf525a9765f2 100644
--- a/media-gfx/cfe/cfe-0.12.ebuild
+++ b/media-gfx/cfe/cfe-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/media-gfx/cfe/cfe-0.12.ebuild,v 1.1 2005/05/03 12:20:53 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/cfe/cfe-0.12.ebuild,v 1.1.1.1 2005/11/30 09:37:26 chriswhite Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://download.uhulinux.hu/pub/pub/mirror/http:/lrn.ru/~osgene/files/$
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 IUSE=""
 
 DEPEND="sys-libs/ncurses"
diff --git a/media-gfx/crwinfo/ChangeLog b/media-gfx/crwinfo/ChangeLog
index 0967c72edf45..3fbc03ac4fe7 100644
--- a/media-gfx/crwinfo/ChangeLog
+++ b/media-gfx/crwinfo/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for media-gfx/crwinfo
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/crwinfo/ChangeLog,v 1.1 2005/01/27 00:28:45 swtaylor Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/crwinfo/ChangeLog,v 1.1.1.1 2005/11/30 09:37:20 chriswhite Exp $
 
 *crwinfo-0.2 (26 Jan 2005)
 
diff --git a/media-gfx/crwinfo/Manifest b/media-gfx/crwinfo/Manifest
index 8e4c273198a5..1a645a11fc38 100644
--- a/media-gfx/crwinfo/Manifest
+++ b/media-gfx/crwinfo/Manifest
@@ -1,4 +1,5 @@
-MD5 d96db87a3c8b3787915523dbdf73766b crwinfo-0.2.ebuild 738
-MD5 3fdf2ab9c011f2da531cb844f90c4af4 ChangeLog 237
+MD5 24aaba0ae136b70826ecbc67f02110f8 crwinfo-0.2.ebuild 737
+MD5 d022044f20e9368f43eeb448229e1d09 ChangeLog 328
+MD5 f9fed01984d881478192c2460c3c8b97 metadata.xml 411
 MD5 2d5ea52fe53714153ab241aac27982e6 files/crwinfo-0.2.patch 991
 MD5 2245f40e97d2e737c708af5905fc49ca files/digest-crwinfo-0.2 62
diff --git a/media-gfx/crwinfo/crwinfo-0.2.ebuild b/media-gfx/crwinfo/crwinfo-0.2.ebuild
index f47a9c2a2d66..f4252e7305a3 100644
--- a/media-gfx/crwinfo/crwinfo-0.2.ebuild
+++ b/media-gfx/crwinfo/crwinfo-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/media-gfx/crwinfo/crwinfo-0.2.ebuild,v 1.1 2005/01/27 00:28:45 swtaylor Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/crwinfo/crwinfo-0.2.ebuild,v 1.1.1.1 2005/11/30 09:37:20 chriswhite Exp $
 
 DESCRIPTION="Canon raw image (CRW) information and thumbnail extractor"
 HOMEPAGE="http://freshmeat.net/projects/crwinfo/"
diff --git a/media-gfx/cthumb/ChangeLog b/media-gfx/cthumb/ChangeLog
index 171a25287469..059038dafef3 100644
--- a/media-gfx/cthumb/ChangeLog
+++ b/media-gfx/cthumb/ChangeLog
@@ -1,8 +1,22 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/cthumb/ChangeLog,v 1.1 2002/12/02 16:35:12 mcummings Exp $
+# ChangeLog for media-gfx/cthumb
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/cthumb/ChangeLog,v 1.1.1.1 2005/11/30 09:37:46 chriswhite Exp $
 
-*cthumb-4.2 (05 Sep 2002) cthumb-4.2.ebuild ChangeLog, digest-cthumb-4.2
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> cthumb-4.2.ebuild:
+  Stable on ppc.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  13 Oct 2004; Tom Martin <slarti@gentoo.org> cthumb-4.2.ebuild:
+  Marked ~amd64, see bug 64361.
+
+  05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> cthumb-4.2.ebuild:
+  Stable on alpha.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*cthumb-4.2 (05 Sep 2002) 
 
   05 Sep 2002; Sven Vermeulen <sven.vermeulen@rug.ac.be> cthumb-4.2.ebuild :
 
diff --git a/media-gfx/cthumb/Manifest b/media-gfx/cthumb/Manifest
index e69de29bb2d1..ad49bd88a14b 100644
--- a/media-gfx/cthumb/Manifest
+++ b/media-gfx/cthumb/Manifest
@@ -0,0 +1,3 @@
+MD5 7b4e20587a3bc64ef2dbe80e316bcf15 ChangeLog 849
+MD5 9e9bc96812a4ee8c9404cb2f200acbce cthumb-4.2.ebuild 810
+MD5 ca6038e2699732769edce44324303c6b files/digest-cthumb-4.2 63
diff --git a/media-gfx/cthumb/cthumb-4.2.ebuild b/media-gfx/cthumb/cthumb-4.2.ebuild
index d0081d5c3a7a..da7bbc534fab 100644
--- a/media-gfx/cthumb/cthumb-4.2.ebuild
+++ b/media-gfx/cthumb/cthumb-4.2.ebuild
@@ -1,21 +1,20 @@
-# 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/media-gfx/cthumb/cthumb-4.2.ebuild,v 1.1 2002/12/02 16:35:12 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/cthumb/cthumb-4.2.ebuild,v 1.1.1.1 2005/11/30 09:37:46 chriswhite Exp $
 
 DESCRIPTION="Create a statical HTML Image gallery with captions for each image."
 
 HOMEPAGE="http://cthumb.sourceforge.net"
-SRC_URI="http://unc.dl.sourceforge.net/sourceforge/cthumb/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/cthumb/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~sparc64 ~alpha"
+KEYWORDS="alpha ~amd64 ppc ~sparc x86"
+IUSE=""
 
 DEPEND="dev-perl/URI
 	dev-perl/HTML-Parser
 	media-libs/netpbm"
 
-S="${WORKDIR}/${P}"
-
 src_compile() {
 	./configure \
 		--host=${CHOST} \
diff --git a/media-gfx/danpei/ChangeLog b/media-gfx/danpei/ChangeLog
index a8372d7cbb93..acad09c2ef47 100644
--- a/media-gfx/danpei/ChangeLog
+++ b/media-gfx/danpei/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for media-gfx/danpei
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/danpei/ChangeLog,v 1.1 2005/01/11 23:12:12 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/danpei/ChangeLog,v 1.1.1.1 2005/11/30 09:37:30 chriswhite Exp $
+
+  03 Oct 2005; Andrej Kacian <ticho@gentoo.org> danpei-2.9.7.ebuild:
+  Stable on x86.
+
+*danpei-2.9.7 (03 Sep 2005)
+
+  03 Sep 2005; Andrej Kacian <ticho@gentoo.org> +danpei-2.9.7.ebuild:
+  Version bump.
+
+  02 Sep 2005; Andrej Kacian <ticho@gentoo.org> danpei-2.9.6.ebuild:
+  Stable on x86.
+
+  10 Aug 2005; Luis Medinas <metalgod@gentoo.org> ChangeLog:
+  Marked ~amd64.
+
+  10 Aug 2005; Luis Medinas <metalgod@gentoo.org> danpei-2.9.6.ebuild:
+  Marked Testing on AMD64.
+
+  22 Jul 2005; David Holm <dholm@gentoo.org> danpei-2.9.6.ebuild:
+  Added to ~ppc.
 
 *danpei-2.9.6 (12 Jan 2005)
 
diff --git a/media-gfx/danpei/Manifest b/media-gfx/danpei/Manifest
index 73083cbc2733..b943427786ab 100644
--- a/media-gfx/danpei/Manifest
+++ b/media-gfx/danpei/Manifest
@@ -1,3 +1,16 @@
-MD5 5a991e35c261504de2567c7116c575ef .danpei-2.9.6.ebuild.swp 4096
-MD5 219b11462a49e9e05d9d5f9d7fe22abd danpei-2.9.6.ebuild 741
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 fec4091785c9e224976dc58d9263024e ChangeLog 963
+MD5 9099af04aba17c25e9a341122ac01f83 danpei-2.9.6.ebuild 854
+MD5 6e5a072323a991d3693fcf7979ca3795 danpei-2.9.7.ebuild 854
 MD5 b8c69e662afea1e0ea08d48fde3ee841 files/digest-danpei-2.9.6 64
+MD5 3abfe0d244e4e091801b88daa0e70df5 files/digest-danpei-2.9.7 64
+MD5 833c06ec7ce9069259dc528b9d462a31 metadata.xml 451
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDQRw+QlM6RnzZP+IRAkWQAJ4iJYIh3PUTd04mtxAakkaiLz2TGQCfQPhC
+GnQMzY+kG9v8gSuVuwai8j4=
+=bW6b
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/danpei/danpei-2.9.6.ebuild b/media-gfx/danpei/danpei-2.9.6.ebuild
index 020748389113..117b602656e9 100644
--- a/media-gfx/danpei/danpei-2.9.6.ebuild
+++ b/media-gfx/danpei/danpei-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/media-gfx/danpei/danpei-2.9.6.ebuild,v 1.1 2005/01/11 23:12:12 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/danpei/danpei-2.9.6.ebuild,v 1.1.1.1 2005/11/30 09:37:30 chriswhite Exp $
 
 DESCRIPTION="GTK1-based Image and Thumbnail viewer, explorer style."
 HOMEPAGE="http://danpei.sourceforge.net/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/danpei/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="nls"
 
 DEPEND="=x11-libs/gtk+-1.2*
diff --git a/media-gfx/danpei/danpei-2.9.7.ebuild b/media-gfx/danpei/danpei-2.9.7.ebuild
index 73065c321508..715b1b56d777 100644
--- a/media-gfx/danpei/danpei-2.9.7.ebuild
+++ b/media-gfx/danpei/danpei-2.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/media-gfx/danpei/danpei-2.9.7.ebuild,v 1.1 2005/09/03 16:40:07 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/danpei/danpei-2.9.7.ebuild,v 1.1.1.1 2005/11/30 09:37:30 chriswhite Exp $
 
 DESCRIPTION="GTK1-based Image and Thumbnail viewer, explorer style."
 HOMEPAGE="http://danpei.sourceforge.net/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/danpei/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="nls"
 
 DEPEND="=x11-libs/gtk+-1.2*
diff --git a/media-gfx/dcraw/ChangeLog b/media-gfx/dcraw/ChangeLog
index be4386f05df2..83f8e4c98d0d 100644
--- a/media-gfx/dcraw/ChangeLog
+++ b/media-gfx/dcraw/ChangeLog
@@ -1,6 +1,67 @@
 # ChangeLog for media-gfx/dcraw
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/ChangeLog,v 1.1 2004/10/17 19:56:08 wschlich Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/ChangeLog,v 1.1.1.1 2005/11/30 09:37:33 chriswhite Exp $
+
+*dcraw-7.65 (22 Sep 2005)
+
+  22 Sep 2005; Wolfram Schlich <wschlich@gentoo.org> +dcraw-7.65.ebuild:
+  version bump
+
+  13 Mar 2005; Wolfram Schlich <wschlich@gentoo.org> dcraw-6.08.ebuild,
+  dcraw-6.09.ebuild, dcraw-6.19.ebuild, dcraw-6.25.ebuild,
+  dcraw-6.31.ebuild, dcraw-6.35.ebuild:
+  fix wrong LICENSE
+
+*dcraw-7.02 (13 Mar 2005)
+
+  13 Mar 2005; Wolfram Schlich <wschlich@gentoo.org> +dcraw-7.02.ebuild:
+  version bump
+
+  12 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> dcraw-6.31.ebuild:
+  stable on amd64 wrt #84017
+
+  07 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> dcraw-6.31.ebuild:
+  Stable on sparc wrt #84017
+
+  05 Mar 2005; Joseph Jezak <josejx@gentoo.org> dcraw-6.31.ebuild:
+  Marked ppc stable for bug #84017.
+
+*dcraw-6.35 (04 Mar 2005)
+
+  04 Mar 2005; Wolfram Schlich <wschlich@gentoo.org> +dcraw-6.35.ebuild:
+  version bump
+
+*dcraw-6.31 (21 Jan 2005)
+
+  21 Jan 2005; Wolfram Schlich <wschlich@gentoo.org> +dcraw-6.31.ebuild:
+  version bump
+
+*dcraw-6.25 (17 Jan 2005)
+
+  17 Jan 2005; Wolfram Schlich <wschlich@gentoo.org> +dcraw-6.25.ebuild:
+  version bump + now including 'dcparse'
+
+  31 Dec 2004; Jason Wever <weeve@gentoo.org> dcraw-6.19.ebuild:
+  Added ~sparc keyword.
+
+*dcraw-6.19 (29 Dec 2004)
+
+  29 Dec 2004; Wolfram Schlich <wschlich@gentoo.org> +dcraw-6.19.ebuild:
+  version bump
+
+  06 Dec 2004; David Holm <dholm@gentoo.org> dcraw-6.09.ebuild:
+  Added to ~ppc.
+
+  04 Dec 2004; Mike Doty <kingtaco@gentoo.org> dcraw-6.09.ebuild:
+  ~amd64 keyword added
+
+  25 Oct 2004; Wolfram Schlich <wschlich@gentoo.org> dcraw-6.09.ebuild:
+  Fixed wrong SRC_URI
+
+*dcraw-6.09 (24 Oct 2004)
+
+  24 Oct 2004; Wolfram Schlich <wschlich@gentoo.org> +dcraw-6.09.ebuild:
+  version bump
 
 *dcraw-6.08 (17 Oct 2004)
 
diff --git a/media-gfx/dcraw/Manifest b/media-gfx/dcraw/Manifest
index 14ed00a9dd3f..faf4c2051145 100644
--- a/media-gfx/dcraw/Manifest
+++ b/media-gfx/dcraw/Manifest
@@ -1,4 +1,18 @@
-MD5 83cf1b0f1cf3b7bcd7b5300e451fb81b dcraw-6.08.ebuild 1142
+MD5 c98ab9aa079223ddbd6b1bb8a5474a4d ChangeLog 2036
+MD5 a1f872351a9024fdd92ff4b7a094d2f8 dcraw-6.08.ebuild 1234
+MD5 f1e0d76caa54abf9161e122270bbc287 dcraw-6.09.ebuild 1330
+MD5 3599fae5dd8669c89ce243f1d4da641a dcraw-6.19.ebuild 1337
+MD5 848bb82e41ee84f0bc2b5be4117699a3 dcraw-6.25.ebuild 1541
+MD5 e4a58b6502fd9bc2669c647bd7937106 dcraw-6.31.ebuild 1534
+MD5 8b3cdcc3bcee1987159e1e15bb516561 dcraw-6.35.ebuild 1538
+MD5 2d3d856d8ef114bf266ada45cadf751d dcraw-7.02.ebuild 1544
 MD5 9ec463cfd8dec8ebebb2d61eb070ada3 metadata.xml 728
-MD5 1969a9af0e55fc73af04706bc940e0b5 ChangeLog 251
+MD5 06594e3cd91a6ea708bbed8c767e6568 dcraw-7.65.ebuild 1521
 MD5 75a3faedfe2fbc457ef792c7438bf2ef files/digest-dcraw-6.08 62
+MD5 f18fbdbd428d34df0a063484f690219f files/digest-dcraw-6.09 62
+MD5 d9bd5461e3812d09c6fac5e700a0f4a6 files/digest-dcraw-6.19 62
+MD5 ce5fd286688fa453124dd4e3701c6964 files/digest-dcraw-6.25 62
+MD5 4b362e7db64e25af915237f19ddf630b files/digest-dcraw-6.31 62
+MD5 f590500d8be6917aeff5885be2807d4e files/digest-dcraw-6.35 62
+MD5 535e8b3e807f08b7eab9a4dd0bd3e2e5 files/digest-dcraw-7.02 62
+MD5 4c10d9631758ceb336348a21a89a4cb8 files/digest-dcraw-7.65 62
diff --git a/media-gfx/dcraw/dcraw-6.08.ebuild b/media-gfx/dcraw/dcraw-6.08.ebuild
index 5f4b9d812fd2..852b1a49a138 100644
--- a/media-gfx/dcraw/dcraw-6.08.ebuild
+++ b/media-gfx/dcraw/dcraw-6.08.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/media-gfx/dcraw/dcraw-6.08.ebuild,v 1.1 2004/10/17 19:56:08 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/dcraw-6.08.ebuild,v 1.1.1.1 2005/11/30 09:37:33 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
 DESCRIPTION="Converts the native (RAW) format of various digital cameras into netpbm portable pixmap (.ppm) image"
 HOMEPAGE="http://www.cybercom.net/~dcoffin/dcraw/"
 SRC_URI="http://dev.gentoo.org/~wschlich/src/media-gfx/dcraw/dcraw-6.08.tar.bz2"
-LICENSE="public-domain"
+LICENSE="freedist"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE="debug"
diff --git a/media-gfx/dcraw/dcraw-6.09.ebuild b/media-gfx/dcraw/dcraw-6.09.ebuild
index 0f35c9dd5e62..a16fae58ae45 100644
--- a/media-gfx/dcraw/dcraw-6.09.ebuild
+++ b/media-gfx/dcraw/dcraw-6.09.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/media-gfx/dcraw/dcraw-6.09.ebuild,v 1.1 2004/10/24 19:56:41 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/dcraw-6.09.ebuild,v 1.1.1.1 2005/11/30 09:37:32 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
 DESCRIPTION="Converts the native (RAW) format of various digital cameras into netpbm portable pixmap (.ppm) image"
 HOMEPAGE="http://www.cybercom.net/~dcoffin/dcraw/"
-SRC_URI="http://dev.gentoo.org/~wschlich/src/media-gfx/dcraw/dcraw-6.08.tar.bz2"
-LICENSE="public-domain"
+SRC_URI="http://dev.gentoo.org/~wschlich/src/media-gfx/dcraw/${P}.tar.bz2"
+LICENSE="freedist"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64 ~ppc"
 IUSE="debug"
 DEPEND="virtual/libc >=media-libs/jpeg-6b"
 RDEPEND="media-libs/netpbm"
diff --git a/media-gfx/dcraw/dcraw-6.19.ebuild b/media-gfx/dcraw/dcraw-6.19.ebuild
index 0ae206ea75a0..b631692fca42 100644
--- a/media-gfx/dcraw/dcraw-6.19.ebuild
+++ b/media-gfx/dcraw/dcraw-6.19.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/media-gfx/dcraw/dcraw-6.19.ebuild,v 1.1 2004/12/29 02:05:13 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/dcraw-6.19.ebuild,v 1.1.1.1 2005/11/30 09:37:33 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
 DESCRIPTION="Converts the native (RAW) format of various digital cameras into netpbm portable pixmap (.ppm) image"
 HOMEPAGE="http://www.cybercom.net/~dcoffin/dcraw/"
 SRC_URI="http://dev.gentoo.org/~wschlich/src/media-gfx/dcraw/${P}.tar.bz2"
-LICENSE="public-domain"
+LICENSE="freedist"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
 IUSE="debug"
 DEPEND="virtual/libc >=media-libs/jpeg-6b"
 RDEPEND="media-libs/netpbm"
diff --git a/media-gfx/dcraw/dcraw-6.25.ebuild b/media-gfx/dcraw/dcraw-6.25.ebuild
index b31f7c44191f..d9b9cb4d6e36 100644
--- a/media-gfx/dcraw/dcraw-6.25.ebuild
+++ b/media-gfx/dcraw/dcraw-6.25.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/dcraw-6.25.ebuild,v 1.1 2005/01/17 17:25:56 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/dcraw-6.25.ebuild,v 1.1.1.1 2005/11/30 09:37:33 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
 DESCRIPTION="Converts the native (RAW) format of various digital cameras into netpbm portable pixmap (.ppm) image"
 HOMEPAGE="http://www.cybercom.net/~dcoffin/dcraw/"
 SRC_URI="http://dev.gentoo.org/~wschlich/src/media-gfx/dcraw/${P}.tar.bz2"
-LICENSE="public-domain"
+LICENSE="freedist"
 SLOT="0"
 KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
 IUSE="debug"
diff --git a/media-gfx/dcraw/dcraw-6.31.ebuild b/media-gfx/dcraw/dcraw-6.31.ebuild
index 6842b28b8a1e..4490343a8515 100644
--- a/media-gfx/dcraw/dcraw-6.31.ebuild
+++ b/media-gfx/dcraw/dcraw-6.31.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/media-gfx/dcraw/dcraw-6.31.ebuild,v 1.1 2005/01/21 08:36:23 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/dcraw-6.31.ebuild,v 1.1.1.1 2005/11/30 09:37:33 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
 DESCRIPTION="Converts the native (RAW) format of various digital cameras into netpbm portable pixmap (.ppm) image"
 HOMEPAGE="http://www.cybercom.net/~dcoffin/dcraw/"
 SRC_URI="http://dev.gentoo.org/~wschlich/src/media-gfx/dcraw/${P}.tar.bz2"
-LICENSE="public-domain"
+LICENSE="freedist"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
+KEYWORDS="x86 amd64 ppc sparc"
 IUSE="debug"
 DEPEND="virtual/libc >=media-libs/jpeg-6b"
 RDEPEND="media-libs/netpbm"
diff --git a/media-gfx/dcraw/dcraw-6.35.ebuild b/media-gfx/dcraw/dcraw-6.35.ebuild
index 0000ad6a15d1..5f6911f844f5 100644
--- a/media-gfx/dcraw/dcraw-6.35.ebuild
+++ b/media-gfx/dcraw/dcraw-6.35.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/dcraw-6.35.ebuild,v 1.1 2005/03/04 10:29:07 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/dcraw-6.35.ebuild,v 1.1.1.1 2005/11/30 09:37:33 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
 DESCRIPTION="Converts the native (RAW) format of various digital cameras into netpbm portable pixmap (.ppm) image"
 HOMEPAGE="http://www.cybercom.net/~dcoffin/dcraw/"
 SRC_URI="http://dev.gentoo.org/~wschlich/src/media-gfx/dcraw/${P}.tar.bz2"
-LICENSE="public-domain"
+LICENSE="freedist"
 SLOT="0"
 KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
 IUSE="debug"
diff --git a/media-gfx/dcraw/dcraw-7.02.ebuild b/media-gfx/dcraw/dcraw-7.02.ebuild
index d5055b126957..e60c748cba1c 100644
--- a/media-gfx/dcraw/dcraw-7.02.ebuild
+++ b/media-gfx/dcraw/dcraw-7.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/media-gfx/dcraw/dcraw-7.02.ebuild,v 1.1 2005/03/12 23:36:36 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/dcraw-7.02.ebuild,v 1.1.1.1 2005/11/30 09:37:33 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
diff --git a/media-gfx/dcraw/dcraw-7.65.ebuild b/media-gfx/dcraw/dcraw-7.65.ebuild
index 901037b39910..b03d592ea618 100644
--- a/media-gfx/dcraw/dcraw-7.65.ebuild
+++ b/media-gfx/dcraw/dcraw-7.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/media-gfx/dcraw/dcraw-7.65.ebuild,v 1.1 2005/09/22 21:24:25 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/dcraw-7.65.ebuild,v 1.1.1.1 2005/11/30 09:37:33 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
diff --git a/media-gfx/dcraw/files/digest-dcraw-6.09 b/media-gfx/dcraw/files/digest-dcraw-6.09
index 2ffddc5e9e66..2a7ccbf5db1b 100644
--- a/media-gfx/dcraw/files/digest-dcraw-6.09
+++ b/media-gfx/dcraw/files/digest-dcraw-6.09
@@ -1 +1 @@
-MD5 9822e701c6c5cbbe852e9613d25a5de4 dcraw-6.08.tar.bz2 29895
+MD5 176848f02247a78f44d8542af17af43b dcraw-6.09.tar.bz2 30291
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index ab4ec02608d1..ab1d023dcd54 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,142 @@
 # ChangeLog for media-gfx/digikam
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.1 2002/10/24 23:14:29 hannes Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.1.1.1 2005/11/30 09:37:45 chriswhite Exp $
+
+*digikam-0.8.0_rc1 (18 Nov 2005)
+
+  18 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  -digikam-0.8.0_beta2.ebuild, +digikam-0.8.0_rc1.ebuild:
+  Version bump.
+
+  03 Oct 2005; Gregorio Guidi <greg_g@gentoo.org>
+  -files/digikam-0.8.0_beta2-configure-fix.patch, digikam-0.7.4.ebuild,
+  digikam-0.8.0_beta2.ebuild:
+  Remove configure patch, not needed anymore (see bug 107571).
+
+  02 Oct 2005; Marcus D. Hanwell <cryos@gentoo.org> digikam-0.7.4.ebuild:
+  Patch to fix configure applied to this version too, bug 107318.
+
+  27 Sep 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  +files/digikam-0.8.0_beta2-configure-fix.patch,
+  digikam-0.8.0_beta2.ebuild:
+  Patch to fix configure applied, bug 107318.
+
+*digikam-0.8.0_beta2 (25 Sep 2005)
+
+  25 Sep 2005; Carsten Lohrke <carlo@gentoo.org> -digikam-0.6.2.ebuild,
+  -digikam-0.7.2.ebuild, -digikam-0.7.3.ebuild, -digikam-0.8.0_beta1.ebuild,
+  +digikam-0.8.0_beta2.ebuild:
+  version bump
+
+  25 Sep 2005; Carsten Lohrke <carlo@gentoo.org> -digikam-0.6.2.ebuild,
+  -digikam-0.7.2.ebuild, -digikam-0.7.3.ebuild, -digikam-0.8.0_beta1.ebuild:
+  clean up
+
+*digikam-0.8.0_beta1 (16 Sep 2005)
+
+  16 Sep 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  +digikam-0.8.0_beta1.ebuild:
+  Added beta version to p.mask for testing, bug 106175.
+
+*digikam-0.7.4 (16 Sep 2005)
+
+  16 Sep 2005; Marcus D. Hanwell <cryos@gentoo.org> -digikam-0.7.ebuild,
+  +digikam-0.7.4.ebuild:
+  Version bump, I added in support for separately downloading the docs. Closes
+  bug 98425, thanks to Carsten Lohrke <carlo@gentoo.org> for the slot rebuild
+  function.
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> digikam-0.7.3.ebuild:
+  add ~alpha ~ia64
+
+*digikam-0.7.3 (07 Jul 2005)
+
+  07 Jul 2005; Carsten Lohrke <carlo@gentoo.org> digikam-0.7.1.ebuild,
+  digikam-0.7.2.ebuild, +digikam-0.7.3.ebuild:
+  version bump, remove now unnecessary block
+
+  07 Apr 2005; Simon Stelling <blubb@gentoo.org> digikam-0.7.1.ebuild:
+  stable on amd64
+
+  04 Mar 2005; Carsten Lohrke <carlo@gentoo.org> digikam-0.7.1.ebuild:
+  stable on x86
+
+*digikam-0.7.2 (03 Mar 2005)
+
+  03 Mar 2005; Carsten Lohrke <carlo@gentoo.org> +digikam-0.7.2.ebuild:
+  version bump
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> digikam-0.6.2.ebuild:
+  Changed dep on kdesdk to accept kdesdk-misc, the split package containing
+  xml2pot.
+
+*digikam-0.7.1 (04 Jan 2005)
+
+  04 Jan 2005; Carsten Lohrke <carlo@gentoo.org> +digikam-0.7.1.ebuild:
+  version bump
+
+  02 Dec 2004; Mike Doty <kingtaco@gentoo.org> digikam-0.6.2.ebuild,
+  digikam-0.7.ebuild:
+  digikam-0.6.2 stable on amd64. digikam-0.7 marked ~amd64.  See bug #67644
+
+  30 Nov 2004; Carsten Lohrke <carlo@gentoo.org> digikam-0.7.ebuild:
+  blocking media-plugins/digikamplugins for convenience
+
+*digikam-0.7 (08 Nov 2004)
+
+  08 Nov 2004; Carsten Lohrke <carlo@gentoo.org> +digikam-0.7.ebuild,
+  -digikam-0.7_rc1.ebuild:
+  version bump
+
+*digikam-0.7_rc1 (03 Nov 2004)
+
+  03 Nov 2004; Carsten Lohrke <carlo@gentoo.org> -digikam-0.5.1.ebuild,
+  -digikam-0.6.2_rc1.ebuild, -digikam-0.7_beta1.ebuild,
+  +digikam-0.7_rc1.ebuild:
+  version bump,  clean up
+
+  30 Oct 2004; Carsten Lohrke <carlo@gentoo.org> digikam-0.7_beta1.ebuild:
+  added missing media-libs/imlib2 dependency
+
+*digikam-0.7_beta1 (18 Oct 2004)
+
+  18 Oct 2004; Carsten Lohrke <carlo@gentoo.org> +digikam-0.7_beta1.ebuild:
+  version bump
+
+  05 Aug 2004; Carsten Lohrke <carlo@gentoo.org> digikam-0.6.2.ebuild:
+  stable on x86
+
+  20 Jul 2004; Carsten Lohrke <carlo@gentoo.org> digikam-0.6.2.ebuild:
+  missing dependency media-libs/imlib (#57625)
+
+  24 Jun 2004; Aron Griffis <agriffis@gentoo.org> digikam-0.6.2.ebuild:
+  add newline at eof
+
+*digikam-0.6.2 (19 Jun 2004)
+
+  19 Jun 2004; Carsten Lohrke <carlo@gentoo.org> digikam-0.6.2.ebuild:
+  version bump
+
+  09 Jun 2004; Carsten Lohrke <carlo@gentoo.org> metadata.xml:
+  added metadata.xml
+
+*digikam-0.6.2_rc1 (07 Jun 2004)
+
+  07 Jun 2004; Carsten Lohrke <carlo@gentoo.org> digikam-0.5.1.ebuild,
+  digikam-0.6.2_rc1.ebuild:
+  ebuild fixes, version bump
+
+  09 May 2004; Danny van Dyk <kugelfang@gentoo.org> digikam-0.5.1.ebuild:
+  Marked ~amd64.
+
+  09 Apr 2004; David Holm <dholm@gentoo.org> digikam-0.5.1.ebuild:
+  Added to ~ppc.
+
+  14 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> digikam-0.5.1.ebuild:
+  inherit kde instead of deprecated kde-base
+
+  02 Nov 2002; Hannes Mehnert <hannes@gentoo.org> digikam-0.5.1.ebuild:
+  marked stable for x86
 
 *digikam-0.5.1 (24 Oct 2002)
 
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index e69de29bb2d1..77960556d76b 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 974ebaec677366cfb5cfacc94b451241 ChangeLog 4787
+MD5 8ff127446138f30080170bb500661422 digikam-0.7.1.ebuild 633
+MD5 e32597bb0e1db575513309f3c705e66b digikam-0.7.4.ebuild 1160
+MD5 8dc090b18c88ab94333aaa9e47ea5dc7 digikam-0.8.0_rc1.ebuild 791
+MD5 65d75029c28dfdaa673c86aa6366ddd2 files/digest-digikam-0.7.1 67
+MD5 55bccecf6ae17fe2365bc62da5ab1640 files/digest-digikam-0.7.4 139
+MD5 3189a6646d2384a5580e28b81f19c8fa files/digest-digikam-0.8.0_rc1 70
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDfiq1ntT9W3vfTuoRAmWxAJ9J2TEajo2m0owd1FtPHTB9PK852gCfWzyC
+QgjXdC6seNFwSs63HxeUQTE=
+=6JNq
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-0.7.1.ebuild b/media-gfx/digikam/digikam-0.7.1.ebuild
index 307040fd2a11..b185b3a14bd3 100644
--- a/media-gfx/digikam/digikam-0.7.1.ebuild
+++ b/media-gfx/digikam/digikam-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/media-gfx/digikam/digikam-0.7.1.ebuild,v 1.1 2005/01/04 22:12:13 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.7.1.ebuild,v 1.1.1.1 2005/11/30 09:37:45 chriswhite Exp $
 
 inherit kde
 
@@ -13,13 +13,12 @@ SRC_URI="mirror://sourceforge/digikam/${MY_P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="x86 ~ppc amd64"
 IUSE=""
 
 DEPEND=">=media-gfx/gphoto2-2.0-r1
 	media-libs/imlib2
 	>=media-libs/libkexif-0.2.1
 	media-libs/libkipi
-	sys-libs/gdbm
-	!media-plugins/digikamplugins"
+	sys-libs/gdbm"
 need-kde 3.2
diff --git a/media-gfx/digikam/digikam-0.7.4.ebuild b/media-gfx/digikam/digikam-0.7.4.ebuild
index 3bbd70157741..17a8b5e1c99b 100644
--- a/media-gfx/digikam/digikam-0.7.4.ebuild
+++ b/media-gfx/digikam/digikam-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/media-gfx/digikam/digikam-0.7.4.ebuild,v 1.1 2005/09/16 19:50:42 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.7.4.ebuild,v 1.1.1.1 2005/11/30 09:37:45 chriswhite Exp $
 
 inherit kde
 
diff --git a/media-gfx/digikam/digikam-0.8.0_rc1.ebuild b/media-gfx/digikam/digikam-0.8.0_rc1.ebuild
index 35abbf099396..bf371da0ae76 100644
--- a/media-gfx/digikam/digikam-0.8.0_rc1.ebuild
+++ b/media-gfx/digikam/digikam-0.8.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/media-gfx/digikam/digikam-0.8.0_rc1.ebuild,v 1.1 2005/11/18 19:25:29 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.8.0_rc1.ebuild,v 1.1.1.1 2005/11/30 09:37:45 chriswhite Exp $
 
 inherit kde
 
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml
index b435a8440ccd..8d1e86a9cefb 100644
--- a/media-gfx/digikam/metadata.xml
+++ b/media-gfx/digikam/metadata.xml
@@ -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/media-gfx/duhdraw/ChangeLog b/media-gfx/duhdraw/ChangeLog
index 4bf3975a11b5..c30e8b5721d9 100644
--- a/media-gfx/duhdraw/ChangeLog
+++ b/media-gfx/duhdraw/ChangeLog
@@ -1,8 +1,26 @@
 # ChangeLog for media-gfx/duhdraw
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/duhdraw/ChangeLog,v 1.1 2003/05/12 12:11:59 hanno Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/duhdraw/ChangeLog,v 1.1.1.1 2005/11/30 09:37:27 chriswhite Exp $
 
-*media-gfx/duhdraw-2.8.12 (12 May 2003)
+  31 Oct 2005; Fabian Groffen <grobian@gentoo.org>
+  +files/duhdraw-2.8.12-macos.patch, duhdraw-2.8.12.ebuild:
+  Adding a small patch to allow compilation on OSX.  Marked ~ppc-macos (bug
+  #110946)
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> duhdraw-2.8.12.ebuild:
+  Stable on ppc.
+
+  30 May 2005; Sven Wegener <swegener@gentoo.org> duhdraw-2.8.12.ebuild:
+  Moved from gcc.eclass to toolchain-funcs.eclass, bug #92745.
+
+  24 Nov 2004; Daniel Black <dragonheart@gentoo.org> duhdraw-2.8.12.ebuild:
+  homepage change as per bug #72080. Thanks to Kurt McKee
+  <kurtmckee@northwestern.edu>
+
+  24 Jun 2004; David Holm <dholm@gentoo.org> duhdraw-2.8.12.ebuild:
+  Added to ~ppc.
+
+*duhdraw-2.8.12 (12 May 2003)
 
   12 May 2003; Hanno Boeck <hanno@gentoo.org> duhdraw-2.8.12 :
   Initial import.
diff --git a/media-gfx/duhdraw/Manifest b/media-gfx/duhdraw/Manifest
index 48c25e375573..7022395704bf 100644
--- a/media-gfx/duhdraw/Manifest
+++ b/media-gfx/duhdraw/Manifest
@@ -1,2 +1,4 @@
-MD5 dcca2108a0db5086d987674fb9664364 duhdraw-2.8.12.ebuild 611
-MD5 81f11eb29042db12aa01a8df9010c9e5 ChangeLog 337
+MD5 5702c3b2740e60c1c92047c8f1f42cb4 duhdraw-2.8.12.ebuild 715
+MD5 1a41ca3bb299a7dae1f7ecac9c3daa74 ChangeLog 1003
+MD5 60e17777f9055fb9661ea67f3844b90a files/duhdraw-2.8.12-macos.patch 325
+MD5 f5c613c6ba0e95bfbc2e828b96191f50 files/digest-duhdraw-2.8.12 65
diff --git a/media-gfx/duhdraw/duhdraw-2.8.12.ebuild b/media-gfx/duhdraw/duhdraw-2.8.12.ebuild
index b5fe2bd0eaeb..f7dad8896b7d 100644
--- a/media-gfx/duhdraw/duhdraw-2.8.12.ebuild
+++ b/media-gfx/duhdraw/duhdraw-2.8.12.ebuild
@@ -1,22 +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/media-gfx/duhdraw/duhdraw-2.8.12.ebuild,v 1.1 2003/05/12 12:11:59 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/duhdraw/duhdraw-2.8.12.ebuild,v 1.1.1.1 2005/11/30 09:37:27 chriswhite Exp $
+
+inherit toolchain-funcs eutils
 
 DESCRIPTION="ASCII art editor"
-HOMEPAGE="http://www.wwco.com/~wls/opensource/duhdraw.php"
+HOMEPAGE="http://www.cs.helsinki.fi/u/penberg/duhdraw"
 SRC_URI="http://www.wwco.com/~wls/opensource/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="ppc ~ppc-macos x86"
 IUSE=""
+
 DEPEND="sys-libs/ncurses"
-S=${WORKDIR}/${P}
+
+src_unpack() {
+	unpack "${A}"
+	epatch "${FILESDIR}/${P}"-macos.patch
+}
 
 src_compile() {
-	emake CC="${CC} -s ${CFLAGS}" || die
+	emake CC="$(tc-getCC) -s ${CFLAGS}" || die
 }
 
 src_install() {
-	dobin ansi ansitoc duhdraw
+	dobin ansi ansitoc duhdraw || die
 	dodoc CREDITS HISTORY TODO READ.ME
 }
diff --git a/media-gfx/eclips/ChangeLog b/media-gfx/eclips/ChangeLog
index e27edad2d7ff..8a68fd04f867 100644
--- a/media-gfx/eclips/ChangeLog
+++ b/media-gfx/eclips/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for media-gfx/eclips
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eclips/ChangeLog,v 1.1 2005/03/30 01:01:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eclips/ChangeLog,v 1.1.1.1 2005/11/30 09:37:47 chriswhite Exp $
 
 *eclips-* (29 Mar 2005)
 
diff --git a/media-gfx/eclips/Manifest b/media-gfx/eclips/Manifest
index eb5959553c80..f188091001a5 100644
--- a/media-gfx/eclips/Manifest
+++ b/media-gfx/eclips/Manifest
@@ -1,2 +1,4 @@
-MD5 1ba22d674d2b523c93c24824ec5779fa eclips-9999.ebuild 283
+MD5 147d6615f0bce8c9b379c5ef9f0e5763 eclips-9999.ebuild 380
+MD5 1fb0cef8c20e31d8fee121ebb2205588 metadata.xml 221
+MD5 d1e31aec8843f8deaeef49b08da9ea57 ChangeLog 335
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-eclips-9999 0
diff --git a/media-gfx/eclips/eclips-9999.ebuild b/media-gfx/eclips/eclips-9999.ebuild
index 489085f829de..275943c7ea8e 100644
--- a/media-gfx/eclips/eclips-9999.ebuild
+++ b/media-gfx/eclips/eclips-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/media-gfx/eclips/eclips-9999.ebuild,v 1.1 2005/03/30 01:01:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eclips/eclips-9999.ebuild,v 1.1.1.1 2005/11/30 09:37:47 chriswhite Exp $
 
 ECVS_MODULE="misc/eclips"
 inherit enlightenment
diff --git a/media-gfx/ee/ChangeLog b/media-gfx/ee/ChangeLog
index c9a91b83381d..2e1444c107cf 100644
--- a/media-gfx/ee/ChangeLog
+++ b/media-gfx/ee/ChangeLog
@@ -1,7 +1,46 @@
 # ChangeLog for media-gfx/ee
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/ee/ChangeLog,v 1.1 2002/02/01 21:53:29 gbevin Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/ee/ChangeLog,v 1.1.1.1 2005/11/30 09:37:30 chriswhite Exp $
 
+  18 Oct 2005; Mike Frysinger <vapier@gentoo.org> ee-0.3.12-r3.ebuild:
+  Cleanup ebuild and fix nls issues #99762.
+
+  11 Aug 2005; Mark Loeser <halcy0n@gentoo.org> +metadata.xml,
+  ee-0.3.12-r2.ebuild, ee-0.3.12-r3.ebuild:
+  Fixed description; bug #92145 and added metadata.xml
+
+  01 Jul 2005; Ferris McCormick <fmccor@gentoo.org> ee-0.3.12-r3.ebuild:
+  Add ~sparc keyword (after user query); builds without incident and appears
+  to run fine.
+
+  01 Jul 2005; Ferris McCormick <fmccor@gentoo.org> ee-0.3.12-r2.ebuild:
+  Add ~sparc keyword as a result of a user query; seems to work fine.
+
+*ee-0.3.12-r3 (07 Dec 2004)
+
+  07 Dec 2004; Akinori Hattori <hattya@gentoo.org> +ee-0.3.12-r3.ebuild:
+  fixes bug #73179.
+
+  01 Oct 2004; <pyrania@gentoo.org> ee-0.3.12-r2.ebuild:
+  Made epatch aware.
+
+  15 Dec 2003; Jon Portnoy <avenj@gentoo.org> ee-0.3.12-r2.ebuild :
+  AMD64 keywords. Also added gnuconfig_update.
+
+*ee-0.3.12-r2 (9 May 2002)
+ 
+  30 Nov 2002; Jon Nall <nall@gentoo.org> ee-0.3.12-r2.ebuild :
+  added ~ppc to KEYWORDS
+
+  15 Oct 2002; Seemant Kulleen <seemant@gentoo.org> ee-0.3.12-r2.ebuild :
+
+  Added db-1 as a dependency. Thanks to: bradh@frogmouth.net (Brad Hards) in
+  bug #9149.
+
+  9 May 2002; Spider <spider@gentoo.org> ee-0.3.12-r2.ebuild :
+  patch for -mo files
+  nls-update
+  
 *ee-0.3.12-r1 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
diff --git a/media-gfx/ee/Manifest b/media-gfx/ee/Manifest
index e69de29bb2d1..2ecf125b0058 100644
--- a/media-gfx/ee/Manifest
+++ b/media-gfx/ee/Manifest
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 aed452930c31d29d227abbb68cb7b4e1 ChangeLog 1951
+MD5 b613f22d8c4048df84acc9592ee34f27 ee-0.3.12-r2.ebuild 985
+MD5 f68040d1aef8436f41b3c79d6aee2e40 ee-0.3.12-r3.ebuild 1357
+MD5 bd6a1a727ab6ef5c722ecf4f77cf719e files/digest-ee-0.3.12-r2 61
+MD5 bd6a1a727ab6ef5c722ecf4f77cf719e files/digest-ee-0.3.12-r3 61
+MD5 3a9923f87aa62b5de53e8fe037fc0dae files/ee-mo.diff 502
+MD5 5fc54c5d01402d0610fafa96961bb8e0 metadata.xml 161
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDVHkWgIKl8Uu19MoRAtGVAJ9pkznHWf+IQppM6WPpzUvQbiyV8QCfYI7g
+bWuTWqKxvw22VyCS+0Ngow0=
+=0qGz
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/ee/ee-0.3.12-r2.ebuild b/media-gfx/ee/ee-0.3.12-r2.ebuild
index b686cd0c04aa..943d925f22f3 100644
--- a/media-gfx/ee/ee-0.3.12-r2.ebuild
+++ b/media-gfx/ee/ee-0.3.12-r2.ebuild
@@ -1,28 +1,36 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author: Achim Gottinger <achim@gentoo.org>
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/ee/ee-0.3.12-r2.ebuild,v 1.1.1.1 2005/11/30 09:37:30 chriswhite Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION="ee"
+inherit gnuconfig eutils
+
+IUSE="nls"
+
+DESCRIPTION="Electric Eyes image viewer"
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.gnome.org/"
 
-DEPEND=">=gnome-base/gnome-libs-1.4.1.2-r1
-	nls? ( sys-devel/gettext )"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc amd64"
 
+DEPEND="=sys-libs/db-1*
+	>=gnome-base/gnome-libs-1.4.1.2-r1"
+RDEPEND="nls? ( sys-devel/gettext )"
 
-RDEPEND=$DEPEND
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	patch -p1 < ${FILESDIR}/${PN}-mo.diff
+	epatch ${FILESDIR}/${PN}-mo.diff || die "epatch failed!"
 }
 
 src_compile() {
+	gnuconfig_update
+
 	local myconf
-	use nls && myconf="--enable-nls" || myconf="--disable-nls" 
-	
-	econf ${myconf} || die "configure failure" 
+	use nls && myconf="--enable-nls" || myconf="--disable-nls"
+
+	econf ${myconf} || die "configure failure"
 	emake || die "make failure"
 }
 
diff --git a/media-gfx/ee/ee-0.3.12-r3.ebuild b/media-gfx/ee/ee-0.3.12-r3.ebuild
index 3d810d858491..ecf57f24f3d1 100644
--- a/media-gfx/ee/ee-0.3.12-r3.ebuild
+++ b/media-gfx/ee/ee-0.3.12-r3.ebuild
@@ -1,56 +1,51 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/ee/ee-0.3.12-r3.ebuild,v 1.1 2004/12/07 10:20:21 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/ee/ee-0.3.12-r3.ebuild,v 1.1.1.1 2005/11/30 09:37:30 chriswhite Exp $
 
 inherit gnuconfig eutils
 
-IUSE="nls"
-
-DESCRIPTION="ee"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz"
+DESCRIPTION="Electric Eyes image viewer"
 HOMEPAGE="http://www.gnome.org/"
+SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="nls"
 
 DEPEND="=sys-libs/db-1*
-	>=gnome-base/gnome-libs-1.4.1.2-r1"
-RDEPEND="nls? ( sys-devel/gettext )"
+	>=gnome-base/gnome-libs-1.4.1.2-r1
+	nls? ( sys-devel/gettext )"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-mo.diff || die "epatch failed!"
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-mo.diff
+	strip-linguas -i po
 }
 
 src_compile() {
-	gnuconfig_update
-
-	local myconf
-	use nls && myconf="--enable-nls" || myconf="--disable-nls"
-
-	econf ${myconf} || die "configure failure"
+	econf \
+		--program-suffix=yes \
+		$(use_enable nls) \
+		|| die "configure failure"
 	emake || die "make failure"
 }
 
 src_install() {
-	make DESTDIR=${D} \
-	     prefix=/usr \
-	     install || die "make install failure"
-	dodoc AUTHORS COPYING ChangeLog NEWS README
+	make DESTDIR="${D}" install || die "make install failure"
+	dodoc AUTHORS ChangeLog NEWS README
 
 	# ee -> eeyes (bug #73179)
 	# based on official Debian package's control file 
-	mv ${D}/usr/bin/{ee,eeyes}
-	mv ${D}/usr/bin/{ee,eeyes}
-	mv ${D}/usr/share/gnome/help/{ee,eeyes}
+	mv "${D}"/usr/share/gnome/help/{ee,eeyes}
 
-	sed 's:\(=ee\):\1yes:' ${D}/usr/share/mime-info/ee.keys \
-		> ${D}/usr/share/mime-info/eeyes.keys
-	rm ${D}/usr/share/mime-info/ee.keys
+	sed 's:\(=ee\):\1yes:' "${D}"/usr/share/mime-info/ee.keys \
+		> "${D}"/usr/share/mime-info/eeyes.keys
+	rm "${D}"/usr/share/mime-info/ee.keys
 
-	sed 's:\(Exec=ee\):\1yes:' ${D}/usr/share/gnome/apps/Graphics/ee.desktop \
-		> ${D}/usr/share/gnome/apps/Graphics/eeyes.desktop
-	rm ${D}/usr/share/gnome/apps/Graphics/ee.desktop
+	dodir /usr/share/applications
+	sed 's:\(Exec=ee\):\1yes:' "${D}"/usr/share/gnome/apps/Graphics/ee.desktop \
+		> "${D}"/usr/share/applications/eeyes.desktop
+	rm -r "${D}"/usr/share/gnome/apps
 }
diff --git a/media-gfx/elicit/ChangeLog b/media-gfx/elicit/ChangeLog
index 0a1a1ecf5807..44f84b722ef8 100644
--- a/media-gfx/elicit/ChangeLog
+++ b/media-gfx/elicit/ChangeLog
@@ -1,8 +1,8 @@
 # ChangeLog for media-gfx/elicit
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/elicit/ChangeLog,v 1.1 2003/10/20 15:21:12 vapier Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/elicit/ChangeLog,v 1.1.1.1 2005/11/30 09:37:40 chriswhite Exp $
 
-*elicit-0.7.20031020 (20 Oct 2003)
+*elicit-0.7.2004* (20 Oct 2003)
 
   20 Oct 2003; Mike Frysinger <vapier@gentoo.org> :
   Initial import.  Ebuild submitted by me.
diff --git a/media-gfx/elicit/Manifest b/media-gfx/elicit/Manifest
index be4bfdc855a7..054e9c6ec7ee 100644
--- a/media-gfx/elicit/Manifest
+++ b/media-gfx/elicit/Manifest
@@ -1,4 +1,6 @@
-MD5 6b33fb301b7a7ac8ced393598c5bc705 files/digest-elicit-0.7.20031020 71
-MD5 dbedd3f1d7da70be6165765b2ebbb449 elicit-0.7.20031020.ebuild 784
-MD5 2a7191b20c87e83a35c2d67d4ceccf79 ChangeLog 345
+MD5 4380fef4dee07977eec358da3a63cc10 ChangeLog 335
 MD5 e278aab9096d59677b60b477be54fec4 metadata.xml 287
+MD5 c63ca448e929c8c9e89db0b5c1156e5d elicit-0.9.0.20050116.ebuild 494
+MD5 cd1090e2ac6834adff61ac7e23bad67b elicit-9999.ebuild 484
+MD5 94d400d964dd59e1a51b2d3ba66276e2 files/digest-elicit-0.9.0.20050116 74
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-elicit-9999 0
diff --git a/media-gfx/elicit/elicit-0.9.0.20050116.ebuild b/media-gfx/elicit/elicit-0.9.0.20050116.ebuild
index 81dad831dc21..7ca3eaf7ab72 100644
--- a/media-gfx/elicit/elicit-0.9.0.20050116.ebuild
+++ b/media-gfx/elicit/elicit-0.9.0.20050116.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/elicit/elicit-0.9.0.20050116.ebuild,v 1.1 2005/01/17 05:05:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/elicit/elicit-0.9.0.20050116.ebuild,v 1.1.1.1 2005/11/30 09:37:40 chriswhite Exp $
 
 inherit enlightenment
 
 DESCRIPTION="tool for examining images on your desktop"
 HOMEPAGE="http://enlightenment.org/pages/elicit.html"
 
-DEPEND=">=x11-libs/evas-1.0.0_pre13
-	>=x11-libs/ecore-1.0.0_pre7
+DEPEND=">=x11-libs/evas-0.9.9
+	>=x11-libs/ecore-0.9.9
 	>=media-libs/edje-0.5.0
-	>=x11-libs/esmart-0.0.2.20040501
-	>=media-libs/imlib2-1.1.1"
+	>=x11-libs/esmart-0.0.3
+	>=media-libs/imlib2-1.2.0"
diff --git a/media-gfx/elicit/elicit-9999.ebuild b/media-gfx/elicit/elicit-9999.ebuild
index 5b681a14a625..cd33b53ccff6 100644
--- a/media-gfx/elicit/elicit-9999.ebuild
+++ b/media-gfx/elicit/elicit-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/elicit/elicit-9999.ebuild,v 1.1 2004/10/22 12:51:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/elicit/elicit-9999.ebuild,v 1.1.1.1 2005/11/30 09:37:40 chriswhite Exp $
 
 inherit enlightenment
 
 DESCRIPTION="tool for examining images on your desktop"
 HOMEPAGE="http://enlightenment.org/pages/elicit.html"
 
-DEPEND=">=x11-libs/evas-1.0.0_pre13
-	>=x11-libs/ecore-1.0.0_pre7
+DEPEND=">=x11-libs/evas-0.9.9
+	>=x11-libs/ecore-0.9.9
 	>=media-libs/edje-0.5.0
-	>=x11-libs/esmart-0.0.2.20040501
-	>=media-libs/imlib2-1.1.1"
+	>=x11-libs/esmart-0.0.3
+	>=media-libs/imlib2-1.2.0"
diff --git a/media-gfx/enblend/ChangeLog b/media-gfx/enblend/ChangeLog
index 2ccf74478705..f353d5cc1a55 100644
--- a/media-gfx/enblend/ChangeLog
+++ b/media-gfx/enblend/ChangeLog
@@ -1,6 +1,33 @@
 # ChangeLog for media-gfx/enblend
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/ChangeLog,v 1.1 2005/02/24 04:02:01 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/ChangeLog,v 1.1.1.1 2005/11/30 09:37:19 chriswhite Exp $
+
+  06 Nov 2005; Luis Medinas <metalgod@gentoo.org> enblend-2.3.ebuild:
+  Marked Stable on amd64.
+
+  13 Sep 2005; Mark Loeser <halcy0n@gentoo.org> enblend-2.3.ebuild:
+  Stable on x86
+
+  06 Sep 2005; Olivier Crête <tester@gentoo.org> enblend-2.2.ebuild:
+  Stable on amd64
+
+*enblend-2.3 (11 Aug 2005)
+
+  11 Aug 2005; Mark Loeser <halcy0n@gentoo.org> metadata.xml,
+  enblend-2.2.ebuild, +enblend-2.3.ebuild:
+  Version bump to enblend-2.3.  bug #93305
+  enblend-2.2 stable on x86
+
+  21 Apr 2005; Herbie Hopkins <herbs@gentoo.org> enblend-2.2.ebuild:
+  ~amd64 keyword added
+
+*enblend-2.2 (21 Apr 2005)
+
+  21 Apr 2005; Luca Barbato <lu_zero@gentoo.org> +enblend-2.2.ebuild:
+  New version
+
+  07 Apr 2005; Marcus D. Hanwell <cryos@gentoo.org> enblend-2.1.ebuild:
+  Marked ~amd64, closes bug 87438.
 
 *enblend-2.1 (24 Feb 2005)
 
diff --git a/media-gfx/enblend/Manifest b/media-gfx/enblend/Manifest
index 9c9352a217a8..7d5b4b56d12d 100644
--- a/media-gfx/enblend/Manifest
+++ b/media-gfx/enblend/Manifest
@@ -1,4 +1,18 @@
-MD5 5fc54c5d01402d0610fafa96961bb8e0 metadata.xml 161
-MD5 096ff77e49179fe4699eae72486f634d enblend-2.1.ebuild 516
-MD5 9f7cbf84b12812384de1501ffcddd3fc ChangeLog 321
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4673c6dabc418cd925a03f084a6bba03 ChangeLog 1202
+MD5 130338d6cc19602b633244fad664d8e8 enblend-2.1.ebuild 604
+MD5 92062b118713aa0611aee5c1d9c34a4d enblend-2.2.ebuild 603
+MD5 a2ae9ecb369821cec7523f45948a3291 enblend-2.3.ebuild 605
 MD5 d4cecbd66e4d004a854f32ca2c15e321 files/digest-enblend-2.1 63
+MD5 b0d7ff691bb4f3f1daf0fc7d5a3983d0 files/digest-enblend-2.2 63
+MD5 2ca5f402d09503ce5950b4868323184c files/digest-enblend-2.3 63
+MD5 3a477b460f42a5c49aadc5971992e834 metadata.xml 251
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDbXcQwUpWvClEHQoRAteZAJoCMC/bSp6qn2YghYbALTHVS+By8QCfeIG7
+qyEGqmVNFKCEYWpz7aT6L1M=
+=ar55
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/enblend/enblend-2.1.ebuild b/media-gfx/enblend/enblend-2.1.ebuild
index 589f4849175f..fcd4bcfae822 100644
--- a/media-gfx/enblend/enblend-2.1.ebuild
+++ b/media-gfx/enblend/enblend-2.1.ebuild
@@ -1,13 +1,13 @@
-# 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/media-gfx/enblend/enblend-2.1.ebuild,v 1.1 2005/02/24 04:02:01 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/enblend-2.1.ebuild,v 1.1.1.1 2005/11/30 09:37:19 chriswhite Exp $
 
 DESCRIPTION="Image Blending with Multiresolution Splines"
 HOMEPAGE="http://enblend.sf.net"
 SRC_URI="mirror://sourceforge/enblend/${P}.tar.gz"
 LICENSE="GPL-2 VIGRA"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~amd64"
 IUSE=""
 
 DEPEND="media-libs/tiff
diff --git a/media-gfx/enblend/enblend-2.2.ebuild b/media-gfx/enblend/enblend-2.2.ebuild
index 20dd9bb8764e..ea9cbc722369 100644
--- a/media-gfx/enblend/enblend-2.2.ebuild
+++ b/media-gfx/enblend/enblend-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/media-gfx/enblend/enblend-2.2.ebuild,v 1.1 2005/04/21 22:56:19 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/enblend-2.2.ebuild,v 1.1.1.1 2005/11/30 09:37:19 chriswhite Exp $
 
 DESCRIPTION="Image Blending with Multiresolution Splines"
 HOMEPAGE="http://enblend.sf.net"
 SRC_URI="mirror://sourceforge/enblend/${P}.tar.gz"
 LICENSE="GPL-2 VIGRA"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 DEPEND="media-libs/tiff
diff --git a/media-gfx/enblend/enblend-2.3.ebuild b/media-gfx/enblend/enblend-2.3.ebuild
index e44b16d017c9..2c3ea03ab0f8 100644
--- a/media-gfx/enblend/enblend-2.3.ebuild
+++ b/media-gfx/enblend/enblend-2.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/media-gfx/enblend/enblend-2.3.ebuild,v 1.1 2005/08/11 01:08:17 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/enblend-2.3.ebuild,v 1.1.1.1 2005/11/30 09:37:19 chriswhite Exp $
 
 DESCRIPTION="Image Blending with Multiresolution Splines"
 HOMEPAGE="http://enblend.sf.net"
 SRC_URI="mirror://sourceforge/enblend/${P}.tar.gz"
 LICENSE="GPL-2 VIGRA"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 DEPEND="media-libs/tiff
diff --git a/media-gfx/enblend/metadata.xml b/media-gfx/enblend/metadata.xml
index e770d1bc9a96..2281daf5fa2d 100644
--- a/media-gfx/enblend/metadata.xml
+++ b/media-gfx/enblend/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>graphics</herd>
+<maintainer>
+  <email>halcy0n@gentoo.org</email>
+  <name>Mark Loeser</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/entice/ChangeLog b/media-gfx/entice/ChangeLog
index 15b49660a978..6da40b2d9413 100644
--- a/media-gfx/entice/ChangeLog
+++ b/media-gfx/entice/ChangeLog
@@ -1,8 +1,16 @@
 # ChangeLog for media-gfx/entice
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/entice/ChangeLog,v 1.1 2003/02/20 12:39:32 vapier Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/entice/ChangeLog,v 1.1.1.1 2005/11/30 09:37:24 chriswhite Exp $
 
-*entice-0.7.0.20030220 (20 Feb 2003)
+*entice-0.9.0.* (18 Oct 2003)
+
+  27 Mar 2003; Seemant Kulleen <seemant@gentoo.org>
+  entice-0.7.0.20030220-r1.ebuild:
+  force upgrade to rid of pic flag
+
+  13 Mar 2003; Aron Griffis <agriffis@gentoo.org>
+  entice-0.7.0.20030220.ebuild:
+  Add ~alpha to KEYWORDS
 
   20 Feb 2003; Mike Frysinger <vapier@gentoo.org> :
   Initial import.  Ebuild submitted by me.
diff --git a/media-gfx/entice/Manifest b/media-gfx/entice/Manifest
index e69de29bb2d1..99fa9596f631 100644
--- a/media-gfx/entice/Manifest
+++ b/media-gfx/entice/Manifest
@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6e4c4426bc160e39111ba5a7b1760c7f entice-0.9.3.004.ebuild 491
+MD5 2f04d0e18e32bd8fb05bcadc8114d3fa metadata.xml 307
+MD5 ca90bffb7e903fb210e9ed3efbec2824 entice-0.9.3.003.ebuild 491
+MD5 ad17e60e573cb45c6b4dc8c915916e28 entice-9999.ebuild 486
+MD5 2fbf23fd277068fea549fcf6a5af9a54 ChangeLog 564
+MD5 1e69004db3610a8676f624fdec1e6cd4 files/digest-entice-0.9.3.003 68
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-entice-9999 0
+MD5 d98f03cdfdb65cc35824dc25e0d44f83 files/digest-entice-0.9.3.004 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDBr1RgIKl8Uu19MoRAmprAJ0YOHowRfbYcTbItBmQ00DnCXJj/QCfZ0FX
+q7itk6Yyxe04YWEX9kArbq4=
+=t9Oq
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/entice/entice-0.9.3.003.ebuild b/media-gfx/entice/entice-0.9.3.003.ebuild
index 4c31c39092b7..dff7a6e6c8e1 100644
--- a/media-gfx/entice/entice-0.9.3.003.ebuild
+++ b/media-gfx/entice/entice-0.9.3.003.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/entice/entice-0.9.3.003.ebuild,v 1.1 2005/05/20 03:25:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/entice/entice-0.9.3.003.ebuild,v 1.1.1.1 2005/11/30 09:37:24 chriswhite Exp $
 
 inherit enlightenment
 
diff --git a/media-gfx/entice/entice-0.9.3.004.ebuild b/media-gfx/entice/entice-0.9.3.004.ebuild
index 2ffb2d1f3a5a..b036812824c3 100644
--- a/media-gfx/entice/entice-0.9.3.004.ebuild
+++ b/media-gfx/entice/entice-0.9.3.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/media-gfx/entice/entice-0.9.3.004.ebuild,v 1.1 2005/08/20 05:18:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/entice/entice-0.9.3.004.ebuild,v 1.1.1.1 2005/11/30 09:37:24 chriswhite Exp $
 
 inherit enlightenment
 
diff --git a/media-gfx/entice/entice-9999.ebuild b/media-gfx/entice/entice-9999.ebuild
index 93218ca4761f..04917fd77585 100644
--- a/media-gfx/entice/entice-9999.ebuild
+++ b/media-gfx/entice/entice-9999.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/media-gfx/entice/entice-9999.ebuild,v 1.1 2004/10/21 20:31:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/entice/entice-9999.ebuild,v 1.1.1.1 2005/11/30 09:37:24 chriswhite Exp $
 
 inherit enlightenment
 
 DESCRIPTION="the E image browser"
 HOMEPAGE="http://www.enlightenment.org/pages/entice.html"
 
-DEPEND=">=media-libs/imlib2-1.1.1
-	>=x11-libs/evas-1.0.0_pre13
+DEPEND=">=media-libs/imlib2-1.2.0
+	>=x11-libs/evas-0.9.9
 	>=dev-db/edb-1.0.5
-	>=x11-libs/ecore-1.0.0_pre7
-	>=x11-libs/esmart-0.0.2.20040501
+	>=x11-libs/ecore-0.9.9
+	>=x11-libs/esmart-0.9.0
 	>=media-libs/edje-0.5.0"
diff --git a/media-gfx/eog/ChangeLog b/media-gfx/eog/ChangeLog
index 3f4c9f301eee..ac36ba9cb274 100644
--- a/media-gfx/eog/ChangeLog
+++ b/media-gfx/eog/ChangeLog
@@ -1,11 +1,403 @@
 # ChangeLog for media-gfx/eog
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/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/media-gfx/eog/ChangeLog,v 1.1.1.1 2005/11/30 09:37:39 chriswhite Exp $
+
+  10 Oct 2005; Hardave Riar <hardave@gentoo.org> eog-2.10.2.ebuild:
+  Stable on mips.
+
+*eog-2.12.1 (06 Oct 2005)
+
+  06 Oct 2005; Leonardo Boshell <leonardop@gentoo.org> -eog-2.12.0.ebuild,
+  +eog-2.12.1.ebuild:
+  New version.
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> eog-2.10.2.ebuild:
+  Mark 2.10.2 stable on alpha
+
+*eog-2.12.0 (07 Sep 2005)
+
+  07 Sep 2005; Leonardo Boshell <leonardop@gentoo.org> -eog-2.10.0.ebuild,
+  -eog-2.11.92.ebuild, +eog-2.12.0.ebuild:
+  New version.
+
+  03 Sep 2005; Markus Rothe <corsair@gentoo.org> eog-2.10.2.ebuild:
+  Stable on ppc64
+
+  02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> eog-2.10.2.ebuild:
+  Stable on ppc.
+
+*eog-2.11.92 (28 Aug 2005)
+
+  28 Aug 2005; John N. Laliberte <allanonjl@gentoo.org> -eog-2.11.90.ebuild,
+  +eog-2.11.92.ebuild:
+  new version
+
+  28 Aug 2005; Simon Stelling <blubb@gentoo.org> eog-2.10.2.ebuild:
+  stable on amd64
+
+  26 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> eog-2.10.2.ebuild:
+  Stable on sparc
+
+  25 Aug 2005; Aron Griffis <agriffis@gentoo.org> eog-2.10.2.ebuild:
+  stable on ia64
+
+  25 Aug 2005; Leonardo Boshell <leonardop@gentoo.org> eog-2.10.2.ebuild:
+  Stable on x86.
+
+*eog-2.11.90 (22 Aug 2005)
+
+  22 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
+  +files/eog-2.11.90-pkgconfig_macro.patch, +eog-2.11.90.ebuild:
+  New version. Added 'lcms' USE flag.
+
+  08 Aug 2005; Markus Rothe <corsair@gentoo.org> eog-2.10.0.ebuild:
+  Stable on ppc64
+
+  02 Aug 2005; Simon Stelling <blubb@gentoo.org> eog-2.10.0.ebuild:
+  stable on amd64
+
+  31 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org> eog-2.10.0.ebuild:
+  ppc stable
+
+  27 Jul 2005; Guy Martin <gmsoft@gentoo.org> eog-2.10.0.ebuild:
+  Stable on hppa.
+
+  27 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> eog-2.10.0.ebuild:
+  Stable on sparc
+
+  26 Jul 2005; Leonardo Boshell <leonardop@gentoo.org> eog-2.10.0.ebuild:
+  Stable on x86.
+
+*eog-2.10.2 (20 Jul 2005)
+
+  20 Jul 2005; Leonardo Boshell <leonardop@gentoo.org> eog-2.10.2.ebuild:
+  New version.
+
+*eog-2.10.0 (18 Apr 2005)
+
+  18 Apr 2005; Joe McCann <joem@gentoo.org> +eog-2.10.0.ebuild:
+  bugfix release
+
+  08 Apr 2005; Markus Rothe <corsair@gentoo.org> eog-2.8.2.ebuild:
+  Stable on ppc64
+
+  02 Apr 2005; Stephen P. Becker <geoman@gentoo.org> eog-2.8.2.ebuild:
+  stable on mips
+
+*eog-2.9.0 (20 Mar 2005)
+
+  20 Mar 2005; Joe McCann <joem@gentoo.org> +eog-2.9.0.ebuild:
+  gnome-2.10 release
+
+  08 Jan 2005; Tom Martin <slarti@gentoo.org> eog-2.8.2.ebuild:
+  Stable on amd64.
+
+  01 Jan 2005; Jason Wever <weeve@gentoo.org> eog-0.6-r4.ebuild:
+  Added ~sparc keyword.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  24 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> eog-2.8.2.ebuild:
+  Stable on alpha.
+
+  23 Dec 2004; Guy Martin <gmsoft@gentoo.org> eog-2.8.2.ebuild:
+  Stable on hppa.
+
+  21 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org> eog-2.8.2.ebuild:
+  Stable on sparc
+
+  19 Dec 2004; Mike Gardiner <obz@gentoo.org> eog-2.8.2.ebuild:
+  Keyworded x86 and ppc for GNOME 2.8.1
+
+  11 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> eog-2.8.1.ebuild:
+  Stable on alpha.
+
+  06 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org> eog-2.8.1.ebuild:
+  Stable on sparc
+
+*eog-2.8.2 (06 Dec 2004)
+
+  06 Dec 2004; Mike Gardiner <obz@gentoo.org> eog-2.8.1.ebuild,
+  +eog-2.8.2.ebuild:
+  New version, marked 2.8.1 x86
+
+*eog-2.8.1 (12 nov 2004)
+
+  12 Nov 2004; foser <foser@gentoo.org> eog-2.8.1.ebuild :
+  New release
+
+  12 Nov 2004; foser <foser@gentoo.org> eog-2.8.0.ebuild :
+  Add patch to fix building with USE=-jpeg, reported on irc by geoman
+
+  12 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> eog-2.8.0.ebuild:
+  Stable on sparc
+
+  11 Nov 2004; Mike Gardiner <obz@gentoo.org> eog-2.8.0.ebuild:
+  Keyworded ppc for GNOME 2.8
+
+  01 Oct 2004; Stephen P. Becker <geoman@gentoo.org> eog-2.6.1.ebuild:
+  stable on mips
+
+  28 Sep 2004; Scott W Taylor <swtaylor@gentoo.org>
+  +files/eog-2.6.1-libexif-0.6.patch, eog-2.6.1.ebuild:
+  now happy with libexif-0.6, same type fix as in 13463
+
+*eog-2.8.0 (17 Sep 2004)
+
+  17 Sep 2004; foser <foser@gentoo.org> eog-2.8.0.ebuild :
+  Gnome 2.8 release
+  Fix deps
+
+  22 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> eog-2.6.1.ebuild:
+  Stable on alpha.
+
+  05 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> eog-2.6.1.ebuild:
+  Stable on sparc
+
+  05 Aug 2004; Guy Martin <gmsoft@gentoo.org> eog-2.6.1.ebuild:
+  Stable on hppa.
+
+  31 Jul 2004; <spider@gentoo.org> eog-2.6.1.ebuild:
+  stable on x86 for gnome 2.6.2
+
+  28 Jul 2004; Tom Gall <tgall@gentoo.org> eog-2.6.1.ebuild:
+  stable on ppc64, bug #58191
+
+  04 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> eog-2.6.0.ebuild:
+  Stable on alpha.
+
+  04 Jun 2004; Stephen P. Becker <geoman@gentoo.org> eog-2.6.0.ebuild:
+  Stable on mips.
+
+  25 May 2004; Guy Martin <gmsoft@gentoo.org> eog-2.6.0.ebuild:
+  Marked stable on hppa.
+
+  15 May 2004; Stephen P. Becker <geoman@gentoo.org> eog-2.4.1.ebuild:
+  Stable on mips.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> eog-0.6-r4.ebuild:
+  Add inherit eutils
+
+*eog-2.6.1 (21 Apr 2004)
+
+  21 Apr 2004; <khai@gentoo.org> :
+  Version bump.
+
+*eog-2.6.0 (23 Mar 2004)
+
+  23 Mar 2004; foser <foser@gentoo.org> eog-2.6.0.ebuild :
+  Gnome 2.6 final
+
+*eog-2.5.91 (21 Mar 2004)
+
+  21 Mar 2004; foser <foser@gentoo.org> eog-2.5.91.ebuild :
+  Gnome 2.6 commit
+
+  16 Mar 2004; Stephen P. Becker <geoman@gentoo.org> eog-2.4.1.ebuild:
+  Added ~mips keyword.
+
+  03 Mar 2004; foser <foser@gentoo.org> eog-0.6-r4.ebuild :
+  Fix sandbox issues (#43165) patch by <usata@gentoo.org>
+  Fix SLOT to be 1, this is not parallel installable (#43165)
+  Remove redundant ${S}
+  Use gnome.org for SRC_URI
+
+  10 Feb 2004; Bartosch Pixa <darkspecter@gentoo.org> eog-2.4.1.ebuild:
+  set ppc in keywords
+
+  29 Jan 2004; Aron Griffis <agriffis@gentoo.org> eog-2.4.1.ebuild:
+  stable on alpha and ia64
+
+  18 Jan 2004; <gustavoz@gentoo.org> eog-2.4.1.ebuild:
+  stable on hppa and sparc
+
+  14 Jan 2004; Mike Gardiner <obz@gentoo.org> eog-2.4.1.ebuild:
+  Stable on x86 as part of GNOME-2.4.1
+
+  13 Dec 2003; Guy Martin <gmsoft@gentoo.org> eog-2.4.0.ebuild:
+  Marked stable on hppa.
+
+  14 Nov 2003; Aron Griffis <agriffis@gentoo.org> eog-2.4.0.ebuild:
+  Stable on ia64
+
+  08 Nov 2003; Todd Sunderlin <todd@gentoo.org> eog-2.4.0.ebuild:
+  added sparc keyword
+
+  22 Oct 2003; Bartosch Pixa <darkspecter@gentoo.org> eog-2.4.0.ebuild:
+  set ppc in keywords
+
+*eog-2.4.1 (20 Oct 2003)
+
+  20 Oct 2003; Mike Gardiner <obz@gentoo.org> eog-2.4.1.ebuild:
+  New version
+
+  17 Oct 2003; Aron Griffis <agriffis@gentoo.org> eog-2.4.0.ebuild:
+  Stable on alpha
+
+  05 Oct 2003; Mike Gardiner <obz@gentoo.org> eog-2.4.0.ebuild:
+  Marked stable on x86
+
+  23 Sep 2003; Bartosch Pixa <darkspecter@gentoo.org> eog-2.2.2.ebuild:
+  set ppc in keywords
+
+  12 Sep 2003; Alastair Tse <liquidx@gentoo.org> eog-2.2.0.ebuild,
+  eog-2.2.1.ebuild, eog-2.2.2.ebuild:
+  removing bonobo-activation dep
+
+*eog-2.4.0 (10 Sep 2003)
+
+  13 Sep 2003; foser <foser@gentoo.org> eog-2.4.0.ebuild :
+  Added scrollkeeper dep
+
+  10 Sep 2003; foser <foser@gentoo.org> eog-2.4.0.ebuild :
+  New version, dep fixes
+
+*eog-2.3.90 (07 Sep 2003) 
+
+  07 Sep 2003; foser <foser@gentoo.org> eog-2.3.90.ebuild :
+  Gnome 2.4 rc1
+
+  25 Aug 2003; Mike Gardiner <obz@gentoo.org> eog-2.2.2.ebuild:
+  Moved to stable on x86
+
+  15 Jul 2003; Todd Sunderlin <todd@gentoo.org> eog-2.2.1.ebuild:
+  Marked stable for sparc
+
+  20 Jun 2003; Alastair Tse <liquidx@gentoo.org> eog-2.2.0.ebuild,
+  eog-2.2.1.ebuild, eog-2.2.2.ebuild:
+  added eel deps
+
+*eog-2.2.2 (17 Jun 2003)
+
+  05 Jul 2003; Guy Martin <gmsoft@gentoo.org> eog-2.2.2.ebuild :
+  Added ~hppa to KEYWORDS.
+
+  17 Jun 2003; <spider@gentoo.org> eog-2.2.2.ebuild:
+  Version bump
+
+  30 May 2003; Luca Barbato <lu_zero@gentoo.org> eog-2.2.0.ebuild,
+  eog-2.2.1.ebuild:
+  Add ppc to KEYWORDS
+
+  18 May 2003; Alastair Tse <liquidx@gentoo.org> eog-2.2.1.ebuild:
+  added omf fix to stop excessive scrollkeeping
+
+*eog-2.2.1 (10 Mar 2003)
+
+  05 Jul 2003; Guy Martin <gmsoft@gentoo.org> eog-2.2.1.ebuild :
+  Added hppa to KEYWORDS.
+
+  16 Mar 2003; foser <foser@gentoo.org> eog-2.2.1.ebuild :
+  Fixed bonobo deps to be on the safe side (#16102)
+
+  10 Mar 2003; foser <foser@gentoo.org> eog-2.2.1.ebuild :
+  New version
+
+  10 Feb 2003; Aron Griffis <agriffis@gentoo.org> eog-2.2.0.ebuild :
+  Add ~alpha to KEYWORDS
+
+*eog-2.2.0 (30 Jan 2003)
+
+  01 Mar 2003; Jason Wever <weeve@gentoo.org> eog-2.2.0.ebuild:
+  Added ~sparc to keywords.
+
+  21 Feb 2003; Aron Griffis <agriffis@gentoo.org> eog-2.2.0.ebuild :
+  Mark stable on Alpha
+
+  30 Jan 2003; foser <foser@gentoo.org> eog-2.2.0.ebuild :
+  GNOME 2.2 RC2 commit
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*eog-1.1.1 (01 Dec 2002)
+
+  03 Dec 2002; Jon Nall <nall@gentoo.org> eog-1.1.1.ebuild :
+  keyworded ~ppc
+
+  01 Dec 2002; foser <foser@gentoo.org> eog-1.1.1.ebuild :
+  forgotten 2.1.2 Commit
+
+*eog-1.0.4 (28 Nov 2002)
+  
+  28 Nov 2002; Spider <spider@gentoo.org> eog-1.0.4.ebuild :
+  SRC_URI fix, nothign much 
+
+*eog-1.1.0 (27 Oct 2002)
+
+  27 Oct 2002; foser <foser@gentoo.org> eog-1.1.0.ebuild :
+  Gnome 2.1 commit
+
+*eog-1.0.3 (06 Sep 2002)
+ 
+  17 Sep 2002; Spider <spider@gentoo.org> eog-1.0.3.ebuild :  ppc keyword 
+  addded 
+  
+  16 Sep 2002; Maarten Thibaut <murphy@gentoo.org> eog-1.0.3.ebuild : Adding
+  sparc/sparc64 keywords. Revamping ChangeLog layout.
+
+  06 Sep 2002; Spider <spider@gentoo.org> eog-1.0.3.ebuild : New version
+  
+*eog-1.0.2 (05 Aug 2002)
+
+  05 Aug 2002; Spider <spider@gentoo.org> eog-1.0.2.ebuild : New version, tweaked deps
+  
+*eog-1.0.1 (27 Jun 2002)
+
+  02 Aug 2002; Mark Guertin <gerk@gentoo.org> eog-1.0.1.ebuild :  Added ppc to keywords
+
+  27 Jun 2002; Spider <spider@gentoo.org> eog-1.0.1-r2.ebuild : mirror:// code
+
+*eog-1.0.1 (21 Jun 2002)
+
+  21 Jun 2002; Spider <spider@gentoo.org> eog-1.0.1-r1.ebuild : Missed the librsvg dep 
+
+*eog-1.0.1 (19 Jun 2002)
+
+  19 Jun 2002; Spider <spider@gentoo.org> eog-1.0.1.ebuild : Dep tweak to match latest,
+  update version
+
+*eog-1.0.0 (10 Jun 2002)
+
+  10 Jun 2002; Spider <spider@gentoo.org> eog-1.0.0.ebuild : New stable version!
+  Get it while its hot
+  
+*eog-0.118.0 (06 Jun 2002)
+
+  06 Jun 2002; Spider <spider@gentoo.org> eog-0.118.0.ebuild : gnome-print fix
+    
+*eog-0.119 (05 Jun  2002)
+
+  05 Jun 2002; Spider <spider@gentoo.org> eog-0.119.ebuild : New eog was announced,
+  this is the ebuild, but the tarball isn't ready yet :)
+  gnome2 eclassed. untested yet
+  
+*eog-0.118.0 (23 May 2002)
+
+  23 May 2002; Spider <spider@gentoo.org>  eog-0.118.0.ebuild : Version bump
+
+*eog-0.117.0 (22 May 2002)
+
+  22 May 2002; Spider <spider@gentoo.org>  eog-0.117.0.ebuild : gnome2 port of eog
+
+*eog-0.6-r4 (12 Apr 2002)
+
+  02 Aug 2002; Mark Guertin <gerk@gentoo.org>: Added ppc to keywords
+
+  12 Apr 2002; Seemant Kulleen <seemant@gentoo.org> eog-0.6-r4.ebuild :
+  Compile against newer libpng
+
+*eog-0.6-r3
+
+  11 Apr 2002; Spider <spider@gentoo.org eog-0.6-r3.ebuild:
+  Big DEPEND update.
+
+  19 Feb 2002; M.Schlemmer <azarah@gentoo.org> eog-0.6-r2.ebuild :
+  Fix SANDBOX errors for locale files and schema files.
 
 *eog-0.6-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/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index f4113eb9da2a..ba69f4e5b3ed 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,11 +1,13 @@
-MD5 1e8f5a72cd2279e27124e7ef3c238353 ChangeLog 3727
-MD5 cdbabaaf0af42eae047242b847352497 eog-0.6-r4.ebuild 1186
-MD5 792865719cda3de647a191adbed7c3b2 eog-1.0.3.ebuild 1072
-MD5 c16be85c1617b2ab52e72d63221d82b0 eog-1.0.4.ebuild 1015
-MD5 2b25a0b6e510ae3fe6c85e8184230172 eog-2.2.0.ebuild 888
-MD5 1d3b3ebced1d0fb5aab4c2f6e2e51157 eog-2.2.1.ebuild 883
+MD5 9e789694f8e582b5b7ed742c59924c6a ChangeLog 11757
+MD5 9f666ab55cf3a49721c52e65e9f03f7b eog-0.6-r4.ebuild 1199
+MD5 fa7f4f22e5eeb44b6d71c12d55fe372c eog-2.8.2.ebuild 1139
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 9108fb930b58fa6f30add3d79a41f741 eog-2.10.2.ebuild 1186
+MD5 bdb0bb61727604b4d41fe92f70f5b9ae eog-2.12.1.ebuild 1341
 MD5 5f786f0751774fc1e127d27e4f0c31e9 files/digest-eog-0.6-r4 59
-MD5 df49c6aa6aae55e947388f38dcf0d6fa files/digest-eog-1.0.3 62
-MD5 09951347d08fc8b5eab8405771a959ad files/digest-eog-1.0.4 62
-MD5 3588e1c18ba9376d9061078d9e9e0e1b files/digest-eog-2.2.0 62
-MD5 b3034328add36cac69c5431bc454bed4 files/digest-eog-2.2.1 62
+MD5 971019038a4bfdd2de90574a669fb426 files/digest-eog-2.12.1 63
+MD5 479fdcdf774451d6e1cd04e63903a71f files/digest-eog-2.8.2 62
+MD5 f4785b67530bea551199881bc37d55d5 files/eog-0.6-version_locale_dirs.patch 828
+MD5 ccb7573c48cc8ef504557fdcda5b2707 files/eog-2.8.0-jpeg_build.patch 1210
+MD5 bf37e4973ce6a51ab6722f47ae980223 files/digest-eog-2.10.2 63
+MD5 56a52e0bf2f415e3ae03f5caaaee1301 files/eog-2.11.90-pkgconfig_macro.patch 655
diff --git a/media-gfx/eog/eog-0.6-r4.ebuild b/media-gfx/eog/eog-0.6-r4.ebuild
index 83d336b11f4b..536f0336e812 100644
--- a/media-gfx/eog/eog-0.6-r4.ebuild
+++ b/media-gfx/eog/eog-0.6-r4.ebuild
@@ -1,49 +1,53 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author: Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-0.6-r4.ebuild,v 1.1 2002/04/12 23:26:13 seemant Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-0.6-r4.ebuild,v 1.1.1.1 2005/11/30 09:37:39 chriswhite Exp $
+
+GNOME_TARBALL_SUFFIX="gz"
+inherit gnome.org eutils
+
+IUSE="nls png jpeg"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Eye of GNOME"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/eog/${P}.tar.gz"
 HOMEPAGE="http://www.gnome.org/gnome-office/eog.shtml"
 
-RDEPEND="virtual/glibc
-	>=gnome-base/gconf-1.0.4-r2
+SLOT="1"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc ~sparc"
+
+DEPEND=">=gnome-base/gconf-1.0.4-r2
 	>=gnome-base/bonobo-1.0.9-r1
 	>=gnome-base/gnome-print-0.25i
-	>=gnome-base/libglade-0.17
+	=gnome-base/libglade-0*
 	>=gnome-base/oaf-0.6.2
 	>=media-libs/gdk-pixbuf-0.16.0
+	=dev-libs/glib-1.2*
 	jpeg? ( media-libs/jpeg )
-	png? ( 	media-libs/libpng 
+	png? ( 	media-libs/libpng
 			sys-libs/zlib )"
 
-DEPEND="${RDEPEND}
+RDEPEND="${DEPEND}
 	nls? ( sys-devel/gettext
 	>=dev-util/intltool-0.11 )"
 
+src_unpack() {
 
-src_compile() {
+	unpack ${A}
 
-	local myconf
+	cd ${S}/po
+	# Fix the makefile to use DESTDIR for locale dirs as well
+	epatch ${FILESDIR}/${P}-version_locale_dirs.patch
 
-	use nls || myconf="--disable-nls"
+}
+
+src_compile() {
 
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var/lib \
-		${myconf} || die
-	
+	econf `use_enable nls`  || die
 	emake || die
 }
 
 src_install() {
 
-	make prefix=${D}/usr \
-		sysconfdir=${D}/etc \
-		localstatedir=/var/lib \
+	make DESTDIR=${D} \
 		GCONF_CONFIG_SOURCE="xml::${D}/etc/gconf/gconf.xml.defaults" \
 		install || die
 
diff --git a/media-gfx/eog/eog-2.10.2.ebuild b/media-gfx/eog/eog-2.10.2.ebuild
index ba443d463e04..ccb41174c4af 100644
--- a/media-gfx/eog/eog-2.10.2.ebuild
+++ b/media-gfx/eog/eog-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/media-gfx/eog/eog-2.10.2.ebuild,v 1.1 2005/07/20 08:18:42 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-2.10.2.ebuild,v 1.1.1.1 2005/11/30 09:37:39 chriswhite Exp $
 
 inherit eutils gnome2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ia64 ~mips ~ppc64"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
 IUSE="jpeg"
 
 RDEPEND=">=x11-libs/gtk+-2.4
diff --git a/media-gfx/eog/eog-2.12.1.ebuild b/media-gfx/eog/eog-2.12.1.ebuild
index d76949c33a1c..072fb5039f39 100644
--- a/media-gfx/eog/eog-2.12.1.ebuild
+++ b/media-gfx/eog/eog-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/media-gfx/eog/eog-2.12.1.ebuild,v 1.1 2005/10/06 08:34:10 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-2.12.1.ebuild,v 1.1.1.1 2005/11/30 09:37:39 chriswhite Exp $
 
 inherit eutils gnome2
 
diff --git a/media-gfx/eog/eog-2.8.2.ebuild b/media-gfx/eog/eog-2.8.2.ebuild
index e069d729eff6..08eae2616ec6 100644
--- a/media-gfx/eog/eog-2.8.2.ebuild
+++ b/media-gfx/eog/eog-2.8.2.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/media-gfx/eog/eog-2.8.2.ebuild,v 1.1 2004/12/06 06:40:03 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-2.8.2.ebuild,v 1.1.1.1 2005/11/30 09:37:39 chriswhite Exp $
 
 inherit gnome2 eutils
 
 DESCRIPTION="Eye Of Gnome, an image viewer"
 HOMEPAGE="http://www.gnome.org/"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="1"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
 IUSE="jpeg"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ia64 ~mips ~ppc64"
 
 RDEPEND=">=x11-libs/gtk+-2.4
 	>=gnome-base/gconf-2.6
@@ -41,3 +41,9 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-2.8.0-jpeg_build.patch
 
 }
+
+src_install() {
+
+	gnome2_src_install scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/
+
+}
diff --git a/media-gfx/epix/ChangeLog b/media-gfx/epix/ChangeLog
index 1e41d166fe6e..3d11ef626eec 100644
--- a/media-gfx/epix/ChangeLog
+++ b/media-gfx/epix/ChangeLog
@@ -1,6 +1,18 @@
-# ChangeLog for app-sci/epix
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/epix/ChangeLog,v 1.1 2004/12/24 01:12:57 ribosome Exp $
+# ChangeLog for media-gfx/epix
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/epix/ChangeLog,v 1.1.1.1 2005/11/30 09:37:42 chriswhite Exp $
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> epix-1.0.0.ebuild:
+  Stable on ppc.
+
+  09 May 2005; David Holm <dholm@gentoo.org> epix-1.0.0.ebuild:
+  Added to ~ppc.
+
+  09 Apr 2005; Marcus D. Hanwell <cryos@gentoo.org> -epix-0.8.10a-r1.ebuild:
+  Removed old ebuild.
+
+  04 Feb 2005; Marcus D. Hanwell <cryos@gentoo.org> epix-1.0.0.ebuild:
+  Marked stable on amd64 and x86.
 
 *epix-1.0.0 (23 Dec 2004)
 
diff --git a/media-gfx/epix/Manifest b/media-gfx/epix/Manifest
index 36843bc5eb3d..a694835a6353 100644
--- a/media-gfx/epix/Manifest
+++ b/media-gfx/epix/Manifest
@@ -1,6 +1,4 @@
-MD5 d7dbc8b934621a6fb2dbf62c5022c67e epix-0.8.10a-r1.ebuild 1528
-MD5 70857f249945b5d88a08557b972a4f70 epix-1.0.0.ebuild 1302
-MD5 c4202fc0556f753107bf741103124012 ChangeLog 1421
+MD5 b700cb5886627d62509e23b2fbd39062 epix-1.0.0.ebuild 1304
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
+MD5 245e45ab8f02fb3c1c10b77628b25db4 ChangeLog 1989
 MD5 978e21d695848341b116f070137c4a50 files/digest-epix-1.0.0 72
-MD5 dc26ec6bc48dee7ffacbe02626c03b78 files/digest-epix-0.8.10a-r1 74
diff --git a/media-gfx/epix/epix-1.0.0.ebuild b/media-gfx/epix/epix-1.0.0.ebuild
index b9fb31eb683b..eee971418bb1 100644
--- a/media-gfx/epix/epix-1.0.0.ebuild
+++ b/media-gfx/epix/epix-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/media-gfx/epix/epix-1.0.0.ebuild,v 1.1 2004/12/24 01:12:57 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/epix/epix-1.0.0.ebuild,v 1.1.1.1 2005/11/30 09:37:42 chriswhite Exp $
 
 inherit toolchain-funcs flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="http://mathcs.holycross.edu/~ahwang/epix/${P}_complete.tar.bz2"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 DEPEND="virtual/tetex"
diff --git a/media-gfx/exif/ChangeLog b/media-gfx/exif/ChangeLog
index aa8c5671db9e..7b3ff654df1d 100644
--- a/media-gfx/exif/ChangeLog
+++ b/media-gfx/exif/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/exif
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/exif/ChangeLog,v 1.1 2005/04/01 14:18:45 dams Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/exif/ChangeLog,v 1.1.1.1 2005/11/30 09:37:47 chriswhite Exp $
+
+  30 Oct 2005; Fabian Groffen <grobian@gentoo.org> exif-0.6.9.ebuild:
+  Marked ~ppc-macos (bug #110820)
 
 *exif-0.6.9 (01 Apr 2005)
 
diff --git a/media-gfx/exif/Manifest b/media-gfx/exif/Manifest
index c6db74ab1ec6..69983f07a0f9 100644
--- a/media-gfx/exif/Manifest
+++ b/media-gfx/exif/Manifest
@@ -1,2 +1,4 @@
-MD5 f9399fa6a273d44c8c900883f4f3350e exif-0.6.9.ebuild 657
+MD5 744dcdd86728a4a07f974b078960c9fe exif-0.6.9.ebuild 744
+MD5 74137ffc68bc5c7fb244f96876aa906e ChangeLog 434
+MD5 f6e6e21a2beceda5e45a2cabfa6176cb metadata.xml 244
 MD5 29d527c627976685861c57bab5a072ad files/digest-exif-0.6.9 62
diff --git a/media-gfx/exif/exif-0.6.9.ebuild b/media-gfx/exif/exif-0.6.9.ebuild
index 09a2193f04db..8b29957ea1ed 100644
--- a/media-gfx/exif/exif-0.6.9.ebuild
+++ b/media-gfx/exif/exif-0.6.9.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/media-gfx/exif/exif-0.6.9.ebuild,v 1.1 2005/04/01 14:18:45 dams Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/exif/exif-0.6.9.ebuild,v 1.1.1.1 2005/11/30 09:37:47 chriswhite Exp $
 
 inherit flag-o-matic
 
 IUSE="nls"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Small CLI util to show EXIF infos hidden in JPEG files"
 SRC_URI="mirror://sourceforge/libexif/${P}.tar.gz"
 HOMEPAGE="http://libexif.sf.net"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="~alpha ~ppc ~ppc-macos ~sparc ~x86"
 SLOT="0"
 
 DEPEND="dev-util/pkgconfig
@@ -29,4 +28,3 @@ src_install () {
 	emake DESTDIR=${D} install || die
 	dodoc AUTHORS ChangeLog README
 }
-
diff --git a/media-gfx/exiftags/ChangeLog b/media-gfx/exiftags/ChangeLog
index 41f94f34d568..5a964f62075b 100644
--- a/media-gfx/exiftags/ChangeLog
+++ b/media-gfx/exiftags/ChangeLog
@@ -1,6 +1,39 @@
 # ChangeLog for media-gfx/exiftags
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiftags/ChangeLog,v 1.1 2003/03/08 16:23:50 liquidx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiftags/ChangeLog,v 1.1.1.1 2005/11/30 09:37:40 chriswhite Exp $
+
+  30 Oct 2005; Fabian Groffen <grobian@gentoo.org> exiftags-1.00.ebuild:
+  Marked ~ppc-macos (bug #110821)
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  exiftags-0.99.1.ebuild:
+  Stable on ppc.
+
+  03 Jun 2005; Luca Barbato <lu_zero@gentoo.org> metadata.xml:
+  Metadata fix
+
+*exiftags-1.00 (20 Apr 2005)
+
+  20 Apr 2005; Alastair Tse <liquidx@gentoo.org> -exiftags-0.97.ebuild,
+  exiftags-0.99.1.ebuild, +exiftags-1.00.ebuild:
+  version bump
+
+  21 Sep 2004; kito@gentoo.org :
+  added ~ppc-macos keyword
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> exiftags-0.97.ebuild:
+  virtual/glibc -> virtual/libc
+
+  18 Jun 2004; David Holm <dholm@gentoo.org> exiftags-0.99.1.ebuild:
+  Added to ~ppc.
+
+*exiftags-0.99.1 (16 Jun 2004)
+
+  16 Jun 2004; Alastair Tse <liquidx@gentoo.org> +exiftags-0.99.1.ebuild:
+  version bump, thanks to Scott Shawcroft <shux_linux@comcast.net> (#53153)
+
+  30 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> exiftags-0.97.ebuild:
+  Adding amd64 keyword. Closing #45583.
 
 *exiftags-0.97 (08 Mar 2003)
 
diff --git a/media-gfx/exiftags/Manifest b/media-gfx/exiftags/Manifest
index e69de29bb2d1..39c59acfda47 100644
--- a/media-gfx/exiftags/Manifest
+++ b/media-gfx/exiftags/Manifest
@@ -0,0 +1,6 @@
+MD5 8a71dcd75373bbc260ea64f0fad484de exiftags-0.99.1.ebuild 629
+MD5 23c9d0f1a6c102e88b133992c058a35d ChangeLog 1337
+MD5 940a9fd66de6e3f1d471914f52375baf metadata.xml 222
+MD5 fafd0c1653b7c5ac5dd52fecde176249 exiftags-1.00.ebuild 630
+MD5 b0724bdfb6b0b8334a312690f9e95fed files/digest-exiftags-1.00 64
+MD5 740013c9c097d469094b0ee9b33f7ef3 files/digest-exiftags-0.99.1 66
diff --git a/media-gfx/exiftags/exiftags-0.99.1.ebuild b/media-gfx/exiftags/exiftags-0.99.1.ebuild
index 691a7b51651d..31b22e6a7dcd 100644
--- a/media-gfx/exiftags/exiftags-0.99.1.ebuild
+++ b/media-gfx/exiftags/exiftags-0.99.1.ebuild
@@ -1,7 +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/media-gfx/exiftags/exiftags-0.99.1.ebuild,v 1.1 2004/06/16 17:30:40 liquidx Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiftags/exiftags-0.99.1.ebuild,v 1.1.1.1 2005/11/30 09:37:40 chriswhite Exp $
 
 DESCRIPTION="Extracts JPEG EXIF headers from digital camera photos"
 HOMEPAGE="http://johnst.org/sw/exiftags/"
@@ -9,7 +8,7 @@ SRC_URI="http://johnst.org/sw/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ppc ~ppc-macos x86"
 IUSE=""
 
 DEPEND=""
@@ -19,7 +18,7 @@ src_compile() {
 }
 
 src_install() {
-	dobin exiftags exifcom exiftime
+	dobin exiftags exifcom exiftime || die
 	doman exiftags.1 exifcom.1 exiftime.1
 	dodoc README CHANGES
 }
diff --git a/media-gfx/exiftags/exiftags-1.00.ebuild b/media-gfx/exiftags/exiftags-1.00.ebuild
index 4ba75e41b1c4..4e671875bb4a 100644
--- a/media-gfx/exiftags/exiftags-1.00.ebuild
+++ b/media-gfx/exiftags/exiftags-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/media-gfx/exiftags/exiftags-1.00.ebuild,v 1.1 2005/04/20 14:16:12 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiftags/exiftags-1.00.ebuild,v 1.1.1.1 2005/11/30 09:37:40 chriswhite Exp $
 
 DESCRIPTION="Extracts JPEG EXIF headers from digital camera photos"
 HOMEPAGE="http://johnst.org/sw/exiftags/"
@@ -8,7 +8,7 @@ SRC_URI="http://johnst.org/sw/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~ppc-macos"
+KEYWORDS="~amd64 ~ppc ~ppc-macos ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/media-gfx/exiftags/metadata.xml b/media-gfx/exiftags/metadata.xml
index bb024d2d598e..3f4f4ab149eb 100644
--- a/media-gfx/exiftags/metadata.xml
+++ b/media-gfx/exiftags/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>media-gfx</herd>
+<herd>graphics</herd>
 <maintainer>
 <email>liquidx@gentoo.org</email>
 </maintainer>
diff --git a/media-gfx/fbgrab/ChangeLog b/media-gfx/fbgrab/ChangeLog
index 5822d6bf6a34..98b81fb85668 100644
--- a/media-gfx/fbgrab/ChangeLog
+++ b/media-gfx/fbgrab/ChangeLog
@@ -1,9 +1,40 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbgrab/ChangeLog,v 1.1 2003/01/20 13:09:35 tad Exp $
+# ChangeLog for media-gfx/fbgrab
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbgrab/ChangeLog,v 1.1.1.1 2005/11/30 09:37:40 chriswhite Exp $
+
+  07 Jul 2005; Herbie Hopkins <herbs@gentoo.org> fbgrab-1.0.ebuild:
+  Stable on amd64.
+
+  26 May 2005; Lars Weiler <pylon@gentoo.org> fbgrab-1.0.ebuild:
+  Stable on ppc.
+
+  03 Jul 2004; Danny van Dyk <kugelfang@gentoo.org> fbgrab-1.0.ebuild:
+  Marked ~amd64.
+
+  29 Mar 2004; <SeJo@gentoo.org> fbgrab-1.0.ebuild,
+  fbgrab-1.0_beta1-r1.ebuild:
+  unstable masking ~ppc
+
+  29 Mar 2004; <SeJo@gentoo.org> fbgrab-1.0_beta1-r1.ebuild:
+  unstable masking ~ppc
+
+*fbgrab-1.0 (29 Feb 2004)
+
+  29 Feb 2004; Michal Januszewski <spock@gentoo.org> fbgrab-1.0.ebuild,
+  fbgrab-1.0_beta1-r1.ebuild:
+  Version bump, closes #43285.
+
+  10 Jun 2003; <msterret@gentoo.org> fbgrab-1.0_beta1-r1.ebuild,
+  fbgrab-1.0_beta1.ebuild:
+  DEPEND on sed >= 4
+
+*fbgrab-1.0_beta1-r1 (21 JAN 2003)
+
+  21 JAN 2003; Troy Dack <tad@gentoo.org> fbgrab-1.0_beta1-r1.ebuild:
+  Man page now installed in /usr/share/doc/fbgrab
 
 *fbgrab-1.0_beta1-r0 (20 JAN 2003)
 
   20 JAN 2003; Troy Dack <tad@gentoo.org> fbgrab-1.0_beta1.ebuild,
   digest-fbgrab-1.0_beta1, ChangeLog : Initial import.  Ebuild submitted
-  by Peter Johanson <peter@peterjohanson.com>. Closes Bug #14008
\ No newline at end of file
+  by Peter Johanson <peter@peterjohanson.com>. Closes Bug #14008
diff --git a/media-gfx/fbgrab/Manifest b/media-gfx/fbgrab/Manifest
index e69de29bb2d1..51f9cd4efaa3 100644
--- a/media-gfx/fbgrab/Manifest
+++ b/media-gfx/fbgrab/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e570df0ca07b051dc7246040b6cbd16e fbgrab-1.0.ebuild 725
+MD5 e66b15896be7d59a09ca0eb64a965cc0 ChangeLog 1331
+MD5 cfe1b5f88cc51ac6ffc42809178d2a06 metadata.xml 221
+MD5 458ad94460142c4d821312d93b1c8f4f files/digest-fbgrab-1.0 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCzYMg2G5bA0cA/ScRAiwfAJ0eCLlD97n1hQW2QaPA5MT9Ayz8IgCgj3ll
+OMVwDD9URwa/OIGOrHGaMJc=
+=dPvo
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/fbgrab/fbgrab-1.0.ebuild b/media-gfx/fbgrab/fbgrab-1.0.ebuild
index 2202db21dfdc..cb01ff8a26d1 100644
--- a/media-gfx/fbgrab/fbgrab-1.0.ebuild
+++ b/media-gfx/fbgrab/fbgrab-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/media-gfx/fbgrab/fbgrab-1.0.ebuild,v 1.1 2004/02/29 18:54:34 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbgrab/fbgrab-1.0.ebuild,v 1.1.1.1 2005/11/30 09:37:40 chriswhite Exp $
 
 DESCRIPTION="Framebuffer screenshot utility"
 HOMEPAGE="http://hem.bredband.net/gmogmo/fbgrab/"
@@ -8,12 +8,12 @@ SRC_URI="http://hem.bredband.net/gmogmo/fbgrab/${PN}-1.0.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~hppa"
+KEYWORDS="amd64 ~hppa ppc ~sparc x86"
+IUSE=""
 
-DEPEND="media-libs/libpng
-	>=sys-apps/sed-4"
+DEPEND="media-libs/libpng"
 
-S="${WORKDIR}/${PN}-1.0"
+S=${WORKDIR}/${PN}-1.0
 
 src_unpack() {
 	unpack ${A}
@@ -29,6 +29,6 @@ src_compile() {
 }
 
 src_install() {
-	dobin fbgrab
+	dobin fbgrab || die
 	newman fbgrab.1.man fbgrab.1
 }
diff --git a/media-gfx/fbgrab/metadata.xml b/media-gfx/fbgrab/metadata.xml
index 04baca241185..28b373129e37 100644
--- a/media-gfx/fbgrab/metadata.xml
+++ b/media-gfx/fbgrab/metadata.xml
@@ -5,7 +5,4 @@
 <maintainer>
   <email>spock@gentoo.org</email>
 </maintainer>
-<maintainer>
-  <email>tad@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/fbi/ChangeLog b/media-gfx/fbi/ChangeLog
index 89f02bc0caff..01f961b4aa19 100644
--- a/media-gfx/fbi/ChangeLog
+++ b/media-gfx/fbi/ChangeLog
@@ -1,9 +1,126 @@
 # ChangeLog for media-gfx/fbi
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbi/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/media-gfx/fbi/ChangeLog,v 1.1.1.1 2005/11/30 09:37:16 chriswhite Exp $
+
+*fbi-1.31-r2 (02 Oct 2005)
+
+  02 Oct 2005; Michał Januszewski <spock@gentoo.org>
+  +files/libexif-0.6.patch, +fbi-1.31-r2.ebuild:
+  Added libexif patches submitted in bug #87203. Thanks!
+
+  05 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org> fbi-1.31-r1.ebuild:
+  Stable on hppa.
+
+  26 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> fbi-1.31-r1.ebuild:
+  Stable on ppc.
+
+  18 Jun 2005; Markus Rothe <corsair@gentoo.org> fbi-1.31-r1.ebuild:
+  Stable on ppc64
+
+  11 Jun 2005; Michał Januszewski <spock@gentoo.org> fbi-1.31-r1.ebuild:
+  Added a fix for bug #61850. Marked 1.31-r1 stable on x86.
+
+  17 May 2005; Michał Januszewski <spock@gentoo.org> fbi-1.31.ebuild,
+  fbi-1.31-r1.ebuild:
+  Switched from gcc to toolchain-funcs eclass (bug #92745).
+
+*fbi-1.31-r1 (23 Mar 2005)
+
+  23 Mar 2005; Michał Januszewski <spock@gentoo.org> fbi-1.31.ebuild,
+  +fbi-1.31-r1.ebuild:
+  Added a dependency on libexif. Removed the dep on libungif in 1.31-r1.
+
+  08 Mar 2005; Michał Januszewski <spock@gentoo.org> -fbi-1.25.ebuild,
+  fbi-1.31.ebuild:
+  Removed old ebuild. Added a block on media-gfx/fbida (bug #84417).
+
+  07 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> fbi-1.31.ebuild:
+  Stable on alpha.
+
+  26 Jan 2005; Markus Rothe <corsair@gentoo.org> fbi-1.31.ebuild:
+  Stable on ppc64
+
+  22 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> fbi-1.31.ebuild:
+  Add ~alpha keyword.
+
+  17 Jan 2005; Michał Januszewski <spock@gentoo.org> fbi-1.31.ebuild:
+  Added giflib to the dependencies as a fix for bug #78243.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  18 Dec 2004; Markus Rothe <corsair@gentoo.org> fbi-1.31.ebuild:
+  added ~ppc64 to KEYWORDS; bug #74651
+
+  26 Oct 2004; <pyrania@gentoo.org> fbi-1.31.ebuild:
+  Added ~sparc keyword.
+
+  23 Oct 2004; Simon Stelling <blubb@gentoo.org> fbi-1.31.ebuild:
+  added ~amd64
+
+  20 Jul 2004; Michał Januszewski <spock@gentoo.org> -fbi-1.21-r1.ebuild,
+  fbi-1.31.ebuild:
+  Fixed SRC_URI, HOMEPAGE and DESCRIPTION, removed an old release that is no
+  longer available for download.
+
+  03 Jul 2004; Guy Martin <gmsoft@gentoo.org> fbi-1.31.ebuild:
+  Marked stable on hppa.
+
+  05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> fbi-1.25.ebuild:
+  Stable on alpha.
+
+  13 Apr 2004; Michał Januszewski <spock@gentoo.org> fbi-1.21-r1.ebuild,
+  fbi-1.25.ebuild, fbi-1.31.ebuild:
+  Fixed minor IUSE issues in all ebuilds.
+
+  03 Apr 2004; Lars Weiler <pylon@gentoo.org> fbi-1.31.ebuild:
+  stable on ppc
+
+  27 Mar 2004; Michał Januszewski <spock@gentoo.org> fbi-1.21-r1.ebuild,
+  fbi-1.21.ebuild, fbi-1.25.ebuild, fbi-1.29.ebuild, fbi-1.31.ebuild:
+  Ebuild clean-ups.
+
+*fbi-1.31 (01 Mar 2004)
+
+  01 Mar 2004; Michał Januszewski <spock@gentoo.org> fbi-1.31.ebuild:
+  Version bump, closes #43380.
+
+  18 Feb 2004; Michał Januszewski <spock@gentoo.org> fbi-1.29.ebuild:
+  Marked stable on x86.
+
+  15 Feb 2004; David Holm <dholm@gentoo.org> fbi-1.29.ebuild:
+  Added to ~ppc.
+
+*fbi-1.29 (26 Jan 2004)
+
+  26 Jan 2004; Michał Januszewski <spock@gentoo.org>
+  fbi-1.21-r1.ebuild, fbi-1.21.ebuild, fbi-1.25.ebuild, fbi-1.29.ebuild,
+  metadata.xml:
+  Version bump, added metadata.xml.
+
+*fbi-1.25 (08 Jan 2003)
+
+  04 Aug 2003; Guy Martin <gmsoft@gentoo.org> fbi-1.25.ebuild :
+  Marked stable on hppa.
+
+  08 Jan 2003; Martin Holzer <mholzer@gentoo.org> fbi-1.25.ebuild files/digest-fbi-1.25 ChangeLog : 
+  Version bumped. Closes #13469
+
+*fbi-1.21-r1 (26 Dec 2002)
+
+  13 Feb 2003; Guy Martin <gmsoft@gentoo.org> fbi-1.21-r1.ebuild :
+  Added hppa to keywords.
+
+  26 Dec 2002; Martin Schlemmer <azarah@gentoo.org> fbi-1.21-r1.ebuild :
+
+  Fix manpages getting installed into /usr/share/man/man1/man1/.
 
 *fbi-1.21 (1 Feb 2002)
 
+  15 Dec 2002; Bjoern Brauel <bjb@gentoo.org> fbi-1.21.ebuild :
+
+  Add alpha 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/media-gfx/fbi/Manifest b/media-gfx/fbi/Manifest
index e69de29bb2d1..327fa37e4c27 100644
--- a/media-gfx/fbi/Manifest
+++ b/media-gfx/fbi/Manifest
@@ -0,0 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3cea4d52fae981c56e196120997c2a45 fbi-1.31.ebuild 964
+MD5 613c1083cd2f413525dc7d4c59068968 fbi-1.31-r1.ebuild 1130
+MD5 3b037e25cdcb13c80eb0256a857e7aee fbi-1.31-r2.ebuild 1216
+MD5 91d22c21db02f0ecb1ef6d36248ac3b9 ChangeLog 4426
+MD5 7fc77b947cec0d01897854f31eb34b31 metadata.xml 367
+MD5 9dde96dcd60bc6d7921ce3302e83a343 files/digest-fbi-1.31-r1 59
+MD5 9dde96dcd60bc6d7921ce3302e83a343 files/digest-fbi-1.31-r2 59
+MD5 9dde96dcd60bc6d7921ce3302e83a343 files/digest-fbi-1.31 59
+MD5 784a957950cb4e63c0f58c4988e75d84 files/libexif-0.6.patch 1489
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDQDHFchej4aZK9/cRApfdAJ9rdSwucSvoFZhoYcKbvTP7NNKgdwCfVirT
+CaIN7I503AJzgj9pyHj+EqU=
+=Y0Ze
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/fbi/fbi-1.31-r1.ebuild b/media-gfx/fbi/fbi-1.31-r1.ebuild
index 163ca3338f87..10f84129d68f 100644
--- a/media-gfx/fbi/fbi-1.31-r1.ebuild
+++ b/media-gfx/fbi/fbi-1.31-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/media-gfx/fbi/fbi-1.31-r1.ebuild,v 1.1 2005/03/23 14:24:18 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbi/fbi-1.31-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:16 chriswhite Exp $
 
-inherit gcc
+inherit toolchain-funcs
 
 DESCRIPTION="A image viewer for the Linux framebuffer console."
 HOMEPAGE="http://linux.bytesex.org/fbida/"
@@ -10,7 +10,7 @@ SRC_URI="http://dl.bytesex.org/releases/fbida/${P/-/_}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~hppa ~amd64 ~sparc ~ppc64 ~alpha"
+KEYWORDS="alpha ~amd64 hppa ppc ppc64 ~sparc x86"
 IUSE="png jpeg gif tiff curl lirc X"
 
 DEPEND="jpeg? ( >=media-libs/jpeg-6b )
@@ -27,11 +27,12 @@ src_unpack() {
 	unpack ${A}
 	sed -e 's/DGifOpenFileName,ungif/DGifOpenFileName,gif/' \
 	    -e 's/-lungif/-lgif/' -i ${S}/GNUmakefile
+	sed -i -e 's/ps\*.jpeg/ps*.tiff/g' ${S}/fbgs
 }
 
 src_compile() {
 	export CFLAGS="${CFLAGS}"
-	make CC="$(gcc-getCC)" || die
+	make CC="$(tc-getCC)" || die
 }
 
 src_install() {
diff --git a/media-gfx/fbi/fbi-1.31-r2.ebuild b/media-gfx/fbi/fbi-1.31-r2.ebuild
index eb1b5f40b141..2b29fd7bb556 100644
--- a/media-gfx/fbi/fbi-1.31-r2.ebuild
+++ b/media-gfx/fbi/fbi-1.31-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/media-gfx/fbi/fbi-1.31-r2.ebuild,v 1.1 2005/10/02 19:14:39 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbi/fbi-1.31-r2.ebuild,v 1.1.1.1 2005/11/30 09:37:16 chriswhite Exp $
 
 inherit toolchain-funcs eutils
 
diff --git a/media-gfx/fbi/fbi-1.31.ebuild b/media-gfx/fbi/fbi-1.31.ebuild
index 90879abd2cfd..0bcb339cfe91 100644
--- a/media-gfx/fbi/fbi-1.31.ebuild
+++ b/media-gfx/fbi/fbi-1.31.ebuild
@@ -1,29 +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/media-gfx/fbi/fbi-1.31.ebuild,v 1.1 2004/03/01 22:16:59 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbi/fbi-1.31.ebuild,v 1.1.1.1 2005/11/30 09:37:16 chriswhite Exp $
 
-IUSE="png jpeg gif tiff curl lirc"
+inherit toolchain-funcs
 
-S="${WORKDIR}/${P}"
-DESCRIPTION="fbi a framebuffer image viewer"
-SRC_URI="http://bytesex.org/misc/${P/-/_}.tar.gz"
-HOMEPAGE="http://bytesex.org/fbi.html"
+DESCRIPTION="A image viewer for the Linux framebuffer console."
+HOMEPAGE="http://linux.bytesex.org/fbida/"
+SRC_URI="http://dl.bytesex.org/releases/fbida/${P/-/_}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+SLOT="0"
+KEYWORDS="x86 ppc hppa ~amd64 ~sparc ppc64 alpha"
+IUSE="png jpeg gif tiff curl lirc X"
 
 DEPEND="jpeg? ( >=media-libs/jpeg-6b )
 	png? ( media-libs/libpng )
-	gif? ( media-libs/libungif )
+	gif? ( media-libs/giflib media-libs/libungif )
 	tiff? ( media-libs/tiff )
-	curl? ( net-ftp/curl )
+	curl? ( net-misc/curl )
 	lirc? ( app-misc/lirc )
-	X? ( virtual/x11 )"
+	X? ( virtual/x11 )
+	<media-libs/libexif-0.6.10
+	!media-gfx/fbida"
 
 src_compile() {
 	export CFLAGS="${CFLAGS}"
-	make CC=gcc || die
+	make CC="$(tc-getCC)" || die
 }
 
 src_install() {
@@ -31,6 +33,5 @@ src_install() {
 		prefix=${D}/usr \
 		mandir=${D}/usr/share/man \
 		install || die
-
-	dodoc COPYING README
+	dodoc README
 }
diff --git a/media-gfx/fbida/ChangeLog b/media-gfx/fbida/ChangeLog
index b11d789bd81e..5e9fc6331cb8 100644
--- a/media-gfx/fbida/ChangeLog
+++ b/media-gfx/fbida/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for media-gfx/fbida
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.1 2005/02/05 23:58:02 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.1.1.1 2005/11/30 09:37:40 chriswhite Exp $
+
+  22 Jul 2005; David Holm <dholm@gentoo.org> fbida-2.03-r1.ebuild:
+  Added to ~ppc.
+
+  07 Jul 2005; Michał Januszewski <spock@gentoo.org> fbida-2.03-r1.ebuild:
+  Marked stable on x86.
+
+  23 Mar 2005; Michał Januszewski <spock@gentoo.org> fbida-2.03.ebuild:
+  Added a dependency on libexif.
+
+*fbida-2.03-r1 (23 Mar 2005)
+
+  23 Mar 2005; Michał Januszewski <spock@gentoo.org> +fbida-2.03-r1.ebuild:
+  Removed dependency on libungif. Added a dependency on libexif. Closes #80414
+  and #85358.
+
+  08 Mar 2005; Michał Januszewski <spock@gentoo.org> fbida-2.03.ebuild:
+  Added a block on media-gfx/fbi (bug #84417). Marked stable on x86.
 
 *fbida-2.03 (06 Feb 2005)
 
diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest
index ceb2c6027500..594fdc410a34 100644
--- a/media-gfx/fbida/Manifest
+++ b/media-gfx/fbida/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 090771aa32e3bf3af88a108b5e529a03 fbida-2.03.ebuild 1610
-MD5 74d9ab424143209f0d7784ce71abe258 ChangeLog 354
+MD5 e6d70a9f564f6169f501eb9ed990c340 ChangeLog 991
+MD5 a0abba1e77e01c06195dda96f8b9e33b fbida-2.03.ebuild 1645
 MD5 cfe1b5f88cc51ac6ffc42809178d2a06 metadata.xml 221
+MD5 625ddc78d3c93afe9b48770bd9187162 fbida-2.03-r1.ebuild 1473
 MD5 bfb6e027022ffa3822ed655578c0046f files/digest-fbida-2.03 62
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCBV2echej4aZK9/cRAmxGAJ9dl2ddEHDrUhWPvJtkZTEysLkqAwCghVn7
-eTCdCf2LfLyjLbQbFf0aS64=
-=+sjp
------END PGP SIGNATURE-----
+MD5 bfb6e027022ffa3822ed655578c0046f files/digest-fbida-2.03-r1 62
diff --git a/media-gfx/fbida/fbida-2.03-r1.ebuild b/media-gfx/fbida/fbida-2.03-r1.ebuild
index 1e09974784b9..286414fced58 100644
--- a/media-gfx/fbida/fbida-2.03-r1.ebuild
+++ b/media-gfx/fbida/fbida-2.03-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/media-gfx/fbida/fbida-2.03-r1.ebuild,v 1.1 2005/03/23 14:02:51 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.03-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:40 chriswhite Exp $
 
 DESCRIPTION="Image viewers for the framebuffer console (fbi) and X11 (ida)."
 HOMEPAGE="http://linux.bytesex.org/fbida/"
@@ -8,7 +8,7 @@ SRC_URI="http://dl.bytesex.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc x86"
 IUSE="png jpeg gif tiff curl lirc X fbcon"
 
 DEPEND="jpeg? ( >=media-libs/jpeg-6b )
diff --git a/media-gfx/fbida/fbida-2.03.ebuild b/media-gfx/fbida/fbida-2.03.ebuild
index 39b213608086..7f7b15f6f852 100644
--- a/media-gfx/fbida/fbida-2.03.ebuild
+++ b/media-gfx/fbida/fbida-2.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/media-gfx/fbida/fbida-2.03.ebuild,v 1.1 2005/02/05 23:58:02 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.03.ebuild,v 1.1.1.1 2005/11/30 09:37:40 chriswhite Exp $
 
 DESCRIPTION="Image viewers for the framebuffer console (fbi) and X11 (ida)."
 HOMEPAGE="http://linux.bytesex.org/fbida/"
@@ -8,7 +8,7 @@ SRC_URI="http://dl.bytesex.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="png jpeg gif tiff curl lirc X fbcon"
 
 DEPEND="jpeg? ( >=media-libs/jpeg-6b )
@@ -17,7 +17,9 @@ DEPEND="jpeg? ( >=media-libs/jpeg-6b )
 	tiff? ( media-libs/tiff )
 	curl? ( net-misc/curl )
 	lirc? ( app-misc/lirc )
-	X? ( virtual/x11 virtual/motif )"
+	X? ( virtual/x11 virtual/motif )
+	media-libs/libexif
+	!media-gfx/fbi"
 
 src_compile() {
 	# let autoconf do its job and then fix things to build fbida
diff --git a/media-gfx/fblogo/ChangeLog b/media-gfx/fblogo/ChangeLog
index 9f509445b90c..6d7c4e7306fa 100644
--- a/media-gfx/fblogo/ChangeLog
+++ b/media-gfx/fblogo/ChangeLog
@@ -1,10 +1,39 @@
 # ChangeLog for media-gfx/fblogo
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fblogo/ChangeLog,v 1.1 2003/08/17 04:56:15 tad Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fblogo/ChangeLog,v 1.1.1.1 2005/11/30 09:37:23 chriswhite Exp $
+
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  22 Jul 2005; David Holm <dholm@gentoo.org> fblogo-0.5.2.ebuild:
+  Added to ~ppc.
+
+  27 Mar 2004; Michal Januszewski <spock@gentoo.org> fblogo-0.5.0.ebuild,
+  fblogo-0.5.1.ebuild, fblogo-0.5.2.ebuild:
+  Ebuild clean-ups.
+
+  18 Feb 2004; Michal Januszewski <spock@gentoo.org> fblogo-0.5.2.ebuild:
+  Marked stable on x86.
+
+*fblogo-0.5.2 (26 Jan 2004)
+
+  26 Jan 2004; Michal 'Spock' Januszewski <spock@gentoo.org>
+  fblogo-0.5.0.ebuild, fblogo-0.5.1.ebuild, fblogo-0.5.2.ebuild, metadata.xml:
+  Version bump, added metadata.
+
+  26 Sep 2003; Jason Wever <weeve@gentoo.org> fblogo-0.5.0.ebuild,
+  fblogo-0.5.1.ebuild:
+  Added ~sparc keyword.
+
+*fblogo-0.5.1 (26 Sep 2003)
+
+  26 Sep 2003; Seemant Kulleen <seemant@gentoo.org> fblogo-0.5.1.ebuild:
+  version bump, identical to previous release, but fixes multiline strings for
+  gcc-3.3
 
 *fblogo-0.5.0 (17 Aug 2003)
 
   17 Aug 2003; Troy Dack <tad@gentoo.org> fblogo-0.5.0.ebuild:
-  Initial import. Thanks to Jes�s P�rez (h0m3r) <jesus.pr@worldonline.es> for
+  Initial import. Thanks to Jesús Pérez (h0m3r) <jesus.pr@worldonline.es> for
   the .ebuild (Bug #19450)
 
diff --git a/media-gfx/fblogo/Manifest b/media-gfx/fblogo/Manifest
index e7ce561ca667..bb28f427f20a 100644
--- a/media-gfx/fblogo/Manifest
+++ b/media-gfx/fblogo/Manifest
@@ -1,3 +1,18 @@
-MD5 29ebdbf4f500702a333164900a91858f fblogo-0.5.0.ebuild~ 912
-MD5 9cbaf912401cd0d2d1ccf224ab4bc535 fblogo-0.5.0.ebuild 911
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 db6675f16bf52b097ef45de12e84ec5b fblogo-0.5.2.ebuild 850
+MD5 03225bd91ca883f7e644761c1f0454da fblogo-0.5.0.ebuild 908
+MD5 0841997a32affdaa52b77e7bf9c16da5 fblogo-0.5.1.ebuild 848
+MD5 7849f5fea3338c9bc3271ff33e41dc51 metadata.xml 398
+MD5 2054eaeb0e7d9d2bfdbbfe814c2a0a11 ChangeLog 1347
+MD5 fbbc497efbdd04b155f6e06a8c653af5 files/digest-fblogo-0.5.1 63
 MD5 a915d708e190c7434a9da8a7444bd36e files/digest-fblogo-0.5.0 63
+MD5 e1b73d49ff7a5901ff2183d6c17f6ea4 files/digest-fblogo-0.5.2 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDK0c6LLFUmVNQ7rkRAnd6AJ9ZC11wl4OD+68Hi0D8bnZGX/kQPQCfdMX5
+6GgGR/ed0JMdcSre74qS8P0=
+=CeiE
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/fblogo/fblogo-0.5.0.ebuild b/media-gfx/fblogo/fblogo-0.5.0.ebuild
index d9a5ce8a34c9..8e0c82c9154d 100644
--- a/media-gfx/fblogo/fblogo-0.5.0.ebuild
+++ b/media-gfx/fblogo/fblogo-0.5.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/media-gfx/fblogo/fblogo-0.5.0.ebuild,v 1.1 2003/08/17 04:56:15 tad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fblogo/fblogo-0.5.0.ebuild,v 1.1.1.1 2005/11/30 09:37:23 chriswhite Exp $
 
 DESCRIPTION="Creates images to substitute Linux boot logo"
 HOMEPAGE="http://freakzone.net/gordon/#fblogo"
@@ -8,32 +8,29 @@ SRC_URI="http://freakzone.net/gordon/src/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-# The only architecture I tested.
-# Since it is a 0.* version, may it be ~x86?
-KEYWORDS="x86"
+KEYWORDS="x86 ~sparc"
 
 IUSE=""
 DEPEND="media-libs/libpng
 	sys-libs/zlib"
 RDEPEND="sys-apps/sed"
-S=${WORKDIR}/${P}
 
 src_unpack() {
-  unpack ${A}
-  cd ${S}
-  mv -f Makefile Makefile.orig
-  sed -e "s:/usr/local:/usr:g" -e "s:^install\:$:install\:\n\
-	mkdir -p \${DESTDIR}\${PREFIX}\n\
-	mkdir -p \${DESTDIR}\${BINDIR}\n\
-	mkdir -p \${DESTDIR}\${MANDIR}/man1:" Makefile.orig > Makefile
-  rm -f Makefile.orig
+	unpack ${A}
+	cd ${S}
+	mv -f Makefile Makefile.orig
+	sed -e "s:/usr/local:/usr:g" -e "s:^install\:$:install\:\n\
+		mkdir -p \${DESTDIR}\${PREFIX}\n\
+		mkdir -p \${DESTDIR}\${BINDIR}\n\
+		mkdir -p \${DESTDIR}\${MANDIR}/man1:" Makefile.orig > Makefile
+	rm -f Makefile.orig
 }
 
 src_compile() {
-  emake || die
+	emake || die
 }
 
 src_install() {
-  make install DESTDIR=${D} || die
-  dodoc README CHANGES COPYING
+	make install DESTDIR=${D} || die
+	dodoc README CHANGES COPYING
 }
diff --git a/media-gfx/fblogo/fblogo-0.5.1.ebuild b/media-gfx/fblogo/fblogo-0.5.1.ebuild
index 484030f66910..14cfd949e9c7 100644
--- a/media-gfx/fblogo/fblogo-0.5.1.ebuild
+++ b/media-gfx/fblogo/fblogo-0.5.1.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/media-gfx/fblogo/fblogo-0.5.1.ebuild,v 1.1 2003/09/26 18:54:33 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fblogo/fblogo-0.5.1.ebuild,v 1.1.1.1 2005/11/30 09:37:23 chriswhite Exp $
 
 IUSE=""
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Creates images to substitute Linux boot logo"
 HOMEPAGE="http://freakzone.net/gordon/#fblogo"
 SRC_URI="http://freakzone.net/gordon/src/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86"
+KEYWORDS="x86 ~sparc"
 
 DEPEND=">=sys-apps/sed-4
 	media-libs/libpng
diff --git a/media-gfx/fblogo/fblogo-0.5.2.ebuild b/media-gfx/fblogo/fblogo-0.5.2.ebuild
index 2d24b1fc27ab..4392c158da4e 100644
--- a/media-gfx/fblogo/fblogo-0.5.2.ebuild
+++ b/media-gfx/fblogo/fblogo-0.5.2.ebuild
@@ -1,17 +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/media-gfx/fblogo/fblogo-0.5.2.ebuild,v 1.1 2004/01/26 11:19:37 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fblogo/fblogo-0.5.2.ebuild,v 1.1.1.1 2005/11/30 09:37:23 chriswhite Exp $
 
 IUSE=""
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Creates images to substitute Linux boot logo"
 HOMEPAGE="http://freakzone.net/gordon/#fblogo"
 SRC_URI="http://freakzone.net/gordon/src/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="~ppc ~sparc x86"
 
 DEPEND=">=sys-apps/sed-4
 	media-libs/libpng
diff --git a/media-gfx/fbv/ChangeLog b/media-gfx/fbv/ChangeLog
index e5bb90d0c420..9ca7f4c37ed5 100644
--- a/media-gfx/fbv/ChangeLog
+++ b/media-gfx/fbv/ChangeLog
@@ -1,6 +1,47 @@
 # ChangeLog for media-gfx/fbv
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbv/ChangeLog,v 1.1 2003/08/25 13:43:46 usata Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbv/ChangeLog,v 1.1.1.1 2005/11/30 09:37:26 chriswhite Exp $
+
+  10 Aug 2005; Luis Medinas <metalgod@gentoo.org> fbv-1.0b.ebuild:
+  Marked ~amd64.
+
+  22 Jul 2005; David Holm <dholm@gentoo.org> fbv-1.0b.ebuild:
+  Added to ~ppc.
+
+  21 Jul 2005; Markus Rothe <corsair@gentoo.org> fbv-1.0b.ebuild:
+  Stable on ppc64
+
+  20 Jul 2005; Daniel Black <dragonheart@gentoo.org> fbv-0.99.ebuild,
+  fbv-1.0b.ebuild:
+  finished fixed for giflib and the deprecation of libungif - bug #85720
+
+  24 Apr 2005; Daniel Black <dragonheart@gentoo.org> fbv-0.99.ebuild:
+  Changed libungif to giflib for version 0.99
+
+  28 Mar 2005; Michał Januszewski <spock@gentoo.org> fbv-1.0b.ebuild:
+  Removed dependency on libungif and changed the makefiles so that everything
+  could work properly with giflib.
+
+  30 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/oob-segfault-fbv-1.0b.diff, fbv-1.0b.ebuild, +metadata.xml:
+  Patch added as per bug 78015. Thanks to Philip Nilsson <leffeman@gmail.com>
+
+  26 Jan 2005; Markus Rothe <corsair@gentoo.org> fbv-0.99.ebuild:
+  Stable on ppc64
+
+*fbv-1.0b (04 Jan 2005)
+
+  04 Jan 2005; Daniel Black <dragonheart@gentoo.org> fbv-0.99.ebuild,
+  +fbv-1.0b.ebuild:
+  QA fix - eclass gcc replaced with toolchain-funcs. Version bump as per bug
+  #76535 by Philip Nilsson <leffeman@gmail.com>
+
+  18 Dec 2004; Markus Rothe <corsair@gentoo.org> fbv-0.99.ebuild:
+  added ~ppc64 to KEYWORDS; bug #74653
+
+  07 Oct 2004; Karol Wojtaszek <sekretarz@gentoo.org> fbv-0.99.ebuild:
+  Using ./configure instead of econf, because econf defines some switches that
+  aren't valid in fbv configure script
 
 *fbv-0.99 (25 Aug 2003)
 
diff --git a/media-gfx/fbv/Manifest b/media-gfx/fbv/Manifest
index d7b1d42b555b..041b1fe9a56f 100644
--- a/media-gfx/fbv/Manifest
+++ b/media-gfx/fbv/Manifest
@@ -1,2 +1,7 @@
-MD5 e42b93f19f5c431b528280beabf218a8 fbv-0.99.ebuild 1003
+MD5 1608fb37a7c11c35e79b48424e3cf340 ChangeLog 1870
+MD5 56c570264fa3d43dfa201b55ee3431ba fbv-0.99.ebuild 1061
+MD5 9872355de4925e7ff4a64827371164b5 fbv-1.0b.ebuild 1185
+MD5 036b6a9a8adfb4f25c886ebdb6bb9f14 metadata.xml 456
 MD5 fddf15ff0ff3ee14782881f4425e8b36 files/digest-fbv-0.99 59
+MD5 d0fa687199799a3f1c51f0bbbb3a0be3 files/digest-fbv-1.0b 59
+MD5 c646a46a19f73a342c92c6f3cb003193 files/oob-segfault-fbv-1.0b.diff 559
diff --git a/media-gfx/fbv/fbv-0.99.ebuild b/media-gfx/fbv/fbv-0.99.ebuild
index dba3d242b4bd..fdcfd0152bb9 100644
--- a/media-gfx/fbv/fbv-0.99.ebuild
+++ b/media-gfx/fbv/fbv-0.99.ebuild
@@ -1,42 +1,39 @@
-# 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/media-gfx/fbv/fbv-0.99.ebuild,v 1.1 2003/08/25 13:43:46 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbv/fbv-0.99.ebuild,v 1.1.1.1 2005/11/30 09:37:26 chriswhite Exp $
 
-IUSE="png gif jpeg"
+inherit toolchain-funcs
 
-DESCRIPTION="fbv is a simple program to view pictures on a linux framebuffer device"
+DESCRIPTION="simple program to view pictures on a linux framebuffer device"
 HOMEPAGE="http://s-tech.elsat.net.pl/fbv/"
-SRC_URI="http://s-tech.elsat.net.pl/fbv//${P}.tar.gz"
+SRC_URI="http://s-tech.elsat.net.pl/fbv/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+SLOT="0"
+KEYWORDS="x86 ppc64"
+IUSE="png gif jpeg"
 
-DEPEND="gif? ( media-libs/libungif )
+DEPEND="gif? ( media-libs/giflib )
 	jpeg? ( media-libs/jpeg )
 	png? ( media-libs/libpng )"
 
 src_compile() {
-
 	local myconf
-
+	sed -e 's/-lungif/-lgif/g' -i Makefile -i configure
 	use png || myconf="${myconf} --without-libpng"
 	use gif || myconf="${myconf} --without-libungif"
 	use jpeg || myconf="${myconf} --without-libjpeg"
-
 	./configure \
 		--prefix=/usr \
-		--bindir=/usr/bin \
-		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
-		${myconf} || die
-	emake CC="${CC} ${CFLAGS}" || die
+		--infodir=/usr/share/info \
+		${myconf} || die "econf failed"
+
+	emake CC="$(tc-getCC) ${CFLAGS}" || die
 }
 
 src_install() {
-
-	dobin fbv
+	dobin fbv || die
 	doman fbv.1
-
 	dodoc ChangeLog README TODO VERSION
 }
diff --git a/media-gfx/fbv/fbv-1.0b.ebuild b/media-gfx/fbv/fbv-1.0b.ebuild
index 6cca80c05ada..46d0f234fcbf 100644
--- a/media-gfx/fbv/fbv-1.0b.ebuild
+++ b/media-gfx/fbv/fbv-1.0b.ebuild
@@ -1,22 +1,29 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbv/fbv-1.0b.ebuild,v 1.1 2005/01/03 22:22:28 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbv/fbv-1.0b.ebuild,v 1.1.1.1 2005/11/30 09:37:26 chriswhite Exp $
 
-inherit toolchain-funcs
+inherit toolchain-funcs eutils
 
 DESCRIPTION="simple program to view pictures on a linux framebuffer device"
 HOMEPAGE="http://s-tech.elsat.net.pl/fbv/"
-SRC_URI="http://s-tech.elsat.net.pl/fbv//${P}.tar.gz"
+SRC_URI="http://s-tech.elsat.net.pl/fbv/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc64"
+KEYWORDS="~amd64 ~ppc ppc64 x86"
 IUSE="png gif jpeg"
 
-DEPEND="gif? ( media-libs/libungif )
+DEPEND="gif? ( media-libs/giflib )
 	jpeg? ( media-libs/jpeg )
 	png? ( media-libs/libpng )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/oob-segfault-fbv-${PV}.diff || die "bad patch"
+	sed -e 's/-lungif/-lgif/g' -i Makefile -i configure
+}
+
 src_compile() {
 	local myconf
 
diff --git a/media-gfx/feh/ChangeLog b/media-gfx/feh/ChangeLog
index 97135a66723f..f3fea008a067 100644
--- a/media-gfx/feh/ChangeLog
+++ b/media-gfx/feh/ChangeLog
@@ -1,13 +1,96 @@
 # ChangeLog for media-gfx/feh
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/ChangeLog,v 1.1 2002/02/01 21:53:29 gbevin Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/ChangeLog,v 1.1.1.1 2005/11/30 09:37:31 chriswhite Exp $
+
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org> feh-1.3.4.ebuild:
+  Mark 1.3.4 stable on alpha
+
+  02 Oct 2005; Michael Hanselmann <hansmi@gentoo.org> feh-1.3.4.ebuild:
+  Stable on ppc.
+
+  30 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org> feh-1.3.4.ebuild:
+  Stable on sparc
+
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> feh-1.3.1.ebuild:
+  Mark 1.3.1 stable on alpha
+
+*feh-1.3.4 (24 Jul 2005)
+
+  24 Jul 2005; Mike Frysinger <vapier@gentoo.org> +feh-1.3.4.ebuild:
+  Version bump #99973 by Joshua Jackson.
+
+  18 Jul 2005; Joseph Jezak <josejx@gentoo.org> feh-1.3.1.ebuild:
+  Marked ppc stable.
+
+*feh-1.3.3 (17 Jul 2005)
+
+  17 Jul 2005; Mike Frysinger <vapier@gentoo.org> +feh-1.3.3.ebuild:
+  Version bump #93164 by Joshua.
+
+*feh-1.3.1 (02 May 2005)
+
+  02 May 2005; Luca Barbato <lu_zero@gentoo.org> +feh-1.3.1.ebuild:
+  New release, thanks to Daniel Webert <rockoo@gmail.com> and Mathias Gumz
+  <akira@fluxbox.org> for pointing out
+
+  05 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> feh-1.2.9.ebuild:
+  ~alpha keyword, bug 78857.
+
+  26 Jan 2005; Markus Rothe <corsair@gentoo.org> feh-1.2.9.ebuild:
+  Stable on ppc64
+
+  18 Dec 2004; Markus Rothe <corsair@gentoo.org> feh-1.2.9.ebuild:
+  added ~ppc64 to KEYWORDS; bug #74529
+
+*feh-1.2.9 (10 Nov 2004)
+
+  10 Nov 2004; Mike Frysinger <vapier@gentoo.org> +feh-1.2.9.ebuild:
+  Version bump #63914 by José Romildo Malaquias / tove.
+
+  10 May 2004; Travis Tilley <lv@gentoo.org> :
+  added ~amd64 keyword
+
+  20 Dec 2003; Ciaran McCreesh <ciaranm@gentoo.org> feh-1.2.6.ebuild:
+  Stable on sparc to give us a Fluxbox background setting tool
+
+  10 Oct 2003; Jason Wever <weeve@gentoo.org> feh-1.2.6.ebuild:
+  Added ~sparc keyword.
+
+  07 Sep 2003; Karl Trygve Kalleberg <karltk@gentoo.org>
+  feh-1.2.5.ebuild, feh-1.2.6.ebuild:
+  Added requirement for <media-libs/freetype-2, as it doesn't work
+  with the 2.x-series. Fixes #22174.
+
+*feh-1.2.6 (30 Jul 2003)
+
+  30 Jul 2003; Martin Holzer <mholzer@gentoo.org> feh-1.2.6.ebuild:
+  Version bumped.
+
+*feh-1.2.5 (01 Jun 2003)
+
+  01 Jun 2003; Martin Holzer <mholzer@gentoo.org> feh-1.2.5.ebuild:
+  Version bumped. Closes #19901.
+
+*feh-1.2.2 (03 Nov 2002)
+
+  03 Nov 2002; Karl Trygve Kalleberg <karltk@gentoo.org> feh-1.2.2.ebuild files/digest-feh-1.2.2 :
+  New upstream version. Fixes #10115.
+
+*feh-1.2.0 (13 Aug 2002)
+
+  13 Aug 2002; Karl Trygve Kalleberg <karltk@gentoo.org> feh-1.2.0.ebuild files/digest-feh-1.2.0 :
+  New upstream version.
+
+*feh-1.1.1 (25 Feb 2002)
+
+  25 Feb 2002; Karl Trygve Kalleberg <karltk@gentoo.org> feh-1.1.1.ebuild files/digest-feh-1.1.1:
+  New upstream version.
 
 *feh-1.1.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.
+  Added initial ChangeLog.
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index e69de29bb2d1..0a7f639542a6 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6c9f94613437cd65762f7330c0b20ad1 metadata.xml 326
+MD5 8a8b626a88db16653282e067c93f41ab ChangeLog 3006
+MD5 9d96f3ccff2a25eb0ff5692b8af307dd feh-1.3.4.ebuild 778
+MD5 826a683ce31263c0ad95f77f94962197 feh-1.3.1.ebuild 744
+MD5 312971fb12bccd6a985f23011fdc9974 files/digest-feh-1.3.4 61
+MD5 0fc5a46b6b7d9f077f8ac14d46a46bb3 files/digest-feh-1.3.1 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDVEuUJrHF4yAQTrARAqkkAJ4478Nk04FIJ74jGR2iJ3dlurlfjwCgtfZ5
+UG1ghSdTGbBbPbJ34yRExRs=
+=w0a1
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/feh/feh-1.3.1.ebuild b/media-gfx/feh/feh-1.3.1.ebuild
index 24c43f6d674b..571c83e355d5 100644
--- a/media-gfx/feh/feh-1.3.1.ebuild
+++ b/media-gfx/feh/feh-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/media-gfx/feh/feh-1.3.1.ebuild,v 1.1 2005/05/02 10:03:09 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/feh-1.3.1.ebuild,v 1.1.1.1 2005/11/30 09:37:31 chriswhite Exp $
 
 DESCRIPTION="A fast, lightweight imageviewer using imlib2"
 HOMEPAGE="http://www.linuxbrit.co.uk/feh"
@@ -8,7 +8,7 @@ SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ppc64 ~alpha"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND=">=media-libs/giblib-1.2.4
diff --git a/media-gfx/feh/feh-1.3.4.ebuild b/media-gfx/feh/feh-1.3.4.ebuild
index 37d5ce451486..c0834c721886 100644
--- a/media-gfx/feh/feh-1.3.4.ebuild
+++ b/media-gfx/feh/feh-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/media-gfx/feh/feh-1.3.4.ebuild,v 1.1 2005/07/24 09:23:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/feh-1.3.4.ebuild,v 1.1.1.1 2005/11/30 09:37:31 chriswhite Exp $
 
 DESCRIPTION="A fast, lightweight imageviewer using imlib2"
 HOMEPAGE="http://www.linuxbrit.co.uk/feh"
@@ -8,7 +8,7 @@ SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ppc ~ppc64 sparc x86"
 IUSE=""
 
 DEPEND=">=media-libs/giblib-1.2.4
@@ -20,7 +20,7 @@ DEPEND=">=media-libs/giblib-1.2.4
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	sed -i -e "/^docsdir =/s:doc/feh:share/doc/${PF}:" Makefile.in
+	sed -i -e "/^docsdir =/s:doc/feh:share/doc/${PF}:" Makefile.in || die
 }
 
 src_install() {
diff --git a/media-gfx/fig2sxd/ChangeLog b/media-gfx/fig2sxd/ChangeLog
index 7583c3090a1a..53711818c8d9 100644
--- a/media-gfx/fig2sxd/ChangeLog
+++ b/media-gfx/fig2sxd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/fig2sxd
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fig2sxd/ChangeLog,v 1.1 2005/09/06 16:40:35 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fig2sxd/ChangeLog,v 1.1.1.1 2005/11/30 09:37:37 chriswhite Exp $
+
+  03 Nov 2005; Fabian Groffen <grobian@gentoo.org> fig2sxd-0.13.ebuild:
+  Marked ~ppc-macos (bug #110936)
+
+  07 Sep 2005; Olivier Fisette <ribosome@gentoo.org> fig2sxd-0.13.ebuild:
+  Use proper quoting for Portage paths variable substitutions and die when
+  documentation installation fails.
 
 *fig2sxd-0.13 (06 Sep 2005)
 
diff --git a/media-gfx/fig2sxd/Manifest b/media-gfx/fig2sxd/Manifest
index 5f19e780cdd0..808ea18a0f2a 100644
--- a/media-gfx/fig2sxd/Manifest
+++ b/media-gfx/fig2sxd/Manifest
@@ -1,4 +1,4 @@
-MD5 aae36a39112c6a65cfd285208050ee46 fig2sxd-0.13.ebuild 784
-MD5 c2262f7346579dcb6c22b44bcc84ac56 ChangeLog 292
+MD5 16191fb1724efe9172bd8e113f144945 fig2sxd-0.13.ebuild 904
+MD5 582b3d73d715178e87df897311c286bf ChangeLog 675
 MD5 c000c0728c9136f1b54cbc3a5fc07644 metadata.xml 220
 MD5 d73b5c60cb1a158f6a508ad78f3f1191 files/digest-fig2sxd-0.13 133
diff --git a/media-gfx/fig2sxd/fig2sxd-0.13.ebuild b/media-gfx/fig2sxd/fig2sxd-0.13.ebuild
index ee93ff0bb98d..30a9b4f32f87 100644
--- a/media-gfx/fig2sxd/fig2sxd-0.13.ebuild
+++ b/media-gfx/fig2sxd/fig2sxd-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/media-gfx/fig2sxd/fig2sxd-0.13.ebuild,v 1.1 2005/09/06 16:40:35 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fig2sxd/fig2sxd-0.13.ebuild,v 1.1.1.1 2005/11/30 09:37:37 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.orig.tar.gz
 
 SLOT="0"
 
-KEYWORDS="~x86"
+KEYWORDS="~ppc-macos ~x86"
 
 IUSE=""
 
@@ -23,7 +23,7 @@ S="${WORKDIR}/${P}.orig"
 
 src_unpack() {
 	unpack ${A}
-	epatch ${WORKDIR}/${PN}_${PV}-1.diff
+	epatch "${WORKDIR}"/${PN}_${PV}-1.diff
 }
 
 src_compile() {
@@ -33,5 +33,5 @@ src_compile() {
 src_install() {
 	dobin ${PN} || die
 	doman ${PN}.1 || die
-	dodoc debian/changelog
+	dodoc debian/changelog || die
 }
diff --git a/media-gfx/figurine/ChangeLog b/media-gfx/figurine/ChangeLog
index edd79523538a..ed6105029d26 100644
--- a/media-gfx/figurine/ChangeLog
+++ b/media-gfx/figurine/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for media-gfx/figurine
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/figurine/ChangeLog,v 1.1 2002/11/08 21:17:43 george Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/figurine/ChangeLog,v 1.1.1.1 2005/11/30 09:37:23 chriswhite Exp $
+
+  05 Nov 2005; Fabian Groffen <grobian@gentoo.org> figurine-1.0.5.ebuild:
+  Marked ~ppc-macos (Bug #111577)
+
+  07 Sep 2005; Luis Medinas <metalgod@gentoo.org> figurine-1.0.5.ebuild:
+  Added ~amd64 keyword.
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> figurine-1.0.5.ebuild:
+  Stable on ppc.
+
+  03 Aug 2004; David Holm <dholm@gentoo.org> figurine-1.0.5.ebuild:
+  Added to ~ppc.
 
 *figurine-1.0.5 (08 Nov 2002)
 
diff --git a/media-gfx/figurine/Manifest b/media-gfx/figurine/Manifest
index e69de29bb2d1..9e8734004cc9 100644
--- a/media-gfx/figurine/Manifest
+++ b/media-gfx/figurine/Manifest
@@ -0,0 +1,3 @@
+MD5 d0cb238a4d47fc9b4955d8782e1e4f11 figurine-1.0.5.ebuild 671
+MD5 734fbd5a408da4581afb8b5f0cc29b9f ChangeLog 853
+MD5 9b6e35e430f713a5450fe5c973a36634 files/digest-figurine-1.0.5 66
diff --git a/media-gfx/figurine/figurine-1.0.5.ebuild b/media-gfx/figurine/figurine-1.0.5.ebuild
index 62085300c1fb..0fc084f254f8 100644
--- a/media-gfx/figurine/figurine-1.0.5.ebuild
+++ b/media-gfx/figurine/figurine-1.0.5.ebuild
@@ -1,30 +1,24 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/figurine/figurine-1.0.5.ebuild,v 1.1 2002/11/08 21:17:43 george Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/figurine/figurine-1.0.5.ebuild,v 1.1.1.1 2005/11/30 09:37:23 chriswhite Exp $
 
-IUSE=""
-
-S=${WORKDIR}/${P}
 DESCRIPTION="A vector based graphics editor similar to xfig, but simpler"
-SRC_URI="http://unc.dl.sourceforge.net/sourceforge/figurine/${P}.tar.gz"
 HOMEPAGE="http://figurine.sourceforge.net/"
+SRC_URI="mirror://sourceforge/figurine/${P}.tar.gz"
 
-DEPEND=" >=media-gfx/transfig-3.2"
-
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+SLOT="0"
+KEYWORDS="~amd64 ppc ~ppc-macos x86"
+IUSE=""
+
+DEPEND=">=media-gfx/transfig-3.2"
 
 src_compile() {
 	econf || die "econf failed"
-
 	emake || die "make failed"
 }
 
-src_install () {
-
+src_install() {
 	einstall || die
-
 	dodoc AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README
 }
-
diff --git a/media-gfx/flphoto/ChangeLog b/media-gfx/flphoto/ChangeLog
index 9eb8c9cc938f..e1e66cd39b6d 100644
--- a/media-gfx/flphoto/ChangeLog
+++ b/media-gfx/flphoto/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for media-gfx/flphoto
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/flphoto/ChangeLog,v 1.1 2003/01/16 04:41:01 jhhudso Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/flphoto/ChangeLog,v 1.1.1.1 2005/11/30 09:37:40 chriswhite Exp $
+
+26 Jul 2003; Jared Hudson <jhhudso@gentoo.org> : Fixed flphoto so that it only
+  depends on a specific version of fltk, since the other versions cause
+  compile errors.
+
+  22 Jul 2005; David Holm <dholm@gentoo.org> flphoto-1.2.ebuild:
+  Added to ~ppc.
+
+  30 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> flphoto-1.2.ebuild:
+  Adding amd64 keyword. Closing #45583.
+
+*flphoto-1.2 (22 Mar 2004)
+
+  22 Mar 2004; Heinrich Wendel <lanius@gentoo.org> flphoto-1.0.ebuild,
+  flphoto-1.2.ebuild:
+  version bump, bug #45424
+
+*flphoto-1.1 (12 Oct 2003)
+
+  12 Oct 2003; Heinrich Wendel <lanius@gentoo.org> flphoto-1.1.ebuild:
+  version bump
 
 *flphoto-1.0 (15 Jan 2003)
 
diff --git a/media-gfx/flphoto/Manifest b/media-gfx/flphoto/Manifest
index e69de29bb2d1..ab206753fcfa 100644
--- a/media-gfx/flphoto/Manifest
+++ b/media-gfx/flphoto/Manifest
@@ -0,0 +1,5 @@
+MD5 97e97ee30890465b3f9c9ac036ee3cec ChangeLog 985
+MD5 fbe70e048a67ea64177c2f1588533af5 flphoto-1.1.ebuild 666
+MD5 3659a95d04bf8e320ea1c0deca4876a0 flphoto-1.2.ebuild 672
+MD5 22c544189770b1200b0e69dc23adbb80 files/digest-flphoto-1.1 70
+MD5 e6c8843cb2c6cb7e989e8e5d4b0b3234 files/digest-flphoto-1.2 70
diff --git a/media-gfx/flphoto/flphoto-1.1.ebuild b/media-gfx/flphoto/flphoto-1.1.ebuild
index c6123f42428c..2378ae87dadf 100644
--- a/media-gfx/flphoto/flphoto-1.1.ebuild
+++ b/media-gfx/flphoto/flphoto-1.1.ebuild
@@ -1,27 +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/media-gfx/flphoto/flphoto-1.1.ebuild,v 1.1 2003/10/12 18:48:26 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/flphoto/flphoto-1.1.ebuild,v 1.1.1.1 2005/11/30 09:37:40 chriswhite Exp $
 
 DESCRIPTION="Basic image management and display program based on the FLTK toolkit"
 HOMEPAGE="http://www.easysw.com/~mike/flphoto/"
 SRC_URI="mirror://sourceforge/fltk/${P}-source.tar.gz"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="cups gphoto2"
-S="${WORKDIR}/${P}"
 
 DEPEND=">=x11-libs/fltk-1.1.2-r2
 	cups? ( net-print/cups )
 	gphoto2? ( media-gfx/gphoto2 )"
 
-MAKEOPTS="${MAKEOPTS} -j1"
-
 src_compile() {
 	econf || die
-	make espmsg || die
-	emake || die
+	emake -j1 || die
 }
 
 src_install() {
diff --git a/media-gfx/flphoto/flphoto-1.2.ebuild b/media-gfx/flphoto/flphoto-1.2.ebuild
index c2258a82a7fc..e020bdc211de 100644
--- a/media-gfx/flphoto/flphoto-1.2.ebuild
+++ b/media-gfx/flphoto/flphoto-1.2.ebuild
@@ -1,21 +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/media-gfx/flphoto/flphoto-1.2.ebuild,v 1.1 2004/03/22 21:17:06 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/flphoto/flphoto-1.2.ebuild,v 1.1.1.1 2005/11/30 09:37:40 chriswhite Exp $
 
 DESCRIPTION="Basic image management and display program based on the FLTK toolkit"
 HOMEPAGE="http://www.easysw.com/~mike/flphoto/"
 SRC_URI="mirror://sourceforge/fltk/${P}-source.tar.gz"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="cups gphoto2"
 
 DEPEND=">=x11-libs/fltk-1.1.4
 	cups? ( net-print/cups )
 	gphoto2? ( media-gfx/gphoto2 )"
 
-MAKEOPTS="${MAKEOPTS} -j1"
+src_compile() {
+	econf || die
+	emake -j1 || die
+}
 
 src_install() {
 	make DESTDIR=${D} install || die
diff --git a/media-gfx/fondu/ChangeLog b/media-gfx/fondu/ChangeLog
index 9593f72766a3..1ae92a28eeb6 100644
--- a/media-gfx/fondu/ChangeLog
+++ b/media-gfx/fondu/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for media-gfx/fondu
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fondu/ChangeLog,v 1.1 2004/07/05 08:05:01 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fondu/ChangeLog,v 1.1.1.1 2005/11/30 09:37:47 chriswhite Exp $
+
+  05 Nov 2004; Mamoru KOMACHI <usata@gentoo.org> fondu-20040925.ebuild:
+  Marked as stable.
+
+*fondu-20040925 (10 Oct 2004)
+
+  10 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> fondu-20040527.ebuild,
+  +fondu-20040925.ebuild:
+  Version bumped.
+
+  06 Jul 2004; David Holm <dholm@gentoo.org> fondu-20040527.ebuild:
+  Added to ~ppc.
 
 *fondu-20040527 (05 Jul 2004)
 
diff --git a/media-gfx/fondu/Manifest b/media-gfx/fondu/Manifest
index a7630ebcc624..18a3f2a07427 100644
--- a/media-gfx/fondu/Manifest
+++ b/media-gfx/fondu/Manifest
@@ -1,2 +1,16 @@
-MD5 02ac0e98905737692cd7058103aaa428 fondu-20040527.ebuild 605
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6140d1f3035a8052a56365c5881d242f ChangeLog 742
+MD5 2008df73c519d631eb2c0eb0fa51bff9 fondu-20040527.ebuild 698
+MD5 295674d4bed87f5a7c2796e032ed561e metadata.xml 158
+MD5 8c2e82db1ed02acca5953e97f4a3196c fondu-20040925.ebuild 696
 MD5 dd30fdab5a8fd8ba6279320465732387 files/digest-fondu-20040527 65
+MD5 2859e97055a12a37eaf82c76502051ce files/digest-fondu-20040925 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBik7dVWNWqTUmv+0RAvIZAJ0UrJU7ecJgU6wSr6o2M2yeOHKJrwCgrCnl
+LkaoE/iHc69T7lv1SH2+a0A=
+=IszD
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/fondu/fondu-20040527.ebuild b/media-gfx/fondu/fondu-20040527.ebuild
index 8148c7f5bda1..cdcf69c0e6f9 100644
--- a/media-gfx/fondu/fondu-20040527.ebuild
+++ b/media-gfx/fondu/fondu-20040527.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/media-gfx/fondu/fondu-20040527.ebuild,v 1.1 2004/07/05 08:05:01 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fondu/fondu-20040527.ebuild,v 1.1.1.1 2005/11/30 09:37:47 chriswhite Exp $
 
 DESCRIPTION="Utilities for converting between and manipulating mac fonts and unix fonts"
 HOMEPAGE="http://fondu.sourceforge.net/"
@@ -9,7 +9,7 @@ SRC_URI="http://fondu.sourceforge.net/${PN}_src-${PV:2:6}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc"
 
 IUSE=""
 DEPEND="virtual/libc"
diff --git a/media-gfx/fondu/fondu-20040925.ebuild b/media-gfx/fondu/fondu-20040925.ebuild
index 5392069a9297..df73f7ed0b69 100644
--- a/media-gfx/fondu/fondu-20040925.ebuild
+++ b/media-gfx/fondu/fondu-20040925.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/media-gfx/fondu/fondu-20040925.ebuild,v 1.1 2004/10/09 20:39:27 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fondu/fondu-20040925.ebuild,v 1.1.1.1 2005/11/30 09:37:47 chriswhite Exp $
 
 DESCRIPTION="Utilities for converting between and manipulating mac fonts and unix fonts"
 HOMEPAGE="http://fondu.sourceforge.net/"
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_src-${PV:2:6}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc"
 
 IUSE=""
 DEPEND="virtual/libc"
diff --git a/media-gfx/fontforge/ChangeLog b/media-gfx/fontforge/ChangeLog
index 62c6006998fc..4a22729e4baf 100644
--- a/media-gfx/fontforge/ChangeLog
+++ b/media-gfx/fontforge/ChangeLog
@@ -1,6 +1,108 @@
 # ChangeLog for media-gfx/fontforge
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.1 2004/05/17 17:31:42 usata Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.1.1.1 2005/11/30 09:37:35 chriswhite Exp $
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> fontforge-20050502.ebuild:
+  Mark 20050502 stable on alpha
+
+  28 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  fontforge-20050502.ebuild:
+  Stable on amd64.
+
+  24 Aug 2005; Aron Griffis <agriffis@gentoo.org> fontforge-20050502.ebuild:
+  stable on ia64
+
+  23 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  fontforge-20050502.ebuild:
+  Stable on sparc
+
+  20 Aug 2005; Fabian Groffen <grobian@gentoo.org>
+  fontforge-20050624.ebuild:
+  Marking ~ppc-macos
+
+  13 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  fontforge-20050502.ebuild:
+  Stable on ppc.
+
+*fontforge-20050624 (02 Jul 2005)
+
+  02 Jul 2005; Mamoru KOMACHI <usata@gentoo.org> -fontforge-20050209.ebuild,
+  fontforge-20050502.ebuild, +fontforge-20050624.ebuild:
+  Version bumped; bug #97326.
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  fontforge-20050310.ebuild:
+  Stable on ppc.
+
+  31 May 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  fontforge-20050310.ebuild:
+  Stable on amd64.
+
+  22 May 2005; Aron Griffis <agriffis@gentoo.org> fontforge-20050310.ebuild:
+  stable on alpha
+
+*fontforge-20050502 (19 May 2005)
+
+  19 May 2005; Mamoru KOMACHI <usata@gentoo.org> -fontforge-20040930.ebuild,
+  fontforge-20050310.ebuild, +fontforge-20050502.ebuild:
+  Version bumped. Added back ~ia64 I accidentally dropped from 20050310.
+
+  26 Mar 2005; Chris White <chriswhite@gentoo.org>
+  fontforge-20041231.ebuild:
+  Added ppc stable keywords.
+
+  23 Mar 2005; Aron Griffis <agriffis@gentoo.org> fontforge-20040930.ebuild,
+  fontforge-20050310.ebuild:
+  Add alpha
+
+*fontforge-20050310 (18 Mar 2005)
+
+  18 Mar 2005; Mamoru KOMACHI <usata@gentoo.org>
+  -files/fontforge-20040618.patch, fontforge-20040930.ebuild,
+  fontforge-20041231.ebuild, fontforge-20050209.ebuild,
+  +fontforge-20050310.ebuild:
+  Version bumped. Fixed giflib dependency; bug #85720.
+
+*fontforge-20050209 (19 Feb 2005)
+
+  19 Feb 2005; Mamoru KOMACHI <usata@gentoo.org> -fontforge-20040618.ebuild,
+  -fontforge-20040824.ebuild, +fontforge-20050209.ebuild:
+  Version bumped. Removed autotrace dependency and added pkg_postinst().
+  See bug #77133.
+
+  18 Feb 2005; Aron Griffis <agriffis@gentoo.org> fontforge-20041231.ebuild:
+  stable on x86 amd64 ia64 alpha
+
+*fontforge-20041231 (07 Jan 2005)
+
+  07 Jan 2005; MATSUU Takuto <matsuu@gentoo.org> +fontforge-20041231.ebuild:
+  Version bumped. Bug 72303.
+
+*fontforge-20040930 (10 Oct 2004)
+
+  10 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> -fontforge-20040509.ebuild,
+  fontforge-20040824.ebuild, +fontforge-20040930.ebuild:
+  Version bumped.
+
+*fontforge-20040824 (29 Aug 2004)
+
+  29 Aug 2004; Mamoru KOMACHI <usata@gentoo.org> fontforge-20040618.ebuild,
+  +fontforge-20040824.ebuild:
+  Version bumped. Marked previous version stable on x86 and ppc.
+
+  12 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  fontforge-20040618.ebuild:
+  Adding ~sparc and readding ~amd64
+
+  23 Jun 2004; David Holm <dholm@gentoo.org> fontforge-20040618.ebuild:
+  Added to ~ppc.
+
+*fontforge-20040618 (22 Jun 2004)
+
+  22 Jun 2004; Mamoru KOMACHI <usata@gentoo.org>
+  +files/fontforge-20040618.patch, fontforge-20040509.ebuild,
+  +fontforge-20040618.ebuild:
+  Version bumped. Marked 20040509 stable.
 
 *fontforge-20040509 (18 May 2004)
 
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index bc9e5c63a144..e97ae87952e3 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -1,2 +1,10 @@
-MD5 503f8f1047d1ee1225457c03bc6d8a39 fontforge-20040509.ebuild 1172
-MD5 4a1317ec3e31d8218ec38fd58ee47178 files/digest-fontforge-20040509 73
+MD5 72c423bc68cd5085d66a5b653c008dbc fontforge-20050624.ebuild 1283
+MD5 295674d4bed87f5a7c2796e032ed561e metadata.xml 158
+MD5 57a940efc48289e1682138aeb21f3b85 ChangeLog 3743
+MD5 9248ab94d30ffdfda2ebcb7a694280d5 fontforge-20050310.ebuild 1261
+MD5 355172b88eb164abfffd97ca33649480 fontforge-20050502.ebuild 1267
+MD5 632835539ac9bcbedc4695eb7bdc34c3 fontforge-20041231.ebuild 1298
+MD5 b5f7c338b5ca0ba3c431716b8a327583 files/digest-fontforge-20050624 73
+MD5 134c4b8ebaff766b1c675d67597995a1 files/digest-fontforge-20041231 73
+MD5 c2f2a20ada47b08aac3dd88ccf55864c files/digest-fontforge-20050502 73
+MD5 f8fa572061a50dba58afc848e19f773f files/digest-fontforge-20050310 73
diff --git a/media-gfx/fontforge/fontforge-20041231.ebuild b/media-gfx/fontforge/fontforge-20041231.ebuild
index 08f9b2fb02a7..bd1ba2476b30 100644
--- a/media-gfx/fontforge/fontforge-20041231.ebuild
+++ b/media-gfx/fontforge/fontforge-20041231.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20041231.ebuild,v 1.1 2005/01/06 15:37:24 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20041231.ebuild,v 1.1.1.1 2005/11/30 09:37:35 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
@@ -10,11 +10,11 @@ SRC_URI="mirror://sourceforge/fontforge/${PN}_full-${PV}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+KEYWORDS="x86 ppc amd64 ~sparc ia64 alpha"
 IUSE="png gif jpeg tiff truetype svg unicode X"
 
 DEPEND="png? ( >=media-libs/libpng-1.2.4 )
-	gif? ( >=media-libs/libungif-4.1.0-r1 )
+	gif? ( >=media-libs/giflib-4.1.0-r1 )
 	jpeg? ( >=media-libs/jpeg-6b-r2 )
 	tiff? ( >=media-libs/tiff-3.5.7-r1 )
 	truetype? ( >=media-libs/freetype-2.1.4 )
@@ -24,6 +24,8 @@ DEPEND="png? ( >=media-libs/libpng-1.2.4 )
 	!media-gfx/pfaedit"
 
 src_compile() {
+	sed -i -e "s@ungif@gif@g" configure* || die
+	sed -i -e 's@"libungif"@"libgif"@g' gdraw/gimagereadgif.c || die
 	local myconf="--with-multilayer"
 	use X || myconf="--without-x"
 
diff --git a/media-gfx/fontforge/fontforge-20050310.ebuild b/media-gfx/fontforge/fontforge-20050310.ebuild
index bee10262950e..71f7af3c1e5d 100644
--- a/media-gfx/fontforge/fontforge-20050310.ebuild
+++ b/media-gfx/fontforge/fontforge-20050310.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20050310.ebuild,v 1.1 2005/03/18 15:22:23 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20050310.ebuild,v 1.1.1.1 2005/11/30 09:37:35 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://fontforge.sourceforge.net/${PN}_full-${PV}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+KEYWORDS="alpha amd64 ppc ~sparc x86"
 IUSE="png gif jpeg tiff truetype svg unicode X"
 
 DEPEND="png? ( >=media-libs/libpng-1.2.4 )
diff --git a/media-gfx/fontforge/fontforge-20050502.ebuild b/media-gfx/fontforge/fontforge-20050502.ebuild
index b5440e7ea070..1cfb14c243c3 100644
--- a/media-gfx/fontforge/fontforge-20050502.ebuild
+++ b/media-gfx/fontforge/fontforge-20050502.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20050502.ebuild,v 1.1 2005/05/19 21:08:08 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20050502.ebuild,v 1.1.1.1 2005/11/30 09:37:35 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://fontforge.sourceforge.net/${PN}_full-${PV}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
 IUSE="png gif jpeg tiff truetype svg unicode X"
 
 DEPEND="png? ( >=media-libs/libpng-1.2.4 )
diff --git a/media-gfx/fontforge/fontforge-20050624.ebuild b/media-gfx/fontforge/fontforge-20050624.ebuild
index c08c8fe2ed8a..bdb466bc5d49 100644
--- a/media-gfx/fontforge/fontforge-20050624.ebuild
+++ b/media-gfx/fontforge/fontforge-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/media-gfx/fontforge/fontforge-20050624.ebuild,v 1.1 2005/07/02 08:07:32 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20050624.ebuild,v 1.1.1.1 2005/11/30 09:37:35 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://fontforge.sourceforge.net/${PN}_full-${PV}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc-macos ~sparc ~x86"
 IUSE="png gif jpeg tiff truetype svg unicode X"
 
 DEPEND="png? ( >=media-libs/libpng-1.2.4 )
diff --git a/media-gfx/freewrl/ChangeLog b/media-gfx/freewrl/ChangeLog
index b295ad2a5815..5933549a924e 100644
--- a/media-gfx/freewrl/ChangeLog
+++ b/media-gfx/freewrl/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-gfx/freewrl
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v 1.1 2004/06/27 15:54:57 hanno Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v 1.1.1.1 2005/11/30 09:37:32 chriswhite Exp $
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> freewrl-1.06.ebuild:
+  dev-perl/MIME-Base64 => perl-core/MIME-Base64 migration
+
+  24 May 2005; Michael Cummings <mcummings@gentoo.org> freewrl-1.06.ebuild:
+  dev-perl/Digest-MD5 => perl-core/Digest-MD5
+
+  01 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org> freewrl-1.06.ebuild:
+  dev-java/saxon -> dev-java/saxon-bin
 
 *freewrl-1.06 (27 Jun 2004)
 
diff --git a/media-gfx/freewrl/Manifest b/media-gfx/freewrl/Manifest
index dbb275c3a7d2..f0f7faca7a0d 100644
--- a/media-gfx/freewrl/Manifest
+++ b/media-gfx/freewrl/Manifest
@@ -1,5 +1,15 @@
-MD5 a02a1e04ba92bbf7236367153a449af4 freewrl-1.06.ebuild 1539
-MD5 c59bb1e37bbc7019641b86633f994808 ChangeLog 409
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c39280b212acdab1d1e2117ec608055d ChangeLog 779
+MD5 6f60619649c6d6e6293b00c459f92c79 freewrl-1.06.ebuild 1536
 MD5 a72a06a37ca4e5905085ebff07fe9e9e metadata.xml 217
 MD5 dc0d00c8e6965ece64a0d6e85cf00a57 files/FreeWRL-1.06+gentoo_pd.diff 4123
 MD5 1debb4c7bf95c1ae23a71d9c61830039 files/digest-freewrl-1.06 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFClIrZtG5z4I8BtQoRAizqAJoCGqJaQ40ywDhzLy3mC/R7aeI6ygCeOYox
+PLBz4ksMpatslnnPbWL+vZM=
+=a9Lg
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/freewrl/freewrl-1.06.ebuild b/media-gfx/freewrl/freewrl-1.06.ebuild
index f39329f8b310..3bbb7e7fd221 100644
--- a/media-gfx/freewrl/freewrl-1.06.ebuild
+++ b/media-gfx/freewrl/freewrl-1.06.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/media-gfx/freewrl/freewrl-1.06.ebuild,v 1.1 2004/06/27 15:54:57 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-1.06.ebuild,v 1.1.1.1 2005/11/30 09:37:32 chriswhite Exp $
 
-inherit nsplugins
+inherit nsplugins eutils
 
-IUSE="opengl doc mozilla"
+IUSE="opengl"
 
 MY_P="FreeWRL-${PV}"
 DESCRIPTION="VRML2 and X3D compliant browser"
@@ -18,11 +18,11 @@ S="${WORKDIR}/${MY_P}"
 
 DEPEND="virtual/x11
 	virtual/jdk
-	>=dev-java/saxon-7.5
+	>=dev-java/saxon-bin-7.5
 	>=dev-lang/perl-5.8.2
-	>=dev-perl/Digest-MD5-2.09
+	>=perl-core/Digest-MD5-2.09
 	>=dev-perl/HTML-Parser-2.25
-	>=dev-perl/MIME-Base64-2.11
+	>=perl-core/MIME-Base64-2.11
 	>=dev-perl/URI-1.04
 	>=dev-perl/libnet-1.0607
 	>=dev-perl/libwww-perl-5.47
diff --git a/media-gfx/frontline/ChangeLog b/media-gfx/frontline/ChangeLog
index 72e7f9e18ba1..4acb0adac35c 100644
--- a/media-gfx/frontline/ChangeLog
+++ b/media-gfx/frontline/ChangeLog
@@ -1,8 +1,20 @@
 # ChangeLog for media-gfx/frontline
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/frontline/ChangeLog,v 1.1 2003/03/13 01:32:51 george Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/frontline/ChangeLog,v 1.1.1.1 2005/11/30 09:37:42 chriswhite Exp $
 
-*frontline-0.5.4.ebuild (12 Mar 2003)
+  22 Jul 2005; David Holm <dholm@gentoo.org> frontline-0.5.4.ebuild:
+  Added to ~ppc.
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> frontline-0.5.4.ebuild:
+  Typo in DESCRIPTION: grahics -> graphics. Bug 59717.
+
+  05 Jul 2004; <pauldv@gentoo.org> frontline-0.5.4.ebuild:
+  Fix the dependencies to depend on libgnome and on gimp-1.2.*
+
+  25 Apr 2004; Aron Griffis <agriffis@gentoo.org> frontline-0.5.4.ebuild:
+  Add die following econf for bug 48950
+
+*frontline-0.5.4 (12 Mar 2003)
 
   12 Mar 2003; George Shapovalov <george@gentoo.org> ChangeLog, frontline-0.5.4.ebuild, files/digest-frontline-0.5.4 :
   initial release
diff --git a/media-gfx/frontline/Manifest b/media-gfx/frontline/Manifest
index 30560adac389..2d8a4846fca1 100644
--- a/media-gfx/frontline/Manifest
+++ b/media-gfx/frontline/Manifest
@@ -1,3 +1,3 @@
+MD5 9555f519fe7f7eec660221ae4ce9fc37 ChangeLog 915
+MD5 ed3653b5773c2f0823ca9301b3e019f1 frontline-0.5.4.ebuild 791
 MD5 749ca01a89e3baed437e005e3b80b2e0 files/digest-frontline-0.5.4 67
-MD5 3a327a18c04c5e6f482f0f3bb6c62913 ChangeLog 473
-MD5 cbd4b789ab452842c28e71ee0f0e39b3 frontline-0.5.4.ebuild 728
diff --git a/media-gfx/frontline/frontline-0.5.4.ebuild b/media-gfx/frontline/frontline-0.5.4.ebuild
index 1262500d2e3f..102ebf8261e2 100644
--- a/media-gfx/frontline/frontline-0.5.4.ebuild
+++ b/media-gfx/frontline/frontline-0.5.4.ebuild
@@ -1,24 +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/media-gfx/frontline/frontline-0.5.4.ebuild,v 1.1 2003/03/13 01:32:51 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/frontline/frontline-0.5.4.ebuild,v 1.1.1.1 2005/11/30 09:37:42 chriswhite Exp $
 
 IUSE=""
 
-DESCRIPTION="Front-End to Autotrace (Converts Bitmaps to vector-grahics)"
+DESCRIPTION="Front-End to Autotrace (Converts Bitmaps to vector-graphics)"
 SRC_URI="http://ftp1.sourceforge.net/autotrace/${P}.tar.gz"
 HOMEPAGE="http://autotrace.sourceforge.net/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~ppc x86"
 
 DEPEND=">=media-gfx/autotrace-0.31.1
-	>=media-gfx/gimp-1.2.1
+	=media-gfx/gimp-1.2*
+	!<media-gfx/gimp-1.2.1
 	>=media-libs/libart_lgpl-2.3.8
-	>=media-libs/imlib-1.8.2"
+	>=media-libs/imlib-1.8.2
+	gnome-base/gnome-libs"
 
 src_compile() {
-	econf
+	econf || die "econf failed"
 	emake -j 1 || die
 }
 
diff --git a/media-gfx/gif2png/ChangeLog b/media-gfx/gif2png/ChangeLog
index 85f9eddc76ba..b30cbf023340 100644
--- a/media-gfx/gif2png/ChangeLog
+++ b/media-gfx/gif2png/ChangeLog
@@ -1,8 +1,48 @@
 # ChangeLog for media-gfx/gif2png
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gif2png/ChangeLog,v 1.1 2003/03/16 21:39:10 malverian Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gif2png/ChangeLog,v 1.1.1.1 2005/11/30 09:37:20 chriswhite Exp $
+
+  11 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> -gif2png-2.4.6.ebuild,
+  -gif2png-2.4.7.ebuild, gif2png-2.5.1.ebuild:
+  2.5.1 x86 stable. Removing old versions.
+
+  22 Jul 2005; <gongloo@gentoo.org> gif2png-2.4.7.ebuild,
+  gif2png-2.5.1.ebuild:
+  Keyworded ~ppc-macos.
+
+  03 Jun 2005; Luca Barbato <lu_zero@gentoo.org> metadata.xml:
+  Metadata fix
+
+  30 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> gif2png-2.5.1.ebuild:
+  Stable on sparc
+
+  26 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> gif2png-2.5.1.ebuild:
+  Keyworded ~sparc wrt #90192
+
+  09 Sep 2004; <blubb@gentoo.org> gif2png-2.5.1.ebuild:
+  added ~amd64 keyword
+
+  18 Jul 2004; Tom Gall <tgall@gentoo.org> gif2png-2.5.1.ebuild:
+  stable on ppc64, bug #57128
+
+  21 Mar 2004; Martin Holzer <mholzer@gentoo.org> gif2png-2.4.6.ebuild,
+  gif2png-2.4.7.ebuild, gif2png-2.5.1.ebuild:
+  fixing QA issue. closes 44519
+
+*gif2png-2.5.1 (29 Dec 2003)
+
+  29 Dec 2003; Martin Holzer <mholzer@gentoo.org> gif2png-2.5.1.ebuild:
+  Version bumped.
+
+*gif2png-2.4.7 (28 Jul 2003)
+
+  28 Jul 2003; Martin Holzer <mholzer@gentoo.org> gif2png-2.4.7.ebuild:
+  Version bumped. Closes #25456.
 
 *gif2png-2.4.6 (16 Mar 2003)
 
-  16 Mar 2003; Philip Walls <malverian@gentoo.org
+  22 Mar 2003; Martin Holzer <mholzer@gentoo.org> gif2png-2.4.6.ebuild:
+  Changed Homepage and SRC_URI. Closes #17999
+
+  16 Mar 2003; Philip Walls <malverian@gentoo.org>
   Initial import.  Ebuild submitted by Don Seiler <don@seiler.us>.
diff --git a/media-gfx/gif2png/Manifest b/media-gfx/gif2png/Manifest
index e69de29bb2d1..efc7046ce7e7 100644
--- a/media-gfx/gif2png/Manifest
+++ b/media-gfx/gif2png/Manifest
@@ -0,0 +1,4 @@
+MD5 e8bdd5e7de085c372d897a9d59d2bd7a gif2png-2.5.1.ebuild 718
+MD5 79908e01e7319552fa65c36299d838e9 ChangeLog 1617
+MD5 94328d8f5876abf1b939df3dc0b22c14 metadata.xml 223
+MD5 4fc0f6cac09879cc1e97b2a16ce32daf files/digest-gif2png-2.5.1 65
diff --git a/media-gfx/gif2png/gif2png-2.5.1.ebuild b/media-gfx/gif2png/gif2png-2.5.1.ebuild
index f2e01632bb1d..9b397e01f8a5 100644
--- a/media-gfx/gif2png/gif2png-2.5.1.ebuild
+++ b/media-gfx/gif2png/gif2png-2.5.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/media-gfx/gif2png/gif2png-2.5.1.ebuild,v 1.1 2003/12/29 13:13:27 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gif2png/gif2png-2.5.1.ebuild,v 1.1.1.1 2005/11/30 09:37:20 chriswhite Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION="gif2png"
-SRC_URI="http://catb.org/~esr/${PN}/${P}.tar.gz"
+DESCRIPTION="Converts images from gif format to png format"
 HOMEPAGE="http://catb.org/~esr/gif2png/"
+SRC_URI="http://catb.org/~esr/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~amd64 ppc ~ppc-macos ppc64 sparc x86"
+IUSE=""
 
 DEPEND="media-libs/libpng"
-RDEPEND=${DEPEND}
 
 src_compile() {
 	econf --prefix=/usr || die "econf failed"
@@ -24,5 +23,5 @@ src_install() {
 	make \
 		DESTDIR=${D} \
 		install || die "make install failed"
-	dodoc AUTHORS ChangeLog COPYING INSTALL NEWS README
+	dodoc AUTHORS ChangeLog NEWS README
 }
diff --git a/media-gfx/gif2png/metadata.xml b/media-gfx/gif2png/metadata.xml
index c90d8d48bd03..d90b5212c1be 100644
--- a/media-gfx/gif2png/metadata.xml
+++ b/media-gfx/gif2png/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>media-gfx</herd>
+<herd>graphics</herd>
 <maintainer>
 <email>graphics@gentoo.org</email>
 </maintainer>
diff --git a/media-gfx/gifsicle/ChangeLog b/media-gfx/gifsicle/ChangeLog
index c2c56fa89085..5a4fd11db8a0 100644
--- a/media-gfx/gifsicle/ChangeLog
+++ b/media-gfx/gifsicle/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for media-gfx/gifsicle
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gifsicle/ChangeLog,v 1.1 2003/10/10 07:35:45 mr_bones_ Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gifsicle/ChangeLog,v 1.1.1.1 2005/11/30 09:37:15 chriswhite Exp $
+
+  03 Nov 2005; Fabian Groffen <grobian@gentoo.org> gifsicle-1.40.ebuild:
+  Marked ~ppc-macos (bug #110937)
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> gifsicle-1.40.ebuild:
+  Stable on ppc.
+
+  23 May 2005; Michael Sterrett <mr_bones_@gentoo.org> gifsicle-1.40.ebuild:
+  stable for x86
+
+  09 May 2005; David Holm <dholm@gentoo.org> gifsicle-1.40.ebuild:
+  Added to ~ppc.
+
+  18 Nov 2004; Karol Wojtaszek <sekretarz@gentoo.org> gifsicle-1.40.ebuild:
+  ~amd64 keyworded
 
 *gifsicle-1.40 (10 Oct 2003)
 
diff --git a/media-gfx/gifsicle/Manifest b/media-gfx/gifsicle/Manifest
index 4d71d49b2c5a..0d2b64751155 100644
--- a/media-gfx/gifsicle/Manifest
+++ b/media-gfx/gifsicle/Manifest
@@ -1,2 +1,3 @@
-MD5 9fdd5810d8780d421e74ab5a3737a065 gifsicle-1.40.ebuild 649
+MD5 633f58ecaabe416ea5a32a37f4c0f304 gifsicle-1.40.ebuild 799
+MD5 3cef63e76fa517acb601b3765c2f75aa ChangeLog 825
 MD5 54496137da5e5b09b0581c45f84406fe files/digest-gifsicle-1.40 65
diff --git a/media-gfx/gifsicle/gifsicle-1.40.ebuild b/media-gfx/gifsicle/gifsicle-1.40.ebuild
index f38e8c2dd979..32508ca6bcf3 100644
--- a/media-gfx/gifsicle/gifsicle-1.40.ebuild
+++ b/media-gfx/gifsicle/gifsicle-1.40.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/media-gfx/gifsicle/gifsicle-1.40.ebuild,v 1.1 2003/10/10 07:35:45 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gifsicle/gifsicle-1.40.ebuild,v 1.1.1.1 2005/11/30 09:37:15 chriswhite Exp $
 
 DESCRIPTION="A UNIX command-line tool for creating, editing, and getting information about GIF images and animations"
 HOMEPAGE="http://www.lcdf.org/~eddietwo/gifsicle/"
 SRC_URI="http://www.lcdf.org/~eddietwo/gifsicle/${P}.tar.gz"
 
-KEYWORDS="~x86"
 LICENSE="GPL-2"
 SLOT="0"
-
+KEYWORDS="~amd64 ppc ~ppc-macos x86"
 IUSE="X"
 
 DEPEND="X? ( virtual/x11 )"
 
 src_compile() {
 	local myconf
+
 	use X || myconf="${myconf} --disable-gifview"
 	econf ${myconf} || die "econf failed"
-	emake           || die "emake failed"
+	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc NEWS README         || die "dodoc failed"
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc NEWS README
 }
diff --git a/media-gfx/gimageview/ChangeLog b/media-gfx/gimageview/ChangeLog
index a44a95bb4bda..dabf06fe0fea 100644
--- a/media-gfx/gimageview/ChangeLog
+++ b/media-gfx/gimageview/ChangeLog
@@ -1,11 +1,80 @@
 # ChangeLog for media-gfx/gimageview
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/ChangeLog,v 1.1 2004/05/22 20:19:33 usata Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/ChangeLog,v 1.1.1.1 2005/11/30 09:37:45 chriswhite Exp $
+
+  04 Oct 2005; MATSUU Takuto <matsuu@gentoo.org>
+  -gimageview-0.2.27-r1.ebuild, gimageview-0.2.27-r2.ebuild:
+  Marked stable.
+
+*gimageview-0.2.27-r2 (23 Sep 2005)
+
+  23 Sep 2005; MATSUU Takuto <matsuu@gentoo.org>
+  +gimageview-0.2.27-r2.ebuild:
+  depricated gtk2 USE flag, Bug 106560.
+
+  29 May 2005; Mamoru KOMACHI <usata@gentoo.org> -gimageview-0.2.25.ebuild,
+  -gimageview-0.2.26.ebuild, gimageview-0.2.27-r1.ebuild:
+  Cleaned gtk2 USE flag. This closes bug #92164.
+
+  08 Apr 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  gimageview-0.2.27-r1.ebuild:
+  Marked stable on amd64.
+
+  08 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  gimageview-0.2.27-r1.ebuild:
+  Stable on ppc64
+
+  30 Mar 2005; Michael Hanselmann <hansmi@gentoo.org>
+  gimageview-0.2.27-r1.ebuild:
+  Stable on ppc.
+
+  21 Mar 2005; Mamoru KOMACHI <usata@gentoo.org>
+  gimageview-0.2.27-r1.ebuild:
+  Stable on x86.
+
+  05 Feb 2005; Mamoru KOMACHI <usata@gentoo.org>
+  +files/gimageview-0.2.27-gtk12_fix.diff,
+  +files/gimageview-0.2.27-sort_fix.diff, gimageview-0.2.27-r1.ebuild:
+  Added patches to fix bug #78648.
+
+*gimageview-0.2.27-r1 (19 Jan 2005)
+
+  19 Jan 2005; Mamoru KOMACHI <usata@gentoo.org>
+  +gimageview-0.2.27-r1.ebuild, -gimageview-0.2.27.ebuild:
+  Corrected install directory.
+
+*gimageview-0.2.27 (18 Jan 2005)
+
+  18 Jan 2005; Mamoru KOMACHI <usata@gentoo.org> +gimageview-0.2.27.ebuild:
+  Version bumped.
+
+  04 Nov 2004; Mamoru KOMACHI <usata@gentoo.org> gimageview-0.2.26.ebuild:
+  Stable on x86 and ppc.
+
+*gimageview-0.2.26 (06 Oct 2004)
+
+  06 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> gimageview-0.2.25.ebuild,
+  +gimageview-0.2.26.ebuild:
+  Version bumped. Marked 0.2.25 stable on x86 and ppc.
+
+  31 Jul 2004; Tom Gall <tgall@gentoo.org> gimageview-0.2.25.ebuild:
+  stable on ppc64, bug #57127
+
+  29 Jun 2004; Daniel Goller <morfic@gentoo.org> gimageview-0.2.25.ebuild:
+  Added patch to allow compilation with gcc-3.4
+  Thanks Bret Towe (Magnade), for the patch.
+  This Closes #53693
+  
+  29 Jun 2004; Danny van Dyk <kugelfang@gentoo.org> gimageview-0.2.25.ebuild:
+  Marked ~amd64.
+
+  24 Jun 2004; Aron Griffis <agriffis@gentoo.org> gimageview-0.2.25.ebuild:
+  QA - fix use invocation
 
 *gimageview-0.2.25 (23 May 2004)
 
   23 May 2004; Mamoru KOMACHI <usata@gentoo.org> gimageview-0.2.25.ebuild:
   Initial import. Thanks to Sadayuki Kobayashi <desperado@s17.xrea.com>,
   MATSUU Takuto <matsuu@gentoo.org> and Lindsay Holmwood
-  <holmwoodl@iinet.net.au>. Bug # 31683
+  <holmwoodl@iinet.net.au>. Bug #21066
 
diff --git a/media-gfx/gimageview/Manifest b/media-gfx/gimageview/Manifest
index baf3d4b2fd83..57c273584b8f 100644
--- a/media-gfx/gimageview/Manifest
+++ b/media-gfx/gimageview/Manifest
@@ -1,2 +1,7 @@
-MD5 6b85954a8b00276ddf8592521244cf6e gimageview-0.2.25.ebuild 1431
-MD5 36f65a43da5f087e4bbc63ff7f8adad0 files/digest-gimageview-0.2.25 70
+MD5 b6cc4141dfcd21c30143a291bb786802 gimageview-0.2.27-r2.ebuild 1500
+MD5 9fe0e6b1e5f5cd35d8369f408781d167 ChangeLog 2665
+MD5 4368b20da8cb79a90eb16111f691f548 metadata.xml 379
+MD5 fb50f147b01c127505cc2bf9369bbc2a files/gimageview-0.2.27-gtk12_fix.diff 476
+MD5 f74096a129e40fbd3c7a911c3afe461a files/digest-gimageview-0.2.27-r2 70
+MD5 9a949f1e3e1aebb680b0b2823db37bf1 files/gimv-gcc34.patch 851
+MD5 e9ac8e8f3e77f9cb035a39c766211170 files/gimageview-0.2.27-sort_fix.diff 920
diff --git a/media-gfx/gimageview/gimageview-0.2.27-r2.ebuild b/media-gfx/gimageview/gimageview-0.2.27-r2.ebuild
index a633d80d8c88..d4799e531209 100644
--- a/media-gfx/gimageview/gimageview-0.2.27-r2.ebuild
+++ b/media-gfx/gimageview/gimageview-0.2.27-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/media-gfx/gimageview/gimageview-0.2.27-r2.ebuild,v 1.1 2005/09/23 02:33:45 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/gimageview-0.2.27-r2.ebuild,v 1.1.1.1 2005/11/30 09:37:45 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/gtkmmviewer/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 # mng, xine, and mplayer are local flags
 IUSE="nls imlib wmf mng svg xine mplayer"
 
diff --git a/media-gfx/gimp-freetype/ChangeLog b/media-gfx/gimp-freetype/ChangeLog
index d4e8d2d29359..8c9a6dfd0349 100644
--- a/media-gfx/gimp-freetype/ChangeLog
+++ b/media-gfx/gimp-freetype/ChangeLog
@@ -1,6 +1,77 @@
 # ChangeLog for media-gfx/gimp-freetype
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-freetype/ChangeLog,v 1.1 2002/02/01 21:53:29 gbevin Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-freetype/ChangeLog,v 1.1.1.1 2005/11/30 09:37:46 chriswhite Exp $
+
+  28 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  gimp-freetype-0.6.ebuild:
+  Stable on amd64, closes bug 103788.
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  gimp-freetype-0.6.ebuild:
+  Stable on ppc.
+
+  16 Jun 2005; Leonardo Boshell <leonardop@gentoo.org>
+  gimp-freetype-0.6.ebuild:
+  Stable on x86.
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  gimp-freetype-0.5.ebuild:
+  Stable on ppc.
+
+  31 May 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  gimp-freetype-0.5.ebuild:
+  Stable on amd64.
+
+*gimp-freetype-0.6 (12 May 2005)
+
+  12 May 2005; Leonardo Boshell <leonardop@gentoo.org>
+  gimp-freetype-0.6.ebuild:
+  New release. Style changes.
+
+  02 Aug 2004; L. Boshell <leonardop@gentoo.org> gimp-freetype-0.5.ebuild:
+  Updated intltool dependency to be >=0.29. See bug #58786.
+
+  07 Jul 2004; Danny van Dyk <kugelfang@gentoo.org> gimp-freetype-0.5.ebuild:
+  Marked ~amd64.
+
+  22 Jun 2004; Leonardo Boshell <leonardop@gentoo.org>
+  gimp-freetype-0.5.ebuild:
+  Marked stable on x86.
+
+  25 Apr 2004; Aron Griffis <agriffis@gentoo.org> gimp-freetype-0.2-r3.ebuild:
+  Add die following econf for bug 48950
+
+  19 Apr 2004; David Holm <dholm@gentoo.org> gimp-freetype-0.5.ebuild:
+  Added to ~ppc.
+
+*gimp-freetype-0.5 (18 Apr 2004)
+
+  18 Apr 2004; Leonardo Boshell <leonardop@gentoo.org>
+  gimp-freetype-0.2-r3.ebuild, gimp-freetype-0.5.ebuild:
+  New release, works with The Gimp 2.0. Use mirror:// syntax, fixed
+  dependencies and SLOT values. Minor cosmetic corrections.
+
+*gimp-freetype-0.2-r3 (16 Jan 2003)
+
+  19 Aug 2003; foser <foser@gentoo.org> gimp-freetype-0.2-r3.ebuild :
+  Fix gimp dep (#22843) and fixed dep vars
+
+  16 Jan 2003; Leonardo Boshell <leonardop@gentoo.org> : Fix for sandbox
+  violation (bug #14030).
+
+  16 Jan 2003; Jared Hudson <jhhudso@gentoo.org> : Fixed install bug where
+  gimp-freetype was installing help files to /var/tmp/portage/
+	
+*gimp-freetype-0.2-r2 (12 Mar 2002)
+
+  12 Mar 2002; Seemant Kulleen <seemant@gentoo.org>:
+  Added USE dependent nls compilation
+
+*gimp-freetype-0.2-r1 (22 Feb 2002)
+
+  22 Feb 2002; Daniel Robbins <drobbins@gentoo.org>: Added a dep on
+  >=media-gfx/gimp-1.2.3-r1 so that gimptool can be found (symlink was missing
+  in earlier versions)
 
 *gimp-freetype-0.2 (1 Feb 2002)
 
diff --git a/media-gfx/gimp-freetype/Manifest b/media-gfx/gimp-freetype/Manifest
index e69de29bb2d1..7885429471b6 100644
--- a/media-gfx/gimp-freetype/Manifest
+++ b/media-gfx/gimp-freetype/Manifest
@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0b8c3b2a5f2796f88078cfbdcde4ea0e gimp-freetype-0.5.ebuild 802
+MD5 db72cf08c6fe4302a99f2114d79eef81 gimp-freetype-0.2-r3.ebuild 898
+MD5 7b9ec7bcaecd59e4a211e4dd6ddf1c8c gimp-freetype-0.6.ebuild 703
+MD5 bc377a9f4b12c9626fc0e09d6d5e3648 ChangeLog 2904
+MD5 4b36c6fccca2978cab3373ab53fd7c3f metadata.xml 631
+MD5 d231ccb326ac2e7f1e63b0b3a5288efb files/digest-gimp-freetype-0.2-r3 69
+MD5 37f8eb7c89a60bf1b7d125d972a925a9 files/digest-gimp-freetype-0.5 69
+MD5 c20cacdb70c1cc6a938fbbf561c5e427 files/digest-gimp-freetype-0.6 69
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDEQ9WntT9W3vfTuoRAh5OAJ41GE6vmmAasUA7wRgk/Max0E2J7QCgojmx
+GBSiu7J0kW6OZcfkVgWThe8=
+=Gv5V
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/gimp-freetype/gimp-freetype-0.2-r3.ebuild b/media-gfx/gimp-freetype/gimp-freetype-0.2-r3.ebuild
index 5e3f4e4481e4..99758786ef66 100644
--- a/media-gfx/gimp-freetype/gimp-freetype-0.2-r3.ebuild
+++ b/media-gfx/gimp-freetype/gimp-freetype-0.2-r3.ebuild
@@ -1,35 +1,40 @@
-# 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/media-gfx/gimp-freetype/gimp-freetype-0.2-r3.ebuild,v 1.1 2003/01/16 12:49:06 jhhudso Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-freetype/gimp-freetype-0.2-r3.ebuild,v 1.1.1.1 2005/11/30 09:37:46 chriswhite Exp $
 
 IUSE="nls"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="GIMP freetype text plugin"
-SRC_URI="http://freetype.gimp.org/gimp-freetype-0.2.tar.gz"
+SRC_URI="http://freetype.gimp.org/${P}.tar.gz"
 HOMEPAGE="http://freetype.gimp.org/"
 
-SLOT="0"
+SLOT="1"
 LICENSE="GPL-2"
 KEYWORDS="x86"
 
-DEPEND=">=media-gfx/gimp-1.2.3-r1 
+RDEPEND="=media-gfx/gimp-1.2*
 	>=media-libs/freetype-2.0.1"
-RDEPEND="nls? ( sys-devel/gettext )"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
 
 src_compile() {
-	local myconf
-	use nls || myconf="${myconf} --disable-nls"
+	local myconf=""
+
+	use nls || myconf="--disable-nls"
 
 	econf \
 		--sysconfdir=/etc/gimp/1.2/ \
 		--with-gimp-exec-prefix=/usr \
-	${myconf} || die
+		${myconf} || die "econf failed"
 
 	emake || die
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	local GIMP_PLUGIN_DIR=`gimptool --gimpplugindir`
+
+	einstall bindir=${D}/${GIMP_PLUGIN_DIR}/plug-ins || die
+
 	dodoc AUTHORS ChangeLog COPYING NEWS README* TODO
 }
diff --git a/media-gfx/gimp-freetype/gimp-freetype-0.5.ebuild b/media-gfx/gimp-freetype/gimp-freetype-0.5.ebuild
index 8b17f2759bb8..b6f3701e6f6b 100644
--- a/media-gfx/gimp-freetype/gimp-freetype-0.5.ebuild
+++ b/media-gfx/gimp-freetype/gimp-freetype-0.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/media-gfx/gimp-freetype/gimp-freetype-0.5.ebuild,v 1.1 2004/04/18 19:41:03 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-freetype/gimp-freetype-0.5.ebuild,v 1.1.1.1 2005/11/30 09:37:46 chriswhite Exp $
 
 IUSE=""
 
@@ -10,13 +10,13 @@ HOMEPAGE="http://freetype.gimp.org/"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND=">=media-gfx/gimp-2
 	>=media-libs/freetype-2"
 
 DEPEND="${RDEPEND}
-	dev-util/intltool
+	>=dev-util/intltool-0.29
 	dev-util/pkgconfig"
 
 src_compile() {
diff --git a/media-gfx/gimp-freetype/gimp-freetype-0.6.ebuild b/media-gfx/gimp-freetype/gimp-freetype-0.6.ebuild
index 85783d612f8a..d79fe9395623 100644
--- a/media-gfx/gimp-freetype/gimp-freetype-0.6.ebuild
+++ b/media-gfx/gimp-freetype/gimp-freetype-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/media-gfx/gimp-freetype/gimp-freetype-0.6.ebuild,v 1.1 2005/05/13 02:55:04 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-freetype/gimp-freetype-0.6.ebuild,v 1.1.1.1 2005/11/30 09:37:46 chriswhite Exp $
 
 DESCRIPTION="Freetype text plugin for The Gimp 2"
 SRC_URI="mirror://gimp/plug-ins/v2.0/freetype/${P}.tar.gz"
@@ -8,7 +8,7 @@ HOMEPAGE="http://freetype.gimp.org/"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND=">=media-gfx/gimp-2
diff --git a/media-gfx/gimp-freetype/metadata.xml b/media-gfx/gimp-freetype/metadata.xml
index da6fd63d0085..342c1dddd038 100644
--- a/media-gfx/gimp-freetype/metadata.xml
+++ b/media-gfx/gimp-freetype/metadata.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+  <herd>gnome</herd>
+    <maintainer>
+    <email>leonardop@gentoo.org</email>
+    <name>Leonardo Boshell</name>
+  </maintainer>
+  <longdescription>
+    GIMP-FreeType is a plug-in for The GIMP that uses the freetype2
+    library to do font rendering. With GIMP version 2.0, GIMP's text
+    rendering has improved a lot and this plug-in became less
+    important.  However there are still some things that only this
+    plug-in can do; so it may still be useful sometimes.
+  </longdescription>
 </pkgmetadata>
diff --git a/media-gfx/gimp-print/ChangeLog b/media-gfx/gimp-print/ChangeLog
index c1e39d8e95d2..6dc80921f733 100644
--- a/media-gfx/gimp-print/ChangeLog
+++ b/media-gfx/gimp-print/ChangeLog
@@ -1,11 +1,263 @@
 # ChangeLog for media-gfx/gimp-print
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/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/media-gfx/gimp-print/ChangeLog,v 1.1.1.1 2005/11/30 09:37:19 chriswhite Exp $
+
+*gimp-print-5.0.0_rc1 (02 Nov 2005)
+
+  02 Nov 2005; Luis Medinas <metalgod@gentoo.org>
+  +gimp-print-5.0.0_rc1.ebuild:
+  Version Bump.
+
+  26 Sep 2005; <dang@gentoo.org> gimp-print-5.0.0_beta4.ebuild:
+  Add ppds to IUSE
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> gimp-print-4.2.7.ebuild:
+  Mark 4.2.7 stable on alpha
+
+  12 Jul 2005; Stephen P. Becker <geoman@gentoo.org>
+  gimp-print-4.2.7.ebuild:
+  stable on mips
+
+*gimp-print-5.0.0_beta4 (31 May 2005)
+
+  31 May 2005; Heinrich Wendel <lanius@gentoo.org>
+  -gimp-print-4.2.5-r2.ebuild, -gimp-print-5.0.0_beta2.ebuild,
+  -gimp-print-5.0.0_beta3.ebuild, +gimp-print-5.0.0_beta4.ebuild:
+  version bump, cleanups
+
+  18 May 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  gimp-print-4.2.7.ebuild:
+  stable on hppa
+
+  08 May 2005; Aron Griffis <agriffis@gentoo.org> gimp-print-4.2.7.ebuild:
+  stable on ia64
+
+  22 Apr 2005; Bryan Østergaard <kloeri@gentoo.org>
+  gimp-print-4.2.7.ebuild:
+  ~ia64 keyword, bug 89768.
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  gimp-print-5.0.0_beta3.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  08 Apr 2005; Markus Rothe <corsair@gentoo.org> gimp-print-4.2.7.ebuild:
+  Stable on ppc64
+
+  24 Mar 2005; Joseph Jezak <josejx@gentoo.org> gimp-print-4.2.7.ebuild:
+  Marked ppc stable for bug #84666.
+
+  21 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org> gimp-print-4.2.7.ebuild:
+  Stable on sparc
+
+*gimp-print-5.0.0_beta3 (20 Feb 2005)
+
+  20 Feb 2005; Heinrich Wendel <lanius@gentoo.org> gimp-print-4.2.6.ebuild,
+  gimp-print-4.2.7.ebuild, +gimp-print-5.0.0_beta3.ebuild:
+  version bump
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  26 Nov 2004; Hardave Riar <hardave@gentoo.org> gimp-print-4.2.6.ebuild:
+  Stable on mips.
+
+  17 Oct 2004; Dylan Carlson <absinthe@gentoo.org> gimp-print-4.2.6.ebuild:
+  stable on amd64.
+
+*gimp-print-5.0.0_beta2 (26 Aug 2004)
+
+  26 Aug 2004; Heinrich Wendel <lanius@gentoo.org>
+  -gimp-print-5.0.0_beta1.ebuild, +gimp-print-5.0.0_beta2.ebuild:
+  version bump
+
+*gimp-print-4.2.7 (21 Aug 2004)
+
+  21 Aug 2004; Heinrich Wendel <lanius@gentoo.org> +gimp-print-4.2.7.ebuild:
+  version bump
+
+  17 Jul 2004; Tom Gall <tgall@gentoo.org> gimp-print-4.2.6.ebuild:
+  stable on ppc64, bug #55802
+
+*gimp-print-5.0.0_beta1 (05 Jul 2004)
+
+  05 Jul 2004; Heinrich Wendel <lanius@gentoo.org>
+  gimp-print-5.0.0_alpha2.ebuild, gimp-print-5.0.0_beta1.ebuild:
+  version bump, bug #51428
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org> gimp-print-4.2.5-r2.ebuild,
+  gimp-print-4.2.6.ebuild, gimp-print-5.0.0_alpha2.ebuild:
+  Fix use invocation
+
+  05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> gimp-print-4.2.6.ebuild:
+  Stable on alpha.
+
+  03 May 2004; Gustavo Zacarias <gustavoz@gentoo.org> gimp-print-4.2.6.ebuild:
+  Stable on sparc
+
+  19 Apr 2004; Guy Martin <gmsoft@gentoo.org> gimp-print-4.2.6.ebuild:
+  Marked stable on hppa.
+
+  15 Apr 2004; Stephen P. Becker <geoman@gentoo.org> gimp-print-4.2.6.ebuild:
+  Added ~mips keyword.
+
+  12 Apr 2004; Heinrich Wendel <lanius@gentoo.org> :
+  remove old version
+
+*gimp-print-5.0.0_alpha2 (17 Apr 2004)
+
+  17 Apr 2004; Heinrich Wendel <lanius@gentoo.org>
+  gimp-print-5.0.0_alpha1.ebuild, gimp-print-5.0.0_alpha2.ebuild:
+  version bump
+
+  09 Apr 2004; Heinrich Wendel <lanius@gentoo.org> gimp-print-4.2.6.ebuild,
+  gimp-print-5.0.0_alpha1.ebuild:
+  build with gimp-2.0.0, bug #46407 and #47305
+
+  08 Apr 2004; Heinrich Wendel <lanius@gentoo.org> gimp-print-4.2.6.ebuild,
+  gimp-print-4.3.25.ebuild:
+  mark 4.2.6 x86, remove 4.3.25
+
+  02 Mar 2004; Heinrich Wendel <lanius@gentoo.org> gimp-print-4.2.5-r2.ebuild,
+  gimp-print-4.2.6.ebuild, gimp-print-4.3.25.ebuild,
+  gimp-print-5.0.0_alpha1.ebuild:
+  sed -i
+
+  12 Feb 2004; Heinrich Wendel <lanius@gentoo.org> gimp-print-4.2.5-r2.ebuild,
+  gimp-print-4.2.6.ebuild, gimp-print-4.3.25.ebuild,
+  gimp-print-5.0.0_alpha1.ebuild:
+  fix linking issues, bug #35414
+
+*gimp-print-4.2.6 (10 Feb 2004)
+
+  10 Feb 2004; Heinrich Wendel <lanius@gentoo.org> gimp-print-4.2.6.ebuild,
+  gimp-print-4.3.25.ebuild, gimp-print-5.0.0_alpha1.ebuild:
+  added the new stable and the new development version
+
+  09 Dec 2003; Heinrich Wendel <lanius@gentoo.org> gimp-print-4.2.5-r2.ebuild,
+  gimp-print-4.3.21.ebuild, gimp-print-4.3.25.ebuild:
+  changed app-text/ghostscript to virtual/ghostscript
+
+  08 Dec 2003; Heinrich Wendel <lanius@gentoo.org> gimp-print-4.3.25.ebuild:
+  better fix for the cflags problem, thx to brandy
+
+  07 Dec 2003; Heinrich Wendel <lanius@gentoo.org> gimp-print-4.3.25.ebuild:
+  won't compile with -O3
+
+*gimp-print-4.3.25 (06 Dec 2003)
+
+  06 Dec 2003; Heinrich Wendel <lanius@gentoo.org> gimp-print-4.3.25.ebuild:
+  bump
+
+  11 Oct 2003; Heinrich Wendel <lanius@gentoo.org> gimp-print-4.2.5-r2.ebuild,
+  gimp-print-4.3.18.ebuild, gimp-print-4.3.19.ebuild,
+  gimp-print-4.3.20.ebuild, gimp-print-4.3.21.ebuild:
+  bug #25747
+
+  03 Oct 2003; Heinrich Wendel <lanius@gentoo.org> gimp-print-4.3.21.ebuild:
+  stable  bump
+
+  28 Sep 2003; Markus Nigbur <pyrania@gentoo.org> gimp-print-4.2.5-r2.ebuild,
+  gimp-print-4.3.18.ebuild, gimp-print-4.3.19.ebuild,
+  gimp-print-4.3.20.ebuild, gimp-print-4.3.21.ebuild:
+  Removed block of merged media-gfx/gimp-print-cups
+
+*gimp-print-4.3.21 (26 Sep 2003)
+
+  26 Sep 2003; Heinrich Wendel <lanius@gentoo.org> gimp-print-4.3.21.ebuild:
+  version bump
+
+*gimp-print-4.3.20 (03 Sep 2003)
+
+  03 Sep 2003; Heinrich Wendel <lanius@gentoo.org> gimp-print-4.3.18.ebuild,
+  gimp-print-4.3.20.ebuild:
+  version bump
+
+*gimp-print-4.3.19 (11 Aug 2003)
+
+  11 Aug 2003; lanius@gentoo.org gimp-print-4.2.2.ebuild,
+  gimp-print-4.2.5-r1.ebuild, gimp-print-4.2.5.ebuild,
+  gimp-print-4.3.19.ebuild:
+  version bump
+
+*gimp-print-4.2.5-r2 (31 Jul 2003)
+
+  31 Jul 2003; lanius@gentoo.org gimp-print-4.2.5-r2.ebuild:
+  backport of 4.3.18 ebuild to stable series
+
+  29 Jul 2003; lanius@gentoo.org gimp-print-4.3.18.ebuild:
+  stable bump
+
+  20 Jul 2003; lanius@gentoo.org gimp-print-4.3.18.ebuild:
+  fixed cups use flag (bug #24873)
+
+*gimp-print-4.3.18 (16 Jul 2003)
+
+  16 Jul 2003; Heinrich Wendel <lanius@gentoo.org> gimp-print-4.3.18.ebuild:
+  fixed missing libgimpprint.so.1 (#20016) and merged gimp-print-cups and
+  gimp-print
+
+*gimp-print-4.2.5-r1 (04 Jul 2003)
+ 
+  12 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
+*gimp-print-4.2.5 (28 Jan 2003)
+
+  03 Jul 2003; Guy Martin <gmsoft@gentoo.org> gimp-print-4.2.5-r1.ebuild :
+  Added hppa to KEYWORDS.
+
+  08 Mar 2003; Thomas Raschbacher <lordvan@gentoo.org> *.ebuild:
+  added dep for !net-print/gimp-print-cups because of conflicts
+
+  07 Mar 2003; Thomas Raschbacher <lordvan@gentoo.org> gimp-print-4.2.5.ebuild:
+  Mark stable on x86
+
+  07 Mar 2003; Thomas Raschbacher <lordvan@gentoo.org> gimp-print-4.2.5-r1.ebuild:
+  should now work with gimp-1.3 only too - please test (bug #14909)
+	
+  21 Feb 2003; Aron Griffis <agriffis@gentoo.org> gimp-print-4.2.5.ebuild :
+  Mark stable on Alpha
+
+  28 Jan 2003; Thomas Raschbacher <lordvan@gentoo.org> gimp-print-4.2.5.ebuild:
+  new version (bug #14660)
+
+*gimp-print-4.2.4 (30 Sept 2002)
+  27 Dec 2002; Thomas Raschbacher <lordvan@gentoo.org gimp-print-4.2.4.ebuild:
+  added new version
+  30 Dec 2002; Thomas Raschbacher <lordvan@gentoo.org gimp-print-4.2.4.ebuild:
+  unmasked for x86
+	
+*gimp-print-4.2.2 (25 Sep 2002)
+  
+  29 Dec 2002; Jack Morgan <jmorgan@gentoo.org> gimp-print-4.2*.ebuild :
+  Added sparc keywords
+
+  17 Oct 2002; Nick Hadaway <raker@gentoo.org> gimp-print-4.2.2.ebuild :
+  Added dependancy on foomatic and it now installs with a much simpler
+  make install routine.  Should fix bug #9014
+
+  29 Sep 2002; Nick Hadaway <raker@gentoo.org> gimp-print-4.2.2.ebuild :
+  Tightened gimp dependancy to the 1.2* series.
+
+  25 Sep 2002; Nick Hadaway <raker@gentoo.org> gimp-print-4.2.2.ebuild,
+  files/digest-gimp-pring-4.2.2 :
+  Version bump.  Lots of fixes. See...
+  http://sourceforge.net/project/shownotes.php?release_id=110475
+  for a complete list of changes.
+
+*gimp-print-4.2.1 (29 Apr 2002)
+
+  29 Sep 2002; Nick Hadaway <raker@gentoo.org> gimp-print-4.2.1.ebuild :
+  Tightened gimp dependancy to the 1.2* series.
+
+*gimp-print-4.1.99_beta4-r1 (2 Apr 2002)
+
+  2 Apr 2002; Seemant Kulleen <seemant@gentoo.org> gimp-print-4.1.99_beta4-r1.ebuild :
+  Fixed sandbox violations and some dependency issues as well.
 
 *gimp-print-4.1.99_beta4 (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/media-gfx/gimp-print/Manifest b/media-gfx/gimp-print/Manifest
index e69de29bb2d1..d30feba35cb7 100644
--- a/media-gfx/gimp-print/Manifest
+++ b/media-gfx/gimp-print/Manifest
@@ -0,0 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 55f96e86217a34c5291fdce2bc1b9e24 ChangeLog 9001
+MD5 5f304014b5d0eb55e0a62cc46d098dfb files/digest-gimp-print-4.2.6 69
+MD5 0dbf86fe4303814e2dfa36f8c4b8e67c files/digest-gimp-print-4.2.7 69
+MD5 ecd67127e5d68d1ad44c9b8f6c70b1e5 files/digest-gimp-print-5.0.0_beta4 76
+MD5 2a5e9010ecd49db63841ba5f47716fc1 files/digest-gimp-print-5.0.0_rc1 74
+MD5 d127b4f94cec575d3aec9d13955d2f27 gimp-print-4.2.6.ebuild 2212
+MD5 70553ab6eead387f4ae932aae1bd4aea gimp-print-4.2.7.ebuild 2218
+MD5 61e404ce73546a5bc61dcf9ff58bc382 gimp-print-5.0.0_beta4.ebuild 2254
+MD5 db698f75226c76aaf388bf749eaf1e8a gimp-print-5.0.0_rc1.ebuild 2254
+MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDaVLowUpWvClEHQoRAlCmAJ9WYXAwQcJdAQyf2kRq+Kp5Y+zOGgCeLtBF
+ZAWfa3Zs6sq3sP3QEkCaCiI=
+=ZGSa
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/gimp-print/gimp-print-4.2.6.ebuild b/media-gfx/gimp-print/gimp-print-4.2.6.ebuild
index 23b05adbb94b..a6cf3e50dea7 100644
--- a/media-gfx/gimp-print/gimp-print-4.2.6.ebuild
+++ b/media-gfx/gimp-print/gimp-print-4.2.6.ebuild
@@ -1,12 +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/media-gfx/gimp-print/gimp-print-4.2.6.ebuild,v 1.1 2004/02/10 13:51:52 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/gimp-print-4.2.6.ebuild,v 1.1.1.1 2005/11/30 09:37:19 chriswhite Exp $
+
+inherit libtool
 
 IUSE="nls gtk readline cups foomaticdb ppds"
 
 DESCRIPTION="Gimp Print Drivers"
 HOMEPAGE="http://gimp-print.sourceforge.net"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64"
+KEYWORDS="x86 ~ppc alpha sparc hppa amd64 mips ppc64"
 SRC_URI="mirror://sourceforge/gimp-print/${P}.tar.gz"
 
 DEPEND="cups? ( >=net-print/cups-1.1.14 )
@@ -21,6 +23,8 @@ LICENSE="GPL-2"
 SLOT="0"
 
 src_compile() {
+	elibtoolize --reverse-deps
+
 	local myconf
 
 	use nls \
@@ -39,7 +43,7 @@ src_compile() {
 		&& myconf="${myconf} --with-gimp" \
 		|| myconf="${myconf} --without-gimp"
 
-	if [ "`use cups`" ]; then
+	if use cups; then
 		myconf="${myconf} --with-cups"
 	else
 		myconf="${myconf} --without-cups"
@@ -49,7 +53,7 @@ src_compile() {
 		&& myconf="${myconf} --with-foomatic3" \
 		|| myconf="${myconf} --without-foomatic"
 
-	econf \
+	GIMPTOOL=/usr/bin/gimptool-1.2 econf \
 		--enable-test \
 		--with-ghosts \
 		--with-user-guide \
@@ -59,16 +63,15 @@ src_compile() {
 		$myconf || die
 
 	# IJS Patch
-	cp src/ghost/ijsgimpprint.c src/ghost/ijsgimpprint.c.org
-	sed -e "s/<ijs/<ijs\/ijs/g" src/ghost/ijsgimpprint.c.org > src/ghost/ijsgimpprint.c
+	sed -i -e "s/<ijs/<ijs\/ijs/g" src/ghost/ijsgimpprint.c
 
-	emake || die "compile problem"
+	emake -j1 || die "compile problem"
 }
 
 src_install () {
 	make install DESTDIR=${D} || die
 
-	if [ ! "`use ppds`" ]; then
+	if ! use ppds; then
 		rm -fR ${D}/usr/share/cups/model/
 	fi
 
diff --git a/media-gfx/gimp-print/gimp-print-4.2.7.ebuild b/media-gfx/gimp-print/gimp-print-4.2.7.ebuild
index 89654b828e46..638395d1621a 100644
--- a/media-gfx/gimp-print/gimp-print-4.2.7.ebuild
+++ b/media-gfx/gimp-print/gimp-print-4.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/media-gfx/gimp-print/gimp-print-4.2.7.ebuild,v 1.1 2004/08/21 09:38:19 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/gimp-print-4.2.7.ebuild,v 1.1.1.1 2005/11/30 09:37:18 chriswhite Exp $
 
 inherit libtool
 
@@ -8,7 +8,7 @@ IUSE="nls gtk readline cups foomaticdb ppds"
 
 DESCRIPTION="Gimp Print Drivers"
 HOMEPAGE="http://gimp-print.sourceforge.net"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~mips ~ppc64"
+KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
 SRC_URI="mirror://sourceforge/gimp-print/${P}.tar.gz"
 
 DEPEND="cups? ( >=net-print/cups-1.1.14 )
@@ -65,7 +65,7 @@ src_compile() {
 	# IJS Patch
 	sed -i -e "s/<ijs/<ijs\/ijs/g" src/ghost/ijsgimpprint.c
 
-	emake || die "compile problem"
+	emake -j1 || die "compile problem"
 }
 
 src_install () {
diff --git a/media-gfx/gimp-print/gimp-print-5.0.0_beta4.ebuild b/media-gfx/gimp-print/gimp-print-5.0.0_beta4.ebuild
index 456917051d18..f4217a925e09 100644
--- a/media-gfx/gimp-print/gimp-print-5.0.0_beta4.ebuild
+++ b/media-gfx/gimp-print/gimp-print-5.0.0_beta4.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/media-gfx/gimp-print/gimp-print-5.0.0_beta4.ebuild,v 1.1 2005/05/31 22:40:53 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/gimp-print-5.0.0_beta4.ebuild,v 1.1.1.1 2005/11/30 09:37:19 chriswhite Exp $
 
 inherit flag-o-matic libtool
 
-IUSE="cups foomaticdb gtk nls readline"
+IUSE="cups foomaticdb gtk nls readline ppds"
 
 MY_P=gutenprint-5.0.0-beta4
 
diff --git a/media-gfx/gimp-print/gimp-print-5.0.0_rc1.ebuild b/media-gfx/gimp-print/gimp-print-5.0.0_rc1.ebuild
index b3102b50519a..ac9e52dce9f3 100644
--- a/media-gfx/gimp-print/gimp-print-5.0.0_rc1.ebuild
+++ b/media-gfx/gimp-print/gimp-print-5.0.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/media-gfx/gimp-print/gimp-print-5.0.0_rc1.ebuild,v 1.1 2005/11/02 23:52:51 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/gimp-print-5.0.0_rc1.ebuild,v 1.1.1.1 2005/11/30 09:37:18 chriswhite Exp $
 
 inherit flag-o-matic libtool
 
diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 19dca266d8c6..88980f6042a5 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,562 @@
 # ChangeLog for media-gfx/gimp
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/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/media-gfx/gimp/ChangeLog,v 1.1.1.1 2005/11/30 09:37:43 chriswhite Exp $
+
+  11 Nov 2005; John N. Laliberte <allanonjl@gentoo.org> gimp-2.2.9.ebuild:
+  remove -march=k6 filtering, #105036
+
+  01 Nov 2005; Martin Schlemmer <azarah@gentoo.org> gimp-2.2.9.ebuild:
+  Fix icon png being removed on upgrade.
+
+*gimp-2.2.9 (28 Oct 2005)
+
+  28 Oct 2005; John N. Laliberte <allanonjl@gentoo.org> +gimp-2.2.9.ebuild:
+  new version, new version of gimp-help as well. remove restart marker patch
+  and configure patch, they have been applied upstream. bump fixes #110650
+
+  07 Oct 2005; Hardave Riar <hardave@gentoo.org> gimp-2.2.8-r1.ebuild:
+  Stable on mips.
+
+  16 Sep 2005; John N. Laliberte <allanonjl@gentoo.org>
+  gimp-2.2.8-r1.ebuild:
+  remove scanner useflag #105192, #101841
+
+  11 Sep 2005; Guy Martin <gmsoft@gentoo.org> gimp-2.2.8-r1.ebuild:
+  Stable on hppa.
+
+  08 Sep 2005; Aron Griffis <agriffis@gentoo.org> gimp-2.2.8-r1.ebuild:
+  Mark 2.2.8-r1 stable on ia64
+
+  03 Sep 2005; Markus Rothe <corsair@gentoo.org> gimp-2.2.8-r1.ebuild:
+  Stable on ppc64
+
+  02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> gimp-2.2.8-r1.ebuild:
+  Stable on ppc.
+
+  31 Aug 2005; Luis Medinas <metalgod@gentoo.org> gimp-2.2.8-r1.ebuild:
+  Marked Stable on AMD64.
+
+  29 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> gimp-2.2.8-r1.ebuild:
+  Stable on sparc
+
+  29 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
+  gimp-2.2.8-r1.ebuild:
+  Stable on x86.
+
+  04 Aug 2005; John N. Laliberte <allanonjl@gentoo.org>
+  gimp-2.2.6-r1.ebuild:
+  add missing hardened use flag.
+
+  16 Jul 2005; John N. Laliberte <allanonjl@gentoo.org> gimp-1.2.5.ebuild,
+  gimp-2.0.4.ebuild, gimp-2.2.6-r1.ebuild, gimp-2.2.8-r1.ebuild:
+  filter ffast-math because gimp needs accuracy.  fixes #98685
+
+  12 Jul 2005; Stephen P. Becker <geoman@gentoo.org> gimp-2.2.6-r1.ebuild:
+  stable on mips
+
+*gimp-2.2.8-r1 (01 Jul 2005)
+
+  01 Jul 2005; John N. Laliberte <allanonjl@gentoo.org>
+  -files/gimp-2.0.0-gcc34.patch, +files/gimp-2.2.8-restart-marker.patch,
+  -files/psd_save.c, -gimp-2.0.0.ebuild, -gimp-2.0.2.ebuild,
+  -gimp-2.0.5.ebuild, -gimp-2.0.6.ebuild, -gimp-2.2.0.ebuild,
+  -gimp-2.2.3.ebuild, -gimp-2.2.6.ebuild, -gimp-2.2.8.ebuild,
+  +gimp-2.2.8-r1.ebuild:
+  apply patch to fix #97361, purged old ebuilds
+
+*gimp-2.2.8 (28 Jun 2005)
+
+  28 Jun 2005; John N. Laliberte <allanonjl@gentoo.org>
+  -files/gimp-2.2.7-configure-fix.patch,
+  +files/gimp-2.2.8-configure-fix.patch, -gimp-2.2.7.ebuild,
+  -gimp-2.2.7-r1.ebuild, +gimp-2.2.8.ebuild:
+  version bump to 2.2.8. fixes #97306
+
+*gimp-2.2.7-r1 (15 Jun 2005)
+
+  15 Jun 2005; John N. Laliberte <allanonjl@gentoo.org>
+  +gimp-2.2.7-r1.ebuild:
+  added symlink to icon in /usr/share/pixmaps. submitted configure.in patch
+  upstream.
+
+  24 May 2005; John N. Laliberte <allanonjl@gentoo.org> gimp-2.2.7.ebuild:
+  add svg to econf section, fixes #93787
+
+  24 May 2005; John N. Laliberte <allanonjl@gentoo.org> gimp-2.2.7.ebuild:
+  re-enable support for mips due to masking of scanner use flag
+
+*gimp-2.2.7 (24 May 2005)
+
+  24 May 2005; John N. Laliberte <allanonjl@gentoo.org>
+  +files/gimp-2.2.7-configure-fix.patch, +gimp-2.2.7.ebuild:
+  fixes bug #51263, bug #61581, bug #92176, bug #41885, bug #76050, bug
+  #76974, bug #92008, bug #93018, bug #92498, updated help, use alternatives
+  eclass, and various other changes.
+
+  21 May 2005; Markus Rothe <corsair@gentoo.org> gimp-2.2.6-r1.ebuild:
+  Stable on ppc64
+
+  17 May 2005; Michael Hanselmann <hansmi@gentoo.org> gimp-2.2.6-r1.ebuild:
+  Stable on ppc.
+
+  14 May 2005; Heinrich Wendel <lanius@gentoo.org> gimp-2.2.6-r1.ebuild:
+  stable on amd64
+
+  12 May 2005; Rene Nussbaumer <killerfox@gentoo.org> gimp-2.2.6-r1.ebuild:
+  Stable on hppa
+
+  11 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> gimp-2.2.6-r1.ebuild:
+  Stable on sparc
+
+*gimp-2.2.6-r1 (10 May 2005)
+
+  10 May 2005; John N. Laliberte <allanonjl@gentoo.org>
+  +gimp-2.2.6-r1.ebuild:
+  Added cache updates to 2.2.6. Marked stable on x86.
+
+  22 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> gimp-2.2.6.ebuild:
+  ~ia64 keyword, bug 89768.
+
+*gimp-2.2.6 (12 Apr 2005)
+
+  12 Apr 2005; Mike Gardiner <obz@gentoo.org> +gimp-2.2.6.ebuild:
+  New version, see bug #83646
+
+  07 Mar 2005; Markus Rothe <corsair@gentoo.org> gimp-2.2.3.ebuild:
+  Stable on ppc64
+
+  10 Feb 2005; Marcus D. Hanwell <cryos@gentoo.org> gimp-2.2.3.ebuild:
+  Hard enabling SIMD assembler for AMD64, closes bug 80638.
+
+*gimp-2.2.3 (02 Feb 2005)
+
+  02 Feb 2005; Joe McCann <joem@gentoo.org> gimp-2.0.6.ebuild,
+  +gimp-2.2.3.ebuild:
+  Bugfix bump and removal from p.mask. Added gtkhtml to IUSE
+
+  23 Dec 2004; Mike Gardiner <obz@gentoo.org> gimp-2.2.0.ebuild, gimp-2.0.6.ebuild:
+  More fixes, changed doc? to gtkhtml? (bug #74848), and fixed USE=-doc to not install any developer documentation in 2.2.0
+
+  22 Dec 2004; Mike Gardiner <obz@gentoo.org> +files/pygimp-logo.png,
+  -files/pygimp-logo.png.bz2, gimp-2.2.0.ebuild:
+  Updated dependencies and a few other fixes.
+
+*gimp-2.2.0 (21 Dec 2004)
+
+  21 Dec 2004; Luca Barbato <lu_zero@gentoo.org> +files/pygimp-logo.png.bz2,
+  +gimp-2.2.0.ebuild:
+  New version
+
+  17 Dec 2004; Markus Rothe <corsair@gentoo.org> gimp-2.0.4.ebuild:
+  Stable on ppc64
+
+  26 Nov 2004; Hardave Riar <hardave@gentoo.org> gimp-2.0.4.ebuild:
+  Stable on mips.
+
+  22 Nov 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed digest.
+
+*gimp-2.0.6 (04 Nov 2004)
+
+  04 Nov 2004; Luca Barbato <lu_zero@gentoo.org> gimp-2.0.5.ebuild,
+  +gimp-2.0.6.ebuild:
+  New version, updated the manual
+
+  03 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> gimp-2.0.5.ebuild:
+  ~alpha keyword.
+
+*gimp-2.0.5 (29 Oct 2004)
+
+  29 Oct 2004; Luca Barbato <lu_zero@gentoo.org> +gimp-2.0.5.ebuild:
+  New ebuild, solves bug #65364
+
+  17 Oct 2004; Dylan Carlson <absinthe@gentoo.org> gimp-2.0.4.ebuild:
+  stable on amd64.
+
+  12 Oct 2004; Alexander Gabert <pappy@gentoo.org> gimp-2.0.4.ebuild:
+  adding hardened versus mmx use flag suppression
+
+  08 Sep 2004; Guy Martin <gmsoft@gentoo.org> gimp-2.0.4.ebuild:
+  Stable on hppa.
+
+  30 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> gimp-2.0.4.ebuild:
+  Stable on sparc
+
+  29 Aug 2004; foser <foser@gentoo.org> gimp-2.0.4.ebuild :
+  Make libgtkhtml dep switch on doc USE flag, since thats what it implies
+  Disable X useflag for now (#58003)
+  Fixed user docs compilation when installing gimp from scratch (#60393)
+
+*gimp-2.0.4 (11 Aug 2004)
+
+  11 Aug 2004; Luca Barbato <lu_zero@gentoo.org> +gimp-2.0.4.ebuild:
+  New ebuild, added gimp-help
+
+  29 Jul 2004; Tom Gall <tgall@gentoo.org> gimp-2.0.2.ebuild:
+  stable on ppc64, bug #57015
+
+  24 Jul 2004; Lars Weiler <pylon@gentoo.org> gimp-2.0.0.ebuild:
+  (Finally) Stable on ppc.
+
+  15 Jul 2004; Gustavo Zacarias <gustavoz@gentoo.org> gimp-2.0.0.ebuild:
+  Ship it on sparc.
+
+  30 Jun 2004; Guy Martin <gmsoft@gentoo.org> gimp-2.0.0.ebuild:
+  Marked stable on hppa.
+
+*gimp-2.0.2 (22 Jun 2004)
+
+  22 Jun 2004; foser <foser@gentoo.org> gimp-2.0.2.ebuild :
+  New release, as requested in #47983
+  Added svg USE as in #51263 (still autodetect based though :/)
+  Use --disable-default-binary instead of removing the versionless gimp link
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org> gimp-1.2.3-r3.ebuild,
+  gimp-1.2.4.ebuild, gimp-1.2.5.ebuild:
+  Fix use invocation
+
+  05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> gimp-1.2.5.ebuild:
+  Stable on alpha.
+
+  01 Jun 2004; Travis Tilley <lv@gentoo.org> gimp-2.0.0.ebuild:
+  stable on amd64
+
+  28 Apr 2004; Travis Tilley <lv@gentoo.org> +files/gimp-2.0.0-gcc34.patch,
+  gimp-2.0.0.ebuild:
+  added patch for compiling with gcc 3.4
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> gimp-2.0_pre3-r1.ebuild:
+  Add inherit eutils
+
+  15 Apr 2004; Stephen P. Becker <geoman@gentoo.org> gimp-2.0.0.ebuild:
+  Added ~mips keyword.
+
+  14 Apr 2004; Stephen P. Becker <geoman@gentoo.org> gimp-1.2.5.ebuild:
+  Marked stable on mips.
+
+*gimp-2.0.0 (26 Mar 2004)
+
+  26 Mar 2004; foser <foser@gentoo.org> gimp-2.0.0.ebuild :
+  First stable release of the GTK+-2 gimp (#45563)
+  Add mng & debug USE
+  Fix up mime/application/desktop installation by touching their dirs
+  Remove the unversioned gimp binary link (slot problem)
+  Removed the obsolete postinstall warnings
+
+  19 Mar 2004; foser <foser@gentoo.org> gimp-1.2.{4,5}.ebuild :
+  Fix jpeg USE in deps (#45110)
+
+  13 Mar 2004; Stephen P. Becker <geoman@gentoo.org> gimp-1.2.5.ebuild:
+  Added ~mips keyword.
+
+*gimp-2.0_pre3-r1 (15 Feb 2004)
+
+  15 Feb 2004; foser <foser@gentoo.org> gimp-2.0_pre3-r1.ebuild :
+  The return of the linking fix, which i was a bit too keen on removing (#38972)
+  Added gcc2 build fixes, reported by Tristan Henderson in #41487 with patch
+	
+*gimp-2.0_pre3 (12 Feb 2004)
+
+  12 Feb 2004; <spider@gentoo.org> gimp-2.0_pre3.ebuild:
+  new pre version, libtool fix for linking , remove patches as they seem to be
+  in main tree now
+
+  07 Feb 2004; Lars Weiler <pylon@gentoo.org> gimp-1.2.5.ebuild:
+  stable on ppc
+
+  01 Feb 2004; Brandon Hale <tseng@gentoo.org>
+  files/gimp-2.0_pre2-cpuaccel-pic.patch:
+  Small fix to gimp-2.0_pre2-cpuaccel-pic.patch for amd64.
+
+  31 Jan 2004; Brandon Hale <tseng@gentoo.org> gimp-2.0_pre2.ebuild,
+  files/gimp-2.0_pre2-cpuaccel-pic.patch:
+  Apply patch from Gimp CVS to allow for PIC-safe building.
+  (http://bugs.gnome.org/show_bug.cgi?id=132999)
+
+*gimp-2.0_pre2 (21 Jan 2004)
+
+  21 Jan 2004; <foser@gentoo.org> gimp-2.0_pre2.ebuild :
+  New release, add upstream fix for gimp-remote to fix desktop item behaviour
+  Add gimpprint local USE handling for printing, based on patch by <brix@gimp.org> in #37684
+  Add wmf USE flag on request in #38867
+
+  14 Jan 2004; <gustavoz@gentoo.org> gimp-1.2.5.ebuild:
+  stable on hppa
+
+  13 Jan 2004; Jon Portnoy <avenj@gentoo.org> gimp-1.2.5.ebuild :
+  Stable on AMD64.
+
+*gimp-2.0_pre1 (09 Jan 2004)
+
+  09 Jan 2004; foser <foser@gentoo.org> gimp-2.0_pre1.ebuild :
+  Fix SRC_URI, duh, i thought i double checked that (#37656)
+  
+  09 Jan 2004; foser <foser@gentoo.org> gimp-2.0_pre1.ebuild :
+  New release, add fix for intltool 0.28 problems
+
+*gimp-1.3.23 (26 Nov 2003)
+
+  26 Nov 2003; foser <foser@gentoo.org> gimp-1.3.23.ebuild :
+  New release
+  Fix some deps and disable some safeguards for testing
+
+  21 Nov 2003; Jason Wever <weeve@gentoo.org> gimp-1.2.5.ebuild:
+  Marked stable on sparc.
+
+*gimp-1.3.22 (10 Nov 2003)
+
+  11 Nov 2003; foser <foser@gentoo.org> gimp-1.3.22.ebuild :
+  Add extra warning as requested in #32896
+
+  10 Nov 2003; Alastair Tse <liquidx@gentoo.org> gimp-1.3.20-r1.ebuild,
+  gimp-1.3.22.ebuild:
+  version bump. add altivec option
+
+  08 Oct 2003; L. Boshell <leonardop@gentoo.org> gimp-1.3.21.ebuild,
+  gimp-1.3.20-r1.ebuild, gimp-1.2.5.ebuild :
+  Use mirror:// in SRC_URI.
+
+*gimp-1.3.21 (08 Oct 2003)
+
+  08 Oct 2003; foser <foser@gentoo.org> gimp-1.3.21.ebuild :
+  New version, minor ebuild fixes
+
+  28 Sep 2003; foser <foser@gentoo.org> gimp-1.2.{4,5}.ebuild :
+  Remove redundant doc in IUSE (#29817)
+
+*gimp-1.3.20-r1 (25 Sep 2003)
+
+  25 Sep 2003; Martin Schlemmer <azarah@gentoo.org> gimp-1.3.20-r1.ebuild,
+  files/ltmain_sh-1.5.0-fix-relink.patch:
+  Cleanup the build a bit. Remove the hack, and rather add a proper fix to
+  libtool.
+
+  20 Sep 2003; Alastair Tse <liquidx@gentoo.org> gimp-1.3.20.ebuild:
+  added more intelligent symlink generation
+
+*gimp-1.3.20 (20 Sep 2003)
+
+  20 Sep 2003; Alastair Tse <liquidx@gentoo.org> gimp-1.3.20.ebuild:
+  version bump. this version has uses libtool 1.5a, and as a result, the
+  troubles with upgrading has re-appeared.we are resorting to the symlink trick
+  at the moment until we can find out how to fix it.
+  
+*gimp-1.3.19 (30 Aug 2003)
+
+  30 Aug 2003; Alastair Tse <liquidx@gentoo.org> gimp-1.3.19.ebuild:
+  version bump to latest dev version.
+
+  15 Aug 2003; Todd Sunderlin <todd@gentoo.org> gimp-1.2.4.ebuild:
+  Marked stable on sparc
+
+*gimp-1.3.18 (12 Aug 2003)
+
+  28 Aug 2003; foser <foser@gentoo.org> gimp-1.3.18.ebuild :
+  Add replace flags for k6 problems, always use i586 (#27415)
+
+  12 Aug 2003; foser <foser@gentoo.org> gimp-1.3.18.ebuild :
+  New unstable version, added exif support under jpeg USE flag
+
+*gimp-1.3.17 (25 Jul 2003)
+
+  04 Aug 2003; Joshua Kinard <kumba@gentoo.org> gimp-1.3.17.ebuild:
+  Added ~sparc to KEYWORDS
+
+  25 Jul 2003; foser <foser@gentoo.org> gimp-1.3.17.ebuild :
+  New dev version, reslotted from 1.4 to 2 along with new upstream versioning plans
+  removed perl USE, only interesting for maintainers
+  added X, mmx and sse USE flags
+
+*gimp-1.3.16 (05 Jul 2003)
+
+  05 Jul 2003; Alastair Tse <liquidx@gentoo.org> gimp-1.3.16.ebuild:
+  version bump. elibtoolize --reverse-deps seems to work with this version of
+  gimp now.
+
+  05 Jul 2003; Alastair Tse <liquidx@gentoo.org> gimp-1.2.4.ebuild,
+  gimp-1.2.5.ebuild, gimp-1.3.15.ebuild:
+  protection against overoptimisations (#21787)
+
+  04 Jul 2003; Alastair Tse <liquidx@gentoo.org> gimp-1.3.15.ebuild:
+  fix menu entry link
+
+  19 Jun 2003; Alastair Tse <liquidx@gentoo.org> gimp-1.2.5.ebuild,
+  gimp-1.3.15.ebuild:
+  filter -fno-inline because gimp uses inline functions
+
+*gimp-1.2.5 (17 Jun 2003)
+
+  11 Aug 2003; foser <foser@gentoo.org> gimp-1.2.5.ebuild :
+  Added workaround for possible libmpeg problems (#21924)
+
+  17 Jun 2003; foser <foser@gentoo.org> gimp-1.2.5.ebuild :
+  New version, add AA fix to be on the safe side
+  tidy up filterflags stuff a bit
+  
+  17 Jun 2003; foser <foser@gentoo.org> gimp-1.3.15.ebuild :
+  revert gtkhtml/print changes liquidx did, always disable printint support for now
+
+  12 Jun 2003; Alastair Tse <liquidx@gentoo.org> gimp-1.3.15.ebuild:
+  restored gtkhtml useflag to use the --disable/enable-print config flag
+
+  12 Jun 2003; Alastair Tse <liquidx@gentoo.org> gimp-1.3.15.ebuild:
+  if aalib is not present, variable $AA will override the values in ./configure
+  causing ${P}.tar.bz2 to become a make target, which is obviously wrong
+  (#22616). also cleaned up the ebuild with respect to econf.
+
+*gimp-1.3.15 (10 Jun 2003)
+
+  04 Jul 2003; Guy Martin <gmsoft@gentoo.org> gimp-1.3.15.ebuild :
+  Added ~hppa to KEYWORDS.
+
+  10 Jun 2003; Nick Hadaway <raker@gentoo.org> gimp-1.3.15.ebuild,
+  files/digest-gimp-1.3.15:
+  Version bump.
+
+  10 Jun 2003; Alastair Tse <liquidx@gentoo.org> gimp-1.3.13.ebuild:
+  fixing libgtkhtml deps
+
+*gimp-1.2.4 (26 May 2003)
+
+  04 Jul  2003; Guy Martin <gmsoft@gentoo.org> gimp-1.2.4.ebuild :
+  Added hppa to KEYWORDS.
+
+  07 Jun 2003; foser <foser@gentoo.org> gimp-1.2.4.ebuild :
+  Add fix for possible k6 compile problem (#22115)
+ 
+  26 May 2003; Alastair Tse <liquidx@gentoo.org> gimp-1.2.4.ebuild,
+  files/gimp-1.2.4-gentoo.diff:
+  bumping stable series to 1.2.4. removing custom psd_save and various
+  ebuild cleanups by foser. also fixed perl man page installation paths.
+
+*gimp-1.3.14 (16 Apr 2003)
+
+  19 Apr 2003; Philip Walls <malverian@gentoo.org> gimp-1.3.14.ebuild :
+  use jpeg, not use libjpeg - bug #19602
+
+  19 Apr 2003; foser <foser@gentoo.org> gimp-1.3.14.ebuild :
+  Fixed slot to be 1.4 again
+
+  18 Apr 2003; Philip Walls <malverian@gentoo.org> gimp-1.3.14.ebuild :
+  Add silly make fix (in all other 1.3.x ebuilds) - Bug #19501
+
+  16 Apr 2003; foser <foser@gentoo.org> gimp-1.3.14.ebuild :
+  New version, fixed deps and added useflags for png, tiff, jpeg and gtkhtml
+
+*gimp-1.3.13 (24 Mar 2003)
+
+  24 Mar 2003; Philip Walls <malverian@gentoo.org> gimp-1.3.13.ebuild,
+  files/digest-gimp-1.3.13 :
+
+  Version bump, check for perl in USE, re-enable gnome-desktop 
+  functionality.
+
+*gimp-1.3.12 (24 Feb 2003)
+
+  10 Mar 2003; Seemant Kulleen <seemant@gentoo.org> gimp-1.2.3-r2.ebuild,
+  gimp-1.2.3-r3.ebuild, gimp-1.3.11.ebuild, gimp-1.3.12.ebuild:
+  strip out -fomit-frame-pointer for k6 based cpu's. closes bug #15559 by
+  sinterklaas <jerroose@xs4all.nl>
+
+  25 Feb 2003; Martin Holzer <mholzer@gentoo.org> gimp-1.3.12.ebuild :
+  Filter out -Os and replace with -O2. Closes #12644.
+
+  24 Feb 2003; foser <foser@gentoo.org. gimp-1.3.12.ebuild :
+  Removed xpm dep (#1446)
+
+  24 Feb 2003; foser <foser@gentoo.org> gimp-1.3.12.ebuild :
+  New version, added aalib USE and xpm dep
+
+*gimp-1.3.11 (05 Jan 2003)
+
+  25 Feb 2003; Martin Holzer <mholzer@gentoo.org> gimp-1.3.11.ebuild :
+  Filter out -Os and replace with -O2. Closes #12644.
+
+  15 Jan 2003; Martin Holzer <mholzer@gentoo.org> gimp-1.2.11.ebuild :
+  Added pygtk to dependency cause of needed in configure
+
+  05 Jan 2003; foser <foser@gentoo.org> gimp-1.3.11.ebuild :
+  New devel version, the python plugin seems stabilized
+
+*gimp-1.3.10 (08 Nov 2002)
+
+  29 Dec 2002; Jack Morgan <jmorgan@gentoo.org> gimp-1.2.3-r3.ebuild :
+  Added sparc keyword
+
+  08 Nov 2002; foser <foser@gentoo.org> gimp-1.3.10.ebuild :
+  New devel version. Python support seems not usable yet.
+
+*gimp-1.2.3-r3 (2 Nov 2002)
+
+  03 Mar 2003; Brandon Low <lostlogic@gentoo.org> gimp-1.2.3-r3.ebuild:
+  Add a warning about threaded perl
+
+  07 Jan 2003; Aron Griffis <agriffis@gentoo.org> gimp-1.2.3-r3.ebuild :
+  Add alpha to KEYWORDS
+
+  04 Dec 2002; Seemant Kulleen <seemant@gentoo.org> gimp-1.2.4-r3.ebuild :
+
+  Cleaned up DEPEND list
+
+  09 Nov 2002; L. Boshell <leonardop@gentoo.org> : Fix access violations.
+  
+  06 Nov 2002; L. Boshell <leonardop@gentoo.org> gimp-1.2.3-r3.ebuild :
+  Create a menu entry in Gnome if it makes sense (bug #10035).
+  
+  28 Oct 2002; Martin Schlemmer <azarah@gentoo.org> gimp-1.2.3-r3.ebuild :
+  Fix braindead use of autoconf-2.5 during reconf.  Do not run autoreconf,
+  or even autoconf, as it (autoreconf at least) needs cvs installed, and
+  breaks configure (locales are not installed).  Our psd_save patch anyhow
+  only touch .am files, so only automake is needed ....  This should fix
+  bugs #8490, #6021 and #9621.
+
+*gimp-1.3.9 (12 Oct 2002)
+ 
+  12 Oct 2002; foser <foser@gentoo.org> gimp-1.3.9 :
+  New gtk2 development version
+
+*gimp-1.2.3-r2 (14 Jul 2002)
+
+  23 Oct 2002; Martin Schlemmer <azarah@gentoo.org> gimp-1.2.3-r2.ebuild :
+  Some more autoconf/gettext fixes.
+
+  14 Jul 2002; Martin Schlemmer <azarah@gentoo.org> gimp-1.2.3-r2.ebuild :
+  Some automake warning cleanups.  Dont really fix anything except
+  getting rid of the warnings, so no revision bump.
+
+*gimp-1.3.7-r1 (02 Jun 2002)
+  02 Jun 2002; Spider <spider@gentoo.org> gimp-1.3.7-r1.ebuild:
+  new version out
+    
+*gimp-1.3.7 (01 Jun 2002)
+  01 Jun 2002; Spider <spider@gentoo.org> gimp-1.3.7.ebuild:
+  new version out
+  
+*gimp-1.3.5 (22 May 2002)
+  22 May 2002; Spider <spider@gentoo.org> gimp-1.3.5.ebuild:
+  in the big gnome2 move I'm adding this beta..
+
+*gimp-1.2.3-r2 (22 Feb 2002)
+  13 Sep 2002; Spider <spider@gentoo.org> :
+  Added fix by Michael Cummings <mcummings@gentoo.org> that makes the perl
+  part not break sandbox. this closes #7718
+
+  
+  22 Feb 2002; Daniel Robbins <drobbins@gentoo.org> added gimptool symlink, 
+  closing bug #810.
+  
+*gimp-1.2.3-r1 (15 Feb 2002)
+  
+  15 Feb 2002; Martin Schlemmer <azarah@gentoo.org> gimp-1.2.3-r1.build:
+
+  Fix /usr/bin/gimp symlink.
+
+*gimp-1.2.3 (14 Feb 2002)
+
+  14 Feb 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ChangeLog
+  digest/digest-gimp-1.2.3 gimp-1.2.3.ebuild files/gimp-1.2.3-gentoo.diff:
+
+  New upstream version.
 
 *gimp-1.2.2-r1 (1 Feb 2002)
 
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 9698a10f2f03..18fc5c51105c 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,18 +1,14 @@
-MD5 cdf445b0a91b29dd40ae4c67420a14a4 ChangeLog 4820
-MD5 0baa40e08fefbcca963d21359b210477 gimp-1.2.3-r2.ebuild 4202
-MD5 3ffcb6910a8be02857177f4179725ca8 gimp-1.2.3-r3.ebuild 4717
-MD5 f965b674f1ab5e80d1c83313aee3900b gimp-1.3.11.ebuild 2151
-MD5 33b3899f6b5b6a4a8e7e43be18ffed46 gimp-1.3.12.ebuild 2280
-MD5 04eb1d0c00755166e94520f1373b452a gimp-1.3.13.ebuild 2355
-MD5 1143feca5d1f4638179e11aba6dc4f0f gimp-1.3.14.ebuild 2493
-MD5 86617fa03849f2ba22c845a31ddf8958 files/digest-gimp-1.2.3-r2 65
-MD5 86617fa03849f2ba22c845a31ddf8958 files/digest-gimp-1.2.3-r3 65
-MD5 e0e988ca6036cf071d0336b57f284b07 files/digest-gimp-1.3.11 65
-MD5 3653d9f21a8d987555662106456ffa5d files/digest-gimp-1.3.12 66
-MD5 13e882e38fccf991bbea8677bedca67e files/digest-gimp-1.3.13 66
-MD5 cdda0b1cc179cf75eabb63945efdae0e files/gimp-1.2.3-libgimpi-libtool.diff 1365
-MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.3-r2-gentoo.diff 427
-MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.3-r3-gentoo.diff 427
+MD5 326e632efd23ae195f7be64beaaa659d gimp-2.2.8-r1.ebuild 4424
+MD5 2649b2a2f35aa2549ab4d81e750ea2d2 gimp-1.2.5.ebuild 3279
+MD5 39d4983eff8a926fd6bc0b8bc122ee3f gimp-2.2.6-r1.ebuild 4307
+MD5 cc348b6f2d85561a454839b708640008 ChangeLog 19597
+MD5 8f507c8b07d0fcd85dd1424f9cf18fa4 gimp-2.2.9.ebuild 4394
+MD5 f4713bbf77ae895c7ff6c022a7a2f542 metadata.xml 222
+MD5 9d903731e90f07c2492aab4bd55f0e62 files/gimp-2.2.8-restart-marker.patch 611
+MD5 12ff6c7c980ee34dc7d4d94aa40059b0 files/ltmain_sh-1.5.0-fix-relink.patch 1718
 MD5 9696bde4a1b70dd2816d46bed477ebc0 files/gimp.desktop 2404
-MD5 f2b58299eceabecfe5df955198c267d6 files/psd_save.c 49151
-MD5 89fee7931deb88ed771f5ec2ec28aea4 files/digest-gimp-1.3.14 66
+MD5 5bd6fc067eba3828be1e3a49b4aa1c44 files/digest-gimp-2.2.6-r1 134
+MD5 aebd823dc72aefe0a0e4596da64c7277 files/digest-gimp-2.2.8-r1 134
+MD5 ff17b80bceb6bd818e20556c23647b0f files/gimp-2.2.8-configure-fix.patch 2423
+MD5 662e7b51f4c882429b73dea3263b39de files/digest-gimp-1.2.5 65
+MD5 1fec061bf029a6b9159111d1b54df32c files/digest-gimp-2.2.9 134
diff --git a/media-gfx/gimp/gimp-1.2.5.ebuild b/media-gfx/gimp/gimp-1.2.5.ebuild
index 25946d870a68..70afdcaab77c 100644
--- a/media-gfx/gimp/gimp-1.2.5.ebuild
+++ b/media-gfx/gimp/gimp-1.2.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/media-gfx/gimp/gimp-1.2.5.ebuild,v 1.1 2003/06/17 22:57:21 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.2.5.ebuild,v 1.1.1.1 2005/11/30 09:37:44 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
-IUSE="python nls gnome aalib perl doc jpeg png tiff doc"
+IUSE="python nls gnome aalib perl doc jpeg png tiff"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="The GIMP"
-SRC_URI="ftp://ftp.gimp.org/pub/gimp/v1.2/v${PV}/${P}.tar.bz2"
+SRC_URI="mirror://gimp/v1.2/v${PV}/${P}.tar.bz2"
 HOMEPAGE="http://www.gimp.org/"
 
 SLOT="1.2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="x86 ppc sparc alpha amd64 hppa mips"
 LICENSE="GPL-2"
 
 RDEPEND="=x11-libs/gtk+-1.2*
@@ -23,7 +22,7 @@ RDEPEND="=x11-libs/gtk+-1.2*
 	python? ( >=dev-lang/python-2.0 )
 	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )
 	tiff? ( media-libs/tiff )
-	jpeg ( media-libs/jpeg )
+	jpeg? ( media-libs/jpeg )
 	png? ( media-libs/libpng )"
 
 DEPEND="nls? ( sys-devel/gettext )
@@ -38,9 +37,15 @@ src_unpack() {
 }
 
 src_compile() {
-
 	# fix problem with k6's (#22115)
-	replace-flags "-march=k6*" "-march=i586"
+	replace-flags -march=k6-2 -march=i586
+	replace-flags -march=k6-3 -march=i586
+	replace-flags -march=k6 -march=i586
+	# over-optimisations (#21787)
+	replace-flags -Os -O2
+	# gimp has inline functions (plug-ins/common/grid.c) (#23078)
+	# gimp uses floating point math, needs accuracy (#98685)
+	filter-flags "-fno-inline" "-ffast-math"
 
 	local mymake=""
 	local AA
@@ -63,7 +68,7 @@ src_compile() {
 		`use_enable doc gtk-doc` \
 		${myconf} || die
 
-	if [ -z "`use aalib`" ] ; then 
+	if ! use aalib ; then
 		# Horrible automake brokenness
 		cp plug-ins/common/Makefile plug-ins/common/Makefile.orig
 		cat plug-ins/common/Makefile.orig | \
@@ -72,19 +77,22 @@ src_compile() {
 	fi
 
 	MAKEOPTS="${MAKEOPTS} -j1"
+	# see bug #21924
+	CFLAGS="${CFLAGS} /usr/lib/libmpeg.a"
+
 	emake ${mymake} || die
 }
 
 src_install() {
 
-	local mymake="" 
+	local mymake=""
 	local AA
 
 	use aalib || mymake="LIBAA= AA="
 	use gnome || mymake="${mymake} HELPBROWSER="
-  
+
 	dodir /usr/lib/gimp/1.2/plug-ins
-	
+
 	einstall \
 		gimpdatadir=${D}/usr/share/gimp/1.2 \
 		gimpsysconfdir=${D}/etc/gimp/1.2 \
@@ -109,9 +117,9 @@ src_install() {
 		insinto /usr/share/applications
 		doins ${FILESDIR}/gimp.desktop
 	)
-	
+
 	preplib /usr
-	
+
 	dodoc AUTHORS COPYING ChangeLog* *MAINTAINERS README* TODO
 	dodoc docs/*.txt docs/*.ps docs/Wilber* docs/quick_reference.tar.gz
 }
diff --git a/media-gfx/gimp/gimp-2.2.6-r1.ebuild b/media-gfx/gimp/gimp-2.2.6-r1.ebuild
index aae97cb1ae28..cb035f02352c 100644
--- a/media-gfx/gimp/gimp-2.2.6-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.2.6-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/media-gfx/gimp/gimp-2.2.6-r1.ebuild,v 1.1 2005/05/10 12:54:05 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.6-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:44 chriswhite Exp $
 
 inherit flag-o-matic libtool eutils fdo-mime
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="http://www.gimp.org/"
-LICENSE="GPL-2"
 
 P_HELP="gimp-help-2-0.7" #gimp-help-2-{version}
 S_HELP="$WORKDIR/${P_HELP}"
 SRC_URI="mirror://gimp/v2.2/${P}.tar.bz2
 	doc? ( mirror://gimp/help/testing/${P_HELP}.tar.gz )"
 
+LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="x86 ~ppc ~hppa ~sparc ~amd64 ~mips ~ppc64 ~alpha"
+KEYWORDS="~alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
 #IUSE="X aalib altivec debug doc gimpprint jpeg mmx mng png python sse svg tiff wmf"
-IUSE="aalib altivec debug doc gtkhtml gimpprint jpeg mmx mng png python sse svg tiff wmf"
+IUSE="aalib altivec debug doc gtkhtml gimpprint hardened jpeg mmx mng png python sse svg tiff wmf"
 
 # FIXME : some more things can be (local) USE flagged
 # a few options are detection only, fix them to switch
@@ -79,7 +79,8 @@ src_compile() {
 	replace-flags "-march=k6*" "-march=i586"
 
 	# gimp uses inline functions (plug-ins/common/grid.c) (#23078)
-	filter-flags "-fno-inline"
+	# gimp uses floating point math, needs accuracy (#98685)
+	filter-flags "-fno-inline" "-ffast-math"
 
 	if use hardened; then
 		ewarn "hardened use flag suppressing mmx use flag"
diff --git a/media-gfx/gimp/gimp-2.2.8-r1.ebuild b/media-gfx/gimp/gimp-2.2.8-r1.ebuild
index 4cb61dc6c556..57dda80dd7b6 100644
--- a/media-gfx/gimp/gimp-2.2.8-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.2.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/media-gfx/gimp/gimp-2.2.8-r1.ebuild,v 1.1 2005/07/01 02:57:59 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.8-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:44 chriswhite Exp $
 
 inherit flag-o-matic libtool eutils fdo-mime alternatives
 
@@ -14,9 +14,9 @@ SRC_URI="mirror://gimp/v2.2/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 hppa ia64 mips ppc ppc64 sparc x86"
 IUSE="aalib altivec debug doc gtkhtml gimpprint hardened jpeg lcms mmx mng png
-python scanner smp sse svg tiff wmf"
+python smp sse svg tiff wmf"
 
 #	X? ( virtual/x11 )"
 RDEPEND="virtual/x11
@@ -45,12 +45,7 @@ RDEPEND="virtual/x11
 	aalib?	( media-libs/aalib )
 	python?	( >=dev-lang/python-2.2
 		>=dev-python/pygtk-2 )
-	lcms? ( media-libs/lcms )
-
-	scanner? ( media-gfx/xsane
-		media-gfx/sane-backends
-		media-gfx/sane-frontends
-		)"
+	lcms? ( media-libs/lcms )"
 
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0
@@ -94,7 +89,8 @@ src_compile() {
 	replace-flags "-march=k6*" "-march=i586"
 
 	# gimp uses inline functions (plug-ins/common/grid.c) (#23078)
-	filter-flags "-fno-inline"
+	# gimp uses floating point math, needs accuracy (#98685)
+	filter-flags "-fno-inline" "-ffast-math"
 
 	if use hardened; then
 		ewarn "hardened use flag suppressing mmx use flag"
@@ -165,11 +161,6 @@ src_install() {
 
 	# Create the gimp-remote link, see bug #36648
 	dosym gimp-remote-2.2 /usr/bin/gimp-remote
-
-	# if use scanner, create the symlink see bug #93018
-	if use scanner; then
-		dosym /usr/bin/xscanimage /usr/lib/gimp/2.0/plug-ins/
-	fi
 }
 
 pkg_postinst() {
diff --git a/media-gfx/gimp/gimp-2.2.9.ebuild b/media-gfx/gimp/gimp-2.2.9.ebuild
index 649409c20af1..157701ba3041 100644
--- a/media-gfx/gimp/gimp-2.2.9.ebuild
+++ b/media-gfx/gimp/gimp-2.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/media-gfx/gimp/gimp-2.2.9.ebuild,v 1.1 2005/10/28 00:46:29 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.9.ebuild,v 1.1.1.1 2005/11/30 09:37:44 chriswhite Exp $
 
 inherit flag-o-matic libtool eutils fdo-mime alternatives
 
@@ -77,7 +77,9 @@ src_compile() {
 	# only use mmx if hardened is not set
 	local USE_MMX=
 
-	replace-flags "-march=k6*" "-march=i586"
+	# remove this for now, since I have 3 reports that this is
+	# not necessary
+	# replace-flags "-march=k6*" "-march=i586"
 
 	# gimp uses inline functions (plug-ins/common/grid.c) (#23078)
 	# gimp uses floating point math, needs accuracy (#98685)
@@ -158,7 +160,8 @@ pkg_postinst() {
 	alternatives_auto_makesym "/usr/bin/gimp" "/usr/bin/gimp-[0-9].[0-9]"
 
 	# fix for bug #76050
-	ln -s $(gimptool-2.0 --gimpdatadir)/images/wilber-icon.png /usr/share/pixmaps/
+	ln -s $(gimptool-2.0 --gimpdatadir)/images/wilber-icon.png \
+		${ROOT}/usr/share/pixmaps/
 
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
@@ -168,7 +171,8 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	rm /usr/share/pixmaps/wilber-icon.png
+	[[ ! -f ${ROOT}/usr/bin/gimp-2.2 ]] && \
+		rm -f ${ROOT}/usr/share/pixmaps/wilber-icon.png
 
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
diff --git a/media-gfx/gimp/metadata.xml b/media-gfx/gimp/metadata.xml
index da6fd63d0085..6ffa481fda37 100644
--- a/media-gfx/gimp/metadata.xml
+++ b/media-gfx/gimp/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/media-gfx/giram/ChangeLog b/media-gfx/giram/ChangeLog
index 3dd26bf89a44..b6c501b1dfa8 100644
--- a/media-gfx/giram/ChangeLog
+++ b/media-gfx/giram/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for media-gfx/giram
-# Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/giram/ChangeLog,v 1.1 2002/08/08 03:45:21 george Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/giram/ChangeLog,v 1.1.1.1 2005/11/30 09:37:42 chriswhite Exp $
+
+  19 Aug 2005; Marcelo Goes <vanquirius@gentoo.org> giram-0.3.5.ebuild:
+  Use elibtoolize to avoid warning messages regarding libtool.
+
+*giram-0.3.5 (13 Aug 2005)
+
+  13 Aug 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +files/giram-0.3.4-fbsd.patch, +files/giram-0.3.5-fbsd.patch,
+  giram-0.3.4.ebuild, +giram-0.3.5.ebuild:
+  0.3.5 version bump, using patches from FreeBSD. Also backported patches to
+  0.3.4. Should fix bug 49829. Thanks to Andre Hinrichs
+  <andre.hinrichs@gmx.de> and others for reporting.
+
+  18 Nov 2003; Brandy Westcott brandy@gentoo.org giram-0.3.4.ebuild:
+  Fixed povfront segfaulting if no config file existed.
+
+*giram-0.3.4 (17 Oct 2002)
+
+  17 Oct 2002; Ryan Phillips <rphillips@gentoo.org> giram-0.3.4.ebuild :
+
+  version bump
 
 *giram-0.3.3 (23 July 2002)
 
diff --git a/media-gfx/giram/Manifest b/media-gfx/giram/Manifest
index e69de29bb2d1..0b1a1f8044f5 100644
--- a/media-gfx/giram/Manifest
+++ b/media-gfx/giram/Manifest
@@ -0,0 +1,10 @@
+MD5 07418c593c0743e711ca51d7ae11e795 giram-0.3.3.ebuild 1004
+MD5 6a96abfe7bc0e12b39e209a725f5a9fc giram-0.3.5.ebuild 1229
+MD5 ad713197382ef6ec3abb5556549f95cf giram-0.3.4.ebuild 1198
+MD5 857011eece392e936085e0d77b814d31 ChangeLog 1331
+MD5 5fc54c5d01402d0610fafa96961bb8e0 metadata.xml 161
+MD5 e74ef6203f46822ded7256cea16f67d9 files/giram-0.3.5-fbsd.patch 5157
+MD5 0b7a883689b1149507702593d3c79ce3 files/digest-giram-0.3.3 64
+MD5 874c146dc51dca7e7230430c342bbd5a files/digest-giram-0.3.4 64
+MD5 f91a82238c2ace1ce56e21e992a0a69b files/digest-giram-0.3.5 64
+MD5 8070263059a0d62266339edb32750bfd files/giram-0.3.4-fbsd.patch 4157
diff --git a/media-gfx/giram/giram-0.3.3.ebuild b/media-gfx/giram/giram-0.3.3.ebuild
index b25ad9a317c0..6908d51c06d9 100644
--- a/media-gfx/giram/giram-0.3.3.ebuild
+++ b/media-gfx/giram/giram-0.3.3.ebuild
@@ -1,6 +1,6 @@
-# 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/media-gfx/giram/giram-0.3.3.ebuild,v 1.1 2002/08/08 03:45:21 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/giram/giram-0.3.3.ebuild,v 1.1.1.1 2005/11/30 09:37:42 chriswhite Exp $
 
 DESCRIPTION="Giram (Giram is really a modeller). A 3d modeller for POV-ray"
 HOMEPAGE="http://www.giram.org"
@@ -9,6 +9,7 @@ SRC_URI="http://www.giram.org/downloads/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
+IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.0.0
 	>=dev-libs/glib-2.0.0
@@ -18,8 +19,6 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0
 	"
 
-S=${WORKDIR}/${P}
-
 src_compile() {
 	./configure \
 		--host=${CHOST} \
@@ -36,6 +35,6 @@ src_compile() {
 
 src_install () {
 	make DESTDIR=${D} install || die
-	
+
 	dodoc AUTHORS BUGS ANNOUNCE CONTRIBUTORS ChangeLog HACKING IDEAS NEWS README TODO
 }
diff --git a/media-gfx/giram/giram-0.3.4.ebuild b/media-gfx/giram/giram-0.3.4.ebuild
index 2e3766baee90..6c3943221d15 100644
--- a/media-gfx/giram/giram-0.3.4.ebuild
+++ b/media-gfx/giram/giram-0.3.4.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/media-gfx/giram/giram-0.3.4.ebuild,v 1.1 2002/10/18 05:40:21 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/giram/giram-0.3.4.ebuild,v 1.1.1.1 2005/11/30 09:37:42 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="Giram (Giram is really a modeller). A 3d modeller for POV-ray"
 HOMEPAGE="http://www.giram.org"
@@ -9,16 +11,21 @@ SRC_URI="http://www.giram.org/downloads/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
+IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.0.0
 	>=dev-libs/glib-2.0.0
-	media-gfx/povray
-	"
+	media-gfx/povray"
+
 DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	"
+	>=dev-util/pkgconfig-0.12.0"
 
-S=${WORKDIR}/${P}
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-fbsd.patch
+	cd ${S}/povfront
+	sed -i -e "s:strlen (g_config_file_to_parse) == 0:g_config_file_to_parse == NULL:" povfront.c
+}
 
 src_compile() {
 	./configure \
@@ -30,12 +37,10 @@ src_compile() {
 		--mandir=/usr/share/man \
 		--with-tutorial-path=/usr/share/doc/${PF} \
 		--enable-bishop-s3d --enable-vik-specials || die "./configure failed"
-
-	make || die
+	emake || die
 }
 
 src_install () {
 	make DESTDIR=${D} install || die
-	
 	dodoc AUTHORS BUGS ANNOUNCE CONTRIBUTORS ChangeLog HACKING IDEAS NEWS README TODO
 }
diff --git a/media-gfx/giram/giram-0.3.5.ebuild b/media-gfx/giram/giram-0.3.5.ebuild
index 9e322cf70e3b..61a500d7608f 100644
--- a/media-gfx/giram/giram-0.3.5.ebuild
+++ b/media-gfx/giram/giram-0.3.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/media-gfx/giram/giram-0.3.5.ebuild,v 1.1 2005/08/13 16:04:14 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/giram/giram-0.3.5.ebuild,v 1.1.1.1 2005/11/30 09:37:43 chriswhite Exp $
 
-inherit eutils
+inherit eutils libtool
 
 DESCRIPTION="Giram (Giram is really a modeller). A 3d modeller for POV-ray"
 HOMEPAGE="http://www.giram.org"
@@ -25,6 +25,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-fbsd.patch
 	cd ${S}/povfront
 	sed -i -e "s:strlen (g_config_file_to_parse) == 0:g_config_file_to_parse == NULL:" povfront.c
+	cd ${S}; elibtoolize
 }
 
 src_compile() {
diff --git a/media-gfx/gliv/ChangeLog b/media-gfx/gliv/ChangeLog
index 6f581407f7d6..d7d624dc86c8 100644
--- a/media-gfx/gliv/ChangeLog
+++ b/media-gfx/gliv/ChangeLog
@@ -1,6 +1,77 @@
 # ChangeLog for media-gfx/gliv
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gliv/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/media-gfx/gliv/ChangeLog,v 1.1.1.1 2005/11/30 09:37:37 chriswhite Exp $
+
+*gliv-1.9.3 (29 May 2005)
+
+  29 May 2005; Luca Barbato <lu_zero@gentoo.org> +metadata.xml,
+  +gliv-1.9.3.ebuild:
+  New version
+
+*gliv-1.9.2 (24 Mar 2005)
+
+  24 Mar 2005; Luca Barbato <lu_zero@gentoo.org> +gliv-1.9.2.ebuild:
+  New version
+
+  05 Mar 2005; Simon Stelling <blubb@gentoo.org> gliv-1.8.2.ebuild:
+  added ~amd64
+
+  18 Oct 2004; Martin Schlemmer <azarah@gentoo.org> gliv-1.8.2.ebuild:
+  Fix sandbox violation if desktop-file-utils is installed.
+
+  26 Apr 2004; David Holm <dholm@gentoo.org> gliv-1.8.2.ebuild:
+  Added to ~ppc.
+
+*gliv-1.8.2 (25 Apr 2004)
+
+  25 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> gliv-1.8.2.ebuild:
+  version bump
+
+*gliv-1.8.1 (27 Feb 2004)
+
+  27 Feb 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bump.
+
+*gliv-1.8 (25 Nov 2003)
+
+  25 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org> gliv-1.8.ebuild:
+  version bump
+
+*gliv-1.7.1 (24 Aug 2003)
+
+  24 Aug 2003; Martin Schlemmer <azarah@gentoo.org> gliv-1.7.1.ebuild:
+  Update version.
+
+*gliv-1.7 (23 Mar 2003)
+
+  23 Mar 2003; Daniel Robbins <drobbins@gentoo.org>: Updated version, fixed
+  dependencies as this new version doesn't support gtk+-1* anymore.
+
+*gliv-1.6 (17 Oct 2002)
+
+  17 Oct 2002; Martin Schlemmer <azarah@gentoo.org> :
+
+  Update version.
+
+*gliv-1.5.3 (28 Jun 2002)
+
+  28 Jun 2002; Martin Schlemmer <azarah@gentoo.org> gliv-1.5.3.ebuild :
+
+  New version.  Resolves bug #4096 thanks to quick responce from the
+  author/maintainer of gliv :)
+
+*gliv-1.5.2 (20 Jun 2002)
+
+  20 Jun 2002; Martin Schlemmer <azarah@gentoo.org> gliv-1.5.2.ebuild :
+  New version; update for >=gtkglarea-1.99.0.
+
+  20 Jun 2002; Martin Schlemmer <azarah@gentoo.org> gliv-1.5.1.ebuild :
+  Do some gnome2 cleanups.  For instance, we have to use the old gtk+-1.2
+  while gliv do not support >=gtkglarea-1.99.0.
+
+*gliv-1.5.1 (21 March 2002)
+
+*gliv-1.5 (6 March 2002)
 
 *gliv-1.4.5 (1 Feb 2002)
 
diff --git a/media-gfx/gliv/Manifest b/media-gfx/gliv/Manifest
index e69de29bb2d1..5d33a2ecf14d 100644
--- a/media-gfx/gliv/Manifest
+++ b/media-gfx/gliv/Manifest
@@ -0,0 +1,12 @@
+MD5 5fc54c5d01402d0610fafa96961bb8e0 metadata.xml 161
+MD5 547fd5a4ea9c4d49a6ffa211d4bdf20c gliv-1.9.2.ebuild 910
+MD5 3167ed16e66764b21cbb94daa7713a4d gliv-1.8.ebuild 675
+MD5 0973b63ea9cbb1c31070ab0d996f80a0 gliv-1.9.3.ebuild 910
+MD5 99cf7784c6eefbd713cdf4cc6483fc8b gliv-1.8.1.ebuild 695
+MD5 20e3fe1a01da2cf9e96fff35628a0df0 gliv-1.8.2.ebuild 871
+MD5 64deee3f92920b325728f658dffb0a97 ChangeLog 2507
+MD5 8a2fa9c9a52b3babbc6c2a53bb939e77 files/digest-gliv-1.8.1 63
+MD5 88ac78b8d6ba1935d622ce8674ac6de3 files/digest-gliv-1.9.3 63
+MD5 58762759ca878e93a57550a303ed35f7 files/digest-gliv-1.8.2 63
+MD5 0acbfc5f0906888d0c4bf5a7a3ef8916 files/digest-gliv-1.8 61
+MD5 81a019b6d3e5b7ff1c985c57464b1361 files/digest-gliv-1.9.2 63
diff --git a/media-gfx/gliv/gliv-1.8.1.ebuild b/media-gfx/gliv/gliv-1.8.1.ebuild
index 75e969cf93ad..973aca110f00 100644
--- a/media-gfx/gliv/gliv-1.8.1.ebuild
+++ b/media-gfx/gliv/gliv-1.8.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/media-gfx/gliv/gliv-1.8.1.ebuild,v 1.1 2004/02/28 04:58:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gliv/gliv-1.8.1.ebuild,v 1.1.1.1 2005/11/30 09:37:37 chriswhite Exp $
 
 DESCRIPTION="An image viewer that uses OpenGL"
 HOMEPAGE="http://guichaz.free.fr/gliv/"
diff --git a/media-gfx/gliv/gliv-1.8.2.ebuild b/media-gfx/gliv/gliv-1.8.2.ebuild
index 481fc24297a7..299c875d8571 100644
--- a/media-gfx/gliv/gliv-1.8.2.ebuild
+++ b/media-gfx/gliv/gliv-1.8.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/media-gfx/gliv/gliv-1.8.2.ebuild,v 1.1 2004/04/25 23:23:13 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gliv/gliv-1.8.2.ebuild,v 1.1.1.1 2005/11/30 09:37:37 chriswhite Exp $
 
 DESCRIPTION="An image viewer that uses OpenGL"
 HOMEPAGE="http://guichaz.free.fr/gliv/"
@@ -8,7 +8,7 @@ SRC_URI="http://guichaz.free.fr/gliv/gliv-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc ~amd64"
 IUSE="nls"
 
 DEPEND=">=x11-libs/gtk+-2.2
@@ -24,6 +24,10 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	# Needed if desktop-file-install is present, else we get
+	# sandbox violations.
+	export DESKTOP_FILE_INSTALL_DIR="${D}/usr/share/applications"
+
+	einstall || die "make install failed"
 	dodoc README NEWS THANKS
 }
diff --git a/media-gfx/gliv/gliv-1.8.ebuild b/media-gfx/gliv/gliv-1.8.ebuild
index 1acbfc787a2a..08adf784ce62 100644
--- a/media-gfx/gliv/gliv-1.8.ebuild
+++ b/media-gfx/gliv/gliv-1.8.ebuild
@@ -1,14 +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/media-gfx/gliv/gliv-1.8.ebuild,v 1.1 2003/11/25 23:06:28 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gliv/gliv-1.8.ebuild,v 1.1.1.1 2005/11/30 09:37:37 chriswhite Exp $
 
 DESCRIPTION="An image viewer that uses OpenGL"
-HOMEPAGE="http://gliv.tuxfamily.org"
-SRC_URI="http://gliv.tuxfamily.org/gliv-${PV}.tar.bz2"
+HOMEPAGE="http://guichaz.free.fr/gliv/"
+SRC_URI="http://guichaz.free.fr/gliv/gliv-${PV}.tar.bz2"
 
-KEYWORDS="~x86"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86"
 IUSE="nls"
 
 DEPEND=">=x11-libs/gtk+-2.2
@@ -23,6 +23,6 @@ src_compile() {
 }
 
 src_install() {
-	einstall                 || die
-	dodoc README NEWS THANKS || die "dodoc failed"
+	einstall || die
+	dodoc README NEWS THANKS
 }
diff --git a/media-gfx/gliv/gliv-1.9.2.ebuild b/media-gfx/gliv/gliv-1.9.2.ebuild
index 999491a44d8d..8178f236ca5d 100644
--- a/media-gfx/gliv/gliv-1.9.2.ebuild
+++ b/media-gfx/gliv/gliv-1.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/media-gfx/gliv/gliv-1.9.2.ebuild,v 1.1 2005/03/24 09:31:21 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gliv/gliv-1.9.2.ebuild,v 1.1.1.1 2005/11/30 09:37:37 chriswhite Exp $
 
 DESCRIPTION="An image viewer that uses OpenGL"
 HOMEPAGE="http://guichaz.free.fr/gliv/"
diff --git a/media-gfx/gliv/gliv-1.9.3.ebuild b/media-gfx/gliv/gliv-1.9.3.ebuild
index 20248099a452..9e83c00fc2a4 100644
--- a/media-gfx/gliv/gliv-1.9.3.ebuild
+++ b/media-gfx/gliv/gliv-1.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/media-gfx/gliv/gliv-1.9.3.ebuild,v 1.1 2005/05/29 10:45:20 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gliv/gliv-1.9.3.ebuild,v 1.1.1.1 2005/11/30 09:37:37 chriswhite Exp $
 
 DESCRIPTION="An image viewer that uses OpenGL"
 HOMEPAGE="http://guichaz.free.fr/gliv/"
diff --git a/media-gfx/gnome-iconedit/ChangeLog b/media-gfx/gnome-iconedit/ChangeLog
index 98c66c70ceea..4e906bf0f9b3 100644
--- a/media-gfx/gnome-iconedit/ChangeLog
+++ b/media-gfx/gnome-iconedit/ChangeLog
@@ -1,6 +1,46 @@
 # ChangeLog for media-gfx/gnome-iconedit
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnome-iconedit/ChangeLog,v 1.1 2002/02/01 21:53:29 gbevin Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnome-iconedit/ChangeLog,v 1.1.1.1 2005/11/30 09:37:35 chriswhite Exp $
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org>
+  gnome-iconedit-1.2.0-r5.ebuild:
+  Add inherit eutils
+
+*gnome-iconedit-1.2.0-r5 (1 May 2002)
+
+  25 Apr 2003; foser <foser@gentoo.org> gnome-iconedit-1.2.0-r5.ebuild :
+  Added libxml dep (#19801)
+
+  25 Mar 2003; Seemant Kulleen <seemant@gentoo.org>
+  gnome-iconedit-1.2.0-r5.ebuild:
+  homepage syntax fix. thanks to: Frantz Dhin <tragedy_rm@hotmail.com> in bug
+  #18145
+
+  15 Feb 2003; Weeve,,, <weeve@gentoo.org> gnome-iconedit-1.2.0-r5.ebuild :
+  Added sparc to keywords.
+
+  19 Sep 2002; Olivier Reisch <doctomoe@gentoo.org> gnome-iconedit-1.2.0-r5.ebuild:
+  Added ppc keyword
+
+  12 Apr 2002; Matthew Kennedy <mkennedy@gentoo.org> ChangeLog,
+  gnome-iconedit-1.2.0-r5, files/gnome-iconedit-1.2.0-r5 :
+
+  Added -I/usr/include/gdk-pixbuf-1.0 per Martin Schlemmer suggestion
+  in bug #1929.
+	
+*gnome-iconedit-1.2.0-r4 (12 Apr 2002)
+
+  12 Apr 2002; Seemant Kulleen <seemant@gentoo.org> 
+  gnome-iconedit-1.2.0-r4.ebuild :
+
+  Compile against newer libpng
+
+*gnome-iconedit-1.2.0-r3 (2 Apr 2002)
+
+  2 Apr 2002; M.Schlemmer <azarah@gentoo.org> :
+
+  Export WANT_AUTOMAKE and WANT_AUTOCONF to use the proper versions of these
+  ( automake-1.4 and autoconf-2.13 ).  This resolves bug #1476.
 
 *gnome-iconedit-1.2.0-r2 (1 Feb 2002)
 
diff --git a/media-gfx/gnome-iconedit/Manifest b/media-gfx/gnome-iconedit/Manifest
index e69de29bb2d1..e79ba3c5ac1c 100644
--- a/media-gfx/gnome-iconedit/Manifest
+++ b/media-gfx/gnome-iconedit/Manifest
@@ -0,0 +1,5 @@
+MD5 46f2dd4354d41ecc5e9986dc317a6429 gnome-iconedit-1.2.0-r5.ebuild 1351
+MD5 73a502b3b2e6b14ecb1a59b37b1201f4 ChangeLog 1928
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 d3c68ccfcef6c7c5f704962581a6d64e files/digest-gnome-iconedit-1.2.0-r5 77
+MD5 f9ee6f59378eced533e5dbe056a0cdb5 files/gnome-iconedit.diff 2157
diff --git a/media-gfx/gnome-iconedit/gnome-iconedit-1.2.0-r5.ebuild b/media-gfx/gnome-iconedit/gnome-iconedit-1.2.0-r5.ebuild
index 2bf27509c8a0..9a61b19618e2 100644
--- a/media-gfx/gnome-iconedit/gnome-iconedit-1.2.0-r5.ebuild
+++ b/media-gfx/gnome-iconedit/gnome-iconedit-1.2.0-r5.ebuild
@@ -1,66 +1,56 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author: Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnome-iconedit/gnome-iconedit-1.2.0-r5.ebuild,v 1.1 2002/05/02 04:28:47 mkennedy Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnome-iconedit/gnome-iconedit-1.2.0-r5.ebuild,v 1.1.1.1 2005/11/30 09:37:35 chriswhite Exp $
 
-LICENSE="GPL-2"
+inherit flag-o-matic eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Edits icons, what more can you say?"
-SRC_URI="http://210.77.60.218/ftp/ftp.debian.org/pool/main/g/gnome-iconedit/gnome-iconedit_${PV}.orig.tar.gz"
-HOMEPAGE="www.advogato.org/proj/GNOME-Iconedit/"
+HOMEPAGE="http://www.advogato.org/proj/GNOME-Iconedit/"
+SRC_URI="http://210.77.60.218/ftp/ftp.debian.org/pool/main/g/${PN}/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc sparc ~amd64"
+IUSE="nls"
 
-DEPEND=">=gnome-base/gnome-libs-1.4.1.2-r1
-	>=x11-libs/gtk+-1.2.10-r4
+RDEPEND=">=gnome-base/gnome-libs-1.4.1.2-r1
+	=x11-libs/gtk+-1.2*
 	>=media-libs/gdk-pixbuf-0.11.0-r1
+	dev-libs/libxml
 	media-libs/libpng
-	gnome-base/ORBit"
+	=gnome-base/orbit-0*"
+
+DEPEND="$RDEPEND >=sys-devel/autoconf-2.58"
 # Gnome-Print support is broken
 #	>=gnome-base/gnome-print-0.30
 # Bonobo support is broken
 #	bonobo? ( gnome-base/bonobo )"
 
-
-
 src_unpack() {
-
 	unpack ${A}
 
 	# Fix some compile / #include errors
 	cd ${S}
-	patch -p1 <${FILESDIR}/gnome-iconedit.diff || die
+	epatch ${FILESDIR}/gnome-iconedit.diff
 
 	# Update the Makefiles.
-	export WANT_AUTOMAKE_1_4=1
-	export WANT_AUTOCONF_2_1=1
+	export WANT_AUTOMAKE=1.4
+	export WANT_AUTOCONF=2.1
 	automake --add-missing
 	autoconf
 }
 
 src_compile() {
-
-	local myconf
-	use nls || myconf="--disable-nls"
-	
-	CFLAGS="${CFLAGS} `gnome-config --cflags print` -I/usr/include/gdk-pixbuf-1.0"	
-
-	./configure --host=${CHOST} 					\
-		--prefix=/usr					\
-		--mandir=/usr/share/man				\
-		--infodir=/usr/share/info				\
-		--with-sysconfdir=/etc				\
-		--without-gnome-print				\
-		${myconf} || die
+	append-flags `gnome-config --cflags print` -I/usr/include/gdk-pixbuf-1.0
+	econf \
+		--without-gnome-print \
+		`use_enable nls` \
+		|| die
 
 	emake || die
 }
 
 src_install() {
-
-	make prefix=${D}/usr						\
-		mandir=${D}/usr/share/man					\
-		infodir=${D}/usr/share/info				\
-		sysconfdir=${D}/etc install || die
-
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
+	einstall || die
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
 }
diff --git a/media-gfx/gnuplot/ChangeLog b/media-gfx/gnuplot/ChangeLog
index e508ac9122ce..932e059cf952 100644
--- a/media-gfx/gnuplot/ChangeLog
+++ b/media-gfx/gnuplot/ChangeLog
@@ -1,7 +1,168 @@
 # ChangeLog for media-gfx/gnuplot
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnuplot/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/media-gfx/gnuplot/ChangeLog,v 1.1.1.1 2005/11/30 09:37:23 chriswhite Exp $
 
+  24 May 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/pdflib-6-compat.patch, gnuplot-4.0-r1.ebuild:
+  (#86008) Add pdflib-6-compat.patch to fix compilation against >=pdflib-6.
+  PDF_open_fp suddenly disappeared, so switch to PDF_open_file.
+
+  30 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> gnuplot-4.0-r1.ebuild:
+  Stable on ppc.
+
+  14 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> gnuplot-4.0-r1.ebuild:
+  Stable on sparc
+
+  02 Mar 2005; Lina Pezzella <j4rg0n@gentoo.org> gnuplot-3.8j.ebuild,
+  gnuplot-4.0-r1.ebuild:
+  Stable ppc-macos
+
+  15 Feb 2005; Markus Rothe <corsair@gentoo.org> gnuplot-4.0-r1.ebuild:
+  Stable on ppc64
+
+  06 Feb 2005; Stephanie Lockwood-Childs <wormo@gentoo.org>
+  gnuplot-4.0-r1.ebuild:
+  Added ~ppc to KEYWORDS (passes 'maketest' unlike 3.8j, planning
+  to stabilize soon)
+
+  07 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> gnuplot-4.0-r1.ebuild:
+  Stable on alpha.
+
+  05 Feb 2005; Steve Arnold <nerdboy@gentoo.org> gnuplot-4.0-r1.ebuild,
+  -gnuplot-4.0.ebuild:
+  bumped to x86 and amd64 (both tested) and removed 4.0 ebuild as superfluous
+
+  02 Feb 2005; Lina Pezzella <j4rg0n@gentoo.org> gnuplot-3.8j.ebuild:
+  Unstable ppc-macos
+
+  30 Jan 2005; Markus Rothe <corsair@gentoo.org> gnuplot-4.0-r1.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  02 Jan 2005; Lina Pezzella <j4rg0n@gentoo.org> gnuplot-4.0-r1.ebuild:
+  Unstable ppc-macos.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  20 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> gnuplot-4.0-r1.ebuild:
+  Support for emacs. Thanks to P.L.Hayes <paul@wolfbone.ath.cx>; bug #66765.
+
+  17 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> gnuplot-4.0-r1.ebuild:
+  Detects XEmacs correctly; bug #66765.
+
+  05 Oct 2004; Jason Wever <weeve@gentoo.org> gnuplot-4.0-r1.ebuild:
+  Added ~sparc keyword.
+
+*gnuplot-4.0-r1 (07 Aug 2004)
+
+  07 Aug 2004; Olivier Fisette <ribosome@gentoo.org> gnuplot-4.0-r1.ebuild:
+  Moved help and demo files to "/usr/share/gnuplot".
+  Added gnuplot tutorial.
+  Added documentation and files related to PostScript
+  creation. (Fixes bug #41729.)
+  Provided access to /dev/svga from inside the sandbox 
+  environment. (Fixes bug #41711.)
+
+  31 Jul 2004; Tom Gall <tgall@gentoo.org> gnuplot-3.8j.ebuild:
+  stable on ppc64, bug #57147
+
+  02 Jul 2004; Grant Goodyear <g2boojum@gentoo.org> gnuplot-4.0.ebuild:
+  Replaced specific dep on xemacs to virtual/xemacs.
+
+  29 Jun 2004; Danny van Dyk <kugelfang@gentoo.org> gnuplot-4.0.ebuild:
+  Marked ~amd64.
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org> gnuplot-3.8j-r1.ebuild,
+  gnuplot-3.8j.ebuild, gnuplot-4.0.ebuild:
+  Fix use invocation
+
+  05 May 2004; Patrick Kursawe <phosphan@gentoo.org> gnuplot-4.0.ebuild,
+  files/header-order.patch:
+  Added a patch for bug #49263 and corrected the header.
+
+  05 May 2004; Bryan Østergaard <kloeri@gentoo.org> gnuplot-3.8j.ebuild:
+  Stable on alpha.
+
+*gnuplot-4.0 (27 Apr 2004)
+
+  27 Apr 2004; Grant Goodyear <g2boojum@gentoo.org> +gnuplot-4.0.ebuild:
+  New version.  Thanks to Frank Hellmuth and Tsyganenko.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> gnuplot-3.8j-r1.ebuild:
+  Add inherit eutils
+
+*gnuplot-3.8j-r1 (08 Apr 2004)
+
+  08 Apr 2004; Travis Tilley <lv@gentoo.org> gnuplot-3.8j-r1.ebuild,
+  files/gnuplot-3.8j-amd64.diff:
+  added a patch to fix a segfault on amd64 - see bug #46981 for more info
+
+  06 Apr 2004; Aron Griffis <agriffis@gentoo.org> gnuplot-3.8j.ebuild:
+  Stable on ia64
+
+  09 Feb 2004; <augustus@gentoo.org> gnuplot-3.8j.ebuild:
+  Added ~amd64 to keywords.
+
+*gnuplot-3.8j (08 Feb 2004)
+
+  08 Feb 2004; Grant Goodyear <g2boojum@gentoo.org> gnuplot-3.7.1-r3.ebuild,
+  gnuplot-3.7.2.ebuild, gnuplot-3.7.3-r1.ebuild, gnuplot-3.7.3.ebuild,
+  gnuplot-3.8j.ebuild, metadata.xml:
+  Old versions fail to build due to some libpng setjmp weirdness that
+  I don't understand.  I've added a new version that builds just fine
+  (on x86, at least), and is much less out-of-date.  I've also removed
+  the versions that don't build.
+
+  14 Dec 2003; Chuck Short <zul@gentoo.org> gnuplot-3.7.3-r1.ebuild:
+  Added amd64 keyword, closes #35807.
+
+*gnuplot-3.7.3-r1 (16 Oct 2003)
+
+  16 Oct 2003; Mamoru KOMACHI <usata@gentoo.org> gnuplot-3.7.3-r1.ebuild:
+  Added doc and pdflib IUSE flags. doc IUSE flag is suggested by Thomas
+  Eckert <eckert.thomas@gmx.net> in Bug #31219
+
+  25 Aug 2003; Jason Wever <weeve@gentoo.org> gnuplot-3.7.3.ebuild:
+  Marked stable for sparc.
+
+*gnuplot-3.7.3 (09 Mar 2003)
+
+  10 Mar 2003; Aron Griffis <agriffis@gentoo.org> gnuplot-3.7.3.ebuild:
+  Mark stable on alpha
+
+  09 Mar 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump.
+
+*gnuplot-3.7.2 (06 Nov 2002)
+
+  06 Nov 2002; Arcady Genkin <agenkin@gentoo.org> gnuplot-3.7.2.ebuild :
+
+  Version bump.
+
+*gnuplot-3.7.1-r3 (12 Apr 2002)
+
+  10 Feb 2003; Peter Johanson <latexer@gentoo.org> gnuplot-3.7.1-r3.ebuild :
+  Added ~alpha to KEYWORDS.
+
+  19 Sep 2002; Owen Stampflee <owen@gentoo.org> :
+  Added PPC to KEYWORDS.
+
+  07 Sep 2002; George Shapovalov <george@gentoo.org> gnuplot-3.7.1-r3.ebuild :
+
+  corrected LICENSE (it has its own, not GPL-compatible)
+  corrected home page, added RDEPEND and some docs
+
+  12 Apr 2002; Seemant Kulleen <seemant@gentoo.org> gnuplot-3.7.1-r3.ebuild :
+
+  Compile against newer libpng
+
+*gnuplot-3.7.1-r2 (12 Feb 2002)
+
+  12 Feb 2002; T.Neidt <tod@gentoo.org> ChangeLog, gnuplot-3.7.1-r2.ebuild :
+  
+  Added gnu plotutils support for gnuplot.  Dependency and configuration for
+  plotutils requires 'plotutils' to be in the USE variable.
+  
 *gnuplot-3.7.1-r1 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
diff --git a/media-gfx/gnuplot/Manifest b/media-gfx/gnuplot/Manifest
index e69de29bb2d1..ba801cb91760 100644
--- a/media-gfx/gnuplot/Manifest
+++ b/media-gfx/gnuplot/Manifest
@@ -0,0 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a945cf203f726632334f896aa6f066cd gnuplot-3.8j-r1.ebuild 2117
+MD5 77cecd5626caaba8696e896a0f88ea98 gnuplot-3.8j.ebuild 2011
+MD5 54965615cf27dc05890dd6de1d1862e6 gnuplot-4.0-r1.ebuild 3982
+MD5 0d0ccbc08efef8b97818204479649574 metadata.xml 220
+MD5 11029b1e3592ac99409af3518b2ee314 ChangeLog 6191
+MD5 4ca2057b57f07811b4da7bd8958d50c2 files/digest-gnuplot-3.8j 67
+MD5 4ca2057b57f07811b4da7bd8958d50c2 files/digest-gnuplot-3.8j-r1 67
+MD5 ca4f01c5e5b582017b2ff93ac26d650e files/digest-gnuplot-4.0-r1 66
+MD5 d6d201e466142a8e19ab7a86da486dde files/gnuplot-3.8j-amd64.diff 329
+MD5 6bd90ea3b0173af9fe24085ca37fbfa3 files/header-order.patch 1692
+MD5 51225315add3dabcbbbde9e771bba24c files/pdflib-6-compat.patch 560
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDLDAzKf2g/qXtneoRAlxmAJ4kwOhr8QcZOVZFpcwQxxa76lIQPQCfUb6x
+RM4naFafPLxDnDcOAkXQCzs=
+=tFrP
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/gnuplot/gnuplot-3.8j-r1.ebuild b/media-gfx/gnuplot/gnuplot-3.8j-r1.ebuild
index 305160cbcf77..14aeebdce7fa 100644
--- a/media-gfx/gnuplot/gnuplot-3.8j-r1.ebuild
+++ b/media-gfx/gnuplot/gnuplot-3.8j-r1.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/media-gfx/gnuplot/gnuplot-3.8j-r1.ebuild,v 1.1 2004/04/09 04:01:51 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnuplot/gnuplot-3.8j-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:23 chriswhite Exp $
+
+inherit eutils
 
 MY_P="${P}.0"
 S=${WORKDIR}/${MY_P}
@@ -14,7 +16,7 @@ KEYWORDS="-x86 -ppc -sparc -alpha amd64 -ia64"
 IUSE="X readline svga plotutils pdflib doc"
 
 # Old png driver seems to have problems; switching to gd instead
-DEPEND=">=media-libs/libgd-2
+DEPEND=">=media-libs/gd-2
 	pdflib? ( media-libs/pdflib )
 	doc? ( virtual/tetex )
 	X? ( virtual/x11 )
@@ -55,7 +57,7 @@ src_compile() {
 	cd ${S}
 	emake || die
 
-	if [ -n "`use doc`" ] ; then
+	if use doc ; then
 		cd docs
 		make pdf || die
 	fi
@@ -69,7 +71,7 @@ src_install () {
 }
 
 pkg_postinst() {
-	if [ "`use svga`" ] ; then
+	if use svga ; then
 		einfo "In order to enable ordinary users to use SVGA console graphics"
 		einfo "gnuplot needs to be set up as setuid root.  Please note that"
 		einfo "this is usually considered to be a security hazard."
diff --git a/media-gfx/gnuplot/gnuplot-3.8j.ebuild b/media-gfx/gnuplot/gnuplot-3.8j.ebuild
index 24ab77b0c368..b89860fcabe5 100644
--- a/media-gfx/gnuplot/gnuplot-3.8j.ebuild
+++ b/media-gfx/gnuplot/gnuplot-3.8j.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/media-gfx/gnuplot/gnuplot-3.8j.ebuild,v 1.1 2004/02/09 00:17:54 g2boojum Exp $
-
-IUSE="X readline svga plotutils pdflib doc"
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnuplot/gnuplot-3.8j.ebuild,v 1.1.1.1 2005/11/30 09:37:23 chriswhite Exp $
 
 MY_P="${P}.0"
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="Quick and useful plotting program"
+HOMEPAGE="http://www.gnuplot.info/"
 SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-HOMEPAGE="http://www.gnuplot.info"
 
-SLOT="0"
 LICENSE="gnuplot"
-KEYWORDS="x86 ~ppc ~alpha ~sparc"
+SLOT="0"
+KEYWORDS="x86 ppc ~sparc alpha amd64 ia64 ppc64 ppc-macos"
+IUSE="X readline svga plotutils pdflib doc"
 
 # Old png driver seems to have problems; switching to gd instead
-DEPEND=">=media-libs/libgd-2
+DEPEND=">=media-libs/gd-2
 	pdflib? ( media-libs/pdflib )
 	doc? ( virtual/tetex )
 	X? ( virtual/x11 )
@@ -35,21 +34,14 @@ src_compile() {
 		&& myconf="${myconf} --with-plot=/usr/lib" \
 		|| myconf="${myconf} --without-plot"
 
-	use pdflib \
-		&& myconf="${myconf} --with-pdf" \
-		|| myconf="${myconf} --without-pdf"
-
-	use X \
-		&& myconf="${myconf} --with-x" \
-		|| myconf="${myconf} --without-x"
+	myconf="${myconf} `use_with pdflib pdf`"
+	myconf="${myconf} `use_with X x`"
 
 	use readline \
 		&& myconf="${myconf} --with-readline=gnu" \
 		|| myconf="${myconf} --with-readline"
 
-	use svga \
-		&& myconf="${myconf} --with-linux-vga" \
-		|| myconf="${myconf} --without-linux-vga"
+	myconf="${myconf} `use_with svga vga`"
 
 	econf \
 		--datadir=/usr/share/gnuplot \
@@ -58,7 +50,7 @@ src_compile() {
 	cd ${S}
 	emake || die
 
-	if [ -n "`use doc`" ] ; then
+	if use doc ; then
 		cd docs
 		make pdf || die
 	fi
@@ -72,7 +64,7 @@ src_install () {
 }
 
 pkg_postinst() {
-	if [ "`use svga`" ] ; then
+	if use svga ; then
 		einfo "In order to enable ordinary users to use SVGA console graphics"
 		einfo "gnuplot needs to be set up as setuid root.  Please note that"
 		einfo "this is usually considered to be a security hazard."
diff --git a/media-gfx/gnuplot/gnuplot-4.0-r1.ebuild b/media-gfx/gnuplot/gnuplot-4.0-r1.ebuild
index 39d9ac74c680..a60c3681b936 100644
--- a/media-gfx/gnuplot/gnuplot-4.0-r1.ebuild
+++ b/media-gfx/gnuplot/gnuplot-4.0-r1.ebuild
@@ -1,22 +1,23 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnuplot/gnuplot-4.0-r1.ebuild,v 1.1 2004/08/07 19:44:50 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnuplot/gnuplot-4.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:23 chriswhite Exp $
 
-inherit eutils
+inherit eutils elisp-common
 
 MY_P="${P}.0"
 
 DESCRIPTION="Command-line driven interactive plotting program"
 HOMEPAGE="http://www.gnuplot.info/"
 SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-LICENSE="gnuplot"
 
+LICENSE="gnuplot"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="doc gd ggi pdflib plotutils png readline svga X xemacs"
+KEYWORDS="alpha amd64 ppc ppc64 ppc-macos s390 sparc x86"
+IUSE="doc emacs gd ggi pdflib plotutils png readline svga X xemacs"
 
 DEPEND="
 	xemacs? ( virtual/xemacs )
+	emacs? ( virtual/emacs !app-emacs/gnuplot-mode )
 	pdflib? ( media-libs/pdflib )
 	ggi? ( media-libs/libggi )
 	png? ( media-libs/libpng )
@@ -29,18 +30,24 @@ DEPEND="
 
 S=${WORKDIR}/${MY_P}
 
+E_SITEFILE="50gnuplot-gentoo.el"
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/header-order.patch
+	epatch ${FILESDIR}/pdflib-6-compat.patch
 }
 
 src_compile() {
-	local myconf="--datadir=/usr/share/${PN} --with-gihdir=/usr/share/${PN}/gih"
+	local myconf="--with-gihdir=/usr/share/${PN}/gih"
 
 	myconf="${myconf} $(use_with X x)"
 	myconf="${myconf} $(use_with svga linux-vga)"
 	myconf="${myconf} $(use_with gd)"
+	myconf="${myconf} $(use_with plotutils plot /usr/lib)"
+	myconf="${myconf} $(use_with png png /usr/lib)"
+	myconf="${myconf} $(use_with pdflib pdf /usr/lib)"
 
 	use ggi \
 		&& myconf="${myconf} --with-ggi=/usr/lib --with-xmi=/usr/lib" \
@@ -50,19 +57,7 @@ src_compile() {
 		&& myconf="${myconf} --with-readline=gnu --enable-history-file" \
 		|| myconf="${myconf} --with-readline"
 
-	use plotutils \
-		&& myconf="${myconf} --with-plot=/usr/lib" \
-		|| myconf="${myconf} --without-plot"
-
-	use png \
-		&& myconf="${myconf} --with-png=/usr/lib" \
-		|| myconf="${myconf} --without-png"
-
-	use pdflib \
-		&& myconf="${myconf} --with-pdf=/usr/lib" \
-		|| myconf="${myconf} --without-pdf"
-
-	! use xemacs && myconf="${myconf} --without-lisp-files"
+	myconf="${myconf} --without-lisp-files"
 
 	# This is a hack to avoid sandbox violations when using the Linux console.
 	# Creating the DVI and PDF tutorials require /dev/svga to build the
@@ -83,6 +78,37 @@ src_compile() {
 src_install () {
 	make DESTDIR=${D} install || die
 
+	if use emacs; then
+		cd lisp
+		einfo "Configuring gnuplot-mode for emacs..."
+		EMACS="emacs" lispdir="/usr/share/emacs/site-lisp/${PN}" econf || die
+		make DESTDIR=${D} install || die
+		make clean
+		cd ..
+
+		# Gentoo emacs site-lisp configuration
+		string="(add-to-list 'load-path \"/usr/share/emacs/site-lisp/${PN}\")"
+		echo -e ";;; Gnuplot site-lisp configuration\n\n${string}\n" > ${E_SITEFILE}
+		sed '/^;; move/,+4 d' lisp/dotemacs >> ${E_SITEFILE}
+		elisp-site-file-install ${E_SITEFILE}
+	fi
+
+	if use xemacs; then
+		cd lisp
+		einfo "Configuring gnuplot-mode for xemacs..."
+		EMACS="xemacs" lispdir="/usr/lib/xemacs/site-packages/${PN}" econf || die
+		make DESTDIR=${D} install || {
+			ewarn "Compiling/installing gnuplot-mode for xemacs has failed."
+			ewarn "I need xemacs-base to be installed before I can compile"
+			ewarn "the gnuplot-mode lisp files for xemacs successfully."
+			ewarn "Please try re-emerging me after app-xemacs/xemacs-base"
+			ewarn "has been successfuly emerged."
+			die
+			}
+		cd ..
+	fi
+
+
 	dodoc BUGS ChangeLog FAQ NEWS PATCHLEVEL PGPKEYS PORTING README* TODO VERSION
 
 	if use doc; then
@@ -102,6 +128,7 @@ src_install () {
 }
 
 pkg_postinst() {
+	use emacs && elisp-site-regen
 	if use svga ; then
 		einfo "In order to enable ordinary users to use SVGA console graphics"
 		einfo "gnuplot needs to be set up as setuid root.  Please note that"
@@ -109,3 +136,7 @@ pkg_postinst() {
 		einfo "As root, manually \"chmod u+s /usr/bin/gnuplot\"."
 	fi
 }
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/media-gfx/gozer/ChangeLog b/media-gfx/gozer/ChangeLog
index c350e8409327..5dfd910463b6 100644
--- a/media-gfx/gozer/ChangeLog
+++ b/media-gfx/gozer/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for media-gfx/gozer
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gozer/ChangeLog,v 1.1 2002/06/03 22:28:32 stroke Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gozer/ChangeLog,v 1.1.1.1 2005/11/30 09:37:22 chriswhite Exp $
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> gozer-0.7-r1.ebuild:
+  Stable on ppc.
+
+  03 May 2005; Herbie Hopkins <herbs@gentoo.org> gozer-0.7-r1.ebuild:
+  Marked ~amd64 wrt bug #91025.
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> gozer-0.7-r1.ebuild:
+  Typo in DESCRIPTION: arbitary -> arbitrary. Bug 59717.
+
+  16 Jul 2004; David Holm <dholm@gentoo.org> gozer-0.7-r1.ebuild:
+  Added to ~ppc.
+
+*gozer-0.7-r1 (13 Jul 2004)
+
+  13 Jul 2004; Mike Frysinger <vapier@gentoo.org> +gozer-0.7-r1.ebuild,
+  -gozer-0.7.ebuild:
+  Clean up documentation install and the ebuild #56363 by Sebastian Kemper.
 
 *gozer-0.7 (4 June 2002)
 
diff --git a/media-gfx/gozer/Manifest b/media-gfx/gozer/Manifest
index e69de29bb2d1..75e2c4b077cc 100644
--- a/media-gfx/gozer/Manifest
+++ b/media-gfx/gozer/Manifest
@@ -0,0 +1,3 @@
+MD5 e0075c66e80e5ac38417785bb6b5f767 ChangeLog 1278
+MD5 f793105404056a93068403fa72d67ed4 gozer-0.7-r1.ebuild 619
+MD5 afe60e5504a333966022a8a15093db9d files/digest-gozer-0.7-r1 61
diff --git a/media-gfx/gozer/gozer-0.7-r1.ebuild b/media-gfx/gozer/gozer-0.7-r1.ebuild
index 43fd252544ce..1d87ea30a520 100644
--- a/media-gfx/gozer/gozer-0.7-r1.ebuild
+++ b/media-gfx/gozer/gozer-0.7-r1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gozer/gozer-0.7-r1.ebuild,v 1.1 2004/07/14 02:31:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gozer/gozer-0.7-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:22 chriswhite Exp $
 
-DESCRIPTION="tool for rendering arbitary text as graphics, using ttfs and styles"
+DESCRIPTION="tool for rendering arbitrary text as graphics, using ttfs and styles"
 HOMEPAGE="http://www.linuxbrit.co.uk/"
 SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
 DEPEND="virtual/x11
diff --git a/media-gfx/gphoto2/ChangeLog b/media-gfx/gphoto2/ChangeLog
index 22b52ecf3068..3275dffd6a65 100644
--- a/media-gfx/gphoto2/ChangeLog
+++ b/media-gfx/gphoto2/ChangeLog
@@ -1,8 +1,153 @@
-# ChangeLog for media-gfx/gphoto
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/ChangeLog,v 1.1 2002/04/01 00:59:01 spider Exp $
+# ChangeLog for media-gfx/gphoto2
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/ChangeLog,v 1.1.1.1 2005/11/30 09:37:26 chriswhite Exp $
+
+  03 Nov 2005; Alastair Tse <liquidx@gentoo.org> gphoto2-2.1.4.ebuild,
+  gphoto2-2.1.5.ebuild:
+  fix elibtoolize before autotools (#106176)
+
+  16 Sep 2005; <dang@gentoo.org> gphoto2-2.1.6.ebuild:
+  Don't re-autotool after elibtoolize.  Bug #106176
+
+  05 Sep 2005; Markus Rothe <corsair@gentoo.org> gphoto2-2.1.6.ebuild:
+  Stable on ppc64
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> gphoto2-2.1.6.ebuild:
+  stable on alpha ia64
+
+  24 Aug 2005; Aron Griffis <agriffis@gentoo.org> gphoto2-2.1.5.ebuild:
+  stable on ia64
+
+  31 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  gphoto2-2.1.5.ebuild:
+  ppc stable
+
+  27 Jun 2005; Markus Rothe <corsair@gentoo.org> gphoto2-2.1.5.ebuild:
+  Stable on ppc64
+
+  25 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> gphoto2-2.1.5.ebuild:
+  Stable on sparc
+
+  24 Jun 2005; Alastair Tse <liquidx@gentoo.org> gphoto2-2.1.6.ebuild:
+  change jpeg USE flag to exif (#93652)
+
+*gphoto2-2.1.6 (24 Jun 2005)
+
+  24 Jun 2005; Alastair Tse <liquidx@gentoo.org> -gphoto2-2.1.1-r1.ebuild,
+  -gphoto2-2.1.2.ebuild, -gphoto2-2.1.3.ebuild, gphoto2-2.1.5.ebuild,
+  +gphoto2-2.1.6.ebuild:
+  version bump (#96879)
+
+  08 May 2005; Aron Griffis <agriffis@gentoo.org> gphoto2-2.1.4.ebuild:
+  stable on ia64
+
+  30 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> gphoto2-2.1.5.ebuild:
+  Add ~alpha keyword, bug 87009.
+
+*gphoto2-2.1.5 (13 Jan 2005)
+
+  13 Jan 2005; Alastair Tse <liquidx@gentoo.org> +gphoto2-2.1.5.ebuild:
+  version bump (#74640) thanks to Robert Davis <rdavis@unico.com>.
+
+  17 Oct 2004; Dylan Carlson <absinthe@gentoo.org> gphoto2-2.1.4.ebuild:
+  stable on amd64.
+
+  31 Jul 2004; Tom Gall <tgall@gentoo.org> gphoto2-2.1.4.ebuild:
+  stable on ppc64, bug #57131
+
+  25 Apr 2004; Aron Griffis <agriffis@gentoo.org> gphoto2-2.1.1-r1.ebuild,
+  gphoto2-2.1.2.ebuild, gphoto2-2.1.3.ebuild, gphoto2-2.1.4.ebuild:
+  Add die following econf for bug 48950
+
+  23 Feb 2004; Sven Blumenstein <bazik@gentoo.org> gphoto2-2.1.4.ebuild:
+  Stable on sparc.
+
+  18 Feb 2004; Aron Griffis <agriffis@gentoo.org> gphoto2-2.1.3.ebuild,
+  gphoto2-2.1.4.ebuild:
+  add ia64/~ia64 keywords
+
+  05 Feb 2004; Luca Barbato <lu_zero@gentoo.org> gphoto2-2.1.3.ebuild:
+  Marked ppc
+
+*gphoto2-2.1.4 (01 Feb 2004)
+
+  01 Feb 2004; Alastair Tse <liquidx@gentoo.org> gphoto2-2.1.3.ebuild,
+  gphoto2-2.1.4.ebuild:
+  version bump (#38713)
+
+  29 Nov 2003; Brad House <brad_mssw@gentoo.org> gphoto2-2.1.3.ebuild:
+  mark stable on amd64
+
+*gphoto2-2.1.3 (28 Oct 2003)
+
+  28 Oct 2003; Alastair Tse <liquidx@gentoo.org> gphoto2-2.1.3.ebuild:
+  version bump (#31566)
+
+  26 Oct 2003; Brad House <brad_mssw@gentoo.org> gphoto2-2.1.2.ebuild:
+  add ~amd64 flag
+
+  12 Oct 2003; Heinrich Wendel <lanius@gentoo.org> gphoto2-2.1.2.ebuild:
+  fixed dep on libgphoto2
+
+*gphoto2-2.1.2 (28 Aug 2003)
+
+  28 Aug 2003; Alastair Tse <liquidx@gentoo.org> gphoto2-2.1.2.ebuild,
+  metadata.xml:
+  version bump, add maintainer
+
+  09 Jul 2003; Alastair Tse <liquidx@gentoo.org> gphoto2-2.1.1-r1.ebuild:
+  added pkgconfig dep
+
+  02 Jul 2003; Jason Wever <weeve@gentoo.org> gphoto2-2.1.1-r1.ebuild:
+  Changed ~sparc keyword to sparc.
+
+  10 Jun 2003; Alastair Tse <liquidx@gentoo.org> gphoto2-2.1.1-r1.ebuild:
+  bumped to stable x86
+
+  20 May 2003; Jason Wever <weeve@gentoo.org> gphoto2-2.1.1-r1.ebuild:
+  Added ~sparc to keywords.
+
+*gphoto2-2.1.1-r1 (11 May 2003)
+
+  11 May 2003; Alastair Tse <liquidx@gentoo.org> gphoto2-2.1.1-r1.ebuild:
+  added optional exif support. Bug #12044.
+
+*gphoto2-2.1.1 (12 feb 2003)
+  
+  12 feb 2003; Spider <spider@gentoo.org> gphoto2-2.1.1.ebuild :
+  lots of changes, libgphoto2 dependency, added aalib? useflag (jpeg is only 
+  used to transfer data to aalib for previews.) added ncurses for the 
+  configurator frontend, added readline optional diable switch. Marked popt 
+   as a fixed dep, since it will become the defacto standard
+
+  
+
+*gphoto2-2.1.0 (23 Oct 2002)
+  
+  02 Dec 2002; Spider <spider@gentoo.org> gphoto2-2.1.0 :
+  marked it as x86
+
+  06 Nov 2002; Seemant Kulleen <seemant@gentoo.org> gphoto2-2.0-r1.ebuild
+  gphoto2-2.1.0.ebuild :
+
+  Introduced flag-o-matic inheritance to filter out the -pipe optimisation
+  flag.  USE dependent NLS compilation. Man pages installed into FHS correct
+  locations.
+
+  23 Oct 2002 ; Spider <spider@gentoo.org> gphoto2-2.1.0.ebuild :
+  new ebuild introduced to bugzilla by  
+  Robert Davis <rdavis@uniformcompany.com>
 
 *gphoto2-2.0-r1 (01 April 2002)
+
+  19 Oct 2002; Calum Selkirk <cselkirk@gentoo.org> gphoto2-2.0-r1.ebuild :
+
+  Added ppc to KEYWORDS.
+
+  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
+
   01 April 2002; Spider <spider@gentoo.org>
   move to gphoto2
 
diff --git a/media-gfx/gphoto2/Manifest b/media-gfx/gphoto2/Manifest
index e488a65af077..37d51c7295b5 100644
--- a/media-gfx/gphoto2/Manifest
+++ b/media-gfx/gphoto2/Manifest
@@ -1,7 +1,18 @@
-MD5 ba472372f75d2b0a3742a60479023bb8 ChangeLog 2119
-MD5 89cd61f0f169d2db621dbf268c12eafa gphoto2-2.0-r1.ebuild 1147
-MD5 3ae454f193ec732c74c616b57c861f61 gphoto2-2.1.0.ebuild 1168
-MD5 0923b7f9662cf135411a6174334312ef gphoto2-2.1.1.ebuild 1315
-MD5 51b5a71b2ed7d53c04e5e3daac55ddf7 files/digest-gphoto2-2.0-r1 64
-MD5 c6b8e82b0fa2b033d67aad22c1eebaf3 files/digest-gphoto2-2.1.0 66
-MD5 c3967212175ba0688697980155c735d2 files/digest-gphoto2-2.1.1 66
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4afecbcf01cd50b2fe9947e0cd0fd499 ChangeLog 5559
+MD5 41665ec8402a0bb20d2b6112fd707870 files/digest-gphoto2-2.1.4 66
+MD5 140f74b092e17be74411552ab8821e55 files/digest-gphoto2-2.1.5 65
+MD5 3a36c3b5451b1f4d0452bf3ea8789e9f files/digest-gphoto2-2.1.6 65
+MD5 718b3767fe78d666ce15026bd8b0efb0 gphoto2-2.1.4.ebuild 1661
+MD5 6ab2526a1d61cfb1dbae687c1bd2e611 gphoto2-2.1.5.ebuild 1708
+MD5 3f1f5957851b3d1ecd33d08fe3287383 gphoto2-2.1.6.ebuild 1699
+MD5 80850151bae2bd61c4ac796f83656ef6 metadata.xml 217
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDaoCE9ZFPrqoILX8RAlfEAJ4vUCzp664Zj5l4kvfZ8DTpBtZxsACbBSfL
+X6Tx6wx7OgzweahKQvmTeks=
+=6fxc
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/gphoto2/gphoto2-2.1.4.ebuild b/media-gfx/gphoto2/gphoto2-2.1.4.ebuild
index 56bab6140f62..cdd929112e1b 100644
--- a/media-gfx/gphoto2/gphoto2-2.1.4.ebuild
+++ b/media-gfx/gphoto2/gphoto2-2.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/media-gfx/gphoto2/gphoto2-2.1.4.ebuild,v 1.1 2004/02/01 22:56:13 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/gphoto2-2.1.4.ebuild,v 1.1.1.1 2005/11/30 09:37:26 chriswhite Exp $
 
 inherit libtool flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="amd64 ia64 ppc ppc64 sparc x86"
 IUSE="nls jpeg readline ncurses aalib"
 
 # jpeg useflag -> exif support
@@ -27,9 +27,9 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_compile() {
+	aclocal
 	elibtoolize
 
-	aclocal
 	# -pipe does no work
 	filter-flags -pipe
 
@@ -53,7 +53,7 @@ src_compile() {
 	use readline \
 		||  myconf="${myconf} --without-readline"
 
-	econf ${myconf}
+	econf ${myconf} || die "econf failed"
 	emake || die
 }
 
diff --git a/media-gfx/gphoto2/gphoto2-2.1.5.ebuild b/media-gfx/gphoto2/gphoto2-2.1.5.ebuild
index 88e60c9043bc..b93d38fb5faf 100644
--- a/media-gfx/gphoto2/gphoto2-2.1.5.ebuild
+++ b/media-gfx/gphoto2/gphoto2-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/media-gfx/gphoto2/gphoto2-2.1.5.ebuild,v 1.1 2005/01/13 15:38:28 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/gphoto2-2.1.5.ebuild,v 1.1.1.1 2005/11/30 09:37:26 chriswhite Exp $
 
 inherit libtool flag-o-matic
 
@@ -10,14 +10,14 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~ia64 ~ppc64"
+KEYWORDS="~alpha ~amd64 ia64 ppc ppc64 sparc x86"
 IUSE="nls jpeg readline ncurses aalib"
 
 # jpeg useflag -> exif support
 # aalib -> needs libjpeg
-RDEPEND=">=dev-libs/libusb-0.1.6
+RDEPEND=">=dev-libs/libusb-0.1.8
 	dev-libs/popt
-	>=media-libs/libgphoto2-2.1.3
+	>=media-libs/libgphoto2-2.1.5
 	ncurses? ( dev-libs/cdk )
 	aalib? ( media-libs/aalib
 		media-libs/jpeg )
@@ -27,12 +27,11 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_compile() {
-	elibtoolize
-
 	aclocal
 	# -pipe does no work
 	# liquidx: why doesn't it work? bug #?
 	# filter-flags -pipe
+	elibtoolize
 
 	local myconf
 	use nls \
diff --git a/media-gfx/gphoto2/gphoto2-2.1.6.ebuild b/media-gfx/gphoto2/gphoto2-2.1.6.ebuild
index 49bac7230acb..702e444c2496 100644
--- a/media-gfx/gphoto2/gphoto2-2.1.6.ebuild
+++ b/media-gfx/gphoto2/gphoto2-2.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/media-gfx/gphoto2/gphoto2-2.1.6.ebuild,v 1.1 2005/06/24 15:10:19 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/gphoto2-2.1.6.ebuild,v 1.1.1.1 2005/11/30 09:37:26 chriswhite Exp $
 
 inherit libtool flag-o-matic
 
@@ -10,8 +10,8 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~ia64 ~ppc64 ~alpha"
-IUSE="nls jpeg readline ncurses aalib"
+KEYWORDS="alpha ~amd64 ia64 ~ppc ppc64 ~sparc ~x86"
+IUSE="nls exif readline ncurses aalib"
 
 # jpeg useflag -> exif support
 # aalib -> needs libjpeg
@@ -21,15 +21,14 @@ RDEPEND=">=dev-libs/libusb-0.1.8
 	ncurses? ( dev-libs/cdk )
 	aalib? ( media-libs/aalib
 		media-libs/jpeg )
-	jpeg? (	media-libs/libexif )
+	exif? (	media-libs/libexif )
 	readline? ( sys-libs/readline )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_compile() {
-	elibtoolize
+	eautoreconf
 
-	aclocal
 	# -pipe does no work
 	# liquidx: why doesn't it work? bug #?
 	# filter-flags -pipe
@@ -47,7 +46,7 @@ src_compile() {
 		&& myconf="${myconf} --with-jpeg-prefix=/usr" \
 		|| myconf="${myconf} --without-aalib --without-jpeg"
 
-	use jpeg \
+	use exif \
 		&& myconf="${myconf} --with-exif-prefix=/usr" \
 		|| myconf="${myconf} --without-exif"
 
diff --git a/media-gfx/gphoto2/metadata.xml b/media-gfx/gphoto2/metadata.xml
index da6fd63d0085..e5f0495c7a9b 100644
--- a/media-gfx/gphoto2/metadata.xml
+++ b/media-gfx/gphoto2/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
+<maintainer><email>liquidx@gentoo.org</email></maintainer>
 </pkgmetadata>
diff --git a/media-gfx/gpp/ChangeLog b/media-gfx/gpp/ChangeLog
index 3b0591fc58e9..964394d0fb35 100644
--- a/media-gfx/gpp/ChangeLog
+++ b/media-gfx/gpp/ChangeLog
@@ -1,6 +1,46 @@
 # ChangeLog for media-gfx/gpp
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gpp/ChangeLog,v 1.1 2003/10/16 18:24:15 leonardop Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gpp/ChangeLog,v 1.1.1.1 2005/11/30 09:37:15 chriswhite Exp $
+
+  22 Jul 2005; David Holm <dholm@gentoo.org> gpp-0.6.5.ebuild:
+  Added to ~ppc.
+
+  19 Apr 2005; Leonardo Boshell <leonardop@gentoo.org> gpp-0.6.5.ebuild:
+  Marked stable on x86. Updated the HOMEPAGE declaration.
+
+*gpp-0.6.5 (17 Mar 2005)
+
+  17 Mar 2005; Leonardo Boshell <leonardop@gentoo.org> gpp-0.6.5.ebuild:
+  New release.
+
+  17 Mar 2005; Leonardo Boshell <leonardop@gentoo.org> gpp-0.6.4.ebuild:
+  Marked stable on x86.
+
+  06 Mar 2005; Daniel Ostrow <dostrow@gentoo.org> gpp-0.6.4.ebuild:
+  ~amd64 for testing
+
+*gpp-0.6.4 (23 Nov 2004)
+
+  23 Nov 2004; Leonardo Boshell <leonardop@gentoo.org> gpp-0.6.4.ebuild:
+  Version bump.
+
+  21 Jan 2004; L. Boshell <leonardop@gentoo.org> gpp-0.6.ebuild,
+  gpp-0.6.3.ebuild:
+  Marking stable.
+
+*gpp-0.6.3 (10 Dec 2003)
+
+  10 Dec 2003; L. Boshell <leonardop@gentoo.org> gpp-0.6.3.ebuild:
+  Version bump.
+
+*gpp-0.6 (18 Nov 2003)
+
+  18 Nov 2003; L. Boshell <leonardop@gentoo.org> gpp-0.6.ebuild:
+  Version bump. Slight modifications since the package comes with autoconf
+  scripts now.
+
+  18 Nov 2003; L. Boshell <leonardop@gentoo.org> gpp-0.5c.ebuild:
+  Marking as stable on x86.
 
 *gpp-0.5c (16 Oct 2003)
 
diff --git a/media-gfx/gpp/Manifest b/media-gfx/gpp/Manifest
index 31b6443a976f..31a9d4277a3d 100644
--- a/media-gfx/gpp/Manifest
+++ b/media-gfx/gpp/Manifest
@@ -1,4 +1,4 @@
-MD5 784d9baac506f9a8fb858b20b8d3d20e ChangeLog 331
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 7012bda3ef71d7e7a68e2e3ed18c4e2a gpp-0.5c.ebuild 740
-MD5 ea73b8b590876d357e4e7fbd463169a8 files/digest-gpp-0.5c 56
+MD5 6c030c65715819d16d944b70e575459f ChangeLog 1473
+MD5 2294efba6c8e1e455c089b7226f09252 metadata.xml 576
+MD5 330e95b95400ba29fa637f3b2e509cea gpp-0.6.5.ebuild 688
+MD5 0757980f11532a26714da26817d00567 files/digest-gpp-0.6.5 61
diff --git a/media-gfx/gpp/gpp-0.6.5.ebuild b/media-gfx/gpp/gpp-0.6.5.ebuild
index d14bab31b05b..1aa3214f5ee8 100644
--- a/media-gfx/gpp/gpp-0.6.5.ebuild
+++ b/media-gfx/gpp/gpp-0.6.5.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/media-gfx/gpp/gpp-0.6.5.ebuild,v 1.1 2005/03/17 23:06:50 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gpp/gpp-0.6.5.ebuild,v 1.1.1.1 2005/11/30 09:37:15 chriswhite Exp $
 
 inherit gnome2
 
 DESCRIPTION="GNOME Photo Printer"
-HOMEPAGE="http://www.fogman.de/gpp/"
+HOMEPAGE="http://www.fogman.de/?GnomePhotoPrinter"
 SRC_URI="http://www.fogman.de/${PN}/${P}.tar.gz"
 
 IUSE=""
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~ppc x86"
 LICENSE="GPL-2"
 
 RDEPEND=">=gnome-base/libgnomeui-2
diff --git a/media-gfx/gpp/metadata.xml b/media-gfx/gpp/metadata.xml
index da6fd63d0085..843b439f97d5 100644
--- a/media-gfx/gpp/metadata.xml
+++ b/media-gfx/gpp/metadata.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+  <herd>gnome</herd>
+  <maintainer>
+    <email>leonardop@gentoo.org</email>
+    <name>Leonardo Boshell</name>
+  </maintainer>
+  <longdescription>
+    Gnome Photo Printer is intended for printing photos in an easy
+    way. Just drag your photos from Nautilus to the Gnome Photo
+    Printer window and drop them. Make some selections like Photo or
+    Paper size, hit Preview or Print , and see your pictures printed.
+  </longdescription>
 </pkgmetadata>
diff --git a/media-gfx/gqview/ChangeLog b/media-gfx/gqview/ChangeLog
index f0c380e972dc..71260129fe14 100644
--- a/media-gfx/gqview/ChangeLog
+++ b/media-gfx/gqview/ChangeLog
@@ -1,6 +1,312 @@
 # ChangeLog for media-gfx/gqview
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gqview/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/media-gfx/gqview/ChangeLog,v 1.1.1.1 2005/11/30 09:37:31 chriswhite Exp $
+
+  06 Jul 2005; Michael Sterrett <mr_bones_@gentoo.org> -gqview-1.4.5.ebuild,
+  -gqview-1.5.1.ebuild, -gqview-1.5.3.ebuild, -gqview-1.5.4.ebuild,
+  -gqview-2.0.0.ebuild, -gqview-2.1.0.ebuild:
+  clean old ebuilds
+
+  06 Jul 2005; Herbie Hopkins <herbs@gentoo.org> gqview-2.0.1.ebuild:
+  Stable on amd64.
+
+  18 Jun 2005; Markus Rothe <corsair@gentoo.org> gqview-2.0.1.ebuild:
+  Stable on ppc64
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> gqview-2.0.1.ebuild:
+  Stable on ppc.
+
+  16 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> gqview-2.0.1.ebuild:
+  Stable on sparc
+
+*gqview-2.1.1 (15 Jun 2005)
+
+  15 Jun 2005; Michael Sterrett <mr_bones_@gentoo.org> +gqview-2.1.1.ebuild:
+  unstable version bump
+
+  15 Jun 2005; Aron Griffis <agriffis@gentoo.org> gqview-2.0.1.ebuild:
+  stable on alpha ia64
+
+  15 Jun 2005; Aron Griffis <agriffis@gentoo.org> gqview-2.0.0.ebuild:
+  stable on alpha ia64
+
+  15 Jun 2005; Michael Sterrett <mr_bones_@gentoo.org> gqview-2.0.1.ebuild:
+  stable on x86
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> gqview-2.0.0.ebuild:
+  Stable on ppc.
+
+  03 Jun 2005; Luca Barbato <lu_zero@gentoo.org> metadata.xml:
+  Metadata fix
+
+  21 May 2005; Markus Rothe <corsair@gentoo.org> gqview-2.0.0.ebuild:
+  Stable on ppc64
+
+  16 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> gqview-2.0.0.ebuild:
+  Stable on sparc
+
+*gqview-2.0.1 (15 May 2005)
+
+  15 May 2005; Michael Sterrett <mr_bones_@gentoo.org> gqview-2.0.0.ebuild,
+  +gqview-2.0.1.ebuild:
+  2.0.0 stable for x86; stable version bump
+
+  08 May 2005; Aron Griffis <agriffis@gentoo.org> gqview-1.5.4.ebuild:
+  stable on ia64
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org> gqview-1.5.3.ebuild:
+  Stable on ppc64
+
+  06 Mar 2005; Michael Sterrett <mr_bones_@gentoo.org> -gqview-1.4.1.ebuild,
+  -gqview-1.5.0.ebuild:
+  add unstable version; clean older ebuilds
+
+  06 Mar 2005; Michael Sterrett <mr_bones_@gentoo.org> gqview-1.4.5.ebuild:
+  stable for x86
+
+  01 Mar 2005; Michael Sterrett <mr_bones_@gentoo.org> -gqview-1.5.8.ebuild,
+  -gqview-1.5.9.ebuild:
+  clean old
+
+*gqview-2.0.0 (26 Feb 2005)
+
+  26 Feb 2005; Michael Sterrett <mr_bones_@gentoo.org> +gqview-2.0.0.ebuild:
+  stable version bump
+
+*gqview-1.5.9 (15 Feb 2005)
+
+  15 Feb 2005; Michael Sterrett <mr_bones_@gentoo.org> +gqview-1.5.9.ebuild:
+  unstable version bump
+
+*gqview-1.5.8 (08 Feb 2005)
+
+  08 Feb 2005; Michael Sterrett <mr_bones_@gentoo.org> +gqview-1.5.8.ebuild:
+  unstable version bump
+
+*gqview-1.5.7 (31 Jan 2005)
+
+  31 Jan 2005; Michael Sterrett <mr_bones_@gentoo.org> +gqview-1.5.7.ebuild:
+  unstable version bump
+
+*gqview-1.5.6 (12 Jan 2004)
+
+  12 Jan 2004; Jon Portnoy <avenj@gentoo.org> gqview-1.5.6.ebuild :
+  Version bump.
+
+  02 Jan 2005; Michael Hanselmann <hansmi@gentoo.org> gqview-1.5.4.ebuild:
+  Stable on ppc.
+
+*gqview-1.5.5 (28 Dec 2004)
+
+  28 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org> +gqview-1.5.5.ebuild:
+  unstable version bump
+
+*gqview-1.5.4 (10 Nov 2004)
+
+  10 Nov 2004; Michael Sterrett <mr_bones_@gentoo.org> +gqview-1.5.4.ebuild:
+  unstable version bump
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> gqview-1.4.5.ebuild,
+  gqview-1.5.1.ebuild, gqview-1.5.3.ebuild:
+  Stable on amd64.
+
+  18 Oct 2004; Gustavo Zacarias <gustavoz@gentoo.org> gqview-1.5.3.ebuild:
+  Stable on sparc
+
+  15 Oct 2004; Michael Sterrett <mr_bones_@gentoo.org> gqview-1.5.3.ebuild:
+  stable for x86
+
+  15 Oct 2004; Michael Sterrett <mr_bones_@gentoo.org> -gqview-1.4.4.ebuild,
+  -gqview-1.5.2.ebuild:
+  clean older ebuilds
+
+*gqview-1.4.5 (15 Oct 2004)
+
+  15 Oct 2004; Michael Sterrett <mr_bones_@gentoo.org> +gqview-1.4.5.ebuild:
+  stable version bump
+
+  14 Oct 2004; Aron Griffis <agriffis@gentoo.org> gqview-1.5.3.ebuild:
+  add ~alpha and ~ia64
+
+*gqview-1.5.3 (21 Sep 2004)
+
+  21 Sep 2004; Michael Sterrett <mr_bones_@gentoo.org> +gqview-1.5.3.ebuild:
+  version bump
+
+  18 Sep 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/rotate_crash_fix.patch, -gqview-1.3.9.ebuild, -gqview-1.4.0.ebuild:
+  clean older ebuilds
+
+*gqview-1.4.4 (18 Sep 2004)
+
+  18 Sep 2004; Michael Sterrett <mr_bones_@gentoo.org> +gqview-1.4.4.ebuild:
+  stable version bump
+
+*gqview-1.5.2 (06 Sep 2004)
+
+  06 Sep 2004; Malcolm Lashley <malc@gentoo.org> +gqview-1.5.2.ebuild:
+  Revbump with avenj's blessing. Closes bug #62142
+
+  03 Sep 2004; <blubb@gentoo.org> :
+  added ~amd64 keyword
+
+  20 Jul 2004; Tom Gall <tgall@gentoo.org> gqview-1.5.1.ebuild:
+  stable on ppc64, bug #57154
+
+  14 May 2004; Lars Weiler <pylon@gentoo.org> gqview-1.5.1.ebuild:
+  Stable on ppc
+
+*gqview-1.5.1 (06 Apr 2004)
+
+  06 Apr 2004; Jon Portnoy <avenj@gentoo.org> gqview-1.5.1.ebuild :
+  Version bump.
+
+  05 Apr 2004; Jason Wever <weeve@gentoo.org> gqview-1.5.0.ebuild:
+  Stable on sparc.
+
+  30 Mar 2004; Jon Portnoy <avenj@gentoo.org> gqview-1.5.0.ebuild :
+  Stable on x86 and AMD64.
+
+*gqview-1.5.0 (12 Mar 2004)
+
+  12 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> gqview-1.5.0.ebuild:
+  unstable version bump
+
+*gqview-1.4.1 (01 Mar 2004)
+
+  01 Mar 2004; Jon Portnoy <avenj@gentoo.org> gqview-1.4.1.ebuild :
+  Version bump.
+
+  23 Feb 2004; Sven Blumenstein <bazik@gentoo.org> gqview-1.0.2-r1.ebuild,
+  gqview-1.2.1.ebuild, gqview-1.3.4.ebuild, gqview-1.3.5.ebuild,
+  gqview-1.3.6-r1.ebuild, gqview-1.3.6.ebuild, gqview-1.4.0.ebuild:
+  Stable on sparc and pcc (thanks Pylon for testing), removed 6 outdated ebuilds.
+
+*gqview-1.4.0 (21 Feb 2004)
+
+  21 Feb 2004; Michael Sterrett <mr_bones_@gentoo.org> gqview-1.4.0.ebuild:
+  version bump - new stable version
+
+*gqview-1.3.9 (03 Feb 2004)
+
+  03 Feb 2004; Jon Portnoy <avenj@gentoo.org> gqview-1.3.9.ebuild :
+  Version bump, allegedly the last before 1.4.0.
+
+*gqview-1.3.8 (23 Jan 2004)
+
+  23 Jan 2004; Jon Portnoy <avenj@gentoo.org> gqview-1.3.8.ebuild :
+  Version bump. Bugfixes and translation updates.
+
+  13 Jan 2004; Jon Portnoy <avenj@gentoo.org> gqview-1.3.7.ebuild :
+  Stable on x86 and AMD64.
+
+*gqview-1.3.7 (22 Dec 2003)
+
+  22 Dec 2003; Jon Portnoy <avenj@gentoo.org> gqview-1.3.7.ebuild :
+  Version bump - lots of bugfixes and a new Swedish translation,
+  apparently.
+
+*gqview-1.3.6-r1 (16 Dec 2003)
+
+  16 Dec 2003; Jon Portnoy <avenj@gentoo.org> gqview-1.3.6-r1.ebuild,
+  files/rotate_crash_fix.patch :
+  Patch from upstream to fix a crash when rotating images.
+
+*gqview-1.3.6 (15 Dec 2003)
+
+  15 Dec 2003; Jon Portnoy <avenj@gentoo.org> gqview-1.3.6.ebuild :
+  Version bump.
+
+*gqview-1.3.5 (09 Nov 2003)
+
+  09 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org> gqview-1.3.5.ebuild:
+  version bump
+
+*gqview-1.3.4 (31 Oct 2003)
+
+  31 Oct 2003; Michael Sterrett <mr_bones_@gentoo.org> gqview-1.3.4.ebuild:
+  version bump
+
+  30 Oct 2003; Jon Portnoy <avenj@gentoo.org> gqview-1.3.3.ebuild :
+  Stable on x86.
+
+  24 Oct 2003; Michael Sterrett <mr_bones_@gentoo.org> gqview-1.3.3.ebuild:
+  mark stable on amd64 per bug 31883
+
+  24 Oct 2003; Michael Sterrett <mr_bones_@gentoo.org> metadata.xml:
+  Add myself as well to the list of maintainers for this package.
+
+*gqview-1.3.3 (21 Oct 2003)
+
+  21 Oct 2003; Jon Portnoy <avenj@gentoo.org> gqview-1.3.3.ebuild :
+  Version bump.
+  From freshmeat:
+  "The sorting of the results of finding duplicates has been reworked. 
+   The preload next image option now also remembers the previous image. 
+   Auto refresh can now be disabled. The size of the Exif sidebar is now 
+   adjustable. Undo was added to the sort manager. The German and 
+   Spanish translations were updated."
+
+  18 Oct 2003; Sven Blumenstein <bazik@gentoo.org> gqview-1.3.2.ebuild:
+  ~sparc keyword added.
+
+  01 Oct 2003; Michael Sterrett <mr_bones_@gentoo.org> gqview-1.3.2.ebuild:
+  use use_enable; don't remove duplicate README as the program looks for it (bug
+  30111); error message for emake
+
+*gqview-1.3.2 (15 Jun 2003)
+
+  15 Jun 2003; Jon Portnoy <avenj@gentoo.org> gqview-1.3.2.ebuild :
+  Version bump.
+
+  25 Apr 2003; Jon Portnoy <avenj@gentoo.org> gqview-1.3.1.ebuild :
+  gdk-pixbuf dependency fix in 1.3 ebuilds, fixes bug #17392.
+
+*gqview-1.3.1 (3 March 2003)
+
+  03 March 2003; Jon Portnoy <avenj@gentoo.org> gqview-1.3.1.ebuild :
+  Version bump, latest unstable (gtk2) gqview.
+
+  02 March 2003; Jon Portnoy <avenj@gentoo.org> gqview-1.2.1.ebuild
+  gqview 1.2.0.ebuild gqview-1.1.6.ebuild :
+
+  gdk-pixbuf dependency fix per bug #16554.
+
+*gqview-1.3.0 (4 Feb 2003)
+
+  4 Feb 3003; Jon Portnoy <avenj@gentoo.org> gqview-1.3.0.ebuild :
+
+   Latest beta gqview, now uses GTK 2.
+
+*gqview-1.2.1 (24 Jan 2003)
+
+  24 Jan 2003; Jon Portnoy <avenj@gentoo.org> gqview-1.2.1.ebuild :
+
+  Latest stable gqview.
+
+*gqview-1.2.0 (13 Dec 2002)
+
+  13 Dec 2002; Jon Portnoy <avenj@gentoo.org> gqview-1.2.0.ebuild :
+
+  Latest gqview.
+
+*gqview-1.1.6 (24 Oct 2002)
+
+  24 Oct 2002; foser <foser@gentoo.org> gqview-1.1.6.ebuild :
+
+  New development release. Thanks to Jon Portnoy <avenj@tellink.net>
+
+*gqview-1.0.2-r1 (12 Apr 2002)
+
+  12 Apr 2002; Seemant Kulleen <seemant@gentoo.org> gqview-1.0.2-r1.ebuild :
+
+  Compile against latest libpng
+
+*gqview-1.0.2 (2 Feb 2002)
+
+  2 Feb 2002; M.Schlemmer <azarah@gentoo.org> gqview-1.0.2.ebuild :
+
+  Updated the copyright in the header.  Bumped the version.
 
 *gqview-1.0.1 (1 Feb 2002)
 
diff --git a/media-gfx/gqview/Manifest b/media-gfx/gqview/Manifest
index 4be7f5abb8d0..bce4d6eb422a 100644
--- a/media-gfx/gqview/Manifest
+++ b/media-gfx/gqview/Manifest
@@ -1,9 +1,6 @@
-MD5 79a87b9eb9f808731392568e7a0d32d0 ChangeLog 1949
-MD5 eb65f9c66be633ca81882025f570834d gqview-1.0.2-r1.ebuild 786
-MD5 450fe68d3c840c740078e2286e58200b gqview-1.2.0.ebuild 776
-MD5 3d41dc1d6a9b6628cc0f8f824c9f7c3f gqview-1.2.1.ebuild 780
-MD5 38622c145ccd795eb5e3f721718c6ecc gqview-1.3.1.ebuild 843
-MD5 1116abfffb603ceb05c682709d1e3c0f files/digest-gqview-1.0.2-r1 64
-MD5 d8d9b366597b3323a23256b5c950f182 files/digest-gqview-1.2.0 64
-MD5 3fda90c6777f1167ff70717a32255b2d files/digest-gqview-1.2.1 64
-MD5 1b587c6945a2a5453686260f15c89479 files/digest-gqview-1.3.1 126
+MD5 244a21edb249a4f958ade3e22d97bc2b ChangeLog 9746
+MD5 176f5bb00858a049524220098d84a0a7 files/digest-gqview-2.0.1 65
+MD5 cc1b51c55cb0af98b20a3a41711e0174 files/digest-gqview-2.1.1 65
+MD5 b697bc43662fd938778d5867689d2966 gqview-2.0.1.ebuild 699
+MD5 61d2b4759ca26b6d412427da088b0254 gqview-2.1.1.ebuild 726
+MD5 85080f79575e2c11f349dac81de4ebb4 metadata.xml 254
diff --git a/media-gfx/gqview/gqview-2.0.1.ebuild b/media-gfx/gqview/gqview-2.0.1.ebuild
index 9c3f97f93ad7..0b12114f663f 100644
--- a/media-gfx/gqview/gqview-2.0.1.ebuild
+++ b/media-gfx/gqview/gqview-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/media-gfx/gqview/gqview-2.0.1.ebuild,v 1.1 2005/05/15 06:08:45 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gqview/gqview-2.0.1.ebuild,v 1.1.1.1 2005/11/30 09:37:31 chriswhite Exp $
 
 DESCRIPTION="A GTK-based image browser"
 HOMEPAGE="http://gqview.sourceforge.net/"
@@ -8,11 +8,10 @@ SRC_URI="mirror://sourceforge/gqview/${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=""
 
-DEPEND="virtual/libc
-	>=x11-libs/gtk+-2.4.0
+DEPEND=">=x11-libs/gtk+-2.4.0
 	nls? ( sys-devel/gettext )"
 
 src_install() {
diff --git a/media-gfx/gqview/gqview-2.1.1.ebuild b/media-gfx/gqview/gqview-2.1.1.ebuild
index 0aeab2256db7..ae7a9fa1e161 100644
--- a/media-gfx/gqview/gqview-2.1.1.ebuild
+++ b/media-gfx/gqview/gqview-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/media-gfx/gqview/gqview-2.1.1.ebuild,v 1.1 2005/06/15 17:47:40 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gqview/gqview-2.1.1.ebuild,v 1.1.1.1 2005/11/30 09:37:31 chriswhite Exp $
 
 DESCRIPTION="A GTK-based image browser"
 HOMEPAGE="http://gqview.sourceforge.net/"
diff --git a/media-gfx/gqview/metadata.xml b/media-gfx/gqview/metadata.xml
index 4e98f418b45c..2cb651a80ace 100644
--- a/media-gfx/gqview/metadata.xml
+++ b/media-gfx/gqview/metadata.xml
@@ -1,10 +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>graphics</herd>
 <maintainer>
-<name>Jon Portnoy</name>
-<email>avenj@gentoo.org</email>
+<email>mr_bones_@gentoo.org</email>
+<name>Michael Sterrett</name>
 </maintainer>
 </pkgmetadata>
-
diff --git a/media-gfx/grace/ChangeLog b/media-gfx/grace/ChangeLog
index b76852a9ec20..ee35e5b7fbe9 100644
--- a/media-gfx/grace/ChangeLog
+++ b/media-gfx/grace/ChangeLog
@@ -1,7 +1,162 @@
 # ChangeLog for media-gfx/grace
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/grace/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/media-gfx/grace/ChangeLog,v 1.1.1.1 2005/11/30 09:37:31 chriswhite Exp $
 
+  11 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> grace-5.1.18.ebuild:
+  Stable on ppc.
+
+  08 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> grace-5.1.18.ebuild:
+  Stable on sparc
+
+  06 Nov 2005; <soulse@gentoo.org> grace-5.1.18.ebuild:
+  Stable on x86 wrt bug #111728.
+
+  26 Oct 2005; Marcus D. Hanwell <cryos@gentoo.org> -grace-5.1.13.ebuild,
+  grace-5.1.18.ebuild:
+  Stable on amd64, pruned old version.
+
+  16 Jun 2005; Marcus D. Hanwell <marcus@gentoo.org> grace-5.1.14.ebuild:
+  Stable on amd64.
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> grace-5.1.14.ebuild:
+  Stable on ppc.
+
+  27 May 2005; Jason Wever <weeve@gentoo.org> grace-5.1.14.ebuild:
+  Stable on SPARC.
+
+  25 May 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  -files/grace-5.1.10-t1lib-fix-gentoo.patch,
+  -files/grace-5.1.12-t1lib-fix-gentoo.patch, -grace-5.1.7-r2.ebuild,
+  -grace-5.1.10-r1.ebuild, -grace-5.1.12-r1.ebuild:
+  Pull old versions.
+
+  25 May 2005; Donnie Berkholz <spyderous@gentoo.org>; grace-5.1.14.ebuild:
+  Stable on x86.
+
+*grace-5.1.18 (25 May 2005)
+
+  25 May 2005; Donnie Berkholz <spyderous@gentoo.org>; +grace-5.1.18.ebuild:
+  (#73898) Version bump. Highlights include PDF-1.4 support, pdflib-6
+  compatibility, better TrueType font support.
+
+  23 Mar 2005; Seemant Kulleen <seemant@gentoo.org> grace-5.1.10-r1.ebuild,
+  grace-5.1.12-r1.ebuild, grace-5.1.13.ebuild, grace-5.1.14.ebuild:
+  change dep from net-www/mozilla to www-client/mozilla
+
+  23 Mar 2005; Seemant Kulleen <seemant@gentoo.org> grace-5.1.10-r1.ebuild,
+  grace-5.1.12-r1.ebuild, grace-5.1.13.ebuild, grace-5.1.14.ebuild:
+  change dep from net-www/epiphany to www-client/epiphany
+
+  18 Mar 2005; Seemant Kulleen <seemant@gentoo.org> grace-5.1.10-r1.ebuild,
+  grace-5.1.12-r1.ebuild, grace-5.1.13.ebuild, grace-5.1.14.ebuild:
+  Galeon is now in www-client from net-www
+
+  07 Nov 2004; Jason Wever <weeve@gentoo.org> grace-5.1.13.ebuild:
+  Stable on sparc.
+
+  10 Oct 2004; Jason Wever <weeve@gentoo.org> grace-5.1.14.ebuild:
+  Added ~sparc keyword.
+
+  08 Sep 2004; Mamoru KOMACHI <usata@gentoo.org> grace-5.1.10-r1.ebuild,
+  grace-5.1.12-r1.ebuild, grace-5.1.13.ebuild, grace-5.1.14.ebuild:
+  Moved net-www/dillo to www-client/dillo.
+
+  30 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> grace-5.1.14.ebuild:
+  Adding amd64 keyword. Closing #44900.
+
+*grace-5.1.14 (18 Mar 2004)
+
+  18 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; grace-5.1.14.ebuild:
+  Version bump. Upstream changes include fixes for 64-bit, for a race condition
+  and for memory issues.
+
+  18 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; grace-5.1.12-r1.ebuild,
+  grace-5.1.13.ebuild:
+  Fixing broken dependency on fftw. fftw-2 and fftw-3 are incompatible, so a >=
+  dep doesn't work. It needs to be done like gtk+-1 and gtk+-2.
+
+  11 Jan 2004; Heinrich Wendel <lanius@gentoo.org> grace-5.1.10-r1.ebuild,
+  grace-5.1.12-r1.ebuild, grace-5.1.13.ebuild, grace-5.1.7-r2.ebuild:
+  fixed motif dep
+
+  11 Jan 2004; Heinrich Wendel <lanius@gentoo.org> grace-5.1.10-r1.ebuild,
+  grace-5.1.12-r1.ebuild, grace-5.1.13.ebuild, grace-5.1.7-r2.ebuild:
+  fixed motif dep
+
+  10 Dec 2003; Patrick Kursawe <phosphan@gentoo.org> grace-5.1.13.ebuild:
+  I guess ~ppc was removed by accident, at least there is no !ppc.
+
+  01 Nov 2003; Donnie Berkholz <spyderous@gentoo.org>; metadata.xml:
+  Adding metadata.xml for sci herd.
+
+  30 Oct 2003; Mamoru KOMACHI <usata@gentoo.org> grace-5.1.10-r1.ebuild,
+  grace-5.1.12-r1.ebuild, grace-5.1.13.ebuild:
+  Removed browsers from DEPEND, see Bug #32290
+
+  30 Oct 2003; Mamoru KOMACHI <usata@gentoo.org> grace-5.1.12-r1.ebuild,
+  grace-5.1.13.ebuild:
+  Added fftw and netcdf local IUSE flags, as suggested by Donnie Berkholz
+  <spyderous@gentoo.org> in Bug #26842
+
+*grace-5.1.13 (27 Oct 2003)
+
+  27 Oct 2003; Mamoru KOMACHI <usata@gentoo.org> grace-5.1.10-r1.ebuild,
+  grace-5.1.10.ebuild, grace-5.1.12-r1.ebuild, grace-5.1.12.ebuild,
+  grace-5.1.13.ebuild, files/grace-helpviewer-gentoo.diff:
+  Version bumped. Marked 5.1.10-r1 and 5.1.12-r1 stable for x86.
+  Removed 5.1.10 and 5.1.12 (since -r1 are in there).  Fixed
+  environment variable settings in 10grace.
+
+*grace-5.1.10-r1 (09 Sep 2003)
+*grace-5.1.12-r1 (09 Sep 2003)
+
+  09 Sep 2003; Mamoru KOMACHI <usata@gentoo.org> grace-5.1.10-r1.ebuild,
+  grace-5.1.12-r1.ebuild:
+  Fixed browsers dependency.  This closes Bug #23292
+
+*grace-5.1.12 (18 Aug 2003)
+
+  19 Aug 2003; MATSUU Takuto <matsuu@gentoo.org> grace-5.1.12.ebuild:
+  Added ~sparc to KEYWORDS.
+
+  18 Aug 2003; Mamoru KOMACHI <usata@gentoo.org> grace-5.1.12.ebuild,
+  files/grace-5.1.12-t1lib-fix-gentoo.patch:
+  Version bump.  New debug, png and jpeg IUSE flags.  Added
+  dev-libs/fftw and app-sci/netcdf to DEPEND.  Thanks to MATSUU Takuto
+  <matsuu@gentoo.org> in bug #26842
+
+*grace-5.1.10 (05 Nov 2002)
+
+  09 Aug 2003; Mamoru KOMACHI <usata@gentoo.org> grace-5.1.10.ebuild,
+  files/grace-5.1.10-t1lib-fix-gentoo.patch:
+  Added t1lib DEPEND and a patch to compile grace against t1lib-5.0.0.
+  Patch submitted by Derek Dolney <dolney@astro.physics.upenn.edu>
+  in bug #25798
+
+  30 Mar 2003; Alastair Tse <liquidx@gentoo.org> grace-5.1.10.ebuild,
+  grace-5.1.7-r2.ebuild:
+  update deps to virtual/motif
+
+  05 Nov 2002; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump.
+
+*grace-5.1.7-r2 (19 May 2002)
+
+  7 Sep 2002; Owen Stampflee <owen@gentoo.org> :
+  Added PPC to KEYWORDS.
+
+  19 May 2002; Seemant Kulleen <seemant@gentoo.org> grace-5.1.7-r2.ebuild
+  files/digest-grace-5.1.7-r2 :
+
+  updated the libpng dependency info which was written incorrectly
+  Thanks to vt@vt.fermentas.lt in bug #2780
+
+*grace-5.1.7 (1 Apr 2002)
+
+  1 Apr 2002; Grant Goodyear <g2boojum@gentoo.org> :
+
+  New version.  Thanks to Daniel Mettler.
+  
 *grace-5.1.6 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
diff --git a/media-gfx/grace/Manifest b/media-gfx/grace/Manifest
index e69de29bb2d1..fe3eb18d6847 100644
--- a/media-gfx/grace/Manifest
+++ b/media-gfx/grace/Manifest
@@ -0,0 +1,8 @@
+MD5 2d82fb1aa15d46de6cfe544c546e48c5 ChangeLog 6363
+MD5 79d4cd7b5bb6c28a0b393294202477cb files/10grace 28
+MD5 b45d65feb380f4734584d415500e8ffd files/digest-grace-5.1.14 65
+MD5 4d77fc740f63f5c45037cd1bd1db14d9 files/digest-grace-5.1.18 65
+MD5 97e5d164e32726698f9e90f93d723c8f files/grace-helpviewer-gentoo.diff 384
+MD5 07bd8a887111679d7775f3604e4381a5 grace-5.1.14.ebuild 3392
+MD5 9a49dd5686076a1da28d3a6c759a27c6 grace-5.1.18.ebuild 3399
+MD5 3862c6034595e39fcd14a6bd239f749b metadata.xml 270
diff --git a/media-gfx/grace/files/10grace b/media-gfx/grace/files/10grace
index 57ea251d3ceb..248553037cab 100644
--- a/media-gfx/grace/files/10grace
+++ b/media-gfx/grace/files/10grace
@@ -1,3 +1 @@
-GRACE_HOME=/opt/grace
-PATH=/opt/grace/bin
-ROOTPATH=/opt/grace/bin
+GRACE_HOME=/usr/share/grace
diff --git a/media-gfx/grace/grace-5.1.14.ebuild b/media-gfx/grace/grace-5.1.14.ebuild
index 19ea215ac9ba..29150b50b9c4 100644
--- a/media-gfx/grace/grace-5.1.14.ebuild
+++ b/media-gfx/grace/grace-5.1.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/media-gfx/grace/grace-5.1.14.ebuild,v 1.1 2004/03/18 19:31:17 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/grace/grace-5.1.14.ebuild,v 1.1.1.1 2005/11/30 09:37:31 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://plasma-gate.weizmann.ac.il/pub/grace/src/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE="debug png jpeg pdflib fftw netcdf"
 
 DEPEND="virtual/x11
@@ -18,16 +18,14 @@ DEPEND="virtual/x11
 	>=sys-libs/zlib-1.0.3
 	>=media-libs/t1lib-1.3.1
 	>=media-libs/tiff-3.5
-	fftw? ( =dev-libs/fftw-2* )
-	netcdf? ( >=app-sci/netcdf-3.0 )
+	fftw? ( =sci-libs/fftw-2* )
+	netcdf? ( >=sci-libs/netcdf-3.0 )
 	png? ( >=media-libs/libpng-0.9.6 )
 	jpeg? ( media-libs/jpeg )
 	pdflib? ( >=media-libs/pdflib-4.0.3 )
 	>=sys-apps/sed-4"
 #	x11-libs/xmhtml
 
-S="${WORKDIR}/${P}"
-
 src_unpack() {
 	unpack ${A}
 
@@ -39,21 +37,21 @@ src_compile() {
 
 	local gracehelpviewer
 
-	if has_version 'net-www/dillo' ; then
+	if has_version 'www-client/dillo' ; then
 		gracehelpviewer="dillo"
-	elif has_version 'net-www/opera' ; then
+	elif has_version 'www-client/opera' ; then
 		gracehelpviewer="opera"
 	elif has_version 'net-www/mozilla-firebird' \
 		|| has_version 'net-www/mozilla-firebird-bin' \
 		|| has_version 'net-www/mozilla-firebird-cvs' ; then
 		gracehelpviewer="MozillaFirebird"
-	elif has_version 'net-www/mozilla' ; then
+	elif has_version 'www-client/mozilla' ; then
 		gracehelpviewer="mozilla"
 	elif has_version 'kde-base/kdebase' ; then
 		gracehelpviewer="konqueror"
-	elif has_version 'net-www/galeon' ; then
+	elif has_version 'www-client/galeon' ; then
 		gracehelpviewer="galeon"
-	elif has_version 'net-www/epiphany' ; then
+	elif has_version 'www-client/epiphany' ; then
 		gracehelpviewer="epiphany"
 	else
 		gracehelpviewer="netscape"
diff --git a/media-gfx/grace/grace-5.1.18.ebuild b/media-gfx/grace/grace-5.1.18.ebuild
index 6ff052b2df22..532564dd8a77 100644
--- a/media-gfx/grace/grace-5.1.18.ebuild
+++ b/media-gfx/grace/grace-5.1.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/media-gfx/grace/grace-5.1.18.ebuild,v 1.1 2005/05/25 00:32:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/grace/grace-5.1.18.ebuild,v 1.1.1.1 2005/11/30 09:37:31 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://plasma-gate.weizmann.ac.il/pub/grace/src/stable/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE="debug png jpeg pdflib fftw netcdf"
 
 DEPEND="virtual/x11
diff --git a/media-gfx/grace/metadata.xml b/media-gfx/grace/metadata.xml
index b229aec85b8f..96ba5d5a359b 100644
--- a/media-gfx/grace/metadata.xml
+++ b/media-gfx/grace/metadata.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<herd>graphics</herd>
 <herd>sci</herd>
+<maintainer>
+<email>spyderous@gentoo.org</email>
+<name>Donnie Berkholz</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/graphicsmagick/ChangeLog b/media-gfx/graphicsmagick/ChangeLog
index d8e2b4e7b515..9cc5ad7c723a 100644
--- a/media-gfx/graphicsmagick/ChangeLog
+++ b/media-gfx/graphicsmagick/ChangeLog
@@ -1,10 +1,111 @@
 # ChangeLog for media-gfx/graphicsmagick
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/ChangeLog,v 1.1 2004/06/05 21:14:11 kloeri Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/ChangeLog,v 1.1.1.1 2005/11/30 09:37:31 chriswhite Exp $
+
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  graphicsmagick-1.1.6-r1.ebuild:
+  Added ~ppc64 keyword; bug #102649
+
+  20 Aug 2005; Jason Wever <weeve@gentoo.org>
+  graphicsmagick-1.1.6-r1.ebuild:
+  Added ~sparc keyword.
+
+  02 Aug 2005; <sekretarz@gentoo.org> graphicsmagick-1.1.6-r1.ebuild:
+  Moved documentation to proper place, using dohtml and added doc USE flag,
+  bug #87323
+
+  21 May 2005; Michael Hanselmann <hansmi@gentoo.org>
+  graphicsmagick-1.1.6.ebuild, graphicsmagick-1.1.6-r1.ebuild:
+  Stable on ppc.
+
+*graphicsmagick-1.1.6-r1 (20 May 2005)
+
+  20 May 2005; Bryan Østergaard <kloeri@gentoo.org> +files/xwd-dos.patch,
+  +graphicsmagick-1.1.6-r1.ebuild:
+  Security fix, bug 90595.
+
+  04 May 2005; Michael Hanselmann <hansmi@gentoo.org>
+  graphicsmagick-1.1.6.ebuild:
+  Stable on ppc.
+
+*graphicsmagick-1.1.6 (03 May 2005)
+
+  03 May 2005; Bryan Østergaard <kloeri@gentoo.org>
+  -graphicsmagick-1.0.6.ebuild, -graphicsmagick-1.1.4.ebuild,
+  +graphicsmagick-1.1.6.ebuild:
+  Bump ebuild + stable x86, bug 90595.
+
+*graphicsmagick-1.1.5-r1 (20 Apr 2005)
+
+  20 Apr 2005; Bryan Østergaard <kloeri@gentoo.org>
+  +graphicsmagick-1.1.5-r1.ebuild:
+  Fix font problems, bug 88058.
+
+  26 Jan 2005; Joseph Jezak <josejx@gentoo.org> graphicsmagick-1.1.5.ebuild:
+  Marked ppc stable for bug #79336.
+
+*graphicsmagick-1.1.5 (24 Jan 2005)
+
+  24 Jan 2005; Bryan Østergaard <kloeri@gentoo.org>
+  +graphicsmagick-1.1.5.ebuild:
+  Version bump, bug 79336.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  11 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
+  graphicsmagick-1.0.6.ebuild, graphicsmagick-1.1.4.ebuild:
+  Fix ghostscript dependency.
+
+  20 Nov 2004; Daniel Black <dragonheart@gentoo.org>
+  graphicsmagick-1.1.4.ebuild:
+  ppc keyword
+
+  18 Nov 2004; Luca Barbato <lu_zero@gentoo.org>
+  graphicsmagick-1.1.4.ebuild:
+  Marked ~ppc
+
+*graphicsmagick-1.1.4 (18 Nov 2004)
+
+  18 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
+  -graphicsmagick-1.1.2.ebuild, -graphicsmagick-1.1.3.ebuild,
+  +graphicsmagick-1.1.4.ebuild:
+  Security bump, bug 71573.
+
+  01 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  graphicsmagick-1.0.6.ebuild, graphicsmagick-1.1.2.ebuild,
+  graphicsmagick-1.1.3.ebuild:
+  Remove >=app-text/dgs-0.5.9.1 dep on USE=X because virtual/x11 provides all
+  the same stuff, and they actually overwrite each other's files. Approved by
+  sekretarz.
+
+  05 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> :
+  Depend on virtual/ghostscript, closes bug 66454.
+
+*graphicsmagick-1.1.3 (04 Oct 2004)
+
+  04 Oct 2004; Bryan Østergaard <kloeri@gentoo.org>
+  +graphicsmagick-1.1.3.ebuild:
+  Version bump.
+
+  18 Jun 2004; Aron Griffis <agriffis@gentoo.org> graphicsmagick-1.1.2.ebuild:
+  Fix use invocation
+
+*graphicsmagick-1.1.2 (14 Jun 2004)
+
+  14 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> +metadata.xml,
+  +graphicsmagick-1.1.2.ebuild:
+  Bump version and add metadata.xml.
+
+  08 Jun 2004; David Holm <dholm@gentoo.org> graphicsmagick-1.0.6.ebuild:
+  Added to ~ppc.
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org> graphicsmagick-1.0.6.ebuild:
+  Fix use invocation
 
 *graphicsmagick-1.0.6 (05 Jun 2004)
 
-  05 Jun 2004; Bryan �stergaard <kloeri@gentoo.org>
+  05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org>
   +graphicsmagick-1.0.6.ebuild:
   Initial ebuild provided by Chris Mayo <mayo@clara.co.uk> in bug #35278.
 
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 6ff230f29521..8a9b91f2737e 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -1,2 +1,11 @@
-MD5 be98e476611d75719f3209de0e543fc3 graphicsmagick-1.0.6.ebuild 2417
-MD5 28bcb1e625a5c8fa5f3b40d749c0a52f files/digest-graphicsmagick-1.0.6 74
+MD5 06e0b0a78a98f9cc051103ce23aeb0e9 ChangeLog 3557
+MD5 ded8cc3796c1c2d79702b832850518dc graphicsmagick-1.1.5-r1.ebuild 2437
+MD5 f28ab825c8f582c4ffa270c04678251f graphicsmagick-1.1.5.ebuild 2365
+MD5 62d36c85e318e3fdd8de5ab4d477b085 graphicsmagick-1.1.6-r1.ebuild 2609
+MD5 d09ae3822260a51a2804d7fe838464b7 graphicsmagick-1.1.6.ebuild 2434
+MD5 eae2172901a7cc6b7a6e37fc9267a2b9 metadata.xml 197
+MD5 c07ee30f29005c8130ae5639813149b7 files/digest-graphicsmagick-1.1.5 74
+MD5 c07ee30f29005c8130ae5639813149b7 files/digest-graphicsmagick-1.1.5-r1 74
+MD5 0ae4b45e8525b3c84deeae402fd11c79 files/digest-graphicsmagick-1.1.6 74
+MD5 0ae4b45e8525b3c84deeae402fd11c79 files/digest-graphicsmagick-1.1.6-r1 74
+MD5 0d86c7176f6338aed5b5f86af8f76d63 files/xwd-dos.patch 1103
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.1.5-r1.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.1.5-r1.ebuild
index 6944737e311d..91d4ac383f50 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.1.5-r1.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.1.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/media-gfx/graphicsmagick/graphicsmagick-1.1.5-r1.ebuild,v 1.1 2005/04/20 07:35:14 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/graphicsmagick-1.1.5-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:31 chriswhite Exp $
 
 inherit libtool flag-o-matic perl-module
 replace-flags k6-3 i586
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.1.5.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.1.5.ebuild
index a861ace3ba6f..fe06b31b43a8 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.1.5.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-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/media-gfx/graphicsmagick/graphicsmagick-1.1.5.ebuild,v 1.1 2005/01/24 21:58:57 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/graphicsmagick-1.1.5.ebuild,v 1.1.1.1 2005/11/30 09:37:31 chriswhite Exp $
 
 inherit libtool flag-o-matic perl-module
 replace-flags k6-3 i586
@@ -19,7 +19,7 @@ HOMEPAGE="http://www.graphicsmagick.org/"
 
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="x86 ppc"
 
 DEPEND=">=sys-apps/sed-4
 	>=app-arch/bzip2-1
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.1.6-r1.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.1.6-r1.ebuild
index e38ed2cfaea9..52abe60ac8f5 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.1.6-r1.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.1.6-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/media-gfx/graphicsmagick/graphicsmagick-1.1.6-r1.ebuild,v 1.1 2005/05/20 19:41:53 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/graphicsmagick-1.1.6-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:31 chriswhite Exp $
 
 inherit libtool flag-o-matic perl-module
 replace-flags k6-3 i586
 replace-flags k6-2 i586
 replace-flags k6 i586
 
-IUSE="X gs jbig jp2 jpeg lcms lzw perl png tiff truetype wmf xml2"
+IUSE="X gs jbig jp2 jpeg lcms lzw perl png tiff truetype wmf xml2 doc"
 
 MY_PN=GraphicsMagick
 MY_P=${MY_PN}-${PV}
@@ -19,7 +19,7 @@ HOMEPAGE="http://www.graphicsmagick.org/"
 
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="~ppc x86"
+KEYWORDS="ppc ~ppc64 ~sparc x86"
 
 DEPEND=">=sys-apps/sed-4
 	>=app-arch/bzip2-1
@@ -92,6 +92,11 @@ src_install() {
 	dosym /usr/lib/${MY_P}/ /usr/lib/GraphicsMagick
 
 	rm -f ${D}/usr/share/GraphicsMagick/*.txt
+	rm -rf ${D}/usr/share/${MY_P}/www
+
+	if use doc; then
+	    dohtml -r www/*
+	fi
 
 	dosed "s:-I/usr/include ::" /usr/bin/GraphicsMagick-config
 	dosed "s:-I/usr/include ::" /usr/bin/GraphicsMagick++-config
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.1.6.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.1.6.ebuild
index 0e07726c6c03..985a3180b3bc 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.1.6.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.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/media-gfx/graphicsmagick/graphicsmagick-1.1.6.ebuild,v 1.1 2005/05/03 22:44:04 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/graphicsmagick-1.1.6.ebuild,v 1.1.1.1 2005/11/30 09:37:31 chriswhite Exp $
 
 inherit libtool flag-o-matic perl-module
 replace-flags k6-3 i586
@@ -19,7 +19,7 @@ HOMEPAGE="http://www.graphicsmagick.org/"
 
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="x86 ppc"
 
 DEPEND=">=sys-apps/sed-4
 	>=app-arch/bzip2-1
diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index 747b50f96f62..5fe77b3742b2 100644
--- a/media-gfx/graphviz/ChangeLog
+++ b/media-gfx/graphviz/ChangeLog
@@ -1,13 +1,293 @@
 # ChangeLog for media-gfx/graphviz
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/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/media-gfx/graphviz/ChangeLog,v 1.1.1.1 2005/11/30 09:37:28 chriswhite Exp $
+
+  20 Nov 2005; Luca Barbato <lu_zero@gentoo.org>
+  files/graphviz-1.16-tempdir.patch:
+  Fixes bug #113044
+
+  11 Nov 2005; Luca Barbato <lu_zero@gentoo.org>
+  files/graphviz-1.16-tempdir.patch:
+  Patch fixed
+
+  10 Nov 2005; Luca Barbato <lu_zero@gentoo.org>
+  files/graphviz-1.16-tempdir.patch:
+  Updated patch as requested in bug #108690
+
+  09 Nov 2005; Fabian Groffen <grobian@gentoo.org>
+  +files/graphviz-2.6-macos.patch, graphviz-2.6.ebuild:
+  Define 'environ' so linking actually succeeds on OSX (bug #111504)
+
+  03 Nov 2005; Luca Barbato <lu_zero@gentoo.org> graphviz-1.16-r1.ebuild:
+  Backport 2.6 postinst
+
+  31 Oct 2005; Lina Pezzella <j4rg0n@gentoo.org>
+  +files/graphviz-2.6-no-undefined.patch, graphviz-2.4.ebuild,
+  graphviz-2.6.ebuild:
+  Fix for undefined symbols on ppc-macos. Conditional on OS in Makefile rather
+  than the ebuild. Keyworded testing ppc-macos.
+
+  28 Oct 2005; Bryan Østergaard <kloeri@gentoo.org> graphviz-2.6.ebuild:
+  Add ~alpha + ~ia64 keywords.
+
+  28 Oct 2005; Simon Stelling <blubb@gentoo.org> graphviz-1.16-r1.ebuild:
+  stable on amd64 wrt bug 108690
+
+  26 Oct 2005; Lina Pezzella <j4rg0n@gentoo.org> graphviz-2.4.ebuild:
+  Testing ppc-macos
+
+  25 Oct 2005; Rene Nussbaumer <killerfox@gentoo.org> graphviz-2.6.ebuild:
+  Unstable on hppa.
+
+*graphviz-1.16-r1 (24 Oct 2005)
+
+  24 Oct 2005; Luca Barbato <lu_zero@gentoo.org> +graphviz-1.16-r1.ebuild:
+  revbump
+
+  24 Oct 2005; Luca Barbato <lu_zero@gentoo.org>
+  +files/graphviz-1.16-tempdir.patch, graphviz-1.16.ebuild:
+  Fix for bug #108690
+
+  24 Sep 2005; Mark Loeser <halcy0n@gentoo.org> graphviz-1.10.ebuild,
+  graphviz-1.12.ebuild, graphviz-1.12-r1.ebuild, graphviz-1.16.ebuild,
+  graphviz-2.2.ebuild, graphviz-2.2.1.ebuild, graphviz-2.2.1-r1.ebuild,
+  graphviz-2.4.ebuild, graphviz-2.6.ebuild:
+  Added sys-devel/gettext to DEPEND; bug #81395
+
+*graphviz-2.6 (15 Sep 2005)
+
+  15 Sep 2005; Steve Arnold <nerdboy@gentoo.org> +graphviz-2.6.ebuild:
+  added latest version for doxygen and bug #105041, and added ~sparc back;
+  modified user-submitted ebuild from Dick Marinus <dm@chello.nl> (thanks!)
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> graphviz-1.16.ebuild:
+  Mark 1.16 stable on alpha
+
+  24 Aug 2005; Aron Griffis <agriffis@gentoo.org> graphviz-1.16.ebuild:
+  stable on ia64
+
+  21 Aug 2005; Marcelo Goes <vanquirius@gentoo.org> -graphviz-2.4-r1.ebuild:
+  Removing this revision bump as it does not fix bug 101337 at all.
+
+*graphviz-2.4-r1 (21 Aug 2005)
+
+  21 Aug 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +files/graphviz-2.4.conf, +graphviz-2.4-r1.ebuild:
+  Revision bump. Install a sample configuration file for bug 101337. Thanks to
+  everyone participating in the bug.
+
+  13 Aug 2005; Marcelo Goes <vanquirius@gentoo.org> graphviz-1.10.ebuild:
+  Use mirror://gentoo for src_uri since this version is no longer available in
+  upstream servers. Fixes bug 64593. Thanks to <ted.reed@gmail.com> and
+  others.
+
+*graphviz-2.4 (02 Aug 2005)
+
+  02 Aug 2005; <sekretarz@gentoo.org> +graphviz-2.4.ebuild:
+  Version bump, bug #99802
+
+  02 Aug 2005; <sekretarz@gentoo.org> graphviz-1.16.ebuild,
+  graphviz-2.2.1-r1.ebuild:
+  pdf files doesn't need to be gziped, bug #97095
+
+  01 Aug 2005; <sekretarz@gentoo.org> graphviz-1.16.ebuild:
+  Added -a switch to automake to add missing files, cought by Volkov Peter
+  <torre_cremata@mail.ru> in bug #100593
+
+  12 Jul 2005; Stephen P. Becker <geoman@gentoo.org> graphviz-1.16.ebuild:
+  stable on mips
+
+*graphviz-2.2.1-r1 (26 Jun 2005)
+
+  26 Jun 2005; Luca Barbato <lu_zero@gentoo.org> graphviz-2.2.1.ebuild,
+  +graphviz-2.2.1-r1.ebuild:
+  Make sure that every arch has a 2.2.1
+
+  26 Jun 2005; Luca Barbato <lu_zero@gentoo.org> graphviz-2.2.1.ebuild:
+  New version, kindly provided by John Ellson <ellson@research.att.com> in bug
+  #89403
+
+  20 Jun 2005; Rene Nussbaumer <killerfox@gentoo.org> graphviz-1.16.ebuild:
+  Stable on hppa.
+
+  14 Jun 2005; Jason Wever <weeve@gentoo.org> graphviz-2.2.1.ebuild:
+  Added ~sparc keyword because pplz didn't love us enough to keep our keyword
+  in there :(
+
+  06 Jun 2005; Markus Rothe <corsair@gentoo.org> graphviz-1.16.ebuild:
+  Stable on ppc64
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> graphviz-1.16.ebuild:
+  Stable on ppc.
+
+  31 May 2005; Lina Pezzella <j4rg0n@gentoo.org> graphviz-1.16.ebuild:
+  Stable ppc-macos
+
+  30 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> graphviz-1.16.ebuild:
+  Stable on sparc, for real
+
+  30 May 2005; Steve Arnold <nerdboy@gentoo.org> graphviz-1.12.ebuild,
+  graphviz-1.12-r1.ebuild, graphviz-1.16.ebuild:
+  updating for doxygen; all 1.x versions work fine on x86 and sparc
+
+*graphviz-2.2.1 (18 May 2005)
+
+  18 May 2005; Luca Barbato <lu_zero@gentoo.org> +graphviz-2.2.1.ebuild:
+  New Version
+
+*graphviz-2.2 (20 Mar 2005)
+
+  20 Mar 2005; Luca Barbato <lu_zero@gentoo.org> +graphviz-2.2.ebuild:
+  New version
+
+  20 Feb 2005; Sven Wegener <swegener@gentoo.org> graphviz-1.16.ebuild:
+  Added missing digest entries. Made the graphviz-1.16-panic.patch.tar.bz2
+  SRC_URI dependant on the ppc-macos flag.
+
+  18 Feb 2005; Lina Pezzella <j4rg0n@gentoo.org>
+  +files/graphviz-1.16-common_h.patch, +files/graphviz-1.16-panic.patch,
+  graphviz-1.16.ebuild:
+  Patched to build on ppc-macos
+
+  18 Dec 2004; Luca Barbato <lu_zero@gentoo.org>
+  +files/graphviz-1.16-build.patch, graphviz-1.16.ebuild:
+  Fix gcc-3.4 compatibility, thanks to Rodolfo Boer <rodolfo_mv@libero.it> for
+  the patch
+
+  14 Dec 2004; Robin H. Johnson <robbat2@gentoo.org> graphviz-1.16.ebuild:
+  Can't seperate out GD yet, still a few bugs.
+
+*graphviz-1.16 (14 Dec 2004)
+
+  14 Dec 2004; Robin H. Johnson <robbat2@gentoo.org> graphviz-1.12-r1.ebuild,
+  graphviz-1.16:
+  Bugs #58592, #73218.
+
+  07 Nov 2004; Karol Wojtaszek <sekretarz@gentoo.org>
+  graphviz-1.10.ebuild, graphviz-1.12-r1.ebuild, graphviz-1.12.ebuild:
+  Fixed URI_SRC to download new configure script. bug #70086 and fixed LICENCEs
+
+*graphviz-1.12-r1 (25 Jul 2004)
+
+  25 Jul 2004; Robin H. Johnson <robbat2@gentoo.org> :
+  bug #58028, improved to be cleaner.
+
+*graphviz-1.12 (22 Jul 2004)
+
+  22 Jul 2004; Aron Griffis <agriffis@gentoo.org> graphviz-1.10.ebuild:
+  Update SRC_URI #53602, bump to 1.12 #52343, run gnuconfig_update in src_unpack
+
+  20 Jul 2004; Tom Gall <tgall@gentoo.org> graphviz-1.10.ebuild:
+  stable on ppc64, bug #57163
+
+  05 Jun 2004; Stephen P. Becker <geoman@gentoo.org> graphviz-1.10.ebuild:
+  Added gnuconfig tweak for mips.
+
+  03 Jun 2004; Stephen P. Becker <geoman@gentoo.org> graphviz-1.10.ebuild:
+  Stable on mips.
+
+  25 Apr 2004; Aron Griffis <agriffis@gentoo.org> graphviz-1.10.ebuild:
+  Add die following econf for bug 48950
+
+  24 Apr 2004; Bret Curtis <psi29a@gentoo.org> graphviz-1.10.ebuild:
+  Added to ~mips
+
+  27 Jan 2004; <gustavoz@gentoo.org> graphviz-1.10.ebuild:
+  marked stable on sparc
+
+  15 Jan 2004; <agriffis@gentoo.org> graphviz-1.10.ebuild:
+  stable on alpha and ia64
+
+  06 Dec 2003; Caleb Tennis <caleb@gentoo.org> graphviz-1.10.ebuild,
+  graphviz-1.9.ebuild:
+  Changed dep versions ( >=pkg-ver* to >=pkg-ver ) fixing bug 35193
+
+  16 Nov 2003; Brad House <brad_mssw@gentoo.org> graphviz-1.8.10-r3.ebuild,
+  graphviz-1.8.10.ebuild:
+  mark stable on amd64
+
+  16 Nov 2003; Brad House <brad_mssw@gentoo.org> graphviz-1.10.ebuild:
+  add ~amd64 flag
+
+  10 Oct 2003; Marius Mauch <genone@gentoo.org> graphviz-1.10.ebuild:
+  small fix to make sort from coreutils-5 happy
+
+*graphviz-1.10 (27 Sep 2003)
+
+  27 Sep 2003; Markus Nigbur <pyrania@gentoo.org> graphviz-1.10.ebuild,
+  Bump
+
+*graphviz-1.9 (22 Feb 2003)
+
+  27 Sep 2003; Markus Nigbur <pyrania@gentoo.org> graphviz-1.9.ebuild,
+  Fixed SRC_URI (bug #29749)
+
+  16 Jun 2003; Will Woods <wwoods@gentoo.org> graphviz-1.9.ebuild:
+  added alpha to KEYWORDS.
+
+  05 May 2003; Luca Barbato <@gentoo.org> graphviz-1.9.ebuild:
+  Added ppc to keywords.
+
+  24 Apr 2003; Stanislav Brabec <utx@gentoo.org> graphviz-1.9.ebuild:
+  Fixed DEPEND for tk-8.4.
+
+  06 Apr 2003; Jason Wever <weeve@gentoo.org> graphviz-1.9.ebuild:
+  Added sparc to keywords.
+
+  19 Mar 2003; George Shapovalov <george@gentoo.org> graphviz-1.9.ebuild :
+  1.9 cannot be built with gcc-2.95.x. (#16018)
+  added >=sys-devel/gcc-3.2* to DEPEND and <media-gfx/graphviz-1.9 to all gcc-2 based profiles
+
+  22 Feb 2003; George Shapovalov <george@gentoo.org> graphviz-1.9.ebuild :
+  new version (#15923)
+  now compiles against libpng-1.2!
+  ebuild submitted by Tom Payne <gentoo@tompayne.org>
+
+*graphviz-1.8.10-r3 (21 Jan 2003)
+
+  19 Mar 2003; Jason Wever <weeve@gentoo.org> graphviz-1.8.10-r3.ebuild:
+  Added ~sparc to keywords.
+
+  13 Mar 2003; Olivier Reisch <doctomoe@gentoo.org> graphviz-1.8.10-r3.ebuild :
+  Marked ppc stable
+
+  21 Jan 2003; George Shapovalov <george@gentoo.org> graphviz-1.8.10-r3.ebuild :
+  Another libpng-1.0 related fix. Now made sure all -lpng are replaced by lpng10, as quite often
+  gcc tries to link against libpng.so.3 instead of libpng.so.2. See #12433.
+  As the fixed problem tends to lead to silent failures, -r bumping the ebuild to force rebuild.
+
+*graphviz-1.8.10-r2 (14 Jan 2003)
+
+  14 Jan 2003; George Shapovalov <george@gentoo.org> graphviz-1.8.10-r2.ebuild :
+
+  Following up on seemant's fix to libpng-1.0 series upated the graphviz ebuild to link against correct 
+  version of libpng. Please see #10726 for more details.
+
+*graphviz-1.8.10-r1 (10 Nov 2002)
+
+  10 Nov 2002; George Shapovalov <george@gentoo.org> graphviz-1.8.10-r1.ebuild, files/ :
+
+  removed libpng dependency and made package compile without libpng. 
+  Reason: at the moment this is the only app left in portage that depends on libpng-1.0 
+  series (often won't compile against 1.2) and libpng-1.0 is creating a lot of trouble 
+  for example with kdelibs. See #10726 for details.
+
+*graphviz-1.8.10 (10 Nov 2002)
+
+  10 Nov 2002; George Shapovalov <george@gentoo.org> graphviz-1.8.10.ebuild :
+   new version.
+   Fixes some weird issue, possibly libpng related. This app still depends on libpng-1.0.x!!
+   Corrected the dependency. See #9702 for more details.
+
+*graphviz-1.7.15-r2 (12 Apr 2002)
+
+  14 Aug 2002; Pieter Van den Abeele <pvdabeel@gentoo.org> :
+  Added ppc keyword
+
+  12 Apr 2002; Seemant Kulleen <seemant@gentoo.org> graphviz-1.7.15-r2.ebuild :
+
+  Compile against newest libpng
 
 *graphviz-1.7.15-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.
+
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index c447cd86fb6f..a9feb6b325a9 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,12 +1,30 @@
-MD5 b1cae0f0a58120cb780ead9cf75140f4 ChangeLog 2776
-MD5 fa57f35cc71729ad2f6c625e2c31feb4 graphviz-1.8.10.ebuild 1190
-MD5 47f4a86ba45ffafdea2d765b42462528 graphviz-1.8.10-r2.ebuild 1261
-MD5 01ecc4acc9c20fc3891bc057a441829e graphviz-1.8.10-r3.ebuild 1960
-MD5 789fca69c9c4b7366175f45b3f34fe0f graphviz-1.9.ebuild 1082
-MD5 975ae293c53e7ef47dc33a52dc30762f graphviz-1.7.15-r2.ebuild 1263
-MD5 378952274e1900d18448028732e49690 files/digest-graphviz-1.8.10 68
-MD5 1737afe4c207e5a3efb388e1f558850f files/digest-graphviz-1.9 190
+MD5 999046d0628cd677bac6e7e66348cfbc ChangeLog 10437
+MD5 ea7e00b7c49179d3961458a98aee9d6c files/digest-graphviz-1.10 66
+MD5 cea8244a5db85a3bc5e74e4ecd3c9a2b files/digest-graphviz-1.12 66
+MD5 54cdc52906c56a19e4e09cd0773d4633 files/digest-graphviz-1.12-r1 139
+MD5 f903a12f0ed9c89432dee821776f4e97 files/digest-graphviz-1.16 141
+MD5 5454fe576c2f133250774cc9b9633e24 files/digest-graphviz-1.16-r1 141
+MD5 9ebf9ffcce27ea71d28da323a9221356 files/digest-graphviz-2.2 65
+MD5 fd083ee967ab029fd47a155ba572ac60 files/digest-graphviz-2.2.1 67
+MD5 fd083ee967ab029fd47a155ba572ac60 files/digest-graphviz-2.2.1-r1 67
+MD5 c7e30bf4d757c98799d61d36723a8c06 files/digest-graphviz-2.4 65
+MD5 52118c7d90398202a81b72b67bf0b0d7 files/digest-graphviz-2.6 65
 MD5 5e8726d7d859188692efcfe9e9155761 files/gdgen.c.patch 756
-MD5 378952274e1900d18448028732e49690 files/digest-graphviz-1.8.10-r2 68
-MD5 378952274e1900d18448028732e49690 files/digest-graphviz-1.8.10-r3 68
-MD5 84a308f6e38ddd0e8c3480ee9312509f files/digest-graphviz-1.7.15-r2 65
+MD5 6700ac8c3ea388f54326ca2a57784a1c files/graphviz-1.12-build.patch 1514
+MD5 280fc858f990639d5d8fb7102b2636ac files/graphviz-1.16-build.patch 6200
+MD5 5c7f01258da58810d0175461e0c1d14b files/graphviz-1.16-common_h.patch 292
+MD5 3dcab6b1ffd0469fd6614a8ea4458366 files/graphviz-1.16-tempdir.patch 1091
+MD5 6f4c558cccabd9d79fe071b4b21fa67b files/graphviz-2.4.conf 236
+MD5 3d944d385ea2770498a6f99cd4d2db3f files/graphviz-2.6-macos.patch 519
+MD5 b208c7d4ddd47dc60e3e1b5bb78e8bfd files/graphviz-2.6-no-undefined.patch 1900
+MD5 2339df982693f89bc4ea845062b0597d graphviz-1.10.ebuild 1276
+MD5 56c7e33463f29fd71f4af44c0fa687a5 graphviz-1.12-r1.ebuild 1913
+MD5 3cfddfbe2fa0fe541cb4243d9e109e69 graphviz-1.12.ebuild 1408
+MD5 9d9b6a6a7cb80ad8386a1a7ff72431bf graphviz-1.16-r1.ebuild 2255
+MD5 885ceebba109e987a9538733178f3139 graphviz-1.16.ebuild 2226
+MD5 4eead72d8554c4afd813032f4ce96ddf graphviz-2.2.1-r1.ebuild 1215
+MD5 a5310746d1a39897c72cd3fd0477646c graphviz-2.2.1.ebuild 1159
+MD5 1d8314727c6cbd655072c67f39b30f0a graphviz-2.2.ebuild 1917
+MD5 beeeebe71f23f7a2c9d20cc4a6b86825 graphviz-2.4.ebuild 1180
+MD5 24092f83efb0c45690148263411da673 graphviz-2.6.ebuild 1493
+MD5 e98595ce89ff0da26058b1e6e0ce3d31 metadata.xml 1540
diff --git a/media-gfx/graphviz/files/digest-graphviz-1.16 b/media-gfx/graphviz/files/digest-graphviz-1.16
index 77d32bb2f943..0678483eebc0 100644
--- a/media-gfx/graphviz/files/digest-graphviz-1.16
+++ b/media-gfx/graphviz/files/digest-graphviz-1.16
@@ -1 +1,2 @@
 MD5 a2a3bd1b9fe807c46e676fb9a3f0ba22 graphviz-1.16.tar.gz 4387670
+MD5 4bb340f3154679f952a1a45fdf11ffc1 graphviz-1.16-panic.patch.tar.bz2 201
diff --git a/media-gfx/graphviz/files/graphviz-1.16-tempdir.patch b/media-gfx/graphviz/files/graphviz-1.16-tempdir.patch
index 0fe40acf4097..d7c1ee154652 100644
--- a/media-gfx/graphviz/files/graphviz-1.16-tempdir.patch
+++ b/media-gfx/graphviz/files/graphviz-1.16-tempdir.patch
@@ -1,21 +1,22 @@
---- graphviz-2.2.1.orig/dotty/dotty.lefty
-+++ graphviz-2.2.1/dotty/dotty.lefty
-@@ -668,7 +668,10 @@
+diff -u graphviz-1.16/dotty.old/dotty.lefty graphviz-1.16/dotty/dotty.lefty
+--- graphviz-1.16/dotty.old/dotty.lefty	2005-11-11 11:11:07.000000000 +0100
++++ graphviz-1.16/dotty/dotty.lefty	2005-11-11 11:13:12.000000000 +0100
+@@ -668,8 +668,8 @@
          if (~(otype = ask ('print to', 'choice', 'file|printer')))
              return;
      if (otype == 'printer') {
 -        name = '/tmp/dottyout.ps';
-+        if (~getenv ('TMPDIR'))
-+            name = concat (getenv ('HOME'), '/.dottyout.ps');
-+        else
-+            name = concat (getenv ('TMPDIR'), '/.dottyout.ps', random (10000));
-         if (getenv ('LEFTYWINSYS') ~= 'mswin' & ~pr)
+-        if (getenv ('LEFTYWINSYS') ~= 'mswin' & ~pr)
++        name = concat (getenv ('HOME'), '/.dottyout.ps');
++	if (getenv ('LEFTYWINSYS') ~= 'mswin' & ~pr)
              if (~(pr = ask ('printer command', 'string', 'lpr')))
                  return;
-@@ -768,5 +771,5 @@
+     }
+@@ -768,5 +768,5 @@
      vt.canvas = canvas;
      destroywidget (pscanvas);
      if (otype == 'printer' & getenv ('LEFTYWINSYS') ~= 'mswin')
 -        system (concat (pr, ' /tmp/dottyout.ps; rm /tmp/dottyout.ps'));
-+        system (concat (pr, ' ', name, '; rm ',name));
++	system (concat (pr, ' ', name, '; rm ',name));
  };
+Common subdirectories: /var/tmp/portage/graphviz-1.16-r1/work/graphviz-1.16/dotty.old/mswin32 and /var/tmp/portage/graphviz-1.16-r1/work/graphviz-1.16/dotty/mswin32
diff --git a/media-gfx/graphviz/graphviz-1.10.ebuild b/media-gfx/graphviz/graphviz-1.10.ebuild
index 81c0b27d907f..d50eaa47a2bd 100644
--- a/media-gfx/graphviz/graphviz-1.10.ebuild
+++ b/media-gfx/graphviz/graphviz-1.10.ebuild
@@ -1,28 +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/media-gfx/graphviz/graphviz-1.10.ebuild,v 1.1 2003/09/27 16:52:48 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-1.10.ebuild,v 1.1.1.1 2005/11/30 09:37:29 chriswhite Exp $
 
-IUSE="tcltk"
+inherit gnuconfig
 
 DESCRIPTION="open source graph drawing software"
-SRC_URI="http://www.graphviz.org/pub/graphviz/${P}.tar.gz"
 HOMEPAGE="http://www.research.att.com/sw/tools/graphviz/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
+LICENSE="as-is ATT"
 SLOT="0"
-LICENSE="as-is | ATT"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
+IUSE="tcltk"
 
 #Can use freetype-1.3 or 2.0, but not both
 DEPEND=">=sys-libs/zlib-1.1.3
-	>=sys-devel/gcc-3.2*
-	>=media-libs/libpng-1.2*
+	>=media-libs/libpng-1.2
 	>=media-libs/jpeg-6b
 	media-libs/freetype
-	tcltk? ( >=dev-lang/tk-8.3* )"
+	sys-devel/gettext
+	tcltk? ( >=dev-lang/tk-8.3 )"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+	sed -i -e "s:+0 -1:-k 1,2:" "${S}/dotneato/common/Makefile.in"
+
+	# Run gnuconfig_update on all arches, needed at least for mips
+	gnuconfig_update
 }
 
 src_compile() {
@@ -31,7 +36,7 @@ src_compile() {
 	#compile without tcltk support
 	use tcltk || myconf="${myconf} --without-tcl --without-tk"
 
-	econf ${myconf}
+	econf ${myconf} || die "econf failed"
 
 	emake || die
 }
diff --git a/media-gfx/graphviz/graphviz-1.12-r1.ebuild b/media-gfx/graphviz/graphviz-1.12-r1.ebuild
index c96b17a3b854..0e42c43a7082 100644
--- a/media-gfx/graphviz/graphviz-1.12-r1.ebuild
+++ b/media-gfx/graphviz/graphviz-1.12-r1.ebuild
@@ -1,26 +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/media-gfx/graphviz/graphviz-1.12-r1.ebuild,v 1.1 2004/07/26 03:24:27 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-1.12-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:28 chriswhite Exp $
 
 inherit gnuconfig eutils
 
 DESCRIPTION="open source graph drawing software"
 HOMEPAGE="http://www.research.att.com/sw/tools/graphviz/"
-SRC_URI="http://www.graphviz.org/pub/graphviz/ARCHIVE/${P}.tar.gz"
-LICENSE="as-is | ATT"
+SRC_URI="http://www.graphviz.org/pub/graphviz/ARCHIVE/${P}.tar.gz
+		mirror://gentoo/graphviz-1.12-configure.ac.bz2"
+
+LICENSE="as-is ATT"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="tcltk"
 
-#remove this for 1.13
-#the d.g.o location is there until it propogates to mirrors
-SRC_URI="${SRC_URI} mirror://gentoo/${P}-configure.ac.bz2 http://dev.gentoo.org/~robbat2/distfiles/${P}-configure.ac.bz2"
-
 #Can use freetype-1.3 or 2.0, but not both
 DEPEND=">=sys-libs/zlib-1.1.3
 	>=media-libs/libpng-1.2
 	>=media-libs/jpeg-6b
 	media-libs/freetype
+	dev-util/pkgconfig
+	sys-devel/gettext
 	tcltk? ( >=dev-lang/tk-8.3 )"
 
 src_unpack() {
diff --git a/media-gfx/graphviz/graphviz-1.12.ebuild b/media-gfx/graphviz/graphviz-1.12.ebuild
index 2cb45d97d09b..95c64687bdbd 100644
--- a/media-gfx/graphviz/graphviz-1.12.ebuild
+++ b/media-gfx/graphviz/graphviz-1.12.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/media-gfx/graphviz/graphviz-1.12.ebuild,v 1.1 2004/07/22 16:18:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-1.12.ebuild,v 1.1.1.1 2005/11/30 09:37:28 chriswhite Exp $
 
 inherit gnuconfig
 
@@ -8,9 +8,9 @@ DESCRIPTION="open source graph drawing software"
 HOMEPAGE="http://www.research.att.com/sw/tools/graphviz/"
 SRC_URI="http://www.graphviz.org/pub/graphviz/ARCHIVE/${P}.tar.gz"
 
-LICENSE="as-is | ATT"
+LICENSE="as-is ATT"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="tcltk"
 
 #Can use freetype-1.3 or 2.0, but not both
@@ -18,6 +18,7 @@ DEPEND=">=sys-libs/zlib-1.1.3
 	>=media-libs/libpng-1.2
 	>=media-libs/jpeg-6b
 	media-libs/freetype
+	sys-devel/gettext
 	tcltk? ( >=dev-lang/tk-8.3 )"
 
 src_unpack() {
diff --git a/media-gfx/graphviz/graphviz-1.16-r1.ebuild b/media-gfx/graphviz/graphviz-1.16-r1.ebuild
index 5c1ab0958e2b..a2d181545e96 100644
--- a/media-gfx/graphviz/graphviz-1.16-r1.ebuild
+++ b/media-gfx/graphviz/graphviz-1.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/media-gfx/graphviz/graphviz-1.16-r1.ebuild,v 1.1 2005/10/24 15:41:36 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-1.16-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:29 chriswhite Exp $
 
 inherit gnuconfig eutils flag-o-matic
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.graphviz.org/pub/graphviz/ARCHIVE/${P}.tar.gz
 
 LICENSE="as-is ATT"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm hppa ia64 mips ppc ppc-macos ppc64 s390 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc-macos ppc64 s390 sparc x86"
 IUSE="tcltk"
 
 #Can use freetype-1.3 or 2.0, but not both
@@ -73,3 +73,7 @@ src_install() {
 	dohtml -r .
 	dodoc doc/*.pdf doc/Dot.ref
 }
+
+pkg_postinst() {
+	dot -c
+}
diff --git a/media-gfx/graphviz/graphviz-1.16.ebuild b/media-gfx/graphviz/graphviz-1.16.ebuild
index 87e81eab928d..7c1ee146a4bd 100644
--- a/media-gfx/graphviz/graphviz-1.16.ebuild
+++ b/media-gfx/graphviz/graphviz-1.16.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/media-gfx/graphviz/graphviz-1.16.ebuild,v 1.1 2004/12/14 10:17:47 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-1.16.ebuild,v 1.1.1.1 2005/11/30 09:37:29 chriswhite Exp $
 
-inherit gnuconfig eutils
+inherit gnuconfig eutils flag-o-matic
 
 DESCRIPTION="open source graph drawing software"
 HOMEPAGE="http://www.research.att.com/sw/tools/graphviz/"
-SRC_URI="http://www.graphviz.org/pub/graphviz/ARCHIVE/${P}.tar.gz"
+SRC_URI="http://www.graphviz.org/pub/graphviz/ARCHIVE/${P}.tar.gz
+	ppc-macos? ( mirror://gentoo/${P}-panic.patch.tar.bz2 )"
 
 LICENSE="as-is ATT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86"
+KEYWORDS="alpha ~amd64 arm hppa ia64 mips ppc ppc-macos ppc64 s390 sparc x86"
 IUSE="tcltk"
 
 #Can use freetype-1.3 or 2.0, but not both
@@ -19,14 +20,31 @@ DEPEND=">=sys-libs/zlib-1.1.3
 	>=media-libs/jpeg-6b
 	media-libs/freetype
 	dev-util/pkgconfig
+	sys-devel/gettext
+	>=media-libs/gd-2.0.29
+	media-libs/fontconfig
 	tcltk? ( >=dev-lang/tk-8.3 )"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+	epatch ${FILESDIR}/${P}-build.patch
+	epatch ${FILESDIR}/${P}-tempdir.patch
+
+	if use ppc-macos; then
+		# fixes weird make issue
+		epatch ${WORKDIR}/${P}-panic.patch
+		epatch ${FILESDIR}/${P}-common_h.patch
+	fi
 
 	# Run gnuconfig_update on all arches, needed at least for mips
 	gnuconfig_update
+
+	if ! use ppc-macos; then
+		#EPATCH_OPTS="-p1 -d${S}" epatch ${FILESDIR}/${P}-fontconfig-externalgd.diff || die "Failed to patch"
+		einfo "Running aclocal/automake/autoconf"
+		aclocal && libtoolize --copy --force && automake -a && autoconf || die "Failed	to aclocal/libtoolize/automake/autoconf"
+	fi
 }
 
 src_compile() {
@@ -36,7 +54,8 @@ src_compile() {
 	# compile without tcltk support
 	use tcltk || myconf="${myconf} --without-tcl --without-tk"
 
-	myconf="${myconf} --enable-dynagraph"
+	myconf="${myconf} --enable-dynagraph --with-mylibgd"
+	use ppc-macos && myconf="${myconf} --with-expatincludedir=/usr/X11R6/include --with-expatlibdir=/usr/X11R6/lib --with-fontconfigincludedir=/usr/X11R6/include --with-fontconfiglibdir=/usr/X11R6/lib"
 	econf ${myconf} || die "econf failed"
 
 	emake || die
@@ -48,6 +67,9 @@ src_install() {
 	dodoc AUTHORS ChangeLog FAQ.txt INSTALL*  MINTERMS.txt \
 		NEWS README*
 
+	insinto /usr/share/doc/${PF}/
+	doins doc/*.pdf
+
 	dohtml -r .
 	dodoc doc/*.pdf doc/Dot.ref
 }
diff --git a/media-gfx/graphviz/graphviz-2.2.1-r1.ebuild b/media-gfx/graphviz/graphviz-2.2.1-r1.ebuild
index be53bf346580..7382aa005c6d 100644
--- a/media-gfx/graphviz/graphviz-2.2.1-r1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.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/media-gfx/graphviz/graphviz-2.2.1-r1.ebuild,v 1.1 2005/06/26 17:20:03 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.2.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:28 chriswhite Exp $
 
 DESCRIPTION="Open Source Graph Visualization Software"
 HOMEPAGE="http://www.graphviz.org/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.graphviz.org/pub/graphviz/ARCHIVE/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~s390 ~x86"
 IUSE="cairo dynagraph tcltk X"
 
 RDEPEND=">=sys-libs/zlib-1.1.3
@@ -18,6 +18,7 @@ RDEPEND=">=sys-libs/zlib-1.1.3
 		   media-libs/fontconfig
 		   dev-libs/expat
 		   sys-libs/zlib
+		   sys-devel/gettext
 		 tcltk? ( >=dev-lang/tk-8.3 )
 		 cairo? ( >=x11-libs/libsvg-cairo-0.1.3 )"
 DEPEND="${RDEPEND}
@@ -35,6 +36,10 @@ src_install() {
 	make DESTDIR=${D} install || die "Install Failed!"
 
 	dodoc AUTHORS ChangeLog INSTALL* NEWS README*
-	dodoc doc/*.pdf doc/Dot.ref
+	dodoc doc/Dot.ref
+
+	insinto /usr/share/doc/${PF}/
+	doins doc/*.pdf
+
 	dohtml -r .
 }
diff --git a/media-gfx/graphviz/graphviz-2.2.1.ebuild b/media-gfx/graphviz/graphviz-2.2.1.ebuild
index 21ea2177ae3b..8062f6480087 100644
--- a/media-gfx/graphviz/graphviz-2.2.1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.2.1.ebuild
@@ -1,62 +1,41 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.2.1.ebuild,v 1.1 2005/05/18 10:58:16 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.2.1.ebuild,v 1.1.1.1 2005/11/30 09:37:28 chriswhite Exp $
 
-inherit gnuconfig eutils flag-o-matic
-
-DESCRIPTION="open source graph drawing software"
-HOMEPAGE="http://www.research.att.com/sw/tools/graphviz/"
+DESCRIPTION="Open Source Graph Visualization Software"
+HOMEPAGE="http://www.graphviz.org/"
 SRC_URI="http://www.graphviz.org/pub/graphviz/ARCHIVE/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~ppc-macos"
-IUSE="tcltk"
-
-#Can use freetype-1.3 or 2.0, but not both
-DEPEND=">=sys-libs/zlib-1.1.3
-	>=media-libs/libpng-1.2
-	>=media-libs/jpeg-6b
-	media-libs/freetype
-	dev-util/pkgconfig
-	>=media-libs/gd-2.0.32
-	media-libs/fontconfig
-	tcltk? ( >=dev-lang/tk-8.3 )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Run gnuconfig_update on all arches, needed at least for mips
-	gnuconfig_update
-
-	if ! use ppc-macos; then
-		#EPATCH_OPTS="-p1 -d${S}" epatch ${FILESDIR}/${P}-fontconfig-externalgd.diff || die "Failed to patch"
-		einfo "Running aclocal/automake/autoconf"
-		aclocal && libtoolize --copy --force && automake -a -c -f && autoconf || die "Failed	to aclocal/libtoolize/automake/autoconf"
-	fi
-}
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~x86"
+IUSE="dynagraph tcltk X"
+
+RDEPEND=">=sys-libs/zlib-1.1.3
+		 >=media-libs/libpng-1.2
+		 >=media-libs/jpeg-6b
+		   media-libs/freetype
+		   media-libs/fontconfig
+		   dev-libs/expat
+		   sys-libs/zlib
+		   sys-devel/gettext
+		 tcltk? ( >=dev-lang/tk-8.3 )"
+
+DEPEND="${RDEPEND}
+		dev-util/pkgconfig"
 
 src_compile() {
-	local myconf
-
-	# if no tcltk, this will generate configure warnings, but will
-	# compile without tcltk support
-	use tcltk || myconf="${myconf} --without-tcl --without-tk"
-
-	myconf="${myconf} --disable-dynagraph --with-mylibgd"
-	use ppc-macos && myconf="${myconf} --with-expatincludedir=/usr/X11R6/include --with-expatlibdir=/usr/X11R6/lib --with-fontconfigincludedir=/usr/X11R6/include --with-fontconfiglibdir=/usr/X11R6/lib"
-	econf ${myconf} || die "econf failed"
-
-	emake || die
+	econf --with-mylibgd \
+		  $(use_with dynagraph dynagraph) \
+		  $(use_with tcltk tcl) $(use_with tcltk tk) \
+		  $(use_with X x) || die "Configure Failed!"
+	emake || die "Compile Failed!"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR=${D} install || die "Install Failed!"
 
-	dodoc AUTHORS ChangeLog FAQ.txt INSTALL*  MINTERMS.txt \
-		NEWS README*
-
-	dohtml -r .
+	dodoc AUTHORS ChangeLog INSTALL* NEWS README*
 	dodoc doc/*.pdf doc/Dot.ref
+	dohtml -r .
 }
diff --git a/media-gfx/graphviz/graphviz-2.2.ebuild b/media-gfx/graphviz/graphviz-2.2.ebuild
index 4bd569ad43f1..081d7a49dfc4 100644
--- a/media-gfx/graphviz/graphviz-2.2.ebuild
+++ b/media-gfx/graphviz/graphviz-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/media-gfx/graphviz/graphviz-2.2.ebuild,v 1.1 2005/03/20 22:56:36 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.2.ebuild,v 1.1.1.1 2005/11/30 09:37:29 chriswhite Exp $
 
 inherit gnuconfig eutils flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.graphviz.org/pub/graphviz/ARCHIVE/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~x86"
 IUSE="tcltk"
 
 #Can use freetype-1.3 or 2.0, but not both
@@ -21,6 +21,7 @@ DEPEND=">=sys-libs/zlib-1.1.3
 	dev-util/pkgconfig
 	>=media-libs/gd-2.0.32
 	media-libs/fontconfig
+	sys-devel/gettext
 	tcltk? ( >=dev-lang/tk-8.3 )"
 
 src_unpack() {
diff --git a/media-gfx/graphviz/graphviz-2.4.ebuild b/media-gfx/graphviz/graphviz-2.4.ebuild
index 57b2fba48a84..1097fc6e3dc4 100644
--- a/media-gfx/graphviz/graphviz-2.4.ebuild
+++ b/media-gfx/graphviz/graphviz-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/media-gfx/graphviz/graphviz-2.4.ebuild,v 1.1 2005/08/02 20:15:54 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.4.ebuild,v 1.1.1.1 2005/11/30 09:37:29 chriswhite Exp $
 
 DESCRIPTION="Open Source Graph Visualization Software"
 HOMEPAGE="http://www.graphviz.org/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.graphviz.org/pub/graphviz/ARCHIVE/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~s390 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc-macos ~ppc64 ~s390 ~x86"
 IUSE="cairo dynagraph tcltk X"
 
 RDEPEND=">=sys-libs/zlib-1.1.3
@@ -16,6 +16,7 @@ RDEPEND=">=sys-libs/zlib-1.1.3
 		 >=media-libs/jpeg-6b
 		   media-libs/freetype
 		   media-libs/fontconfig
+		   sys-devel/gettext
 		   dev-libs/expat
 		   sys-libs/zlib
 		 tcltk? ( >=dev-lang/tk-8.3 )
diff --git a/media-gfx/graphviz/graphviz-2.6.ebuild b/media-gfx/graphviz/graphviz-2.6.ebuild
index 8e9d9cc45bee..f6199b1d78cb 100644
--- a/media-gfx/graphviz/graphviz-2.6.ebuild
+++ b/media-gfx/graphviz/graphviz-2.6.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/media-gfx/graphviz/graphviz-2.6.ebuild,v 1.1 2005/09/15 07:15:55 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.6.ebuild,v 1.1.1.1 2005/11/30 09:37:28 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="Open Source Graph Visualization Software"
 HOMEPAGE="http://www.graphviz.org/"
@@ -8,7 +10,7 @@ SRC_URI="http://www.graphviz.org/pub/graphviz/ARCHIVE/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~ppc-macos ~s390 ~sparc ~x86"
 IUSE="cairo dynagraph tcltk X static"
 
 RDEPEND=">=sys-libs/zlib-1.1.3
@@ -18,12 +20,20 @@ RDEPEND=">=sys-libs/zlib-1.1.3
 	 media-libs/fontconfig
 	 dev-libs/expat
 	 sys-libs/zlib
+	 sys-devel/gettext
 	 tcltk? ( >=dev-lang/tk-8.3 )
 	 cairo? ( >=x11-libs/libsvg-cairo-0.1.3 )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch "${FILESDIR}/${P}"-no-undefined.patch
+	epatch "${FILESDIR}/${P}"-macos.patch
+}
+
 src_compile() {
 	econf --with-mylibgd \
 		--disable-dependency-tracking \
diff --git a/media-gfx/grender/ChangeLog b/media-gfx/grender/ChangeLog
index f76f8afde222..2158a0b16fc4 100644
--- a/media-gfx/grender/ChangeLog
+++ b/media-gfx/grender/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/grender
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/grender/ChangeLog,v 1.1 2004/06/18 19:50:47 eradicator Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/grender/ChangeLog,v 1.1.1.1 2005/11/30 09:37:15 chriswhite Exp $
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> grender-0.1.3.ebuild:
+  Typo in DESCRIPTION: aa -> a. Bug 59717.
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> grender-0.1.3.ebuild:
+  Stable x86.
 
 *grender-0.1.3 (18 Jun 2004)
 
diff --git a/media-gfx/grender/Manifest b/media-gfx/grender/Manifest
index b682cc4c6bb4..dd86c441bd38 100644
--- a/media-gfx/grender/Manifest
+++ b/media-gfx/grender/Manifest
@@ -1,2 +1,14 @@
-MD5 d67d5041307f668c311d07c73984b4be grender-0.1.3.ebuild 727
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5af6c5c6423dbc787658102a79c53765 ChangeLog 585
+MD5 15eee0096aeb7318115956bbc21b3b5b grender-0.1.3.ebuild 662
+MD5 c1e212329f9083e2405b16dd382d6632 metadata.xml 259
 MD5 6f99b72d06d6e6c23b6adf02fece10f8 files/digest-grender-0.1.3 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDAuzbArHZZzCEUG0RAgKJAJ0R418pZHkAdPebfzl110ypk2sTsgCdG8+t
+sR8SjkTEEx3omo8yLq+MK7k=
+=8eW3
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/grender/grender-0.1.3.ebuild b/media-gfx/grender/grender-0.1.3.ebuild
index 241f5a73a9c1..ffeb574ed7b0 100644
--- a/media-gfx/grender/grender-0.1.3.ebuild
+++ b/media-gfx/grender/grender-0.1.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/media-gfx/grender/grender-0.1.3.ebuild,v 1.1 2004/06/18 19:50:47 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/grender/grender-0.1.3.ebuild,v 1.1.1.1 2005/11/30 09:37:15 chriswhite Exp $
 
 IUSE=""
 
@@ -9,14 +9,13 @@ MY_P="${MY_PN}-${PV}"
 
 S="${WORKDIR}/${MY_P}"
 
-DESCRIPTION="grender is aa queue management system for rendering in Maya."
+DESCRIPTION="grender is a queue management system for rendering in Maya."
 HOMEPAGE="http://grender.sourceforge.net/"
 SRC_URI="mirror://sourceforge/grender/GRender-0.1.3.tar.gz"
-RESTRICT="nomirror"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86 "
 
 DEPEND=">=x11-libs/gtk+-2.2
 	media-gfx/maya"
diff --git a/media-gfx/gthumb/ChangeLog b/media-gfx/gthumb/ChangeLog
index 26e24f39c5cb..8622e63ba828 100644
--- a/media-gfx/gthumb/ChangeLog
+++ b/media-gfx/gthumb/ChangeLog
@@ -1,7 +1,224 @@
 # ChangeLog for media-gfx/gthumb
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/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/media-gfx/gthumb/ChangeLog,v 1.1.1.1 2005/11/30 09:37:35 chriswhite Exp $
 
+*gthumb-2.6.8 (26 Sep 2005)
+
+  26 Sep 2005; Mike Gardiner <obz@gentoo.org> +gthumb-2.6.8.ebuild:
+  A new, mostly bugfix release, as requested in bug #107108.
+
+*gthumb-2.6.7 (17 Sep 2005)
+
+  17 Sep 2005; Aron Griffis <agriffis@gentoo.org> gthumb-2.6.5.ebuild,
+  +gthumb-2.6.7.ebuild:
+  Bump to 2.6.7 (from 2.6.5).  Mark 2.6.5 stable on amd64
+
+  24 Aug 2005; Aron Griffis <agriffis@gentoo.org> gthumb-2.6.5.ebuild:
+  stable on ia64
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> gthumb-2.6.5.ebuild:
+  Stable on ppc.
+
+  06 Jun 2005; Marinus Schraal <foser@gentoo.org> gthumb-2.6.{3,5}.ebuild :
+  Add workaround for #92920
+
+*gthumb-2.6.5 (24 Apr 2005)
+
+  24 Apr 2005; John N. Laliberte <allanonjl@gentoo.org> metadata.xml,
+  +gthumb-2.6.5.ebuild:
+  version bump, fixes bug #90117
+
+  21 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> gthumb-2.6.3.ebuild:
+  Stable on ppc.
+
+  10 Apr 2005; Simon Stelling <blubb@gentoo.org> gthumb-2.6.3.ebuild:
+  stable on amd64
+
+*gthumb-2.6.4 (01 Apr 2005)
+
+  01 Apr 2005; foser <foser@gentoo.org> gthumb-2.6.4.ebuild :
+  New release (#87430)
+
+  21 Feb 2005; Joseph Jezak <josejx@gentoo.org> gthumb-2.4.2.ebuild:
+  Marked ppc stable for dholm.
+
+*gthumb-2.6.3 (27 Jan 2005)
+
+  27 Jan 2005; Joe McCann <joem@gentoo.org> +gthumb-2.6.3.ebuild:
+  new release, bug 79716
+
+*gthumb-2.6.2 (10 Jan 2005)
+
+  10 Jan 2005; foser <foser@gentoo.org> gthumb-2.6.2.ebuild :
+  New bugfix release
+
+*gthumb-2.6.1 (22 Nov 2004)
+
+  22 Nov 2004; Mike Gardiner <obz@gentoo.org> +gthumb-2.6.1.ebuild:
+  New version, as requested in bug #71999
+
+*gthumb-2.4.1 (20 Nov 2004)
+
+  20 Nov 2004; Mike Gardiner <obz@gentoo.org> -gthumb-2.2.0.ebuild,
+  -gthumb-2.4.0.ebuild, -gthumb-2.4.1.ebuild, gthumb-2.4.2.ebuild,
+  +gthumb-2.6.0.1.ebuild:
+  New version 2.6.0.1, as requested in bug #68201. Marked 2.4.2 x86, and
+  removed older versions
+
+*gthumb-2.4.2 (03 Sep 2004)
+
+  03 Sep 2004; <spider@gentoo.org> +gthumb-2.4.2.ebuild:
+  versionbump. upstream fixes only
+
+  31 Jul 2004; <spider@gentoo.org> :
+  Versionbump.
+
+*gthumb-2.4.0 (01 Jun 2004)
+
+  01 Jun 2004; foser <foser@gentoo.org> gthumb-2.4.0.ebuild :
+  New release
+  add USE (gphoto2) + dep for gphoto2 support, autodetect(=bad) though
+
+  01 Feb 2004; Jon Portnoy <avenj@gentoo.org> gthumb-2.2.1.ebuild :
+  AMD64 keywords.
+
+*gthumb-2.2.1 (27 Jan 2004)
+
+  27 Jan 2004; foser <foser@gentoo.org> gthumb-2.2.1.ebuild :
+  New release
+
+  26 Jan 2004; Luca Barbato <lu_zero@gentoo.org> gthumb-2.2.0.ebuild:
+  Fix for bug #36219
+
+*gthumb-2.2.0 (23 Nov 2003)
+
+  23 Nov 2003; foser <foser@gentoo.org> gthumb-2.2.0.ebuild :
+  New release
+
+  23 Nov 2003; foser <foser@gentoo.org> gthumb-2.0.1.ebuild :
+  Fix SLOT from 1 -> 0 .. duh
+ 
+*gthumb-2.1.8 (07 Nov 2003)
+
+  07 Nov 2003; Alastair Tse <liquidx@gentoo.org> gthumb-2.1.8.ebuild:
+  version bump
+
+*gthumb-2.1.7 (14 Oct 2003)
+
+  14 Oct 2003; Mike Gardiner <obz@gentoo.org> gthumb-2.1.6.ebuild,
+  gthumb-2.1.7.ebuild:
+  New version, 2.1.6 stable on x86
+
+  12 Sep 2003; <spider@gentoo.org> gthumb-2.0.1.ebuild, gthumb-2.1.5.ebuild,
+  gthumb-2.1.6.ebuild:
+  Deprecating bonbobo-activation
+
+  07 Sep 2003; Mike Gardiner <obz@gentoo.org> gthumb-2.1.5.ebuild,
+  gthumb-2.1.6.ebuild:
+  Fixed libexif dependency to >=0.5.10
+
+*gthumb-2.1.6 (01 Sep 2003)
+
+  01 Sep 2003; Mike Gardiner <obz@gentoo.org> gthumb-2.1.6.ebuild:
+  New version, bug #25729 still affects, keeping omf_fix out for now
+
+*gthumb-2.1.5 (18 Aug 2003)
+
+  18 Aug 2003; foser <foser@gentoo.org> gthumb-2.1.5.ebuild :
+  New version, added tiff USE dependency
+
+*gthumb-2.1.4 (09 Aug 2003)
+
+  09 Aug 2003; foser <foser@gentoo.org> gthumb-2.1.4.ebuild :
+  New version, removed omf fix for now (#25729)
+
+*gthumb-2.1.2 (16 May 2003)
+
+  16 May 2003; Alastair Tse <liquidx@gentoo.org> gthumb-2.1.2.ebuild:
+  version bump and scrollkeeper fixes
+
+*gthumb-2.1.1 (16 Mar 2003)
+
+  16 Mar 2003; foser <foser@gentoo.org> gthumb-2.1.1.ebuild :
+  New version
+
+*gthumb-2.1.0 (03 Mar 2003)
+
+  03 Mar 2003; foser <foser@gentoo.org> gthumb-2.1.0.ebuild :
+  New version
+
+*gthumb-2.0.1 (27 Jan 2003)
+
+  27 Jan 2003; foser <foser@gentoo.org> gthumb-2.0.1.ebuild :
+  new version
+
+*gthumb-2.0.0 (21 Jan 2003)
+
+  21 Jan 2003; foser <foser@gentoo.org> gthumb-2.2.0.ebuild :
+  new version
+
+*gthumb-1.108 (07 Jan 2003)
+
+  07 Jan 2003; foser <foser@gentoo.org> gthum-1.108.ebuild :
+  New version
+
+*gthumb-1.107 (22 Dec 2002)
+
+  22 Dec 2002; foser <foser@gentoo.org> gthumb-1.107.ebuild :
+  New version
+
+*gthumb-1.106 (28 Nov 2002)
+
+  28 Nov 2002; foser <foser@gentoo.org> gthumb-1.106.ebuild :
+  New version
+
+*gthumb-1.104 (11 Oct 2002)
+  
+  11 Oct 2002; foser <foser@gentoo.org> gthumb-1.104.ebuild :
+  New version, fixes nautilus viewer problem
+  Fixed deps as well
+
+*gthumb-1.103 (12 Aug 2002)
+  12 Aug 2002; Gabriele Giorgetti <stroke@gentoo.org> gthumb-1.103.ebuild :
+  New version.
+
+*gthumb-1.102-r1 (18 Jul 2002)
+  18 Jul 2002; Spider <spider@gentoo.org> gthumb-1.102-r1.ebuild :
+  eclassify, ppc works
+
+*gthumb-1.102 (16 Jul 2002)
+  16 Jul 2002; Gabriele Giorgetti <stroke@gentoo.org> gthumb-1.102.ebuild :
+  New version. (Gnome2).
+
+*gthumb-0.13 (16 Jul 2002)
+  16 Jul 2002; Gabriele Giorgetti <stroke@gentoo.org> gthumb-0.13.ebuild:
+  New version. (Gnome1).
+
+*gthumb-1.101-r1 (01 Jul 2002)
+  01 Jul 2002; Gabriele Giorgetti <stroke@gentoo.org> gthumb-1.101-r1.ebuild :
+  Added missing scrollkeeper dependence (fixes bug #4349). Updated deps.   
+
+*gthumb-1.101 (10 Jun 2002)
+  10 Jun 2002; Spider <spider@gentoo.org> gthumb-1.101.ebuild :
+  new version
+  
+*gthumb-1.100-r1 (8 Jun 2002)
+  8 Jun 2002; Spider <spider@gentoo.org> gthumb-1.100-r1.ebuild
+  new revision with a changed path due to our dep-caching.
+
+
+*gthumb-1.100 (29 May 2002)
+  29 May 2002; Spider <spider@gentoo.org>  gthumb-1.100.ebuild :
+  Gnome2 port
+
+*gthumb-0.9.9 (11 Apr 2002)
+
+  11 Apr 2002; Tod Neidt <tod@gentoo.org> ChangeLog gthumb-0.9.9.ebuild :
+
+  Changed DESTDIR=${D} to repassing the installation directory config flags,
+  ala prefix=${D}/usr etc, etc, to fix mkdir sandbox violation on initial
+  install. See Bug# 1635.
+  
 *gthumb-0.9.9 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index df5ebd5df6f6..8a4a04cbbce5 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -1,13 +1,10 @@
-MD5 a3c086e29d747886db3363fb42129adf ChangeLog 2917
-MD5 9e7a21a0eae98900c2d5bad94e15a66a gthumb-0.13.ebuild 953
-MD5 1ea5c9d54c6befb5c5e184ef3da5ef40 gthumb-1.104.ebuild 992
-MD5 d43373a0dbbd201052a746fbeb7411f1 gthumb-2.1.2.ebuild 1098
-MD5 bed2ea0937855e2d4be48ad1985cf5e9 gthumb-2.0.1.ebuild 1058
-MD5 a356c73a36bd7581937893aff678abaa gthumb-2.1.0.ebuild 1097
-MD5 d43373a0dbbd201052a746fbeb7411f1 gthumb-2.1.1.ebuild 1098
-MD5 6552832e528ea12ac21ec464c103fc2f files/digest-gthumb-0.13 63
-MD5 f3ba7fa273aa1c3523b3d79357e4a0cc files/digest-gthumb-1.104 64
-MD5 a0516645946b03a8f35516b06f8a5261 files/digest-gthumb-2.1.0 66
-MD5 ca0f5f3d6f82d7d700cf19e06bf70693 files/digest-gthumb-2.0.1 65
-MD5 87171724d5a88b1ca370f0070769d9f0 files/digest-gthumb-2.1.1 66
-MD5 ea8de7fe49beb9c21f5063345833b2fc files/digest-gthumb-2.1.2 66
+MD5 e93340b848737ff027b3c0294fffd44a ChangeLog 6701
+MD5 ecbc2445d140c88c4b9dadf6864234e9 gthumb-2.6.3.ebuild 1238
+MD5 1731ed0607bbfef20841efbdce0e9de0 gthumb-2.6.5.ebuild 1421
+MD5 f4713bbf77ae895c7ff6c022a7a2f542 metadata.xml 222
+MD5 3ba57378f8e6afa48c15e146dac59776 gthumb-2.6.7.ebuild 1425
+MD5 e8832f4939588dafedc35ad84a6caaf5 gthumb-2.6.8.ebuild 1420
+MD5 c1d4c50442ad19c29af3bb85dd427716 files/digest-gthumb-2.6.3 66
+MD5 1724520898546aadcf150ec88c8a2e7a files/digest-gthumb-2.6.5 66
+MD5 af2acaad904b53afb8e81cc75c772af0 files/digest-gthumb-2.6.7 66
+MD5 cd9083444eead56335b292b89897ff68 files/digest-gthumb-2.6.8 66
diff --git a/media-gfx/gthumb/gthumb-2.6.3.ebuild b/media-gfx/gthumb/gthumb-2.6.3.ebuild
index 1ed1b989ed47..46005197a4ee 100644
--- a/media-gfx/gthumb/gthumb-2.6.3.ebuild
+++ b/media-gfx/gthumb/gthumb-2.6.3.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/media-gfx/gthumb/gthumb-2.6.3.ebuild,v 1.1 2005/01/28 05:06:29 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.6.3.ebuild,v 1.1.1.1 2005/11/30 09:37:35 chriswhite Exp $
 
 inherit gnome2
 
 DESCRIPTION="Image viewer and browser for Gnome"
 HOMEPAGE="http://gthumb.sourceforge.net/"
-LICENSE="GPL-2"
 
-IUSE="jpeg tiff png gphoto2"
+LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="amd64 ia64 ppc x86"
+IUSE="jpeg tiff png gphoto2"
 
 # FIXME : configure switches, no autodetection
 
@@ -32,12 +32,17 @@ RDEPEND=">=dev-libs/glib-2.4
 	jpeg? ( media-libs/jpeg
 		>=media-libs/libexif-0.5.12 )
 	gphoto2? ( >=media-libs/libgphoto2-2.1.3 )"
-
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9.0
 	app-text/scrollkeeper
 	>=dev-util/intltool-0.29"
 
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
+DOCS="AUTHORS ChangeLog INSTALL NEWS README"
+
+src_install() {
+
+	gnome2_src_install scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/
+
+}
 
 USE_DESTDIR="1"
diff --git a/media-gfx/gthumb/gthumb-2.6.5.ebuild b/media-gfx/gthumb/gthumb-2.6.5.ebuild
index 49ad5e3af859..5ac661da01c1 100644
--- a/media-gfx/gthumb/gthumb-2.6.5.ebuild
+++ b/media-gfx/gthumb/gthumb-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/media-gfx/gthumb/gthumb-2.6.5.ebuild,v 1.1 2005/04/24 23:45:18 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.6.5.ebuild,v 1.1.1.1 2005/11/30 09:37:35 chriswhite Exp $
 
 inherit gnome2
 
@@ -10,7 +10,7 @@ LICENSE="GPL-2"
 
 IUSE="jpeg tiff png gphoto2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="amd64 ia64 ppc x86"
 
 # FIXME : configure switches, no autodetection
 
@@ -51,3 +51,10 @@ src_unpack() {
 	rm ${S}/components/image-viewer/*.server
 
 }
+
+src_install() {
+
+	# workaround #92920 FIXME
+	gnome2_src_install scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/
+
+}
diff --git a/media-gfx/gthumb/gthumb-2.6.7.ebuild b/media-gfx/gthumb/gthumb-2.6.7.ebuild
index 9598cfc6289f..0303b218de69 100644
--- a/media-gfx/gthumb/gthumb-2.6.7.ebuild
+++ b/media-gfx/gthumb/gthumb-2.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/media-gfx/gthumb/gthumb-2.6.7.ebuild,v 1.1 2005/09/17 00:37:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.6.7.ebuild,v 1.1.1.1 2005/11/30 09:37:35 chriswhite Exp $
 
 inherit gnome2
 
diff --git a/media-gfx/gthumb/gthumb-2.6.8.ebuild b/media-gfx/gthumb/gthumb-2.6.8.ebuild
index dde01923561f..b46c59f7608f 100644
--- a/media-gfx/gthumb/gthumb-2.6.8.ebuild
+++ b/media-gfx/gthumb/gthumb-2.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/media-gfx/gthumb/gthumb-2.6.8.ebuild,v 1.1 2005/09/26 16:23:51 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.6.8.ebuild,v 1.1.1.1 2005/11/30 09:37:35 chriswhite Exp $
 
 inherit gnome2
 
diff --git a/media-gfx/gthumb/metadata.xml b/media-gfx/gthumb/metadata.xml
index da6fd63d0085..6ffa481fda37 100644
--- a/media-gfx/gthumb/metadata.xml
+++ b/media-gfx/gthumb/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/media-gfx/gtkam/ChangeLog b/media-gfx/gtkam/ChangeLog
index 701022ee08a3..8d9358e2b362 100644
--- a/media-gfx/gtkam/ChangeLog
+++ b/media-gfx/gtkam/ChangeLog
@@ -1,6 +1,113 @@
 # ChangeLog for media-gfx/gtkam
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/ChangeLog,v 1.1 2002/06/01 21:03:30 stroke Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/ChangeLog,v 1.1.1.1 2005/11/30 09:37:15 chriswhite Exp $
+
+  11 Nov 2005; Michael Hanselmann <hansmi@gentoo.org>
+  gtkam-0.1.12-r1.ebuild:
+  Stable on ppc.
+
+  13 Oct 2005; Aron Griffis <agriffis@gentoo.org> gtkam-0.1.12-r1.ebuild:
+  Mark 0.1.12-r1 stable on alpha/amd64/ia64/x86
+
+  02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> gtkam-0.1.12.ebuild:
+  Stable on ppc.
+
+*gtkam-0.1.12-r1 (27 Aug 2005)
+
+  27 Aug 2005; Aron Griffis <agriffis@gentoo.org>
+  +files/gtkam-0.1.12-helpdoc.patch, gtkam-0.1.12.ebuild,
+  +gtkam-0.1.12-r1.ebuild:
+  Mark 0.1.12 stable on amd64 x86. Add 0.1.12-r1 which re-enables gnome
+  support and fixes a doc error, thanks to Tobias Sager #61248
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> gtkam-0.1.12.ebuild:
+  add ~alpha ~ia64
+
+  31 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org> gtkam-0.1.11.ebuild:
+  ppc stable
+
+  24 Jun 2005; Alastair Tse <liquidx@gentoo.org> gtkam-0.1.12.ebuild:
+  updated dep version and replaced USE jpeg with USE exif
+
+*gtkam-0.1.12 (24 Jun 2005)
+
+  24 Jun 2005; Alastair Tse <liquidx@gentoo.org> -gtkam-0.1.10.ebuild,
+  gtkam-0.1.11.ebuild, +gtkam-0.1.12.ebuild:
+  version bump (#96879)
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org>
+  gtkam-0.1.10-r1.ebuild:
+  Stable on ppc.
+
+  09 Jun 2004; Yi Qiang <khai@gentoo.org> +files/gtkam-0.1.10-gtk24.patch,
+  gtkam-0.1.10-r1.ebuild, gtkam-0.1.11.ebuild:
+  Backported the gtk2.4 patch
+
+  04 May 2004; Alastair Tse <liquidx@gentoo.org> gtkam-0.1.11.ebuild:
+  add gnome2 eclass to get rid of scrollkeeper indexes
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> gtkam-0.1.10-r1.ebuild,
+  gtkam-0.1.10.ebuild, gtkam-0.1.11.ebuild:
+  Add inherit eutils
+
+  19 Apr 2004; Chris Gianelloni <wolf31o2@gentoo.org> gtkam-0.1.11.ebuild:
+  Removing gnome deps, since it only builds a yelp file and we are missing the
+  gphoto2 docs in portage, the gnome deps served no purpose. For more
+  information, please see bug #36684.
+
+  11 Apr 2004; Alastair Tse <liquidx@gentoo.org> gtkam-0.1.11.ebuild:
+  fixed gtkam-0.1.11 dep to libgphoto2-2.1.4 (#47458)
+
+*gtkam-0.1.11 (28 Mar 2004)
+
+  28 Mar 2004; Alastair Tse <liquidx@gentoo.org> gtkam-0.1.11.ebuild,
+  files/gtkam-0.1.11-gtk24.patch:
+  version bump plus gtk2.4 fixes (#45510)
+
+  16 Feb 2004; Dylan Carlson <absinthe@gentoo.org> gtkam-0.1.10-r1.ebuild:
+  added ~amd64 keyword.
+
+  10 Nov 2003; Mike Gardiner <obz@gentoo.org> gtkam-0.1.10-r1.ebuild,
+  gtkam-0.1.10.ebuild:
+  Fixed homepage, gtkam is now at proj/gtkam
+
+  06 Oct 2003; Mike Gardiner <obz@gentoo.org> gtkam-0.1.10-r1.ebuild:
+  Marked stable on x86
+
+*gtkam-0.1.10-r1 (12 Sep 2003)
+
+  12 Sep 2003; <spider@gentoo.org> gtkam-0.1.10-r1.ebuild:
+  New rev to remove bonobo-activation.
+
+  09 Jul 2003; Alastair Tse <liquidx@gentoo.org> gtkam-0.1.10.ebuild,
+  gtkam-0.1.4.ebuild, gtkam-0.1.9.ebuild:
+  added pkgconfig deps and cleanup
+
+  10 Jun 2003; Alastair Tse <liquidx@gentoo.org> gtkam-0.1.10.ebuild:
+  bump to stable x86
+
+*gtkam-0.1.10 (11 May 2003)
+
+  11 May 2003; Alastair Tse <liquidx@gentoo.org> gtkam-0.1.10.ebuild,
+  files/gtkam-0.1.10-norpm.patch:
+  version bump. add gnome and exif support.
+
+*gtkam-0.1.9 (23 Oct 2002)
+
+  28 Mar 2003; Seemant Kulleen <seemant@gentoo.org> gtkam-0.1.9.ebuild:
+  nls in IUSE
+
+  31 Jan 2003; foser <foser@gentoo.org> gtkam-0.1.9.ebuild :
+  Doc fix (#12001)
+
+  29 Nov 2002; Jon Nall <nall@gentoo.org> gtkam-0.1.9.ebuild :
+  added ~ppc to KEYWORDS
+
+  27 Nov 2002; foser <foser@gentoo.org> gtkam-0.1.9.ebuild :
+  Fix deps to use GTK+-2 (bug #11228)
+  
+  23 Oct 2002; Spider <spider@gentoo.org> gtkam-0.1.9.ebuild :  Added the 
+  updated ebuild from Robert Davis <rdavis@uniformcompany.com> 
 
 *gtkam-0.1.4 (1 June 2002)
 
diff --git a/media-gfx/gtkam/Manifest b/media-gfx/gtkam/Manifest
index fda15585197c..16252b12f00b 100644
--- a/media-gfx/gtkam/Manifest
+++ b/media-gfx/gtkam/Manifest
@@ -1,8 +1,14 @@
-MD5 ff4eddb51e67ccbae38aff2eb309f72c ChangeLog 1394
-MD5 b169871109e992ae208b7ab0584689a7 gtkam-0.1.4.ebuild 678
-MD5 9209af589a9155a977b506edd43daf8b gtkam-0.1.9.ebuild 936
-MD5 9f2ecadaff4aa1290727e2e05e6ca391 gtkam-0.1.10.ebuild 1421
-MD5 0c55eb7ec8a4af3f3efdee10a639e3ac files/digest-gtkam-0.1.4 63
-MD5 ecc463b67ca1c84a223144fd7bcb0396 files/digest-gtkam-0.1.9 63
+MD5 07ab67030f5f0e082eda81ed43ee9e79 ChangeLog 4268
+MD5 a1c4a2f9990b3356ce169554c82dd2f6 files/digest-gtkam-0.1.10-r1 64
+MD5 d37596d611b2b5fe213cf911c5988211 files/digest-gtkam-0.1.11 64
+MD5 9895bd6e825868f9d33ec407108e7d50 files/digest-gtkam-0.1.12 64
+MD5 9895bd6e825868f9d33ec407108e7d50 files/digest-gtkam-0.1.12-r1 64
+MD5 2cee4a75ae4dbbcd3345e16c18018ade files/gtkam-0.1.10-gtk24.patch 976
 MD5 6eb68b631f3f91c3af9151bbe912dbe8 files/gtkam-0.1.10-norpm.patch 398
-MD5 a1c4a2f9990b3356ce169554c82dd2f6 files/digest-gtkam-0.1.10 64
+MD5 6113479df45c8e3a3818213705b5bc5a files/gtkam-0.1.11-gtk24.patch 1563
+MD5 fa538ec70c797b9ea37efc0328c6703a files/gtkam-0.1.12-helpdoc.patch 788
+MD5 e6d8afefe8f00f75d111dcf610487f8f gtkam-0.1.10-r1.ebuild 1302
+MD5 47a8a0d22420b57489469f1b9397c367 gtkam-0.1.11.ebuild 1335
+MD5 c55d8371c2849a0e6096be86ea330e9f gtkam-0.1.12-r1.ebuild 1149
+MD5 b9cf5355ba6178aae4261866e51374ea gtkam-0.1.12.ebuild 1305
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
diff --git a/media-gfx/gtkam/gtkam-0.1.10-r1.ebuild b/media-gfx/gtkam/gtkam-0.1.10-r1.ebuild
index 20b60204ec6e..cb158fffad60 100644
--- a/media-gfx/gtkam/gtkam-0.1.10-r1.ebuild
+++ b/media-gfx/gtkam/gtkam-0.1.10-r1.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/media-gfx/gtkam/gtkam-0.1.10-r1.ebuild,v 1.1 2003/09/12 09:36:08 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/gtkam-0.1.10-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:15 chriswhite Exp $
+
+inherit eutils
 
 IUSE="nls gnome jpeg"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="A frontend for gPhoto 2"
-HOMEPAGE="http://gphoto.org/gphoto2/gtk.html"
+HOMEPAGE="http://gphoto.org/proj/gtkam"
 SRC_URI="mirror://sourceforge/gphoto/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc amd64"
 
 RDEPEND=">=x11-libs/gtk+-2
 	>=media-libs/libgphoto2-2.1.1-r2
@@ -29,7 +30,8 @@ src_unpack() {
 
 	cd ${S}
 	epatch ${FILESDIR}/${P}-norpm.patch
-}
+	epatch ${FILESDIR}/gtkam-0.1.10-gtk24.patch
+	}
 
 src_compile() {
 
diff --git a/media-gfx/gtkam/gtkam-0.1.11.ebuild b/media-gfx/gtkam/gtkam-0.1.11.ebuild
index c153436c2bac..782650eebde1 100644
--- a/media-gfx/gtkam/gtkam-0.1.11.ebuild
+++ b/media-gfx/gtkam/gtkam-0.1.11.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/media-gfx/gtkam/gtkam-0.1.11.ebuild,v 1.1 2004/03/28 18:11:49 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/gtkam-0.1.11.ebuild,v 1.1.1.1 2005/11/30 09:37:15 chriswhite Exp $
 
-IUSE="nls gnome jpeg"
+inherit eutils gnome2
+
+IUSE="jpeg nls"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="A frontend for gPhoto 2"
 HOMEPAGE="http://gphoto.org/proj/gtkam"
 SRC_URI="mirror://sourceforge/gphoto/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ppc x86"
 
 RDEPEND=">=x11-libs/gtk+-2
-	>=media-libs/libgphoto2-2.1.1-r2
-	gnome? ( >=gnome-base/libbonobo-2
-		>=gnome-base/libgnomeui-2 )
+	>=media-libs/libgphoto2-2.1.4
 	jpeg? ( media-libs/libexif-gtk
 		media-libs/libexif )"
+	# commenting per bug #36684
+	#gnome? ( >=gnome-base/libbonobo-2
+	#	>=gnome-base/libgnomeui-2 )
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -42,9 +44,9 @@ src_compile() {
 		&& myconf="${myconf} --with-exif" \
 		|| myconf="${myconf} --without-exif"
 
-	use gnome \
-		&& myconf="${myconf} --with-gnome --with-bonobo" \
-		|| myconf="${myconf} --without-gnome --without-bonobo"
+	#use gnome \
+	#	&& myconf="${myconf} --with-gnome --with-bonobo" \
+	#	|| myconf="${myconf} --without-gnome --without-bonobo"
 
 	econf ${myconf} `use_enable nls` || die
 	emake || die
diff --git a/media-gfx/gtkam/gtkam-0.1.12-r1.ebuild b/media-gfx/gtkam/gtkam-0.1.12-r1.ebuild
index aa16057a3ac7..a053b9adaa64 100644
--- a/media-gfx/gtkam/gtkam-0.1.12-r1.ebuild
+++ b/media-gfx/gtkam/gtkam-0.1.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/media-gfx/gtkam/gtkam-0.1.12-r1.ebuild,v 1.1 2005/08/27 17:00:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/gtkam-0.1.12-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:15 chriswhite Exp $
 
 inherit eutils gnome2
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
+KEYWORDS="alpha amd64 ia64 ppc x86"
 
 RDEPEND=">=x11-libs/gtk+-2
 	>=media-libs/libgphoto2-2.1.6
diff --git a/media-gfx/gtkam/gtkam-0.1.12.ebuild b/media-gfx/gtkam/gtkam-0.1.12.ebuild
index 1eb060e10a35..af38a81f4f5e 100644
--- a/media-gfx/gtkam/gtkam-0.1.12.ebuild
+++ b/media-gfx/gtkam/gtkam-0.1.12.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/media-gfx/gtkam/gtkam-0.1.12.ebuild,v 1.1 2005/06/24 15:15:54 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/gtkam-0.1.12.ebuild,v 1.1.1.1 2005/11/30 09:37:15 chriswhite Exp $
 
 inherit eutils gnome2
 
-IUSE="jpeg nls"
+IUSE="exif nls"
 
 DESCRIPTION="A frontend for gPhoto 2"
 HOMEPAGE="http://gphoto.org/proj/gtkam"
@@ -12,11 +12,11 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~alpha amd64 ~ia64 ppc x86"
 
 RDEPEND=">=x11-libs/gtk+-2
-	>=media-libs/libgphoto2-2.1.4
-	jpeg? ( media-libs/libexif-gtk
+	>=media-libs/libgphoto2-2.1.6
+	exif? ( media-libs/libexif-gtk
 		media-libs/libexif )"
 	# commenting per bug #36684
 	#gnome? ( >=gnome-base/libbonobo-2
@@ -39,7 +39,7 @@ src_compile() {
 
 	myconf="--with-rpmbuild=/bin/false --without-gimp"
 
-	use jpeg \
+	use exif \
 		&& myconf="${myconf} --with-exif" \
 		|| myconf="${myconf} --without-exif"
 
diff --git a/media-gfx/gtksee/ChangeLog b/media-gfx/gtksee/ChangeLog
index 224bb2eafe53..5e5fcdb4dd78 100644
--- a/media-gfx/gtksee/ChangeLog
+++ b/media-gfx/gtksee/ChangeLog
@@ -1,10 +1,70 @@
 # ChangeLog for media-gfx/gtksee
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtksee/ChangeLog,v 1.1 2002/05/15 19:48:57 agenkin Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtksee/ChangeLog,v 1.1.1.1 2005/11/30 09:37:38 chriswhite Exp $
+
+  15 Nov 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  gtksee-0.6.0_beta1.ebuild:
+  upstream updated their beta.
+
+*gtksee-0.6.0_beta1 (08 Nov 2004)
+
+  08 Nov 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  +gtksee-0.6.0_beta1.ebuild:
+  version bump (might fix bug #67974)
+
+  30 Sep 2004; Michael Sterrett <mr_bones_@gentoo.org> gtksee-0.5.6.ebuild:
+  support DESTDIR with USE nls (bug #65889)
+
+  22 Sep 2004; Michael Sterrett <mr_bones_@gentoo.org> gtksee-0.5.6.ebuild:
+  tidy src_install
+
+  19 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org> -gtksee-0.5.5.1.ebuild:
+  clean older version
+
+  14 Aug 2004; Travis Tilley <lv@gentoo.org> gtksee-0.5.6.ebuild:
+  stable on amd64
+
+*gtksee-0.5.6 (19 Jul 2004)
+
+  19 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> +gtksee-0.5.6.ebuild:
+  version bump (bug #57526)
+
+  26 May 2004; Travis Tilley <lv@gentoo.org> gtksee-0.5.5.1.ebuild:
+  added ~amd64 keyword
+
+  07 Apr 2004; Ciaran McCreesh <ciaranm@gentoo.org> gtksee-0.5.5.1.ebuild:
+  Added ~sparc, #46912
+
+  18 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org> gtksee-0.5.5.1.ebuild:
+  marked x86 stable
+
+*gtksee-0.5.5.1 (24 Nov 2003)
+
+  24 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org> gtksee-0.5.4.ebuild,
+  gtksee-0.5.5.1.ebuild:
+  mark 0.5.4 stable; version bump
+
+  30 Oct 2003; David Holm <dholm@gentoo.org> gtksee-0.5.4.ebuild:
+  Added to ~ppc.
+
+*gtksee-0.5.4 (22 Sep 2003)
+
+  22 Sep 2003; Michael Sterrett <msterret@gentoo.org> gtksee-0.5.4.ebuild:
+  version bump; add metadata.xml
+
+*gtksee-0.5.3 (21 Aug 2003)
+
+  21 Aug 2003; Michael Sterrett <msterret@gentoo.org> gtksee-0.5.3.ebuild:
+  version bump (bug 27033)
+
+*gtksee-0.5.2 (08 Jul 2003)
+
+  08 Jul 2003; Christian Birchinger <joker@gentoo.org> gtksee-0.5.2.ebuild:
+  Version bump
 
 *gtksee-0.5.0 (15 May 2002)
 
   15 May 2002; Arcady Genkin <agenkin@thpoon.com> gtksee-0.5.0.ebuild :
   
   Initial release of GTK See ebuild, submitted by Lasse Mikkelsen
-  <lbm@fatalerror.dk>.
\ No newline at end of file
+  <lbm@fatalerror.dk>.
diff --git a/media-gfx/gtksee/Manifest b/media-gfx/gtksee/Manifest
index e69de29bb2d1..f0d85fb2175e 100644
--- a/media-gfx/gtksee/Manifest
+++ b/media-gfx/gtksee/Manifest
@@ -0,0 +1,6 @@
+MD5 878d99a2a1bbdfad00ac58e0db4384c1 ChangeLog 2148
+MD5 e6d8ced1f09eb759fdb9c5df11dc7195 metadata.xml 528
+MD5 6202b536edd81c99b1c0cee17156fcf6 gtksee-0.5.6.ebuild 856
+MD5 c27d3856bf4b0dc26881392bb278a5f6 gtksee-0.6.0_beta1.ebuild 923
+MD5 188634bd77a86d48d390bb5a0af4bd04 files/digest-gtksee-0.5.6 64
+MD5 a0bc16f0deaff91390d10d4fccc6c6a4 files/digest-gtksee-0.6.0_beta1 67
diff --git a/media-gfx/gtksee/files/digest-gtksee-0.6.0_beta1 b/media-gfx/gtksee/files/digest-gtksee-0.6.0_beta1
index e8e03d835bed..7bb6d89001d3 100644
--- a/media-gfx/gtksee/files/digest-gtksee-0.6.0_beta1
+++ b/media-gfx/gtksee/files/digest-gtksee-0.6.0_beta1
@@ -1 +1 @@
-MD5 bd163c40d5bbffbc087dcb826dbec145 gtksee-0.6.0b.tar.gz 359040
+MD5 faf4196ea38df0da93d9f403c03883a3 gtksee-0.6.0b-1.tar.gz 355921
diff --git a/media-gfx/gtksee/gtksee-0.5.6.ebuild b/media-gfx/gtksee/gtksee-0.5.6.ebuild
index 6f42f9a3ed46..a8935c55e537 100644
--- a/media-gfx/gtksee/gtksee-0.5.6.ebuild
+++ b/media-gfx/gtksee/gtksee-0.5.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/media-gfx/gtksee/gtksee-0.5.6.ebuild,v 1.1 2004/07/19 10:27:17 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtksee/gtksee-0.5.6.ebuild,v 1.1.1.1 2005/11/30 09:37:38 chriswhite Exp $
 
 DESCRIPTION="A simple but functional image viewer/browser - ACD See alike."
 HOMEPAGE="http://gtksee.berlios.de/"
@@ -8,7 +8,7 @@ SRC_URI="http://download.berlios.de/gtksee/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~amd64"
+KEYWORDS="x86 ppc ~sparc amd64"
 IUSE="nls"
 
 DEPEND="=x11-libs/gtk+-1.2*
@@ -25,6 +25,7 @@ src_compile() {
 }
 
 src_install() {
+	# broken makefiles that don't support DESTDIR with USE nls (bug #65889)
 	einstall || die
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO || die "dodoc failed"
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
 }
diff --git a/media-gfx/gtksee/gtksee-0.6.0_beta1.ebuild b/media-gfx/gtksee/gtksee-0.6.0_beta1.ebuild
index 33b6a2d6ac0a..f48505192caf 100644
--- a/media-gfx/gtksee/gtksee-0.6.0_beta1.ebuild
+++ b/media-gfx/gtksee/gtksee-0.6.0_beta1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtksee/gtksee-0.6.0_beta1.ebuild,v 1.1 2004/11/09 03:21:56 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtksee/gtksee-0.6.0_beta1.ebuild,v 1.1.1.1 2005/11/30 09:37:38 chriswhite Exp $
 
 DESCRIPTION="A simple but functional image viewer/browser - ACD See alike."
 HOMEPAGE="http://gtksee.berlios.de/"
-SRC_URI="http://download.berlios.de/gtksee/${P/_beta1/b}.tar.gz"
+SRC_URI="http://download.berlios.de/gtksee/${P/_beta1/b-1}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -18,7 +18,7 @@ DEPEND="=x11-libs/gtk+-1.2*
 	>=media-libs/libpng-1.2.1
 	nls? ( sys-devel/gettext )"
 
-S="${WORKDIR}/${P/_beta1/b}"
+S="${WORKDIR}/${P/_beta1/b-1}"
 
 src_compile() {
 	econf \
diff --git a/media-gfx/gtksee/metadata.xml b/media-gfx/gtksee/metadata.xml
index 7b313458b1d3..93d8f24eb913 100644
--- a/media-gfx/gtksee/metadata.xml
+++ b/media-gfx/gtksee/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-  <email>msterret@gentoo.org</email>
+  <email>mr_bones_@gentoo.org</email>
   <name>Michael Sterrett</name>
 </maintainer>
 <longdescription>
diff --git a/media-gfx/gwenview/ChangeLog b/media-gfx/gwenview/ChangeLog
index bcb2d81c02ea..4c755317d04d 100644
--- a/media-gfx/gwenview/ChangeLog
+++ b/media-gfx/gwenview/ChangeLog
@@ -1,6 +1,144 @@
 # ChangeLog for media-gfx/gwenview
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gwenview/ChangeLog,v 1.1 2002/06/18 20:04:40 danarmak Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gwenview/ChangeLog,v 1.1.1.1 2005/11/30 09:37:19 chriswhite Exp $
+
+  26 Sep 2005; Carsten Lohrke <carlo@gentoo.org> gwenview-1.2.0.ebuild,
+  gwenview-1.3.0.ebuild:
+  applied slot_rebuild workaround
+
+*gwenview-1.3.0 (24 Sep 2005)
+
+  24 Sep 2005; Heinrich Wendel <lanius@gentoo.org> +gwenview-1.3.0.ebuild:
+  version bump
+
+  26 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> gwenview-1.2.92.ebuild:
+  Manually remove visibility support, until next version that will feature a
+  better check (#103815).
+
+*gwenview-1.2.92 (23 Aug 2005)
+
+  23 Aug 2005; Heinrich Wendel <lanius@gentoo.org> +gwenview-1.2.92.ebuild:
+  version bump
+
+*gwenview-1.2.0 (22 Apr 2005)
+
+  22 Apr 2005; Heinrich Wendel <lanius@gentoo.org>
+  -gwenview-1.2.0_pre4.ebuild, +gwenview-1.2.0.ebuild:
+  version bump
+
+  25 Mar 2005; Heinrich Wendel <lanius@gentoo.org> gwenview-1.2.0_pre4.ebuild:
+  add kipi use flag, bug #84149
+
+*gwenview-1.2.0_pre4 (22 Mar 2005)
+
+  22 Mar 2005; Heinrich Wendel <lanius@gentoo.org> -gwenview-1.1.8.ebuild,
+  -gwenview-1.2.0_pre1.ebuild, +gwenview-1.2.0_pre4.ebuild:
+  version bump
+
+*gwenview-1.2.0_pre1 (29 Jan 2005)
+
+  29 Jan 2005; Gregorio Guidi <greg_g@gentoo.org> +gwenview-1.2.0_pre1.ebuild:
+  Version bump (#79932).
+
+*gwenview-1.1.8 (10 Jan 2005)
+
+  10 Jan 2005; Heinrich Wendel <lanius@gentoo.org> -gwenview-1.1.7.ebuild,
+  +gwenview-1.1.8.ebuild:
+  version bump
+
+  31 Dec 2004; Jason Wever <weeve@gentoo.org> gwenview-1.1.7.ebuild:
+  Added ~sparc keyword.
+
+*gwenview-1.1.7 (20 Dec 2004)
+
+  20 Dec 2004; Heinrich Wendel <lanius@gentoo.org> -gwenview-1.1.6.ebuild,
+  +gwenview-1.1.7.ebuild:
+  version bump
+
+*gwenview-1.1.6 (29 Nov 2004)
+
+  29 Nov 2004; lanius@gentoo.org -gwenview-1.1.4.ebuild,
+  +gwenview-1.1.6.ebuild:
+  version bump
+
+*gwenview-1.1.4 (02 Aug 2004)
+
+  02 Aug 2004; Dominik Stadler <centic@gentoo.org> +gwenview-1.1.4.ebuild:
+  Add new version 1.1.4.
+
+*gwenview-1.1.3 (03 Jul 2004)
+
+  03 Jul 2004; Heinrich Wendel <lanius@gentoo.org> gwenview-1.1.1.ebuild,
+  gwenview-1.1.3.ebuild:
+  version bump, bug #54511
+
+  29 Jun 2004; Carsten Lohrke <carlo@gentoo.org> gwenview-1.0.1.ebuild,
+  gwenview-1.1.1.ebuild:
+  QA: kde-base -> kde
+
+  22 Mar 2004; David Holm <dholm@gentoo.org> gwenview-1.1.1.ebuild:
+  Added to ~ppc.
+
+*gwenview-1.1.1 (22 Mar 2004)
+
+  22 Mar 2004; Heinrich Wendel <lanius@gentoo.org> gwenview-1.0.0.ebuild,
+  gwenview-1.1.0.ebuild, gwenview-1.1.1.ebuild:
+  remove old versions; version bump
+
+*gwenview-1.1.0 (02 Feb 2004)
+
+  02 Feb 2004; Heinrich Wendel <lanius@gentoo.org> gwenview-1.0.1.ebuild,
+  gwenview-1.1.0.ebuild:
+  mark 1.0.1 x86; bump to 1.1.0
+
+*gwenview-1.0.1 (12 Jan 2004)
+
+  12 Jan 2004; Heinrich Wendel <lanius@gentoo.org> gwenview-0.17.1a.ebuild,
+  gwenview-1.0.0.ebuild, gwenview-1.0.1.ebuild:
+  version bump; mark 1.0.0 stable; remove old version
+
+*gwenview-1.0.0 (08 Dec 2003)
+
+  08 Dec 2003; Heinrich Wendel <lanius@gentoo.org> gwenview-1.0.0.ebuild,
+  gwenview-1.0.0_pre2.ebuild, gwenview-1.0.0_pre4.ebuild, metadata.xml:
+  bump
+
+  06 Dec 2003; Heinrich Wendel <lanius@gentoo.org> gwenview-1.0.0_pre4.ebuild:
+  added ~amd64
+
+*gwenview-1.0.0_pre4 (17 Nov 2003)
+
+  17 Nov 2003; Heinrich Wendel <lanius@gentoo.org> gwenview-1.0.0_pre1.ebuild,
+  gwenview-1.0.0_pre4.ebuild:
+  bump
+
+*gwenview-1.0.0_pre2 (12 Oct 2003)
+
+  12 Oct 2003; Heinrich Wendel <lanius@gentoo.org> gwenview-1.0.0_pre2.ebuild:
+  version bump
+
+*gwenview-1.0.0_pre1 (02 Oct 2003)
+
+  02 Oct 2003; Heinrich Wendel <lanius@gentoo.org> gwenview-1.0.0_pre1.ebuild:
+  version bump #30148
+
+*gwenview-0.17.1a (07 Jul 2003)
+  07 Jul 2003; Caleb Tennis <caleb@gentoo.org> gwenview-0.17.1a.ebuild:
+  Version bump.
+
+*gwenview-0.16.2 (18 Feb 2003)
+
+  06 Apr 2003; Dan Armak <danarmak@gentoo.org> gwenview-0.16.2.ebuild:
+  Add stable x86 keyword.
+
+  18 Feb 2003; Hannes Mehnert <hannes@gentoo.org> gwenview-0.16.2.ebuild:
+  New upstream release.
+  
+*gwenview-0.15.1 (31 Oct 2002)
+
+  31 Oct 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  New upstream release.
 
 *gwenview-0.14.0 (19 Jun 2002)
 
diff --git a/media-gfx/gwenview/Manifest b/media-gfx/gwenview/Manifest
index e69de29bb2d1..f91a7a27c1a2 100644
--- a/media-gfx/gwenview/Manifest
+++ b/media-gfx/gwenview/Manifest
@@ -0,0 +1,10 @@
+MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
+MD5 bf360b6ec54c34be0cbdc4eac5493f06 ChangeLog 4259
+MD5 48341e8bee80b63e482106d9bda07ad3 gwenview-1.2.0.ebuild 729
+MD5 bd480e25280fc6cc92131f110003575e gwenview-1.3.0.ebuild 741
+MD5 7278f4d03b785ae364819f170fe8c401 gwenview-1.2.92.ebuild 651
+MD5 8f5b2ac340c74aa79197e0b2264c64e1 gwenview-1.0.1.ebuild 424
+MD5 8abb569096ada06d487bf9273a12a03f files/digest-gwenview-1.2.0 68
+MD5 3776fd2161c9e4097c556f5a643b2932 files/digest-gwenview-1.2.92 69
+MD5 ec9b547539178737eb9327ca97270c50 files/digest-gwenview-1.0.1 67
+MD5 80e4a238dd79a961f466b46305e0ed80 files/digest-gwenview-1.3.0 68
diff --git a/media-gfx/gwenview/gwenview-1.0.1.ebuild b/media-gfx/gwenview/gwenview-1.0.1.ebuild
index 9f853745e718..00dccfc26058 100644
--- a/media-gfx/gwenview/gwenview-1.0.1.ebuild
+++ b/media-gfx/gwenview/gwenview-1.0.1.ebuild
@@ -1,13 +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/media-gfx/gwenview/gwenview-1.0.1.ebuild,v 1.1 2004/01/12 14:57:26 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gwenview/gwenview-1.0.1.ebuild,v 1.1.1.1 2005/11/30 09:37:19 chriswhite Exp $
 
-inherit kde-base
-need-kde 3
+inherit kde
 
 DESCRIPTION="image viewer for KDE"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://gwenview.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 ~amd64"
+IUSE=""
+
+need-kde 3
diff --git a/media-gfx/gwenview/gwenview-1.2.0.ebuild b/media-gfx/gwenview/gwenview-1.2.0.ebuild
index 82e69ac4ae3b..b00bdee0c02e 100644
--- a/media-gfx/gwenview/gwenview-1.2.0.ebuild
+++ b/media-gfx/gwenview/gwenview-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/media-gfx/gwenview/gwenview-1.2.0.ebuild,v 1.1 2005/04/22 17:47:04 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gwenview/gwenview-1.2.0.ebuild,v 1.1.1.1 2005/11/30 09:37:19 chriswhite Exp $
 
 inherit kde
 
@@ -18,6 +18,12 @@ DEPEND="kipi? ( >=media-plugins/kipi-plugins-0.1.0_beta2 )"
 
 need-kde 3
 
+pkg_setup(){
+	if use kipi ; then
+		slot_rebuild "media-plugins/kipi-plugins" && die
+	fi
+}
+
 src_compile() {
 	local myconf="`use_enable kipi`"
 	kde_src_compile myconf configure
diff --git a/media-gfx/gwenview/gwenview-1.2.92.ebuild b/media-gfx/gwenview/gwenview-1.2.92.ebuild
index e1c2cbcd810f..4ed1a67f54c5 100644
--- a/media-gfx/gwenview/gwenview-1.2.92.ebuild
+++ b/media-gfx/gwenview/gwenview-1.2.92.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gwenview/gwenview-1.2.92.ebuild,v 1.1 2005/08/23 11:14:54 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gwenview/gwenview-1.2.92.ebuild,v 1.1.1.1 2005/11/30 09:37:19 chriswhite Exp $
 
 inherit kde
 
@@ -10,16 +10,18 @@ S=${WORKDIR}/${MY_P}
 DESCRIPTION="image viewer for KDE"
 HOMEPAGE="http://gwenview.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="kipi"
+
 DEPEND="kipi? ( >=media-plugins/kipi-plugins-0.1.0_beta2 )"
 
 need-kde 3
 
 src_compile() {
-	local myconf="`use_enable kipi`"
+	local myconf="$(use_enable kipi)"
 	kde_src_compile myconf configure
 	make || die
 }
diff --git a/media-gfx/gwenview/gwenview-1.3.0.ebuild b/media-gfx/gwenview/gwenview-1.3.0.ebuild
index 10acdfc437e1..83dd873c67fd 100644
--- a/media-gfx/gwenview/gwenview-1.3.0.ebuild
+++ b/media-gfx/gwenview/gwenview-1.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/media-gfx/gwenview/gwenview-1.3.0.ebuild,v 1.1 2005/09/24 12:48:35 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gwenview/gwenview-1.3.0.ebuild,v 1.1.1.1 2005/11/30 09:37:19 chriswhite Exp $
 
 inherit kde
 
@@ -20,11 +20,13 @@ DEPEND="kipi? ( >=media-plugins/kipi-plugins-0.1.0_beta2 )"
 
 need-kde 3
 
-src_compile() {
-	# Manually remove visibility support,
-	# will not be needed in next version.
-	export kde_cv_prog_cxx_fvisibility_hidden=no
+pkg_setup(){
+	if use kipi ; then
+		slot_rebuild "media-plugins/kipi-plugins" && die
+	fi
+}
 
+src_compile() {
 	local myconf="$(use_enable kipi)"
 	kde_src_compile myconf configure
 	make || die
diff --git a/media-gfx/hugin/ChangeLog b/media-gfx/hugin/ChangeLog
index fa7a7d35dbaf..615e0eec47d8 100644
--- a/media-gfx/hugin/ChangeLog
+++ b/media-gfx/hugin/ChangeLog
@@ -1,6 +1,34 @@
 # ChangeLog for media-gfx/hugin
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.1 2005/08/10 22:56:50 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.1.1.1 2005/11/30 09:37:42 chriswhite Exp $
+
+  19 Nov 2005; Mark Loeser <halcy0n@gentoo.org>
+  +files/hugin-0.5_rc2-gcc4.patch, hugin-0.5_rc2.ebuild:
+  Add patch to fix compilation with gcc4.
+
+*hugin-0.5_rc1-r2 (16 Oct 2005)
+
+  16 Oct 2005; Mark Loeser <halcy0n@gentoo.org> -hugin-0.5_rc1.ebuild,
+  -hugin-0.5_rc1-r1.ebuild, +hugin-0.5_rc1-r2.ebuild:
+  Fixing the default autopano executable.  This ebuild also gets rid of the gtk2
+  useflag
+
+*hugin-0.5_rc2 (01 Oct 2005)
+*hugin-0.5_rc1-r1 (01 Oct 2005)
+
+  01 Oct 2005; Mark Loeser <halcy0n@gentoo.org> +hugin-0.5_rc1-r1.ebuild,
+  +hugin-0.5_rc2.ebuild:
+  Remove gtk useflag, since gtk2 is the only available toolkit.  Bump to _rc2.
+  bug #107776
+
+  16 Sep 2005; Mark Loeser <halcy0n@gentoo.org> hugin-0.5_rc1.ebuild:
+  Stable on x86
+
+  21 Aug 2005; Luis Medinas <metalgod@gentoo.org> hugin-0.5_rc1.ebuild:
+  Added ~amd64 keywords. Closes bug #103254.
+
+  11 Aug 2005; David Holm <dholm@gentoo.org> hugin-0.5_rc1.ebuild:
+  Added to ~ppc.
 
 *hugin-0.5_rc1 (10 Aug 2005)
 
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index b12603de63e7..f20dae4e809f 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,4 +1,17 @@
-MD5 c9254c8462231b94f408312e4f2df4e0 hugin-0.5_rc1.ebuild 1461
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e2ea169a87e1e2719c0f669cc66d7e12 ChangeLog 1327
+MD5 549db5b9b4146eb8aff8a35d39eabf1e files/digest-hugin-0.5_rc1-r2 67
+MD5 fca5e4ab4e2444d69d18b311f6a5591f files/digest-hugin-0.5_rc2 67
+MD5 12a2513bc1428c9adcadbd78ee32ecdd files/hugin-0.5_rc2-gcc4.patch 1701
+MD5 497db1fa2082827dd88807dffec1fe22 hugin-0.5_rc1-r2.ebuild 1483
+MD5 38c122d86a314a131edbdf69926ffbde hugin-0.5_rc2.ebuild 1542
 MD5 958a93f482686868d880a8b448d0899d metadata.xml 324
-MD5 cf3c48e540b79baefbc1189cf63ae2e3 ChangeLog 296
-MD5 549db5b9b4146eb8aff8a35d39eabf1e files/digest-hugin-0.5_rc1 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfrO0CRZPokWLroQRAnlBAKDWJcgInQW7kd44tFctkjZpgs5GQwCfdETd
+ffDjbDdTSxAoRv5SJ4MuM2g=
+=D19l
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/hugin/files/hugin-0.5_rc2-gcc4.patch b/media-gfx/hugin/files/hugin-0.5_rc2-gcc4.patch
index 0499699bc172..76cd2abbf0f2 100644
--- a/media-gfx/hugin/files/hugin-0.5_rc2-gcc4.patch
+++ b/media-gfx/hugin/files/hugin-0.5_rc2-gcc4.patch
@@ -9,8 +9,8 @@ diff -u -r1.8 -r1.9
   *
   *  @author Pablo d'Angelo <pablo.dangelo@web.de>
   *
-- *  $Id: hugin-0.5_rc2-gcc4.patch,v 1.1 2005/11/19 05:10:01 halcy0n Exp $
-+ *  $Id: hugin-0.5_rc2-gcc4.patch,v 1.1 2005/11/19 05:10:01 halcy0n Exp $
+- *  $Id: hugin-0.5_rc2-gcc4.patch,v 1.1.1.1 2005/11/30 09:37:42 chriswhite Exp $
++ *  $Id: hugin-0.5_rc2-gcc4.patch,v 1.1.1.1 2005/11/30 09:37:42 chriswhite Exp $
   *
   *  This is free software; you can redistribute it and/or
   *  modify it under the terms of the GNU General Public
diff --git a/media-gfx/hugin/hugin-0.5_rc1-r2.ebuild b/media-gfx/hugin/hugin-0.5_rc1-r2.ebuild
index ec769809d308..c252a6d1a195 100644
--- a/media-gfx/hugin/hugin-0.5_rc1-r2.ebuild
+++ b/media-gfx/hugin/hugin-0.5_rc1-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/media-gfx/hugin/hugin-0.5_rc1-r2.ebuild,v 1.1 2005/10/16 02:23:49 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-0.5_rc1-r2.ebuild,v 1.1.1.1 2005/11/30 09:37:42 chriswhite Exp $
 
 inherit wxwidgets
 
diff --git a/media-gfx/hugin/hugin-0.5_rc2.ebuild b/media-gfx/hugin/hugin-0.5_rc2.ebuild
index 77ced715c8dc..863a6b0f6e57 100644
--- a/media-gfx/hugin/hugin-0.5_rc2.ebuild
+++ b/media-gfx/hugin/hugin-0.5_rc2.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/media-gfx/hugin/hugin-0.5_rc2.ebuild,v 1.1 2005/10/01 20:11:13 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-0.5_rc2.ebuild,v 1.1.1.1 2005/11/30 09:37:42 chriswhite Exp $
 
-inherit wxwidgets
+inherit wxwidgets eutils
 
 DESCRIPTION="GUI for the creation & processing of panoramic images"
 HOMEPAGE="http://hugin.sf.net"
@@ -26,6 +26,9 @@ S=${WORKDIR}/${MY_P}
 src_unpack() {
 	unpack ${A}
 
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc4.patch
+
 	sed -i -e 's/autopanog\.exe/autopanog/' "${S}"/src/include/hugin/config_defaults.h
 }
 
diff --git a/media-gfx/icon-slicer/ChangeLog b/media-gfx/icon-slicer/ChangeLog
index aab16a717428..59d954f89749 100644
--- a/media-gfx/icon-slicer/ChangeLog
+++ b/media-gfx/icon-slicer/ChangeLog
@@ -1,6 +1,21 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/icon-slicer/ChangeLog,v 1.1 2003/09/15 13:47:11 wmertens Exp $
+# ChangeLog for media-gfx/icon-slicer
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/icon-slicer/ChangeLog,v 1.1.1.1 2005/11/30 09:37:13 chriswhite Exp $
+
+  26 May 2004; Travis Tilley <lv@gentoo.org> icon-slicer-0.3.ebuild:
+  added ~amd64 keyword
+
+  17 Feb 2004; Aron Griffis <agriffis@gentoo.org> icon-slicer-0.3.ebuild:
+  stable on alpha and ia64
+
+  09 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org> icon-slicer-0.3.ebuild:
+  more docs; tidy
+
+  12 Oct 2003; David Holm <dholm@gentoo.org> icon-slicer-0.3.ebuild:
+  Added to ~ppc.
+
+  30 Sep 2003; Todd Sunderlin <todd@gentoo.org> icon-slicer-0.3.ebuild:
+  added ~sparc keyword
 
 *icon-slicer-0.3 (15 Sep 2003)
 
diff --git a/media-gfx/icon-slicer/Manifest b/media-gfx/icon-slicer/Manifest
index 2a94d194b3a0..68f7e07f4903 100644
--- a/media-gfx/icon-slicer/Manifest
+++ b/media-gfx/icon-slicer/Manifest
@@ -1,3 +1,3 @@
-MD5 4564242ff8a2a399d0ce50f9cb42873e icon-slicer-0.3.ebuild 563
-MD5 9508aa9f0d6386a60221a49099b8537b ChangeLog 316
+MD5 c0acc6a42159192605e1124887eb2cf4 icon-slicer-0.3.ebuild 657
+MD5 bbd90ef60b3613b62e3668f837060132 ChangeLog 875
 MD5 73f2d6ece5276b5eed4f6dd791a61a11 files/digest-icon-slicer-0.3 67
diff --git a/media-gfx/icon-slicer/icon-slicer-0.3.ebuild b/media-gfx/icon-slicer/icon-slicer-0.3.ebuild
index d02677a9d04e..5b40f027e0d2 100644
--- a/media-gfx/icon-slicer/icon-slicer-0.3.ebuild
+++ b/media-gfx/icon-slicer/icon-slicer-0.3.ebuild
@@ -1,30 +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/media-gfx/icon-slicer/icon-slicer-0.3.ebuild,v 1.1 2003/09/15 13:47:11 wmertens Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/icon-slicer/icon-slicer-0.3.ebuild,v 1.1.1.1 2005/11/30 09:37:13 chriswhite Exp $
 
 DESCRIPTION="utility for generating icon themes and libXcursor cursor themes"
-
 HOMEPAGE="http://www.freedesktop.org/software/icon-slicer/"
-
 SRC_URI="http://www.freedesktop.org/software/icon-slicer/releases/${P}.tar.gz"
 
+KEYWORDS="x86 ~sparc ppc alpha ia64 amd64"
 LICENSE="GPL-2"
-
 SLOT="0"
-
-KEYWORDS="x86"
-
 IUSE=""
 
 DEPEND=">=x11-libs/gtk+-2.0
 	dev-libs/popt"
 
-src_compile() {
-	econf || die
-	emake || die
-}
-
 src_install() {
-	#make DESTDIR=${D} install || die
 	einstall || die
+	dodoc AUTHORS ChangeLog README TODO || die "dodoc failed"
 }
diff --git a/media-gfx/icoutils/ChangeLog b/media-gfx/icoutils/ChangeLog
index 465f8e6da70e..2b561788caee 100644
--- a/media-gfx/icoutils/ChangeLog
+++ b/media-gfx/icoutils/ChangeLog
@@ -1,6 +1,34 @@
 # ChangeLog for media-gfx/icoutils
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/icoutils/ChangeLog,v 1.1 2002/10/16 09:16:19 hanno Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/icoutils/ChangeLog,v 1.1.1.1 2005/11/30 09:37:15 chriswhite Exp $
+
+  14 Mar 2005; <hparker@gentoo.org> icoutils-0.23.0.ebuild:
+  Added ~amd64. Fixes #85203
+
+  17 Oct 2004; David Holm <dholm@gentoo.org> icoutils-0.23.0.ebuild:
+  Added to ~ppc.
+
+*icoutils-0.23.0 (20 Sep 2004)
+
+  20 Sep 2004; Hanno Boeck <hanno@gentoo.org> +icoutils-0.23.0.ebuild:
+  Version bump.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  icoutils-0.17.0.ebuild:
+  virtual/glibc -> virtual/libc
+
+*icoutils-0.22.0 (09 Nov 2003)
+
+  09 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org> icoutils-0.22.0.ebuild:
+  version bump
+
+  09 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org> icoutils-0.17.0.ebuild:
+  more docs; tidy
+
+*icoutils-0.17.0 (06 Dec 2002)
+
+  06 Dez 2002; Hanno Boeck <hanno@gentoo.org> icoutils-0.17.0.ebuild :
+  New version.
 
 *icoutils-0.16.0 (16 Oct 2002)
 
diff --git a/media-gfx/icoutils/Manifest b/media-gfx/icoutils/Manifest
index e69de29bb2d1..3fc152d2493d 100644
--- a/media-gfx/icoutils/Manifest
+++ b/media-gfx/icoutils/Manifest
@@ -0,0 +1,7 @@
+MD5 0a0491dc38e87f9d8806eecf4e7de347 ChangeLog 1216
+MD5 aa20f50306af18f917256bfc99e22073 icoutils-0.17.0.ebuild 630
+MD5 5189723dfaef651238e1023d0255673c icoutils-0.22.0.ebuild 783
+MD5 211e36989b61a018496e40a6fb33b807 icoutils-0.23.0.ebuild 796
+MD5 06b2ab9bde565384278bdd10b8d8d4b6 files/digest-icoutils-0.17.0 67
+MD5 70de881a8f9a14a104f86461a540bee2 files/digest-icoutils-0.22.0 67
+MD5 3e55b33ea2433fb9d3677ebbd75128fe files/digest-icoutils-0.23.0 67
diff --git a/media-gfx/icoutils/icoutils-0.17.0.ebuild b/media-gfx/icoutils/icoutils-0.17.0.ebuild
index 51215e07d899..401f87f7bbe5 100644
--- a/media-gfx/icoutils/icoutils-0.17.0.ebuild
+++ b/media-gfx/icoutils/icoutils-0.17.0.ebuild
@@ -1,22 +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/media-gfx/icoutils/icoutils-0.17.0.ebuild,v 1.1 2002/12/06 20:39:22 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/icoutils/icoutils-0.17.0.ebuild,v 1.1.1.1 2005/11/30 09:37:15 chriswhite Exp $
 
 DESCRIPTION="A set of programs for extracting and converting images in Microsoft Windows icon and cursor files (.ico, .cur)."
 HOMEPAGE="http://www.student.lu.se/~nbi98oli"
 SRC_URI="http://www.student.lu.se/~nbi98oli/src/${P}.tar.gz"
+
+KEYWORDS="x86"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-DEPEND="virtual/glibc"
-S="${WORKDIR}/${P}"
 IUSE=""
 
-src_compile() {
-	econf || die
-	emake || die
-}
+DEPEND="virtual/libc"
 
 src_install() {
-	make DESTDIR=${D} install || die
+	einstall || die
+	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
 }
diff --git a/media-gfx/icoutils/icoutils-0.22.0.ebuild b/media-gfx/icoutils/icoutils-0.22.0.ebuild
index 4f78fe01cabb..dab6c36b1799 100644
--- a/media-gfx/icoutils/icoutils-0.22.0.ebuild
+++ b/media-gfx/icoutils/icoutils-0.22.0.ebuild
@@ -1,12 +1,12 @@
-# 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/media-gfx/icoutils/icoutils-0.22.0.ebuild,v 1.1 2003/11/09 10:31:51 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/icoutils/icoutils-0.22.0.ebuild,v 1.1.1.1 2005/11/30 09:37:15 chriswhite Exp $
 
 DESCRIPTION="A set of programs for extracting and converting images in Microsoft Windows icon and cursor files (.ico, .cur)."
 HOMEPAGE="http://www.student.lu.se/~nbi98oli"
 SRC_URI="http://www.student.lu.se/~nbi98oli/src/${P}.tar.gz"
 
-KEYWORDS="~x86"
+KEYWORDS="x86"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="nls"
diff --git a/media-gfx/icoutils/icoutils-0.23.0.ebuild b/media-gfx/icoutils/icoutils-0.23.0.ebuild
index 538fd0005b73..31b88d59675f 100644
--- a/media-gfx/icoutils/icoutils-0.23.0.ebuild
+++ b/media-gfx/icoutils/icoutils-0.23.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/media-gfx/icoutils/icoutils-0.23.0.ebuild,v 1.1 2004/09/20 13:48:39 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/icoutils/icoutils-0.23.0.ebuild,v 1.1.1.1 2005/11/30 09:37:15 chriswhite Exp $
 
 DESCRIPTION="A set of programs for extracting and converting images in Microsoft Windows icon and cursor files (.ico, .cur)."
 HOMEPAGE="http://www.student.lu.se/~nbi98oli"
 SRC_URI="http://www.student.lu.se/~nbi98oli/src/${P}.tar.gz"
 
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc ~amd64"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="nls"
diff --git a/media-gfx/igal/ChangeLog b/media-gfx/igal/ChangeLog
index b5edf964ced8..b69ba8759cbd 100644
--- a/media-gfx/igal/ChangeLog
+++ b/media-gfx/igal/ChangeLog
@@ -1,7 +1,34 @@
-# ChangeLog for app-miscigalChangeLog/
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/igal/ChangeLog,v 1.1 2002/12/03 02:31:37 mcummings Exp $
+# ChangeLog for media-gfx/igal
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/igal/ChangeLog,v 1.1.1.1 2005/11/30 09:37:32 chriswhite Exp $
 
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org> igal-1.4.ebuild:
+  Stable on ppc64
+
+  23 Nov 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed digest.
+
+  03 Nov 2004; Markus Rothe <corsair@gentoo.org> igal-1.4.ebuild:
+  Marked ~ppc64; bug #69849
+
+  08 Aug 2004; Dylan Carlson <absinthe@gentoo.org> igal-1.4.ebuild:
+  KEYWORDS amd64.
+
+*igal-1.4 (16 Mar 2003)
+
+  06 Apr 2003; Dylan Carlson <absinthe@gentoo.org> igal-1.4.ebuild:
+  ppc sparc alpha moved to stable.
+
+  03 Apr 2003; Dylan Carlson <absinthe@gentoo.org> igal-1.4.ebuild:
+  x86 moved to stable.
+
+  16 Mar 2003; Dylan Carlson <absinthe@gentoo.org> igal-1.4.ebuild,
+  files/igal-1.4-gentoo.diff:
+  Version bump. Manpage fixed; tile.gif was replaced with tile.png; igal.css
+  added; "THANKS" added to docs.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
   23 Oct 2002; Michael Cummings <mcummings@gentoo.org> igal-1.3.ebuild :
 
   Initial entry. Submitted by Dylan Carlson <absinthe@pobox.com>, bug 9587
diff --git a/media-gfx/igal/Manifest b/media-gfx/igal/Manifest
index e69de29bb2d1..2ca4403d8160 100644
--- a/media-gfx/igal/Manifest
+++ b/media-gfx/igal/Manifest
@@ -0,0 +1,5 @@
+MD5 746994c5369e64de65ecf3dcb371afb4 ChangeLog 1199
+MD5 4c796b8f7c6f6e3d93ebe560685e4e02 igal-1.4.ebuild 838
+MD5 686285d9a04bf84e0d0f1870c55ce390 metadata.xml 460
+MD5 42ea8b39a800dd0794b0601f3bcb59f0 files/digest-igal-1.4 59
+MD5 943b5dbcddc3a985b05ab6a76f01cdda files/igal-1.4-gentoo.diff 4306
diff --git a/media-gfx/igal/igal-1.4.ebuild b/media-gfx/igal/igal-1.4.ebuild
index b0e4ca47153c..e2cc497adfcd 100644
--- a/media-gfx/igal/igal-1.4.ebuild
+++ b/media-gfx/igal/igal-1.4.ebuild
@@ -1,15 +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/media-gfx/igal/igal-1.4.ebuild,v 1.1 2003/03/16 05:53:46 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/igal/igal-1.4.ebuild,v 1.1.1.1 2005/11/30 09:37:32 chriswhite Exp $
 
-S="${WORKDIR}/${P}"
 DESCRIPTION="Static HTML image gallery generator"
 HOMEPAGE="http://www.stanford.edu/~epop/igal/"
 SRC_URI="http://www.stanford.edu/~epop/igal/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="x86 ppc sparc alpha amd64 ppc64"
+IUSE=""
 
 RDEPEND="dev-lang/perl
 		media-gfx/imagemagick"
@@ -35,4 +35,3 @@ src_install(){
 	doman igal.1
 	dodoc ChangeLog COPYING README THANKS
 }
-
diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 318f65013d71..b0c9ecf06d86 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,721 @@
 # ChangeLog for media-gfx/imagemagick
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.1 2002/02/01 21:53:29 gbevin Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.1.1.1 2005/11/30 09:37:34 chriswhite Exp $
+
+*imagemagick-6.2.5.4 (05 Nov 2005)
+
+  05 Nov 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/imagemagick-6.2.5.4-docs.patch, +imagemagick-6.2.5.4.ebuild:
+  Version bump to fix png support, and fix #80198 (USE=cups->gs), #93115
+  (respect USE=nocxx/perl/png/gs), and install doc files properly #91911.
+
+  29 Oct 2005; Bryan Østergaard <kloeri@gentoo.org>
+  imagemagick-6.2.4.2-r1.ebuild:
+  Stable on ia64.
+
+  29 Oct 2005; Michael Hanselmann <hansmi@gentoo.org>
+  imagemagick-6.2.4.2-r1.ebuild:
+  Stable on hppa, ppc. See bug #105717.
+
+  27 Oct 2005; Jose Luis Rivero <yoswink@gentoo.org>
+  imagemagick-6.2.4.2-r1.ebuild:
+  Stable on alpha wrt bug #105717
+
+  27 Oct 2005; Simon Stelling <blubb@gentoo.org>
+  imagemagick-6.2.4.2-r1.ebuild:
+  stable on amd64 wrt bug 105717
+
+  27 Oct 2005; Brent Baude <ranger@gentoo.org>
+  imagemagick-6.2.4.2-r1.ebuild:
+  Marking imagemagick-6.2.4.2-r1 ppc64 stable per bug 105717
+
+  27 Oct 2005; Andrej Kacian <ticho@gentoo.org>
+  imagemagick-6.2.4.2-r1.ebuild:
+  Stable on x86, security bug #105717.
+
+  27 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  imagemagick-6.2.4.2-r1.ebuild:
+  Stable on sparc wrt #105717
+
+*imagemagick-6.2.5.2 (19 Oct 2005)
+*imagemagick-6.2.4.2-r1 (19 Oct 2005)
+
+  19 Oct 2005; Karol Wojtaszek <sekretarz@gentoo.org>
+  +imagemagick-6.2.4.2-r1.ebuild, +imagemagick-6.2.5.2.ebuild:
+  Version bump, fixed security bug #105717
+
+*imagemagick-6.2.4.2 (25 Aug 2005)
+
+  25 Aug 2005; <sekretarz@gentoo.org> +imagemagick-6.2.4.2.ebuild:
+  Version bump. Upstream doesn't install libtool files now, bug #103149.
+
+  28 Jul 2005; <sekretarz@gentoo.org> metadata.xml:
+  Changed maintainer to sekretarz
+
+  12 Jul 2005; Stephen P. Becker <geoman@gentoo.org>
+  imagemagick-6.2.2.3-r1.ebuild:
+  stable on mips
+
+  06 Jun 2005; Karol Wojtaszek <sekretarz@gentoo.org>
+  +files/imagemagick-perlmagick.patch, -files/perlpatch.diff,
+  imagemagick-6.2.2.3-r1.ebuild:
+  Fixed linking problems with perlmagick when livesystem doesn't have
+  imagemagick's libs, bug #93078
+
+  03 Jun 2005; Luca Barbato <lu_zero@gentoo.org> metadata.xml:
+  Metadata fix
+
+  19 May 2005; Olivier Crête <tester@gentoo.org>
+  imagemagick-6.2.2.3-r1.ebuild:
+  Stable on x86 for security bug #90423
+
+*imagemagick-6.2.1.5-r1 (18 May 2005)
+
+  18 May 2005; Michael Cummings <mcummings@gentoo.org>
+  +imagemagick-6.2.1.5-r1.ebuild, +imagemagick-6.2.2.0-r1.ebuild,
+  +imagemagick-6.2.2.3-r1.ebuild:
+  Added block to the old perlmagick to the newer imagemagicks. Without it,
+  people can emerge imagemagick without removing their old perlmagick and end up
+  with severely broken perlmagicks
+
+  16 May 2005; Bryan Østergaard <kloeri@gentoo.org>
+  imagemagick-6.2.2.3.ebuild:
+  Stable on ia64, bug 90423.
+
+  16 May 2005; Bryan Østergaard <kloeri@gentoo.org>
+  imagemagick-6.2.2.3.ebuild:
+  Stable on alpha, bug 90423.
+
+  16 May 2005; Markus Rothe <corsair@gentoo.org> imagemagick-6.2.2.3.ebuild:
+  Stable on ppc64; bug #90423
+
+  16 May 2005; Jason Wever <weeve@gentoo.org> imagemagick-6.2.2.3.ebuild:
+  Stable on SPARC wrt security bug #90423.
+
+  15 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  imagemagick-6.2.2.3.ebuild:
+  stable on amd64 wrt #90423
+
+  15 May 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  imagemagick-6.2.2.3.ebuild:
+  Stable on hppa
+
+  15 May 2005; Michael Hanselmann <hansmi@gentoo.org>
+  imagemagick-6.2.2.3.ebuild:
+  Stable on ppc.
+
+*imagemagick-6.2.2.3 (15 May 2005)
+
+  15 May 2005; Karol Wojtaszek <sekretarz@gentoo.org>
+  +imagemagick-6.2.2.3.ebuild:
+  Version bump, security bug #90423
+
+  27 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  imagemagick-6.2.2.0.ebuild:
+  Stable on hppa.
+
+  27 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  imagemagick-6.2.2.0.ebuild:
+  Stable on sparc wrt #90423
+
+  27 Apr 2005; Olivier Crête <tester@gentoo.org>
+  imagemagick-6.2.2.0.ebuild:
+  Stable on x86 per security bug #90423
+
+  27 Apr 2005; Karol Wojtaszek <sekretarz@gentoo.org>
+  -imagemagick-6.1.3.2.ebuild, -imagemagick-6.1.3.4.ebuild,
+  -imagemagick-6.1.6.0.ebuild:
+  Ebuild clean up
+
+  27 Apr 2005; Luca Barbato <lu_zero@gentoo.org> imagemagick-6.2.2.0.ebuild:
+  Marked ppc
+
+  27 Apr 2005; Herbie Hopkins <herbs@gentoo.org> imagemagick-6.2.2.0.ebuild:
+  Stable on amd64 wrt bug #90423
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> imagemagick-6.2.2.0.ebuild:
+  Stable on ppc64; bug #90423
+
+  27 Apr 2005; Bryan Østergaard <kloeri@gentoo.org>
+  imagemagick-6.2.2.0.ebuild:
+  Stable on alpha + ia64, bug 90423.
+
+*imagemagick-6.2.2.0 (26 Apr 2005)
+
+  26 Apr 2005; Karol Wojtaszek <sekretarz@gentoo.org>
+  +imagemagick-6.2.2.0.ebuild:
+  Version bump, this release fixes heap-overflow vulnerability reported by
+  Damian Put (http://www.overflow.pl/adv/imheapoverflow.txt)
+
+*imagemagick-6.2.1.5 (20 Apr 2005)
+
+  20 Apr 2005; Karol Wojtaszek <sekretarz@gentoo.org>
+  +imagemagick-6.2.1.5.ebuild:
+  Perlmagick is now part of Imagemagick. Thanks to mcummings for help. Fixed
+  bug #87963
+
+  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> imagemagick-6.2.0.4.ebuild:
+  stable on ia64
+
+  21 Mar 2005; Guy Martin <gmsoft@gentoo.org> imagemagick-6.2.0.4.ebuild:
+  Stable on hppa.
+
+  13 Mar 2005; Hardave Riar <hardave@gentoo.org> imagemagick-6.2.0.4.ebuild:
+  Stable on mips, bug #83542.
+
+*imagemagick-6.2.0.6 (10 Mar 2005)
+
+  10 Mar 2005; Karol Wojtaszek <sekretarz@gentoo.org>
+  +imagemagick-6.2.0.6.ebuild:
+  Version bump, closing bug #84524
+
+  06 Mar 2005; Bryan Østergaard <kloeri@gentoo.org>
+  imagemagick-6.2.0.4.ebuild:
+  Stable on alpha, bug 83542.
+
+  06 Mar 2005; Olivier Crête <tester@gentoo.org> :
+  Stable on x86 per security bug 83542
+
+  03 Mar 2005; Michael Hanselmann <hansmi@gentoo.org>
+  imagemagick-6.2.0.4.ebuild:
+  Stable on ppc.
+
+  03 Mar 2005; Markus Rothe <corsair@gentoo.org> imagemagick-6.2.0.4.ebuild:
+  Stable on ppc64; bug #83542
+
+  03 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  imagemagick-6.2.0.4.ebuild:
+  stable on amd64 wrt #83542
+
+  03 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  imagemagick-6.2.0.4.ebuild:
+  Stable on sparc wrt #83542
+
+  03 Mar 2005; Karol Wojtaszek <sekretarz@gentoo.org>
+  imagemagick-6.2.0.4.ebuild:
+  Fixed SRC_URI, now using gz'ed files instead of bzip2'ed
+
+*imagemagick-6.2.0.4 (03 Mar 2005)
+
+  03 Mar 2005; Karol Wojtaszek <sekretarz@gentoo.org>
+  +imagemagick-6.2.0.4.ebuild:
+  Version bump, release fixes security bug #83542
+
+  20 Feb 2005; Aron Griffis <agriffis@gentoo.org> imagemagick-6.1.8.8.ebuild:
+  stable on ia64 #77932
+
+  17 Feb 2005; Guy Martin <gmsoft@gentoo.org> imagemagick-6.1.8.8.ebuild:
+  Stable on hppa.
+
+  21 Jan 2005; Karol Wojtaszek <sekretarz@gentoo.org>
+  -imagemagick-6.0.7.1.ebuild, -imagemagick-6.0.8.1.ebuild,
+  -imagemagick-6.1.0.1.ebuild, imagemagick-6.1.8.8.ebuild:
+  Solved file collision problem, bug #78740. Ebuild clean up
+
+  20 Jan 2005; Hardave Riar <hardave@gentoo.org> imagemagick-6.1.8.8.ebuild:
+  Stable on mips, bug #77932.
+
+  20 Jan 2005; Bryan Østergaard <kloeri@gentoo.org>
+  imagemagick-6.1.8.8.ebuild:
+  Stable on alpha, bug 77932.
+
+  19 Jan 2005; Karol Wojtaszek <sekretarz@gentoo.org>
+  imagemagick-6.1.8.8.ebuild:
+  Stable on amd64, bug #77932
+
+  18 Jan 2005; Olivier Crête <tester@gentoo.org> imagemagick-6.1.8.8.ebuild:
+  Stable on x86 wrt security bug #77932
+
+  18 Jan 2005; Michael Hanselmann <hansmi@gentoo.org> :
+  Stable on ppc.
+
+  18 Jan 2005; Markus Rothe <corsair@gentoo.org> imagemagick-6.1.8.8.ebuild:
+  Stable on ppc64; bug #77932
+
+  18 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  imagemagick-6.1.8.8.ebuild:
+  Stable on sparc wrt #77932
+
+  18 Jan 2005; Karol Wojtaszek <sekretarz@gentoo.org>
+  +files/imagemagick-6.1.8.8-fpx.patch, imagemagick-6.1.8.8.ebuild:
+  Fixed fpx compile problems
+
+*imagemagick-6.1.8.8 (17 Jan 2005)
+
+  17 Jan 2005; Karol Wojtaszek <sekretarz@gentoo.org>
+  +imagemagick-6.1.8.8.ebuild:
+  This release of imagemagick fixes .psd Image File Decode Heap Overflow
+  Vulnerability, bug #77932. Fixed collision problem with gaim, bug #73464 and
+  Ghostscript fonts problem, bug #68205
+
+  10 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  imagemagick-6.1.3.4.ebuild:
+  Stable on sparc wrt #71953
+
+  10 Jan 2005; Karol Wojtaszek <sekretarz@gentoo.org>
+  imagemagick-6.1.3.4.ebuild:
+  Added info about possibility of broken libtool, specially for sparc guys,
+  bug #71953
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  05 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
+  imagemagick-6.1.3.4.ebuild:
+  Stable on alpha, bug 71953.
+
+  04 Dec 2004; Karol Wojtaszek <sekretarz@gentoo.org> :
+  Version bump, bug #72920
+
+  27 Nov 2004; Hardave Riar <hardave@gentoo.org> imagemagick-6.1.3.4.ebuild:
+  Stable on mips, bug #71953.
+
+  25 Nov 2004; Karol Wojtaszek <sekretarz@gentoo.org>
+  imagemagick-6.1.3.4.ebuild:
+  Stable on amd64, bug #71953
+
+  25 Nov 2004; Olivier Crete <tester@gentoo.org> imagemagick-6.1.3.4.ebuild:
+  Stable on x86 wrt bug 71953
+
+  25 Nov 2004; Joseph Jezak <josejx@gentoo.org> imagemagick-6.1.3.4.ebuild:
+  Marked ppc stable for bug #71953.
+
+  22 Nov 2004; Markus Rothe <corsair@gentoo.org> imagemagick-6.1.3.4.ebuild:
+  Stable on ppc64; bug #71953
+
+  08 Nov 2004; Hardave Riar <hardave@gentoo.org> imagemagick-6.1.3.2.ebuild:
+  Stable on mips, bug #69825.
+
+  06 Nov 2004; Lars Weiler <pylon@gentoo.org> imagemagick-6.1.3.2.ebuild:
+  Finally stable on ppc, bug #69825.
+
+  06 Nov 2004; Karol Wojtaszek <sekretarz@gentoo.org>
+  imagemagick-6.1.3.4.ebuild:
+  Added ${DEPEND} to RDEPEND
+
+*imagemagick-6.1.3.4 (06 Nov 2004)
+
+  06 Nov 2004; Karol Wojtaszek <sekretarz@gentoo.org>
+  +imagemagick-6.1.3.4.ebuild:
+  Version bump. Closed bug #69840 and #69705
+
+  06 Nov 2004; Markus Rothe <corsair@gentoo.org> imagemagick-6.1.3.2.ebuild:
+  Stable on ppc64; bug #69825
+
+  04 Nov 2004; Olivier Crete <tester@gentoo.org> imagemagick-6.1.3.2.ebuild:
+  Stable on x86 wrt bug #69825
+
+  03 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
+  imagemagick-6.1.3.2.ebuild:
+  Stable on alpha, bug 69825.
+
+  02 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  imagemagick-6.1.3.2.ebuild:
+  Stable on sparc wrt #69825
+
+  02 Nov 2004; Karol Wojtaszek,,, <sekretarz@gentoo.org>
+  imagemagick-6.1.3.2.ebuild:
+  Commented out rm line
+
+  02 Nov 2004; Michael Hanselmann <hansmi@gentoo.org>
+  imagemagick-6.1.3.2.ebuild:
+  Stable on ppc.
+
+  02 Nov 2004; Karol Wojtaszek,,, <sekretarz@gentoo.org>
+  imagemagick-6.1.3.2.ebuild:
+  Stable on amd64
+
+  01 Nov 2004; Scott W Taylor <swtaylor@gentoo.org>
+  imagemagick-6.1.3.2.ebuild:
+  dont forget dev-perl/perlmagick needs to match these versions
+
+  01 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  imagemagick-6.0.7.1.ebuild, imagemagick-6.0.8.1.ebuild,
+  imagemagick-6.1.0.1.ebuild, imagemagick-6.1.3.2.ebuild:
+  Remove >=app-text/dgs-0.5.9.1 dep on USE=X because virtual/x11 provides all
+  the same stuff, and they actually overwrite each other's files. Approved by
+  sekretarz.
+
+*imagemagick-6.1.3.2 (02 Nov 2004)
+
+  02 Nov 2004; Karol Wojtaszek,,, <sekretarz@gentoo.org>
+  -imagemagick-5.5.4.4.ebuild, -imagemagick-5.5.6-r1.ebuild,
+  -imagemagick-5.5.7.15.ebuild, -imagemagick-6.0.8.3.ebuild,
+  +imagemagick-6.1.3.2.ebuild:
+  Ebuild clean up, version bump - closing bugs #69705, #25357, #65970, #67078
+
+  19 Oct 2004; Jason Wever <weeve@gentoo.org> imagemagick-6.1.0.1.ebuild:
+  Stable on sparc wrt bug #67553.
+
+  19 Oct 2004; Michael Hanselmann <hansmi@gentoo.org>
+  imagemagick-6.1.0.1.ebuild:
+  Stable on PowerPC.
+
+  19 Oct 2004; Guy Martin <gmsoft@gentoo.org> imagemagick-6.1.0.1.ebuild:
+  Stable on hppa.
+
+  17 Oct 2004; Hardave Riar <hardave@gentoo.org> imagemagick-6.0.7.1.ebuild:
+  Stable on mips, bug #62309.
+
+  15 Oct 2004; Bryan Østergaard <kloeri@gentoo.org>
+  imagemagick-6.1.0.1.ebuild:
+  Stable on alpha, bug 67553.
+
+  09 Oct 2004; Tom Gall <tgall@gentoo.org> imagemagick-6.0.7.1.ebuild:
+  stable on ppc64, bug #62309
+
+*imagemagick-6.1.0.1 (04 Oct 2004)
+
+  04 Oct 2004; Karol Wojtaszek <sekretarz@gentoo.org>
+  +imagemagick-6.1.0.1.ebuild:
+  Version bump
+
+*imagemagick-6.0.8.3 (21 Sep 2004)
+
+  21 Sep 2004; Karol Wojtaszek <sekretarz@gentoo.org>
+  imagemagick-6.0.7.1.ebuild, imagemagick-6.0.8.1.ebuild,
+  +imagemagick-6.0.8.3.ebuild:
+  Minor typos fixes. Version bump
+
+*imagemagick-6.0.8.1 (16 Sep 2004)
+
+  16 Sep 2004; Karol Wojtaszek <sekretarz@gentoo.org>
+  -imagemagick-6.0.7.1.ebuild, +imagemagick-6.0.8.1.ebuild:
+  Version bump. Removing 6.0.7.4, because it's no longer on imagemagick mirrors.
+  Silly imagemagick devs ;)
+
+*imagemagick-6.0.7.4 (15 Sep 2004)
+
+  15 Sep 2004; Karol Wojtaszek <sekretarz@gentoo.org>
+  imagemagick-6.0.7.1.ebuild, -imagemagick-6.0.7.3.ebuild,
+  +imagemagick-6.0.7.4.ebuild:  Version bump. Fixed SRC_URI. Removing 6.0.7.3, because it's no longer on imagemagick mirrors. Bug #64099
+
+*imagemagick-6.0.7.3 (14 Sep 2004)
+
+  14 Sep 2004; Karol Wojtaszek <sekretarz@gentoo.org>
+  +imagemagick-6.0.7.3.ebuild:
+  Version bump.
+
+  14 Sep 2004; Karol Wojtaszek <sekretarz@gentoo.org>
+  -imagemagick-5.4.7.4-r1.ebuild, -imagemagick-5.5.3.2.ebuild,
+  -imagemagick-5.5.7.11.ebuild, -imagemagick-5.5.7.14.ebuild,
+  -imagemagick-6.0.5.2.ebuild:
+  Ebuild clean up
+
+  08 Sep 2004; Bryan Østergaard <kloeri@gentoo.org>
+  imagemagick-6.0.7.1.ebuild:
+  Stable on alpha, bug 62309.
+
+  06 Sep 2004; Daniel Ahlberg <aliz@gentoo.org> imagemagick-6.0.7.1.ebuild:
+  Stable on amd64.
+
+  06 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  imagemagick-6.0.7.1.ebuild:
+  Stable on sparc wrt #62309
+
+*imagemagick-6.0.7.1 (06 Sep 2004)
+
+  06 Sep 2004; Karol Wojtaszek <sekretarz@gentoo.org>
+  +imagemagick-6.0.7.1.ebuild:
+  Version bump. Closing bugs #62309 and #62229
+
+  30 Aug 2004; Karol Wojtaszek <sekretarz@gentoo.org>
+  imagemagick-6.0.5.2.ebuild:
+  Marked unstable on ppc sparc alpha hppa amd64 mips ppc64
+
+*imagemagick-6.0.5.2 (20 Aug 2004)
+
+  20 Aug 2004; Karol Wojtaszek <sekretarz@gentoo.org>
+  +imagemagick-6.0.5.2.ebuild:
+  Version bump. Bug #53697
+
+  17 Jul 2004; Tom Gall <tgall@gentoo.org> imagemagick-5.5.7.15.ebuild:
+  stable on ppc64, bug #55801
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> imagemagick-5.5.3.2.ebuild,
+  imagemagick-5.5.4.4.ebuild, imagemagick-5.5.6-r1.ebuild,
+  imagemagick-5.5.7.11.ebuild, imagemagick-5.5.7.14.ebuild,
+  imagemagick-5.5.7.15.ebuild:
+  Add inherit eutils
+
+  25 Apr 2004; Aron Griffis <agriffis@gentoo.org> imagemagick-5.5.4.4.ebuild:
+  Add die following econf for bug 48950
+
+  07 Mar 2004; Bret Curtis <psi29a@gentoo.org> imagemagick-5.5.3.2.ebuild:
+  Bumped mips back to ~mips in KEYWORDS.
+
+  07 Mar 2004; Bret Curtis <psi29a@gentoo.org> imagemagick-5.5.7.15.ebuild:
+  Added ~mips to KEYWORDS
+
+  16 Feb 2004; Martin Holzer <mholzer@gentoo.org> imagemagick-5.5.7.11.ebuild,
+  imagemagick-5.5.7.15.ebuild:
+  adding RESTRICT=nomirror
+
+*imagemagick-5.5.7.15 (17 Dec 2003)
+
+  12 Feb 2004; Mike Frysinger <vapier@gentoo.org> :
+  Moved to stable to fix security issue #24001.
+
+  17 Dec 2003; Martin Holzer <mholzer@gentoo.org> imagemagick-5.5.7.15.ebuild:
+  Version bumped.
+
+*imagemagick-5.5.7.14 (15 Dec 2003)
+
+  15 Dec 2003; Martin Holzer <mholzer@gentoo.org> imagemagick-5.5.7.14.ebuild:
+  Version bumped.
+
+  09 Dec 2003; Heinrich Wendel <lanius@gentoo.org>
+  imagemagick-5.4.7.4-r1.ebuild, imagemagick-5.5.3.2.ebuild,
+  imagemagick-5.5.4.4.ebuild, imagemagick-5.5.6-r1.ebuild,
+  imagemagick-5.5.7-r2.ebuild, imagemagick-5.5.7.11.ebuild:
+  changed app-text/ghostscript to virtual/ghostscript
+
+  03 Dec 2003; Aron Griffis <agriffis@gentoo.org> imagemagick-5.5.7.11.ebuild:
+  Stable on alpha to support lilypond-1.8.2
+
+  29 Nov 2003; Brad House <brad_mssw@gentoo.org> imagemagick-5.5.6-r1.ebuild:
+  -fPIC needed for compile on amd64 b/c koffice 1.3_rc1 links the .a into
+  a shared object, so it bugs out if not compiled with -fPIC
+
+  22 Oct 2003; Christian Birchinger <joker@gentoo.org>
+  imagemagick-5.5.6-r1.ebuild:
+  Added sparc stable keyword
+
+  04 Oct 2003; Heinrich Wendel <lanius@gentoo.org>
+  imagemagick-5.5.6-r1.ebuild, imagemagick-5.5.7-r2.ebuild,
+  imagemagick-5.5.7.11.ebuild:
+  fixed symlinks #30289
+
+*imagemagick-5.5.7.11 (02 Oct 2003)
+
+  02 Oct 2003; Bartosch Pixa <darkspecter@gentoo.org>
+  imagemagick-5.5.7.11.ebuild:
+  version bump and added a local useflag for jbigkit
+
+*imagemagick-5.5.7-r2 (01 Oct 2003)
+
+  01 Oct 2003; Martin Holzer <mholzer@gentoo.org> imagemagick-5.5.7-r2.ebuild:
+  minor version bumped.
+
+*imagemagick-5.5.7-r1 (22 Jul 2003)
+
+  22 Jul 2003; Martin Holzer <mholzer@gentoo.org> imagemagick-5.5.7-r1.ebuild:
+  Version bumped. Closes #24126
+
+*imagemagick-5.5.7 (30 Jun 2003)
+
+  30 Jun 2003; Daniel Ahlberg <aliz@gentoo.org> imagemagick-5.5.7.ebuild :
+  Version bump.
+
+  15 May 2003; Bartosch Pixa <darkspecter@gentoo.org>
+  imagemagick-5.5.3.2.ebuild, imagemagick-5.5.4.4.ebuild,
+  imagemagick-5.5.6-r1.ebuild, imagemagick-5.5.6.ebuild:
+  fixed freetype DEPEND
+
+*imagemagick-5.5.6-r1 (12 May 2003)
+
+  04 Aug 2003; Guy Martin <gmsoft@gentoo.org> imagemagick-5.5.6-r1.ebuild :
+  Marked stable on hppa.
+
+  12 May 2003; Graham Forest <vladimir@gentoo.org>
+  imagemagick-5.5.6-r1.ebuild:
+  Added usage of wmf USE flag to 5.5.6-r1, and moved to ~ for a bit of testing
+
+*imagemagick-5.5.6 (24 Apr 2003)
+
+  28 Apr 2003; Martin Holzer <mholzer@gentoo.org>
+  imagemagick-5.4.7.4-r1.ebuild, imagemagick-5.5.3.2.ebuild,
+  imagemagick-5.5.4.4.ebuild, imagemagick-5.5.6.ebuild:
+  Changed SRC_URI to use mirror://sf.
+
+  24 Apr 2003; Bartosch Pixa <darkspecter@gentoo.org>
+  imagemagick-5.5.6.ebuild:
+  version bump and changed to use mirror:
+
+*imagemagick-5.5.5.3 (17 Mar 2003)
+
+  25 Mar 2003; Graham Forest <vladimir@gentoo.org> imagemagick-5.5.5.3.ebuild:
+  Set to stable on ppc and x86
+
+  25 Mar 2003; Graham Forest <vladimir@gentoo.org>
+  imagemagick-5.4.7.4-r1.ebuild, imagemagick-5.4.9.1-r2.ebuild,
+  imagemagick-5.5.3.2.ebuild, imagemagick-5.5.4.4.ebuild,
+  imagemagick-5.5.5.3.ebuild:
+  Changed to .gz because the ImageMagick people think it's ok to delete .bz2's
+  of old versions off their servers
+
+  18 Mar 2003; Graham Forest <vladimir@gentoo.org> imagemagick-5.5.5.3.ebuild:
+  Fixed a missing lib issue with a symlink
+
+  17 Mar 2003; Graham Forest <vladimir@gentoo.org> imagemagick-5.5.5.3.ebuild:
+  Version bump, moved PerlMagick to a seperate ebuild
+
+  13 Mar 2003; Olivier Reisch <doctomoe@gentoo.org> imagemagick-5.5.3.2.ebuild
+  Put back to ~ppc as some deps are not marked ppc stable either.
+
+*imagemagick-5.5.4.4 (12 Feb 2003)
+
+  21 Feb 2003; Aron Griffis <agriffis@gentoo.org> imagemagick-5.5.4.4.ebuild :
+  Mark stable on alpha
+
+  12 Feb 2003; Seemant Kulleen <seemant@gentoo.org>
+  imagemagick-5.5.4.4.ebuild files/digest-imagemagick-5.5.4.4 :
+
+  Version bump to latest.  Added other arches to testing in all ebuilds.
+
+*imagemagick-5.5.3.2 (03 Jan 2003)
+
+  10 Mar 2003; mcummings <mcummings@gentoo.org> imagemagick-5.5.3.2.ebuild
+  Unmarked stable. The deps for this ebuild are not satisfied on all platforms.
+
+  06 Mar5 2003; phoen][x <phoenix@gentoo.org> imagemagick-5.5.3.2.ebuild
+  Marked stable. dvdrip-0.50.4 depends on version 5.5.3* of imagemagick.
+
+  09 Feb 2003; Martin Holzer <mholzer@gentoo.org> imagemagick-5.5.3.2.ebuild
+  Corrected html doc dir. Closes #15386.
+
+  25 Jan 2003; Martin Holzer <mholzer@gentoo.org> imagemagick-5.5.3.2.ebuild
+  using flag-o-magic to force i586 for k6. Closes #14343.
+
+  03 Jan 2003; Seemant Kulleen <seemant@gentoo.org>
+  imagemagick-5.5.3.2.ebuild files/digest-imagemagick-5.5.3.2 :
+
+  Version bump to latest.
+
+*imagemagick-5.4.9.1-r2 (09 Feb 2003)
+
+  09 Feb 2003; Martin Holzer <mholzer@gentoo.org> imagemagick-5.4.7.4-r2.ebuild
+  Corrected html doc dir. Closes #15386.
+
+*imagemagick-5.4.9.1 (05 Nov 2002)
+
+  22 Jan 2003; Martin Holzer <mholzer@gentoo.org> imagemagick-5.4.7.4-r1.ebuild
+  using flag-o-magic to force i586 for k6. Closes #14343.
+
+  16 Dec 2002; Mike Frysinger <vapier@gentoo.org> :
+  Added dosed's to remove -I/usr/include from the -config scripts. #11649
+
+  07 Dec 2002; Jack Morgan <jmorgan@gentoo.org> imagemagick-5.4.7.4.ebuild,
+  imagemagick-5.4.9.1.ebuild, imagemagick-5.4.9.1-r1.ebuild:
+  Changed sparc64 to sparc keyword imagemagick-5.4.7.4.ebuild
+  Changed ~sparc64 to ~sparc keyword imagemagick-5.4.9.1[-r1].ebuild
+
+  05 Nov 2002; Nick Hadaway <raker@gentoo.org>
+  imagemagick-5.4.9.1-r1.ebuild, files/digest-imagemagick-5.4.9.1-r1 :
+  Added dependancy on media-libs/jbigkit for jbig support.  Ebuild
+  already had --with-jbig specified...
+
+*imagemagick-5.4.7.4-r1 (09 Feb 2003)
+
+  09 Feb 2003; Martin Holzer <mholzer@gentoo.org> imagemagick-5.4.7.4-r1.ebuild
+  Corrected html doc dir. Closes #15386.
+
+*imagemagick-5.4.7.4 (28 Oct 2002)
+
+  28 Oct 2002; Seemant Kulleen <seemant@gentoo.org>
+  imagemagick-5.4.7.4.ebuild files/digest-imagemagick-5.4.7.4 :
+
+  Version bump on the 5.4.7 (stable KEYWORDS) version, as the old tarball is
+  no longer available.  Thanks to: ince@pacifier.com (Michael Labhard) in
+  bug #9848.
+
+*imagemagick-5.4.9.1 (22 Oct 2002)
+
+  27 Oct 2002; <mcummings@gentoo.org> :
+  Tested on x86 - there is no longer a tar ball for 5.4.7, testing required 
+  immediately.
+
+  22 Oct 2002; Seemant Kulleen <seemant@gentoo.org>
+  imagemagick-5.4.9.1.ebuild files/digest-imagemagick-5.4.9.1 :
+
+  Version bump.  In this release, the versioning has been made smarter, so
+  that the last digit maps to the -number from the upstream version number.
+
+*imagemagick-5.4.7-r2 (24 Sep 2002)
+  
+  17 Oct 2002; <mcummings@gentoo.org> : added sparc64 to keywords
+
+  24 Sep 2002; <mcummings@gentoo.org> : addresses bug 8299
+  
+*imagemagick-5.4.7-r1 (15 Sep 2002)
+  
+  15 Sep 2002; <mcummings@gentoo.org> : version bump is at Grant's suggestion
+  since the last version would install, this makes sure anyone that installed
+  it gets the working copy.
+
+*imagemagick-5.4.7 (08 Jul 2002)
+
+  15 Sep 2002; <mcummings@gentoo.org> : fixed missing make install(?)
+
+  13 Sep 2002; <mcummings@gentoo.org> : fixed perl eclass usage
+
+  12 Aug 2002; Mark Guertin <gerk@gentoo.org> imagemagick-5.4.7.ebuild :
+  Added ppc to keywords
+
+  08 Jul 2002; Seemant Kulleen <seemant@gentoo.org> imagemagick-5.4.7.ebuild
+  files/digest-imagemagick-5.4.7 :
+
+  Version bump.
+
+*imagemagick-5.4.6 (29 Jun 2002)
+
+  29 Jun 2002; Seemant Kulleen <seemant@gentoo.org> imagemagick-5.4.6.ebuild
+  files/digest-imagemagick-5.4.6 :
+
+  Version bump.
+
+*imagemagick-5.4.5 (6 May 2002)
+
+  29 Apr 2002; Thilo Bangert <bangert@gentoo.org> imagemagick-5.4.4-r2.ebuild :
+  
+  put dgs depandy under X use, so that imagemagick now no longer depends on X
+
+  17 Apr 2002; Martin Schlemmer <azarah@gentoo.org> imagemagick-5.4.4-r2.ebuild :
+
+  Libtoolized to fix build problems with dual gcc installations.
+
+*imagemagick-5.4.4-r2 (13 Apr 2002)
+
+  13 Apr 2002; Seemant Kulleen <seemant@gentoo.org> imagemagick-5.4.4-r2.ebuild :
+  files/digest-imagemagick-5.4.4-r2 :
+
+  I rearranged the MY_P variables, and oops'd on it, because it wasn't setting
+  the WORKDIR correctly.  Also there were fetch problems.
+
+*imagemagick-5.4.4-r2 (12 Apr 2002)
+
+  12 Apr 2002; Seemant Kulleen <seemant@gentoo.org> imagemagick-5.4.4-r2.ebuild:
+
+  Compile against newest libpng
+
+*imagemagick-5.4.4-r1 (11 Apr 2002)
+
+  11 Apr 2002; Seemant Kulleen <seemant@gentoo.org> imagemagick-5.4.4-r1.ebuild:
+
+  Changed the tarball to be fetched to tar.gz because the server no longer
+  carries a tar.bz2 for some reason
+
+*imagemagick-5.4.4 (6 Apr 2002)
+
+  6 Apr 2002; Jon Nelson <jnelson@gentoo.org> imagemagick-5.4.4.ebuild :
+
+  Updated to use the latest version of the tarball (5.4.4-4).
+  Removed dependencies on virtual/glibc (because its implicit),
+  and virtual/lpr (because its not needed)
+
+*imagemagick-5.4.4.4 (6 Apr 2002)
+
+  6 Apr 2002; Jon Nelson <jnelson@gentoo.org> imagemagick-5.4.4.4.ebuild :
+
+  Fixed typo in ebuild
+
+*imagemagick-5.4.3-r1 (3 March 2002)
+
+  3 March 2002; M.Schlemmer <azarah@gentoo.org> imagemagick-5.4.3-r1.ebuild :
+
+  Updated to use the latest version of the tarball (5.4.3-8).
+
+*imagemagick-5.4.3 (25 Feb 2002)
 
 *imagemagick-5.4.1 (1 Feb 2002)
 
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 408a7573adb7..3e234e09ac5c 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,10 +1,41 @@
-MD5 b8c364b7292f52ccf1139b939d8cfffb ChangeLog 7268
-MD5 dc74e8fb82df7412137f181c71e7e78b imagemagick-5.4.7.4-r1.ebuild 2098
-MD5 bf4d329c184f350fd905f3e2057bbc32 imagemagick-5.5.3.2.ebuild 3263
-MD5 f654570739726f2d6dfbf2dfab864a62 imagemagick-5.5.4.4.ebuild 3265
-MD5 0634c71038cffccc8ed716213b5924fc imagemagick-5.5.6.ebuild 2430
-MD5 f83c498eca8fc6a0cbd227182619f38e files/digest-imagemagick-5.4.7.4-r1 72
-MD5 f9ff3fba47b4d61edd32eea1aee94731 files/digest-imagemagick-5.5.3.2 72
-MD5 69be221b82f76ec46d241c5e4bff0f12 files/digest-imagemagick-5.5.4.4 72
-MD5 edbc2be86318f2676c55ce64e47ea2f6 files/perlpatch.diff 1598
-MD5 4cd3e2742fa943129dca5d63d0109a42 files/digest-imagemagick-5.5.6 71
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1d054c23cda5a5d73ad576e4d8856379 ChangeLog 24552
+MD5 42fd34630ded62400ed31be1426e3b32 files/digest-imagemagick-6.1.8.8 73
+MD5 b5fd28bb0167a5ab5f5422e7335a5c11 files/digest-imagemagick-6.2.0.4 72
+MD5 3463dd071a5d891ab69d1797c256df76 files/digest-imagemagick-6.2.0.6 72
+MD5 ab68adfb9efb0f004017b018e622b96a files/digest-imagemagick-6.2.1.5 73
+MD5 ab68adfb9efb0f004017b018e622b96a files/digest-imagemagick-6.2.1.5-r1 73
+MD5 0cd85649e1efbcb3e9631a8cde085b60 files/digest-imagemagick-6.2.2.0 73
+MD5 0cd85649e1efbcb3e9631a8cde085b60 files/digest-imagemagick-6.2.2.0-r1 73
+MD5 83dfdae9306c5c8a11423558fe92f6fe files/digest-imagemagick-6.2.2.3 73
+MD5 83dfdae9306c5c8a11423558fe92f6fe files/digest-imagemagick-6.2.2.3-r1 73
+MD5 151be5e2bac5482ef9302c47ce86e1a3 files/digest-imagemagick-6.2.4.2 73
+MD5 151be5e2bac5482ef9302c47ce86e1a3 files/digest-imagemagick-6.2.4.2-r1 73
+MD5 36bddbdde99d4acb74564afdbbfcabae files/digest-imagemagick-6.2.5.2 73
+MD5 4736bc9de8d4560b65df7cc6ce51ba96 files/digest-imagemagick-6.2.5.4 73
+MD5 7f9f2aefd153cd638c79eb85bcc39b00 files/imagemagick-6.1.8.8-fpx.patch 504
+MD5 0437a3eeba135410aca694c2eae65720 files/imagemagick-6.2.5.4-docs.patch 958
+MD5 0ec169e44bbf685be7f25684344ff9a6 files/imagemagick-perlmagick.patch 1193
+MD5 26d349b9ac3126394eca1640b90c1e66 imagemagick-6.1.8.8.ebuild 2317
+MD5 4a944fd0845cf1ffc4651141bb76fbc5 imagemagick-6.2.0.4.ebuild 2281
+MD5 ba4ddb58c87859514dc6fdb4c45d3a0c imagemagick-6.2.0.6.ebuild 2290
+MD5 4c6b5a9b2f6836174c4cd4834f76b67e imagemagick-6.2.1.5-r1.ebuild 2617
+MD5 c065399950638c0256aab63246c0f238 imagemagick-6.2.1.5.ebuild 2592
+MD5 e217021f88f2b1597d5946f36f4f7ec3 imagemagick-6.2.2.0-r1.ebuild 2609
+MD5 3dce9cbb137138524f39515905101a35 imagemagick-6.2.2.0.ebuild 2584
+MD5 44276ac94f4ce41654185285a85dd336 imagemagick-6.2.2.3-r1.ebuild 2658
+MD5 6ddba8488efcce8504bb7c7143f55345 imagemagick-6.2.2.3.ebuild 2582
+MD5 3c5815b5f5801d71e285a0f674393dba imagemagick-6.2.4.2-r1.ebuild 2705
+MD5 f83f94636e500cc9b4e38e637e19eeaa imagemagick-6.2.4.2.ebuild 2678
+MD5 cc6c155e7a58cc1d780b805d3f4fdab1 imagemagick-6.2.5.2.ebuild 2714
+MD5 e02cd9e89244f3179ecfe2aa37a56ecb imagemagick-6.2.5.4.ebuild 2629
+MD5 3dc350be33069338fa083ca16ec11cc8 metadata.xml 224
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD4DBQFDdAZtgIKl8Uu19MoRArMjAJ9+v6W5blGxyAsq0de+Khy58KQzhACYmNip
+tjwxJsneOZVJxqtqJICkig==
+=15xZ
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/files/digest-imagemagick-6.2.0.4 b/media-gfx/imagemagick/files/digest-imagemagick-6.2.0.4
index 4b8f2a6876bf..0044820296a6 100644
--- a/media-gfx/imagemagick/files/digest-imagemagick-6.2.0.4
+++ b/media-gfx/imagemagick/files/digest-imagemagick-6.2.0.4
@@ -1 +1 @@
-MD5 682cb65818a5162dadfbb2b9f9a35796 ImageMagick-6.2.0-4.tar.bz2 4642968
+MD5 121af7abaa9b0997ab64af1cafc30f6a ImageMagick-6.2.0-4.tar.gz 5656116
diff --git a/media-gfx/imagemagick/imagemagick-6.1.8.8.ebuild b/media-gfx/imagemagick/imagemagick-6.1.8.8.ebuild
index d888008378b0..368bf2b6563d 100644
--- a/media-gfx/imagemagick/imagemagick-6.1.8.8.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.1.8.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/media-gfx/imagemagick/imagemagick-6.1.8.8.ebuild,v 1.1 2005/01/17 21:41:37 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.1.8.8.ebuild,v 1.1.1.1 2005/11/30 09:37:34 chriswhite Exp $
 
 inherit libtool flag-o-matic eutils
 
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.imagemagick.org/pub/${MY_PN}/${MY_P2}.tar.bz2"
 LICENSE="as-is"
 SLOT="0"
 # PLEASE BUMP AND UPDATE KEYWORDS OF dev-perl/perlmagick TO MATCH THIS. THANK YOU.
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
 IUSE="X cups jpeg lcms mpeg png truetype tiff xml2 wmf jbig perl graphviz fpx"
 
 DEPEND=">=sys-apps/sed-4
@@ -45,6 +45,7 @@ src_unpack() {
 	cd ${S}
 
 	chmod +x config.sub
+	epatch ${FILESDIR}/${P}-fpx.patch
 }
 
 src_compile() {
@@ -81,8 +82,8 @@ src_install() {
 	#bug 69705
 	rm -f ${D}/usr/lib/libltdl*
 
-	#bug 73464
-	rm -f ${D}/usr/lib/perl5/5.8.6/x86_64-linux/perllocal.pod
+	#bug 73464 and 78740
+	rm -f ${D}/usr/lib/perl5/*/*/perllocal.pod
 
 	dosed "s:-I/usr/include ::" /usr/bin/Magick-config
 	dosed "s:-I/usr/include ::" /usr/bin/Magick++-config
diff --git a/media-gfx/imagemagick/imagemagick-6.2.0.4.ebuild b/media-gfx/imagemagick/imagemagick-6.2.0.4.ebuild
index ef726332efad..814ad02a4da2 100644
--- a/media-gfx/imagemagick/imagemagick-6.2.0.4.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.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/media-gfx/imagemagick/imagemagick-6.2.0.4.ebuild,v 1.1 2005/03/02 23:04:38 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.2.0.4.ebuild,v 1.1.1.1 2005/11/30 09:37:34 chriswhite Exp $
 
 inherit libtool flag-o-matic eutils
 
@@ -11,12 +11,12 @@ MY_P2=${MY_PN}-${PV%.*}-${PV#*.*.*.}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="A collection of tools and libraries for many image formats"
 HOMEPAGE="http://www.imagemagick.org/"
-SRC_URI="ftp://ftp.imagemagick.org/pub/${MY_PN}/${MY_P2}.tar.bz2"
+SRC_URI="ftp://ftp.imagemagick.org/pub/${MY_PN}/${MY_P2}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
 # PLEASE BUMP AND UPDATE KEYWORDS OF dev-perl/perlmagick TO MATCH THIS. THANK YOU.
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
 IUSE="X cups jpeg lcms mpeg png truetype tiff xml2 wmf jbig perl graphviz fpx"
 
 DEPEND=">=sys-apps/sed-4
diff --git a/media-gfx/imagemagick/imagemagick-6.2.0.6.ebuild b/media-gfx/imagemagick/imagemagick-6.2.0.6.ebuild
index 9dc1d7828bf1..541e9eb3d861 100644
--- a/media-gfx/imagemagick/imagemagick-6.2.0.6.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.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/media-gfx/imagemagick/imagemagick-6.2.0.6.ebuild,v 1.1 2005/03/10 21:33:30 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.2.0.6.ebuild,v 1.1.1.1 2005/11/30 09:37:33 chriswhite Exp $
 
 inherit libtool flag-o-matic eutils
 
diff --git a/media-gfx/imagemagick/imagemagick-6.2.1.5-r1.ebuild b/media-gfx/imagemagick/imagemagick-6.2.1.5-r1.ebuild
index 202e4cad569a..2eee02c2118d 100644
--- a/media-gfx/imagemagick/imagemagick-6.2.1.5-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.2.1.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/media-gfx/imagemagick/imagemagick-6.2.1.5-r1.ebuild,v 1.1 2005/05/18 18:24:31 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.2.1.5-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:34 chriswhite Exp $
 
 inherit libtool flag-o-matic eutils perl-module
 
diff --git a/media-gfx/imagemagick/imagemagick-6.2.1.5.ebuild b/media-gfx/imagemagick/imagemagick-6.2.1.5.ebuild
index 1aed02fddd56..51173bf14179 100644
--- a/media-gfx/imagemagick/imagemagick-6.2.1.5.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.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/media-gfx/imagemagick/imagemagick-6.2.1.5.ebuild,v 1.1 2005/04/20 14:47:43 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.2.1.5.ebuild,v 1.1.1.1 2005/11/30 09:37:33 chriswhite Exp $
 
 inherit libtool flag-o-matic eutils perl-module
 
@@ -39,12 +39,8 @@ DEPEND=">=sys-apps/sed-4
 RDEPEND="${DEPEND}
 		>=sys-devel/libtool-1.5.2-r6"
 pkg_setup() {
-	if has_version 'dev-perl/perlmagick'; then
-		eerror "dev-perl/perlmagick is now part of imagemagick,"
-		eerror "please uninstall perlmagick, enable perl USE flag"
-		eerror "and emerge imagemagick again"
-		die "Please, uninstall perlmagick"
-	fi
+		ewarn "Please, remember that dev-perl/perlmagick is now"
+		ewarn "part of media-gfx/imagemagick"
 }
 
 src_unpack() {
diff --git a/media-gfx/imagemagick/imagemagick-6.2.2.0-r1.ebuild b/media-gfx/imagemagick/imagemagick-6.2.2.0-r1.ebuild
index 77b7e148ee9e..b782030e32d2 100644
--- a/media-gfx/imagemagick/imagemagick-6.2.2.0-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.2.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/media-gfx/imagemagick/imagemagick-6.2.2.0-r1.ebuild,v 1.1 2005/05/18 18:24:31 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.2.2.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:34 chriswhite Exp $
 
 inherit libtool flag-o-matic eutils perl-module
 
diff --git a/media-gfx/imagemagick/imagemagick-6.2.2.0.ebuild b/media-gfx/imagemagick/imagemagick-6.2.2.0.ebuild
index b9d167a0bfd4..8e6546ebb0ad 100644
--- a/media-gfx/imagemagick/imagemagick-6.2.2.0.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.2.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/media-gfx/imagemagick/imagemagick-6.2.2.0.ebuild,v 1.1 2005/04/26 19:58:41 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.2.2.0.ebuild,v 1.1.1.1 2005/11/30 09:37:33 chriswhite Exp $
 
 inherit libtool flag-o-matic eutils perl-module
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/imagemagick/${MY_P2}.tar.bz2"
 
 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="X cups jpeg lcms mpeg png truetype tiff xml2 wmf jbig perl graphviz fpx doc"
 
 DEPEND=">=sys-apps/sed-4
@@ -39,12 +39,8 @@ DEPEND=">=sys-apps/sed-4
 RDEPEND="${DEPEND}
 		>=sys-devel/libtool-1.5.2-r6"
 pkg_setup() {
-	if has_version 'dev-perl/perlmagick'; then
-		eerror "dev-perl/perlmagick is now part of imagemagick,"
-		eerror "please uninstall perlmagick, enable perl USE flag"
-		eerror "and emerge imagemagick again"
-		die "Please, uninstall perlmagick"
-	fi
+		ewarn "Please, remember that dev-perl/perlmagick is now"
+		ewarn "part of media-gfx/imagemagick"
 }
 
 src_unpack() {
diff --git a/media-gfx/imagemagick/imagemagick-6.2.2.3-r1.ebuild b/media-gfx/imagemagick/imagemagick-6.2.2.3-r1.ebuild
index 0b402d50c528..5627a2f9279f 100644
--- a/media-gfx/imagemagick/imagemagick-6.2.2.3-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.2.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/media-gfx/imagemagick/imagemagick-6.2.2.3-r1.ebuild,v 1.1 2005/05/18 18:24:31 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.2.2.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:33 chriswhite Exp $
 
 inherit libtool flag-o-matic eutils perl-module
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/imagemagick/${MY_P2}.tar.bz2"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
 IUSE="X cups jpeg lcms mpeg png truetype tiff xml2 wmf jbig perl graphviz fpx doc"
 
 DEPEND=">=sys-apps/sed-4
@@ -49,6 +49,7 @@ src_unpack() {
 	cd ${S}
 
 	chmod +x config.sub
+	epatch ${FILESDIR}/imagemagick-perlmagick.patch
 }
 
 src_compile() {
diff --git a/media-gfx/imagemagick/imagemagick-6.2.2.3.ebuild b/media-gfx/imagemagick/imagemagick-6.2.2.3.ebuild
index 9a7fa7a52153..a081c42beb91 100644
--- a/media-gfx/imagemagick/imagemagick-6.2.2.3.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.2.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/media-gfx/imagemagick/imagemagick-6.2.2.3.ebuild,v 1.1 2005/05/15 15:59:38 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.2.2.3.ebuild,v 1.1.1.1 2005/11/30 09:37:33 chriswhite Exp $
 
 inherit libtool flag-o-matic eutils perl-module
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/imagemagick/${MY_P2}.tar.bz2"
 
 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="X cups jpeg lcms mpeg png truetype tiff xml2 wmf jbig perl graphviz fpx doc"
 
 DEPEND=">=sys-apps/sed-4
diff --git a/media-gfx/imagemagick/imagemagick-6.2.4.2-r1.ebuild b/media-gfx/imagemagick/imagemagick-6.2.4.2-r1.ebuild
index 55e1ee64060c..d8f4636e0542 100644
--- a/media-gfx/imagemagick/imagemagick-6.2.4.2-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.2.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/media-gfx/imagemagick/imagemagick-6.2.4.2-r1.ebuild,v 1.1 2005/10/19 23:10:55 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.2.4.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:34 chriswhite Exp $
 
 inherit libtool flag-o-matic eutils perl-module
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/imagemagick/${MY_P2}.tar.bz2"
 
 LICENSE="as-is"
 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="X cups jpeg lcms mpeg png truetype tiff xml2 wmf jbig perl graphviz fpx doc"
 
 DEPEND=">=sys-apps/sed-4
diff --git a/media-gfx/imagemagick/imagemagick-6.2.4.2.ebuild b/media-gfx/imagemagick/imagemagick-6.2.4.2.ebuild
index aef29cff0b18..991e182e1e06 100644
--- a/media-gfx/imagemagick/imagemagick-6.2.4.2.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.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/media-gfx/imagemagick/imagemagick-6.2.4.2.ebuild,v 1.1 2005/08/25 16:07:16 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.2.4.2.ebuild,v 1.1.1.1 2005/11/30 09:37:34 chriswhite Exp $
 
 inherit libtool flag-o-matic eutils perl-module
 
diff --git a/media-gfx/imagemagick/imagemagick-6.2.5.2.ebuild b/media-gfx/imagemagick/imagemagick-6.2.5.2.ebuild
index 19631294c5f4..9dafe789db9f 100644
--- a/media-gfx/imagemagick/imagemagick-6.2.5.2.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.2.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/media-gfx/imagemagick/imagemagick-6.2.5.2.ebuild,v 1.1 2005/10/19 23:10:55 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.2.5.2.ebuild,v 1.1.1.1 2005/11/30 09:37:34 chriswhite Exp $
 
 inherit libtool flag-o-matic eutils perl-module
 
diff --git a/media-gfx/imagemagick/imagemagick-6.2.5.4.ebuild b/media-gfx/imagemagick/imagemagick-6.2.5.4.ebuild
index 961e95469f21..9267bf561aad 100644
--- a/media-gfx/imagemagick/imagemagick-6.2.5.4.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.2.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/media-gfx/imagemagick/imagemagick-6.2.5.4.ebuild,v 1.1 2005/11/05 07:18:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.2.5.4.ebuild,v 1.1.1.1 2005/11/30 09:37:34 chriswhite Exp $
 
 inherit eutils perl-module multilib
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/imagemagick/${MY_P2}.tar.bz2"
 
 LICENSE="as-is"
 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="bzip2 doc fpx graphviz gs jbig jpeg lcms mpeg nocxx perl png tiff truetype X wmf xml2 zlib"
 
 RDEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/media-gfx/imagemagick/metadata.xml b/media-gfx/imagemagick/metadata.xml
index c90d8d48bd03..6eb9e63e12b6 100644
--- a/media-gfx/imagemagick/metadata.xml
+++ b/media-gfx/imagemagick/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>media-gfx</herd>
+<herd>graphics</herd>
 <maintainer>
-<email>graphics@gentoo.org</email>
+<email>sekretarz@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/media-gfx/imgseek/ChangeLog b/media-gfx/imgseek/ChangeLog
index dda4c6c82dcf..0f544cf09312 100644
--- a/media-gfx/imgseek/ChangeLog
+++ b/media-gfx/imgseek/ChangeLog
@@ -1,9 +1,39 @@
 # ChangeLog for media-gfx/imgseek
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imgseek/ChangeLog,v 1.1 2003/09/23 02:04:28 avenj Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imgseek/ChangeLog,v 1.1.1.1 2005/11/30 09:37:42 chriswhite Exp $
+
+  22 Jul 2005; David Holm <dholm@gentoo.org> imgseek-0.8.5.ebuild:
+  Added to ~ppc.
+
+*imgseek-0.8.5 (21 Apr 2005)
+
+  21 Apr 2005; Carsten Lohrke <carlo@gentoo.org> +imgseek-0.8.5.ebuild:
+  version bump, proper desktop entry
+
+  06 Mar 2005; Sven Wegener <swegener@gentoo.org> :
+  Added missing digest entries.
+
+  06 Mar 2005; Carsten Lohrke <carlo@gentoo.org>
+  -files/imgSeek-0.8.4-sizetype.patch, imgseek-0.8.4.ebuild:
+  removing large patch from cvs
+
+*imgseek-0.8.4 (22 Feb 2005)
+
+  22 Feb 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/imgSeek-0.8.4-sizetype.patch, +imgseek-0.8.4.ebuild:
+  version bump and PyQt 3.14 compatibility patch
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  19 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> imgseek-0.8.2.ebuild:
+  dev-python/Imaging renamed to dev-python/imaging.
+
+  14 Mar 2004; Jon Portnoy <avenj@gentoo.org> imgseek-0.8.2.ebuild :
+  AMD64 keywords.
 
 *imgseek-0.8.2 (22 Sep 2003)
 
-    22 Sep 2003; Jon Portnoy <avenj@gentoo.org> imgseek-0.8.2.ebuild :
-    Initial import. Submitted in bug 20186 by Ricardo Niederberger 
-    <nieder@mail.ru>.
+  22 Sep 2003; Jon Portnoy <avenj@gentoo.org> imgseek-0.8.2.ebuild :
+  Initial import. Submitted in bug 20186 by Ricardo Niederberger 
+  <nieder@mail.ru>.
diff --git a/media-gfx/imgseek/Manifest b/media-gfx/imgseek/Manifest
index 38d8a8b68dd6..a4bf018b26ef 100644
--- a/media-gfx/imgseek/Manifest
+++ b/media-gfx/imgseek/Manifest
@@ -1,3 +1,7 @@
-MD5 27c159b4c9abee94673298e63be667cc imgseek-0.8.2.ebuild 670
-MD5 e49fe10a949831210deab0f3195fe1df files/digest-imgseek-0.8.1 66
+MD5 c79a75ead564bd7b1bee22ea88784307 ChangeLog 1357
+MD5 c4bc6a7297b40b8706d33906d861427c imgseek-0.8.2.ebuild 763
+MD5 62132720297b33b9dabea827d17bf48f imgseek-0.8.4.ebuild 940
+MD5 7ffa6a4dc7ce5a4ff94ba0a2831a8862 imgseek-0.8.5.ebuild 928
 MD5 8551a8f7682f14334f01f842c0f48153 files/digest-imgseek-0.8.2 66
+MD5 9ea66abd8c3bb3bedbafcf7e5a5351a7 files/digest-imgseek-0.8.4 144
+MD5 2fe1e8533251cf13f2efd0dc26b36f43 files/digest-imgseek-0.8.5 66
diff --git a/media-gfx/imgseek/files/digest-imgseek-0.8.4 b/media-gfx/imgseek/files/digest-imgseek-0.8.4
index b502d5ae80f3..8f624db93a84 100644
--- a/media-gfx/imgseek/files/digest-imgseek-0.8.4
+++ b/media-gfx/imgseek/files/digest-imgseek-0.8.4
@@ -1 +1,2 @@
 MD5 6b79e7e7e588fa9afa71240d5c2d0b52 imgSeek-0.8.4.tar.bz2 375144
+MD5 294ff536569752c3578fac614eddc259 imgSeek-0.8.4-sizetype.patch.tar.gz 8168
diff --git a/media-gfx/imgseek/imgseek-0.8.2.ebuild b/media-gfx/imgseek/imgseek-0.8.2.ebuild
index 6693a1c84e6e..14f3e4108c0b 100644
--- a/media-gfx/imgseek/imgseek-0.8.2.ebuild
+++ b/media-gfx/imgseek/imgseek-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/media-gfx/imgseek/imgseek-0.8.2.ebuild,v 1.1 2003/09/23 02:04:28 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imgseek/imgseek-0.8.2.ebuild,v 1.1.1.1 2005/11/30 09:37:42 chriswhite Exp $
 
 S=${WORKDIR}/imgSeek-${PV}
 DESCRIPTION="Photo collection manager with content-based search."
@@ -8,12 +8,12 @@ HOMEPAGE="http://imgseek.sourceforge.net/"
 SRC_URI="mirror://sourceforge/imgseek/imgSeek-${PV}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE="qt"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
 
 DEPEND=">=dev-lang/python-2.2
 	>=dev-python/PyQt-3.5
-	dev-python/Imaging"
+	dev-python/imaging"
 
 src_compile() {
 
diff --git a/media-gfx/imgseek/imgseek-0.8.4.ebuild b/media-gfx/imgseek/imgseek-0.8.4.ebuild
index bf4df021dc43..0ce2616ab3a2 100644
--- a/media-gfx/imgseek/imgseek-0.8.4.ebuild
+++ b/media-gfx/imgseek/imgseek-0.8.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/media-gfx/imgseek/imgseek-0.8.4.ebuild,v 1.1 2005/02/22 21:05:17 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imgseek/imgseek-0.8.4.ebuild,v 1.1.1.1 2005/11/30 09:37:42 chriswhite Exp $
 
 inherit eutils
 
@@ -8,7 +8,8 @@ MY_P="imgSeek-${PV}"
 S="${WORKDIR}/${MY_P}"
 DESCRIPTION="Photo collection manager with content-based search."
 HOMEPAGE="http://imgseek.sourceforge.net/"
-SRC_URI="mirror://sourceforge/imgseek/${MY_P}.tar.bz2"
+SRC_URI="mirror://sourceforge/imgseek/${MY_P}.tar.bz2
+	http://dev.gentoo.org/~carlo/patches/${MY_P}-sizetype.patch.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
@@ -21,7 +22,7 @@ DEPEND=">=dev-lang/python-2.2
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${MY_P}-sizetype.patch
+	epatch ${WORKDIR}/${MY_P}-sizetype.patch
 }
 
 src_compile() {
diff --git a/media-gfx/imgseek/imgseek-0.8.5.ebuild b/media-gfx/imgseek/imgseek-0.8.5.ebuild
index 6130f02abfe5..14b955f01349 100644
--- a/media-gfx/imgseek/imgseek-0.8.5.ebuild
+++ b/media-gfx/imgseek/imgseek-0.8.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/media-gfx/imgseek/imgseek-0.8.5.ebuild,v 1.1 2005/04/21 16:05:24 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imgseek/imgseek-0.8.5.ebuild,v 1.1.1.1 2005/11/30 09:37:42 chriswhite Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/imgseek/${MY_P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND=">=dev-lang/python-2.2
diff --git a/media-gfx/imlib2_tools/ChangeLog b/media-gfx/imlib2_tools/ChangeLog
index 3476ef40b965..c9a430aa5019 100644
--- a/media-gfx/imlib2_tools/ChangeLog
+++ b/media-gfx/imlib2_tools/ChangeLog
@@ -1,8 +1,27 @@
 # ChangeLog for media-gfx/imlib2_tools
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imlib2_tools/ChangeLog,v 1.1 2003/02/20 12:38:36 vapier Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imlib2_tools/ChangeLog,v 1.1.1.1 2005/11/30 09:37:25 chriswhite Exp $
 
-*imlib2_tools-0.0.0.20030220 (20 Feb 2003)
+*imlib2_tools-0.0.0.20031013_alpha2 (13 Oct 2003)
+
+  13 Oct 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump.
+
+*imlib2_tools-0.0.0.20030907_alpha2 (18 Sep 2003)
+
+  18 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump to fix #28891.
+
+*imlib2_tools-0.0.0.20030629_alpha2 (29 Jun 2003)
+
+  29 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump.
+
+*imlib2_tools-0.0.0.20030220_alpha2 (20 Feb 2003)
+
+  13 Mar 2003; Aron Griffis <agriffis@gentoo.org>
+  imlib2_tools-0.0.0.20030220_alpha2.ebuild:
+  Add ~alpha to KEYWORDS
 
   20 Feb 2003; Mike Frysinger <vapier@gentoo.org> :
   Initial import.  Ebuild submitted by me.
diff --git a/media-gfx/imlib2_tools/Manifest b/media-gfx/imlib2_tools/Manifest
index e69de29bb2d1..0a3d877a7086 100644
--- a/media-gfx/imlib2_tools/Manifest
+++ b/media-gfx/imlib2_tools/Manifest
@@ -0,0 +1,4 @@
+MD5 3b500a0143a54437e42f08c38df84967 ChangeLog 860
+MD5 30a85e20de50b5fb2da4b097ebd1f2e8 imlib2_tools-0.0.0.20031013_alpha2.ebuild 390
+MD5 76398c6b1c0d1426f97b0d9a12d91a50 files/0.0.0.20030907_alpha2-imlib-config.patch 606
+MD5 ee8c4ee558ebe0f6bebdf532234aeaec files/digest-imlib2_tools-0.0.0.20031013_alpha2 86
diff --git a/media-gfx/imlib2_tools/imlib2_tools-0.0.0.20031013_alpha2.ebuild b/media-gfx/imlib2_tools/imlib2_tools-0.0.0.20031013_alpha2.ebuild
index f80cc9521d35..d5f2439decd1 100644
--- a/media-gfx/imlib2_tools/imlib2_tools-0.0.0.20031013_alpha2.ebuild
+++ b/media-gfx/imlib2_tools/imlib2_tools-0.0.0.20031013_alpha2.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/media-gfx/imlib2_tools/imlib2_tools-0.0.0.20031013_alpha2.ebuild,v 1.1 2003/10/14 03:17:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imlib2_tools/imlib2_tools-0.0.0.20031013_alpha2.ebuild,v 1.1.1.1 2005/11/30 09:37:25 chriswhite Exp $
 
 EHACKAUTOGEN=yes
 inherit enlightenment
diff --git a/media-gfx/inkscape/ChangeLog b/media-gfx/inkscape/ChangeLog
index 5b4d15390536..2bc0549b6efc 100644
--- a/media-gfx/inkscape/ChangeLog
+++ b/media-gfx/inkscape/ChangeLog
@@ -1,8 +1,139 @@
 # ChangeLog for media-gfx/inkscape
-# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.1 2004/02/18 15:43:59 zypher Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.1.1.1 2005/11/30 09:37:23 chriswhite Exp $
 
-*inkscape-0.37 (15. Feb 2004)
+  22 Nov 2005; Chris White <chriswhite@gentoo.org> inkscape-0.43.ebuild:
+  x86 stable wrt bug #109993.
+
+  22 Nov 2005; Simon Stelling <blubb@gentoo.org> inkscape-0.43.ebuild:
+  stable on amd64 wrt bug 109993
+
+  22 Nov 2005; Markus Rothe <corsair@gentoo.org> inkscape-0.43.ebuild:
+  Stable on ppc64; bug #109993
+
+*inkscape-0.43 (22 Nov 2005)
+
+  22 Nov 2005; Karol Wojtaszek <sekretarz@gentoo.org> inkscape-0.42.ebuild,
+  +inkscape-0.43.ebuild:
+  Version bump, this release fixes security bug #109993. Updated
+  dev-libs/libxml2 depend, bug #108131
+
+  19 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> inkscape-0.42.2.ebuild:
+  Depend on a gcc equal or major than 3, as it seems to work fine with gcc4.
+
+  30 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  inkscape-0.42.2.ebuild:
+  Stable on ppc.
+
+  30 Aug 2005; Markus Rothe <corsair@gentoo.org> inkscape-0.42.2.ebuild:
+  Stable on ppc64 (bug #101842)
+
+  30 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  inkscape-0.42.2.ebuild:
+  Stable on sparc wrt #101842
+
+  30 Aug 2005; Simon Stelling <blubb@gentoo.org> inkscape-0.42.2.ebuild:
+  stable on amd64 wrt bug 101842
+
+*inkscape-0.42.2 (29 Aug 2005)
+
+  29 Aug 2005; Marcelo Goes <vanquirius@gentoo.org> +inkscape-0.42.2.ebuild:
+  Version bump. Should fix bug 104006, bug 101842 and bug 101637. x86 stable
+  because of bug 101842.
+
+  28 Aug 2005; Markus Rothe <corsair@gentoo.org> inkscape-0.42.ebuild:
+  added ~ppc64
+
+*inkscape-0.42 (30 Jul 2005)
+
+  30 Jul 2005; <sekretarz@gentoo.org> +inkscape-0.42.ebuild:
+  Version bump, bug #100386
+
+  05 Jul 2005; Marc Hildebrand <zypher@gentoo.org>
+  inkscape-0.41-r1.ebuild:
+  Stable on x86
+
+  27 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  inkscape-0.41-r1.ebuild:
+  Stable on sparc
+
+  11 Jun 2005; Markus Rothe <corsair@gentoo.org> inkscape-0.41-r1.ebuild:
+  Stable on ppc64; bug #92995
+
+  10 Jun 2005; Joseph Jezak <josejx@gentoo.org> inkscape-0.41-r1.ebuild:
+  Marked ppc stable.
+
+  10 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  inkscape-0.40-r1.ebuild:
+  Stable on sparc wrt #92995
+
+  09 Jun 2005; <sekretarz@gentoo.org> inkscape-0.41-r1.ebuild:
+  Stable on amd64, bug #92995
+
+  05 Jun 2005; Markus Rothe <corsair@gentoo.org> inkscape-0.41.ebuild:
+  Stable on ppc64; bug #92995
+
+  24 May 2005; Marc Hildebrand <zypher@gentoo.org> inkscape-0.41-r1.ebuild:
+  Added inkscape-0.41-configure.ac.patch, should close bug #84323
+  Thanks to motaboy for the actual work on this.
+
+  21 May 2005; Markus Rothe <corsair@gentoo.org> inkscape-0.41.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  27 Apr 2005; Karol Wojtaszek <sekretarz@gentoo.org> inkscape-0.41.ebuild:
+  dev-libs/libxslt added to DEPEND, bug #86629
+
+  06 Apr 2005; Markus Rothe <corsair@gentoo.org> inkscape-0.40-r1.ebuild:
+  Stable on ppc64
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> inkscape-0.41.ebuild:
+  Added ~sparc keyword wrt bug #86280.
+
+*inkscape-0.41 (22 Mar 2005)
+
+  22 Mar 2005; Karol Wojtaszek <sekretarz@gentoo.org>
+  +files/inkscape-0.41_gnome-print.patch, +inkscape-0.41.ebuild:
+  Version bump, bug #81529
+
+  28 Feb 2005; Markus Rothe <corsair@gentoo.org> inkscape-0.40-r1.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  19 Jan 2005; Marc Hildebrand <zypher@gentoo.org> inkscape-0.40-r1.ebuild:
+  Added Radial-patch, closes bug #78592. Thanks to Jens Ansorg for
+  the patch.
+
+  22 Dec 2004; Hanno Boeck <hanno@gentoo.org> inkscape-0.37.ebuild,
+  inkscape-0.38.ebuild:
+  Fix libsigc++-dep in all versions of the ebuild (bug #66342).
+
+*inkscape-0.40 (07 Dec 2004)
+
+  07 Dec 2004; Chris Bainbridge <chrb@gentoo.org> +inkscape-0.40.ebuild:
+  Version bump.
+
+*inkscape-0.39 (18 Jul 2004)
+
+  18 Jul 2004; Marc Hildebrand <zypher@gentoo.org> :
+  Version bump.
+
+*inkscape-0.38.1 (14 Jun 2004)
+
+  14 Jun 2004; Hanno Boeck <hanno@gentoo.org> +files/string.patch,
+  inkscape-0.38.1.ebuild:
+  Compilation fix for gcc 3.4.
+
+  25 May 2004; Marc Hildebrand <zypher@gentoo.org> inkscape-0.38.1.ebuild:
+  Changed libsigc++ dep from >=v.1.2 to =v.1.2* resolves bug #51325.
+
+  02 May 2004; Jason Wever <weeve@gentoo.org> inkscape-0.38.1.ebuild:
+  Added ~sparc keyword, resolves bug #49703.
+
+*inkscape-0.38 (07 Apr 2004)
+
+  09 Apr 2004; Marc Hildebrand <zypher@gentoo.org> :
+  Version bump.
+
+*inkscape-0.37 (15 Feb 2004)
 
   18 Feb 2004; Marc Hildebrand <zypher@gentoo.org> :
   Initial ebuild.
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index ad89e2a0e3a4..4dca7382af21 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,2 +1,38 @@
-MD5 b95ae81b69c504126f19a09f47951d84 inkscape-0.37.ebuild 1081
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 240974d91790d179edb2b847e002b2d6 inkscape-0.41.ebuild 2120
+MD5 45828204906035f66f3428b9f2f53eca metadata.xml 223
+MD5 56df37cd00502e6ca07fe0fe22b59482 inkscape-0.38.ebuild 1020
+MD5 d1d310cc6a47d0546149021847424c00 ChangeLog 4508
+MD5 d0b3db2f31f409e820730c52d9cb6810 inkscape-0.40.ebuild 1175
+MD5 4c583041c079432faa856dc42cf0c117 inkscape-0.41-r1.ebuild 2294
+MD5 b7eec73faa910b3210eabe052f56dcb1 inkscape-0.42.ebuild 1823
+MD5 5be04a05a47091a211b362eea872f498 inkscape-0.40-r1.ebuild 1256
+MD5 1b9cd1b4f6b5955dbfd427741488fee2 inkscape-0.39.ebuild 1129
+MD5 dc737b2039d3e51cf505eea83e106b33 inkscape-0.42.2.ebuild 1819
+MD5 c1fc5c1332bb5b9d342a077d86f7ed15 inkscape-0.38.1.ebuild 1100
+MD5 43f345619b8fb7c94ce9a6839d5b1ce4 inkscape-0.37.ebuild 1018
+MD5 014f0ef9fee0356daa864f01ef76a2ee inkscape-0.43.ebuild 1821
+MD5 8d23195ea09e60622c134e6d6af1b0a7 files/digest-inkscape-0.41-r1 67
+MD5 6d1db27dd1b71567662b3e58b3bfed8b files/inkscape-0.41-configure.ac.patch 514
+MD5 5a2e7c990f27ecf4a864bc72a8324695 files/0.40-radial.patch 487
+MD5 96ffe3671e95f776e9e90718e5e3132a files/string.patch 489
+MD5 4908ac96c1846e705c50d6b56f2cf30c files/digest-inkscape-0.39 66
+MD5 2d24a0a0111fe735750b605a505f2813 files/digest-inkscape-0.42.2 69
 MD5 43383d33f039e916a8092b3703f3ede2 files/digest-inkscape-0.37 66
+MD5 2a6db3de949e36fe3ec3ecbca9c26f3e files/inkscape-0.41_gnome-print.patch 404
+MD5 89c95424c23f934760231c805597a979 files/digest-inkscape-0.42 67
+MD5 1fc3e80f4d06574fbcc24e8647d4cb96 files/digest-inkscape-0.40 66
+MD5 f26304c2cdbb3d60e92ec483a23d6bf4 files/digest-inkscape-0.43 67
+MD5 8d23195ea09e60622c134e6d6af1b0a7 files/digest-inkscape-0.41 67
+MD5 2351ba855aa9cbb514d6b9d61c29158b files/digest-inkscape-0.38 66
+MD5 1fc3e80f4d06574fbcc24e8647d4cb96 files/digest-inkscape-0.40-r1 66
+MD5 2e95c9a487b220b70e9d2a0485316ff4 files/digest-inkscape-0.38.1 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDg30tFdQwWVoAgN4RAifjAKDvAWYRVFgMTO4bJeq52b3mVyTlRACfd08X
+g8MEkWb3SExGrqHOx78796c=
+=kAez
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/inkscape/inkscape-0.37.ebuild b/media-gfx/inkscape/inkscape-0.37.ebuild
index 5d14e173216c..f70d9d88dbe5 100644
--- a/media-gfx/inkscape/inkscape-0.37.ebuild
+++ b/media-gfx/inkscape/inkscape-0.37.ebuild
@@ -1,41 +1,37 @@
-# 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/media-gfx/inkscape/inkscape-0.37.ebuild,v 1.1 2004/02/18 15:43:59 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.37.ebuild,v 1.1.1.1 2005/11/30 09:37:24 chriswhite Exp $
 
 inherit gnome2
 
-DESCRIPTION="A vector drawing program for GNOME initially based on sodipodi"
+DESCRIPTION="A SVG based generic vector-drawing program"
 HOMEPAGE="http://www.inkscape.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS="x86 ~ppc amd64"
 IUSE="gnome mmx"
 
 RDEPEND=">=x11-libs/gtk+-2.2.4
 	>=media-libs/libart_lgpl-2.3.16
-	>=dev-libs/atk-1.4.1
 	>=dev-libs/libxml2-2.6.4
 	virtual/xft
 	media-libs/fontconfig
 	dev-libs/popt
 	sys-libs/zlib
 	media-libs/libpng
-	>=x11-libs/pango-1.2.5
-	>=dev-libs/libsigc++-1.2.5
-	gnome? ( >=gnome-base/librsvg-2.4.0
-	        >=gnome-base/libgnomeprint-2.2
+	=dev-libs/libsigc++-1.2*
+	gnome? ( >=gnome-base/libgnomeprint-2.2
 		>=gnome-base/libgnomeprintui-2.2 )"
 
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	dev-util/pkgconfig
-	>=dev-util/intltool-0.22"
+	>=dev-util/intltool-0.29"
 
-G2CONF="${G2CONF} `use_enable mmx` `use_with gnome`"
 G2CONF="${G2CONF} --with-xft --with-popt"
-# disable experimental features for now
-G2CONF="${G2CONF} --without-mlview --without-kde"
+use mmx || G2CONF="${G2CONF} --disable-mmx"
+use gnome && G2CONF="${G2CONF} --with-gnome-print"
 
-DOCS="AUTHORS COPYING ChangeLog HACKING NEWS README TODO"
+DOCS="AUTHORS COPYING ChangeLog HACKING NEWS README"
diff --git a/media-gfx/inkscape/inkscape-0.38.1.ebuild b/media-gfx/inkscape/inkscape-0.38.1.ebuild
index adf21466efd5..a737a3d57f02 100644
--- a/media-gfx/inkscape/inkscape-0.38.1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.38.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/media-gfx/inkscape/inkscape-0.38.1.ebuild,v 1.1 2004/04/19 05:29:04 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.38.1.ebuild,v 1.1.1.1 2005/11/30 09:37:24 chriswhite Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="A SVG based generic vector-drawing program"
 HOMEPAGE="http://www.inkscape.org/"
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
 IUSE="gnome mmx"
 
 RDEPEND=">=x11-libs/gtk+-2.2.4
@@ -21,7 +21,7 @@ RDEPEND=">=x11-libs/gtk+-2.2.4
 	dev-libs/popt
 	sys-libs/zlib
 	media-libs/libpng
-	>=dev-libs/libsigc++-1.2
+	=dev-libs/libsigc++-1.2*
 	gnome? ( >=gnome-base/libgnomeprint-2.2
 		>=gnome-base/libgnomeprintui-2.2 )"
 
@@ -34,4 +34,9 @@ G2CONF="${G2CONF} --with-xft --with-popt"
 use mmx || G2CONF="${G2CONF} --disable-mmx"
 use gnome && G2CONF="${G2CONF} --with-gnome-print"
 
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/string.patch
+}
+
 DOCS="AUTHORS COPYING ChangeLog HACKING NEWS README"
diff --git a/media-gfx/inkscape/inkscape-0.38.ebuild b/media-gfx/inkscape/inkscape-0.38.ebuild
index 6f8c95224e48..36c51ae15be8 100644
--- a/media-gfx/inkscape/inkscape-0.38.ebuild
+++ b/media-gfx/inkscape/inkscape-0.38.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/media-gfx/inkscape/inkscape-0.38.ebuild,v 1.1 2004/04/09 12:58:16 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.38.ebuild,v 1.1.1.1 2005/11/30 09:37:23 chriswhite Exp $
 
 inherit gnome2
 
@@ -21,7 +21,7 @@ RDEPEND=">=x11-libs/gtk+-2.2.4
 	dev-libs/popt
 	sys-libs/zlib
 	media-libs/libpng
-	>=dev-libs/libsigc++-1.2
+	=dev-libs/libsigc++-1.2*
 	gnome? ( >=gnome-base/libgnomeprint-2.2
 		>=gnome-base/libgnomeprintui-2.2 )"
 
diff --git a/media-gfx/inkscape/inkscape-0.39.ebuild b/media-gfx/inkscape/inkscape-0.39.ebuild
index 79f279339572..a325779268bb 100644
--- a/media-gfx/inkscape/inkscape-0.39.ebuild
+++ b/media-gfx/inkscape/inkscape-0.39.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/media-gfx/inkscape/inkscape-0.39.ebuild,v 1.1 2004/07/18 16:32:50 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.39.ebuild,v 1.1.1.1 2005/11/30 09:37:24 chriswhite Exp $
 
 inherit gnome2 eutils
 
@@ -17,11 +17,13 @@ RDEPEND=">=x11-libs/gtk+-2.4.1
 	>=media-libs/libart_lgpl-2.3.16
 	>=dev-libs/libxml2-2.6.7
 	>=x11-libs/pango-1.4.0
+	dev-perl/XML-Parser
 	virtual/xft
 	media-libs/fontconfig
 	dev-libs/popt
 	sys-libs/zlib
 	media-libs/libpng
+	=sys-devel/gcc-3*
 	=dev-libs/libsigc++-1.2*
 	gnome? ( >=gnome-base/libgnomeprint-2.2
 		>=gnome-base/libgnomeprintui-2.2 )"
diff --git a/media-gfx/inkscape/inkscape-0.40-r1.ebuild b/media-gfx/inkscape/inkscape-0.40-r1.ebuild
index 87f59f3875db..bc89139d1c78 100644
--- a/media-gfx/inkscape/inkscape-0.40-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.40-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/media-gfx/inkscape/inkscape-0.40-r1.ebuild,v 1.1 2005/01/19 20:31:13 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.40-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:23 chriswhite Exp $
 
 inherit gnome2 eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+KEYWORDS="~x86 ~ppc ~amd64 sparc ppc64"
 IUSE="gnome mmx doc"
 
 RDEPEND=">=x11-libs/gtk+-2.4.1
diff --git a/media-gfx/inkscape/inkscape-0.40.ebuild b/media-gfx/inkscape/inkscape-0.40.ebuild
index a5fc08080db9..b653da328933 100644
--- a/media-gfx/inkscape/inkscape-0.40.ebuild
+++ b/media-gfx/inkscape/inkscape-0.40.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/media-gfx/inkscape/inkscape-0.40.ebuild,v 1.1 2004/12/07 23:31:53 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.40.ebuild,v 1.1.1.1 2005/11/30 09:37:23 chriswhite Exp $
 
 inherit gnome2 eutils
 
diff --git a/media-gfx/inkscape/inkscape-0.41-r1.ebuild b/media-gfx/inkscape/inkscape-0.41-r1.ebuild
index 2b88834d764a..33d6710483b6 100644
--- a/media-gfx/inkscape/inkscape-0.41-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.41-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/media-gfx/inkscape/inkscape-0.41-r1.ebuild,v 1.1 2005/05/24 21:23:59 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.41-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:23 chriswhite Exp $
 
 inherit gnome2 eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="gnome mmx perl python bonobo inkjar doc plugin spell"
 
 RDEPEND=">=x11-libs/gtk+-2.4.1
diff --git a/media-gfx/inkscape/inkscape-0.41.ebuild b/media-gfx/inkscape/inkscape-0.41.ebuild
index 2059271577c0..a995d427ac09 100644
--- a/media-gfx/inkscape/inkscape-0.41.ebuild
+++ b/media-gfx/inkscape/inkscape-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/media-gfx/inkscape/inkscape-0.41.ebuild,v 1.1 2005/03/22 18:00:42 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.41.ebuild,v 1.1.1.1 2005/11/30 09:37:23 chriswhite Exp $
 
 inherit gnome2 eutils
 
@@ -10,13 +10,14 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc ppc64 ~sparc ~x86"
 IUSE="gnome mmx perl python bonobo inkjar doc plugin"
 
 RDEPEND=">=x11-libs/gtk+-2.4.1
 	>=media-libs/libart_lgpl-2.3.16
 	>=dev-libs/libxml2-2.6.7
 	>=x11-libs/pango-1.4.0
+	>=dev-libs/libxslt-1.0.15
 	dev-perl/XML-Parser
 	virtual/xft
 	dev-libs/popt
diff --git a/media-gfx/inkscape/inkscape-0.42.2.ebuild b/media-gfx/inkscape/inkscape-0.42.2.ebuild
index cd6c7061a016..4800a5dacfc1 100644
--- a/media-gfx/inkscape/inkscape-0.42.2.ebuild
+++ b/media-gfx/inkscape/inkscape-0.42.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/media-gfx/inkscape/inkscape-0.42.2.ebuild,v 1.1 2005/08/29 16:11:57 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.42.2.ebuild,v 1.1.1.1 2005/11/30 09:37:24 chriswhite Exp $
 
 inherit gnome2 eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="gnome mmx perl python bonobo inkjar doc plugin effects spell"
 
 RDEPEND=">=x11-libs/gtk+-2.4.1
@@ -24,7 +24,7 @@ RDEPEND=">=x11-libs/gtk+-2.4.1
 	media-libs/fontconfig
 	sys-libs/zlib
 	media-libs/libpng
-	=sys-devel/gcc-3*
+	>=sys-devel/gcc-3
 	>=dev-libs/libsigc++-2.0.3
 	>=dev-cpp/gtkmm-2.4
 	dev-cpp/glibmm
diff --git a/media-gfx/inkscape/inkscape-0.42.ebuild b/media-gfx/inkscape/inkscape-0.42.ebuild
index a4c42e0746a4..9bf0a7ab5317 100644
--- a/media-gfx/inkscape/inkscape-0.42.ebuild
+++ b/media-gfx/inkscape/inkscape-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/media-gfx/inkscape/inkscape-0.42.ebuild,v 1.1 2005/07/30 10:03:27 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.42.ebuild,v 1.1.1.1 2005/11/30 09:37:23 chriswhite Exp $
 
 inherit gnome2 eutils
 
@@ -10,12 +10,12 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="gnome mmx perl python bonobo inkjar doc plugin effects spell"
 
 RDEPEND=">=x11-libs/gtk+-2.4.1
 	>=media-libs/libart_lgpl-2.3.16
-	>=dev-libs/libxml2-2.6.7
+	>=dev-libs/libxml2-2.6.20
 	>=x11-libs/pango-1.4.0
 	>=dev-libs/libxslt-1.0.15
 	dev-perl/XML-Parser
diff --git a/media-gfx/inkscape/inkscape-0.43.ebuild b/media-gfx/inkscape/inkscape-0.43.ebuild
index a12dd4c3b66e..815b2085c3ce 100644
--- a/media-gfx/inkscape/inkscape-0.43.ebuild
+++ b/media-gfx/inkscape/inkscape-0.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/media-gfx/inkscape/inkscape-0.43.ebuild,v 1.1 2005/11/22 15:14:35 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.43.ebuild,v 1.1.1.1 2005/11/30 09:37:24 chriswhite Exp $
 
 inherit gnome2 eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ppc64 ~sparc x86"
 IUSE="gnome mmx perl python bonobo inkjar doc plugin effects spell"
 
 RDEPEND=">=x11-libs/gtk+-2.4.1
diff --git a/media-gfx/iv/ChangeLog b/media-gfx/iv/ChangeLog
index 5f193a7b9a8f..3681b63becb9 100644
--- a/media-gfx/iv/ChangeLog
+++ b/media-gfx/iv/ChangeLog
@@ -1,10 +1,37 @@
 # ChangeLog for media-gfx/iv
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# Maintainer: George Shapovalov <george@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/iv/ChangeLog,v 1.1 2002/05/16 04:46:37 george Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/iv/ChangeLog,v 1.1.1.1 2005/11/30 09:37:16 chriswhite Exp $
 
-*iv-0.1.9 (15 May 2002)
+*iv-1.3.2 (09 Nov 2005)
+
+  09 Nov 2005; Marcelo Goes <vanquirius@gentoo.org> +metadata.xml,
+  +iv-1.3.2.ebuild:
+  1.3.2 version bump, add to graphics herd in metadata.xml. Fixes bug 111964.
+  Thanks to Alexandru Toma <flash3001 at yahoo dot com>.
+
+  15 Aug 2005; Luca Barbato <lu_zero@gentoo.org> iv-1.2.1.ebuild:
+  Marked ppc and x86 stable
+
+*iv-1.2.1 (13 Apr 2005)
+
+  13 Apr 2005; Luca Barbato <lu_zero@gentoo.org> +iv-1.2.1.ebuild:
+  New ebuild, thanks to Alexandru Toma <flash3001@yahoo.com> for providing it
 
-	15 May 2002; George Shapovalov <george@gentoo.org> iv-0.1.9.ebuild,Changelog,files/digest-iv-0.1.9 :
+*iv-0.1.10 (24 Apr 2003)
+
+  24 Apr 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bumpage
+
+*iv-0.1.9-r1 (30 Oct 2002)
+
+  30 Oct 2002; Brandon Low <lostlogic@gentoo.org> iv-0.1.9-r1.ebuild :
+  Make work with things the way they are.  Let me know if it works in
+  glibc-2.2.5 and or gcc-2.95.3 systems.
+
+*iv-0.1.9 (15 May 2002)
 
-	Initial release
+  16 May 2002; George Shapovalov <george@gentoo.org> iv-0.1.9.ebuild :
+  updated DEPEND entry per Pedro Fiol's clarification
+	
+  15 May 2002; George Shapovalov <george@gentoo.org> iv-0.1.9.ebuild,Changelog,files/digest-iv-0.1.9 :
+  Initial release
diff --git a/media-gfx/iv/Manifest b/media-gfx/iv/Manifest
index e69de29bb2d1..b796e2013fbf 100644
--- a/media-gfx/iv/Manifest
+++ b/media-gfx/iv/Manifest
@@ -0,0 +1,9 @@
+MD5 02a56d86cc2a510727f72648943ac213 iv-1.3.2.ebuild 1344
+MD5 0d43f70b343e5f992e5fb5a56dfbeb53 iv-1.2.1.ebuild 1339
+MD5 4ddb17c25723ef82647fcbdb8a60c024 ChangeLog 1297
+MD5 5fc54c5d01402d0610fafa96961bb8e0 metadata.xml 161
+MD5 805db42ed613adaf7151f91f9af0b0b3 iv-0.1.10.ebuild 743
+MD5 731bbb3f7376e225e06b79b3df8cc9c9 files/digest-iv-0.1.10 62
+MD5 d6cc30815320be37168254ee7f0fed8e files/digest-iv-1.2.1 61
+MD5 d9f49cb784a7189e9ccfaa978d7aca1a files/digest-iv-1.3.2 61
+MD5 c39cdd7fa9ad99b575e835c73126c25c files/iv-0.1.10-gentoo.patch 283
diff --git a/media-gfx/iv/iv-0.1.10.ebuild b/media-gfx/iv/iv-0.1.10.ebuild
index bd1422cf7728..2d0ce5ef3ce0 100644
--- a/media-gfx/iv/iv-0.1.10.ebuild
+++ b/media-gfx/iv/iv-0.1.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/media-gfx/iv/iv-0.1.10.ebuild,v 1.1 2003/04/24 11:41:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/iv/iv-0.1.10.ebuild,v 1.1.1.1 2005/11/30 09:37:16 chriswhite Exp $
 
 inherit eutils
 
@@ -11,6 +11,7 @@ HOMEPAGE="http://wolfpack.twu.net/utilities.html"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86"
+IUSE=""
 
 DEPEND=">=media-libs/imlib-1.9.13
 	=x11-libs/gtk+-1.2*"
diff --git a/media-gfx/iv/iv-1.2.1.ebuild b/media-gfx/iv/iv-1.2.1.ebuild
index a4e73a289bb9..fca2fa981e88 100644
--- a/media-gfx/iv/iv-1.2.1.ebuild
+++ b/media-gfx/iv/iv-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/media-gfx/iv/iv-1.2.1.ebuild,v 1.1 2005/04/13 00:50:54 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/iv/iv-1.2.1.ebuild,v 1.1.1.1 2005/11/30 09:37:16 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://wolfpack.twu.net/users/wolfpack/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="ppc x86"
 IUSE="gif imlib jpeg png xpm"
 
 DEPEND="=x11-libs/gtk+-1.2*
@@ -41,7 +41,7 @@ src_install() {
 		PREFIX=${D}/usr \
 		MAN_DIR=${D}/usr/share/man/man1 \
 		|| die "make install failed"
-	
+
 	dodoc README
 
 	# eog.desktop uses name Image Viewer, so differentiate
diff --git a/media-gfx/iv/iv-1.3.2.ebuild b/media-gfx/iv/iv-1.3.2.ebuild
index 9e418beaec67..8a202d0b040f 100644
--- a/media-gfx/iv/iv-1.3.2.ebuild
+++ b/media-gfx/iv/iv-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/media-gfx/iv/iv-1.3.2.ebuild,v 1.1 2005/11/09 19:59:44 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/iv/iv-1.3.2.ebuild,v 1.1.1.1 2005/11/30 09:37:16 chriswhite Exp $
 
 inherit eutils
 
diff --git a/media-gfx/jhead/ChangeLog b/media-gfx/jhead/ChangeLog
index d8e1eb1933fe..8ef988f2e1ef 100644
--- a/media-gfx/jhead/ChangeLog
+++ b/media-gfx/jhead/ChangeLog
@@ -1,10 +1,100 @@
 # ChangeLog for media-gfx/jhead
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/jhead/ChangeLog,v 1.1 2002/04/13 23:18:38 verwilst Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/jhead/ChangeLog,v 1.1.1.1 2005/11/30 09:37:41 chriswhite Exp $
 
+  11 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> jhead-2.2.ebuild:
+  Stable on ppc.
+
+  10 Nov 2005; Luis Medinas <metalgod@gentoo.org> jhead-2.2.ebuild:
+  Marked Stable on amd64. Bug #110242.
+
+  10 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> jhead-2.2.ebuild:
+  Stable on sparc wrt #110242
+
+  10 Nov 2005; Marcelo Goes <vanquirius@gentoo.org> jhead-2.2.ebuild,
+  jhead-2.4.ebuild:
+  Inherit toolchain-funcs to get CC for 2.2 and 2.4. Marking 2.2 x86 stable
+  for bug 110242, on Renat Lumpau's <rl03 at gentoo dot org> request.
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> jhead-2.2.ebuild:
+  Mark 2.2 stable on alpha
+
+*jhead-2.4 (10 Sep 2005)
+
+  10 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +files/jhead-2.4-gcc4.diff, +metadata.xml, -jhead-2.1.ebuild,
+  +jhead-2.4.ebuild:
+  Version bump for bug 105492, thanks to Jonathan Stimmel <jstimmel at gmail
+  dot com>. Adding gcc4 patch to avoid compile warnings, adding myself as a
+  maintainer and graphics as its herd.
+
+  08 Jul 2005; <gongloo@gentoo.org> jhead-2.2.ebuild:
+  Keyworded ~ppc-macos. Closes bug 93977.
+
+  08 May 2005; Aron Griffis <agriffis@gentoo.org> jhead-2.2.ebuild:
+  stable on ia64
+
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org> jhead-2.2.ebuild:
+  Stable on ppc64
+
+  02 Nov 2004; Markus Rothe <corsair@gentoo.org> jhead-2.2.ebuild:
+  Marked ~ppc64; dependency of bug #49688
+
+*jhead-2.2 (23 Sep 2004)
+
+  23 Sep 2004; Karol Wojtaszek <sekretarz@gentoo.org> -jhead-1.6.ebuild,
+  -jhead-1.9.ebuild, +jhead-2.2.ebuild:
+  Ebuild cleanup. Version bump
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> jhead-1.6.ebuild,
+  jhead-1.9.ebuild, jhead-2.0.ebuild, jhead-2.1.ebuild:
+  virtual/glibc -> virtual/libc
+
+  17 Apr 2004; Guy Martin <gmsoft@gentoo.org> jhead-2.0.ebuild,
+  jhead-2.1.ebuild:
+  Marked stable on hppa.
+
+*jhead-2.1 (25 Feb 2004)
+
+  25 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> jhead-2.1.ebuild:
+  Version bump. Closing #38980.
+
+  16 Feb 2004; Aron Griffis <agriffis@gentoo.org> jhead-2.0.ebuild:
+  stable on alpha and ia64
+
+  14 Dec 2003; Guy Martin <gmsoft@gentoo.org> jhead-1.6.ebuild:
+  Marked stable on hppa.
+
+  11 Dec 2003; Rajiv Aaron Manglani <rajiv@gentoo.org> jhead-2.0.ebuild:
+  stable on ppc.
+
+  07 Dec 2003; Rajiv Aaron Manglani <rajiv@gentoo.org> jhead-2.0.ebuild:
+  marked ~ppc.
+
+  22 Oct 2003; Christian Birchinger <joker@gentoo.org> jhead-2.0.ebuild:
+  Added sparc stable keyword
+
+  05 Oct 2003; Todd Sunderlin <todd@gentoo.org> jhead-1.6.ebuild:
+  added ~sparc keyword
+
+*jhead-2.0 (28 May 2003)
+
+  28 May 2003; Caleb Tennis <caleb@gentoo.org> jhead-2.0.ebuild:
+  Version bump, submitted by Shardik@gmx.net.  Closes bug #20335
+
+*jhead-1.9 (20 Feb 2003)
+
+  17 Apr 2003; Graham Forest <vladimir@gentoo.org> jhead-1.9.ebuild:
+  set ~ppc in keywords
+
+  20 Feb 2003; Alastair Tse <liquidx@gentoo.org> ChangeLog, jhead-1.9.ebuild:
+  Version bump and license correction. Resolves bug #11917
 
 *jhead-1.6 (14 April 2002)
 
+  04 Apr 2003; Graham Forest <vladimir@gentoo.org> jhead-1.6.ebuild:
+  set ~ppc in keywords
+
   14 April 2002; Bart Verwilst <verwilst@gentoo.org> Changelog :
 
   Initial ebuild.  Enjoy!
diff --git a/media-gfx/jhead/Manifest b/media-gfx/jhead/Manifest
index cf81fd0548d4..ffef85afb797 100644
--- a/media-gfx/jhead/Manifest
+++ b/media-gfx/jhead/Manifest
@@ -1,5 +1,9 @@
-MD5 102f303d2870d9aee45308e1b5848b83 ChangeLog 685
-MD5 9228ba808f6c1d0512a40db3fa11811e jhead-1.6.ebuild 620
-MD5 33df293064ed3d6ed536e54706080fee jhead-1.9.ebuild 627
-MD5 53c498eb15e277939736724aafb212b4 files/digest-jhead-1.6 119
-MD5 50904b71e701083233ee536befdada4e files/digest-jhead-1.9 60
+MD5 5e336be639c5cea199c39ad08503295f ChangeLog 3330
+MD5 d2ee1c3e7a9ca19f96c0f78ee48cbc9a files/digest-jhead-2.0 60
+MD5 914162d5ed1fd8cf9f24104fff013410 files/digest-jhead-2.2 60
+MD5 89f78d6efa8594f34ceb1a4a20b61803 files/digest-jhead-2.4 60
+MD5 7b4626f3d33f81e78651e4e78cd6032c files/jhead-2.4-gcc4.diff 5559
+MD5 4609656bb2447d6d858e23376fe1cb83 jhead-2.0.ebuild 647
+MD5 0261ef7b7cdf0819e69fede8d70137f9 jhead-2.2.ebuild 795
+MD5 56963d2de901ca65f3fa7d2898b890d6 jhead-2.4.ebuild 865
+MD5 daf676490886bcebc03a96609cd21923 metadata.xml 227
diff --git a/media-gfx/jhead/jhead-2.0.ebuild b/media-gfx/jhead/jhead-2.0.ebuild
index f63c837c1b8b..3cbed20b2b1b 100644
--- a/media-gfx/jhead/jhead-2.0.ebuild
+++ b/media-gfx/jhead/jhead-2.0.ebuild
@@ -1,28 +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/media-gfx/jhead/jhead-2.0.ebuild,v 1.1 2003/05/30 03:00:33 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/jhead/jhead-2.0.ebuild,v 1.1.1.1 2005/11/30 09:37:41 chriswhite Exp $
 
-IUSE=""
-S=${WORKDIR}/${P}
 DESCRIPTION="Exif Jpeg camera setting parser and thumbnail remover"
-SRC_URI="http://www.sentex.net/~mwandel/jhead/${P}.tar.gz"
 HOMEPAGE="http://www.sentex.net/~mwandel/jhead/"
+SRC_URI="http://www.sentex.net/~mwandel/jhead/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="~x86"
+SLOT="0"
+KEYWORDS="x86 ppc sparc amd64 alpha ia64 hppa"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
-
-	cd ${S}
 	emake || die
 }
 
-src_install () {
-
-	dobin jhead  
+src_install() {
+	dobin jhead || die
 	dodoc readme.txt changes.txt
 	dohtml usage.html
 	doman jhead.1.gz
diff --git a/media-gfx/jhead/jhead-2.2.ebuild b/media-gfx/jhead/jhead-2.2.ebuild
index d67c7cd143f8..f2b57d0ff43c 100644
--- a/media-gfx/jhead/jhead-2.2.ebuild
+++ b/media-gfx/jhead/jhead-2.2.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/media-gfx/jhead/jhead-2.2.ebuild,v 1.1 2004/09/23 17:03:42 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/jhead/jhead-2.2.ebuild,v 1.1.1.1 2005/11/30 09:37:41 chriswhite Exp $
+
+inherit toolchain-funcs
 
 DESCRIPTION="Exif Jpeg camera setting parser and thumbnail remover"
 HOMEPAGE="http://www.sentex.net/~mwandel/jhead/"
@@ -8,7 +10,7 @@ SRC_URI="http://www.sentex.net/~mwandel/jhead/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha ~ia64 ~hppa"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc ~ppc-macos ppc64 sparc x86"
 IUSE=""
 
 DEPEND="virtual/libc"
@@ -20,6 +22,7 @@ src_unpack() {
 }
 
 src_compile() {
+	export CC="$(tc-getCC)"
 	emake || die
 }
 
diff --git a/media-gfx/jhead/jhead-2.4.ebuild b/media-gfx/jhead/jhead-2.4.ebuild
index 9dca654feb85..559fa4029cf1 100644
--- a/media-gfx/jhead/jhead-2.4.ebuild
+++ b/media-gfx/jhead/jhead-2.4.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/media-gfx/jhead/jhead-2.4.ebuild,v 1.1 2005/09/10 19:04:25 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/jhead/jhead-2.4.ebuild,v 1.1.1.1 2005/11/30 09:37:41 chriswhite Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Exif Jpeg camera setting parser and thumbnail remover"
 HOMEPAGE="http://www.sentex.net/~mwandel/jhead/"
@@ -18,11 +18,12 @@ RDEPEND="virtual/libc
 
 src_unpack() {
 	unpack ${A}; cd ${S}
-	epatch ${FILESDIR}/${P}-gcc4.diff
+	epatch "${FILESDIR}"/${P}-gcc4.diff
 	sed -i "s:-O3 -Wall:${CFLAGS}:" makefile || die
 }
 
 src_compile() {
+	export CC="$(tc-getCC)"
 	emake || die
 }
 
diff --git a/media-gfx/jpeg2ps/ChangeLog b/media-gfx/jpeg2ps/ChangeLog
index 728359286592..c5edddc887a2 100644
--- a/media-gfx/jpeg2ps/ChangeLog
+++ b/media-gfx/jpeg2ps/ChangeLog
@@ -1,6 +1,40 @@
 # ChangeLog for media-gfx/jpeg2ps
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/jpeg2ps/ChangeLog,v 1.1 2004/07/11 19:27:47 pclouds Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/jpeg2ps/ChangeLog,v 1.1.1.1 2005/11/30 09:37:29 chriswhite Exp $
+
+  01 Nov 2005; Simon Stelling <blubb@gentoo.org> jpeg2ps-1.9-r1.ebuild:
+  re-adding wrongly removed ~amd64 keyword
+
+  30 Oct 2005; Fabian Groffen <grobian@gentoo.org> jpeg2ps-1.9-r1.ebuild:
+  Marked ~ppc-macos (bug #110822)
+
+  13 Sep 2005; Mark Loeser <halcy0n@gentoo.org>
+  +files/jpeg2ps-1.9-include.diff, jpeg2ps-1.9-r1.ebuild:
+  Added patch to get rid of warnings with gcc4.  Thanks to Marcelo Goes
+  <vanquirius@gentoo.org>; bug #105561
+
+  12 Sep 2005; Joseph Jezak <josejx@gentoo.org> jpeg2ps-1.9-r1.ebuild:
+  Marked ~ppc for bug #105561.
+
+*jpeg2ps-1.9-r1 (01 Aug 2005)
+
+  01 Aug 2005; <pclouds@gentoo.org> +jpeg2ps-1.9-r1.ebuild:
+  set papersize based on localtime #61922
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> jpeg2ps-1.9.ebuild:
+  Stable on ppc.
+
+  03 Jun 2005; Luca Barbato <lu_zero@gentoo.org> metadata.xml:
+  Metadata fix
+
+  27 Nov 2004; <pclouds@gentoo.org> jpeg2ps-1.9.ebuild:
+  Stable on x86
+
+  22 Sep 2004; <blubb@gentoo.org> jpeg2ps-1.9.ebuild:
+  added ~amd64
+
+  17 Jul 2004; David Holm <dholm@gentoo.org> jpeg2ps-1.9.ebuild:
+  Added to ~ppc.
 
 *jpeg2ps-1.9 (12 Jul 2004)
 
diff --git a/media-gfx/jpeg2ps/Manifest b/media-gfx/jpeg2ps/Manifest
index b2b0de82264f..35aced4dc4b8 100644
--- a/media-gfx/jpeg2ps/Manifest
+++ b/media-gfx/jpeg2ps/Manifest
@@ -1,2 +1,7 @@
-MD5 2b332a3e1c5d8709e87066cdb044875d jpeg2ps-1.9.ebuild 1050
+MD5 77ee7eca51b08a336fed35e88c798bb4 ChangeLog 1447
+MD5 bf609798498cc213dec7124c8e14a036 jpeg2ps-1.9.ebuild 1158
+MD5 6c8c7c049342cbfec9eafc2be9fa31c6 metadata.xml 220
+MD5 beb217d9c5ab9b07d85b8f7707654133 jpeg2ps-1.9-r1.ebuild 1529
 MD5 d40db91990d9b92ba61626a89d40d818 files/digest-jpeg2ps-1.9 62
+MD5 d40db91990d9b92ba61626a89d40d818 files/digest-jpeg2ps-1.9-r1 62
+MD5 3836d11586a0cd4279eb4915c4b5f7df files/jpeg2ps-1.9-include.diff 341
diff --git a/media-gfx/jpeg2ps/jpeg2ps-1.9-r1.ebuild b/media-gfx/jpeg2ps/jpeg2ps-1.9-r1.ebuild
index 4a22b5f10e44..5a319c046a47 100644
--- a/media-gfx/jpeg2ps/jpeg2ps-1.9-r1.ebuild
+++ b/media-gfx/jpeg2ps/jpeg2ps-1.9-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/media-gfx/jpeg2ps/jpeg2ps-1.9-r1.ebuild,v 1.1 2005/08/01 01:30:14 pclouds Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/jpeg2ps/jpeg2ps-1.9-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:29 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="Converts JPEG images to Postscript using a wrapper"
 HOMEPAGE="http://www.pdflib.com/products/more/jpeg2ps.html"
@@ -8,12 +10,19 @@ SRC_URI="http://www.pdflib.com/products/more/jpeg2ps/${P}.tar.gz"
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc ~ppc-macos ~x86"
 IUSE=""
 
 DEPEND="sys-apps/sed"
 RDEPEND=""
 
+src_unpack() {
+	unpack ${A}
+
+	#bug 105561
+	epatch "${FILESDIR}"/${P}-include.diff
+}
+
 src_compile() {
 	local pagesize=""
 	if [ -h /etc/localtime ]; then
diff --git a/media-gfx/jpeg2ps/jpeg2ps-1.9.ebuild b/media-gfx/jpeg2ps/jpeg2ps-1.9.ebuild
index 1b5f3b974f22..1894d8172c36 100644
--- a/media-gfx/jpeg2ps/jpeg2ps-1.9.ebuild
+++ b/media-gfx/jpeg2ps/jpeg2ps-1.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/media-gfx/jpeg2ps/jpeg2ps-1.9.ebuild,v 1.1 2004/07/11 19:27:47 pclouds Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/jpeg2ps/jpeg2ps-1.9.ebuild,v 1.1.1.1 2005/11/30 09:37:29 chriswhite Exp $
 
 DESCRIPTION="Converts JPEG images to Postscript using a wrapper"
 HOMEPAGE="http://www.pdflib.com/products/more/jpeg2ps.html"
@@ -8,7 +8,7 @@ SRC_URI="http://www.pdflib.com/products/more/jpeg2ps/${P}.tar.gz"
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
 DEPEND="sys-apps/sed"
diff --git a/media-gfx/jpeg2ps/metadata.xml b/media-gfx/jpeg2ps/metadata.xml
index f2405d63233c..708ab83a1c30 100644
--- a/media-gfx/jpeg2ps/metadata.xml
+++ b/media-gfx/jpeg2ps/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>media-gfx</herd>
+<herd>graphics</herd>
 <maintainer><email>pclouds@gentoo.org</email></maintainer>
 </pkgmetadata>
diff --git a/media-gfx/jpeginfo/ChangeLog b/media-gfx/jpeginfo/ChangeLog
index f1fa7e0cbfa2..fd8044eea8ee 100644
--- a/media-gfx/jpeginfo/ChangeLog
+++ b/media-gfx/jpeginfo/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for media-gfx/jpeginfo
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/jpeginfo/ChangeLog,v 1.1 2003/02/12 11:23:40 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/jpeginfo/ChangeLog,v 1.1.1.1 2005/11/30 09:37:23 chriswhite Exp $
+
+  30 Oct 2005; Fabian Groffen <grobian@gentoo.org> jpeginfo-1.6.0.ebuild:
+  Marked ~ppc-macos (bug #110823)
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> jpeginfo-1.6.0.ebuild:
+  Stable on ppc.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  20 Jul 2004; Tom Gall <tgall@gentoo.org> jpeginfo-1.6.0.ebuild: 
+  stable on ppc64, bug #57156
+
+  05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> jpeginfo-1.6.0.ebuild:
+  Stable on alpha.
+
+  20 Apr 2004; Danny van Dyk <kugelfang@gentoo.org> jpeginfo-1.6.0.ebuild:
+  marked ~amd64
 
 *jpeginfo-1.6.0 (12 Feb 2003)
 
diff --git a/media-gfx/jpeginfo/Manifest b/media-gfx/jpeginfo/Manifest
index e69de29bb2d1..805dac0ab16f 100644
--- a/media-gfx/jpeginfo/Manifest
+++ b/media-gfx/jpeginfo/Manifest
@@ -0,0 +1,3 @@
+MD5 84ee8e30a1e014371857b0b611c947fe jpeginfo-1.6.0.ebuild 604
+MD5 b793e05851e8a71931b9b99656b1cd82 ChangeLog 1076
+MD5 4512bd4b2ffb25cd8ce57ce01ac1098c files/digest-jpeginfo-1.6.0 65
diff --git a/media-gfx/jpeginfo/jpeginfo-1.6.0.ebuild b/media-gfx/jpeginfo/jpeginfo-1.6.0.ebuild
index a8f0d6bdbb0c..858ecc6daf46 100644
--- a/media-gfx/jpeginfo/jpeginfo-1.6.0.ebuild
+++ b/media-gfx/jpeginfo/jpeginfo-1.6.0.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/media-gfx/jpeginfo/jpeginfo-1.6.0.ebuild,v 1.1 2003/02/12 11:23:40 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/jpeginfo/jpeginfo-1.6.0.ebuild,v 1.1.1.1 2005/11/30 09:37:23 chriswhite Exp $
 
 IUSE=""
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Prints information and tests integrity of JPEG/JFIF files."
 HOMEPAGE="http://www.cc.jyu.fi/~tjko/projects.html"
 SRC_URI="http://www.cc.jyu.fi/~tjko/src/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="alpha ~amd64 ppc ~ppc-macos ppc64 ~sparc x86"
 
 DEPEND=">=media-libs/jpeg-6b"
 
diff --git a/media-gfx/jpegoptim/ChangeLog b/media-gfx/jpegoptim/ChangeLog
index a9c31c6fc6de..0592190cd1d9 100644
--- a/media-gfx/jpegoptim/ChangeLog
+++ b/media-gfx/jpegoptim/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-gfx/jpegoptim
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/jpegoptim/ChangeLog,v 1.1 2003/11/26 00:49:21 brandy Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/jpegoptim/ChangeLog,v 1.1.1.1 2005/11/30 09:37:19 chriswhite Exp $
+
+  30 Oct 2005; Fabian Groffen <grobian@gentoo.org> jpegoptim-1.2.2.ebuild:
+  Marked ~ppc-macos (bug #110824)
+
+  27 Aug 2005; <sekretarz@gentoo.org> jpegoptim-1.2.2.ebuild:
+  Stable on x86, added to ~amd64
+
+  22 Jul 2005; David Holm <dholm@gentoo.org> jpegoptim-1.2.2.ebuild:
+  Added to ~ppc.
 
 *jpegoptim-1.2.2 (26 Nov 2003)
 
diff --git a/media-gfx/jpegoptim/Manifest b/media-gfx/jpegoptim/Manifest
index 868175366a49..6be3fd0ae75c 100644
--- a/media-gfx/jpegoptim/Manifest
+++ b/media-gfx/jpegoptim/Manifest
@@ -1,4 +1,4 @@
-MD5 c21defc1a06ced0bd4bcb82c86d3979f ChangeLog 428
+MD5 fc4f0f755b4b7272df9109814c85e24e ChangeLog 713
 MD5 5fc54c5d01402d0610fafa96961bb8e0 metadata.xml 161
-MD5 b00595d1ddb210821f5622b80e0cdfea jpegoptim-1.2.2.ebuild 734
+MD5 adb0059e58830bcc4d3e25de810d1f82 jpegoptim-1.2.2.ebuild 729
 MD5 ee6dcbe664184a8f3ad13aa5a0f76357 files/digest-jpegoptim-1.2.2 66
diff --git a/media-gfx/jpegoptim/jpegoptim-1.2.2.ebuild b/media-gfx/jpegoptim/jpegoptim-1.2.2.ebuild
index 19ddaeb48ab0..b25fd348099c 100644
--- a/media-gfx/jpegoptim/jpegoptim-1.2.2.ebuild
+++ b/media-gfx/jpegoptim/jpegoptim-1.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/media-gfx/jpegoptim/jpegoptim-1.2.2.ebuild,v 1.1 2003/11/26 00:49:21 brandy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/jpegoptim/jpegoptim-1.2.2.ebuild,v 1.1.1.1 2005/11/30 09:37:19 chriswhite Exp $
 
 DESCRIPTION="JPEG file optimiser"
 HOMEPAGE="http://www.cc.jyu.fi/~tjko/projects.html"
@@ -8,13 +8,11 @@ SRC_URI="http://www.cc.jyu.fi/~tjko/src/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc ~ppc-macos x86"
 
 IUSE=""
 DEPEND="media-libs/jpeg"
 
-S=${WORKDIR}/${P}
-
 src_compile() {
 
 	./configure \
diff --git a/media-gfx/jpegpixi/ChangeLog b/media-gfx/jpegpixi/ChangeLog
index d13c4758d5b9..36f38bac84fe 100644
--- a/media-gfx/jpegpixi/ChangeLog
+++ b/media-gfx/jpegpixi/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for media-gfx/jpegpixi
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/jpegpixi/ChangeLog,v 1.1 2004/08/25 06:08:24 eldad Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/jpegpixi/ChangeLog,v 1.1.1.1 2005/11/30 09:37:25 chriswhite Exp $
+
+  30 Oct 2005; Fabian Groffen <grobian@gentoo.org> jpegpixi-1.0.3.ebuild:
+  Marked ~ppc-macos (bug #110825)
+
+*jpegpixi-1.0.3 (29 Oct 2004)
+
+  29 Oct 2004; Eldad Zack <eldad@gentoo.org> jpegpixi-0.16.0.ebuild,
+  +jpegpixi-1.0.3.ebuild:
+  Version bump. Fixed man pages packaging.
+
+  22 Sep 2004; <blubb@gentoo.org> jpegpixi-0.16.0.ebuild:
+  added ~amd64
+
+  03 Sep 2004; David Holm <dholm@gentoo.org> jpegpixi-0.16.0.ebuild:
+  Added to ~ppc.
 
 *jpegpixi-0.16.0 (25 Aug 2004)
 
diff --git a/media-gfx/jpegpixi/Manifest b/media-gfx/jpegpixi/Manifest
index 8b4f77ed265b..7fb8af40beb0 100644
--- a/media-gfx/jpegpixi/Manifest
+++ b/media-gfx/jpegpixi/Manifest
@@ -1,3 +1,6 @@
-MD5 a2575042db24ed700cdd8862574de41d jpegpixi-0.16.0.ebuild 626
-MD5 67be3ac6fbd4827f481553aa55ad5fd7 metadata.xml 363
+MD5 b4822373f4b3143061a1896987cfa9f5 jpegpixi-1.0.3.ebuild 770
+MD5 c7eee6199a600843b35e43834f84ad73 jpegpixi-0.16.0.ebuild 750
+MD5 e8afe399927709d9114e34fa8b95e382 ChangeLog 788
+MD5 ce71377210eadee7d86189e4fa901428 metadata.xml 364
+MD5 daf74296062587c8afe589e7383072e8 files/digest-jpegpixi-1.0.3 66
 MD5 b95b4e5862cb8682c353497eff1f1190 files/digest-jpegpixi-0.16.0 67
diff --git a/media-gfx/jpegpixi/jpegpixi-0.16.0.ebuild b/media-gfx/jpegpixi/jpegpixi-0.16.0.ebuild
index 171d9f73e10d..e61bdf4c6b54 100644
--- a/media-gfx/jpegpixi/jpegpixi-0.16.0.ebuild
+++ b/media-gfx/jpegpixi/jpegpixi-0.16.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/media-gfx/jpegpixi/jpegpixi-0.16.0.ebuild,v 1.1 2004/08/25 06:08:24 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/jpegpixi/jpegpixi-0.16.0.ebuild,v 1.1.1.1 2005/11/30 09:37:25 chriswhite Exp $
 
 DESCRIPTION="almost lossless JPEG pixel interpolator, for correcting digital camera defects."
 HOMEPAGE="http://www.zero-based.org/software/jpegpixi/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.zero-based.org/software/jpegpixi/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc ~amd64"
 IUSE=""
 
 DEPEND="media-libs/jpeg"
@@ -22,7 +22,7 @@ src_install () {
 	insinto /usr/bin
 	dobin jpegpixi jpeghotp
 
-	doman jpegpixi.1 jpeghotp.1
+	doman man/jpegpixi.1 man/jpeghotp.1
 
 	dodoc AUTHORS NEWS README README.jpeglib
 }
diff --git a/media-gfx/jpegpixi/jpegpixi-1.0.3.ebuild b/media-gfx/jpegpixi/jpegpixi-1.0.3.ebuild
index 6ae716dd1bbb..fd8f21e69731 100644
--- a/media-gfx/jpegpixi/jpegpixi-1.0.3.ebuild
+++ b/media-gfx/jpegpixi/jpegpixi-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/media-gfx/jpegpixi/jpegpixi-1.0.3.ebuild,v 1.1 2004/10/29 11:11:16 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/jpegpixi/jpegpixi-1.0.3.ebuild,v 1.1.1.1 2005/11/30 09:37:25 chriswhite Exp $
 
 DESCRIPTION="almost lossless JPEG pixel interpolator, for correcting digital camera defects."
 HOMEPAGE="http://www.zero-based.org/software/jpegpixi/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.zero-based.org/software/jpegpixi/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc ~ppc-macos ~x86"
 IUSE=""
 
 DEPEND="media-libs/jpeg"
diff --git a/media-gfx/k3d/ChangeLog b/media-gfx/k3d/ChangeLog
index bc5bb94f5d73..1b5f07a8d7b0 100644
--- a/media-gfx/k3d/ChangeLog
+++ b/media-gfx/k3d/ChangeLog
@@ -1,10 +1,68 @@
 # ChangeLog for media-gfx/k3d
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/ChangeLog,v 1.1 2003/11/10 10:57:10 brandy Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/ChangeLog,v 1.1.1.1 2005/11/30 09:37:47 chriswhite Exp $
+
+  03 Nov 2005; Luca Barbato <lu_zero@gentoo.org> k3d-0.5.0.33.ebuild:
+  Made ngui the default, fixed the js subsystem, thanks to Patrizio Bassi
+  <hetfield666@gmail.com>
+
+  02 Nov 2005; Luca Barbato <lu_zero@gentoo.org> k3d-0.5.0.33.ebuild:
+  minor change to support the former gui
+
+*k3d-0.5.0.33 (01 Nov 2005)
+
+  01 Nov 2005; Mike Frysinger <vapier@gentoo.org> +k3d-0.5.0.33.ebuild:
+  Version bumpage.
+
+  17 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> k3d-0.2.5.4.ebuild:
+  Add my devspace as fall back for patch.
+
+  17 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -files/k3d-0.2.5.4-gentoo.patch.tar.bz2, k3d-0.2.5.4.ebuild:
+  Move patch to mirrors, do not dodoc INSTALL. See bug 106150.
+
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  02 Apr 2005; Luca Barbato <lu_zero@gentoo.org> k3d-0.4.4.2.ebuild:
+  Ruby support removed
+
+  25 Mar 2005; Luca Barbato <lu_zero@gentoo.org> k3d-0.4.4.2.ebuild:
+  Fix myconf
+
+*k3d-0.4.4.2 (15 Mar 2005)
+
+  15 Mar 2005; Luca Barbato <lu_zero@gentoo.org> +k3d-0.4.4.2.ebuild:
+  New version, thanks Timothy M. Shead <tshead@k-3d.com> for the notice
+
+  22 Jan 2005; Jason Wever <weeve@gentoo.org> k3d-0.4.4.0.ebuild:
+  Added ~sparc keyword as it was dropped in the version bump and no one ever
+  contacted us about it.
+
+  14 Jan 2005; Luca Barbato <lu_zero@gentoo.org> k3d-0.4.4.0.ebuild:
+  Missing dep added, fix bug #77955
+
+*k3d-0.4.4.0 (13 Jan 2005)
+
+  13 Jan 2005; Luca Barbato <lu_zero@gentoo.org> +files/va_copy.patch,
+  +k3d-0.4.4.0.ebuild:
+  New version, marked just ~x86 since has known issue at least on ppc.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> k3d-0.2.5.4.ebuild:
+  Add inherit eutils
+
+  12 Apr 2004; Jason Wever <weeve@gentoo.org> k3d-0.2.5.4.ebuild:
+  Added ~sparc to keywords.
+
+  12 Apr 2004; Mamoru KOMACHI <usata@gentoo.org> k3d-0.2.5.4.ebuild:
+  virtual/ruby fix
+
+  10 Mar 2004; Bryan Østergaard,,, <kloeri@gentoo.org> k3d-0.2.5.4.ebuild:
+  Fix python compilation, bug #42822.
 
 *k3d-0.2.5.4 (10 Nov 2003)
 
   10 Nov 2003; Brandy Westcott brandy@gentoo.org k3d-0.2.5.4.ebuild:
-  Initial import. Thanks to Marc-�ric Dupuis <baal@megaoctet.net> and Carlo
+  Initial import. Thanks to Marc-Éric Dupuis <baal@megaoctet.net> and Carlo
   <current@myrealbox.com> for submitting ebuilds. Closes bug #27101.
 
diff --git a/media-gfx/k3d/Manifest b/media-gfx/k3d/Manifest
index 2b0e34c04961..30002ab626df 100644
--- a/media-gfx/k3d/Manifest
+++ b/media-gfx/k3d/Manifest
@@ -1,5 +1,11 @@
-MD5 ac84a5a7f2f44327841600ea67d4c16f k3d-0.2.5.4.ebuild 1469
-MD5 e1845158f06b77d7116ea7d5a5b3434f ChangeLog 451
+MD5 0db93aa35830baa298359d3e3c5102a3 ChangeLog 2460
+MD5 90223e0f76e4b3d8b1914de87a639a7c files/digest-k3d-0.2.5.4 144
+MD5 43f337d9da3004619b1c64a1280b5b22 files/digest-k3d-0.4.4.0 62
+MD5 525840432840e8ddfa5fa7c20079bc29 files/digest-k3d-0.4.4.2 69
+MD5 f422c293ed6d2f4f51162353a19008a0 files/digest-k3d-0.5.0.33 66
+MD5 0b360e0690b5de9ab01cd583c38408b3 files/va_copy.patch 1546
+MD5 58f419aaabe56f9e909a0082b76b4df4 k3d-0.2.5.4.ebuild 1667
+MD5 c540c9ec333f9eca8abd3aa09b82a31b k3d-0.4.4.0.ebuild 1571
+MD5 79d97aa4b737cb59938261ed914a500a k3d-0.4.4.2.ebuild 1585
+MD5 b4275fc98b9707d8361812632919ef93 k3d-0.5.0.33.ebuild 2030
 MD5 5fc54c5d01402d0610fafa96961bb8e0 metadata.xml 161
-MD5 e0baf5403904a6b909361f0fdd20271a files/k3d-0.2.5.4-gentoo.patch.tar.bz2 7497
-MD5 86d41f87f2689037989cc31b5d19d700 files/digest-k3d-0.2.5.4 69
diff --git a/media-gfx/k3d/files/digest-k3d-0.2.5.4 b/media-gfx/k3d/files/digest-k3d-0.2.5.4
index fee235f197f7..4ee01be4930c 100644
--- a/media-gfx/k3d/files/digest-k3d-0.2.5.4
+++ b/media-gfx/k3d/files/digest-k3d-0.2.5.4
@@ -1 +1,2 @@
 MD5 5343d39a6120f7b9848f9152230e7d5a k3d-0.2.5.4-src.tar.bz2 3053441
+MD5 e0baf5403904a6b909361f0fdd20271a k3d-0.2.5.4-gentoo.patch.tar.bz2 7497
diff --git a/media-gfx/k3d/k3d-0.2.5.4.ebuild b/media-gfx/k3d/k3d-0.2.5.4.ebuild
index ffaaed0f7ce4..2bb0ca212037 100644
--- a/media-gfx/k3d/k3d-0.2.5.4.ebuild
+++ b/media-gfx/k3d/k3d-0.2.5.4.ebuild
@@ -1,16 +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/media-gfx/k3d/k3d-0.2.5.4.ebuild,v 1.1 2003/11/10 10:57:10 brandy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/k3d-0.2.5.4.ebuild,v 1.1.1.1 2005/11/30 09:37:47 chriswhite Exp $
+
+inherit python eutils
 
 IUSE="truetype doc python ruby"
 
 DESCRIPTION="K-3D is a free 3D modeling, animation, and rendering system."
 HOMEPAGE="http://k3d.sourceforge.net"
-SRC_URI="mirror://sourceforge/k3d/${P}-src.tar.bz2"
+SRC_URI="mirror://sourceforge/k3d/${P}-src.tar.bz2
+	mirror://gentoo/${P}-gentoo.patch.tar.bz2
+	http://dev.gentoo.org/~vanquirius/files/${P}-gentoo.patch.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~sparc"
 
 DEPEND="virtual/x11
 	virtual/opengl
@@ -19,21 +23,21 @@ DEPEND="virtual/x11
 	=x11-libs/gtk+-1.2*
 	=dev-libs/libsigc++-1.0*
 	media-libs/plib
-	truetype? ( >=media-libs/freetype-2* )
+	truetype? ( >=media-libs/freetype-2 )
 	doc? ( app-text/xmlto )
-	python? ( >=dev-lang/python-2.2* )
-	ruby? ( >=dev-lang/ruby-1.6* )"
+	python? ( >=dev-lang/python-2.2 )
+	ruby? ( virtual/ruby )"
 
 src_unpack() {
+	unpack ${A}; cd ${S}
+	epatch "${WORKDIR}/${P}-gentoo.patch"
 
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.patch.tar.bz2
-
+	# fix python compilation
+	python_version
+	sed -i -e "s:python2.2:python${PYVER}:g" configure
 }
 
 src_compile() {
-
 	local myconf="--with-plib --without-graphviz"
 
 	use truetype \
@@ -53,14 +57,10 @@ src_compile() {
 		|| myconf="${myconf} --without-ruby"
 
 	econf ${myconf} || die
-
 	emake "CXXFLAGS=${CXXFLAGS}" || die
-
 }
 
 src_install() {
-
 	einstall || die
-	dodoc AUTHORS INSTALL NEWS README TODO
-
+	dodoc AUTHORS NEWS README TODO
 }
diff --git a/media-gfx/k3d/k3d-0.4.4.0.ebuild b/media-gfx/k3d/k3d-0.4.4.0.ebuild
index 49815715b561..830bc9a50ccf 100644
--- a/media-gfx/k3d/k3d-0.4.4.0.ebuild
+++ b/media-gfx/k3d/k3d-0.4.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/media-gfx/k3d/k3d-0.4.4.0.ebuild,v 1.1 2005/01/13 07:53:37 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/k3d-0.4.4.0.ebuild,v 1.1.1.1 2005/11/30 09:37:47 chriswhite Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/k3d/${P}.tbz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~sparc"
 
 DEPEND="virtual/x11
 	virtual/opengl
@@ -22,6 +22,7 @@ DEPEND="virtual/x11
 	=dev-libs/libsigc++-1.0*
 	>=media-libs/netpbm-10
 	media-libs/plib
+	media-gfx/imagemagick
 	truetype? ( >=media-libs/freetype-2 )
 	doc? ( app-text/xmlto )
 	python? ( >=dev-lang/python-2.3 )
diff --git a/media-gfx/k3d/k3d-0.4.4.2.ebuild b/media-gfx/k3d/k3d-0.4.4.2.ebuild
index 0c150b7e4dd8..c10cdabde7fd 100644
--- a/media-gfx/k3d/k3d-0.4.4.2.ebuild
+++ b/media-gfx/k3d/k3d-0.4.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/media-gfx/k3d/k3d-0.4.4.2.ebuild,v 1.1 2005/03/15 13:44:59 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/k3d-0.4.4.2.ebuild,v 1.1.1.1 2005/11/30 09:37:47 chriswhite Exp $
 
 inherit eutils
 
@@ -26,7 +26,7 @@ DEPEND="virtual/x11
 	truetype? ( >=media-libs/freetype-2 )
 	doc? ( app-text/xmlto )
 	python? ( >=dev-lang/python-2.3 )
-	ruby? ( virtual/ruby )"
+	" ##ruby support deprecated ruby? ( virtual/ruby )
 
 src_unpack()
 {
@@ -54,12 +54,12 @@ src_compile()
 		&& myconf="${myconf} --with-python" \
 		|| myconf="${myconf} --without-python"
 
-	use ruby \
-		&& myconf="${myconf} --with-ruby=`ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]'`" \
-		|| myconf="${myconf} --without-ruby"
+#	use ruby \
+#		&& myconf="${myconf} --with-ruby=`ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]'`" \
+#		|| myconf="${myconf} --without-ruby"
 
 
-	econf "CXXFLAGS=${CXXFLAGS}" || die
+	econf "CXXFLAGS=${CXXFLAGS}" $myconf || die
 	emake || die
 
 }
diff --git a/media-gfx/k3d/k3d-0.5.0.33.ebuild b/media-gfx/k3d/k3d-0.5.0.33.ebuild
index ac8e2a7aa0f9..669db347777e 100644
--- a/media-gfx/k3d/k3d-0.5.0.33.ebuild
+++ b/media-gfx/k3d/k3d-0.5.0.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/media-gfx/k3d/k3d-0.5.0.33.ebuild,v 1.1 2005/11/01 23:42:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/k3d-0.5.0.33.ebuild,v 1.1.1.1 2005/11/30 09:37:47 chriswhite Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/k3d/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="expat gnome imagemagick jpeg ngui nls openexr plib png python qt tiff truetype xml2"
+IUSE="expat gnome imagemagick jpeg nls openexr plib png python qt tiff truetype xml2"
 
 DEPEND="virtual/x11
 	virtual/opengl
@@ -24,7 +24,7 @@ DEPEND="virtual/x11
 	gnome? ( gnome-base/libgnome )
 	imagemagick? ( media-gfx/imagemagick )
 	jpeg? ( media-libs/jpeg )
-	ngui? ( dev-cpp/glibmm dev-cpp/gtkmm x11-libs/gtkglext )
+	dev-cpp/glibmm dev-cpp/gtkmm x11-libs/gtkglext
 	openexr? ( media-libs/openexr )
 	plib? ( media-libs/plib )
 	png? ( media-libs/libpng )
@@ -32,9 +32,17 @@ DEPEND="virtual/x11
 	qt? ( x11-libs/qt )
 	tiff? ( media-libs/tiff )
 	=dev-libs/libsigc++-2.0*"
+src_unpack() {
+	unpack ${A}
+	sed -i -e "s:#if _LIB_VERSION == _IEEE_:#if 0:" \
+		${S}/modules/javascript/js/src/fdlibm/k_standard.c \
+		|| die "errno fix failed"
+	rm -f ${S}/modules/javascript/object_model.cpp
+	touch ${S}/modules/javascript/object_model.cpp
+}
 
 src_compile() {
-	local myconf
+	local myconf="--with-ngui"
 	if use expat || ! use xml2 ; then
 		myconf="--without-libxml2"
 	else
@@ -65,4 +73,6 @@ src_compile() {
 src_install() {
 	make install DESTDIR="${D}" || die
 	dodoc AUTHORS INSTALL NEWS README TODO
+	#missing dir
+	dodir /usr/share/k3d/shaders/layered
 }
diff --git a/media-gfx/kimdaba/ChangeLog b/media-gfx/kimdaba/ChangeLog
index 754c324332fe..73d5b21d8727 100644
--- a/media-gfx/kimdaba/ChangeLog
+++ b/media-gfx/kimdaba/ChangeLog
@@ -1,6 +1,47 @@
 # ChangeLog for media-gfx/kimdaba
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kimdaba/ChangeLog,v 1.1 2004/01/18 14:58:09 caleb Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kimdaba/ChangeLog,v 1.1.1.1 2005/11/30 09:37:22 chriswhite Exp $
+
+  22 Jul 2005; David Holm <dholm@gentoo.org> kimdaba-2.1.ebuild:
+  Added to ~ppc.
+
+  04 Jun 2005; Dominik Stadler <centic@gentoo.org> kimdaba-2.0.ebuild,
+  kimdaba-2.1.ebuild:
+  Adding dependency on kdegraphics, fixes Bug 94991
+
+  31 May 2005; Marcus D. Hanwell <marcus@gentoo.org> kimdaba-2.0.ebuild:
+  Stable on amd64.
+
+  15 May 2005; Dominik Stadler <centic@gentoo.org> kimdaba-2.1.ebuild:
+  Add fix for translations, see the Bug at
+  http://bugs.kde.org/show_bug.cgi?id=105293
+
+*kimdaba-2.1 (04 May 2005)
+
+  04 May 2005; Dominik Stadler <centic@gentoo.org> +kimdaba-2.1.ebuild:
+  Add Version 2.1
+
+  13 Mar 2005; Carsten Lohrke <carlo@gentoo.org> kimdaba-2.0.ebuild:
+  stable on x86
+
+  31 Dec 2004; Jason Wever <weeve@gentoo.org> kimdaba-2.0.ebuild:
+  Added ~sparc keyword.
+
+  23 Dec 2004; Simon Stelling <blubb@gentoo.org> kimdaba-2.0.ebuild:
+  added ~amd64
+
+*kimdaba-2.0 (18 Oct 2004)
+
+  18 Oct 2004; Carsten Lohrke <carlo@gentoo.org> +kimdaba-2.0.ebuild:
+  version bump
+
+  14 Apr 2004; Danny van Dyk <kugelfang@gentoo.org> kimdaba-1.1.ebuild:
+  marked ~amd64
+
+*kimdaba-1.1 (17 Feb 2004)
+
+  17 Feb 2004; Caleb Tennis <caleb@gentoo.org> kimdaba-1.1.ebuild:
+  Version bump
 
 *kimdaba-1.0.1 (18 Jan 2004)
 
diff --git a/media-gfx/kimdaba/Manifest b/media-gfx/kimdaba/Manifest
index 2a78368b4d07..0873cf885907 100644
--- a/media-gfx/kimdaba/Manifest
+++ b/media-gfx/kimdaba/Manifest
@@ -1,3 +1,10 @@
-MD5 5954e06ed208e3e473e0a86ce23407bc kimdaba-1.0.1.ebuild 337
-MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
+MD5 fb01e47de4760379a240337adc23c8ae ChangeLog 1520
+MD5 dc7c6ff33b80be4d1a2a531695afe9cc kimdaba-1.0.1.ebuild 427
+MD5 898bbf6eed174d47dd8edfc45733a76b kimdaba-1.1.ebuild 432
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 2587dbb10e3ba41ced856eb681ee62cb kimdaba-2.0.ebuild 600
+MD5 9956500b4e584ec65efb83b1f021e06b kimdaba-2.1.ebuild 772
 MD5 f7537f536c58778617d45603885dea95 files/digest-kimdaba-1.0.1 67
+MD5 a0c23d1c1a7d12d827d49be92dd64d14 files/digest-kimdaba-1.1 65
+MD5 068b53375139f12577924c84d3bd43be files/digest-kimdaba-2.0 65
+MD5 740491e5fe1d75d66eea3600a5a676d4 files/digest-kimdaba-2.1 66
diff --git a/media-gfx/kimdaba/files/digest-kimdaba-2.1 b/media-gfx/kimdaba/files/digest-kimdaba-2.1
index deed6be9860f..189e0ac5c4c5 100644
--- a/media-gfx/kimdaba/files/digest-kimdaba-2.1
+++ b/media-gfx/kimdaba/files/digest-kimdaba-2.1
@@ -1 +1 @@
-MD5 3d650b04fffc3b2442dcfe91d43f7fce kimdaba-2.1.tar.bz2 11565148
+MD5 5c8b3e1d806c069830e893e5a433234a kimdaba-2.1.tar.bz2 11558295
diff --git a/media-gfx/kimdaba/kimdaba-1.0.1.ebuild b/media-gfx/kimdaba/kimdaba-1.0.1.ebuild
index 61fe826b81c7..002c3dc7dc8e 100644
--- a/media-gfx/kimdaba/kimdaba-1.0.1.ebuild
+++ b/media-gfx/kimdaba/kimdaba-1.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/media-gfx/kimdaba/kimdaba-1.0.1.ebuild,v 1.1 2004/01/18 14:58:09 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kimdaba/kimdaba-1.0.1.ebuild,v 1.1.1.1 2005/11/30 09:37:22 chriswhite Exp $
 inherit kde
 need-kde 3
 
diff --git a/media-gfx/kimdaba/kimdaba-1.1.ebuild b/media-gfx/kimdaba/kimdaba-1.1.ebuild
index 0b01c1c2b635..82384b2e4814 100644
--- a/media-gfx/kimdaba/kimdaba-1.1.ebuild
+++ b/media-gfx/kimdaba/kimdaba-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/media-gfx/kimdaba/kimdaba-1.1.ebuild,v 1.1 2004/02/17 13:27:13 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kimdaba/kimdaba-1.1.ebuild,v 1.1.1.1 2005/11/30 09:37:22 chriswhite Exp $
 inherit kde
 need-kde 3
 
@@ -11,4 +11,4 @@ DESCRIPTION="KDE Image Database"
 SRC_URI="http://ktown.kde.org/kimdaba/download/${P}.tar.bz2"
 HOMEPAGE="http://ktown.kde.org/kimdaba/"
 LICENSE="GPL-2"
-KEYWORDS="x86"
+KEYWORDS="x86 ~amd64"
diff --git a/media-gfx/kimdaba/kimdaba-2.0.ebuild b/media-gfx/kimdaba/kimdaba-2.0.ebuild
index 778f8e7cec93..06e8cb628fcf 100644
--- a/media-gfx/kimdaba/kimdaba-2.0.ebuild
+++ b/media-gfx/kimdaba/kimdaba-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/media-gfx/kimdaba/kimdaba-2.0.ebuild,v 1.1 2004/10/18 21:50:34 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kimdaba/kimdaba-2.0.ebuild,v 1.1.1.1 2005/11/30 09:37:22 chriswhite Exp $
 
 inherit kde
 
@@ -10,8 +10,9 @@ SRC_URI="http://ktown.kde.org/kimdaba/download/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="amd64 ~sparc x86"
 IUSE=""
 
-DEPEND="media-libs/libkipi"
-need-kde 3.2
\ No newline at end of file
+DEPEND="media-libs/libkipi
+	|| ( kde-base/kdegraphics-kfile-plugins kde-base/kdegraphics )"
+need-kde 3.2
diff --git a/media-gfx/kimdaba/kimdaba-2.1.ebuild b/media-gfx/kimdaba/kimdaba-2.1.ebuild
index 6bcf4d91d062..06727c16bac1 100644
--- a/media-gfx/kimdaba/kimdaba-2.1.ebuild
+++ b/media-gfx/kimdaba/kimdaba-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/media-gfx/kimdaba/kimdaba-2.1.ebuild,v 1.1 2005/05/05 17:31:17 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kimdaba/kimdaba-2.1.ebuild,v 1.1.1.1 2005/11/30 09:37:22 chriswhite Exp $
 
 inherit kde
 
@@ -11,9 +11,17 @@ SRC_URI="http://ktown.kde.org/kimdaba/download/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~sparc"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
-DEPEND="media-libs/libkipi"
+DEPEND="media-libs/libkipi
+	|| ( kde-base/kdegraphics-kfile-plugins kde-base/kdegraphics )"
+
 need-kde 3.2
 
+src_unpack()
+{
+	unpack ${A}
+	find ${S}/translations -name Makefile.in | xargs \
+		sed -i -e 's|LANG)/doc|LANG)/kimdaba|g'
+}
diff --git a/media-gfx/kimdaba/metadata.xml b/media-gfx/kimdaba/metadata.xml
index b435a8440ccd..8d1e86a9cefb 100644
--- a/media-gfx/kimdaba/metadata.xml
+++ b/media-gfx/kimdaba/metadata.xml
@@ -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/media-gfx/kpl/ChangeLog b/media-gfx/kpl/ChangeLog
index 2837feddbc58..31540a8c6050 100644
--- a/media-gfx/kpl/ChangeLog
+++ b/media-gfx/kpl/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-gfx/kpl
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kpl/ChangeLog,v 1.1 2005/04/19 00:44:59 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kpl/ChangeLog,v 1.1.1.1 2005/11/30 09:37:22 chriswhite Exp $
+
+  08 Aug 2005; Joseph Jezak <josejx@gentoo.org> kpl-3.2.ebuild:
+  Marked ~ppc for bug #101408.
+
+  04 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> kpl-3.2.ebuild:
+  QA: standardize use of need-kde().
+
+  26 Jul 2005; Marcus D. Hanwell <marcus@gentoo.org> kpl-3.2.ebuild:
+  Stable on amd64 and x86.
 
 *kpl-3.2 (19 Apr 2005)
 
diff --git a/media-gfx/kpl/Manifest b/media-gfx/kpl/Manifest
index 87180a934bbc..6f6d564e218d 100644
--- a/media-gfx/kpl/Manifest
+++ b/media-gfx/kpl/Manifest
@@ -1,3 +1,14 @@
-MD5 8df93e8d49bede5579f4721445c0eb72 kpl-3.2.ebuild 319
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9d981dbd76fba992d5bf6f2d06dc53bd ChangeLog 715
 MD5 f35a30fe312c6556dcbd29b28cdf8833 metadata.xml 474
+MD5 e858b46f84cacfc6b97874620e21beb7 kpl-3.2.ebuild 517
 MD5 4d8d247b92777032dbf13dcbadf56857 files/digest-kpl-3.2 60
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC9qN2csIHjyDViGQRAg2RAJ9ktDdrq4gXjUURlS8d9zZoGG6rZwCbBIge
+cQ0PM/W1uPcEsJcrsW6KTRc=
+=gqMw
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/kpl/kpl-3.2.ebuild b/media-gfx/kpl/kpl-3.2.ebuild
index 40f921a61ebe..e6cc1d05f256 100644
--- a/media-gfx/kpl/kpl-3.2.ebuild
+++ b/media-gfx/kpl/kpl-3.2.ebuild
@@ -1,19 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kpl/kpl-3.2.ebuild,v 1.1 2005/04/19 00:44:59 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kpl/kpl-3.2.ebuild,v 1.1.1.1 2005/11/30 09:37:22 chriswhite Exp $
 
 inherit kde
 
-need-kde 3.2
-
-DESCRIPTION="KDE tool for plotting data sets and functions in 2D and 3D"
+DESCRIPTION="KDE tool for plotting data sets and functions in 2D and 3D."
 HOMEPAGE="http://frsl06.physik.uni-freiburg.de/privat/stille/kpl/"
-SRC_URI="http://frsl06.physik.uni-freiburg.de/privat/stille/kpl/kpl-3.2.tar.bz2"
-
+SRC_URI="http://frsl06.physik.uni-freiburg.de/privat/stille/kpl/${P}.tar.bz2"
 LICENSE="GPL-2"
+
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
-DEPEND=""
-RDEPEND=""
+need-kde 3.2
diff --git a/media-gfx/kst/ChangeLog b/media-gfx/kst/ChangeLog
index 47faae0063af..2f16183f96ef 100644
--- a/media-gfx/kst/ChangeLog
+++ b/media-gfx/kst/ChangeLog
@@ -1,6 +1,50 @@
-# ChangeLog for app-sci/kst
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kst/ChangeLog,v 1.1 2004/12/24 01:34:30 ribosome Exp $
+# ChangeLog for media-gfx/kst
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kst/ChangeLog,v 1.1.1.1 2005/11/30 09:37:36 chriswhite Exp $
+
+  15 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kst-1.1.1.ebuild:
+  Reverted changes to kst patch as 1.1.1 also failed to link on amd64 due to
+  netcdf.
+
+*kst-1.1.1 (10 Nov 2005)
+
+  10 Nov 2005; Gregorio Guidi <greg_g@gentoo.org> +kst-1.1.1.ebuild:
+  New version (#111625).
+
+*kst-1.1.0-r1 (28 Oct 2005)
+
+  28 Oct 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  +files/kst-1.1.0-netcdf-fix.patch, +kst-1.1.0-r1.ebuild:
+  Patch configure so that it doesn not link to netcdf unconditionally, thanks
+  to Lucas Chiesa <lucas.chiesa@gmail.com> for providing the patch.
+
+  02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> kst-1.1.0.ebuild:
+  Stable on ppc.
+
+  20 Aug 2005; Olivier Fisette <ribosome@gentoo.org> -kst-0.94.ebuild,
+  kst-0.97.ebuild, -kst-0.99.ebuild, -kst-1.0.0.ebuild, kst-1.1.0.ebuild:
+  Changed dependency from kdebase to kdelibs (see bug #83059). Added 1.1.0 to
+  x86. Pruned old versions.
+
+*kst-1.1.0 (17 Jun 2005)
+
+  17 Jun 2005; Dominik Stadler <centic@gentoo.org> +kst-1.1.0.ebuild:
+  Add new version 1.1.0, fixes Bug 96136
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> kst-0.97.ebuild:
+  Stable on ppc.
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> kst-0.94.ebuild,
+  kst-0.97.ebuild, kst-0.99.ebuild, kst-1.0.0.ebuild:
+  Changed dep on kdebase to accept kdebase-meta, the split 'meta' package.
+  This dep will be narrowed down in the future to the precise split packages
+  required.
+
+  28 Dec 2004; Olivier Fisette <ribosome@gentoo.org> kst-0.99.ebuild:
+  Dependency update: dev-libs/gsl -> sci-libs/gsl.
+
+  28 Dec 2004; Olivier Fisette <ribosome@gentoo.org> kst-1.0.0.ebuild:
+  Dependency update: dev-libs/gsl -> sci-libs/gsl.
 
 *kst-0.97 (23 Dec 2004)
 
diff --git a/media-gfx/kst/Manifest b/media-gfx/kst/Manifest
index febead02a1b5..4f3e2c0703fc 100644
--- a/media-gfx/kst/Manifest
+++ b/media-gfx/kst/Manifest
@@ -1,10 +1,21 @@
-MD5 7a7f64fd16613fe42409b6276a550f89 kst-0.97.ebuild 498
-MD5 c74e0c01c6376c41e25c33c28444d508 kst-0.99.ebuild 532
-MD5 83076a01c8073acc3561706f5936072b kst-0.94.ebuild 491
-MD5 a83c837da0c6d0fd5f9ec968209e0b62 kst-1.0.0.ebuild 536
-MD5 47300e32772e6d2c1e0353cbbfbdfcc1 ChangeLog 1046
-MD5 201497e376059503f8b7afd504d41023 metadata.xml 179
-MD5 a9c083343a53c0028f39d92ac01dc93a files/digest-kst-1.0.0 62
-MD5 124f013d204eb93390b67c4a9442e5aa files/digest-kst-0.94 61
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 cc230ff78650cedc0521a4df3f873db8 ChangeLog 2922
 MD5 19eccdaf16ff3e3301ad96c85fd3417b files/digest-kst-0.97 61
-MD5 eda462e34c4db01289aca79fcb10f263 files/digest-kst-0.99 61
+MD5 b3c3b4529c7a84a69be4e52b98c71a53 files/digest-kst-1.1.0 63
+MD5 b3c3b4529c7a84a69be4e52b98c71a53 files/digest-kst-1.1.0-r1 63
+MD5 4c04a9b00cd2b78b80a7b38eb3d4574a files/digest-kst-1.1.1 62
+MD5 7d7826a4f8fadf0c3c8627577a4f55a9 files/kst-1.1.0-netcdf-fix.patch 2939
+MD5 27834100f5137f06a3001217f76e74fa kst-0.97.ebuild 479
+MD5 5d6b71a99a2af171fbb39416e1816f9d kst-1.1.0-r1.ebuild 692
+MD5 441ad79778d2e3a21a44dd85f7be64da kst-1.1.0.ebuild 540
+MD5 d1127db7a7ca1c477d1a87642e89bb6f kst-1.1.1.ebuild 623
+MD5 862e7941cb21c9dd10e8bd6183f21fb0 metadata.xml 173
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDecJKntT9W3vfTuoRAtgCAJ4xGy6rdFJjY0U+NAcZlQg5dQnh4gCePiJw
+Bhbc1ACMwBXN+jW3RmJrIrI=
+=BztN
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/kst/kst-0.97.ebuild b/media-gfx/kst/kst-0.97.ebuild
index 083294fd888c..7a8a475a5367 100644
--- a/media-gfx/kst/kst-0.97.ebuild
+++ b/media-gfx/kst/kst-0.97.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/media-gfx/kst/kst-0.97.ebuild,v 1.1 2004/12/24 01:34:30 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kst/kst-0.97.ebuild,v 1.1.1.1 2005/11/30 09:37:36 chriswhite Exp $
 
 inherit kde
 
-DESCRIPTION="A plotting and data viewing program for KDE"
-HOMEPAGE="http://omega.astro.utoronto.ca/kst/"
+DESCRIPTION="A plotting and data viewing program for KDE."
+HOMEPAGE="http://kst.kde.org/"
 SRC_URI="http://omega.astro.utoronto.ca/kst/${P}.tar.gz"
 
-KEYWORDS="x86 ~ppc ~sparc amd64"
+KEYWORDS="amd64 ppc ~sparc x86"
 LICENSE="GPL-2"
 
 SLOT="0"
 IUSE=""
 
-DEPEND=">=kde-base/kdebase-3.1"
+DEPEND="kde-base/kdelibs"
 need-kde 3.1
diff --git a/media-gfx/kst/kst-1.1.0-r1.ebuild b/media-gfx/kst/kst-1.1.0-r1.ebuild
index 2a9ab991fdd3..e55dd6959e15 100644
--- a/media-gfx/kst/kst-1.1.0-r1.ebuild
+++ b/media-gfx/kst/kst-1.1.0-r1.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/media-gfx/kst/kst-1.1.0-r1.ebuild,v 1.1 2005/10/28 13:07:32 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kst/kst-1.1.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:36 chriswhite Exp $
 
 inherit kde
 
-DESCRIPTION="A plotting and data viewing program for KDE"
-HOMEPAGE="http://omega.astro.utoronto.ca/kst/"
+DESCRIPTION="A plotting and data viewing program for KDE."
+HOMEPAGE="http://kst.kde.org/"
 SRC_URI="http://mirrors.isc.org/pub/kde/stable/apps/KDE3.x/scientific/${P}.tar.gz"
 
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
diff --git a/media-gfx/kst/kst-1.1.0.ebuild b/media-gfx/kst/kst-1.1.0.ebuild
index d3a1eebc9622..0d52f4e6d635 100644
--- a/media-gfx/kst/kst-1.1.0.ebuild
+++ b/media-gfx/kst/kst-1.1.0.ebuild
@@ -1,21 +1,20 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kst/kst-1.1.0.ebuild,v 1.1 2005/06/17 18:40:54 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kst/kst-1.1.0.ebuild,v 1.1.1.1 2005/11/30 09:37:36 chriswhite Exp $
 
 inherit kde
 
-DESCRIPTION="A plotting and data viewing program for KDE"
-HOMEPAGE="http://omega.astro.utoronto.ca/kst/"
-#SRC_URI="http://omega.astro.utoronto.ca/kst/${P}.tar.gz"
+DESCRIPTION="A plotting and data viewing program for KDE."
+HOMEPAGE="http://kst.kde.org/"
 SRC_URI="http://mirrors.isc.org/pub/kde/stable/apps/KDE3.x/scientific/${P}.tar.gz"
 
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="~amd64 ppc ~sparc x86"
 LICENSE="GPL-2"
 
 SLOT="0"
 IUSE=""
 
-DEPEND="|| ( kde-base/kdebase-meta >=kde-base/kdebase-3.1 )"
+DEPEND="kde-base/kdelibs"
 RDEPEND="$DEPEND
 	sci-libs/gsl"
 need-kde 3.1
diff --git a/media-gfx/kst/kst-1.1.1.ebuild b/media-gfx/kst/kst-1.1.1.ebuild
index 4e713d76ffbd..f7e6098a5e38 100644
--- a/media-gfx/kst/kst-1.1.1.ebuild
+++ b/media-gfx/kst/kst-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/media-gfx/kst/kst-1.1.1.ebuild,v 1.1 2005/11/10 17:20:23 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kst/kst-1.1.1.ebuild,v 1.1.1.1 2005/11/30 09:37:36 chriswhite Exp $
 
 inherit kde
 
@@ -17,15 +17,10 @@ DEPEND="sci-libs/gsl"
 
 need-kde 3.1
 
+PATCHES="${FILESDIR}/${PN}-1.1.0-netcdf-fix.patch"
+
 src_unpack(){
 	kde_src_unpack
-
-	epatch "${FILESDIR}/kst-1.1.0-netcdf-fix.patch"
-	make -f admin/Makefile.common || die
-}
-
-src_compile() {
-	local myconf="--disable-netcdf"
-
-	kde_src_compile
+	rm -f configure
+	autoconf || die "autoconf failed"
 }
diff --git a/media-gfx/kst/metadata.xml b/media-gfx/kst/metadata.xml
index c215d35366c4..adaba9a99949 100644
--- a/media-gfx/kst/metadata.xml
+++ b/media-gfx/kst/metadata.xml
@@ -2,5 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sci</herd>
-<herd>kde-other</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/media-gfx/labplot/ChangeLog b/media-gfx/labplot/ChangeLog
index de5adb543572..06185f6b5d20 100644
--- a/media-gfx/labplot/ChangeLog
+++ b/media-gfx/labplot/ChangeLog
@@ -1,6 +1,18 @@
-# ChangeLog for app-sci/labplot
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/labplot/ChangeLog,v 1.1 2004/12/24 01:37:05 ribosome Exp $
+# ChangeLog for media-gfx/labplot
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/labplot/ChangeLog,v 1.1.1.1 2005/11/30 09:37:15 chriswhite Exp $
+
+*labplot-1.4.0 (05 Jan 2005)
+
+  05 Jan 2005; Patrick Kursawe <phosphan@gentoo.org> +files/getversion.patch,
+  +labplot-1.4.0.ebuild:
+  Version bump. Using USE flags for cdf and netcdf now. Added a patch for the
+  cdf version string (referred to a header that isn't installed by default).
+  Depending on fftw3 now to avoid potential trouble when fftw3 is used and
+  de-installed (which would not break the old dependency).
+
+  28 Dec 2004; Olivier Fisette <ribosome@gentoo.org> labplot-1.3.0.ebuild:
+  Dependency update: dev-libs/gsl -> sci-libs/gsl.
 
 *labplot-1.3.0 (23 Dec 2004)
 
diff --git a/media-gfx/labplot/Manifest b/media-gfx/labplot/Manifest
index 8b3c604abfd9..bfea56c281b3 100644
--- a/media-gfx/labplot/Manifest
+++ b/media-gfx/labplot/Manifest
@@ -1,15 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b48fe2d04a5dda1639faad946b927359 ChangeLog 1231
-MD5 caed2d14a2233347dca3e90db9ca5e72 labplot-1.3.0.ebuild 1083
-MD5 201497e376059503f8b7afd504d41023 metadata.xml 179
-MD5 b717f0448045aa171f74df43edcf4409 files/digest-labplot-1.3.0 66
+MD5 862e7941cb21c9dd10e8bd6183f21fb0 metadata.xml 173
+MD5 c29f2d9bf9c757e8b6a93a7f147b5766 labplot-1.4.0.ebuild 1607
+MD5 748a8b231bf5d0a9186881a422260f0c ChangeLog 1994
+MD5 1db5faa2d87be7b123c3ffdecd45ddec files/getversion.patch 945
+MD5 0e5477ba8d6a62e6a2dde93c7e12cef6 files/digest-labplot-1.4.0 66
 MD5 56ca5a2584d30cb2ec78d04714df475a files/labplot-1.3.0-amd64.patch 855
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBx12mI1lqEGTUzyQRApF7AKCQDWuNH7/G0K80587yprmXSZzGggCgqawZ
-WHYkmbJmbabgMXhjF3pTys8=
-=98zv
------END PGP SIGNATURE-----
diff --git a/media-gfx/labplot/labplot-1.4.0.ebuild b/media-gfx/labplot/labplot-1.4.0.ebuild
index f737ed2883c2..30aab0df5ff8 100644
--- a/media-gfx/labplot/labplot-1.4.0.ebuild
+++ b/media-gfx/labplot/labplot-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/media-gfx/labplot/labplot-1.4.0.ebuild,v 1.1 2005/01/05 14:44:59 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/labplot/labplot-1.4.0.ebuild,v 1.1.1.1 2005/11/30 09:37:15 chriswhite Exp $
 
 inherit eutils gnuconfig kde
 
diff --git a/media-gfx/labplot/metadata.xml b/media-gfx/labplot/metadata.xml
index c215d35366c4..adaba9a99949 100644
--- a/media-gfx/labplot/metadata.xml
+++ b/media-gfx/labplot/metadata.xml
@@ -2,5 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sci</herd>
-<herd>kde-other</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/media-gfx/lprof/ChangeLog b/media-gfx/lprof/ChangeLog
index 48e74a77f8f6..14b1ad663170 100644
--- a/media-gfx/lprof/ChangeLog
+++ b/media-gfx/lprof/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for media-gfx/lprof
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/lprof/ChangeLog,v 1.1 2003/12/09 16:50:12 lanius Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/lprof/ChangeLog,v 1.1.1.1 2005/11/30 09:37:20 chriswhite Exp $
+
+  27 Jul 2005; Simon Stelling <blubb@gentoo.org> lprof-1.09.ebuild:
+  added ~amd64 keyword
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> lprof-1.09.ebuild:
+  Add inherit eutils
+
+  29 Feb 2004; Caleb Tennis <caleb@gentoo.org> lprof-1.09.ebuild:
+  Add a qt addpredict to help alleviate compilation errors
+
+  15 Jan 2004; Heinrich Wendel <lanius@gentoo.org> lprof-1.09.ebuild:
+  mark x86
 
 *lprof-1.09 (09 Dec 2003)
 
diff --git a/media-gfx/lprof/Manifest b/media-gfx/lprof/Manifest
index 93243eee7471..58c929c3defe 100644
--- a/media-gfx/lprof/Manifest
+++ b/media-gfx/lprof/Manifest
@@ -1,4 +1,16 @@
-MD5 455f896034766e72a2d7cf44a3bd744d lprof-1.09.ebuild 772
-MD5 ccd27f9677836e20d828c165ad6d12b4 files/lprof-1.0.9_mrr_patch4.patch 12493
-MD5 c68c921dfc549a38258045190fedf541 files/lprof-1.0.9_fix-include.patch 290
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 39d779773b5ff55322619839948f9364 lprof-1.09.ebuild 916
+MD5 e1de896582867337e11318e35d0cdca8 ChangeLog 828
+MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
+MD5 c68c921dfc549a38258045190fedf541 files/lprof-1.09_fix-include.patch 290
+MD5 ccd27f9677836e20d828c165ad6d12b4 files/lprof-1.09_mrr_patch4.patch 12493
 MD5 d761545bacdfb7a9e189c7c1186ecac6 files/digest-lprof-1.09 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDEJmlevY57Fted3ERAn84AKCqD4LWo/wLpgXXve+vPTE1gETVYwCgsUlh
+YkLF7nYXKZn5HWzjy/6XJ4I=
+=Y39K
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/lprof/lprof-1.09.ebuild b/media-gfx/lprof/lprof-1.09.ebuild
index 4d11716a6ff0..1ff68ab3575e 100644
--- a/media-gfx/lprof/lprof-1.09.ebuild
+++ b/media-gfx/lprof/lprof-1.09.ebuild
@@ -1,13 +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/media-gfx/lprof/lprof-1.09.ebuild,v 1.1 2003/12/09 16:50:12 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/lprof/lprof-1.09.ebuild,v 1.1.1.1 2005/11/30 09:37:20 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="Little CMS ICC profile construction set"
 HOMEPAGE="http://www.littlecms.com/profilers.htm"
 SRC_URI="http://www.littlecms.com/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 DEPEND="x11-libs/qt
 	>=media-libs/lcms-1.09"
@@ -19,6 +21,7 @@ src_unpack() {
 }
 
 src_compile() {
+	addpredict ${QTDIR}/etc/settings
 	emake || die
 }
 
@@ -27,5 +30,5 @@ src_install() {
 	exeinto /usr/bin
 	doexe {icc2it8,qtmeasurementtool,qtmonitorprofiler,qtprofilechecker,qtscannerprofiler}
 	dodir /usr/share/lprof
-	cp -ar ${S}/{pics,profiles,targets,template} ${D}/usr/share/lprof
+	cp -pPR ${S}/{pics,profiles,targets,template} ${D}/usr/share/lprof
 }
diff --git a/media-gfx/maya/ChangeLog b/media-gfx/maya/ChangeLog
index 39bda26ab37a..9429fddcb47b 100644
--- a/media-gfx/maya/ChangeLog
+++ b/media-gfx/maya/ChangeLog
@@ -1,6 +1,85 @@
 # ChangeLog for media-gfx/maya
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/maya/ChangeLog,v 1.1 2004/04/27 05:54:56 eradicator Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/maya/ChangeLog,v 1.1.1.1 2005/11/30 09:37:36 chriswhite Exp $
+
+  13 Oct 2005; <dang@gentoo.org> maya-6.5.ebuild:
+  Make maya use virtual/fam. Bug #67170
+
+  15 Aug 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/maya-5.0.1.md5sum, -files/aw_flexlm, -files/aw_flexlm.conf.d,
+  -maya-5.0.1-r1.ebuild:
+  Removing old maya-5 from portage. If someone is still using that old verion,
+  let me know, and I'll add 5.0 back. If someone needs 6.0, you'll need to get
+  me a CD.
+
+  11 Aug 2005; Jeremy Huddleston <eradicator@gentoo.org> maya-6.5.ebuild:
+  Don't install the aw_flexlm init script. Add support for installing the
+  shader library.
+
+  11 Aug 2005; Jeremy Huddleston <eradicator@gentoo.org> maya-6.5.ebuild:
+  Create /usr/aw symlink for compatibility and COM/bin/installKey runtime lib
+  path.
+
+*maya-6.5 (02 Aug 2005)
+
+  02 Aug 2005; Jeremy Huddleston <eradicator@gentoo.org> +files/50maya,
+  files/aw_flexlm, maya-5.0.1-r1.ebuild, +maya-6.5.ebuild:
+  Version bump.  Ebuild made by me with support from Depthvfx,
+  http://www.depthvfx.com.
+
+  30 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/maya-6.0.md5sum, files/aw_flexlm, files/aw_flexlm.conf.d,
+  files/maya-docs, maya-5.0.1-r1.ebuild, -maya-6.0.ebuild:
+  Cleaned up init scripts. Removed 6.0 since nobody ever gave me a CD to
+  complete the ebuild with. 6.5 will be coming shortly.
+
+  06 May 2005; Sven Wegener <swegener@gentoo.org> maya-5.0.1-r1.ebuild,
+  maya-6.0.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  19 Apr 2005; Simon Stelling <blubb@gentoo.org> maya-6.0.ebuild:
+  added ~amd64
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> maya-5.0.1-r1.ebuild,
+  maya-6.0.ebuild:
+  Typo in DESCRIPTION: Comercial -> Commercial. Bug 59717.
+
+  19 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org> maya-6.0.ebuild:
+  Fix RDEPEND.
+
+  18 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> maya-5.0.1-r1.ebuild:
+  fix RDEPEND
+
+  18 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org> maya-5.0.1-r1.ebuild,
+  maya-6.0.ebuild:
+  Preliminary amd64 support... Docs don't work right because of funky java.
+
+*maya-6.0 (07 Jun 2004)
+
+  07 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org> maya-6.0.ebuild,
+  files/maya-6.0.md5sum:
+  In-progress maya6 ebuild.  Docs aren't working, but everything else is.
+
+  07 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org> maya-5.0.1-r1.ebuild:
+  Fixed postinstall->postinst
+
+  30 May 2004; Jeremy Huddleston <eradicator@gentoo.org> maya-5.0.1-r1.ebuild:
+  Stable x86.
+
+  04 May 2004; Jeremy Huddleston <eradicator@gentoo.org> maya-5.0.1-r1.ebuild:
+  Now using cdrom_get_cds if MAYA_INSTALL_LOC is not set.  Closes bug #49765.
+
+*maya-5.0.1-r1 (30 Apr 2004)
+
+  30 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> maya-5.0.1-r1.ebuild,
+  files/maya-5.0.1.md5sum:
+  Better install-from-cd support. Thanks to Henti Smith <henti@geekware.co.za>
+  for helping me test it out.
+  app-shells/tcsh or csh RDEPEND for Render.
+  /usr/aw/maya5.0/bin/maya symlink made to make Render work.
+
+  29 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> maya-5.0.1.ebuild:
+  Fixed permissions and RDEPEND statement
 
 *maya-5.0.1 (26 Apr 2004)
 
diff --git a/media-gfx/maya/Manifest b/media-gfx/maya/Manifest
index 67aeeed8ac05..4cb17db4b3b6 100644
--- a/media-gfx/maya/Manifest
+++ b/media-gfx/maya/Manifest
@@ -1,2 +1,16 @@
-MD5 2ddbc610a236ebaeaf057278e53f6413 maya-5.0.1.ebuild 1208
-MD5 911ab2c4c3366141b3c1e6e567324a85 files/digest-maya-5.0.1 158
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9cffffa1b1fdcc02103f0d9623de25b6 ChangeLog 3469
+MD5 9bd53be7de27bdf7b1964a15ed99b93d files/50maya 106
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-maya-6.5 0
+MD5 aa3d8c97154f1ce2d263a2a071811c28 files/maya-docs 314
+MD5 a9308ad8600c89224489d42c07a3e554 maya-6.5.ebuild 8663
+MD5 c1e212329f9083e2405b16dd382d6632 metadata.xml 259
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDTpoMomPajV0RnrERAj/eAJ91w9x2AhjVSifMk/jHUYs5wUV/ZQCePkPT
+8o6tuCde1x7zf2+t1QSUU7A=
+=u6yy
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/maya/files/maya-docs b/media-gfx/maya/files/maya-docs
index da6da64a28bd..58f4fb2d5bb6 100644
--- a/media-gfx/maya/files/maya-docs
+++ b/media-gfx/maya/files/maya-docs
@@ -6,12 +6,12 @@ depend() {
 
 start() {
 	ebegin "Starting Maya Doc Server"
-	start-stop-daemon --start --quiet --exec /usr/aw/maya/docs/startDocServer.sh
+	start-stop-daemon --start --quiet --exec /opt/aw/maya/docs/startDocServer.sh
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping Maya Doc Server"
-	start-stop-daemon --start --quiet --exec /usr/aw/maya/docs/shutdownDocServer.sh
+	start-stop-daemon --start --quiet --exec /opt/aw/maya/docs/shutdownDocServer.sh
 	eend $?
 }
diff --git a/media-gfx/maya/maya-6.5.ebuild b/media-gfx/maya/maya-6.5.ebuild
index 5032ec7825eb..631130a9c8ca 100644
--- a/media-gfx/maya/maya-6.5.ebuild
+++ b/media-gfx/maya/maya-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/media-gfx/maya/maya-6.5.ebuild,v 1.1 2005/08/11 08:50:25 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/maya/maya-6.5.ebuild,v 1.1.1.1 2005/11/30 09:37:36 chriswhite Exp $
 
 inherit rpm eutils versionator
 
@@ -33,7 +33,7 @@ KEYWORDS="~amd64 ~x86"
 DEPEND="app-arch/unzip"
 
 RDEPEND="|| ( app-shells/tcsh app-shells/csh )
-	 x86? ( app-admin/fam
+	 x86? ( virtual/fam
 	        !bundled-libs? ( =x11-libs/qt-3*
 	                         || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )
 	                         >=x11-libs/openmotif-2.2 ) )
@@ -64,16 +64,16 @@ src_unpack() {
 
 	# rpm_unpack unpacks in ${WORKDIR} no matter what we try... so get it out of the way...
 	cd ${S}
-	rpm_unpack ${CDROM_ROOT}/${AWCOMMON_RPM}
-	rpm_unpack ${CDROM_ROOT}/${AWCOMMON_SERVER_RPM}
-	rpm_unpack ${CDROM_ROOT}/${MAYA_RPM}
+	rpm_unpack ${CDROM_ROOT}/${AWCOMMON_RPM} || die
+	rpm_unpack ${CDROM_ROOT}/${AWCOMMON_SERVER_RPM} || die
+	rpm_unpack ${CDROM_ROOT}/${MAYA_RPM} || die
 
 	if use doc ; then
-		rpm_unpack ${CDROM_ROOT}/${MAYA_DOCS_RPM}
+		rpm_unpack ${CDROM_ROOT}/${MAYA_DOCS_RPM} || die
 
 		if ! use bundled-libs; then
-			rm -rf ${S}/usr/aw/maya6.5/docs/jre
-			sed -i -e 's:JAVACMD=\./jre/bin/java:JAVACMD=java:g' ${S}/usr/aw/maya6.5/docs/startDocServer.sh
+			rm -rf ${S}/usr/aw/maya6.5/docs/jre || die
+			sed -i -e 's:JAVACMD=\./jre/bin/java:JAVACMD=java:g' ${S}/usr/aw/maya6.5/docs/startDocServer.sh || die
 		fi
 	fi
 
@@ -81,34 +81,34 @@ src_unpack() {
 		pushd ${CDROM_ROOT} >& /dev/null
 		[[ -d shaderLibrary ]] || die "Could not locate shaderLibrary on Maya Installation CD."
 
-		tar -c -f - shaderLibrary | (cd ${S}; tar -x -f -) || die "Failed to copy over maya shader library"
+		tar -c -f - shaderLibrary | (cd ${S}/usr/aw/maya${SLOT}; tar -x -f -) || die "Failed to copy over maya shader library"
 
 		popd >& /dev/null
 	fi
 
-	mkdir ${S}/insroot
-	mv ${S}/usr ${S}/insroot/opt
-	rm -rf ${S}/insroot/opt/sbin
+	# Use app-admin/flexlm
+	rm -rf ${S}/usr/COM/{bin/lmutil,etc/lmgrd} || die
 
 	# Don't need RedHat's init script
-	rm -rf ${S}/etc
+	rm -rf ${S}/etc || die
 
-	# Use app-admin/flexlm
-	rm -rf ${S}/insroot/opt/COM/{bin/lmutil,etc/lmgrd}
+	mkdir ${S}/insroot || die
+	mv ${S}/usr ${S}/insroot/opt || die
+	rm -rf ${S}/insroot/opt/sbin || die
 
-	cp -a ${CDROM_ROOT}/README.html ${S}
+	cp -a ${CDROM_ROOT}/README.html ${S} || die
 
 	# Remove unneeded libs (provided by RDEPEND).
 	if ! use bundled-libs; then
-		#rm -f ${S}/insroot/${AWDIR}/COM/lib/libXm.so.2.1
-		rm -f ${S}/insroot/${MAYADIR}/lib/libgcc_s.so.1
-		rm -f ${S}/insroot/${MAYADIR}/lib/libstdc++.so.5.0.6
+		#rm -f ${S}/insroot/${AWDIR}/COM/lib/libXm.so.2.1 || die
+		rm -f ${S}/insroot/${MAYADIR}/lib/libgcc_s.so.1 || die
+		rm -f ${S}/insroot/${MAYADIR}/lib/libstdc++.so.5.0.6 || die
 
 		# We keep this one because of possible C++ ABI changes...
 		# Maya 6.5 was compiled with CXXABI_1.2 (libstdc++.so.5)
-		# rm -f ${S}/insroot/${MAYADIR}/lib/libqt.so.3
+		# rm -f ${S}/insroot/${MAYADIR}/lib/libqt.so.3 || die
 
-		rm -f ${S}/insroot/${MAYADIR}/lib/libXm.so.3
+		rm -f ${S}/insroot/${MAYADIR}/lib/libXm.so.3 || die
 	fi
 }
 
@@ -116,7 +116,7 @@ src_install() {
 	dohtml README.html
 
 	cd ${S}/insroot
-	cp -a . ${D}
+	cp -a . ${D} || die
 
 	# We use our own Motif runtime unless USE=bundled-libs
 	#if use bundled-libs; then
@@ -166,17 +166,18 @@ src_install() {
 
 	doenvd ${FILESDIR}/50maya
 
-	doinitd ${FILESDIR}/aw_flexlm
-	newconfd  ${FILESDIR}/aw_flexlm.conf.d aw_flexlm
-
 	if use maya-shaderlibrary ; then
-		die "Add support to install the shaderLibrary here"
+		echo "MAYA_SHADER_LIBRARY_PATH=\"${AWDIR}/maya/shaderLibrary/shaders\"" >> ${D}/etc/env.d/50maya
 	fi
 
 	# Fix permissions
 	find ${D}${AWDIR} -type d -exec chmod 755 {} \;
 
 	dosed 's:tail -1: tail -n 1:g' /opt/aw/maya${SLOT}/bin/Maya${SLOT}
+
+	# For compatibility purposes.  Also, COM/bin/installKey uses
+	# /usr/aw/COM/lib as runtime lib path to find libXm.so.2
+	dosym ../opt/aw /usr/aw
 }
 
 pkg_postinst() {
diff --git a/media-gfx/megapov/ChangeLog b/media-gfx/megapov/ChangeLog
index c03ac50bc232..d2e186f6187c 100644
--- a/media-gfx/megapov/ChangeLog
+++ b/media-gfx/megapov/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/megapov
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/megapov/ChangeLog,v 1.1 2003/07/30 08:12:51 msterret Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/megapov/ChangeLog,v 1.1.1.1 2005/11/30 09:37:26 chriswhite Exp $
+
+  09 May 2005; David Holm <dholm@gentoo.org> megapov-1.0.ebuild:
+  Added to ~ppc.
 
 *megapov-1.0 (30 Jul 2003)
 
diff --git a/media-gfx/megapov/Manifest b/media-gfx/megapov/Manifest
index 3dcc75b11fa8..db557dc126c5 100644
--- a/media-gfx/megapov/Manifest
+++ b/media-gfx/megapov/Manifest
@@ -1,2 +1,3 @@
-MD5 30925dce49bc335f73e9b733553393c0 megapov-1.0.ebuild 1179
+MD5 58f58a50de3319d6842d39a402ab749e ChangeLog 479
+MD5 8923eef1684aef9267b7d1e43249a729 megapov-1.0.ebuild 1803
 MD5 98014ef18d9679f35cfa31671127a06c files/digest-megapov-1.0 68
diff --git a/media-gfx/megapov/megapov-1.0.ebuild b/media-gfx/megapov/megapov-1.0.ebuild
index bf97bc10c128..c4b511791ea8 100644
--- a/media-gfx/megapov/megapov-1.0.ebuild
+++ b/media-gfx/megapov/megapov-1.0.ebuild
@@ -1,12 +1,12 @@
-# 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/media-gfx/megapov/megapov-1.0.ebuild,v 1.1 2003/07/30 08:12:51 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/megapov/megapov-1.0.ebuild,v 1.1.1.1 2005/11/30 09:37:26 chriswhite Exp $
 
 DESCRIPTION="The popular collection of unofficial extensions of POV-Ray"
 HOMEPAGE="http://megapov.inetart.net/"
 SRC_URI="http://megapov.inetart.net/${P}_unix_s.tgz"
 LICENSE="povlegal-3.5"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 SLOT="0"
 IUSE=""
 
diff --git a/media-gfx/metadata.xml b/media-gfx/metadata.xml
index 017a11b9c111..d113fda95aff 100644
--- a/media-gfx/metadata.xml
+++ b/media-gfx/metadata.xml
@@ -4,5 +4,23 @@
 	<longdescription lang="en">
 		The media-gfx category contains graphics-related packages.
 	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie media-gfx enthält Programme rund um das Thema Grafik.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría media-gfx contiene paquetes relacionados con gráficos.
+	</longdescription>
+	<longdescription lang="ja">
+		media-gfxカテゴリーにはグラフィック関連のパッケージが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De media-gfx categorie bevat grafische applicaties.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm media-gfx chứa các gói liên quan đến đồ hoạ.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria media-gfx contiene pacchetti per la grafica.
+	</longdescription>
 </catmetadata>
 
diff --git a/media-gfx/mkgallery/ChangeLog b/media-gfx/mkgallery/ChangeLog
index a9b1b519023a..67a625298ddd 100644
--- a/media-gfx/mkgallery/ChangeLog
+++ b/media-gfx/mkgallery/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for media-gfx/mkgallery
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/mkgallery/ChangeLog,v 1.1 2002/11/22 23:29:05 vapier Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/mkgallery/ChangeLog,v 1.1.1.1 2005/11/30 09:37:13 chriswhite Exp $
+
+  05 Aug 2005; Olivier Crête <tester@gentoo.org> mkgallery-1.1.ebuild:
+  Stable on amd64
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> mkgallery-1.1.ebuild:
+  Stable on ppc.
+
+  30 Aug 2004; Tom Martin <slarti@gentoo.org> mkgallery-1.1.ebuild:
+  Marked ~amd64.
+
+  14 Jun 2004; Michael Hanselmann <hansmi@gentoo.org> mkgallery-1.1.ebuild:
+  Added ~ppc to KEYWORDS.
+
+  29 Sep 2003; Todd Sunderlin <todd@gentoo.org> mkgallery-1.1.ebuild:
+  added sparc keyword
 
 *mkgallery-1.1 (22 Nov 2002)
 
diff --git a/media-gfx/mkgallery/Manifest b/media-gfx/mkgallery/Manifest
index e69de29bb2d1..ce117e3e6593 100644
--- a/media-gfx/mkgallery/Manifest
+++ b/media-gfx/mkgallery/Manifest
@@ -0,0 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 30736582096a30d245210940f5bf6c8f ChangeLog 841
+MD5 1c9fe0fd4b651411a36da84a01618548 mkgallery-1.1.ebuild 569
+MD5 a9c6def331b5cc3157fa080c5739e338 files/digest-mkgallery-1.1 60
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC8uQymOfEJZHYOKcRAh2XAKC4PQLWt97d0sh6Rc0dlpEtv3TlMwCeIv1M
+RVhwrKBha3MPz4arfdi8uek=
+=oOqj
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/mkgallery/mkgallery-1.1.ebuild b/media-gfx/mkgallery/mkgallery-1.1.ebuild
index 7585afa21b29..d49ea8520c6a 100644
--- a/media-gfx/mkgallery/mkgallery-1.1.ebuild
+++ b/media-gfx/mkgallery/mkgallery-1.1.ebuild
@@ -1,13 +1,14 @@
-# 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/media-gfx/mkgallery/mkgallery-1.1.ebuild,v 1.1 2002/11/22 23:29:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/mkgallery/mkgallery-1.1.ebuild,v 1.1.1.1 2005/11/30 09:37:13 chriswhite Exp $
 
 DESCRIPTION="Creates thumbnails and a HTML index file for a directory of jpg files"
 HOMEPAGE="http://mkgallery.sourceforge.net/"
-SRC_URI="http://mkgallery.sourceforge.net/${PN}-${PV}.tgz"
+SRC_URI="http://mkgallery.sourceforge.net/${P}.tgz"
 
 LICENSE="GPL-2"
-KEYWORDS="x86"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE=""
 SLOT="0"
 
 DEPEND="media-gfx/imagemagick"
diff --git a/media-gfx/nip2/ChangeLog b/media-gfx/nip2/ChangeLog
index 3eb6cd4997b3..b8386049a415 100644
--- a/media-gfx/nip2/ChangeLog
+++ b/media-gfx/nip2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/nip2
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/nip2/ChangeLog,v 1.1 2005/04/06 21:13:07 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/nip2/ChangeLog,v 1.1.1.1 2005/11/30 09:37:38 chriswhite Exp $
+
+  03 Jun 2005; Luca Barbato <lu_zero@gentoo.org> metadata.xml:
+  Metadata fix
+
+  07 Apr 2005; Sven Wegener <swegener@gentoo.org> nip2-7.10.9.ebuild:
+  Fixed invalid atoms in *DEPEND.
 
 *nip2-7.10.9 (06 Apr 2005)
 
diff --git a/media-gfx/nip2/Manifest b/media-gfx/nip2/Manifest
index 773ac91f15e5..bca4e9eb910f 100644
--- a/media-gfx/nip2/Manifest
+++ b/media-gfx/nip2/Manifest
@@ -1,2 +1,4 @@
-MD5 92b3e4411399e4ca0b9b8e02a0f0609f nip2-7.10.9.ebuild 756
+MD5 fe73035625dc6609b435f48162acae65 metadata.xml 165
+MD5 9f8bb2380c926a22bc9fdec7c12d62ef nip2-7.10.9.ebuild 786
+MD5 7cb7f6956b5780accc0b6533edee2867 ChangeLog 564
 MD5 d314c6489fe5364c5b75b157c734a4f7 files/digest-nip2-7.10.9 65
diff --git a/media-gfx/nip2/metadata.xml b/media-gfx/nip2/metadata.xml
index 443a1ef74226..8266fc360ff1 100644
--- a/media-gfx/nip2/metadata.xml
+++ b/media-gfx/nip2/metadata.xml
@@ -3,6 +3,6 @@
 
 <pkgmetadata>
 
-	<herd>media-gfx</herd>
+	<herd>graphics</herd>
 
 </pkgmetadata>
diff --git a/media-gfx/nip2/nip2-7.10.9.ebuild b/media-gfx/nip2/nip2-7.10.9.ebuild
index 639c23be8e77..088a4ce20010 100644
--- a/media-gfx/nip2/nip2-7.10.9.ebuild
+++ b/media-gfx/nip2/nip2-7.10.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/media-gfx/nip2/nip2-7.10.9.ebuild,v 1.1 2005/04/06 21:13:07 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/nip2/nip2-7.10.9.ebuild,v 1.1.1.1 2005/11/30 09:37:38 chriswhite Exp $
 
 DESCRIPTION="VIPS Image Processing Graphical User Interface"
 SRC_URI="http://www.vips.ecs.soton.ac.uk/vips-7.10/${P}.tar.gz"
@@ -17,7 +17,7 @@ RDEPEND=">=media-libs/vips-7.10.7
 		>=x11-libs/gtk+-2.4
 		dev-libs/libxml2
 		>=dev-libs/glib-2
-		fftw? ( >=sci-libs/fftw )"
+		fftw? ( sci-libs/fftw )"
 
 DEPEND="${RDEPEND}
 		sys-devel/flex
diff --git a/media-gfx/nvidia-cg-toolkit/ChangeLog b/media-gfx/nvidia-cg-toolkit/ChangeLog
index 0acd44109881..b94ff7a79135 100644
--- a/media-gfx/nvidia-cg-toolkit/ChangeLog
+++ b/media-gfx/nvidia-cg-toolkit/ChangeLog
@@ -1,9 +1,41 @@
-# ChangeLog for <media-gfx>/<nvidia-cg-toolkit>
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-cg-toolkit/ChangeLog,v 1.1 2002/12/18 01:48:01 blauwers Exp $
+# ChangeLog for media-gfx/nvidia-cg-toolkit
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-cg-toolkit/ChangeLog,v 1.1.1.1 2005/11/30 09:37:39 chriswhite Exp $
+
+  07 Apr 2005; Simon Stelling <blubb@gentoo.org>
+  nvidia-cg-toolkit-1.2.0402.1900.ebuild:
+  stable on amd64
+
+*nvidia-cg-toolkit-1.3.0501.0700 (08 Mar 2005)
+
+ 08 Mar 2005; Bart Lauwers ,blauwers@gentoo.org> nvidia-cg-toolkit-1.3.0501.0700.ebuild:
+ version bump per bug #75792, this ebuild also add initial x64 support
+
+*nvidia-cg-toolkit-1.3.0408.0400 (10 Jan 2005)
+
+ 10 Jan 2005; Bart Lauwers <blauwers@gentoo.org> nvidia-cg-toolkit-1.3.0408.0400.ebuild:
+ Version bump per Bug #61956
+
+*nvidia-cg-toolkit-1.1.0303.0400 (29 Mar 2004)
+
+ 29 Mar 2004; Bart Lauwers <blauwers@gentoo.org> nvidia-cg-toolkit-1.1.0303.0400.ebuild:
+ Rename of nvidia-cg-toolkit-2.1-r7.ebuild to match vendor versioning scheme
+
+*nvidia-cg-toolkit-1.2.0402.1900 (28 Mar 2004)
+
+  28 Mar 2004; Bart Lauwers <blauwers@gentoo.org> nvidia-cg-toolkit-1.2.0402.1900.ebuild, ChangeLog, metadata.xml, nvidia-cg-toolkit-2.1-r6.ebuild, nvidia-cg-toolkit-2.1-r7.ebuild:
+  Version bump + fixes to copyright dates (satisfy repoman).
+
+*nvidia-cg-toolkit-2.1-r7 (03 MAY 2003)
+
+  03 MAY 2003; Bart Lauwers <blauwers@gentoo.org> :
+  Version bump per Bug#18282 and dep fix per Bug#19660
 
 *nvidia-cg-toolkit-2.1-r6 (10 DEC 2002)
 
+  20 Mar 2003; Martin Holzer <mholzer@gentoo.org> nvidia-cg-toolkit-2.1-r6.ebuild :
+  Changed SRC_URI since it's no more available on nvidia site.
+
   10 DEC 2002; B.Lauwers <blauwers@gentoo.org> nvidia-cg-toolkit-2.1-r6.ebuild :
 
   Initial import of the cg toolkit from NVIDIA, find more great examples on
diff --git a/media-gfx/nvidia-cg-toolkit/Manifest b/media-gfx/nvidia-cg-toolkit/Manifest
index e69de29bb2d1..55ad78062ae7 100644
--- a/media-gfx/nvidia-cg-toolkit/Manifest
+++ b/media-gfx/nvidia-cg-toolkit/Manifest
@@ -0,0 +1,11 @@
+MD5 b994b8bc2a0a8475b824e9bfa786a82b ChangeLog 1768
+MD5 890b7fa33669db119f8bc412566d2b73 metadata.xml 683
+MD5 74558eaa4327232c6635761146fe7746 nvidia-cg-toolkit-1.1.0303.0400.ebuild 1687
+MD5 a22f6ecbfaafa3f5cdd5506f645cd0cd nvidia-cg-toolkit-1.2.0402.1900.ebuild 1587
+MD5 761a49754a4dc7a308ca7e93a87f130d nvidia-cg-toolkit-1.3.0408.0400.ebuild 1597
+MD5 c62dd2fbdc45e62b8470426d37aee38d nvidia-cg-toolkit-1.3.0501.0700.ebuild 1769
+MD5 eb578c83d5ce406419a4676f87293109 files/80cgc 251
+MD5 25a8347bedfc8f693ef8c4f16e52e642 files/digest-nvidia-cg-toolkit-1.1.0303.0400 69
+MD5 59ca53210babe162facca60aeaa30692 files/digest-nvidia-cg-toolkit-1.2.0402.1900 69
+MD5 a481313dbafb3b6c9b49a37af9ccaf36 files/digest-nvidia-cg-toolkit-1.3.0408.0400 74
+MD5 2272e06e17522faa78fa2e1ba6e11fdd files/digest-nvidia-cg-toolkit-1.3.0501.0700 150
diff --git a/media-gfx/nvidia-cg-toolkit/files/80cgc b/media-gfx/nvidia-cg-toolkit/files/80cgc
index 192fda87337c..2c032e653695 100644
--- a/media-gfx/nvidia-cg-toolkit/files/80cgc
+++ b/media-gfx/nvidia-cg-toolkit/files/80cgc
@@ -1,5 +1,5 @@
 # /etc/env.d/80cgc :
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-cg-toolkit/files/80cgc,v 1.1 2002/12/10 22:32:13 blauwers Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-cg-toolkit/files/80cgc,v 1.1.1.1 2005/11/30 09:37:40 chriswhite Exp $
 
 
 # Configures the CG Runtime environment for Bourne shell and compatible shells
diff --git a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-1.1.0303.0400.ebuild b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-1.1.0303.0400.ebuild
index 025a07af6764..a343c27b2db2 100644
--- a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-1.1.0303.0400.ebuild
+++ b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-1.1.0303.0400.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/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-1.1.0303.0400.ebuild,v 1.1 2004/03/29 20:24:25 blauwers Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-1.1.0303.0400.ebuild,v 1.1.1.1 2005/11/30 09:37:40 chriswhite Exp $
 
 DESCRIPTION="nvidia's c graphics compiler toolkit"
 HOMEPAGE="http://developer.nvidia.com/view.asp?IO=cg_toolkit"
@@ -8,7 +8,7 @@ SRC_URI="ftp://download.nvidia.com/developer/cg/Cg-1.1.0303-0400.tar.gz"
 LICENSE="NVIDIA"
 SLOT="0"
 KEYWORDS="x86 amd64"
-IUSE="glut"
+IUSE=""
 DEPEND="virtual/glut"
 S="${WORKDIR}"
 
diff --git a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-1.2.0402.1900.ebuild b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-1.2.0402.1900.ebuild
index f03aada9bbbc..3bd00503c2f6 100644
--- a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-1.2.0402.1900.ebuild
+++ b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-1.2.0402.1900.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/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-1.2.0402.1900.ebuild,v 1.1 2004/03/28 16:13:46 blauwers Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-1.2.0402.1900.ebuild,v 1.1.1.1 2005/11/30 09:37:39 chriswhite Exp $
 
 DESCRIPTION="nvidia's c graphics compiler toolkit"
 HOMEPAGE="http://developer.nvidia.com/view.asp?IO=cg_toolkit"
 SRC_URI="ftp://download.nvidia.com/developer/cg/Cg_1.2/Linux/Cg-1.2.0402-1900.tar.gz"
+
 LICENSE="NVIDIA"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64"
 IUSE=""
+
 DEPEND="virtual/glut"
-S="${WORKDIR}"
+
+S=${WORKDIR}
 
 src_install() {
 	dobin usr/bin/cgc
diff --git a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-1.3.0408.0400.ebuild b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-1.3.0408.0400.ebuild
index 02bbdd2ffca9..5e5faccb6d54 100644
--- a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-1.3.0408.0400.ebuild
+++ b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-1.3.0408.0400.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-1.3.0408.0400.ebuild,v 1.1 2005/01/10 01:38:57 blauwers Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-1.3.0408.0400.ebuild,v 1.1.1.1 2005/11/30 09:37:39 chriswhite Exp $
 
 DESCRIPTION="nvidia's c graphics compiler toolkit"
 HOMEPAGE="http://developer.nvidia.com/view.asp?IO=cg_toolkit"
diff --git a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-1.3.0501.0700.ebuild b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-1.3.0501.0700.ebuild
index f7784738b3ba..51fcc3bb16c4 100644
--- a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-1.3.0501.0700.ebuild
+++ b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-1.3.0501.0700.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-1.3.0501.0700.ebuild,v 1.1 2005/03/08 16:45:46 blauwers Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-1.3.0501.0700.ebuild,v 1.1.1.1 2005/11/30 09:37:39 chriswhite Exp $
 
 DESCRIPTION="nvidia's c graphics compiler toolkit"
 HOMEPAGE="http://developer.nvidia.com/view.asp?IO=cg_toolkit"
diff --git a/media-gfx/opcion/ChangeLog b/media-gfx/opcion/ChangeLog
index 547d8dc5edd1..542f21339900 100644
--- a/media-gfx/opcion/ChangeLog
+++ b/media-gfx/opcion/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/opcion
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/opcion/ChangeLog,v 1.1 2004/10/02 07:01:01 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/opcion/ChangeLog,v 1.1.1.1 2005/11/30 09:37:25 chriswhite Exp $
+
+  17 Oct 2004; David Holm <dholm@gentoo.org> opcion-1.1.1.ebuild:
+  Added to ~ppc.
+
+  17 Oct 2004; Thomas Matthijs <axxo@gentoo.org> opcion-1.1.1.ebuild:
+  dojar --> java-pkg_dojar
 
 *opcion-1.1.1 (02 Oct 2004)
 
diff --git a/media-gfx/opcion/Manifest b/media-gfx/opcion/Manifest
index 667d6670e62e..7f4979097217 100644
--- a/media-gfx/opcion/Manifest
+++ b/media-gfx/opcion/Manifest
@@ -1,2 +1,4 @@
-MD5 0b035b6de9630b243a2065eb005cf5c5 opcion-1.1.1.ebuild 358
+MD5 9ba1ac46b6ee42dfa6f0014001ec1db1 ChangeLog 546
+MD5 295674d4bed87f5a7c2796e032ed561e metadata.xml 158
+MD5 eacba6bd839f3a232c5913d31a71a77f opcion-1.1.1.ebuild 731
 MD5 217073f210ff1a99b65f840cc5050586 files/digest-opcion-1.1.1 62
diff --git a/media-gfx/opcion/opcion-1.1.1.ebuild b/media-gfx/opcion/opcion-1.1.1.ebuild
index bb2cbef49d8d..0e5f9697109e 100644
--- a/media-gfx/opcion/opcion-1.1.1.ebuild
+++ b/media-gfx/opcion/opcion-1.1.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/media-gfx/opcion/opcion-1.1.1.ebuild,v 1.1 2004/10/02 07:01:01 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/opcion/opcion-1.1.1.ebuild,v 1.1.1.1 2005/11/30 09:37:25 chriswhite Exp $
 
 inherit java-pkg
 
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 
 SLOT="0"
 
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 
 IUSE=""
 
@@ -31,7 +31,7 @@ src_compile() {
 }
 
 src_install() {
-	dojar *.jar
+	java-pkg_dojar *.jar
 
 	echo "#!/bin/sh" > ${T}/opcion
 	echo "java -jar /usr/share/opcion/lib/${MY_P}.jar" >> ${T}/opcion
diff --git a/media-gfx/opendx-samples/ChangeLog b/media-gfx/opendx-samples/ChangeLog
index 10dcaee70be3..be1cfdaeec2b 100644
--- a/media-gfx/opendx-samples/ChangeLog
+++ b/media-gfx/opendx-samples/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/opendx-samples
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/opendx-samples/ChangeLog,v 1.1 2005/08/08 14:56:56 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/opendx-samples/ChangeLog,v 1.1.1.1 2005/11/30 09:37:25 chriswhite Exp $
+
+  20 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  opendx-samples-4.3.2.ebuild:
+  Added to ~ppc (#101951).
 
 *opendx-samples-4.3.2 (08 Aug 2005)
 
diff --git a/media-gfx/opendx-samples/Manifest b/media-gfx/opendx-samples/Manifest
index acc3ba3410a1..13a5a8e816ec 100644
--- a/media-gfx/opendx-samples/Manifest
+++ b/media-gfx/opendx-samples/Manifest
@@ -1,4 +1,4 @@
-MD5 1aef4ee079071b45c6d510562cf85eb1 opendx-samples-4.3.2.ebuild 1081
-MD5 17040b844455b83c9bd118c62ffc80a9 ChangeLog 326
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
+MD5 e284983050cf759dc2a26456013b60ab ChangeLog 535
+MD5 c9f7b709e22c3a814bb0dcf6f8015707 opendx-samples-4.3.2.ebuild 1196
 MD5 79e9088507c29d4854546506167d851c files/digest-opendx-samples-4.3.2 68
diff --git a/media-gfx/opendx-samples/opendx-samples-4.3.2.ebuild b/media-gfx/opendx-samples/opendx-samples-4.3.2.ebuild
index 2fafff508d8d..877c17e57e28 100644
--- a/media-gfx/opendx-samples/opendx-samples-4.3.2.ebuild
+++ b/media-gfx/opendx-samples/opendx-samples-4.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/media-gfx/opendx-samples/opendx-samples-4.3.2.ebuild,v 1.1 2005/08/08 14:56:56 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/opendx-samples/opendx-samples-4.3.2.ebuild,v 1.1.1.1 2005/11/30 09:37:25 chriswhite Exp $
 
 S="${WORKDIR}/dxsamples-${PV}"
 
@@ -10,7 +10,7 @@ SRC_URI="http://opendx.npaci.edu/source/dxsamples-${PV}.tar.gz"
 LICENSE="IPL-1"
 SLOT="0"
 
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 IUSE=""
 
 DEPEND="=media-gfx/opendx-${PV}*"
diff --git a/media-gfx/opendx/ChangeLog b/media-gfx/opendx/ChangeLog
index 4e6b1bc7896e..a53750121912 100644
--- a/media-gfx/opendx/ChangeLog
+++ b/media-gfx/opendx/ChangeLog
@@ -1,6 +1,54 @@
 # ChangeLog for media-gfx/opendx
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/opendx/ChangeLog,v 1.1 2004/03/15 02:31:35 spyderous Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/opendx/ChangeLog,v 1.1.1.1 2005/11/30 09:37:23 chriswhite Exp $
+
+  28 Aug 2005; Simon Stelling <blubb@gentoo.org> ChangeLog:
+  added ~amd64 keyword
+
+  20 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  opendx-4.3.2-r1.ebuild:
+  Stable on ppc (bug #101923).
+
+  25 Jul 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  opendx-4.3.2-r1.ebuild:
+  Stable on x86.
+
+  25 Jul 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  opendx-4.3.2-r1.ebuild:
+  Update to use linux-info.eclass and to check for SMP properly.
+
+  24 May 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  opendx-4.3.2-r1.ebuild:
+  (#82672) Filter -finline-functions and -O3.
+
+  28 Dec 2004; Olivier Fisette <ribosome@gentoo.org> :
+  Dependency update: dev-libs/szip -> sci-libs/szip.
+
+  28 Dec 2004; Olivier Fisette <ribosome@gentoo.org> :
+  Dependency update: dev-libs/szip -> sci-libs/szip.
+
+  28 Dec 2004; Olivier Fisette <ribosome@gentoo.org> opendx-4.3.2-r1.ebuild:
+  Dependency update: dev-libs/szip -> sci-libs/szip.
+
+  28 Dec 2004; Olivier Fisette <ribosome@gentoo.org> opendx-4.3.2.ebuild:
+  Dependency update: dev-libs/szip -> sci-libs/szip.
+
+  28 Dec 2004; Olivier Fisette <ribosome@gentoo.org> opendx-4.3.2-r1.ebuild:
+  Dependency update: dev-libs/hdf -> sci-libs/hdf.
+
+  28 Dec 2004; Olivier Fisette <ribosome@gentoo.org> opendx-4.3.2.ebuild:
+  Dependency update: dev-libs/hdf -> sci-libs/hdf.
+
+*opendx-4.3.2-r1 (24 May 2004)
+
+  24 May 2004; Patrick Kursawe <phosphan@gentoo.org> opendx-4.3.2-r1.ebuild:
+  Making szip dependency optional
+
+  16 Mar 2004; Patrick Kursawe <phosphan@gentoo.org> opendx-4.3.2.ebuild:
+  Fixing bug #44727 by adding szip as dependency.
+
+  15 Mar 2004; David Holm <dholm@gentoo.org> opendx-4.3.2.ebuild:
+  Added to ~ppc.
 
 *opendx-4.3.2 (14 Mar 2004)
 
diff --git a/media-gfx/opendx/Manifest b/media-gfx/opendx/Manifest
index c96028f58b75..1b396bae3544 100644
--- a/media-gfx/opendx/Manifest
+++ b/media-gfx/opendx/Manifest
@@ -1,2 +1,6 @@
-MD5 7353c294c49d44a7e3ceafe0132b21ac opendx-4.3.2.ebuild 3056
+MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
+MD5 fd24b5fc7086d5c2bce97275e154562d ChangeLog 2078
+MD5 592a24a74375c717430f42e1b0105280 opendx-4.3.2.ebuild 2894
+MD5 2e4addc2031e514eb5263460f3aec8c3 opendx-4.3.2-r1.ebuild 2788
 MD5 e8b3b97f7766dc0b83d6dfd1cd0b753e files/digest-opendx-4.3.2 61
+MD5 e8b3b97f7766dc0b83d6dfd1cd0b753e files/digest-opendx-4.3.2-r1 61
diff --git a/media-gfx/opendx/opendx-4.3.2-r1.ebuild b/media-gfx/opendx/opendx-4.3.2-r1.ebuild
index b3c8b3a642cd..d6de49f09bbd 100644
--- a/media-gfx/opendx/opendx-4.3.2-r1.ebuild
+++ b/media-gfx/opendx/opendx-4.3.2-r1.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/media-gfx/opendx/opendx-4.3.2-r1.ebuild,v 1.1 2004/05/24 11:35:26 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/opendx/opendx-4.3.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:23 chriswhite Exp $
 
 # Set SMP="no" to force disable of SMP compilation.
 # Set SMP="yes" to force enable of SMP compilation.
 # Otherwise it will be autodetected from /usr/src/linux.
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic linux-info
 
 DESCRIPTION="A 3D data visualization tool"
 HOMEPAGE="http://www.opendx.org/"
@@ -24,16 +24,16 @@ SRC_URI="http://opendx.npaci.edu/source/${P/open}.tar.gz"
 LICENSE="IPL-1"
 SLOT="0"
 # Should work on x86, ppc, alpha at least
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~amd64 ppc x86"
 
 IUSE="hdf cdf netcdf tiff imagemagick szip" # java doc"
 
 DEPEND="virtual/x11
 	x11-libs/openmotif
-	szip? ( dev-libs/szip )
-	hdf? ( dev-libs/hdf )
-	cdf? ( app-sci/cdf )
-	netcdf? ( app-sci/netcdf )
+	szip? ( sci-libs/szip )
+	hdf? ( sci-libs/hdf )
+	cdf? ( sci-libs/cdf )
+	netcdf? ( sci-libs/netcdf )
 	tiff? ( media-libs/tiff )
 	imagemagick? ( >=media-gfx/imagemagick-5.3.4 )"
 # waiting on bug #36349 for media-libs/jasper in imagemagick
@@ -48,17 +48,7 @@ smp() {
 }
 
 smp_check() {
-	if [ -e /usr/src/linux/.config ]
-	then
-		if [ "`grep SMP /usr/src/linux/.config | cut -d= -f2`" = "y" ]
-		then
-			return 0
-		else
-			return 1
-		fi
-	else
-		die "SMP check failed. Make sure /usr/src/linux/.config exists."
-	fi
+	linux_chkconfig_present SMP
 }
 
 src_compile() {
@@ -84,6 +74,9 @@ src_compile() {
 	# with gcc 3.3.2 I had an infinite loop on src/exec/libdx/zclipQ.c
 	append-flags -fno-strength-reduce
 
+	# (#82672)
+	filter-flags -finline-functions
+	replace-flags -O3 -O2
 
 	local GENTOOARCH="${ARCH}"
 	# opendx uses this variable
diff --git a/media-gfx/opendx/opendx-4.3.2.ebuild b/media-gfx/opendx/opendx-4.3.2.ebuild
index 1a66cd8320f9..acdfe668682f 100644
--- a/media-gfx/opendx/opendx-4.3.2.ebuild
+++ b/media-gfx/opendx/opendx-4.3.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/media-gfx/opendx/opendx-4.3.2.ebuild,v 1.1 2004/03/15 02:31:35 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/opendx/opendx-4.3.2.ebuild,v 1.1.1.1 2005/11/30 09:37:23 chriswhite Exp $
 
 # Set SMP="no" to force disable of SMP compilation.
 # Set SMP="yes" to force enable of SMP compilation.
@@ -24,15 +24,16 @@ SRC_URI="http://opendx.npaci.edu/source/${P/open}.tar.gz"
 LICENSE="IPL-1"
 SLOT="0"
 # Should work on x86, ppc, alpha at least
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 
 IUSE="hdf cdf netcdf tiff imagemagick" # java doc"
 
 DEPEND="virtual/x11
 	x11-libs/openmotif
-	hdf? ( dev-libs/hdf )
-	cdf? ( app-sci/cdf )
-	netcdf? ( app-sci/netcdf )
+	sci-libs/szip
+	hdf? ( sci-libs/hdf )
+	cdf? ( sci-libs/cdf )
+	netcdf? ( sci-libs/netcdf )
 	tiff? ( media-libs/tiff )
 	imagemagick? ( >=media-gfx/imagemagick-5.3.4 )"
 # waiting on bug #36349 for media-libs/jasper in imagemagick
diff --git a/media-gfx/optipng/ChangeLog b/media-gfx/optipng/ChangeLog
index 125c2558080c..3ffbf7533183 100644
--- a/media-gfx/optipng/ChangeLog
+++ b/media-gfx/optipng/ChangeLog
@@ -1,6 +1,90 @@
 # ChangeLog for media-gfx/optipng
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/ChangeLog,v 1.1 2003/10/31 12:54:29 taviso Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/ChangeLog,v 1.1.1.1 2005/11/30 09:37:30 chriswhite Exp $
+
+  30 Oct 2005; Fabian Groffen <grobian@gentoo.org> optipng-0.4.8-r1.ebuild:
+  Marked ~ppc-macos (bug #110826)
+
+  10 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  optipng-0.4.8-r1.ebuild:
+  stable on alpha wrt bug #108404
+
+  07 Oct 2005; Michael Hanselmann <hansmi@gentoo.org>
+  optipng-0.4.8-r1.ebuild:
+  Stable on ppc.
+
+*optipng-0.4.8-r1 (07 Oct 2005)
+
+  07 Oct 2005; Tavis Ormandy <taviso@gentoo.org>
+  +files/optipng-zlib-security.diff, +optipng-0.4.8-r1.ebuild:
+  fix #108404, mark stable on x86
+
+  13 Jul 2005; Simon Stelling <blubb@gentoo.org> optipng-0.4.8.ebuild:
+  added ~amd64 keyword
+
+  12 Jun 2005; Bryan Østergaard <kloeri@gentoo.org> optipng-0.4.7.ebuild:
+  Stable on alpha.
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> optipng-0.4.7.ebuild:
+  Stable on ppc.
+
+*optipng-0.4.8 (03 Jun 2005)
+
+  03 Jun 2005; Tavis Ormandy <taviso@gentoo.org> +optipng-0.4.8.ebuild:
+  bump
+
+  02 Mar 2005; Tavis Ormandy <taviso@gentoo.org> optipng-0.4.7.ebuild:
+  0.4.7 stable on x86
+
+*optipng-0.4.7 (13 Jan 2005)
+
+  13 Jan 2005; Tavis Ormandy <taviso@gentoo.org>
+  -files/optipng-0.4.3-r1-more-makefile-options.diff,
+  -optipng-0.4.3-r1.ebuild, -optipng-0.4.3.ebuild, +optipng-0.4.7.ebuild:
+  clean out stale ebuilds, new version
+
+  29 Dec 2004; Tom Martin <slarti@gentoo.org> optipng-0.4.5.ebuild:
+  Marked ~amd64, resolves bug 73180.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  08 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> optipng-0.4.5.ebuild:
+  Stable on alpha.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  optipng-0.4.3-r1.ebuild, optipng-0.4.3.ebuild, optipng-0.4.5.ebuild:
+  virtual/glibc -> virtual/libc
+
+  27 Jun 2004; Tavis Ormandy <taviso@gentoo.org> optipng-0.4.5.ebuild:
+  stable on x86
+
+  03 Jun 2004; Tavis Ormandy <taviso@gentoo.org> optipng-0.4.5.ebuild,
+  files/optipng-0.4.5-more-makefile-options.diff:
+  use ifeq syntax instead of setting env vars.
+
+*optipng-0.4.5 (02 Jun 2004)
+
+  02 Jun 2004; Tavis Ormandy <taviso@gentoo.org> optipng-0.4.5.ebuild:
+  bump
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> optipng-0.4.3.ebuild:
+  Add inherit eutils
+
+  27 Mar 2004; Tavis Ormandy <taviso@gentoo.org> optipng-0.4.3-r1.ebuild:
+  stable
+
+*optipng-0.4.3-r1 (13 Mar 2004)
+
+  13 Mar 2004; Tavis Ormandy <taviso@gentoo.org> optipng-0.4.3-r1.ebuild,
+  files/optipng-0.4.3-r1-more-makefile-options.diff:
+  fixing patch (wrong zlib header)
+
+  06 Nov 2003; Tavis Ormandy <taviso@gentoo.org> optipng-0.4.3.ebuild:
+  stable
+
+  31 Oct 2003; Tavis Ormandy <taviso@gentoo.org> optipng-0.4.3.ebuild:
+  typo.
 
 *optipng-0.4.3 (31 Oct 2003)
 
diff --git a/media-gfx/optipng/Manifest b/media-gfx/optipng/Manifest
index 1ebd0ef951fe..2fc4c2f77d1b 100644
--- a/media-gfx/optipng/Manifest
+++ b/media-gfx/optipng/Manifest
@@ -1,3 +1,13 @@
-MD5 a98fe34529256f6cbb6b74c7d71fb531 optipng-0.4.3.ebuild 1640
-MD5 776935461c2653df2b47f23f7b7c60d7 files/digest-optipng-0.4.3 65
+MD5 865e94bfc19aedcb3eb7d6c63afb25bf optipng-0.4.8-r1.ebuild 935
+MD5 24e4516150c74ca051b37bc100498e46 optipng-0.4.8.ebuild 931
+MD5 86d23c83773f704f2e0716a2bc035cdc optipng-0.4.5.ebuild 2587
+MD5 3805815a8ba53625e46b9caa4336eb3d ChangeLog 3087
+MD5 c7fc1e1bf37885691cf1d6733401eb03 optipng-0.4.7.ebuild 922
+MD5 d1fd781dd463a1e5d87df46fad732ec6 metadata.xml 400
+MD5 5d355d799e3bb4eb76b567156932b803 files/digest-optipng-0.4.8-r1 65
+MD5 cbb26191f6029021230a63ee5ac9a062 files/digest-optipng-0.4.5 65
+MD5 6bb7aeb92d547a0979d3bc3ee21b9319 files/digest-optipng-0.4.7 65
+MD5 5d355d799e3bb4eb76b567156932b803 files/digest-optipng-0.4.8 65
 MD5 eab5451d70e601bb80438372adbcc3cd files/optipng-more-makefile-options.diff 1423
+MD5 ee642ac85110cd1a39ac0f53a753289e files/optipng-zlib-security.diff 1455
+MD5 95e87b9aa8430dbe8d14268fb922a818 files/optipng-0.4.5-more-makefile-options.diff 2271
diff --git a/media-gfx/optipng/files/optipng-0.4.5-more-makefile-options.diff b/media-gfx/optipng/files/optipng-0.4.5-more-makefile-options.diff
index 4506ea2673b5..91f16e1b2b05 100644
--- a/media-gfx/optipng/files/optipng-0.4.5-more-makefile-options.diff
+++ b/media-gfx/optipng/files/optipng-0.4.5-more-makefile-options.diff
@@ -1,5 +1,5 @@
 --- optipng-0.4.5.orig/src/scripts/Makefile.gcc	2004-05-31 10:38:00.000000000 +0100
-+++ optipng-0.4.5/src/scripts/Makefile.gcc	2004-06-02 23:49:49.134972424 +0100
++++ optipng-0.4.5/src/scripts/Makefile.gcc	2004-06-03 09:21:38.958025528 +0100
 @@ -3,22 +3,40 @@
  
  all: optipng
@@ -47,13 +47,19 @@
  
  libpng.a: ../lib-cos/libpng/libpng.a
  	cp ../lib-cos/libpng/libpng.a libpng.a
-@@ -28,10 +46,10 @@
+@@ -27,11 +45,14 @@
+ 	cp ../lib-cos/zlib/libz.a libz.a
  
  ../lib-cos/libpng/libpng.a: ../lib-cos/zlib/libz.a
- 	cd ../lib-cos/libpng; \
+-	cd ../lib-cos/libpng; \
 -	${MAKE} -f scripts/makefile.gcc; \
-+	${MAKE} -f scripts/${pngmake}; \
- 	cd ../../src
+-	cd ../../src
++ifeq (${usemmx},1)
++	cd ../lib-cos/libpng; ${MAKE} -f scripts/makefile.gcmmx; cd ../../src
++else
++	cd ../lib-cos/libpng; ${MAKE} -f scripts/makefile.gcc; cd ../../src
++endif
++
  
  ../lib-cos/zlib/libz.a:
  	cd ../lib-cos/zlib; \
diff --git a/media-gfx/optipng/optipng-0.4.5.ebuild b/media-gfx/optipng/optipng-0.4.5.ebuild
index a74e1a4d4a62..18f2f5207d81 100644
--- a/media-gfx/optipng/optipng-0.4.5.ebuild
+++ b/media-gfx/optipng/optipng-0.4.5.ebuild
@@ -1,25 +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/media-gfx/optipng/optipng-0.4.5.ebuild,v 1.1 2004/06/02 22:54:30 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/optipng-0.4.5.ebuild,v 1.1.1.1 2005/11/30 09:37:30 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
-DESCRIPTION="PNG optimizing utility"
+DESCRIPTION="Find the optimal compression settings for your png files"
 SRC_URI="http://www.cs.toronto.edu/~cosmin/pngtech/optipng/${P}.tar.gz"
 HOMEPAGE="http://www.cs.toronto.edu/~cosmin/pngtech/optipng/"
 
 LICENSE="as-is"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha"
+KEYWORDS="x86 ~ppc alpha ~amd64"
 
 IUSE="ext-png ext-zlib mmx"
 
 DEPEND="ext-png? ( media-libs/libpng )
 	ext-zlib? ( sys-libs/zlib )
-	virtual/glibc"
-
-S=${WORKDIR}/${P}
+	virtual/libc"
 
 src_unpack() {
 	unpack ${A}
@@ -41,17 +39,17 @@ src_compile() {
 		# do amd64/ia64 support mmx?
 		use x86 || ewarn "mmx flag set, but not on x86?"
 
-		pngmake=makefile.gcmmx
+		usemmx=1
 	else
-		pngmake=makefile.gcc
+		usemmx=0
 	fi
 
-	# only defined in bundled zlib?
+	# only defined in bundled zlib
 	if use ext-zlib || use ext-png; then
 		append-flags -DZ_RLE=3
 	fi
 
-	export pngmake LDFLAGS
+	export usemmx LDFLAGS
 
 	# some logic to decide which version to build...
 	if ! use ext-png; then
@@ -85,3 +83,17 @@ src_install() {
 	dodoc ${S}/doc/{CAVEAT,DESIGN,FEATURES,HISTORY,LICENSE,README,TODO,USAGE}
 	dohtml ${S}/doc/index.html
 }
+
+pkg_postinst() {
+	if use ext-zlib || use ext-png; then
+		ewarn "the ext-zlib and ext-png USE flags are designed for users"
+		ewarn "that require special modifications to libpng or zlib."
+		ewarn
+		ewarn "the bundled libraries are highly optimised specifically"
+		ewarn "for use with compressing png files, and should be used if"
+		ewarn "possible."
+		ewarn
+		ewarn "if you set these flags in error, please unset them and"
+		ewarn "re-merge ${PN}."
+	fi
+}
diff --git a/media-gfx/optipng/optipng-0.4.7.ebuild b/media-gfx/optipng/optipng-0.4.7.ebuild
index 250753c5700b..10c74b803e03 100644
--- a/media-gfx/optipng/optipng-0.4.7.ebuild
+++ b/media-gfx/optipng/optipng-0.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/media-gfx/optipng/optipng-0.4.7.ebuild,v 1.1 2005/01/13 23:49:08 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/optipng-0.4.7.ebuild,v 1.1.1.1 2005/11/30 09:37:30 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.cs.toronto.edu/~cosmin/pngtech/optipng/"
 LICENSE="as-is"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha"
+KEYWORDS="alpha ppc x86"
 IUSE=""
 
 DEPEND="virtual/libc"
diff --git a/media-gfx/optipng/optipng-0.4.8-r1.ebuild b/media-gfx/optipng/optipng-0.4.8-r1.ebuild
index 682b48e8f3b4..7f935e1db596 100644
--- a/media-gfx/optipng/optipng-0.4.8-r1.ebuild
+++ b/media-gfx/optipng/optipng-0.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/media-gfx/optipng/optipng-0.4.8-r1.ebuild,v 1.1 2005/10/07 16:36:00 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/optipng-0.4.8-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:30 chriswhite Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.cs.toronto.edu/~cosmin/pngtech/optipng/"
 LICENSE="as-is"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc x86"
+KEYWORDS="alpha ~amd64 ppc ~ppc-macos x86"
 IUSE=""
 
 DEPEND="virtual/libc"
diff --git a/media-gfx/optipng/optipng-0.4.8.ebuild b/media-gfx/optipng/optipng-0.4.8.ebuild
index 7b80ef739e81..a1ed5728b0aa 100644
--- a/media-gfx/optipng/optipng-0.4.8.ebuild
+++ b/media-gfx/optipng/optipng-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/media-gfx/optipng/optipng-0.4.8.ebuild,v 1.1 2005/06/03 14:54:20 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/optipng-0.4.8.ebuild,v 1.1.1.1 2005/11/30 09:37:30 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.cs.toronto.edu/~cosmin/pngtech/optipng/"
 LICENSE="as-is"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="virtual/libc"
diff --git a/media-gfx/photopc/ChangeLog b/media-gfx/photopc/ChangeLog
index 6b7e48417ce6..aa4cdb587ed4 100644
--- a/media-gfx/photopc/ChangeLog
+++ b/media-gfx/photopc/ChangeLog
@@ -1,9 +1,22 @@
 # ChangeLog for media-gfx/photopc
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/photopc/ChangeLog,v 1.1 2002/06/14 18:49:27 rphillips Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/photopc/ChangeLog,v 1.1.1.1 2005/11/30 09:37:35 chriswhite Exp $
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> photopc-3.05.ebuild:
+  Added to ~ppc.
+
+  09 Nov 2004; Michael Sterrett <mr_bones_@gentoo.org> photopc-3.05.ebuild:
+  LICENSE fix; tidy
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> photopc-3.05.ebuild:
+  virtual/glibc -> virtual/libc
 
 *photopc-3.05 (14 June 2002)
 
+  27 June 2002; Ryan Phillips <rphillips@gentoo.org> photopc-3.05.ebuild :
+
+  Fixed installation issues. Thanks to Uwe Ohse
+  
   14 June 2002; Ryan Phillips <rphillips@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/media-gfx/photopc/Manifest b/media-gfx/photopc/Manifest
index e69de29bb2d1..000041c6d573 100644
--- a/media-gfx/photopc/Manifest
+++ b/media-gfx/photopc/Manifest
@@ -0,0 +1,3 @@
+MD5 d15c6bb9dc592f7ef7bce0ec6cf8e46d ChangeLog 1098
+MD5 4268e2d1aaa9924f7924eba07166abd5 photopc-3.05.ebuild 572
+MD5 255f96d9e6898b4eaba78c3d6e63161b files/digest-photopc-3.05 64
diff --git a/media-gfx/photopc/photopc-3.05.ebuild b/media-gfx/photopc/photopc-3.05.ebuild
index 9bb632f93c28..96ca8f690ed6 100644
--- a/media-gfx/photopc/photopc-3.05.ebuild
+++ b/media-gfx/photopc/photopc-3.05.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/media-gfx/photopc/photopc-3.05.ebuild,v 1.1 2002/06/14 18:49:27 rphillips Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/photopc/photopc-3.05.ebuild,v 1.1.1.1 2005/11/30 09:37:35 chriswhite Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION="photopc"
-SRC_URI="http://unc.dl.sourceforge.net/sourceforge/photopc/${P}.tar.gz"
+DESCRIPTION="Utility to control digital cameras based on Sierra Imaging firmware"
 HOMEPAGE="http://photopc.sourceforge.net"
-DEPEND="virtual/glibc"
+SRC_URI="mirror://sourceforge/photopc/${P}.tar.gz"
 
-src_unpack () 
-{
-	unpack ${A}
-	cd ${S}
-}
+LICENSE="|| ( BSD as-is )"
+SLOT="0"
+KEYWORDS="~ppc x86"
+IUSE=""
 
-src_install ()
-{
-	into /usr
-	dobin photopc
-	doman photopc
-}
+DEPEND="virtual/libc"
 
+src_install() {
+	dobin photopc epinfo || die "dobin failed"
+	doman photopc.1 epinfo.1
+}
diff --git a/media-gfx/pixie/ChangeLog b/media-gfx/pixie/ChangeLog
index 09f3a2236566..7732555bd79b 100644
--- a/media-gfx/pixie/ChangeLog
+++ b/media-gfx/pixie/ChangeLog
@@ -1,6 +1,110 @@
 # ChangeLog for media-gfx/pixie
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/ChangeLog,v 1.1 2004/04/30 01:51:05 eradicator Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/ChangeLog,v 1.1.1.1 2005/11/30 09:37:24 chriswhite Exp $
+
+*pixie-1.5.1 (02 Oct 2005)
+*pixie-1.4.7 (02 Oct 2005)
+
+  02 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/pixie-1.4.7-libtool.patch, +pixie-1.4.7.ebuild,
+  +pixie-1.5.1.ebuild:
+  Version bump.
+
+  09 Aug 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -pixie-1.4.4.ebuild:
+  Removing old version.
+
+*pixie-1.4.5 (23 Jul 2005)
+
+  23 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +pixie-1.4.5.ebuild:
+  Version bump.
+
+*pixie-1.4.4 (18 Jul 2005)
+
+  18 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/pixie-1.4.3-libtool.patch, +files/pixie-1.4.4-libtool.patch,
+  +files/pixie-1.4.4-math.patch, -pixie-1.4.3.ebuild, +pixie-1.4.4.ebuild:
+  Version bump.
+
+*pixie-1.4.3 (11 Jul 2005)
+
+  11 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/pixie-1.3.11-gentoo.patch, +files/pixie-1.4.3-libtool.patch,
+  -files/50pixie, -pixie-1.3.13.ebuild, -pixie-1.3.25.ebuild,
+  +pixie-1.4.3.ebuild:
+  Version bump closes bug #98469.
+
+  19 Jun 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  pixie-1.4.1-r1.ebuild:
+  Stable sparc, x86.
+
+*pixie-1.4.1-r1 (09 Apr 2005)
+
+  09 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -pixie-1.4.1.ebuild, +pixie-1.4.1-r1.ebuild,
+  +files/pixie-1.4.1-libtool.patch:
+  libtool related fixes.
+
+*pixie-1.4.1 (08 Apr 2005)
+
+  08 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -pixie-1.3.20.ebuild, -pixie-1.3.22.ebuild, +pixie-1.4.1.ebuild:
+  Version bump.
+
+*pixie-1.3.25 (28 Dec 2004)
+
+  28 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  pixie-1.3.13.ebuild, pixie-1.3.20.ebuild, pixie-1.3.22.ebuild,
+  +pixie-1.3.25.ebuild:
+  Version bump and fixing libtool related problems...  Closes bug #75186.
+
+*pixie-1.3.22 (22 Oct 2004)
+
+  22 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +pixie-1.3.22.ebuild:
+  Version bump.
+
+*pixie-1.3.20 (22 Sep 2004)
+
+  22 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/pixie-1.3.11-Makefile.patch, -files/pixie-1.3.11-gcc3.4.patch,
+  -files/pixie-1.3.11-pic.patch, -files/pixie-1.3.5-Makefile.patch,
+  -files/pixie-1.3.5-math.patch, -pixie-1.3.11.ebuild, +pixie-1.3.20.ebuild,
+  -pixie-1.3.5-r1.ebuild:
+  Version bump and cleanup.
+
+  01 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> pixie-1.3.13.ebuild:
+  Stable sparc x86.
+
+*pixie-1.3.13 (19 Jul 2004)
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +pixie-1.3.13.ebuild:
+  Version bump.
+
+*pixie-1.3.11 (14 Jun 2004)
+
+  14 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/pixie-1.3.11-Makefile.patch, +files/pixie-1.3.11-gcc3.4.patch,
+  +files/pixie-1.3.11-gentoo.patch, +files/pixie-1.3.11-math.patch,
+  +files/pixie-1.3.11-pic.patch, +pixie-1.3.11.ebuild:
+  Version bump. gcc3.4 fixes, -fPIC fixes... amd64 compilation fixes (but
+  doesn't run right).
+
+  02 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  pixie-1.3.5-r1.ebuild:
+  Added to ~sparc
+
+*pixie-1.3.5-r1 (01 May 2004)
+
+  01 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  pixie-1.3.5-r1.ebuild, pixie-1.3.5.ebuild, files/50pixie,
+  files/pixie-1.3.5-Makefile.patch:
+  Revision bump to fix a few install bugs.  Now installs in /opt/pixie.
+
+  30 Apr 2004; David Holm <dholm@gentoo.org> pixie-1.3.5.ebuild:
+  Added to ~ppc.
 
 *pixie-1.3.5 (29 Apr 2004)
 
diff --git a/media-gfx/pixie/Manifest b/media-gfx/pixie/Manifest
index 3deb10d5b8e7..ff0961bb30e3 100644
--- a/media-gfx/pixie/Manifest
+++ b/media-gfx/pixie/Manifest
@@ -1,2 +1,25 @@
-MD5 4bec5c52553d8c061b0797e2a88df023 pixie-1.3.5.ebuild 585
-MD5 c3ecef6a787c76274c3123507835c714 files/digest-pixie-1.3.5 65
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 25f49b74d555ae01f63d25e3c6404561 ChangeLog 3565
+MD5 c1e212329f9083e2405b16dd382d6632 metadata.xml 259
+MD5 7fac8c4c30f64a7982262cc0cd780808 pixie-1.5.1.ebuild 1390
+MD5 2890bc643293ec454fd2898947845ac4 pixie-1.4.1-r1.ebuild 1351
+MD5 38df59661a903bb445428268f760a77e pixie-1.4.5.ebuild 1390
+MD5 b8f845ec17ba57747682b96f40c7fdce pixie-1.4.7.ebuild 1390
+MD5 a5e1bbee1a7d0e59e324fca6b22d45c7 files/digest-pixie-1.4.7 65
+MD5 9c2746d29b44d65086d1464a94f0ef9f files/pixie-1.4.1-libtool.patch 9889
+MD5 850d794bc1458a3b170f1dcc64938612 files/pixie-1.4.4-libtool.patch 14591
+MD5 1bfeaf00e756addc8de83293ff0623eb files/digest-pixie-1.4.5 65
+MD5 6cc5b77de73a722c5e850636bf750a32 files/pixie-1.3.11-math.patch 365
+MD5 c47cd24a306a2475680ce9f914546c4e files/digest-pixie-1.4.1-r1 65
+MD5 48ac8837dbadef8c09f4707f8010c85f files/pixie-1.4.4-math.patch 836
+MD5 89da012136dbc32c9a68dabc09e802d4 files/digest-pixie-1.5.1 65
+MD5 391ca6aaedf3654e8e09f851cf502c01 files/pixie-1.4.7-libtool.patch 14583
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDQHIlOpjtAl+gMRURAtAdAJ4qIvzt5VWIYmYOiFKzdcSHZ0QBhQCfdJWi
+b5E8np7q6j7ZxxNtdnq6OhI=
+=+j3H
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/pixie/pixie-1.4.1-r1.ebuild b/media-gfx/pixie/pixie-1.4.1-r1.ebuild
index 88024851f5a7..5c1cdcafbfdd 100644
--- a/media-gfx/pixie/pixie-1.4.1-r1.ebuild
+++ b/media-gfx/pixie/pixie-1.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/media-gfx/pixie/pixie-1.4.1-r1.ebuild,v 1.1 2005/04/09 04:28:45 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/pixie-1.4.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:24 chriswhite Exp $
 
 inherit eutils
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-src-${PV}.tgz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc -amd64"
+KEYWORDS="-amd64 ~ppc sparc x86"
 
 RDEPEND="media-libs/jpeg
 	 sys-libs/zlib
@@ -48,7 +48,7 @@ src_unpack() {
 
 src_compile() {
 	econf --disable-static || die
-	emake || die
+	emake -j1 || die
 }
 
 src_install() {
diff --git a/media-gfx/pixie/pixie-1.4.5.ebuild b/media-gfx/pixie/pixie-1.4.5.ebuild
index 53d71d75582a..4ba705216730 100644
--- a/media-gfx/pixie/pixie-1.4.5.ebuild
+++ b/media-gfx/pixie/pixie-1.4.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/media-gfx/pixie/pixie-1.4.5.ebuild,v 1.1 2005/07/23 23:23:14 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/pixie-1.4.5.ebuild,v 1.1.1.1 2005/11/30 09:37:24 chriswhite Exp $
 
 inherit eutils
 
diff --git a/media-gfx/pixie/pixie-1.4.7.ebuild b/media-gfx/pixie/pixie-1.4.7.ebuild
index 39dba95a2b9c..f42652ae3b8b 100644
--- a/media-gfx/pixie/pixie-1.4.7.ebuild
+++ b/media-gfx/pixie/pixie-1.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/media-gfx/pixie/pixie-1.4.7.ebuild,v 1.1 2005/10/02 23:49:42 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/pixie-1.4.7.ebuild,v 1.1.1.1 2005/11/30 09:37:24 chriswhite Exp $
 
 inherit eutils
 
diff --git a/media-gfx/pixie/pixie-1.5.1.ebuild b/media-gfx/pixie/pixie-1.5.1.ebuild
index b3803ab1bd7b..e5c1a5eaa578 100644
--- a/media-gfx/pixie/pixie-1.5.1.ebuild
+++ b/media-gfx/pixie/pixie-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/media-gfx/pixie/pixie-1.5.1.ebuild,v 1.1 2005/10/02 23:49:42 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/pixie-1.5.1.ebuild,v 1.1.1.1 2005/11/30 09:37:24 chriswhite Exp $
 
 inherit eutils
 
diff --git a/media-gfx/plustek-parallel/ChangeLog b/media-gfx/plustek-parallel/ChangeLog
index 4933ede00137..eb99f0880225 100644
--- a/media-gfx/plustek-parallel/ChangeLog
+++ b/media-gfx/plustek-parallel/ChangeLog
@@ -1,6 +1,11 @@
-# ChangeLog for media-gfx/sane-plustek
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/plustek-parallel/ChangeLog,v 1.1 2003/08/25 09:29:14 phosphan Exp $
+# ChangeLog for media-gfx/plustek-parallel
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/plustek-parallel/ChangeLog,v 1.1.1.1 2005/11/30 09:37:36 chriswhite Exp $
+
+  16 Feb 2004; Michal Januszewski <spock@gentoo.org>
+  plustek-parallel-0.42.9.ebuild:
+  Added a note about this package being deprecated, added dependency on
+  virtual/linux-sources-2.4* (it won't compile with 2.6 kernels).
 
 *plustek-parallel-0.42.9 (25 Aug 2003)
 
diff --git a/media-gfx/plustek-parallel/Manifest b/media-gfx/plustek-parallel/Manifest
index 8d725f7a58ab..474eccfef8fd 100644
--- a/media-gfx/plustek-parallel/Manifest
+++ b/media-gfx/plustek-parallel/Manifest
@@ -1,5 +1,5 @@
-MD5 d984f4401dfaac6f58962dae6b0bbf70 sane-plustek-0.42.9.ebuild 1582
-MD5 f4cd9d37868227d29ee8b9bf18a331c9 ChangeLog 476
+MD5 48220a192222ce5e1e7f3fab03c2ec75 ChangeLog 826
 MD5 ce65434687722b486889c015f1bf674d metadata.xml 301
-MD5 9935e8e37e6e0dd8e4e4f370957d0702 files/sane-plustek-0.42.9.patch 444
-MD5 39c5e1f091395fecb60fc5f4014a1c5e files/digest-sane-plustek-0.42.9 73
+MD5 0fc56f60644e1524d54a7cfeafc9639a plustek-parallel-0.42.9.ebuild 1730
+MD5 9935e8e37e6e0dd8e4e4f370957d0702 files/plustek-parallel-0.42.9.patch 444
+MD5 39c5e1f091395fecb60fc5f4014a1c5e files/digest-plustek-parallel-0.42.9 73
diff --git a/media-gfx/plustek-parallel/plustek-parallel-0.42.9.ebuild b/media-gfx/plustek-parallel/plustek-parallel-0.42.9.ebuild
index c55a2394888a..e89ba540ce1c 100644
--- a/media-gfx/plustek-parallel/plustek-parallel-0.42.9.ebuild
+++ b/media-gfx/plustek-parallel/plustek-parallel-0.42.9.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/media-gfx/plustek-parallel/plustek-parallel-0.42.9.ebuild,v 1.1 2003/08/25 09:29:14 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/plustek-parallel/plustek-parallel-0.42.9.ebuild,v 1.1.1.1 2005/11/30 09:37:36 chriswhite Exp $
 
 IUSE=""
 
@@ -8,13 +8,13 @@ inherit eutils
 
 DESCRIPTION="Scanner Access Now Easy - Plustek module for parallel port scanners"
 HOMEPAGE="http://www.gjaeger.de/scanner/plustek.html"
-DEPEND="virtual/kernel 
+DEPEND="=virtual/linux-sources-2.4*
 	>=media-gfx/sane-backends-1.0.8"
 SRC_URI="http://www.gjaeger.de/scanner/current/plustek-module-0_42_9.tar.gz"
 S="${WORKDIR}/plustek_driver"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 src_compile() {
 	epatch ${FILESDIR}/${P}.patch
@@ -25,7 +25,7 @@ src_install () {
 	make install || die
 	mkdir -p ${D}etc/modules.d
 	cat >${D}etc/modules.d/pt_drv <<END
-alias char-major-40 pt_drv                                                                                                        
+alias char-major-40 pt_drv
 options pt_drv port=0x378 forceMode=0 lOffonEnd=1 mov=0 warmup=15 slowIO=0 lampoff=180
 END
 }
@@ -41,5 +41,9 @@ pkg_postinst () {
 	einfo
 	einfo If you want this module to be loaded automatically at system boot,
 	einfo add 'pt_drv' to /etc/modules.autoload.d/kernel-$(uname -r | sed 's/\([0-9].[0-9]\).*/\1/')
+
+	ewarn "Please note that this program is DEPRECATED and will be removed from Portage"
+	ewarn "in the nearest future. It is recommended that you install the latest"
+	ewarn "sane-backends (1.0.13 or newer) instead."
 }
 
diff --git a/media-gfx/pngcrush/ChangeLog b/media-gfx/pngcrush/ChangeLog
index 65217a91d394..54a957edd800 100644
--- a/media-gfx/pngcrush/ChangeLog
+++ b/media-gfx/pngcrush/ChangeLog
@@ -1,14 +1,40 @@
 # ChangeLog for media-gfx/pngcrush
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngcrush/ChangeLog,v 1.1 2002/05/01 05:48:50 rphillips Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngcrush/ChangeLog,v 1.1.1.1 2005/11/30 09:37:26 chriswhite Exp $
+
+  30 Oct 2005; Fabian Groffen <grobian@gentoo.org> pngcrush-1.5.10.ebuild:
+  Marked ~ppc-macos (bug #110827)
+
+  29 Jul 2005; Marcelo Goes <vanquirius@gentoo.org> +metadata.xml,
+  pngcrush-1.5.10.ebuild:
+  Install documentation if doc USE flag is on for bug 62177. Thanks to Richard
+  Schreyer <rwschreyer@umail.ucsb.edu>.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  pngcrush-1.5.10.ebuild:
+  virtual/glibc -> virtual/libc
+
+  09 Feb 2004; Dylan Carlson <absinthe@gentoo.org> pngcrush-1.5.10.ebuild:
+  added amd64 keyword.
+
+*pngcrush-1.5.10 (10 Sep 2002)
+
+  27 Oct 2002; Jon Nall <nall@gentoo.org> :
+
+  Added IUSE flag
+
+  10 Sep 2002; Sascha Schwabbauer <cybersystem@gentoo.org> :
+
+  Added ppc to keywords.
+
+*pngcrush-1.5.10 (21 Jul 2002)
+
+  21 Jul 2002; Maik Schreiber <blizzy@gentoo.org> :
+
+  New version, closes bug #5332.
 
 *pngcrush-1.5.8 (30 Apr 2002)
 
-  30 Apr 2002; Ryan Phillips <rphillips@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.
-  
+  30 Apr 2002; Ryan Phillips <rphillips@gentoo.org> :
+
+  Initial import.
diff --git a/media-gfx/pngcrush/Manifest b/media-gfx/pngcrush/Manifest
index e69de29bb2d1..bbaf3364f95b 100644
--- a/media-gfx/pngcrush/Manifest
+++ b/media-gfx/pngcrush/Manifest
@@ -0,0 +1,4 @@
+MD5 9645194da9503eaf8a6a1ea6f5f97cbd pngcrush-1.5.10.ebuild 606
+MD5 af0c063275c6f063b33a5b9c218b4e06 ChangeLog 1156
+MD5 035a2156b3aec707f70a2c518efdce93 metadata.xml 211
+MD5 d79c2354a6387a3c996a34326d1eb157 files/digest-pngcrush-1.5.10 67
diff --git a/media-gfx/pngcrush/pngcrush-1.5.10.ebuild b/media-gfx/pngcrush/pngcrush-1.5.10.ebuild
index 94713796c876..fee6a3d4164f 100644
--- a/media-gfx/pngcrush/pngcrush-1.5.10.ebuild
+++ b/media-gfx/pngcrush/pngcrush-1.5.10.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/media-gfx/pngcrush/pngcrush-1.5.10.ebuild,v 1.1 2002/07/21 18:16:07 blizzy Exp $
-
-S=${WORKDIR}/${P}
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngcrush/pngcrush-1.5.10.ebuild,v 1.1.1.1 2005/11/30 09:37:26 chriswhite Exp $
 
 DESCRIPTION="PNG optimizing tool"
-SRC_URI="mirror://sourceforge/pmt/${P}.tar.gz"
 HOMEPAGE="http://pmt.sourceforge.net/pngcrush/"
+SRC_URI="mirror://sourceforge/pmt/${P}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="amd64 ppc ~ppc-macos x86"
+IUSE="doc"
 
-RDEPEND="virtual/glibc"
-DEPEND="${RDEPEND}"
+DEPEND="virtual/libc"
 
 src_compile() {
 	cp Makefile.gcc Makefile
 	emake CFLAGS="-I. ${CFLAGS}" || die
 }
 
-src_install () {
+src_install() {
 	dobin pngcrush
+	use doc && dodoc {INSTALL,README}.txt
 }
diff --git a/media-gfx/pngrewrite/ChangeLog b/media-gfx/pngrewrite/ChangeLog
index 5aff4c0ed389..eee8513c1787 100644
--- a/media-gfx/pngrewrite/ChangeLog
+++ b/media-gfx/pngrewrite/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for media-gfx/pngrewrite
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngrewrite/ChangeLog,v 1.1 2003/11/07 01:43:07 ciaranm Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngrewrite/ChangeLog,v 1.1.1.1 2005/11/30 09:37:29 chriswhite Exp $
+
+  30 Oct 2005; Fabian Groffen <grobian@gentoo.org> pngrewrite-1.2.1.ebuild:
+  Marked ~ppc-macos (bug #110828)
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  pngrewrite-1.2.1.ebuild:
+  Stable on ppc.
+
+  23 Apr 2005; Ciaran McCreesh <ciaranm@gentoo.org> pngrewrite-1.2.1.ebuild:
+  Add unzip dep, bug #90103
+
+  15 Dec 2004; Michael Hanselmann <hansmi@gentoo.org>
+  pngrewrite-1.2.1.ebuild:
+  Added to ~ppc.
+
+  24 Aug 2004; Ciaran McCreesh <ciaranm@gentoo.org> pngrewrite-1.2.1.ebuild:
+  Stable on x86
+
+  29 May 2004; Ciaran McCreesh <ciaranm@gentoo.org> pngrewrite-1.2.1.ebuild:
+  Stable on sparc
 
 *pngrewrite-1.2.1 (07 Nov 2003)
 
diff --git a/media-gfx/pngrewrite/Manifest b/media-gfx/pngrewrite/Manifest
index a32c69056668..77e8de93caa1 100644
--- a/media-gfx/pngrewrite/Manifest
+++ b/media-gfx/pngrewrite/Manifest
@@ -1,2 +1,4 @@
-MD5 c4a533c5e239b7cfd0f1d96926df1689 pngrewrite-1.2.1.ebuild 548
+MD5 1a86adf32e5c4a34179bc65ba9603984 pngrewrite-1.2.1.ebuild 720
+MD5 e0b3414ac43e4dd6a6d941e6c2fa86d9 ChangeLog 964
+MD5 dc120a7f743858956bef211725cd02a0 metadata.xml 254
 MD5 4356f785519b6fe9ba7c306a9e4bb4a4 files/digest-pngrewrite-1.2.1 64
diff --git a/media-gfx/pngrewrite/pngrewrite-1.2.1.ebuild b/media-gfx/pngrewrite/pngrewrite-1.2.1.ebuild
index 5e8846a4398c..3ab5cfd64ed9 100644
--- a/media-gfx/pngrewrite/pngrewrite-1.2.1.ebuild
+++ b/media-gfx/pngrewrite/pngrewrite-1.2.1.ebuild
@@ -1,17 +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/media-gfx/pngrewrite/pngrewrite-1.2.1.ebuild,v 1.1 2003/11/07 01:43:07 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngrewrite/pngrewrite-1.2.1.ebuild,v 1.1.1.1 2005/11/30 09:37:29 chriswhite Exp $
 
 DESCRIPTION="A utility which reduces large palettes in PNG images"
 HOMEPAGE="http://entropymine.com/jason/pngrewrite/"
 SRC_URI="http://entropymine.com/jason/pngrewrite/${P}.zip"
 
-DEPEND="media-libs/libpng
+DEPEND="app-arch/unzip
+	media-libs/libpng
+	sys-libs/zlib"
+
+RDEPEND="media-libs/libpng
 	sys-libs/zlib"
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="ppc ~ppc-macos sparc x86"
 
 IUSE=""
 
diff --git a/media-gfx/pngtoico/ChangeLog b/media-gfx/pngtoico/ChangeLog
index 181d05e35247..b9c1d6db43c4 100644
--- a/media-gfx/pngtoico/ChangeLog
+++ b/media-gfx/pngtoico/ChangeLog
@@ -1,8 +1,20 @@
 # ChangeLog for media-gfx/pngtoico
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngtoico/ChangeLog,v 1.1 2002/11/14 17:16:14 vapier Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngtoico/ChangeLog,v 1.1.1.1 2005/11/30 09:37:32 chriswhite Exp $
+
+  30 Oct 2005; Fabian Groffen <grobian@gentoo.org> pngtoico-1.0.ebuild:
+  Marked ~ppc-macos (bug #110829)
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> pngtoico-1.0.ebuild:
+  Added to ~ppc.
+
+  09 Apr 2005; Simon Stelling <blubb@gentoo.org> pngtoico-1.0.ebuild:
+  added ~amd64
 
 *pngtoico-1.0 (14 Nov 2002)
 
+  25 May 2003; Martin Holzer <mholzer@gentoo.org> pngtoico-1.0.ebuild:
+  now uses mirror://kernel
+
   14 Nov 2002; Mike Frysinger <vapier@gentoo.org> :
   Initial import.  Ebuild submitted by Alastair Tse <gentoo@liquidx.net>.
diff --git a/media-gfx/pngtoico/Manifest b/media-gfx/pngtoico/Manifest
index f7a9c5b03673..f48d993dc646 100644
--- a/media-gfx/pngtoico/Manifest
+++ b/media-gfx/pngtoico/Manifest
@@ -1,4 +1,4 @@
-MD5 869eb8fb7345b978be4cc7cce4450566 ChangeLog 373
-MD5 6863b9f9ec6ed69c6d5d4e76d15a862e pngtoico-1.0.ebuild 660
+MD5 1dac83102a2d2097ac76d2bb965707fa pngtoico-1.0.ebuild 685
+MD5 ac5b840f1863062c250cca34afc7f686 ChangeLog 741
+MD5 1bd0ef1eb0469dba51a17382c9304c22 files/pngtoico-1.0-Makefile.patch 469
 MD5 c92aed2d78ad63c530ccec495dbe78f8 files/digest-pngtoico-1.0 63
-MD5 3f6c254f08ad2ad88a61bff9bfea45f5 files/pngtoico-1.0-Makefile.patch 472
diff --git a/media-gfx/pngtoico/files/pngtoico-1.0-Makefile.patch b/media-gfx/pngtoico/files/pngtoico-1.0-Makefile.patch
index eab1c38f5711..859f7bf9ef60 100644
--- a/media-gfx/pngtoico/files/pngtoico-1.0-Makefile.patch
+++ b/media-gfx/pngtoico/files/pngtoico-1.0-Makefile.patch
@@ -7,7 +7,7 @@
 -CFLAGS  = -O2 -fomit-frame-pointer
 -LDFLAGS = -s
 -LIBS    = -lpng
-+CFLAGS  = -O2 -fomit-frame-pointer `libpng-config --cflags`
++CFLAGS  += -fomit-frame-pointer `libpng-config --cflags`
 +LDFLAGS = -s `libpng-config --ldflags` 
 +LIBS    = `libpng-config --libs`
  INSTALL = install
diff --git a/media-gfx/pngtoico/pngtoico-1.0.ebuild b/media-gfx/pngtoico/pngtoico-1.0.ebuild
index 90bc6a2ea0f1..04fa133a0ea2 100644
--- a/media-gfx/pngtoico/pngtoico-1.0.ebuild
+++ b/media-gfx/pngtoico/pngtoico-1.0.ebuild
@@ -1,21 +1,24 @@
-# 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/media-gfx/pngtoico/pngtoico-1.0.ebuild,v 1.1 2002/11/14 17:16:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngtoico/pngtoico-1.0.ebuild,v 1.1.1.1 2005/11/30 09:37:32 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="Convert png images to MS ico format"
 HOMEPAGE="http://www.kernel.org/pub/software/graphics/pngtoico/"
-SRC_URI="ftp://ftp.kernel.org/pub/software/graphics/pngtoico/${P}.tar.bz2"
+SRC_URI="mirror://kernel/software/graphics/pngtoico/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~amd64 ~ppc ~ppc-macos x86"
+IUSE=""
 
 DEPEND="media-libs/libpng"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	patch -p1 Makefile < ${FILESDIR}/${P}-Makefile.patch
+	epatch ${FILESDIR}/${P}-Makefile.patch
 }
 
 src_compile() {
diff --git a/media-gfx/pornview/ChangeLog b/media-gfx/pornview/ChangeLog
index 7eaf85dc9884..d7d5ec4526c2 100644
--- a/media-gfx/pornview/ChangeLog
+++ b/media-gfx/pornview/ChangeLog
@@ -1,8 +1,80 @@
 # ChangeLog for media-gfx/pornview
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pornview/ChangeLog,v 1.1 2002/11/17 16:59:07 agenkin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pornview/ChangeLog,v 1.1.1.1 2005/11/30 09:37:36 chriswhite Exp $
 
-*pornview-0.1.1 (17 Nov 2002)
+  19 Nov 2005; John N. Laliberte <allanonjl@gentoo.org>
+  pornview-0.2.0_pre1.ebuild:
+  remove gtk2 useflag.
+
+  07 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  pornview-0.2.0_pre1.ebuild:
+  Don't assume ld is GNU ld.
+
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  01 Aug 2005; <sekretarz@gentoo.org> +files/gtkxine.diff,
+  pornview-0.2.0_pre1.ebuild:
+  Fixed problems with libxine and gtk, thanks Roland Bär <roland@pinguin.tv> 
+  in bug #81179
+
+  07 May 2005; Michael Hanselmann <hansmi@gentoo.org>
+  pornview-0.2.0_pre1.ebuild:
+  Added to ~hppa.
+
+  16 Mar 2005; Michael Hanselmann <hansmi@gentoo.org>
+  pornview-0.2.0_pre1.ebuild:
+  Added to ~sparc.
+
+  04 Oct 2004; Patrick Kursawe <phosphan@gentoo.org> -pornview-0.1.5.ebuild:
+  Removing ancient version which depended on no-longer existing xine-lib.
+
+  06 Sep 2004; Lars Weiler <pylon@gentoo.org> pornview-0.2.0_pre1.ebuild:
+  Stable on ppc.
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org> pornview-0.2.0_pre1.ebuild:
+  Fix use invocation
+
+  28 Apr 2004; Jon Portnoy <avenj@gentoo.org> pornview-0.2.0_pre1.ebuild :
+  Stable on AMD64.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> pornview-0.2.0_pre1.ebuild:
+  Add inherit eutils
+
+  28 Mar 2004; Jon Portnoy <avenj@gentoo.org> pornview-0.2.0_pre1.ebuild :
+  AMD64 keywords.
+
+  06 Dec 2003; <spider@gentoo.org> pornview-0.2.0_pre1.ebuild:
+  Fixed gtk2 deps
+
+  16 Nov 2003; Martin Holzer <mholzer@gentoo.org> pornview-0.2.0_pre1.ebuild,
+  files/pornview-0.2.0_pre1-4.diff:
+  Adding thumbnails patch. Closes #32074
+
+  19 Oct 2003; Martin Holzer <mholzer@gentoo.org> pornview-0.2.0_pre1.ebuild:
+  x86 stable.
+
+*pornview-0.2.0_pre1 (25 Jul 2003)
+
+  25 Jul 2003; Nick Hadaway <raker@gentoo.org> pornview-0.2.0_pre1.ebuild:
+  This build now includes the previously missing/old mplayer/xine 
+  support.  Added gtk2, nls, static, and jpeg USE flags.  As mplayer
+  and xine support cannot be installed at the same time, xine takes
+  preference over mplayer.
+
+*pornview-0.1.5 (29 Dec 2002)
+
+  01 Feb 2003; Mark Guertin <gerk@gentoo.org> pornview-0.1.5.ebuild :
+  Set ppc stable in keywords.
+
+  29 Dec 2002; Martin Holzer <mholzer@gentoo.org> pornview-0.1.5.ebuild files/digest-pornview-0.1.5 ChangeLog :
+  Version pumped. Sorry still no mplayer support
+
+*pornview-0.1.4 (15 Dec 2002)
+
+  18 Dec 2002; Martin Holzer <mholzer@gentoo.org> pornview-0.1.4.ebuild :
+  Fixed Dependeny (#12366) doesn't work with xine-lib >=0.9.13) i've added a bug on sf for this
+
+  15 Dec 2002; Martin Holzer <mholzer@gentoo.org> pornview-0.1.4.ebuild files/digest-pornview-0.1.4 Changelog :
+  Added nev Version. Sorry mplayer support is broken by pornview itself. So it's disabled
 
-  17 Nov 2002; Arcady Genkin <agenkin@gentoo.org> pornview-0.1.1.ebuild :
-  Initial version, submitted by Leigh MacDonald <admin@tech-guys.com>.
diff --git a/media-gfx/pornview/Manifest b/media-gfx/pornview/Manifest
index e69de29bb2d1..4617be5063e7 100644
--- a/media-gfx/pornview/Manifest
+++ b/media-gfx/pornview/Manifest
@@ -0,0 +1,5 @@
+MD5 46e774457a0629aac85aedfae96c328e pornview-0.2.0_pre1.ebuild 1626
+MD5 6ad0f1598ce279c1368e9ca65b5f6a3d ChangeLog 2944
+MD5 ab6f7336b8990c2fbbc86ac3ed04e07c files/pornview-0.2.0_pre1-4.diff 9594
+MD5 6ebbb2673f7c4a0889d2d9af5ba1d9c3 files/gtkxine.diff 676
+MD5 99e3e0440e74b2a8efcc2c958be7718f files/digest-pornview-0.2.0_pre1 70
diff --git a/media-gfx/pornview/pornview-0.2.0_pre1.ebuild b/media-gfx/pornview/pornview-0.2.0_pre1.ebuild
index 9d7fb270dd77..243448fdf882 100644
--- a/media-gfx/pornview/pornview-0.2.0_pre1.ebuild
+++ b/media-gfx/pornview/pornview-0.2.0_pre1.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/media-gfx/pornview/pornview-0.2.0_pre1.ebuild,v 1.1 2003/07/25 14:26:24 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pornview/pornview-0.2.0_pre1.ebuild,v 1.1.1.1 2005/11/30 09:37:36 chriswhite Exp $
 
-IUSE="avi gtk2 jpeg mpeg nls static"
+inherit eutils
+
+IUSE="jpeg mplayer nls static xine"
 
 DESCRIPTION="Image viewer/manager with optional support for MPEG movies."
 HOMEPAGE="http://pornview.sourceforge.net"
 LICENSE="GPL-2"
 
-DEPEND=">=media-libs/gdk-pixbuf-0.16
-	media-libs/libpng
-	=x11-libs/gtk+-1.2*
-	avi? ( media-video/mplayer )
+DEPEND="media-libs/libpng
+	mplayer? ( media-video/mplayer )
 	jpeg? ( media-libs/jpeg )
-	gtk2? ( >=x11-libs/gtk+-2.0 )
-	mpeg? ( =media-libs/xine-lib-1* )
+	>=x11-libs/gtk+-2.0
+	xine? ( =media-libs/xine-lib-1* )
 	nls? ( sys-devel/gettext )"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc amd64"
 SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.gz"
+RESTRICT="nomirror"
 
 S="${WORKDIR}/${P/_/}"
 
 src_compile() {
-	local myflags="--with-gnu-ld"
+	local myflags
 	# --with-normal-paned     Use standard gtk+ paned
 
 	# This is considered experimental but appears to work fine
@@ -34,9 +35,9 @@ src_compile() {
 
 	# mplayer and xine movie support cannot be installed at the same
 	# time so prefer xine support over mplayer if both are available
-	if [ "`use mpeg`" ]; then
+	if use xine; then
 		myflags="${myflags} --enable-xine"
-	elif [ "`use avi`"]; then
+	elif use mplayer; then
 		myflags="${myflags} --disable-xinetest --enable-mplayer"
 	else
 		myflags="${myflags} --disable-xinetest"
@@ -46,6 +47,9 @@ src_compile() {
 
 	use static && myflags="${myflags} --enable-static"
 
+	epatch ${FILESDIR}/${P}-4.diff || die
+	epatch ${FILESDIR}/gtkxine.diff || die
+
 	econf ${myflags} || die "./configure failed"
 
 	emake || die "make failed"
@@ -56,4 +60,3 @@ src_install() {
 
 	dodoc AUTHORS NEWS README
 }
-
diff --git a/media-gfx/potrace/ChangeLog b/media-gfx/potrace/ChangeLog
index ede957b4fa35..a6317e7774fb 100644
--- a/media-gfx/potrace/ChangeLog
+++ b/media-gfx/potrace/ChangeLog
@@ -1,6 +1,49 @@
 # ChangeLog for media-gfx/potrace
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/potrace/ChangeLog,v 1.1 2004/09/02 08:38:18 usata Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/potrace/ChangeLog,v 1.1.1.1 2005/11/30 09:37:13 chriswhite Exp $
+
+  29 Oct 2005; Fabian Groffen <grobian@gentoo.org> potrace-1.7.ebuild:
+  Marked ~ppc-macos (bug #109959)
+
+  24 Aug 2005; Aron Griffis <agriffis@gentoo.org> potrace-1.7.ebuild:
+  stable on ia64
+
+  23 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> potrace-1.7.ebuild:
+  Stable on sparc
+
+  13 Aug 2005; Luis Medinas <metalgod@gentoo.org> potrace-1.7.ebuild:
+  Stable on AMD64.
+
+  12 Jun 2005; Bryan Østergaard <kloeri@gentoo.org> potrace-1.7.ebuild:
+  Stable on alpha.
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> potrace-1.7.ebuild:
+  Stable on ppc.
+
+  28 May 2005; Mamoru KOMACHI <usata@gentoo.org> potrace-1.7.ebuild:
+  Stable on x86.
+
+  08 May 2005; Aron Griffis <agriffis@gentoo.org> potrace-1.6.ebuild:
+  stable on ia64
+
+*potrace-1.7 (24 Apr 2005)
+
+  24 Apr 2005; Mamoru KOMACHI <usata@gentoo.org> +potrace-1.7.ebuild:
+  Version bumped; bug #90227.
+
+*potrace-1.6 (01 Mar 2005)
+
+  01 Mar 2005; Mamoru KOMACHI <usata@gentoo.org> +potrace-1.6.ebuild:
+  Version bumped. This closes bug #83573.
+
+  18 Feb 2005; Aron Griffis <agriffis@gentoo.org> potrace-1.5.ebuild:
+  stable on alpha amd64 ia64 x86
+
+  27 Dec 2004; Jason Wever <weeve@gentoo.org> potrace-1.5.ebuild:
+  Added ~sparc keyword.
+
+  05 Sep 2004; David Holm <dholm@gentoo.org> potrace-1.5.ebuild:
+  Added to ~ppc.
 
 *potrace-1.5 (02 Sep 2004)
 
diff --git a/media-gfx/potrace/Manifest b/media-gfx/potrace/Manifest
index bdd705edca2e..df13df57031e 100644
--- a/media-gfx/potrace/Manifest
+++ b/media-gfx/potrace/Manifest
@@ -1,2 +1,8 @@
-MD5 2ccd59f0fffa11eb52e75a3ca66ff8c3 potrace-1.5.ebuild 472
+MD5 e5cfbfb37b67d6338229bbcd7c1dc648 potrace-1.6.ebuild 715
+MD5 f18d3cc26cd6b1073d82158fa6817a4b potrace-1.5.ebuild 713
+MD5 09978c29c9f7747eee424c79b72a5aef potrace-1.7.ebuild 721
+MD5 66d2c6a0da48cf9d23e5e01b1c0bf970 ChangeLog 1611
+MD5 edc0a4ca02de4f7c3958060db8486845 metadata.xml 294
 MD5 8a5b21b00cc946b2ea6919a9a7be6787 files/digest-potrace-1.5 63
+MD5 c632fe18fd9d018a7013014840430508 files/digest-potrace-1.6 63
+MD5 02756dbdd3a9961a862e688663fde8ca files/digest-potrace-1.7 63
diff --git a/media-gfx/potrace/potrace-1.5.ebuild b/media-gfx/potrace/potrace-1.5.ebuild
index 36af87a25b5f..b3553543aa99 100644
--- a/media-gfx/potrace/potrace-1.5.ebuild
+++ b/media-gfx/potrace/potrace-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/media-gfx/potrace/potrace-1.5.ebuild,v 1.1 2004/09/02 08:38:18 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/potrace/potrace-1.5.ebuild,v 1.1.1.1 2005/11/30 09:37:13 chriswhite Exp $
 
 DESCRIPTION="Transforming bitmaps into vector graphics"
 HOMEPAGE="http://potrace.sourceforge.net/"
@@ -9,7 +9,7 @@ SRC_URI="http://potrace.sourceforge.net/download/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc ~sparc amd64 alpha ia64"
 
 IUSE="zlib"
 
diff --git a/media-gfx/potrace/potrace-1.6.ebuild b/media-gfx/potrace/potrace-1.6.ebuild
index d0b3c5e969e6..0ef567687511 100644
--- a/media-gfx/potrace/potrace-1.6.ebuild
+++ b/media-gfx/potrace/potrace-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/media-gfx/potrace/potrace-1.6.ebuild,v 1.1 2005/03/01 09:05:15 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/potrace/potrace-1.6.ebuild,v 1.1.1.1 2005/11/30 09:37:13 chriswhite Exp $
 
 DESCRIPTION="Transforming bitmaps into vector graphics"
 HOMEPAGE="http://potrace.sourceforge.net/"
@@ -9,7 +9,7 @@ SRC_URI="http://potrace.sourceforge.net/download/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha ~ia64"
+KEYWORDS="~alpha ~amd64 ia64 ~ppc ~sparc x86"
 
 IUSE="zlib"
 
diff --git a/media-gfx/potrace/potrace-1.7.ebuild b/media-gfx/potrace/potrace-1.7.ebuild
index 4b15d6a8fa39..fc18f7803063 100644
--- a/media-gfx/potrace/potrace-1.7.ebuild
+++ b/media-gfx/potrace/potrace-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/media-gfx/potrace/potrace-1.7.ebuild,v 1.1 2005/04/24 17:35:01 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/potrace/potrace-1.7.ebuild,v 1.1.1.1 2005/11/30 09:37:13 chriswhite Exp $
 
 DESCRIPTION="Transforming bitmaps into vector graphics"
 HOMEPAGE="http://potrace.sourceforge.net/"
@@ -9,7 +9,7 @@ SRC_URI="http://potrace.sourceforge.net/download/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha ~ia64"
+KEYWORDS="alpha amd64 ia64 ppc ~ppc-macos sparc x86"
 
 IUSE="zlib"
 
diff --git a/media-gfx/potracegui/ChangeLog b/media-gfx/potracegui/ChangeLog
index 3ce0eb0effc8..8e88842048de 100644
--- a/media-gfx/potracegui/ChangeLog
+++ b/media-gfx/potracegui/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-gfx/potracegui
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/potracegui/ChangeLog,v 1.1 2005/04/06 04:22:01 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/potracegui/ChangeLog,v 1.1.1.1 2005/11/30 09:37:37 chriswhite Exp $
+
+  23 Oct 2005; Carsten Lohrke <carlo@gentoo.org> potracegui-1.2.ebuild:
+  QA: need-qt unnecessary, need-*() belong after R/DEPEND
+
+  27 Jun 2005; David Holm <dholm@gentoo.org> potracegui-1.2.ebuild:
+  Added to ~ppc.
+
+  23 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> potracegui-1.2.ebuild:
+  added ~amd64 to KEYWORDS, fixes #89992
 
 *potracegui-1.2 (06 Apr 2005)
 
diff --git a/media-gfx/potracegui/Manifest b/media-gfx/potracegui/Manifest
index 4e4b506f6556..955835348653 100644
--- a/media-gfx/potracegui/Manifest
+++ b/media-gfx/potracegui/Manifest
@@ -1,2 +1,4 @@
-MD5 4c59cbcbaf454cb3ca6b0c3e7a91027f potracegui-1.2.ebuild 453
+MD5 da9e3e7b7a9268015fb26f97210cabd0 potracegui-1.2.ebuild 572
+MD5 0f1d81db7f7fd31d7da1753f4606f37b ChangeLog 760
+MD5 295674d4bed87f5a7c2796e032ed561e metadata.xml 158
 MD5 8d97ca14322c9f97a5d09e5374eb8197 files/digest-potracegui-1.2 67
diff --git a/media-gfx/potracegui/potracegui-1.2.ebuild b/media-gfx/potracegui/potracegui-1.2.ebuild
index 5ecbf07365d0..f07702b804e2 100644
--- a/media-gfx/potracegui/potracegui-1.2.ebuild
+++ b/media-gfx/potracegui/potracegui-1.2.ebuild
@@ -1,21 +1,18 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/potracegui/potracegui-1.2.ebuild,v 1.1 2005/04/06 04:22:01 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/potracegui/potracegui-1.2.ebuild,v 1.1.1.1 2005/11/30 09:37:37 chriswhite Exp $
 
 inherit kde
 
-need-kde 3.3.2
-need-qt 3.3.3
-
 DESCRIPTION="Potracegui is a GUI interface for potrace and autotrace, two programs for tracing bitmapped images"
 HOMEPAGE="http://potracegui.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND=""
 RDEPEND="media-gfx/autotrace
 	media-gfx/potrace"
+need-kde 3.3.2
\ No newline at end of file
diff --git a/media-gfx/povray/ChangeLog b/media-gfx/povray/ChangeLog
index d776cc87eece..36b8388488c8 100644
--- a/media-gfx/povray/ChangeLog
+++ b/media-gfx/povray/ChangeLog
@@ -1,6 +1,206 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.1 2002/03/31 20:53:16 spider Exp $
+# ChangeLog for media-gfx/povray
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.1.1.1 2005/11/30 09:37:33 chriswhite Exp $
+
+  24 Aug 2005; Aron Griffis <agriffis@gentoo.org> povray-3.6.1-r1.ebuild:
+  stable on ia64
+
+  25 Jul 2005; Guy Martin <gmsoft@gentoo.org> povray-3.6.1-r1.ebuild:
+  Stable on hppa.
+
+  17 Jul 2005; Hardave Riar <hardave@gentoo.org> povray-3.6.1-r1.ebuild:
+  Keyworded ~mips
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> povray-3.6.1-r1.ebuild:
+  Stable on SPARC.
+
+  12 May 2005; Aron Griffis <agriffis@gentoo.org> povray-3.6.1-r1.ebuild:
+  add ~ia64
+
+  20 Jan 2005; Daniel Goller <morfic@gentoo.org> -files/README.ICC-PGO,
+  -files/gentoo-3.5.patch, -files/gentoo.patch,
+  -files/povray-3.5-amd64.patch, -files/prob-opt.sh, -povray-3.1g-r5.ebuild,
+  -povray-3.5.ebuild, povray-3.6.1-r1.ebuild:
+  Cleanup old and or broken versions
+
+  19 Jan 2005; Mike Doty <kingtaco@gentoo.org> povray-3.6.1-r1.ebuild:
+  stable on amd64.
+
+  02 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> povray-3.6.1-r1.ebuild:
+  Stable on alpha.
+
+  24 Dec 2004; Jason Wever <weeve@gentoo.org> povray-3.6.1-r1.ebuild:
+  Added ~sparc keyword.
+
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org> povray-3.6.1-r1.ebuild:
+  Stable on ppc64
+
+  12 Dec 2004; Daniel Goller <morfic@gentoo.org> povray-3.6.1-r1.ebuild:
+  Removing -fomit-frame-pointer if k6-2 march is used, closing bug 71255
+
+  07 Dec 2004; Daniel Goller <morfic@gentoo.org> povray-3.6.1-r1.ebuild:
+  Stable on ppc and x86
+
+  01 Nov 2004; Markus Rothe <corsair@gentoo.org> povray-3.6.1-r1.ebuild:
+  Marked ~ppc64; bug #68711
+
+*povray-3.6.1-r1 (27 Oct 2004)
+
+  27 Oct 2004; Daniel Goller <morfic@gentoo.org> +povray-3.6.1-r1.ebuild,
+  -povray-3.6.1.ebuild:
+  Added >=medi-libs/tiff-3.6.1 to ebuild and bumped to -r1 to force upgrade
+  Closing bug 67783
+
+*povray-3.5 (21 Sep 2004)
+
+  21 Sep 2004; Daniel Goller <morfic@gentoo.org> +files/gentoo-3.5.patch,
+  -files/gentoo-3.50c.patch, +files/povray-3.5-amd64.patch,
+  -files/povray-3.50c-amd64.patch, +povray-3.5.ebuild, -povray-3.50c.ebuild:
+  to make sure portage knows 3.6.1 is newer than 3.50c ebuild 3.50c renamed to
+  3.5, moved ebuilds, and patches
+
+  20 Sep 2004; Daniel Goller <morfic@gentoo.org> metadata.xml:
+  removed "no-herd" from metadata.xml, left over from skel
+
+  20 Sep 2004; Daniel Goller <morfic@gentoo.org> :
+  Added povray-3.6.1 ebuild
+  thanks to Alexander Holler
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> povray-3.1g-r5.ebuild,
+  povray-3.50c.ebuild:
+  Typo in DESCRIPTION: Persistance -> Persistence. Bug 59717.
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org> povray-3.1g-r5.ebuild,
+  povray-3.50c.ebuild:
+  Fix use invocation
+
+  08 Mar 2004; <augustus@gentoo.org> povray-3.50c.ebuild:
+  Marked stable on amd64.
+
+  15 Jan 2004; Luca Barbato <lu_zero@gentoo.org> povray-3.50c.ebuild:
+  Fix, thanks to Jayson <mrdizzy38@hotmail.com>
+
+  01 Jan 2004; Luca Barbato <lu_zero@gentoo.org> povray-3.50c.ebuild:
+  Fixed the without X build issue (bug #27049)
+
+  12 Dec 2003; Daniel Ahlberg <aliz@gentoo.org> povray-3.50c.ebuild:
+  Add amd64 keyword. AMD64 patch contributed by Kris Kersey <augustus@linuxhardware.org>
+  in #34027.
+
+  08 Oct 2003; Luca Barbato <lu_zero@gentoo.org> povray-3.50c.ebuild:
+  Fixed bug #25149
+
+  31 Aug 2003; Luca Barbato <lu_zero@gentoo.org> povray-3.50c.ebuild:
+  Fixed bug #27049
+
+*povray-3.50c (26 Mar 2003)
+
+  18 Apr 2003; Philip Walls <malverian@gentoo.org> povray-3.50c.ebuild :
+  Fixed bug #18522
+
+  9 Apr 2003; Luca Barbato <lu_zero@gentoo.org> povray-3.50c.ebuild:
+  Fixes bug #18970
+
+  1 Apr 2003; Philip Walls <malverian@gentoo.org> povray-3.50c.ebuild:
+  Added jpeg and tiff libraries to DEPEND, fixes bug #18457
+
+  30 Mar 2003; Martin Holzer <mholzer@gentoo.org> povray-3.50c.ebuild:
+  Added gcc-version check cause it doesn't compile on gcc-2.95
+
+  26 Mar 2003; Philip Walls <malverian@gentoo.org> povray-3.50c.ebuild :
+  Version bump, fixes bug #18206
+
+*povray-3.5a (05 Oct 2002)
+
+  14 Mar 2003; Stefan Jones <cretin@gentoo.org> povray-3.5a.ebuild :
+  Added pthread to librarys for /usr/X11R6/lib/libX11.a dep
+  Bug 17493
+
+  02 March 2003; Jon Portnoy <avenj@gentoo.org> povray-3.5a.ebuild :
+  Fixed missing 'else' for GCC CPPFLAGS.
+
+  02 March 2003; Jon Portnoy <avenj@gentoo.org> files/prob-opt.sh :
+  Added script from Klaus-J. Wolf <yanestra@web.de> to optimize
+  POV-ray significantly more heavily.
+
+  15 Dec 2002; Bjoern Brauel <bjb@gentoo.org> povray-3.5a.ebuild :
+  Add alpha to KEYWORDS
+
+  05 Oct 2002; Sascha Schwabbauer <cybersystem@gentoo.org> povray-3.5a.ebuild :
+
+  Added ppc to keywords.
+
+*povray-3.5a (2 Aug 2002)
+
+  26 Aug 2002; Ryan Phillips <rphillips@gentoo.org> povray-3.5a.ebuild :
+
+  Removed PGO extensions to ebuild
+
+  4 Aug 2002; Ryan Phillips <rphillips@gentoo.org> povray-3.5a.ebuild :
+
+  Compiles and runs now on my system.  Needs testing for PPC, et al platforms
+  and on the ICC compiler.
+
+  2 Aug 2002; Ryan Phillips <rphillips@gentoo.org> povray-3.5a.ebuild :
+
+  Preliminary ebuild for povray 3.5.  The application errors out with an
+  I/O error looking for povray.ini... I or someone will look into this.
+
+*povray-3.1g-r5 (27 Jun 2002)
+
+  6 Aug 2002; Ryan Phillips <rphillips@gentoo.org> povray-3.1g-r5.ebuild :
+
+  Changed ebuild to reflect the manually mirrored source files.
+
+  27 Jun 2002; Spider <spider@gentoo.org> povray-3.1g-r5.ebuild :
+  updated with SLOT and LICENSE flags. added povlegal-3.1g to licenses
+
+
+  
+  14 May 2002; William McArthur <sandymac@gentoo.org>
+
+  rphillips found a problem where -ip causes segfaults on P3 cpus. I removed
+  -ip from the default case.
+
+*povray-3.1g-r4 (19 Apr 2002)
+
+  12 Apr 2002; William McArthur <sandymac@gentoo.org>
+
+  Fixed povray to use system versions of libpng and zlib. PovRay wasn't using
+  newest libpng despite the change entry below.
+  
+  Changed the CFLAGS in the makefile to be similar to the ones in the systems
+  /etc/make.conf . This is kinda ugly but it doesn't hard code the CFLAGS for 
+  pentium 2.
+
+  Added icc support. This is also ugly but there are real speed increases to be
+  gained. To use icc you need to add "icc" to your USE variable. My benchmarks
+  show that using icc gives a 5% speed increase on a pentium 2.
+
+  Added icc Profile-guided Optimization (PGO) support. To use PGO you need to
+  add "icc-pgo" to your USE variable. Then merge the package, run it some to
+  collect profile data, and merge it again useing that profile data. PGO is a
+  two step process, so it requires that the user merge the package twice. In
+  step one the icc compiles the package with "-prof_gen" in the CFLAGS. Then
+  icc adds code in the application to collect stats on the execution flow of the
+  program. Unfortunatlly there is about a 30% performance hit but the performace
+  gains later are worth it. After you've run the program a some, the more you do
+  the better the collected stats, you recompile with "-prof_use". The resulting
+  binary is optimized based on your use of the program. In my benchmarks the PGO
+  binary was 21.7% faster that the gcc version and 15.8% faster than the non-PGO
+  icc version. If you want to recollect the PGO data delete the
+  /var/tmp/portage/povray-3.1g-r4/icc-pgo directory. The ebuild detects the
+  presence of this directory to decide which stage in the PGO process it is in.
+
+*povray-3.1g-r3 (12 Apr 2002)
+
+  12 Apr 2002; Seemant Kulleen <seemant@gentoo.org>
+
+  Compile against newest libpng
+
+*povray-3.1g-r2 (01 Apr 2002)
+  01 Apr 2002; Spider <spider@gentoo.org>
+  apply sed-fix from tod to get the default povray.ini to point right
 
 *povray-3.1g-r1 (31 Mar 2002)
   31 Mar 2002; Spider <spider@gentoo.org>
diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest
index 732f9d8b123c..adaffdf220cd 100644
--- a/media-gfx/povray/Manifest
+++ b/media-gfx/povray/Manifest
@@ -1,9 +1,4 @@
-MD5 c97d3b13f9be1a88ace57fe0be033c4c ChangeLog 4581
-MD5 bdf9e42740d15022b9a448c955338c09 povray-3.1g-r5.ebuild 3547
-MD5 9fef938227355aa26a280ee0c7c7baa2 povray-3.50c.ebuild 3573
-MD5 ba3f731e3c5027c2fb00332ae552e1dd files/README.ICC-PGO 1819
-MD5 56a3132643c427eee562370d53961f67 files/digest-povray-3.1g-r5 122
-MD5 21a61dd7740c2a3bec0cc8b27327fae2 files/digest-povray-3.50c 58
-MD5 05e59113d8c2485e9c60b679e834dff2 files/gentoo-3.50c.patch 247
-MD5 d8e13273e95d019333221aa531a33b9a files/gentoo.patch 1829
-MD5 dc1e966ff1abdf0e308be6630c50b4d5 files/prob-opt.sh 2582
+MD5 48eaa040015831c1b8e6bc2e0e6ce522 metadata.xml 262
+MD5 5729acd4191ab68578ea6ae4638fe12d ChangeLog 7784
+MD5 e05e268f18e2fef45f37b56c7e277e1e povray-3.6.1-r1.ebuild 1283
+MD5 c46bc643339b324f376236e2a9df237b files/digest-povray-3.6.1-r1 64
diff --git a/media-gfx/povray/metadata.xml b/media-gfx/povray/metadata.xml
index b95bae2b9be3..37169a8a144d 100644
--- a/media-gfx/povray/metadata.xml
+++ b/media-gfx/povray/metadata.xml
@@ -1,7 +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>morfic@gentoo.org</email>
  <description>Persistence of Vision Ray-Tracer</description>
diff --git a/media-gfx/povray/povray-3.6.1-r1.ebuild b/media-gfx/povray/povray-3.6.1-r1.ebuild
index f359423de516..02a11576b422 100644
--- a/media-gfx/povray/povray-3.6.1-r1.ebuild
+++ b/media-gfx/povray/povray-3.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/media-gfx/povray/povray-3.6.1-r1.ebuild,v 1.1 2004/10/27 16:19:07 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/povray-3.6.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:33 chriswhite Exp $
+
+inherit flag-o-matic
 
 DESCRIPTION="The Persistence Of Vision Ray Tracer"
 SRC_URI="ftp://ftp.povray.org/pub/povray/Official/Unix/povray-3.6.tar.bz2"
@@ -8,7 +10,7 @@ HOMEPAGE="http://www.povray.org/"
 
 SLOT="0"
 LICENSE="povlegal-3.6"
-KEYWORDS="~x86 ~ppc ~alpha ~amd64"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="X svga"
 
 DEPEND="media-libs/libpng
@@ -22,6 +24,11 @@ DEPEND="media-libs/libpng
 src_compile() {
 	local myconf
 
+	# closes bug 71255
+	if  get-flag march == k6-2 ; then
+		filter-flags -fomit-frame-pointer
+	fi
+
 	use X && myconf="${myconf} --with-x" \
 		|| myconf="${myconf} --without-x"\
 		CFLAGS="${CFLAGS} -DX_DISPLAY_MISSING"
diff --git a/media-gfx/povtree/ChangeLog b/media-gfx/povtree/ChangeLog
index c57494763c22..702c2d767549 100644
--- a/media-gfx/povtree/ChangeLog
+++ b/media-gfx/povtree/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for media-gfx/povtree
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/povtree/ChangeLog,v 1.1 2003/11/03 23:56:54 mr_bones_ Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povtree/ChangeLog,v 1.1.1.1 2005/11/30 09:37:41 chriswhite Exp $
+
+  03 Nov 2005; Fabian Groffen <grobian@gentoo.org> povtree-1.5.ebuild:
+  Marked ~ppc-macos (bug #110938)
+
+  07 Sep 2005; Marcus D. Hanwell <cryos@gentoo.org> povtree-1.5.ebuild:
+  Marked ~amd64, closes bug 105164.
+
+*povtree-1.5 (03 Sep 2005)
+
+  03 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> povtree-1.3.ebuild,
+  +povtree-1.5.ebuild:
+  Version bump for bug 50577. Thanks to kconkcon@yahoo.com and Tina Hirsch
+  <tehirsch@web.de>.
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> povtree-1.3.ebuild:
+  Stable on ppc.
+
+  07 May 2004; David Holm <dholm@gentoo.org> povtree-1.3.ebuild:
+  Added to ~ppc.
 
 *povtree-1.3 (03 Nov 2003)
 
diff --git a/media-gfx/povtree/Manifest b/media-gfx/povtree/Manifest
index 697cbb5c4ced..fcceedb1df1b 100644
--- a/media-gfx/povtree/Manifest
+++ b/media-gfx/povtree/Manifest
@@ -1,2 +1,6 @@
-MD5 5cdbb86a94d8a49a84b1032b0237536b povtree-1.3.ebuild 559
+MD5 630b4628cc900b5d0d956fe389a1a94f povtree-1.3.ebuild 734
+MD5 0916adb7eb79bd93b658dd5ceeedfe8b povtree-1.5.ebuild 782
+MD5 ca4aa80dfa5ead0a5eb21f210ffcec94 ChangeLog 939
 MD5 3b6e4e59090e71b1df7a82f962f14a3c files/digest-povtree-1.3 59
+MD5 e6ebb078dfb750f6956e797626c378ff files/digest-povtree-1.5 59
+MD5 f17c326278ce2e29473737c7d8adb87a files/povtree 434
diff --git a/media-gfx/povtree/files/povtree b/media-gfx/povtree/files/povtree
index 5ec1409e71df..447d9b3154a4 100644
--- a/media-gfx/povtree/files/povtree
+++ b/media-gfx/povtree/files/povtree
@@ -1,7 +1,7 @@
 #!/bin/sh
-# 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/media-gfx/povtree/files/povtree,v 1.1 2003/11/03 23:56:54 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povtree/files/povtree,v 1.1.1.1 2005/11/30 09:37:41 chriswhite Exp $
 
 which java > /dev/null 2>&1 && \
 	java -jar /usr/lib/povtree/povtree.jar $* && \
diff --git a/media-gfx/povtree/povtree-1.3.ebuild b/media-gfx/povtree/povtree-1.3.ebuild
index eae4d7f11307..cae0417af208 100644
--- a/media-gfx/povtree/povtree-1.3.ebuild
+++ b/media-gfx/povtree/povtree-1.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/media-gfx/povtree/povtree-1.3.ebuild,v 1.1 2003/11/03 23:56:54 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povtree/povtree-1.3.ebuild,v 1.1.1.1 2005/11/30 09:37:41 chriswhite Exp $
 
 S="${WORKDIR}"
 DESCRIPTION="Tree generator for POVray based on TOMTREE macro"
 HOMEPAGE="http://propro.ru/go/Wshop/tools/tools.html"
 SRC_URI="http://propro.ru/go/Wshop/tools/files/${PN}${PV}.zip"
 
-KEYWORDS="~x86"
+KEYWORDS="ppc x86"
 LICENSE="as-is"
 SLOT="0"
 IUSE=""
@@ -17,8 +17,8 @@ RDEPEND=">=virtual/jre-1.3
 DEPEND="app-arch/unzip"
 
 src_install() {
-	dobin ${FILESDIR}/povtree              || die "dobin failed"
+	dobin ${FILESDIR}/povtree || die "dobin failed"
 	insinto /usr/lib/povtree
-	doins povtree.jar                      || die "doins failed"
+	doins povtree.jar || die "doins failed"
 	dodoc README.txt TOMTREEm.inc help.jpg || die "dodoc failed"
 }
diff --git a/media-gfx/povtree/povtree-1.5.ebuild b/media-gfx/povtree/povtree-1.5.ebuild
index 67ed3cc24579..94075825c0a8 100644
--- a/media-gfx/povtree/povtree-1.5.ebuild
+++ b/media-gfx/povtree/povtree-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/media-gfx/povtree/povtree-1.5.ebuild,v 1.1 2005/09/03 02:13:47 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povtree/povtree-1.5.ebuild,v 1.1.1.1 2005/11/30 09:37:41 chriswhite Exp $
 
 S="${WORKDIR}"
 MY_P="${PN}${PV}"
@@ -8,7 +8,7 @@ DESCRIPTION="Tree generator for POVray based on TOMTREE macro"
 HOMEPAGE="http://propro.ru/go/Wshop/povtree/povtree.html"
 SRC_URI="http://propro.ru/go/Wshop/povtree/${MY_P}.zip"
 
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc-macos ~x86"
 LICENSE="as-is"
 SLOT="0"
 IUSE=""
diff --git a/media-gfx/propaganda/ChangeLog b/media-gfx/propaganda/ChangeLog
index 11f8a2a5e2fc..4eb7f086ef33 100644
--- a/media-gfx/propaganda/ChangeLog
+++ b/media-gfx/propaganda/ChangeLog
@@ -1,6 +1,13 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/propaganda/ChangeLog,v 1.1 2002/04/01 01:04:25 spider Exp $
+# ChangeLog for media-gfx/propaganda
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/propaganda/ChangeLog,v 1.1.1.1 2005/11/30 09:37:31 chriswhite Exp $
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  propaganda-1.0.ebuild:
+  virtual/glibc -> virtual/libc
+
+  05 Jun 2004; Robert Coie <rac@gentoo.org> propaganda-1.0.ebuild:
+  keyword amd64 and ppc
 
 *propaganda-1.0 (1 April 2002)
   1 Apr 2002; Spider <spider@gentoo.org>
diff --git a/media-gfx/propaganda/Manifest b/media-gfx/propaganda/Manifest
index e69de29bb2d1..5895108fc190 100644
--- a/media-gfx/propaganda/Manifest
+++ b/media-gfx/propaganda/Manifest
@@ -0,0 +1,3 @@
+MD5 7c2becddffff218a40269a562dd3ccdd propaganda-1.0.ebuild 1925
+MD5 c28471278819fe05d62d11dea9ebaa3d ChangeLog 596
+MD5 e6bb4f6d0d76baa9aba520b1bacd4926 files/digest-propaganda-1.0 1040
diff --git a/media-gfx/propaganda/files/digest-propaganda-1.0 b/media-gfx/propaganda/files/digest-propaganda-1.0
index 16e1d1a3864b..a02e47c99fca 100644
--- a/media-gfx/propaganda/files/digest-propaganda-1.0
+++ b/media-gfx/propaganda/files/digest-propaganda-1.0
@@ -1,6 +1,3 @@
-MD5 8ae6bd3f46932efb5c10b6127b2e115c Propaganda-13.tar.gz 4143608
-MD5 0103b8703eba0d350ff2cfeeab2437dc Propaganda-14.tar.gz 3734658
-MD5 d056cfdfe0000bf401ad8b9dd856b12c Propaganda-For-E.tar.gz 4234559
 MD5 1e088cac253a25d5aec93ffc3fe73a2e Propaganda-Vol-01.tar.gz 1086117
 MD5 a9ae4754c0f9483201bd74f637a44a51 Propaganda-Vol-02.tar.gz 335094
 MD5 42c31cc4d45fe964e7f629b817970292 Propaganda-Vol-03.tar.gz 1186808
@@ -13,3 +10,6 @@ MD5 bb0f415451197a2a1490f0e4b47a61fb Propaganda-Vol-09.tar.gz 1664869
 MD5 3fae2baad14108ed5028d5bdca8aeb81 Propaganda-Vol-10.tar.gz 6376914
 MD5 00c05740ff8951e2df63c30b8c3a1eb1 Propaganda-Vol-11.tar.gz 3030910
 MD5 6f1931de5fd3e28862ee6fb9b795d1ec Propaganda-Vol-12.tar.gz 3140955
+MD5 8ae6bd3f46932efb5c10b6127b2e115c Propaganda-13.tar.gz 4143608
+MD5 0103b8703eba0d350ff2cfeeab2437dc Propaganda-14.tar.gz 3734658
+MD5 d056cfdfe0000bf401ad8b9dd856b12c Propaganda-For-E.tar.gz 4234559
diff --git a/media-gfx/propaganda/propaganda-1.0.ebuild b/media-gfx/propaganda/propaganda-1.0.ebuild
index edc585a9d869..7e1255683646 100644
--- a/media-gfx/propaganda/propaganda-1.0.ebuild
+++ b/media-gfx/propaganda/propaganda-1.0.ebuild
@@ -1,16 +1,10 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer Spider <spider.gentoo@darkmere.wanfear.com> 
-# /space/gentoo/cvsroot/gentoo-x86/skel.ebuild,v 1.3 2002/02/04 15:46:51 gbevin Exp
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/propaganda/propaganda-1.0.ebuild,v 1.1.1.1 2005/11/30 09:37:31 chriswhite Exp $
 
-# Source directory; the dir where the sources can be found
-# (automatically unpacked) inside ${WORKDIR}.  Usually you can just
-# leave this as-is.
 S=${WORKDIR}/Propaganda
-
-# Short one-line description of this package.
 DESCRIPTION="Propaganda Volume 1-14 + E. Tiling images for your desktop"
-
+HOMEPAGE="http://www.resexcellence.com/propaganda/index.shtml"
 SITE="http://www.resexcellence.com/propaganda/"
 # Point to any required sources; these will be automatically
 # downloaded by Portage.
@@ -29,25 +23,24 @@ SRC_URI="${SITE}Propaganda-Vol-01.tar.gz
 	${SITE}Propaganda-13.tar.gz
 	${SITE}Propaganda-14.tar.gz
 	${SITE}Propaganda-For-E.tar.gz"
-	
-# Homepage, not used by Portage directly but handy for developer reference
-HOMEPAGE="http://www.resexcellence.com/propaganda/index.shtml"
 
-DEPEND=""
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 amd64 ppc"
+IUSE=""
 
-# Run-time dependencies, same as DEPEND if RDEPEND isn't defined:
-#RDEPEND=""
+DEPEND="virtual/libc"
 
 src_compile() {
 	rm -fr ${S}/../Propaganda-Vol-11/.finderinfo
 	rm -fr ${S}/../Propaganda-Vol-11/.resource
-	
+
 	rm -fr ${S}/../Propaganda-Vol-12/.finderinfo
-	rm -fr ${S}/../Propaganda-Vol-12/.resource	
-	
+	rm -fr ${S}/../Propaganda-Vol-12/.resource
+
 	mv ${S}/../Propaganda-Vol-11 ${S}/Vol11
 	mv ${S}/../Propaganda-Vol-12 ${S}/Vol12
-	
+
 	for NUM in 1 2 3 4 5 6 7 8 9 10 11 12 13 14; do
 		chmod -x ${S}/Vol${NUM}/*
 		cd ${S}/Vol${NUM}
@@ -64,12 +57,12 @@ src_compile() {
 	./script.perl *.jpg
 	cd ${S}
 	pwd
-	rm -f ${S}/Vol2/\@	
+	rm -f ${S}/Vol2/\@
 	chmod ugo-w -R ${S}
 	chmod ugo+r -R ${S}
 }
 
-src_install () {
+src_install() {
 	dodir /usr/share/pixmaps/
 	gunzip magicbg.tar.gz
 	dodoc COPYING READM*  magicbg.tar
diff --git a/media-gfx/pstoedit/ChangeLog b/media-gfx/pstoedit/ChangeLog
index a48a7e5d5fdb..9d41dceaddc3 100644
--- a/media-gfx/pstoedit/ChangeLog
+++ b/media-gfx/pstoedit/ChangeLog
@@ -1,6 +1,80 @@
 # ChangeLog for media-gfx/pstoedit
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/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/media-gfx/pstoedit/ChangeLog,v 1.1.1.1 2005/11/30 09:37:46 chriswhite Exp $
+
+*pstoedit-3.42 (02 Nov 2005)
+
+  02 Nov 2005; Leonardo Boshell <leonardop@gentoo.org>
+  pstoedit-3.40.ebuild, +pstoedit-3.42.ebuild:
+  Fix SRC_URI in version 3.40 (bug #110958). Version bump to 3.42.
+
+  22 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> pstoedit-3.40.ebuild:
+  Stable on sparc
+
+  09 Jun 2005; <sekretarz@gentoo.org> pstoedit-3.40.ebuild:
+  Stable on amd64
+
+  05 Jun 2005; Markus Rothe <corsair@gentoo.org> pstoedit-3.40.ebuild:
+  Stable on ppc64; dependency for bug #92995
+
+  21 May 2005; Markus Rothe <corsair@gentoo.org> pstoedit-3.40.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> pstoedit-3.40.ebuild:
+  Added ~sparc keyword wrt bug #86280.
+
+  22 Mar 2005; Karol Wojtaszek <sekretarz@gentoo.org> pstoedit-3.40.ebuild:
+  Added to ~amd64
+
+*pstoedit-3.40 (21 Feb 2005)
+
+  21 Feb 2005; Mamoru KOMACHI <usata@gentoo.org> +pstoedit-3.40.ebuild:
+  Version bumped. Added plututils to IUSE. This closes bug #43820.
+
+  25 Apr 2004; Aron Griffis <agriffis@gentoo.org> pstoedit-3.32.ebuild,
+  pstoedit-3.33.ebuild:
+  Add die following econf for bug 48950
+
+  16 Feb 2004; Mike Gardiner <obz@gentoo.org> pstoedit-3.33.ebuild:
+  Added libemf as a dependency, and fixed libemf related compilation problems by
+  removing -pedantic CFLAG
+
+  02 Feb 2004; Martin Holzer <mholzer@gentoo.org> pstoedit-3.32.ebuild,
+  pstoedit-3.33.ebuild:
+  adding media-libs/libexif to depend. closes 39693
+
+  31 Jan 2004; Mike Gardiner <obz@gentoo.org> pstoedit-3.32.ebuild,
+  pstoedit-3.33.ebuild:
+  Now installs all documentation, and a man page. Removed -pedantic flag which
+  causes errors with libEMF
+
+  09 Dec 2003; Heinrich Wendel <lanius@gentoo.org> pstoedit-3.32.ebuild,
+  pstoedit-3.33.ebuild:
+  changed app-text/ghostscript to virtual/ghostscript
+
+  02 Oct 2003; Mike Gardiner <obz@gentoo.org> metadata.xml,
+  pstoedit-3.33.ebuild:
+  Fixes re bug: 29724 for libEMF and removed ming support which is currently
+  un-supported support (?). We're also going stable on x86
+
+*pstoedit-3.33 (17 Jun 2003)
+
+  17 Jun 2003; Seemant Kulleen <seemant@gentoo.org> pstoedit-3.33.ebuild:
+  version bump, thanks to: Sean P. Kane <spkane@genomatica.com> in bug #22962
+
+*pstoedit-3.32 (22 Oct 2002)
+
+  22 Oct 2002; Seemant Kulleen <seemant@gentoo.org> pstoedit-3.32.ebuild
+  files/digest-pstoedit-3.32 :
+
+  Version bump thanks to: mavos@bigfoot.com (Martin Vollrathson) in bug
+  #8967.
+
+*pstoedit-3.31-r1 (12 Apr 2002)
+
+  12 Apr 2002; Seemant Kulleen <seemant@gentoo.org> pstoedit-3.31-r1.ebuild :
+
+  Compile against latest libpng
 
 *pstoedit-3.31 (1 Feb 2002)
 
diff --git a/media-gfx/pstoedit/Manifest b/media-gfx/pstoedit/Manifest
index e69de29bb2d1..3e6ba22b7059 100644
--- a/media-gfx/pstoedit/Manifest
+++ b/media-gfx/pstoedit/Manifest
@@ -0,0 +1,8 @@
+MD5 e779966ce8a0fb0927b5e9430015bb54 ChangeLog 3218
+MD5 a907639a46bec91770facf3dda3db0b6 files/digest-pstoedit-3.33 65
+MD5 b4ab64e60b0732f6b73230e7834dc110 files/digest-pstoedit-3.40 65
+MD5 0ab11abda10b4e03161ae0fe955f4bdc files/digest-pstoedit-3.42 65
+MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
+MD5 0187a9702c0fb3b0b8beae436a0bb9c0 pstoedit-3.33.ebuild 1465
+MD5 079605c006cdc7aa874c8afe4ce673d2 pstoedit-3.40.ebuild 1526
+MD5 5cdbbe39ba71e0fcbd43b996e5d9829a pstoedit-3.42.ebuild 1540
diff --git a/media-gfx/pstoedit/pstoedit-3.33.ebuild b/media-gfx/pstoedit/pstoedit-3.33.ebuild
index fe56540911c2..905ad954654a 100644
--- a/media-gfx/pstoedit/pstoedit-3.33.ebuild
+++ b/media-gfx/pstoedit/pstoedit-3.33.ebuild
@@ -1,35 +1,59 @@
-# 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/media-gfx/pstoedit/pstoedit-3.33.ebuild,v 1.1 2003/06/17 11:33:28 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/pstoedit-3.33.ebuild,v 1.1.1.1 2005/11/30 09:37:46 chriswhite Exp $
 
 inherit libtool
 
-IUSE="flash"
+# see bug #29724. please don't re-enable flash support until
+# ming has the patches applied <obz@gentoo.org>
+# secondly, we're not enabling libemf via a use flag, until it's
+# actually switchable via configure, see bug #39557
+# IUSE="flash libemf"
+IUSE=""
 
-S=${WORKDIR}/${P}
 DESCRIPTION="translates PostScript and PDF graphics into other vector formats"
 SRC_URI="http://home.t-online.de/home/helga.glunz/wglunz/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.pstoedit.net/pstoedit"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc"
 
-DEPEND="media-libs/libpng
-	sys-libs/zlib
-	flash? ( media-libs/ming )"
+DEPEND="sys-libs/zlib
+	media-libs/libemf
+	media-libs/libpng
+	media-libs/libexif"
+#	flash? ( media-libs/ming )"
 
 RDEPEND="${DEPEND}
-	app-text/ghostscript"
+	virtual/ghostscript"
+
+src_unpack() {
+
+	unpack ${A}; cd ${S}
+	# need to remove the pedantic flag, see bug #39557
+	sed -i -e "s/\-pedantic//" configure
+
+}
 
 src_compile() {
+
+	local myconf=""
+	# checking if libemf is previously installed, bug #29724
+	[ -f /usr/include/libEMF/emf.h ] \
+		&& myconf="${myconf} --with-libemf-include=/usr/include/libEMF"
+
 	elibtoolize
-	econf
+	econf ${myconf} || die "econf failed"
 	make || die
+
 }
 
 src_install () {
+
 	make DESTDIR=${D} install || die "make install failed"
-	dodoc readme.txt copying 
-	dodoc changelog.htm
+	dodoc readme.txt copying
+	dohtml changelog.htm index.htm doc/pstoedit.htm
+	doman doc/pstoedit.1
+
 }
diff --git a/media-gfx/pstoedit/pstoedit-3.40.ebuild b/media-gfx/pstoedit/pstoedit-3.40.ebuild
index 6d73ec5c53f4..f17adc65a861 100644
--- a/media-gfx/pstoedit/pstoedit-3.40.ebuild
+++ b/media-gfx/pstoedit/pstoedit-3.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/media-gfx/pstoedit/pstoedit-3.40.ebuild,v 1.1 2005/02/21 14:50:54 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/pstoedit-3.40.ebuild,v 1.1.1.1 2005/11/30 09:37:46 chriswhite Exp $
 
 inherit libtool
 
@@ -12,12 +12,12 @@ inherit libtool
 IUSE="plotutils"
 
 DESCRIPTION="translates PostScript and PDF graphics into other vector formats"
-SRC_URI="http://home.t-online.de/home/helga.glunz/wglunz/${PN}/${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 HOMEPAGE="http://www.pstoedit.net/pstoedit"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="amd64 ~ppc ppc64 sparc ~x86"
 
 DEPEND="sys-libs/zlib
 	media-libs/libemf
diff --git a/media-gfx/pstoedit/pstoedit-3.42.ebuild b/media-gfx/pstoedit/pstoedit-3.42.ebuild
index dfacd25a93fa..2ae95f0be1f4 100644
--- a/media-gfx/pstoedit/pstoedit-3.42.ebuild
+++ b/media-gfx/pstoedit/pstoedit-3.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/media-gfx/pstoedit/pstoedit-3.42.ebuild,v 1.1 2005/11/02 12:53:58 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/pstoedit-3.42.ebuild,v 1.1.1.1 2005/11/30 09:37:46 chriswhite Exp $
 
 inherit libtool
 
diff --git a/media-gfx/qingy-themes/ChangeLog b/media-gfx/qingy-themes/ChangeLog
index dfdf3adebc80..07ff4b04ee0e 100644
--- a/media-gfx/qingy-themes/ChangeLog
+++ b/media-gfx/qingy-themes/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/qingy-themes
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/qingy-themes/ChangeLog,v 1.1 2005/08/16 13:15:00 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/qingy-themes/ChangeLog,v 1.1.1.1 2005/11/30 09:37:18 chriswhite Exp $
+
+  24 Aug 2005; Michele Noberasco <s4t4n@gentoo.org> qingy-themes-20050816.ebuild:
+  Change chown line to root:0 instead of root:root, closing #103563.
+  Stable for x86.
 
 *qingy-themes-20050816 (16 Aug 2005)
 
diff --git a/media-gfx/qingy-themes/Manifest b/media-gfx/qingy-themes/Manifest
index 582c5211716a..c2b1abfcfc60 100644
--- a/media-gfx/qingy-themes/Manifest
+++ b/media-gfx/qingy-themes/Manifest
@@ -1,4 +1,4 @@
-MD5 0b627a451151ffa015b638988ff0e795 qingy-themes-20050816.ebuild 2316
-MD5 a8d360b431e39ec9d41444323993fc86 ChangeLog 262
+MD5 7e46b72c165d0b5f74632774bd8e7885 qingy-themes-20050816.ebuild 2423
+MD5 985b5c896c5248465fc45e86ff5cda45 ChangeLog 580
 MD5 58c0aa279c75f5c2f122e7ccd969b5d3 metadata.xml 221
 MD5 b30fe64685413e706af632fe6bc5abc1 files/digest-qingy-themes-20050816 1230
diff --git a/media-gfx/qingy-themes/qingy-themes-20050816.ebuild b/media-gfx/qingy-themes/qingy-themes-20050816.ebuild
index 8369c027cbd3..17e2544d5d55 100644
--- a/media-gfx/qingy-themes/qingy-themes-20050816.ebuild
+++ b/media-gfx/qingy-themes/qingy-themes-20050816.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/qingy-themes/qingy-themes-20050816.ebuild,v 1.1 2005/08/16 13:15:00 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/qingy-themes/qingy-themes-20050816.ebuild,v 1.1.1.1 2005/11/30 09:37:18 chriswhite Exp $
 
 DESCRIPTION="Collection of qingy themes"
 
@@ -48,7 +48,7 @@ SRC_URI="http://jefklak.suidzer0.org/downloads/qingy/qingy_lila.tar.bz2
 # lila -> freedist
 # all the others -> GPL
 LICENSE="GPL-2 freedist"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 SLOT="0"
 IUSE=""
@@ -61,5 +61,5 @@ src_install()
 	local QINGY_THEMES=/usr/share/qingy/themes
 	dodir ${QINGY_THEMES}
 	cp -dpR * ${D}/${QINGY_THEMES}
-	chown -R root:root ${D}/${QINGY_THEMES}
+	chown -R root:0 ${D}/${QINGY_THEMES}
 }
diff --git a/media-gfx/qiv/ChangeLog b/media-gfx/qiv/ChangeLog
index 3be8ac00890a..ede52415c042 100644
--- a/media-gfx/qiv/ChangeLog
+++ b/media-gfx/qiv/ChangeLog
@@ -1,6 +1,53 @@
 # ChangeLog for media-gfx/qiv
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/qiv/ChangeLog,v 1.1 2002/02/01 21:53:30 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/qiv/ChangeLog,v 1.1.1.1 2005/11/30 09:37:35 chriswhite Exp $
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> qiv-1.9.ebuild:
+  Mark 1.9 stable on alpha
+
+  29 Jul 2005; Chris White <chriswhite@gentoo.org> qiv-2.0.ebuild:
+  Marked ~ppc.
+
+*qiv-2.0 (28 Jul 2005)
+
+  28 Jul 2005; <sekretarz@gentoo.org> +qiv-2.0.ebuild:
+  Version bump, bug #51789
+
+  03 Jun 2005; Luca Barbato <lu_zero@gentoo.org> metadata.xml:
+  Metadata fix
+
+  23 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> qiv-1.9.ebuild:
+  ~alpha keyword.
+
+  22 Jul 2004; Tom Gall <tgall@gentoo.org> qiv-1.9.ebuild:
+  stable on ppc64, bug #57623
+
+  17 Mar 2004; Seemant Kulleen <seemant@gentoo.org> qiv-1.9_pre10.ebuild:
+  fix for bug #44712 by Michael Sterret <mr_bones_@gentoo.org>
+
+*qiv-1.9 (03 Jan 2004)
+
+  03 Jan 2004; Martin Holzer <mholzer@gentoo.org> qiv-1.9.ebuild:
+  Version bumped. Closes 37098
+
+  25 Aug 2003; Jason Wever <weeve@gentoo.org> qiv-1.7-r3.ebuild,
+  qiv-1.9_pre10.ebuild:
+  Marked stable for sparc to fix bug #27312.
+
+*qiv-1.9_pre10 (09 Feb 2003)
+
+  09 Feb 2003; Matthew Turk <satai@gentoo.org> :
+  Version bump to a pre-release.  Masked.
+
+*qiv-1.7-r3 (12 Apr 2002)
+
+  26 Aug 2002; Calum Selkirk <cselkirk@gentoo.org>  qiv-1.7-r3.ebuild :
+
+  Added ppc to KEYWORDS.
+
+  12 Apr 2002; Seemant Kulleen <seemant@gentoo.org> qiv-1.7-r3.ebuild :
+
+  Compile against newest libpng
 
 *qiv-1.7-r2 (1 Feb 2002)
 
diff --git a/media-gfx/qiv/Manifest b/media-gfx/qiv/Manifest
index e69de29bb2d1..1434b4db1f93 100644
--- a/media-gfx/qiv/Manifest
+++ b/media-gfx/qiv/Manifest
@@ -0,0 +1,10 @@
+MD5 bda79ca65b5f47c4f7323c21def0d605 qiv-2.0.ebuild 749
+MD5 97b5c11fc7ef5fc991b15cc20c3cf2c6 qiv-1.9_pre10.ebuild 642
+MD5 94328d8f5876abf1b939df3dc0b22c14 metadata.xml 223
+MD5 9ac1a05327b6910b3a12cfa35669f0df ChangeLog 1950
+MD5 7566d60aff071101c76389eac6ef6390 qiv-1.9.ebuild 622
+MD5 2fa2f734aa7d5270c35bb46b190216ce qiv-1.7-r3.ebuild 612
+MD5 98b8d5ed7bf4340676a2aa8e16906c81 files/digest-qiv-1.7-r3 59
+MD5 28ceb350e2f9981483bf5dd1408e8f47 files/digest-qiv-1.9 59
+MD5 5699ee267d58090636ca8299ff3f9c78 files/digest-qiv-1.9_pre10 62
+MD5 c05ba881e54da3f1b35e28258d497037 files/digest-qiv-2.0 59
diff --git a/media-gfx/qiv/metadata.xml b/media-gfx/qiv/metadata.xml
index c90d8d48bd03..d90b5212c1be 100644
--- a/media-gfx/qiv/metadata.xml
+++ b/media-gfx/qiv/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>media-gfx</herd>
+<herd>graphics</herd>
 <maintainer>
 <email>graphics@gentoo.org</email>
 </maintainer>
diff --git a/media-gfx/qiv/qiv-1.7-r3.ebuild b/media-gfx/qiv/qiv-1.7-r3.ebuild
index a656b25919d9..82b69e46555b 100644
--- a/media-gfx/qiv/qiv-1.7-r3.ebuild
+++ b/media-gfx/qiv/qiv-1.7-r3.ebuild
@@ -1,19 +1,21 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Thread <thread@threadbox.net>
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/qiv/qiv-1.7-r3.ebuild,v 1.1 2002/04/13 00:22:37 seemant Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/qiv/qiv-1.7-r3.ebuild,v 1.1.1.1 2005/11/30 09:37:35 chriswhite Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Quick Image Viewer"
 SRC_URI="http://www.klografx.net/qiv/download/${P}-src.tgz"
-HOMEPAGE="http://www.klografx.net/qiv"
+HOMEPAGE="http://www.klografx.net/qiv/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc alpha sparc"
+IUSE=""
 
 DEPEND="media-libs/libpng
 	>=media-libs/tiff-3.5.5
 	>=media-libs/imlib-1.9.10
 	virtual/x11"
 
-
 src_compile() {
 	make || die
 }
diff --git a/media-gfx/qiv/qiv-1.9.ebuild b/media-gfx/qiv/qiv-1.9.ebuild
index a703e4c2fcb4..b96262f2a389 100644
--- a/media-gfx/qiv/qiv-1.9.ebuild
+++ b/media-gfx/qiv/qiv-1.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/media-gfx/qiv/qiv-1.9.ebuild,v 1.1 2004/01/03 13:44:28 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/qiv/qiv-1.9.ebuild,v 1.1.1.1 2005/11/30 09:37:35 chriswhite Exp $
 
 DESCRIPTION="Quick Image Viewer"
 SRC_URI="http://www.klografx.net/qiv/download/${P}-src.tgz"
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.klografx.net/qiv/"
 IUSE=""
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="alpha ~amd64 ppc ppc64 ~sparc ~x86"
 
 DEPEND="media-libs/libpng
 	>=media-libs/tiff-3.5.5
diff --git a/media-gfx/qiv/qiv-1.9_pre10.ebuild b/media-gfx/qiv/qiv-1.9_pre10.ebuild
index 5df493a8902f..95f30ae0b00a 100644
--- a/media-gfx/qiv/qiv-1.9_pre10.ebuild
+++ b/media-gfx/qiv/qiv-1.9_pre10.ebuild
@@ -1,16 +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/media-gfx/qiv/qiv-1.9_pre10.ebuild,v 1.1 2003/02/09 09:25:38 satai Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/qiv/qiv-1.9_pre10.ebuild,v 1.1.1.1 2005/11/30 09:37:35 chriswhite Exp $
 
-P="qiv-1.9-pre10"
-S="${WORKDIR}/qiv-1.9"
+MY_P=${P/_/-}
+S=${WORKDIR}/${P%%_*}
 DESCRIPTION="Quick Image Viewer"
-SRC_URI="http://www.klografx.net/qiv/devel/${P}.tgz"
+SRC_URI="http://www.klografx.net/qiv/devel/${MY_P}.tgz"
 HOMEPAGE="http://www.klografx.net/qiv/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 sparc amd64"
+IUSE=""
 
 DEPEND="media-libs/libpng
 	>=media-libs/tiff-3.5.5
diff --git a/media-gfx/qiv/qiv-2.0.ebuild b/media-gfx/qiv/qiv-2.0.ebuild
index 87a69c4c4804..017281bfad07 100644
--- a/media-gfx/qiv/qiv-2.0.ebuild
+++ b/media-gfx/qiv/qiv-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/media-gfx/qiv/qiv-2.0.ebuild,v 1.1 2005/07/28 20:58:01 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/qiv/qiv-2.0.ebuild,v 1.1.1.1 2005/11/30 09:37:35 chriswhite Exp $
 
 MY_P=${P/_/-}
 S=${WORKDIR}/${P%%_*}
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.klografx.net/qiv/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~amd64"
+KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
 IUSE="xinerama"
 
 DEPEND="media-libs/libpng
diff --git a/media-gfx/qmatplot/ChangeLog b/media-gfx/qmatplot/ChangeLog
index 1bd5c2ba698b..1962089e728b 100644
--- a/media-gfx/qmatplot/ChangeLog
+++ b/media-gfx/qmatplot/ChangeLog
@@ -1,6 +1,12 @@
-# ChangeLog for app-sci/qmatplot
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/qmatplot/ChangeLog,v 1.1 2004/12/24 02:13:36 ribosome Exp $
+# ChangeLog for media-gfx/qmatplot
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/qmatplot/ChangeLog,v 1.1.1.1 2005/11/30 09:37:25 chriswhite Exp $
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> qmatplot-0.4.2-r1.ebuild:
+  Added to ~ppc.
+
+  07 Jul 2005; Caleb Tennis <caleb@gentoo.org> qmatplot-0.4.2-r1.ebuild:
+  Fix qt dep
 
 *qmatplot-0.4.2-r1 (23 Dec 2004)
 
diff --git a/media-gfx/qmatplot/Manifest b/media-gfx/qmatplot/Manifest
index af921fc91580..20f860d804c1 100644
--- a/media-gfx/qmatplot/Manifest
+++ b/media-gfx/qmatplot/Manifest
@@ -1,6 +1,6 @@
-MD5 082c7cca1a7735187264a643c4303803 qmatplot-0.4.2-r1.ebuild 954
-MD5 2cf37a0947b9bdc9ffdf9142fdc2cbf9 ChangeLog 952
+MD5 17b8319a4cbdd9eeafd983c97437f563 ChangeLog 1386
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 caa148371a7c466ed0b1c5c95b929622 files/qmatplot-0.4.2-gentoo.patch 453
+MD5 71eaaaf01a6420b26870ca7d98d72a01 qmatplot-0.4.2-r1.ebuild 974
 MD5 2cbaba30419f14241d64b9569438428f files/digest-qmatplot-0.4.2-r1 64
 MD5 a8b1462a453838dce1d466ec93e8e57a files/qmatplot-0.4.2-gcc34.patch 1139
+MD5 caa148371a7c466ed0b1c5c95b929622 files/qmatplot-0.4.2-gentoo.patch 453
diff --git a/media-gfx/qmatplot/qmatplot-0.4.2-r1.ebuild b/media-gfx/qmatplot/qmatplot-0.4.2-r1.ebuild
index 7b2a1706d70c..fc9280b91295 100644
--- a/media-gfx/qmatplot/qmatplot-0.4.2-r1.ebuild
+++ b/media-gfx/qmatplot/qmatplot-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/media-gfx/qmatplot/qmatplot-0.4.2-r1.ebuild,v 1.1 2004/12/24 02:13:36 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/qmatplot/qmatplot-0.4.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:25 chriswhite Exp $
 
 inherit eutils
 
@@ -9,13 +9,13 @@ HOMEPAGE="http://qmatplot.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
-KEYWORDS="x86 ~amd64"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 SLOT="0"
 
-DEPEND=">=x11-libs/qt-3
-	>=app-sci/octave-2.1
-	>=app-sci/scilab-2.6"
+DEPEND="=x11-libs/qt-3*
+	>=sci-mathematics/octave-2.1
+	>=sci-mathematics/scilab-2.6"
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-gfx/quat/ChangeLog b/media-gfx/quat/ChangeLog
index 1ccb8d2a2554..f1b7f9f7c18c 100644
--- a/media-gfx/quat/ChangeLog
+++ b/media-gfx/quat/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/quat
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/quat/ChangeLog,v 1.1 2003/09/12 04:16:31 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/quat/ChangeLog,v 1.1.1.1 2005/11/30 09:37:35 chriswhite Exp $
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> quat-1.20.ebuild:
+  Added to ~ppc.
 
 *quat-1.20 (30 Aug 2003)
 
diff --git a/media-gfx/quat/Manifest b/media-gfx/quat/Manifest
index 1e9fee32bb10..4f9617c37519 100644
--- a/media-gfx/quat/Manifest
+++ b/media-gfx/quat/Manifest
@@ -1,3 +1,3 @@
+MD5 20684af0bdf3326101d184a1395edad2 ChangeLog 537
+MD5 5fb6b17829fb037c554b5f43f8701a75 quat-1.20.ebuild 907
 MD5 7adfb8037a82a5f86380a42e2c18dbc5 files/digest-quat-1.20 61
-MD5 161341d6a17ac8412e38a20119cde4a4 ChangeLog 466
-MD5 2000d8de4e414132d138e6b71a862c44 quat-1.20.ebuild 898
diff --git a/media-gfx/quat/quat-1.20.ebuild b/media-gfx/quat/quat-1.20.ebuild
index 6c0e5a54dd33..5fb82851b114 100644
--- a/media-gfx/quat/quat-1.20.ebuild
+++ b/media-gfx/quat/quat-1.20.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/media-gfx/quat/quat-1.20.ebuild,v 1.1 2003/09/12 04:16:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/quat/quat-1.20.ebuild,v 1.1.1.1 2005/11/30 09:37:35 chriswhite Exp $
 
 DESCRIPTION="A 3D quaternionic fractal generator"
 HOMEPAGE="http://www.physcip.uni-stuttgart.de/phy11733/quat_e.html"
@@ -8,7 +8,8 @@ SRC_URI="http://www.physcip.uni-stuttgart.de/phy11733/download/quat-1.20.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~ppc x86"
+IUSE="X debug"
 
 DEPEND="X? ( >=x11-libs/fltk-1.1 virtual/x11 )
 	>=sys-libs/zlib-1.1.4"
@@ -20,7 +21,7 @@ src_compile() {
 		`use_enable X gui` \
 		`use_enable debug` \
 		`use_enable debug prof` \
-		|| die "configure failure" 
+		|| die "configure failure"
 	emake || die "make failure"
 }
 
diff --git a/media-gfx/quickplot/ChangeLog b/media-gfx/quickplot/ChangeLog
index d07b871ef4d5..ec8b68943222 100644
--- a/media-gfx/quickplot/ChangeLog
+++ b/media-gfx/quickplot/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for media-gfx/quickplot
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/quickplot/ChangeLog,v 1.1 2005/01/05 01:12:43 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/quickplot/ChangeLog,v 1.1.1.1 2005/11/30 09:37:42 chriswhite Exp $
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> quickplot-0.8.5.ebuild:
+  Added to ~ppc.
+
+  17 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> quickplot-0.8.5.ebuild:
+  Marked stable on amd64 and x86.
+
+  09 Jan 2005; Marcus Hanwell <cryos@gentoo.org> quickplot-0.8.5.ebuild:
+  Corrected paths in the help files, added a .desktop entry.
+
+  07 Jan 2005; Marcus Hanwell <cryos@gentoo.org> quickplot-0.8.5.ebuild:
+  Added sndfile USE flag, and tidied up documentation files.
+
+*quickplot-0.8.5 (06 Jan 2005)
+
+  06 Jan 2005; Marcus Hanwell <cryos@gentoo.org>
+  -files/quickplot-0.8.2-gcc-3.4.patch, -quickplot-0.8.2.ebuild,
+  +quickplot-0.8.5.ebuild:
+  Version bump, patch integrated upstream. Removed obsolete version.
 
 *quickplot-0.8.2 (05 Jan 2005)
 
diff --git a/media-gfx/quickplot/Manifest b/media-gfx/quickplot/Manifest
index ab491b7d0bce..f7e4f6e33f70 100644
--- a/media-gfx/quickplot/Manifest
+++ b/media-gfx/quickplot/Manifest
@@ -1,4 +1,4 @@
-MD5 df66cb76409b885b67e6fc524086023e quickplot-0.8.2.ebuild 665
-MD5 5747938c4e02aca9d73cd262241ac246 metadata.xml 651
-MD5 506e890d1309788f93e3f7b6135c8ce7 files/digest-quickplot-0.8.2 68
-MD5 a23d8d86d650cc012f6e3c272f23dd90 files/quickplot-0.8.2-gcc-3.4.patch 1458
+MD5 d1b060ad1d63952a89493f3a47b9e002 ChangeLog 1304
+MD5 f7ccf447ef7110a72f7c987c517942bd metadata.xml 689
+MD5 c6a4f1c68783336f056e24f21d7730ff quickplot-0.8.5.ebuild 1657
+MD5 161b412e414642dbef003cb31c9584b0 files/digest-quickplot-0.8.5 68
diff --git a/media-gfx/quickplot/quickplot-0.8.5.ebuild b/media-gfx/quickplot/quickplot-0.8.5.ebuild
index 02937506d22b..be350d7ce8d4 100644
--- a/media-gfx/quickplot/quickplot-0.8.5.ebuild
+++ b/media-gfx/quickplot/quickplot-0.8.5.ebuild
@@ -1,29 +1,50 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/quickplot/quickplot-0.8.5.ebuild,v 1.1 2005/01/06 07:42:35 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/quickplot/quickplot-0.8.5.ebuild,v 1.1.1.1 2005/11/30 09:37:42 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="A fast interactive 2D plotter."
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://quickplot.sourceforge.net/"
 
-IUSE=""
+IUSE="sndfile"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ~ppc x86"
+
+RDEPEND=">=dev-cpp/gtkmm-2.4.5
+	sndfile? ( >=media-libs/libsndfile-1.0.5 )"
 
-DEPEND=">=dev-util/pkgconfig-0.15
-	>=dev-cpp/gtkmm-2.4.5
-	>=media-libs/libsndfile-1.0.5"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.15"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# Some files have been moved around to more appropriate locations
+	sed -i -e 's|quickplot_icon.png|/usr/share/pixmaps/quickplot.png|' \
+		index.html.in
+	sed -i -e 's|href="ChangeLog"|href="../ChangeLog.gz"|' index.html.in
+	sed -i -e 's|href="COPYING"|href="/usr/portage/licenses/GPL-2"|' \
+		about.html.in
+}
 
 src_compile() {
-	econf || die "econf step failed."
-	emake || die "emake step failed."
+	econf `use_with sndfile libsndfile` || die "econf step failed."
+	emake htmldir=/usr/share/doc/${PF}/html || die "emake step failed."
 }
 
 src_install () {
-	make install DESTDIR=${D} || die "make install step failed."
-	# Remove the licence as it is specified in LICENCE
-	rm ${D}/usr/share/doc/${PN}/COPYING
-	# Move the docs to the correct location
-	mv ${D}/usr/share/doc/${PN} ${D}/usr/share/doc/${PF}
+	make install DESTDIR=${D} htmldir=/usr/share/doc/${PF}/html \
+		|| die "make install step failed."
+	dodoc AUTHORS ChangeLog README README.devel TODO
+	# Remove COPYING as it is specified in LICENCE. Move other stuff.
+	cd ${D}/usr/share/doc/${PF}/html
+	rm COPYING quickplot_icon.png ChangeLog
+	mv ${D}/usr/share/pixmaps/quickplot_icon.png \
+		${D}/usr/share/pixmaps/quickplot.png
+	make_desktop_entry 'quickplot --no-pipe' Quickplot quickplot.png Graphics
+	mv ${D}/usr/share/applications/quickplot\ --no-pipe.desktop \
+		${D}/usr/share/applications/quickplot.desktop
 }
diff --git a/media-gfx/radiance/ChangeLog b/media-gfx/radiance/ChangeLog
index 58bf45de4b65..34a1e1afbd77 100644
--- a/media-gfx/radiance/ChangeLog
+++ b/media-gfx/radiance/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for media-gfx/radiance
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/radiance/ChangeLog,v 1.1 2003/12/14 17:44:53 malverian Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/radiance/ChangeLog,v 1.1.1.1 2005/11/30 09:37:19 chriswhite Exp $
+
+  03 Jun 2005; Luca Barbato <lu_zero@gentoo.org> metadata.xml:
+  Metadata fix
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> radiance-3.5.ebuild:
+  Add inherit eutils
+
+  23 Mar 2004; Martin Holzer <mholzer@gentoo.org> radiance-3.5.ebuild:
+  fixing depend qa issue. see 45343.
+
+  15 Dec 2003; Brandy Westcott brandy@gentoo.org radiance-3.5.ebuild:
+  Added app-shells/tcsh as a dependency.
+
+  15 Dec 2003; Brandy Westcott brandy@gentoo.org radiance-3.5.ebuild:
+  Added X USE flag and dev-lang/tk as a dependency. Added patch to enable
+  radiance to build without X.
 
 *radiance-3.5 (14 Dec 2003)
 
diff --git a/media-gfx/radiance/Manifest b/media-gfx/radiance/Manifest
index ab6fd8cdaca8..1fe64d5d1818 100644
--- a/media-gfx/radiance/Manifest
+++ b/media-gfx/radiance/Manifest
@@ -1,4 +1,5 @@
-MD5 5efcb40a23d73841423ad1dadcc467c3 radiance-3.5.ebuild 2292
-MD5 6f826a40d8aafc654f97acab145439df metadata.xml 1059
-MD5 c78074cc3fdc5f52ce1002ff4808eaf0 ChangeLog 412
+MD5 fe5335e413aa2cea96686760caf00ad4 metadata.xml 1054
+MD5 b32b04dc48e3013d93e748f46a0cfa83 radiance-3.5.ebuild 2428
+MD5 da5989d0e3e99dbaf3dc37752078a2f5 ChangeLog 1064
 MD5 347f17131e4ad7db7b308e247e947de5 files/digest-radiance-3.5 59
+MD5 1d71271d9c1459ddba0d0e3cc8b454bd files/radiance-3.5-noX11.patch 3425
diff --git a/media-gfx/radiance/files/radiance-3.5-noX11.patch b/media-gfx/radiance/files/radiance-3.5-noX11.patch
index 5ed888d55e57..1fa1573ea011 100644
--- a/media-gfx/radiance/files/radiance-3.5-noX11.patch
+++ b/media-gfx/radiance/files/radiance-3.5-noX11.patch
@@ -1,3 +1,36 @@
+diff -ur ray.orig/src/hd/Rmakefile ray/src/hd/Rmakefile
+--- ray.orig/src/hd/Rmakefile	2003-12-15 16:52:34.000000000 +1300
++++ ray/src/hd/Rmakefile	2003-12-15 18:12:48.000000000 +1300
+@@ -24,7 +24,7 @@
+ 
+ all:	$(PROGS)
+ 
+-install:	all $(DEVS) $(SPECIAL)
++install:	all $(SPECIAL)
+ 	cp $(PROGS) $(INSTDIR)
+ 
+ clean:
+@@ -74,7 +74,7 @@
+ 	rm -f $(DEVDIR)/x11h.hdi
+ 	ln $(DEVDIR)/x11.hdi $(DEVDIR)/x11h.hdi
+ 
+-$(DEVDIR)/x11.hdi:	rhdisp.o rhdisp2.o viewbeams.o rhd_x11.o rhd_qtree.o \
++$(DEVDIR)/x11.hdi:	rhdisp.o rhdisp2.o viewbeams.o rhd_qtree.o \
+ rhd_qtree2r.o rhd_ctab.o holo.o
+ 	$(CC) $(CFLAGS) -o $(DEVDIR)/x11.hdi rhdisp.o rhdisp2.o viewbeams.o \
+ rhd_x11.o rhd_qtree.o rhd_qtree2r.o rhd_ctab.o holo.o -lrt -lX11 -lm
+diff -ur ray.orig/src/meta/Rmakefile ray/src/meta/Rmakefile
+--- ray.orig/src/meta/Rmakefile	2003-12-15 16:52:35.000000000 +1300
++++ ray/src/meta/Rmakefile	2003-12-15 18:02:14.000000000 +1300
+@@ -32,7 +32,7 @@
+ 
+ general:	$(INSTDIR)/meta2tga $(INSTDIR)/pexpand $(INSTDIR)/psort \
+ $(INSTDIR)/cv $(INSTDIR)/psmeta $(INSTDIR)/plotin \
+-$(INSTDIR)/x11meta ../lib/libmeta.a $(INSTDIR)/bgraph $(INSTDIR)/igraph \
++../lib/libmeta.a $(INSTDIR)/bgraph $(INSTDIR)/igraph \
+ $(INSTDIR)/dgraph $(INSTDIR)/gcomp $(INSTDIR)/plot4
+ 
+ special:	$(EXEC2)/mt160l $(EXEC2)/mt160 $(EXEC2)/mtext \
 diff -ur ray.orig/src/px/Rmakefile ray/src/px/Rmakefile
 --- ray.orig/src/px/Rmakefile	2003-12-15 16:52:34.000000000 +1300
 +++ ray/src/px/Rmakefile	2003-12-15 16:56:41.000000000 +1300
diff --git a/media-gfx/radiance/metadata.xml b/media-gfx/radiance/metadata.xml
index 69ae8939f410..41142de49e77 100644
--- a/media-gfx/radiance/metadata.xml
+++ b/media-gfx/radiance/metadata.xml
@@ -2,10 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 
 <pkgmetadata>
-	<herd>media-gfx</herd>
+	<herd>graphics</herd>
 	<maintainer>
 		<email>malverian@gentoo.org</email>
 		<name>Philip Walls</name>
 	</maintainer>
-	<longdescription>Radiance is intended to aid lighting designers and architects by predicting the light levels and appearance of a space prior to construction. The package includes programs for modeling and translating scene geometry, luminaire data and material properties, all of which are needed as input to the simulation. The lighting simulation itself uses ray tracing techniques to compute radiance values (ie. the quantity of light passing through a specific point in a specific direction), which are typically arranged to form a photographic quality image. The resulting image may be analyzed, displayed and manipulated within the package, and converted to other popular image file formats for export to other packages, facilitating the production of hard copy output.</longdescription> -->
+	<longdescription>Radiance is intended to aid lighting designers and architects by predicting the light levels and appearance of a space prior to construction. The package includes programs for modeling and translating scene geometry, luminaire data and material properties, all of which are needed as input to the simulation. The lighting simulation itself uses ray tracing techniques to compute radiance values (ie. the quantity of light passing through a specific point in a specific direction), which are typically arranged to form a photographic quality image. The resulting image may be analyzed, displayed and manipulated within the package, and converted to other popular image file formats for export to other packages, facilitating the production of hard copy output.</longdescription>
 </pkgmetadata>
diff --git a/media-gfx/radiance/radiance-3.5.ebuild b/media-gfx/radiance/radiance-3.5.ebuild
index 54fec97f8065..4afc1cdefdb0 100644
--- a/media-gfx/radiance/radiance-3.5.ebuild
+++ b/media-gfx/radiance/radiance-3.5.ebuild
@@ -1,12 +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/media-gfx/radiance/radiance-3.5.ebuild,v 1.1 2003/12/14 17:44:53 malverian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/radiance/radiance-3.5.ebuild,v 1.1.1.1 2005/11/30 09:37:19 chriswhite Exp $
+
+inherit eutils
 
 MY_P=${P/./R}
 MY_P=${MY_P/radiance-/rad}
 
-# Compilation fails with multiple jobs here
-MAKEOPTS=""
+IUSE="X"
 
 DESCRIPTION="Radiance is a suite of programs for the analysis and visualization of lighting in design"
 HOMEPAGE="http://radsite.lbl.gov/radiance/"
@@ -16,17 +17,17 @@ LICENSE="Radiance"
 SLOT="0"
 KEYWORDS="~x86"
 
-RDEPEND="media-libs/tiff
-		virtual/x11"
-
-DEPEND="${RDEPEND}"
+DEPEND="media-libs/tiff
+	app-shells/tcsh
+	X? ( virtual/x11 dev-lang/tk )"
 
 src_unpack() {
-
 	unpack ${A}
 	cd ${WORKDIR}/ray
 	mkdir -p src/lib
 
+	use X ||  epatch ${FILESDIR}/${P}-noX11.patch
+
 	# patch to not build libtiff that comes with Radiance
 	cp src/px/Rmakefile src/px/Rmakefile.orig
 	sed -e "s/\.\.\/lib\/libtiff\.a$//g" \
@@ -41,7 +42,6 @@ src_unpack() {
 	cp src/cal/ev.c src/cal/ev.c.orig
 	sed -e "s/extern int  errno;/#include <errno.h>/g" \
 		src/cal/ev.c.orig > src/cal/ev.c
-
 }
 
 src_compile() {
@@ -54,7 +54,7 @@ src_compile() {
 	for i in $srcdirs ;
 	do
 		pushd $i
-		emake "SPECIAL=" \
+		make "SPECIAL=" \
 			"OPT=$CFLAGS -DSPEED=200" \
 			"MACH=-Dlinux -L/usr/X11R6/lib -I/usr/include/X11 -DNOSTEREO -DBIGMEM" \
 			ARCH=IBMPC "COMPAT=bmalloc.o erf.o getpagesize.o" \
@@ -90,6 +90,8 @@ src_install() {
 	doman doc/man/man5/*.5
 	prepallman
 
+	dodoc README
+
 	docinto notes
 	dodoc doc/notes/*
 
diff --git a/media-gfx/retina/ChangeLog b/media-gfx/retina/ChangeLog
index f72e42f6fc66..48ab2f3d6612 100644
--- a/media-gfx/retina/ChangeLog
+++ b/media-gfx/retina/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for media-gfx/retina
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/retina/ChangeLog,v 1.1 2005/09/07 03:43:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/retina/ChangeLog,v 1.1.1.1 2005/11/30 09:37:29 chriswhite Exp $
 
 *retina-* (06 Sep 2005)
 
diff --git a/media-gfx/retina/Manifest b/media-gfx/retina/Manifest
index b3a21ecf2e7e..0b8c0dd7af53 100644
--- a/media-gfx/retina/Manifest
+++ b/media-gfx/retina/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 fea39951bacc77c34d1d1dd65f942577 metadata.xml 250
-MD5 3032c87e40dd66d77a383fcece8461e0 retina-9999.ebuild 269
-MD5 d027a8ab01c5819311b78141f816b5a1 ChangeLog 348
+MD5 dcb4b6c6bf27895360eb14377182fd9b retina-9999.ebuild 366
+MD5 26748ce8c5530242a7d680ffa5a9ba8d ChangeLog 346
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-retina-9999 0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDHmIAgIKl8Uu19MoRAoO5AJ9u0cemedt5dgJrXqjt0zhYgUkCSACfb22p
+toOwsHhg2STviD+lMg+lwBs=
+=Pk+c
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/retina/retina-9999.ebuild b/media-gfx/retina/retina-9999.ebuild
index 66124f95b367..057f367a0422 100644
--- a/media-gfx/retina/retina-9999.ebuild
+++ b/media-gfx/retina/retina-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/media-gfx/retina/retina-9999.ebuild,v 1.1 2005/09/07 03:43:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/retina/retina-9999.ebuild,v 1.1.1.1 2005/11/30 09:37:29 chriswhite Exp $
 
 ECVS_MODULE="misc/retina"
 inherit enlightenment
diff --git a/media-gfx/sam2p/ChangeLog b/media-gfx/sam2p/ChangeLog
index f73083747346..974d14cc4279 100644
--- a/media-gfx/sam2p/ChangeLog
+++ b/media-gfx/sam2p/ChangeLog
@@ -1,6 +1,38 @@
 # ChangeLog for media-gfx/sam2p
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sam2p/ChangeLog,v 1.1 2003/04/10 15:27:36 twp Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sam2p/ChangeLog,v 1.1.1.1 2005/11/30 09:37:18 chriswhite Exp $
+
+  25 Jul 2005; Tom Payne <twp@gentoo.org> sam2p-0.44.ebuild:
+  Update DESCRIPTION and RDEPEND. Bug # 99718.
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> sam2p-0.44.ebuild:
+  Stable on ppc.
+
+  13 May 2005; Tom Payne <twp@gentoo.org> -sam2p-0.43.ebuild,
+  sam2p-0.44.ebuild:
+  Update to use toolchain-funcs. Remove old version.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> sam2p-0.43.ebuild:
+  virtual/glibc -> virtual/libc
+
+  31 May 2004; <twp@gentoo.org> sam2p-0.44.ebuild:
+  Stable on x86
+
+  26 Apr 2004; David Holm <dholm@gentoo.org> sam2p-0.44.ebuild:
+  Added to ~ppc.
+
+*sam2p-0.44 (25 Apr 2004)
+
+  25 Apr 2004; <twp@gentoo.org> +sam2p-0.44.ebuild:
+  Version bump.
+
+  28 Sep 2003; Tom Payne <twp@gentoo.org> :
+  Added metadata.xml.
+  
+*sam2p-0.43 (30 Aug 2003)
+
+  30 Aug 2003; Tom Payne <twp@gentoo.org> sam2p-0.43.ebuild :
+  Version bump.
 
 *sam2p-0.41 (10 Apr 2003)
 
diff --git a/media-gfx/sam2p/Manifest b/media-gfx/sam2p/Manifest
index e69de29bb2d1..d0137afa0b15 100644
--- a/media-gfx/sam2p/Manifest
+++ b/media-gfx/sam2p/Manifest
@@ -0,0 +1,4 @@
+MD5 582eef0b51809b5de3ab008f2dfedc2b sam2p-0.44.ebuild 827
+MD5 8ac13c5b2397299dba1c9464923ffd5d ChangeLog 1191
+MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
+MD5 83eb0bb62aef95179599e800262049da files/digest-sam2p-0.44 63
diff --git a/media-gfx/sam2p/sam2p-0.44.ebuild b/media-gfx/sam2p/sam2p-0.44.ebuild
index 13d6b240dfad..954194f6aa43 100644
--- a/media-gfx/sam2p/sam2p-0.44.ebuild
+++ b/media-gfx/sam2p/sam2p-0.44.ebuild
@@ -1,24 +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/media-gfx/sam2p/sam2p-0.44.ebuild,v 1.1 2004/04/25 14:02:28 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sam2p/sam2p-0.44.ebuild,v 1.1.1.1 2005/11/30 09:37:18 chriswhite Exp $
 
-DESCRIPTION="A utility to convert raster images to PDF and others"
+inherit toolchain-funcs
+
+DESCRIPTION="Utility to convert raster images to EPS, PDF and many others"
 HOMEPAGE="http://www.inf.bme.hu/~pts/sam2p/"
 # The author refuses to distribute 
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="ppc x86"
 IUSE="gif"
 DEPEND="dev-lang/perl
 	sys-devel/gcc-config"
+RDEPEND="virtual/libc"
+
 S=${WORKDIR}
 
 src_compile() {
 	local myconf="--enable-lzw `use_enable gif`"
 	# Makedep borks if distcc is used, so disable it for econf by
 	# overriding the path to g++
-	CXX="$(gcc-config -B)/g++" econf ${myconf} || die
+	CXX="$(tc-getCXX)" econf ${myconf} || die
 	make || die
 }
 
diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog
index 10f7fdfa4022..7c4422a4e765 100644
--- a/media-gfx/sane-backends/ChangeLog
+++ b/media-gfx/sane-backends/ChangeLog
@@ -1,6 +1,424 @@
 # ChangeLog for media-gfx/sane-backends
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.1 2002/02/01 21:53:30 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.1.1.1 2005/11/30 09:37:17 chriswhite Exp $
+
+  08 Nov 2005; Patrick Kursawe <phosphan@gentoo.org> files/sm3600usb.patch:
+  Will I ever get sm3600 right? Links with sanei now.
+
+  07 Nov 2005; Patrick Kursawe <phosphan@gentoo.org> +files/sm3600usb.patch:
+  Re-adding patch with substitution turned off
+
+  07 Nov 2005; Patrick Kursawe <phosphan@gentoo.org> -files/sm3600usb.patch:
+  sm3600usb.patch was broken by keyword subsitution
+
+  04 Nov 2005; Patrick Kursawe <phosphan@gentoo.org> files/sm3600usb.patch:
+  Yesterday's patch was broken
+
+  03 Nov 2005; Patrick Kursawe <phosphan@gentoo.org> +files/sm3600usb.patch,
+  sane-backends-1.0.16-r4.ebuild:
+  Additional fix for sm3600 USB from sane-CVS
+
+*sane-backends-1.0.16-r4 (02 Nov 2005)
+
+  02 Nov 2005; Patrick Kursawe <phosphan@gentoo.org>
+  +files/kernel2.6.13usb-problem.patch, +sane-backends-1.0.16-r4.ebuild:
+  Fix for bug #109355 from sane-CVS
+
+*sane-backends-1.0.16-r3 (31 Oct 2005)
+
+  31 Oct 2005; Patrick Kursawe <phosphan@gentoo.org> +files/lide25-r1.patch,
+  +sane-backends-1.0.16-r3.ebuild:
+  Updated lide25 patch (bug #104026)
+
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org>
+  sane-backends-1.0.15-r3.ebuild:
+  Mark 1.0.15-r3 stable on alpha
+
+  19 Sep 2005; Patrick Kursawe <phosphan@gentoo.org>
+  sane-backends-1.0.16-r2.ebuild:
+  Getting to the root of the problem for -ffast-math (bug #103118)
+
+  17 Sep 2005; Aron Griffis <agriffis@gentoo.org> ChangeLog:
+  Mark 1.0.15-r3 stable on ia64
+
+  12 Sep 2005; Patrick Kursawe <phosphan@gentoo.org>
+  sane-backends-1.0.16-r2.ebuild:
+  Creating lock directory in a different way (see bug #105429)
+
+  05 Sep 2005; Patrick Kursawe <phosphan@gentoo.org>
+  sane-backends-1.0.16-r2.ebuild:
+  Filtering -fstack-protector for amd64 (see bug #104303)
+
+*sane-backends-1.0.16-r2 (30 Aug 2005)
+
+  30 Aug 2005; Patrick Kursawe <phosphan@gentoo.org> +files/lide25.patch,
+  +sane-backends-1.0.16-r2.ebuild, -sane-backends-1.0.16.ebuild:
+  Adding lock directory (used by some backends, bug #104025) and support for
+  LiDE25 scanners (bug #104026)
+
+  22 Aug 2005; Patrick Kursawe <phosphan@gentoo.org>
+  sane-backends-1.0.16-r1.ebuild:
+  Filtering -ffast-math (bug #103118)
+
+*sane-backends-1.0.16-r1 (22 Aug 2005)
+
+  22 Aug 2005; Patrick Kursawe <phosphan@gentoo.org>
+  +sane-backends-1.0.16-r1.ebuild:
+  Adding again the BrotherMFC-Patch from sourceforge, adapted for .16 by Joachim
+  Feise.
+
+  22 Aug 2005; Patrick Kursawe <phosphan@gentoo.org>
+  sane-backends-1.0.16.ebuild:
+  Tried to unpack a patch that wasn't downloaded (see bug #103152)
+
+*sane-backends-1.0.16 (19 Aug 2005)
+
+  19 Aug 2005; Patrick Kursawe <phosphan@gentoo.org>
+  +sane-backends-1.0.16.ebuild:
+  Version bump. Most old patches should not be necessary any more. Attention
+  BrotherMFC-users: I didn't yet find the time to port this patch to .16, so it
+  is currently disabled.
+  If you have problems that your scanner isn't found when you use
+  $SANE_BACKENDS, please comment on bug #90598. I haven't been able to
+  reproduce this problem so far.
+
+*sane-backends-1.0.15-r3 (04 Aug 2005)
+
+  04 Aug 2005; Patrick Kursawe <phosphan@gentoo.org>
+  +sane-backends-1.0.15-r3.ebuild:
+  Getting gt68xx-Version from SANE CVS because of bug #101248
+
+  30 May 2005; Patrick Kursawe <phosphan@gentoo.org>
+  sane-backends-1.0.15-r1.ebuild, sane-backends-1.0.15-r2.ebuild,
+  sane-backends-1.0.15.ebuild:
+  Fixing gphoto dependency
+
+  10 May 2005; Aron Griffis <agriffis@gentoo.org>
+  sane-backends-1.0.15-r1.ebuild, sane-backends-1.0.15-r2.ebuild:
+  add ~ia64 #91975
+
+*sane-backends-1.0.15-r2 (09 May 2005)
+
+  09 May 2005; Patrick Kursawe <phosphan@gentoo.org>
+  -sane-backends-1.0.14-r3.ebuild, -sane-backends-1.0.14-r6.ebuild,
+  +sane-backends-1.0.15-r2.ebuild:
+  Compiling (almost) only selected backends using $SANE_BACKENDS now.
+  See bug #90598.
+  The patch by Diego (flameeyes@gentoo.org) also does some cleanups and adds
+  parallel port support for amd64.
+  Cleaning up unused versions.
+
+*sane-backends-1.0.15-r1 (27 Apr 2005)
+
+  27 Apr 2005; Patrick Kursawe <phosphan@gentoo.org>
+  +files/sane-backend-1.0.15-gt68xx-update67.patch,
+  +sane-backends-1.0.15-r1.ebuild:
+  Fixes for gt68xx-based scanners (bug #90442)
+
+  08 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  sane-backends-1.0.15.ebuild:
+  Stable on ppc64
+
+  01 Apr 2005; Lars Weiler <pylon@gentoo.org> sane-backends-1.0.15.ebuild:
+  Stable on ppc.
+
+  24 Mar 2005; Danny van Dyk <kugelfang@gentoo.org>
+  sane-backends-1.0.15.ebuild:
+  Fixed stupid typo in previous fix. Thanks to greg_g for his eagle eyes :-).
+
+  23 Mar 2005; Danny van Dyk <kugelfang@gentoo.org>
+  sane-backends-1.0.15.ebuild:
+  Fixed BUG #86354 (multilib-strict). Marked stable on amd64.
+
+  21 Jan 2005; Bryan Østergaard <kloeri@gentoo.org>
+  sane-backends-1.0.15.ebuild:
+  Stable on alpha.
+
+  10 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  sane-backends-1.0.15.ebuild:
+  Stable on sparc
+
+  10 Jan 2005; Patrick Kursawe <phosphan@gentoo.org>
+  sane-backends-1.0.15.ebuild:
+  Stable for x86
+
+  16 Dec 2004; Dylan Carlson <absinthe@gentoo.org>
+  sane-backends-1.0.14-r6.ebuild:
+  Stable on amd64.
+
+  24 Nov 2004; Dominik Stadler <centic@gentoo.org>
+  sane-backends-1.0.13-r3.ebuild, sane-backends-1.0.14-r3.ebuild,
+  sane-backends-1.0.14-r6.ebuild, sane-backends-1.0.15.ebuild:
+  Update homepage to http://www.sane-project.org/
+
+  23 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
+  sane-backends-1.0.15.ebuild:
+  ~alpha keyword.
+
+*sane-backends-1.0.15 (16 Nov 2004)
+
+  16 Nov 2004; Patrick Kursawe <phosphan@gentoo.org>
+  +sane-backends-1.0.15.ebuild:
+  Version bump.
+  Niash support has been added upstream, removing the patch.
+  Brothermfc-Patch needed slight changes.
+
+  02 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  sane-backends-1.0.14-r6.ebuild:
+  Stable on sparc
+
+  02 Nov 2004; Patrick Kursawe <phosphan@gentoo.org>
+  -sane-backends-1.0.14-r2.ebuild, -sane-backends-1.0.14-r4.ebuild,
+  -sane-backends-1.0.14-r5.ebuild, sane-backends-1.0.14-r6.ebuild:
+  Cleanup; -r6 stable for x86.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org>
+  sane-backends-1.0.14-r2.ebuild, sane-backends-1.0.14-r3.ebuild:
+  Stable on amd64.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org>
+  sane-backends-1.0.14-r6.ebuild:
+  KEYWORDS ~amd64.
+
+*sane-backends-1.0.14-r6 (22 Sep 2004)
+
+  22 Sep 2004; Patrick Kursawe <phosphan@gentoo.org>
+  +sane-backends-1.0.14-r6.ebuild:
+  Using ipv6 USE flag now, see bug #64376.
+
+*sane-backends-1.0.14-r5 (30 Aug 2004)
+
+  30 Aug 2004; Patrick Kursawe <phosphan@gentoo.org>
+  +sane-backends-1.0.14-r5.ebuild:
+  Bug #29506 revisited. Canon 2700F focus problems.
+
+  26 Aug 2004; Jason Wever <weeve@gentoo.org> sane-backends-1.0.14-r3.ebuild:
+  Stable on sparc.
+
+  25 Aug 2004; Jason Wever <weeve@gentoo.org> :
+  Stable on sparc.
+
+*sane-backends-1.0.14-r4 (18 Aug 2004)
+
+  18 Aug 2004; Patrick Kursawe <phosphan@gentoo.org>
+  sane-backends-1.0.14-r3.ebuild, +sane-backends-1.0.14-r4.ebuild:
+  Adding support for NIASH based scanners, see bug #50760. Thanks Jose!
+  Declaring -r3 stable for x86.
+
+  31 Jul 2004; Tom Gall <tgall@gentoo.org> sane-backends-1.0.14-r3.ebuild:
+  stable on ppc64, bug #57131
+
+  27 Jul 2004; Patrick Kursawe <phosphan@gentoo.org>
+  sane-backends-1.0.14-r2.ebuild, sane-backends-1.0.14-r3.ebuild:
+  Moving enewgroup where it belongs (bug #58526)
+
+  30 Jun 2004; Lars Weiler <pylon@gentoo.org> sane-backends-1.0.14-r3.ebuild:
+  Stable on ppc.  1.0.13-r3 does not compile any more.
+
+  19 Jun 2004; Danny van Dyk <kugelfang@gentoo.org>
+  sane-backends-1.0.14-r2.ebuild:
+  Marked ~amd64.
+
+  18 Jun 2004; Jason Wever <weeve@gentoo.org> sane-backends-1.0.14-r3.ebuild:
+  Added ~sparc keyword (not sure where it went).
+
+*sane-backends-1.0.14-r3 (17 Jun 2004)
+
+  17 Jun 2004; Patrick Kursawe <phosphan@gentoo.org>
+  sane-backends-1.0.14-r3.ebuild, files/libusbscanner-device-r1.patch:
+  Should get the right path in /proc from hotplug now.
+
+  11 Jun 2004; Patrick Kursawe <phosphan@gentoo.org>
+  sane-backends-1.0.12-r2.ebuild, sane-backends-1.0.13-r1.ebuild,
+  sane-backends-1.0.13-r2.ebuild, sane-backends-1.0.13.ebuild,
+  sane-backends-1.0.14-r1.ebuild, sane-backends-1.0.14-r2.ebuild,
+  sane-backends-1.0.14-r3.ebuild, sane-backends-1.0.14.ebuild:
+  Big cleanup. 1.0.14-r2 stable for x86.
+
+*sane-backends-1.0.14-r3 (11 May 2004)
+
+  11 May 2004; Patrick Kursawe <phosphan@gentoo.org>
+  sane-backends-1.0.14-r3.ebuild:
+  Adding parport direct io support
+
+*sane-backends-1.0.14-r2 (10 May 2004)
+
+  10 May 2004; Patrick Kursawe <phosphan@gentoo.org>
+  sane-backends-1.0.14-r2.ebuild, files/libusbscanner-device.patch:
+  Some little fixes for bug #49815 (added scanner group, made script executable,
+  added device variable workaround)
+
+*sane-backends-1.0.14-r1 (06 May 2004)
+
+  06 May 2004; Patrick Kursawe <phosphan@gentoo.org>
+  sane-backends-1.0.14-r1.ebuild:
+  Now also installing hotplug related files, see bug #49815
+
+*sane-backends-1.0.14 (05 May 2004)
+
+  05 May 2004; Patrick Kursawe <phosphan@gentoo.org>
+  sane-backends-1.0.14.ebuild:
+  Version bump - added gphoto2 USE support, thanks to bug #48992
+
+  03 Mar 2004; Patrick Kursawe <phosphan@gentoo.org>
+  sane-backends-1.0.13-r3.ebuild:
+  Now really moving to stable.
+
+  28 Feb 2004; Patrick Kursawe <phosphan@gentoo.org>
+  sane-backends-1.0.13-r3.ebuild:
+  Increased revision number of patch
+
+*sane-backends-1.0.13-r3 (27 Feb 2004)
+
+  27 Feb 2004; Patrick Kursawe <phosphan@gentoo.org>
+  sane-backends-1.0.13-r3.ebuild:
+  Time to go stable. The -r2 -r3 update can't cause any harm.
+
+*sane-backends-1.0.13-r3 (27 Feb 2004)
+
+  27 Feb 2004; Patrick Kursawe <phosphan@gentoo.org>
+  sane-backends-1.0.13-r3.ebuild:
+  Patch for brother usb scanner was changed because of bug #43028, increased
+  revision number to force update.
+
+  28 Jan 2004; Aron Griffis <agriffis@gentoo.org>
+  sane-backends-1.0.12-r2.ebuild, sane-backends-1.0.13-r1.ebuild,
+  sane-backends-1.0.13-r2.ebuild, sane-backends-1.0.13.ebuild:
+  ia64 keywords changes
+
+*sane-backends-1.0.13-r2 (11 Dec 2003)
+
+  11 Dec 2003; Patrick Kursawe <phosphan@gentoo.org>
+  sane-backends-1.0.13-r2.ebuild:
+  Added support for Brother MFC 4600 via USB if "usb" is in USE. The patch
+  originates from http://sourceforge.net/projects/brother-mfc/ but had to be
+  modified for 1.0.13.
+
+  10 Dec 2003; Patrick Kursawe <phosphan@gentoo.org>
+  sane-backends-1.0.11.ebuild, sane-backends-1.0.12-r1.ebuild,
+  sane-backends-1.0.12-r2.ebuild, sane-backends-1.0.13_pre2.ebuild,
+  sane-backends-1.0.8-r2.ebuild:
+  Cleanup.
+
+*sane-backends-1.0.13-r1 (10 Dec 2003)
+
+  10 Dec 2003; Patrick Kursawe <phosphan@gentoo.org>
+  sane-backends-1.0.13-r1.ebuild:
+  Now bings in libusb for sm3600 support if "usb" is in USE.
+
+*sane-backends-1.0.13 (24 Nov 2003)
+
+  24 Nov 2003; Patrick Kursawe <phosphan@gentoo.org>
+  sane-backends-1.0.13.ebuild:
+  Version bump
+
+  29 Nov 2003; Brad House <brad_mssw@gentoo.org>
+  sane-backends-1.0.12-r2.ebuild:
+  mark stable on amd64
+
+*sane-backends-1.0.13_pre2 (11 Nov 2003)
+
+  11 Nov 2003; Patrick Kursawe <phosphan@gentoo.org>
+  sane-backends-1.0.13_pre2.ebuild:
+  Version bump, removed patches for new release.
+
+  26 Oct 2003; Brad House <brad_mssw@gentoo.org>
+  sane-backends-1.0.12-r2.ebuild:
+  add ~amd64 flag
+
+*sane-backends-1.0.12-r2 (08 Oct 2003)
+
+  08 Oct 2003; Patrick Kursawe <phosphan@gentoo.org> metadata.xml,
+  sane-backends-1.0.12-r2.ebuild, files/canoscan-focus.patch:
+  Added workaround patch for canoscan 2700F focus problems, switches
+  off focusing.
+
+  10 Sep 2003; Patrick Kursawe <phosphan@gentoo.org>
+  sane-backends-1.0.12-r1.ebuild:
+  Fixed access violation when generating sane.ps (bug #28303).
+  Now bug 23974 should really be dead.
+
+*sane-backends-1.0.12-r1 (25 Aug 2003)
+
+  25 Aug 2003; Patrick Kursawe <phosphan@gentoo.org>
+  sane-backends-1.0.12-r1.ebuild:
+  Added updated plustek driver (bug 27280) and fixed bug 23974.
+
+  11 Jul 2003; Patrick Kursawe <phosphan@gentoo.org>
+  sane-backends-1.0.11.ebuild, sane-backends-1.0.12.ebuild,
+  sane-backends-1.0.9.ebuild:
+  Updated download URIs
+
+  20 Jun 2003; mkeadle <mkeadle@gentoo.org> sane-backends-1.0.11.ebuild:
+  moving from ~x86 to stable. stable, and closes bug #23163.
+
+*sane-backends-1.0.12 (19 Jun 2003)
+
+  19 Jun 2003; mkeadle <mkeadle@gentoo.org> sane-backends-1.0.12.ebuild:
+  bump to latest upstream stable
+
+*sane-backends-1.0.11 (09 Mar 2003)
+
+  09 Mar 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*sane-backends-1.0.9 (01 Dec 2002)
+
+  06 Jan 2002; Matt Keadle <mkeadle@gentoo.org> sane-backends-1.0.9.ebuild
+
+  Unmasking for x86 and moving to stable.
+
+  01 Dec 2002; Matt Keadle <mkeadle@gentoo.org> sane-backends-1.0.9.ebuild
+  files/digest-sane-backends-1.0.9
+
+  Version bump to latest release.
+
+*sane-backends-1.0.8-r2 (03 Jul 2002)
+
+  15 Sep 2002; Maarten Thibaut <murphy@gentoo.org> sane-backends-1.0.8-r2.ebuild :
+  Added keywords for sparc and sparc64.
+
+  11 Aug 2002; Mark Guertin <gerk@gentoo.org> sane-backends-1.0.8-r2.ebuild :
+  Adjusted for new arch checks in DEPEND
+
+  03 Jul 2002; Seemant Kulleen <seemant@gentoo.org>
+  sane-backends-1.0.8-r2.ebuild files/digest-sane-backends-1.0.8-r2 :
+
+  Added libieee1284 to DEPEND so that the canon drivers get built as well
+  now.  Thanks to troy@tkdack.com (Troy Dack) in bug #4207
+
+*sane-backends-1.0.8-r1 (24 Jun 2002)
+
+  24 Jun 2002; Seemant Kulleen <seemant@gentoo.org>
+  sane-backends-1.0.8-r1.ebuild files/digest-sane-backends-1.0.8-r1 :
+
+  Made src_install() install the /etc/env.d file instead of pkg_postinst()
+  so that unmerge will remove it as well. Fix suggested by arcady@gentoo.org
+
+*sane-backends-1.0.8 (22 Jun 2002)
+
+  22 Jun 2002; Ryan Phillips <rphillips@gentoo.org> sane-backends-1.0.8.ebuild
+  files/digest-sane-backends-1.0.8
+
+  New version
+
+*sane-backends-1.0.7-r1 (13 Apr 2002)
+
+  13 Apr 2002; Seemant Kulleen <seemant@gentoo.org>
+  sane-backends-1.0.7-r1.ebuild files/digest-sane-backends-1.0.7-r1 :
+
+  Added a pkg_postinst() function to add the SANE_CONFIG_DIR environment
+  variable.  This solution was found by the bug reporter of bug #1595,
+  MvOstheim@web.de (Michael v.Ostheim)
+
+*sane-backends-1.0.7 (2 Mar 2002)
+
+  2 Mar 2002; Chris Houser <chouser@gentoo.org>
+	files/digest-sane-backends-1.0.7 ChangeLog sane-backends-1.0.7.ebuild :
+
+  Upgraded package -- no ebuild changes were needed.
 
 *sane-backends-1.0.5-r1 (1 Feb 2002)
 
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index e69de29bb2d1..c11f4182d62b 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -0,0 +1,29 @@
+MD5 a89929370bb0df2da7a794efc7811785 sane-backends-1.0.16-r2.ebuild 4297
+MD5 ebd00143bfe66f76d0d0da95cbc84923 sane-backends-1.0.15.ebuild 2598
+MD5 8c23aab107d4c5424e32e24123d4811f sane-backends-1.0.16-r4.ebuild 4386
+MD5 544c2bc7c5a23b2ae8280b879eac1fbb sane-backends-1.0.15-r2.ebuild 3912
+MD5 4c8053c87e31c8209998ba49c07d60a5 sane-backends-1.0.13-r3.ebuild 1717
+MD5 61d573be9593ba3be2da335586ac7eb2 sane-backends-1.0.16-r1.ebuild 3743
+MD5 54cad14b24bc825f61130e50ea2238f8 sane-backends-1.0.16-r3.ebuild 4300
+MD5 e73a3bf54c049342701898a62ea3b301 sane-backends-1.0.15-r1.ebuild 2674
+MD5 e93ac06fc7c787ca54aad3c4a4147bca ChangeLog 14976
+MD5 b742040acaeddc3798a21739bd59e8aa metadata.xml 224
+MD5 d04dce955a1bf3c5436bc517f2e2070c sane-backends-1.0.15-r3.ebuild 3973
+MD5 365f695ec2c079ac06dd5bbf495f87ce files/linux_sg3_err.h 4894
+MD5 bd0e1ecf807f1e676c4466f12cac215a files/lide25-r1.patch 7949
+MD5 3c9eec3f3f2e73bd6228f946f41c08b8 files/kernel2.6.13usb-problem.patch 1125
+MD5 f49c8e2b591496e87e91ae243d9864d0 files/sane-backend-1.0.15-gt68xx-update67.patch 5682
+MD5 820e842ff4247de984a89752ac129ceb files/libusbscanner-device.patch 582
+MD5 026dc517ef9d45268cd506ec83519a0e files/canoscan-focus.patch 472
+MD5 cb4dcb744752238bdfed71fdcce81c79 files/libusbscanner-device-r1.patch 681
+MD5 01607471a4380f74f7b9da650e5ca5ad files/digest-sane-backends-1.0.13-r3 160
+MD5 83640d1e7caa2aa50c676d40b64866c7 files/digest-sane-backends-1.0.15-r1 157
+MD5 83640d1e7caa2aa50c676d40b64866c7 files/digest-sane-backends-1.0.15-r2 157
+MD5 d16f7594dad0db0c268e143c3676041e files/digest-sane-backends-1.0.15-r3 220
+MD5 d5d1e4a4c8d3839c16329c105f2580d3 files/digest-sane-backends-1.0.16-r1 151
+MD5 d5d1e4a4c8d3839c16329c105f2580d3 files/digest-sane-backends-1.0.16-r2 151
+MD5 d5d1e4a4c8d3839c16329c105f2580d3 files/digest-sane-backends-1.0.16-r3 151
+MD5 d5d1e4a4c8d3839c16329c105f2580d3 files/digest-sane-backends-1.0.16-r4 151
+MD5 0bc1f6b8682b5585c8e87a325f983ade files/lide25.patch 5565
+MD5 83640d1e7caa2aa50c676d40b64866c7 files/digest-sane-backends-1.0.15 157
+MD5 76ecccefb14f182ef419873f26693129 files/sm3600usb.patch 7815
diff --git a/media-gfx/sane-backends/files/digest-sane-backends-1.0.13-r3 b/media-gfx/sane-backends/files/digest-sane-backends-1.0.13-r3
index ce9b09a3bb86..63e10ba5a99b 100644
--- a/media-gfx/sane-backends/files/digest-sane-backends-1.0.13-r3
+++ b/media-gfx/sane-backends/files/digest-sane-backends-1.0.13-r3
@@ -1,2 +1,2 @@
 MD5 9a158413180a752f8af6f11792154a42 sane-backends-1.0.13.tar.gz 3108639
-MD5 643de6a8321df8ef561170610b91b538 sane-backends-1.0.13-brothermfc.patch.bz2 9727
+MD5 643de6a8321df8ef561170610b91b538 sane-backends-1.0.13-brothermfc-r1.patch.bz2 9727
diff --git a/media-gfx/sane-backends/files/sm3600usb.patch b/media-gfx/sane-backends/files/sm3600usb.patch
index 52909c42b1f5..7dff9ca5f272 100644
--- a/media-gfx/sane-backends/files/sm3600usb.patch
+++ b/media-gfx/sane-backends/files/sm3600usb.patch
@@ -289,3 +289,13 @@
  #include "sm3600-scantool.h"
  
  /* **********************************************************************
+--- backend/Makefile.in	13 Aug 2005 15:30:01 -0000	1.117
++++ backend/Makefile.in	16 Aug 2005 19:50:33 -0000	1.118
+@@ -430,6 +430,7 @@
+ libsane-sharp.la: ../sanei/sanei_constrain_value.lo
+ libsane-sharp.la: ../sanei/sanei_scsi.lo
+ libsane-sm3600.la: ../sanei/sanei_constrain_value.lo
++libsane-sm3600.la: ../sanei/sanei_usb.lo
+ libsane-sm3840.la: ../sanei/sanei_config2.lo
+ libsane-sm3840.la: ../sanei/sanei_constrain_value.lo
+ libsane-sm3840.la: ../sanei/sanei_usb.lo
diff --git a/media-gfx/sane-backends/metadata.xml b/media-gfx/sane-backends/metadata.xml
index 69009a3f3161..bce3a70882f8 100644
--- a/media-gfx/sane-backends/metadata.xml
+++ b/media-gfx/sane-backends/metadata.xml
@@ -4,6 +4,5 @@
 <herd>no-herd</herd>
 <maintainer>
   <email>phosphan@gentoo.org</email>
-  <description>No real maintainer, don't even have a scanner. Just looks like I sometimes fix bugs.</description>
 </maintainer>
 </pkgmetadata>
diff --git a/media-gfx/sane-backends/sane-backends-1.0.13-r3.ebuild b/media-gfx/sane-backends/sane-backends-1.0.13-r3.ebuild
index 7c47c6844721..5f4fccc243f4 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.13-r3.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.13-r3.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/media-gfx/sane-backends/sane-backends-1.0.13-r3.ebuild,v 1.1 2004/02/27 09:35:02 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.13-r3.ebuild,v 1.1.1.1 2005/11/30 09:37:17 chriswhite Exp $
 
 inherit eutils
 
 IUSE="usb"
 
 DESCRIPTION="Scanner Access Now Easy - Backends"
-HOMEPAGE="http://www.mostang.com/sane/"
+HOMEPAGE="http://www.sane-project.org/"
 
 DEPEND=">=media-libs/jpeg-6b
 	x86? ( sys-libs/libieee1284 )
 	=sys-apps/sed-4*
 	usb? ( dev-libs/libusb )"
 
-BROTHERMFCDRIVER="sane-backends-1.0.13-brothermfc.patch"
+BROTHERMFCDRIVER="sane-backends-1.0.13-brothermfc-r1.patch"
 
 SRC_URI="ftp://ftp.mostang.com/pub/sane/${P}/${P}.tar.gz
 	ftp://ftp.mostang.com/pub/sane/old-versions/${P}/${P}.tar.gz
diff --git a/media-gfx/sane-backends/sane-backends-1.0.15-r1.ebuild b/media-gfx/sane-backends/sane-backends-1.0.15-r1.ebuild
index 2b6af24bbb43..57a0661c8ff2 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.15-r1.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.15-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/media-gfx/sane-backends/sane-backends-1.0.15-r1.ebuild,v 1.1 2005/04/27 08:08:38 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.15-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:16 chriswhite Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ DEPEND=">=media-libs/jpeg-6b
 	x86? ( sys-libs/libieee1284 )
 	=sys-apps/sed-4*
 	usb? ( dev-libs/libusb )
-	gphoto2? ( media-gfx/gphoto2 )"
+	gphoto2? ( media-libs/libgphoto2 )"
 
 BROTHERMFCDRIVER="sane-backends-1.0.15-brothermfc.patch"
 
@@ -22,7 +22,7 @@ SRC_URI="ftp://ftp.mostang.com/pub/sane/${P}/${P}.tar.gz
 	usb? ( mirror://gentoo/${BROTHERMFCDRIVER}.bz2 )"
 SLOT="0"
 LICENSE="GPL-2 public-domain"
-KEYWORDS="~x86 ~sparc ~ppc ~ppc64 ~amd64 ~alpha"
+KEYWORDS="~x86 ~sparc ~ppc ~ppc64 ~amd64 ~alpha ~ia64"
 
 
 src_unpack() {
diff --git a/media-gfx/sane-backends/sane-backends-1.0.15-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.15-r2.ebuild
index 621b98147fc1..26d8a31ac9cb 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.15-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.15-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/media-gfx/sane-backends/sane-backends-1.0.15-r2.ebuild,v 1.1 2005/05/09 09:45:49 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.15-r2.ebuild,v 1.1.1.1 2005/11/30 09:37:16 chriswhite Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ DEPEND=">=media-libs/jpeg-6b
 	amd64? ( sys-libs/libieee1284 )
 	x86? ( sys-libs/libieee1284 )
 	usb? ( dev-libs/libusb )
-	gphoto2? ( media-gfx/gphoto2 )
+	gphoto2? ( media-libs/libgphoto2 )
 	v4l? ( sys-kernel/linux-headers )"
 
 BROTHERMFCDRIVER="sane-backends-1.0.15-brothermfc.patch"
@@ -23,7 +23,7 @@ SRC_URI="ftp://ftp.mostang.com/pub/sane/${P}/${P}.tar.gz
 	usb? ( mirror://gentoo/${BROTHERMFCDRIVER}.bz2 )"
 SLOT="0"
 LICENSE="GPL-2 public-domain"
-KEYWORDS="~x86 ~sparc ~ppc ~ppc64 ~amd64 ~alpha"
+KEYWORDS="~x86 ~sparc ~ppc ~ppc64 ~amd64 ~alpha ~ia64"
 
 # To enable specific backends, define SANE_BACKENDS with the backends you want
 # in those:
diff --git a/media-gfx/sane-backends/sane-backends-1.0.15-r3.ebuild b/media-gfx/sane-backends/sane-backends-1.0.15-r3.ebuild
index 71cd98d136df..78bcf7dd620c 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.15-r3.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.15-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/media-gfx/sane-backends/sane-backends-1.0.15-r3.ebuild,v 1.1 2005/08/04 07:35:45 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.15-r3.ebuild,v 1.1.1.1 2005/11/30 09:37:16 chriswhite Exp $
 
 inherit eutils
 
@@ -25,7 +25,7 @@ SRC_URI="ftp://ftp.mostang.com/pub/sane/${P}/${P}.tar.gz
 	usb? ( mirror://gentoo/${BROTHERMFCDRIVER}.bz2 )"
 SLOT="0"
 LICENSE="GPL-2 public-domain"
-KEYWORDS="~x86 ~sparc ~ppc ~ppc64 ~amd64 ~alpha ~ia64"
+KEYWORDS="alpha ~amd64 ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # To enable specific backends, define SANE_BACKENDS with the backends you want
 # in those:
diff --git a/media-gfx/sane-backends/sane-backends-1.0.15.ebuild b/media-gfx/sane-backends/sane-backends-1.0.15.ebuild
index 11efa69feb83..03c104d0f035 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.15.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.15.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.15.ebuild,v 1.1 2004/11/16 14:41:59 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.15.ebuild,v 1.1.1.1 2005/11/30 09:37:16 chriswhite Exp $
 
 inherit eutils
 
 IUSE="usb gphoto2 ipv6"
 
 DESCRIPTION="Scanner Access Now Easy - Backends"
-HOMEPAGE="http://www.mostang.com/sane/"
+HOMEPAGE="http://www.sane-project.org/"
 
 DEPEND=">=media-libs/jpeg-6b
 	x86? ( sys-libs/libieee1284 )
 	=sys-apps/sed-4*
 	usb? ( dev-libs/libusb )
-	gphoto2? ( media-gfx/gphoto2 )"
+	gphoto2? ( media-libs/libgphoto2 )"
 
 BROTHERMFCDRIVER="sane-backends-1.0.15-brothermfc.patch"
 
@@ -22,7 +22,7 @@ SRC_URI="ftp://ftp.mostang.com/pub/sane/${P}/${P}.tar.gz
 	usb? ( mirror://gentoo/${BROTHERMFCDRIVER}.bz2 )"
 SLOT="0"
 LICENSE="GPL-2 public-domain"
-KEYWORDS="~x86 ~sparc ~ppc ~ppc64 ~amd64"
+KEYWORDS="x86 sparc ppc ppc64 amd64 alpha"
 
 
 src_unpack() {
@@ -67,6 +67,7 @@ src_install () {
 		sysconfdir=${D}/etc \
 		mandir=${D}/usr/share/man \
 		docdir=${D}/usr/share/doc/${PF} \
+		libdir=${D}/usr/$(get_libdir) \
 		install || die
 
 	if use usb; then
diff --git a/media-gfx/sane-backends/sane-backends-1.0.16-r1.ebuild b/media-gfx/sane-backends/sane-backends-1.0.16-r1.ebuild
index 622a388db64c..09394dc39034 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.16-r1.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.16-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/media-gfx/sane-backends/sane-backends-1.0.16-r1.ebuild,v 1.1 2005/08/22 08:55:12 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.16-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:16 chriswhite Exp $
 
-inherit eutils
+inherit eutils flag-o-matic
 
 IUSE="usb gphoto2 ipv6 v4l"
 
@@ -85,6 +85,7 @@ src_unpack() {
 }
 
 src_compile() {
+	filter-flags -ffast-math
 	SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
 	BACKENDS="${SANE_BACKENDS}" \
 	econf \
diff --git a/media-gfx/sane-backends/sane-backends-1.0.16-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.16-r2.ebuild
index 27914f37e0f4..148ad120e9bb 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.16-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.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/media-gfx/sane-backends/sane-backends-1.0.16-r2.ebuild,v 1.1 2005/08/30 08:00:38 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.16-r2.ebuild,v 1.1.1.1 2005/11/30 09:37:17 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -9,13 +9,16 @@ IUSE="usb gphoto2 ipv6 v4l"
 DESCRIPTION="Scanner Access Now Easy - Backends"
 HOMEPAGE="http://www.sane-project.org/"
 
-DEPEND=">=media-libs/jpeg-6b
+RDEPEND=">=media-libs/jpeg-6b
 	amd64? ( sys-libs/libieee1284 )
 	x86? ( sys-libs/libieee1284 )
 	usb? ( dev-libs/libusb )
 	gphoto2? ( media-libs/libgphoto2 )
 	v4l? ( sys-kernel/linux-headers )"
 
+DEPEND="${DEPEND}
+	>=sys-apps/sed-4"
+
 BROTHERMFCDRIVER="sane-${PV}-brother-driver.diff"
 
 SRC_URI="ftp://ftp.sane-project.org/pub/sane/${P}/${P}.tar.gz
@@ -38,6 +41,8 @@ KEYWORDS="~x86 ~sparc ~ppc ~ppc64 ~amd64 ~alpha ~ia64"
 # Note that some backends has specific dependencies which make the compilation
 # fail because not supported on your current platform.
 pkg_setup() {
+	enewgroup scanner
+
 	IEEE1284_BACKENDS="canon_pp hpsj5s mustek_pp"
 
 	if [[ "${SANE_BACKENDS}" != "" ]]; then
@@ -83,17 +88,27 @@ src_unpack() {
 		:
 	fi
 	epatch ${FILESDIR}/lide25.patch
+
+	# trouble with -ffast-math, see bug #103118
+	for file in backend/matsushita.c backend/sceptre.c backend/leo.c \
+		backend/sp15c.h backend/teco1.c backend/teco2.c backend/teco3.c \
+		backend/sp15c-scsi.h backend/dc210.c include/sane/sanei_backend.h; do
+			sed -e 's/__unused__/sane_unused__/g' -i ${file} || \
+				die "Could not apply __unused__-fix for ${file}"
+	done
+
 }
 
 src_compile() {
-	filter-flags -ffast-math
+	if use amd64; then
+		filter-flags -fstack-protector
+	fi
 	SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
 	BACKENDS="${SANE_BACKENDS}" \
 	econf \
 		$(use_enable usb libusb) \
 		$(use_with gphoto2) \
 		$(use_enable ipv6) \
-		--with-group=scanner \
 		${myconf} || die "econf failed"
 
 	emake || die
@@ -107,7 +122,9 @@ src_compile() {
 
 src_install () {
 	einstall docdir=${D}/usr/share/doc/${PF}
-	touch ${D}/var/lib/lock/sane/.keep # don't use keepdir, it changes the permissions
+	keepdir /var/lib/lock/sane
+	fowners root:scanner /var/lib/lock/sane
+	fperms g+w /var/lib/lock/sane
 	if use usb; then
 		cd tools/hotplug
 		insinto /etc/hotplug/usb
@@ -127,8 +144,3 @@ src_install () {
 	doins 30sane
 
 }
-
-pkg_preinst() {
-	enewgroup scanner
-}
-
diff --git a/media-gfx/sane-backends/sane-backends-1.0.16-r3.ebuild b/media-gfx/sane-backends/sane-backends-1.0.16-r3.ebuild
index e6f78ebbf5af..f125df239004 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.16-r3.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.16-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/media-gfx/sane-backends/sane-backends-1.0.16-r3.ebuild,v 1.1 2005/10/31 13:31:16 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.16-r3.ebuild,v 1.1.1.1 2005/11/30 09:37:17 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
diff --git a/media-gfx/sane-backends/sane-backends-1.0.16-r4.ebuild b/media-gfx/sane-backends/sane-backends-1.0.16-r4.ebuild
index fb3837ac4340..a341f618b55f 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.16-r4.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.16-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/media-gfx/sane-backends/sane-backends-1.0.16-r4.ebuild,v 1.1 2005/11/02 12:17:45 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.16-r4.ebuild,v 1.1.1.1 2005/11/30 09:37:17 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -89,6 +89,7 @@ src_unpack() {
 	fi
 	epatch ${FILESDIR}/lide25-r1.patch
 	epatch ${FILESDIR}/kernel2.6.13usb-problem.patch
+	epatch ${FILESDIR}/sm3600usb.patch
 
 	# trouble with -ffast-math, see bug #103118
 	for file in backend/matsushita.c backend/sceptre.c backend/leo.c \
diff --git a/media-gfx/sane-frontends/ChangeLog b/media-gfx/sane-frontends/ChangeLog
index 3aa0e3ba51d0..d3b31637a2e3 100644
--- a/media-gfx/sane-frontends/ChangeLog
+++ b/media-gfx/sane-frontends/ChangeLog
@@ -1,13 +1,132 @@
 # ChangeLog for media-gfx/sane-frontends
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-frontends/ChangeLog,v 1.1 2002/02/01 21:53:30 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-frontends/ChangeLog,v 1.1.1.1 2005/11/30 09:37:42 chriswhite Exp $
 
-*sane-frontends-1.0.4-r2 (1 Feb 2002)
+*sane-frontends-1.0.14 (19 Sep 2005)
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  19 Sep 2005; Patrick Kursawe <phosphan@gentoo.org>
+  +sane-frontends-1.0.14.ebuild:
+  Version bump
+
+  31 May 2005; Patrick Kursawe <phosphan@gentoo.org>
+  sane-frontends-1.0.13.ebuild:
+  Fixing yesterday's fix.
+
+  30 May 2005; Patrick Kursawe <phosphan@gentoo.org>
+  -sane-frontends-1.0.11.ebuild, -sane-frontends-1.0.12.ebuild,
+  sane-frontends-1.0.13.ebuild:
+  Removing old versions and calling gimptool without version suffix now.
+
+  08 Apr 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  sane-frontends-1.0.13.ebuild:
+  Marked stable on amd64.
+
+  08 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  sane-frontends-1.0.13.ebuild:
+  Stable on ppc64
+
+  01 Apr 2005; Lars Weiler <pylon@gentoo.org> sane-frontends-1.0.13.ebuild:
+  Stable on ppc.
+
+  15 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  sane-frontends-1.0.13.ebuild:
+  Stable on sparc
+
+*sane-frontends-1.0.13 (19 Oct 2004)
+
+  19 Oct 2004; Patrick Kursawe <phosphan@gentoo.org>
+  +sane-frontends-1.0.13.ebuild:
+  Version bump.
+
+  05 Sep 2004; <blubb@gentoo.org> sane-frontends-1.0.12.ebuild:
+  added ~amd64 keyword
+
+  25 Aug 2004; Jason Wever <weeve@gentoo.org> sane-frontends-1.0.12.ebuild:
+  Stable on sparc.
+
+  18 Aug 2004; Patrick Kursawe <phosphan@gentoo.org>
+  sane-frontends-1.0.12.ebuild, -sane-frontends-1.0.9.ebuild:
+  .12 stable for x86, cleaning up a bit
+
+  31 Jul 2004; Tom Gall <tgall@gentoo.org> sane-frontends-1.0.11.ebuild:
+  stable on ppc64, bug #57131
+
+  18 Jun 2004; Jason Wever <weeve@gentoo.org> sane-frontends-1.0.11.ebuild:
+  Stable on sparc.
+
+  06 Jun 2004; Jason Wever <weeve@gentoo.org> sane-frontends-1.0.11.ebuild,
+  sane-frontends-1.0.12.ebuild:
+  Added ~sparc keywords to 1.0.11 and 1.0.12 due to them not being included
+  since 1.0.10.
+
+  12 May 2004; Patrick Kursawe <phosphan@gentoo.org>
+  sane-frontends-1.0.10.ebuild, sane-frontends-1.0.11.ebuild,
+  sane-frontends-1.0.8.ebuild, sane-frontends-1.0.9.ebuild:
+  Cleanup
+
+*sane-frontends-1.0.12 (05 May 2004)
+
+  05 May 2004; Patrick Kursawe <phosphan@gentoo.org>
+  sane-frontends-1.0.12.ebuild:
+  Version bump. Introduced local USE flag "gimp", re-wrote the part that sets
+  the link to xscanimage.
+
+  29 Dec 2003; Jason Wever <weeve@gentoo.org> sane-frontends-1.0.9.ebuild:
+  Here a ~sparc, there a ~sparc, everwhere a ~sparc ~sparc.
+
+  06 Dec 2003; Chuck Short <zul@gentoo.org> sane-frontends-1.0.10.ebuild,
+  sane-frontends-1.0.11.ebuild, sane-frontends-1.0.8.ebuild,
+  sane-frontends-1.0.9.ebuild:
+  Updated homepage, helps closes 35208.
+
+  11 Jul 2003; Patrick Kursawe <phosphan@gentoo.org>
+  sane-frontends-1.0.8.ebuild:
+  Another SRC_URI fix
+
+*sane-frontends-1.0.11 (11 Jul 2003)
+
+  11 Jul 2003; Patrick Kursawe <phosphan@gentoo.org>
+  sane-frontends-1.0.10.ebuild, sane-frontends-1.0.11.ebuild,
+  sane-frontends-1.0.9.ebuild:
+  Added URI with "old-version" to SRC_URI, so always one of them should work.
+
+*sane-frontends-1.0.11 (11 Jul 2003)
+
+  11 Jul 2003; Patrick Kursawe <phosphan@gentoo.org>
+  sane-frontends-1.0.10.ebuild, sane-frontends-1.0.11.ebuild,
+  sane-frontends-1.0.9.ebuild:
+  Version bump, updated download URIs
+
+*sane-frontends-1.0.10 (09 Mar 2003)
+
+  09 Mar 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump.
+
+*sane-frontends-1.0.9 (01 Dec 2002)
+
+  06 Jan 2002; Matt Keadle <mkeadle@gentoo.org> sane-frontends-1.0.9.ebuild
+
+  Unmasking for x86. Haven't heard a thing about it so stable she goes.
+
+  01 Dec 2002; Matt Keadle <mkeadle@gentoo.org> sane-frontends-1.0.9.ebuild
+  files/digest-sane-frontends-1.0.9
+
+  Version bump to latest release
+  
+*sane-frontends-1.0.8 (22 Jun 2002)
+  
+  07 July 2002; Owen Stampflee <owen@gentoo.org> :
+
+  Removed the the GIMP deps. It doesn't actually need it.
   
-  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.
+  22 Jun 2002; Arcady Genkin <agenkin@thpoon.com>
+	sane-frontends-1.0.8.ebuild :
+
+  Upgrade to version 1.0.8.
+
+*sane-frontends-1.0.7 (2 Mar 2002)
+
+  2 Mar 2002; Chris Houser <chouser@gentoo.org>
+	files/digest-sane-frontends-1.0.7 ChangeLog sane-frontends-1.0.7.ebuild :
+
+  Upgraded package.  Minor ebuild corrections.
diff --git a/media-gfx/sane-frontends/Manifest b/media-gfx/sane-frontends/Manifest
index e69de29bb2d1..dbfb118f2310 100644
--- a/media-gfx/sane-frontends/Manifest
+++ b/media-gfx/sane-frontends/Manifest
@@ -0,0 +1,6 @@
+MD5 128d53d1ff3cb18629670331c0244456 ChangeLog 4252
+MD5 95e4447b4d866c1b4232400337a67cb5 files/digest-sane-frontends-1.0.13 73
+MD5 6de81e8d6294d258988408d8f90e140d files/digest-sane-frontends-1.0.14 73
+MD5 b742040acaeddc3798a21739bd59e8aa metadata.xml 224
+MD5 ce4c0f6c12d72df134040d30225b64aa sane-frontends-1.0.13.ebuild 1463
+MD5 39ce88f2c759b2cd48fcfc6e8fef4fc2 sane-frontends-1.0.14.ebuild 1471
diff --git a/media-gfx/sane-frontends/metadata.xml b/media-gfx/sane-frontends/metadata.xml
index 735d2de34d79..bce3a70882f8 100644
--- a/media-gfx/sane-frontends/metadata.xml
+++ b/media-gfx/sane-frontends/metadata.xml
@@ -4,6 +4,5 @@
 <herd>no-herd</herd>
 <maintainer>
   <email>phosphan@gentoo.org</email>
-  <description>No real maintainer, don't even have a scanner. Just looks like I sometimes fix bugs. If you want to maintain this, just go ahead.</description>
 </maintainer>
 </pkgmetadata>
diff --git a/media-gfx/sane-frontends/sane-frontends-1.0.13.ebuild b/media-gfx/sane-frontends/sane-frontends-1.0.13.ebuild
index f8503ac4cb5d..cff422da7d68 100644
--- a/media-gfx/sane-frontends/sane-frontends-1.0.13.ebuild
+++ b/media-gfx/sane-frontends/sane-frontends-1.0.13.ebuild
@@ -1,42 +1,48 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-frontends/sane-frontends-1.0.13.ebuild,v 1.1 2004/10/19 07:27:03 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-frontends/sane-frontends-1.0.13.ebuild,v 1.1.1.1 2005/11/30 09:37:42 chriswhite Exp $
 
 DESCRIPTION="Scanner Access Now Easy"
 HOMEPAGE="http://www.sane-project.org"
 SRC_URI="ftp://ftp.mostang.com/pub/sane/${P}/${P}.tar.gz
-		ftp://ftp.mostang.com/pub/sane/old-versions/${P}/${P}.tar.gz"
+	ftp://ftp.mostang.com/pub/sane/old-versions/${P}/${P}.tar.gz"
 
-DEPEND=">=media-gfx/sane-backends-${PV}
-	gimp? ( media-gfx/gimp )"
-
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+SLOT="0"
+KEYWORDS="amd64 ia64 ppc ppc64 sparc x86"
 IUSE="gimp"
 
+DEPEND=">=media-gfx/sane-backends-${PV}
+	gimp? ( media-gfx/gimp )"
+
 src_compile() {
 	local myconf=""
 	use gimp || myconf="--disable-gimp"
-	use gimp && if ! has_version ">=media-gfx/gimp-2"; then \
-					myconf="--enable-gimp12"; fi
+	use gimp && ! has_version ">=media-gfx/gimp-2" && myconf="--enable-gimp12"
 	econf \
-		--datadir=/usr/share/misc ${myconf} || die
+		--datadir=/usr/share/misc \
+		${myconf} || die
 	emake || die "emake failed"
 }
 
 src_install() {
+	local gimpplugindir
+	local gimptool
 	einstall datadir=${D}/usr/share/misc || die
 	if use gimp; then
-		local gimpshortversion=$(best_version media-gfx/gimp \
-						| cut -f 1,2 -d "." | cut -f 3 -d "-")
-		einfo "Setting plugin link for GIMP version	${gimpshortversion}.x"
-
-		gimpplugindir=$(/usr/bin/gimptool-${gimpshortversion} \
-						--gimpplugindir)/plug-ins
-
-		dodir ${gimpplugindir}
-		dosym /usr/bin/xscanimage ${gimpplugindir}/xscanimage
+		for gimptool in gimptool gimptool-2.0 gimptool-1.2; do
+			if [ -x /usr/bin/${gimptool} ]; then
+				einfo "Setting plugin link for GIMP version	$(/usr/bin/${gimptool} --version)"
+				gimpplugindir=$(/usr/bin/${gimptool} --gimpplugindir)/plug-ins
+				break
+			fi
+		done
+		if [ "/plug-ins" != "${gimpplugindir}" ]; then
+			 dodir ${gimpplugindir}
+			dosym /usr/bin/xscanimage ${gimpplugindir}/xscanimage
+		else
+			ewarn "No idea where to find the gimp plugin directory"
+		fi
 	fi
-	dodoc AUTHORS COPYING Changelog NEWS PROBLEMS README TODO
+	dodoc AUTHORS Changelog NEWS PROBLEMS README
 }
diff --git a/media-gfx/sane-frontends/sane-frontends-1.0.14.ebuild b/media-gfx/sane-frontends/sane-frontends-1.0.14.ebuild
index 91c37378dae8..07e1d103400d 100644
--- a/media-gfx/sane-frontends/sane-frontends-1.0.14.ebuild
+++ b/media-gfx/sane-frontends/sane-frontends-1.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/media-gfx/sane-frontends/sane-frontends-1.0.14.ebuild,v 1.1 2005/09/19 14:08:28 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-frontends/sane-frontends-1.0.14.ebuild,v 1.1.1.1 2005/11/30 09:37:42 chriswhite Exp $
 
 DESCRIPTION="Scanner Access Now Easy"
 HOMEPAGE="http://www.sane-project.org"
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="gimp"
 
-DEPEND=">=media-gfx/sane-backends
+DEPEND="media-gfx/sane-backends
 	gimp? ( media-gfx/gimp )"
 
 src_compile() {
diff --git a/media-gfx/scigraphica/ChangeLog b/media-gfx/scigraphica/ChangeLog
index 0f949d595ece..410237955d82 100644
--- a/media-gfx/scigraphica/ChangeLog
+++ b/media-gfx/scigraphica/ChangeLog
@@ -1,6 +1,13 @@
-# ChangeLog for app-sci/scigraphica
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/scigraphica/ChangeLog,v 1.1 2004/12/24 02:52:44 ribosome Exp $
+# ChangeLog for media-gfx/scigraphica
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/scigraphica/ChangeLog,v 1.1.1.1 2005/11/30 09:37:22 chriswhite Exp $
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  scigraphica-0.8.0-r2.ebuild:
+  Stable on ppc.
+
+  09 May 2005; David Holm <dholm@gentoo.org> scigraphica-0.8.0-r2.ebuild:
+  Added to ~ppc.
 
 *scigraphica-0.8.0-r2 (23 Dec 2004)
 
diff --git a/media-gfx/scigraphica/Manifest b/media-gfx/scigraphica/Manifest
index bd79c032629c..12d8e10371be 100644
--- a/media-gfx/scigraphica/Manifest
+++ b/media-gfx/scigraphica/Manifest
@@ -1,5 +1,5 @@
-MD5 5d6980b17752cac5406c09d0880cfba9 scigraphica-0.8.0-r2.ebuild 2397
-MD5 65c6929e565f71391182ab4895967e03 ChangeLog 1448
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 c2d9cfaee160e764e5ea4eef6864b114 files/digest-scigraphica-0.8.0-r2 69
+MD5 479f30169196d2d51854be85144d2ae2 ChangeLog 1863
+MD5 7231788d2fc8a34da1fc9e859bd30cec scigraphica-0.8.0-r2.ebuild 2401
 MD5 a268a921bce77204066be75a284df252 files/gcc3.4.patch 464
+MD5 c2d9cfaee160e764e5ea4eef6864b114 files/digest-scigraphica-0.8.0-r2 69
diff --git a/media-gfx/scigraphica/scigraphica-0.8.0-r2.ebuild b/media-gfx/scigraphica/scigraphica-0.8.0-r2.ebuild
index 01fc360cd67c..31545a7be421 100644
--- a/media-gfx/scigraphica/scigraphica-0.8.0-r2.ebuild
+++ b/media-gfx/scigraphica/scigraphica-0.8.0-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/media-gfx/scigraphica/scigraphica-0.8.0-r2.ebuild,v 1.1 2004/12/24 02:52:44 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/scigraphica/scigraphica-0.8.0-r2.ebuild,v 1.1.1.1 2005/11/30 09:37:22 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://scigraphica.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="ppc x86"
 IUSE="gnome"
 
 DEPEND=">=x11-libs/gtk+extra-0.99.17
diff --git a/media-gfx/scrot/ChangeLog b/media-gfx/scrot/ChangeLog
index 941342161cf5..3a3449e0d03d 100644
--- a/media-gfx/scrot/ChangeLog
+++ b/media-gfx/scrot/ChangeLog
@@ -1,9 +1,58 @@
 # ChangeLog for media-gfx/scrot
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/scrot/ChangeLog,v 1.1 2002/02/01 21:53:30 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/scrot/ChangeLog,v 1.1.1.1 2005/11/30 09:37:41 chriswhite Exp $
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> scrot-0.8.ebuild:
+  Mark 0.8 stable on alpha
+
+  09 Dec 2004; Mike Doty <kingtaco@gentoo.org> scrot-0.8.ebuild:
+  stable on amd64.  see bug #73936
+
+  06 Nov 2004; Aaron Walker <ka0ttic@gentoo.org> scrot-0.8.ebuild:
+  Remove pkg_postinst since bash-completion.eclass now exports it.
+
+  03 Nov 2004; Aaron Walker <ka0ttic@gentoo.org> scrot-0.8.ebuild:
+  Updated to use bash-completion.eclass
+
+  04 Oct 2004; Aaron Walker <ka0ttic@gentoo.org> scrot-0.8.ebuild:
+  Fixed minor bug where make install installs docs in /usr/doc/${PN}.
+
+  11 Sep 2004; Aaron Walker <ka0ttic@gentoo.org> metadata.xml,
+  scrot-0.8.ebuild:
+  Fixed LICENSE declaration, updated metadata info, and added a bash-completion
+  script (please test).
+
+  31 Jul 2004; Tom Gall <tgall@gentoo.org> scrot-0.8.ebuild:
+  stable on ppc64, bug #57034
+
+  03 Jul 2004; Jason Wever <weeve@gentoo.org> scrot-0.8.ebuild:
+  Added ~sparc keyword.
+
+  26 Jun 2004; Danny van Dyk <kugelfang@gentoo.org> scrot-0.8.ebuild:
+  Marked ~amd64.
+
+  09 Jun 2004; Seemant Kulleen <seemant@gentoo.org> -scrot-0.6.ebuild,
+  scrot-0.8.ebuild:
+  moved 0.8 to stable, and shipped 0.6 out due to non-compilation
+
+*scrot-0.8 (24 Oct 2003)
+
+  24 Oct 2003; Heinrich Wendel <lanius@gentoo.org> scrot-0.8.ebuild:
+  bump, 31933
 
 *scrot-0.6 (1 Feb 2002)
 
+  17 May 2003; Graham Forest <vladimir@gentoo.org> scrot-0.6.ebuild:
+  set ~ppc in keywords
+
+  25 Mar 2003; Aron Griffis <agriffis@gentoo.org> scrot-0.6.ebuild:
+  Add ~alpha to KEYWORDS
+
+  11 Sep 2002; Seemant Kulleen <seemant@gentoo.org> scrot-0.6.ebuild :
+
+  Installs man page now.  Thanks to: xelnix@yahoo.com (Austin Johnson) in
+  bug #3831.
+
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/media-gfx/scrot/Manifest b/media-gfx/scrot/Manifest
index e69de29bb2d1..a72932918034 100644
--- a/media-gfx/scrot/Manifest
+++ b/media-gfx/scrot/Manifest
@@ -0,0 +1,5 @@
+MD5 a4c8467ea3cc7ff07eb2e19fe6d79aec scrot-0.8.ebuild 694
+MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254
+MD5 5a582107467cce142d168c692e6b8e22 ChangeLog 2313
+MD5 b3873efbdcaeb0d52ab7ffd1ecbf5071 files/scrot.bash-completion 1063
+MD5 f7254c66a5852d7a6e48a39da63d5fe3 files/digest-scrot-0.8 60
diff --git a/media-gfx/scrot/metadata.xml b/media-gfx/scrot/metadata.xml
index d8b96be3c5cd..d31152aca840 100644
--- a/media-gfx/scrot/metadata.xml
+++ b/media-gfx/scrot/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>no-herd</herd>
 	<maintainer>
-		<email>bug-wranglers@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
+		<email>ka0ttic@gentoo.org</email>
+		<name>Aaron Walker</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/scrot/scrot-0.8.ebuild b/media-gfx/scrot/scrot-0.8.ebuild
index 8d59ca86260d..c38ae469da00 100644
--- a/media-gfx/scrot/scrot-0.8.ebuild
+++ b/media-gfx/scrot/scrot-0.8.ebuild
@@ -1,20 +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/media-gfx/scrot/scrot-0.8.ebuild,v 1.1 2003/10/24 21:01:28 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/scrot/scrot-0.8.ebuild,v 1.1.1.1 2005/11/30 09:37:41 chriswhite Exp $
+
+inherit bash-completion
 
 DESCRIPTION="Screen Shooter"
-SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.tar.gz"
 HOMEPAGE="http://www.linuxbrit.co.uk/"
+SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.tar.gz"
 
+LICENSE="as-is BSD"
 SLOT="0"
-LICENSE="as-is | BSD"
-KEYWORDS="~x86 ~alpha ~ppc"
+KEYWORDS="alpha amd64 ~hppa ppc ppc64 sparc x86"
+IUSE=""
 
 DEPEND=">=media-libs/imlib2-1.0.3
 	>=media-libs/giblib-1.2.3"
 
-src_install () {
-	make DESTDIR=${D} install || die
+src_install() {
+	make DESTDIR="${D}" install || die
+	rm -r "${D}"/usr/doc
 
 	dodoc TODO README AUTHORS ChangeLog
+
+	dobashcompletion ${FILESDIR}/${PN}.bash-completion ${PN}
 }
diff --git a/media-gfx/sfftobmp/ChangeLog b/media-gfx/sfftobmp/ChangeLog
index f68e5a6b8fe0..3c41c3b5c721 100644
--- a/media-gfx/sfftobmp/ChangeLog
+++ b/media-gfx/sfftobmp/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for media-gfx/sfftobmp
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sfftobmp/ChangeLog,v 1.1 2004/11/15 17:54:24 lu_zero Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sfftobmp/ChangeLog,v 1.1.1.1 2005/11/30 09:37:38 chriswhite Exp $
+
+  15 Sep 2005; Mark Loeser <halcy0n@gentoo.org> sfftobmp-3.0.ebuild:
+  Add app-arch/unzip to DEPEND; bug #69831
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> sfftobmp-3.0.ebuild:
+  Stable on ppc.
+
+  20 Apr 2005; Herbie Hopkins <herbs@gentoo.org> sfftobmp-3.0.ebuild:
+  Added ~amd64 keyword.
+
+  06 Feb 2005; Alin Nastac <mrness@gentoo.org> metadata.xml,
+  sfftobmp-3.0.ebuild:
+  Mark stable on x86.
 
 *sfftobmp-3.0 (15 Nov 2004)
 
diff --git a/media-gfx/sfftobmp/Manifest b/media-gfx/sfftobmp/Manifest
index 3d8ddd510767..3a5e933c1bb6 100644
--- a/media-gfx/sfftobmp/Manifest
+++ b/media-gfx/sfftobmp/Manifest
@@ -1,2 +1,14 @@
-MD5 2681fbba15e05ae3e67aeef31f83d1dc sfftobmp-3.0.ebuild 588
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 98c3e4b410641431d93a7e7cff2fba4b ChangeLog 876
+MD5 7a501e3b6f3edc070e7d0098e586d0b1 metadata.xml 217
+MD5 565ae6da35bc5cfb49f98f637594b245 sfftobmp-3.0.ebuild 832
 MD5 d19f2c6f8a72637aa493632722596753 files/digest-sfftobmp-3.0 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDKdM6CRZPokWLroQRAknUAKCfiz0vRSMe+7Q9DCnWZY9PoeIrmACfccLy
+SFN61ppgCaNrPkU9ivviuGU=
+=WaXI
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/sfftobmp/metadata.xml b/media-gfx/sfftobmp/metadata.xml
index c90d8d48bd03..41e7c1b277d2 100644
--- a/media-gfx/sfftobmp/metadata.xml
+++ b/media-gfx/sfftobmp/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>media-gfx</herd>
-<maintainer>
-<email>graphics@gentoo.org</email>
-</maintainer>
+<herd>graphics</herd>
+<longdescription>sff to bmp converter</longdescription>
 </pkgmetadata>
diff --git a/media-gfx/sfftobmp/sfftobmp-3.0.ebuild b/media-gfx/sfftobmp/sfftobmp-3.0.ebuild
index ac5a7abb242b..1f0ead371dbf 100644
--- a/media-gfx/sfftobmp/sfftobmp-3.0.ebuild
+++ b/media-gfx/sfftobmp/sfftobmp-3.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/media-gfx/sfftobmp/sfftobmp-3.0.ebuild,v 1.1 2004/11/15 17:54:24 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sfftobmp/sfftobmp-3.0.ebuild,v 1.1.1.1 2005/11/30 09:37:38 chriswhite Exp $
 
 MY_P=${PN}_${PV/./_}
 S=${WORKDIR}/${MY_P}
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/sfftools/${MY_P}_src.zip"
 SLOT="0"
 IUSE=""
 LICENSE="as-is"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~amd64 ppc x86"
 
 RDEPEND="virtual/libc
 	>=dev-libs/boost-1.31.0
@@ -20,7 +20,8 @@ RDEPEND="virtual/libc
 	media-libs/jpeg"
 
 DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.59"
+	>=sys-devel/autoconf-2.59
+	app-arch/unzip"
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-gfx/showimg/ChangeLog b/media-gfx/showimg/ChangeLog
index 5fd5e142ac56..6e9ac84857d4 100644
--- a/media-gfx/showimg/ChangeLog
+++ b/media-gfx/showimg/ChangeLog
@@ -1,7 +1,96 @@
 # ChangeLog for media-gfx/showimg
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/showimg/ChangeLog,v 1.1 2002/07/18 22:57:53 drobbins Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/showimg/ChangeLog,v 1.1.1.1 2005/11/30 09:37:42 chriswhite Exp $
 
-*showimg-0.7 (18 Jul 2002)
+  07 Apr 2005; Simon Stelling <blubb@gentoo.org> showimg-0.9.4.1.ebuild:
+  stable on amd64
+
+  20 Mar 2005; Carsten Lohrke <carlo@gentoo.org> showimg-0.9.4.1.ebuild:
+  refined dependencies
+
+  13 Mar 2005; Carsten Lohrke <carlo@gentoo.org> showimg-0.9.4.1.ebuild:
+  stable on x86
+
+*showimg-0.9.4.1 (18 Jan 2005)
+
+  18 Jan 2005; Carsten Lohrke <carlo@gentoo.org> +showimg-0.9.4.1.ebuild:
+  version bump
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> showimg-0.9.3.ebuild,
+  showimg-0.9.4.ebuild:
+  Changed dep on kdebase to accept kdebase-meta, the split 'meta' package.
+  This dep will be narrowed down in the future to the precise split packages
+  required.
+
+  05 Jan 2005; Marcus Hanwell <cryos@gentoo.org> showimg-0.9.4.ebuild:
+  Marked ~amd64 as requested in bug 72943.
+
+  03 Jan 2005; Joseph Jezak <josejx@gentoo.org> showimg-0.9.4.ebuild:
+  Marked ~ppc for bug #72943.
+
+  31 Dec 2004; Jason Wever <weeve@gentoo.org> showimg-0.9.4.ebuild:
+  Added ~sparc keyword.
+
+  30 Nov 2004; Carsten Lohrke <carlo@gentoo.org> showimg-0.9.4.ebuild:
+  dependency correction
+
+*showimg-0.9.4 (30 Nov 2004)
+
+  30 Nov 2004; Carsten Lohrke <carlo@gentoo.org> -showimg-0.8.0.ebuild,
+  -showimg-0.8.1.ebuild, -showimg-0.9.1.ebuild, -showimg-0.9.2.ebuild,
+  +showimg-0.9.4.ebuild:
+  clean up, version bump
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> showimg-0.9.1.ebuild,
+  showimg-0.9.2.ebuild, showimg-0.9.3.ebuild:
+  Stable on amd64.
+
+  13 Sep 2004; Carsten Lohrke <carlo@gentoo.org> showimg-0.9.3.ebuild:
+  missing kdebase dependency, missing ~archs, stable on x86
+
+*showimg-0.9.3 (06 Jul 2004)
+
+  06 Jul 2004; Dominik Stadler <centic@gentoo.org> :
+  Add new Version 0.9.3
+
+  03 Jul 2004; Dominik Stadler <centic@gentoo.org> showimg-0.9.1.ebuild,
+  showimg-0.9.2.ebuild:
+  Mark stable on x86.
+
+  29 Jun 2004; Carsten Lohrke <carlo@gentoo.org> showimg-0.8.0.ebuild,
+  showimg-0.8.1.ebuild, showimg-0.9.1.ebuild, showimg-0.9.2.ebuild:
+  QA: kde-base -> kde
+
+  16 May 2004; Dominik Stadler <centic@gentoo.org> showimg-0.8.0.ebuild,
+  showimg-0.8.1.ebuild, showimg-0.9.1.ebuild:
+  Add IUSE
+
+  28 Apr 2004; Jon Portnoy <avenj@gentoo.org> showimg-0.8.1.ebuild :
+  Stable on AMD64.
+
+*showimg-0.9.2 (24 Apr 2004)
+
+  24 Apr 2004; Dominik Stadler <centic@gentoo.org> +showimg-0.9.2.ebuild:
+  Add new Version 0.9.2, see Bug 48199
+
+  20 Apr 2004; David Holm <dholm@gentoo.org> showimg-0.9.1.ebuild:
+  Added to ~ppc.
+
+*showimg-0.9.1 (19 Apr 2004)
+
+  19 Apr 2004; Jon Portnoy <avenj@gentoo.org> showimg-0.9.1.ebuild :
+  Version bump.
+
+  14 Mar 2004; Jon Portnoy <avenj@gentoo.org> showimg-0.8.1.ebuild :
+  AMD64 keywords.
+
+*showimg-0.8.1 (30 Nov 2003)
+
+  30 Nov 2003; Caleb Tennis <caleb@gentoo.org> showimg-0.8.1.ebuild:
+  Version bump
+
+*showimg-0.8.0 (23 Oct 2003)
+
+  23 Oct 2003; Caleb Tennis <caleb@gentoo.org> metadata.xml, showimg-0.8.0.ebuild:
+  Initial version - submitted by maintainer
 
-  18 Jul 2002; Daniel Robbins <drobbins@gentoo.org>: Added missing ChangeLog
diff --git a/media-gfx/showimg/Manifest b/media-gfx/showimg/Manifest
index e69de29bb2d1..d7f8ab1c8e61 100644
--- a/media-gfx/showimg/Manifest
+++ b/media-gfx/showimg/Manifest
@@ -0,0 +1,4 @@
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 3bfc3fc507e7483ab9d839c95624f668 showimg-0.9.4.1.ebuild 754
+MD5 9bd156518dce5decf46b8d94f995ba03 ChangeLog 3082
+MD5 fcb67a07b4a8e10c2e4a1825a500baf9 files/digest-showimg-0.9.4.1 69
diff --git a/media-gfx/showimg/metadata.xml b/media-gfx/showimg/metadata.xml
index b435a8440ccd..8d1e86a9cefb 100644
--- a/media-gfx/showimg/metadata.xml
+++ b/media-gfx/showimg/metadata.xml
@@ -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/media-gfx/showimg/showimg-0.9.4.1.ebuild b/media-gfx/showimg/showimg-0.9.4.1.ebuild
index d380e0482e22..a6ddcd94ef6d 100644
--- a/media-gfx/showimg/showimg-0.9.4.1.ebuild
+++ b/media-gfx/showimg/showimg-0.9.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/media-gfx/showimg/showimg-0.9.4.1.ebuild,v 1.1 2005/01/18 14:35:40 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/showimg/showimg-0.9.4.1.ebuild,v 1.1.1.1 2005/11/30 09:37:42 chriswhite Exp $
 
 inherit kde
 
@@ -14,11 +14,11 @@ SRC_URI="http://www.jalix.org/projects/showimg/download/${MY_PV}/${MY_P}.tar.bz2
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+KEYWORDS="x86 ~sparc ~ppc amd64"
 IUSE=""
 
 
-DEPEND="|| ( kde-base/kdebase-meta kde-base/kdebase )
+DEPEND="|| ( kde-base/libkonq kde-base/kdebase )
 	media-libs/libkexif
 	media-plugins/kipi-plugins"
 need-kde 3.1
diff --git a/media-gfx/skencil/ChangeLog b/media-gfx/skencil/ChangeLog
index 10293863f41e..ab46000a86d6 100644
--- a/media-gfx/skencil/ChangeLog
+++ b/media-gfx/skencil/ChangeLog
@@ -1,8 +1,66 @@
 # ChangeLog for media-gfx/skencil
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/skencil/ChangeLog,v 1.1 2003/12/11 21:00:36 hanno Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/skencil/ChangeLog,v 1.1.1.1 2005/11/30 09:37:27 chriswhite Exp $
+
+  17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> skencil-0.6.17.ebuild:
+  Fixed multilib-strict issue, bug 98622. Re-add dropped ~amd64 keyword.
+
+*skencil-0.6.17 (18 Sep 2005)
+
+  18 Sep 2005; Chris White <chriswhite@gentoo.org> +skencil-0.6.17.ebuild:
+  Version bump for bug #103217 by spyderous. This adds a USE flag support
+  check, as well as making the nls DEPEND/RDEPEND Gentoo/BSD friendly for when
+  they want to mark it.
+
+  22 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> skencil-0.6.16.ebuild:
+  Stable on sparc
+
+  10 Jun 2005; Joseph Jezak <josejx@gentoo.org> skencil-0.6.16.ebuild:
+  Marked ppc stable.
+
+  09 Jun 2005; <sekretarz@gentoo.org> skencil-0.6.16.ebuild:
+  Stable on amd64
+
+  05 Jun 2005; Markus Rothe <corsair@gentoo.org> skencil-0.6.16.ebuild:
+  Stable on ppc64; dependency for bug #92995
+
+  21 May 2005; Markus Rothe <corsair@gentoo.org> skencil-0.6.16.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  22 Mar 2005; Karol Wojtaszek <sekretarz@gentoo.org> skencil-0.6.16.ebuild:
+  Added to ~amd64
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  23 Dec 2004; Hanno Boeck <hanno@gentoo.org> skencil-0.6.16.ebuild:
+  Added pyxml to dependencies.
+
+  13 Oct 2004; Seemant Kulleen <seemant@gentoo.org> skencil-0.6.16.ebuild,
+  skencil-0.6.16_pre3.ebuild:
+  HOMEPAGE update thanks to: James Kyte <james.kyte@gmail.com> in bug #67452
+
+  19 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> skencil-0.6.16.ebuild,
+  skencil-0.6.16_pre3.ebuild:
+  dev-python/Imaging renamed to dev-python/imaging.
+
+  14 Mar 2004; Jason Wever <weeve@gentoo.org> skencil-0.6.16.ebuild:
+  Added ~sparc keyword.
+
+  10 Mar 2004; Hanno Boeck <hanno@gentoo.org> skencil-0.6.16.ebuild:
+  Marked stable on x86.
+
+*skencil-0.6.16 (09 Feb 2004)
+
+  09 Feb 2004; Hanno Boeck <hanno@gentoo.org> skencil-0.6.16.ebuild,
+  skencil-0.6.16_pre3.ebuild:
+  Version bump.
+
+  09 Feb 2004; Hanno Boeck <hanno@gentoo.org> skencil-0.6.16_pre3.ebuild:
+  Added reportlab to DEPEND. Fixes #33946.
 
 *skencil-0.6.16_pre3 (11 Dec 2003)
+*skencil-0.6.15 (11 Dec 2003)
 
   11 Dec 2003; Hanno Boeck <hanno@gentoo.org> skencil-0.6.16_pre3.ebuild:
   skencil is the new name of sketch.
diff --git a/media-gfx/skencil/Manifest b/media-gfx/skencil/Manifest
index 996c07dc4c4c..10b23efd8e99 100644
--- a/media-gfx/skencil/Manifest
+++ b/media-gfx/skencil/Manifest
@@ -1,4 +1,18 @@
-MD5 31fb19d14f2fadfb84d1da9c7bcef7be ChangeLog 362
-MD5 13f41084c1422f9845cf4c1287004b17 skencil-0.6.16_pre3.ebuild 1081
-MD5 a72a06a37ca4e5905085ebff07fe9e9e metadata.xml 217
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6b9d0383a5ad4185ed13c5b5b8520f91 ChangeLog 2398
+MD5 2ea05533c709cbd5828da5af9798d49c files/digest-skencil-0.6.16 67
 MD5 9d7047c414b537db65e3518f5b39677a files/digest-skencil-0.6.16_pre3 70
+MD5 9c9922b39806ca56eed7ebdaaf3cea1c files/digest-skencil-0.6.17 67
+MD5 a72a06a37ca4e5905085ebff07fe9e9e metadata.xml 217
+MD5 63e5df2d36bfe591a246939dc7e08a78 skencil-0.6.16.ebuild 1077
+MD5 c0d19d1776bb0445dd87a74dfc963da8 skencil-0.6.16_pre3.ebuild 1088
+MD5 5be4d6f42ab88f53abcb3fb8bef0d518 skencil-0.6.17.ebuild 1430
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfRYf2G5bA0cA/ScRAlGEAJ4w3ks0/c9NYx2FcAl05G3jT/wUzQCeO3PW
+JGpn0g95B7HRmKJxxAbTKGI=
+=rsRH
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/skencil/skencil-0.6.16.ebuild b/media-gfx/skencil/skencil-0.6.16.ebuild
index aa5073286736..c49ad655c12b 100644
--- a/media-gfx/skencil/skencil-0.6.16.ebuild
+++ b/media-gfx/skencil/skencil-0.6.16.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/media-gfx/skencil/skencil-0.6.16.ebuild,v 1.1 2004/02/09 22:59:21 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/skencil/skencil-0.6.16.ebuild,v 1.1.1.1 2005/11/30 09:37:27 chriswhite Exp $
 
 IUSE="nls"
-S=${WORKDIR}/${P}
 DESCRIPTION="Interactive X11 vector drawing program"
 SRC_URI="mirror://sourceforge/sketch/${P}.tar.gz"
-HOMEPAGE="http://sketch.sourceforge.net/"
-DEPEND=">=dev-python/Imaging-1.1.2-r1
+HOMEPAGE="http://www.skencil.org/"
+DEPEND=">=dev-python/imaging-1.1.2-r1
 	dev-python/reportlab
-	dev-lang/tk"
+	dev-lang/tk
+	dev-python/pyxml"
 RDEPEND="nls? ( sys-devel/gettext )"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 
 src_compile() {
 	use nls && useopts="${useopts} --with-nls"
diff --git a/media-gfx/skencil/skencil-0.6.16_pre3.ebuild b/media-gfx/skencil/skencil-0.6.16_pre3.ebuild
index df809f59f7be..7053a3221eb8 100644
--- a/media-gfx/skencil/skencil-0.6.16_pre3.ebuild
+++ b/media-gfx/skencil/skencil-0.6.16_pre3.ebuild
@@ -1,18 +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/media-gfx/skencil/skencil-0.6.16_pre3.ebuild,v 1.1 2003/12/11 21:00:36 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/skencil/skencil-0.6.16_pre3.ebuild,v 1.1.1.1 2005/11/30 09:37:27 chriswhite Exp $
 
 IUSE="nls"
 S=${WORKDIR}/${P/_/}
 DESCRIPTION="Interactive X11 vector drawing program"
 SRC_URI="http://sketch.sourceforge.net/files/src/sketch/${P/_/}.tar.gz"
-HOMEPAGE="http://sketch.sourceforge.net/"
-DEPEND=">=dev-python/Imaging-1.1.2-r1
+HOMEPAGE="http://www.skencil.org/"
+DEPEND=">=dev-python/imaging-1.1.2-r1
+	dev-python/reportlab
 	dev-lang/tk"
 RDEPEND="nls? ( sys-devel/gettext )"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 
 src_compile() {
 	use nls && useopts="${useopts} --with-nls"
diff --git a/media-gfx/skencil/skencil-0.6.17.ebuild b/media-gfx/skencil/skencil-0.6.17.ebuild
index d04ca66443d7..1682b317483a 100644
--- a/media-gfx/skencil/skencil-0.6.17.ebuild
+++ b/media-gfx/skencil/skencil-0.6.17.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/media-gfx/skencil/skencil-0.6.17.ebuild,v 1.1 2005/09/18 07:07:12 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/skencil/skencil-0.6.17.ebuild,v 1.1.1.1 2005/11/30 09:37:27 chriswhite Exp $
 
-inherit python
+inherit python multilib
 
 IUSE="nls"
 S=${WORKDIR}/${P/_/}
@@ -16,12 +16,24 @@ DEPEND=">=dev-python/imaging-1.1.2-r1
 RDEPEND="!elibc_glibc? ( nls? ( sys-devel/gettext ) )"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 pkg_setup() {
 	python_tkinter_exists
 }
 
+src_unpack() {
+	unpack ${A}
+	# Fix hardcoded libdir
+	if [ $(get_libdir) != "lib" ] ; then
+		sed -i -e "s:lib/:$(get_libdir)/:" \
+			-e "s:lib':$(get_libdir)':" \
+			${S}/{Pax,Filter,Sketch/Modules}/Makefile.pre.in \
+			${S}/Plugins/Objects/Lib/multilinetext/{TextEditor,styletext}.py \
+			${S}/setup.py || die "sed failed"
+	fi
+}
+
 src_compile() {
 	use nls && useopts="${useopts} --with-nls"
 	./setup.py configure ${useopts} || die "setup.py configure failed"
diff --git a/media-gfx/sodipodi/ChangeLog b/media-gfx/sodipodi/ChangeLog
index ab796ea04eec..a42d99219f6e 100644
--- a/media-gfx/sodipodi/ChangeLog
+++ b/media-gfx/sodipodi/ChangeLog
@@ -1,6 +1,102 @@
 # ChangeLog for media-gfx/sodipodi
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sodipodi/ChangeLog,v 1.1 2002/02/01 21:53:30 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sodipodi/ChangeLog,v 1.1.1.1 2005/11/30 09:37:40 chriswhite Exp $
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> sodipodi-0.34.ebuild:
+  Mark 0.34 stable on alpha
+
+  26 Aug 2005; Brent Baude <ranger@gentoo.org> sodipodi-0.34.ebuild:
+  Marking  sodipodi-0.34 ~ppc64
+
+  20 Aug 2004; Danny van Dyk <kugelfang@gentoo.org>
+  files/sodipodi-0.34.64bit.diff:
+  Updated 64bit patch. Fixed BUG #60383.
+
+  19 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> sodipodi-0.34.ebuild:
+  Stable on sparc
+
+  11 May 2004; Travis Tilley <lv@gentoo.org> +files/sodipodi-0.34.64bit.diff,
+  sodipodi-0.34.ebuild:
+  added fix for 64bit systems
+
+  10 May 2004; Travis Tilley <lv@gentoo.org> sodipodi-0.28.ebuild,
+  sodipodi-0.32.ebuild, sodipodi-0.33.ebuild, sodipodi-0.34.ebuild:
+  added ~amd64 keyword
+
+*sodipodi-0.34 (14 Feb 2004)
+
+  14 Feb 2004; Alastair Tse <liquidx@gentoo.org> sodipodi-0.34.ebuild:
+  version bump
+
+  24 Dec 2003; Sven Blumenstein <bazik@gentoo.org> sodipodi-0.33.ebuild:
+  sparcified KEYWORDS.
+
+*sodipodi-0.33 (04 Dec 2003)
+
+  04 Dec 2003; foser <foser@gentoo.org> sodipodi-0.33.ebuild :
+  New release, requested in #34879
+  fixed deps, tightened configure switches
+
+  12 Nov 2003; Todd Sunderlin <todd@gentoo.org> sodipodi-0.32.ebuild:
+  changed to stable on sparc
+
+*sodipodi-0.32 (21 Jun 2003)
+
+  21 Sep 2003; foser <foser@gentoo.org> sodipodi-0.32.ebuild :
+  Fix libgnomeprint switch & dep (#28771)
+
+  21 Jun 2003; Alastair Tse <liquidx@gentoo.org> sodipodi-0.32.ebuild:
+  version bump and cleanup
+
+  10 Jun 2003; Alastair Tse <liquidx@gentoo.org> sodipodi-0.28.ebuild:
+  fixed gal deps
+
+*sodipodi-0.31.1-r1 (30 Mar 2003)
+
+  31 Mar 2003; foser <foser@gentoo.org> sodipodi-0.31.1-r1.ebuild :
+  Fixed libgnomeprint(ui) dep to 2.0 
+
+  30 Mar 2003; Alastair Tse <liquidx@gentoo.org> sodipodi-0.31.1-r1.ebuild:
+  marked as stable
+
+  30 Mar 2003; foser <foser@gentoo.org> sodipodi-0.31.1-r1.ebuild :
+  Dep fixes
+  Use flag fixes
+  Adapted to gnome2 eclass
+
+*sodipodi-0.31.1 (28 Mar 2003)
+
+  28 Mar 2003; Hanno Boeck <hanno@gentoo.org> sodipodi-0.31.1.ebuild :
+  New version.
+
+*sodipodi-0.31 (07 Mar 2003)
+  07 Mar 2003; Thomas Raschbacher <lordvan@gentoo.org> sodipodi-0.31.ebuild:
+  new version (gnome-print turned off cuz it breaks) bug #15301
+	
+
+*sodipodi-0.28 (27 Nov 2002)
+
+  27 Nov 2002; foser <foser@gentoo.org> sodipodi-0.28.ebuild :
+  New version, fixed wmf stuff
+
+*sodipodi-0.27 (22 Oct 2002)
+
+	07 Jan 2003; Mark Guertin <gerk@gentoo.org> sodipodi-0.28.ebuild :
+  Updated KEYWORDS to ppc
+
+  24 Dec 2002; Mark Guertin <gerk@gentoo.org> sodipodi-0.28.ebuild :
+  Updated KEYWORDS for ~ppc
+
+  24 Oct 2002; foser <foser@gentoo.org> sodipodi-0.27.ebuild :
+  Added wmf USE flag
+
+  22 Oct 2002; foser <foser@gentoo.org> sodipodi-0.27.ebuild :
+  New version. Fixes bonobo breakage.
+
+*sodipodi-0.25 (19 Oct 2002)
+
+  19 Oct 2002; foser <foser@gentoo.org> sodipodi-0.25.ebuild :
+  New version. Added xml2 use flag. Disabled bonobo, it breaks.
 
 *sodipodi-0.24.1-r3 (1 Feb 2002)
 
diff --git a/media-gfx/sodipodi/Manifest b/media-gfx/sodipodi/Manifest
index e69de29bb2d1..7b83c7cb8253 100644
--- a/media-gfx/sodipodi/Manifest
+++ b/media-gfx/sodipodi/Manifest
@@ -0,0 +1,11 @@
+MD5 8a184e8fb3d62af3940790c8a6f36c4f sodipodi-0.33.ebuild 1061
+MD5 859f6e897ac8d3c7c82fa94c87093890 sodipodi-0.32.ebuild 913
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 e033e71196da0599a8b7146c9a4d3d3c ChangeLog 3554
+MD5 4cbeb0174f9857472216b670c98f22ee sodipodi-0.34.ebuild 1158
+MD5 42d70b15148e4ac5fcc0e07c6eb55569 sodipodi-0.28.ebuild 1156
+MD5 796559c273a15e0a8e7c9c55c22ddcb8 files/digest-sodipodi-0.33 66
+MD5 b06ae3761eae4107d65a634b4168a7d4 files/digest-sodipodi-0.28 66
+MD5 cd2634a575324947ac9454da66827f9f files/sodipodi-0.34.64bit.diff 8690
+MD5 7b307f02d45ceeb01f8e010147f73224 files/digest-sodipodi-0.32 66
+MD5 6886dd31b21c1d66ad0948a1173ccff2 files/digest-sodipodi-0.34 66
diff --git a/media-gfx/sodipodi/files/sodipodi-0.34.64bit.diff b/media-gfx/sodipodi/files/sodipodi-0.34.64bit.diff
index c725aa20156d..b2a465359203 100644
--- a/media-gfx/sodipodi/files/sodipodi-0.34.64bit.diff
+++ b/media-gfx/sodipodi/files/sodipodi-0.34.64bit.diff
@@ -277,3 +277,14 @@ diff -ur src/verbs.c src/verbs.c
  	svp = malloc (sizeof (NRSVP) + (nsegs - 1) * sizeof (NRSVPSegment));
  	svp->length = nsegs;
  	if (nsegs > 0) {
+--- src/libnrtype/nr-type-xft.c	2003-12-15 15:38:21.000000000 -0700
++++ src/libnrtype/nr-type-xft.c	2004-08-14 18:46:45.108908800 -0700
+@@ -186,7 +186,7 @@
+ 
+ 	/* Get typeface list */
+ #ifdef WITH_FONTCONFIG
+-	obj = FcObjectSetBuild (FC_SCALABLE, FC_OUTLINE, FC_FAMILY, FC_WEIGHT, FC_SLANT, FC_FILE, FC_INDEX, 0);
++	obj = FcObjectSetBuild (FC_SCALABLE, FC_OUTLINE, FC_FAMILY, FC_WEIGHT, FC_SLANT, FC_FILE, FC_INDEX, NULL);
+ 	NRXftPatterns = FcFontList (cfg, pat, obj);
+ 	FcObjectSetDestroy (obj);
+ #else
diff --git a/media-gfx/sodipodi/sodipodi-0.28.ebuild b/media-gfx/sodipodi/sodipodi-0.28.ebuild
index 29a3eaaf29d2..822bd24b7c5c 100644
--- a/media-gfx/sodipodi/sodipodi-0.28.ebuild
+++ b/media-gfx/sodipodi/sodipodi-0.28.ebuild
@@ -1,66 +1,50 @@
-# 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/media-gfx/sodipodi/sodipodi-0.28.ebuild,v 1.1 2002/11/27 19:59:15 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sodipodi/sodipodi-0.28.ebuild,v 1.1.1.1 2005/11/30 09:37:40 chriswhite Exp $
 
-IUSE="xml2 nls bonobo wmf"
+inherit flag-o-matic
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Vector illustration application for GNOME"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://sodipodi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+SLOT="0"
+KEYWORDS="x86 ppc ~amd64"
+IUSE="xml2 nls bonobo wmf"
 
 RDEPEND=">=gnome-base/gnome-print-0.35
-	>=gnome-extra/gal-0.13
+	<gnome-extra/gal-1.99
 	media-libs/gdk-pixbuf
 	bonobo? ( gnome-base/bonobo )
 	xml2? ( dev-libs/libxml2 )
 	wmf? ( >=media-libs/libwmf-0.2.1 )"
-
 DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+	>=sys-devel/autoconf-2.58"
 
-# trick to make the configure compile tests work
 src_unpack() {
-        unpack ${A}
-        
-        cd ${S}
-        export WANT_AUTOCONF_2_5=1
-        autoconf --force
+	unpack ${A}
+
+	cd ${S}
+	export WANT_AUTOCONF=2.5
+	autoconf --force
 }
 
 src_compile() {
-	local myconf
-
-	use bonobo \
-		&& myconf="${myconf} --with-bonobo" \
-		|| myconf="${myconf} --without-bonobo"
-
-	use xml2 \
-		&& myconf="${myconf} --with-gnome-xml2" \
-		|| myconf="${myconf} --without-gnome-xml2"
-
-	use wmf \
-		&& myconf="${myconf} --with-libwmf" \
-		|| myconf="${myconf} --without-libwmf"
-
-	use nls || myconf="${myconf} --disable-nls"
-
-	CFLAGS="${CFLAGS} `gnome-config --cflags gdk_pixbuf`"
-
+	append-flags `gnome-config --cflags gdk_pixbuf`
 	econf \
 		--enable-gnome \
 		--enable-gnome-print \
-		${myconf} || die
-
+		`use_with bonobo` \
+		`use_with xml2 gnome-xml2` \
+		`use_with wmf libwmf` \
+		`use_enable nls` \
+		|| die
 	emake || die
 }
 
-src_install () {
+src_install() {
 	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING ChangeLog README NEWS TODO
+	dodoc AUTHORS ChangeLog README NEWS TODO
 }
diff --git a/media-gfx/sodipodi/sodipodi-0.32.ebuild b/media-gfx/sodipodi/sodipodi-0.32.ebuild
index 5928deeaa408..8faa25cac4fe 100644
--- a/media-gfx/sodipodi/sodipodi-0.32.ebuild
+++ b/media-gfx/sodipodi/sodipodi-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/media-gfx/sodipodi/sodipodi-0.32.ebuild,v 1.1 2003/06/21 11:10:56 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sodipodi/sodipodi-0.32.ebuild,v 1.1.1.1 2005/11/30 09:37:40 chriswhite Exp $
 
 inherit gnome2
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="x86 ppc sparc ~alpha ~amd64"
 IUSE="gnome mmx"
 
 RDEPEND=">=x11-libs/gtk+-2.2.1
@@ -20,18 +20,14 @@ RDEPEND=">=x11-libs/gtk+-2.2.1
 	dev-libs/popt
 	sys-libs/zlib
 	media-libs/libpng
-	gnome? ( =gnome-base/libgnomeprintui-1.116* )"
+	gnome? ( >=gnome-base/libgnomeprintui-2.2 )"
+
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	dev-util/pkgconfig
 	>=dev-util/intltool-0.22"
 
-G2CONF="${G2CONF} `use_enable mmx`"
-G2CONF="${G2CONF} `use_enable gnome gnome-print`"
-
-# FIXME : xft doesnt actually seem to work 
+G2CONF="${G2CONF} `use_enable mmx` `use_with gnome gnome-print`"
 G2CONF="${G2CONF} --with-xft --with-popt"
 
-DOCS="AUTHORS COPYING ChangeLog HACKING NEWS README TODO"
-
-SCROLLKEEPER_UPDATE="0"
+DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
diff --git a/media-gfx/sodipodi/sodipodi-0.33.ebuild b/media-gfx/sodipodi/sodipodi-0.33.ebuild
index 36e522c9519b..f70a7909f06a 100644
--- a/media-gfx/sodipodi/sodipodi-0.33.ebuild
+++ b/media-gfx/sodipodi/sodipodi-0.33.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/media-gfx/sodipodi/sodipodi-0.33.ebuild,v 1.1 2003/12/04 15:47:55 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sodipodi/sodipodi-0.33.ebuild,v 1.1.1.1 2005/11/30 09:37:40 chriswhite Exp $
 
 inherit gnome2
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="~x86 ~ppc sparc ~alpha ~amd64"
 IUSE="gnome mmx"
 
 RDEPEND=">=x11-libs/gtk+-2.2.1
@@ -34,4 +34,4 @@ G2CONF="${G2CONF} --with-xft --with-popt"
 # disable experimental features for now
 G2CONF="${G2CONF} --without-mlview --without-kde"
 
-DOCS="AUTHORS COPYING ChangeLog HACKING NEWS README TODO"
+DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
diff --git a/media-gfx/sodipodi/sodipodi-0.34.ebuild b/media-gfx/sodipodi/sodipodi-0.34.ebuild
index e86f19f9b39b..afe7af4d04c3 100644
--- a/media-gfx/sodipodi/sodipodi-0.34.ebuild
+++ b/media-gfx/sodipodi/sodipodi-0.34.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/media-gfx/sodipodi/sodipodi-0.34.ebuild,v 1.1 2004/02/14 17:41:56 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sodipodi/sodipodi-0.34.ebuild,v 1.1.1.1 2005/11/30 09:37:40 chriswhite Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="vector-based drawing program for GNOME"
 HOMEPAGE="http://sodipodi.sourceforge.net/"
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="alpha ~amd64 ppc ~ppc64 sparc x86"
 IUSE="gnome mmx"
 
 RDEPEND=">=x11-libs/gtk+-2.2.1
@@ -35,3 +35,9 @@ G2CONF="${G2CONF} --with-xft --with-popt"
 G2CONF="${G2CONF} --without-mlview --without-kde"
 
 DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/sodipodi-0.34.64bit.diff
+}
diff --git a/media-gfx/spectromatic/ChangeLog b/media-gfx/spectromatic/ChangeLog
index 77c87e9b75ae..d9afc65131d1 100644
--- a/media-gfx/spectromatic/ChangeLog
+++ b/media-gfx/spectromatic/ChangeLog
@@ -1,6 +1,13 @@
-# ChangeLog for app-sci/spectromatic
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/spectromatic/ChangeLog,v 1.1 2004/12/24 02:55:48 ribosome Exp $
+# ChangeLog for media-gfx/spectromatic
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/spectromatic/ChangeLog,v 1.1.1.1 2005/11/30 09:37:35 chriswhite Exp $
+
+  22 Jul 2005; David Holm <dholm@gentoo.org> spectromatic-1.0.ebuild:
+  Added to ~ppc.
+
+  28 Dec 2004; Olivier Fisette <ribosome@gentoo.org>
+  spectromatic-1.0.ebuild:
+  Dependency update: dev-libs/gsl -> sci-libs/gsl.
 
 *spectromatic-1.0 (23 Dec 2004)
 
diff --git a/media-gfx/spectromatic/Manifest b/media-gfx/spectromatic/Manifest
index 966ffc9904ec..df9b8058c8ed 100644
--- a/media-gfx/spectromatic/Manifest
+++ b/media-gfx/spectromatic/Manifest
@@ -1,6 +1,6 @@
-MD5 d8b29c21bda7f2fc8a804f74636f5127 spectromatic-1.0.ebuild 935
-MD5 9a8489a18e7e7a5083bf2a84a7315cd5 ChangeLog 687
+MD5 4a9aff9f7d13e74e67133e08ed67ef13 ChangeLog 1183
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 981e4c6dcc48b5ffbd99f76b39c32ef8 files/spectromatic-1.0-stringliteral.patch 2217
-MD5 3f1f11cd807e925f279e51c239688289 files/spectromatic-1.0-gentoo.diff 603
+MD5 b4cb9d26a9901c0e43df921d40e7676f spectromatic-1.0.ebuild 939
 MD5 23d4c34b3e33e1ed27f69a9d41c34220 files/digest-spectromatic-1.0 69
+MD5 3f1f11cd807e925f279e51c239688289 files/spectromatic-1.0-gentoo.diff 603
+MD5 981e4c6dcc48b5ffbd99f76b39c32ef8 files/spectromatic-1.0-stringliteral.patch 2217
diff --git a/media-gfx/spectromatic/spectromatic-1.0.ebuild b/media-gfx/spectromatic/spectromatic-1.0.ebuild
index 1429176654fb..1af2f6e8c1d2 100644
--- a/media-gfx/spectromatic/spectromatic-1.0.ebuild
+++ b/media-gfx/spectromatic/spectromatic-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/media-gfx/spectromatic/spectromatic-1.0.ebuild,v 1.1 2004/12/24 02:55:48 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/spectromatic/spectromatic-1.0.ebuild,v 1.1.1.1 2005/11/30 09:37:35 chriswhite Exp $
 
 inherit eutils
 
@@ -12,9 +12,9 @@ HOMEPAGE="http://ieee.uow.edu.au/~daniel/software/spectromatic/"
 SRC_URI="http://ieee.uow.edu.au/~daniel/software/spectromatic/dist/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~ppc x86"
 
-DEPEND=">=dev-libs/gsl-1.2
+DEPEND=">=sci-libs/gsl-1.2
 		>=media-libs/libpng-1.2.4"
 
 src_unpack() {
diff --git a/media-gfx/splash-themes-gentoo/ChangeLog b/media-gfx/splash-themes-gentoo/ChangeLog
index 02cc9e1158ad..3a9542b0b4c8 100644
--- a/media-gfx/splash-themes-gentoo/ChangeLog
+++ b/media-gfx/splash-themes-gentoo/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/splash-themes-gentoo
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splash-themes-gentoo/ChangeLog,v 1.1 2005/04/29 22:55:36 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splash-themes-gentoo/ChangeLog,v 1.1.1.1 2005/11/30 09:37:32 chriswhite Exp $
+
+  20 Jul 2005; Herbie Hopkins <herbs@gentoo.org>
+  splash-themes-gentoo-20050429.ebuild:
+  Stable on amd64 wrt bug #99709.
+
+  07 Jul 2005; Michał Januszewski <spock@gentoo.org>
+  splash-themes-gentoo-20050429.ebuild:
+  Marked stable on x86.
 
 *splash-themes-gentoo-20050429 (29 Apr 2005)
 
diff --git a/media-gfx/splash-themes-gentoo/Manifest b/media-gfx/splash-themes-gentoo/Manifest
index 1ce723ed8bc4..72e322fd7eec 100644
--- a/media-gfx/splash-themes-gentoo/Manifest
+++ b/media-gfx/splash-themes-gentoo/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 a7c81e018bb13b362d1da1409f2601b7 splash-themes-gentoo-20050429.ebuild 773
-MD5 a76761b07cb5acdad955b9a8a4e23589 ChangeLog 550
+MD5 62a9815ac13c9a5498d0a1c061b113fe splash-themes-gentoo-20050429.ebuild 779
+MD5 abd30b2a5631b252c9e258a957e9c60f ChangeLog 793
 MD5 cfe1b5f88cc51ac6ffc42809178d2a06 metadata.xml 221
 MD5 36933970a8a86c439254e145516dbb3e files/digest-splash-themes-gentoo-20050429 159
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCc85MI1lqEGTUzyQRAphMAKDDsHfVhup6t3sGreoKdVwLcxopqQCgjCVu
-pXX8CU+AwM7+ZzMOzbJFwSY=
-=NfXr
+iD8DBQFC3rky2G5bA0cA/ScRAoniAJ9wAm5n8aKQDeULgcs5Yy7KKjrDzwCfdIrw
+L4Apuj4m49M39etTqClOFaA=
+=AtuF
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/splash-themes-gentoo/splash-themes-gentoo-20050429.ebuild b/media-gfx/splash-themes-gentoo/splash-themes-gentoo-20050429.ebuild
index acd81c9c0c6d..33fec9a6ec82 100644
--- a/media-gfx/splash-themes-gentoo/splash-themes-gentoo-20050429.ebuild
+++ b/media-gfx/splash-themes-gentoo/splash-themes-gentoo-20050429.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/media-gfx/splash-themes-gentoo/splash-themes-gentoo-20050429.ebuild,v 1.1 2005/04/29 22:55:36 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splash-themes-gentoo/splash-themes-gentoo-20050429.ebuild,v 1.1.1.1 2005/11/30 09:37:32 chriswhite Exp $
 
-DESCRIPTION="A collection of Gentoo themes for splashutils"
+DESCRIPTION="A collection of Gentoo themes for splashutils."
 HOMEPAGE="http://dev.gentoo.org/~spock/"
 SRC_URI="mirror://gentoo/fbsplash-theme-emergence-r2.tar.bz2
 	 mirror://gentoo/fbsplash-theme-gentoo-r2.tar.bz2"
-
+IUSE=""
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="amd64 ~ppc x86"
 DEPEND=">=media-gfx/splashutils-1.1.9.5"
 
 src_install() {
diff --git a/media-gfx/splash-themes-livecd/ChangeLog b/media-gfx/splash-themes-livecd/ChangeLog
index aa9f80a0897b..4b5e35e9992c 100644
--- a/media-gfx/splash-themes-livecd/ChangeLog
+++ b/media-gfx/splash-themes-livecd/ChangeLog
@@ -1,6 +1,39 @@
 # ChangeLog for media-gfx/splash-themes-livecd
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splash-themes-livecd/ChangeLog,v 1.1 2004/10/12 22:44:31 wolf31o2 Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splash-themes-livecd/ChangeLog,v 1.1.1.1 2005/11/30 09:37:32 chriswhite Exp $
+
+  23 Jul 2005; Lars Weiler <pylon@gentoo.org>
+  splash-themes-livecd-2005.1.ebuild:
+  Stable on ppc.
+
+*splash-themes-livecd-2005.1 (10 Jul 2005)
+
+  10 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  +splash-themes-livecd-2005.1.ebuild:
+  Added 2005.1 theme.
+
+  02 May 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  splash-themes-livecd-2004.3.ebuild, splash-themes-livecd-2005.0.ebuild:
+  Changing description and closing bug #90987.
+
+  14 Apr 2005; Lars Weiler <pylon@gentoo.org>
+  splash-themes-livecd-2005.0.ebuild:
+  It's working on ppc now, but still testing until newer splashutils with a
+  tiny bugfix will be released.
+
+*splash-themes-livecd-2005.0 (28 Mar 2005)
+
+  28 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  +splash-themes-livecd-2005.0.ebuild:
+  Added 2005.0 splash theme.
+
+  20 Oct 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  splash-themes-livecd-2004.3.ebuild:
+  Marking stable on x86 and amd64.
+
+  12 Oct 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  splash-themes-livecd-2004.3.ebuild:
+  It helps to commit the right version.
 
 *splash-themes-livecd-2004.3 (12 Oct 2004)
 
diff --git a/media-gfx/splash-themes-livecd/Manifest b/media-gfx/splash-themes-livecd/Manifest
index e98098c66408..ed35dec5d278 100644
--- a/media-gfx/splash-themes-livecd/Manifest
+++ b/media-gfx/splash-themes-livecd/Manifest
@@ -1,4 +1,8 @@
-MD5 2bdaaa288a201e35a96968fd5eb33131 ChangeLog 2921
+MD5 70483790b7fd0d23b06359d655de1f15 ChangeLog 1462
 MD5 d86e5b5e47260e5a965eae2afe6d6d40 metadata.xml 159
-MD5 6f405d11696d0e8a74e0ca20d2222125 splash-themes-livecd-2004.3.ebuild 837
+MD5 2bb4a653aef197bfa716906e066eb1de splash-themes-livecd-2004.3.ebuild 613
+MD5 4966ae40161aa597a0ea535a54d4b124 splash-themes-livecd-2005.0.ebuild 676
+MD5 ef22497fc7874f87d1ca5c4ccfc8c405 splash-themes-livecd-2005.1.ebuild 674
 MD5 1343d51c2fef69eb595c779bfde02674 files/digest-splash-themes-livecd-2004.3 81
+MD5 6fde4dd5480f2f502cebb7b1e5c8ea3e files/digest-splash-themes-livecd-2005.0 80
+MD5 54bf719e4b1ed5ec76c1b7848ef490e3 files/digest-splash-themes-livecd-2005.1 81
diff --git a/media-gfx/splash-themes-livecd/splash-themes-livecd-2004.3.ebuild b/media-gfx/splash-themes-livecd/splash-themes-livecd-2004.3.ebuild
index d1ba229c317e..e8e91de79590 100644
--- a/media-gfx/splash-themes-livecd/splash-themes-livecd-2004.3.ebuild
+++ b/media-gfx/splash-themes-livecd/splash-themes-livecd-2004.3.ebuild
@@ -1,26 +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/media-gfx/splash-themes-livecd/splash-themes-livecd-2004.3.ebuild,v 1.1 2004/10/12 22:44:31 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splash-themes-livecd/splash-themes-livecd-2004.3.ebuild,v 1.1.1.1 2005/11/30 09:37:32 chriswhite Exp $
 
-IUSE="livecd bootsplash"
+IUSE=""
 S=${WORKDIR}/livecd-${PV}
-DESCRIPTION="Gentoo ${PV} theme for bootsplash consoles"
+DESCRIPTION="Gentoo theme for gensplash consoles"
 HOMEPAGE="http://www.gentoo.org/"
 SRC_URI="http://dev.gentoo.org/~wolf31o2/sources/${PN}/${PF}.tar.bz2"
 
 SLOT=${PV}
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64"
 
-DEPEND="bootsplash? ( >=media-gfx/bootsplash-0.6-r16 )
-	!bootsplash? ( media-gfx/splashutils )"
+DEPEND="media-gfx/splashutils"
 
 src_install() {
-	if use bootsplash; then
-		dodir /etc/bootsplash/livecd-${PV}
-		cp -r ${S}/* ${D}/etc/bootsplash/livecd-${PV}
-	else
-		dodir /etc/splash/livecd-${PV}
-		cp -r ${S}/* ${D}/etc/splash/livecd-${PV}
-	fi
+	dodir /etc/splash/livecd-${PV}
+	cp -r ${S}/* ${D}/etc/splash/livecd-${PV}
 }
diff --git a/media-gfx/splash-themes-livecd/splash-themes-livecd-2005.0.ebuild b/media-gfx/splash-themes-livecd/splash-themes-livecd-2005.0.ebuild
index b776c55db008..96e846371461 100644
--- a/media-gfx/splash-themes-livecd/splash-themes-livecd-2005.0.ebuild
+++ b/media-gfx/splash-themes-livecd/splash-themes-livecd-2005.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/media-gfx/splash-themes-livecd/splash-themes-livecd-2005.0.ebuild,v 1.1 2005/03/28 00:23:15 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splash-themes-livecd/splash-themes-livecd-2005.0.ebuild,v 1.1.1.1 2005/11/30 09:37:32 chriswhite Exp $
 
 MY_P="gentoo-livecd-${PV}"
 MY_REV="0.9.1"
-DESCRIPTION="Gentoo ${PV} theme for bootsplash consoles"
+DESCRIPTION="Gentoo theme for gensplash consoles"
 HOMEPAGE="http://www.gentoo.org/"
 SRC_URI="http://dev.gentoo.org/~wolf31o2/sources/${PN}/${MY_P}-${MY_REV}.tar.bz2"
 
 SLOT=${PV}
 LICENSE="GPL-2"
-KEYWORDS="x86 amd64"
+KEYWORDS="x86 amd64 ~ppc"
 IUSE=""
 
 DEPEND=">=media-gfx/splashutils-0.9.1"
diff --git a/media-gfx/splash-themes-livecd/splash-themes-livecd-2005.1.ebuild b/media-gfx/splash-themes-livecd/splash-themes-livecd-2005.1.ebuild
index 87d55b2aadb4..753a99ae94c5 100644
--- a/media-gfx/splash-themes-livecd/splash-themes-livecd-2005.1.ebuild
+++ b/media-gfx/splash-themes-livecd/splash-themes-livecd-2005.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splash-themes-livecd/splash-themes-livecd-2005.1.ebuild,v 1.1 2005/07/10 16:43:22 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splash-themes-livecd/splash-themes-livecd-2005.1.ebuild,v 1.1.1.1 2005/11/30 09:37:32 chriswhite Exp $
 
 MY_P="gentoo-livecd-${PV}"
 MY_REV="0.9.2"
@@ -10,7 +10,7 @@ SRC_URI="http://dev.gentoo.org/~wolf31o2/sources/${PN}/${MY_P}-${MY_REV}.tar.bz2
 
 SLOT=${PV}
 LICENSE="GPL-2"
-KEYWORDS="x86 amd64 ~ppc"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 DEPEND=">=media-gfx/splashutils-1.1.9.7"
diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index a74f0807923e..593defd78682 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,274 @@
 # ChangeLog for media-gfx/splashutils
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.1 2004/08/21 21:23:57 spock Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.1.1.1 2005/11/30 09:37:21 chriswhite Exp $
+
+  20 Nov 2005; Michał Januszewski <spock@gentoo.org>
+  +files/splashutils-1.1.9.10-ppc-2.6.14.patch, splashutils-1.1.9.10.ebuild:
+  Added a patch to allow building splashutils against 2.6.14 on ppc (bug
+  #112744).
+
+*splashutils-1.1.9.10 (29 Sep 2005)
+
+  29 Sep 2005; Michał Januszewski <spock@gentoo.org>
+  -splashutils-0.9.1.ebuild, -splashutils-1.1.9.6-r1.ebuild,
+  -splashutils-1.1.9.7.ebuild, +splashutils-1.1.9.10.ebuild:
+  Version bump.
+
+  09 Sep 2005; Michał Januszewski <spock@gentoo.org>
+  splashutils-1.1.9.9-r1.ebuild:
+  Updated zlib to 1.2.3 (requested in bug #104118).
+
+  08 Sep 2005; Michał Januszewski <spock@gentoo.org>
+  splashutils-1.1.9.9-r1.ebuild:
+  Added a fix for bug #104251 -- try to support gcc built with the 'vanilla' 
+  USE flag.
+
+  02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
+  splashutils-1.1.9.8.ebuild:
+  Stable on ppc.
+
+  31 Aug 2005; Luis Medinas <metalgod@gentoo.org>
+  splashutils-1.1.9.8.ebuild:
+  Marked Stable on AMD64.
+
+*splashutils-1.1.9.9-r1 (28 Aug 2005)
+
+  28 Aug 2005; Michał Januszewski <spock@gentoo.org>
+  +files/splashutils-1.1.9.9-external-klibc.patch,
+  splashutils-1.1.9.8.ebuild, +splashutils-1.1.9.9-r1.ebuild:
+  Updated the splashutils ebuild to build against external klibc. Credits for
+  the patch go to Martin Schlemmer <azarah (at) gentoo (dot) org> (bug
+  #103855). Marked 1.1.9.8 stable on x86.
+
+*splashutils-1.1.9.9 (21 Aug 2005)
+
+  21 Aug 2005; Michał Januszewski <spock@gentoo.org>
+  +splashutils-1.1.9.9.ebuild:
+  Version bump.
+
+  20 Jul 2005; Joseph Jezak <josejx@gentoo.org> splashutils-1.1.9.7.ebuild:
+  Marked ppc stable for 2.6.12 support.
+
+*splashutils-1.1.9.8 (18 Jul 2005)
+
+  18 Jul 2005; Michał Januszewski <spock@gentoo.org>
+  +splashutils-1.1.9.8.ebuild:
+  Version bump.
+
+*splashutils-1.1.9.7 (09 Jul 2005)
+
+  09 Jul 2005; Michał Januszewski <spock@gentoo.org>
+  +splashutils-1.1.9.7.ebuild:
+  Version bump -- 1.1.9.7 includes many bugfixes and has support for genkernel
+  initrds. Changed all KBUILD_OUTPUT references to KV_OUT_DIR in the ebuild.
+  This should fix compilation problems for people using an external kernel
+  object directory.
+
+  08 Jul 2005; Michał Januszewski <spock@gentoo.org>
+  -splashutils-1.1.9.6.ebuild, splashutils-1.1.9.6-r1.ebuild:
+  Fixed a typo in the ebuild info messages (bug #98375). Removed old ebuild.
+
+  07 Jul 2005; Herbie Hopkins <herbs@gentoo.org>
+  splashutils-1.1.9.6-r1.ebuild:
+  Stable on amd64.
+
+  06 Jul 2005; Daniel Drake <dsd@gentoo.org> splashutils-1.1.9.6-r1.ebuild:
+  Stable on x86, required for fbsplash on 2.6.12
+
+  23 Jun 2005; Michał Januszewski <spock@gentoo.org>
+  splashutils-1.1.9.6-r1.ebuild:
+  Use KERNEL_DIR instead of /usr/src/linux for the kernel source tree (bug
+  #96897).
+
+  23 Jun 2005; Michał Januszewski <spock@gentoo.org>
+  splashutils-1.1.9.6.ebuild, splashutils-1.1.9.6-r1.ebuild:
+  Replaced 'mkdev' with 'mknod' (bug #96725).
+
+  12 Jun 2005; Michał Januszewski <spock@gentoo.org>
+  splashutils-0.9.1.ebuild, splashutils-1.1.9.6.ebuild:
+  Negate -fstack-protector regardless of the 'hardened' USE flag state (fix
+  for bug #71193).
+
+  12 Jun 2005; Michał Januszewski <spock@gentoo.org>
+  -splashutils-1.1.9.5.ebuild:
+  Removed old ebuild.
+
+*splashutils-1.1.9.6-r1 (12 Jun 2005)
+
+  12 Jun 2005; Michał Januszewski <spock@gentoo.org>
+  +splashutils-1.1.9.6-r1.ebuild:
+  Added a fix for bug #95657.
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  splashutils-0.9.1.ebuild:
+  Stable on ppc.
+
+  24 May 2005; Herbie Hopkins <herbs@gentoo.org> splashutils-1.1.9.6.ebuild:
+  fixed multilib issue
+
+*splashutils-1.1.9.6 (16 May 2005)
+
+  16 May 2005; Michał Januszewski <spock@gentoo.org>
+  -splashutils-1.1.9.3.ebuild, -splashutils-1.1.9.4.ebuild,
+  +splashutils-1.1.9.6.ebuild:
+  And another bugfix release, which includes fixes for some remaining issues 
+  spotted in the 1.1.9.x series (bug #90483 comes to mind). The default silent 
+  tty has now been set to tty16 to avoid conflicts with consolefont and 
+  syslog-ng. If you have a 'tty:' setting on your kernel command line, try 
+  removing it in case of any problems. A new utility script, called 
+  splash_manager, is included in this release. The script can be used for 
+  switching, setting, testing and listing themes. It's somewhat experimental
+  at this stage, so please test it. If you are not sure how the kernel command 
+  line should be set, try using 'splash_manager -c switch -t <theme>'.
+
+  29 Apr 2005; Michał Januszewski <spock@gentoo.org>
+  -splashutils-0.9_rc1.ebuild, -splashutils-1.1.9.1.ebuild,
+  -splashutils-1.1.9.2.ebuild:
+  Removed old ebuilds.
+
+*splashutils-1.1.9.5 (29 Apr 2005)
+
+  29 Apr 2005; Michał Januszewski <spock@gentoo.org>
+  +splashutils-1.1.9.5.ebuild:
+  Yet another bugfix release. Includes fixes for 16bpp modes, and complete or
+  partial fixes for bugs: #90307, #90331, #90483, #90556. There have also been
+  some important changes in the ebuild. The sample Gentoo themes have been
+  removed from this package and are now available in
+  media-gfx/splash-themes-gentoo. Some additional sanity checks (/dev/tty1
+  presence, GCC_SPEC checking) have been added to make it easier to fix common
+  problems.
+
+  26 Apr 2005; Michał Januszewski <spock@gentoo.org>
+  splashutils-1.1.9.4.ebuild:
+  Avoid installing the default symlink if it already exists -- fixed bug #90484.
+
+*splashutils-1.1.9.4 (24 Apr 2005)
+
+  24 Apr 2005; Michał Januszewski <spock@gentoo.org>
+  +splashutils-1.1.9.4.ebuild:
+  A bugfix release (fixes bugs: #88461, #87113, #85531). It also introduces
+  support for new USE flags: png, truetype and kdgraphics. The first two of
+  them should probably be enabled to make sure all themes work correctly.
+  kdgraphics is a local USE flag which changes the way the silent splash image
+  is displayed. Please read the description in use.local.desc before enabling
+  it, as it has the potential to break things and it should probably be kept
+  disabled in all common situations.
+
+*splashutils-1.1.9.3 (28 Mar 2005)
+
+  28 Mar 2005; Michał Januszewski <spock@gentoo.org>
+  +splashutils-1.1.9.3.ebuild:
+  A new release with bugfixes and some simple new features. Please have a look
+  at the project changelog at my devsite for a full list of changes.
+
+*splashutils-1.1.9.2 (21 Mar 2005)
+
+  21 Mar 2005; Michał Januszewski <spock@gentoo.org>
+  +splashutils-1.1.9.2.ebuild:
+  Version bump. Mostly bugfixes. Please have a look at the project homepage
+  for a full list of changes.
+
+*splashutils-1.1.9.1 (09 Mar 2005)
+
+  09 Mar 2005; Michał Januszewski <spock@gentoo.org>
+  +splashutils-1.1.9.1.ebuild:
+  Added a development version of splashutils.
+
+  08 Mar 2005; Michał Januszewski <spock@gentoo.org>
+  splashutils-0.9.1.ebuild, -splashutils-0.9_pre09.ebuild,
+  -splashutils-0.9_pre10.ebuild, splashutils-0.9_rc1.ebuild:
+  Removed old ebuilds. Updated the remaining ebuilds to work with KBUILD_OUTPUT.
+
+  07 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  splashutils-0.9.1.ebuild:
+  Marking stable on amd64 so we have the right version on the LiveCD... bad
+  spock...
+
+  01 Mar 2005; Michał Januszewski <spock@gentoo.org>
+  splashutils-0.9.1.ebuild:
+  Marked stable on x86.
+
+  11 Feb 2005; Michał Januszewski <spock@gentoo.org>
+  splashutils-0.9.1.ebuild, splashutils-0.9_pre09.ebuild,
+  splashutils-0.9_pre10.ebuild, splashutils-0.9_rc1.ebuild:
+  Added version deps as a fix for bug #81608.
+
+*splashutils-0.9.1 (27 Jan 2005)
+
+  27 Jan 2005; Michał Januszewski <spock@gentoo.org>
+  +splashutils-0.9.1.ebuild, -splashutils-0.9_pre07.ebuild,
+  -splashutils-0.9_pre08.ebuild:
+  Added a new version of splashutils with some amazing new features and
+  bugfixes which I'm too lazy to list here ;) Removed old ebuilds.
+
+  16 Jan 2005; Michal Januszewski <spock@gentoo.org>
+  splashutils-0.9_rc1.ebuild:
+  Added hardened compilation fixes from bug #71193.
+
+  12 Jan 2005; Michal Januszewski <spock@gentoo.org>
+  splashutils-0.9_rc1.ebuild:
+  Marked stable on x86.
+
+  04 Jan 2005; Michael Hanselmann <hansmi@gentoo.org>
+  splashutils-0.9_rc1.ebuild:
+  Added to ~ppc, bug 76637.
+
+*splashutils-0.9_rc1 (12 Nov 2004)
+
+  12 Nov 2004; Michal Januszewski <spock@gentoo.org>
+  +splashutils-0.9_rc1.ebuild:
+  A new bugfix release. Closes #68853 and #70029. Fixes some theme issues
+  (wrong images for 8bpp, wrong box coordinates for the gentoo theme).
+
+  20 Oct 2004; Michal Januszewski <spock@gentoo.org>
+  splashutils-0.9_pre10.ebuild:
+  Marked splashutils stable on x86 and amd64. Changed baselayout dep. to >=
+  1.9.4-r5.
+
+  13 Oct 2004; Michal Januszewski <spock@gentoo.org>
+  splashutils-0.9_pre07.ebuild, splashutils-0.9_pre08.ebuild,
+  splashutils-0.9_pre09.ebuild, splashutils-0.9_pre10.ebuild:
+  Added a dep on virtual/linux-sources.
+
+  01 Oct 2004; Michal Januszewski <spock@gentoo.org>
+  splashutils-0.9_pre10.ebuild:
+  Added a little fix (removed dependency on unistd.h for syscalls.nrs) which
+  should make splashutils compile with older kernels.
+
+*splashutils-0.9_pre10 (27 Sep 2004)
+
+  27 Sep 2004; Michal Januszewski <spock@gentoo.org>
+  +splashutils-0.9_pre10.ebuild:
+  Splashutils update. Includes small bugfixes, klibc and libpng updates, and
+  2.6.9-rc2 compatibility. Closes bug #64068.
+
+  08 Sep 2004; Michal Januszewski <spock@gentoo.org>
+  splashutils-0.9_pre09.ebuild:
+  Updated the klibc version (bug #63170). Marked ~amd64.
+
+*splashutils-0.9_pre09 (07 Sep 2004)
+
+  07 Sep 2004; Michal Januszewski <spock@gentoo.org>
+  +splashutils-0.9_pre09.ebuild:
+  Splashutils update, includes fixes for amd64 and dithering for 15/16bpp modes.
+  Special thanks to Christian Roessner for his help with making it work on 
+  amd64.
+
+*splashutils-0.9_pre08 (05 Sep 2004)
+
+  05 Sep 2004; Michal Januszewski <spock@gentoo.org>
+  +splashutils-0.9_pre08.ebuild:
+  Version bump. Added a new theme 'gentoo' and fixed the 'emergence' theme. For
+  a full ChangeLog for splashutils check http://dev.gentoo.org/~spock/. Closes
+  bugs #61341, #61478, #61960 and possibly #61678.
+
+  30 Aug 2004; Michal Januszewski <spock@gentoo.org>
+  splashutils-0.9_pre07.ebuild:
+  Updated the ebuild to display info about 'make prepare', not try to execute it.
+
+  22 Aug 2004; Michal Januszewski <spock@gentoo.org>
+  splashutils-0.9_pre07.ebuild:
+  Added a fix for 8bpp silent images for the emergence theme.
 
 *splashutils-0.9_pre07 (21 Aug 2004)
 
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index 76a6694ebfe6..351472297abb 100644
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -1,17 +1,22 @@
-MD5 4dcae7f7dfe19ee2441b8ba73620775d splashutils-0.9_pre04.ebuild 2505
-MD5 f4ce235ff3db59715830c33eac59d428 splashutils-0.9_pre06.ebuild 2728
-MD5 097b19a13dc749d636bf9b9ca8f30d33 splashutils-0.9_pre03.ebuild 785
-MD5 4dcae7f7dfe19ee2441b8ba73620775d splashutils-0.9_pre05.ebuild 2505
-MD5 285d246ff6d86975c6db0a18a328e443 splashutils-0.9_pre07.ebuild 1913
-MD5 19fcfc01b17ba5d8df6d139ca3c15cdb files/rc 18710
-MD5 51b24ed63c332283553019f6e245b2a7 files/runscript.sh 12328
-MD5 8384ef0de697d8a905415195d331fe56 files/functions.sh 11452
-MD5 c7beb32cfdb3c544db31bb4c1c601c40 files/digest-splashutils-0.9_pre03 143
-MD5 0005eb751201e533426dcda23e083e43 files/digest-splashutils-0.9_pre04 214
-MD5 2828f94ce7ce1d230c8f19fb2e55f0e4 files/digest-splashutils-0.9_pre05 214
-MD5 3e182e1395c82217ada9dd2b1caa54e4 files/digest-splashutils-0.9_pre06 216
-MD5 ebf22f53007c23687b34a3131f69b230 files/digest-splashutils-0.9_pre07 299
-MD5 cdfbad1f12adf713f414104b14c84edf files/splash-functions.sh 4240
-MD5 b9e63c7ad2c10de42102ff1cfec67aa3 files/splash 3175
-MD5 072119bd0d46d0e81c9a762c94c87f90 files/splash.conf 551
-MD5 893755d681290bbc52c6bacdd4686a26 files/rc-services.sh 15746
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9bb520965d955a7a145093568fd90291 ChangeLog 10633
+MD5 c518e5f1875064cb0c5784f53f9db7f5 files/digest-splashutils-1.1.9.10 484
+MD5 c55d25b2df1c791c0fa802c0de31af73 files/digest-splashutils-1.1.9.8 547
+MD5 227086af2d5e8360c3e2f23cdbfb97eb files/digest-splashutils-1.1.9.9 548
+MD5 887e148191dfd124be52f9682e391c78 files/digest-splashutils-1.1.9.9-r1 483
+MD5 6b70ab6899c37465a35de0f0a89c6365 files/splashutils-1.1.9.10-ppc-2.6.14.patch 749
+MD5 c9591cbde5eca614a8e1694ee01c315f files/splashutils-1.1.9.9-external-klibc.patch 10294
+MD5 cfe1b5f88cc51ac6ffc42809178d2a06 metadata.xml 221
+MD5 49dce03a53018b483790a604c1745a4d splashutils-1.1.9.10.ebuild 6327
+MD5 4180e756570d9f26db82b36b42c8cbc3 splashutils-1.1.9.8.ebuild 6287
+MD5 1b03f7bbbe2db156b7b1a54d51d76ea0 splashutils-1.1.9.9-r1.ebuild 6234
+MD5 98fd11c248eba6f1f945bc2d7e530664 splashutils-1.1.9.9.ebuild 6323
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDgOUschej4aZK9/cRAjH4AJ9FG34BrxVesp4OwTrTMo76m97dSgCfSQpI
+XnPQ09IEJrA40Z0ASO2xheQ=
+=rRBG
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/splashutils/files/digest-splashutils-1.1.9.10 b/media-gfx/splashutils/files/digest-splashutils-1.1.9.10
index 623c3f264ac8..d3024bebfec2 100644
--- a/media-gfx/splashutils/files/digest-splashutils-1.1.9.10
+++ b/media-gfx/splashutils/files/digest-splashutils-1.1.9.10
@@ -1,7 +1,7 @@
-MD5 3603b1d5124bf7a143f201dd828c95d7 splashutils-lite-1.1.9.10.tar.bz2 55094
-MD5 89c00eb118a549348bd3a97ee7087ecc splashutils-gentoo-0.1.14.tar.bz2 7750
-MD5 f8e92992682bbaf8e6eb2316ac708bc0 miscsplashutils-0.1.3.tar.bz2 91825
-MD5 00cea4539bea4bd34cbf8b82ff9589cd libpng-1.2.8.tar.bz2 384970
-MD5 dbd5f3b47ed13132f04c685d608a7547 jpegsrc.v6b.tar.gz 613261
 MD5 ec1b903e4be5f073caa72458ea58c29c freetype-2.1.9.tar.bz2 992394
+MD5 dbd5f3b47ed13132f04c685d608a7547 jpegsrc.v6b.tar.gz 613261
+MD5 00cea4539bea4bd34cbf8b82ff9589cd libpng-1.2.8.tar.bz2 384970
+MD5 f8e92992682bbaf8e6eb2316ac708bc0 miscsplashutils-0.1.3.tar.bz2 91825
+MD5 89c00eb118a549348bd3a97ee7087ecc splashutils-gentoo-0.1.14.tar.bz2 7750
+MD5 3603b1d5124bf7a143f201dd828c95d7 splashutils-lite-1.1.9.10.tar.bz2 55094
 MD5 dee233bf288ee795ac96a98cc2e369b6 zlib-1.2.3.tar.bz2 425209
diff --git a/media-gfx/splashutils/files/digest-splashutils-1.1.9.9-r1 b/media-gfx/splashutils/files/digest-splashutils-1.1.9.9-r1
index a8d67902b41a..bf70d8ddfd23 100644
--- a/media-gfx/splashutils/files/digest-splashutils-1.1.9.9-r1
+++ b/media-gfx/splashutils/files/digest-splashutils-1.1.9.9-r1
@@ -4,4 +4,4 @@ MD5 f8e92992682bbaf8e6eb2316ac708bc0 miscsplashutils-0.1.3.tar.bz2 91825
 MD5 00cea4539bea4bd34cbf8b82ff9589cd libpng-1.2.8.tar.bz2 384970
 MD5 dbd5f3b47ed13132f04c685d608a7547 jpegsrc.v6b.tar.gz 613261
 MD5 ec1b903e4be5f073caa72458ea58c29c freetype-2.1.9.tar.bz2 992394
-MD5 8106069990476a3c5187301465bd7a60 zlib-1.2.1.tar.bz2 284152
+MD5 dee233bf288ee795ac96a98cc2e369b6 zlib-1.2.3.tar.bz2 425209
diff --git a/media-gfx/splashutils/splashutils-1.1.9.10.ebuild b/media-gfx/splashutils/splashutils-1.1.9.10.ebuild
index b1bf8e25f288..756895e879d5 100644
--- a/media-gfx/splashutils/splashutils-1.1.9.10.ebuild
+++ b/media-gfx/splashutils/splashutils-1.1.9.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/media-gfx/splashutils/splashutils-1.1.9.10.ebuild,v 1.1 2005/09/29 08:47:37 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.1.9.10.ebuild,v 1.1.1.1 2005/11/30 09:37:21 chriswhite Exp $
 
 inherit eutils multilib linux-mod
 
@@ -87,6 +87,8 @@ src_unpack() {
 	rm ${S}/libs/zlib-${V_ZLIB}/Makefile
 	cd ${S}
 
+	epatch ${FILESDIR}/splashutils-1.1.9.10-ppc-2.6.14.patch
+
 	# Check whether the kernel tree has been patched with fbsplash.
 	if [[ ! -e ${KV_DIR}/include/linux/console_splash.h ]]; then
 		ewarn "Your kernel in ${KV_DIR} has not been patched with a compatible version"
@@ -128,7 +130,7 @@ src_compile() {
 	emake LIB=$(get_libdir) || die "failed to build miscsplashutils"
 	cd ${S}
 	export ZLIBSRC LPNGSRC JPEGSRC FT2SRC
-	emake -j1 LIB=$(get_libdir) || die "failed to build splashutils"
+	emake -j1 LIB=$(get_libdir) ARCH=$(tc-arch-kernel) || die "failed to build splashutils"
 }
 
 src_install() {
diff --git a/media-gfx/splashutils/splashutils-1.1.9.8.ebuild b/media-gfx/splashutils/splashutils-1.1.9.8.ebuild
index b015fa5cee4f..063f917b84b3 100644
--- a/media-gfx/splashutils/splashutils-1.1.9.8.ebuild
+++ b/media-gfx/splashutils/splashutils-1.1.9.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/media-gfx/splashutils/splashutils-1.1.9.8.ebuild,v 1.1 2005/07/18 20:19:35 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.1.9.8.ebuild,v 1.1.1.1 2005/11/30 09:37:22 chriswhite Exp $
 
 inherit multilib linux-mod
 
@@ -29,7 +29,7 @@ SRC_URI="mirror://gentoo/${PN}-lite-${PV}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="amd64 ppc x86"
 RDEPEND="truetype? ( >=media-libs/freetype-2 )
 	png? ( >=media-libs/libpng-1.2.7 )
 	>=media-libs/jpeg-6b
@@ -105,7 +105,7 @@ src_unpack() {
 
 	# Use tty16 as the default silent tty.
 	sed -i -e 's/#define TTY_SILENT.*/#define TTY_SILENT 16/' ${S}/splash.h
-	
+
 	# Setup the kernel object directory
 	echo "KRNLOBJ = ${KV_OUT_DIR}" >> ${S}/libs/klibc-${V_KLIBC}/MCONFIG
 }
@@ -143,7 +143,7 @@ src_install() {
 
 	insinto /usr/share/${PN}
 	doins ${SG}/initrd.splash
-	
+
 	insinto /sbin
 	doins ${SG}/splash-functions.sh
 
@@ -159,7 +159,7 @@ src_install() {
 pkg_postinst() {
 	ebegin "Checking whether /dev/tty1 is in place"
 	mount --bind / ${T}
-	
+
 	if [[ ! -c ${T}/dev/tty1 ]]; then
 		eend 1
 		ewarn "It appears that the /dev/tty1 character device doesn't exist on"
@@ -182,7 +182,7 @@ pkg_postinst() {
 		ewarn "  http://www.gentoo.org/doc/en/udev-guide.xml"
 		echo ""
 	fi
-		
+
 	ewarn "If you upgrade your kernel from pre-2.6.12 to 2.6.12 or higher, please"
 	ewarn "make sure that you remerge this package and rebuild your initrds. You"
 	ewarn "can use the splash_geninitramfs script to do that."
diff --git a/media-gfx/splashutils/splashutils-1.1.9.9-r1.ebuild b/media-gfx/splashutils/splashutils-1.1.9.9-r1.ebuild
index c315537d280f..6c56cd644dd0 100644
--- a/media-gfx/splashutils/splashutils-1.1.9.9-r1.ebuild
+++ b/media-gfx/splashutils/splashutils-1.1.9.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/media-gfx/splashutils/splashutils-1.1.9.9-r1.ebuild,v 1.1 2005/08/28 19:33:33 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.1.9.9-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:21 chriswhite Exp $
 
 inherit eutils multilib linux-mod
 
@@ -8,9 +8,14 @@ MISCSPLASH="miscsplashutils-0.1.3"
 GENTOOSPLASH="splashutils-gentoo-0.1.13"
 V_JPEG="6b"
 V_PNG="1.2.8"
-V_ZLIB="1.2.1"
+V_ZLIB="1.2.3"
 V_FT="2.1.9"
 
+ZLIBSRC="libs/zlib-${V_ZLIB}"
+LPNGSRC="libs/libpng-${V_PNG}"
+JPEGSRC="libs/jpeg-${V_JPEG}"
+FT2SRC="libs/freetype-${V_FT}"
+
 IUSE="hardened png truetype kdgraphics"
 
 DESCRIPTION="Framebuffer splash utilities."
@@ -96,8 +101,13 @@ src_unpack() {
 		spl_conf yes CONFIG_FBSPLASH
 	fi
 
-	# This should make splashutils compile on systems with hardened GCC.
-	sed -e 's@K_CFLAGS =@K_CFLAGS = -fno-stack-protector@' -i ${S}/Makefile
+	if built_with_use sys-devel/gcc vanilla ; then
+		ewarn "Your GCC was built with the 'vanilla' flag set. If you can't compile"
+		ewarn "splashutils, you're on your own, as this configuration is not supported."
+	else
+		# This should make splashutils compile on systems with hardened GCC.
+		sed -e 's@K_CFLAGS =@K_CFLAGS = -fno-stack-protector@' -i ${S}/Makefile
+	fi
 
 	mkdir ${S}/kernel
 
@@ -111,12 +121,11 @@ src_compile() {
 	spl_conf_use truetype CONFIG_TTF_KERNEL
 	spl_conf_use kdgraphics CONFIG_SILENT_KD_GRAPHICS
 	sed -i -e "s/^CFLAGS[ \t]*=.*/CFLAGS = ${CFLAGS}/" Makefile
-		LIBCSRC="libs/klibc-${V_KLIBC}/klibc" \
-		|| die "failed to build splashutils"
 
 	cd ${SM}
 	emake LIB=$(get_libdir) || die "failed to build miscsplashutils"
 	cd ${S}
+	export ZLIBSRC LPNGSRC JPEGSRC FT2SRC
 	emake -j1 LIB=$(get_libdir) || die "failed to build splashutils"
 }
 
@@ -124,6 +133,7 @@ src_install() {
 	cd ${SM}
 	make DESTDIR=${D} install || die
 
+	export ZLIBSRC LPNGSRC JPEGSRC FT2SRC
 	cd ${S}
 	make DESTDIR=${D} install || die
 
diff --git a/media-gfx/splashutils/splashutils-1.1.9.9.ebuild b/media-gfx/splashutils/splashutils-1.1.9.9.ebuild
index 0db2dad0bed1..2b633dd1504d 100644
--- a/media-gfx/splashutils/splashutils-1.1.9.9.ebuild
+++ b/media-gfx/splashutils/splashutils-1.1.9.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/media-gfx/splashutils/splashutils-1.1.9.9.ebuild,v 1.1 2005/08/21 19:52:07 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.1.9.9.ebuild,v 1.1.1.1 2005/11/30 09:37:21 chriswhite Exp $
 
 inherit multilib linux-mod
 
diff --git a/media-gfx/springgraph/ChangeLog b/media-gfx/springgraph/ChangeLog
index c8c47f019254..dfdd3a5e78c9 100644
--- a/media-gfx/springgraph/ChangeLog
+++ b/media-gfx/springgraph/ChangeLog
@@ -1,6 +1,40 @@
 # ChangeLog for media-gfx/springgraph
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/springgraph/ChangeLog,v 1.1 2003/12/02 05:07:52 robbat2 Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/springgraph/ChangeLog,v 1.1.1.1 2005/11/30 09:37:13 chriswhite Exp $
+
+  08 May 2005; Aron Griffis <agriffis@gentoo.org> springgraph-82.ebuild:
+  stable on ia64
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> springgraph-82.ebuild:
+  Stable on amd64.
+
+  13 Oct 2004; Guy Martin <gmsoft@gentoo.org> springgraph-82.ebuild:
+  Stable on hppa.
+
+  18 Sep 2004; Jason Wever <weeve@gentoo.org> springgraph-82.ebuild:
+  Stable on sparc.
+
+  08 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> springgraph-82.ebuild:
+  Stable on alpha.
+
+  18 Jul 2004; Robin H. Johnson <robbat2@gentoo.org> springgraph-79.ebuild,
+  springgraph-82.ebuild:
+  fix up warnings, stable 82 on x86.
+
+*springgraph-82 (29 May 2004)
+
+  29 May 2004; Robin H. Johnson <robbat2@gentoo.org> springgraph-79.ebuild,
+  springgraph-82.ebuild:
+  version bump, and old ver in stable
+
+  04 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> springgraph-79.ebuild:
+  fix header dates
+
+  04 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> springgraph-79.ebuild:
+  fix description
 
 *springgraph-79 (01 Dec 2003)
 
diff --git a/media-gfx/springgraph/Manifest b/media-gfx/springgraph/Manifest
index d63aa64e2e75..67fdc5313e38 100644
--- a/media-gfx/springgraph/Manifest
+++ b/media-gfx/springgraph/Manifest
@@ -1,2 +1,6 @@
-MD5 bba002a508514d58bad42cc7781aa56e springgraph-79.ebuild 530
+MD5 ad3e6e2666399656220e675a0af6141d springgraph-79.ebuild 705
+MD5 b5459e16203163aa5ebd53bd0801251d springgraph-82.ebuild 927
+MD5 544d97b39cdb2b59f2bf6a31fd050f74 ChangeLog 1453
+MD5 33972e24d3f8c3621bd32c36ba6e8b6c metadata.xml 716
 MD5 b0879467842149fda0eb7ccea27b6a64 files/digest-springgraph-79 61
+MD5 263d583a99ac0787161b08250a2017b1 files/digest-springgraph-82 140
diff --git a/media-gfx/springgraph/springgraph-79.ebuild b/media-gfx/springgraph/springgraph-79.ebuild
index b34f3a54f4be..9e47fb727f49 100644
--- a/media-gfx/springgraph/springgraph-79.ebuild
+++ b/media-gfx/springgraph/springgraph-79.ebuild
@@ -1,18 +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/media-gfx/springgraph/springgraph-79.ebuild,v 1.1 2003/12/02 05:07:52 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/springgraph/springgraph-79.ebuild,v 1.1.1.1 2005/11/30 09:37:13 chriswhite Exp $
 
-DESCRIPTION="This is a sample skeleton ebuild file"
-HOMEPAGE="http://www.chaosreigns.com/code/springgraph"
+DESCRIPTION="Generate spring graphs from graphviz input files"
+BASE_URI="http://www.chaosreigns.com/code/springgraph"
+HOMEPAGE="${BASE_URI}"
 SRC_FILENAME="${PN}.pl.${PV}"
-SRC_URI="${HOMEPAGE}/dl/${SRC_FILENAME}"
+SRC_URI="${BASE_URI}/dl/${SRC_FILENAME}"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~arm ~hppa ~mips ~ppc ~sparc ia64 amd64"
+KEYWORDS="x86 alpha hppa ~mips ppc sparc ia64 amd64"
 IUSE=""
 DEPEND=""
 RDEPEND="dev-perl/GD"
-S=${WORKDIR}/${P}
 
 src_unpack() {
 	# nothing to do
diff --git a/media-gfx/springgraph/springgraph-82.ebuild b/media-gfx/springgraph/springgraph-82.ebuild
index fc45d0ac3a5e..49069231361a 100644
--- a/media-gfx/springgraph/springgraph-82.ebuild
+++ b/media-gfx/springgraph/springgraph-82.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/media-gfx/springgraph/springgraph-82.ebuild,v 1.1 2004/05/30 02:11:46 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/springgraph/springgraph-82.ebuild,v 1.1.1.1 2005/11/30 09:37:13 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="Generate spring graphs from graphviz input files"
 HOMEPAGE="http://www.chaosreigns.com/code/springgraph"
@@ -12,7 +14,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${SRC_FILE}
 		 mirror://debian/pool/main/${PN:0:1}/${PN}/${SRC_DEBIAN_PATCH}"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~hppa ~mips ~ppc ~sparc ~ia64 ~amd64"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86"
 IUSE=""
 DEPEND=""
 RDEPEND="dev-perl/GD"
diff --git a/media-gfx/surf/ChangeLog b/media-gfx/surf/ChangeLog
index f40708445cad..7d2ce26f7d49 100644
--- a/media-gfx/surf/ChangeLog
+++ b/media-gfx/surf/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-gfx/surf
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/surf/ChangeLog,v 1.1 2003/10/04 22:25:51 matsuu Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/surf/ChangeLog,v 1.1.1.1 2005/11/30 09:37:20 chriswhite Exp $
+
+  30 Jun 2004; David Holm <dholm@gentoo.org> surf-1.0.4-r1.ebuild:
+  Added to ~ppc.
+
+*surf-1.0.4-r1 (30 Jun 2004)
+
+  30 Jun 2004; MATSUU Takuto <matsuu@gentoo.org> +files/surf-1.0.4-gcc33.patch,
+  +surf-1.0.4-r1.ebuild:
+  Fixed gcc 3.3 compile failures. Bug#53755.
 
 *surf-1.0.4 (05 Oct 2003)
 
diff --git a/media-gfx/surf/Manifest b/media-gfx/surf/Manifest
index 414e92b68198..1c54478c6073 100644
--- a/media-gfx/surf/Manifest
+++ b/media-gfx/surf/Manifest
@@ -1,2 +1,7 @@
-MD5 286513e09f203473aecfd370cdcea706 surf-1.0.4.ebuild 722
+MD5 5084f53d5cbcde4200e685f6dbe22510 surf-1.0.4-r1.ebuild 920
+MD5 2a6203360db56f7ac040d5ec6986e979 surf-1.0.4.ebuild 810
+MD5 6b74d61195d30d1532ca7033f632b78d ChangeLog 579
+MD5 8a67b13e5639d281680288bd86cfdbab metadata.xml 506
+MD5 42e79d8544b3618f7beaee05d2e16ef9 files/surf-1.0.4-gcc33.patch 2009
 MD5 3ca4fef631e9dc15c4f8fb9e2024ca24 files/digest-surf-1.0.4 62
+MD5 3ca4fef631e9dc15c4f8fb9e2024ca24 files/digest-surf-1.0.4-r1 62
diff --git a/media-gfx/surf/metadata.xml b/media-gfx/surf/metadata.xml
index 4b8bd3b77366..c0081d0054ca 100644
--- a/media-gfx/surf/metadata.xml
+++ b/media-gfx/surf/metadata.xml
@@ -4,7 +4,7 @@
 <herd>no-herd</herd>
 <maintainer>
   <email>matsuu@gentoo.org</email>
-  <name>MATSUU Takuto</name> -->
+  <name>MATSUU Takuto</name>
 </maintainer>
 <longdescription>surf is a tool to visualize some real algebraic geometry: plane algebraic curves, algebraic surfaces and hyperplane sections of surfaces. surf is script driven and has (optionally) a nifty GUI using the Gtk widget set. </longdescription>
 </pkgmetadata>
diff --git a/media-gfx/surf/surf-1.0.4-r1.ebuild b/media-gfx/surf/surf-1.0.4-r1.ebuild
index 249b548ac240..93cb2b9825e4 100644
--- a/media-gfx/surf/surf-1.0.4-r1.ebuild
+++ b/media-gfx/surf/surf-1.0.4-r1.ebuild
@@ -1,13 +1,15 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/surf/surf-1.0.4-r1.ebuild,v 1.1 2004/06/30 03:55:58 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/surf/surf-1.0.4-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:20 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="a tool to visualize algebraic curves and algebraic surfaces"
 HOMEPAGE="http://surf.sourceforge.net/"
 SRC_URI="mirror://sourceforge/surf/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86 ~amd64 ~ppc"
 SLOT="0"
 IUSE="gtk"
 
diff --git a/media-gfx/surf/surf-1.0.4.ebuild b/media-gfx/surf/surf-1.0.4.ebuild
index e46b19f39686..e5b18f290c20 100644
--- a/media-gfx/surf/surf-1.0.4.ebuild
+++ b/media-gfx/surf/surf-1.0.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/media-gfx/surf/surf-1.0.4.ebuild,v 1.1 2003/10/04 22:25:51 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/surf/surf-1.0.4.ebuild,v 1.1.1.1 2005/11/30 09:37:20 chriswhite Exp $
 
 DESCRIPTION="a tool to visualize algebraic curves and algebraic surfaces"
 HOMEPAGE="http://surf.sourceforge.net/"
diff --git a/media-gfx/swftools/ChangeLog b/media-gfx/swftools/ChangeLog
index 118bda0fbe00..c66937259c9f 100644
--- a/media-gfx/swftools/ChangeLog
+++ b/media-gfx/swftools/ChangeLog
@@ -1,6 +1,35 @@
 # ChangeLog for media-gfx/swftools
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/swftools/ChangeLog,v 1.1 2003/11/18 17:15:04 rizzo Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/swftools/ChangeLog,v 1.1.1.1 2005/11/30 09:37:15 chriswhite Exp $
+
+  09 Apr 2005; Simon Stelling <blubb@gentoo.org> swftools-0.6.2.ebuild:
+  added ~amd64
+
+*swftools-0.6.2 (30 Nov 2004)
+
+  30 Nov 2004; Don Seiler <rizzo@gentoo.org> swftools-0.5.0-r1.ebuild,
+  +swftools-0.6.2.ebuild:
+  Version bump
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> swftools-0.5.0-r1.ebuild:
+  Add inherit eutils
+
+  21 Feb 2004; Don Seiler <rizzo@gentoo.org>; swftools-0.5.0-r1.ebuild:
+  Correcting deps and avi2swf only works with specificed version
+
+*swftools-0.5.0-r1 (13 Feb 2004)
+
+  13 Feb 2004; Don Seiler <rizzo@gentoo.org>; swftools-0.5.0-r1.ebuild,
+  files/swftools-0.5.0-font.patch:
+  Revision bump for font patch
+
+*swftools-0.5.0 (09 Feb 2004)
+
+  09 Feb 2004; Don Seiler <rizzo@gentoo.org>; swftools-0.5.0.ebuild:
+  Version bump
+
+  18 Nov 2003; Don Seiler <rizzo@gentoo.org>; swftools-0.4.4.ebuild:
+  Added missing RDEPEND apps
 
 *swftools-0.4.4 (18 Nov 2003)
 
diff --git a/media-gfx/swftools/Manifest b/media-gfx/swftools/Manifest
index 1f5a2401ee83..8f85e0dcd275 100644
--- a/media-gfx/swftools/Manifest
+++ b/media-gfx/swftools/Manifest
@@ -1,3 +1,4 @@
-MD5 82800c00bf607da107d49c26a65988ca swftools-0.4.4.ebuild 578
-MD5 5ba33ead936ab22f86ddc0e7f43b8748 metadata.xml 437
-MD5 fc24f2a89ffedcb062c3751929f6c35c files/digest-swftools-0.4.4 67
+MD5 af3d288be3face1bbcf0cc91927e1635 ChangeLog 1245
+MD5 369600b1b203a51d1a1947afa7c1cdb6 metadata.xml 312
+MD5 760842c923c1a214d3f928de176b21a2 swftools-0.6.2.ebuild 777
+MD5 15aa8ade8fb71cd3ecb378d6b47ec99d files/digest-swftools-0.6.2 67
diff --git a/media-gfx/swftools/metadata.xml b/media-gfx/swftools/metadata.xml
index 8be79aaf9a5f..b0d32862ea31 100644
--- a/media-gfx/swftools/metadata.xml
+++ b/media-gfx/swftools/metadata.xml
@@ -2,10 +2,5 @@
 <!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>
-  <!-- <description></description> -->
-</maintainer>
-<longdescription> SWF Tools is a collection of SWF manipulation and generation utilities written by Rainer B�hme and Matthias Kramm.</longdescription>
+<longdescription> SWF Tools is a collection of SWF manipulation and generation utilities written by Rainer Böhme and Matthias Kramm.</longdescription>
 </pkgmetadata>
diff --git a/media-gfx/swftools/swftools-0.6.2.ebuild b/media-gfx/swftools/swftools-0.6.2.ebuild
index 2afb9c809438..78df58a3331e 100644
--- a/media-gfx/swftools/swftools-0.6.2.ebuild
+++ b/media-gfx/swftools/swftools-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/media-gfx/swftools/swftools-0.6.2.ebuild,v 1.1 2004/11/30 19:52:42 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/swftools/swftools-0.6.2.ebuild,v 1.1.1.1 2005/11/30 09:37:15 chriswhite Exp $
 
 inherit eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.quiss.org/swftools/"
 SRC_URI="http://www.quiss.org/swftools/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 IUSE="avi"
 
 DEPEND=">=media-libs/t1lib-1.3.1
diff --git a/media-gfx/tgif/ChangeLog b/media-gfx/tgif/ChangeLog
index a95c7fd56bdd..04a13bb0b875 100644
--- a/media-gfx/tgif/ChangeLog
+++ b/media-gfx/tgif/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for media-gfx/tgif
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/tgif/ChangeLog,v 1.1 2005/05/19 19:46:59 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tgif/ChangeLog,v 1.1.1.1 2005/11/30 09:37:41 chriswhite Exp $
+
+  17 Nov 2005; Homer Parker <hparker@gentoo.org> tgif-4.1.44.ebuild:
+  Marked ~amd64.
+
+  03 Nov 2005; Fabian Groffen <grobian@gentoo.org> tgif-4.1.44.ebuild:
+  Marked ~ppc-macos (bug #110939)
+
+  07 Jun 2005; Luca Barbato <lu_zero@gentoo.org> tgif-4.1.44.ebuild:
+  Fix url, thanks to alawi <alawi@csail.mit.edu> for the report
+
+*tgif-4.1.44 (20 May 2005)
+
+  20 May 2005; Luca Barbato <lu_zero@gentoo.org> +tgif-4.1.44.ebuild:
+  Updated version
 
 *tgif-4.1.43 (19 May 2005)
 
diff --git a/media-gfx/tgif/Manifest b/media-gfx/tgif/Manifest
index cbe178123d7e..075334328f43 100644
--- a/media-gfx/tgif/Manifest
+++ b/media-gfx/tgif/Manifest
@@ -1,2 +1,5 @@
-MD5 e901a9af2463c0059c0a08537797c151 tgif-4.1.43.ebuild 818
+MD5 7b279d6277890f785c7c8ad676fa69bd ChangeLog 815
+MD5 90d71a4740edbc10d1d7a488b2512b17 tgif-4.1.43.ebuild 867
+MD5 5a983bb7c458edd39cccc5b73e58a0c6 tgif-4.1.44.ebuild 919
 MD5 fabdf6f7de1d2dbdbb62cd9b9e9c9a11 files/digest-tgif-4.1.43 64
+MD5 147fae33f70687bc11a61826e30abe65 files/digest-tgif-4.1.44 68
diff --git a/media-gfx/tgif/tgif-4.1.43.ebuild b/media-gfx/tgif/tgif-4.1.43.ebuild
index 17a55881adee..245d4c0ce668 100644
--- a/media-gfx/tgif/tgif-4.1.43.ebuild
+++ b/media-gfx/tgif/tgif-4.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/media-gfx/tgif/tgif-4.1.43.ebuild,v 1.1 2005/05/19 19:46:59 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tgif/tgif-4.1.43.ebuild,v 1.1.1.1 2005/11/30 09:37:42 chriswhite Exp $
 
 DESCRIPTION="Tgif is an Xlib base 2-D drawing facility under X11."
 HOMEPAGE="http://bourbon.cs.umd.edu:8001/tgif/"
diff --git a/media-gfx/tgif/tgif-4.1.44.ebuild b/media-gfx/tgif/tgif-4.1.44.ebuild
index a50b723eed33..a0a645044768 100644
--- a/media-gfx/tgif/tgif-4.1.44.ebuild
+++ b/media-gfx/tgif/tgif-4.1.44.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/media-gfx/tgif/tgif-4.1.44.ebuild,v 1.1 2005/05/20 00:54:34 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tgif/tgif-4.1.44.ebuild,v 1.1.1.1 2005/11/30 09:37:41 chriswhite Exp $
 
 MY_P="${PN}-QPL-${PV}"
 DESCRIPTION="Tgif is an Xlib base 2-D drawing facility under X11."
-HOMEPAGE="http://bourbon.ucs.edu:8001/tgif/"
+HOMEPAGE="http://bourbon.usc.edu:8001/tgif/"
 SRC_URI="ftp://bourbon.usc.edu/pub/tgif/${MY_P}.tar.gz"
 
 S="${WORKDIR}/${MY_P}"
 
-LICENSE="QPL-1"
+LICENSE="QPL-1.0"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~amd64 ~ppc ~ppc-macos ~x86"
 
 DEPEND="virtual/x11"
 
diff --git a/media-gfx/tic98/ChangeLog b/media-gfx/tic98/ChangeLog
index 59e2ca02df31..16896e57dd6f 100644
--- a/media-gfx/tic98/ChangeLog
+++ b/media-gfx/tic98/ChangeLog
@@ -1,6 +1,14 @@
-# ChangeLog for sys-apps/tic98
+# ChangeLog for media-gfx/tic98
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/tic98/ChangeLog,v 1.1 2005/03/05 00:48:58 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tic98/ChangeLog,v 1.1.1.1 2005/11/30 09:37:25 chriswhite Exp $
+
+  03 Nov 2005; Fabian Groffen <grobian@gentoo.org>
+  +files/tic98-1.01-macos.patch, tic98-1.01-r1.ebuild:
+  Added compilation fix for OSX and marked ~ppc-macos (bug #110944)
+
+  02 Aug 2005; <sekretarz@gentoo.org> -files/tic98.diff,
+  files/tic98-1.01-gentoo.diff, tic98-1.01-r1.ebuild:
+  Fixed compile problems, bug #84160. Merged tic98.diff to tic98-gentoo.diff
 
 *tic98-1.01 (05 Mar 2005)
 
diff --git a/media-gfx/tic98/Manifest b/media-gfx/tic98/Manifest
index 4fc6cc4c23f9..51b98b9ac73f 100644
--- a/media-gfx/tic98/Manifest
+++ b/media-gfx/tic98/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c7739da4572153440acfda4f042cf550 ChangeLog 476
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 50a0a0ba7718311bf42a44fd6b416874 tic98-1.01-r1.ebuild 885
-MD5 35f25cf1cc072cb32876f2bfdc63e8c3 tic98-1.01.ebuild 882
-MD5 b2419a7092da155e7165fec26d606e07 files/digest-tic98-1.01 62
+MD5 67a664586abca340c603b5f503d03f2e tic98-1.01-r1.ebuild 776
+MD5 ea29b649c56723cdcb113d0c8cc8ba68 tic98-1.01.ebuild 882
+MD5 c6ac9537ba5649114b922cc6865f47f7 ChangeLog 1081
+MD5 5fc54c5d01402d0610fafa96961bb8e0 metadata.xml 161
 MD5 b2419a7092da155e7165fec26d606e07 files/digest-tic98-1.01-r1 62
-MD5 c7a34ada9751cb8a4ed07f73959c881a files/tic98-1.01-gentoo.diff 2153
-MD5 2deb186a272185cf5454932fb730c77b files/tic98.diff 2480
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.5 (GNU/Linux)
-
-iD8DBQFBKrpyI1lqEGTUzyQRAouTAKDPxmcI50Z4t9RGE2u85y6054+hZwCeJe46
-Sm04cjlUx/d11FV1tA7VhKo=
-=ZXXD
------END PGP SIGNATURE-----
+MD5 b2419a7092da155e7165fec26d606e07 files/digest-tic98-1.01 62
+MD5 b80a7cb3b7dc39abec555032dc752cc5 files/tic98-1.01-macos.patch 643
+MD5 d20e8645219f4317f941051e02713f3b files/tic98-1.01-gentoo.diff 5452
diff --git a/media-gfx/tic98/files/tic98-1.01-gentoo.diff b/media-gfx/tic98/files/tic98-1.01-gentoo.diff
index 21ab2f3a68cf..880dfa059545 100644
--- a/media-gfx/tic98/files/tic98-1.01-gentoo.diff
+++ b/media-gfx/tic98/files/tic98-1.01-gentoo.diff
@@ -80,3 +80,126 @@ diff -Nru tic98/ppmd_model.c tic98.gentoo/ppmd_model.c
  unsigned int
  arith_decode_target (unsigned int totl)
  /* Arithmetically decodes the target. */
+diff -Nru tic98.orig/page_features.c tic98/page_features.c
+--- tic98.orig/page_features.c	1999-06-22 03:48:42.000000000 +0200
++++ tic98/page_features.c	2005-08-02 19:47:09.485681960 +0200
+@@ -37,18 +37,17 @@
+ void
+ dump_header()
+ {
+-  fprintf(stdout,"@arff 3
+-@relation features
+-@attribute 'Number' real
+-@attribute 'Area' real
+-@attribute 'Avg_area' real
+-@attribute 'Density' real
+-@attribute 'Aspect' real
+-@attribute 'Holes' real
+-@attribute 'Edges' real
+-@attribute 'class' string range ( {?} )
+-@data
+-");
++  fprintf(stdout,"@arff 3"
++"@relation features"
++"@attribute 'Number' real"
++"@attribute 'Area' real"
++"@attribute 'Avg_area' real"
++"@attribute 'Density' real"
++"@attribute 'Aspect' real"
++"@attribute 'Holes' real"
++"@attribute 'Edges' real"
++"@attribute 'class' string range ( {?} )"
++"@data");
+ 
+ 
+ }
+diff -ru tic98/main_tic.c tic98-new/main_tic.c
+--- tic98/main_tic.c	Thu Jul  1 21:02:56 1999
++++ tic98-new/main_tic.c	Fri Mar 16 11:43:56 2001
+@@ -11,6 +11,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <errno.h>
+ 
+ #include "arithcode.h"
+ #include "globals.h"
+@@ -96,8 +97,10 @@
+   marklistptr list=NULL,list2=NULL;
+   marktype copy;
+ 
+-  if(marktype_readnamed(fn, image)!=0)
++  if(marktype_readnamed(fn, image)!=0) {
++    fprintf(stderr, "imagefn_to_list(): bad input file %s\n", fn);
+     return NULL;
++  }
+ 
+   *w=image->w;
+   *h=image->h;
+@@ -495,7 +498,10 @@
+ 
+     TimerStart(1);
+ 
+-    freopen(outfilename[0],"wb",stdout);
++    if (! freopen(outfilename[0],"wb",stdout)) {
++	 fprintf(stderr, "failed to open %s for writing: %s\n",
++		 outfilename[0], strerror(errno));
++    }
+ 
+     tic98_init(&t);
+     tic98_start_encoding();
+@@ -503,8 +509,11 @@
+     for(i=0;i<num_in;i++){
+       int w,h,xx,yy,ok=0;
+       marktype image;
+-      list=imagefn_to_list(&image,infilename[i], &w, &h);
+-      
++      if (! (list=imagefn_to_list(&image,infilename[i], &w, &h))) {
++	   fprintf(stderr, "cannot read file %s\n", infilename[i]);
++	   exit(1);
++      }
++
+       tic98_num_encode(&t,NEW_PAGE);
+ 
+       for(xx=0;xx<image.w;xx++)
+@@ -560,7 +569,10 @@
+     newoutname=(char*)malloc(sizeof(char)*(strlen(outfilename[0])+10));
+     assert(newoutname);
+ 
+-    freopen(infilename[0],"rb",stdin);
++    if (! freopen(infilename[0],"rb",stdin)) {
++	 fprintf(stderr, "failed to open %s for reading: %s\n",
++		 infilename[0], strerror(errno));
++    }
+ 
+     tic98_init(&t);
+     tic98_start_decoding();
+diff -ru tic98/marklist.c tic98-new/marklist.c
+--- tic98/marklist.c	Thu Jul  1 21:56:19 1999
++++ tic98-new/marklist.c	Fri Mar 16 11:44:20 2001
+@@ -94,11 +94,11 @@
+   magic = magic_popnamed (fn, &err) >> 16;	/* only interested in first 2 bytes */
+ 
+   if (err != 0) {
+-    return 1;			/* failure */
+     fprintf (stderr, "error - can't open file '%s'\n", fn);
+-    return 1;
++    return 1;			/* failure */
+   }
+   if (!((magic == MAGIC_P1) || (magic == MAGIC_P4))) {
++    fprintf (stderr, "bad magic in file '%s'\n", fn);
+     return 1;
+   }
+   if (fn2) {
+diff -ru tic98/utils.c tic98-new/utils.c
+--- tic98/utils.c	Tue Jun 22 02:48:43 1999
++++ tic98-new/utils.c	Fri Mar 16 11:23:57 2001
+@@ -117,7 +117,7 @@
+     }
+     else{
+ 	*err=1;
+-/*	error("magic_popnamed","can't open file",fn);*/
++	error("magic_popnamed","can't open file",fn);
+ 	return 0;
+     }
+ }
diff --git a/media-gfx/tic98/metadata.xml b/media-gfx/tic98/metadata.xml
index 96a2d586367d..e770d1bc9a96 100644
--- a/media-gfx/tic98/metadata.xml
+++ b/media-gfx/tic98/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<herd>graphics</herd>
 </pkgmetadata>
diff --git a/media-gfx/tic98/tic98-1.01-r1.ebuild b/media-gfx/tic98/tic98-1.01-r1.ebuild
index c4fcc9898b44..a784bb91d862 100644
--- a/media-gfx/tic98/tic98-1.01-r1.ebuild
+++ b/media-gfx/tic98/tic98-1.01-r1.ebuild
@@ -1,31 +1,35 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/tic98/tic98-1.01-r1.ebuild,v 1.1 2005/03/05 00:48:58 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tic98/tic98-1.01-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:25 chriswhite Exp $
 
 inherit eutils
 
-DESCRIPTION="tic98 is a compressor for black-and-white images, in particular scanned documents. It gets very good compression, better than AT&T's DjVu system.  tic98 also includes ppmd text compression (ppmd) and number compression (b_gamma_enc)"
+DESCRIPTION="compressor for black-and-white images, in particular scanned documents"
 HOMEPAGE="http://www.cs.waikato.ac.nz/~singlis/"
 SRC_URI="http://www.cs.waikato.ac.nz/~singlis/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 amd64"
+KEYWORDS="amd64 ~ppc-macos x86"
 IUSE=""
 
 DEPEND=""
 
 S="${WORKDIR}/${PN}"
 
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}/${P}"-macos.patch
+	cd "${S}"
+	epatch "${FILESDIR}/${P}"-gentoo.diff
+}
+
 src_compile() {
-	epatch ${FILESDIR}/${P}-gentoo.diff
-	epatch $FILESDIR/${PN}.diff
 	emake all || die
 	emake all2 || die
 }
 
 src_install() {
-	dodir /usr
 	dodir /usr/bin
 	make BIN=${D}usr/bin install || die
 }
diff --git a/media-gfx/tic98/tic98-1.01.ebuild b/media-gfx/tic98/tic98-1.01.ebuild
index ffd7c61732e6..af2535f06dc8 100644
--- a/media-gfx/tic98/tic98-1.01.ebuild
+++ b/media-gfx/tic98/tic98-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/media-gfx/tic98/tic98-1.01.ebuild,v 1.1 2005/03/05 00:48:58 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tic98/tic98-1.01.ebuild,v 1.1.1.1 2005/11/30 09:37:25 chriswhite Exp $
 
 inherit eutils
 
diff --git a/media-gfx/transfig/ChangeLog b/media-gfx/transfig/ChangeLog
index 350a3b39d3aa..636a70c881a5 100644
--- a/media-gfx/transfig/ChangeLog
+++ b/media-gfx/transfig/ChangeLog
@@ -1,6 +1,79 @@
 # ChangeLog for media-gfx/transfig
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/transfig/ChangeLog,v 1.1 2002/02/01 21:53:30 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/transfig/ChangeLog,v 1.1.1.1 2005/11/30 09:37:45 chriswhite Exp $
+
+  31 Oct 2005; Fabian Groffen <grobian@gentoo.org> transfig-3.2.4-r2.ebuild:
+  Also apply GGC3.3 patch for GCC4.  Allows compilation on ppc-macos, marked
+  ~ppc-macos (bug #110948)
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> transfig-3.2.4-r2.ebuild:
+  Mark 3.2.4-r2 stable on alpha
+
+  30 May 2005; Sven Wegener <swegener@gentoo.org> transfig-3.2.4-r1.ebuild,
+  transfig-3.2.4-r2.ebuild:
+  Moved from gcc.eclass to toolchain-funcs.eclass, bug #92745.
+
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org> transfig-3.2.4-r2.ebuild:
+  Stable on ppc64
+
+  01 Nov 2004; Markus Rothe <corsair@gentoo.org> transfig-3.2.4-r2.ebuild:
+  Marked ~ppc64
+
+  01 Nov 2004; Markus Rothe <corsair@gentoo.org> transfig-3.2.4-r1.ebuild:
+  Marked ~ppc64; bug #66756
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  transfig-3.2.4-r2.ebuild:
+  multilib fixes.
+
+*transfig-3.2.4-r2 (02 Sep 2004)
+
+  02 Sep 2004; Mamoru KOMACHI <usata@gentoo.org> +transfig-3.2.4-r2.ebuild:
+  Added shapepatch. Thanks to Geoffrey <geoffrey@andrews.edu>, see bug #20877.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> transfig-3.2.4-r1.ebuild:
+  Add inherit eutils
+
+  05 Dec 2003; Jason Wever <weeve@gentoo.org> transfig-3.2.4-r1.ebuild:
+  Marked stable on sparc.
+
+*transfig-3.2.4-r1 (18 Apr 2003)
+
+  06 Nov 2003; Philip Walls <malverian@gentoo.org> files/transfig-3.2.4.patch :
+  Fixes emerge -K problems, Xpm support, and png support. Thanks to 
+  splite (splite-gentoo@sigint.cs.purdue.edu) for patch. closes #25076
+
+  01 Jul 2003; Guy Martin <gmsoft@gentoo.org> transfig-3.2.4-r1.ebuild
+  Added hppa to KEYWORDS.
+
+  21 Jul 2003; Will Woods <wwoods@gentoo.org> transfig-3.2.4-r1.ebuild:
+  Marked stable for alpha
+
+  24 Jun 2003; Luca Barbato <lu_zero@gentoo.org> transfig-3.2.4-r1.ebuild:
+  Fixed gcc-3.3 problems.
+
+  10 May 2003; Jason Wever <weeve@gentoo.org> transfig-3.2.4-r1.ebuild:
+  Added ~sparc to keywords.
+
+  18 Apr 2003; Philip Walls <malverian@gentoo.org> transfig-3.2.4.ebuild
+  files/transfig-3.2.4.patch :
+  Stopped from installing into /usr/local
+  Fixes bug #18983
+
+*transfig-3.2.4 (08 Jan 2003)
+
+  08 Jan 2003; Martin Holzer <mholzer@gentoo.org> transfig-3.2.4.ebuild 
+  files/digest-transfig-3.2.4 ChangeLog :
+  Version bumped.
+
+*transfig-3.2.3d-r1 (12 Apr 2002)
+
+  7 Sep 2002; Owen Stampflee <owen@gentoo.org> :
+  Added PPC to KEYWORDS.
+
+  12 Apr 2002; Seemant Kulleen <seemant@gentoo.org> transfig-3.2.3d-r1.ebuild :
+
+  Added Description, and compile against newer libpng
 
 *transfig-3.2.3d (1 Feb 2002)
 
diff --git a/media-gfx/transfig/Manifest b/media-gfx/transfig/Manifest
index 61a00aa98425..7392f5179d0f 100644
--- a/media-gfx/transfig/Manifest
+++ b/media-gfx/transfig/Manifest
@@ -1,7 +1,11 @@
-MD5 26f7cea46fb082ab417e311ac98d3549 ChangeLog 1292
-MD5 50afa532bad053ef4d322e0dbf0e2b30 transfig-3.2.3d-r1.ebuild 1079
-MD5 46c5d27814cc83af5fee4054e686a93e transfig-3.2.4-r1.ebuild 1074
+MD5 49fe10083e271086f0ec1c08564ac3ff transfig-3.2.3d-r1.ebuild 1081
+MD5 f3b35d3b6e246dca0ce894f763cbe8f8 transfig-3.2.4-r1.ebuild 1291
+MD5 aa13a53e9e07cf3120437c858ecaafbd ChangeLog 3146
+MD5 c79bb2d8e4e2c25d12c2420048c00baf metadata.xml 235
+MD5 2e6fcf286ac1f276c3913986bdaffe08 transfig-3.2.4-r2.ebuild 1530
 MD5 db86c631cd0071efe757e7ea210f777c files/digest-transfig-3.2.3d-r1 67
+MD5 c1e84814be65ba288f57ef4df07f1dad files/transfig-3.2.4.patch 2042
 MD5 f9974d3952eb7a7aaef9145c8970f371 files/digest-transfig-3.2.4-r1 66
+MD5 ff90232bbf79ef8dcf25771dcd286a0a files/digest-transfig-3.2.4-r2 144
+MD5 71a0fff063c73b598780da48ef56b943 files/transfig-3.2.4-gcc-3.3.patch 1895
 MD5 4649eef8f14275cfba64c077532d6aad files/transfig-3.2.3d.patch 1532
-MD5 bc2c5e2e9cd1565c110ccce5786d88b4 files/transfig-3.2.4.patch 1877
diff --git a/media-gfx/transfig/files/transfig-3.2.4.patch b/media-gfx/transfig/files/transfig-3.2.4.patch
index 668a5eb70d12..fa33aa30689a 100644
--- a/media-gfx/transfig/files/transfig-3.2.4.patch
+++ b/media-gfx/transfig/files/transfig-3.2.4.patch
@@ -1,12 +1,66 @@
-diff -ru transfig.3.2.4/fig2dev/Imakefile.org transfig.3.2.4/fig2dev/Imakefile
---- transfig.3.2.4/fig2dev/Imakefile.org	2003-01-14 09:04:09.000000000 +0000
-+++ transfig.3.2.4/fig2dev/Imakefile	2003-01-14 09:04:18.000000000 +0000
-@@ -130,7 +130,7 @@
+--- fig2dev/Imakefile.orig	2002-12-19 12:33:44.000000000 -0500
++++ fig2dev/Imakefile	2003-07-22 13:38:50.000000000 -0500
+@@ -20,13 +20,13 @@
+ XCOMM You should point XFIGLIBDIR to the same directory you did when you compiled
+ XCOMM and installed xfig.
+ 
+-XFIGLIBDIR =	/usr/local/lib/X11/xfig
++XFIGLIBDIR =	$(LIBDIR)/xfig
+ 
+ XCOMM ******
+ XCOMM If your system has the strerror() function (doesn't have sys_errlist) then
+ XCOMM comment out NEED_STRERROR with an XCOMM comment.
+ 
+-NEED_STRERROR = -DNEED_STRERROR
++XCOMM NEED_STRERROR = -DNEED_STRERROR
+ 
+ XCOMM The following probably only applies to Windows 9x/NT:
+ XCOMM If your system can open files in text and binary modes and has the
+@@ -39,7 +39,7 @@
+ XCOMM inline functions. With the "INLINE" keyword, you should notice that
+ XCOMM the display will be a bit faster in complex figures
+ 
+-XCOMM USEINLINE = -DUSE_INLINE
++USEINLINE = -DUSE_INLINE
+ 
+ XCOMM ****************
+ XCOMM Change RGB if necessary, to point to your rgb.txt color database
+@@ -60,8 +60,8 @@
+ XCOMM are in different places
+ 
+ #ifdef USEPNG
+-PNGLIBDIR = $(USRLIBDIR)
+-PNGINC = -I/usr/include/X11
++PNGLIBDIR = $(SYSTEMUSRLIBDIR)
++PNGINC = -I$(SYSTEMUSRINCDIR)/libpng
+ #endif
+ 
+ XCOMM ****************
+@@ -73,11 +73,11 @@
+ XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h)
+ XCOMM
+ 
+-XCOMM #define USEXPM
++#define USEXPM
+ 
+ #ifdef USEXPM
+ XPMLIBDIR = $(USRLIBDIR)
+-XPMINC = -I/usr/include/X11
++XPMINC = -I$(INCDIR)/X11
+ #endif
+ 
+ XCOMM ****************
+@@ -126,11 +126,11 @@
+ 
+ #ifdef I18N
+ I18N_DEFS = -DI18N 
+-FIG2DEV_LIBDIR = /usr/local/lib/fig2dev
++FIG2DEV_LIBDIR = $(LIBDIR)/fig2dev
  I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=\\\"$(FIG2DEV_LIBDIR)\\\"
  
  install::
 -	[ -d $(DESTDIR)$(FIG2DEV_LIBDIR) ] || mkdir $(DESTDIR)$(FIG2DEV_LIBDIR)
-+	[ -d $(DESTDIR)$(FIG2DEV_LIBDIR) ] || mkdir -p $(DESTDIR)$(FIG2DEV_LIBDIR)
++	[ -d $(DESTDIR)$(FIG2DEV_LIBDIR) ] || $(MKDIRHIER) $(DESTDIR)$(FIG2DEV_LIBDIR)
  	$(INSTALL) -c dev/japanese.ps $(DESTDIR)$(FIG2DEV_LIBDIR)
  	( cd $(DESTDIR)$(FIG2DEV_LIBDIR); \
  	  rm -f ja.ps ja_JP.ps ja_JP.ujis.ps ja_JP.eucJP.ps ja_JP.EUC.ps; \
diff --git a/media-gfx/transfig/transfig-3.2.3d-r1.ebuild b/media-gfx/transfig/transfig-3.2.3d-r1.ebuild
index c89d2c099567..864746885807 100644
--- a/media-gfx/transfig/transfig-3.2.3d-r1.ebuild
+++ b/media-gfx/transfig/transfig-3.2.3d-r1.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Michael Conrad Tilstra <michael@gentoo.org> <tadpol@tadpol.org>
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/transfig/transfig-3.2.3d-r1.ebuild,v 1.1 2002/04/13 00:29:37 seemant Exp $
-
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/transfig/transfig-3.2.3d-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:46 chriswhite Exp $
 
 MY_P=${P/transfig-/transfig.}
 S=${WORKDIR}/${MY_P}
@@ -10,8 +8,13 @@ DESCRIPTION="A set of tools for creating TeX documents with graphics which can b
 SRC_URI="http://www.xfig.org/xfigdist/${MY_P}.tar.gz"
 HOMEPAGE="http://www.xfig.org"
 
-DEPEND="virtual/xfree
-    >=media-libs/jpeg-6
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="x86 ppc"
+IUSE=""
+
+DEPEND="virtual/x11
+	>=media-libs/jpeg-6
 	media-libs/libpng"
 
 src_unpack() {
@@ -21,27 +24,26 @@ src_unpack() {
 }
 
 src_compile() {
-    xmkmf || die
-    make Makefiles || die
-    make || die
+	xmkmf || die
+	make Makefiles || die
+	make || die
 }
 
-src_install () {
-    # gotta set up the dirs for it....
-    dodir /usr/bin
-    dodir /usr/sbin
-    dodir /usr/share/man/man1
-    dodir /usr/X11R6/lib/fig2dev
-
-    #Now install it.
-    make    \
-        DESTDIR=${D}    \
-        install || die
-
-    #Install docs
-    dodoc README CHANGES LATEX.AND.XFIG NOTES
-    doman doc/fig2dev.1
-    doman doc/fig2ps2tex.1
-    doman doc/pic2tpic.1
-
+src_install() {
+	# gotta set up the dirs for it....
+	dodir /usr/bin
+	dodir /usr/sbin
+	dodir /usr/share/man/man1
+	dodir /usr/X11R6/lib/fig2dev
+
+	#Now install it.
+	make \
+		DESTDIR=${D} \
+		install || die
+
+	#Install docs
+	dodoc README CHANGES LATEX.AND.XFIG NOTES
+	doman doc/fig2dev.1
+	doman doc/fig2ps2tex.1
+	doman doc/pic2tpic.1
 }
diff --git a/media-gfx/transfig/transfig-3.2.4-r1.ebuild b/media-gfx/transfig/transfig-3.2.4-r1.ebuild
index a036ba620a4e..6625225df0e0 100644
--- a/media-gfx/transfig/transfig-3.2.4-r1.ebuild
+++ b/media-gfx/transfig/transfig-3.2.4-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/media-gfx/transfig/transfig-3.2.4-r1.ebuild,v 1.1 2003/04/18 14:22:13 malverian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/transfig/transfig-3.2.4-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:46 chriswhite Exp $
+
+inherit toolchain-funcs eutils
 
 MY_P=${P/transfig-/transfig.}
 S=${WORKDIR}/${MY_P}
@@ -10,7 +12,8 @@ HOMEPAGE="http://www.xfig.org"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc sparc alpha hppa amd64 ~ppc64"
+IUSE=""
 
 DEPEND="virtual/x11
 	>=media-libs/jpeg-6
@@ -20,6 +23,11 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${P}.patch
+	#bad way to fix a bad issue
+	if [ "$(gcc-major-version)" -eq "3" -a "$(gcc-minor-version)" -ge "3" ]
+	then
+	epatch  ${FILESDIR}/${P}-gcc-3.3.patch
+	fi
 }
 
 src_compile() {
diff --git a/media-gfx/transfig/transfig-3.2.4-r2.ebuild b/media-gfx/transfig/transfig-3.2.4-r2.ebuild
index 3f0340c2735f..984a5ce4ad88 100644
--- a/media-gfx/transfig/transfig-3.2.4-r2.ebuild
+++ b/media-gfx/transfig/transfig-3.2.4-r2.ebuild
@@ -1,8 +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/media-gfx/transfig/transfig-3.2.4-r2.ebuild,v 1.1 2004/09/02 02:54:03 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/transfig/transfig-3.2.4-r2.ebuild,v 1.1.1.1 2005/11/30 09:37:46 chriswhite Exp $
 
-inherit gcc eutils
+IUSE=""
+
+inherit toolchain-funcs eutils
 
 MY_P=${PN}.${PV}
 S=${WORKDIR}/${MY_P}
@@ -15,8 +17,7 @@ HOMEPAGE="http://www.xfig.org"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
-IUSE=""
+KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc-macos ppc64 ~sparc ~x86"
 
 DEPEND="virtual/x11
 	>=media-libs/jpeg-6
@@ -28,8 +29,8 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}.patch
 	epatch ../${SHAPE_P}/${PN}.${SHAPE_P#*.}.patch	# bug #20877
 
-	#bad way to fix a bad issue
-	if [ "$(gcc-major-version)" -eq "3" -a "$(gcc-minor-version)" -ge "3" ]
+	# Apply gcc-3.3 patch for GCC 3.3 and above -- bug #110948
+	if [ "$(gcc-major-version)$(gcc-minor-version)" -ge "33" ];
 	then
 		epatch  ${FILESDIR}/${P}-gcc-3.3.patch
 	fi
@@ -39,14 +40,14 @@ src_compile() {
 	xmkmf || die "xmkmf failed"
 	make Makefiles || die "make Makefiles failed"
 
-	emake BINDIR=/usr/bin LIBDIR=/usr/lib || die "emake failed"
+	emake BINDIR=/usr/bin LIBDIR=/usr/$(get_libdir) || die "emake failed"
 }
 
 src_install() {
 	make \
 		DESTDIR=${D} \
 		BINDIR=/usr/bin \
-		LIBDIR=/usr/lib \
+		LIBDIR=/usr/$(get_libdir) \
 		install || die
 
 	#Install docs
diff --git a/media-gfx/truevision/ChangeLog b/media-gfx/truevision/ChangeLog
index 734579a54fc0..699b4c4e428b 100644
--- a/media-gfx/truevision/ChangeLog
+++ b/media-gfx/truevision/ChangeLog
@@ -1,8 +1,28 @@
 # ChangeLog for media-gfx/truevision
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/truevision/ChangeLog,v 1.1 2003/03/16 22:09:16 malverian Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/truevision/ChangeLog,v 1.1.1.1 2005/11/30 09:37:26 chriswhite Exp $
 
-*truevision-0.4.10 (16 Mar 2003)
+  09 Aug 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -files/truevision-0.3.10-gentoo1.patch,
+  -files/truevision-0.3.10-gentoo2.patch,
+  -files/truevision-0.3.10-gentoo3.patch, truevision-0.3.10.ebuild:
+  Add patch from bug 75912, move patches to mirrors. Fixes bug 75912. Thanks
+  to psk <gentoo@feeleas.org>, Marnix Klooster <marnix.klooster@gmail.com> and
+  others.
 
-  16 Mar 2003; Philip Walls <malverian@gentoo.org
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> truevision-0.3.10.ebuild:
+  Add inherit eutils
+
+  08 Oct 2003; Brandy Westcott brandy@gentoo.org truevision-0.3.10.ebuild:
+  Added gnome-base/gnome-libs as a dependency
+
+*truevision-0.3.10 (10 Jun 2003)
+
+  10 Jun 2003; Alastair Tse <liquidx@gentoo.org> truevision-0.3.10.ebuild,
+  files/truevision-0.3.10-gentoo2.patch,
+  files/truevision-0.3.10-gentoo3.patch:
+  added gtkglarea dep, deuglified build process, added more sensible patch,
+  added docs and examples
+
+  16 Mar 2003; Philip Walls <malverian@gentoo.org>
   Initial import.
diff --git a/media-gfx/truevision/Manifest b/media-gfx/truevision/Manifest
index e69de29bb2d1..8893282515b0 100644
--- a/media-gfx/truevision/Manifest
+++ b/media-gfx/truevision/Manifest
@@ -0,0 +1,4 @@
+MD5 9da200cf0cba8f50e7871458a1ae51cb truevision-0.3.10.ebuild 1121
+MD5 246cf789fef5822e50ae958af2bb42db ChangeLog 1171
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 fd3f729570328f8ed534b1490a977561 files/digest-truevision-0.3.10 226
diff --git a/media-gfx/truevision/files/digest-truevision-0.3.10 b/media-gfx/truevision/files/digest-truevision-0.3.10
index a5a0906b3d06..09f5e15fa960 100644
--- a/media-gfx/truevision/files/digest-truevision-0.3.10
+++ b/media-gfx/truevision/files/digest-truevision-0.3.10
@@ -1,2 +1,3 @@
 MD5 260acc07ffb0943554816eb47d4be88b truevision-0.3.10.tar.gz 1088249
 MD5 658bf82b0000435b04737de181e534e5 truevision-extramat-0.3.10.tar.gz 1738369
+MD5 7f9b96ef904729e639a7bf5da08103b7 truevision-0.3.10-genpatch.tar.bz2 3171
diff --git a/media-gfx/truevision/truevision-0.3.10.ebuild b/media-gfx/truevision/truevision-0.3.10.ebuild
index 55a1c79faada..8dc6dcd24e6f 100644
--- a/media-gfx/truevision/truevision-0.3.10.ebuild
+++ b/media-gfx/truevision/truevision-0.3.10.ebuild
@@ -1,31 +1,39 @@
-# 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/media-gfx/truevision/truevision-0.3.10.ebuild,v 1.1 2003/03/16 22:09:16 malverian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/truevision/truevision-0.3.10.ebuild,v 1.1.1.1 2005/11/30 09:37:25 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="Gnome frontend to Povray"
 HOMEPAGE="http://truevision.sourceforge.net"
-SRC_URI="http://unc.dl.sourceforge.net/sourceforge/truevision/${P}.tar.gz http://unc.dl.sourceforge.net/sourceforge/truevision/${PN}-extramat-${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/truevision/${P}.tar.gz
+	mirror://sourceforge/truevision/${PN}-extramat-${PV}.tar.gz
+	mirror://gentoo/${P}-genpatch.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
 DEPEND="=x11-libs/gtk+-1.2*
-	media-gfx/povray"
-
-RDEPEND=${DEPEND}
-
-S="${WORKDIR}/${P}"
-
-src_compile() {
-	epatch ${FILESDIR}/truevision-0.3.10-gentoo1.patch || die
-	econf --prefix=${D}/usr --datadir=${D}/usr/share || die
-	emake || die
+	gnome-base/gnome-libs
+	media-gfx/povray
+	sys-libs/zlib
+	virtual/opengl
+	<x11-libs/gtkglarea-1.99"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${WORKDIR}/truevision-0.3.10-gentoo{2,3,4}.patch
 }
 
 src_install() {
-	emake PREFIX=${D}/usr DATADIR=${D}/usr/share PACKAGE_MATERIALS_DIR=${D}/usr/share/truevision/materials PACKAGE_PIXMAPS_DIR=${D}/usr/share/pixmaps/truevision install || die
+	einstall \
+		PACKAGE_MATERIALS_DIR=${D}/usr/share/truevision/materials \
+		PACKAGE_PIXMAPS_DIR=${D}/usr/share/pixmaps/truevision || die
+
+	dodoc AUTHORS COPYING README ChangeLog INSTALL TODO
+	cp -r ${S}/examples ${D}/usr/share/doc/${PF}/examples
 
 	cd ${WORKDIR}/${PN}-extramat-${PV} || die
 	cp -R materials ${D}/usr/share/truevision/materials/ || die
diff --git a/media-gfx/tuxpaint-stamps/ChangeLog b/media-gfx/tuxpaint-stamps/ChangeLog
index 0093ced79024..e35c9d89939c 100644
--- a/media-gfx/tuxpaint-stamps/ChangeLog
+++ b/media-gfx/tuxpaint-stamps/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/tuxpaint-stamps
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint-stamps/ChangeLog,v 1.1 2004/11/23 23:13:10 leonardop Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint-stamps/ChangeLog,v 1.1.1.1 2005/11/30 09:37:20 chriswhite Exp $
+
+  27 Sep 2005; Luis Medinas <metalgod@gentoo.org>
+  tuxpaint-stamps-20041003.ebuild:
+  Added ~amd64 keyword. Closes bug #107304.
+
+  20 Mar 2005; Leonardo Boshell <leonardop@gentoo.org>
+  tuxpaint-stamps-20041003.ebuild:
+  Marked stable.
 
 *tuxpaint-stamps-20041003 (23 Nov 2004)
 
diff --git a/media-gfx/tuxpaint-stamps/Manifest b/media-gfx/tuxpaint-stamps/Manifest
index ca027697ad10..3181a5fc3e20 100644
--- a/media-gfx/tuxpaint-stamps/Manifest
+++ b/media-gfx/tuxpaint-stamps/Manifest
@@ -1,4 +1,15 @@
-MD5 0f04a1255a3e972d058a90d42912ef00 ChangeLog 467
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 941d64c90f41c2e00c7c07c715cd285e ChangeLog 612
 MD5 548bfb2cefb8615b331cfcd311684e16 metadata.xml 376
-MD5 fed332348bc2333200745c07746c4bb4 tuxpaint-stamps-20041003.ebuild 858
+MD5 947237e5d722342383c66fd73e921355 tuxpaint-stamps-20041003.ebuild 807
 MD5 cdc1bab02af9f48c5726f46f6f8d6578 files/digest-tuxpaint-stamps-20041003 79
+MD5 7b37712ba33469a003c56a2116b2d272 files/tuxpaint-stamps-2004-10-03-makefile.patch 746
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD4DBQFDOU2QwUpWvClEHQoRAhFbAJIDfUmxbWMoU3mMcEA5DkdbseE5AJ4jT8Nq
+wloYsScWJc2m/Ak7WFKZ0A==
+=tGdZ
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20041003.ebuild b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20041003.ebuild
index ea42f296fa53..bbd5cfe11d81 100644
--- a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20041003.ebuild
+++ b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20041003.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/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20041003.ebuild,v 1.1 2004/11/23 23:13:10 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20041003.ebuild,v 1.1.1.1 2005/11/30 09:37:20 chriswhite Exp $
 
 inherit eutils
 
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 x86"
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-gfx/tuxpaint/ChangeLog b/media-gfx/tuxpaint/ChangeLog
index e78f4314290d..a91c84b1d2b0 100644
--- a/media-gfx/tuxpaint/ChangeLog
+++ b/media-gfx/tuxpaint/ChangeLog
@@ -1,8 +1,73 @@
 # ChangeLog for media-gfx/tuxpaint
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/ChangeLog,v 1.1 2003/10/31 12:35:35 leonardop Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/ChangeLog,v 1.1.1.1 2005/11/30 09:37:38 chriswhite Exp $
 
+  26 May 2005; Jan Brinkmann <luckyduck@gentoo.org> tuxpaint-0.9.14.ebuild:
+  stable on amd64
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org>
+  tuxpaint-0.9.14.ebuild:
+  Stable on ppc.
+
+  19 Apr 2005; Leonardo Boshell <leonardop@gentoo.org> tuxpaint-0.9.14.ebuild:
+  Marked stable on x86.
+
+  23 Mar 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  tuxpaint-0.9.13-r1.ebuild:
+  rekeyword stable for x86
+
+  22 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> tuxpaint-0.9.13-r1.ebuild,
+  tuxpaint-0.9.14.ebuild:
+  added ~amd64 to KEYWORDS, fixes #79703
+
+  20 Mar 2005; Leonardo Boshell <leonardop@gentoo.org>
+  tuxpaint-0.9.13-r1.ebuild,
+  files/tuxpaint-0.9.13-fix_error_directives.patch:
+  Added a patch to remove a few useless #error directives that were breaking
+  compilation. Resolves bug #82598.
+
+*tuxpaint-0.9.14 (20 Mar 2005)
+
+  20 Mar 2005; Leonardo Boshell <leonardop@gentoo.org> tuxpaint-0.9.14.ebuild:
+  New release. Uses a modified patch to fix a few small problems.
+
+  20 Mar 2005; Leonardo Boshell <leonardop@gentoo.org>
+  tuxpaint-0.9.13-r1.ebuild:
+  Marked stable on x86.
+  
+  12 Feb 2005; Gregorio Guidi <greg_g@gentoo.org> tuxpaint-0.9.13-r1.ebuild:
+  Install kde files in /usr (#63863).
+
+*tuxpaint-0.9.13-r1 (23 Nov 2004)
+
+  23 Nov 2004; L. Boshell <leonardop@gentoo.org> tuxpaint-0.9.13-r1.ebuild:
+  New revision with some style changes, a new patch for its Makefile which
+  should resolve bug #42971, and support for the `nls' USE flag.
+
+  31 Aug 2004; David Holm <dholm@gentoo.org> tuxpaint-0.9.13.ebuild:
+  Added to ~ppc.
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org> tuxpaint-0.9.12.ebuild,
+  tuxpaint-0.9.13.ebuild:
+  Fix use invocation
+
+  17 Feb 2004; L. Boshell <leonardop@gentoo.org> tuxpaint-0.9.13.ebuild:
+  Marked as stable on x86.
+
+*tuxpaint-0.9.13 (10 Jan 2004)
+
+  10 Jan 2004; L. Boshell <leonardop@gentoo.org> tuxpaint-0.9.13.ebuild:
+  Version bump.
+
+  10 Dec 2003; L. Boshell <leonardop@gentoo.org> tuxpaint-0.9.12.ebuild:
+  Marked as stable on x86.
+
+  09 Nov 2003; L. Boshell <leonardop@gentoo.org> tuxpaint-0.9.12.ebuild :
+  Fix for sandbox violations when the `gnome' USE flag is not present.
+  Closes bug #32862.
+  
 *tuxpaint-0.9.12 (31 Oct 2003)
 
   31 Oct 2003; L. Boshell <leonardop@gentoo.org> tuxpaint-0.9.12.ebuild :
-  Initial import. Thanks to Ron for the contribution on bug #15530.
+  Initial import. Thanks to Ron for the contribution on bug #15530. Thanks
+  to user Mario Beroiza for his help with KDE-related problems.
diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index e266ea13818b..6164d6abf7a6 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -1,2 +1,15 @@
-MD5 ff7b9e468237dc257e01fdf68ba6b988 tuxpaint-0.9.12.ebuild 6643
-MD5 60d68c719ff0eec4ce2849662bbce97e files/digest-tuxpaint-0.9.12 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a8ba0e922db9574f510b60932e1e56e3 tuxpaint-0.9.14.ebuild 1480
+MD5 73afd13b7524ba3667324a418c35839c ChangeLog 2623
+MD5 60d69ee439da76dbf4d88951ef86236a metadata.xml 648
+MD5 b12d971848124691a60da9265ecb86ba files/tuxpaint-0.9.14-gentoo.patch 4511
+MD5 6c694aa3e9399a07cdaa7f82a162b222 files/digest-tuxpaint-0.9.14 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFClhqW06ebR+OMO78RAou0AJ0Tcc8AZI9Q5fa0XTeZQm4fOg2/2ACeLRZx
+ufnOQJl9YgbWkc/XKdQExwk=
+=tNY3
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/tuxpaint/metadata.xml b/media-gfx/tuxpaint/metadata.xml
index da6fd63d0085..84b3e31fceff 100644
--- a/media-gfx/tuxpaint/metadata.xml
+++ b/media-gfx/tuxpaint/metadata.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+  <herd>graphics</herd>
+  <maintainer>
+    <email>leonardop@gentoo.org</email>
+    <name>Leonardo Boshell</name>
+  </maintainer>
+  <longdescription>
+    Tux Paint is a free drawing program designed for young children
+    (kids ages 3 and up). It has a simple, easy-to-use interface, fun
+    sound effects, and an encouraging cartoon mascot who helps guide
+    children as they use the program. It provides a blank canvas and a
+    variety of drawing tools to help your child be creative.
+  </longdescription>
 </pkgmetadata>
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.14.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.14.ebuild
index dcde43cc2f1b..92ead2266166 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.14.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.14.ebuild
@@ -1,11 +1,18 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/tuxpaint-0.9.14.ebuild,v 1.1 2005/03/20 21:26:01 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/tuxpaint-0.9.14.ebuild,v 1.1.1.1 2005/11/30 09:37:38 chriswhite Exp $
 
 inherit eutils
 
 DESCRIPTION="Drawing program designed for young children"
 HOMEPAGE="http://www.newbreedsoftware.com/tuxpaint/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc amd64"
+
+IUSE="gnome kde nls"
 
 DEPEND="media-libs/libpng
 	media-libs/sdl-ttf
@@ -16,13 +23,6 @@ DEPEND="media-libs/libpng
 	media-libs/netpbm
 	nls? ( sys-devel/gettext )"
 
-IUSE="gnome kde nls"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
diff --git a/media-gfx/ufraw/ChangeLog b/media-gfx/ufraw/ChangeLog
index 5b7c99d0573a..1d20c8c12e01 100644
--- a/media-gfx/ufraw/ChangeLog
+++ b/media-gfx/ufraw/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for media-gfx/ufraw
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/ufraw/ChangeLog,v 1.1 2005/09/27 16:09:37 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/ufraw/ChangeLog,v 1.1.1.1 2005/11/30 09:37:46 chriswhite Exp $
 
 *ufraw-0.5 (27 Sep 2005)
 
diff --git a/media-gfx/ufraw/Manifest b/media-gfx/ufraw/Manifest
index 06dbd960065e..4e32d03cd19e 100644
--- a/media-gfx/ufraw/Manifest
+++ b/media-gfx/ufraw/Manifest
@@ -1,4 +1,4 @@
-MD5 548aa3fd3b0c38b381814cf480f336db ChangeLog 262
-MD5 fe73035625dc6609b435f48162acae65 metadata.xml 165
-MD5 d9bacaee47cd749a22fc2d284e014865 ufraw-0.5.ebuild 720
+MD5 6d7f3c60bf80781db076ccfd174a866e ChangeLog 350
 MD5 bc7b31ad019bc30a55625da776b5b05b files/digest-ufraw-0.5 61
+MD5 fe73035625dc6609b435f48162acae65 metadata.xml 165
+MD5 542b9dc44d903b76edbfe2d2c9dc65bb ufraw-0.5.ebuild 815
diff --git a/media-gfx/ufraw/ufraw-0.5.ebuild b/media-gfx/ufraw/ufraw-0.5.ebuild
index cc8554c67e66..dad3cb5d170f 100644
--- a/media-gfx/ufraw/ufraw-0.5.ebuild
+++ b/media-gfx/ufraw/ufraw-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/media-gfx/ufraw/ufraw-0.5.ebuild,v 1.1 2005/09/27 16:09:37 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/ufraw/ufraw-0.5.ebuild,v 1.1.1.1 2005/11/30 09:37:46 chriswhite Exp $
 
 DESCRIPTION="RAW Image format viewer and GIMP plugin"
 HOMEPAGE="ufraw.sf.net"
diff --git a/media-gfx/videorbits/ChangeLog b/media-gfx/videorbits/ChangeLog
index 96208a0bd015..4fd23d859e30 100644
--- a/media-gfx/videorbits/ChangeLog
+++ b/media-gfx/videorbits/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for media-gfx/videorbits
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/videorbits/ChangeLog,v 1.1 2002/11/27 18:59:42 george Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/videorbits/ChangeLog,v 1.1.1.1 2005/11/30 09:37:29 chriswhite Exp $
+
+  22 Jul 2005; David Holm <dholm@gentoo.org> videorbits-2.201.ebuild:
+  Added to ~ppc.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  videorbits-2.201.ebuild:
+  virtual/glibc -> virtual/libc
+
+  08 Oct 2003; Brandy Westcott brandy@gentoo.org metadata.xml,
+  videorbits-2.201.ebuild:
+  Added virtual/x11, sys-libs/zlib, media-libs/libpng, media-libs/jpeg as
+  dependencies
 
 *videorbits-2.201 (27 Nov 2002)
 
diff --git a/media-gfx/videorbits/Manifest b/media-gfx/videorbits/Manifest
index e69de29bb2d1..dca7ff82739c 100644
--- a/media-gfx/videorbits/Manifest
+++ b/media-gfx/videorbits/Manifest
@@ -0,0 +1,4 @@
+MD5 cc3172bea06d6d23d2334d3ecd3d939d ChangeLog 1016
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 6d8d5dfe6ed587155f54dfd8b1dcba2f videorbits-2.201.ebuild 1060
+MD5 954268dcf8cb7f560b970694741c1e8a files/digest-videorbits-2.201 65
diff --git a/media-gfx/videorbits/videorbits-2.201.ebuild b/media-gfx/videorbits/videorbits-2.201.ebuild
index b8c196ac1bb0..fd4f01f7f2cb 100644
--- a/media-gfx/videorbits/videorbits-2.201.ebuild
+++ b/media-gfx/videorbits/videorbits-2.201.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/media-gfx/videorbits/videorbits-2.201.ebuild,v 1.1 2002/11/27 18:59:42 george Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/videorbits/videorbits-2.201.ebuild,v 1.1.1.1 2005/11/30 09:37:29 chriswhite Exp $
 
-IUSE=""
-
-S="${WORKDIR}/${P}"
-DESCRIPTION="a collection of programs for creating high dynamic range images."
-SRC_URI="http://us.dl.sourceforge.net/comparametric/${P}.tgz"
+DESCRIPTION="a collection of programs for creating high dynamic range images"
 HOMEPAGE="http://comparametric.sourceforge.net/"
+SRC_URI="mirror://sourceforge/comparametric/${P}.tgz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+SLOT="0"
+KEYWORDS="~ppc x86"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc
+	virtual/x11
+	sys-libs/zlib
+	media-libs/libpng
+	media-libs/jpeg"
 
 src_unpack() {
 	unpack ${A}
@@ -33,15 +35,7 @@ src_compile() {
 	emake || die
 }
 
-src_install () {
+src_install() {
 	make DESTDIR=${D} install || die
-	# If the above installs anything outside of DESTDIR, try the following.
-	#make \
-	#	prefix=${D}/usr \
-	#	mandir=${D}/usr/share/man \
-	#	infodir=${D}/usr/share/info \
-	#	install || die
-
-	# Install documentation.
 	dodoc AUTHORS ChangeLog COPYING NEWS README README.MORE
 }
diff --git a/media-gfx/viewer/ChangeLog b/media-gfx/viewer/ChangeLog
index 4ad2a73b6ca5..8a94b3bcb4ec 100644
--- a/media-gfx/viewer/ChangeLog
+++ b/media-gfx/viewer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/viewer
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/viewer/ChangeLog,v 1.1 2003/10/20 09:50:15 brandy Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/viewer/ChangeLog,v 1.1.1.1 2005/11/30 09:37:41 chriswhite Exp $
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> viewer-0.7.3.ebuild:
+  Added to ~ppc.
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> viewer-0.7.3.ebuild:
+  Typo in DESCRIPTION: stero -> stereo. Bug 59717.
 
 *viewer-0.7.3 (20 Oct 2003)
 
diff --git a/media-gfx/viewer/Manifest b/media-gfx/viewer/Manifest
index 7984b4166a60..743eed0b617e 100644
--- a/media-gfx/viewer/Manifest
+++ b/media-gfx/viewer/Manifest
@@ -1,4 +1,4 @@
-MD5 f8e535a451a03a1aef05f8ce0920e5b5 viewer-0.7.3.ebuild 690
-MD5 7729058e80017d777c1c2393f5651ff2 ChangeLog 405
+MD5 a4db4959fb8ea8059837fd5a681abfa2 ChangeLog 598
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 7a396adafe1458faf95883a0642ddacd viewer-0.7.3.ebuild 686
 MD5 18c3b0548abf7d64f6c16ffd3051d96d files/digest-viewer-0.7.3 63
diff --git a/media-gfx/viewer/viewer-0.7.3.ebuild b/media-gfx/viewer/viewer-0.7.3.ebuild
index 80bd1123301c..ea947bae8c47 100644
--- a/media-gfx/viewer/viewer-0.7.3.ebuild
+++ b/media-gfx/viewer/viewer-0.7.3.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/media-gfx/viewer/viewer-0.7.3.ebuild,v 1.1 2003/10/20 09:50:15 brandy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/viewer/viewer-0.7.3.ebuild,v 1.1.1.1 2005/11/30 09:37:41 chriswhite Exp $
 
-DESCRIPTION="A stero pair image viewer (supports ppm's only)"
+DESCRIPTION="A stereo pair image viewer (supports ppm's only)"
 HOMEPAGE="http://www-users.cs.umn.edu/~wburdick/geowall/viewer.html"
 SRC_URI=ftp://ftp.cs.umn.edu/dept/users/wburdick/geowall/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 IUSE=""
 DEPEND="virtual/opengl"
 
diff --git a/media-gfx/w3mimgfb/ChangeLog b/media-gfx/w3mimgfb/ChangeLog
index 44a7044fc4e1..feea13b5081b 100644
--- a/media-gfx/w3mimgfb/ChangeLog
+++ b/media-gfx/w3mimgfb/ChangeLog
@@ -1,9 +1,39 @@
 # ChangeLog for media-gfx/w3mimgfb
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/w3mimgfb/ChangeLog,v 1.1 2003/06/16 15:03:14 phosphan Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/w3mimgfb/ChangeLog,v 1.1.1.1 2005/11/30 09:37:31 chriswhite Exp $
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> w3mimgfb-0.9.1.ebuild:
+  Stable on ppc.
+
+  08 Sep 2004; Mamoru KOMACHI <usata@gentoo.org> -w3mimgfb-0.8.ebuild,
+  w3mimgfb-0.9.1.ebuild:
+  Moved from net-www/w3m{,-m17n} to www-client/w3m{,-m17n}.
+
+  26 Apr 2004; David Holm <dholm@gentoo.org> w3mimgfb-0.9.1.ebuild:
+  Added to ~ppc.
+
+  06 Nov 2003; Mamoru KOMACHI <usata@gentoo.org> w3mimgfb-0.7.1.ebuild,
+  w3mimgfb-0.8.ebuild, w3mimgfb-0.9.1.ebuild:
+  Cleanup installation path. Marked 0.9.1 stable.
+
+*w3mimgfb-0.9.1 (14 Aug 2003)
+
+  14 Aug 2003; Mamoru KOMACHI <usata@gentoo.org> w3mimgfb-0.9.1.ebuild:
+  Version bump
+
+*w3mimgfb-0.8 (15 Jul 2003)
+
+  14 Aug 2003; Mamoru KOMACHI <usata@gentoo.org> w3mimgfb-0.8.ebuild:
+  Marked as stable
+
+  15 Jul 2003; Mamoru KOMACHI <usata@gentoo.org> w3mimgfb-0.8.ebuild:
+  Version bump
 
 *w3mimgfb-0.7.1 (16 Jun 2003)
 
+  14 Aug 2003; Mamoru KOMACHI <usata@gentoo.org> w3mimgfb-0.7.1.ebuild:
+  Marked as stable
+
   16 Jun 2003; Patrick Kursawe <phosphan@gentoo.org> w3mimgfb-0.7.1.ebuild:
   Initial import, ebuild written by Mamoru KOMACHI
   <usata@sodan.ecc.u-tokyo.ac.jp>
diff --git a/media-gfx/w3mimgfb/Manifest b/media-gfx/w3mimgfb/Manifest
index 4cf2a4d94f0f..2e13375cd8c9 100644
--- a/media-gfx/w3mimgfb/Manifest
+++ b/media-gfx/w3mimgfb/Manifest
@@ -1,2 +1,4 @@
-MD5 ac2a6986b47b28d7f7a8cda9f5f444d2 w3mimgfb-0.7.1.ebuild 721
-MD5 03177f6c3ff748dd109287e5eeeb0933 files/digest-w3mimgfb-0.7.1 65
+MD5 4690d4c112dbb243db26d45195801a21 w3mimgfb-0.9.1.ebuild 1291
+MD5 97db8bf26a08c292d864c41406e4e89b ChangeLog 1325
+MD5 043e2d431237aeec1769801a5b0214df metadata.xml 251
+MD5 9a3da37d4a2b9e331d232580b09d7b3f files/digest-w3mimgfb-0.9.1 65
diff --git a/media-gfx/w3mimgfb/w3mimgfb-0.9.1.ebuild b/media-gfx/w3mimgfb/w3mimgfb-0.9.1.ebuild
index 5c09323807f1..83a647459ec4 100644
--- a/media-gfx/w3mimgfb/w3mimgfb-0.9.1.ebuild
+++ b/media-gfx/w3mimgfb/w3mimgfb-0.9.1.ebuild
@@ -1,38 +1,52 @@
-# 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/media-gfx/w3mimgfb/w3mimgfb-0.9.1.ebuild,v 1.1 2003/08/13 17:13:00 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/w3mimgfb/w3mimgfb-0.9.1.ebuild,v 1.1.1.1 2005/11/30 09:37:31 chriswhite Exp $
 
-IUSE=""
+inherit toolchain-funcs
 
 DESCRIPTION="Image viewer for w3m under frame buffer environment"
-SRC_URI="http://homepage3.nifty.com/slokar/fb/${P}.tar.gz"
 HOMEPAGE="http://homepage3.nifty.com/slokar/fb/w3mimg.html"
+SRC_URI="http://homepage3.nifty.com/slokar/fb/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="w3m BSD"
-KEYWORDS="~x86"
+SLOT="0"
+KEYWORDS="x86 ppc"
+IUSE=""
 
 DEPEND=">=media-libs/stimg-0.1.0
-	virtual/textbrowser"
+	virtual/w3m"
 
 src_compile() {
-	emake CC="${CC}" CFLAGS="${CFLAGS}" || die "emake failed"
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
 }
 
 src_install() {
-	if has_version 'net-www/w3m' && has_version 'net-www/w3m-m17n' ; then
+
+	local realbin
+
+	if has_version '<www-client/w3m-0.4.2' ; then
 		exeinto /usr/lib/w3m
 		doexe w3mimgdisplayfb
-		dodir /usr/lib/w3m-m17n
-		dohard /usr/lib/w3m/w3mimgdisplayfb \
-			/usr/lib/w3m-m17n/w3mimgdisplayfb
-	elif has_version 'net-www/w3m' ; then
-		exeinto /usr/lib/w3m
+	elif has_version '>=www-client/w3m-0.4.2-r1' ; then
+		exeinto /usr/libexec/w3m
 		doexe w3mimgdisplayfb
-	elif has_version 'net-www/w3m-m17n' ; then
+	fi
+	if has_version '<www-client/w3m-m17n-0.4.2' ; then
 		exeinto /usr/lib/w3m-m17n
 		doexe w3mimgdisplayfb
+	elif has_version '>=www-client/w3m-m17n-0.4.2' ; then
+		exeinto /usr/libexec/w3m-m17n
+		doexe w3mimgdisplayfb
 	fi
 
+	for exe in /usr/lib{,exec}/w3m{,-m17n}/w3mimgdisplayfb ; do
+		if [ -n "$realexe" ] ; then
+			rm ${D}$exe
+			dohard $realexe $exe
+		elif [ -x ${D}$exe ] ; then
+			realexe=$exe
+		fi
+	done
+
 	dodoc COPYING readme.txt
 }
diff --git a/media-gfx/wings/ChangeLog b/media-gfx/wings/ChangeLog
index a0a75b820bc6..ca79ea89e81c 100644
--- a/media-gfx/wings/ChangeLog
+++ b/media-gfx/wings/ChangeLog
@@ -1,6 +1,61 @@
 # ChangeLog for media-gfx/wings
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/wings/ChangeLog,v 1.1 2003/02/18 00:14:03 vapier Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/wings/ChangeLog,v 1.1.1.1 2005/11/30 09:37:39 chriswhite Exp $
+
+*wings-0.98.29b (02 Jul 2005)
+
+  02 Jul 2005; Mike Frysinger <vapier@gentoo.org> +wings-0.98.29b.ebuild:
+  Version bump #97573 by Tupone Alfredo.
+
+*wings-0.98.21c (11 Apr 2004)
+
+  11 Apr 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bump.
+
+*wings-0.98.21 (22 Mar 2004)
+
+  22 Mar 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bump from Robust.
+
+*wings-0.98.20c (22 Mar 2004)
+
+  22 Mar 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bump from Robust.
+
+*wings-0.98.19b (21 Feb 2004)
+
+  21 Feb 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #35605.
+
+*wings-0.98.15a (14 Aug 2003)
+
+  14 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #26273.
+
+*wings-0.98.11c (13 Jul 2003)
+
+  13 Jul 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #24263.
+
+*wings-0.98.11b (13 Jul 2003)
+
+  13 Jul 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #24263.
+
+*wings-0.98.11a (28 Jun 2003)
+
+  28 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #23636.
+
+*wings-0.98.11 (21 Jun 2003)
+
+  21 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #23190.
+
+*wings-0.98.10e (19 Jun 2003)
+
+  19 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #20758.
 
 *wings-0.98.08d (17 Feb 2003)
 
diff --git a/media-gfx/wings/Manifest b/media-gfx/wings/Manifest
index e69de29bb2d1..46e0a76fcce8 100644
--- a/media-gfx/wings/Manifest
+++ b/media-gfx/wings/Manifest
@@ -0,0 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9bddf18f4d4f69f23d00d06d85d28daa metadata.xml 604
+MD5 3d4edf9ce92ba608f911106f833e798d wings-0.98.29b.ebuild 925
+MD5 b601dcaf434a901a714b6be133db0fe9 wings-0.98.20c.ebuild 920
+MD5 0fd876dd6532b72bf71e7855969728c8 wings-0.98.21c.ebuild 918
+MD5 471382d2fc89273530cf2aa8b3709739 ChangeLog 1586
+MD5 0fd80fa8e48d37b740a4a63b937ee231 files/digest-wings-0.98.20c 67
+MD5 f5cec09e12d398b7c76a90122992303d files/digest-wings-0.98.21c 67
+MD5 56a37b6b86b97612494f6b71ebf0bc58 files/wings.sh 171
+MD5 4392f9e8857795dec69f9c5608f4ffe9 files/digest-wings-0.98.29b 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFC+8kDgIKl8Uu19MoRAk1TAJ9N8w6H+9rN3lTeybPU9d8qFyjtGQCeOO0K
+0rrDghpCs+5WSgTaWQzg1jk=
+=624f
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/wings/files/wings.sh b/media-gfx/wings/files/wings.sh
index c9e8552f6e73..3498dfa50069 100644
--- a/media-gfx/wings/files/wings.sh
+++ b/media-gfx/wings/files/wings.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Wing3D run script
-
 ESDL_ROOT="/usr/lib/erlang/lib/esdl"
 WINGS_ROOT="/usr/lib/erlang/lib/wings"
-
-erl -pa $ESDL_ROOT/ebin $WINGS_ROOT/ebin -run wings_start start_halt
+exec erl -noshell -pa $ESDL_ROOT/ebin $WINGS_ROOT/ebin -run wings_start start_halt
diff --git a/media-gfx/wings/wings-0.98.20c.ebuild b/media-gfx/wings/wings-0.98.20c.ebuild
index 3a5a99acb358..000c143e4211 100644
--- a/media-gfx/wings/wings-0.98.20c.ebuild
+++ b/media-gfx/wings/wings-0.98.20c.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/media-gfx/wings/wings-0.98.20c.ebuild,v 1.1 2004/03/23 02:34:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/wings/wings-0.98.20c.ebuild,v 1.1.1.1 2005/11/30 09:37:39 chriswhite Exp $
 
 DESCRIPTION="excellent 3D polygon mesh modeler"
 HOMEPAGE="http://www.wings3d.com/"
@@ -9,6 +9,7 @@ SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="x86 ppc"
+IUSE=""
 
 DEPEND=">=dev-lang/erlang-9c
 	>=media-libs/esdl-0.93.0526"
diff --git a/media-gfx/wings/wings-0.98.21c.ebuild b/media-gfx/wings/wings-0.98.21c.ebuild
index a6b300c5ea45..eaf6d82b5fce 100644
--- a/media-gfx/wings/wings-0.98.21c.ebuild
+++ b/media-gfx/wings/wings-0.98.21c.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/media-gfx/wings/wings-0.98.21c.ebuild,v 1.1 2004/04/12 02:22:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/wings/wings-0.98.21c.ebuild,v 1.1.1.1 2005/11/30 09:37:39 chriswhite Exp $
 
 DESCRIPTION="excellent 3D polygon mesh modeler"
 HOMEPAGE="http://www.wings3d.com/"
@@ -8,7 +8,8 @@ SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="ppc x86"
+IUSE=""
 
 DEPEND=">=dev-lang/erlang-9c
 	>=media-libs/esdl-0.93.0526"
diff --git a/media-gfx/wings/wings-0.98.29b.ebuild b/media-gfx/wings/wings-0.98.29b.ebuild
index a2d8b5ed3d6f..4575bbae62db 100644
--- a/media-gfx/wings/wings-0.98.29b.ebuild
+++ b/media-gfx/wings/wings-0.98.29b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/wings/wings-0.98.29b.ebuild,v 1.1 2005/07/02 22:39:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/wings/wings-0.98.29b.ebuild,v 1.1.1.1 2005/11/30 09:37:39 chriswhite Exp $
 
 DESCRIPTION="excellent 3D polygon mesh modeler"
 HOMEPAGE="http://www.wings3d.com/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
 DEPEND=">=dev-lang/erlang-9c
diff --git a/media-gfx/xd3d/ChangeLog b/media-gfx/xd3d/ChangeLog
index 3b083f41a7eb..575b98b70588 100644
--- a/media-gfx/xd3d/ChangeLog
+++ b/media-gfx/xd3d/ChangeLog
@@ -1,6 +1,12 @@
-# ChangeLog for app-sci/xd3d
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xd3d/ChangeLog,v 1.1 2004/12/24 03:00:27 ribosome Exp $
+# ChangeLog for media-gfx/xd3d
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xd3d/ChangeLog,v 1.1.1.1 2005/11/30 09:37:19 chriswhite Exp $
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> xd3d-8.2.1.ebuild:
+  Added to ~ppc.
+
+  27 Jun 2005; Olivier Fisette <ribosome@gentoo.org> xd3d-8.2.1.ebuild:
+  Added missing tcsh dependency (bug #73814). Thanks to Bryan Duff.
 
 *xd3d-8.2.1 (23 Dec 2004)
 
diff --git a/media-gfx/xd3d/Manifest b/media-gfx/xd3d/Manifest
index b53570a67522..9ec999a33cce 100644
--- a/media-gfx/xd3d/Manifest
+++ b/media-gfx/xd3d/Manifest
@@ -1,5 +1,5 @@
-MD5 2a2960c53a438400122a18fdcd671cab ChangeLog 504
+MD5 be9fee68d56a7e1a0b08967144f2d4b6 ChangeLog 922
 MD5 7bf785acde90eaaaf82fbf66074df9ec metadata.xml 673
-MD5 799af217aafd73211beff2ab97ff6908 xd3d-8.2.1.ebuild 1170
-MD5 8e74eb67d30393b9b79c4cf10e070ac9 files/gentoo-xd3d-8.2.1.diff 4127
+MD5 bd195bf28d5692cf9f8125f7cab76884 xd3d-8.2.1.ebuild 1192
 MD5 155cd0a8aa6b4012cddc9e7666e93b4f files/digest-xd3d-8.2.1 63
+MD5 8e74eb67d30393b9b79c4cf10e070ac9 files/gentoo-xd3d-8.2.1.diff 4127
diff --git a/media-gfx/xd3d/xd3d-8.2.1.ebuild b/media-gfx/xd3d/xd3d-8.2.1.ebuild
index 255b7409d26c..76037ec82b22 100644
--- a/media-gfx/xd3d/xd3d-8.2.1.ebuild
+++ b/media-gfx/xd3d/xd3d-8.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/media-gfx/xd3d/xd3d-8.2.1.ebuild,v 1.1 2004/12/24 03:00:27 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xd3d/xd3d-8.2.1.ebuild,v 1.1.1.1 2005/11/30 09:37:19 chriswhite Exp $
 
 DESCRIPTION="scientific visualization tool"
 
@@ -11,14 +11,16 @@ LICENSE="GPL-2"
 
 SLOT="0"
 
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 
 IUSE="icc"
 
 RDEPEND="virtual/x11 \
 	icc? ( dev-lang/icc dev-lang/ifc )"
 
-DEPEND="${RDEPEND} sys-apps/which"
+DEPEND="${RDEPEND}
+	sys-apps/which
+	app-shells/tcsh"
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-gfx/xfig/ChangeLog b/media-gfx/xfig/ChangeLog
index f4880b30082f..6c6f2b4fbe65 100644
--- a/media-gfx/xfig/ChangeLog
+++ b/media-gfx/xfig/ChangeLog
@@ -1,6 +1,80 @@
 # ChangeLog for media-gfx/xfig
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/ChangeLog,v 1.1 2002/02/01 21:53:30 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/ChangeLog,v 1.1.1.1 2005/11/30 09:37:37 chriswhite Exp $
+
+*xfig-3.2.5_alpha5 (24 Sep 2005)
+
+  24 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +files/xfig-3.2.5_alpha5-gentoo.diff, +files/xfig-3.2.5_alpha5-xaw3d.diff,
+  +metadata.xml, -xfig-3.2.3d-r1.ebuild, -xfig-3.2.4.ebuild,
+  +xfig-3.2.5_alpha5.ebuild:
+  Version bump for bug 71205, thanks to Cristian Peraferrer <corellian at
+  interec dot org>. Ported gentoo and xaw3d patches, shape patch is integrated
+  upstream.
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> xfig-3.2.4-r2.ebuild:
+  Mark 3.2.4-r2 stable on alpha
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org> xfig-3.2.4-r2.ebuild:
+  Stable on ppc64
+
+  01 Nov 2004; Markus Rothe <corsair@gentoo.org> xfig-3.2.4-r2.ebuild:
+  Marked ~ppc64
+
+  01 Nov 2004; Markus Rothe <corsair@gentoo.org>
+
+  xfig-3.2.4-r1.ebuild:
+  Marked ~ppc64; bug #66756
+
+*xfig-3.2.4-r2 (02 Sep 2004)
+
+  02 Sep 2004; Mamoru KOMACHI <usata@gentoo.org> +xfig-3.2.4-r2.ebuild:
+  Added shapepatch. Thanks to Geoffrey <geoffrey@andrews.edu>, see bug #20877.
+
+  05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> xfig-3.2.4-r1.ebuild:
+  Stable on alpha.
+
+  25 Mar 2004; Joshua Kinard <kumba@gentoo.org> xfig-3.2.4-r1.ebuild:
+  Removed ~mips from KEYWORDS until this can be tested on mips.
+
+  13 Dec 2003; Brad House <brad_mssw@gentoo.org> xfig-3.2.4-r1.ebuild:
+  mark stable on amd64
+
+*xfig-3.2.4-r1 (10 Mar 2003)
+
+  10 Mar 2003; Seemant Kulleen <seemant@gentoo.org> xfig-3.2.4-r1.ebuild,
+  files/xfig-3.2.4-xaw3d.diff:
+  supports Xaw3d now. thanks to: Sander Graswinckel <sgraswinckel@hotmail.com>
+  for the patch in bug #16224
+
+*xfig-3.2.4 (12 Feb 2003)
+
+  12 Feb 2003; Seemant Kulleen <seemant@gentoo.org> xfig-3.2.4.ebuild :
+
+  Version bump thanks to: Daniele Foci <sunscan@sunscan.org> in bug
+  #14245.  Also, removed the patch from files and sent it to the mirrors,
+  and using epatch from eutils.eclass to handle the patching.
+
+*xfig-3.2.3d-r1 (13 Apr 2002)
+
+  07 Jan 2003; George Shapovalov <george@gentoo.org> xfig-3.2.3d-r1.ebuild :
+  added IUSE, few cosmetic touch-ups
+
+  02 Dec 2002; Seemant Kulleen <seemant@gentoo.org> xfig-3.2.3d-r1.ebuild :
+
+  Added media-libs/netpbm to RDEPEND, closing bug #11515 by ntl@swt.edu
+  (nate lynch)
+
+  7 Sep 2002; Owen Stampflee <owen@gentoo.org> :
+  Added PPC to KEYWORDS.
+
+  13 Apr 2002; Seemant Kulleen <seemant@gentoo.org> xfig-3.2.3d-r1.ebuild :
+
+  Added transfig to the RDEPEND. Did not bump version numbers though.
+  Closes bug #1619 by ekoontz@hiro-tan.dhs.org (Eugene Koontz)
 
 *xfig-3.2.3d (1 Feb 2002)
 
diff --git a/media-gfx/xfig/Manifest b/media-gfx/xfig/Manifest
index e69de29bb2d1..9418023df0ce 100644
--- a/media-gfx/xfig/Manifest
+++ b/media-gfx/xfig/Manifest
@@ -0,0 +1,11 @@
+MD5 c90f05f166f78646da5cda62db8f7c45 xfig-3.2.4-r2.ebuild 1382
+MD5 06dd79b318ab2b565d7844f664c4b9bd xfig-3.2.5_alpha5.ebuild 1202
+MD5 05da0d580f50e46c60ddb6c915310a51 xfig-3.2.4-r1.ebuild 1063
+MD5 02f7d3ed86b200e1383fa5aedb21c2f0 ChangeLog 3229
+MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
+MD5 1d27cd35de86081aa824a8f837f14745 files/xfig-3.2.4-xaw3d.diff 465
+MD5 b30d1a2b0c6ce802248a2605e13356df files/digest-xfig-3.2.5_alpha5 75
+MD5 beb83fd8cd3423aeffdc3858a633852d files/xfig-3.2.5_alpha5-gentoo.diff 2110
+MD5 410ddf8ebcca6c2714f820d737f136c0 files/digest-xfig-3.2.4-r1 137
+MD5 4b1ad5e5e2087452ce25723ececb2708 files/digest-xfig-3.2.4-r2 215
+MD5 65da21fda4fd5353fa3d7f421982af99 files/xfig-3.2.5_alpha5-xaw3d.diff 456
diff --git a/media-gfx/xfig/xfig-3.2.4-r1.ebuild b/media-gfx/xfig/xfig-3.2.4-r1.ebuild
index 674c1e93258e..afbb458c4d57 100644
--- a/media-gfx/xfig/xfig-3.2.4-r1.ebuild
+++ b/media-gfx/xfig/xfig-3.2.4-r1.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2.
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/xfig-3.2.4-r1.ebuild,v 1.1 2003/03/10 11:34:45 seemant Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/xfig-3.2.4-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:37 chriswhite Exp $
 
 inherit eutils
 
-IUSE=""
-
 MY_P=${PN}.${PV}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="A menu-driven tool to draw and manipulate objects interactively in an X window."
@@ -13,15 +11,15 @@ HOMEPAGE="http://www.xfig.org"
 SRC_URI="http://www.xfig.org/xfigdist/${MY_P}.full.tar.gz
 	mirror://gentoo/${P}-gentoo.diff.bz2"
 
-SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa"
+SLOT="0"
+KEYWORDS="x86 ppc ~sparc alpha ~hppa amd64 ~ppc64"
+IUSE=""
 
 DEPEND="virtual/x11
 	x11-libs/Xaw3d
 	media-libs/jpeg
 	media-libs/libpng"
-
 RDEPEND="${DEPEND}
 	media-gfx/transfig
 	media-libs/netpbm"
@@ -38,10 +36,8 @@ src_compile() {
 	make || die
 }
 
-src_install () {
-	make \
-		DESTDIR=${D} \
-		install || die
+src_install() {
+	make DESTDIR=${D} install || die
 
 	make \
 		DESTDIR=${D} \
diff --git a/media-gfx/xfig/xfig-3.2.4-r2.ebuild b/media-gfx/xfig/xfig-3.2.4-r2.ebuild
index dc0817fac1f6..9e0f2baf9fbc 100644
--- a/media-gfx/xfig/xfig-3.2.4-r2.ebuild
+++ b/media-gfx/xfig/xfig-3.2.4-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/media-gfx/xfig/xfig-3.2.4-r2.ebuild,v 1.1 2004/09/02 03:39:15 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/xfig-3.2.4-r2.ebuild,v 1.1.1.1 2005/11/30 09:37:37 chriswhite Exp $
 
 inherit eutils
 
@@ -16,7 +16,7 @@ SRC_URI="http://www.xfig.org/xfigdist/${MY_P}.full.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
+KEYWORDS="alpha ~amd64 ~hppa ~ppc ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="virtual/x11
diff --git a/media-gfx/xfig/xfig-3.2.5_alpha5.ebuild b/media-gfx/xfig/xfig-3.2.5_alpha5.ebuild
index f5830d4ffc42..92c76bb20163 100644
--- a/media-gfx/xfig/xfig-3.2.5_alpha5.ebuild
+++ b/media-gfx/xfig/xfig-3.2.5_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/media-gfx/xfig/xfig-3.2.5_alpha5.ebuild,v 1.1 2005/09/24 21:31:55 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/xfig-3.2.5_alpha5.ebuild,v 1.1.1.1 2005/11/30 09:37:37 chriswhite Exp $
 
 inherit eutils
 
diff --git a/media-gfx/xgraph/ChangeLog b/media-gfx/xgraph/ChangeLog
index 948ee7a8bd30..9dde57c4e72e 100644
--- a/media-gfx/xgraph/ChangeLog
+++ b/media-gfx/xgraph/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for media-gfx/xgraph
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xgraph/ChangeLog,v 1.1 2004/01/11 04:15:14 robbat2 Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xgraph/ChangeLog,v 1.1.1.1 2005/11/30 09:37:29 chriswhite Exp $
+
+  03 Nov 2005; Fabian Groffen <grobian@gentoo.org> xgraph-12.1.ebuild:
+  Marked ~ppc-macos (bug #110940)
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> xgraph-12.1.ebuild:
+  Added to ~ppc.
+
+  23 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> xgraph-12.1.ebuild:
+  added ~amd64 to KEYWORDS. fixes #83054
+
+  14 Jun 2004; Ferris McCormick <fmccor@gentoo.org> xgraph-12.1.ebuild:
+  Marked stable for sparc.
 
 *xgraph-12.1 (10 Jan 2004)
 
diff --git a/media-gfx/xgraph/Manifest b/media-gfx/xgraph/Manifest
index 797ed8bad6ff..5128b9d7eab3 100644
--- a/media-gfx/xgraph/Manifest
+++ b/media-gfx/xgraph/Manifest
@@ -1,2 +1,3 @@
-MD5 52b979c074f64dbde227323508f60291 xgraph-12.1.ebuild 657
+MD5 e4947eff055ff9379adae1745ebaf6f7 xgraph-12.1.ebuild 773
+MD5 8c3055d6f45715b64c104f1f29f7085a ChangeLog 835
 MD5 6826e5d007a04ca340b4b97e6672f81f files/digest-xgraph-12.1 63
diff --git a/media-gfx/xgraph/xgraph-12.1.ebuild b/media-gfx/xgraph/xgraph-12.1.ebuild
index 2276b6c66bea..4656aed08616 100644
--- a/media-gfx/xgraph/xgraph-12.1.ebuild
+++ b/media-gfx/xgraph/xgraph-12.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/media-gfx/xgraph/xgraph-12.1.ebuild,v 1.1 2004/01/11 04:15:14 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xgraph/xgraph-12.1.ebuild,v 1.1.1.1 2005/11/30 09:37:29 chriswhite Exp $
 
 DESCRIPTION="X11 Plotting Utility"
 HOMEPAGE="http://www.isi.edu/nsnam/xgraph/"
 SRC_URI="http://www.isi.edu/nsnam/dist/${P}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="~amd64 ~ppc ~ppc-macos sparc ~x86"
 IUSE=""
 DEPEND="virtual/x11"
 
diff --git a/media-gfx/xli/ChangeLog b/media-gfx/xli/ChangeLog
index 9c6d5dee131d..04ab8066daf2 100644
--- a/media-gfx/xli/ChangeLog
+++ b/media-gfx/xli/ChangeLog
@@ -1,6 +1,106 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xli/ChangeLog,v 1.1 2002/07/14 20:45:55 naz Exp $
+# ChangeLog for media-gfx/xli
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xli/ChangeLog,v 1.1.1.1 2005/11/30 09:37:20 chriswhite Exp $
+
+  20 Nov 2005; Hardave Riar <hardave@gentoo.org> xli-1.17.0-r2.ebuild:
+  Stable on mips, bug #108365.
+
+  29 Oct 2005; Bryan Østergaard <kloeri@gentoo.org> xli-1.17.0-r2.ebuild:
+  Stable on ia64.
+
+  29 Oct 2005; Michael Hanselmann <hansmi@gentoo.org> xli-1.17.0-r2.ebuild:
+  Stable on hppa, ppc. See bug #108365.
+
+  28 Oct 2005; Mark Loeser <halcy0n@gentoo.org> xli-1.17.0-r2.ebuild:
+  Stable on x86; bug #108365
+
+  27 Oct 2005; Simon Stelling <blubb@gentoo.org> xli-1.17.0-r2.ebuild:
+  stable on amd64 wrt bug 108365
+
+  27 Oct 2005; Brent Baude <ranger@gentoo.org> xli-1.17.0-r2.ebuild:
+  Marking xli-1.17.0-r2 ppc64 stable for bug 108635
+
+  27 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> xli-1.17.0-r2.ebuild:
+  Stable on sparc wrt #108365
+
+  27 Oct 2005; Bryan Østergaard <kloeri@gentoo.org> xli-1.17.0-r2.ebuild:
+  Stable on alpha, bug 108365.
+
+  27 Oct 2005; Fabian Groffen <grobian@gentoo.org> xli-1.17.0-r2.ebuild:
+  Marked ppc-macos for bug #108365
+
+*xli-1.17.0-r2 (26 Oct 2005)
+
+  26 Oct 2005; Tavis Ormandy <taviso@gentoo.org>
+  +files/xli-security-gentoo.diff, +xli-1.17.0-r2.ebuild:
+  security fix, #108365
+
+  24 Apr 2005; Markus Rothe <corsair@gentoo.org> xli-1.17.0-r1.ebuild:
+  Stable on ppc64
+
+  21 Mar 2005; Guy Martin <gmsoft@gentoo.org> xli-1.17.0-r1.ebuild:
+  Stable on hppa.
+
+  18 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> xli-1.17.0-r1.ebuild,
+  xli-1.17.0.ebuild:
+  Removing full path from xmkmf call as it is not needed, and breaks systems
+  with no X11R6 symlink, bug 85797.
+
+  17 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> xli-1.17.0-r1.ebuild:
+  Marked stable on amd64 for gnupg-1.4.1, bug 85547.
+
+  16 Mar 2005; Markus Rothe <corsair@gentoo.org> xli-1.17.0.ebuild:
+  Added ~ppc64 to KEYWORDS; bug #76234
+
+  15 Mar 2005; Hardave Riar <hardave@gentoo.org> xli-1.17.0-r1.ebuild:
+  Keyworded ~mips, bug #76234.
+
+  01 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> xli-1.17.0-r1.ebuild:
+  Stable on alpha.
+
+  28 Feb 2005; Lina Pezzella <j4rg0n@gentoo.org> xli-1.17.0-r1.ebuild:
+  Stable ppc-macos
+
+  28 Feb 2005; Michael Hanselmann <hansmi@gentoo.org> xli-1.17.0-r1.ebuild:
+  Stable on ppc.
+
+  28 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org> xli-1.17.0-r1.ebuild:
+  Stable on sparc wrt #79762
+
+  28 Feb 2005; Olivier Crête <tester@gentoo.org> xli-1.17.0-r1.ebuild:
+  Stable on x86 per security bug #79762
+
+*xli-1.17.0-r1 (28 Feb 2005)
+
+  28 Feb 2005; Tavis Ormandy <taviso@gentoo.org> +xli-1.17.0-r1.ebuild:
+  new snapshot with security fixes.
+
+  05 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> xli-1.17.0.ebuild:
+  ~alpha keyworded, bug 76234.
+
+  03 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> xli-1.17.0.ebuild:
+  Keyworded ~sparc wrt #76234
+
+  10 Nov 2004; Mamoru KOMACHI <usata@gentoo.org> xli-1.17.0.ebuild:
+  Added to ~ppc-macos.
+
+  31 May 2004; Danny van Dyk <kugelfang@gentoo.org> xli-1.17.0.ebuild:
+  Marked ~amd64.
+
+  13 Mar 2004; Mamoru KOMACHI <usata@gentoo.org> xli-1.17.0.ebuild,
+  files/Xli.ad:
+  Use alternatives.eclass to avoid conflict between xloadimage, see bug #26751
+
+  29 Dec 2003; Guy Martin <gmsoft@gentoo.org> xli-1.17.0.ebuild :
+  Added hppa to KEYWORDS and moved sed stuff in src_unpack.
+
+  14 Dec 2003; Lars Weiler <pylon@gentoo.org> xli-1.17.0.ebuild:
+  Make stable on ppc
+  Thanks to Florian Daniel for the testing
+
+  07 Oct 2003; Brandy Westcott brandy@gentoo.org metadata.xml,
+  xli-1.17.0.ebuild:
+  Small fix so we can compile using gcc-3.3
 
 *xli-1.17.0 (13 Jul 2002)
 
diff --git a/media-gfx/xli/Manifest b/media-gfx/xli/Manifest
index e69de29bb2d1..2f2611eae533 100644
--- a/media-gfx/xli/Manifest
+++ b/media-gfx/xli/Manifest
@@ -0,0 +1,10 @@
+MD5 5f59929081a2e68e5340f27ce1b715e3 ChangeLog 3851
+MD5 88664b266f34957e871e07457c605227 files/Xli.ad 123
+MD5 56c2673ad567dbf5ca2163c932571234 files/digest-xli-1.17.0 62
+MD5 4f4d73aa9e90de9931e810d283ab6db6 files/digest-xli-1.17.0-r1 66
+MD5 4f4d73aa9e90de9931e810d283ab6db6 files/digest-xli-1.17.0-r2 66
+MD5 5cfa67b158e1deae4d28589f9a7da60a files/xli-security-gentoo.diff 6940
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 102b722f83fa906cc5ce1a687bbd240f xli-1.17.0-r1.ebuild 2211
+MD5 c75be2f06d4afdb642b4899be00b70dd xli-1.17.0-r2.ebuild 2324
+MD5 9cde58e96d0616fd7a7707bcc8a44eec xli-1.17.0.ebuild 2119
diff --git a/media-gfx/xli/xli-1.17.0-r1.ebuild b/media-gfx/xli/xli-1.17.0-r1.ebuild
index ae13b0cc7cd9..7770c44c18a9 100644
--- a/media-gfx/xli/xli-1.17.0-r1.ebuild
+++ b/media-gfx/xli/xli-1.17.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/media-gfx/xli/xli-1.17.0-r1.ebuild,v 1.1 2005/02/28 11:22:14 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xli/xli-1.17.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:20 chriswhite Exp $
 
 inherit alternatives
 
@@ -11,13 +11,14 @@ SRC_URI="http://pantransit.reptiles.org/prog/xli/xli-${SNAPSHOT}.tar.gz"
 
 LICENSE="X11"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc-macos ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc-macos ppc64 sparc x86"
 IUSE=""
 
 DEPEND="virtual/x11
 	>=sys-libs/zlib-1.1.4
 	>=media-libs/libpng-1.0.5
-	>=media-libs/jpeg-6b-r2"
+	>=media-libs/jpeg-6b-r2
+	app-arch/bzip2"
 
 S=${WORKDIR}/${PN}-${SNAPSHOT}
 
@@ -33,7 +34,7 @@ src_unpack() {
 	fi
 
 	sed -i Imakefile \
-		-e "/^DEFINES =/s/$/ -DHAVE_GUNZIP/" \
+		-e "/^DEFINES =/s/$/ -DHAVE_GUNZIP -DHAVE_BUNZIP2 /" \
 		-e "/CCOPTIONS =/s/=.*/=/"
 
 	# This is a hack to avoid a parse error on /usr/include/string.h
@@ -48,7 +49,7 @@ src_unpack() {
 }
 
 src_compile() {
-	/usr/X11R6/bin/xmkmf || die
+	xmkmf || die "xmkmf failed."
 
 	emake CDEBUGFLAGS="${CFLAGS}" || die
 }
diff --git a/media-gfx/xli/xli-1.17.0-r2.ebuild b/media-gfx/xli/xli-1.17.0-r2.ebuild
index 6275bc29b964..bb4d55c95c0c 100644
--- a/media-gfx/xli/xli-1.17.0-r2.ebuild
+++ b/media-gfx/xli/xli-1.17.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/media-gfx/xli/xli-1.17.0-r2.ebuild,v 1.1 2005/10/26 15:09:15 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xli/xli-1.17.0-r2.ebuild,v 1.1.1.1 2005/11/30 09:37:20 chriswhite Exp $
 
 inherit alternatives eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://pantransit.reptiles.org/prog/xli/xli-${SNAPSHOT}.tar.gz"
 
 LICENSE="X11"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc-macos ppc64 sparc x86"
 IUSE=""
 
 DEPEND="virtual/x11
@@ -27,7 +27,7 @@ src_unpack() {
 
 	cd ${S}
 
-	if use ppc-macos ; then
+	if use userland_Darwin ; then
 		for f in $(grep zopen * | cut -d':' -f1 | uniq); do
 			sed -i "s:zopen:xli_zopen:g" $f
 		done
diff --git a/media-gfx/xli/xli-1.17.0.ebuild b/media-gfx/xli/xli-1.17.0.ebuild
index f5c9af6a7ecb..e94649d9325a 100644
--- a/media-gfx/xli/xli-1.17.0.ebuild
+++ b/media-gfx/xli/xli-1.17.0.ebuild
@@ -1,55 +1,86 @@
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xli/xli-1.17.0.ebuild,v 1.1.1.1 2005/11/30 09:37:20 chriswhite Exp $
+
+inherit alternatives
 
-S=${WORKDIR}/${P}
 DESCRIPTION="X Load Image: view images or load them to root window"
-SRC_URI="ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/${P}.tar.gz"
 HOMEPAGE="http://pantransit.reptiles.org/prog/"
+SRC_URI="ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="X11"
-KEYWORDS="x86"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ppc ~ppc-macos ~ppc64 ~sparc x86"
+IUSE=""
 
-DEPEND="virtual/glibc \
-		virtual/x11 \
-		>=sys-libs/zlib-1.1.4
-		>=media-libs/libpng-1.0.5 \
-		>=media-libs/jpeg-6b-r2"
+DEPEND="virtual/x11
+	>=sys-libs/zlib-1.1.4
+	>=media-libs/libpng-1.0.5
+	>=media-libs/jpeg-6b-r2"
 
-src_compile() {
-	cp Imakefile Imakefile.orig
-	sed -e "/^DEFINES =/s/$/ -DHAVE_GUNZIP/" < Imakefile.orig > Imakefile
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
 
-	/usr/X11R6/bin/xmkmf || die
+	if use ppc-macos ; then
+		for f in $(grep zopen * | cut -d':' -f1 | uniq); do
+			sed -i "s:zopen:xli_zopen:g" $f
+		done
+	fi
 
-	cp Makefile Makefile.orig
-	sed -e "/CDEBUGFLAGS =/s/=.*/= ${CFLAGS}/" < Makefile.orig > Makefile
+	sed -i Imakefile \
+		-e "/^DEFINES =/s/$/ -DHAVE_GUNZIP/" \
+		-e "/CCOPTIONS =/s/=.*/=/"
 
 	# This is a hack to avoid a parse error on /usr/include/string.h
 	# when _BSD_SOURCE is defined. This may be a bug in that header.
-	cp png.c png.c.orig
-	sed -e "/^#include \"xli.h\"/i#undef _BSD_SOURCE" < png.c.orig > png.c
+	sed	-i png.c \
+		-e "/^#include \"xli.h\"/i#undef _BSD_SOURCE"
+
+	# This hack will allow xli to compile using gcc-3.3
+	sed -i rlelib.c \
+		-e "s/#include <varargs.h>//"
 
-	emake || die
 }
 
-src_install () {
+src_compile() {
+	xmkmf || die "xmkmf died."
+
+	emake CDEBUGFLAGS="${CFLAGS}" || die
+}
+
+
+src_install() {
 	into /usr
 	dobin xli xlito
 	dodoc README README.xloadimage ABOUTGAMMA TODO chkgamma.jpg
 	newman xli.man xli.1
 	newman xliguide.man xliguide.1
 	newman xlito.man xlito.1
-	dosym /usr/bin/xli /usr/bin/xview
-	dosym /usr/bin/xli /usr/bin/xsetbg
-	
-	# is this even worth it? xrdb doesnt like this file; this is what
-	# their install does, though.
-	dodir /usr/X11R6/lib/X11/app-defaults
-	cp /dev/null ${D}/usr/X11R6/lib/X11/app-defaults/Xli
-	echo "path=/usr/X11R6/include/X11/bitmaps /usr/X11R6/include/X11/images" \
-		>> ${D}/usr/X11R6/lib/X11/app-defaults/Xli
-	echo "extension=.gif .jpg .rle .csun .msun .sun .face .xbm .bm"  \
-		>> ${D}/usr/X11R6/lib/X11/app-defaults/Xli
-	chmod a+r ${D}/usr/X11R6/lib/X11/app-defaults/Xli
+	#dosym /usr/bin/xli /usr/bin/xview
+	#dosym /usr/bin/xli /usr/bin/xsetbg
+
+	insinto /etc/X11/app-defaults
+	newins ${FILESDIR}/Xli.ad Xli || die
+	fperms a+r /etc/X11/app-defaults/Xli
 }
 
+update_alternatives() {
+	alternatives_makesym /usr/bin/xview \
+		/usr/bin/{xloadimage,xli}
+	alternatives_makesym /usr/bin/xsetbg \
+		/usr/bin/{xloadimage,xli}
+	alternatives_makesym /usr/share/man/man1/xview.1.gz \
+		/usr/share/man/man1/{xloadimage,xli}.1.gz
+	alternatives_makesym /usr/share/man/man1/xsetbg.1.gz \
+		/usr/share/man/man1/{xloadimage,xli}.1.gz
+}
+
+pkg_postinst() {
+	use ppc-macos || update_alternatives
+}
+
+pkg_postrm() {
+	use ppc-macos || update_alternatives
+}
diff --git a/media-gfx/xloadimage/ChangeLog b/media-gfx/xloadimage/ChangeLog
index 045bed52a65c..e9eec64213b0 100644
--- a/media-gfx/xloadimage/ChangeLog
+++ b/media-gfx/xloadimage/ChangeLog
@@ -1,6 +1,106 @@
 # ChangeLog for media-gfx/xloadimage
-# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xloadimage/ChangeLog,v 1.1 2004/03/13 12:02:36 usata Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xloadimage/ChangeLog,v 1.1.1.1 2005/11/30 09:37:47 chriswhite Exp $
+
+  20 Nov 2005; Hardave Riar <hardave@gentoo.org> xloadimage-4.1-r4.ebuild:
+  Stable on mips, bug #108365.
+
+  02 Nov 2005; Krzysiek Pawlik <nelchael@gentoo.org> ChangeLog:
+  Fix ChangeLog.
+
+  29 Oct 2005; Bryan Østergaard <kloeri@gentoo.org>
+  xloadimage-4.1-r4.ebuild:
+  Stable on ia64.
+
+  29 Oct 2005; Michael Hanselmann <hansmi@gentoo.org>
+  xloadimage-4.1-r4.ebuild:
+  Stable on hppa, ppc. See bug #108365.
+
+  28 Oct 2005; Mark Loeser <halcy0n@gentoo.org> xloadimage-4.1-r4.ebuild:
+  Stable on x86; bug #108365
+
+  27 Oct 2005; Simon Stelling <blubb@gentoo.org> xloadimage-4.1-r4.ebuild:
+  stable on amd64 wrt bug 108365
+
+  27 Oct 2005; Brent Baude <ranger@gentoo.org> xloadimage-4.1-r4.ebuild:
+  Marking xloadimage-4.1-r4 ppc64 stable for bug 108635
+
+  27 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  xloadimage-4.1-r4.ebuild:
+  Stable on sparc wrt #108365
+
+  27 Oct 2005; Bryan Østergaard <kloeri@gentoo.org>
+  xloadimage-4.1-r4.ebuild:
+  Stable on alpha, bug 108365.
+
+  27 Oct 2005; Fabian Groffen <grobian@gentoo.org> xloadimage-4.1-r4.ebuild:
+  Marked ppc-macos for bug #108365
+
+*xloadimage-4.1-r4 (26 Oct 2005)
+
+  26 Oct 2005; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/xloadimage-gentoo.patch, +xloadimage-4.1-r4.ebuild:
+  Fix security bug 108365.
+
+*xloadimage-4.1-r3 (25 Aug 2005)
+
+  25 Aug 2005; Jonathan Smith <smithj@gentoo.org> ChangeLog:
+  pyrania forgot to add a changelog entry for 4.1-r3, so this is coppied from
+  the cvs log: Fixed b0rked endif. See bug #84072.
+
+  01 Mar 2005; Bryan Østergaard <kloeri@gentoo.org>
+  xloadimage-4.1-r2.ebuild:
+  Stable on alpha.
+
+  01 Mar 2005; Hardave Riar <hardave@gentoo.org> xloadimage-4.1-r2.ebuild:
+  Stable on mips, bug #79762.
+
+  28 Feb 2005; Lina Pezzella <j4rg0n@gentoo.org> xloadimage-4.1-r2.ebuild:
+  Stable ppc-macos
+
+  28 Feb 2005; Michael Hanselmann <hansmi@gentoo.org>
+  xloadimage-4.1-r2.ebuild:
+  Stable on ppc.
+
+  28 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  xloadimage-4.1-r2.ebuild:
+  Stable on sparc wrt #79762
+
+  28 Feb 2005; Olivier Crête <tester@gentoo.org> xloadimage-4.1-r2.ebuild:
+  Stable on x86 per security bug #79762
+
+  28 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> xloadimage-4.1-r2.ebuild:
+  stable on amd64. see #79762
+
+  28 Feb 2005; Markus Rothe <corsair@gentoo.org> xloadimage-4.1-r2.ebuild:
+  Stable on ppc64; bug #79762
+
+*xloadimage-4.1-r2 (28 Feb 2005)
+
+  28 Feb 2005; Tavis Ormandy <taviso@gentoo.org>
+  +files/xloadimage-4.1-zio-shell-meta-char.diff, +xloadimage-4.1-r2.ebuild:
+  security patch, escape shell meta chars when viewing compressed files.
+
+  02 Jan 2005; <gongloo@gentoo.org> xloadimage-4.1-r1.ebuild:
+  Stable on ppc-macos.
+
+  10 Nov 2004; Mamoru KOMACHI <usata@gentoo.org> xloadimage-4.1-r1.ebuild:
+  Added to ~ppc-macos.
+
+  30 Sep 2004; Stephen P. Becker <geoman@gentoo.org> xloadimage-4.1-r1.ebuild:
+  stable on mips
+
+  22 Aug 2004; Tom Gall <tgall@gentoo.org> xloadimage-4.1-r1.ebuild:
+  stable on ppc64
+
+  13 Jul 2004; Tom Gall <tgall@gentoo.org> xloadimage-4.1-r1.ebuild:
+  added ~ppc64, bug #54814
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> xloadimage-4.1-r1.ebuild:
+  Add inherit eutils
+
+  24 Apr 2004; Bret Curtis <psi29a@gentoo.org> xloadimage-4.1-r1.ebuild:
+  Added to ~mips
 
 *xloadimage-4.1-r1 (13 Mar 2004)
 
@@ -18,7 +118,7 @@
   Added metadata.xml
 
   21 Sep 2003; Seemant Kulleen <seemant@gentoo.org> xloadimage-4.1-r1.ebuild:
-  SRC_URI update, thanks to: P�ntek L�szl� <nembela@index.hu> in bug #29294
+  SRC_URI update, thanks to: Péntek László <nembela@index.hu> in bug #29294
 
   07 Jun 2003; Paul de Vrieze <pauldv@gentoo.org> xloadimage-4.1-r1.ebuild:
   Make a fix so xloadimage compiles with gcc-3.3
diff --git a/media-gfx/xloadimage/Manifest b/media-gfx/xloadimage/Manifest
index b6900c147309..ff8155df3c09 100644
--- a/media-gfx/xloadimage/Manifest
+++ b/media-gfx/xloadimage/Manifest
@@ -1,5 +1,14 @@
-MD5 1d3c5e0bfe55bb5468ff8593e3fddb99 ChangeLog 2256
-MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
-MD5 9b9afd1daf91037fd03a1b3aaba72758 xloadimage-4.1-r1.ebuild 1714
-MD5 c411c977cc7ae79dd96aad933980dbb2 files/xloadimage-4.1-include-errno_h.patch 303
+MD5 c3fbcfe23186ae04214cf27076adae6d ChangeLog 5733
 MD5 bad387ba03d0111a70dd7066ba97d5e5 files/digest-xloadimage-4.1-r1 140
+MD5 bad387ba03d0111a70dd7066ba97d5e5 files/digest-xloadimage-4.1-r2 140
+MD5 bad387ba03d0111a70dd7066ba97d5e5 files/digest-xloadimage-4.1-r3 140
+MD5 1e91f350f870e196e1f181a27f3fd1ab files/digest-xloadimage-4.1-r4 140
+MD5 fb91a22d37e6c6db534f1dc81add707e files/xloadimage-4.1-endif.patch 321
+MD5 c411c977cc7ae79dd96aad933980dbb2 files/xloadimage-4.1-include-errno_h.patch 303
+MD5 9208b10866e00f1e47bb12a7f8bec04a files/xloadimage-4.1-zio-shell-meta-char.diff 1372
+MD5 49ea6a01c79f1540896bd264c3606cb3 files/xloadimage-gentoo.patch 8956
+MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
+MD5 078fc3ab12c2f7564321ccdb25dda6f7 xloadimage-4.1-r1.ebuild 1987
+MD5 c70706f60bc9c49272d9117bd7d0ea00 xloadimage-4.1-r2.ebuild 2036
+MD5 eb2e15ec1eb2e879d416b8692be3cee6 xloadimage-4.1-r3.ebuild 2072
+MD5 3b4e3a149a689a83cb33172d754bb3a7 xloadimage-4.1-r4.ebuild 2127
diff --git a/media-gfx/xloadimage/xloadimage-4.1-r1.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r1.ebuild
index 082183054af6..7c6ce296be32 100644
--- a/media-gfx/xloadimage/xloadimage-4.1-r1.ebuild
+++ b/media-gfx/xloadimage/xloadimage-4.1-r1.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/media-gfx/xloadimage/xloadimage-4.1-r1.ebuild,v 1.1 2004/03/13 12:02:36 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xloadimage/xloadimage-4.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:47 chriswhite Exp $
 
-inherit alternatives
+inherit alternatives eutils flag-o-matic
 
 MY_P="${P/-/.}"
 S=${WORKDIR}/${MY_P}
@@ -13,14 +13,15 @@ SRC_URI="ftp://ftp.x.org/R5contrib/${MY_P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="x86 sparc ppc alpha hppa amd64 ia64"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86 ppc-macos"
 IUSE="tiff jpeg png"
 
-DEPEND=">=sys-apps/sed-4.0.5
-	virtual/x11
+RDEPEND="virtual/x11
 	tiff? ( media-libs/tiff )
 	png? ( media-libs/libpng )
 	jpeg? ( media-libs/jpeg )"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4.0.5"
 
 src_unpack() {
 	unpack ${A}
@@ -32,9 +33,16 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-include-errno_h.patch
 
 	sed -i "s:OPT_FLAGS=:OPT_FLAGS=$CFLAGS:" Make.conf
+	sed -i "s:^#include <varargs.h>:#include <stdarg.h>:" ${S}/rlelib.c
+
+	if use ppc-macos ; then
+		sed -i 's,<malloc.h>,<malloc/malloc.h>,' vicar.c
+		for f in $(grep zopen * | cut -d':' -f1 | uniq);do
+			sed -i "s:zopen:zloadimage_zopen:g" $f
+		done
+	fi
 
 	chmod +x ${S}/configure
-	sed -i "s:^#include <varargs.h>:#include <stdarg.h>:" ${S}/rlelib.c
 }
 
 src_install() {
@@ -62,9 +70,9 @@ update_alternatives() {
 }
 
 pkg_postinst() {
-	update_alternatives
+	use ppc-macos || update_alternatives
 }
 
 pkg_postrm() {
-	update_alternatives
+	use ppc-macos || update_alternatives
 }
diff --git a/media-gfx/xloadimage/xloadimage-4.1-r2.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r2.ebuild
index 7e036d820ab5..772a410aa153 100644
--- a/media-gfx/xloadimage/xloadimage-4.1-r2.ebuild
+++ b/media-gfx/xloadimage/xloadimage-4.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/media-gfx/xloadimage/xloadimage-4.1-r2.ebuild,v 1.1 2005/02/28 15:46:04 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xloadimage/xloadimage-4.1-r2.ebuild,v 1.1.1.1 2005/11/30 09:37:47 chriswhite Exp $
 
 inherit alternatives eutils flag-o-matic
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.x.org/R5contrib/${MY_P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ppc-macos sparc x86"
 IUSE="tiff jpeg png"
 
 RDEPEND="virtual/x11
diff --git a/media-gfx/xloadimage/xloadimage-4.1-r3.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r3.ebuild
index 4fadee2eb2e3..446936530bad 100644
--- a/media-gfx/xloadimage/xloadimage-4.1-r3.ebuild
+++ b/media-gfx/xloadimage/xloadimage-4.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/media-gfx/xloadimage/xloadimage-4.1-r3.ebuild,v 1.1 2005/03/05 11:48:02 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xloadimage/xloadimage-4.1-r3.ebuild,v 1.1.1.1 2005/11/30 09:37:47 chriswhite Exp $
 
 inherit alternatives eutils flag-o-matic
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.x.org/R5contrib/${MY_P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 mips ppc ppc64 sparc x86 ppc-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ppc-macos sparc x86"
 IUSE="tiff jpeg png"
 
 RDEPEND="virtual/x11
diff --git a/media-gfx/xloadimage/xloadimage-4.1-r4.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r4.ebuild
index 3211e827703e..d68c4d2576c1 100644
--- a/media-gfx/xloadimage/xloadimage-4.1-r4.ebuild
+++ b/media-gfx/xloadimage/xloadimage-4.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/media-gfx/xloadimage/xloadimage-4.1-r4.ebuild,v 1.1 2005/10/26 18:58:38 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xloadimage/xloadimage-4.1-r4.ebuild,v 1.1.1.1 2005/11/30 09:37:47 chriswhite Exp $
 
 inherit alternatives eutils flag-o-matic
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.x.org/R5contrib/${MY_P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc-macos ppc64 sparc x86"
 IUSE="tiff jpeg png"
 
 RDEPEND="virtual/x11
@@ -39,7 +39,7 @@ src_unpack() {
 	sed -i "s:OPT_FLAGS=:OPT_FLAGS=$CFLAGS:" Make.conf
 	sed -i "s:^#include <varargs.h>:#include <stdarg.h>:" ${S}/rlelib.c
 
-	if use ppc-macos ; then
+	if use userland_Darwin ; then
 		sed -i 's,<malloc.h>,<malloc/malloc.h>,' vicar.c
 		for f in $(grep zopen * | cut -d':' -f1 | uniq);do
 			sed -i "s:zopen:zloadimage_zopen:g" $f
diff --git a/media-gfx/xpaint/ChangeLog b/media-gfx/xpaint/ChangeLog
index c83d167435cf..801859a4b26f 100644
--- a/media-gfx/xpaint/ChangeLog
+++ b/media-gfx/xpaint/ChangeLog
@@ -1,9 +1,49 @@
 # ChangeLog for media-gfx/xpaint
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xpaint/ChangeLog,v 1.1 2002/04/13 00:51:29 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xpaint/ChangeLog,v 1.1.1.1 2005/11/30 09:37:29 chriswhite Exp $
+
+*xpaint-2.7.7 (30 Jul 2005)
+
+  30 Jul 2005; Marcelo Goes <vanquirius@gentoo.org> +xpaint-2.7.7.ebuild:
+  Version bump, adding Xaw3d USE flag. May or may not fix bugs 41030 and
+  41035. Thanks to Toni DiBoulda <boulder_flight_technician@yahoo.com> for
+  reporting.
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> xpaint-2.7.0.ebuild:
+  Added to ~ppc.
+
+  22 Jul 2005; Herbie Hopkins <herbs@gentoo.org> xpaint-2.7.0.ebuild:
+  Marked ~amd64 wrt bug #98697.
+
+  01 Oct 2004; <pyrania@gentoo.org> xpaint-2.7.0.ebuild:
+  Made epatch aware.
+
+  12 Apr 2004; Jason Wever <weeve@gentoo.org> xpaint-2.7.0.ebuild:
+  Added ~sparc keyword.
+
+  08 Oct 2003; Brandy Westcott brandy@gentoo.org metadata.xml:
+  Added sys-libs/zlib, sys-devel/bison & sys-devel/flex as dependencies
+
+  21 Aug 2003; Patrick Kursawe <phosphan@gentoo.org> xpaint-2.7.0.ebuild:
+  Marked as x86
+
+*xpaint-2.7.0 (23 Jul 2003)
+
+  23 Jul 2003; Patrick Kursawe <phosphan@gentoo.org> xpaint-2.7.0.ebuild,
+  files/xpaint-2.7.0.patch:
+  Version bump + attempt to fix the errno problem (bug 25084)
+
+*xpaint-2.6.9 (27 May 2003)
+
+  27 May 2003; Christian Birchinger <joker@gentoo.org>
+  xpaint-2.6.9.ebuild:
+
+  Version bump. Own install functions (sandbox violations).
+  Using included Xaw95 libs because compilation fails otherwise.
 
 *xpaint-2.6.2-r1 (12 Apr 2002)
 
-  12 Apr 2002; Seemant Kulleen <seemant @gentoo.org> xpaint-2.6.2-r1.ebuild :
+  12 Apr 2002; Seemant Kulleen <seemant@gentoo.org>
+  xpaint-2.6.2-r1.ebuild:
 
   Compile against new libpng
diff --git a/media-gfx/xpaint/Manifest b/media-gfx/xpaint/Manifest
index 76083d892d96..0b0f37218612 100644
--- a/media-gfx/xpaint/Manifest
+++ b/media-gfx/xpaint/Manifest
@@ -1,6 +1,12 @@
-MD5 2e99669465f8c006380517bfc769bdcb ChangeLog 587
-MD5 7726af76b7e0fd130791d94f7fd8e7e0 xpaint-2.6.2-r1.ebuild 897
-MD5 917acdb88e0630f7f37e47578a54d25f xpaint-2.6.9.ebuild 1316
-MD5 9e9f3e735d4ceda26c1ab79a710edd05 files/Local.config-2.6.2.diff 622
-MD5 4302427d27ae29264bde31507e3a7122 files/digest-xpaint-2.6.2-r1 64
+MD5 534b9691669912b8235ddf00e104154a xpaint-2.6.2-r1.ebuild 895
+MD5 728a0a103ea49a0fc6838cfd89fdd66f xpaint-2.7.0.ebuild 1464
+MD5 1671c54c16cb8c22422283dbe56c88e3 xpaint-2.6.9.ebuild 1298
+MD5 6384d97f6278f3ab61cc9eae41ede09d xpaint-2.7.7.ebuild 817
+MD5 c6d7d4db958ec15fc8e5827338508249 ChangeLog 1628
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 cc2d31e2b0dd3d23351d9a7083e30438 files/xpaint-2.7.0.patch 3104
 MD5 a5a84ca3757c5b7c1c548fcc6e4fa4d2 files/digest-xpaint-2.6.9 65
+MD5 3c20cc0f202977da7d96cadc7557b9d2 files/digest-xpaint-2.7.0 65
+MD5 8cda772b1da25f82a766f1a53d9d7267 files/digest-xpaint-2.7.7 65
+MD5 4302427d27ae29264bde31507e3a7122 files/digest-xpaint-2.6.2-r1 64
+MD5 9e9f3e735d4ceda26c1ab79a710edd05 files/Local.config-2.6.2.diff 622
diff --git a/media-gfx/xpaint/files/Local.config-2.6.2.diff b/media-gfx/xpaint/files/Local.config-2.6.2.diff
index 0a04207fb07e..2fbc50ca264a 100644
--- a/media-gfx/xpaint/files/Local.config-2.6.2.diff
+++ b/media-gfx/xpaint/files/Local.config-2.6.2.diff
@@ -15,7 +15,7 @@
   XCOMM the default paths and man page extension.
   XCOMM
 ! BINDIR = /usr/bin
-! MANDIR = /usr/share/man
+! MANDIR = /usr/share/man/man1
   XCOMM #undef ManSuffix
   XCOMM #define ManSuffix 1
   
diff --git a/media-gfx/xpaint/xpaint-2.6.2-r1.ebuild b/media-gfx/xpaint/xpaint-2.6.2-r1.ebuild
index f33d3c9d80e0..9bfc1c59bef7 100644
--- a/media-gfx/xpaint/xpaint-2.6.2-r1.ebuild
+++ b/media-gfx/xpaint/xpaint-2.6.2-r1.ebuild
@@ -1,39 +1,36 @@
-#Copyright 2002 Gentoo Technologies, Inc.
-#Distributed under the terms of the GNU General Public License, v2 or later
-#Author John Stalker <stalker@math.princeton.edu>
-#$Header: /var/cvsroot/gentoo-x86/media-gfx/xpaint/xpaint-2.6.2-r1.ebuild,v 1.1 2002/04/13 00:51:29 seemant Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xpaint/xpaint-2.6.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:29 chriswhite Exp $
 
 S=${WORKDIR}/xpaint
 DESCRIPTION="XPaint is an image editor which supports most standard paint program options."
 SRC_URI="http://home.worldonline.dk/~torsten/xpaint/${P}.tar.gz"
 HOMEPAGE="http://home.worldonline.dk/~torsten/xpaint/"
+
 SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+IUSE=""
 
-DEPEND=">=media-libs/tiff-3.2 
-	virtual/x11 
+DEPEND=">=media-libs/tiff-3.2
+	virtual/x11
 	media-libs/jpeg
 	media-libs/libpng"
 
 src_unpack() {
-
-	unpack ${P}.tar.gz
+	unpack ${A}
 	cd ${S}
 	patch -p0 < ${FILESDIR}/Local.config-2.6.2.diff
-
 }
 
 src_compile() {
-
 	xmkmf || die
 	make Makefiles || die
 	emake || die
-
 }
 
-src_install () {
-
+src_install() {
 	make DESTDIR=${D} install || die
 	make DESTDIR=${D} install.man || die
-	dodoc ChangeLog INSTALL README README.PNG README.old TODO 
-
+	dodoc ChangeLog INSTALL README README.PNG README.old TODO
 }
diff --git a/media-gfx/xpaint/xpaint-2.6.9.ebuild b/media-gfx/xpaint/xpaint-2.6.9.ebuild
index 8fd48ee0f7e7..3a46f4f6fe2d 100644
--- a/media-gfx/xpaint/xpaint-2.6.9.ebuild
+++ b/media-gfx/xpaint/xpaint-2.6.9.ebuild
@@ -1,18 +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/media-gfx/xpaint/xpaint-2.6.9.ebuild,v 1.1 2003/05/27 02:28:27 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xpaint/xpaint-2.6.9.ebuild,v 1.1.1.1 2005/11/30 09:37:29 chriswhite Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="XPaint is an image editor which supports most standard paint program options."
 SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
 HOMEPAGE="http://sf-xpaint.sourceforge.net/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86"
+IUSE=""
 
-DEPEND=">=media-libs/tiff-3.2 
-	virtual/x11 
+DEPEND=">=media-libs/tiff-3.2
+	virtual/x11
 	media-libs/jpeg
 	media-libs/libpng"
 
@@ -41,7 +41,7 @@ src_install() {
 	insinto /usr/share/xpaint/include
 	doins image.h
 
-	insinto /usr/share/pixmap
+	insinto /usr/share/pixmaps
 	doins XPaintIcon.xpm
 
 	newman xpaint._man xpaint.1
diff --git a/media-gfx/xpaint/xpaint-2.7.0.ebuild b/media-gfx/xpaint/xpaint-2.7.0.ebuild
index 3d8cb28135e7..95e3be73a4e0 100644
--- a/media-gfx/xpaint/xpaint-2.7.0.ebuild
+++ b/media-gfx/xpaint/xpaint-2.7.0.ebuild
@@ -1,24 +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/media-gfx/xpaint/xpaint-2.7.0.ebuild,v 1.1 2003/07/23 09:54:17 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xpaint/xpaint-2.7.0.ebuild,v 1.1.1.1 2005/11/30 09:37:29 chriswhite Exp $
+
+inherit eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="XPaint is an image editor which supports most standard paint program options."
 SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
 HOMEPAGE="http://sf-xpaint.sourceforge.net/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
+IUSE=""
 
-DEPEND=">=media-libs/tiff-3.2 
-	virtual/x11 
+DEPEND=">=media-libs/tiff-3.2
+	virtual/x11
 	media-libs/jpeg
-	media-libs/libpng"
+	media-libs/libpng
+	sys-libs/zlib
+	sys-devel/bison
+	sys-devel/flex"
 
 src_unpack() {
 	unpack ${A}
-	patch -p0 < ${FILESDIR}/${P}.patch || die "patch failed"
+	epatch ${FILESDIR}/${P}.patch || die "epatch failed"
 }
 
 src_compile() {
diff --git a/media-gfx/xpaint/xpaint-2.7.7.ebuild b/media-gfx/xpaint/xpaint-2.7.7.ebuild
index 27b8fff12bf7..8dade3b88ea1 100644
--- a/media-gfx/xpaint/xpaint-2.7.7.ebuild
+++ b/media-gfx/xpaint/xpaint-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/media-gfx/xpaint/xpaint-2.7.7.ebuild,v 1.1 2005/07/30 03:10:16 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xpaint/xpaint-2.7.7.ebuild,v 1.1.1.1 2005/11/30 09:37:30 chriswhite Exp $
 
 inherit eutils
 
diff --git a/media-gfx/xsane/ChangeLog b/media-gfx/xsane/ChangeLog
index 385b7b9a96c2..a49bf76ea487 100644
--- a/media-gfx/xsane/ChangeLog
+++ b/media-gfx/xsane/ChangeLog
@@ -1,13 +1,159 @@
 # ChangeLog for media-gfx/xsane
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/ChangeLog,v 1.1 2002/02/01 21:53:30 gbevin Exp $
-
-*xsane-0.77-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/media-gfx/xsane/ChangeLog,v 1.1.1.1 2005/11/30 09:37:26 chriswhite Exp $
+
+*xsane-0.97-r1 (20 Sep 2005)
+
+  20 Sep 2005; Patrick Kursawe <phosphan@gentoo.org> +xsane-0.97-r1.ebuild:
+  Getting rid of gtk1 support (bug #106560)
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> xsane-0.97.ebuild:
+  Mark 0.97 stable on alpha
+
+  05 Sep 2005; Patrick Kursawe <phosphan@gentoo.org> -files/doublefree.patch,
+  -xsane-0.96-r1.ebuild, xsane-0.97.ebuild:
+  Using local USE flag 'gimp' (see bug #104592), printing xsane.rc-warning only
+  when the previous version actually was <=0.93
+
+  28 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org> xsane-0.97.ebuild:
+  Stable on amd64.
+
+  24 Aug 2005; Aron Griffis <agriffis@gentoo.org> xsane-0.97.ebuild:
+  stable on ia64
+
+  13 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> xsane-0.97.ebuild:
+  Stable on ppc.
+
+  08 Aug 2005; Markus Rothe <corsair@gentoo.org> xsane-0.97.ebuild:
+  Stable on ppc64
+
+  27 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> xsane-0.97.ebuild:
+  Stable on sparc
+
+  27 Jul 2005; Patrick Kursawe <phosphan@gentoo.org> -xsane-0.93.ebuild,
+  -xsane-0.95.ebuild, xsane-0.97.ebuild:
+  Cleanup and declaring latest version stable for x86
+
+  29 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> xsane-0.96-r1.ebuild:
+  Stable on sparc
+
+  30 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> xsane-0.97.ebuild:
+  ~alpha keyword, bug 89326.
+
+  08 Apr 2005; Markus Rothe <corsair@gentoo.org> xsane-0.96-r1.ebuild:
+  Stable on ppc64
+
+  07 Apr 2005; Simon Stelling <blubb@gentoo.org> xsane-0.96-r1.ebuild:
+  stable on amd64
+
+  01 Apr 2005; Lars Weiler <pylon@gentoo.org> xsane-0.96-r1.ebuild:
+  Stable on ppc.
+
+*xsane-0.97 (22 Jan 2005)
+
+  22 Jan 2005; Patrick Kursawe <phosphan@gentoo.org> +xsane-0.97.ebuild:
+  Version bump
+
+  16 Dec 2004; Dylan Carlson <absinthe@gentoo.org> xsane-0.95.ebuild:
+  Stable on amd64.
+
+  13 Dec 2004; Patrick Kursawe <phosphan@gentoo.org> -xsane-0.91.ebuild,
+  -xsane-0.96.ebuild:
+  Cleanup
+
+*xsane-0.96-r1 (10 Dec 2004)
+
+  10 Dec 2004; Patrick Kursawe <phosphan@gentoo.org> +files/doublefree.patch,
+  +xsane-0.96-r1.ebuild:
+  Adding a fix for bug #73618
+
+  07 Dec 2004; Patrick Kursawe <phosphan@gentoo.org> metadata.xml:
+  edited metadata
+
+*xsane-0.96 (25 Nov 2004)
+
+  25 Nov 2004; Luca Barbato <lu_zero@gentoo.org> +xsane-0.96.ebuild:
+  New version
+
+*xsane-0.95 (09 Sep 2004)
+
+  09 Sep 2004; Patrick Kursawe <phosphan@gentoo.org> -xsane-0.86-r1.ebuild,
+  -xsane-0.90.ebuild, -xsane-0.92.ebuild, +xsane-0.95.ebuild:
+  Cleanup
+
+*xsane-0.95 (09 Sep 2004)
+
+  09 Sep 2004; Patrick Kursawe <phosphan@gentoo.org> +xsane-0.95.ebuild:
+  Version bump.
+
+  31 Jul 2004; Tom Gall <tgall@gentoo.org> xsane-0.93.ebuild:
+  stable on ppc64, bug #57132
+
+  30 Jun 2004; Lars Weiler <pylon@gentoo.org> xsane-0.93.ebuild:
+  Stable on ppc.
+
+*xsane-0.93 (30 Apr 2004)
+
+  30 Apr 2004; Luca Barbato <lu_zero@gentoo.org> +xsane-0.93.ebuild:
+  New version
+
+  29 Dec 2003; Jason Wever <weeve@gentoo.org> xsane-0.92.ebuild:
+  ~sparc, taking the world by storm since 1492.
+
+  13 Dec 2003; Brad House <brad_mssw@gentoo.org> xsane-0.92.ebuild:
+  mark stable on amd64
+
+  09 Oct 2003; Brandy Westcott brandy@gentoo.org xsane-0.92.ebuild:
+  Fixed dependencies so jpeg, libpng & tiff will be installed if need be
+
+  08 Oct 2003; Brandy Westcott brandy@gentoo.org metadata.xml,
+  xsane-0.91.ebuild:
+  Fixed dependencies so jpeg, libpng & tiff will be installed if need be
+
+  22 Sep 2003; Brad Laue <brad@gentoo.org> xsane-0.91.ebuild:
+  Small change - dont check for GIMP if gtk2 is used, since this prevents the
+  GTK+ 2.0 frontend from building.
+
+*xsane-0.92 (08 Oct 2003)
+
+  08 Oct 2003; Heinrich Wendel <lanius@gentoo.org> xsane-0.91.ebuild,
+  xsane-0.92.ebuild:
+  version bump, marked 0.91 stable on ppc
+
+*xsane-0.91 (22 Jul 2003)
+
+  22 Jul 2003; Brad Laue <brad@gentoo.org> xsane-0.90.ebuild,
+  xsane-0.91.ebuild:
+  Version bump.
+
+  15 May 2003; Luca Barbato <lu_zero@gentoo.org> xsane-0.90.ebuild : 
+  Make sure that gimp-1.3 won't think that xsane is a gimp plugin
+  Fixes  bug #20870
+
+*xsane-0.90 (12 Feb 2003)
+
+  12 Feb 2003; Luca Barbato <lu_zero@gentoo.org> : Version bump.
+  Just needs gtk+, it can use both gtk+-1.2 or gtk+-2.x
+  gimp-1.3 support seems still missing.
+
+*xsane-0.89 (14 Dec 2002)
+
+  14 Dec 2002; Donny Davies <woodchip@gentoo.org> : Version bump.
+
+*xsane-0.86-r1 (16 Jul 2002)
+
+  13 Sep 2002; Donny Davies <woodchip@gentoo.org> xsane-0.86-r1.ebuild :
+  Needs gtk+-1, fix #6476.
+
+  16 Jul 2002; Seemant Kulleen <seemant@gentoo.org> xsane-0.86-r1.ebuild
+  files/digest-xsane-0.86-r1 : Added ppc to KEYWORDS, because it works,
+  and USE dependent nls, jpeg, tiff, png supports.
+
+*xsane-0.86 (11 June 2002)
+
+  07 July 2002; Owen Stampflee <owen@gentoo.org> xsane-0.86.ebuild :
+  Removed the depend on The GIMP. It doesn't actually need it.
+
+  11 June 2002; Ryan Phillips <rphillips@gentoo.org> xsane-0.86.ebuild :
+  Thanks to Bret the ebuild will install the plugin link into the correct
+  location.  Updated Revision.
diff --git a/media-gfx/xsane/Manifest b/media-gfx/xsane/Manifest
index 80de421a9ca4..fe47102896f2 100644
--- a/media-gfx/xsane/Manifest
+++ b/media-gfx/xsane/Manifest
@@ -1,5 +1,6 @@
-MD5 2217aa3ad7d58fe9e5ca8c69e6e9079f ChangeLog 1321
-MD5 bf737d4867fecd1e111522aff2c83394 xsane-0.86-r1.ebuild 984
-MD5 39e966acd6f4001349e95e559a90460f xsane-0.90.ebuild 1061
-MD5 8de50a8739761e8d1cfd1b4e6409b66a files/digest-xsane-0.86-r1 63
-MD5 e048f5d9cf2c47be4638753bdc659554 files/digest-xsane-0.90 63
+MD5 1ec14e1ee0ca39dda7b4e5633402ddaf xsane-0.97-r1.ebuild 1630
+MD5 8c5d4fdcaf6572134cefe867a24ae018 xsane-0.97.ebuild 1677
+MD5 6ae34fea270d96a514c3b684fafcf3a1 ChangeLog 5116
+MD5 1f00d52c238ab654e46144b458cb8090 metadata.xml 347
+MD5 918ef3f00d812af7c8417080ff4b8f75 files/digest-xsane-0.97 63
+MD5 918ef3f00d812af7c8417080ff4b8f75 files/digest-xsane-0.97-r1 63
diff --git a/media-gfx/xsane/metadata.xml b/media-gfx/xsane/metadata.xml
index 20ce219711a2..d2c5d286a5fa 100644
--- a/media-gfx/xsane/metadata.xml
+++ b/media-gfx/xsane/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>no-herd</herd>
+<maintainer>
+<email>phosphan@gentoo.org</email>
+<description>Package free for adoption, I don't have much time and my scanner is connected to a dialup machine</description>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/xsane/xsane-0.97-r1.ebuild b/media-gfx/xsane/xsane-0.97-r1.ebuild
index 61db7d792acd..f3b4db64f52c 100644
--- a/media-gfx/xsane/xsane-0.97-r1.ebuild
+++ b/media-gfx/xsane/xsane-0.97-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/media-gfx/xsane/xsane-0.97-r1.ebuild,v 1.1 2005/09/20 16:09:10 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/xsane-0.97-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:26 chriswhite Exp $
 
 DESCRIPTION="graphical scanning frontend"
 HOMEPAGE="http://www.xsane.org/"
diff --git a/media-gfx/xsane/xsane-0.97.ebuild b/media-gfx/xsane/xsane-0.97.ebuild
index e4ffa4d1545c..1de4ea0d731e 100644
--- a/media-gfx/xsane/xsane-0.97.ebuild
+++ b/media-gfx/xsane/xsane-0.97.ebuild
@@ -1,33 +1,41 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/xsane-0.97.ebuild,v 1.1 2005/01/22 23:10:05 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/xsane-0.97.ebuild,v 1.1.1.1 2005/11/30 09:37:26 chriswhite Exp $
 
 DESCRIPTION="graphical scanning frontend"
-SRC_URI="http://www.xsane.org/download/${P}.tar.gz"
 HOMEPAGE="http://www.xsane.org/"
+SRC_URI="http://www.xsane.org/download/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc ~ppc64"
-IUSE="gtk2 nls jpeg png tiff"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
+IUSE="gtk2 nls jpeg png tiff gimp"
 
 DEPEND="media-gfx/sane-backends
-	|| (
-		gtk2? ( >=x11-libs/gtk+-2.0 )
-		=x11-libs/gtk+-1.2*
-	)
+	gtk2? ( >=x11-libs/gtk+-2.0 )
+	!gtk2? ( =x11-libs/gtk+-1.2* )
 	jpeg? ( media-libs/jpeg )
 	png? ( media-libs/libpng )
-	tiff? ( media-libs/tiff )"
+	tiff? ( media-libs/tiff )
+	gimp? ( media-gfx/gimp )"
 
+pkg_setup() {
+	export OLDXSANE
+	if has_version '<=media-gfx/xsane-0.93'; then
+		OLDXSANE="yes"
+	else
+		OLDXSANE="no"
+	fi
+}
 
 src_compile() {
 	econf \
-		`use_enable nls` \
-		`use_enable jpeg` \
-		`use_enable png` \
-		`use_enable tiff` \
-		`use_enable gtk2` \
+		$(use_enable nls) \
+		$(use_enable jpeg) \
+		$(use_enable png) \
+		$(use_enable tiff) \
+		$(use_enable gtk2) \
+		$(use_enable gimp) \
 		|| die
 	emake || die
 }
@@ -38,20 +46,26 @@ src_install() {
 	dohtml -r doc
 
 	# link xsane so it is seen as a plugin in gimp
-	if [ -d /usr/lib/gimp/1.2 ]; then
-		dodir /usr/lib/gimp/1.2/plug-ins
-		dosym /usr/bin/xsane /usr/lib/gimp/1.2/plug-ins
-	fi
-	if [ -d /usr/lib/gimp/2.0 ]; then
-		dodir /usr/lib/gimp/2.0/plug-ins
-		dosym /usr/bin/xsane /usr/lib/gimp/2.0/plug-ins
+	if use gimp; then
+		local plugindir
+		if [ -x /usr/bin/gimptool ]; then
+			plugindir="$(gimptool --gimpplugindir)/plug-ins"
+		elif [ -x /usr/bin/gimptool-2.0 ]; then
+			plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins"
+		else
+			die "Can't find GIMP plugin directory."
+		fi
+		dodir "${plugindir}"
+		dosym /usr/bin/xsane "${plugindir}"
 	fi
 }
 
 pkg_postinst() {
-	einfo ""
-	ewarn "If you are upgrading from <=xsane-0.93, please make sure to"
-	ewarn "remove ~/.sane/xsane/xsane.rc _before_ you start xsane for"
-	ewarn "the first time."
-	einfo ""
+	if [ $OLDXSANE = 'yes' ]; then
+		einfo ""
+		ewarn "If you are upgrading from <=xsane-0.93, please make sure to"
+		ewarn "remove ~/.sane/xsane/xsane.rc _before_ you start xsane for"
+		ewarn "the first time."
+		einfo ""
+	fi
 }
diff --git a/media-gfx/xsvg/ChangeLog b/media-gfx/xsvg/ChangeLog
index 953957903c80..efc218c8d9df 100644
--- a/media-gfx/xsvg/ChangeLog
+++ b/media-gfx/xsvg/ChangeLog
@@ -1,6 +1,36 @@
 # ChangeLog for media-gfx/xsvg
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsvg/ChangeLog,v 1.1 2004/03/17 23:55:01 twp Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsvg/ChangeLog,v 1.1.1.1 2005/11/30 09:37:39 chriswhite Exp $
+
+  10 Sep 2005; Saleem Abdulrasool <compnerd@gentoo.org> +xsvg-0.2.1.ebuild:
+  Version bump for xsvg for new version of cairo and libsvg-cairo.  Resolves bug
+  #102883
+
+*xsvg-0.2.1 (10 Sep 2005)
+
+  28 Aug 2005; Luis Medinas <metalgod@gentoo.org> xsvg-0.2.0.ebuild:
+  Added ~amd64 keywords. Closes bug #103802.
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> xsvg-0.1.2.ebuild:
+  Stable on ppc.
+
+*xsvg-0.2.0 (24 Feb 2005)
+
+  24 Feb 2005; Peter Johanson <latexer@gentoo.org> metadata.xml,
+  +xsvg-0.2.0.ebuild:
+  Bump, and add myself as a maintainer.
+
+  04 Jun 2004; David Holm <dholm@gentoo.org> xsvg-0.1.2.ebuild:
+  Added to ~ppc.
+
+  13 May 2004; <twp@gentoo.org> xsvg-0.1.2.ebuild:
+  Use default src_compile at mr_bones_' suggestion.
+
+  09 May 2004; <twp@gentoo.org> xsvg-0.1.2.ebuild:
+  Stable on x86.
+
+  26 Mar 2004; Tom Payne <twp@gentoo.org> xsvg-0.1.2.ebuild :
+  Correct SRC_URI.
 
 *xsvg-0.1.2 (18 Mar 2004)
 
diff --git a/media-gfx/xsvg/Manifest b/media-gfx/xsvg/Manifest
index ac11e2794e6e..c0d452fd38e1 100644
--- a/media-gfx/xsvg/Manifest
+++ b/media-gfx/xsvg/Manifest
@@ -1,4 +1,8 @@
-MD5 cb10bdee07f79e21eaae9a215057daba xsvg-0.1.2.ebuild 512
-MD5 37407a29c8e8403d74a51ad1abdbc376 ChangeLog 314
-MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
+MD5 ab3e824292b336d09e910d06fc922830 xsvg-0.1.2.ebuild 476
+MD5 2a7382defc04ebb6dfa7a11a6fc3c0ed xsvg-0.2.0.ebuild 495
+MD5 01e6621146c9f6a786eb529688ba9bcc xsvg-0.2.1.ebuild 495
+MD5 2259d3604a043de2cd25827c9a92e893 ChangeLog 1204
+MD5 65d1d5c2aa536148fb35cee02b3a8428 metadata.xml 337
 MD5 2bf76d515ba474b47f91b52fc19e8ba5 files/digest-xsvg-0.1.2 61
+MD5 d7aaba27d175fc26f5298df5d92b9ec0 files/digest-xsvg-0.2.0 61
+MD5 98011c25b6e5650e803eb575cd90acbc files/digest-xsvg-0.2.1 61
diff --git a/media-gfx/xsvg/metadata.xml b/media-gfx/xsvg/metadata.xml
index d9bb4626fb2b..0277d97e7d3f 100644
--- a/media-gfx/xsvg/metadata.xml
+++ b/media-gfx/xsvg/metadata.xml
@@ -3,6 +3,10 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
+  <email>latexer@gentoo.org</email>
+  <name>Peter Johanson</name>
+</maintainer>
+<maintainer>
   <email>twp@gentoo.org</email>
   <name>Tom Payne</name>
 </maintainer>
diff --git a/media-gfx/xsvg/xsvg-0.1.2.ebuild b/media-gfx/xsvg/xsvg-0.1.2.ebuild
index 2a186790016b..cb5388bb6ecd 100644
--- a/media-gfx/xsvg/xsvg-0.1.2.ebuild
+++ b/media-gfx/xsvg/xsvg-0.1.2.ebuild
@@ -1,22 +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/media-gfx/xsvg/xsvg-0.1.2.ebuild,v 1.1 2004/03/17 23:55:01 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsvg/xsvg-0.1.2.ebuild,v 1.1.1.1 2005/11/30 09:37:39 chriswhite Exp $
 
 DESCRIPTION="X11 SVG viewer"
 HOMEPAGE="http://xsvg.org/"
-SRC_URI="http://xsvg.org/snapshots/${P}.tar.gz"
+SRC_URI="http://cairographics.org/snapshots/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="ppc x86"
 IUSE=""
 DEPEND="virtual/x11
 	x11-libs/libsvg-cairo"
 
-src_compile() {
-	econf || die
-	emake || die
-}
-
 src_install() {
-	make install DESTDIR=${D}
+	make install DESTDIR=${D} || die
 }
diff --git a/media-gfx/xsvg/xsvg-0.2.0.ebuild b/media-gfx/xsvg/xsvg-0.2.0.ebuild
index ad566497b927..314150f58e27 100644
--- a/media-gfx/xsvg/xsvg-0.2.0.ebuild
+++ b/media-gfx/xsvg/xsvg-0.2.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsvg/xsvg-0.2.0.ebuild,v 1.1 2005/02/24 14:50:05 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsvg/xsvg-0.2.0.ebuild,v 1.1.1.1 2005/11/30 09:37:39 chriswhite Exp $
 
 DESCRIPTION="X11 SVG viewer"
 HOMEPAGE="http://xsvg.org/"
 SRC_URI="http://cairographics.org/snapshots/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 DEPEND="virtual/x11
 	>=x11-libs/libsvg-cairo-0.1.5"
diff --git a/media-gfx/xsvg/xsvg-0.2.1.ebuild b/media-gfx/xsvg/xsvg-0.2.1.ebuild
index a1b99584547a..7eb72b3e76a1 100644
--- a/media-gfx/xsvg/xsvg-0.2.1.ebuild
+++ b/media-gfx/xsvg/xsvg-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/media-gfx/xsvg/xsvg-0.2.1.ebuild,v 1.1 2005/09/10 22:17:45 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsvg/xsvg-0.2.1.ebuild,v 1.1.1.1 2005/11/30 09:37:39 chriswhite Exp $
 
 DESCRIPTION="X11 SVG viewer"
 HOMEPAGE="http://xsvg.org/"
diff --git a/media-gfx/xv/ChangeLog b/media-gfx/xv/ChangeLog
index fc3dcbb2c13d..5e597a709496 100644
--- a/media-gfx/xv/ChangeLog
+++ b/media-gfx/xv/ChangeLog
@@ -1,6 +1,294 @@
 # ChangeLog for media-gfx/xv
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/ChangeLog,v 1.1 2002/02/01 21:53:30 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/ChangeLog,v 1.1.1.1 2005/11/30 09:37:14 chriswhite Exp $
+
+  11 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> xv-3.10a-r12.ebuild:
+  Stable on hppa, ppc.
+
+  01 Nov 2005; Fabian Groffen <grobian@gentoo.org>
+  +files/xv-3.10a-r12-xv-osx.patch, xv-3.10a-r12.ebuild:
+  Fixed compilation issues and marked ~ppc-macos (bug #110942)
+
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org> xv-3.10a-r12.ebuild:
+  Mark 3.10a-r12 stable on alpha
+
+  13 Oct 2005; Aron Griffis <agriffis@gentoo.org> xv-3.10a-r12.ebuild:
+  Mark 3.10a-r12 stable on ia64
+
+  12 Oct 2005; Tavis Ormandy <taviso@gentoo.org>
+  +files/jumbo-patch-nojpeg.diff, xv-3.10a-r12.ebuild:
+  fix installation without jpeg support, many thanks to Tim Ramsey.
+  (bug #109012)
+
+  11 Oct 2005; Hardave Riar <hardave@gentoo.org> xv-3.10a-r12.ebuild:
+  Stable on mips.
+
+  10 Oct 2005; <dang@gentoo.org> xv-3.10a-r12.ebuild:
+  Marked stable on amd64
+
+  07 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> xv-3.10a-r12.ebuild:
+  Stable on sparc
+
+  07 Oct 2005; Tavis Ormandy <taviso@gentoo.org> xv-3.10a-r12.ebuild:
+  stable on x86, dont install INSTALL
+
+  12 Jul 2005; Stephen P. Becker <geoman@gentoo.org> xv-3.10a-r11.ebuild,
+  xv-3.10a-r12.ebuild:
+  -r11 mips, -r12 ~mips
+
+  31 May 2005; Rene Nussbaumer <killerfox@gentoo.org> xv-3.10a-r11.ebuild:
+  Stable on hppa. bug #88742
+
+  27 May 2005; Lina Pezzella <j4rg0n@gentoo.org>
+  +files/xv-3.10a-r11-xv-osx.patch, xv-3.10a-r11.ebuild:
+  Fix for Bug 88742.
+
+  27 May 2005; Lina Pezzella <j4rg0n@gentoo.org> xv-3.10a-r10.ebuild:
+  Fixed Bug with -ffast-math flag on OSX
+
+  16 May 2005; Rene Nussbaumer <killerfox@gentoo.org> xv-3.10a-r10.ebuild:
+  Stable on hppa; bug #83686
+
+  16 May 2005; Rene Nussbaumer <killerfox@gentoo.org> xv-3.10a-r12.ebuild:
+  Added ~hppa
+
+*xv-3.10a-r12 (05 May 2005)
+
+  05 May 2005; Tavis Ormandy <taviso@gentoo.org> +xv-3.10a-r12.ebuild:
+  new release of patchset.
+
+  19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> xv-3.10a-r11.ebuild:
+  Stable on ia64, bug 88742.
+
+  18 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> xv-3.10a-r11.ebuild:
+  Stable on alpha, bug 88742.
+
+  16 Apr 2005; Markus Rothe <corsair@gentoo.org> xv-3.10a-r11.ebuild:
+  Stable on ppc64; bug #88742
+
+  15 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> xv-3.10a-r11.ebuild:
+  Stable on ppc.
+
+  15 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> xv-3.10a-r11.ebuild:
+  Keyworded sparc wrt #88742
+
+  15 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> xv-3.10a-r11.ebuild:
+  stable on amd64 wrt security bug #88742
+
+*xv-3.10a-r11 (15 Apr 2005)
+
+  15 Apr 2005; Tavis Ormandy <taviso@gentoo.org>
+  +files/xv-3.10a-bmpfix.patch.bz2, +files/xv-3.10a-yaos.dif.bz2,
+  +xv-3.10a-r11.ebuild:
+  switching to the jumbo patch format, includes security fixes.
+
+  13 Mar 2005; Hardave Riar <hardave@gentoo.org> xv-3.10a-r10.ebuild:
+  Stable on mips, bug #83686.
+
+  03 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> xv-3.10a-r10.ebuild:
+  Stable on alpha, bug 83686.
+
+  02 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> xv-3.10a-r10.ebuild:
+  Stable on ppc.
+
+  02 Mar 2005; Markus Rothe <corsair@gentoo.org> xv-3.10a-r10.ebuild:
+  Stable on ppc64; bug #83686
+
+  02 Mar 2005; Ferris McCormick <fmccor@gentoo.org> xv-3.10a-r10.ebuild:
+  Stable for sparc, closing filename issue Bug 83686.
+
+  02 Mar 2005; Lina Pezzella <j4rg0n@gentoo.org> xv-3.10a-r10.ebuild:
+  Stable ppc-macos
+
+  02 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> xv-3.10a-r10.ebuild:
+  stable on amd64. see #83686
+
+*xv-3.10a-r10 (01 Mar 2005)
+
+  01 Mar 2005; Tavis Ormandy <taviso@gentoo.org>
+  +files/xv-filename-format-string.diff, +xv-3.10a-r10.ebuild:
+  patch for #83686
+
+  26 Feb 2005; Lina Pezzella <j4rg0n@gentoo.org> xv-3.10a-r8.ebuild:
+  Stable ppc-macos
+
+  20 Jan 2005; Lina Pezzella <j4rg0n@gentoo.org> xv-3.10a-r9.ebuild:
+  Unstable ppc-macos. Thanks to Trixtrax@comcast.net for the patchset.
+
+*xv-3.10a-r9 (04 Jan 2005)
+
+  04 Jan 2005; Tavis Ormandy <taviso@gentoo.org> +files/xv-optimize-jpeg.diff,
+  +files/xv-postscript-double-free.diff, +files/xv-smoothing-algorithm.diff,
+  +xv-3.10a-r9.ebuild:
+  everyone can use getcwd() instead of getwd().
+  apply patches from dave coffin, http://www.cybercom.net/~dcoffin/dcraw/.
+
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org> xv-3.10a-r8.ebuild:
+  Stable on ppc64
+
+  24 Nov 2004; Chris Gianelloni <wolf31o2@gentoo.org> xv-3.10a-r8.ebuild:
+  Stable on amd64.  Blame Mr_Bones_.
+
+*xv-3.10a-r8 (03 Nov 2004)
+
+  03 Nov 2004; Markus Rothe <corsair@gentoo.org> xv-3.10a-r8.ebuild:
+  Marked ~ppc64; bug #69847
+
+  13 Oct 2004; <solar@gentoo.org> -xv-3.10a-r7.ebuild:
+  security bump. -r7 -> -r8 no changes except for depending on a newer version
+  of libtiff
+
+  07 Sep 2004; <blubb@gentoo.org> xv-3.10a-r7.ebuild:
+  added ~amd64 keyword
+
+  05 Sep 2004; Malcolm Lashley <malc@gentoo.org> xv-3.10a-r7.ebuild:
+  amd64 needs a stable version after the security fix - #62742
+
+*xv-3.10a-r7 (02 Sep 2004)
+
+  02 Sep 2004; Tavis Ormandy <taviso@gentoo.org> +metadata.xml,
+  -xv-3.10a-r3.ebuild, -xv-3.10a-r5.ebuild, -xv-3.10a-r6.ebuild,
+  +xv-3.10a-r7.ebuild:
+  fix security issues reported in #61619.
+  vulnerable versions removed.
+  meatadata.xml added with me named as new maintainer.
+
+  06 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> xv-3.10a-r6.ebuild:
+  Stable on sparc
+
+  31 Jul 2004; Mamoru KOMACHI <usata@gentoo.org>
+  -files/xv-3.10a-enhanced-Nu.patch, -files/xv-3.10a-gentoo-Nu.patch,
+  xv-3.10a-r5.ebuild, xv-3.10a-r6.ebuild:
+  Stable on x86 and ppc. Compressed large patches in files directory
+  and put them on Gentoo mirrors.
+
+  20 Jul 2004; Tom Gall <tgall@gentoo.org> xv-3.10a-r6.ebuild:
+  stable on ppc64, bug #57151
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org> xv-3.10a-r3.ebuild,
+  xv-3.10a-r5.ebuild, xv-3.10a-r6.ebuild:
+  Fix use invocation, fix sed expressions, add error checking
+
+  17 Apr 2004; Travis Tilley <lv@gentoo.org> +files/xv-use-getcwd.patch,
+  xv-3.10a-r6.ebuild:
+  fix for segfaults on amd64
+
+  17 Feb 2004; Aron Griffis <agriffis@gentoo.org> xv-3.10a-r6.ebuild:
+  stable on alpha and ia64
+
+  02 Feb 2004; Michael Sterrett <mr_bones_@gentoo.org> xv-3.10a-r3.ebuild,
+  xv-3.10a-r5.ebuild, xv-3.10a-r6.ebuild:
+  fix license for bug 17976
+
+  19 Dec 2003; Guy Martin <gmsoft@gentoo.org> xv-3.10a-r6.ebuild:
+  Marked stable on hppa.
+
+  13 Nov 2003; <tuxus@gentoo.org> xv-3.10a-r6.ebuild:
+  added mips to KEYWORDS
+
+  06 Nov 2003; Mamoru KOMACHI <usata@gentoo.org> xv-3.10a-r3.ebuild,
+  xv-3.10a-r5.ebuild, xv-3.10a-r6.ebuild:
+  Changed to LIBDIR=/dev/null. xvdocs.ps was installed to /usr/lib
+  (not a directory, but a file called /usr/lib !) due to absence of
+  /usr/lib (we should dodir before calling make, if it is really
+  necessary in the ebuild), but anyhow we dodoc xvdocs.ps in
+  src_install so we don't need it.
+
+*xv-3.10a-r6 (28 Oct 2003)
+
+  28 Oct 2003; Martin Holzer <mholzer@gentoo.org> xv-3.10a-r6.ebuild:
+  Closing #29253.
+
+  26 Oct 2003; Sven Blumenstein <bazik@gentoo.org> xv-3.10a-r5.ebuild:
+  Bumped to stable on sparc, removed RESTRICT (bug #29276)
+
+  28 Sep 2003; Markus Nigbur <pyrania@gentoo.org> xv-3.10a-r3.ebuild,
+  xv-3.10a-r5.ebuild:
+  Added ~amd64 keyword. request by brad@mainstreetsoftworks.com in bug #29806.
+
+*xv-3.10a-r5 (07 Aug 2003)
+
+  04 Sep 2003; Mamoru KOMACHI <usata@gentoo.org> xv-3.10a-r2.ebuild,
+  xv-3.10a-r3.ebuild, xv-3.10a-r4.ebuild, xv-3.10a-r5.ebuild:
+  Deleted trailing white-spaces.  Removed unused IUSE flags from -r5.
+  Merged ccc support from -r3 to -r5 and removed broken -r4.
+
+  14 Aug 2003; Mamoru KOMACHI <usata@gentoo.org> xv-3.10a-r5.ebuild,
+  files/xv-3.10a-r5-ppc.patch:
+  Corrected ppc patch.  Thanks to Christophe Boyanique
+  <gentoo@raceme.org>.  Closing bug #26192
+
+  07 Aug 2003; Mamoru KOMACHI <usata@gentoo.org> xv-3.10a-r5.ebuild,
+  files/xv-3.10a-r5-gentoo-Nu.patch:
+  Fixed install destination directories.  Thanks to Brandon Anderson
+  <branders@ccsoft.com> for bug report #25678.
+
+*xv-3.10a-r4 (31 Jul 2003)
+
+  02 Aug 2003; Ryan Phillips <rphillips@gentoo.org> xv-3.10a-r4.ebuild :
+  included Martin Ehmsen's patch to the ebuild added jpg, png and tiff support
+
+  31 Jul 2003; Ryan Phillips <rphillips@gentoo.org> xv-3.10a-r4.ebuild :
+  Added Dean Baender's contribution of changes #20092.  Patch to read photoCDs,
+  and the xv author's own patches.
+
+*xv-3.10a-r3 (03 Nov 2002)
+
+  16 Jun 2003; Michael Nazaroff <naz@gentoo.org> :
+  Marked x86 as stable.
+
+  27 May 2003; Tavis Ormandy <taviso@gentoo.org> xv-3.10a-r3.ebuild:
+  ccc support
+
+  25 Mar 2003; Aron Griffis <agriffis@gentoo.org> xv-3.10a-r3.ebuild:
+  Add ~alpha to KEYWORDS
+
+  03 Nov 2002; Ryan Phillips <rphillips@gentoo.org> xv-3.10a-r3.ebuild :
+
+  Added Bret Towes sed statements to produce an optimized build. Fixes #6756
+
+*xv-3.10a-r2 (05 Jun 2002)
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  13 Oct 2002; Olivier Reisch <doctomoe@gentoo.org> xv-3.10a-r2.ebuild:
+  Fixed the ebuild to apply patches correctly if we both have use ppc and use png
+
+  02 Sep 2002; Jack Morgan <jmorgan@gentoo.org> xv-3.10a-r2.ebuild
+  Added sparc/sparc64 keywords :
+
+  05 Jun 2002; Olivier Reisch <doctomoe@gentoo.org> xv-3.10a-r2.ebuild
+  files/digest-xv-3.10a-r2 :
+
+  Added a patch to the current ebuild that makes the sources build and link
+  fine on PPC. The patch is only applied on PPC, so there should be no
+  changes in code on other platforms. Fixes BUG #3370.
+
+*xv-3.10a-r2 (29 Apr 2002)
+
+  29 Apr 2002; Seemant Kulleen <seemant@gentoo.org> xv-3.10a-r2.ebuild
+  files/digest-xv-3.10a-r2 :
+
+  NAZ (from #gentoo) enhanced the patch so that app-shells/tcsh does not have
+  to be a compile-time dependency.
+
+*xv-3.10a-r1 (29 Apr 2002)
+
+  29 Apr 2002; Seemant Kulleen <seemant@gentoo.org> xv-3.10a-r1.ebuild
+  files/digest-xv-3.10a-r1 files/xv-naz-gentoo.patch :
+
+  This patch, submitted by NAZ (from #gentoo) now brings in png, jpeg and tiff
+  support.  The only issue is that, if you want support for one of those, you
+  get to have support for all of them.  While unfortunate, this unavoidable, due
+  to the manner in which xv's Makefiles are laid out.  To think, there actually
+  is a configure script.  And also, it's been more than half a decade since
+  this package came out -- you'd think the author would issue an upgrade.
+  </rant>
+
+
+  25 Apr 2002; Thilo Bangert <bangert@gentoo.org> :
+  
+  switched to || die - added description
 
 *xv-3.10a (1 Feb 2002)
 
diff --git a/media-gfx/xv/Manifest b/media-gfx/xv/Manifest
index 717573d74e26..9bab70f5add4 100644
--- a/media-gfx/xv/Manifest
+++ b/media-gfx/xv/Manifest
@@ -1,7 +1,27 @@
-MD5 143327b75a1b113f378ad179fe4c9951 xv-3.10a-r3.ebuild 1507
-MD5 a1af7e816b30618ebacfbf86bbc9a0b6 ChangeLog 2667
-MD5 0882c0dbf1e66f66dcdec7b678db2793 xv-3.10a-r2.ebuild 1222
-MD5 f0dfce1262042f01e76412c96ba62d25 files/digest-xv-3.10a-r2 125
-MD5 f0dfce1262042f01e76412c96ba62d25 files/digest-xv-3.10a-r3 125
-MD5 4590eadc74a630f5aa530a08b4102a3c files/xv.diff 3838
-MD5 a533b616d1b8911f97cc37cd89dccd6f files/xv-3.10a-ppc.patch 1202
+MD5 cbaffae7e65600c04d5abdd3397262d6 ChangeLog 10939
+MD5 3b193d08268519822ea55ef0534c805a files/digest-xv-3.10a-r10 127
+MD5 6f7117c9be7e979494866250a24a3338 files/digest-xv-3.10a-r11 145
+MD5 bf64513c42257ec1f60b78efabf94e6e files/digest-xv-3.10a-r12 145
+MD5 3b193d08268519822ea55ef0534c805a files/digest-xv-3.10a-r8 127
+MD5 3b193d08268519822ea55ef0534c805a files/digest-xv-3.10a-r9 127
+MD5 d5c3a8ae96703604cb323e57a7e8e554 files/jumbo-patch-nojpeg.diff 469
+MD5 270b4d6ba55f1253d0d1edfde1640844 files/xv-3.10a-bmpfix.patch.bz2 1249
+MD5 24acb62ee86813a3fde2819683b2ffc9 files/xv-3.10a-makefile-osx.patch 538
+MD5 4b034e22d5bb0502e383afcfeb8ea4b0 files/xv-3.10a-ppc.patch 359
+MD5 5abcdae2ed559d5909856a83ab102180 files/xv-3.10a-r11-xv-osx.patch 1088
+MD5 6bf2b7ee3f291595d8ee51f8d6bc59e6 files/xv-3.10a-r12-xv-osx.patch 1686
+MD5 123bdb40134767bb438eeaccb50f1646 files/xv-3.10a-security.diff 4079
+MD5 32841798fbb3c9923d5d8a26994e1b0a files/xv-3.10a-vdcomp-osx.patch 341
+MD5 b6755903a15ab242469da379020a0a66 files/xv-3.10a-xv-osx.patch 615
+MD5 4e152e258221470988e2fc31bd8e03d5 files/xv-3.10a-yaos.dif.bz2 4212
+MD5 63deb1e35f05b4f406f141d1e48ff17b files/xv-filename-format-string.diff 319
+MD5 a5b5fd8ad9fbef9a63f360d83f55e546 files/xv-optimize-jpeg.diff 553
+MD5 f555e07727c8b51042dae772ae474f42 files/xv-postscript-double-free.diff 864
+MD5 8edd408b62a85896b2b76411f7839c60 files/xv-smoothing-algorithm.diff 6418
+MD5 cda66dd1f3a032802881a6ae4430e0d6 files/xv-use-getcwd.patch 222
+MD5 8fc22f08ecb2e292e60ce7553c58d0c2 metadata.xml 222
+MD5 2954b497004732142fd6d69104cf2499 xv-3.10a-r10.ebuild 2689
+MD5 e85f1a876b925f9a8b4a29eabc3e3788 xv-3.10a-r11.ebuild 2321
+MD5 e67f1ba1a2fd1482df813a7beb9a3e1f xv-3.10a-r12.ebuild 2341
+MD5 fbe8dc0be0ab018633f1e153b56c1662 xv-3.10a-r8.ebuild 2347
+MD5 d3caaf1691b52006d2295f1443fe691b xv-3.10a-r9.ebuild 2529
diff --git a/media-gfx/xv/files/digest-xv-3.10a-r11 b/media-gfx/xv/files/digest-xv-3.10a-r11
index 753f8e86594f..9fae64b67904 100644
--- a/media-gfx/xv/files/digest-xv-3.10a-r11
+++ b/media-gfx/xv/files/digest-xv-3.10a-r11
@@ -1,2 +1,2 @@
-MD5 2d4fbeec1561304362781cc8e2f7f72d xv-3.10a.tar.gz 2259124
 MD5 3e0ba6c317df2e64015e03f7c97acb60 xv-3.10a-jumbo-patches-20050410.tar.bz2 262943
+MD5 2d4fbeec1561304362781cc8e2f7f72d xv-3.10a.tar.gz 2259124
diff --git a/media-gfx/xv/files/digest-xv-3.10a-r8 b/media-gfx/xv/files/digest-xv-3.10a-r8
index cd41246cdd7b..2bb5f3fa79b8 100644
--- a/media-gfx/xv/files/digest-xv-3.10a-r8
+++ b/media-gfx/xv/files/digest-xv-3.10a-r8
@@ -1,4 +1,2 @@
 MD5 2d4fbeec1561304362781cc8e2f7f72d xv-3.10a.tar.gz 2259124
-SHA1 9e6372f154be9e9e355972cbeb91d98d9c342474 xv-3.10a.tar.gz 2259124
 MD5 f8b8a8f7d76e5108b4abe3e7a5901f3e xv-3.10a-gentoo.tar.gz 52394
-SHA1 39035d9f9c8c1d4a78f19020a1132f37b7e4d238 xv-3.10a-gentoo.tar.gz 52394
diff --git a/media-gfx/xv/files/xv-3.10a-ppc.patch b/media-gfx/xv/files/xv-3.10a-ppc.patch
index 0c1763988ee5..c73b5f493608 100644
--- a/media-gfx/xv/files/xv-3.10a-ppc.patch
+++ b/media-gfx/xv/files/xv-3.10a-ppc.patch
@@ -1,18 +1,6 @@
-diff -uNr xv-3.10a/Makefile xv-3.10a.n/Makefile
---- xv-3.10a/Makefile	Mon Jan 23 21:20:54 1995
-+++ xv-3.10a.n/Makefile	Wed Jun  5 11:05:56 2002
-@@ -188,7 +188,7 @@
- 	$(NODIRENT) $(VPRINTF) $(TIMERS) $(UNIX) $(BSDTYPES) $(RAND) \
- 	$(DXWM) $(MCHN)
- 
--LIBS = -lX11 $(JPEGLIB) $(TIFFLIB) -lm
-+LIBS = -L/usr/X11R6/lib -lX11 $(JPEGLIB) $(TIFFLIB) -lm
- 
- OBJS = 	xv.o xvevent.o xvroot.o xvmisc.o xvimage.o xvcolor.o xvsmooth.o \
- 	xv24to8.o xvgif.o xvpm.o xvinfo.o xvctrl.o xvscrl.o xvalg.o \
-diff -uNr xv-3.10a/tiff/Makefile xv-3.10a.n/tiff/Makefile
---- xv-3.10a/tiff/Makefile	Thu Dec 22 23:35:12 1994
-+++ xv-3.10a.n/tiff/Makefile	Wed Jun  5 11:26:30 2002
+diff -urN xv-3.10a.enhanced.gentoo/tiff/Makefile xv-3.10a/tiff/Makefile
+--- xv-3.10a.enhanced.gentoo/tiff/Makefile	1994-12-23 07:35:12.000000000 +0900
++++ xv-3.10a/tiff/Makefile	2003-08-14 22:35:04.000000000 +0900
 @@ -60,7 +60,6 @@
  
  ${ALL}:	${OBJS}
@@ -21,15 +9,3 @@ diff -uNr xv-3.10a/tiff/Makefile xv-3.10a.n/tiff/Makefile
  
  ${OBJS}:	tiffio.h tiff.h tiffcomp.h tiffiop.h tiffconf.h
  
-diff -uNr xv-3.10a/xv.h xv-3.10a.n/xv.h
---- xv-3.10a/xv.h	Mon Jan 23 21:22:23 1995
-+++ xv-3.10a.n/xv.h	Wed Jun  5 11:06:18 2002
-@@ -116,7 +116,7 @@
- #  include <errno.h>
-    extern int   errno;             /* SHOULD be in errno.h, but often isn't */
- #  ifndef __NetBSD__
--     extern char *sys_errlist[];     /* this too... */
-+//     extern char *sys_errlist[];     /* this too... */
- #  endif
- #endif
- 
diff --git a/media-gfx/xv/xv-3.10a-r10.ebuild b/media-gfx/xv/xv-3.10a-r10.ebuild
index f83c3b5a8f65..844eece3e314 100644
--- a/media-gfx/xv/xv-3.10a-r10.ebuild
+++ b/media-gfx/xv/xv-3.10a-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/media-gfx/xv/xv-3.10a-r10.ebuild,v 1.1 2005/03/01 15:28:51 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r10.ebuild,v 1.1.1.1 2005/11/30 09:37:14 chriswhite Exp $
 
 inherit ccc flag-o-matic eutils
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.cis.upenn.edu/pub/xv/${P}.tar.gz
 
 LICENSE="xv"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~ia64 ~amd64 ~ppc64 ~ppc-macos"
+KEYWORDS="x86 ppc sparc alpha mips hppa ~ia64 amd64 ppc64 ppc-macos"
 IUSE="jpeg tiff png"
 
 DEPEND="virtual/x11
@@ -49,6 +49,9 @@ src_unpack() {
 }
 
 src_compile() {
+	if use ppc-macos; then
+		filter-flags -ffast-math
+	fi
 	if use jpeg; then
 		append-flags -DDOJPEG
 	else
diff --git a/media-gfx/xv/xv-3.10a-r11.ebuild b/media-gfx/xv/xv-3.10a-r11.ebuild
index c96e7839494b..03945beb6fb9 100644
--- a/media-gfx/xv/xv-3.10a-r11.ebuild
+++ b/media-gfx/xv/xv-3.10a-r11.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/media-gfx/xv/xv-3.10a-r11.ebuild,v 1.1 2005/04/15 09:26:21 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r11.ebuild,v 1.1.1.1 2005/11/30 09:37:14 chriswhite Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
 JUMBOV=20050410
 DESCRIPTION="An interactive image manipulation program for X which can deal with a wide variety of image formats"
-HOMEPAGE="http://www.trilon.com/xv/index.html"
-SRC_URI="http://www.sonic.net/~roelofs/code/${P}-jumbo-patches-${JUMBOV}.tar.bz2	ftp://ftp.cis.upenn.edu/pub/xv/${P}.tar.gz"
+HOMEPAGE="http://www.trilon.com/xv/index.html http://www.sonic.net/~roelofs/greg_xv.html"
+SRC_URI="mirror://sourceforge/png-mng/${P}-jumbo-patches-${JUMBOV}.tar.bz2 ftp://ftp.cis.upenn.edu/pub/xv/${P}.tar.gz"
 
 LICENSE="xv"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc-macos ppc64 sparc x86"
 IUSE="jpeg tiff png"
 
 DEPEND="virtual/x11
@@ -31,6 +31,11 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-bmpfix.patch.bz2 || die
 	epatch ${FILESDIR}/${P}-yaos.dif.bz2 || die
 
+	if use ppc-macos; then
+		epatch ${FILESDIR}/${PF}-xv-osx.patch
+		epatch ${FILESDIR}/${P}-vdcomp-osx.patch
+	fi
+
 	sed -i	-e 's/\(^JPEG.*\)/#\1/g' \
 			-e 's/\(^PNG.*\)/#\1/g' \
 			-e 's/\(^TIFF.*\)/#\1/g' \
@@ -42,7 +47,11 @@ src_unpack() {
 }
 
 src_compile() {
-	append-flags -DUSE_GETCWD -DLINUX -DUSLEEP
+	if use ppc-macos; then
+		append-flags -DUSE_GETCWD -DUSLEEP
+	else
+		append-flags -DUSE_GETCWD -DLINUX -DUSLEEP
+	fi
 
 	einfo "Enabling Optional Features..."
 	if use jpeg; then
diff --git a/media-gfx/xv/xv-3.10a-r12.ebuild b/media-gfx/xv/xv-3.10a-r12.ebuild
index e036fcf1b01f..fb5fe486b144 100644
--- a/media-gfx/xv/xv-3.10a-r12.ebuild
+++ b/media-gfx/xv/xv-3.10a-r12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r12.ebuild,v 1.1 2005/05/05 10:25:54 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r12.ebuild,v 1.1.1.1 2005/11/30 09:37:14 chriswhite Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/png-mng/${P}-jumbo-patches-${JUMBOV}.tar.bz2 ftp:/
 
 LICENSE="xv"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~sparc ~ppc ~ppc64 ~alpha ~ia64"
+KEYWORDS="alpha amd64 hppa ia64 mips ppc ~ppc-macos ~ppc64 sparc x86"
 IUSE="jpeg tiff png"
 
 DEPEND="virtual/x11
@@ -22,12 +22,19 @@ DEPEND="virtual/x11
 src_unpack() {
 	unpack ${A}
 
+	# bug #109012
+	cd ${WORKDIR}; epatch ${FILESDIR}/jumbo-patch-nojpeg.diff || die
+
 	cd ${S}
 
 	# XXX: fix version on subsequent releases.
 	epatch ${WORKDIR}/${P}-jumbo-fix-patch-20050410.txt || die
 	epatch ${WORKDIR}/${P}-jumbo-enh-patch-${JUMBOV}.txt || die
 
+	# OSX malloc and define patches
+	epatch "${FILESDIR}/${P}"-r12-xv-osx.patch || die
+	epatch "${FILESDIR}/${P}"-vdcomp-osx.patch || die
+
 	sed -i	-e 's/\(^JPEG.*\)/#\1/g' \
 			-e 's/\(^PNG.*\)/#\1/g' \
 			-e 's/\(^TIFF.*\)/#\1/g' \
@@ -38,7 +45,6 @@ src_unpack() {
 
 	# fix installation of ps docs.
 	sed -i -e 's#$(DESTDIR)$(LIBDIR)#$(LIBDIR)#g' Makefile
-
 }
 
 src_compile() {
@@ -77,5 +83,5 @@ src_install() {
 			MANDIR=/usr/share/man/man1 \
 			LIBDIR=${T} install || die
 
-	dodoc README{,.jumbo,.pcd} INSTALL CHANGELOG BUGS IDEAS docs/*.ps docs/*.doc
+	dodoc README{,.jumbo,.pcd} CHANGELOG BUGS IDEAS docs/*.ps docs/*.doc
 }
diff --git a/media-gfx/xv/xv-3.10a-r8.ebuild b/media-gfx/xv/xv-3.10a-r8.ebuild
index 73a88ebc9d04..111e8f4a9ad9 100644
--- a/media-gfx/xv/xv-3.10a-r8.ebuild
+++ b/media-gfx/xv/xv-3.10a-r8.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/media-gfx/xv/xv-3.10a-r8.ebuild,v 1.1 2004/10/13 14:04:04 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r8.ebuild,v 1.1.1.1 2005/11/30 09:37:14 chriswhite Exp $
 
 inherit ccc flag-o-matic eutils
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.cis.upenn.edu/pub/xv/${P}.tar.gz
 
 LICENSE="xv"
 SLOT="0"
-KEYWORDS="x86 ppc sparc alpha mips hppa ia64 ~amd64"
+KEYWORDS="x86 ppc sparc alpha mips hppa ia64 amd64 ppc64 ppc-macos"
 IUSE="jpeg tiff png"
 
 DEPEND="virtual/x11
@@ -31,6 +31,12 @@ src_unpack() {
 
 	# fix security issues #61619
 	epatch ${FILESDIR}/${P}-security.diff || die
+
+	if use ppc-macos; then
+		epatch ${FILESDIR}/${P}-xv-osx.patch
+		epatch ${FILESDIR}/${P}-vdcomp-osx.patch
+		epatch ${FILESDIR}/${P}-makefile-osx.patch
+	fi
 }
 
 src_compile() {
diff --git a/media-gfx/xv/xv-3.10a-r9.ebuild b/media-gfx/xv/xv-3.10a-r9.ebuild
index 28b918f25792..583bde4ffd91 100644
--- a/media-gfx/xv/xv-3.10a-r9.ebuild
+++ b/media-gfx/xv/xv-3.10a-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r9.ebuild,v 1.1 2005/01/04 14:10:17 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r9.ebuild,v 1.1.1.1 2005/11/30 09:37:14 chriswhite Exp $
 
 inherit ccc flag-o-matic eutils
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.cis.upenn.edu/pub/xv/${P}.tar.gz
 
 LICENSE="xv"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~ia64 ~amd64 ~ppc64"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~ia64 ~amd64 ~ppc64 ~ppc-macos"
 IUSE="jpeg tiff png"
 
 DEPEND="virtual/x11
@@ -37,6 +37,12 @@ src_unpack() {
 	epatch ${FILESDIR}/xv-smoothing-algorithm.diff || die
 	epatch ${FILESDIR}/xv-optimize-jpeg.diff || die
 	epatch ${FILESDIR}/xv-postscript-double-free.diff || die
+
+	if use ppc-macos; then
+		epatch ${FILESDIR}/${P}-xv-osx.patch
+		epatch ${FILESDIR}/${P}-vdcomp-osx.patch
+		epatch ${FILESDIR}/${P}-makefile-osx.patch
+	fi
 }
 
 src_compile() {
diff --git a/media-gfx/xwgui2/ChangeLog b/media-gfx/xwgui2/ChangeLog
index b8e3a82d7bf2..7aef61d61c65 100644
--- a/media-gfx/xwgui2/ChangeLog
+++ b/media-gfx/xwgui2/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/xwgui2
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xwgui2/ChangeLog,v 1.1 2003/10/29 23:45:17 plasmaroo Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xwgui2/ChangeLog,v 1.1.1.1 2005/11/30 09:37:15 chriswhite Exp $
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> xwgui2-2.08.ebuild:
+  Added to ~ppc.
 
 *xwgui2-2.08 (29 Oct 2003)
 
diff --git a/media-gfx/xwgui2/Manifest b/media-gfx/xwgui2/Manifest
index 51f74d43c712..3b091ffd484f 100644
--- a/media-gfx/xwgui2/Manifest
+++ b/media-gfx/xwgui2/Manifest
@@ -1,4 +1,4 @@
-MD5 efd46a3f9bb9b7c19cbe75a864880cbd ChangeLog 270
-MD5 d91c51b0cd9cf82b5f534a0273f6fa8b xwgui2-2.08.ebuild 1041
-MD5 52fe5f4a1d13e28251612ad711a68354 files/xwgui2-2.08-makefilediff.patch 866
+MD5 7041709cffbb0b8eeebcb7fc41496634 ChangeLog 432
+MD5 9e1d07bdaa719f67a236153262d12506 xwgui2-2.08.ebuild 1350
 MD5 3c20b8804ee3f88f145aafa599c07b43 files/digest-xwgui2-2.08 62
+MD5 52fe5f4a1d13e28251612ad711a68354 files/xwgui2-2.08-makefilediff.patch 866
diff --git a/media-gfx/xwgui2/xwgui2-2.08.ebuild b/media-gfx/xwgui2/xwgui2-2.08.ebuild
index d63dca3bbd77..4fd9fb4015f5 100644
--- a/media-gfx/xwgui2/xwgui2-2.08.ebuild
+++ b/media-gfx/xwgui2/xwgui2-2.08.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/media-gfx/xwgui2/xwgui2-2.08.ebuild,v 1.1 2003/10/29 23:45:17 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xwgui2/xwgui2-2.08.ebuild,v 1.1.1.1 2005/11/30 09:37:15 chriswhite Exp $
 
-DESCRIPTION="xwGUI2 is an image and photo layout software for printing"
+DESCRIPTION="xwGUI2 is an image and photo layout application aimed for printing"
 HOMEPAGE="http://xwgui.automatix.de/"
 SRC_URI="http://xwgui.automatix.de/daten/xwgui-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 
 IUSE=""
 DEPEND="virtual/x11
 	>=x11-libs/xforms-1.0
-	>=media-libs/t1lib-1.0"
+	=media-libs/t1lib-1*"
 
 S="${WORKDIR}/xwGUI"
 
@@ -25,7 +25,12 @@ src_compile() {
 
 	patch -p0 -s < ${FILESDIR}/xwgui2-${PV}-makefilediff.patch || die
 
+	# This sorts out "invisible" input boxes due to a known
+	# XForms bug...
+	sed -e 's/20,xwGR/23,xwGR/' -i xwGUI/*.c || die
+
 	cd xwGUI || die
+	sed -e 's:/usr/X11R6/lib/libforms.so.1.0:/usr/lib/libforms.so.1:' -i Makefile || die
 	emake || die
 	echo
 	echo
@@ -41,7 +46,6 @@ src_compile() {
 src_install() {
 
 	einstall || die
-
 	if [ -x /usr/bin/gimp-1.2 ]; then
 		cd xwprint2 || die
 
diff --git a/media-gfx/xzgv/ChangeLog b/media-gfx/xzgv/ChangeLog
index 143fea4d92d6..9f6eb868e366 100644
--- a/media-gfx/xzgv/ChangeLog
+++ b/media-gfx/xzgv/ChangeLog
@@ -1,6 +1,67 @@
-# ChangeLog for media-gfx/scrot
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xzgv/ChangeLog,v 1.1 2002/04/24 09:39:13 verwilst Exp $
+# ChangeLog for media-gfx/xzgv
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xzgv/ChangeLog,v 1.1.1.1 2005/11/30 09:37:38 chriswhite Exp $
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> xzgv-0.8-r1.ebuild:
+  Mark 0.8-r1 stable on alpha
+
+  24 Aug 2005; Aron Griffis <agriffis@gentoo.org> xzgv-0.8-r1.ebuild:
+  stable on ia64
+
+  13 Jun 2005; Jonathan Smith <smithj@gentoo.org> metadata.xml:
+  taking over this package
+
+  24 May 2005; Joseph Jezak <josejx@gentoo.org> xzgv-0.8-r1.ebuild:
+  Marked ppc stable for bug #93132.
+
+  21 May 2005; Jose Luis Rivero <yoswink@gentoo.org> xzgv-0.8-r1.ebuild:
+  Keyworded ~alpha
+
+  19 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> xzgv-0.8-r1.ebuild:
+  Stable on sparc wrt #93132
+
+  19 May 2005; Rene Nussbaumer <killerfox@gentoo.org> xzgv-0.8-r1.ebuild:
+  Add ~hppa; bug #93132
+
+  19 May 2005; Markus Rothe <corsair@gentoo.org> xzgv-0.8-r1.ebuild:
+  Added ~ppc64 to KEYWORDS; bug #93132
+
+  19 May 2005; Olivier Crête <tester@gentoo.org> -xzgv-0.7-r1.ebuild,
+  -xzgv-0.8.ebuild, xzgv-0.8-r1.ebuild:
+  Fixed homepage and src_uri, removed vulnerable versions (see GLSA 200501-09)
+  and marked stable on amd64, closes bugs #42092 and #93132
+
+  16 Jan 2005; Danny van Dyk <kugelfang@gentoo.org> xzgv-0.8-r1.ebuild:
+  Marked ~amd64.
+
+  06 Jan 2005; Chris White <chriswhite@gentoo.org> xzgv-0.8-r1.ebuild:
+  Marked x86 stable for bug #74069.
+
+*xzgv-0.8-r1 (06 Jan 2005)
+
+  06 Jan 2005; Chris White <chriswhite@gentoo.org>
+  +files/xzgv-0.8-integer-overflow-fix.diff, +xzgv-0.8-r1.ebuild:
+  Fixing Security bug #74069 and added ~ppc while I was there.
+
+  06 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> xzgv-0.7-r1.ebuild,
+  xzgv-0.8.ebuild:
+  Keyworded 0.7-r1 -sparc, 0.8 ~sparc
+
+  02 Jun 2004; Danny van Dyk <kugelfang@gentoo.org> xzgv-0.8.ebuild:
+  Marked ~amd64 after adding patch to disable mmx on amd64.
+
+*xzgv-0.8 (07 Oct 2003)
+
+  07 Oct 2003; Brandy Westcott brandy@gentoo.org xzgv-0.8.ebuild:
+  Version bump. This version will compile with gcc-3.3. Added sys-apps/gawk as a
+  dependency
+
+*xzgv-0.7-r1 (28 Jun 2002)
+
+  28 Jun 2002; Seemant Kulleen <seemant@gentoo.org> xzgv-0.7-r1.ebuild
+  files/digest-xzgv-0.7-r1 :
+
+  LFH/man page fixes; SLOT and LICENSE
 
 *xzgv-0.7 (24 April 2002)
 
diff --git a/media-gfx/xzgv/Manifest b/media-gfx/xzgv/Manifest
index e69de29bb2d1..abe0469b5479 100644
--- a/media-gfx/xzgv/Manifest
+++ b/media-gfx/xzgv/Manifest
@@ -0,0 +1,5 @@
+MD5 17bdb42d8f6ab9d25bb7c695c41c93bd xzgv-0.8-r1.ebuild 1406
+MD5 ba9c20ee3f3568176dc0dd45b3cab35b metadata.xml 218
+MD5 5a8988520a14c904681fa2c9ca73e3bc ChangeLog 2393
+MD5 df76e36ea08fa4317c30d7879eec9f93 files/digest-xzgv-0.8-r1 60
+MD5 9495e82307945c08599a0bd9ffc2f4f6 files/xzgv-0.8-integer-overflow-fix.diff 6374
diff --git a/media-gfx/xzgv/metadata.xml b/media-gfx/xzgv/metadata.xml
index 20ce219711a2..1db51a098ef5 100644
--- a/media-gfx/xzgv/metadata.xml
+++ b/media-gfx/xzgv/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>no-herd</herd>
+<maintainer><email>smithj@gentoo.org</email></maintainer>
 </pkgmetadata>
diff --git a/media-gfx/xzgv/xzgv-0.8-r1.ebuild b/media-gfx/xzgv/xzgv-0.8-r1.ebuild
index 1a4b8d27b982..cd69e24d63ee 100644
--- a/media-gfx/xzgv/xzgv-0.8-r1.ebuild
+++ b/media-gfx/xzgv/xzgv-0.8-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/media-gfx/xzgv/xzgv-0.8-r1.ebuild,v 1.1 2005/01/05 16:32:01 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xzgv/xzgv-0.8-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:38 chriswhite Exp $
 
 inherit eutils
 
-DESCRIPTION="An X image viewer."
-SRC_URI="http://xzgv.browser.org/${P}.tar.gz"
-HOMEPAGE="http://xzgv.browser.org/"
+DESCRIPTION="An X image viewer"
+HOMEPAGE="http://rus.members.beeb.net/xzgv.html"
+SRC_URI="ftp://ftp.ibiblio.org/pub/Linux/apps/graphics/viewers/X/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~ppc"
+SLOT="0"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc ~ppc64 sparc x86"
 IUSE=""
 
 DEPEND="virtual/x11
-	sys-apps/gawk
 	media-libs/libpng
 	media-libs/jpeg
 	media-libs/tiff
@@ -66,5 +65,5 @@ src_install() {
 
 	cd ${S}
 
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO
+	dodoc AUTHORS ChangeLog INSTALL NEWS README* TODO
 }
diff --git a/media-gfx/yablex/ChangeLog b/media-gfx/yablex/ChangeLog
index 598ca26458d4..d0bf53b9623e 100644
--- a/media-gfx/yablex/ChangeLog
+++ b/media-gfx/yablex/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-gfx/yablex
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/yablex/ChangeLog,v 1.1 2003/11/25 11:52:25 brandy Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/yablex/ChangeLog,v 1.1.1.1 2005/11/30 09:37:29 chriswhite Exp $
+
+  15 Sep 2005; Mark Loeser <halcy0n@gentoo.org> yablex-20030826.ebuild:
+  Add app-arch/unzip to DEPEND; bug #69831
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> yablex-20030826.ebuild:
+  Added to ~ppc.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> yablex-20030826.ebuild:
+  Add inherit eutils
 
 *yablex-20030826 (26 Nov 2003)
 
diff --git a/media-gfx/yablex/Manifest b/media-gfx/yablex/Manifest
index ff8c77a09c74..f12252a72b8c 100644
--- a/media-gfx/yablex/Manifest
+++ b/media-gfx/yablex/Manifest
@@ -1,5 +1,15 @@
-MD5 8d59db58bcae93d98ae385edb47dc0fe yablex-20030826.ebuild 693
-MD5 b5f5a1b584d13d7ae5bc6333ea41987f ChangeLog 426
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0ab3548c0f52f6bbab929142e1525071 ChangeLog 717
 MD5 5fc54c5d01402d0610fafa96961bb8e0 metadata.xml 161
+MD5 930b8a485ae979735189c561b29c491d yablex-20030826.ebuild 720
 MD5 4fac2f76973f964e489fb2f29bfa0d94 files/digest-yablex-20030826 68
 MD5 a60f88cc7020603a859d9e5de0f32450 files/yablex-20030826-gentoo.patch 690
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDKdQvCRZPokWLroQRAqh0AJ9C/Z4/yKmH2udjFtAXed0jpuAoNQCdGCgx
+nEBAQfX7W8PMojUe+B9HKa4=
+=joFz
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/yablex/yablex-20030826.ebuild b/media-gfx/yablex/yablex-20030826.ebuild
index 9ec9aab0b297..38ec05ab2175 100644
--- a/media-gfx/yablex/yablex-20030826.ebuild
+++ b/media-gfx/yablex/yablex-20030826.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/media-gfx/yablex/yablex-20030826.ebuild,v 1.1 2003/11/25 11:52:25 brandy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/yablex/yablex-20030826.ebuild,v 1.1.1.1 2005/11/30 09:37:29 chriswhite Exp $
+
+inherit eutils
 
 MY_P=${PN}${PV}
 DESCRIPTION="YaBle - Yet Another Blender Exporter"
@@ -9,10 +11,10 @@ SRC_URI="mirror://gentoo/${MY_P}-leope.zip"
 
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 
 IUSE=""
-DEPEND=""
+DEPEND="app-arch/unzip"
 RDEPEND="media-gfx/blender
 	dev-lang/python"
 
diff --git a/media-gfx/yafray/ChangeLog b/media-gfx/yafray/ChangeLog
index 4671a4806fad..5c582ac1307a 100644
--- a/media-gfx/yafray/ChangeLog
+++ b/media-gfx/yafray/ChangeLog
@@ -1,6 +1,87 @@
 # ChangeLog for media-gfx/yafray
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/yafray/ChangeLog,v 1.1 2003/10/19 08:07:01 mr_bones_ Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/yafray/ChangeLog,v 1.1.1.1 2005/11/30 09:37:42 chriswhite Exp $
+
+  01 Oct 2005; Simon Stelling <blubb@gentoo.org>
+  +files/yafray-0.0.8-libdir.patch, -files/yafray-0.0.8-multilib.patch,
+  yafray-0.0.8.ebuild:
+  replace the old multilib-patch with a more elegant one, thanks to Ben
+  Skeggs; bug 103431
+
+  17 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -files/yafray-gcc34-fix.gz, yafray-0.0.6.ebuild:
+  Move patch to mirrors. See bug 106150.
+
+  04 Sep 2005; Simon Stelling <blubb@gentoo.org>
+  +files/yafray-0.0.8-64bit.patch, +files/yafray-0.0.8-multilib.patch,
+  yafray-0.0.8.ebuild:
+  fixed evil ptr->int cast and made it multilib-strict aware
+
+  15 Aug 2005; Luca Barbato <lu_zero@gentoo.org> ChangeLog:
+  New version, thanks to Joshua Leach <leachj@cae.wisc.edu> for the ebuild
+
+  14 Jun 2005; Ferris McCormick <fmccor@gentoo.org> yafray-0.0.7.ebuild:
+  Add ~sparc keyword.  Builds and appears to run on sparc ---
+  needed for blender testing.
+
+  02 Jun 2005; Danny van Dyk <kugelfang@gentoo.org> yafray-0.0.6.ebuild,
+  yafray-0.0.7.ebuild:
+  Removed WANT_GCC and inherit gcc. (BUG #92745)
+
+  05 May 2005; Sven Wegener <swegener@gentoo.org> yafray-0.0.6.ebuild,
+  yafray-0.0.7.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  26 Apr 2005; Luca Barbato <lu_zero@gentoo.org> yafray-0.0.7.ebuild:
+  inheriting python eclass
+
+  22 Mar 2005; Karol Wojtaszek <sekretarz@gentoo.org> yafray-0.0.7.ebuild:
+  Stable on amd64, bug #86184
+
+  24 Feb 2005; Luca Barbato <lu_zero@gentoo.org> +metadata.xml:
+  Added metadata.xml
+
+  18 Feb 2005; Luca Barbato <lu_zero@gentoo.org> yafray-0.0.7.ebuild:
+  libtoolized
+
+  28 Oct 2004; Luca Barbato <lu_zero@gentoo.org> yafray-0.0.6.ebuild,
+  yafray-0.0.7.ebuild:
+  Marked x86
+
+  28 Oct 2004; Luca Barbato <lu_zero@gentoo.org> yafray-0.0.6.ebuild,
+  yafray-0.0.7.ebuild:
+  Marked ppc
+
+*yafray-0.0.7 (08 Aug 2004)
+
+  08 Aug 2004; Luca Barbato <lu_zero@gentoo.org>
+  +files/yafray-0.0.7-scons.patch, +yafray-0.0.7.ebuild:
+  New version
+
+  08 Jun 2004; David Holm <dholm@gentoo.org> yafray-0.0.6.ebuild:
+  Changed DEPEND to require >=gcc-3.3* as 3.2* and older can't compile yafray
+  (confirmed on x86 and ppc).
+
+  01 Jun 2004; Travis Tilley <lv@gentoo.org> yafray-0.0.6.ebuild:
+  stable on amd64
+
+  03 May 2004; Hanno Boeck <hanno@gentoo.org> +files/yafray-gcc34-fix.gz,
+  yafray-0.0.6.ebuild:
+  Fix for gcc 3.4.
+
+  18 Feb 2004; <augustus@gentoo.org> yafray-0.0.6.ebuild:
+  Added ~amd64 keyword.
+
+  05 Feb 2004; Luca Barbato <lu_zero@gentoo.org> yafray-0.0.6.ebuild:
+  fixed gcc-3 requirement, bug
+
+*yafray-0.0.6 (04 Feb 2004)
+
+  04 Feb 2004; Luca Barbato <lu_zero@gentoo.org> yafray-0.0.6.ebuild:
+  New version, needed by newer blender
+
+  07 Dec 2003; Michael Sterrett <mr_bones_@gentoo.org> yafray-0.0.4.ebuild:
+  bump to stable
 
 *yafray-0.0.4 (19 Oct 2003)
 
diff --git a/media-gfx/yafray/Manifest b/media-gfx/yafray/Manifest
index 295f3947b846..a9eb83c10867 100644
--- a/media-gfx/yafray/Manifest
+++ b/media-gfx/yafray/Manifest
@@ -1,2 +1,14 @@
-MD5 e1c3544d8bc1f53821a5ad5aef52527d yafray-0.0.4.ebuild 462
+MD5 4255cf67b32ddb1a2ae686dbb2fc8d0a ChangeLog 3116
+MD5 5fc54c5d01402d0610fafa96961bb8e0 metadata.xml 161
+MD5 6cd6b3531914a358df0c6698b3ecae0d yafray-0.0.4.ebuild 807
+MD5 97a8d3328032eff330989855015de006 yafray-0.0.6.ebuild 1067
+MD5 a998d11d232890b45f990edea55e4fa5 yafray-0.0.7.ebuild 995
+MD5 9efd27c5ec50f63cb06d5a5bd30bafb0 yafray-0.0.8.ebuild 1150
 MD5 9eb9f2e8a635d14ca7d085f6a0f271d0 files/digest-yafray-0.0.4 64
+MD5 c26515fc17ce25dd3a97c619f013d4da files/digest-yafray-0.0.6 126
+MD5 1369fb0f3bdcd1b7cbf08c71ded07fca files/digest-yafray-0.0.7 64
+MD5 7b50d20a15ce12bca91f1354401f1351 files/yafray-0.0.7-scons.patch 866
+MD5 b99ce19d58e373fa5dd2529e24bb3bfc files/digest-yafray-0.0.8 64
+MD5 78f9242de2b0493dab84891fe6c9e2eb files/yafray-0.0.8-scons.patch 782
+MD5 6f303b3dd7cb31ba2fdd965c7bcddbe3 files/yafray-0.0.8-64bit.patch 659
+MD5 065bf1da4acf58011d3907c814822bb1 files/yafray-0.0.8-libdir.patch 962
diff --git a/media-gfx/yafray/files/digest-yafray-0.0.6 b/media-gfx/yafray/files/digest-yafray-0.0.6
index a177b844fe08..f62ca1c065e4 100644
--- a/media-gfx/yafray/files/digest-yafray-0.0.6
+++ b/media-gfx/yafray/files/digest-yafray-0.0.6
@@ -1 +1,2 @@
 MD5 001b01416c21a8cdfb0fe5e17abba31d yafray-0.0.6.tar.gz 500879
+MD5 6990e835f5744cd54dbc5afb80a05f34 yafray-gcc34-fix.gz 1190
diff --git a/media-gfx/yafray/yafray-0.0.4.ebuild b/media-gfx/yafray/yafray-0.0.4.ebuild
index fdff4800b276..508c0f46638a 100644
--- a/media-gfx/yafray/yafray-0.0.4.ebuild
+++ b/media-gfx/yafray/yafray-0.0.4.ebuild
@@ -1,12 +1,12 @@
-# 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/media-gfx/yafray/yafray-0.0.4.ebuild,v 1.1 2003/10/19 08:07:01 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/yafray/yafray-0.0.4.ebuild,v 1.1.1.1 2005/11/30 09:37:42 chriswhite Exp $
 
 DESCRIPTION="Yet Another Free Raytracer"
 HOMEPAGE="http://www.yafray.org"
 SRC_URI="http://www.coala.uniovi.es/~jandro/noname/downloads/${P}.tar.gz"
 
-KEYWORDS="~x86"
+KEYWORDS="x86"
 LICENSE="LGPL-2.1"
 SLOT="0"
 
diff --git a/media-gfx/yafray/yafray-0.0.6.ebuild b/media-gfx/yafray/yafray-0.0.6.ebuild
index 972f5876e9c3..e36e0b37cef0 100644
--- a/media-gfx/yafray/yafray-0.0.6.ebuild
+++ b/media-gfx/yafray/yafray-0.0.6.ebuild
@@ -1,38 +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/media-gfx/yafray/yafray-0.0.6.ebuild,v 1.1 2004/02/04 01:23:41 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/yafray/yafray-0.0.6.ebuild,v 1.1.1.1 2005/11/30 09:37:42 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="Yet Another Free Raytracer"
-HOMEPAGE="http://www.yafray.org"
-SRC_URI="http://www.coala.uniovi.es/~jandro/noname/downloads/${P}.tar.gz"
+HOMEPAGE="http://www.yafray.org/"
+SRC_URI="http://www.coala.uniovi.es/~jandro/noname/downloads/${P}.tar.gz
+	mirror://gentoo/${PN}-gcc34-fix.gz
+	http://dev.gentoo.org/~vanquirius/files/${PN}-gcc34-fix.gz"
 
-KEYWORDS="~x86 ~ppc"
 LICENSE="LGPL-2.1"
 SLOT="0"
+KEYWORDS="x86 ppc amd64"
+IUSE=""
 
 RDEPEND="media-libs/jpeg
-		sys-libs/zlib"
+	sys-libs/zlib"
 DEPEND="${RDEPEND}
-		>=sys-apps/sed-4
-		>=sys-devel/automake-1.7.2"
-
-IUSE=""
+	>=sys-devel/gcc-3.3
+	>=sys-apps/sed-4
+	>=sys-devel/automake-1.7.2"
 
 export WANT_AUTOMAKE="1.7"
 
 src_unpack() {
 	unpack ${A}
+	epatch "${WORKDIR}/${PN}-gcc34-fix"
 	cd ${S}
 
 	sed -i \
 		-e "s
-O3 -fomit-frame-pointer -ffast-math
${CXXFLAGS}
" \
 			src/Makefile.am || \
 				die "sed src/Makefile.am failed"
-aclocal
+	aclocal
+	libtoolize --copy --force
 }
 
 src_install() {
-	einstall            || die
-	dodoc AUTHORS       || die "dodoc failed"
+	einstall || die
+	dodoc AUTHORS || die "dodoc failed"
 	dohtml doc/doc.html || die "dohtml failed"
 }
diff --git a/media-gfx/yafray/yafray-0.0.7.ebuild b/media-gfx/yafray/yafray-0.0.7.ebuild
index 4dd8dc9ac8a0..6377cb796c40 100644
--- a/media-gfx/yafray/yafray-0.0.7.ebuild
+++ b/media-gfx/yafray/yafray-0.0.7.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/media-gfx/yafray/yafray-0.0.7.ebuild,v 1.1 2004/08/08 14:35:15 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/yafray/yafray-0.0.7.ebuild,v 1.1.1.1 2005/11/30 09:37:42 chriswhite Exp $
 
-inherit gcc eutils
+inherit eutils python
 
 DESCRIPTION="Yet Another Free Raytracer"
 HOMEPAGE="http://www.yafray.org/"
@@ -10,22 +10,22 @@ SRC_URI="http://www.coala.uniovi.es/~jandro/noname/downloads/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE=""
 
 RDEPEND="media-libs/jpeg
 	sys-libs/zlib"
 DEPEND="${RDEPEND}
-	>=sys-devel/gcc-3.3*
+	>=sys-devel/gcc-3.3
 	>=sys-apps/sed-4
 	dev-util/scons"
 
-export WANT_GCC_3="yes"
 export WANT_AUTOMAKE="1.7"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+	libtoolize --copy --force
 	epatch ${FILESDIR}/${P}-scons.patch
 	sed -i -e "s:-O3:${CFLAGS}:" SConstruct
 }
diff --git a/media-gfx/yafray/yafray-0.0.8.ebuild b/media-gfx/yafray/yafray-0.0.8.ebuild
index 9ace4f8ced23..2aa334408d48 100644
--- a/media-gfx/yafray/yafray-0.0.8.ebuild
+++ b/media-gfx/yafray/yafray-0.0.8.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/media-gfx/yafray/yafray-0.0.8.ebuild,v 1.1 2005/08/20 09:45:31 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/yafray/yafray-0.0.8.ebuild,v 1.1.1.1 2005/11/30 09:37:42 chriswhite Exp $
 
-inherit eutils python
+inherit eutils python multilib
 
 DESCRIPTION="Yet Another Free Raytracer"
 HOMEPAGE="http://www.yafray.org/"
@@ -27,6 +27,8 @@ src_unpack() {
 	cd ${S}
 	libtoolize --copy --force
 	epatch ${FILESDIR}/${P}-scons.patch
+	epatch ${FILESDIR}/${P}-64bit.patch
+	epatch ${FILESDIR}/${P}-libdir.patch
 	# Dirty hack for a dirty buildsystem.
 	sed -i -e "s:-O3:${CXXFLAGS} -fsigned-char:g" *-settings.py
 }
@@ -36,7 +38,7 @@ src_compile() {
 }
 
 src_install() {
-	scons prefix="/usr" destdir="${D}" install || die
+	scons prefix="/usr" destdir="${D}" libdir="/$(get_libdir)" install || die
 
 	find ${D} -name .sconsign -exec rm \{\} \;
 	dodoc AUTHORS 		|| die "dodoc failed"
diff --git a/media-gfx/zgv/ChangeLog b/media-gfx/zgv/ChangeLog
index d3b448c24279..e03b8f187d7f 100644
--- a/media-gfx/zgv/ChangeLog
+++ b/media-gfx/zgv/ChangeLog
@@ -1,6 +1,41 @@
 # ChangeLog for media-gfx/zgv
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/zgv/ChangeLog,v 1.1 2002/02/01 21:53:30 gbevin Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zgv/ChangeLog,v 1.1.1.1 2005/11/30 09:37:37 chriswhite Exp $
+
+*zgv-5.8 (06 Nov 2004)
+
+  06 Nov 2004; <lanius@gentoo.org> +files/zgv-5.8-integer-overflow-fix.diff,
+  +zgv-5.8.ebuild:
+  version bump, add security fix, bug #69150
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> zgv-5.7-r1.ebuild:
+  Add inherit eutils
+
+*zgv-5.7-r1 (22 Jan 2004)
+
+  22 Jan 2004; Mike Frysinger <vapier@gentoo.org> :
+  Remove setuid bit since you dont need them with svgalib-1.9.x.
+
+*zgv-5.7 (03 Oct 2003)
+
+  07 Oct 2003; Brandy Westcott brandy@gentoo.org zgv-5.7.ebuild:
+  Added sys-apps/gawk as a dependency
+
+  03 Oct 2003; Heinrich Wendel <lanius@gentoo.org> zgv-5.7.ebuild,
+  files/zgv-5.7-gcc3.patch:
+  version bump
+
+*zgv-5.6 (9 May 2002)
+
+  9 May 2002; Martin Schlemmer <azarah@gentoo.org> zgv-5.6.ebuild :
+
+  Update to latest version.
+
+*zgv-5.5-r1 (12 Mar 2002)
+
+  12 Mar 2002; Seemant Kulleen <seemant@gentoo.org> zgv-5.5-r1.ebuild :
+
+  Compile against new libpng
 
 *zgv-5.5 (1 Feb 2002)
 
diff --git a/media-gfx/zgv/Manifest b/media-gfx/zgv/Manifest
index e69de29bb2d1..f02d7b1b3205 100644
--- a/media-gfx/zgv/Manifest
+++ b/media-gfx/zgv/Manifest
@@ -0,0 +1,8 @@
+MD5 3ed7ebf62221997d28c3cb9940235bb1 zgv-5.8.ebuild 1221
+MD5 065dec6535104ab6218a95c2fedbeb20 zgv-5.7-r1.ebuild 1128
+MD5 b00dbaba35d4f393907d22059146ddb7 ChangeLog 1547
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 1c0e7ed3b8b41a4715baee9702d8f75b files/digest-zgv-5.7-r1 59
+MD5 d41b7ec521804bd1ff821a49464f8688 files/zgv-5.7-gcc3.patch 7078
+MD5 75f0cfb0c1cbe1f896115eaba8fe2e1a files/digest-zgv-5.8 59
+MD5 1683151022bec4c607d5c33c6eb65592 files/zgv-5.8-integer-overflow-fix.diff 10910
diff --git a/media-gfx/zgv/files/zgv-5.7-gcc3.patch b/media-gfx/zgv/files/zgv-5.7-gcc3.patch
index 6c44c16a150a..7a43849834ef 100644
--- a/media-gfx/zgv/files/zgv-5.7-gcc3.patch
+++ b/media-gfx/zgv/files/zgv-5.7-gcc3.patch
@@ -1,6 +1,6 @@
-diff -u orig/bdf2h.c new/bdf2h.c
---- orig/bdf2h.c	2003-10-03 06:05:53.573182320 +0200
-+++ new/bdf2h.c	2003-10-03 06:16:07.603835472 +0200
+diff -u src.orig/bdf2h.c src/bdf2h.c
+--- src.orig/bdf2h.c	2003-10-03 06:05:53.573182320 +0200
++++ src/bdf2h.c	2003-10-03 06:16:07.603835472 +0200
 @@ -45,14 +45,14 @@
   */
  printf("#ifndef DEFINED_STRUCT_FONTINFO_TAG\n");
@@ -24,9 +24,9 @@ diff -u orig/bdf2h.c new/bdf2h.c
  printf("#endif\n\n");
  
  /* generate font data */
-diff -u orig/font.c new/font.c
---- orig/font.c	2003-10-03 06:05:53.573182320 +0200
-+++ new/font.c	2003-10-03 06:06:10.775567160 +0200
+diff -u src.orig/font.c src/font.c
+--- src.orig/font.c	2003-10-03 06:05:53.573182320 +0200
++++ src/font.c	2003-10-03 06:06:10.775567160 +0200
 @@ -37,9 +37,9 @@
   * best have this:
   */
@@ -40,9 +40,9 @@ diff -u orig/font.c new/font.c
  
  
  /* prototypes */
-diff -u orig/install-info.c new/install-info.c
---- orig/install-info.c	2003-10-03 06:05:53.573182320 +0200
-+++ new/install-info.c	2003-10-03 06:06:10.775567160 +0200
+diff -u src.orig/install-info.c src/install-info.c
+--- src.orig/install-info.c	2003-10-03 06:05:53.573182320 +0200
++++ src/install-info.c	2003-10-03 06:06:10.775567160 +0200
 @@ -309,38 +309,38 @@
  void
  print_help ()
diff --git a/media-gfx/zgv/zgv-5.7-r1.ebuild b/media-gfx/zgv/zgv-5.7-r1.ebuild
index 852719cb4e32..e13c4e6d320d 100644
--- a/media-gfx/zgv/zgv-5.7-r1.ebuild
+++ b/media-gfx/zgv/zgv-5.7-r1.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/media-gfx/zgv/zgv-5.7-r1.ebuild,v 1.1 2004/01/23 04:51:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zgv/zgv-5.7-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:37 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="A svgalib console image viewer"
 HOMEPAGE="http://www.svgalib.org/rus/zgv/"
@@ -9,6 +11,7 @@ SRC_URI="http://www.svgalib.org/rus/zgv/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
+IUSE=""
 
 DEPEND=">=media-libs/svgalib-1.4.2
 	>=media-libs/jpeg-6b-r2
diff --git a/media-gfx/zgv/zgv-5.8.ebuild b/media-gfx/zgv/zgv-5.8.ebuild
index 75b966a8f622..305391b382b0 100644
--- a/media-gfx/zgv/zgv-5.8.ebuild
+++ b/media-gfx/zgv/zgv-5.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/media-gfx/zgv/zgv-5.8.ebuild,v 1.1 2004/11/06 15:30:05 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zgv/zgv-5.8.ebuild,v 1.1.1.1 2005/11/30 09:37:37 chriswhite Exp $
 
 inherit eutils
 
diff --git a/media-gfx/zphoto/ChangeLog b/media-gfx/zphoto/ChangeLog
index 6bd2f00528d2..010bed996856 100644
--- a/media-gfx/zphoto/ChangeLog
+++ b/media-gfx/zphoto/ChangeLog
@@ -1,9 +1,73 @@
 # ChangeLog for media-gfx/zphoto
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/zphoto/ChangeLog,v 1.1 2003/07/18 09:49:37 usata Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zphoto/ChangeLog,v 1.1.1.1 2005/11/30 09:37:20 chriswhite Exp $
+
+*zphoto-1.2-r2 (04 Oct 2005)
+
+  04 Oct 2005; MATSUU Takuto <matsuu@gentoo.org> -zphoto-1.1.ebuild,
+  -zphoto-1.2.ebuild, +zphoto-1.2-r2.ebuild:
+  Removed old versions.
+  depricated gtk2 USE flag. Bug #106560.
+  Added ~amd64.
+
+  04 Jun 2005; Mamoru KOMACHI <usata@gentoo.org> zphoto-1.2-r1.ebuild:
+  Make wxzphoto compile with wxGTK-2.6; bug #94601.
+
+  29 May 2005; Mamoru KOMACHI <usata@gentoo.org> zphoto-1.2-r1.ebuild:
+  Stable on x86.
+
+*zphoto-1.2-r1 (23 Apr 2005)
+
+  23 Apr 2005; Mamoru KOMACHI <usata@gentoo.org> +zphoto-1.2-r1.ebuild:
+  Added wxwindows support. Thanks to Nuno Araujo <nuno.araujo@russo79.com>;
+  bug #88964.
+
+  04 Nov 2004; Mamoru KOMACHI <usata@gentoo.org> zphoto-1.2.ebuild:
+  Marked as stable.
+
+*zphoto-1.2 (10 Oct 2004)
+
+  10 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> -zphoto-0.9.ebuild,
+  -zphoto-1.0.ebuild, zphoto-1.1.ebuild, +zphoto-1.2.ebuild:
+  Version bumped.
+
+*zphoto-1.1 (07 Jul 2004)
+
+  07 Jul 2004; Mamoru KOMACHI <usata@gentoo.org> +zphoto-1.1.ebuild:
+  Version bumped.
+
+*zphoto-1.0 (30 May 2004)
+
+  30 May 2004; Mamoru KOMACHI <usata@gentoo.org> zphoto-0.7.ebuild,
+  zphoto-0.9.ebuild, zphoto-1.0.ebuild, files/zphoto-0.7-avifile-gentoo.diff:
+  Version bumped. Marked 0.9 stable and removed 0.7 from CVS.
+  Closing bug #51449
+
+*zphoto-0.9 (02 May 2004)
+
+  02 May 2004; Mamoru KOMACHI <usata@gentoo.org> zphoto-0.6.ebuild,
+  zphoto-0.7.ebuild, zphoto-0.9.ebuild, files/zphoto-0.7-avifile-gentoo.diff,
+  files/zphoto-0.9-avifile-gentoo.diff, files/zphoto-avifile-gentoo.diff:
+  Version bumped. Marked previous version stable. Removed old ebuild.
+
+*zphoto-0.7 (27 Mar 2004)
+
+  27 Mar 2004; Mamoru KOMACHI <usata@gentoo.org> zphoto-0.7.ebuild,
+  files/zphoto-avifile-gentoo.diff:
+  Version bumped.
 
 *zphoto-0.6 (18 Jul 2003)
 
+  03 Oct 2003; Mamoru KOMACHI <usata@gentoo.org> metadata.xml,
+  zphoto-0.6.ebuild:
+  Considered for stable
+
+  03 Sep 2003; Mamoru KOMACHI <usata@gentoo.org> zphoto-0.6.ebuild,
+  files/zphoto-0.6-gentoo.diff:
+  Added a patch to build zphoto with avifile-0.7.38.20030710.ebuild.
+  Thanks to the report by D Bandopadhyay <dhruba@codewordt.co.uk>
+  in bug #27770
+
   18 Jul 2003; Mamoru KOMACHI <usata@gentoo.org> zphoto-0.6.ebuild:
   Initial import, ebuild provided by Doudou <leculier@fr.uu.net>
   in bug #18686
diff --git a/media-gfx/zphoto/Manifest b/media-gfx/zphoto/Manifest
index 37fd7f082cce..e7bbd5f99067 100644
--- a/media-gfx/zphoto/Manifest
+++ b/media-gfx/zphoto/Manifest
@@ -1,2 +1,7 @@
-MD5 6328faa31c7c4012fa2e6c1b8a6fa1db zphoto-0.6.ebuild 558
-MD5 5d667eff255326f09226873397d63c3b files/digest-zphoto-0.6 62
+MD5 5ec71d6c9e72e64850e696640c150609 zphoto-1.2-r1.ebuild 1305
+MD5 5c72072b135edb3555b3c20c40fa1c5d zphoto-1.2-r2.ebuild 1226
+MD5 42d7d9ee58489cc639edde0303a2abea ChangeLog 2481
+MD5 043e2d431237aeec1769801a5b0214df metadata.xml 251
+MD5 d3946f39d2b97ca5c97697351f478e3f files/zphoto-0.9-avifile-gentoo.diff 319
+MD5 da4e2ed233005ec8423569e0bc407105 files/digest-zphoto-1.2-r1 62
+MD5 da4e2ed233005ec8423569e0bc407105 files/digest-zphoto-1.2-r2 62
diff --git a/media-gfx/zphoto/zphoto-1.2-r1.ebuild b/media-gfx/zphoto/zphoto-1.2-r1.ebuild
index 767ec6706545..fb1478738ae9 100644
--- a/media-gfx/zphoto/zphoto-1.2-r1.ebuild
+++ b/media-gfx/zphoto/zphoto-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/media-gfx/zphoto/zphoto-1.2-r1.ebuild,v 1.1 2005/04/23 06:31:00 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zphoto/zphoto-1.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:20 chriswhite Exp $
 
 IUSE="wxwindows gtk2"
 
@@ -9,7 +9,7 @@ SRC_URI="http://namazu.org/~satoru/zphoto/${P}.tar.gz"
 HOMEPAGE="http://namazu.org/~satoru/zphoto/"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 LICENSE="LGPL-2.1"
 
 DEPEND=">=media-libs/ming-0.2a
@@ -24,11 +24,18 @@ src_compile() {
 	local myconf
 
 	if use wxwindows ; then
-		if use gtk2 ; then
-			myconf="--with-wx-config=/usr/bin/wxgtk2-2.4-config"
-		else
-			myconf="--with-wx-config=/usr/bin/wxgtk-2.4-config"
+		if use gtk2 && has_version '>=x11-libs/wxGTK-2.6' ; then
+			wx_config="/usr/bin/wx-config-2.6"
+			sed -i -e 's@\($WXCONFIG --cflags\)@\1 --unicode=no@' \
+				-e 's@\($WXCONFIG --libs\)@\1 --unicode=no@' \
+				configure || die
+			sed -i -e 's@FALSE@false@g' wxzphoto.cpp || die
+		elif use gtk2 ; then
+			wx_config="/usr/bin/wxgtk2-2.4-config"
+		else	# gtk1
+			wx_config="/usr/bin/wxgtk-2.4-config"
 		fi
+		myconf="--with-wx-config=$wx_config"
 	else
 		myconf="--disable-wx"
 	fi
diff --git a/media-gfx/zphoto/zphoto-1.2-r2.ebuild b/media-gfx/zphoto/zphoto-1.2-r2.ebuild
index 14db6c695f8c..442c0170261c 100644
--- a/media-gfx/zphoto/zphoto-1.2-r2.ebuild
+++ b/media-gfx/zphoto/zphoto-1.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/media-gfx/zphoto/zphoto-1.2-r2.ebuild,v 1.1 2005/10/04 22:21:40 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zphoto/zphoto-1.2-r2.ebuild,v 1.1.1.1 2005/11/30 09:37:20 chriswhite Exp $
 
 IUSE="wxwindows"
 
diff --git a/media-sound/DBMix/ChangeLog b/media-sound/DBMix/ChangeLog
index 4e423e74c829..692ea638ada7 100644
--- a/media-sound/DBMix/ChangeLog
+++ b/media-sound/DBMix/ChangeLog
@@ -1,6 +1,9 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/DBMix/ChangeLog,v 1.1 2003/12/29 17:22:08 wmertens Exp $
+# ChangeLog for media-sound/DBMix
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/DBMix/ChangeLog,v 1.1.1.1 2005/11/30 09:38:01 chriswhite Exp $
+
+  04 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> DBMix-0.9.8.ebuild:
+  -sparc -amd64.
 
 *DBMix-0.9.8 (29 Dec 2001)
 
diff --git a/media-sound/DBMix/DBMix-0.9.8.ebuild b/media-sound/DBMix/DBMix-0.9.8.ebuild
index 59ad2b8955ab..22757e41583d 100644
--- a/media-sound/DBMix/DBMix-0.9.8.ebuild
+++ b/media-sound/DBMix/DBMix-0.9.8.ebuild
@@ -1,6 +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/media-sound/DBMix/DBMix-0.9.8.ebuild,v 1.1 2003/12/29 17:22:08 wmertens Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/DBMix/DBMix-0.9.8.ebuild,v 1.1.1.1 2005/11/30 09:38:01 chriswhite Exp $
+
+IUSE="xmms"
+
+inherit gnuconfig
 
 DESCRIPTION="Mix several xmms and other sound streams like a DJ"
 HOMEPAGE="http://dbmix.sourceforge.net"
@@ -8,8 +12,9 @@ SRC_URI="mirror://sourceforge/dbmix/${P}.tar.gz"
 RESTRICT="nomirror"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
-IUSE="xmms"
+# -amd64: looks like sizeof() problems... sound plays but "skippy"
+# -sparc: fails to initialize.  xmms plugin segfaults xmms on exit
+KEYWORDS="x86 -amd64 -sparc"
 
 DEPEND="x11-libs/gtk+
 	xmms? ( media-sound/xmms )"
@@ -36,6 +41,8 @@ src_unpack() {
 	einfo "Fixing naked . in include"
 	sed -i~ 's/^INCLUDES = ./INCLUDES = -I./' dbfsd_src/Makefile* \
 		|| die
+
+	gnuconfig_update
 }
 
 src_compile() {
diff --git a/media-sound/DBMix/Manifest b/media-sound/DBMix/Manifest
index a302c4ce0f5e..7141a83ea790 100644
--- a/media-sound/DBMix/Manifest
+++ b/media-sound/DBMix/Manifest
@@ -1,3 +1,4 @@
-MD5 1267696d763d18993b318f8a177e166c DBMix-0.9.8.ebuild 1395
-MD5 0f2f9008034660c6a0f944b5fac13c48 ChangeLog 232
+MD5 2864ba4a42858151ddef30699f7433c3 ChangeLog 404
+MD5 b18996dafaf4315885144a733c8b122f DBMix-0.9.8.ebuild 1676
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 cee242134f8c1f1c26d0d3dc01197a72 files/digest-DBMix-0.9.8 63
diff --git a/media-sound/SmarTagger/ChangeLog b/media-sound/SmarTagger/ChangeLog
index 468f3a903523..9ff3d301487e 100644
--- a/media-sound/SmarTagger/ChangeLog
+++ b/media-sound/SmarTagger/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for media-sound/SmarTagger
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/SmarTagger/ChangeLog,v 1.1 2004/08/27 03:44:46 chriswhite Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/SmarTagger/ChangeLog,v 1.1.1.1 2005/11/30 09:38:11 chriswhite Exp $
+
+  10 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> SmarTagger-0.1.ebuild:
+  Don't install INSTALL file.
+
+  11 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  SmarTagger-0.1.ebuild:
+  Stable amd64, sparc, x86.
+
+  18 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  SmarTagger-0.1.ebuild:
+  Ebuild cleanup.  Added to ~amd64 and ~sparc.
+
+  02 Sep 2004; David Holm <dholm@gentoo.org> SmarTagger-0.1.ebuild:
+  Added to ~ppc.
 
 *SmarTagger-0.1 (27 Aug 2004)
 
diff --git a/media-sound/SmarTagger/Manifest b/media-sound/SmarTagger/Manifest
index 81a9886e2644..b6276f266458 100644
--- a/media-sound/SmarTagger/Manifest
+++ b/media-sound/SmarTagger/Manifest
@@ -1,2 +1,14 @@
-MD5 e3f803438603f0aaf83dec2f8af3c842 SmarTagger-0.1.ebuild 667
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 76ba5e1dc709c81045c2fca6ee63df88 ChangeLog 895
+MD5 0cea0eed0eb0095ca4dc07c7a0cf3747 SmarTagger-0.1.ebuild 687
+MD5 4e5a50f7aee667b932576ab7fdcfc85f metadata.xml 219
 MD5 63c44af40da2528472d68da85257c9b7 files/digest-SmarTagger-0.1 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDIwEhj5H05b2HAEkRAtl7AJsHKM/i9Ez1QstZAc4dqC32pZGhpQCfZktt
+/8xx0sXZUmK1ujmX4mt9TV4=
+=gMvb
+-----END PGP SIGNATURE-----
diff --git a/media-sound/SmarTagger/SmarTagger-0.1.ebuild b/media-sound/SmarTagger/SmarTagger-0.1.ebuild
index d7f3afb1afba..cd0a0177d634 100644
--- a/media-sound/SmarTagger/SmarTagger-0.1.ebuild
+++ b/media-sound/SmarTagger/SmarTagger-0.1.ebuild
@@ -1,34 +1,27 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/SmarTagger/SmarTagger-0.1.ebuild,v 1.1 2004/08/27 03:44:46 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/SmarTagger/SmarTagger-0.1.ebuild,v 1.1.1.1 2005/11/30 09:38:11 chriswhite Exp $
+
+IUSE=""
 
 DESCRIPTION="Perl script for renaming and tagging mp3s"
 HOMEPAGE="http://freshmeat.net/projects/smartagger/"
 SRC_URI="http://freshmeat.net/redir/smartagger/9680/url_tgz/${P}.tar.gz"
 
-IUSE=""
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 
-DEPEND="dev-lang/perl
-	dev-perl/MP3-Info"
+DEPEND=""
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	mv changelog ChangeLog
-	mv album.id3 Example.id3
-}
+RDEPEND="dev-lang/perl
+	dev-perl/MP3-Info"
 
 src_install() {
-	dodir /usr/bin/
-
-	exeinto /usr/bin
-	doexe SmarTagger
+	dobin SmarTagger
+	dosym SmarTagger /usr/bin/smartagger
 
-	dosym /usr/bin/SmarTagger /usr/bin/smartagger
-
-	dodoc ChangeLog INSTALL README TODO Example.id3
+	dodoc README TODO
+	newdoc changelog ChangeLog
+	newdoc album.id3 Example.id3
 }
-
diff --git a/media-sound/abcde/ChangeLog b/media-sound/abcde/ChangeLog
index b4942aeee950..dc0071426895 100644
--- a/media-sound/abcde/ChangeLog
+++ b/media-sound/abcde/ChangeLog
@@ -1,6 +1,92 @@
 # ChangeLog for media-sound/abcde
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/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/media-sound/abcde/ChangeLog,v 1.1.1.1 2005/11/30 09:37:51 chriswhite Exp $
+
+*abcde-2.3.0 (27 Aug 2005)
+
+  27 Aug 2005; <rphillips@gentoo.org> +abcde-2.3.0.ebuild:
+  Version bump.  Also changed the ebuild from patched to use SED.
+
+  05 May 2005; Sven Wegener <swegener@gentoo.org> abcde-2.1.9.ebuild,
+  abcde-2.1.15.ebuild, abcde-2.1.19.ebuild, abcde-2.2.0.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  18 Apr 2005; Yuta SATOH <nigoro@gentoo.org> abcde-2.2.0.ebuild:
+  added ~ppc64
+
+  08 Apr 2005; Luca Barbato <lu_zero@gentoo.org> abcde-2.1.19.ebuild,
+  abcde-2.2.0.ebuild:
+  Updated ~ and stable for ppc
+
+*abcde-2.2.0 (12 Mar 2005)
+
+  12 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/abcde-2.2.0-gentoo.diff, +abcde-2.2.0.ebuild:
+  new upstream version, fixes #71978
+
+  19 Aug 2004; David Holm <dholm@gentoo.org> abcde-2.1.19.ebuild:
+  Added to ~ppc.
+
+  21 Apr 2004; Gustavo Zacarias <gustavoz@gentoo.org> abcde-2.1.19.ebuild:
+  keyworded sparc, closes #48098, thanks to Raphael Assenat
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> abcde-2.0.3.ebuild,
+  abcde-2.1.15.ebuild, abcde-2.1.19.ebuild, abcde-2.1.9.ebuild:
+  Added IUSE.
+
+*abcde-2.1.19 (18 Apr 2004)
+
+  18 Apr 2004; Ryan Phillips <rphillips@gentoo.org> abcde-2.1.19.ebuild:
+  Version bump. 
+
+*abcde-2.1.15 (22 Mar 2004)
+
+  22 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> abcde-2.1.15.ebuild,
+  abcde-2.1.4.ebuild, abcde-2.1.6.ebuild, abcde-2.1.9.ebuild,
+  files/abcde-1.9.9-r1-gentoo.diff, files/abcde-2.1.4-gentoo.diff,
+  files/abcde-2.1.6-gentoo.diff:
+  Version bump... bump to stable x86... removing old ebuilds... Closes bug
+  #45345.
+
+*abcde-2.1.9 (01 Dec 2003)
+
+  01 Dec 2003; <rphillips@gentoo.org> abcde-2.1.9.ebuild,
+  files/abcde-2.1.9-gentoo.diff:
+  Added Johnathan Spectre's 2.1.9 ebuild with patch
+
+*abcde-2.1.6 (06 Oct 2003)
+
+  06 Oct 2003; Ryan Phillips <rphillips@gentoo.org> abcde-2.1.6.ebuild :
+  version bump
+
+*abcde-2.1.4 (21 Jun 2003)
+
+  21 Jun 2003; jje <jje@gentoo.org> abcde-2.1.4.ebuild,
+  files/abcde-2.1.4-gentoo.diff:
+  Version bump.
+  
+  Submitted by: Slaterson <ruppie30@yahoo.com>
+
+  18 Jan 2003; Bryon Roche <kain@kain.org> abcde-2.0.3.ebuild :
+
+  Added ppc to KEYWORDS.  This has been working for me forever and there's been
+  another success report.
+  
+  28 Jun 2002; Ryan Phillips <rphillips@gentoo.org> files/abcde-2.0.3-gentoo.diff :
+
+  Slight bug in the diff file... Changed line 7.
+  
+  19 Jun 2002; William McArthur <sandymac@gentoo.org> abcde-2.0.3.ebuild :
+
+  Added media-sound/id3v2 to DEPEND, did not bump revision as this is too
+  small of a reason to force a recompile for existing users that are probably
+  already working.
+
+*abcde-2.0.3 (26 May 2002)
+
+  26 May 2002; Ryan Phillips <rphillips@gentoo.org> ChangeLog :
+
+  Updated version, and updated patch file
 
 *abcde-1.9.9 (1 Feb 2002)
 
diff --git a/media-sound/abcde/Manifest b/media-sound/abcde/Manifest
index e69de29bb2d1..49cf59c6eeae 100644
--- a/media-sound/abcde/Manifest
+++ b/media-sound/abcde/Manifest
@@ -0,0 +1,17 @@
+MD5 e606b0cd0acedd037d32a8bd00cd1440 abcde-2.1.15.ebuild 900
+MD5 394920e3c0836e449d4860f5f4a16f34 abcde-2.2.0.ebuild 891
+MD5 4fee19ab9a559c468bcc493473e1eef6 abcde-2.1.9.ebuild 874
+MD5 32fed8b7b46f1b2de38393312aa3e494 abcde-2.3.0.ebuild 925
+MD5 677b1056299a186812b7acfd0baf7ee0 abcde-2.1.19.ebuild 908
+MD5 b4da78b40cef88c194c917809b002341 abcde-2.0.3.ebuild 820
+MD5 4365cee9d758012a2975e4c324b9994a ChangeLog 3412
+MD5 059733ad92a101895ce18a1120b6eb55 metadata.xml 225
+MD5 a2f0e2962b108c01df109e8123f0a290 files/abcde-2.0.3-gentoo.diff 1125
+MD5 f2594cb41ae11004b7fb8d6e010b605b files/digest-abcde-2.1.15 68
+MD5 ad04d9d2662fcef3056d210c3e5f8cda files/digest-abcde-2.1.19 68
+MD5 7b2ef4f38711230f745cbba49d892035 files/abcde-2.2.0-gentoo.diff 827
+MD5 60d60afd57309ef7488531c447e6b2ae files/digest-abcde-2.0.3 67
+MD5 25b33b09dc6ed31413a1082a5350e872 files/digest-abcde-2.1.9 67
+MD5 ce58af2601ccb50843238b885aed5a2f files/digest-abcde-2.2.0 67
+MD5 6b6eff66c2b6bc9beabcadaa4dbba0cc files/digest-abcde-2.3.0 67
+MD5 2694d89dcc4dbec5b5c26687f260c483 files/abcde-2.1.9-gentoo.diff 903
diff --git a/media-sound/abcde/abcde-2.0.3.ebuild b/media-sound/abcde/abcde-2.0.3.ebuild
index 6d1661af89a1..c0941b971af9 100644
--- a/media-sound/abcde/abcde-2.0.3.ebuild
+++ b/media-sound/abcde/abcde-2.0.3.ebuild
@@ -1,29 +1,32 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# Author Peter Gavin <pbg1854@garnet.acns.fsu.edu>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.0.3.ebuild,v 1.1 2002/05/27 02:49:31 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.0.3.ebuild,v 1.1.1.1 2005/11/30 09:37:51 chriswhite Exp $
+
+IUSE=""
 
-S=${WORKDIR}/${P}
 DESCRIPTION="a better cd encoder"
-SRC_URI="http://lly.org/~rcw/abcde/${PN}_${PV}.orig.tar.gz"
-HOMEPAGE="http://lly.org/~rcw/abcde/page/"
+SRC_URI="http://www.hispalinux.es/~data/files/${PN}_${PV}.orig.tar.gz"
+HOMEPAGE="http://www.hispalinux.es/~data/abcde.php"
+
 SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc"
+
 DEPEND=">=media-sound/id3-0.12
-        >=media-sound/cd-discid-0.6
-        >=media-sound/cdparanoia-3.9.7
-	>=media-sound/vorbis-tools-1.0_rc3"
+	>=media-sound/cd-discid-0.6
+	>=media-sound/cdparanoia-3.9.7
+	>=media-sound/vorbis-tools-1.0_rc3
+	media-sound/id3v2"
 
 src_unpack() {
-    unpack ${PN}_${PV}.orig.tar.gz
-    cd ${S}
-    cp Makefile Makefile.orig
-    patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
+	unpack ${PN}_${PV}.orig.tar.gz
+	cd ${S}
+	cp Makefile Makefile.orig
+	patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
 }
 
-src_install () {
-    cd ${S}
-    dodir /etc/abcde
-    make DESTDIR=${D} install || die
-    dodoc COPYING README TODO changelog
+src_install() {
+	dodir /etc/abcde
+	make DESTDIR=${D} install || die
+	dodoc COPYING README TODO changelog
 }
-
diff --git a/media-sound/abcde/abcde-2.1.15.ebuild b/media-sound/abcde/abcde-2.1.15.ebuild
index 393eb30beb93..978a6e5a47fe 100644
--- a/media-sound/abcde/abcde-2.1.15.ebuild
+++ b/media-sound/abcde/abcde-2.1.15.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/media-sound/abcde/abcde-2.1.15.ebuild,v 1.1 2004/03/22 16:57:40 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.1.15.ebuild,v 1.1.1.1 2005/11/30 09:37:51 chriswhite Exp $
+
+IUSE=""
 
 DESCRIPTION="a better cd encoder"
 SRC_URI="http://www.hispalinux.es/~data/files/${PN}_${PV}.orig.tar.gz"
@@ -15,7 +17,7 @@ RDEPEND=">=media-sound/id3-0.12
 	>=media-sound/cdparanoia-3.9.7
 	>=media-sound/vorbis-tools-1.0_rc3
 	media-sound/id3v2
-	>=media-libs/flac-1*
+	>=media-libs/flac-1
 	>=media-sound/normalize-0.7.4"
 
 DEPEND="${RDEPEND}
diff --git a/media-sound/abcde/abcde-2.1.19.ebuild b/media-sound/abcde/abcde-2.1.19.ebuild
index baea74c64f69..f8479b14a120 100644
--- a/media-sound/abcde/abcde-2.1.19.ebuild
+++ b/media-sound/abcde/abcde-2.1.19.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/media-sound/abcde/abcde-2.1.19.ebuild,v 1.1 2004/04/18 19:19:24 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.1.19.ebuild,v 1.1.1.1 2005/11/30 09:37:51 chriswhite Exp $
+
+IUSE=""
 
 DESCRIPTION="a better cd encoder"
 SRC_URI="http://www.hispalinux.es/~data/files/${PN}_${PV}.orig.tar.gz"
@@ -8,14 +10,14 @@ HOMEPAGE="http://www.hispalinux.es/~data/abcde.php"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 amd64"
+KEYWORDS="x86 amd64 sparc ppc"
 
 RDEPEND=">=media-sound/id3-0.12
 	>=media-sound/cd-discid-0.6
 	>=media-sound/cdparanoia-3.9.7
 	>=media-sound/vorbis-tools-1.0_rc3
 	media-sound/id3v2
-	>=media-libs/flac-1*
+	>=media-libs/flac-1
 	>=media-sound/normalize-0.7.4"
 
 DEPEND="${RDEPEND}
diff --git a/media-sound/abcde/abcde-2.1.9.ebuild b/media-sound/abcde/abcde-2.1.9.ebuild
index 8141e1ef09d1..8c1e6e8500dc 100644
--- a/media-sound/abcde/abcde-2.1.9.ebuild
+++ b/media-sound/abcde/abcde-2.1.9.ebuild
@@ -1,21 +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/media-sound/abcde/abcde-2.1.9.ebuild,v 1.1 2003/12/01 19:38:41 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.1.9.ebuild,v 1.1.1.1 2005/11/30 09:37:51 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="a better cd encoder"
-SRC_URI="http://www.hispalinux.es/~data/files/${PN}_${PV}.orig.tar.gz"
 HOMEPAGE="http://www.hispalinux.es/~data/abcde.php"
+SRC_URI="http://www.hispalinux.es/~data/files/${PN}_${PV}.orig.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+SLOT="0"
+KEYWORDS="x86 amd64"
+IUSE=""
 
 DEPEND=">=media-sound/id3-0.12
 	>=media-sound/cd-discid-0.6
 	>=media-sound/cdparanoia-3.9.7
 	>=media-sound/vorbis-tools-1.0_rc3
 	media-sound/id3v2
-	>=media-libs/flac-1*
+	>=media-libs/flac-1
 	>=media-sound/normalize-0.7.4"
 
 src_unpack() {
@@ -28,5 +31,5 @@ src_unpack() {
 src_install() {
 	dodir /etc/abcde
 	make DESTDIR=${D} install || die
-	dodoc COPYING README TODO changelog
+	dodoc README TODO changelog
 }
diff --git a/media-sound/abcde/abcde-2.2.0.ebuild b/media-sound/abcde/abcde-2.2.0.ebuild
index 3a6c7ff7d1f8..5c7a9b7fdd8d 100644
--- a/media-sound/abcde/abcde-2.2.0.ebuild
+++ b/media-sound/abcde/abcde-2.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/media-sound/abcde/abcde-2.2.0.ebuild,v 1.1 2005/03/12 16:08:25 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.2.0.ebuild,v 1.1.1.1 2005/11/30 09:37:51 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.hispalinux.es/~data/files/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86 ~amd64 ~ppc ~ppc64"
 IUSE=""
 
 DEPEND=">=media-sound/id3-0.12
@@ -18,7 +18,7 @@ DEPEND=">=media-sound/id3-0.12
 	>=media-sound/cdparanoia-3.9.7
 	>=media-sound/vorbis-tools-1.0_rc3
 	media-sound/id3v2
-	>=media-libs/flac-1*
+	>=media-libs/flac-1
 	>=media-sound/normalize-0.7.4"
 
 src_unpack() {
diff --git a/media-sound/abcde/abcde-2.3.0.ebuild b/media-sound/abcde/abcde-2.3.0.ebuild
index 67a1d04f5584..9eb664165c0c 100644
--- a/media-sound/abcde/abcde-2.3.0.ebuild
+++ b/media-sound/abcde/abcde-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/media-sound/abcde/abcde-2.3.0.ebuild,v 1.1 2005/08/27 20:35:31 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.3.0.ebuild,v 1.1.1.1 2005/11/30 09:37:51 chriswhite Exp $
 
 inherit eutils
 
diff --git a/media-sound/abcde/files/abcde-2.0.3-gentoo.diff b/media-sound/abcde/files/abcde-2.0.3-gentoo.diff
index 73d1568e3505..cff0ed4f4f92 100644
--- a/media-sound/abcde/files/abcde-2.0.3-gentoo.diff
+++ b/media-sound/abcde/files/abcde-2.0.3-gentoo.diff
@@ -4,7 +4,7 @@
  	ALBUMFILE=$(mungefilename "$DALBUM")
  	ARTISTFILE=$(mungefilename "$TRACKARTIST")
  	TRACKFILE=$(mungefilename "$TRACKNAME")
-++	TRACKNUM=$(printf %0.${TRACKNUMPADDING}d ${UTRACKNUM})
++	TRACKNUM=$(printf %0.${TRACKNUMPADDING}d ${UTRACKNUM})
  	# Supported variables for OUTPUTFORMAT are ALBUMFILE, ARTISTFILE, TRACKFILE, and TRACKNUM.
  	if [ "$VARIOUSARTISTS" = "y" ]; then
  		OUTPUTFILE=$(eval echo $VAOUTPUTFORMAT)
@@ -24,7 +24,7 @@
 @@ -1,12 +1,12 @@
  VERSION = 2.0.3
 -INSTALL = /usr/bin/install -c
-+INSTALL = /bin/install -c
++INSTALL = /usr/bin/install -c
  
  # Installation directories
  prefix = ${DESTDIR}/usr
diff --git a/media-sound/abcde/files/abcde-2.1.9-gentoo.diff b/media-sound/abcde/files/abcde-2.1.9-gentoo.diff
index 586ba35940f5..a2450ac2410e 100644
--- a/media-sound/abcde/files/abcde-2.1.9-gentoo.diff
+++ b/media-sound/abcde/files/abcde-2.1.9-gentoo.diff
@@ -4,7 +4,7 @@ diff -u -r abcde-2.1.9/Makefile abcde-2.1.9.new/Makefile
 @@ -1,12 +1,12 @@
  VERSION = 2.1.9
 -INSTALL = /usr/bin/install -c
-+INSTALL =/bin/install -c
++INSTALL = /usr/bin/install -c
  
  # Installation directories
  prefix = ${DESTDIR}/usr
diff --git a/media-sound/abcm2ps/ChangeLog b/media-sound/abcm2ps/ChangeLog
index 8c032b0ed9f0..f361e367ce6f 100644
--- a/media-sound/abcm2ps/ChangeLog
+++ b/media-sound/abcm2ps/ChangeLog
@@ -1,6 +1,33 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcm2ps/ChangeLog,v 1.1 2002/11/16 06:57:22 satai Exp $
+# ChangeLog for media-sound/abcm2ps
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcm2ps/ChangeLog,v 1.1.1.1 2005/11/30 09:38:45 chriswhite Exp $
+
+  10 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> abcm2ps-3.7.21.ebuild:
+  Don't install INSTALL file.
+
+  17 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> abcm2ps-3.7.21.ebuild:
+  Added to ~ppc.
+
+*abcm2ps-3.7.21 (18 Dec 2004)
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/abcm2ps-3.7.21-destdir.patch, -abcm2ps-2.11.3.ebuild,
+  +abcm2ps-3.7.21.ebuild, -abcm2ps-3.7.9.ebuild:
+  Version bump for security bug #74702.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> abcm2ps-3.7.9.ebuild:
+  Stable amd64, sparc.
+
+  04 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> abcm2ps-3.7.9.ebuild:
+  Added ~amd64 ~sparc.
+
+  26 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> abcm2ps-3.7.9.ebuild:
+  Cleaned up and put in stable x86.
+
+*abcm2ps-3.7.9 (28 Sep 2003)
+
+  28 Sep 2003; jje <jje@gentoo.org> abcm2ps-3.7.9.ebuild:
+  Version bump.
 
 *abcm2ps-2.11.3 (16 Nov 2002)
 
diff --git a/media-sound/abcm2ps/Manifest b/media-sound/abcm2ps/Manifest
index e69de29bb2d1..dab0c6016a00 100644
--- a/media-sound/abcm2ps/Manifest
+++ b/media-sound/abcm2ps/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3c35679def3ccd395a5e4d3815c4e670 ChangeLog 1245
+MD5 b6ddd4bc5a0c345cc8bfc6649c996f33 abcm2ps-3.7.21.ebuild 646
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 e87cb37ec163051062c84d1e8b22abed files/digest-abcm2ps-3.7.21 66
+MD5 e6fc956d54d9ca52bc305031ffe395b4 files/abcm2ps-3.7.21-destdir.patch 562
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDIwFHj5H05b2HAEkRAkKNAKCTg34B0Rs/ZMP2I7kZNLYLkOEPYACfVO8A
+r5uxgk0PEWi72koXEK7T+FA=
+=XewT
+-----END PGP SIGNATURE-----
diff --git a/media-sound/abcm2ps/abcm2ps-3.7.21.ebuild b/media-sound/abcm2ps/abcm2ps-3.7.21.ebuild
index 569c180db881..5f54de639db8 100644
--- a/media-sound/abcm2ps/abcm2ps-3.7.21.ebuild
+++ b/media-sound/abcm2ps/abcm2ps-3.7.21.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/media-sound/abcm2ps/abcm2ps-3.7.21.ebuild,v 1.1 2004/12/19 01:32:59 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcm2ps/abcm2ps-3.7.21.ebuild,v 1.1.1.1 2005/11/30 09:38:45 chriswhite Exp $
 
 IUSE=""
 
@@ -12,7 +12,7 @@ SRC_URI="http://moinejf.free.fr/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 sparc x86"
+KEYWORDS="amd64 sparc x86 ~ppc"
 
 DEPEND=""
 
@@ -24,5 +24,5 @@ src_unpack() {
 
 src_install() {
 	make DESTDIR="${D}" install || die
-	dodoc README abc-draft.txt Changes INSTALL
+	dodoc README abc-draft.txt Changes
 }
diff --git a/media-sound/acast/ChangeLog b/media-sound/acast/ChangeLog
index 7462cdfa0b1d..7dc850a79183 100644
--- a/media-sound/acast/ChangeLog
+++ b/media-sound/acast/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/acast
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/acast/ChangeLog,v 1.1 2005/03/16 20:06:40 zaheerm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/acast/ChangeLog,v 1.1.1.1 2005/11/30 09:37:57 chriswhite Exp $
+
+  19 Apr 2005; <zaheerm@gentoo.org> acast-0.18.ebuild:
+  Removed deprecated use flag oggvorbis
 
 *acast-0.18 (16 Mar 2005)
 
diff --git a/media-sound/acast/Manifest b/media-sound/acast/Manifest
index 21444db747b5..47cc0ce18d0e 100644
--- a/media-sound/acast/Manifest
+++ b/media-sound/acast/Manifest
@@ -1,2 +1,4 @@
-MD5 53c0a04c30569dedb6751de7e847f1b8 acast-0.18.ebuild 1009
+MD5 949dee1f30842575f1c3b19f01d86b5a acast-0.18.ebuild 1112
+MD5 04315efbab63b5ea380ed86aa98390fa ChangeLog 449
+MD5 6050196ef420c3e4025029ebee5a813f metadata.xml 162
 MD5 5cdad6b314ca3108841cf00d8921f488 files/digest-acast-0.18 63
diff --git a/media-sound/acast/acast-0.18.ebuild b/media-sound/acast/acast-0.18.ebuild
index 6de550bd0f31..dbf7360abfbf 100644
--- a/media-sound/acast/acast-0.18.ebuild
+++ b/media-sound/acast/acast-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/media-sound/acast/acast-0.18.ebuild,v 1.1 2005/03/16 20:06:40 zaheerm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/acast/acast-0.18.ebuild,v 1.1.1.1 2005/11/30 09:37:57 chriswhite Exp $
 inherit gnome2
 
 DESCRIPTION="Webcasting app for GNOME"
@@ -9,7 +9,7 @@ SRC_URI="http://live.hujjat.org/acast/${P}.tar.bz2"
 LICENSE="GPL-2"
 
 KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="oggvorbis encode gnome"
+IUSE="vorbis encode gnome"
 SLOT="0"
 
 RDEPEND=">=x11-libs/gtk+-2.4
@@ -19,8 +19,8 @@ RDEPEND=">=x11-libs/gtk+-2.4
 	>=media-libs/gst-plugins-0.8.8
 	>=media-plugins/gst-plugins-gnomevfs-0.8.8
 	>=media-plugins/gst-plugins-shout2-0.8.8
-	oggvorbis? ( >=media-plugins/gst-plugins-vorbis-0.8.8
-	             >=media-plugins/gst-plugins-ogg-0.8.8 )
+	vorbis? ( >=media-plugins/gst-plugins-vorbis-0.8.8
+			  >=media-plugins/gst-plugins-ogg-0.8.8 )
 	encode? ( >=media-plugins/gst-plugins-lame-0.8.8 )
 	gnome? ( >=gnome-base/libgnomeui-2.6.0
 	         >=gnome-extra/gnome-media-2.6.0 )"
diff --git a/media-sound/adplay/ChangeLog b/media-sound/adplay/ChangeLog
index 6f6d896e7f2d..4f0270c9b963 100644
--- a/media-sound/adplay/ChangeLog
+++ b/media-sound/adplay/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for media-sound/adplay
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/adplay/ChangeLog,v 1.1 2004/07/20 14:15:42 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/adplay/ChangeLog,v 1.1.1.1 2005/11/30 09:38:21 chriswhite Exp $
+
+  11 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> adplay-1.4.ebuild:
+  Stable amd64, sparc, x86.
+
+*adplay-1.4 (01 Oct 2004)
+
+  01 Oct 2004; Michal Januszewski <spock@gentoo.org> +adplay-1.4.ebuild:
+  Version bump.
+
+  03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> adplay-1.3.ebuild:
+  Added ~amd64 and ~sparc
+
+  21 Jul 2004; David Holm <dholm@gentoo.org> adplay-1.3.ebuild:
+  Added to ~ppc.
 
 *adplay-1.3 (20 Jul 2004)
 
diff --git a/media-sound/adplay/Manifest b/media-sound/adplay/Manifest
index fea1428b7251..1cd06e148926 100644
--- a/media-sound/adplay/Manifest
+++ b/media-sound/adplay/Manifest
@@ -1,2 +1,16 @@
-MD5 41abc323990e05174c6d8ae031d8b7b5 adplay-1.3.ebuild 466
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 97b71894a9471f510bcd1a7bf4d4b520 ChangeLog 756
+MD5 1ff0163501210a2517291b1a4bb2a003 adplay-1.3.ebuild 777
+MD5 71b09a1721c4dd0557be0abe8dd46315 metadata.xml 219
+MD5 dff70996418557861f82ef7832f13893 adplay-1.4.ebuild 779
 MD5 a37117ac2a2cf7dcde5ec34efe68e121 files/digest-adplay-1.3 63
+MD5 fe853638700b2be12a84c6d2f804bae8 files/digest-adplay-1.4 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBkzqVArHZZzCEUG0RAoLVAJ9TKByJgIr0PSi2m9WcqsX3pnH1hgCcCmT7
+dLxH6tNg1MuGBhAs/6mj88o=
+=HmvD
+-----END PGP SIGNATURE-----
diff --git a/media-sound/adplay/adplay-1.3.ebuild b/media-sound/adplay/adplay-1.3.ebuild
index 5bc7157389dc..bf5dbb1c22d0 100644
--- a/media-sound/adplay/adplay-1.3.ebuild
+++ b/media-sound/adplay/adplay-1.3.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/media-sound/adplay/adplay-1.3.ebuild,v 1.1 2004/07/20 14:15:42 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/adplay/adplay-1.3.ebuild,v 1.1.1.1 2005/11/30 09:38:21 chriswhite Exp $
 
 DESCRIPTION="A console player for AdLib music"
 HOMEPAGE="http://adplug.sourceforge.net/"
 SRC_URI="mirror://sourceforge/adplug/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
 IUSE="oss esd sdl"
 DEPEND=">=media-libs/adplug-1.4.1"
 
diff --git a/media-sound/adplay/adplay-1.4.ebuild b/media-sound/adplay/adplay-1.4.ebuild
index a5a92ae494b7..6166427458c9 100644
--- a/media-sound/adplay/adplay-1.4.ebuild
+++ b/media-sound/adplay/adplay-1.4.ebuild
@@ -1,14 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/adplay/adplay-1.4.ebuild,v 1.1 2004/10/01 16:52:05 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/adplay/adplay-1.4.ebuild,v 1.1.1.1 2005/11/30 09:38:21 chriswhite Exp $
+
+IUSE="oss esd sdl"
 
 DESCRIPTION="A console player for AdLib music"
 HOMEPAGE="http://adplug.sourceforge.net/"
 SRC_URI="mirror://sourceforge/adplug/${P}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
-IUSE="oss esd sdl"
+KEYWORDS="amd64 ~ppc sparc x86"
+
 DEPEND=">=media-libs/adplug-1.4.1"
 
 src_compile() {
@@ -23,5 +26,5 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 }
diff --git a/media-sound/albumart/ChangeLog b/media-sound/albumart/ChangeLog
index dba9f3038bfb..13704c42caab 100644
--- a/media-sound/albumart/ChangeLog
+++ b/media-sound/albumart/ChangeLog
@@ -1,6 +1,57 @@
 # ChangeLog for media-sound/albumart
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/albumart/ChangeLog,v 1.1 2004/07/14 23:13:40 squinky86 Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/albumart/ChangeLog,v 1.1.1.1 2005/11/30 09:38:19 chriswhite Exp $
+
+  16 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  albumart-1.5.0-r1.ebuild:
+  Add qt3 to inherit so that the ${QTDIR}/etc/settings directory can be
+  written. Closes bug #105220.
+
+*albumart-1.5.0-r1 (05 Jun 2005)
+
+  05 Jun 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -albumart-1.5.0.ebuild, +albumart-1.5.0-r1.ebuild:
+  Fixed bug where .ui files didn't get compiled on some systems.
+
+  27 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> :
+  fixed #90378
+
+*albumart-1.5.0 (18 Apr 2005)
+
+  18 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> +albumart-1.5.0.ebuild:
+  new upstream version, fixes #86548
+
+*albumart-1.4.0-r1 (22 Feb 2005)
+
+  22 Feb 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/albumart-1.4.0-sizetype.patch, +albumart-1.4.0-r1.ebuild:
+  Pyqt 3.14 compatibility patch
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*albumart-1.4.0 (28 Nov 2004)
+
+  28 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +albumart-1.4.0.ebuild:
+  Version bump closes bug #70588.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  albumart-1.3.1.ebuild:
+  Stable amd64, sparc.
+
+  16 Aug 2004; Jon Hood <squinky86@gentoo.org> albumart-1.3.1.ebuild:
+  Stable on x86.
+
+  20 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> albumart-1.3.1.ebuild:
+  dev-python/Imaging is now dev-python/imaging - adjust dependencies accordingly.
+
+  20 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  albumart-1.3.1.ebuild:
+  Added to ~amd64 and ~sparc.
+
+  16 Jul 2004; David Holm <dholm@gentoo.org> albumart-1.3.1.ebuild:
+  Added to ~ppc.
 
 *albumart-1.3.1 (14 Jul 2004)
 
diff --git a/media-sound/albumart/Manifest b/media-sound/albumart/Manifest
index a27321652c10..98fdfe36e9f7 100644
--- a/media-sound/albumart/Manifest
+++ b/media-sound/albumart/Manifest
@@ -1,2 +1,21 @@
-MD5 f0172bd85dda3cf17cfab4e7273104a8 albumart-1.3.1.ebuild 541
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ca460604f6a23da9a437baf1889e6074 ChangeLog 2041
+MD5 719889acda81cad0f8e3b8ff0bb02f67 albumart-1.3.1.ebuild 646
+MD5 81ffa637be1ea29587b616df576bdb96 albumart-1.4.0-r1.ebuild 749
+MD5 ff7909256f78dca2b360980a0591aed3 albumart-1.4.0.ebuild 650
+MD5 4173f332923a0d78f8a6a43713a7e71d albumart-1.5.0-r1.ebuild 716
+MD5 74c859f013ca46568a1fdc14b522711c files/albumart-1.4.0-sizetype.patch 1387
 MD5 fdc51f934be51b668279394b8c8f5e68 files/digest-albumart-1.3.1 66
+MD5 5984f5790131a2a32ea91c49b641e40d files/digest-albumart-1.4.0 66
+MD5 5984f5790131a2a32ea91c49b641e40d files/digest-albumart-1.4.0-r1 66
+MD5 bc5e55e5e1a644b233607ed1f775686d files/digest-albumart-1.5.0-r1 66
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDUrGvj5H05b2HAEkRAsizAJ9V2kPt7jsv7WGLqcD+QDES+AosPACeP0jy
+SFPk7WUG0rUUbHcL4Jxw4f0=
+=ONz6
+-----END PGP SIGNATURE-----
diff --git a/media-sound/albumart/albumart-1.3.1.ebuild b/media-sound/albumart/albumart-1.3.1.ebuild
index 72b306200c0d..24ace58187c5 100644
--- a/media-sound/albumart/albumart-1.3.1.ebuild
+++ b/media-sound/albumart/albumart-1.3.1.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/media-sound/albumart/albumart-1.3.1.ebuild,v 1.1 2004/07/14 23:13:40 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/albumart/albumart-1.3.1.ebuild,v 1.1.1.1 2005/11/30 09:38:19 chriswhite Exp $
 
 DESCRIPTION="Album Cover Art Downloader"
 SRC_URI="http://kempele.fi/~skyostil/projects/albumart/dist/${P}.tar.gz"
 HOMEPAGE="http://kempele.fi/~skyostil/projects/albumart/"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc amd64 sparc"
 IUSE=""
 SLOT="0"
 
 DEPEND=">=dev-python/PyQt-3.0
-	>=dev-python/Imaging-1.0.0"
+	>=dev-python/imaging-1.0.0"
 
 src_compile() {
 	einfo "nothing to compile"
diff --git a/media-sound/albumart/albumart-1.4.0-r1.ebuild b/media-sound/albumart/albumart-1.4.0-r1.ebuild
index 7e76c53cc26a..5c0b8aacd657 100644
--- a/media-sound/albumart/albumart-1.4.0-r1.ebuild
+++ b/media-sound/albumart/albumart-1.4.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/media-sound/albumart/albumart-1.4.0-r1.ebuild,v 1.1 2005/02/22 21:01:30 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/albumart/albumart-1.4.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:19 chriswhite Exp $
 
 inherit eutils
 
diff --git a/media-sound/albumart/albumart-1.4.0.ebuild b/media-sound/albumart/albumart-1.4.0.ebuild
index c601641cbd9b..b3d57b108e56 100644
--- a/media-sound/albumart/albumart-1.4.0.ebuild
+++ b/media-sound/albumart/albumart-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/media-sound/albumart/albumart-1.4.0.ebuild,v 1.1 2004/11/28 22:53:36 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/albumart/albumart-1.4.0.ebuild,v 1.1.1.1 2005/11/30 09:38:19 chriswhite Exp $
 
 IUSE=""
 
diff --git a/media-sound/albumart/albumart-1.5.0-r1.ebuild b/media-sound/albumart/albumart-1.5.0-r1.ebuild
index 72b4f4a509ee..58b30f27bce5 100644
--- a/media-sound/albumart/albumart-1.5.0-r1.ebuild
+++ b/media-sound/albumart/albumart-1.5.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/media-sound/albumart/albumart-1.5.0-r1.ebuild,v 1.1 2005/06/05 21:29:19 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/albumart/albumart-1.5.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:19 chriswhite Exp $
 
-inherit eutils
+inherit eutils qt3
 
 DESCRIPTION="Album Cover Art Downloader"
 SRC_URI="http://kempele.fi/~skyostil/projects/albumart/dist/${P}.tar.gz"
diff --git a/media-sound/albumart/metadata.xml b/media-sound/albumart/metadata.xml
index b401bb87f474..e1774e3d9ad7 100644
--- a/media-sound/albumart/metadata.xml
+++ b/media-sound/albumart/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sound</herd>
-<maintainer>
- <email>squinky86@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index 08e2d8c0dd54..7c3b3749ad65 100644
--- a/media-sound/alsa-driver/ChangeLog
+++ b/media-sound/alsa-driver/ChangeLog
@@ -1,6 +1,864 @@
 # ChangeLog for media-sound/alsa-driver
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/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/media-sound/alsa-driver/ChangeLog,v 1.1.1.1 2005/11/30 09:38:34 chriswhite Exp $
+
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org> alsa-driver-1.0.10.ebuild:
+  Stable on ppc64; bug #111968
+
+  18 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  alsa-driver-1.0.10.ebuild:
+  Remove the ppcunbreak patch, it gets patched by the buildsystem by itself.
+
+*alsa-driver-1.0.10 (16 Nov 2005)
+
+  16 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +alsa-driver-1.0.10.ebuild:
+  Bump to latest upstream version.
+
+  15 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  alsa-driver-1.0.10_rc3.ebuild:
+  Stable on x86 wrt bug #112442.
+
+  15 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  alsa-driver-1.0.10_rc3.ebuild:
+  Don't try to check for PNP support on PowerPC systems.
+
+  15 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/alsa-driver-1.0.10_rc3-ppc-unbreakage.patch,
+  alsa-driver-1.0.10_rc2.ebuild, alsa-driver-1.0.10_rc3.ebuild:
+  Workaround the moved headers in PPC's 2.6.14 kernel. Apply patch to rc3 to
+  reverse a change that's in no official kernel yet and was breaking PPC.
+
+  14 Nov 2005; Luca Barbato <lu_zero@gentoo.org>
+  alsa-driver-1.0.10_rc3.ebuild:
+  Marked ppc to match linux 2.6.14
+
+  12 Nov 2005; <soulse@gentoo.org> alsa-driver-1.0.10_rc2.ebuild:
+  Stable on x86 wrt bug #111968.
+
+*alsa-driver-1.0.10_rc3 (08 Nov 2005)
+
+  08 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +alsa-driver-1.0.10_rc3.ebuild:
+  Bump to latest version.
+
+  07 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  alsa-driver-1.0.3.ebuild, alsa-driver-1.0.8.ebuild,
+  alsa-driver-1.0.9b.ebuild:
+  Don't install INSTALL and COPYING files.
+
+  02 Nov 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-1.0.10_rc2.ebuild:
+  Removing from ~sparc until I get a chance to fix the build system to be more
+  sane.
+
+  31 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  alsa-driver-1.0.10_rc2.ebuild:
+  Resolve collision-protect errors as per bug #93286.
+
+  30 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/alsa-driver-1.0.10_rc2-audigy2zs.patch,
+  alsa-driver-1.0.10_rc2.ebuild:
+  Added patch for Audigy 2 ZS soundcards as per bug #110699.
+
+  11 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  alsa-driver-1.0.10_rc2.ebuild:
+  Correctly renamed include patch. Also make sure that the HOSTCC/CC are
+  crosscompile safe.
+
+*alsa-driver-1.0.10_rc2 (11 Oct 2005)
+
+  11 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -alsa-driver-1.0.10_rc1.ebuild, +alsa-driver-1.0.10_rc2.ebuild:
+  Bumped to newer rc.
+
+  25 Aug 2005; Chris White <chriswhite@gentoo.org> alsa-driver-1.0.8.ebuild,
+  alsa-driver-1.0.9b.ebuild, alsa-driver-1.0.10_rc1.ebuild:
+  Converted to linux-info.eclass methods so as to stop warning message spam.
+  Only remove old kernel sound modules if they actually exist (prevents silly
+  directory not found warnings with find).
+
+  24 Aug 2005; Chris White <chriswhite@gentoo.org>
+  +files/alsa-driver-1.0.10_rc1-include.patch,
+  alsa-driver-1.0.10_rc1.ebuild:
+  Make this actually compile.  Added upstream patch from alsa bug 0001356.
+
+*alsa-driver-1.0.10_rc1 (25 Aug 2005)
+
+  25 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +alsa-driver-1.0.10_rc1.ebuild:
+  Added ebuild for alsa 1.0.10_rc1.
+
+  21 Jul 2005; Joseph Jezak <josejx@gentoo.org> alsa-driver-1.0.9b.ebuild:
+  Marked ppc stable.
+
+  20 Jul 2005; Markus Rothe <corsair@gentoo.org> alsa-driver-1.0.9b.ebuild:
+  Stable on ppc64
+
+  19 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  alsa-driver-1.0.9b.ebuild:
+  Stable on alpha.
+
+  19 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/alsa-driver-1.0.9b-sparc64-ioctl-detect.patch,
+  alsa-driver-1.0.9b.ebuild:
+  Back into ~sparc with the patch that I made for upstream bug #1267.
+
+  17 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-1.0.9b.ebuild:
+  Stable amd64, x86.
+
+  07 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -alsa-driver-1.0.9_rc3.ebuild, -alsa-driver-1.0.9a.ebuild,
+  alsa-driver-1.0.9b.ebuild:
+  1.0.9b -sparc.  Removing 1.0.9a.
+
+*alsa-driver-1.0.9b (13 Jun 2005)
+
+  13 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -alsa-driver-1.0.9.ebuild, +alsa-driver-1.0.9b.ebuild:
+  New upstream version, fixes #95976.
+
+  12 Jun 2005; Bryan Østergaard <kloeri@gentoo.org>
+  alsa-driver-1.0.8.ebuild:
+  Stable on alpha.
+
+*alsa-driver-1.0.9a (03 Jun 2005)
+
+  03 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +alsa-driver-1.0.9a.ebuild:
+  new upstream release, see #94831
+
+*alsa-driver-1.0.9 (27 May 2005)
+
+  27 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +alsa-driver-1.0.9.ebuild:
+  New upstream version released, see #94196.
+
+  05 May 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/alsa-driver-1.0.4-devfix.patch,
+  -files/alsa-driver-1.0.5-devfix.patch,
+  -files/alsa-driver-1.0.5a-cs46xx-passthrough.patch,
+  -files/alsa-driver-1.0.5a-xbox-ac97.patch,
+  -files/alsa-driver-1.0.6a-emu10k1-passthrough.patch,
+  -files/alsa-driver-1.0.6a-kbuild.patch,
+  -files/alsa-driver-1.0.7-audigy71.patch,
+  -files/alsa-driver-1.0.7-configure.patch,
+  -files/alsa-driver-1.0.7-ioctl32.patch-r2,
+  -files/alsa-driver-1.0.7-xbox.patch, -alsa-driver-1.0.7-r4.ebuild:
+  Removing old version and cleaning out unused patches.
+
+*alsa-driver-1.0.9_rc3 (05 May 2005)
+
+  05 May 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -alsa-driver-1.0.9_rc2.ebuild, +alsa-driver-1.0.9_rc3.ebuild:
+  Version bump.
+
+  12 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -alsa-driver-0.9.8.ebuild, alsa-driver-1.0.9_rc2.ebuild:
+  Killing off 0.9 alsa.
+
+  04 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -alsa-driver-1.0.5a.ebuild, -alsa-driver-1.0.6a.ebuild,
+  -alsa-driver-1.0.7-r3.ebuild, alsa-driver-1.0.7-r4.ebuild,
+  -alsa-driver-1.0.8_rc1.ebuild, alsa-driver-1.0.8.ebuild,
+  alsa-driver-1.0.9_rc2.ebuild:
+  Removing old versions and adding /dev/null redirect for rmdir messages.
+
+  03 Apr 2005; Chris Bainbridge <chrb@gentoo.org> +files/xbox-1.0.8.patch,
+  alsa-driver-1.0.8.ebuild:
+  Re-added xbox support (bug #80989)
+
+*alsa-driver-1.0.9_rc2 (31 Mar 2005)
+
+  31 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +alsa-driver-1.0.9_rc2.ebuild:
+  Version bump.
+
+  30 Mar 2005; Daniel Ostrow <dostrow@gentoo.org> alsa-driver-1.0.8.ebuild:
+  Stable on ppc64
+
+  20 Mar 2005; Lars Weiler <pylon@gentoo.org> alsa-driver-1.0.8.ebuild:
+  Readded ppc to a 1.x version.
+
+  08 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-1.0.8.ebuild:
+  Stable amd64, sparc, x86.
+
+  01 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-1.0.8.ebuild:
+  Don't install modules into the kernel subdir. This way, youu don't need to
+  re-emerge alsa-driver every time you do a make modules_install in your
+  kernel.
+
+  19 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/1.0.8-msi_audigyls.patch, alsa-driver-1.0.8.ebuild:
+  added patch which were contribution by Søren Dalby Larsen <sdl@larsen.dk>.
+  fixes #81666
+
+  28 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> alsa-driver-1.0.8.ebuild:
+  applied patch which Daniel Black <dragonheart@gentoo.org> provided, also see
+  bug #79812
+
+  24 Jan 2005; Chris Bainbridge <chrb@gentoo.org> alsa-driver-1.0.8.ebuild:
+  Removed xbox patch for 1.0.8 since its now in upstream sources.
+
+  23 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-1.0.8.ebuild:
+  Cleanup PNP logic.
+
+  23 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-1.0.8.ebuild:
+  Cleanup PNP logic.
+
+  18 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+  alsa-driver-1.0.6a.ebuild, alsa-driver-1.0.7-r3.ebuild,
+  alsa-driver-1.0.7-r4.ebuild, alsa-driver-1.0.8.ebuild,
+  alsa-driver-1.0.8_rc1.ebuild:
+  Changed unset ARCH to set_arch_to_kernel/set_arch_to_portage pair as per brix
+
+  18 Jan 2005; Daniel Black <dragonheart@gentoo.org> alsa-driver-0.9.8.ebuild,
+  alsa-driver-1.0.7-r4.ebuild, alsa-driver-1.0.8.ebuild:
+  QA - 0.9.8 - fixed bad depend on portage. 1.0.7-r4 and 1.0.8 - added check in
+  for CONFIG_PNP that 2 drivers depend on. Bug #53529 refers
+
+  17 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+  alsa-driver-1.0.7-r4.ebuild:
+  Disabled some ppc drivers due to compile problems as per bug #53529. Added
+  ~ppc keyword
+
+*alsa-driver-1.0.8 (14 Jan 2005)
+
+  14 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +alsa-driver-1.0.8.ebuild, -alsa-driver-1.0.8_rc2.ebuild:
+  Version bump.
+
+  11 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-1.0.8_rc1.ebuild:
+  Stable x86 as it's needed for 2.6.10 kernels (which is in stable x86).
+
+*alsa-driver-1.0.8_rc2 (11 Jan 2005)
+
+  11 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-1.0.7-r3.ebuild, alsa-driver-1.0.7-r4.ebuild,
+  alsa-driver-1.0.8_rc1.ebuild, +alsa-driver-1.0.8_rc2.ebuild:
+  Version bump and mention the doc in postinst to close bug #77339.
+
+*alsa-driver-1.0.8_rc1 (01 Jan 2005)
+
+  01 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +alsa-driver-1.0.8_rc1.ebuild:
+  Version bump.
+
+  19 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-1.0.7-r4.ebuild:
+  Fixing for people who use KERNEL_OUTPUT.  Bug #74914.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-1.0.7-r3.ebuild, alsa-driver-1.0.7-r4.ebuild:
+  Stable amd64, sparc, x86.
+
+  09 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-1.0.7-r4.ebuild:
+  Setting keywords ~x86 as only xbox benefits from this update.
+
+*alsa-driver-1.0.7-r4 (08 Dec 2004)
+
+  08 Dec 2004; Chris Bainbridge <chrb@gentoo.org>
+  +files/alsa-driver-1.0.7-xbox-hw1.6fix.patch,
+  +alsa-driver-1.0.7-r4.ebuild:
+  New patch for hw version 1.6 xbox.
+
+  08 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-1.0.7-r3.ebuild:
+  Make sure the user isn't using OSS Drivers in the kernel.
+
+  04 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  files/alsa-driver-1.0.7-configure.patch:
+  Updated configure patch to update Makefile.conf.in as well to fix
+  compilation with 2.4 kernels. Closes bug #73290.
+
+*alsa-driver-1.0.7-r3 (02 Dec 2004)
+
+  02 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  files/alsa-driver-1.0.7-configure.patch,
+  -files/alsa-driver-1.0.7-ioctl32.patch,
+  -files/alsa-driver-1.0.7-ioctl32.patch-r1, -alsa-driver-1.0.7-r1.ebuild,
+  -alsa-driver-1.0.7-r2.ebuild, +alsa-driver-1.0.7-r3.ebuild,
+  -alsa-driver-1.0.7.ebuild:
+  Fixing the configure patch to match what was committed upstream as the patch
+  we originally used had some problems.
+
+  30 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-1.0.7-r2.ebuild:
+  Stable sparc.
+
+*alsa-driver-1.0.7-r2 (29 Nov 2004)
+
+  29 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/alsa-driver-1.0.7-ioctl32.patch-r2, alsa-driver-1.0.7-r1.ebuild,
+  +alsa-driver-1.0.7-r2.ebuild:
+  Updated the ioctl32 patch to match what has gone into cvs ustream.  We also
+  no longer default to the new dsp for cs46xx.  To use it, set
+  ALSA_CARDS="cs46xx,cs46xx-new-dsp"
+
+  27 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-1.0.7-r1.ebuild:
+  CONFIG_CHECK love.
+
+  27 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-1.0.7-r1.ebuild:
+  Fixing kernel configuration check.
+
+  26 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-1.0.7-r1.ebuild:
+  Adding to ~arch.
+
+  26 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  files/alsa-driver-1.0.7-ioctl32.patch-r1:
+  Updating upstream ioctl32 patch.
+
+  25 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/alsa-driver-1.0.7-audigy71.patch,
+  files/alsa-driver-1.0.7-ioctl32.patch-r1, alsa-driver-1.0.7-r1.ebuild:
+  Adding patch from recent alsa cvs to fix 7.1 detection on some audigy2
+  cards. Closes bug #72433. Also incorporate some kernel-mod fixes thanks to
+  johnm.
+
+  24 Nov 2004; Daniel Drake <dsd@gentoo.org> alsa-driver-1.0.7-r1.ebuild,
+  alsa-driver-1.0.7.ebuild:
+  Fix building against /usr/src/linux rather than running kernel
+
+*alsa-driver-1.0.7-r1 (24 Nov 2004)
+
+  24 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/alsa-driver-1.0.7-ioctl32.patch-r1, +alsa-driver-1.0.7-r1.ebuild:
+  Updated ioctl32 patch to one provided by upstream.
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-1.0.7.ebuild:
+  Don't install Makefiles from the docs.
+
+  21 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/alsa-driver-1.0.7-ioctl32.patch, alsa-driver-1.0.7.ebuild:
+  Added patch to ioctl32 support to get it to work on sparc... still needs
+  testing... See bug #55465.
+
+  19 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-1.0.7.ebuild:
+  Added IUSE=doc to control installation of documentation.  Closes bug #71730.
+
+  19 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/alsa-driver-1.0.7-configure.patch, alsa-driver-1.0.7.ebuild:
+  Added patch for compilation on sparc64.
+
+  18 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-1.0.7.ebuild:
+  Forcing -j1 for bug #71028.
+
+*alsa-driver-1.0.7 (12 Nov 2004)
+
+  12 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-1.0.6a.ebuild, +alsa-driver-1.0.7.ebuild:
+  Version bump.
+
+  03 Nov 2004; Stephen P. Becker <geoman@gentoo.org>
+  alsa-driver-1.0.6a.ebuild:
+  added ~mips keyword
+
+  07 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> -files/alsa,
+  -files/alsa-driver-0.9.0rc1-ppc.patch, -files/alsa-modules.conf,
+  -files/alsa-modules.conf-rc -files/alsasound, -alsa-driver-0.5.12a.ebuild,
+  -alsa-driver-0.9.0_rc2.ebuild, -alsa-driver-0.9.2.ebuild:
+  Version cleanup.
+
+  07 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/alsa-driver-1.0.6a-emu10k1-passthrough.patch:
+  Added patch to make emu10k1 passthrough work.  Closes bug #66635.
+
+  22 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> :
+  Stable amd64, x86. Fixed build process to work on newer 2.6 kernels without
+  needing to copy over the kernel source tree.
+
+*alsa-driver-1.0.6a (23 Aug 2004)
+
+  23 Aug 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +alsa-driver-1.0.6a.ebuild:
+  Version bump.
+
+  23 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -alsa-driver-1.0.2c.ebuild, -alsa-driver-1.0.4-r1.ebuild,
+  -alsa-driver-1.0.4.ebuild, -alsa-driver-1.0.5.ebuild:
+  Removing old versions.  Fixing DEPEND.
+
+  23 Jul 2004; Chris Bainbridge <chrb@gentoo.org> alsa-driver-1.0.5a.ebuild:
+  Added xbox patch, bug #47166
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-1.0.5a.ebuild:
+  Added alsa-headers to RDEPEND.  Added in cs46xx patch to close bug #56056.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-0.5.12a.ebuild, alsa-driver-0.9.0_rc2.ebuild,
+  alsa-driver-0.9.2.ebuild, alsa-driver-0.9.8.ebuild,
+  alsa-driver-1.0.2c.ebuild:
+  virtual/glibc -> virtual/libc
+
+*alsa-driver-1.0.5a (25 Jun 2004)
+
+  25 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +alsa-driver-1.0.5a.ebuild:
+  Adding 1.0.5a which is a small bugfix release from upstream. This fixes a
+  crucial bug and is thus going straight into stable.
+
+  24 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-1.0.5.ebuild:
+  Stable x86 amd64.
+
+*alsa-driver-1.0.5 (30 May 2004)
+
+  30 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-1.0.5.ebuild, files/alsa-driver-1.0.5-devfix.patch:
+  Version Bump.
+
+  25 Apr 2004; Aron Griffis <agriffis@gentoo.org> alsa-driver-1.0.3.ebuild,
+  alsa-driver-1.0.4-r1.ebuild, alsa-driver-1.0.4.ebuild:
+  Add die following econf for bug 48950
+
+  24 Apr 2004; Bret Curtis <psi29a@gentoo.org> alsa-driver-1.0.3.ebuild:
+  Added to ~mips
+
+  17 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-0.5.12a.ebuild, alsa-driver-0.9.0_rc2.ebuild,
+  alsa-driver-0.9.2.ebuild:
+  IUSE.  eutils.
+
+*alsa-driver-1.0.4-r1 (08 Apr 2004)
+
+  08 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-1.0.4-r1.ebuild, files/alsa-driver-1.0.4-devfix.patch:
+  Added SNDRV_DMA_TYPE_PCI to SNDRV_DMA_TYPE_DEV fixes.
+
+  08 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-0.5.12a.ebuild, alsa-driver-0.9.0_rc2.ebuild,
+  alsa-driver-0.9.2.ebuild:
+  Ebuild cleanups.
+
+  06 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-1.0.3.ebuild, alsa-driver-1.0.4.ebuild:
+  Filtering -fomit-frame-pointer to fix bug #46901.
+
+*alsa-driver-1.0.4 (04 Apr 2004)
+
+  04 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-1.0.3.ebuild, alsa-driver-1.0.4.ebuild:
+  1.0.3 stable on x86.  version bump.
+
+  28 Mar 2004; Aron Griffis <agriffis@gentoo.org> alsa-driver-1.0.3.ebuild:
+  Mark stable on alpha and ia64 since eradicator eradicated the versions that
+  were previously marked stable for these architectures.
+
+  27 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-0.9.8.ebuild, alsa-driver-1.0.0_rc2.ebuild,
+  alsa-driver-1.0.1.ebuild, alsa-driver-1.0.2c.ebuild, files/alsa-compile-fix,
+  files/alsa-driver-0.9.5-spinlock_t.patch, files/alsa-driver-0.9.7-pde.patch,
+  files/wolk.patch:
+  Removed old ebuilds.  Cleaned up remaining ones.
+
+  23 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-1.0.3.ebuild:
+  Adding ebuild kludgery to get alsa-driver to work with 2.6 kernels. Closes bug
+  #42062.
+
+  04 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-0.9.8.ebuild:
+  SBLive Value note
+
+*alsa-driver-1.0.3 (01 Mar 2004)
+
+  01 Mar 2004; Martin Holzer <mholzer@gentoo.org> alsa-driver-1.0.3.ebuild:
+  Version bumped.
+
+  15 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-1.0.0_rc2.ebuild, alsa-driver-1.0.1.ebuild,
+  alsa-driver-1.0.2.ebuild, alsa-driver-1.0.2c.ebuild:
+  Updated einfo's to reflect that 1.0.2c should work with 2.6 kernels and
+  removing 1.0.2 since it is identical to 1.0.2c except for 2.6 kernel related
+  bugfixes.
+
+*alsa-driver-1.0.2c (08 Feb 2004)
+
+  08 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-1.0.2c.ebuild:
+  Version bump.
+
+  08 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-0.9.8.ebuild, alsa-driver-1.0.0_rc2.ebuild,
+  alsa-driver-1.0.1.ebuild, alsa-driver-1.0.2.ebuild,
+  files/alsa-driver-0.9.8-au-fix.patch:
+  Added patch to include ac97 and mpu401 with ALSA_CARDS=au88[123]0.
+  Closes bug #38284.
+
+  28 Jan 2004; Aron Griffis <agriffis@gentoo.org> alsa-driver-1.0.1.ebuild:
+  stable on alpha and ia64
+
+*alsa-driver-1.0.2 (27 Jan 2004)
+
+  27 Jan 2004; Martin Holzer <mholzer@gentoo.org> alsa-driver-1.0.2.ebuild:
+  Version bumped.
+
+  17 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org>
+  alsa-driver-0.9.8.ebuild:
+  manifest fix
+
+  16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org>
+  alsa-driver-0.9.8.ebuild:
+  set ppc in keywords
+
+  13 Jan 2004; Jon Portnoy <avenj@gentoo.org> alsa-driver-1.0.1.ebuild,
+  alsa-driver-0.9.8.ebuild :
+  AMD64 keywords.
+
+*alsa-driver-1.0.1 (10 Jan 2004)
+
+  10 Jan 2004; Martin Holzer <mholzer@gentoo.org> alsa-driver-1.0.1.ebuild:
+  Version bumped.
+
+  26 Dec 2003; Jason Wever <weeve@gentoo.org> alsa-driver-0.5.12a.ebuild,
+  alsa-driver-0.9.0_rc2.ebuild, alsa-driver-0.9.2.ebuild,
+  alsa-driver-0.9.8.ebuild, alsa-driver-1.0.0_rc1.ebuild,
+  alsa-driver-1.0.0_rc2.ebuild:
+  Masked on sparc as alsa doesn't build correctly.
+
+  18 Dec 2003; Martin Holzer <mholzer@gentoo.org> alsa-driver-0.9.8.ebuild,
+  alsa-driver-1.0.0_rc1.ebuild, alsa-driver-1.0.0_rc2.ebuild:
+  removing makefile from docs.
+
+*alsa-driver-1.0.0_rc2 (07 Dec 2003)
+
+  07 Dec 2003; Martin Holzer <mholzer@gentoo.org>
+  alsa-driver-1.0.0_rc2.ebuild:
+  Version bumped.
+
+*alsa-driver-1.0.0_rc1 (02 Dec 2003)
+
+  02 Dec 2003; Martin Holzer <mholzer@gentoo.org>
+  alsa-driver-1.0.0_rc1.ebuild:
+  Version bumped.
+
+  26 Nov 2003; Martin Holzer <mholzer@gentoo.org> alsa-driver-0.9.8.ebuild:
+  marked x86 stable.
+
+  27 Oct 2003; Martin Holzer <mholzer@gentoo.org> alsa-driver-0.9.8.ebuild:
+  Changing SLOT to KV.
+
+  25 Oct 2003; Martin Holzer <mholzer@gentoo.org> alsa-driver-0.9.7-r4.ebuild:
+  adding forgotten autoconf. Closes #29965.
+
+*alsa-driver-0.9.8 (25 Oct 2003)
+
+  25 Oct 2003; Martin Holzer <mholzer@gentoo.org> alsa-driver-0.9.8.ebuild:
+  Version bumped.
+
+*alsa-driver-0.9.7-r4 (24 Oct 2003)
+
+  24 Oct 2003; Martin Holzer <mholzer@gentoo.org> alsa-driver-0.9.7-r4.ebuild,
+  files/alsa-driver-0.9.7-pde.patch:
+  0Adding PDE fix. Closes #29965 & dupex.
+
+  24 Sep 2003; Hanno Boeck <hanno@gentoo.org> alsa-driver-0.9.6.ebuild,
+  files/alsa-compile-fix:
+  Add compile-fix for 2.4.23-pre-kernels.
+
+  07 Sep 2003; Arcady Genkin <agenkin@gentoo.org> files/wolk.patch:
+  An updated version from Sebastian Held <sebastian.held@gmx.de>.
+  Closees #27870.
+
+  16 Aug 2003; rob holland <tigger@gentoo.org> alsa-driver-0.9.6.ebuild,
+  files/wolk.patch:
+  Added wolk patch to let alsa compile against a wolk kernel.
+  Not bumping the revision as it was only broken for wolk peeps.
+  Thanks to Sebastian Held and Kerin for the patch/bringing it to our
+  attention. Closes #25731
+
+  05 Aug 2003; John Mylchreest <johnm@gentoo.org>; alsa-driver-0.9.6.ebuild,
+  files/makefile.patch:
+  Updating for 2.6 compliance
+
+  05 Aug 2003; John Mylchreest <johnm@gentoo.org>; alsa-driver-0.9.6.ebuild:
+  Updating for 2.6 compliance
+
+  05 Jun 2003; Brandon Low <lostlogic@gentoo.org> alsa-driver-0.9.4-r1.ebuild:
+  Make the USE=oss actually do something
+
+  05 Jun 2003; Daniel Ahlberg <aliz@gentoo.org> alsa-driver-0.9.4.ebuild :
+  Switched to mirror://alsaproject in SRC_URI.
+
+*alsa-driver-0.9.7-r3 (14 Oct 2003)
+
+  14 Oct 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Version bump to 0.9.7c.
+
+*alsa-driver-0.9.7-r2 (11 Oct 2003)
+
+  11 Oct 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Version bump to 0.9.7b.
+
+*alsa-driver-0.9.7-r1 (01 Oct 2003)
+
+  01 Oct 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Version bump to 0.9.7a.
+
+*alsa-driver-0.9.7 (27 Sep 2003)
+
+  27 Sep 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Version bump.
+  Removed wolk.patch and alsa-compile-fix patches since it looks like they
+  are included in this release.
+
+*alsa-driver-0.9.6 (29 Jul 2003)
+
+  29 Jul 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Version bump.
+
+*alsa-driver-0.9.5-r2 (15 Jul 2003)
+
+  15 Jul 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Added another trivial patch by Takashi Iwai, found in alsa-user 
+  mailing list.
+
+  15 Jul 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Picked up another patch regarding the same issue from alsa-devel
+  by Klaus Steinberger.  Replaced the previous patch by one comprehensive
+  that fixes all three bugs.
+  Added dependency on virtual/linux-sources.
+
+*alsa-driver-0.9.5-r1 (14 Jul 2003)
+
+  14 Jul 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Added a fix for compilation failures on SMP-enabled kernels.
+  Closes bug #24323.
+
+*alsa-driver-0.9.5 (11 Jul 2003)
+
+  11 Jul 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Version update.
+
+*alsa-driver-0.9.4-r1 (05 Jun 2003)
+
+  05 Jun 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Obey the 'oss' USE flag when building.  Patch by Georgi Georgiev 
+  <chutz@chubaka.net> (bug #14708).
+
+*alsa-driver-0.9.4 (03 Jun 2003)
+
+  03 Jun 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Version update.
+
+*alsa-driver-0.9.3c-r1 (24 May 2003)
+
+  24 May 2003; Arcady Genkin <agenkin@gentoo.org> :
+  0.9.3c removes /proc/asound/dev directory, to which /dev/snd used to be
+  a symlink.  This doesn't mean much to us, since we use devfs, but
+  the "make install" now may attempt to create real /dev/snd directory,
+  causing a Portage sandbox violation error.  This revision fixes this
+  problem (Gentoo bug #21410).
+  Installing a new file: /usr/sbin/snddevices for people who are not using
+  devfs.
+
+*alsa-driver-0.9.3c (05 May 2003)
+
+  05 May 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Version update.
+
+*alsa-driver-0.9.3b (19 May 2003)
+
+  19 May 2003; Daniel Ahlberg <aliz@gentoo.org> alsa-driver-0.9.3b.ebuild :
+  Version bump.
+
+*alsa-driver-0.9.3 (05 May 2003)
+
+  05 May 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Version update.
+
+*alsa-driver-0.9.3a (04 May 2003)
+
+  04 May 2003; Daniel Ahlberg <aliz@gentoo.org> alsa-driver-0.9.3a.ebuild :
+  Version bump.
+
+*alsa-driver-0.9.2 (27 Mar 2003)
+
+  15 Apr 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Marking stable on x86.
+
+  27 Mar 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Version update.
+
+*alsa-driver-0.9.1 (12 Mar 2003)
+
+  12 Mar 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Update to version 0.9.1.
+
+*alsa-driver-0.9.0_rc8-r1 (03 Mar 2003)
+
+  09 Mar 2003; Mark Guertin <gerk@gentoo.org> alsa-driver-0.9.0_rc8-r1.ebuild:
+  set ~ppc in keywords
+
+  04 Mar 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Update to version 0.9.0rc8b.
+  Replaced "emake" with "make".
+
+*alsa-driver-0.9.0_rc8 (03 Mar 2003)
+
+  04 Mar 2003; Arcady Genkin <agenkin@gentoo.org> files/alsasound :
+  Applied a patch from Thomas Weidner <yasea@gmx.net> (bug 15762) to the
+  init script.  The patch adds code that inhibits alsactl error messages
+  at boot time.
+
+  03 Mar 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Quick update to rc8.
+
+*alsa-driver-0.9.0_rc7 (04 Feb 2003)
+
+  05 Feb 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Removed the patch for ice1712 cards.
+
+  04 Feb 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Quick update to rc7.
+	
+*alsa-driver-0.9.0_rc6 (19 Nov 2002)
+
+  21 Dec 2002; Arcady Genkin <agenkin@gentoo.org> :
+  Added patch for ice1712 cards (bug #11572).
+  Added "options snd cards_limit=1" into the modules.d file (bug #12076).
+	
+  19 Nov 2002; Arcady Genkin <agenkin@gentoo.org>
+	alsa-driver-0.9.0_rc6.ebuild :
+  Quick update to rc6.  Legwork done by Roman Weber <gentoo@gonzo.ch>.
+
+*alsa-driver-0.9.0_rc5 (24 Oct 2002)
+
+  24 Oct 2002; Arcady Genkin <agenkin@gentoo.org>
+	alsa-driver-0.9.0_rc5.ebuild :
+  Quick update to rc5.
+	
+*alsa-driver-0.9.0_rc4 (23 Oct 2002)
+
+  23 Oct 2002; Arcady Genkin <agenkin@gentoo.org>
+	alsa-driver-0.9.0_rc4.ebuild :
+
+  Quick update to rc4.
+	
+*alsa-driver-0.9.0_rc3 (15 Aug 2002)
+
+  15 Aug 2002; Arcady Genkin <agenkin@thpoon.com>
+	alsa-driver-0.9.0_rc3.ebuild :
+
+  Quick update to version 0.9.0rc3.
+
+  16 Aug 2002; Arcady Genkin <agenkin@thpoon.com>
+	alsa-driver-0.9.0_rc3.ebuild :
+
+  Updated support for ALSA_CARDS env. variable at build time to
+  enable multiple selected drivers.
+
+  04 Sep 2002, Arcady Genkin <agenkin@thpoon.com>
+	alsa-driver-0.9.0_rc3.ebuild :
+
+  Fixed the compilation problem due to isapnp.h.
+
+*alsa-driver-0.9.0_rc2 (20 Jun 2002)
+
+  20 Jun 2002; Arcady Genkin <agenkin@thpoon.com>
+	alsa-driver-0.9.0_rc2.ebuild :
+
+  Quick update to version 0.9.0rc2.
+
+  16 Aug 2002; Arcady Genkin <agenkin@thpoon.com>
+	alsa-driver-0.9.0_rc2.ebuild :
+
+  Updated support for ALSA_CARDS env. variable at build time to
+  enable multiple selected drivers.
+
+*alsa-driver-0.9.0_rc1 (27 Apr 2002)
+
+  06 Jun 2002; Olivier Reisch <doctomoe@gentoo.org>
+	alsa-driver-0.9.0_rc1-r7.ebuild files/alsa-driver-0.9.0rc1-ppc.patch :
+
+  Added a small patch to fix ALSA up for PPC. keywest.c was missing a vital
+  header.
+
+  23 May 2002; Arcady Genkin <agenkin@thpoon.com>
+	alsa-driver-0.9.0_rc1-r7.ebuild files/alsa-modules.conf :
+
+  Aliased /dev/dsp and /dev/mixer to respective OSS emulation modules.
+
+  12 May 2002; Arcady Genkin <agenkin@thpoon.com>
+	alsa-driver-0.9.0_rc1-r6.ebuild :
+
+  Updated the 'alsasound' init script so that it runs before the modules
+  from /etc/modules.autoload get loaded.  This relies on baselayout >=1.7.9.
+
+  8 May 2002; Jon Nelson <jnelson@gentoo.org>
+	alsa-driver-0.9.0_rc1-r5.ebuild :
+        
+  Use check_KV and depend on portage >= 1.9.10
+
+  3 May 2002; Arcady Genkin <agenkin@thpoon.com>
+	alsa-driver-0.9.0_rc1-r5.ebuild :
+
+  Makes sure that Portage determines the kernel version.
+
+  2 May 2002; Arcady Genkin <agenkin@thpoon.com>
+	alsa-driver-0.9.0_rc1-r4.ebuild :
+
+  Added a hack to work around compilation breakage if a user has
+  /etc/rc.d/init.d directory.
+
+  28 Apr 2002; Arcady Genkin <agenkin@thpoon.com>
+	alsa-driver-0.9.0_rc1-r3.ebuild :
+
+  More work on the startup script and updated config file for /etc/modules.d.
+  Be sure to have a look at it and adjust it to your needs.
+
+  27 Apr 2002; Arcady Genkin <agenkin@thpoon.com>
+	alsa-driver-0.9.0_rc1-r2.ebuild :
+
+  Updated the alsasound startup script.
+	
+  27 Apr 2002; Arcady Genkin <agenkin@thpoon.com>
+	alsa-driver-0.9.0_rc1-r1.ebuild :
+
+  Rewrote the istallation procedures to use the package's native
+  installation subsystem.
+	
+  27 Apr 2002; Arcady Genkin <agenkin@thpoon.com>
+	alsa-driver-0.9.0_rc1.ebuild :
+
+  Quick update to version 0.9.0rc1.
+
+*alsa-driver-0.9.0_beta10 (3 Feb 2002)
+
+  8 Feb 2002; Donny Davies <woodchip@gentoo.org> ChangeLog,
+  alsa-driver-0.5.11.ebuild, alsa-driver-0.5.12a.ebuild,
+  alsa-driver-0.9.0_beta10.ebuild:
+
+  Moved the code looking for the kernel sources into pkg_setup().
+  Closes bug #273.  No revisions bumped, mostly a cosmetic change.
+
+  3 Feb 2002; T.Neidt <tod@gentoo.org> ChangeLog :
+
+  Upgraded version to latest beta.
+  The issue below seems to be fixable by creating a link in the alsa-lib
+  ebuild from libasound.so.2 to libasound.so.1, but I'm leaving the warning
+  until further testing is done.
+  ##WARNING## Upgrading to this version will require massive recompiling
+  of pretty much everything linked against sound.  libasound.so.1 is
+  no longer provided in the package, it is now libasound.so.2.  Sound
+  apps will be broken until recompiled against the new lib.  For example,
+  if you use the Gnome Desktop, you will have to recompile almost everything
+  just to start it up.  Good news is you don't have to upgrade now if you
+  don't want to.  Bad news is that you will eventually.
 
 *alsa-driver-0.5.12a (1 Feb 2002)
 
diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest
index d9dacfb295f2..6894ffa39901 100644
--- a/media-sound/alsa-driver/Manifest
+++ b/media-sound/alsa-driver/Manifest
@@ -1,14 +1,22 @@
-MD5 787daae725934ffd540b0011cecf86ea ChangeLog 6383
-MD5 a0d2f9e64f89d3fea2a09767bb1eb6a2 alsa-driver-0.5.12a.ebuild 1663
-MD5 6824caf41e03202f95d32f4855d45f97 alsa-driver-0.9.0_rc2.ebuild 2654
-MD5 a64b0229ef1bb9861f766c745f1e1ca8 alsa-driver-0.9.2.ebuild 2686
-MD5 304036ff2d79f19389121c07b304da6a alsa-driver-0.9.3a.ebuild 2685
-MD5 28ae6bb0823279c56f378d7ac6d6f607 files/alsasound 4608
-MD5 45f2cf526eaa8ff274ac6876f15302d1 files/alsa 518
-MD5 87448a6155eb013f2b14e4a531ffc25a files/alsa-driver-0.9.0rc1-ppc.patch 358
-MD5 8c81382138ab9223d1e0abdfdb1e5e98 files/alsa-modules.conf 1088
-MD5 9732f15dfab42b3c1556f546f14f041f files/alsa-modules.conf-rc 1161
-MD5 ac8c1852768868cb9c61a07e6baddc3a files/digest-alsa-driver-0.5.12a 72
-MD5 e3912a14a13dae85c5ee17f351733bae files/digest-alsa-driver-0.9.0_rc2 74
-MD5 5283280b5f72b9ea25f3e1e1adcde464 files/digest-alsa-driver-0.9.2 71
-MD5 2d39f80fad60314ed189ac266fec3d72 files/digest-alsa-driver-0.9.3a 72
+MD5 8af3b8a81fa20909ed80fdaee9fe1641 ChangeLog 30012
+MD5 afcbb70f92f2785ee73a764383c47611 alsa-driver-1.0.3.ebuild 3349
+MD5 5f53d077d0ff6216fca0d50170172f0c alsa-driver-1.0.8.ebuild 4679
+MD5 79f7336e1fcbf3cd90de84db0283b03a alsa-driver-1.0.9b.ebuild 4552
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 83e0d77659b142d24afa2a86d91b3c4d alsa-driver-1.0.10_rc2.ebuild 4555
+MD5 05d84ba8681d1e857e581caf97e6db59 alsa-driver-1.0.10_rc3.ebuild 4675
+MD5 626c89c990496895a3d7e94088e9c05f alsa-driver-1.0.10.ebuild 4623
+MD5 5445a523e0e8aa31b9f293b1ac380b37 files/1.0.8-msi_audigyls.patch 1771
+MD5 8c120f7730b91118d0a8148d2deb3a43 files/alsa-driver-0.9.8-au-fix.patch 1267
+MD5 938a2ee36c54416322d1acd47b249c99 files/digest-alsa-driver-1.0.3 71
+MD5 14b6c8d954e36bb9d40c97cf051220f0 files/digest-alsa-driver-1.0.8 71
+MD5 496627835733f8108e6b10dfc8ee9bf4 files/digest-alsa-driver-1.0.9b 72
+MD5 27ccbe36406f145c1d63725a53517233 files/makefile.patch 1122
+MD5 b2791ec892d9be6952fe139cc2309abf files/xbox-1.0.8.patch 1525
+MD5 be4912a88e538a1f620b2fd422859ef6 files/alsa-driver-1.0.9b-sparc64-ioctl-detect.patch 513
+MD5 ed352c464a295465543d8933c162f101 files/alsa-driver-1.0.10_rc1-include.patch 346
+MD5 569ec84f258f90c508827a3040062f41 files/digest-alsa-driver-1.0.10_rc2 75
+MD5 2f9a74cca5e78c63142073f0c90b9ff8 files/alsa-driver-1.0.10_rc2-audigy2zs.patch 460
+MD5 ad7631557a0317471d29e4c26cfb4cf2 files/digest-alsa-driver-1.0.10_rc3 75
+MD5 f6a0e5f4624041d23bbd60726331310e files/alsa-driver-1.0.10_rc3-ppc-unbreakage.patch 2957
+MD5 5474546fa4977a1fa63fbab0a155fd15 files/digest-alsa-driver-1.0.10 72
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.10.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.10.ebuild
index cd22f8539bc3..ace01571c202 100644
--- a/media-sound/alsa-driver/alsa-driver-1.0.10.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-1.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/media-sound/alsa-driver/alsa-driver-1.0.10.ebuild,v 1.1 2005/11/16 19:59:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.10.ebuild,v 1.1.1.1 2005/11/30 09:38:35 chriswhite Exp $
 
 inherit linux-mod flag-o-matic eutils
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://alsaproject/driver/${MY_P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ppc64 ~x86"
 IUSE="oss doc"
 
 RDEPEND="virtual/modutils
@@ -71,7 +71,6 @@ src_unpack() {
 	cd ${S}
 
 	epatch "${FILESDIR}"/${PN}-1.0.10_rc1-include.patch
-	epatch "${FILESDIR}/${PN}-1.0.10_rc3-ppc-unbreakage.patch"
 
 	convert_to_m ${S}/Makefile
 	sed -i -e 's:\(.*depmod\):#\1:' ${S}/Makefile
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.10_rc2.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.10_rc2.ebuild
index 50c9a29eebb5..bb4bc2412a73 100644
--- a/media-sound/alsa-driver/alsa-driver-1.0.10_rc2.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-1.0.10_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/media-sound/alsa-driver/alsa-driver-1.0.10_rc2.ebuild,v 1.1 2005/10/11 15:34:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.10_rc2.ebuild,v 1.1.1.1 2005/11/30 09:38:34 chriswhite Exp $
 
 inherit linux-mod flag-o-matic eutils
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://alsaproject/driver/${MY_P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 x86"
 IUSE="oss doc"
 
 RDEPEND="virtual/modutils
@@ -54,6 +54,11 @@ pkg_setup() {
 	fi
 
 	linux-mod_pkg_setup
+
+	if [[ ${PROFILE_ARCH} == "sparc64" ]] ; then
+		CBUILD=${CBUILD-${CHOST}}
+		CHOST="sparc64-unknown-linux-gnu"
+	fi
 }
 
 src_unpack() {
@@ -61,18 +66,16 @@ src_unpack() {
 
 	cd ${S}
 
-	if use sparc ; then
-		epatch ${FILESDIR}/alsa-driver-1.0.9b-sparc64-ioctl-detect.patch
-		WANT_AUTOCONF=2.5 autoconf || die
-	fi
-
-	epatch ${FILESDIR}/${P}-include.patch
+	epatch "${FILESDIR}"/${PN}-1.0.10_rc1-include.patch
+	epatch "${FILESDIR}"/${P}-audigy2zs.patch
 	convert_to_m ${S}/Makefile
+	sed -i -e 's:\(.*depmod\):#\1:' ${S}/Makefile
 }
 
 src_compile() {
 	# Should fix bug #46901
 	is-flag "-malign-double" && filter-flags "-fomit-frame-pointer"
+	append-flags "-I${KV_DIR}/arch/$(tc-arch-kernel)/include"
 
 	econf $(use_with oss) \
 		--with-kernel="${KV_DIR}" \
@@ -85,7 +88,7 @@ src_compile() {
 
 	# -j1 : see bug #71028
 	ARCH=$(tc-arch-kernel)
-	emake -j1 || die "Make Failed"
+	emake -j1 HOSTCC=$(tc-getBUILD_CC) CC=$(tc-getCC) || die "Make Failed"
 	ARCH=$(tc-arch)
 
 	if use doc;
@@ -102,15 +105,7 @@ src_compile() {
 
 
 src_install() {
-	dodir /usr/include/sound
-
-	make DESTDIR=${D} install || die "make install failed"
-
-	# Provided by alsa-headers now
-	rm -rf ${D}/usr/include/sound
-
-	# We have our own scripts in alsa-utils
-	rm -f ${D}/etc/init.d/alsasound ${D}/etc/rc.d/init.d/alsasound
+	make DESTDIR=${D} install-modules || die "make install failed"
 
 	dodoc CARDS-STATUS FAQ README WARNING TODO
 
@@ -145,7 +140,6 @@ pkg_postinst() {
 	einfo "If you experience problems, please report bugs to http://bugs.gentoo.org."
 	einfo
 
-
 	linux-mod_pkg_postinst
 
 	einfo "Check out the ALSA installation guide availible at the following URL:"
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.10_rc3.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.10_rc3.ebuild
index a3c0c9e0880a..d89be5d539c1 100644
--- a/media-sound/alsa-driver/alsa-driver-1.0.10_rc3.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-1.0.10_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/media-sound/alsa-driver/alsa-driver-1.0.10_rc3.ebuild,v 1.1 2005/11/08 12:17:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.10_rc3.ebuild,v 1.1.1.1 2005/11/30 09:38:34 chriswhite Exp $
 
 inherit linux-mod flag-o-matic eutils
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://alsaproject/driver/${MY_P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ppc ~ppc64 x86"
 IUSE="oss doc"
 
 RDEPEND="virtual/modutils
@@ -46,7 +46,11 @@ pkg_setup() {
 	PNP_ERROR="Some of the drivers you selected require PNP in your kernel (${PNP_DRIVERS}).  Either enable PNP in your kernel or trim which drivers get compiled using ALSA_CARDS in /etc/make.conf."
 
 	if [[ "${ALSA_CARDS}" == "all" ]]; then
-		CONFIG_CHECK="${CONFIG_CHECK} PNP"
+
+		# Ignore PNP checks for ppc architecture, as PNP can't be enabled there.
+		if [[ ${ARCH} != "ppc" ]]; then
+			CONFIG_CHECK="${CONFIG_CHECK} PNP"
+		fi
 	else
 		for pnpdriver in ${PNP_DRIVERS}; do
 			hasq ${pnpdriver} ${ALSA_CARDS} && CONFIG_CHECK="${CONFIG_CHECK} PNP"
@@ -67,6 +71,8 @@ src_unpack() {
 	cd ${S}
 
 	epatch "${FILESDIR}"/${PN}-1.0.10_rc1-include.patch
+	epatch "${FILESDIR}/${P}-ppc-unbreakage.patch"
+
 	convert_to_m ${S}/Makefile
 	sed -i -e 's:\(.*depmod\):#\1:' ${S}/Makefile
 }
@@ -74,6 +80,7 @@ src_unpack() {
 src_compile() {
 	# Should fix bug #46901
 	is-flag "-malign-double" && filter-flags "-fomit-frame-pointer"
+	append-flags "-I${KV_DIR}/arch/$(tc-arch-kernel)/include"
 
 	econf $(use_with oss) \
 		--with-kernel="${KV_DIR}" \
@@ -84,8 +91,8 @@ src_compile() {
 
 	# linux-mod_src_compile doesn't work well with alsa
 
-	# -j1 : see bug #71028
 	ARCH=$(tc-arch-kernel)
+	# -j1 : see bug #71028
 	emake -j1 HOSTCC=$(tc-getBUILD_CC) CC=$(tc-getCC) || die "Make Failed"
 	ARCH=$(tc-arch)
 
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.3.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.3.ebuild
index 5bd74cdf20a8..0390229a7529 100644
--- a/media-sound/alsa-driver/alsa-driver-1.0.3.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-1.0.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/media-sound/alsa-driver/alsa-driver-1.0.3.ebuild,v 1.1 2004/03/01 08:53:08 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.3.ebuild,v 1.1.1.1 2005/11/30 09:38:34 chriswhite Exp $
+
+inherit eutils kernel-mod flag-o-matic
 
 DESCRIPTION="Advanced Linux Sound Architecture kernel modules"
 HOMEPAGE="http://www.alsa-project.org/"
@@ -13,25 +15,25 @@ LICENSE="GPL-2 LGPL-2.1"
 #
 #   env ALSA_CARDS='emu10k1 intel8x0 ens1370' emerge alsa-driver
 #
-[ x"${ALSA_CARDS}" = x ] && ALSA_CARDS=all
+[ -z "${ALSA_CARDS}" ] && ALSA_CARDS=all
 
 IUSE="oss"
 
-# Need the baselayout 1.7.9 or newer for the init script to work correctly.
-DEPEND="sys-devel/autoconf
-	virtual/glibc
+RDEPEND="virtual/modutils"
+
+DEPEND="${RDEPEND}
 	virtual/linux-sources
-	>=sys-apps/portage-1.9.10
-	>=sys-apps/baselayout-1.7.9"
+	sys-devel/autoconf
+	sys-apps/debianutils"
+
 PROVIDE="virtual/alsa"
 
 SLOT="${KV}"
-KEYWORDS="~x86 ~ppc -sparc ~amd64 ~alpha ~ia64"
+KEYWORDS="x86 ~ppc -sparc ~amd64 alpha ia64 ~mips"
 
 MY_P=${P/_rc/rc}
-#SRC_URI="ftp://ftp.alsa-project.org/pub/driver/${MY_P}.tar.bz2"
 SRC_URI="mirror://alsaproject/driver/${P}.tar.bz2"
-RESTRICT="nomirror"
+# nouserpriv is neccessary for 2.6.x kernels... Hopefully the ALSA guys will figure out another way to do this...
 S=${WORKDIR}/${MY_P}
 
 src_unpack() {
@@ -42,28 +44,48 @@ src_unpack() {
 	# This patch stops that
 	epatch ${FILESDIR}/makefile.patch || die "Makefile patch failed"
 	epatch ${FILESDIR}/${PN}-0.9.8-au-fix.patch
-}
 
+	if kernel-mod_is_2_6_kernel || kernel-mod_is_2_5_kernel; then
+		FULL_KERNEL_PATH="${ROOT}/usr/src/${KV_DIR}"
+
+		if ! [ -d "${FULL_KERNEL_PATH}" ]; then
+			eerror "An error seems to have occurred.  We looked in ${FULL_KERNEL_PATH} for your kernel sources, but we didn't see them."
+			die "ALSA driver configuration failure."
+		fi
+
+		einfo "A 2.5 or 2.6 kernel was detected.  We are copying the kernel source tree from"
+		einfo "${FULL_KERNEL_PATH} to ${T}/linux"
+		einfo "because the alsa-driver build process overwrites files in the 2.6.x kernel tree."
+
+		# Copy everything over to our tmp dir...
+		cp -a ${FULL_KERNEL_PATH} ${T}/linux
+	fi
+}
 
 src_compile() {
-	# Portage should determine the version of the kernel sources
-	check_KV
-
-	myconf=""
-	use oss && myconf="$myconf --with-oss=yes" || \
-		myconf="$myconf --with-oss=no"
-
-	./configure \
-		$myconf \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--with-kernel="${ROOT}usr/src/linux" \
+	# Default ARCH & kernel path to set in compilation and make
+	KER_ARCH=${ARCH}
+	KER_DIR=${KERNEL_DIR}
+
+	# If we're using a 2.5 or 2.6 kernel, use our copied kernel tree.
+	if [ -d "${T}/linux" ]; then
+		KER_DIR="${T}/linux"
+
+		# Set the kernel ARCH
+		use x86 && KER_ARCH="i386"
+		use amd64 && KER_ARCH="x86_64"
+	fi
+
+	econf `use_with oss` \
+		--with-kernel="${KER_DIR}" \
 		--with-isapnp=yes \
 		--with-sequencer=yes \
-		--with-cards="${ALSA_CARDS}" \
-		|| die "./configure failed"
+		--with-cards="${ALSA_CARDS}" || die "econf failed"
+
+	# Should fix bug #46901
+	is-flag "-malign-double" && filter-flags "-fomit-frame-pointer"
 
-	emake || die "Parallel Make Failed"
+	emake ARCH="${KER_ARCH}" || die "Parallel Make Failed"
 }
 
 
@@ -72,7 +94,7 @@ src_install() {
 	make DESTDIR=${D} install || die
 
 	rm doc/Makefile
-	dodoc CARDS-STATUS COPYING FAQ INSTALL README WARNING TODO doc/*
+	dodoc CARDS-STATUS FAQ README WARNING TODO doc/*
 }
 
 pkg_postinst() {
@@ -87,7 +109,7 @@ pkg_postinst() {
 	einfo "Also, remember that all mixer channels will be MUTED by default."
 	einfo "Use the 'alsamixer' program to unmute them."
 	einfo
-	einfo "Version 1.0.2c and above should work with version 2.6 kernels."
+	einfo "Version 1.0.3 and above should work with version 2.6 kernels."
 	einfo "If you experience problems, please report bugs to http://bugs.gentoo.org."
 	einfo
 }
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.8.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.8.ebuild
index f2edb3f78fb5..0775204800a4 100644
--- a/media-sound/alsa-driver/alsa-driver-1.0.8.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-1.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/media-sound/alsa-driver/alsa-driver-1.0.8.ebuild,v 1.1 2005/01/14 13:52:55 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.8.ebuild,v 1.1.1.1 2005/11/30 09:38:34 chriswhite Exp $
 
 IUSE="oss doc"
 inherit linux-mod flag-o-matic eutils
@@ -14,7 +14,7 @@ SRC_URI="mirror://alsaproject/driver/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86"
 
 RDEPEND="virtual/modutils
 	 ~media-sound/alsa-headers-${PV}"
@@ -28,13 +28,6 @@ DEPEND="${RDEPEND}
 PROVIDE="virtual/alsa"
 
 pkg_setup() {
-	CONFIG_CHECK="SOUND !SND !SOUND_PRIME"
-	SND_ERROR="ALSA is already compiled into the kernel."
-	SOUND_ERROR="Your kernel doesn't have sound support enabled."
-	SOUND_PRIME_ERROR="Your kernel is configured to use the deprecated OSS drivers.  Please disable them and re-emerge alsa-driver."
-
-	linux-mod_pkg_setup
-
 	# By default, drivers for all supported cards will be compiled.
 	# If you want to only compile for specific card(s), set ALSA_CARDS
 	# environment to a space-separated list of drivers that you want to build.
@@ -42,10 +35,30 @@ pkg_setup() {
 	#
 	#   env ALSA_CARDS='emu10k1 intel8x0 ens1370' emerge alsa-driver
 	#
-	if [ -z "${ALSA_CARDS}" ]; then
-		ewarn "\${ALSA_CARDS} isn't set, so we are compiling all alsa drivers."
-		ALSA_CARDS="all"
+	ALSA_CARDS=${ALSA_CARDS:-all}
+
+	if [ "${PROFILE_ARCH}" == "xbox" ]; then
+		ALSA_CARDS='intel8x0'
 	fi
+
+	# Which drivers need PNP
+	local PNP_DRIVERS="interwave interwave-stb"
+
+	CONFIG_CHECK="SOUND !SND !SOUND_PRIME"
+	SND_ERROR="ALSA is already compiled into the kernel."
+	SOUND_ERROR="Your kernel doesn't have sound support enabled."
+	SOUND_PRIME_ERROR="Your kernel is configured to use the deprecated OSS drivers.  Please disable them and re-emerge alsa-driver."
+	PNP_ERROR="Some of the drivers you selected require PNP in your kernel (${PNP_DRIVERS}).  Either enable PNP in your kernel or trim which drivers get compiled using ALSA_CARDS in /etc/make.conf."
+
+	if [[ "${ALSA_CARDS}" == "all" ]]; then
+		CONFIG_CHECK="${CONFIG_CHECK} PNP"
+	else
+		for pnpdriver in ${PNP_DRIVERS}; do
+			hasq ${pnpdriver} ${ALSA_CARDS} && CONFIG_CHECK="${CONFIG_CHECK} PNP"
+		done
+	fi
+
+	linux-mod_pkg_setup
 }
 
 src_unpack() {
@@ -53,10 +66,14 @@ src_unpack() {
 
 	cd ${S}
 
-	[ "${PROFILE_ARCH}" == "xbox" ] && \
-		epatch ${FILESDIR}/${PN}-1.0.7-xbox.patch
+	#see #81666
+	epatch ${FILESDIR}/${PV}-msi_audigyls.patch
 
 	convert_to_m ${S}/Makefile
+
+	if [ "${PROFILE_ARCH}" == "xbox" ]; then
+		epatch ${FILESDIR}/xbox-1.0.8.patch
+	fi
 }
 
 src_compile() {
@@ -71,9 +88,11 @@ src_compile() {
 		--with-cards="${ALSA_CARDS}" || die "econf failed"
 
 	# linux-mod_src_compile doesn't work well with alsa
-	unset ARCH
+
 	# -j1 : see bug #71028
-	emake -j1 || die "Parallel Make Failed"
+	ARCH=$(tc-arch-kernel)
+	emake -j1 || die "Make Failed"
+	ARCH=$(tc-arch)
 
 	if use doc;
 	then
@@ -90,7 +109,8 @@ src_compile() {
 
 src_install() {
 	dodir /usr/include/sound
-	make DESTDIR="${D}" install || die
+
+	make DESTDIR=${D} install || die
 
 	# Provided by alsa-headers now
 	rm -rf ${D}/usr/include/sound
@@ -99,7 +119,7 @@ src_install() {
 	test -e ${D}/etc/init.d/alsasound && rm ${D}/etc/init.d/alsasound
 	test -e ${D}/etc/rc.d/init.d/alsasound && rm ${D}/etc/rc.d/init.d/alsasound
 
-	dodoc CARDS-STATUS INSTALL FAQ README WARNING TODO
+	dodoc CARDS-STATUS FAQ README WARNING TODO
 
 	if use doc; then
 		docinto doc
@@ -113,6 +133,12 @@ src_install() {
 		docinto Documentation
 		dodoc sound/Documentation/*
 	fi
+
+	if kernel_is 2 6; then
+		# mv the drivers somewhere they won't be killed by the kernel's make modules_install
+		mv ${D}/lib/modules/${KV_FULL}/kernel/sound ${D}/lib/modules/${KV_FULL}/${PN}
+		rmdir ${D}/lib/modules/${KV_FULL}/kernel &> /dev/null
+	fi
 }
 
 pkg_postinst() {
@@ -126,8 +152,20 @@ pkg_postinst() {
 	einfo "If you experience problems, please report bugs to http://bugs.gentoo.org."
 	einfo
 
+
 	linux-mod_pkg_postinst
 
 	einfo "Check out the ALSA installation guide availible at the following URL:"
 	einfo "http://www.gentoo.org/doc/en/alsa-guide.xml"
+
+	if kernel_is 2 6 && [ -e ${ROOT}/lib/modules/${KV_FULL}/kernel/sound  ]; then
+		# Cleanup if they had older alsa installed
+		for file in $(find ${ROOT}/lib/modules/${KV_FULL}/${PN} -type f); do
+			rm -f ${file//${KV_FULL}\/${PN}/${KV_FULL}\/kernel\/sound}
+		done
+
+		for dir in $(find ${ROOT}/lib/modules/${KV_FULL}/kernel/sound -type d | tac); do
+			rmdir ${dir} &> /dev/null
+		done
+	fi
 }
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.9b.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.9b.ebuild
index 0c33a886682c..aaa764028521 100644
--- a/media-sound/alsa-driver/alsa-driver-1.0.9b.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-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/media-sound/alsa-driver/alsa-driver-1.0.9b.ebuild,v 1.1 2005/06/13 18:45:34 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.9b.ebuild,v 1.1.1.1 2005/11/30 09:38:34 chriswhite Exp $
 
 inherit linux-mod flag-o-matic eutils
 
@@ -10,15 +10,15 @@ SRC_URI="mirror://alsaproject/driver/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+
+KEYWORDS="alpha amd64 ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="oss doc"
 
 RDEPEND="virtual/modutils
-	 ~media-sound/alsa-headers-${PV/b/}"
+	 ~media-sound/alsa-headers-${PV}"
 DEPEND="${RDEPEND}
-	sys-devel/patch
 	virtual/linux-sources
-	>=sys-devel/autoconf-2.50
+	sparc? ( >=sys-devel/autoconf-2.50 )
 	sys-apps/debianutils"
 
 PROVIDE="virtual/alsa"
@@ -58,6 +58,11 @@ src_unpack() {
 
 	cd ${S}
 
+	if use sparc ; then
+		epatch ${FILESDIR}/alsa-driver-1.0.9b-sparc64-ioctl-detect.patch
+		WANT_AUTOCONF=2.5 autoconf || die
+	fi
+
 	convert_to_m ${S}/Makefile
 }
 
@@ -75,9 +80,9 @@ src_compile() {
 	# linux-mod_src_compile doesn't work well with alsa
 
 	# -j1 : see bug #71028
-	set_arch_to_kernel
+	ARCH=$(tc-arch-kernel)
 	emake -j1 || die "Make Failed"
-	set_arch_to_portage
+	ARCH=$(tc-arch)
 
 	if use doc;
 	then
@@ -104,7 +109,7 @@ src_install() {
 	test -e ${D}/etc/init.d/alsasound && rm ${D}/etc/init.d/alsasound
 	test -e ${D}/etc/rc.d/init.d/alsasound && rm ${D}/etc/rc.d/init.d/alsasound
 
-	dodoc CARDS-STATUS INSTALL FAQ README WARNING TODO
+	dodoc CARDS-STATUS FAQ README WARNING TODO
 
 	if use doc; then
 		docinto doc
@@ -143,7 +148,7 @@ pkg_postinst() {
 	einfo "Check out the ALSA installation guide availible at the following URL:"
 	einfo "http://www.gentoo.org/doc/en/alsa-guide.xml"
 
-	if kernel_is 2 6; then
+	if kernel_is 2 6 && [ -e  ${ROOT}/lib/modules/${KV_FULL}/kernel/sound ]; then
 		# Cleanup if they had older alsa installed
 		for file in $(find ${ROOT}/lib/modules/${KV_FULL}/${PN} -type f); do
 			rm -f ${file//${KV_FULL}\/${PN}/${KV_FULL}\/kernel\/sound}
diff --git a/media-sound/alsa-driver/metadata.xml b/media-sound/alsa-driver/metadata.xml
index 03db19e85220..e1774e3d9ad7 100644
--- a/media-sound/alsa-driver/metadata.xml
+++ b/media-sound/alsa-driver/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sound</herd>
-<maintainer>
-  <email>agenkin@gentoo.org</email>
-  <name>Arcady Genkin</name>
-</maintainer>
 </pkgmetadata>
diff --git a/media-sound/alsa-firmware/ChangeLog b/media-sound/alsa-firmware/ChangeLog
index 4c80a7f4d622..43dbf740881b 100644
--- a/media-sound/alsa-firmware/ChangeLog
+++ b/media-sound/alsa-firmware/ChangeLog
@@ -1,6 +1,94 @@
 # ChangeLog for media-sound/alsa-firmware
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-firmware/ChangeLog,v 1.1 2003/12/02 18:31:55 mholzer Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-firmware/ChangeLog,v 1.1.1.1 2005/11/30 09:38:00 chriswhite Exp $
+
+*alsa-firmware-1.0.10 (17 Nov 2005)
+
+  17 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +alsa-firmware-1.0.10.ebuild:
+  Added alsa-firmware 1.0.10 as per bug #112789.
+
+*alsa-firmware-1.0.9 (27 May 2005)
+
+  27 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +alsa-firmware-1.0.9.ebuild:
+  New upstream version released, see #94196.
+
+*alsa-firmware-1.0.8-r1 (22 Apr 2005)
+
+  22 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -alsa-firmware-1.0.7.ebuild, -alsa-firmware-1.0.8.ebuild,
+  +alsa-firmware-1.0.8-r1.ebuild:
+  Corrected firmware location for hotplug to be /lib/firmware. Closes bug
+  #78780.
+
+  16 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -alsa-firmware-1.0.4.ebuild:
+  Removing old versions.
+
+  08 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-firmware-1.0.8.ebuild:
+  Stable amd64, sparc, x86.
+
+*alsa-firmware-1.0.8 (23 Jan 2005)
+
+  23 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +alsa-firmware-1.0.8.ebuild:
+  Version bump.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-firmware-1.0.7.ebuild:
+  Stable amd64, sparc, x86.
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-firmware-1.0.7.ebuild:
+  Added to ~sparc.
+
+*alsa-firmware-1.0.7 (19 Nov 2004)
+
+  19 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -alsa-firmware-1.0.2.ebuild, -alsa-firmware-1.0.3.ebuild,
+  alsa-firmware-1.0.4.ebuild, +alsa-firmware-1.0.7.ebuild:
+  Version bump.
+
+  24 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-firmware-1.0.4.ebuild:
+  Stable x86 amd64.
+
+  16 Apr 2004; Travis Tilley <lv@gentoo.org> alsa-firmware-1.0.4.ebuild:
+  added ~amd64 keyword
+
+*alsa-firmware-1.0.4 (04 Apr 2004)
+
+  04 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-firmware-1.0.3.ebuild, alsa-firmware-1.0.4.ebuild:
+  1.0.3 stable on x86.  Version bump.
+
+  26 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-firmware-1.0.0_rc2.ebuild, alsa-firmware-1.0.1.ebuild,
+  alsa-firmware-1.0.2.ebuild, alsa-firmware-1.0.3.ebuild:
+  Removed old ebuilds.  Added IUSE
+
+*alsa-firmware-1.0.3 (01 Mar 2004)
+
+  01 Mar 2004; Martin Holzer <mholzer@gentoo.org> alsa-firmware-1.0.3.ebuild:
+  Version bumped.
+
+*alsa-firmware-1.0.2 (27 Jan 2004)
+
+  27 Jan 2004; Martin Holzer <mholzer@gentoo.org> alsa-firmware-1.0.2.ebuild:
+  Version bumped.
+
+*alsa-firmware-1.0.1 (10 Jan 2004)
+
+  10 Jan 2004; Martin Holzer <mholzer@gentoo.org> alsa-firmware-1.0.1.ebuild:
+  VErsion bumped.
+
+*alsa-firmware-1.0.0_rc2 (07 Dec 2003)
+
+  07 Dec 2003; Martin Holzer <mholzer@gentoo.org>
+  alsa-firmware-1.0.0_rc2.ebuild:
+  Version bumped.
 
 *alsa-firmware-1.0.0_rc1 (02 Dec 2003)
 
diff --git a/media-sound/alsa-firmware/Manifest b/media-sound/alsa-firmware/Manifest
index 5443f0c6b456..ca11ae65e0ca 100644
--- a/media-sound/alsa-firmware/Manifest
+++ b/media-sound/alsa-firmware/Manifest
@@ -1,2 +1,18 @@
-MD5 b5a667c327db616657afed4c5d599bca alsa-firmware-1.0.0_rc1.ebuild 511
-MD5 9c8373dda0046b211956970126ccf2e2 files/digest-alsa-firmware-1.0.0_rc1 76
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 dbb5ac0c1131be7a6f7153e7e5e4f426 ChangeLog 2954
+MD5 e1defd6190a40d70246d8e3093d5757f alsa-firmware-1.0.10.ebuild 678
+MD5 3420599c69435348716238fa365b5215 alsa-firmware-1.0.8-r1.ebuild 649
+MD5 b43e9e138f11590663e0d0ffa1274eaf alsa-firmware-1.0.9.ebuild 677
+MD5 deb370043b630e033e580fec20c65efd files/digest-alsa-firmware-1.0.10 74
+MD5 455a8b164a15d1dfd6a5784479456b7e files/digest-alsa-firmware-1.0.8-r1 73
+MD5 159c0eac9528b3b6171929caf5b9509d files/digest-alsa-firmware-1.0.9 73
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfGuMAiZjviIA2XgRAlc5AJ93/qScSFGS1LrAJ6Ql5WVEYOG4YQCgvFBG
+6IFDper2nkEinyi+kItKHgM=
+=rqqy
+-----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-firmware/alsa-firmware-1.0.10.ebuild b/media-sound/alsa-firmware/alsa-firmware-1.0.10.ebuild
index 41d0113409dc..ef05f8d014a8 100644
--- a/media-sound/alsa-firmware/alsa-firmware-1.0.10.ebuild
+++ b/media-sound/alsa-firmware/alsa-firmware-1.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/media-sound/alsa-firmware/alsa-firmware-1.0.10.ebuild,v 1.1 2005/11/17 11:37:28 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-firmware/alsa-firmware-1.0.10.ebuild,v 1.1.1.1 2005/11/30 09:38:00 chriswhite Exp $
 
 DESCRIPTION="Advanced Linux Sound Architecture firmware"
 HOMEPAGE="http://www.alsa-project.org/"
diff --git a/media-sound/alsa-firmware/alsa-firmware-1.0.8-r1.ebuild b/media-sound/alsa-firmware/alsa-firmware-1.0.8-r1.ebuild
index ecbe34a05792..98d668d8583b 100644
--- a/media-sound/alsa-firmware/alsa-firmware-1.0.8-r1.ebuild
+++ b/media-sound/alsa-firmware/alsa-firmware-1.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/media-sound/alsa-firmware/alsa-firmware-1.0.8-r1.ebuild,v 1.1 2005/04/22 11:15:04 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-firmware/alsa-firmware-1.0.8-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:00 chriswhite Exp $
 
 IUSE=""
 
diff --git a/media-sound/alsa-firmware/alsa-firmware-1.0.9.ebuild b/media-sound/alsa-firmware/alsa-firmware-1.0.9.ebuild
index 4995dc8090c2..7c37f488cfbc 100644
--- a/media-sound/alsa-firmware/alsa-firmware-1.0.9.ebuild
+++ b/media-sound/alsa-firmware/alsa-firmware-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/media-sound/alsa-firmware/alsa-firmware-1.0.9.ebuild,v 1.1 2005/05/27 20:38:42 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-firmware/alsa-firmware-1.0.9.ebuild,v 1.1.1.1 2005/11/30 09:38:00 chriswhite Exp $
 
 DESCRIPTION="Advanced Linux Sound Architecture firmware"
 HOMEPAGE="http://www.alsa-project.org/"
diff --git a/media-sound/alsa-firmware/metadata.xml b/media-sound/alsa-firmware/metadata.xml
index 78ec7f6984fe..e1774e3d9ad7 100644
--- a/media-sound/alsa-firmware/metadata.xml
+++ b/media-sound/alsa-firmware/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sound</herd>
-<maintainer>
-  <email>sound@gentoo.org</email>
-  <name>Gentoo Sound Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/media-sound/alsa-headers/ChangeLog b/media-sound/alsa-headers/ChangeLog
index 1101c0dfd3c4..5abe237814b5 100644
--- a/media-sound/alsa-headers/ChangeLog
+++ b/media-sound/alsa-headers/ChangeLog
@@ -1,6 +1,223 @@
 # ChangeLog for media-sound/alsa-headers
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-headers/ChangeLog,v 1.1 2004/07/19 19:05:41 eradicator Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-headers/ChangeLog,v 1.1.1.1 2005/11/30 09:38:40 chriswhite Exp $
+
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org> alsa-headers-1.0.10.ebuild:
+  Stable on ppc64; bug #111968
+
+  19 Nov 2005; Guy Martin <gmsoft@gentoo.org>
+  alsa-headers-1.0.10_rc3.ebuild:
+  Stable on hppa.
+
+*alsa-headers-1.0.10 (16 Nov 2005)
+
+  16 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +alsa-headers-1.0.10.ebuild:
+  Bump to latest upstream version.
+
+  15 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  alsa-headers-1.0.10_rc3.ebuild:
+  Stable on x86 wrt bug #112442.
+
+  14 Nov 2005; Luca Barbato <lu_zero@gentoo.org>
+  alsa-headers-1.0.10_rc3.ebuild:
+  Marked ppc to match linux 2.6.14
+
+  13 Nov 2005; Petteri Räty <betelgeuse@gentoo.org>
+  alsa-headers-1.0.10_rc2.ebuild:
+  Marked stable on x86 for bug #111968.
+
+*alsa-headers-1.0.10_rc3 (08 Nov 2005)
+
+  08 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +alsa-headers-1.0.10_rc3.ebuild:
+  Bump to latest version.
+
+*alsa-headers-1.0.10_rc2 (11 Oct 2005)
+
+  11 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -alsa-headers-1.0.10_rc1.ebuild, +alsa-headers-1.0.10_rc2.ebuild:
+  Bumped to newer rc.
+
+*alsa-headers-1.0.10_rc1 (25 Aug 2005)
+
+  25 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +alsa-headers-1.0.10_rc1.ebuild:
+  Added ebuild for alsa 1.0.10_rc1.
+
+  24 Aug 2005; Aron Griffis <agriffis@gentoo.org>
+  alsa-headers-1.0.9b.ebuild:
+  stable on ia64
+
+  29 Jul 2005; Guy Martin <gmsoft@gentoo.org> alsa-headers-1.0.9b.ebuild:
+  Stable on hppa.
+
+  21 Jul 2005; Joseph Jezak <josejx@gentoo.org> alsa-headers-1.0.9b.ebuild:
+  Marked ppc stable.
+
+  20 Jul 2005; Markus Rothe <corsair@gentoo.org> alsa-headers-1.0.9b.ebuild:
+  Stable on ppc64
+
+  19 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  alsa-headers-1.0.9b.ebuild:
+  Stable on alpha.
+
+  19 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-headers-1.0.9b.ebuild:
+  Added to ~sparc.
+
+  17 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-headers-1.0.9b.ebuild:
+  Stable amd64, x86.
+
+  12 Jul 2005; Stephen P. Becker <geoman@gentoo.org>
+  alsa-headers-1.0.8.ebuild:
+  stable on mips
+
+  07 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -alsa-headers-1.0.5a.ebuild:
+  Removing old verison.
+
+*alsa-headers-1.0.9b (07 Jul 2005)
+
+  07 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -alsa-headers-1.0.9_rc3.ebuild, -alsa-headers-1.0.9.ebuild,
+  +alsa-headers-1.0.9b.ebuild:
+  Version bump.
+
+  12 Jun 2005; Bryan Østergaard <kloeri@gentoo.org>
+  alsa-headers-1.0.8.ebuild:
+  Stable on alpha.
+
+*alsa-headers-1.0.9 (27 May 2005)
+
+  27 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +alsa-headers-1.0.9.ebuild:
+  New upstream version released, see #94196.
+
+  05 May 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -alsa-headers-1.0.7.ebuild:
+  Removing old version.
+
+*alsa-headers-1.0.9_rc3 (05 May 2005)
+
+  05 May 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -alsa-headers-1.0.9_rc2.ebuild, +alsa-headers-1.0.9_rc3.ebuild:
+  Version bump.
+
+  05 May 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -alsa-headers-1.0.6a.ebuild, -alsa-headers-1.0.8_rc1.ebuild:
+  Cleaning out old versions.
+
+*alsa-headers-1.0.9_rc2 (31 Mar 2005)
+
+  31 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +alsa-headers-1.0.9_rc2.ebuild:
+  Version bump.
+
+  29 Mar 2005; Markus Rothe <corsair@gentoo.org> alsa-headers-1.0.8.ebuild:
+  Stable on ppc64
+
+  27 Mar 2005; Guy Martin <gmsoft@gentoo.org> alsa-headers-1.0.8.ebuild:
+  Stable on hppa.
+
+  20 Mar 2005; Lars Weiler <pylon@gentoo.org> alsa-headers-1.0.8.ebuild:
+  Readded ppc to a 1.x version.
+
+  09 Mar 2005; Mike Gardiner <obz@gentoo.org> alsa-headers-1.0.7.ebuild:
+  Keyworded ppc
+
+  08 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-headers-1.0.8.ebuild:
+  Stable amd64, sparc, x86.
+
+  25 Jan 2005; Markus Rothe <corsair@gentoo.org> alsa-headers-1.0.7.ebuild:
+  Stable on ppc64
+
+*alsa-headers-1.0.8 (14 Jan 2005)
+
+  14 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +alsa-headers-1.0.8.ebuild, -alsa-headers-1.0.8_rc2.ebuild:
+  Version bump.
+
+  12 Jan 2005; Guy Martin <gmsoft@gentoo.org> alsa-headers-1.0.8_rc1.ebuild:
+  Stable on hppa.
+
+  11 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-headers-1.0.8_rc1.ebuild:
+  Stable x86 as it's needed for 2.6.10 kernels (which is in stable x86).
+
+*alsa-headers-1.0.8_rc2 (11 Jan 2005)
+
+  11 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +alsa-headers-1.0.8_rc2.ebuild:
+  Version bump.
+
+*alsa-headers-1.0.8_rc1 (01 Jan 2005)
+
+  01 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +alsa-headers-1.0.8_rc1.ebuild:
+  Version bump.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-headers-1.0.7.ebuild:
+  Stable amd64, x86.
+
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org> alsa-headers-1.0.6a.ebuild:
+  Stable on ppc64
+
+  30 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-headers-1.0.7.ebuild:
+  Stable sparc.
+
+*alsa-headers-1.0.7 (12 Nov 2004)
+
+  12 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-headers-1.0.5a.ebuild, alsa-headers-1.0.6a.ebuild,
+  +alsa-headers-1.0.7.ebuild:
+  Version bump.
+
+  03 Nov 2004; Stephen P. Becker <geoman@gentoo.org>
+  alsa-headers-1.0.6a.ebuild:
+  added ~mips keyword
+
+  08 Oct 2004; Guy Martin <gmsoft@gentoo.org> alsa-headers-1.0.6a.ebuild:
+  Marked stable on hppa.
+
+  22 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-headers-1.0.5a.ebuild, alsa-headers-1.0.6a.ebuild:
+  Removed unneccessary inherits.
+
+  22 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-headers-1.0.6a.ebuild:
+  Added to ~sparc.
+
+  22 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-headers-1.0.6a.ebuild:
+  Stable amd64, x86.
+
+  25 Aug 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/alsa-headers-1.0.6a-user.patch:
+  Added patch for undefined __user.
+
+*alsa-headers-1.0.6a (23 Aug 2004)
+
+  23 Aug 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +alsa-headers-1.0.6a.ebuild:
+  Version bump.
+
+  17 Aug 2004; Guy Martin <gmsoft@gentoo.org> alsa-headers-1.0.5a.ebuild:
+  Stable on hppa.
+
+  27 Jul 2004; Aron Griffis <agriffis@gentoo.org> alsa-headers-1.0.5a.ebuild:
+  stable on alpha and ia64
+
+  24 Jul 2004; Lars Weiler <pylon@gentoo.org> alsa-headers-1.0.5a.ebuild:
+  Stable on ppc.
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-headers-1.0.5a.ebuild:
+  Fixing keywords to match alsa-driver.
 
 *alsa-headers-1.0.5a (19 Jul 2004)
 
diff --git a/media-sound/alsa-headers/Manifest b/media-sound/alsa-headers/Manifest
index c377e1efe570..c7229259ce2f 100644
--- a/media-sound/alsa-headers/Manifest
+++ b/media-sound/alsa-headers/Manifest
@@ -1,2 +1,13 @@
-MD5 229dd7b2c9ffcf9943b90d14d20cf52f alsa-headers-1.0.5a.ebuild 1723
-MD5 deb0bfd8e2cfe0ba434fb5a820294502 files/digest-alsa-headers-1.0.5a 72
+MD5 c6e97a92af7932849568e1ffe45779fe ChangeLog 6745
+MD5 c6fb273cd23828076b44c689f5363999 alsa-headers-1.0.8.ebuild 1045
+MD5 b92b40894cafd64ded78e9e35b527bd7 alsa-headers-1.0.9b.ebuild 1024
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 a9e144dbe9c96be33f280e18ee2e369d alsa-headers-1.0.10_rc2.ebuild 1060
+MD5 68e0083b150cb84847cd0788fa19969c alsa-headers-1.0.10_rc3.ebuild 1054
+MD5 2fb359398ad7264059fd1e36406b1c34 alsa-headers-1.0.10.ebuild 1053
+MD5 6985658411b4e459ef8b03a25f480404 files/alsa-headers-1.0.6a-user.patch 419
+MD5 14b6c8d954e36bb9d40c97cf051220f0 files/digest-alsa-headers-1.0.8 71
+MD5 496627835733f8108e6b10dfc8ee9bf4 files/digest-alsa-headers-1.0.9b 72
+MD5 569ec84f258f90c508827a3040062f41 files/digest-alsa-headers-1.0.10_rc2 75
+MD5 ad7631557a0317471d29e4c26cfb4cf2 files/digest-alsa-headers-1.0.10_rc3 75
+MD5 5474546fa4977a1fa63fbab0a155fd15 files/digest-alsa-headers-1.0.10 72
diff --git a/media-sound/alsa-headers/alsa-headers-1.0.10.ebuild b/media-sound/alsa-headers/alsa-headers-1.0.10.ebuild
index 87d6660a0956..269b00785b9a 100644
--- a/media-sound/alsa-headers/alsa-headers-1.0.10.ebuild
+++ b/media-sound/alsa-headers/alsa-headers-1.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/media-sound/alsa-headers/alsa-headers-1.0.10.ebuild,v 1.1 2005/11/16 19:59:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-headers/alsa-headers-1.0.10.ebuild,v 1.1.1.1 2005/11/30 09:38:40 chriswhite Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://alsaproject/driver/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/media-sound/alsa-headers/alsa-headers-1.0.10_rc2.ebuild b/media-sound/alsa-headers/alsa-headers-1.0.10_rc2.ebuild
index 35d7db45fb29..dbe339c7de36 100644
--- a/media-sound/alsa-headers/alsa-headers-1.0.10_rc2.ebuild
+++ b/media-sound/alsa-headers/alsa-headers-1.0.10_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/media-sound/alsa-headers/alsa-headers-1.0.10_rc2.ebuild,v 1.1 2005/10/11 15:33:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-headers/alsa-headers-1.0.10_rc2.ebuild,v 1.1.1.1 2005/11/30 09:38:40 chriswhite Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://alsaproject/driver/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/media-sound/alsa-headers/alsa-headers-1.0.10_rc3.ebuild b/media-sound/alsa-headers/alsa-headers-1.0.10_rc3.ebuild
index 7c5e71d6a24c..e327d5a7e5a4 100644
--- a/media-sound/alsa-headers/alsa-headers-1.0.10_rc3.ebuild
+++ b/media-sound/alsa-headers/alsa-headers-1.0.10_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/media-sound/alsa-headers/alsa-headers-1.0.10_rc3.ebuild,v 1.1 2005/11/08 12:16:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-headers/alsa-headers-1.0.10_rc3.ebuild,v 1.1.1.1 2005/11/30 09:38:40 chriswhite Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://alsaproject/driver/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/media-sound/alsa-headers/alsa-headers-1.0.8.ebuild b/media-sound/alsa-headers/alsa-headers-1.0.8.ebuild
index bccb574de2e0..61be945b8b80 100644
--- a/media-sound/alsa-headers/alsa-headers-1.0.8.ebuild
+++ b/media-sound/alsa-headers/alsa-headers-1.0.8.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/media-sound/alsa-headers/alsa-headers-1.0.8.ebuild,v 1.1 2005/01/14 13:52:07 eradicator Exp $
-
-IUSE=""
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-headers/alsa-headers-1.0.8.ebuild,v 1.1.1.1 2005/11/30 09:38:40 chriswhite Exp $
 
 inherit eutils
 
@@ -19,7 +17,8 @@ SRC_URI="mirror://alsaproject/driver/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
+IUSE=""
 
 DEPEND=""
 
@@ -44,5 +43,5 @@ src_compile() {
 src_install() {
 	cd ${S}/alsa-kernel/include
 	insinto /usr/include/sound
-	doins *.h
+	doins *.h || die "include failed"
 }
diff --git a/media-sound/alsa-headers/alsa-headers-1.0.9b.ebuild b/media-sound/alsa-headers/alsa-headers-1.0.9b.ebuild
index 05642bea6a30..1e507109c808 100644
--- a/media-sound/alsa-headers/alsa-headers-1.0.9b.ebuild
+++ b/media-sound/alsa-headers/alsa-headers-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/media-sound/alsa-headers/alsa-headers-1.0.9b.ebuild,v 1.1 2005/07/07 09:12:21 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-headers/alsa-headers-1.0.9b.ebuild,v 1.1.1.1 2005/11/30 09:38:40 chriswhite Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://alsaproject/driver/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/media-sound/alsa-patch-bay/ChangeLog b/media-sound/alsa-patch-bay/ChangeLog
index 6737d6ec08f2..926995cba059 100644
--- a/media-sound/alsa-patch-bay/ChangeLog
+++ b/media-sound/alsa-patch-bay/ChangeLog
@@ -1,9 +1,93 @@
 # ChangeLog for media-sound/alsa-patch-bay
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-patch-bay/ChangeLog,v 1.1 2002/12/21 05:36:58 agenkin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-patch-bay/ChangeLog,v 1.1.1.1 2005/11/30 09:38:00 chriswhite Exp $
+
+  19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  Remove retired developer from metadata.xml.
+
+  09 Jan 2005; Sven Wegener <swegener@gentoo.org>
+  alsa-patch-bay-1.0.0-r1.ebuild:
+  Added missing parentheses in SRC_URI/*DEPEND/LICENSE.
+
+*alsa-patch-bay-1.0.0-r2 (22 Nov 2004)
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +alsa-patch-bay-1.0.0-r2.ebuild:
+  Ebuild cleanup.  Added support for more reasonable USE flags.  Added to ~sparc.
+
+  02 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -alsa-patch-bay-0.5.1-r1.ebuild, -alsa-patch-bay-0.5.2.ebuild,
+  -alsa-patch-bay-1.0.0.ebuild:
+  Removing old versions.
+
+  03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-patch-bay-1.0.0-r1.ebuild:
+  Stable amd64, x86.
+
+*alsa-patch-bay-1.0.0-r1 (03 Jul 2004)
+
+  03 Jul 2004; David Holm <dholm@gentoo.org> alsa-patch-bay-1.0.0-r1.ebuild:
+  Added to ~ppc.
+
+  03 Jul 2004; Frank van de Pol <fvdpol@gentoo.org>
+  +files/alsa-patch-bay-1.0.0-amd64.patch:
+  AMD64 compilation fixes.
+
+  14 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-patch-bay-1.0.0.ebuild:
+  Fixed gtkmm dependency to close bug #50964.
+
+  08 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-patch-bay-0.5.1-r1.ebuild, alsa-patch-bay-0.5.2.ebuild,
+  alsa-patch-bay-1.0.0.ebuild:
+  Stable x86.  Small cleanup.
+
+*alsa-patch-bay-1.0.0 (19 Jan 2004)
+
+  19 Jan 2004; <torbenh@gentoo.org> alsa-patch-bay-0.5.1-r1.ebuild,
+  alsa-patch-bay-0.5.2.ebuild, alsa-patch-bay-1.0.0.ebuild, metadata.xml:
+  - Added new Version 1.0.0
+  - Added metadata.xml
+  - bumped 0.5.2 to stable
+
+  07 Dec 2003; Heinrich Wendel <lanius@gentoo.org>
+  alsa-patch-bay-0.5.1-r1.ebuild, alsa-patch-bay-0.5.2.ebuild:
+  fixed alsa deps
+
+  20 Sep 2003; jje <jje@gentoo.org> alsa-patch-bay-0.3.ebuild,
+  alsa-patch-bay-0.4.1.ebuild, alsa-patch-bay-0.5.1.ebuild:
+  Remove old versions.
+
+*alsa-patch-bay-0.5.2 (20 Sep 2003)
+
+  20 Sep 2003; jje <jje@gentoo.org> alsa-patch-bay-0.5.2.ebuild:
+  Version bump. Fixes compile issue w/gcc3.3.1. Closes #28103.
+
+*alsa-patch-bay-0.5.1-r1 (08 Jun 2003)
+
+  08 Jun 2003; root <torbenh@gentoo.org> Manifest alsa-patch-bay-0.5.1-r1.ebuild files/digest-alsa-patch-bay-0.5.1-r1 :
+  fixed DEPEND to >gtkmm-2.0 and fixed IUSE
+
+  09 May 2003; Bartosch Pixa <darkspecter@gentoo.org>
+  alsa-patch-bay-0.5.1.ebuild:
+  minor symlink fix
+
+*alsa-patch-bay-0.5.1 (09 May 2003)
+
+  09 May 2003; Bartosch Pixa <darkspecter@gentoo.org>
+  alsa-patch-bay-0.5.1.ebuild:
+  version bump and small sandbox fix
+
+*alsa-patch-bay-0.4.1 (04 Mar 2003)
+
+  04 Mar 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Version bump by Jonathan Kraut <jkraut1@nyc.rr.com>.
 
 *alsa-patch-bay-0.3 (20 Dec 2002)
 
+  27 Dec 2002; Arcady Genkin <agenkin@gentoo.org> :
+  Unmasking to ~x86.
+
   20 Dec 2002; Arcady Genkin <agenkin@gentoo.org> :
   Initial version by Jonathan Kraut <jkraut1@nyc.rr.com>.  Closes bug
   #12405.
diff --git a/media-sound/alsa-patch-bay/Manifest b/media-sound/alsa-patch-bay/Manifest
index e69de29bb2d1..8dbf6d53c78f 100644
--- a/media-sound/alsa-patch-bay/Manifest
+++ b/media-sound/alsa-patch-bay/Manifest
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 bfabdcfc2c2e022ff0470fae2a5b7e23 ChangeLog 3125
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 3df37763a771c4c2d79f64432baf8d5b alsa-patch-bay-1.0.0-r2.ebuild 1293
+MD5 edb752f53038584a03b60c6de92a673d alsa-patch-bay-1.0.0-r1.ebuild 1404
+MD5 f3ba80b5a1ce25a42136ca5f4396d691 files/digest-alsa-patch-bay-1.0.0-r2 72
+MD5 f3ba80b5a1ce25a42136ca5f4396d691 files/digest-alsa-patch-bay-1.0.0-r1 72
+MD5 3451271c44f72268abb6051fa9af1145 files/alsa-patch-bay-1.0.0-amd64.patch 2030
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCZLyvKf2g/qXtneoRApcEAKCMKYvVErrG9ETkeSQod0WKAqZI8ACeMZVg
+tD0Tal+XbH4QDpw3yhzgQHc=
+=iymm
+-----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-patch-bay/alsa-patch-bay-1.0.0-r1.ebuild b/media-sound/alsa-patch-bay/alsa-patch-bay-1.0.0-r1.ebuild
index 3b7066ee5260..8c19858b6e15 100644
--- a/media-sound/alsa-patch-bay/alsa-patch-bay-1.0.0-r1.ebuild
+++ b/media-sound/alsa-patch-bay/alsa-patch-bay-1.0.0-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/media-sound/alsa-patch-bay/alsa-patch-bay-1.0.0-r1.ebuild,v 1.1 2004/07/02 23:46:26 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-patch-bay/alsa-patch-bay-1.0.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:00 chriswhite Exp $
 
 inherit eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://pkl.net/~node/alsa-patch-bay.html"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64 ~ppc"
 
 IUSE="fltk"
 
@@ -17,8 +17,8 @@ IUSE="fltk"
 # To use fltk instead, do $ USE="fltk" emerge alsa-patch-bay
 # Note: fltk is not an official USE flag, and the dependency on
 # it may go away in the future.
-DEPEND="!fltk? =dev-cpp/gtkmm-2.2*
-	fltk? >=x11-libs/fltk-1.1.2
+DEPEND="!fltk? ( =dev-cpp/gtkmm-2.2* )
+	fltk? ( >=x11-libs/fltk-1.1.2 )
 	>=media-libs/alsa-lib-0.9.0_rc1"
 
 SRC_URI="http://pkl.net/~node/software/${P}.tar.gz"
diff --git a/media-sound/alsa-patch-bay/alsa-patch-bay-1.0.0-r2.ebuild b/media-sound/alsa-patch-bay/alsa-patch-bay-1.0.0-r2.ebuild
index 35f747b636b6..ecc866d13e0a 100644
--- a/media-sound/alsa-patch-bay/alsa-patch-bay-1.0.0-r2.ebuild
+++ b/media-sound/alsa-patch-bay/alsa-patch-bay-1.0.0-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/media-sound/alsa-patch-bay/alsa-patch-bay-1.0.0-r2.ebuild,v 1.1 2004/11/22 22:30:48 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-patch-bay/alsa-patch-bay-1.0.0-r2.ebuild,v 1.1.1.1 2005/11/30 09:38:00 chriswhite Exp $
 
 IUSE="alsa jack ladcca fltk gtk"
 
diff --git a/media-sound/alsa-patch-bay/metadata.xml b/media-sound/alsa-patch-bay/metadata.xml
index d4ce46c038ab..e1774e3d9ad7 100644
--- a/media-sound/alsa-patch-bay/metadata.xml
+++ b/media-sound/alsa-patch-bay/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sound</herd>
-<maintainer>
-  <email>torbenh@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/media-sound/alsa-tools/ChangeLog b/media-sound/alsa-tools/ChangeLog
index d10a72190665..3fc9820500f0 100644
--- a/media-sound/alsa-tools/ChangeLog
+++ b/media-sound/alsa-tools/ChangeLog
@@ -1,10 +1,379 @@
-# ChangeLog for media-libs/alsa-lib
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.1 2002/02/17 08:04:30 agenkin Exp $
+# ChangeLog for media-sound/alsa-tools
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.1.1.1 2005/11/30 09:38:03 chriswhite Exp $
 
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org> alsa-tools-1.0.10.ebuild:
+  Stable on ppc64; bug #111968
+
+*alsa-tools-1.0.10 (16 Nov 2005)
+
+  16 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +alsa-tools-1.0.10.ebuild:
+  Bump to latest upstream version.
+
+*alsa-tools-1.0.10_rc2 (08 Nov 2005)
+
+  08 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +alsa-tools-1.0.10_rc2.ebuild:
+  Bump to latest version.
+
+  07 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  alsa-tools-1.0.9-r2.ebuild:
+  Added missing flag-o-matic inherit.
+
+*alsa-tools-1.0.9-r2 (31 Oct 2005)
+
+  31 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  alsa-tools-1.0.9-r1.ebuild, +alsa-tools-1.0.9-r2.ebuild:
+  Split X useflag into fltk and gtk flags as per bug #111028. Patch from
+  Henrik Brix Andersen <brix@gentoo.org>. Don't rewrite LDFLAGS.
+
+*alsa-tools-1.0.9-r1 (30 Oct 2005)
+
+  30 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +alsa-tools-1.0.9-r1.ebuild:
+  Added echomixer utility as per bug #103746.
+
+  21 Jul 2005; Markus Rothe <corsair@gentoo.org> alsa-tools-1.0.9.ebuild:
+  Stable on ppc64
+
+*alsa-tools-1.0.9 (27 May 2005)
+
+  27 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +alsa-tools-1.0.9.ebuild:
+  New upstream version released, see #94196.
+
+  12 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/alsa-tools-1.0.3-kernel-2.6.patch, -alsa-tools-0.9.8.ebuild,
+  -alsa-tools-1.0.8.ebuild, alsa-tools-1.0.8-r1.ebuild:
+  Removing old versions.
+
+  01 Apr 2005; Joseph Jezak <josejx@gentoo.org> alsa-tools-1.0.8-r1.ebuild:
+  Marked ppc stable for bug #86064.
+
+  29 Mar 2005; Markus Rothe <corsair@gentoo.org> alsa-tools-1.0.8-r1.ebuild:
+  Stable on ppc64
+
+  20 Mar 2005; Lars Weiler <pylon@gentoo.org> alsa-tools-1.0.8.ebuild:
+  Readded ppc to a 1.x version.
+
+  16 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -alsa-tools-1.0.6.ebuild:
+  Removing old versions.
+
+  08 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-tools-1.0.8.ebuild:
+  Stable amd64, sparc, x86.
+
+  12 Feb 2005; Robin H. Johnson <robbat2@gentoo.org>
+  alsa-tools-1.0.7.ebuild:
+  Add ~mips for my XXS1500 hardware.
+
+  26 Jan 2005; Chris White <chriswhite@gentoo.org>
+  alsa-tools-1.0.8-r1.ebuild:
+  The same tool that happily breaks on ppc64 also breaks on ppc. Added some
+  logic for this as well.
+
+*alsa-tools-1.0.8-r1 (25 Jan 2005)
+
+  25 Jan 2005; Markus Rothe <corsair@gentoo.org> +alsa-tools-1.0.8-r1.ebuild:
+  sb16_csp won't build on ppc64
+
+*alsa-tools-1.0.8 (23 Jan 2005)
+
+  23 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +alsa-tools-1.0.8.ebuild:
+  Version bump.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-tools-1.0.7.ebuild:
+  Stable amd64, sparc, x86.
+
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org> alsa-tools-1.0.6.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-tools-1.0.7.ebuild:
+  Added to ~sparc.
+
+*alsa-tools-1.0.7 (12 Nov 2004)
+
+  12 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-tools-1.0.6.ebuild, +alsa-tools-1.0.7.ebuild:
+  Version bump.
+
+  12 Nov 2004; <SeJo@gentoo.org> alsa-tools-1.0.6.ebuild:
+  stable on ppc asked by eradicator
+
+  12 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -alsa-tools-1.0.4.ebuild, -alsa-tools-1.0.5-r1.ebuild:
+  Removing old versions.
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-tools-1.0.6.ebuild:
+  get_libdir fixes.
+
+  02 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -alsa-tools-0.9.0_rc1-r1.ebuild:
+  Removing ancient version.
+
+  23 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-tools-1.0.6.ebuild:
+  Stable amd64, x86.
+
+  02 Sep 2004; Travis Tilley <lv@gentoo.org> alsa-tools-1.0.5-r1.ebuild:
+  add gcc 3.4 fix to 1.0.5
+
+*alsa-tools-1.0.6 (23 Aug 2004)
+
+  23 Aug 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/alsa-tools-1.0.6-gcc34.patch, +alsa-tools-1.0.6.ebuild:
+  Version bump.
+
+  04 Aug 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -alsa-tools-1.0.2.ebuild, -alsa-tools-1.0.3.ebuild,
+  -alsa-tools-1.0.5.ebuild:
+  Removing old versions.
+
+  04 Aug 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-tools-1.0.5-r1.ebuild:
+  Stable x86 amd64.
+
+  24 Jul 2004; Lars Weiler <pylon@gentoo.org> :
+  Stable on ppc.
+
+*alsa-tools-1.0.5-r1 (26 Jun 2004)
+
+  26 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +alsa-tools-1.0.5-r1.ebuild:
+  Added USE=X support so we can avoid putting in unneccessary DEPs.
+
+  24 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-tools-1.0.5.ebuild:
+  Stable amd64 x86.
+
+*alsa-tools-1.0.5 (30 May 2004)
+
+  30 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-tools-1.0.5.ebuild:
+  Version Bump.
+
+  10 May 2004; Daniel Ahlberg <aliz@gentoo.org> alsa-tools-1.0.4.ebuild:
+  Added amd64 keyword, closing #50606.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-tools-0.9.0_rc1-r1.ebuild:
+  Added IUSE.
+
+  16 Apr 2004; Travis Tilley <lv@gentoo.org> alsa-tools-1.0.4.ebuild:
+  added ~amd64 keyword and a gnuconfig_update needed to get alsa-tools to
+  recognise x86_64-unknown-linux-gnu as a valid arch
+
+*alsa-tools-1.0.4 (04 Apr 2004)
+
+  04 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-tools-1.0.3.ebuild, alsa-tools-1.0.4.ebuild:
+  1.0.3 stable on x86.  Version bump.
+
+  27 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-tools-0.9.1.ebuild, alsa-tools-1.0.0_rc2-r1.ebuild,
+  alsa-tools-1.0.1.ebuild:
+  Removing old ebuilds.
+
+  14 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-tools-1.0.3.ebuild, files/alsa-tools-1.0.3-kernel-2.6.patch:
+  Patch closes bug #42087.
+
+  09 Mar 2004; Tom Gall <tgall@gentoo.org> 
+  alsa-tools-1.0.0_rc2-r1.ebuild, alsa-tools-1.0.1.ebuild, 
+  alsa-tools-1.0.2.ebuild, alsa-tools-1.0.3.ebuild:
+  removed ppc64 - we're not ready yet
+
+*alsa-tools-1.0.3 (01 Mar 2004)
+
+  01 Mar 2004; Martin Holzer <mholzer@gentoo.org> alsa-tools-1.0.3.ebuild:
+  Version bumped.
+
+  19 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-tools-0.9.0_rc1-r1.ebuild, alsa-tools-0.9.1.ebuild,
+  alsa-tools-0.9.8.ebuild, alsa-tools-1.0.0_rc2-r1.ebuild,
+  alsa-tools-1.0.1.ebuild, alsa-tools-1.0.2.ebuild:
+  The user can now override which tools get built by default by setting the
+  ALSA_TOOLS environment variable. Closes bug #37784.
+
+*alsa-tools-1.0.2 (27 Jan 2004)
+
+  27 Jan 2004; Martin Holzer <mholzer@gentoo.org> alsa-tools-1.0.2.ebuild:
+  Version bumped.
+
+  17 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> alsa-tools-0.9.8.ebuild:
+  manifest fix
+
+  16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> alsa-tools-0.9.8.ebuild:
+  set ppc in keywords
+
+*alsa-tools-1.0.1 (10 Jan 2004)
+
+  10 Jan 2004; Martin Holzer <mholzer@gentoo.org> alsa-tools-1.0.1.ebuild:
+  Version bumped.
+
+*alsa-tools-1.0.0_rc2-r1 (03 Jan 2004)
+
+  03 Jan 2004; Martin Holzer <mholzer@gentoo.org>
+  alsa-tools-1.0.0_rc2-r1.ebuild:
+  adding more tools. Closes 36503
+
+*alsa-tools-1.0.0_rc2 (07 Dec 2003)
+
+  07 Dec 2003; Martin Holzer <mholzer@gentoo.org> alsa-tools-1.0.0_rc2.ebuild:
+  Version bumped.
+
+*alsa-tools-1.0.0_rc1 (02 Dec 2003)
+
+  02 Dec 2003; Martin Holzer <mholzer@gentoo.org> alsa-tools-1.0.0_rc1.ebuild:
+  Version bumped.
+
+  26 Nov 2003; Martin Holzer <mholzer@gentoo.org> alsa-tools-0.9.8.ebuild:
+  marked x86 stable.
+
+*alsa-tools-0.9.8 (25 Oct 2003)
+
+  25 Oct 2003; Martin Holzer <mholzer@gentoo.org> alsa-tools-0.9.8.ebuild:
+  Version bumped.
+
+  07 Oct 2003; Bartosch Pixa <darkspecter@gentoo.org> alsa-tools-0.9.7.ebuild:
+  minor econf tweak
+
+*alsa-tools-0.9.7 (02 Oct 2003)
+
+  02 Oct 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Version update.
+  Two tools have been removed (hdsploader and sscape_ctl), because they no
+  longer compile with linux headers from 2.4 series kernels.  I sent bug
+  reports to the alsa-devel people, so, hopefully, they'll be fixed in
+  subsequent releases.
+
+*alsa-tools-0.9.6-r1 (18 Aug 2003)
+
+  18 Aug 2003; Nick Hadaway <raker@gentoo.org> alsa-tools-0.9.6-r1.ebuild:
+  See bug #25775.  Brought the ALSA_TOOLS list up to date and added
+  a small fix0r for a non compiling hdspmixer.
+
+  04 Jul 2003; jje <jje@gentoo.org> alsa-tools-0.9.4.ebuild:
+  Added alsa-driver to DEPEND. See #23613. Most people follow the instructions
+  and this isn't needed. It does appear to be the case that it depends on
+  alsa-driver.
+
+  17 Jun 2003; <spider@gentoo.org> alsa-tools-0.9.0_rc1-r1.ebuild,
+  alsa-tools-0.9.1.ebuild, alsa-tools-0.9.3.ebuild, alsa-tools-0.9.4.ebuild:
+  Updated all gtk+ dependencies to be =x11-libs/gtk+-1.2* since 1.0 isn't in our
+  tree, and 2.x doesnt work here.
+
+  05 Jun 2003; Daniel Ahlberg <aliz@gentoo.org> alsa-tools-0.9.4.ebuild :
+  Switched to mirror://alsaproject in SRC_URI.
+
+*alsa-utils-0.9.6 (29 Jul 2003)
+
+  29 Jul 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Version update.
+
+*alsa-tools-0.9.5-r1 (15 Jul 2003)
+
+  15 Jul 2003; Arcady Geknin <agenkin@gentoo.org> :
+  Enabled patch by Jason Rhinelander <jason-gentoo@gossamer-threads.com>
+  (bug #22324) to fix compilation with gcc 3.3.
+
+*alsa-tools-0.9.5 (11 Jul 2003)
+
+  11 Jul 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Version update.
+  Require virtual/alsa instead of media-sound/alsa-driver.
+
+*alsa-tools-0.9.4 (03 June 2003)
+
+  06 June 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Added patch by Jason Rhinelander <jason-gentoo@gossamer-threads.com>
+  (bug #22324) to fix compilation with gcc 3.3.
+
+  03 June 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Version update.
+
+*alsa-tools-0.9.3 (04 May 2003)
+
+  04 May 2003; Daniel Ahlberg <aliz@gentoo.org> alsa-tools-0.9.3.ebuild :
+  Version bump.
+
+*alsa-tools-0.9.1 (12 Mar 2003)
+
+  15 Apr 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Marking stable on x86.
+
+  12 Mar 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Update to version 0.9.1.
+
+*alsa-tools-0.9.0_rc8 (03 Mar 2003)
+
+  09 Mar 2003; Mark Guertin <gerk@gentoo.org> alsa-tools-0.9.0_rc8.ebuild:
+  set ~ppc in keywords
+
+  03 Mar 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Quick update to rc8.
+
+*alsa-tools-0.9.0_rc7 (04 Feb 2003)
+
+  04 Feb 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Quick update to rc7.
+	
+*alsa-tools-0.9.0_rc6 (19 Nov 2002)
+
+  19 Nov 2002; Arcady Genkin <agenkin@gentoo.org> alsa-tools-0.9.0_rc6.ebuild :
+  Quick update to rc6.  Legwork done by Roman Weber <gentoo@gonzo.ch>.
+
+*alsa-tools-0.9.0_rc5 (24 Oct 2002)
+
+  24 Oct 2002; Arcady Genkin <agenkin@gentoo.org> alsa-tools-0.9.0_rc5.ebuild :
+
+  Quick update to rc5.
+
+*alsa-tools-0.9.0_rc4 (23 Oct 2002)
+
+  23 Oct 2002; Arcady Genkin <agenkin@gentoo.org> alsa-tools-0.9.0_rc4.ebuild :
+
+  Quick update to rc4.
+
+*alsa-tools-0.9.0_rc1-r1 (27 Jun 2002)
+
+  20 Oct 2002; Calum Selkirk <cselkirk@gentoo.org>
+  alsa-tools-0.9.0_rc1-r1.ebuild :
+
+  Added ppc to KEYWORDS.
+
+  27 Jun 2002; Spider <spider@gentoo.org> alsa-tools-0.9.0_rc1-r1.ebuild :
+  Just changed the dep to >= on alsa-lib to get the new portage to not install the old rc, it works with rc2 ..
+ 
+*alsa-tools-0.9.0_rc1 (27 Apr 2002)
+
+  23 May 2002; Arcady Genkin <agenkin@thpoon.com>
+	alsa-tools-0.9.0_rc1.ebuild :
+
+  Now installs man pages under /usr/share/man.
+
+  17 Feb 2002; Arcady Genkin <agenkin@thpoon.com>
+	alsa-tools-0.9.0_rc1.ebuild :
+
+  Quick update to version 0.9.0rc1.
+
+*alsa-tools-0.9.0_beta10-r1 (17 Feb 2002)
+
+  17 Feb 2002; Arcady Genkin <agenkin@thpoon.com>
+	alsa-tools-0.9.0_beta10.ebuild-r1 :
+
+  Installs the documentation properly.
+  Fixes a typo in the dependencies.
+	
 *alsa-tools-0.9.0_beta10 (17 Feb 2002)
 
   17 Feb 2002; Arcady Genkin <agenkin@thpoon.com>
 	alsa-tools-0.9.0_beta10.ebuild :
 
-  The first version of this package.
\ No newline at end of file
+  The first version of this package.
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index b62c9cadb385..17a3c661848f 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -1,7 +1,17 @@
-MD5 4dfb18f6947abb285caff8400c33d585 ChangeLog 2337
-MD5 8385a0d367ce05a3db2ffe05b15b9cf7 alsa-tools-0.9.0_rc1-r1.ebuild 1322
-MD5 f917f91872fa7330a546a370bd5034aa alsa-tools-0.9.1.ebuild 1300
-MD5 a070d2c329c5aa4f9d12cb23860bf074 alsa-tools-0.9.3.ebuild 1298
-MD5 2094cef02e54ae2c227bf442fa461f08 files/digest-alsa-tools-0.9.0_rc1-r1 72
-MD5 0c34b1352e030b5ef4d8ae5e102a8c3d files/digest-alsa-tools-0.9.1 69
-MD5 e36a6a2466b43a9d6ef67c7b178e1a9a files/digest-alsa-tools-0.9.3 69
+MD5 992278d7c981c36bbc9b7a25c82ed97f ChangeLog 11733
+MD5 a61565c41f57b7e963d503fa49b81ffe alsa-tools-1.0.7.ebuild 2325
+MD5 89881d144ad73dd853bb44c56d2fe839 alsa-tools-1.0.8-r1.ebuild 2437
+MD5 3a596fb47a6e44a98f01b8c2cc8c5d83 alsa-tools-1.0.9.ebuild 2351
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 9e250b9f58ca18e6d2f0c73ba622afad alsa-tools-1.0.9-r1.ebuild 2380
+MD5 a1dfd6a17f6c1782471e014503f503a5 alsa-tools-1.0.9-r2.ebuild 2367
+MD5 fcf3afa6e8dc04d230a3be035930283d alsa-tools-1.0.10_rc2.ebuild 2416
+MD5 6c293ef0745da1e77b8731efd711ba6a alsa-tools-1.0.10.ebuild 2409
+MD5 e2a96585b296f3f975f2cc8146eb3b74 files/alsa-tools-1.0.6-gcc34.patch 280
+MD5 d71b074ecf904c67e2cffaa96ca52367 files/digest-alsa-tools-1.0.7 69
+MD5 92018b0f62f8da61cc08aa7a03c5bb42 files/digest-alsa-tools-1.0.8-r1 69
+MD5 b2bfa51076f226abb79fed1c136b1d80 files/digest-alsa-tools-1.0.9 70
+MD5 b2bfa51076f226abb79fed1c136b1d80 files/digest-alsa-tools-1.0.9-r1 70
+MD5 b2bfa51076f226abb79fed1c136b1d80 files/digest-alsa-tools-1.0.9-r2 70
+MD5 f1cafa65d9aa68072b763e782ac2f261 files/digest-alsa-tools-1.0.10_rc2 74
+MD5 f679ba128fdc2882d1f7197dbc2a04d8 files/digest-alsa-tools-1.0.10 71
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.10.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.10.ebuild
index 41b82155e1de..ae838032da31 100644
--- a/media-sound/alsa-tools/alsa-tools-1.0.10.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.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/media-sound/alsa-tools/alsa-tools-1.0.10.ebuild,v 1.1 2005/11/16 19:59:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.10.ebuild,v 1.1.1.1 2005/11/30 09:38:03 chriswhite Exp $
 
 inherit gnuconfig eutils flag-o-matic
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://alsaproject/tools/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~mips ~ppc ppc64 ~sparc ~x86"
 IUSE="fltk gtk"
 
 DEPEND=">=media-libs/alsa-lib-1.0.0
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.10_rc2.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.10_rc2.ebuild
index fdc937fac9df..318506377b85 100644
--- a/media-sound/alsa-tools/alsa-tools-1.0.10_rc2.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.0.10_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/media-sound/alsa-tools/alsa-tools-1.0.10_rc2.ebuild,v 1.1 2005/11/08 12:21:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.10_rc2.ebuild,v 1.1.1.1 2005/11/30 09:38:03 chriswhite Exp $
 
 inherit gnuconfig eutils flag-o-matic
 
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.7.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.7.ebuild
index dce2d98f7f1f..58815392e684 100644
--- a/media-sound/alsa-tools/alsa-tools-1.0.7.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.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/media-sound/alsa-tools/alsa-tools-1.0.7.ebuild,v 1.1 2004/11/12 11:14:21 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.7.ebuild,v 1.1.1.1 2005/11/30 09:38:03 chriswhite Exp $
 
 IUSE="X"
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.alsa-project.org"
 SRC_URI="mirror://alsaproject/tools/${P}.tar.bz2"
 
 SLOT="0.9"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc sparc x86 ~mips"
 LICENSE="GPL-2"
 
 DEPEND=">=media-libs/alsa-lib-1.0.0
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.8-r1.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.8-r1.ebuild
index 6a0ad49f8191..a56879379eca 100644
--- a/media-sound/alsa-tools/alsa-tools-1.0.8-r1.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.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/media-sound/alsa-tools/alsa-tools-1.0.8-r1.ebuild,v 1.1 2005/01/25 16:04:18 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.8-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:03 chriswhite Exp $
 
 IUSE="X"
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.alsa-project.org"
 SRC_URI="mirror://alsaproject/tools/${P}.tar.bz2"
 
 SLOT="0.9"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~mips ppc ppc64 sparc x86"
 LICENSE="GPL-2"
 
 DEPEND=">=media-libs/alsa-lib-1.0.0
@@ -43,8 +43,8 @@ if [ -z "${ALSA_TOOLS}" ]; then
 					sscape_ctl us428control usx2yloader vxloader"
 	fi
 
-	# sb16_csp won't build on ppc64 (and is not needed)
-	if ! use ppc64; then
+	# sb16_csp won't build on ppc64 _AND_ ppc (and is not needed)
+	if  use !ppc64 && use !ppc; then
 		ALSA_TOOLS="${ALSA_TOOLS} sb16_csp"
 	fi
 
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.9-r1.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.9-r1.ebuild
index ecbd230260f4..0a645bfcdda7 100644
--- a/media-sound/alsa-tools/alsa-tools-1.0.9-r1.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.0.9-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/media-sound/alsa-tools/alsa-tools-1.0.9-r1.ebuild,v 1.1 2005/10/30 22:52:09 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.9-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:03 chriswhite Exp $
 
-inherit gnuconfig eutils
+inherit gnuconfig eutils flag-o-matic
 
 DESCRIPTION="Advanced Linux Sound Architecture tools"
 HOMEPAGE="http://www.alsa-project.org"
@@ -10,7 +10,7 @@ SRC_URI="mirror://alsaproject/tools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~amd64 ~mips ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="X"
 
 DEPEND=">=media-libs/alsa-lib-1.0.0
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.9-r2.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.9-r2.ebuild
index 01bb4f812553..46a8357090a6 100644
--- a/media-sound/alsa-tools/alsa-tools-1.0.9-r2.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.0.9-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/media-sound/alsa-tools/alsa-tools-1.0.9-r2.ebuild,v 1.1 2005/10/31 16:47:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.9-r2.ebuild,v 1.1.1.1 2005/11/30 09:38:03 chriswhite Exp $
 
-inherit gnuconfig eutils
+inherit gnuconfig eutils flag-o-matic
 
 DESCRIPTION="Advanced Linux Sound Architecture tools"
 HOMEPAGE="http://www.alsa-project.org"
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.9.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.9.ebuild
index d825c763fc9a..ff7de6edc160 100644
--- a/media-sound/alsa-tools/alsa-tools-1.0.9.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-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/media-sound/alsa-tools/alsa-tools-1.0.9.ebuild,v 1.1 2005/05/27 20:37:43 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.9.ebuild,v 1.1.1.1 2005/11/30 09:38:03 chriswhite Exp $
 
 inherit gnuconfig eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://alsaproject/tools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~mips ~ppc ppc64 ~sparc ~x86"
 IUSE="X"
 
 DEPEND=">=media-libs/alsa-lib-1.0.0
diff --git a/media-sound/alsa-tools/metadata.xml b/media-sound/alsa-tools/metadata.xml
index 03db19e85220..e1774e3d9ad7 100644
--- a/media-sound/alsa-tools/metadata.xml
+++ b/media-sound/alsa-tools/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sound</herd>
-<maintainer>
-  <email>agenkin@gentoo.org</email>
-  <name>Arcady Genkin</name>
-</maintainer>
 </pkgmetadata>
diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index 7a0040d43808..76f09a143c1b 100644
--- a/media-sound/alsa-utils/ChangeLog
+++ b/media-sound/alsa-utils/ChangeLog
@@ -1,6 +1,534 @@
 # ChangeLog for media-sound/alsa-utils
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/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/media-sound/alsa-utils/ChangeLog,v 1.1.1.1 2005/11/30 09:37:54 chriswhite Exp $
+
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org> alsa-utils-1.0.10.ebuild:
+  Stable on ppc64; bug #111968
+
+  19 Nov 2005; Guy Martin <gmsoft@gentoo.org> alsa-utils-1.0.10_rc3.ebuild:
+  Stable on hppa.
+
+*alsa-utils-1.0.10 (16 Nov 2005)
+
+  16 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +alsa-utils-1.0.10.ebuild:
+  Bump to latest upstream version.
+
+  15 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  alsa-utils-1.0.10_rc3.ebuild:
+  Stable on x86 wrt bug #112442.
+
+  15 Nov 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-utils-1.0.10_rc3.ebuild:
+  Added to ~sparc.
+
+  14 Nov 2005; Luca Barbato <lu_zero@gentoo.org>
+  alsa-utils-1.0.10_rc3.ebuild:
+  Marked ppc to match linux 2.6.14
+
+  13 Nov 2005; Petteri Räty <betelgeuse@gentoo.org>
+  alsa-utils-1.0.10_rc2.ebuild:
+  Marked stable on x86 for bug #111968.
+
+*alsa-utils-1.0.10_rc3 (08 Nov 2005)
+
+  08 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +alsa-utils-1.0.10_rc3.ebuild:
+  Bump to latest version.
+
+  31 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/alsasound-1.0.10_rc2, alsa-utils-1.0.10_rc2.ebuild:
+  Don't fail if restoring a card fails. See bug #100911.
+
+*alsa-utils-1.0.10_rc2 (11 Oct 2005)
+
+  11 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -alsa-utils-1.0.10_rc1.ebuild, +alsa-utils-1.0.10_rc2.ebuild:
+  Bumped to newer rc.
+
+  10 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/alsa-utils-1.0.9a-strsignal.patch, alsa-utils-1.0.9a-r1.ebuild,
+  alsa-utils-1.0.10_rc1.ebuild:
+  Fix by R. Bosch to use strsignal as needed by uClibc systems #103189 by Chan
+  Min Wai.
+
+  14 Sep 2005; Aron Griffis <agriffis@gentoo.org> alsa-utils-1.0.9a.ebuild:
+  Mark 1.0.9a stable on alpha
+
+  13 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  alsa-utils-1.0.9a-r1.ebuild, alsa-utils-1.0.10_rc1.ebuild:
+  inherit goes before setting DESCRIPTION.
+
+  27 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  alsa-utils-1.0.9a-r1.ebuild, alsa-utils-1.0.10_rc1.ebuild:
+  Was doinitd, not newinitd. Closes bug #103885.
+
+  25 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  alsa-utils-1.0.10_rc1.ebuild:
+  alsa-utils configure checks for 1.0.9, but alsamixer uses 1.0.10-specific
+  code, bump dependency.
+
+*alsa-utils-1.0.10_rc1 (25 Aug 2005)
+
+  25 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/alsa-utils-1.0.10_rc1-largefile.patch,
+  +files/alsa-utils-1.0.10_rc1-nls.patch, +alsa-utils-1.0.10_rc1.ebuild:
+  Added ebuild for alsa 1.0.10_rc1. Added patch to better fix largefile support.
+
+  24 Aug 2005; Aron Griffis <agriffis@gentoo.org> alsa-utils-1.0.9a.ebuild:
+  stable on ia64
+
+  24 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  alsa-utils-1.0.9a-r1.ebuild:
+  Use newconfd/newinitd.
+
+*alsa-utils-1.0.9a-r1 (13 Aug 2005)
+
+  13 Aug 2005; Tony Vroon <chainsaw@gentoo.org>
+  +alsa-utils-1.0.9a-r1.ebuild:
+  Compile sources with largefile (>2GB) support, closes bug #91056.
+
+  29 Jul 2005; Guy Martin <gmsoft@gentoo.org> alsa-utils-1.0.9a.ebuild:
+  Stable on hppa.
+
+  21 Jul 2005; Joseph Jezak <josejx@gentoo.org> alsa-utils-1.0.9a.ebuild:
+  Marked ppc stable.
+
+  20 Jul 2005; Markus Rothe <corsair@gentoo.org> alsa-utils-1.0.9a.ebuild:
+  Stable on ppc64
+
+  18 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-utils-1.0.9a.ebuild:
+  Fixed dependency on alsa-lib to 1.0.9 for snd_timer_ginfo_alloca and
+  snd_timer_ginfo_set_tid in names.c. Closes bug #99340.
+
+  17 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-utils-1.0.9a.ebuild:
+  Stable amd64, sparc, x86.
+
+  07 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -alsa-utils-1.0.9.ebuild, alsa-utils-1.0.9a.ebuild:
+  Removing old version.
+
+*alsa-utils-1.0.9a (03 Jun 2005)
+
+  03 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +alsa-utils-1.0.9a.ebuild:
+  new upstream release, see #94831
+
+  27 May 2005; Jan Brinkmann <luckyduck@gentoo.org> alsa-utils-1.0.9.ebuild:
+  introduced support for the nls useflag, fixes #92080
+
+*alsa-utils-1.0.9 (27 May 2005)
+
+  27 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +alsa-utils-1.0.9.ebuild:
+  New upstream version released, see #94196.
+
+  21 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org> files/alsasound,
+  files/alsasound.confd:
+  Cleaned up alsasound init script. Added RESTORE_ON_START and ENABLE_OSS_EMUL
+  options.
+
+  12 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -alsa-utils-0.9.8.ebuild, -alsa-utils-1.0.6.ebuild:
+  Killing off 0.9 alsa.
+
+  29 Mar 2005; Markus Rothe <corsair@gentoo.org> alsa-utils-1.0.8.ebuild:
+  Stable on ppc64
+
+  27 Mar 2005; Guy Martin <gmsoft@gentoo.org> alsa-utils-1.0.8.ebuild:
+  Stable on hppa.
+
+  20 Mar 2005; Lars Weiler <pylon@gentoo.org> alsa-utils-1.0.8.ebuild:
+  Readded ppc to a 1.x version.
+
+  08 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-utils-1.0.8.ebuild:
+  Stable amd64, sparc, x86.
+
+  12 Feb 2005; Robin H. Johnson <robbat2@gentoo.org>
+  alsa-utils-1.0.7.ebuild:
+  Add ~mips for my XXS1500 hardware.
+
+  31 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org> files/alsasound:
+  Don't return an error if there is no asound.state file.  Closes bug #80196.
+
+  23 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> alsa-utils-1.0.8.ebuild:
+  updated alsa-lib dependency to fix bug #79205.
+
+*alsa-utils-1.0.8 (22 Jan 2005)
+
+  22 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +alsa-utils-1.0.8.ebuild:
+  Version bump.
+
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org> alsa-utils-1.0.6.ebuild:
+  Stable on ppc64
+
+  29 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> files/alsasound:
+  Fixed alsasound to work on kernels where module support is disabled. Closes
+  bug #72849.
+
+  29 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> files/alsasound:
+  Added save option thanks to Ben Anderson <roothorick@new.rr.com> in bug #72771.
+
+  23 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-utils-1.0.7.ebuild:
+  Added a warning to sparc users about the dangers of bad ioctl32.
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-utils-1.0.7.ebuild:
+  Stable sparc. This is package.mask'd in the normal sparc profiles. Use the
+  default-linux/sparc/sparc64/2004.3/alsa profile if you want to use alsa on
+  sparc.
+
+  20 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> files/alsasound:
+  Load snd-ioctl32 on start.
+
+  16 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> files/alsasound:
+  Module list uses aliases instead of driver name to close bug #71230.
+
+*alsa-utils-1.0.7 (12 Nov 2004)
+
+  12 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> -files/alsa-0.5.10,
+  -files/alsa-modules.conf-rc, -files/alsa-utils-0.5.10-aplay-destdir.diff,
+  -files/alsa-utils-1.0.4-alsaconf.patch, -alsa-utils-1.0.2.ebuild,
+  -alsa-utils-1.0.5.ebuild, alsa-utils-1.0.6.ebuild, +alsa-utils-1.0.7.ebuild:
+  Version bump. Removing old versions.
+
+  06 Nov 2004; Lars Weiler <pylon@gentoo.org> alsa-utils-1.0.6.ebuild:
+  Stable on ppc.
+
+  29 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> files/alsasound:
+  init script cleaned up to work better with mixed module/builtin systems.
+  Also works properly if some modules are already loaded.
+
+  08 Oct 2004; Guy Martin <gmsoft@gentoo.org> alsa-utils-1.0.6.ebuild:
+  Marked stable on hppa.
+
+  02 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -alsa-utils-0.5.10-r8.ebuild, -alsa-utils-0.9.0_rc2.ebuild,
+  -alsa-utils-0.9.2.ebuild:
+  Removing ancient versions.  Added pciutils to RDEPEND to close bug #66114.
+
+  23 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-utils-1.0.6.ebuild:
+  Stable amd64, x86.
+
+  09 Sep 2004; <tchiwam@gentoo.org>, alsa-utils-1.0.6.ebuild
+  added ~ppc64 keyword
+
+  30 Aug 2004; <pyrania@gentoo.org> files/alsasound:
+  Fixing typo in init.d script. Closing bug #62152.
+
+  29 Aug 2004; Jeremy Huddleston <eradicator@gentoo.org> files/alsasound:
+  Fix typo in init script to fix bug #62168.
+
+  29 Aug 2004; Jeremy Huddleston <eradicator@gentoo.org> files/alsasound,
+  +files/alsasound.confd:
+  Added SAVE_ON_STOP option to init script thanks to Kalin KOZHUHAROV
+  <kalin@ThinRope.net> in bug #61130.
+
+*alsa-utils-1.0.6 (23 Aug 2004)
+
+  23 Aug 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +alsa-utils-1.0.6.ebuild:
+  Version bump.
+
+  17 Aug 2004; Guy Martin <gmsoft@gentoo.org> alsa-utils-1.0.5.ebuild:
+  Marked stable on hppa.
+
+  17 Aug 2004; Aron Griffis <agriffis@gentoo.org> alsa-utils-1.0.5.ebuild:
+  add ~alpha #60071
+
+  04 Aug 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -alsa-utils-1.0.3.ebuild, -alsa-utils-1.0.4.ebuild:
+  Removing old versions.
+
+  24 Jul 2004; Lars Weiler <pylon@gentoo.org> alsa-utils-1.0.5.ebuild:
+  Stable on ppc.
+
+  24 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-utils-1.0.5.ebuild:
+  Stable x86 amd64.
+
+  18 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org> files/alsasound:
+  Fix return value for success of modules_unload.  Redirect stdout and
+  stderr for rmmod.  Closes bug #54274.
+
+  07 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org> files/alsasound:
+  Small beautification changes to init script.
+
+*alsa-utils-1.0.5 (30 May 2004)
+
+  30 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-utils-1.0.5.ebuild:
+  Version Bump.
+
+  22 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-utils-1.0.4.ebuild:
+  dev-util/dialog added as a DEPEND for alsaconf to work.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-utils-0.5.10-r8.ebuild, alsa-utils-0.9.0_rc2.ebuild,
+  alsa-utils-0.9.2.ebuild, alsa-utils-0.9.8.ebuild:
+  Added IUSE.
+
+  17 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-utils-1.0.4.ebuild, files/alsa-utils-1.0.4-alsaconf.patch:
+  Adding gentoo support to alsaconf. Closes bug #47289. Thanks Carter Smithhart
+  <derheld42@derheld.net>.
+
+  08 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-utils-0.5.10-r8.ebuild, alsa-utils-0.9.8.ebuild:
+  Small ebuild cleanup. S= and mirror://
+
+*alsa-utils-1.0.4 (04 Apr 2004)
+
+  04 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-utils-1.0.3.ebuild, alsa-utils-1.0.4.ebuild:
+  1.0.3 stable on x86.  version bump.
+
+  30 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-utils-0.9.5.ebuild, alsa-utils-1.0.0_rc2.ebuild,
+  alsa-utils-1.0.1.ebuild, alsa-utils-1.0.2.ebuild, alsa-utils-1.0.3.ebuild,
+  files/alsasound:
+  Added sleeps to get around a bug in udev.  See bug #39345.
+  Removing old ebuilds and cleaning up existing.
+
+  13 Mar 2004; Stephen P. Becker <geoman@gentoo.org> alsa-utils-1.0.2.ebuild:
+  Added ~mips keyword.
+
+  09 Mar 2004; Tom Gall <tgall@gentoo.org> alsa-utils-1.0.3.ebuild,
+  alsa-utils-1.0.0_rc2.ebuild,
+  alsa-utils-1.0.1.ebuild, alsa-utils-1.0.2.ebuild:
+  removed ppc64, we're not ready yet
+
+*alsa-utils-1.0.3 (01 Mar 2004)
+
+  01 Mar 2004; Martin Holzer <mholzer@gentoo.org> alsa-utils-1.0.3.ebuild:
+  Version bumped.
+
+  20 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> files/alsasound:
+  alsasound init script has been updated to fix terminate (bug #35916) and 2.6
+  per-soundcard scripts (bug #42248).
+
+  19 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> files/alsasound:
+  Updated alsasound initscript to fix 'loading unneccessary modules on 2.6
+  kernels' bug #41600.
+
+  12 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-utils-0.9.8.ebuild, alsa-utils-1.0.0_rc2.ebuild,
+  alsa-utils-1.0.1.ebuild, alsa-utils-1.0.2.ebuild, files/alsasound:
+  Always load snd-seq to make timidity work when no real sequencer. Also, fix
+  module loading on 2.6 kernels. Changed ebuilds' reference from update-modules
+  to modules-update.  Closes bug #31849.
+
+  10 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> files/alsasound:
+  Added snd-seq to SEQUENCERS to load so timidity will work even if we have no
+  real sequenced. Closes bug #30942.
+
+  09 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> files/alsasound:
+  Updated alsasound init script to not load sequencer modules that are compiled
+  into the kernel. Fixes bug #37786.
+
+  06 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> files/alsasound:
+  init script now checks /proc/modules to see if module is loaded before
+  modprobing.  Closes bug #32045.
+
+*alsa-utils-1.0.2 (27 Jan 2004)
+
+  27 Jan 2004; Martin Holzer <mholzer@gentoo.org> alsa-utils-1.0.2.ebuild:
+  Version bumped.
+
+  17 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> alsa-utils-0.9.8.ebuild:
+  manifest fix
+
+  16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> alsa-utils-0.9.8.ebuild:
+  set ppc in keywords
+
+*alsa-utils-1.0.1 (10 Jan 2004)
+
+  10 Jan 2004; Martin Holzer <mholzer@gentoo.org> alsa-utils-1.0.1.ebuild:
+  Version bumped.
+
+  18 Dec 2003; Martin Holzer <mholzer@gentoo.org> files/alsasound:
+  updating init script for oss emu. closes 34541
+
+*alsa-utils-1.0.0_rc2 (07 Dec 2003)
+
+  07 Dec 2003; Martin Holzer <mholzer@gentoo.org> alsa-utils-1.0.0_rc2.ebuild:
+  Version bumped.
+
+  04 Dec 2003; Martin Holzer <mholzer@gentoo.org> files/alsasound:
+  fixing typo. Closes #35062
+
+*alsa-utils-1.0.0_rc1 (02 Dec 2003)
+
+  02 Dec 2003; Martin Holzer <mholzer@gentoo.org> alsa-utils-1.0.0_rc1.ebuild:
+  Version bumped.
+
+  29 Nov 2003; Brad House <brad_mssw@gentoo.org> alsa-utils-0.9.8.ebuild:
+  mark stable on amd64
+
+  26 Nov 2003; Martin Holzer <mholzer@gentoo.org> alsa-utils-0.9.8.ebuild:
+  marked x86 stable.
+
+*alsa-utils-0.9.8 (25 Oct 2003)
+
+  25 Oct 2003; Martin Holzer <mholzer@gentoo.org> alsa-utils-0.9.8.ebuild:
+  Version bumped.
+
+  04 Sep 2003; John Mylchreest <johnm@gentoo.org>; files/alsasound:
+  Updating init script to load all oss compat modules. not just pcm-oss
+
+  21 Aug 2003; John Mylchreest <johnm@gentoo.org>; files/alsasound:
+  Updating alsasound to load sequencers properly
+
+*alsa-utils-0.9.7 (02 Oct 2003)
+
+  02 Oct 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Version update.
+
+*alsa-utils-0.9.6-r1 (05 Aug 2003)
+
+  05 Aug 2003; John Mylchreest <johnm@gentoo.org>; alsa-utils-0.9.6-r1.ebuild,
+  files/alsa-modules.conf-rc, files/alsasound:
+  Updating for 2.6 compliance
+
+  12 Jun 2003; <msterret@gentoo.org> alsa-utils-0.5.10-r8.ebuild:
+  fix Header
+
+  05 Jun 2003; Daniel Ahlberg <aliz@gentoo.org> alsa-utils-0.9.4.ebuild :
+  Switched to mirror://alsaproject in SRC_URI.
+
+*alsa-utils-0.9.6 (29 Jul 2003)
+
+  29 Jul 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Version update.
+
+*alsa-utils-0.9.5 (11 Jul 2003)
+
+  11 Jul 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Version update.
+
+*alsa-utils-0.9.4 (03 June 2003)
+
+  03 June 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Version update.
+
+*alsa-utils-0.9.3 (04 May 2003)
+
+  04 May 2003; Daniel Ahlberg <aliz@gentoo.org> alsa-utils-0.9.3.ebuild :
+  Version bump.
+
+*alsa-utils-0.9.2 (27 Mar 2003)
+
+  15 Apr 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Marking stable on x86.
+
+  27 Mar 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Version update.
+
+*alsa-utils-0.9.1 (12 Mar 2003)
+
+  12 Mar 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Update to version 0.9.1.
+
+*alsa-utils-0.9.0_rc8-r1 (07 Mar 2003)
+
+  09 Mar 2003; Mark Guertin <gerk@gentoo.org> alsa-utils-0.9.0_rc8-r1.ebuild:
+  set ~ppc in keywords
+
+  07 Mar 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Quick update to rc8a.
+
+*alsa-utils-0.9.0_rc8 (03 Mar 2003)
+
+  03 Mar 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Quick update to rc8.
+
+*alsa-utils-0.9.0_rc7 (04 Feb 2003)
+
+  04 Feb 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Quick update to rc7.
+	
+*alsa-utils-0.9.0_rc6 (19 Nov 2002)
+
+  11 Dec 2002; J Robert Ray <jrray@gentoo.org> *.ebuild :
+  Updated the description to help differentiate this package from alsa-tools.
+
+  19 Nov 2002; Arcady Genkin <agenkin@gentoo.org>
+	alsa-utils-0.9.0_rc6.ebuild :
+  Quick update to rc6.  Legwork done by Roman Weber <gentoo@gonzo.ch>.
+
+*alsa-utils-0.9.0_rc5 (24 Oct 2002)
+
+  24 Oct 2002; Arcady Genkin <agenkin@gentoo.org>
+	alsa-utils-0.9.0_rc5.ebuild :
+
+  Quick update to rc5.
+
+*alsa-utils-0.9.0_rc4 (23 Oct 2002)
+
+  23 Oct 2002; Arcady Genkin <agenkin@gentoo.org>
+	alsa-utils-0.9.0_rc4.ebuild :
+
+  Quick update to rc4.
+
+*alsa-utils-0.9.0_rc3 (15 Aug 2002)
+
+  20 Oct 2002; Calum Selkirk <cselkirk@gentoo.org> alsa-utils-0.5.10-r8.ebuild
+  alsa-utils-0.9.0_rc1.ebuild alsa-utils-0.9.0_rc2.ebuild
+  alsa-utils-0.9.0_rc3.ebuild :
+
+  Addeed ppc to KEYWORDS.
+
+  20 Jun 2002; Arcady Genkin <agenkin@thpoon.com>
+	alsa-utils-0.9.0_rc3.ebuild :
+
+  Quick update to version 0.9.0rc3.
+
+*alsa-utils-0.9.0_rc2 (20 Jun 2002)
+
+  20 Jun 2002; Arcady Genkin <agenkin@thpoon.com>
+	alsa-utils-0.9.0_rc2.ebuild :
+
+  Quick update to version 0.9.0rc2.
+
+*alsa-utils-0.5.10-r8 (28 Apr 2002)
+
+  28 Apr 2002; Karl Trygve Kalleberg <karltk@gentoo.org> alsa-utils-0.5.10-r8.ebuild files/digest-alsa-utils-0.5.10-r8:
+
+  Previous update broke alsa-0.5.10 by messing up the /etc/init.d/alsa script,
+  this has now been reverted to the original scheme for 0.5.10. 0.9.x is not
+  affected.
+
+  Removed alsa-utils-0.5.10-r7.ebuild files/digest-alsa-utils-0.5.10-r7
+
+*alsa-utils-0.9.0_rc1 (27 Apr 2002)
+
+  17 Feb 2002; Arcady Genkin <agenkin@thpoon.com>
+	alsa-utils-0.9.0_rc1.ebuild :
+
+  Quick update to version 0.9.0rc1.
+
+*alsa-utils-0.9.0.1_beta10 (3 Feb 2002)
+
+  3 Feb 2002; T.Neidt <tod@gentoo.org> ChangeLog :
+
+  Upgraded version to latest beta.
+  The issue below seems to be fixable by creating a link in the alsa-lib
+  ebuild from libasound.so.2 to libasound.so.1, but I'm leaving the warning
+  until further testing is done.
+  ##WARNING## Upgrading to this version will require massive recompiling
+  of pretty much everything linked against sound.  libasound.so.1 is
+  no longer provided in the package, it is now libasound.so.2.  Sound
+  apps will be broken until recompiled against the new lib.  For example,
+  if you use the Gnome Desktop, you will have to recompile almost everything
+  just to start it up.  Good news is you don't have to upgrade now if you
+  don't want to.  Bad news is that you will eventually.
 
 *alsa-utils-0.5.10-r7 (1 Feb 2002)
 
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index ac87c0061c9f..4eac5fd7e2b4 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -1,13 +1,23 @@
-MD5 84ebbff74dcae02327c49e6aa733bbf1 ChangeLog 4040
-MD5 8fc26410880f58f4a5134714db00388b alsa-utils-0.5.10-r8.ebuild 959
-MD5 3eac039092b8c3bb766bf2f6b852f525 alsa-utils-0.9.0_rc2.ebuild 923
-MD5 ccdffee4f1ed9e02a32914c6bd8d2176 alsa-utils-0.9.2.ebuild 904
-MD5 165b9cf816fcb254f612d588cc9ade69 alsa-utils-0.9.3.ebuild 902
-MD5 dcc66ee6a9db24006a4158e2be0da3f2 files/alsa-0.5.10 392
-MD5 f20045fc395596290d5a6d807ba311fc files/alsa-utils-0.5.10-aplay-destdir.diff 626
-MD5 332df836790d7158bf4bbcf3b1a650c1 files/alsa.rc5 444
-MD5 387a6bdfd1b85aff55902bf1a7d7d19e files/alsa.rc6 632
-MD5 a82c4c173c1d617bae9967438c659bac files/digest-alsa-utils-0.5.10-r8 70
-MD5 59a93bf64737644e4001cbb6ad5387b4 files/digest-alsa-utils-0.9.0_rc2 71
-MD5 55414f65ffecf5f44fa35295dae8bf19 files/digest-alsa-utils-0.9.2 69
-MD5 9146e8a90dc5c3dc0105876e10c4f36f files/digest-alsa-utils-0.9.3 69
+MD5 a4b39f14b35e4aa0c91db9b819ada809 ChangeLog 18414
+MD5 a2a37bf9cb817343a6a58e20cfea9bb8 alsa-utils-1.0.7.ebuild 2272
+MD5 26f5354615b23de013a20117251274ee alsa-utils-1.0.8.ebuild 2269
+MD5 8bf806386c8a966605549b7a91fd9131 alsa-utils-1.0.9a.ebuild 2343
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 d9b19e1fc31acdd0b7091ce79400ce85 alsa-utils-1.0.9a-r1.ebuild 2525
+MD5 8e9e89032a9705095a4f28b1034d05cd alsa-utils-1.0.10_rc2.ebuild 2588
+MD5 13f8ee3120f13e393a218955f2b3ac62 alsa-utils-1.0.10_rc3.ebuild 2582
+MD5 db92e65508e1bf16559f89daa4d24265 alsa-utils-1.0.10.ebuild 2421
+MD5 954b0951b5fed9bf591abf9e7cc1963e files/alsa-modules.conf-rc 1162
+MD5 2a50971b115f63d74d0054c7e3ee9144 files/alsasound 7106
+MD5 f4f492c382b243ebf558809a372fd6b7 files/alsasound.confd 515
+MD5 ddaf1d5cc1a19dff65e19e6470bc711d files/digest-alsa-utils-1.0.7 69
+MD5 ec6210532acb9b397bacb3eb81f7593a files/digest-alsa-utils-1.0.8 69
+MD5 2bfc6eaf49d769272a46ed2046b73944 files/digest-alsa-utils-1.0.9a 70
+MD5 2bfc6eaf49d769272a46ed2046b73944 files/digest-alsa-utils-1.0.9a-r1 70
+MD5 6945018085dd4204d2f26490fb7b50b6 files/alsa-utils-1.0.10_rc1-largefile.patch 445
+MD5 4d2059fdfeeafe53e5d42692d9c2f14e files/alsa-utils-1.0.10_rc1-nls.patch 1959
+MD5 5583841a2a5a206ad2838524c2cc7528 files/digest-alsa-utils-1.0.10_rc2 73
+MD5 504c2047f55a094833631892ab099ada files/alsa-utils-1.0.9a-strsignal.patch 454
+MD5 9224c89a555eeabd60baff541b5996b2 files/alsasound-1.0.10_rc2 7150
+MD5 8c0d2ce137d1d9a639a0b9d23c8dffb1 files/digest-alsa-utils-1.0.10_rc3 73
+MD5 a86ec4a87712d028c83f9066f4505551 files/digest-alsa-utils-1.0.10 70
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.10.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.10.ebuild
index 09559703f948..0badc704e1fa 100644
--- a/media-sound/alsa-utils/alsa-utils-1.0.10.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.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/media-sound/alsa-utils/alsa-utils-1.0.10.ebuild,v 1.1 2005/11/16 19:59:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.10.ebuild,v 1.1.1.1 2005/11/30 09:37:55 chriswhite Exp $
 
 inherit eutils flag-o-matic autotools
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://alsaproject/utils/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ppc64 -sparc ~x86"
 IUSE="nls"
 
 DEPEND=">=sys-libs/ncurses-5.1
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.10_rc2.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.10_rc2.ebuild
index 4f2694070c73..bd6ffd398be4 100644
--- a/media-sound/alsa-utils/alsa-utils-1.0.10_rc2.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.0.10_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/media-sound/alsa-utils/alsa-utils-1.0.10_rc2.ebuild,v 1.1 2005/10/11 15:37:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.10_rc2.ebuild,v 1.1.1.1 2005/11/30 09:37:54 chriswhite Exp $
 
 inherit eutils flag-o-matic autotools
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://alsaproject/utils/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc x86"
 IUSE="nls"
 
 DEPEND=">=sys-libs/ncurses-5.1
@@ -53,7 +53,7 @@ src_install() {
 	newconfd ${FILESDIR}/alsasound.confd alsasound
 	insinto /etc/modules.d
 	newins ${FILESDIR}/alsa-modules.conf-rc alsa
-	doinitd ${FILESDIR}/alsasound
+	newinitd ${FILESDIR}/alsasound-1.0.10_rc2 alsasound
 }
 
 pkg_postinst() {
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.10_rc3.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.10_rc3.ebuild
index 2b6dc042152f..f8f37f9d873f 100644
--- a/media-sound/alsa-utils/alsa-utils-1.0.10_rc3.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.0.10_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/media-sound/alsa-utils/alsa-utils-1.0.10_rc3.ebuild,v 1.1 2005/11/08 12:19:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.10_rc3.ebuild,v 1.1.1.1 2005/11/30 09:37:55 chriswhite Exp $
 
 inherit eutils flag-o-matic autotools
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://alsaproject/utils/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86"
+KEYWORDS="~alpha ~amd64 hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86"
 IUSE="nls"
 
 DEPEND=">=sys-libs/ncurses-5.1
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.7.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.7.ebuild
index 404a2d226d5c..7f1f5af72baa 100644
--- a/media-sound/alsa-utils/alsa-utils-1.0.7.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.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/media-sound/alsa-utils/alsa-utils-1.0.7.ebuild,v 1.1 2004/11/12 11:11:49 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.7.ebuild,v 1.1.1.1 2005/11/30 09:37:54 chriswhite Exp $
 
 IUSE=""
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 sparc ~x86 ~mips"
 
 DEPEND=">=sys-libs/ncurses-5.1
 	dev-util/dialog
@@ -57,4 +57,13 @@ pkg_postinst() {
 	einfo "and run modules-update. You can do this like so:"
 	einfo "	# nano -w /etc/modules.d/alsa && modules-update"
 	echo
+
+	if use sparc; then
+		ewarn "Old versions of alsa-drivers had a broken snd-ioctl32 module"
+		ewarn "which causes sparc64 machines to lockup on such tasks as"
+		ewarn "changing the volume.  Because of this, it is VERY important"
+		ewarn "that you do not use the snd-ioctl32 modules contained in"
+		ewarn "development-sources or <=gentoo-dev-sources-2.6.7-r14.  Doing so"
+		ewarn "may result in an unbootable system if you start alsasound at boot."
+	fi
 }
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.8.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.8.ebuild
index 09b32f669dd6..6029dd330e95 100644
--- a/media-sound/alsa-utils/alsa-utils-1.0.8.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.0.8.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/media-sound/alsa-utils/alsa-utils-1.0.8.ebuild,v 1.1 2005/01/23 07:01:02 eradicator Exp $
-
-IUSE=""
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.8.ebuild,v 1.1.1.1 2005/11/30 09:37:55 chriswhite Exp $
 
 MY_P=${P/_rc/rc}
 S=${WORKDIR}/${MY_P}
@@ -13,12 +11,12 @@ SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+IUSE=""
 
 DEPEND=">=sys-libs/ncurses-5.1
 	dev-util/dialog
-	>=media-libs/alsa-lib-1.0.3"
-
+	>=media-libs/alsa-lib-1.0.8"
 RDEPEND="${DEPEND}
 	sys-apps/pciutils"
 
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.9a-r1.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.9a-r1.ebuild
index e6a3de5732c0..8a3035cb2111 100644
--- a/media-sound/alsa-utils/alsa-utils-1.0.9a-r1.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.0.9a-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/media-sound/alsa-utils/alsa-utils-1.0.9a-r1.ebuild,v 1.1 2005/08/13 13:32:20 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.9a-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:54 chriswhite Exp $
+
+inherit eutils flag-o-matic
 
 DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
 HOMEPAGE="http://www.alsa-project.org/"
 SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
 
-inherit flag-o-matic
-
 LICENSE="GPL-2"
 SLOT="0.9"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86"
@@ -19,6 +19,12 @@ DEPEND=">=sys-libs/ncurses-5.1
 RDEPEND="${DEPEND}
 	sys-apps/pciutils"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-strsignal.patch #103189
+}
+
 src_compile() {
 	# Largefile support, bug #91056
 	append-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
@@ -39,12 +45,10 @@ src_install() {
 	dodoc ${ALSA_UTILS_DOCS}
 	newdoc alsamixer/README README.alsamixer
 
-	insinto /etc/conf.d
-	newins ${FILESDIR}/alsasound.confd alsasound
+	newconfd ${FILESDIR}/alsasound.confd alsasound
 	insinto /etc/modules.d
 	newins ${FILESDIR}/alsa-modules.conf-rc alsa
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/alsasound
+	doinitd ${FILESDIR}/alsasound
 }
 
 pkg_postinst() {
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.9a.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.9a.ebuild
index 1625c8c0f835..4a0efbb4e6c0 100644
--- a/media-sound/alsa-utils/alsa-utils-1.0.9a.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.0.9a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.9a.ebuild,v 1.1 2005/06/03 20:00:20 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.9a.ebuild,v 1.1.1.1 2005/11/30 09:37:54 chriswhite Exp $
 
 DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
 HOMEPAGE="http://www.alsa-project.org/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 -sparc x86"
 IUSE="nls"
 
 DEPEND=">=sys-libs/ncurses-5.1
diff --git a/media-sound/alsa-utils/files/alsa-modules.conf-rc b/media-sound/alsa-utils/files/alsa-modules.conf-rc
index aea18d9ddcb5..391767b457c3 100644
--- a/media-sound/alsa-utils/files/alsa-modules.conf-rc
+++ b/media-sound/alsa-utils/files/alsa-modules.conf-rc
@@ -1,5 +1,5 @@
 # Alsa 0.9.X kernel modules' configuration file.
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsa-modules.conf-rc,v 1.1 2003/08/05 21:07:55 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsa-modules.conf-rc,v 1.1.1.1 2005/11/30 09:37:55 chriswhite Exp $
 
 # ALSA portion
 alias char-major-116 snd
diff --git a/media-sound/alsa-utils/files/alsasound b/media-sound/alsa-utils/files/alsasound
index c00e51cee1bc..112fbee33635 100644
--- a/media-sound/alsa-utils/files/alsasound
+++ b/media-sound/alsa-utils/files/alsasound
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound,v 1.1 2003/08/05 21:07:55 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound,v 1.1.1.1 2005/11/30 09:37:55 chriswhite Exp $
 #
 # Gentoo users: add this script to 'boot' run level.
 # ==================================================
@@ -27,111 +27,122 @@
 #  along with this program; if not, write to the Free Software
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 
-#	Edited to support Linux kernel 2.5 and above as well as 2.4
-#	John Mylchreest <johnm@gentoo.org>
-#	July 29, 2003 
+# ChangeLog:
+#
+# 2003.07.29 - John Mylchreest <johnm@gentoo.org>
+# Edited to support Linux kernel 2.5 and above as well as 2.4
+#
+# 2004.06.02 - Jeremy Huddleston <eradicator@gentoo.org>
+# Rewritten for better support for built-in drivers 
+#
+# 2004.10.29 - Jeremy Huddleston <eradicator@gentoo.org>
+# Cleaned up to work better for mixed builtin/module systems
+#
+# 2004.11.29 - Jeremy Huddleston <eradicator@gentoo.org>
+# Added save option thanks to Ben Anderson <roothorick@new.rr.com>
+#
+# 2005.04.21 - Jeremy Huddleston <eradicator@gentoo.org>
+# Added restore option and oss option.
+# Cleaned up code to use bash builtins instead of test.
 
 alsactl=/usr/sbin/alsactl
 asoundcfg=/etc/asound.state
 aconnect=/usr/bin/aconnect
 alsascrdir=/etc/alsa.d
 
+opts="${opts} save"
+
 depend() {
-  need bootmisc localmount
-  before modules
-  after isapnp
-  provide alsa-modules
+	need bootmisc localmount
+	after modules isapnp coldplug hotplug
 }
 
-start() {
-	if [ -d /proc/asound ] && [ -z "$(grep ' no soundcards ' /proc/asound/cards)" ] ; then
-		ebegin "ALSA Detected"
-	else
-		ebegin "Loading ALSA drivers"
-		
-		# I really dislike this and would like to tidy it up.
-		# Anyone running 2.4 + alsa-driver willing to help me?
-		
-		DRIVERS="$(modprobe -c | grep snd_ | grep pci: | awk '{ print $3 }' | uniq)"
-		if [ -z "${DRIVERS}" ] ; then
-			# Fallback on older modprobe syntax
-			DRIVERS="$(/sbin/modprobe -c | grep -E "^[[:space:]]*alias[[:space:]]+snd-card-[[:digit:]]" | awk '{print $3}')"
+load_modules() {
+	# List of drivers for each card.
+	local DRIVERS="$(modprobe -c | grep -E "^[[:space:]]*alias[[:space:]]+snd-card-[[:digit:]]" | awk '{print $2}')"
+
+	# Fall back on the automated aliases if we don't have ALSA configured properly...
+	if [[ -z "${DRIVERS}" && ! ( -d /proc/asound && -z "$(grep ' no soundcards ' /proc/asound/cards)" ) ]] ; then
+		ewarn "Could not detect custom ALSA settings.  Loading all detected alsa drivers."
+		DRIVERS="$(modprobe -c | grep pci: |  awk '{ print $3 }' | grep snd.* | sort | uniq)"
+		[[ -z "${DRIVERS}" ]] && eerror "Unable to find any ALSA drivers. Have you compiled alsa-drivers correctly?"
+	fi
+
+	if [[ ${ENABLE_OSS_EMUL} == "yes" ]] && modprobe -c | grep -q "snd.*oss$" ; then
+		# Test for use of OSS
+		local OSS="$(modprobe -l | grep "snd.*oss" | sed -e "s:\/.*\/::" -e "s:\..*::")"
+		# Add oss modules to list
+		local i
+		for i in ${OSS}
+		do
+			DRIVERS="${DRIVERS} ${i}"
+		done
+	fi
+
+	# We want to ensure snd-seq is loaded as it is needed for things like
+	# timidity even if we don't use a real sequencer.
+	DRIVERS="${DRIVERS} $(modprobe -l | grep "snd.seq\." | sed -e "s:\/.*\/::" -e "s:\..*::")"
+
+	# We want to ensure snd-ioctl32 is loaded as it is needed for 32bit
+	# compatibility
+	DRIVERS="${DRIVERS} $(modprobe -l | grep "snd.ioctl32\." | sed -e "s:\/.*\/::" -e "s:\..*::")"
+
+	local DRIVER
+	for DRIVER in ${DRIVERS}
+	do
+		if [[ "${DRIVER}" != "off"  &&
+		      -z $(cut -d' ' -f1 /proc/modules | egrep "^${DRIVER}\$") &&
+		      -z $(cut -d' ' -f1 /proc/modules | egrep "^${DRIVER//-/_}\$") ]] ; then
+			ebegin "  Loading: ${DRIVER}"
+			/sbin/modprobe ${DRIVER}
+			eend $?
 		fi
+	done
 		
-		[ -z "${DRIVERS}" ] && eerror "Unable to find any ALSA drivers. Have you compiled alsa-drivers correctly?"
-		[ -n "$(modprobe -l | grep "snd.*oss")" ] && DRIVERS="snd-pcm-oss ${DRIVERS}"
-		
-		for DRIVER in ${DRIVERS}
+	sleep 1
+
+	if [[ -f /proc/asound/seq/drivers ]] ; then
+		local SEQUENCERS="$(awk -F, '$2~/^empty$/ {print $1}' /proc/asound/seq/drivers)"
+		local SEQUENCER
+		for SEQUENCER in ${SEQUENCERS}
 		do
-			if [ ! "${DRIVER}" = off ] ; then
-				einfo "Loading: ${DRIVER}"
-				/sbin/modprobe ${DRIVER}
+			if [[ -z $(cut -d' ' -f1 /proc/modules | egrep "^${SEQUENCER}\$")  &&
+			      -z $(cut -d' ' -f1 /proc/modules | egrep "^${SEQUENCER//-/_}\$") ]] ; then
+				ebegin "  Loading: ${SEQUENCER}"
+				/sbin/modprobe ${SEQUENCER}
+				eend $?
 			fi
 		done
+	fi
 		
-		sleep 1
-		
-		if [ x"$START_ALSA_SEQ" = xyes -a -r /proc/asound/seq/drivers ]; then
-			SEQUENCERS="$(cut -d , -f 1 /proc/asound/seq/drivers)"
-			for SEQUENCER in ${SEQUENCERS}
-			do
-				einfo "Loading: ${SEQUENCER}"
-				[ ! "x${SEQUENCER}" = "x" ] && /sbin/modprobe ${SEQUENCER}
-			done
+	for DRIVER in ${DRIVERS}
+	do
+		local TMP=${DRIVER##snd-}
+		TMP=${TMP##snd_}
+		if [[ -x "${alsascrdir}/${TMP}" ]] ; then
+			ebegin "  Running: ${alsascrdir}/${TMP}"
+			${alsascrdir}/${TMP}
+			eend $?
 		fi
+	done
 		
-		einfo "Running card-dependant scripts"
-		for DRIVER in ${DRIVERS}
-		do
-			TMP=${DRIVER##snd-}
-			[ -x "${alsascrdir}/${TMP}" ] && ${alsascrdir}/${TMP}
-		done
-		
-		[ ! -d /proc/asound ] && eerror "ERROR: Failed to load neccessary drivers"
-	fi
-	
-	einfo "Restoring Mixer Levels"
-	if [ ! -r $asoundcfg ]; then
-		ewarn "No mixer config in $asoundcfg, you have to unmute your card!"
-		eend 1
-	elif [ -x $alsactl ]; then
-		CARDS="$(cat /proc/asound/cards | awk '/: / { print $1 }')"
-		for CARDNUM in ${CARDS}
-		do
-			$alsactl -f $asoundcfg restore ${CARDNUM}
-		done
-	else
-		eerror -e "ERROR: Cannot find alsactl, did you forget to install media-sound/alsa-utils?"
-		eend 1
+	if [[ ! -d /proc/asound || -n "$(grep ' no soundcards ' /proc/asound/cards)" ]] ; then
+		eerror "ERROR: Failed to load necessary drivers"
 	fi
-	eend 0
 }
 
-stop() {
-	if [ ! -d /proc/asound ] ; then
-		error "ALSA is not loaded"
-		return 0
-	fi
-	
-	ebegin "Unloading ALSA"
-	terminate
-	einfo "Storing ALSA Mixer Levels"
-	if [ -x $alsactl ]; then
-		$alsactl -f $asoundcfg store
-	else
-		eerror -e "ERROR: Cannot find alsactl, did you forget to install media-sound/alsa-utils?"
-		eend 1
-	fi
-
-	LOADED_MODULES="$(/sbin/lsmod | grep -E "^snd" | awk '{print $1}')"
-	einfo "Unloading modules"
+unload_modules() {
+	local LOADED_MODULES="$(/sbin/lsmod | grep -E "^snd" | awk '{print $1}')"
+	local MODULE
 	for MODULE in ${LOADED_MODULES}
 	do
-		/sbin/rmmod ${MODULE} 2> /dev/null
+		/sbin/rmmod ${MODULE} >& /dev/null
 	done
-	/sbin/rmmod soundcore 2> /dev/null
-	/sbin/rmmod gameport 2> /dev/null	
-	eend 0
+	/sbin/rmmod soundcore >& /dev/null
+	/sbin/rmmod gameport >& /dev/null	
+
+	# Return success if the modules are unloaded
+	[[ -z "$(/sbin/lsmod | grep -E "^snd" | awk '{print $1}')" ]]
 }
 
 terminate() {
@@ -139,16 +150,103 @@ terminate() {
 	# Kill processes holding open sound devices
 	#
 	# DEVS=`find /dev/ -follow -type c -maxdepth 1 -print 2>/dev/null | xargs ls -dils | grep "1*1[46]," | cut -d: -f2 | cut -d" " -f2; echo /proc/asound/dev/*`
-	ossdevs="/dev/admmidi? /dev/adsp? /dev/amidi? /dev/audio* /dev/dmfm* \
+	local ossdevs="/dev/admmidi? /dev/adsp? /dev/amidi? /dev/audio* /dev/dmfm* \
 			/dev/dmmidi? /dev/dsp* /dev/dspW* /dev/midi0? /dev/mixer? /dev/music \
 			/dev/patmgr? /dev/sequencer* /dev/sndstat"
-	alsadevs="/proc/asound/dev/*"
-	fuser -k $ossdevs $alsadevs 2> /dev/null 1>/dev/null
+	local alsadevs="/proc/asound/dev/* /dev/sound/* /dev/snd/*"
+	fuser -k ${ossdevs} ${alsadevs} >& /dev/null
 	
 	#
 	# remove all sequencer connections if any
 	#
-	[ -f /proc/asound/seq/clients -a -x $aconnect ] && $aconnect --removeall
+	[[ -f /proc/asound/seq/clients && -x ${aconnect} ]] && ${aconnect} --removeall
 }
 
+restore_mixer() {
+	if [[ ${RESTORE_ON_START} == "no" ]] ; then
+		return 0
+	fi
+
+	ebegin "Restoring Mixer Levels"
+
+	local val=0
+
+	if [[ ! -r ${asoundcfg} ]] ; then
+		ewarn "No mixer config in ${asoundcfg}, you have to unmute your card!"
+	elif [[ -x ${alsactl} ]] ; then
+		local CARDS="$(cat /proc/asound/cards | awk '/: / { print $1 }')"
+		local CARDNUM
+		for CARDNUM in ${CARDS}
+		do
+			[[ -e /dev/snd/controlC0 ]] || sleep 2
+			[[ -e /dev/snd/controlC0 ]] || sleep 2
+			[[ -e /dev/snd/controlC0 ]] || sleep 2
+			[[ -e /dev/snd/controlC0 ]] || sleep 2
+			${alsactl} -f ${asoundcfg} restore ${CARDNUM}
+			((val=val+$?))
+		done
+	else
+		eerror -e "ERROR: Cannot find alsactl, did you forget to install media-sound/alsa-utils?"
+		val=1
+	fi
+
+	eend ${val}
+	return ${val}
+}
+
+save() {
+	ebegin "Storing ALSA Mixer Levels"
+
+	local val=0
+	
+	if [[ -x ${alsactl} ]] ; then
+		${alsactl} -f ${asoundcfg} store
+		val=$?
+	else
+		eerror -e "ERROR: Cannot find alsactl."
+		val=1
+	fi
 
+	eend ${val}
+	return ${val}
+}
+
+start() {
+	if [[ -f /proc/modules ]] ; then
+		ebegin "Loading ALSA modules"
+		if load_modules ; then
+			eend 0
+		else
+			eend 1
+			return 1
+		fi
+	fi
+	
+	if [[ ${RESTORE_ON_START} == "yes" ]]; then
+		restore_mixer
+	fi
+}
+
+stop() {
+	if [[ ! -d /proc/asound ]] ; then
+		eerror "ALSA is not loaded"
+		return 0
+	fi
+	
+	if [[ ${SAVE_ON_STOP} == "yes" ]]; then
+		save
+	fi
+
+	ebegin "Unloading ALSA"
+	terminate
+	eend 0
+
+	if [[ -f /proc/modules ]]; then
+		ebegin "Unloading ALSA modules"
+		if unload_modules; then
+			eend 0
+		else
+			eend 1
+		fi
+	fi
+}
diff --git a/media-sound/alsa-utils/files/alsasound-1.0.10_rc2 b/media-sound/alsa-utils/files/alsasound-1.0.10_rc2
index dfe51b71454d..6b2a35f3a7b7 100644
--- a/media-sound/alsa-utils/files/alsasound-1.0.10_rc2
+++ b/media-sound/alsa-utils/files/alsasound-1.0.10_rc2
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound-1.0.10_rc2,v 1.1 2005/10/31 18:39:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound-1.0.10_rc2,v 1.1.1.1 2005/11/30 09:37:55 chriswhite Exp $
 #
 # Gentoo users: add this script to 'boot' run level.
 # ==================================================
diff --git a/media-sound/alsa-utils/files/alsasound.confd b/media-sound/alsa-utils/files/alsasound.confd
index 7be75537b602..6e82cdd32e95 100644
--- a/media-sound/alsa-utils/files/alsasound.confd
+++ b/media-sound/alsa-utils/files/alsasound.confd
@@ -1,3 +1,18 @@
+# ENABLE_OSS_EMUL:
+# Do you want to enable in-kernel oss emulation?
+# no - Do not load oss emul drivers
+# yes - Load oss emul drivers if they're found
+
+ENABLE_OSS_EMUL="yes"
+
+# RESTORE_ON_START:
+# Do you want to restore your mixer settings?  If not, your cards will be
+# muted.
+# no - Do not restore state
+# yes - Restore state
+
+RESTORE_ON_START="yes"
+
 # SAVE_ON_STOP:
 # Do you want to save changes made to your mixer volumes when alsasound
 # stops? 
diff --git a/media-sound/alsa-utils/metadata.xml b/media-sound/alsa-utils/metadata.xml
index cde8e33b77e4..e1774e3d9ad7 100644
--- a/media-sound/alsa-utils/metadata.xml
+++ b/media-sound/alsa-utils/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sound</herd>
-<maintainer>
-  <email>agenkins@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/media-sound/alsamixergui/ChangeLog b/media-sound/alsamixergui/ChangeLog
index 0c64e80204e8..9d1f4fca2b74 100644
--- a/media-sound/alsamixergui/ChangeLog
+++ b/media-sound/alsamixergui/ChangeLog
@@ -1,9 +1,102 @@
 # ChangeLog for media-sound/alsamixergui
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsamixergui/ChangeLog,v 1.1 2002/05/24 07:34:19 agenkin Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsamixergui/ChangeLog,v 1.1.1.1 2005/11/30 09:37:59 chriswhite Exp $
 
-*alsamixergui-0.9.0_rc2 (24 May 2002)
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsamixergui-0.9.0.1.2-r4.ebuild:
+  Stable sparc.
 
-  24 May 2002; Arcady Genkin <agenkin@thpoon.com> alsamixergui-0.9.0_rc2.ebuild :
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org>
+  alsamixergui-0.9.0.1.2-r4.ebuild:
+  Stable on ppc64
+
+  07 Dec 2004; Joseph Jezak <josejx@gentoo.org>
+  +files/segfault-on-exit.patch, alsamixergui-0.9.0.1.2-r4.ebuild:
+  Added fix for bug #67307 and marked ppc stable.
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsamixergui-0.9.0.1.2-r4.ebuild:
+  Added to ~sparc.
+
+  01 Nov 2004; Markus Rothe <corsair@gentoo.org>
+  alsamixergui-0.9.0.1.2-r4.ebuild:
+  Marked ~ppc64; bug #64612
+
+  15 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -alsamixergui-0.9.0.1.2-r1.ebuild, -alsamixergui-0.9.0.1.2-r3.ebuild:
+  Removed old versions.
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsamixergui-0.9.0.1.2-r4.ebuild:
+  get_libdir fixes.
+
+  03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsamixergui-0.9.0.1.2-r4.ebuild:
+  Stable amd64, x86.
+
+  05 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -alsamixergui-0.9.0.1.2-r2.ebuild:
+  ppc should not have been dropped from KEYWORDS in -r4.  Removing clutter.
+
+*alsamixergui-0.9.0.1.2-r4 (03 Jul 2004)
+
+  03 Jul 2004; Frank van de Pol <fvdpol@gentoo.org>
+  +files/alsamixergui-0.9.0.1.2-gcc34.patch,
+  +alsamixergui-0.9.0.1.2-r4.ebuild:
+  GCC-3.4 patch. Closes bug #53186
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsamixergui-0.9.0.1.2-r1.ebuild, alsamixergui-0.9.0.1.2-r2.ebuild,
+  alsamixergui-0.9.0.1.2-r3.ebuild, alsamixergui-0.9.0.1.2.ebuild:
+  Added IUSE.
+
+  18 Apr 2004; Travis Tilley <lv@gentoo.org> alsamixergui-0.9.0.1.2-r3.ebuild:
+  marking stable on amd64
+
+  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsamixergui-0.9.0.1.2-r1.ebuild:
+  inherit eutils.
+
+  16 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsamixergui-0.9.0.1.2-r1.ebuild, alsamixergui-0.9.0.1.2-r2.ebuild,
+  alsamixergui-0.9.0.1.2.ebuild:
+  virtual/alsa fix for bug #27746.
+
+  07 Dec 2003; Heinrich Wendel <lanius@gentoo.org>
+  alsamixergui-0.9.0.1.2-r3.ebuild:
+  ~x86 -> x86
+
+  31 Oct 2003; Douglas Russell <puggy@gentoo.org>
+  alsamixergui-0.9.0.1.2-r1.ebuild, alsamixergui-0.9.0.1.2-r2.ebuild,
+  alsamixergui-0.9.0.1.2-r3.ebuild, alsamixergui-0.9.0.1.2.ebuild:
+  Added ~ppc ACCEPT_KEYWORD and metadata.xml
+
+*alsamixergui-0.9.0.1.2-r3 (08 Oct 2003)
+
+  08 Oct 2003; John Mylchreest <johnm@gentoo.org>;
+  alsamixergui-0.9.0.1.2-r3.ebuild:
+  Thought this had been changed long ago... Changing to depend on virtual/alsa
+
+*alsamixergui-0.9.0.1.2-r2 (02 Jan 2002)
+
+  02 Jan 2002; Nick Hadaway <raker@gentoo.org>
+  alsamixergui-0.9.0.1.2-r2.ebuild,
+  files/digest-alsamixergui-0.9.0.1.2-r2,
+  files/gentoo.diff :
+  New ebuild.  Another attempt at getting configure right.
+
+*alsamixergui-0.9.0.1.2-r1 (21 Sep 2002)
+
+  21 Sep 2002; Mike Frysinger <vapier@gentoo.org> :
+  The alsa-lib has changed locations from media-sound to media-libs so the
+  DEPEND variable needed updating
+
+*alsamixergui-0.9.0.1.2 (24 May 2002)
+
+  13 Aug 2002; Arcady Genkin <agenkin@thpoon.com> alsamixergui-0.9.0.1.2.ebuild :
+
+  Hacked for compatibility with the latest fltk library.
+	
+  24 May 2002; Arcady Genkin <agenkin@thpoon.com> alsamixergui-0.9.0.1.2.ebuild :
   
-  Initial version of the package, created by you@hanez.org (Johannes Findeisen).
\ No newline at end of file
+  Initial version of the package, created by you@hanez.org (Johannes Findeisen).
diff --git a/media-sound/alsamixergui/Manifest b/media-sound/alsamixergui/Manifest
index e69de29bb2d1..f8eac7c60a2b 100644
--- a/media-sound/alsamixergui/Manifest
+++ b/media-sound/alsamixergui/Manifest
@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 11b7055b373b7604b09f05570bdb740b ChangeLog 3566
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 10fb6405037a8030eef3af2434e70fa3 alsamixergui-0.9.0.1.2-r4.ebuild 1156
+MD5 63d2d0c0e4d846f282cd434e8eded5e5 files/segfault-on-exit.patch 402
+MD5 1d989be2658c31e20c7b40421c52d488 files/fltk-1.1+gcc3.diff 2950
+MD5 b41f6aecc3e59693e3daa2ff30ab4142 files/gentoo.diff 2907
+MD5 bbbd9c8764a3e702e0acc8a35bf90f6e files/alsamixergui-0.9.0.1.2-gcc34.patch 557
+MD5 6ca0194d89c9788252d9e58bb6d2ee8a files/digest-alsamixergui-0.9.0.1.2-r4 74
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBxRICArHZZzCEUG0RAtHUAJ98kSmwjQq/Aqe+M3DwwOuRZ+2QfwCgglxl
+Qh+ilM88g4SYik/IniggMlE=
+=wH/Q
+-----END PGP SIGNATURE-----
diff --git a/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild b/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild
index f99c18b3fae2..f6f3ba84a2d3 100644
--- a/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild
+++ b/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.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/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild,v 1.1 2004/07/03 00:01:56 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild,v 1.1.1.1 2005/11/30 09:37:59 chriswhite Exp $
 
 IUSE=""
 
@@ -13,31 +13,32 @@ DESCRIPTION="AlsaMixerGui - a FLTK based amixer Frontend"
 HOMEPAGE="http://www.iua.upf.es/~mdeboer/projects/alsamixergui/"
 SRC_URI="ftp://www.iua.upf.es/pub/mdeboer/projects/alsamixergui/${PN}-${NATIVE_VER}.tar.gz"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+
 DEPEND="virtual/alsa
 	>=media-libs/alsa-lib-0.9.0_rc1
 	>=media-sound/alsa-utils-0.9.0_rc1
 	>=x11-libs/fltk-1.1.0_rc6"
 
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-LICENSE="GPL-2"
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/gentoo.diff
 	epatch ${FILESDIR}/${P}-gcc34.patch
+	epatch ${FILESDIR}/segfault-on-exit.patch
 }
 
 src_compile() {
-	export LDFLAGS="-L/usr/lib/fltk-1.1"
-	export CPPFLAGS="-I/usr/include/fltk-1.1"
+	export LDFLAGS="-L/usr/$(get_libdir)/fltk-1.1 ${LDFLAGS}"
+	export CPPFLAGS="-I/usr/include/fltk-1.1 ${CPPFLAGS}"
 
 	econf || die "configure failed"
 	emake || die "make failed"
 }
 
 src_install() {
-	einstall || die
-	dodoc COPYING README AUTHORS ChangeLog
+	make DESTDIR="${D}" install || die
+	dodoc README AUTHORS ChangeLog
 }
diff --git a/media-sound/alsaplayer/ChangeLog b/media-sound/alsaplayer/ChangeLog
index 7ad1ce1465d0..69565b8adc05 100644
--- a/media-sound/alsaplayer/ChangeLog
+++ b/media-sound/alsaplayer/ChangeLog
@@ -1,6 +1,184 @@
 # ChangeLog for media-sound/alsaplayer
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/ChangeLog,v 1.1 2002/04/26 19:33:14 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/ChangeLog,v 1.1.1.1 2005/11/30 09:38:25 chriswhite Exp $
+
+  24 Aug 2005; Aron Griffis <agriffis@gentoo.org>
+  alsaplayer-0.99.76-r1.ebuild:
+  stable on ia64
+
+  05 Jul 2005; Aron Griffis <agriffis@gentoo.org>
+  alsaplayer-0.99.76-r1.ebuild:
+  stable on alpha
+
+  14 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  alsaplayer-0.99.76-r1.ebuild:
+  introduced support for the audiofile useflag, as suggest by Dennis Schridde
+  <lindevel@gmx.net>. fixes #91678. did some cosmetic cleanup
+
+  09 May 2005; Aron Griffis <agriffis@gentoo.org> alsaplayer-0.99.76.ebuild:
+  stable on ia64
+
+  20 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> -files/gcc.patch,
+  -alsaplayer-0.99.75-r1.ebuild, alsaplayer-0.99.76-r1.ebuild,
+  alsaplayer-0.99.76.ebuild:
+  added missing libsndfile dependency, fixes #89597. also changed deprecated
+  oggvorbis to vorbis.
+
+  19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  Remove retired developer from metadata.xml.
+
+  13 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  alsaplayer-0.99.76-r1.ebuild:
+  removed unneeded useflag logic, fixes #85046
+
+*alsaplayer-0.99.76-r1 (12 Mar 2005)
+
+  12 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +alsaplayer-0.99.76-r1.ebuild:
+  applied a cleanup patch which was suggested by Diego Pettenò
+  <dgp85@users.sourceforge.net>. Fixes #82744
+
+  06 Mar 2005; Joseph Jezak <josejx@gentoo.org>
+  +files/alsaplayer-endian.patch, alsaplayer-0.99.76.ebuild:
+  Added Chris White's patch for big endian machines.  See bug #76409.
+
+  12 Feb 2005; Robin H. Johnson <robbat2@gentoo.org>
+  alsaplayer-0.99.76.ebuild:
+  Add ~mips for my XXS1500 hardware.
+
+  06 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsaplayer-0.99.75-r1.ebuild, alsaplayer-0.99.76.ebuild:
+  Fixing gtk dep to close bug #73504.
+
+  03 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsaplayer-0.99.75-r1.ebuild, alsaplayer-0.99.76.ebuild:
+  Added to ~sparc
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsaplayer-0.99.76.ebuild:
+  Stable amd64.
+
+  25 Apr 2004; Aron Griffis <agriffis@gentoo.org>
+  alsaplayer-0.99.75-r1.ebuild:
+  Add die following econf for bug 48950
+
+  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsaplayer-0.99.75-r1.ebuild:
+  inherit eutils.
+
+  26 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsaplayer-0.99.75-r1.ebuild, alsaplayer-0.99.76.ebuild:
+  Cleaned up DEPs, added eutils.  Moved to stable x86.
+
+  17 Feb 2004; Ciaran McCreesh <ciaranm@gentoo.org>
+  alsaplayer-0.99.75-r1.ebuild, alsaplayer-0.99.76.ebuild:
+  Changing to -sparc as we don't have ALSA support
+
+  22 Jan 2004; <torbenh@gentoo.org> alsaplayer-0.99.75-r1.ebuild,
+  alsaplayer-0.99.76.ebuild:
+  Fixed alsa-1.0 bug
+  fixed jack dependency.
+
+  12 Dec 2003; Michael Sterrett <mr_bones_@gentoo.org>
+  alsaplayer-0.99.76.ebuild:
+  media-libs/libjackasync -> media-libs/libjackasyn
+
+*alsaplayer-0.99.76 (12 Dec 2003)
+
+  12 Dec 2003; Seemant Kulleen <seemant@gentoo.org> alsaplayer-0.99.76.ebuild:
+  version bump thanks to: Niek van der Maas <webmaster@refstart.nl> and Brett I.
+  Holcomb <brettholcomb@charter.net> in bug #35507
+
+*alsaplayer-0.99.75-r1 (26 Sep 2003)
+
+  26 Sep 2003; jje <jje@gentoo.org> alsaplayer-0.99.75-r1.ebuild,
+  files/gcc.patch:
+  Patched for gcc-3.3. See #29553.
+
+*alsaplayer-0.99.75 (09 May 2003)
+
+  09 May 2003; jje <jje@gentoo.org> alsaplayer-0.99.75.ebuild:
+  Version bump.
+
+  13 Mar 2003; Daniel Ahlberg <aliz@gentoo.org> alsaplayer-0.99.74.ebuild :
+  Updated installation command. Closes #17415.
+
+*alsaplayer-0.99.74 (09 Mar 2003)
+
+  09 Mar 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump.
+
+*alsaplayer-0.99.73 (16 Dec 2002)
+
+  18 Dec 2002; Seemant Kulleen <seemant@gentoo.org>
+  alsaplayer-0.99.73.ebuild :
+
+  I screwed up with some syntax (left a hanging if).  Closes bug #12372 by
+  hertog@home.nl (Gert-Jan Rodenburg)
+
+  16 Dec 2002; Seemant Kulleen <seemant@gentoo.org>
+  alsaplayer-0.99.73.ebuild files/digest-alsaplayer-0.99.73 :
+
+  Version bump thanks to: ashura666@mac.com in bug #12271.
+
+*alsaplayer-0.99.72 (18 Oct 2002)
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  18 Oct 2002; Seemant Kulleen <seemant@gentoo.org>
+  alsaplayer-0.99.72.ebuild files/digest-alsaplayer-0.99.72 :
+
+  Andy Lo-A-Foe informed me of this version bump a day or two after it came
+  out, but we were in freeze.  Due to new masking, I have finally added it.
+  Also, requested by: luke@dslextreme.com (Luke Ravitch) in bug #9232.
+
+*alsaplayer-0.99.71.20020607 (7 Jun 2002)
+
+  17 Sep 2002; Seemant Kulleen <seemant@gentoo.org>
+  alsaplayer-0.99.71.20020607.ebuild :
+
+  Andy Lo-A-Foe (alsaplayer upstream author) informs me that the qt plugin
+  is no longer shipped with alsaplayer, so all qt stuff has gone from the
+  ebuild.
+
+  7 Jun 2002; Seemant Kulleen <seemant@gentoo.org>
+  alsaplayer-0.99.71.20020607.ebuild
+  files/digest-alsaplayer-0.99.71.20020607 :
+
+  Version bump to newest CVS snapshot, which sorts the gcc-3.1 bug out and
+  also works with alsa5 for those users who still need that.
+
+*alsaplayer-0.99.70-r1 (4 Jun 2002)
+
+  4 Jun 2002; Seemant Kulleen <seemant@gentoo.org>
+  alsaplayer-0.99.70-r1.ebuild files/digest-alsaplayer-0.99.70-r1 :
+
+  sandbox violation fix for installing the documentation if doxygen is on
+  the system.  Closes bug # 3322, by ryan.shaw@stanfordalumni.org (Ryan
+  Shaw)
+
+*alsaplayer-0.99.70 (22 May 2002)
+
+  22 May 2002; Matthew Kennedy <mkennedy@gentoo.org>
+  alsaplayer-0.99.70.ebuild, files/digest-alsaplayer-0.99.70,
+  files/alsaplayer-0.99.70-gcc3.1-gentoo.patch :
+
+  Version bump and patch to get it to compile against gcc3.1.
+
+*alsaplayer-0.99.60-r1 (4 May 2002)
+
+  4 May 2002; Seemant Kulleen <seemant@gentoo.org> alsaplayer-0.99.60-r1.ebuild
+  files/digest-alsaplayer-0.99.60-r1 :
+
+  Rachel Holmes pointed out that ALSA is not a requirement but an optional
+  dependency.  Also added nls optional and fixed oggvorbis optional.
+
+*alsaplayer-0.99.60 (2 May 2002)
+
+  2 May 2002; Seemant Kulleen <seemant@gentoo.org> alsaplayer-0.99.60.ebuild
+  files/digest-alsaplayer-0.99.60
+
+  Version bump, thanks to Rachel Holmes.
 
 *alsaplayer-0.99.59 (26 Apr 2002)
 
diff --git a/media-sound/alsaplayer/Manifest b/media-sound/alsaplayer/Manifest
index a3dc0a256ada..b69652c12e58 100644
--- a/media-sound/alsaplayer/Manifest
+++ b/media-sound/alsaplayer/Manifest
@@ -1,12 +1,7 @@
-MD5 0deb6f322c6e3c5de46d4fafead6d7ec ChangeLog 3248
-MD5 85dc4d6acf3287fdbabc396c91d91464 alsaplayer-0.99.71.20020607.ebuild 1888
-MD5 5b2406a9d388a9dd160a9cbed26de056 alsaplayer-0.99.72.ebuild 1971
-MD5 1c009db676657b9ad77643a12a032b4a alsaplayer-0.99.73.ebuild 1928
-MD5 90be333ffddb0dc7ccfdbd781b34052c alsaplayer-0.99.74.ebuild 2046
-MD5 90be333ffddb0dc7ccfdbd781b34052c alsaplayer-0.99.75.ebuild 2046
-MD5 c3bda0979e54037156c5184b6110db98 files/alsaplayer-0.99.70-gcc3.1-gentoo.patch 880
-MD5 e957f44dcc4c868c6ad49ebf0e44c5ba files/digest-alsaplayer-0.99.71.20020607 80
-MD5 8935db340128115835e9cef670f73a12 files/digest-alsaplayer-0.99.72 71
-MD5 df376a85157cb5149ef7fbff347566b9 files/digest-alsaplayer-0.99.73 71
-MD5 267c7e7507f8f2a00944a899f005a67e files/digest-alsaplayer-0.99.74 71
-MD5 d7c5048a47693b7a9ba603a3fadd8cd1 files/digest-alsaplayer-0.99.75 71
+MD5 fa9994cba4a0be6f81deb33e4e3100e7 alsaplayer-0.99.76-r1.ebuild 2047
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 c2e99be6f50e792d2fdcd3182badf745 ChangeLog 6451
+MD5 41d025f12a81a5c43e55d58ed0dbcbde alsaplayer-0.99.76.ebuild 1604
+MD5 53bd2804a0e111a7f5fd3e65e8ccd493 files/digest-alsaplayer-0.99.76-r1 71
+MD5 4d1180a1109044fb119335839a357f95 files/alsaplayer-endian.patch 1143
+MD5 53bd2804a0e111a7f5fd3e65e8ccd493 files/digest-alsaplayer-0.99.76 71
diff --git a/media-sound/alsaplayer/alsaplayer-0.99.76-r1.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.76-r1.ebuild
index d1d1a05b8b8a..71969d007090 100644
--- a/media-sound/alsaplayer/alsaplayer-0.99.76-r1.ebuild
+++ b/media-sound/alsaplayer/alsaplayer-0.99.76-r1.ebuild
@@ -1,30 +1,31 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/alsaplayer-0.99.76-r1.ebuild,v 1.1 2005/03/12 15:00:11 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/alsaplayer-0.99.76-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:25 chriswhite Exp $
 
 inherit eutils
 
-IUSE="nas nls esd opengl doc oss gtk oggvorbis alsa jack mikmod flac"
-
 DESCRIPTION="Media player primarily utilising ALSA"
 HOMEPAGE="http://www.alsaplayer.org/"
 SRC_URI="http://www.alsaplayer.org/${P}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~mips"
+SLOT="0"
+KEYWORDS="alpha ~amd64 ia64 ~mips ~ppc ~sparc ~x86"
+IUSE="alsa audiofile doc esd flac gtk jack mikmod nas nls ogg opengl oss vorbis xosd"
 
 RDEPEND=">=dev-libs/glib-1.2.10
+	media-libs/libsndfile
+	alsa? ( media-libs/alsa-lib )
+	audiofile? ( media-libs/audiofile )
 	esd? ( media-sound/esound )
+	flac? ( media-libs/flac )
 	gtk? ( =x11-libs/gtk+-1* )
-	nas? ( media-libs/nas )
-	alsa? ( media-libs/alsa-lib )
 	jack? ( >=media-sound/jack-audio-connection-kit-0.80.0 )
-	flac? ( media-libs/flac )
 	mikmod? ( >=media-libs/libmikmod-3.1.10 )
+	nas? ( media-libs/nas )
+	ogg? ( media-libs/libogg )
 	opengl? ( virtual/opengl )
 	vorbis? ( media-libs/libvorbis )
-	ogg? ( media-libs/libogg )
 	xosd? ( x11-libs/xosd )"
 
 DEPEND="${RDEPEND}
@@ -41,35 +42,33 @@ src_unpack() {
 }
 
 src_compile() {
+	export CPPFLAGS="${CPPFLAGS} -I/usr/X11R6/include"
+
 	use xosd ||
 		export ac_cv_lib_xosd_xosd_create="no"
 
 	use doc ||
 		export ac_cv_prog_HAVE_DOXYGEN="false"
 
-	if ! use ogg && use vorbis; then
-		die "To enable vorbis you must enable also ogg."
-	fi
-
 	if use ogg && use flac; then
 		myconf="${myconf} --enable-oggflac"
 	fi
 
 	econf \
-		$(use_enable oss) \
+		$(use_enable audiofile) \
+		$(use_enable esd) \
+		$(use_enable flac) \
+		$(use_enable gtk) \
+		$(use_enable jack) \
+		$(use_enable mikmod) \
 		$(use_enable nas) \
 		$(use_enable opengl) \
+		$(use_enable oss) \
 		$(use_enable nls) \
 		$(use_enable sparc) \
 		$(use_enable vorbis oggvorbis) \
-		$(use_enable esd) \
-		$(use_enable gtk) \
-		$(use_enable jack) \
-		$(use_enable mikmod) \
-		$(use_enable flac) \
 		${myconf} \
 		--disable-sgi --disable-dependency-tracking || die "./configure failed"
-
 	emake || die "make failed"
 }
 
@@ -77,6 +76,6 @@ src_install() {
 	make DESTDIR=${D} docdir=${D}/usr/share/doc/${PF} install \
 		|| die "make install failed"
 
-	dodoc AUTHORS COPYING ChangeLog README TODO
+	dodoc AUTHORS ChangeLog README TODO
 	dodoc docs/wishlist.txt
 }
diff --git a/media-sound/alsaplayer/alsaplayer-0.99.76.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.76.ebuild
index 88dbc818dae6..f5a1549855b5 100644
--- a/media-sound/alsaplayer/alsaplayer-0.99.76.ebuild
+++ b/media-sound/alsaplayer/alsaplayer-0.99.76.ebuild
@@ -1,31 +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/media-sound/alsaplayer/alsaplayer-0.99.76.ebuild,v 1.1 2003/12/12 20:38:44 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/alsaplayer-0.99.76.ebuild,v 1.1.1.1 2005/11/30 09:38:25 chriswhite Exp $
 
-IUSE="nas nls esd opengl doc oss gtk oggvorbis alsa jack mikmod flac"
+inherit eutils
+
+IUSE="nas nls esd opengl doc oss gtk vorbis alsa jack mikmod flac"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Media player primarily utilising ALSA"
 HOMEPAGE="http://www.alsaplayer.org/"
 SRC_URI="http://www.alsaplayer.org/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~arm ~amd64 ~ia64"
+KEYWORDS="~alpha amd64 ia64 ~mips ppc ~sparc x86"
 
-DEPEND=">=dev-libs/glib-1.2.10
+RDEPEND=">=dev-libs/glib-1.2.10
+	media-libs/libsndfile
 	doc? ( app-doc/doxygen )
 	esd? ( media-sound/esound )
-	gtk? ( x11-libs/gtk+ )
+	gtk? ( =x11-libs/gtk+-1* )
 	nas? ( media-libs/nas )
 	alsa? ( media-libs/alsa-lib )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.80.0 )
 	flac? ( media-libs/flac )
-	jack? ( media-libs/libjackasync )
 	mikmod? ( >=media-libs/libmikmod-3.1.10 )
 	opengl? ( virtual/opengl )
-	oggvorbis? ( media-libs/libvorbis )"
+	vorbis? ( media-libs/libvorbis )"
+
+DEPEND="${RDEPEND}
+	sys-apps/sed
+	nls? ( sys-devel/gettext )"
 
-RDEPEND="nls? ( sys-devel/gettext )"
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	if use ppc; then
+		epatch ${FILESDIR}/alsaplayer-endian.patch
+	fi
+}
 
 src_compile() {
 	export CPPFLAGS="${CPPFLAGS} -I/usr/X11R6/include"
@@ -36,7 +48,7 @@ src_compile() {
 		`use_enable opengl` \
 		`use_enable nls` \
 		`use_enable sparc` \
-		`use_enable oggvorbis` \
+		`use_enable vorbis oggvorbis` \
 		`use_enable esd` \
 		`use_enable gtk` \
 		`use_enable jack` \
@@ -51,6 +63,6 @@ src_install() {
 
 	make DESTDIR=${D} docdir=${D}/usr/share/doc/${PF} install
 
-	dodoc AUTHORS COPYING ChangeLog README TODO
+	dodoc AUTHORS ChangeLog README TODO
 	dodoc docs/wishlist.txt
 }
diff --git a/media-sound/alsaplayer/metadata.xml b/media-sound/alsaplayer/metadata.xml
index d4ce46c038ab..e1774e3d9ad7 100644
--- a/media-sound/alsaplayer/metadata.xml
+++ b/media-sound/alsaplayer/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sound</herd>
-<maintainer>
-  <email>torbenh@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 3bec618ea75f..6da27d07679a 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,391 @@
 # ChangeLog for media-sound/amarok
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.1 2003/09/21 01:56:48 jje Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.1.1.1 2005/11/30 09:38:03 chriswhite Exp $
+
+*amarok-1.3.6 (08 Nov 2005)
+
+  08 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> -amarok-1.3.5.ebuild,
+  +amarok-1.3.6.ebuild:
+  Update to 1.3.6 (and removal of 1.3.5) that seems to fix the crash at startup.
+
+  05 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -files/amarok-1.3.2-playlist.patch, -amarok-1.2.3.ebuild,
+  -amarok-1.3.2-r1.ebuild, -amarok-1.3.3.ebuild:
+  Remove old versions.
+
+  28 Oct 2005; Jason Wever <weeve@gentoo.org> amarok-1.3.5.ebuild:
+  Changed -sparc keyword to ~sparc.
+
+*amarok-1.3.5 (25 Oct 2005)
+
+  25 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> -amarok-1.3.4.ebuild,
+  +amarok-1.3.5.ebuild:
+  Update to 1.3.5, as 1.3.4 seemed to have problems.
+
+*amarok-1.3.4 (24 Oct 2005)
+
+  24 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> +amarok-1.3.4.ebuild:
+  Bumped to 1.3.4.
+
+  19 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> amarok-1.3.3.ebuild:
+  Do not force arts plugins, avoiding complications due to the fact that
+  kde-base/artsplugins-akode will be providing them in KDE 3.5.
+
+  11 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> amarok-1.3.3.ebuild:
+  Cleanup configure parameters, make sure musicbrainz is disabled when
+  required, and forcefully disable extra engines.
+
+*amarok-1.3.3 (09 Oct 2005)
+
+  09 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> +amarok-1.3.3.ebuild:
+  Version bump following upstream.
+
+*amarok-1.3.2-r1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -files/amarok-1.3.1-gst-alsaagain.patch,
+  -files/amarok-1.3.1-gst-onlyoss.patch, -files/amarok-1.3.1-qt-3.3.5.patch,
+  +files/amarok-1.3.2-playlist.patch, -amarok-1.3.ebuild,
+  -amarok-1.3.1-r1.ebuild, -amarok-1.3.1-r2.ebuild, -amarok-1.3.2.ebuild,
+  +amarok-1.3.2-r1.ebuild:
+  Added patch to fix crashes on startup with 1.3 series. Thanks to Mark
+  Kretschmann for the patch. Purged old 1.3 ebuilds as they are not stable
+  enough.
+
+*amarok-1.3.2 (20 Sep 2005)
+
+  20 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +amarok-1.3.2.ebuild:
+  Version bump.
+
+  18 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/amarok-1.3.1-qt-3.3.5.patch, amarok-1.3.1-r2.ebuild:
+  Added patch to compile with qt 3.3.5 from amaroK's SVN repository. Closes
+  bug #106366.
+
+*amarok-1.3.1-r2 (11 Sep 2005)
+
+  11 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/amarok-1.3.1-gst-alsaagain.patch, +amarok-1.3.1-r2.ebuild:
+  Added patch to re-add support for alsasink with gstreamer engine. Thanks to
+  Mark Kretschmann for submitting it.
+
+  08 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> amarok-1.3.1-r1.ebuild:
+  Don't force using gst-plugins-oss, let the uesrs select what they want.
+  Close #105298. The sed for libpq-fe is no more needed. Make musicbrainz
+  optional with musicbrainz useflag. Close #105298.
+
+*amarok-1.3.1-r1 (08 Sep 2005)
+
+  08 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/amarok-1.3.1-gst-onlyoss.patch, -amarok-1.3.1.ebuild,
+  +amarok-1.3.1-r1.ebuild:
+  Added patch to avoid using autodetection with gstreamer (crashes when using
+  alsa). Added a note for gstreamer users and a dependency over oss plugin.
+  Consider using xine backend if you want alsa output.
+
+*amarok-1.3.1 (06 Sep 2005)
+
+  06 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +amarok-1.3.1.ebuild:
+  Added amarok 1.3.1, masked due to problems with gstreamer and alsa.
+
+*amarok-1.3 (15 Aug 2005)
+
+  15 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -amarok-1.3_beta3.ebuild, +amarok-1.3.ebuild:
+  Updated to amarok-1.3 final.
+
+  08 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> amarok-1.2.3.ebuild,
+  amarok-1.2.4.ebuild, amarok-1.3_beta3.ebuild:
+  Raise dependency on mysql for bug #101717.
+
+  07 Aug 2005; Carsten Lohrke <carlo@gentoo.org> amarok-1.3_beta3.ebuild:
+  fix build with postgres
+
+*amarok-1.3_beta3 (01 Aug 2005)
+
+  01 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +amarok-1.3_beta3.ebuild:
+  New upstream version. Closes #101001. Still in package.mask being a beta.
+
+  31 Jul 2005; Diego Pettenò <flameeyes@gentoo.org> amarok-1.2.3.ebuild,
+  amarok-1.2.4.ebuild, amarok-1.3_beta1.ebuild, amarok-1.3_beta2.ebuild:
+  Use ${KDEDIR} instead of kde-config to set PREFIX as it's not in path during
+  src_compile().
+
+  30 Jul 2005; Simon Stelling <blubb@gentoo.org> amarok-1.2.4.ebuild:
+  stable on amd64
+
+  10 Jul 2005; Joseph Jezak <josejx@gentoo.org> amarok-1.2.4.ebuild:
+  Marked ppc stable.
+
+  08 Jul 2005; Carsten Lohrke <carlo@gentoo.org> amarok-1.2.4.ebuild:
+  stable on x86
+
+  09 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> amarok-1.3_beta2.ebuild:
+  Move amarok.desktop in /usr/share/applications (#77515).
+
+*amarok-1.3_beta2 (27 Jun 2005)
+
+  27 Jun 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +amarok-1.3_beta2.ebuild:
+  New upstream beta.
+
+  22 Jun 2005; Hanno Boeck <hanno@gentoo.org> +files/amarok-gcc4.gz,
+  amarok-1.2.4.ebuild:
+  Fix for gcc4.
+
+  17 Jun 2005; Joseph Jezak <josejx@gentoo.org> amarok-1.2.3.ebuild:
+  Marked ppc stable.
+
+  16 Jun 2005; Diego Pettenò <flameeyes@gentoo.org>
+  amarok-1.3_beta1.ebuild:
+  Amarok 1.3 depends on kde 3.3 not 3.4.
+
+  08 Jun 2005; Gregorio Guidi <greg_g@gentoo.org> amarok-1.3_beta1.ebuild:
+  Change flag 'oggvorbis' into 'vorbis' (#89592). Change 'mad' into 'mp3'. Add
+  missing configure switches.
+
+*amarok-1.3_beta1 (06 Jun 2005)
+
+  06 Jun 2005; Heinrich Wendel <lanius@gentoo.org> +amarok-1.3_beta1.ebuild:
+  version bump
+
+*amarok-1.2.4 (21 May 2005)
+
+  21 May 2005; Heinrich Wendel <lanius@gentoo.org> -amarok-1.2.ebuild,
+  -amarok-1.2.1.ebuild, -amarok-1.2.2.ebuild, amarok-1.2.3.ebuild,
+  +amarok-1.2.4.ebuild:
+  version bump, cleanups
+
+  14 May 2005; Heinrich Wendel <lanius@gentoo.org> amarok-1.2.3.ebuild:
+  stable on amd64 and x86
+
+  07 Apr 2005; Simon Stelling <blubb@gentoo.org> amarok-1.2.1.ebuild:
+  stable on amd64
+
+*amarok-1.2.3 (29 Mar 2005)
+
+  29 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> +amarok-1.2.3.ebuild:
+  new upstream version, thanks to Diego Pettenò <dgp85@users.sourceforge.net>
+
+  21 Mar 2005; Gregorio Guidi <greg_g@gentoo.org> amarok-1.2.1.ebuild:
+  Stable on x86.
+
+*amarok-1.2.2 (18 Mar 2005)
+
+  18 Mar 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/amarok-1.2.2-contextbrowser-cpu-fix.patch, +amarok-1.2.2.ebuild:
+  New version (#85284). Correct gstreamer dependencies (#84663). Add support for
+  visualization plugins through libvisual (#82165). Warn that aRts support is
+  deprecated (as requested in bug #85542). Add patch to fix kde bug 101524.
+
+*amarok-1.2.1 (01 Mar 2005)
+
+  01 Mar 2005; Carsten Lohrke <carlo@gentoo.org> +amarok-1.2.1.ebuild:
+  version bump
+
+*amarok-1.2 (13 Feb 2005)
+
+  13 Feb 2005; Gregorio Guidi <greg_g@gentoo.org> +amarok-1.2.ebuild:
+  Version bump.
+
+  02 Feb 2005; Gregorio Guidi <greg_g@gentoo.org> -files/amarok-1.0-cjk.diff,
+  amarok-1.2_beta4.ebuild:
+  Removed cjk patch, it does not apply anymore.
+
+*amarok-1.2_beta4 (01 Feb 2005)
+
+  01 Feb 2005; Gregorio Guidi <greg_g@gentoo.org> -amarok-1.2_beta2.ebuild,
+  -amarok-1.2_beta3.ebuild, +amarok-1.2_beta4.ebuild:
+  Version bump.
+
+  30 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> amarok-1.1.1.ebuild:
+  added missing libsdl dependency. fixes #72395
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> amarok-1.0.2.ebuild,
+  amarok-1.1.1.ebuild, amarok-1.2_beta2.ebuild, amarok-1.2_beta3.ebuild:
+  Changed deps on kdebase, kdemultimedia to accept kdebase-meta and
+  kdemultimedia-meta, the split 'meta' packages. This dep will be narrowed
+  down in the future to the precise split packages required.
+
+*amarok-1.2_beta3 (11 Jan 2005)
+
+  11 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +amarok-1.2_beta3.ebuild:
+  Version bump closes bug #77185.
+
+  04 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  amarok-1.1.1.ebuild, amarok-1.2_beta2.ebuild:
+  Updating version on xine dependency per bug #70260.
+
+  13 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -amarok-1.2_beta1.ebuild, amarok-1.2_beta2.ebuild:
+  Added mysql support.
+
+*amarok-1.2_beta2 (12 Dec 2004)
+
+  12 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +amarok-1.2_beta2.ebuild:
+  Version bump.
+
+  04 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  amarok-1.1.1.ebuild, amarok-1.2_beta1.ebuild:
+  Relaxing the arts dependency.  Closes bug #72869.
+
+  30 Nov 2004; Sven Wegener <swegener@gentoo.org> amarok-1.1.1.ebuild,
+  amarok-1.2_beta1.ebuild:
+  Fixed invalid atoms in *DEPEND.
+
+*amarok-1.2_beta1 (29 Nov 2004)
+
+  29 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  amarok-1.1.1.ebuild, +amarok-1.2_beta1.ebuild:
+  Version bump (package.mask'd beta) and fix missing depend on
+  media-sound/kdemultimedia for CD playback.
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  amarok-1.1.1.ebuild:
+  -sparc
+
+  12 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> -amarok-0.9.ebuild,
+  amarok-1.1.1.ebuild:
+  Cleanup.
+
+  07 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  amarok-1.1.1.ebuild:
+  Readded gstreamer support forcing the mad plugin to be installed for
+  gstreamer support as the ffmpeg plugin won't work (see bug #66902).
+
+  05 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  amarok-1.1.1.ebuild:
+  Removing gstreamer support as it is horribly broken and uses 100% CPU under
+  some circumstances... see bug #65434 comment #3.
+
+  26 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  amarok-1.1.1.ebuild:
+  Changing dep to =libvisual-0.1.6 to close bug #68731.
+
+*amarok-1.1.1 (09 Oct 2004)
+
+  09 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +amarok-1.1.1.ebuild, -amarok-1.1.ebuild:
+  Version bump for bug #66902.
+
+  30 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> amarok-1.1.ebuild:
+  Removed noamazon support as it is broken in this version. Fixed upstream for
+  next release.
+
+  28 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> amarok-1.1.ebuild:
+  Added noamazon USE flag to turn off support for downloading covers from
+  amazon.com
+
+*amarok-1.0.1 (27 Sep 2004)
+
+  27 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> -amarok-1.0.1.ebuild,
+  -amarok-1.0.ebuild, -amarok-1.1_beta2.ebuild:
+  Version bump and cleanup.
+
+  22 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  amarok-1.1_beta2.ebuild:
+  Added arts to IUSE.
+
+*amarok-1.1_beta2 (15 Sep 2004)
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +amarok-1.1_beta2.ebuild:
+  Version bump closes bug #61723.
+
+  03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -amarok-1.0_beta3.ebuild, -amarok-1.0_beta4.ebuild:
+  1.0.2 stable amd64, x86.  Removing old ebuilds.
+
+*amarok-1.0.2 (09 Aug 2004)
+
+  09 Aug 2004; Patrick Dawson <pkdawson@gentoo.org> amarok-1.0.2.ebuild:
+  Version bump, closes bug #59600. Added a xine USE flag.
+  Thanks to Andrew Cooks <andrew@expertron.co.za>
+
+  06 Jul 2004; Frank van de Pol <fvdpol@gentoo.org> :
+  Version bump, closes bug #55898.
+
+  03 Jul 2004; Carsten Lohrke <carlo@gentoo.org> amarok-1.0.ebuild:
+  QA: need-kde after R/DEPEND
+
+  18 Jun 2004; Dominik Stadler <centic@gentoo.org> amarok-1.0.ebuild:
+  According to the README we should require gstreamer 0.8.1
+
+*amarok-1.0 (18 Jun 2004)
+
+  18 Jun 2004; Dominik Stadler <centic@gentoo.org>
+  +files/amarok-1.0-cjk-a.diff, +amarok-1.0.ebuild:
+  Add Version 1.0, fixes Bug 54251 and add ~amd64, fixes Bug 54305
+
+*amarok-1.0_beta4 (15 Jun 2004)
+
+  15 Jun 2004; Jon Hood <squinky86@gentoo.org> +files/amarok-1.0-cjk.diff,
+  amarok-1.0_beta3.ebuild, +amarok-1.0_beta4.ebuild:
+  adding cjk patch and version bump from Jackey Yang <043936y@acadiau.ca>,
+  closes #52930
+
+*amarok-1.0_beta3 (22 May 2004)
+
+  22 May 2004; Jon Hood <squinky86@gentoo.org> -amarok-0.7.0.ebuild,
+  -amarok-0.8.3.ebuild, +amarok-1.0_beta3.ebuild:
+  version bump, closes #51133
+
+  25 Apr 2004; Danny van Dyk <kugelfang@gentoo.org> amarok-0.9.ebuild:
+  marked ~amd64.
+
+  24 Apr 2004; Heinrich Wendel <lanius@gentoo.org> amarok-0.7.0.ebuild,
+  amarok-0.8.3.ebuild, amarok-0.9.ebuild, amarok-1.0_beta1.ebuild:
+  fix depend
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> amarok-0.7.0.ebuild,
+  amarok-0.8.3.ebuild:
+  Added IUSE.
+
+*amarok-1.0_beta1 (12 Apr 2004)
+
+  12 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  amarok-1.0_beta1.ebuild:
+  Version bump closes bug #47539.
+
+  14 Apr 2004; Heinrich Wendel <lanius@gentoo.org> amarok-0.7.0.ebuild,
+  amarok-0.8.3.ebuild, amarok-0.9.ebuild:
+  fix depend, mark 0.9 stable
+
+  17 Mar 2004; David Holm <dholm@gentoo.org> amarok-0.9.ebuild:
+  Added to ~ppc.
+
+*amarok-0.9 (16 Mar 2004)
+
+  16 Mar 2004; Heinrich Wendel <lanius@gentoo.org> amarok-0.9.ebuild,
+  amarok-0.9_beta2.ebuild:
+  version bump
+
+  23 Feb 2004; Heinrich Wendel <lanius@gentoo.org> amarok-0.8.3.ebuild:
+  mark x86
+
+  23 Feb 2004; Heinrich Wendel <lanius@gentoo.org> amarok-0.9_beta2.ebuild:
+  version bump
+
+*amarok-0.7.0 (22 Jan 2004)
+*amarok-0.8.3 (22 Jan 2004)
+
+  22 Jan 2004; Heinrich Wendel <lanius@gentoo.org> amarok-0.6.0.ebuild,
+  amarok-0.6.91.ebuild, amarok-0.7.0.ebuild, amarok-0.8.3.ebuild:
+  version bump; mark 0.7.0 x86
+
+  15 Nov 2003; Heinrich Wendel <lanius@gentoo.org> :
+  bump
+
+*amarok-0.6.91 (30 Oct 2003)
+
+  30 Oct 2003; Heinrich Wendel <lanius@gentoo.org> amarok-0.6.91.ebuild:
+  bump
+
+  26 Sep 2003; Alex Veber <coronalvr@gentoo.org> amarok-0.6.0.ebuild:
+  added a missing dep on kdemultimedia
 
 *amarok-0.6.0 (21 Sep 2003)
 
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index ddf1c4555e1b..fba737914de9 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,2 +1,17 @@
-MD5 e79e8212b3ab16386ef93aa7d9dd9348 amarok-0.6.0.ebuild 473
-MD5 1b36d394c22d0dcbc71059f97570b72a files/digest-amarok-0.6.0 65
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3c906d92ed2d748bcf1f23d03703aa7c ChangeLog 13540
+MD5 25af04c1ed653efd29b66d9a0f2fc564 amarok-1.2.4.ebuild 2400
+MD5 5dde073c018d727ff50c5ca9a29bb5ff amarok-1.3.6.ebuild 3068
+MD5 32030194ea3f2079d1db17aa160f63a2 files/amarok-gcc4.gz 522
+MD5 9966964d087dd7c05b7fa2efeff9b1ac files/digest-amarok-1.2.4 66
+MD5 d8cfb3a78866379e2ac9b439de887551 files/digest-amarok-1.3.6 66
+MD5 b23600108f12c98a4fd574d3487ee598 metadata.xml 175
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDcJXoj5H05b2HAEkRAmkXAJ9CQXZ9+aB3ve4rx2EQ/MChztxqNwCgiG4h
+Yvk3lSMnoxVKVRnnkf8K8OE=
+=3kYK
+-----END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-1.2.4.ebuild b/media-sound/amarok/amarok-1.2.4.ebuild
index 11bbea9ba023..99fe943f196c 100644
--- a/media-sound/amarok/amarok-1.2.4.ebuild
+++ b/media-sound/amarok/amarok-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/media-sound/amarok/amarok-1.2.4.ebuild,v 1.1 2005/05/21 17:34:29 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.2.4.ebuild,v 1.1.1.1 2005/11/30 09:38:03 chriswhite Exp $
 
 inherit kde eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/amarok/${P}.tar.bz2"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc -sparc ~x86"
+KEYWORDS="amd64 ppc -sparc x86"
 IUSE="arts flac gstreamer kde mad mysql noamazon oggvorbis opengl xine xmms visualization"
 # kde: enables compilation of the konqueror sidebar plugin
 
@@ -28,7 +28,7 @@ RDEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
 		      oggvorbis? ( >=media-plugins/gst-plugins-ogg-0.8.6
 				   >=media-plugins/gst-plugins-vorbis-0.8.6 )
 		      flac? ( >=media-plugins/gst-plugins-flac-0.8.6 ) )
-	 mysql? ( >=dev-db/mysql-4 )
+	 mysql? ( >=dev-db/mysql-4.0.16 )
 	 visualization? ( media-libs/libsdl
 			  >=media-plugins/libvisual-plugins-0.2 )"
 
@@ -55,11 +55,16 @@ pkg_setup() {
 	kde_pkg_setup
 }
 
+src_unpack() {
+	kde_src_unpack
+	epatch ${FILESDIR}/amarok-gcc4.gz
+}
+
 src_compile() {
 	# amarok does not respect kde coding standards, and makes a lot of
 	# assuptions regarding its installation directory. For this reason,
 	# it must be installed in the KDE install directory.
-	PREFIX="`kde-config --prefix`"
+	PREFIX="${KDEDIR}"
 
 	myconf="$(use_with arts) $(use_with xine)
 		$(use_with gstreamer) $(use_enable mysql)
diff --git a/media-sound/amarok/amarok-1.3.6.ebuild b/media-sound/amarok/amarok-1.3.6.ebuild
index 0e86a094fb38..d5c8de503765 100644
--- a/media-sound/amarok/amarok-1.3.6.ebuild
+++ b/media-sound/amarok/amarok-1.3.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/media-sound/amarok/amarok-1.3.6.ebuild,v 1.1 2005/11/08 12:11:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.3.6.ebuild,v 1.1.1.1 2005/11/30 09:38:03 chriswhite Exp $
 
 inherit kde eutils
 
diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
index e1774e3d9ad7..ede2e3c0508d 100644
--- a/media-sound/amarok/metadata.xml
+++ b/media-sound/amarok/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>kde</herd>
 <herd>sound</herd>
 </pkgmetadata>
diff --git a/media-sound/amp/ChangeLog b/media-sound/amp/ChangeLog
index 72341d0e34e4..23acef62d51b 100644
--- a/media-sound/amp/ChangeLog
+++ b/media-sound/amp/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for media-sound/amp
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amp/ChangeLog,v 1.1 2003/03/09 01:16:54 jje Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amp/ChangeLog,v 1.1.1.1 2005/11/30 09:38:27 chriswhite Exp $
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> amp-0.7.6.ebuild:
+  Stable amd64, sparc.
+
+  07 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/amp-0.7.6-gcc34.patch, -files/amp-0.7.6-gentoo.diff:
+  gcc3.4 fixes close bug #56023.  ~amd64
+
+  04 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> amp-0.7.6.ebuild:
+  ~sparc.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> amp-0.7.6.ebuild:
+  Added IUSE.
+
+  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> amp-0.7.6.ebuild:
+  Ebuild cleanup.
 
 *amp-0.7.6 (09 Mar 2003)
 
diff --git a/media-sound/amp/Manifest b/media-sound/amp/Manifest
index e69de29bb2d1..91ff25f71e11 100644
--- a/media-sound/amp/Manifest
+++ b/media-sound/amp/Manifest
@@ -0,0 +1,5 @@
+MD5 befc3bae3734623493256ffe83f44bfa ChangeLog 901
+MD5 b840332589aea6ee81ea711a5d072fc2 amp-0.7.6.ebuild 598
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 dfa9cfdfc2fdefe0a9a21f46d270707b files/digest-amp-0.7.6 61
+MD5 114cc11c329e1a2810dd61a99f5873af files/amp-0.7.6-gcc34.patch 338
diff --git a/media-sound/amp/amp-0.7.6.ebuild b/media-sound/amp/amp-0.7.6.ebuild
index 2807b84f39c8..df311bbf8b47 100644
--- a/media-sound/amp/amp-0.7.6.ebuild
+++ b/media-sound/amp/amp-0.7.6.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/media-sound/amp/amp-0.7.6.ebuild,v 1.1 2003/03/09 01:16:54 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amp/amp-0.7.6.ebuild,v 1.1.1.1 2005/11/30 09:38:27 chriswhite Exp $
+
+IUSE=""
+
+inherit eutils
 
 DESCRIPTION="AMP - the Audio Mpeg Player"
 LICENSE="as-is"
 
 SRC_URI="http://distro.ibiblio.org/pub/Linux/distributions/slackware/slackware_source/ap/amp/${P}.tar.gz"
-KEYWORDS='~x86'
+KEYWORDS="x86 sparc amd64"
 SLOT="0"
-S=${WORKDIR}/${P}
-
-src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
 
-	patch -p0 <${FILESDIR}/${P}-gentoo.diff || die
-	emake || die
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gcc34.patch
 }
 
 src_install() {
diff --git a/media-sound/ams/ChangeLog b/media-sound/ams/ChangeLog
index 68e3b74dbd3a..5c2af577e0b9 100644
--- a/media-sound/ams/ChangeLog
+++ b/media-sound/ams/ChangeLog
@@ -1,6 +1,64 @@
 # ChangeLog for media-sound/ams
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ams/ChangeLog,v 1.1 2003/07/09 10:46:58 torbenh Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ams/ChangeLog,v 1.1.1.1 2005/11/30 09:37:48 chriswhite Exp $
+
+  09 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> ams-1.7.2.ebuild,
+  ams-1.8.2.ebuild, ams-1.8.4.ebuild, ams-1.8.7.ebuild:
+  Don't install INSTALL and LICENSE files.
+
+  07 Jul 2005; Caleb Tennis <caleb@gentoo.org> ams-1.7.2.ebuild,
+  ams-1.8.2.ebuild, ams-1.8.4.ebuild, ams-1.8.7.ebuild:
+  Fix qt dep
+
+  19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  Remove retired developer from metadata.xml.
+
+  27 Nov 2004; Joseph Jezak <josejx@gentoo.org> ams-1.8.7.ebuild:
+  Marked ~ppc for bug #71979.
+
+*ams-1.8.7 (21 Nov 2004)
+
+  21 Nov 2004; Frank van de Pol <fvdpol@gentoo.org> +ams-1.8.7.ebuild:
+  Version bump to 1.8.7.
+
+  03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> ams-1.8.4.ebuild:
+  Stable amd64, x86.
+
+  05 Jul 2004; David Holm <dholm@gentoo.org> ams-1.8.4.ebuild:
+  Added to ~ppc.
+
+*ams-1.8.4 (04 Jul 2004)
+
+  04 Jul 2004; Frank van de Pol <fvdpol@gentoo.org> +ams-1.8.4.ebuild:
+  Version bump to 1.8.4.
+
+  15 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org> ams-1.8.2.ebuild:
+  Stable x86 and amd64.
+
+  13 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org> ams-1.7.2.ebuild,
+  ams-1.8.2.ebuild:
+  Getting rid of virtual/jack.
+
+*ams-1.8.2 (15 May 2004)
+
+  15 May 2004; Jeremy Huddleston <eradicator@gentoo.org> ams-1.7.2.ebuild,
+  ams-1.8.2.ebuild:
+  Version bump and small DEP fix for bug #50961.
+
+  24 Apr 2004; Danny van Dyk <kugelfang@gentoo.org> ams-1.7.2.ebuild:
+  marked ~amd64
+
+  26 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> ams-1.7.2.ebuild:
+  Stable x86.
+
+  22 Jan 2004; <torbenh@gentoo.org> ams-1.7.2.ebuild:
+  added fftw dependency
+
+*ams-1.7.2 (22 Jan 2004)
+
+  22 Jan 2004; <torbenh@gentoo.org> ams-1.5.9.ebuild, ams-1.7.2.ebuild,
+  metadata.xml, files/ams-fixMakefile.patch:
+  Version bump which fixes alsa-1.0 showstopper.
 
 *ams-1.5.9 (09 Jul 2003)
 
diff --git a/media-sound/ams/Manifest b/media-sound/ams/Manifest
index 0e9cfe9bf990..d51c58cc20e4 100644
--- a/media-sound/ams/Manifest
+++ b/media-sound/ams/Manifest
@@ -1,3 +1,20 @@
-MD5 504ab187e4f6255d46678af848d2e5e3 ams-1.5.9.ebuild 860
-MD5 7f151f457c013e612977125df6797745 files/ams-fixMakefile.patch 167
-MD5 55a5a0cac31104589deeabf5be012fcb files/digest-ams-1.5.9 61
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 775fb3a5936c490c2976a2bc4438ca57 ams-1.8.7.ebuild 931
+MD5 6fa2edb43f952a129ada848bf6acf197 ams-1.8.4.ebuild 903
+MD5 f2d90b78fcfdc8a240ac0a5a44b9f372 ChangeLog 2183
+MD5 6ce0ab4ba50f0bc6668f2ecb57abad4f ams-1.7.2.ebuild 900
+MD5 01cccb4066c2ddb25f88afc78f4e7388 ams-1.8.2.ebuild 898
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 c19ec89f0bf4237ed67c3479875b09e0 files/digest-ams-1.8.2 62
+MD5 285e9f3b72f69416d97b9ecd61434974 files/digest-ams-1.7.2 62
+MD5 82fd7a5edb679f417fe2e20571a23b79 files/digest-ams-1.8.7 62
+MD5 a10be76630a8184335a83449a12a5de0 files/digest-ams-1.8.4 62
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDIYrHj5H05b2HAEkRAiZ6AJ4qZduzZuOgvKImu6WAkXGrPT5NZgCbBPAj
+3mtVPGKp+3Naee5zYuimfWM=
+=KqHt
+-----END PGP SIGNATURE-----
diff --git a/media-sound/ams/ams-1.7.2.ebuild b/media-sound/ams/ams-1.7.2.ebuild
index ba68316764cc..309ca0621ae8 100644
--- a/media-sound/ams/ams-1.7.2.ebuild
+++ b/media-sound/ams/ams-1.7.2.ebuild
@@ -1,29 +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/media-sound/ams/ams-1.7.2.ebuild,v 1.1 2004/01/22 09:46:21 torbenh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ams/ams-1.7.2.ebuild,v 1.1.1.1 2005/11/30 09:37:48 chriswhite Exp $
 
 DESCRIPTION="Alsa Modular Software Synthesizer"
 HOMEPAGE="http://alsamodular.sourceforge.net"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~amd64"
 IUSE=""
 
-DEPEND=" >=media-libs/alsa-lib-0.9
-	virtual/jack
-	>=x11-libs/qt-3.0.0
-	media-libs/ladspa-sdk"
+RDEPEND=">=media-libs/alsa-lib-0.9
+	 media-sound/jack-audio-connection-kit
+	 =x11-libs/qt-3*
+	 =sci-libs/fftw-2*
+	 media-libs/ladspa-sdk"
 
+DEPEND="${RDEPEND}
+	sys-apps/sed"
 
-SRC_URI="http://alsamodular.sourceforge.net/${P}.tar.bz2"
-S=${WORKDIR}/${P}
+SRC_URI="mirror://sourceforge/alsamodular/${P}.tar.bz2"
+RESTRICT="nomirror"
 
 src_unpack() {
 	unpack ${A} || die
 	cd ${S}
 
-	sed -i "s%QT_BASE_DIR=/usr/lib/qt3%QT_BASE_DIR=/usr/qt/3%" Makefile
+	sed -i "s%QT_BASE_DIR=/usr/lib/qt3%QT_BASE_DIR=${QTDIR}%" Makefile || die "Makefile update failed."
 }
 
 src_compile() {
@@ -31,10 +34,9 @@ src_compile() {
 }
 
 src_install() {
-
 	dobin ams
 
-	dodoc README INSTALL THANKS LICENSE
+	dodoc README THANKS
 
 	docinto examples
 	dodoc *.ams
diff --git a/media-sound/ams/ams-1.8.2.ebuild b/media-sound/ams/ams-1.8.2.ebuild
index e2d83ac853e5..2baa3d2683d0 100644
--- a/media-sound/ams/ams-1.8.2.ebuild
+++ b/media-sound/ams/ams-1.8.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/media-sound/ams/ams-1.8.2.ebuild,v 1.1 2004/05/15 08:16:00 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ams/ams-1.8.2.ebuild,v 1.1.1.1 2005/11/30 09:37:48 chriswhite Exp $
 
 DESCRIPTION="Alsa Modular Software Synthesizer"
 HOMEPAGE="http://alsamodular.sourceforge.net"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64"
 IUSE=""
 
 RDEPEND=">=media-libs/alsa-lib-0.9
-	 virtual/jack
-	 >=x11-libs/qt-3.0.0
-	 =dev-libs/fftw-2*
+	 media-sound/jack-audio-connection-kit
+	 =x11-libs/qt-3*
+	 =sci-libs/fftw-2*
 	 media-libs/ladspa-sdk"
 
 DEPEND="${RDEPEND}
@@ -36,7 +36,7 @@ src_compile() {
 src_install() {
 	dobin ams
 
-	dodoc README INSTALL THANKS LICENSE
+	dodoc README THANKS
 
 	docinto examples
 	dodoc *.ams
diff --git a/media-sound/ams/ams-1.8.4.ebuild b/media-sound/ams/ams-1.8.4.ebuild
index 58cafdbde15d..154750bdeb7c 100644
--- a/media-sound/ams/ams-1.8.4.ebuild
+++ b/media-sound/ams/ams-1.8.4.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ams/ams-1.8.4.ebuild,v 1.1 2004/07/04 20:28:29 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ams/ams-1.8.4.ebuild,v 1.1.1.1 2005/11/30 09:37:48 chriswhite Exp $
 
 DESCRIPTION="Alsa Modular Software Synthesizer"
 HOMEPAGE="http://alsamodular.sourceforge.net"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64 ~ppc"
 IUSE=""
 
 RDEPEND=">=media-libs/alsa-lib-0.9
 	 media-sound/jack-audio-connection-kit
-	 >=x11-libs/qt-3.0.0
-	 =dev-libs/fftw-2*
+	 =x11-libs/qt-3*
+	 =sci-libs/fftw-2*
 	 media-libs/ladspa-sdk"
 
 DEPEND="${RDEPEND}
@@ -36,7 +36,7 @@ src_compile() {
 src_install() {
 	dobin ams
 
-	dodoc README INSTALL THANKS LICENSE
+	dodoc README THANKS
 
 	docinto examples
 	dodoc *.ams
diff --git a/media-sound/ams/ams-1.8.7.ebuild b/media-sound/ams/ams-1.8.7.ebuild
index 5e0a3ff4aa6c..3b38e3f7a9ef 100644
--- a/media-sound/ams/ams-1.8.7.ebuild
+++ b/media-sound/ams/ams-1.8.7.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ams/ams-1.8.7.ebuild,v 1.1 2004/11/21 20:01:37 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ams/ams-1.8.7.ebuild,v 1.1.1.1 2005/11/30 09:37:48 chriswhite Exp $
 
 DESCRIPTION="Alsa Modular Software Synthesizer"
 HOMEPAGE="http://alsamodular.sourceforge.net"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86 ~amd64 ~ppc"
 IUSE=""
 
 RDEPEND=">=media-libs/alsa-lib-0.9
 	 media-sound/jack-audio-connection-kit
-	 >=x11-libs/qt-3.0.0
-	 =dev-libs/fftw-2*
+	 =x11-libs/qt-3*
+	 =sci-libs/fftw-2*
 	 media-libs/ladspa-sdk
 	 media-libs/libclalsadrv"
 
@@ -37,7 +37,7 @@ src_compile() {
 src_install() {
 	dobin ams
 
-	dodoc README INSTALL THANKS LICENSE
+	dodoc README THANKS
 
 	docinto examples
 	dodoc *.ams
diff --git a/media-sound/ams/metadata.xml b/media-sound/ams/metadata.xml
index d4ce46c038ab..e1774e3d9ad7 100644
--- a/media-sound/ams/metadata.xml
+++ b/media-sound/ams/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sound</herd>
-<maintainer>
-  <email>torbenh@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/media-sound/amsynth/ChangeLog b/media-sound/amsynth/ChangeLog
index 331c5c5cdae5..cb7b225d791f 100644
--- a/media-sound/amsynth/ChangeLog
+++ b/media-sound/amsynth/ChangeLog
@@ -1,6 +1,66 @@
 # ChangeLog for media-sound/amsynth
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amsynth/ChangeLog,v 1.1 2003/07/02 11:58:14 torbenh Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amsynth/ChangeLog,v 1.1.1.1 2005/11/30 09:38:24 chriswhite Exp $
+
+*amsynth-1.0.0-r1 (17 Jul 2005)
+
+  17 Jul 2005; Frank van de Pol <fvdpol@gentoo.org>
+  +files/amsynth-1.0.0-ALSAMidiDriver.patch, +amsynth-1.0.0-r1.ebuild:
+  Added conditional compilation if ALSA is not available. Closes bug #56032.
+
+  03 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> metadata.xml:
+  updated metadata.xml. torbenh is retired.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  amsynth-1.0.0.ebuild:
+  Stable sparc.
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  amsynth-1.0.0.ebuild:
+  Added to ~sparc.
+
+  31 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -amsynth-1.0_rc4.ebuild:
+  Removing old version.
+
+  04 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> amsynth-1.0.0.ebuild:
+  Stable amd64.
+
+  13 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org> amsynth-1.0.0.ebuild,
+  amsynth-1.0_rc4.ebuild:
+  Getting rid of virtual/jack.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> amsynth-1.0_rc4.ebuild:
+  Add inherit eutils
+
+  24 Apr 2004; Danny van Dyk <kugelfang@gentoo.org> amsynth-1.0.0.ebuild:
+  marked ~amd64
+
+  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> amsynth-1.0.0.ebuild:
+  inherit eutils and stable on x86.
+
+  14 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> amsynth-1.0.0.ebuild,
+  amsynth-1.0_rc4.ebuild, files/amsynth-pthread.patch:
+  Added patch from bug #44696 to fix missing declaration of pthread_kill.
+
+  04 Mar 2004; David Holm <dholm@gentoo.org> amsynth-1.0.0.ebuild:
+  Added to ~ppc.
+
+*amsynth-1.0.0 (02 Mar 2004)
+
+  02 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> amsynth-1.0.0.ebuild,
+  amsynth-1.0_rc4.ebuild:
+  Version bump closes bug #43496.
+
+*amsynth-1.0_rc4 (22 Jan 2004)
+
+  22 Jan 2004; <torbenh@gentoo.org> amsynth-1.0_rc2.ebuild,
+  amsynth-1.0_rc4.ebuild, metadata.xml:
+  Version Bump.
+  And fix for alsa-1.0
+
+  13 Jul 2003; Martin Holzer <mholzer@gentoo.org> amsynth-1.0_rc2.ebuild:
+  update x11-libs/gtkmm to dev-cpp/gtkmm
 
 *amsynth-1.0_rc2 (02 Jul 2003)
 
diff --git a/media-sound/amsynth/Manifest b/media-sound/amsynth/Manifest
index f78608b10f2e..e9f00835b732 100644
--- a/media-sound/amsynth/Manifest
+++ b/media-sound/amsynth/Manifest
@@ -1,2 +1,18 @@
-MD5 be55085e52eaeaad9884212961929197 amsynth-1.0_rc2.ebuild 1294
-MD5 7931d67ee0c4973ba2b9e3d3065f9eef files/digest-amsynth-1.0_rc2 67
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 edc51bbd1f9402b885b78dc1b4b7a07b amsynth-1.0.0-r1.ebuild 1581
+MD5 a33d519eeaf9796c2c62ddca0e73b75a amsynth-1.0.0.ebuild 1532
+MD5 8203e4187f5ac16ce5adee85c49be148 ChangeLog 2462
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 4fb13c78eeda484932c012ef45935845 files/amsynth-1.0.0-ALSAMidiDriver.patch 269
+MD5 2f7dc56770343abd47f6fcc7bca6938e files/amsynth-pthread.patch 256
+MD5 d7a734ec324ae5b115669d858666fb58 files/digest-amsynth-1.0.0 65
+MD5 d7a734ec324ae5b115669d858666fb58 files/digest-amsynth-1.0.0-r1 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC2oRDvpz1081QvMkRAlnXAJ0Y7i/TgR+mLoYzYZid3cIFonkPOQCfaqHC
+86cEFxCP0gxzOSJ5+540ywk=
+=sQvj
+-----END PGP SIGNATURE-----
diff --git a/media-sound/amsynth/amsynth-1.0.0-r1.ebuild b/media-sound/amsynth/amsynth-1.0.0-r1.ebuild
index e37659b9416f..81580078de26 100644
--- a/media-sound/amsynth/amsynth-1.0.0-r1.ebuild
+++ b/media-sound/amsynth/amsynth-1.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/media-sound/amsynth/amsynth-1.0.0-r1.ebuild,v 1.1 2005/07/17 16:15:17 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amsynth/amsynth-1.0.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:25 chriswhite Exp $
 
 IUSE="oss alsa jack"
 
diff --git a/media-sound/amsynth/amsynth-1.0.0.ebuild b/media-sound/amsynth/amsynth-1.0.0.ebuild
index b6a81f5e3705..f9be790051e3 100644
--- a/media-sound/amsynth/amsynth-1.0.0.ebuild
+++ b/media-sound/amsynth/amsynth-1.0.0.ebuild
@@ -1,6 +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/media-sound/amsynth/amsynth-1.0.0.ebuild,v 1.1 2004/03/03 04:11:26 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amsynth/amsynth-1.0.0.ebuild,v 1.1.1.1 2005/11/30 09:38:24 chriswhite Exp $
+
+IUSE="oss alsa jack"
+
+inherit eutils
 
 MY_P=${P/_rc/-rc}
 MY_P=${MY_P/amsynth/amSynth}
@@ -8,20 +12,17 @@ MY_P=${MY_P/amsynth/amSynth}
 DESCRIPTION="A retro analogue - modelling softsynth"
 HOMEPAGE="http://amsynthe.sourceforge.net/"
 SRC_URI="mirror://sourceforge/amsynthe/${MY_P}.tar.gz"
-RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-
-IUSE="oss alsa jack"
+KEYWORDS="amd64 ~ppc sparc x86"
 
 # libsndfile support is actually optional, but IMHO this package should have it
 DEPEND="=dev-cpp/gtkmm-1.2* \
 	media-libs/libsndfile \
 	alsa? ( media-libs/alsa-lib \
 		media-sound/alsa-utils ) \
-	jack? ( virtual/jack )"
+	jack? ( media-sound/jack-audio-connection-kit )"
 
 S=${WORKDIR}/${MY_P}
 
@@ -31,6 +32,8 @@ src_unpack() {
 
 	sed -i "/#include <alsa\\/asoundlib.h>/i\\#define ALSA_PCM_OLD_HW_PARAMS_API 1\\" src/drivers/ALSAmmapAudioDriver.h
 	sed -i "/#include <alsa\\/asoundlib.h>/i\\#define ALSA_PCM_OLD_HW_PARAMS_API 1\\" src/drivers/ALSAAudioDriver.h
+
+	epatch ${FILESDIR}/${PN}-pthread.patch
 }
 
 src_compile() {
@@ -43,12 +46,12 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo ""
+	einfo
 	einfo "amSynth has been installed normally."
 	einfo "If you would like to use the virtual"
 	einfo "keyboard option, then do"
 	einfo "emerge vkeybd"
 	einfo "and make sure you emerged amSynth"
 	einfo "with alsa support (USE=alsa)"
-	einfo ""
+	einfo
 }
diff --git a/media-sound/amsynth/metadata.xml b/media-sound/amsynth/metadata.xml
index d4ce46c038ab..e1774e3d9ad7 100644
--- a/media-sound/amsynth/metadata.xml
+++ b/media-sound/amsynth/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sound</herd>
-<maintainer>
-  <email>torbenh@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/media-sound/apetag/ChangeLog b/media-sound/apetag/ChangeLog
index deabf6611ed9..f7e6f03d3449 100644
--- a/media-sound/apetag/ChangeLog
+++ b/media-sound/apetag/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/apetag
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/apetag/ChangeLog,v 1.1 2004/10/07 08:24:44 trapni Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/apetag/ChangeLog,v 1.1.1.1 2005/11/30 09:38:42 chriswhite Exp $
+
+*apetag-1.7 (31 Oct 2005)
+
+  31 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> +apetag-1.7.ebuild:
+  Update to 1.7 as per bug #110365.
+
+  07 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> apetag-1.5.ebuild:
+  Added python to RDEPEND.
 
 *apetag-0.5 (07 Oct 2004)
 
diff --git a/media-sound/apetag/Manifest b/media-sound/apetag/Manifest
index 0e3773d8c20a..8fa1df1cba79 100644
--- a/media-sound/apetag/Manifest
+++ b/media-sound/apetag/Manifest
@@ -1,4 +1,16 @@
-MD5 05ab4d4775083f0930841e415df18ad6 metadata.xml 160
-MD5 de7b0e907c11e7e7fe253e8ab9a41f77 apetag-1.5.ebuild 626
-MD5 82ed55c19f2a83cc58542e3689062f8a ChangeLog 312
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9212e00747b601f77481f6365feaca89 ChangeLog 646
+MD5 0ba11b58a42e84e42c6e96cffc54b2c5 apetag-1.5.ebuild 789
+MD5 08d9fbfbc0c0d96b6372f7612b69b256 apetag-1.7.ebuild 803
 MD5 e8bc9fc658d549f4fd8542f071ebdb92 files/digest-apetag-1.5 61
+MD5 18138b31536d6dae52e6a962e063ac13 files/digest-apetag-1.7 61
+MD5 05ab4d4775083f0930841e415df18ad6 metadata.xml 160
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDZlEaj5H05b2HAEkRAihMAJ9IItnUbiwyfaz91bxRkJQKcsg+wwCferBS
+ZTCqQIDSTokzZdmXBv9OYok=
+=LokO
+-----END PGP SIGNATURE-----
diff --git a/media-sound/apetag/apetag-1.5.ebuild b/media-sound/apetag/apetag-1.5.ebuild
index bb606c23cb2b..5bc7c5acc626 100644
--- a/media-sound/apetag/apetag-1.5.ebuild
+++ b/media-sound/apetag/apetag-1.5.ebuild
@@ -1,20 +1,23 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/apetag/apetag-1.5.ebuild,v 1.1 2004/10/07 08:24:44 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/apetag/apetag-1.5.ebuild,v 1.1.1.1 2005/11/30 09:38:42 chriswhite Exp $
+
+IUSE=""
 
 inherit eutils
 
+S=${WORKDIR}/Apetag
+
 DESCRIPTION="Command-line ape 2.0 tagger"
 HOMEPAGE="http://muth.org/Robert/Apetag/"
 SRC_URI="http://muth.org/Robert/Apetag/${PN}.${PV}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE=""
 
 DEPEND=""
-
-S=${WORKDIR}/Apetag
+RDEPEND="dev-lang/python"
 
 src_unpack() {
 	unpack ${A} || die
diff --git a/media-sound/apetag/apetag-1.7.ebuild b/media-sound/apetag/apetag-1.7.ebuild
index 371f9019ae1e..aaf82cdcb02e 100644
--- a/media-sound/apetag/apetag-1.7.ebuild
+++ b/media-sound/apetag/apetag-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/media-sound/apetag/apetag-1.7.ebuild,v 1.1 2005/10/31 17:14:52 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/apetag/apetag-1.7.ebuild,v 1.1.1.1 2005/11/30 09:38:42 chriswhite Exp $
 
 IUSE=""
 
diff --git a/media-sound/apollo/ChangeLog b/media-sound/apollo/ChangeLog
index 0ae75de0df07..3cdaa9f9c739 100644
--- a/media-sound/apollo/ChangeLog
+++ b/media-sound/apollo/ChangeLog
@@ -1,9 +1,69 @@
 # ChangeLog for media-sound/apollo
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/apollo/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/media-sound/apollo/ChangeLog,v 1.1.1.1 2005/11/30 09:38:11 chriswhite Exp $
+
+  28 Jul 2005; Caleb Tennis <caleb@gentoo.org> apollo-1.4.1.ebuild,
+  apollo-1.4.2.ebuild:
+  made qt and kde deps explicit on version 3, per bug #100235
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> apollo-1.4.2.ebuild:
+  Added to ~ppc.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  apollo-1.4.2.ebuild:
+  Stable sparc.
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  apollo-1.4.2.ebuild:
+  Added to ~sparc.
+
+  04 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> apollo-1.4.2.ebuild:
+  -amd64.
+
+  03 May 2004; Jeremy Huddleston <eradicator@gentoo.org> apollo-1.4.1.ebuild,
+  apollo-1.4.2.ebuild:
+  Changing mad dep to madplay.
+
+  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> apollo-1.4.2.ebuild:
+  epatch instead of patch.
+
+  23 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> apollo-1.4.1.ebuild,
+  apollo-1.4.2.ebuild, metadata.xml:
+  mpg123 dep changed to virtual
+
+  19 Jul 2003; Nick Hadaway <raker@gentoo.org>:
+  Removed unneeded 1.4.2-r1
+
+*apollo-1.4.2-r1 (17 Jul 2003)
+
+  17 Jul 2003; Nick Hadaway <raker@gentoo.org> apollo-1.4.2-r1.ebuild:
+  Changed to depend on media-libs{libmad,libid3tag}
+
+  02 Nov 2002; Hannes Mehnert <hannes@gentoo.org> apollo-1.4.2.ebuild:
+  marked stable for x86
+
+*apollo-1.4.2 (30 Oct 2002)
+
+  30 Oct 2002; Hannes Mehnert <hannes@gentoo.org> apollo-1.4.2.ebuild:
+  version bump
+
+  08 Oct 2002; Hannes Mehnert <hannes@gentoo.org> apollo-1.4.1.ebuild,
+  ChangeLog: added --without-stl, because stl support in apollo is broken.
+
+*apollo-1.4.1 (04 Oct 2002)
+
+  04 Oct 2002; Hannes Mehnert <hannes@gentoo.org> apollo-1.4.1.ebuild,
+  ChangeLog, files/digest-apollo-1.4.1, files/apollo-1.4.1.patch.bz2 :
+
+  version bump, fixed ebuild, will hopefully close bug #8649
 
 *apollo-1.1.1-r1 (1 Feb 2002)
 
+  26 Aug 2002; Seemant Kulleen <seemant@gentoo.org> apollo-1.1.1-r1 :
+
+  Changed dodir usr/bin to dodir /usr/bin. Thanks to: senor@lucidsoft.org
+  (Kevin Duffy) in bug #6669.
+
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/media-sound/apollo/Manifest b/media-sound/apollo/Manifest
index e69de29bb2d1..c57d6bbe56ea 100644
--- a/media-sound/apollo/Manifest
+++ b/media-sound/apollo/Manifest
@@ -0,0 +1,8 @@
+MD5 457a0b0d8375d273bf618d02ace1be2e apollo-1.4.2.ebuild 1107
+MD5 ccfdda6e9622bde79224ace0d7f07046 apollo-1.4.1.ebuild 1537
+MD5 b41ed815ba2a4255bb8c641d90a6fb08 ChangeLog 2585
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 6ea3dbd53a98afe867e6cac2a499a897 files/apollo-1.4.1.patch.bz2 2650
+MD5 a00fe12f4ef67580f796cb1a239a2ca4 files/digest-apollo-1.4.1 71
+MD5 6f7fe591f805258399900cb0e7aab313 files/digest-apollo-1.4.2 71
+MD5 146cde786093f6e5ec2eae823291260c files/apollo-1.4.2-gentoo.diff 276
diff --git a/media-sound/apollo/apollo-1.4.1.ebuild b/media-sound/apollo/apollo-1.4.1.ebuild
index 244cb169319f..c4bf43e899cd 100644
--- a/media-sound/apollo/apollo-1.4.1.ebuild
+++ b/media-sound/apollo/apollo-1.4.1.ebuild
@@ -1,10 +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/media-sound/apollo/apollo-1.4.1.ebuild,v 1.1 2002/10/04 20:25:59 hannes Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/apollo/apollo-1.4.1.ebuild,v 1.1.1.1 2005/11/30 09:38:11 chriswhite Exp $
 
-#inherit kde-base
-#use kde && inherit kde-base
-#need-kde 3
+IUSE="kde qt"
 
 S=${WORKDIR}/${P}-1
 DESCRIPTION="A Qt-based front-end to mpg123"
@@ -15,11 +13,11 @@ SLOT="2"
 LICENSE="GPL-2"
 KEYWORDS="x86"
 
-DEPEND="media-sound/mpg123
+DEPEND="virtual/mpg123
 	media-libs/id3lib
-	media-sound/mad
-	qt?		( x11-libs/qt )
-	kde?	( kde-base/kdelibs )"
+	media-sound/madplay
+	qt?	( =x11-libs/qt-3* )
+	kde?	( =kde-base/kdelibs-3* )"
 #	dev-libs/STLport
 
 src_unpack() {
@@ -34,11 +32,13 @@ src_unpack() {
 
 src_compile() {
 	local myconf
-	myconf="--without-kde"
+	myconf="--without-kde --without-stl"
 #	use kde && kdeconf="--with-kde=$KDEDIR" || kdeconf="--without-kde"
-	myconf="$myconf $kdeconf"
+#kde support currently does not work
+#	myconf="$myconf $kdeconf"
 	use qt && myconf="$myconf --with-qt-dir=$QTDIR --with-qmake" || myconf="$myconf --with-tmake"
 #	use stl && myconf="$myconf --with-stl" || myconf="$myconf --without-stl"
+#stl support is broken
 #	use buffer && myconf="$myconf --enable-buffer" || myconf="$myconf --disable-buffer"
 #	use mad && myconf="$myconf --with-mad=/usr/lib"
 	myconf="$myconf --with-mad=/usr/lib"
diff --git a/media-sound/apollo/apollo-1.4.2.ebuild b/media-sound/apollo/apollo-1.4.2.ebuild
index 03a3dfbc0334..1cb133cdb826 100644
--- a/media-sound/apollo/apollo-1.4.2.ebuild
+++ b/media-sound/apollo/apollo-1.4.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/apollo/apollo-1.4.2.ebuild,v 1.1 2002/10/30 20:20:48 hannes Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/apollo/apollo-1.4.2.ebuild,v 1.1.1.1 2005/11/30 09:38:11 chriswhite Exp $
+
+inherit eutils
 
 IUSE="qt"
 
@@ -14,15 +16,16 @@ HOMEPAGE="http://www.apolloplayer.org"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+# -amd64: weird segfaults... try a later version...
+KEYWORDS="-amd64 ~ppc sparc x86"
 
-DEPEND="media-sound/mpg123
+DEPEND="virtual/mpg123
 	media-libs/id3lib
-	media-sound/mad
-	qt?		( x11-libs/qt )"
+	media-sound/madplay
+	qt?		( =x11-libs/qt-3* )"
 
 src_compile() {
-	patch < ${FILESDIR}/${P}-gentoo.diff
+	epatch ${FILESDIR}/${P}-gentoo.diff
 	myconf="--without-kde2 --with-mad=/usr/lib"
 	./configure.sh $myconf
 	make || die "Make failed"
diff --git a/media-sound/ardour/ChangeLog b/media-sound/ardour/ChangeLog
index 674e1ac787d5..ae79f7a9fc96 100644
--- a/media-sound/ardour/ChangeLog
+++ b/media-sound/ardour/ChangeLog
@@ -1,6 +1,227 @@
 # ChangeLog for media-sound/ardour
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.1 2003/06/27 09:45:21 robh Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.1.1.1 2005/11/30 09:37:56 chriswhite Exp $
+
+  26 Sep 2005; Eldad Zack <eldad@gentoo.org> ardour-0.99.ebuild:
+  Added BUILD_SSE_OPTIMIZATIONS scons flag. Thanks to Michael Schnake
+  <schnake@composition.de>. Bug #107266.
+
+  26 Sep 2005; Eldad Zack <eldad@gentoo.org> -ardour-0.9_beta26.ebuild,
+  -ardour-0.9_beta27.ebuild:
+  Purged old ebuilds for beta26 and beta27.
+
+*ardour-0.99 (26 Sep 2005)
+
+  26 Sep 2005; Eldad Zack <eldad@gentoo.org> +ardour-0.99.ebuild:
+  Version bump. This is the first version that can be marked stable.
+
+  14 Sep 2005; Eldad Zack <eldad@gentoo.org> ardour-0.9_beta30.ebuild:
+  Updated to kito's suggestions, added altivec useflag. bug #105726
+
+*ardour-0.9_beta30 (14 Sep 2005)
+
+  14 Sep 2005; Eldad Zack <eldad@gentoo.org> +ardour-0.9_beta30.ebuild:
+  Version bump. added sse useflag. bug #105726.
+
+  24 Apr 2005; Eric Shattow <jnc@gentoo.org> ardour-0.9_beta29.ebuild:
+  Added debug USE flag.
+
+*ardour-0.9_beta29 (24 Apr 2005)
+
+  24 Apr 2005; Eric Shattow <jnc@gentoo.org> +ardour-0.9_beta29.ebuild:
+  Version Bump. Closes #89654. Thanks go to David Bergstein for scons-aware
+  ebuild submission.
+
+*ardour-0.9_beta28 (12 Mar 2005)
+
+  12 Mar 2005; Eric Shattow <jnc@gentoo.org> +ardour-0.9_beta28.ebuild:
+  Version bump.
+
+*ardour-0.9_beta27 (01 Mar 2005)
+
+  01 Mar 2005; Eric Shattow <jnc@gentoo.org> +ardour-0.9_beta27.ebuild:
+  Version bump.
+
+*ardour-0.9_beta26 (11 Feb 2005)
+
+  11 Feb 2005; Rob Holland <tigger@gentoo.org> +ardour-0.9_beta26.ebuild:
+  revision bump.
+
+  06 Feb 2005; Eldad Zack <eldad@gentoo.org> -ardour-0.9_beta19-r1.ebuild,
+  ardour-0.9_beta24.ebuild:
+  Purged beta19. Carried over ~amd64 ~ppc to the latest version which got lost
+  in the version bump.
+
+*ardour-0.9_beta24 (03 Feb 2005)
+
+  03 Feb 2005; Eric Shattow <jnc@gentoo.org> +ardour-0.9_beta24.ebuild:
+  Version bump. Usability improvements and bugfixes.
+
+*ardour-0.9_beta23 (09 Jan 2005)
+
+  09 Jan 2005; Eric Shattow <jnc@gentoo.org> +ardour-0.9_beta23.ebuild:
+  verison bump. many bug fixes.
+
+*ardour-0.9_beta22 (19 Dec 2004)
+
+  19 Dec 2004; Eldad Zack <eldad@gentoo.org> +ardour-0.9_beta22.ebuild:
+  Version bump.
+
+  03 Dec 2004; Eldad Zack <eldad@gentoo.org> ardour-0.9_beta19-r1.ebuild:
+  Workaround for xorg bug concerning lucida fonts. Closes bug #73056.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -ardour-0.9_beta11-r1.ebuild, -ardour-0.9_beta14.ebuild,
+  -ardour-0.9_beta16.ebuild, -ardour-0.9_beta17.ebuild,
+  -ardour-0.9_beta18-r1.ebuild, -ardour-0.9_beta18-r2.ebuild,
+  -ardour-0.9_beta18.ebuild, -ardour-0.9_beta19.ebuild:
+  Removing old versions.
+
+*ardour-0.9_beta19-r1 (14 Aug 2004)
+
+  14 Aug 2004; Rob Holland <tigger@gentoo.org> +ardour-0.9_beta19-r1.ebuild:
+  Fixed optimisation flags and don't run autoconf as its not needed.
+
+*ardour-0.9_beta19 (13 Aug 2004)
+
+  13 Aug 2004; Jon Hood <squinky86@gentoo.org> ardour-0.9_beta16.ebuild,
+  ardour-0.9_beta17.ebuild, ardour-0.9_beta18-r1.ebuild,
+  ardour-0.9_beta18-r2.ebuild, ardour-0.9_beta18.ebuild,
+  +ardour-0.9_beta19.ebuild:
+  Version bump and fix DEPEND irt #60184.
+
+*ardour-0.9_beta18-r2 (26 Jul 2004)
+
+  26 Jul 2004; Rob Holland <tigger@gentoo.org> +ardour-0.9_beta18-r2.ebuild:
+  Version bump to 18.4
+
+*ardour-0.9_beta18-r1 (24 Jul 2004)
+
+  24 Jul 2004; Rob Holland <tigger@gentoo.org> +ardour-0.9_beta18-r1.ebuild:
+  Version bump and optimisation improvements.
+
+*ardour-0.9_beta18 (21 Jul 2004)
+
+  21 Jul 2004; Eldad Zack <eldad@gentoo.org> +ardour-0.9_beta18.ebuild:
+  Version bump. disabled ksi support.
+
+  16 Jul 2004; Eldad Zack <eldad@gentoo.org> +files/ardour-gcc34.patch,
+  ardour-0.9_beta17.ebuild:
+  GCC 3.4 fix - Thanks to Patrick Dawson <pkdawson@buffalo.edu> for the patch.
+  closes #56371.
+
+  09 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ardour-0.9_beta17.ebuild:
+  Fixed jack to not be virtual.
+
+*ardour-0.9_beta17 (07 Jul 2004)
+
+  07 Jul 2004; Eldad Zack <eldad@gentoo.org> +ardour-0.9_beta17.ebuild:
+  Version bump.
+
+  27 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ardour-0.9_beta16.ebuild:
+  Stable x86 amd64.
+
+*ardour-0.9_beta16 (13 Jun 2004)
+
+  13 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +ardour-0.9_beta16.ebuild:
+  Version bump closes bug #53491 and fixing jack dependency for bug #53382.
+
+*ardour-0.9_beta14 (25 May 2004)
+
+  25 May 2004; Jon Hood <squinky86@gentoo.org> +ardour-0.9_beta14.ebuild:
+  version bump, closes #51929; fix metadata.xml
+
+  10 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ardour-0.9_beta11-r1.ebuild:
+  QA fixup.  Removed ksi USE flag.
+
+  07 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ardour-0.9_beta11-r1.ebuild:
+  Stable x86.
+
+  18 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> ardour-0.9_beta11-r1.ebuild:
+  Adding amd64 keyword, closing #48151.
+
+*ardour-0.9_beta11-r1 (02 Apr 2004)
+
+  02 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ardour-0.9_beta10.ebuild, ardour-0.9_beta11-r1.ebuild,
+  ardour-0.9_beta11.ebuild:
+  Version bump.  -r1 is beta11.2, but portage doesn't like that version string.
+
+  02 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ardour-0.9_beta10.ebuild, ardour-0.9_beta11.ebuild,
+  ardour-0.9_beta2-r1.ebuild, ardour-0.9_beta3.ebuild,
+  ardour-0.9_beta5.ebuild, ardour-0.9_beta7.ebuild, ardour-0.9_beta8.ebuild,
+  ardour-0.9_beta9.ebuild:
+  jack dep is now virtual.  Depend on liblrdf.  See bug #45980.  Removing
+  pre beta10 ebuilds.
+
+*ardour-0.9_beta11 (20 Feb 2004)
+
+  20 Feb 2004; rob holland <tigger@gentoo.org> ardour-0.9_beta11.ebuild:
+  Version bump
+
+*ardour-0.9_beta10 (16 Feb 2004)
+
+  16 Feb 2004; rob holland <tigger@gentoo.org> ardour-0.9_beta10.ebuild:
+  version bump
+
+  12 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ardour-0.9_beta2-r1.ebuild, ardour-0.9_beta3.ebuild,
+  ardour-0.9_beta5.ebuild, ardour-0.9_beta7.ebuild, ardour-0.9_beta8.ebuild,
+  ardour-0.9_beta9.ebuild, files/ardour-pthread.patch:
+  Updated homepage. Added nomirror. Added patch to fix compilation problem with
+  missing signal.h include to close bug #33105 submitted by Arthur Peters
+  <amp@singingwizard.org>.
+
+  10 Dec 2003; <torbenh@gentoo.org> ardour-0.9_beta8.ebuild:
+  Fixed DEPEND to >= jack-0.91.1
+
+  10 Dec 2003; <torbenh@gentoo.org> ardour-0.9_beta1.ebuild,
+  ardour-0.9_beta2.ebuild:
+  remove old versions which depended on jack-cvs ebuild
+
+*ardour-0.9_beta8 (07 Nov 2003)
+
+  07 Nov 2003; rob holland <tigger@gentoo.org> ardour-0.9_beta8.ebuild:
+  version bump, tidied ebuild a tiny bit
+
+*ardour-0.9_beta7 (27 Oct 2003)
+
+  27 Oct 2003; rob holland <tigger@gentoo.org> ardour-0.9_beta7.ebuild:
+  Version bump.
+
+  11 Oct 2003; rob holland <tigger@gentoo.org> :
+  Version bump. Removed jack blocker
+
+  25 Sep 2003; rob holland <tigger@gentoo.org> ardour-0.9_beta3.ebuild:
+  fixed a dep to be more accurate
+
+  16 Sep 2003; rob holland <tigger@gentoo.org> ardour-0.9_beta3.ebuild:
+  fix typo spotted by James Cloos <cloos@jhcloos.com>, resolves #28219
+
+  16 Sep 2003; rob holland <tigger@gentoo.org> ardour-0.9_beta3.ebuild:
+  Added a blocking dep for the latest jack as this beta won't compile against it
+
+*ardour-0.9_beta3 (14 Aug 2003)
+
+  14 Aug 2003; rob holland <tigger@gentoo.org> ardour-0.9_beta3.ebuild:
+  version bump
+
+*ardour-0.9_beta2-r1 (07 Aug 2003)
+
+  07 Aug 2003; rob holland <tigger@gentoo.org> ardour-0.9_beta2-r1.ebuild,
+  metadata.xml:
+  allow ardour to build with optimisations. work by torbenh@gentoo.org (ta ;)
+
+*ardour-0.9_beta2 (29 Jun 2003)
+
+  29 Jun 2003; robh <robh@gentoo.org> ardour-0.9_beta2.ebuild:
+  Version bump.
 
 *ardour-0.9_beta1 (27 Jun 2003)
 
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 4706db067c8e..576c363a487f 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,3 +1,13 @@
-MD5 cd2bba05ce70ebf35a58aae382fa8ff9 ardour-0.9_beta1.ebuild 1238
-MD5 29d4f9306984b7fc9575df09ded96ad9 files/digest-ardour-0.9_beta1 69
-MD5 ba0c302f321f83e793695dbe68e4f3cb files/digest-ardour-1.0_beta1 69
+MD5 26f2574749a4a173ce86e7c9ec35ef8c ardour-0.99.ebuild 2322
+MD5 28188f1657f0547a15f682ed3626a397 metadata.xml 330
+MD5 da4fa0d331e9f817596086fb148f07a2 ChangeLog 7772
+MD5 ce9e98d8b029c69ffcdb77ac96ea5b0d ardour-0.9_beta29.ebuild 1461
+MD5 d2b8fe2b0b5029f2b87ccd646c46159d ardour-0.9_beta30.ebuild 2110
+MD5 ddf2c2a467b0beccb346c708ae0ddca9 ardour-0.9_beta28.ebuild 1319
+MD5 5387e9a33bfec4d88393e4fef163cd1a files/ardour-0.99-scons.patch 842
+MD5 323d42579941b3e8210af7e9c21e8442 files/digest-ardour-0.99 65
+MD5 11e862600d9c027d453d23dc2bf8763d files/ardour.aclocal.patch 8594
+MD5 e016dfbfc8e85547954395c455b04e61 files/ardour-gcc34.patch 9562
+MD5 67a6ee0e7176f783a48484445f39bf59 files/digest-ardour-0.9_beta29 70
+MD5 0e89f38a43bd80ecd39e3547552a9956 files/digest-ardour-0.9_beta28 70
+MD5 674b91595af44849fde8356f9b4fba70 files/digest-ardour-0.9_beta30 70
diff --git a/media-sound/ardour/ardour-0.99.ebuild b/media-sound/ardour/ardour-0.99.ebuild
index 3fd3cd69ebf3..1be5939998e7 100644
--- a/media-sound/ardour/ardour-0.99.ebuild
+++ b/media-sound/ardour/ardour-0.99.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-0.99.ebuild,v 1.1 2005/09/26 07:56:32 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-0.99.ebuild,v 1.1.1.1 2005/11/30 09:37:56 chriswhite Exp $
 
 inherit eutils
 
@@ -49,6 +49,12 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${P/_/}"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-scons.patch
+}
+
 src_compile() {
 	# bug 99664
 	cd ${S}/libs/gtkmm
@@ -71,6 +77,7 @@ src_compile() {
 		NLS=${NLS} \
 		PREFIX=/usr \
 		USE_SSE_EVERYWHERE=${SSE} \
+		BUILD_SSE_OPTIMIZATIONS=${SSE} \
 		KSI=0 \
 		-j2
 }
diff --git a/media-sound/ardour/ardour-0.9_beta28.ebuild b/media-sound/ardour/ardour-0.9_beta28.ebuild
index b135bdeaceae..d576cbc448a8 100644
--- a/media-sound/ardour/ardour-0.9_beta28.ebuild
+++ b/media-sound/ardour/ardour-0.9_beta28.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-0.9_beta28.ebuild,v 1.1 2005/03/12 10:35:10 jnc Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-0.9_beta28.ebuild,v 1.1.1.1 2005/11/30 09:37:56 chriswhite Exp $
 
 inherit eutils
 
diff --git a/media-sound/ardour/ardour-0.9_beta29.ebuild b/media-sound/ardour/ardour-0.9_beta29.ebuild
index 57fff0281726..f9e375465a1c 100644
--- a/media-sound/ardour/ardour-0.9_beta29.ebuild
+++ b/media-sound/ardour/ardour-0.9_beta29.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-0.9_beta29.ebuild,v 1.1 2005/04/24 06:06:15 jnc Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-0.9_beta29.ebuild,v 1.1.1.1 2005/11/30 09:37:56 chriswhite Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ RESTRICT="nomirror"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE="nls"
+IUSE="nls debug"
 
 RDEPEND="dev-util/pkgconfig
 	>=media-libs/liblrdf-0.3.6
@@ -36,7 +36,8 @@ S="${WORKDIR}/${P/_/}"
 src_compile() {
 	# Required for scons to "see" intermediate install location
 	mkdir -p ${D}
-	scons DESTDIR=${D} PREFIX=/usr KSI=0 -j2
+	DBUG=no ; if useq debug ; then DBUG=yes ; fi
+	scons DEBUG=${DBUG} DESTDIR=${D} PREFIX=/usr KSI=0 -j2
 }
 
 src_install() {
diff --git a/media-sound/ardour/ardour-0.9_beta30.ebuild b/media-sound/ardour/ardour-0.9_beta30.ebuild
index 731dd760521f..f0cc21c4b87f 100644
--- a/media-sound/ardour/ardour-0.9_beta30.ebuild
+++ b/media-sound/ardour/ardour-0.9_beta30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-0.9_beta30.ebuild,v 1.1 2005/09/14 02:07:02 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-0.9_beta30.ebuild,v 1.1.1.1 2005/11/30 09:37:56 chriswhite Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ RESTRICT="nomirror"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE="nls debug sse"
+IUSE="nls debug sse altivec"
 
 # From beta30 release notes:
 #  plugin latency compensation now working correctly (we believe)
@@ -35,30 +35,45 @@ RDEPEND="dev-util/pkgconfig
 	>=media-libs/ladspa-sdk-1.12
 	>=media-libs/libsamplerate-0.0.14
 	>=dev-libs/libxml2-2.5.7
-	>=media-libs/libart_lgpl-2.3.16
-	>=dev-util/scons-0.96.1"
+	>=media-libs/libart_lgpl-2.3.16"
 
 DEPEND="${RDEPEND}
+	sys-devel/autoconf
+	sys-devel/automake
+	dev-util/pkgconfig
+	>=dev-util/scons-0.96.1
 	nls? ( sys-devel/gettext )"
 
 S="${WORKDIR}/${P/_/}"
 
 src_compile() {
+	# bug 99664
+	cd ${S}/libs/gtkmm
+	chmod a+x autogen.sh && ./autogen.sh || die "autogen failed"
+	econf || die "configure failed"
+
 	# Required for scons to "see" intermediate install location
 	mkdir -p ${D}
-	DBUG=no ; if useq debug ; then DBUG=yes ; fi
-	ENABLE_SSE=0 ; if useq sse ; then ENABLE_SSE=1 ; fi
 
-	scons DEBUG=${DBUG} USE_SSE_EVERYWHERE=${ENABLE_SSE} DESTDIR=${D} PREFIX=/usr KSI=0 -j2
+	use altivec && ALTIVEC=1 || ALTIVEC=0
+	use debug && ARDOUR_DEBUG=1 || ARDOUR_DEBUG=0
+	use nls && NLS=1 || NLS=0
+	use sse && SSE=1 || SSE=0
+
+	cd ${S}
+	scons \
+		ALTIVEC=${ALTIVEC} \
+		DEBUG=${ARDOUR_DEBUG} \
+		DESTDIR=${D} \
+		NLS=${NLS} \
+		PREFIX=/usr \
+		USE_SSE_EVERYWHERE=${SSE} \
+		KSI=0 \
+		-j2
 }
 
 src_install() {
 	scons install || die "make install failed"
 
-	# Workaround for xorg bug concerning lucida fonts. bug 73056. (2004 Dec 3 eldad)
-	# This workaround is no longer required as of ardour-0.9_beta29
-	# as it is already implemented in ardour_ui.rc
-	#sed -e 's/lucida[^-]*-/helvetica-/' -i ${D}/etc/ardour/ardour_ui.rc
-
 	dodoc DOCUMENTATION/*
 }
diff --git a/media-sound/ardour/metadata.xml b/media-sound/ardour/metadata.xml
index 25cdf89e6a50..f160f4635ee8 100644
--- a/media-sound/ardour/metadata.xml
+++ b/media-sound/ardour/metadata.xml
@@ -3,6 +3,11 @@
 <pkgmetadata>
 <herd>sound</herd>
 <maintainer>
-  <email>robh@gentoo.org</email>
+	<email>tigger@gentoo.org</email>
+	<name>Rob Holland</name>
+</maintainer>
+<maintainer>
+	<email>eldad@gentoo.org</email>
+	<name>Eldad Zack</name>
 </maintainer>
 </pkgmetadata>
diff --git a/media-sound/aseqview/ChangeLog b/media-sound/aseqview/ChangeLog
index 2cf073a0fe3e..2dc8ec200c0a 100644
--- a/media-sound/aseqview/ChangeLog
+++ b/media-sound/aseqview/ChangeLog
@@ -1,6 +1,38 @@
 # ChangeLog for media-sound/aseqview
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aseqview/ChangeLog,v 1.1 2002/12/21 04:23:04 agenkin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aseqview/ChangeLog,v 1.1.1.1 2005/11/30 09:38:02 chriswhite Exp $
+
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> aseqview-0.1.4.ebuild,
+  aseqview-0.2.1.ebuild:
+  Don't install COPYING file.
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> aseqview-0.2.1.ebuild:
+  Added to ~ppc.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  aseqview-0.2.1.ebuild:
+  Stable sparc.
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  aseqview-0.2.1.ebuild:
+  Added to ~sparc.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  aseqview-0.2.1.ebuild:
+  Stable amd64.
+
+  24 Apr 2004; Danny van Dyk <kugelfang@gentoo.org> aseqview-0.2.1.ebuild:
+  marked ~amd64
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  aseqview-0.1.4.ebuild:
+  Added IUSE.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  aseqview-0.2.1.ebuild:
+  QA fix.
+
+*aseqview-0.2.1 (23 Jan 2004)
 
 *aseqview-0.1.4 (20 Dec 2002)
 
diff --git a/media-sound/aseqview/Manifest b/media-sound/aseqview/Manifest
index e69de29bb2d1..467f1521a0de 100644
--- a/media-sound/aseqview/Manifest
+++ b/media-sound/aseqview/Manifest
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5c424dbf41017ea06405b82096fcab23 aseqview-0.2.1.ebuild 697
+MD5 13722778032ca5f354fc082de0483f43 ChangeLog 1197
+MD5 350e418c0d0dee8f67c737650d043d43 aseqview-0.1.4.ebuild 681
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 caf9e4f757d5fc811fbd8416b96dacdf files/digest-aseqview-0.2.1 65
+MD5 62dc4f68c863126cdfc9ba7abe731469 files/digest-aseqview-0.1.4 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGtT3j5H05b2HAEkRAumJAJ9EP0agAmKJNYXSk2VpmH5k6y5RfwCeNkPT
+FZEao86PFmfCX8/WPkT+u5M=
+=qZlK
+-----END PGP SIGNATURE-----
diff --git a/media-sound/aseqview/aseqview-0.1.4.ebuild b/media-sound/aseqview/aseqview-0.1.4.ebuild
index 88f37bff1eb8..723249c01376 100644
--- a/media-sound/aseqview/aseqview-0.1.4.ebuild
+++ b/media-sound/aseqview/aseqview-0.1.4.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/media-sound/aseqview/aseqview-0.1.4.ebuild,v 1.1 2002/12/21 04:23:04 agenkin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aseqview/aseqview-0.1.4.ebuild,v 1.1.1.1 2005/11/30 09:38:02 chriswhite Exp $
+
+IUSE=""
 
 DESCRIPTION="ALSA sequencer event viewer/filter."
 HOMEPAGE="http://www.alsa-project.org/~iwai/alsa.html"
@@ -13,7 +15,6 @@ SLOT="0"
 KEYWORDS="x86"
 
 SRC_URI="http://www.alsa-project.org/~iwai/${P}.tar.gz"
-S=${WORKDIR}/${P}
 
 src_compile() {
 	econf || die "./configure failed"
@@ -23,5 +24,5 @@ src_compile() {
 
 src_install() {
 	einstall || die "Installation Failed"
-	dodoc AUTHORS COPYING ChangeLog NEWS README
+	dodoc AUTHORS ChangeLog NEWS README
 }
diff --git a/media-sound/aseqview/aseqview-0.2.1.ebuild b/media-sound/aseqview/aseqview-0.2.1.ebuild
index 19149e64f49d..7056d5b7356d 100644
--- a/media-sound/aseqview/aseqview-0.2.1.ebuild
+++ b/media-sound/aseqview/aseqview-0.2.1.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/media-sound/aseqview/aseqview-0.2.1.ebuild,v 1.1 2004/01/23 14:13:34 torbenh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aseqview/aseqview-0.2.1.ebuild,v 1.1.1.1 2005/11/30 09:38:02 chriswhite Exp $
+
+IUSE=""
 
 DESCRIPTION="ALSA sequencer event viewer/filter."
 HOMEPAGE="http://www.alsa-project.org/~iwai/alsa.html"
+SRC_URI="http://www.alsa-project.org/~iwai/${P}.tar.gz"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc sparc x86"
 
 DEPEND=">=media-libs/alsa-lib-0.9.0
 	x11-libs/gtk+"
 
-SLOT="0"
-KEYWORDS="x86"
-
-SRC_URI="http://www.alsa-project.org/~iwai/${P}.tar.gz"
-S=${WORKDIR}/${P}
-
 src_compile() {
 	econf || die "./configure failed"
 	make clean
@@ -23,5 +23,5 @@ src_compile() {
 
 src_install() {
 	einstall || die "Installation Failed"
-	dodoc AUTHORS COPYING ChangeLog NEWS README
+	dodoc AUTHORS ChangeLog NEWS README
 }
diff --git a/media-sound/asunder/ChangeLog b/media-sound/asunder/ChangeLog
index dade6a11b1cc..4763c9266aa8 100644
--- a/media-sound/asunder/ChangeLog
+++ b/media-sound/asunder/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/asunder
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/asunder/ChangeLog,v 1.1 2005/03/29 13:02:22 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/asunder/ChangeLog,v 1.1.1.1 2005/11/30 09:38:18 chriswhite Exp $
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> asunder-0.1.0.ebuild:
+  Added to ~ppc.
 
 *asunder-0.1.0 (29 Mar 2005)
 
diff --git a/media-sound/asunder/Manifest b/media-sound/asunder/Manifest
index 0f48ff9f3ee0..3b0d4905b401 100644
--- a/media-sound/asunder/Manifest
+++ b/media-sound/asunder/Manifest
@@ -1,5 +1,5 @@
-MD5 99fc0585c3d8adcbb6532d37b02d2dee asunder-0.1.0.ebuild 779
-MD5 bdef36c7d149b1b37e0040c5ceda3fa3 ChangeLog 338
+MD5 e11e8e4f77a3626dc7067b9080c2994b ChangeLog 513
+MD5 0a9506794103715577bdcae5a9765b28 asunder-0.1.0.ebuild 885
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 bf7f18ef1aa5ef5e6bf20f2ada912f73 files/asunder.desktop 210
 MD5 6e4435adf4bcb11a7240fe0c22bb19b8 files/digest-asunder-0.1.0 66
diff --git a/media-sound/asunder/asunder-0.1.0.ebuild b/media-sound/asunder/asunder-0.1.0.ebuild
index 7984cd6e2c9e..e8231cfcddac 100644
--- a/media-sound/asunder/asunder-0.1.0.ebuild
+++ b/media-sound/asunder/asunder-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/media-sound/asunder/asunder-0.1.0.ebuild,v 1.1 2005/03/29 13:02:22 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/asunder/asunder-0.1.0.ebuild,v 1.1.1.1 2005/11/30 09:38:18 chriswhite Exp $
 
 MY_P=Asunder-${PV}
 S=${WORKDIR}/${MY_P}
@@ -12,7 +12,7 @@ SRC_URI="http://ericlathrop.com/${PN}/${MY_P}.tar.bz2"
 HOMEPAGE="http://ericlathrop.com/asunder/"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 SLOT="0"
 
 DEPEND=">=x11-libs/gtk+-2.4
diff --git a/media-sound/audacious/ChangeLog b/media-sound/audacious/ChangeLog
index f90020f09073..fe2c2df53e8c 100644
--- a/media-sound/audacious/ChangeLog
+++ b/media-sound/audacious/ChangeLog
@@ -1,6 +1,29 @@
 # ChangeLog for media-sound/audacious
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/ChangeLog,v 1.1 2005/10/30 14:20:41 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/ChangeLog,v 1.1.1.1 2005/11/30 09:37:50 chriswhite Exp $
+
+  20 Nov 2005; <chainsaw@gentoo.org> audacious-0.1-r1.ebuild:
+  Install libFLAC.m4, which is available separately. Closes bug #112990.
+
+  14 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  audacious-0.1-r1.ebuild:
+  Keyworded ~sparc wrt #112452
+
+  14 Nov 2005; Brent Baude <ranger@gentoo.org> audacious-0.1.ebuild:
+  Marking audacious-0.1 ~ppc64 for bug request 112452
+
+*audacious-0.1-r1 (01 Nov 2005)
+
+  01 Nov 2005; <chainsaw@gentoo.org> +files/0.1-aac-makefile.am,
+  +audacious-0.1-r1.ebuild:
+  Revision bump, need corrected makefile to disable AAC. Forcibly disable AAC,
+  closes bug #110987.
+
+  30 Oct 2005; Petteri Räty <betelgeuse@gentoo.org> audacious-0.1.ebuild:
+  Added ~x86 keyword requested in bug #110892.
+
+  30 Oct 2005; Luca Barbato <lu_zero@gentoo.org> audacious-0.1.ebuild:
+  Marked ~ppc
 
 *audacious-0.1 (30 Oct 2005)
 
diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index 2326d67ce1bd..058ed783cadc 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,3 +1,17 @@
-MD5 e3a326a48e122ca64c1a555d1b61a1d5 audacious-0.1.ebuild 2449
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0ef8cc7a711d747353efcfc47d59f84e ChangeLog 1440
+MD5 b5ac0de9588722b6dc7f188a1feaf051 audacious-0.1-r1.ebuild 2498
+MD5 343fbbbf4c755e36e509b34c296929b2 audacious-0.1.ebuild 2402
+MD5 91d8a8b27023cfe143010b46f5d97ffb files/0.1-aac-makefile.am 52
 MD5 556a78b44b63b6950de07d76f6261e8f files/digest-audacious-0.1 134
+MD5 8a62ab9f0b016d1b6a876704775313b1 files/digest-audacious-0.1-r1 187
 MD5 319fe8f45b51a2d31f8d4e9a4071ca10 metadata.xml 248
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDgO+ep5vW4rUFj5oRAhmlAKC+tU2oxVv7vEb+uL2J187I6y4kcACeIKEL
+WYal8LxB8VKRN3SrBbADQ6o=
+=+zwV
+-----END PGP SIGNATURE-----
diff --git a/media-sound/audacious/audacious-0.1-r1.ebuild b/media-sound/audacious/audacious-0.1-r1.ebuild
index fbd7c41c40a7..fb16f9b5c306 100644
--- a/media-sound/audacious/audacious-0.1-r1.ebuild
+++ b/media-sound/audacious/audacious-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/media-sound/audacious/audacious-0.1-r1.ebuild,v 1.1 2005/11/01 00:23:08 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-0.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:50 chriswhite Exp $
 
 IUSE="alsa esd flac gnome mmx mp3 nls oss sdl vorbis"
 
@@ -9,12 +9,13 @@ inherit flag-o-matic eutils libtool autotools
 DESCRIPTION="Audacious Player - Your music, your way, no exceptions."
 HOMEPAGE="http://audacious.nenolod.net/Main_Page"
 SRC_URI="http://audacious.nenolod.net/release/audacious-0.1.tgz
-	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
+	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2
+	 http://svn.atheme.org/audacious/trunk/m4/libFLAC.m4"
 
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 RDEPEND="app-arch/unzip
 	>=x11-libs/gtk+-2.4
@@ -38,6 +39,9 @@ src_unpack() {
 		ewarn "MP3 support is now optional and you have not enabled it."
 	fi
 
+	mkdir -p ${S}/m4/
+	cp ${DISTDIR}/libFLAC.m4 ${S}/m4/
+
 	unpack ${A}
 	cd ${S}
 
diff --git a/media-sound/audacious/audacious-0.1.ebuild b/media-sound/audacious/audacious-0.1.ebuild
index 8f81cb3b0f47..755c02d9271a 100644
--- a/media-sound/audacious/audacious-0.1.ebuild
+++ b/media-sound/audacious/audacious-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/media-sound/audacious/audacious-0.1.ebuild,v 1.1 2005/10/30 14:20:41 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-0.1.ebuild,v 1.1.1.1 2005/11/30 09:37:50 chriswhite Exp $
 
 IUSE="aac alsa esd flac gnome mmx mp3 nls oss sdl vorbis"
 
@@ -14,7 +14,7 @@ SRC_URI="http://audacious.nenolod.net/release/audacious-0.1.tgz
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
 # beep-config has a runtime depend on pkg-config
 RDEPEND="app-arch/unzip
diff --git a/media-sound/audacious/files/digest-audacious-0.1-r1 b/media-sound/audacious/files/digest-audacious-0.1-r1
index 330adcc335bb..e77386be6614 100644
--- a/media-sound/audacious/files/digest-audacious-0.1-r1
+++ b/media-sound/audacious/files/digest-audacious-0.1-r1
@@ -1,2 +1,3 @@
 MD5 540865e944f41a5bb082b13c6b8fd686 audacious-0.1.tgz 2385825
 MD5 41eababfa8bad11e9e34e467cdfb86be gentoo_ice-xmms-0.2.tar.bz2 51839
+MD5 f2a34c01dbaa658587520780316908d0 libFLAC.m4 3922
diff --git a/media-sound/audacity/ChangeLog b/media-sound/audacity/ChangeLog
index ec145f36e3ed..ade966dda8ae 100644
--- a/media-sound/audacity/ChangeLog
+++ b/media-sound/audacity/ChangeLog
@@ -1,6 +1,178 @@
 # ChangeLog for media-sound/audacity
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.1 2002/06/21 23:07:25 rphillips Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.1.1.1 2005/11/30 09:38:06 chriswhite Exp $
+
+  17 Sep 2005; Mark Loeser <halcy0n@gentoo.org>
+  +files/audacity-1.2.3-x86.patch, audacity-1.2.3-r1.ebuild:
+  Thanks to basic <basic AT mozdev DOT org> for the patch to fix compilation on
+  x86.  Marking ~x86 for testing. bug #73248
+
+  15 May 2005; Diego Pettenò <flameeyes@gentoo.org> audacity-1.2.1.ebuild,
+  audacity-1.2.2.ebuild, audacity-1.2.3.ebuild, audacity-1.2.3-r1.ebuild:
+  Fixed dependency ok wxGTK 2.4 slot as per bug #92730.
+
+*audacity-1.2.3-r1 (15 Apr 2005)
+
+  15 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> +audacity-1.2.3-r1.ebuild:
+  applied cleanup patch which was provided by Diego Pettenò
+  <dgp85@users.sourceforge.net>, fixes #74224 and #83301
+
+  05 Mar 2005; Markus Rothe <corsair@gentoo.org> audacity-1.2.3.ebuild:
+  Stable on ppc64
+
+  13 Jan 2005; Markus Rothe <corsair@gentoo.org> audacity-1.2.3.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  audacity-1.2.3.ebuild:
+  Stable sparc.
+
+  11 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  audacity-1.2.3.ebuild:
+  -x86 because of bad assembly.
+
+*audacity-1.2.3 (29 Nov 2004)
+
+  29 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +audacity-1.2.3.ebuild:
+  Version bump closes bug #72290.
+
+*audacity-1.2.2 (31 Oct 2004)
+
+  31 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/audacity-1.2.0-STTypes.patch, -audacity-1.1.3.ebuild,
+  -audacity-1.2.0-r1.ebuild, +audacity-1.2.2.ebuild:
+  Version bump. Only installing .desktop in applications. Installing audacity
+  icon to close bug #59611.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  audacity-1.2.0-r1.ebuild, audacity-1.2.1.ebuild:
+  1.2.0 is -amd64, and added a note not to remove 1.2.1 from ~amd64 because of
+  xfce4 problem (bug #54331).
+
+*audacity-1.2.1 (10 May 2004)
+
+  10 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  audacity-1.2.1.ebuild:
+  Version bump.
+
+  06 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  audacity-1.2.0-r1.ebuild:
+  Added to ~sparc.
+
+  06 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  audacity-1.2.0-r1.ebuild, files/audacity-1.2.0-STTypes.patch:
+  Patch added to fix bug #49417.
+
+  03 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  audacity-1.1.3.ebuild, audacity-1.2.0-r1.ebuild:
+  Changing mad dep to madplay.
+
+*audacity-1.2.0-r1 (04 Apr 2004)
+
+  04 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  audacity-1.2.0-r1.ebuild, audacity-1.2.0.ebuild, files/audacity.desktop:
+  Stable on x86.  Revbumping to include the .desktop.
+
+  13 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  audacity-1.2.0.ebuild:
+  readded wxgtk unicode check...
+
+  04 Mar 2004; David Holm <dholm@gentoo.org> audacity-1.2.0.ebuild:
+  Added to ~ppc.
+
+*audacity-1.2.0 (03 Mar 2004)
+
+  03 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  audacity-1.2.0.ebuild:
+  Version bump.  Bug #43577. 1.2 works fine with wxGTK unicode.
+
+*audacity-1.2.0_pre4 (28 Feb 2004)
+
+  28 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  audacity-1.2.0_pre4.ebuild:
+  Version bump.
+
+*audacity-1.2.0_pre3 (07 Feb 2004)
+
+  07 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  audacity-1.1.3.ebuild, audacity-1.2.0_pre3.ebuild, metadata.xml,
+  files/basecfg-1.1.1:
+  Version bump (Bug #35658). Fixed fftw DEP (Bug #34010). Updated ebuild to
+  correctly use USE flags. Now die only if wxGTK was compiled with unicode
+  support (Bug #32753).
+
+  19 Jul 2003; Nick Hadaway <raker@gentoo.org>:
+  Reverted to previous version
+
+*audacity-1.1.3-r1 (17 Jul 2003)
+
+  17 Jul 2003; Nick Hadaway <raker@gentoo.org> audacity-1.1.3-r1.ebuild:
+  Changed media-sound/mad dep to media-libs/{libmad,libid3tag}
+
+*audacity-1.1.3 (12 Apr 2003)
+
+  12 Apr 2003; jje audacity-1.1.3.ebuild:
+  Version bump. Cleaned up ebuild from previous version.
+
+*audacity-1.1.1-r1 (30 Jan 2003)
+
+  17 Feb 2003; Nick Hadaway <raker@gentoo.org> audacity-1.1.1-r1.ebuild :
+  Added a hook so gtk2 in USE causes the compile to stop and warn
+  the user of the incompatibility.
+
+  12 Feb 2003; Nick Hadaway <raker@gentoo.org> audacity-1.1.1-r1.ebuild,
+  files/basecfg-1.1.1 :
+  Added a very basic configuration so when building against wxGTK,
+  starting it doesn't cause a segfault.
+
+  04 Feb 2003; Nick Hadaway <raker@gentoo.org> audacity-1.1.1-r1.ebuild :
+  I have now tested audacity with wxGTK-2.4.0 and it works great.
+
+  30 Jan 2003; Nick Hadaway <raker@gentoo.org> audacity-1.1.1-r1.ebuild,
+  files/digest-audacity-1.1.1-r1 :
+  Updated ebuild to depend on wxGTK-2.2.9* as wxGTK-2.4.0 causes
+  a segfault on startup.  Updated to the -3 audacity tarball.
+  Added a system dependancy on >=libsndfile-1.0.0.  CVS should
+  be compatible with =wxGTK-2.4* real soon now. :)  I'm not motivated
+  to do an audacity-cvs build yet as it has been very unstable.
+  Once I start seeing the code base become more stable I may consider
+  it.
+
+*audacity-1.1.1 (15 Jan 2003)
+
+  15 Jan 2003; Nick Hadaway <raker@gentoo.org> audacity-1.1.1.ebuild, 
+  files/digest-audacity-1.1.1, files/mono_mp3_export.patch :
+  Version bump.  Marked stable as it depends on wxGTK-2.4.x which
+  has also been released as stable.  Thanks to the anonymous
+  "Gentoo User" on bug #13978 for the mono patch.
+
+*audacity-1.1.0 (10 Nov 2002)
+
+  27 Mar 2003; Alastair Tse <liquidx@gentoo.org> audacity-1.0.0-r1.ebuild,
+  audacity-1.0.0-r1.ebuild, audacity-1.0.0-r2.ebuild,
+  audacity-1.0.0-r2.ebuild, audacity-1.0.0.ebuild, audacity-1.0.0.ebuild,
+  audacity-1.1.0.ebuild, audacity-1.1.0.ebuild:
+  clean up old ebuilds
+
+  10 Nov 2002; Nick Hadaway <raker@gentoo.org> audacity-1.1.0.ebuild :
+  Updated ebuild.
+
+*audacity-1.0.0-r2 (26 Aug 2002)
+
+  26 Aug 2002; Spider <spider@gentoo.org> audacity-1.0.0-r2.ebuild :
+  removed id3lib_pre2 in the ebuild in favour of the final + patches 
+  for it to work with gcc 3.2. now it should emerge clean on gcc 3.2
+  systems.  masked for testing on gcc 2.95.3
+
+*audacity-1.0.0-r1 (09 Aug 2002)
+
+  22 Aug 2002; Nick Hadaway <raker@gentoo.org> audacity-1.0.0-r1.ebuild :
+  Updated dependancies to include app-arch/zip
+
+  09 Aug 2002; Nick Hadaway <raker@gentoo.org> audacity-1.0.0-r1.ebuild,
+  files/digest-audacity-1.0.0-r1, files/audacity-1.0.0-gcc31.patch :
+  Updated ebuild with a patch to allow >=gcc3 systems to compile properly.
 
 *audacity-1.0.0 (21 Jun 2002)
 
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 47ff7a5095d3..9fd83ae65169 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,13 +1,22 @@
-MD5 a593db6d7c43d745d970958d76a5b157 ChangeLog 3292
-MD5 a3f0f1fe5cdb2a49cdc57771e9f9e98a audacity-1.1.3.ebuild 1199
-MD5 cab4fb9dd0257a4c4e47791cec32efb9 audacity-1.1.1-r1.ebuild 1393
-MD5 096a267fdcc01acac3c6d0b5a3868e49 audacity-1.1.1.ebuild 863
-MD5 c151b63a0eca16e885c23226c03d28f0 files/audacity-1.0.0-gcc31.patch 2153
-MD5 f779279f19d249c6d735b28e72c30c6b files/audacity-src-1.1.0-phonograph.patch 5137
-MD5 f34b93cc26c85c6789d21fb94b213e09 files/audacity-src-1.1.0-timestretch.patch 19316
-MD5 d1064c1800175d5fb3113f74785568f6 files/basecfg-1.1.1 35
-MD5 cb2f75d37538e9688fe397cf178f57ad files/digest-audacity-1.1.3 68
-MD5 024df109bab703d496948d08e53f7b8f files/digest-audacity-1.1.1 68
-MD5 766f7e6fa7f5a3253ca220bca4826430 files/digest-audacity-1.1.1-r1 70
-MD5 21b2333db59cc116a7e3c96563fe9ccd files/id3lib-3.8.0-gcc3.patch 2707
-MD5 8f5051d60b802ecf74497bc2ec4bb32e files/mono_mp3_export.patch 6261
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8af468ad169e36b46ba514d551906099 ChangeLog 6921
+MD5 55dad7669fd5f768ae53eb6fff270ca9 audacity-1.2.1.ebuild 2274
+MD5 fc75ba4d5a33758eecdfc678c7f32a0a audacity-1.2.2.ebuild 2183
+MD5 b3b1d3f0eebee301f98415e406a4b1b8 audacity-1.2.3-r1.ebuild 1857
+MD5 abf6e05d1c798fc33e0b91578c037837 audacity-1.2.3.ebuild 2186
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 8332a9c72a43ed19ab1904a935a25e03 files/audacity.desktop 155
+MD5 8f1e5073472cee2da1987db62e7db3a9 files/digest-audacity-1.2.1 72
+MD5 a150eb16468631b07901c6ca01451679 files/digest-audacity-1.2.2 71
+MD5 bf35b35e84d0c0be6fa8e87acf085294 files/digest-audacity-1.2.3 71
+MD5 bf35b35e84d0c0be6fa8e87acf085294 files/digest-audacity-1.2.3-r1 71
+MD5 502eabf8993eb2af91e1265425024091 files/audacity-1.2.3-x86.patch 995
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDLHJ9CRZPokWLroQRAnT1AJ4h5yszD0RgZD9crxHqBdU9rM3CngCeMlRI
+QRTMZyXJJkniXMIu6fFggm4=
+=Iwu3
+-----END PGP SIGNATURE-----
diff --git a/media-sound/audacity/audacity-1.2.1.ebuild b/media-sound/audacity/audacity-1.2.1.ebuild
index 7ff1a5cefd51..12208b1485fd 100644
--- a/media-sound/audacity/audacity-1.2.1.ebuild
+++ b/media-sound/audacity/audacity-1.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/media-sound/audacity/audacity-1.2.1.ebuild,v 1.1 2004/05/11 03:45:38 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.2.1.ebuild,v 1.1.1.1 2005/11/30 09:38:06 chriswhite Exp $
 
 MY_PV="${PV/_/-}"
 MY_P="${PN}-src-${MY_PV}"
@@ -13,9 +13,11 @@ RESTRICT="nomirror"
 LICENSE="GPL-2"
 IUSE="encode flac mad oggvorbis"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc"
 
-DEPEND=">=x11-libs/wxGTK-2.2.9
+# Do not unmask on amd64 without talking to eradicator
+KEYWORDS="x86 ~ppc ~sparc ~amd64"
+
+DEPEND="=x11-libs/wxGTK-2.4*
 	>=app-arch/zip-2.3
 	>=media-libs/id3lib-3.8.0
 	media-libs/libid3tag
diff --git a/media-sound/audacity/audacity-1.2.2.ebuild b/media-sound/audacity/audacity-1.2.2.ebuild
index fa12293e17ac..88eca09fe08d 100644
--- a/media-sound/audacity/audacity-1.2.2.ebuild
+++ b/media-sound/audacity/audacity-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/media-sound/audacity/audacity-1.2.2.ebuild,v 1.1 2004/10/31 10:37:32 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.2.2.ebuild,v 1.1.1.1 2005/11/30 09:38:06 chriswhite Exp $
 
 IUSE="encode flac mad oggvorbis"
 
@@ -18,7 +18,7 @@ SLOT="0"
 # Do not unmask on amd64 without talking to eradicator
 KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 
-DEPEND=">=x11-libs/wxGTK-2.2.9
+DEPEND="=x11-libs/wxGTK-2.4*
 	>=app-arch/zip-2.3
 	>=media-libs/id3lib-3.8.0
 	media-libs/libid3tag
@@ -84,7 +84,7 @@ src_install() {
 	rm -rf ${D}/share/doc
 
 	insinto /usr/share/pixmaps
-	newins AudacityLogo48x48.xpm audacity.xpm
+	newins images/AudacityLogo48x48.xpm audacity.xpm
 
 	insinto /usr/share/applications
 	doins ${FILESDIR}/audacity.desktop
diff --git a/media-sound/audacity/audacity-1.2.3-r1.ebuild b/media-sound/audacity/audacity-1.2.3-r1.ebuild
index 8bf454c75d23..35411f15892d 100644
--- a/media-sound/audacity/audacity-1.2.3-r1.ebuild
+++ b/media-sound/audacity/audacity-1.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/media-sound/audacity/audacity-1.2.3-r1.ebuild,v 1.1 2005/04/15 17:46:25 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.2.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:06 chriswhite Exp $
 
 inherit wxwidgets eutils
 
@@ -18,10 +18,9 @@ LICENSE="GPL-2"
 SLOT="0"
 
 # amd64: causes xfce pannel to crash...
-# Bad x86 assembly: #73248
-KEYWORDS="~amd64 ~ppc ~sparc -x86 ~ppc64"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~ppc64"
 
-DEPEND=">=x11-libs/wxGTK-2.4.2-r1
+DEPEND="=x11-libs/wxGTK-2.4*
 	>=app-arch/zip-2.3
 	>=media-libs/id3lib-3.8.0
 	media-libs/libid3tag
@@ -35,6 +34,11 @@ DEPEND=">=x11-libs/wxGTK-2.4.2-r1
 
 WX_GTK_VER="2.4"
 
+src_unpack() {
+	unpack "${A}"
+	epatch "${FILESDIR}"/${P}-x86.patch #bug #73248
+}
+
 src_compile() {
 	if ! use gtk2; then
 		need-wxwidgets gtk || die "No gtk1 version of x11-libs/wxGTK found"
diff --git a/media-sound/audacity/audacity-1.2.3.ebuild b/media-sound/audacity/audacity-1.2.3.ebuild
index e30b4bc324c3..ebdf45bc05f7 100644
--- a/media-sound/audacity/audacity-1.2.3.ebuild
+++ b/media-sound/audacity/audacity-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/media-sound/audacity/audacity-1.2.3.ebuild,v 1.1 2004/11/29 13:02:12 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.2.3.ebuild,v 1.1.1.1 2005/11/30 09:38:06 chriswhite Exp $
 
 IUSE="encode flac mad oggvorbis"
 
@@ -15,10 +15,11 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-# Do not unmask on amd64 without talking to eradicator
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+# amd64: causes xfce pannel to crash...
+# Bad x86 assembly: #73248
+KEYWORDS="~amd64 ~ppc sparc -x86 ppc64"
 
-DEPEND=">=x11-libs/wxGTK-2.2.9
+DEPEND="=x11-libs/wxGTK-2.4*
 	>=app-arch/zip-2.3
 	>=media-libs/id3lib-3.8.0
 	media-libs/libid3tag
diff --git a/media-sound/audio-entropyd/ChangeLog b/media-sound/audio-entropyd/ChangeLog
index 5ac63036da7a..6977c2a8b145 100644
--- a/media-sound/audio-entropyd/ChangeLog
+++ b/media-sound/audio-entropyd/ChangeLog
@@ -1,6 +1,47 @@
 # ChangeLog for media-sound/audio-entropyd
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audio-entropyd/ChangeLog,v 1.1 2004/03/31 09:58:00 method Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audio-entropyd/ChangeLog,v 1.1.1.1 2005/11/30 09:38:42 chriswhite Exp $
+
+  24 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  audio-entropyd-0.0.6.ebuild:
+  Use newconfd/newinitd.
+
+  14 Aug 2004; Sven Wegener <swegener@gentoo.org> files/audio-entropyd.conf:
+  Fixed CVS Header.
+
+  04 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  audio-entropyd-0.0.6.ebuild:
+  ~sparc added
+
+  04 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  audio-entropyd-0.0.6.ebuild:
+  ~amd64.
+
+  02 Jul 2004; Chris PeBenito <pebenito@gentoo.org>
+  audio-entropyd-0.0.6.ebuild:
+  Overdue stable.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  audio-entropyd-0.0.6.ebuild:
+  virtual/glibc -> virtual/libc
+
+  07 May 2004; Brandon Hale <tseng@gentoo.org> audio-entropyd-0.0.6.ebuild:
+  Remove S=
+
+  07 Apr 2004; Chris PeBenito <pebenito@gentoo.org>
+  audio-entropyd-0.0.6.ebuild:
+  Add SELinux policy RDEP
+
+  02 Apr 2004; Joshua Brindle <method@gentoo.org> audio-entropyd-0.0.6.ebuild,
+  files/audio-entropyd.init:
+  fixed up the init file and conf.d to read more variables
+
+  01 Apr 2004; David Holm <dholm@gentoo.org> audio-entropyd-0.0.6.ebuild:
+  Added to ~ppc.
+
+  31 Mar 2004; Joshua Brindle <method@gentoo.org> audio-entropyd-0.0.6.ebuild,
+  files/audio-entropyd.init:
+  updated init file and ebuild courtesy of Cory Visi <cory@visi.name>
 
 *audio-entropyd-0.0.6 (31 Mar 2004)
 
diff --git a/media-sound/audio-entropyd/Manifest b/media-sound/audio-entropyd/Manifest
index 7eae5a8f72a4..37d01ef16d53 100644
--- a/media-sound/audio-entropyd/Manifest
+++ b/media-sound/audio-entropyd/Manifest
@@ -1,3 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 38f66e8390c35b421e796b4dd131812f ChangeLog 1678
+MD5 f8ce22ed4ed0a0587b71f1f851755b26 audio-entropyd-0.0.6.ebuild 885
 MD5 96e29d7bb8e68a4c9e642e3b4029f762 metadata.xml 325
-MD5 a92eab83cc7a18c8a6d80d7c0abaf5fb audio-entropyd-0.0.6.ebuild 490
 MD5 0585a52027bab216bab4009edb0dd4e4 files/digest-audio-entropyd-0.0.6 68
+MD5 9aa880982b3fef9a498774a02cfae068 files/audio-entropyd.init 769
+MD5 61b40957017928e7dee0914fea292ace files/audio-entropyd.conf 524
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDDKO9j5H05b2HAEkRAkmHAJsEG/vwucx3eDnKutoY4B0foYWZBQCfZPjO
+XcV4olw12Pz0FujFaku1MmI=
+=Ej4i
+-----END PGP SIGNATURE-----
diff --git a/media-sound/audio-entropyd/audio-entropyd-0.0.6.ebuild b/media-sound/audio-entropyd/audio-entropyd-0.0.6.ebuild
index 12249b004a88..dcc7abb58dd1 100644
--- a/media-sound/audio-entropyd/audio-entropyd-0.0.6.ebuild
+++ b/media-sound/audio-entropyd/audio-entropyd-0.0.6.ebuild
@@ -1,25 +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/media-sound/audio-entropyd/audio-entropyd-0.0.6.ebuild,v 1.1 2004/03/31 09:58:00 method Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audio-entropyd/audio-entropyd-0.0.6.ebuild,v 1.1.1.1 2005/11/30 09:38:42 chriswhite Exp $
 
 DESCRIPTION="Audio-entropyd generates entropy-data for the /dev/random device."
 HOMEPAGE="http://www.vanheusden.com/aed/"
 SRC_URI="http://www.vanheusden.com/aed/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-DEPEND=""
-RDEPEND=""
+KEYWORDS="x86 ppc ~amd64 ~sparc"
+IUSE="selinux"
+DEPEND="virtual/libc"
+RDEPEND="${DEPEND}
+	>=sys-apps/sed-4
+	!amd64? ( selinux? ( sec-policy/selinux-audio-entropyd ) )"
 
-S=${WORKDIR}/${P}
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	sed -i.orig \
+		-e "s:^OPT_FLAGS=.*:OPT_FLAGS=$CFLAGS:" \
+		Makefile
+}
 
 src_compile() {
 	emake || die "emake failed"
 }
 
 src_install() {
-	dobin audio-entropyd
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/audio-entropyd.init audio-entropyd
+	dosbin audio-entropyd
+
+	newinitd ${FILESDIR}/${PN}.init ${PN}
+	newconfd ${FILESDIR}/${PN}.conf ${PN}
 }
diff --git a/media-sound/audio-entropyd/files/audio-entropyd.conf b/media-sound/audio-entropyd/files/audio-entropyd.conf
index dcd7993b7ba7..977d55eac027 100644
--- a/media-sound/audio-entropyd/files/audio-entropyd.conf
+++ b/media-sound/audio-entropyd/files/audio-entropyd.conf
@@ -1,5 +1,8 @@
-# /etc/conf.d/audio-entropyd:
-# $Header: 
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audio-entropyd/files/audio-entropyd.conf,v 1.1.1.1 2005/11/30 09:38:42 chriswhite Exp $
+
+# /etc/conf.d/audio-entropyd
 
 # The acceptable values are DEVICE, READSIZE and SAMPLERATE
 # These defaults give the optimum entropy 
diff --git a/media-sound/audio-entropyd/files/audio-entropyd.init b/media-sound/audio-entropyd/files/audio-entropyd.init
index a4c56fc6df15..4438ff6be577 100644
--- a/media-sound/audio-entropyd/files/audio-entropyd.init
+++ b/media-sound/audio-entropyd/files/audio-entropyd.init
@@ -1,19 +1,27 @@
 #!/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/media-sound/audio-entropyd/files/audio-entropyd.init,v 1.1 2004/03/31 09:58:00 method Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audio-entropyd/files/audio-entropyd.init,v 1.1.1.1 2005/11/30 09:38:42 chriswhite Exp $
 
-start() {
+depend() {
+	need modules
+	use alsa
+}
 
-	ebegin "audio-entropyd"
-	start-stop-daemon --start --quiet --exec /usr/bin/audio-entropyd --background 
-	eend $?
+start() {
+	local params=""
+	[ -n "$DEVICE" ] && params="$params -d $DEVICE"
+	[ -n "$READSIZE" ] && params="$params -r $READSIZE"
+	[ -n "$SAMPLERATE" ] && params="$params -N $SAMPLERATE"
 
+	ebegin "Starting audio entropy gathering daemon"
+	start-stop-daemon --start --quiet --exec /usr/sbin/audio-entropyd -- ${params}
+	eend ${?}
 }
 
 stop() {
-
-	ebegin "Stopping famd"
-	start-stop-daemon --stop --quiet --exec /usr/bin/audio-entropyd
-	eend $?
+	ebegin "Stopping audio entropy gathering daemon"
+	start-stop-daemon --stop --quiet --pidfile /var/run/audio-entropyd.pid
+	eend ${?}
 }
+
diff --git a/media-sound/audiocompress/ChangeLog b/media-sound/audiocompress/ChangeLog
index ae929439f719..e3e7f2ffd5d2 100644
--- a/media-sound/audiocompress/ChangeLog
+++ b/media-sound/audiocompress/ChangeLog
@@ -1,6 +1,43 @@
 # ChangeLog for media-sound/audiocompress
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audiocompress/ChangeLog,v 1.1 2003/06/03 10:48:39 robh Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audiocompress/ChangeLog,v 1.1.1.1 2005/11/30 09:38:39 chriswhite Exp $
+
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  audiocompress-1.3.ebuild, audiocompress-1.5.ebuild,
+  audiocompress-1.5.1.ebuild:
+  Don't install COPYING file.
+
+  13 Jan 2005; Frank van de Pol <fvdpol@gentoo.org> audiocompress-1.5.ebuild:
+  Added esound dependency. Closes Bug #77867.
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  audiocompress-1.5.1.ebuild:
+  -sparc
+
+  03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  audiocompress-1.5.1.ebuild:
+  Stable x86.
+
+  04 Aug 2004; David Holm <dholm@gentoo.org> audiocompress-1.5.1.ebuild:
+  Added to ~ppc.
+
+*audiocompress-1.5.1 (02 Aug 2004)
+
+  02 Aug 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/audiocompress-1.5.1-gentoo.patch, +audiocompress-1.5.1.ebuild:
+  Version bump and -fPIC fixes.  Closes bug #56026.  Added -amd64.
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org> audiocompress-1.3.ebuild:
+  Fix use invocation
+
+  26 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  audiocompress-1.5.ebuild:
+  Stable x86.
+
+*audiocompress-1.5 (06 Aug 2003)
+
+  06 Aug 2003; jje <jje@gentoo.org> audiocompress-1.5.ebuild:
+  Version bump.
 
 *audiocompress-1.3 (03 Jun 2003)
 
diff --git a/media-sound/audiocompress/Manifest b/media-sound/audiocompress/Manifest
index 55399ff8fa16..256725d01b4b 100644
--- a/media-sound/audiocompress/Manifest
+++ b/media-sound/audiocompress/Manifest
@@ -1,3 +1,19 @@
-MD5 a7421d36c1f2f2ebd7c775f2d57a6717 audiocompress-1.3.ebuild 963
-MD5 4ab0ab93051b50e5673519c18c7b0682 ChangeLog 329
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 16b6955e8577d2fe7376847823ec1cad ChangeLog 1549
+MD5 41949b9d653e781c83055df3932f0d85 audiocompress-1.3.ebuild 942
+MD5 3c0e0cbbdaa5e485dcbf5293877a71e2 audiocompress-1.5.ebuild 962
+MD5 0e488237842bf81d3071d4cb8d1c58d9 audiocompress-1.5.1.ebuild 1294
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 14e76a619191ebae564b85c528b32d2e files/digest-audiocompress-1.5 68
 MD5 45241faef0fdd3134f481dd0e30f8079 files/digest-audiocompress-1.3 68
+MD5 f49cd4e9e5f178e7206b47bb03a4a841 files/audiocompress-1.5.1-gentoo.patch 983
+MD5 f47385522df4cea0523c5179f10cad25 files/digest-audiocompress-1.5.1 70
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGs/5j5H05b2HAEkRAmESAJ9H72ARYyfi2SIV0sR75r9/rXg+bwCgmG4V
+pCcXJHjv0JMi0I/g8soG430=
+=e44X
+-----END PGP SIGNATURE-----
diff --git a/media-sound/audiocompress/audiocompress-1.3.ebuild b/media-sound/audiocompress/audiocompress-1.3.ebuild
index d78524ed9a33..35a1f222185b 100644
--- a/media-sound/audiocompress/audiocompress-1.3.ebuild
+++ b/media-sound/audiocompress/audiocompress-1.3.ebuild
@@ -1,37 +1,35 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audiocompress/audiocompress-1.3.ebuild,v 1.1 2003/06/03 10:48:39 robh Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audiocompress/audiocompress-1.3.ebuild,v 1.1.1.1 2005/11/30 09:38:39 chriswhite Exp $
 
 MY_P="AudioCompress-${PV}"
 
-DESCRIPTION="AudioCompress is (essentially) a very gentle, 1-band dynamic range compressor intended to keep audio output at a consistent volume without introducing any audible artifacts"
-SRC_URI="http://trikuare.cx/code/${MY_P}.tar.gz"
+DESCRIPTION="AudioCompress is (essentially) a very gentle, 1-band dynamic range compressor intended to keep audio output at a consistent volume without introducing any audible artifacts."
 HOMEPAGE="http://trikuare.cx/code/AudioCompress.html"
-IUSE="xmms"
-
-S=${WORKDIR}/${MY_P}
+SRC_URI="http://trikuare.cx/code/${MY_P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+SLOT="0"
+KEYWORDS="x86"
+IUSE="xmms"
 
 DEPEND="xmms? ( media-sound/xmms )"
 
+S=${WORKDIR}/${MY_P}
+
 src_compile() {
-	if [ -n "`use xmms`" ]; then
-	  emake || die
+	if use xmms; then
+		emake || die
 	else
-	  emake AudioCompress
+		emake AudioCompress || die
 	fi
 }
 
 src_install() {
-    dodir /usr/bin
-	install -m 755 AudioCompress ${D}/usr/bin/ || die
-	if [ -n "`use xmms`" ]; then
-	  installdir="${D}$(xmms-config --effect-plugin-dir)"
-	  install -d ${installdir} || die
-	  install -m 755 libcompress.so ${installdir} || die
+	dobin AudioCompress || die
+	if use xmms; then
+		exeinto "$(xmms-config --effect-plugin-dir)" || die
+		doexe libcompress.so || die
 	fi
-	dodoc COPYING ChangeLog README TODO
+	dodoc ChangeLog README TODO
 }
diff --git a/media-sound/audiocompress/audiocompress-1.5.1.ebuild b/media-sound/audiocompress/audiocompress-1.5.1.ebuild
index 24154955841b..c7054bfbc43e 100644
--- a/media-sound/audiocompress/audiocompress-1.5.1.ebuild
+++ b/media-sound/audiocompress/audiocompress-1.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/media-sound/audiocompress/audiocompress-1.5.1.ebuild,v 1.1 2004/08/02 22:07:33 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audiocompress/audiocompress-1.5.1.ebuild,v 1.1.1.1 2005/11/30 09:38:39 chriswhite Exp $
 
 IUSE="xmms"
 
@@ -15,9 +15,11 @@ SRC_URI="http://trikuare.cx/code/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 #-amd64: 1.5.1 - Floating point exception when using xmms plugin
-KEYWORDS="~x86 -amd64"
+#-sparc: 1.5.5 - Gdk-ERROR **: BadValue (integer parameter out of range for operation) serial 7 error_code 2 request_code 1 minor_code 0
+KEYWORDS="-amd64 ~ppc -sparc x86"
 
-DEPEND="xmms? ( media-sound/xmms )"
+DEPEND="xmms? ( media-sound/xmms )
+	media-sound/esound"
 
 S=${WORKDIR}/${MY_P}
 
@@ -44,5 +46,5 @@ src_install() {
 		exeinto "$(xmms-config --effect-plugin-dir)" || die
 		doexe libcompress.so || die
 	fi
-	dodoc COPYING ChangeLog README TODO
+	dodoc ChangeLog README TODO
 }
diff --git a/media-sound/audiocompress/audiocompress-1.5.ebuild b/media-sound/audiocompress/audiocompress-1.5.ebuild
index b93ceb43719f..9d396d50b9f0 100644
--- a/media-sound/audiocompress/audiocompress-1.5.ebuild
+++ b/media-sound/audiocompress/audiocompress-1.5.ebuild
@@ -1,37 +1,36 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audiocompress/audiocompress-1.5.ebuild,v 1.1 2003/08/06 10:58:24 jje Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audiocompress/audiocompress-1.5.ebuild,v 1.1.1.1 2005/11/30 09:38:39 chriswhite Exp $
 
 MY_P="AudioCompress-${PV}"
 
 DESCRIPTION="AudioCompress is (essentially) a very gentle, 1-band dynamic range compressor intended to keep audio output at a consistent volume without introducing any audible artifacts."
-SRC_URI="http://trikuare.cx/code/${MY_P}.tar.gz"
 HOMEPAGE="http://trikuare.cx/code/AudioCompress.html"
-IUSE="xmms"
-
-S=${WORKDIR}/${MY_P}
+SRC_URI="http://trikuare.cx/code/${MY_P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+SLOT="0"
+KEYWORDS="x86"
+IUSE="xmms"
 
-DEPEND="xmms? ( media-sound/xmms )"
+DEPEND="xmms? ( media-sound/xmms )
+	media-sound/esound"
+
+S=${WORKDIR}/${MY_P}
 
 src_compile() {
-	if [ -n "`use xmms`" ]; then
-	  emake || die
+	if use xmms; then
+		emake || die
 	else
-	  emake AudioCompress
+		emake AudioCompress || die
 	fi
 }
 
 src_install() {
-    dodir /usr/bin
-	install -m 755 AudioCompress ${D}/usr/bin/ || die
-	if [ -n "`use xmms`" ]; then
-	  installdir="${D}$(xmms-config --effect-plugin-dir)"
-	  install -d ${installdir} || die
-	  install -m 755 libcompress.so ${installdir} || die
+	dobin AudioCompress || die
+	if use xmms; then
+		exeinto "$(xmms-config --effect-plugin-dir)" || die
+		doexe libcompress.so || die
 	fi
-	dodoc COPYING ChangeLog README TODO
+	dodoc ChangeLog README TODO
 }
diff --git a/media-sound/audiotag/ChangeLog b/media-sound/audiotag/ChangeLog
index 3089a00fd21a..3a477dfaec99 100644
--- a/media-sound/audiotag/ChangeLog
+++ b/media-sound/audiotag/ChangeLog
@@ -1,6 +1,47 @@
 # ChangeLog for media-sound/audiotag
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audiotag/ChangeLog,v 1.1 2004/07/07 21:02:38 fvdpol Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audiotag/ChangeLog,v 1.1.1.1 2005/11/30 09:38:29 chriswhite Exp $
+
+  06 Jun 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  audiotag-0.12.ebuild, audiotag-0.13.ebuild, audiotag-0.14.ebuild:
+  Use vorbis and mp3 USE flags.
+
+*audiotag-0.14 (11 Mar 2005)
+
+  11 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> +audiotag-0.14.ebuild:
+  new upstream release, fixes #79572
+
+  01 Jan 2005; Markus Rothe <corsair@gentoo.org> audiotag-0.13.ebuild:
+  Stable on ppc64
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  audiotag-0.13.ebuild:
+  Stable sparc.
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  audiotag-0.13.ebuild:
+  Added to ~sparc.
+
+  22 Nov 2004; Markus Rothe <corsair@gentoo.org> audiotag-0.13.ebuild:
+  Added ~ppc64 to KEYWORDS, bug #72087
+
+  11 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  audiotag-0.13.ebuild:
+  Stable amd64, x86.
+
+  15 Oct 2004; David Holm <dholm@gentoo.org> audiotag-0.13.ebuild:
+  Added to ~ppc.
+
+*audiotag-0.13 (04 Sep 2004)
+
+  04 Sep 2004; Frank van de Pol <fvdpol@gentoo.org> audiotag-0.12.ebuild,
+  +audiotag-0.13.ebuild:
+  Version bump to 0.13. closes #45884
+
+*audiotag-0.12 (04 Sep 2004)
+
+  04 Sep 2004; Frank van de Pol <fvdpol@gentoo.org> audiotag-0.12.ebuild:
+  Minor cleanup of the ebuild
 
   07 Jul 2004; Frank van de Pol <fvdpol@gentoo.org> :
   New ebuild thanks submitted by Ryan McGuigan <ryan@cardweb.com>. Closes bug
diff --git a/media-sound/audiotag/Manifest b/media-sound/audiotag/Manifest
index bfb554923963..0da405082346 100644
--- a/media-sound/audiotag/Manifest
+++ b/media-sound/audiotag/Manifest
@@ -1,4 +1,18 @@
-MD5 0fcf4a7d4d19e5a8703f2af1f4ac27e2 audiotag-0.12.ebuild 605
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c886da2d09178c0f5627da89e1e846b3 ChangeLog 1553
+MD5 0e5969533962eb89964baf160251adcd audiotag-0.12.ebuild 705
+MD5 b9a4ddb98f53c0c71f0130a81c9a86c1 audiotag-0.13.ebuild 722
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 c802fa17c35b2e8c76a16fb8df1c0b68 ChangeLog 264
+MD5 c53e6e40ae3872d6ecc26014ae39c856 audiotag-0.14.ebuild 726
 MD5 a226e76d5dc4582827fff8bc0f544130 files/digest-audiotag-0.12 64
+MD5 ed2c6c9a7a7d74e9f03f15a3558a03d0 files/digest-audiotag-0.13 64
+MD5 e7bf3e2cef0276efbd35cd77c6c8bcd3 files/digest-audiotag-0.14 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCpNMCArHZZzCEUG0RAgMXAKCGwBrX570SAP8kK0AuufJzTLv+GQCfSofE
+lwbwdPBsIqGkBltKxHUY7iI=
+=jxD3
+-----END PGP SIGNATURE-----
diff --git a/media-sound/audiotag/audiotag-0.12.ebuild b/media-sound/audiotag/audiotag-0.12.ebuild
index 72147de88f37..3d70b4ff02c8 100644
--- a/media-sound/audiotag/audiotag-0.12.ebuild
+++ b/media-sound/audiotag/audiotag-0.12.ebuild
@@ -1,22 +1,23 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audiotag/audiotag-0.12.ebuild,v 1.1 2004/07/07 21:02:38 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audiotag/audiotag-0.12.ebuild,v 1.1.1.1 2005/11/30 09:38:29 chriswhite Exp $
 
-IUSE="flac oggvorbis"
-SLOT="0"
-LICENSE="GPL-2"
 DESCRIPTION="A command-line audio file meta-data tagger. Sets id3 and/or vorbis tags in mp3, ogg, and flac files."
 HOMEPAGE="http://tempestgames.com/ryan/"
-SRC_URI="http://tempestgames.com/ryan/downloads/audiotag-0.12.tar.gz"
+SRC_URI="http://tempestgames.com/ryan/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~x86 ~amd64"
+IUSE="flac vorbis mp3"
 
 DEPEND="dev-lang/perl"
 RDEPEND="flac? ( media-libs/flac )
-	oggvorbis? ( media-sound/vorbis-tools )
-	media-libs/id3lib"
+	 vorbis? ( media-sound/vorbis-tools )
+	 mp3? ( media-libs/id3lib )"
 
 src_install() {
 	dobin audiotag
-	dodoc README COPYING ChangeLog
+	dodoc README ChangeLog
 }
 
diff --git a/media-sound/audiotag/audiotag-0.13.ebuild b/media-sound/audiotag/audiotag-0.13.ebuild
index 90740f35d282..440b9f87804f 100644
--- a/media-sound/audiotag/audiotag-0.13.ebuild
+++ b/media-sound/audiotag/audiotag-0.13.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/media-sound/audiotag/audiotag-0.13.ebuild,v 1.1 2004/09/04 20:28:36 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audiotag/audiotag-0.13.ebuild,v 1.1.1.1 2005/11/30 09:38:29 chriswhite Exp $
+
+IUSE="flac vorbis mp3"
 
 DESCRIPTION="A command-line audio file meta-data tagger. Sets id3 and/or vorbis tags in mp3, ogg, and flac files."
 HOMEPAGE="http://tempestgames.com/ryan/"
@@ -8,13 +10,13 @@ SRC_URI="http://tempestgames.com/ryan/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="flac oggvorbis"
+KEYWORDS="amd64 ~ppc ppc64 sparc x86"
 
 DEPEND="dev-lang/perl"
+
 RDEPEND="flac? ( media-libs/flac )
-	oggvorbis? ( media-sound/vorbis-tools )
-	media-libs/id3lib"
+	 vorbis? ( media-sound/vorbis-tools )
+	 mp3? ( media-libs/id3lib )"
 
 src_install() {
 	dobin audiotag
diff --git a/media-sound/audiotag/audiotag-0.14.ebuild b/media-sound/audiotag/audiotag-0.14.ebuild
index da503fa106b4..96a210b8db5c 100644
--- a/media-sound/audiotag/audiotag-0.14.ebuild
+++ b/media-sound/audiotag/audiotag-0.14.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/media-sound/audiotag/audiotag-0.14.ebuild,v 1.1 2005/03/11 22:08:31 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audiotag/audiotag-0.14.ebuild,v 1.1.1.1 2005/11/30 09:38:29 chriswhite Exp $
 
-IUSE="flac oggvorbis"
+IUSE="flac vorbis mp3"
 
 DESCRIPTION="A command-line audio file meta-data tagger. Sets id3 and/or vorbis tags in mp3, ogg, and flac files."
 HOMEPAGE="http://tempestgames.com/ryan/"
@@ -15,8 +15,8 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 DEPEND="dev-lang/perl"
 
 RDEPEND="flac? ( media-libs/flac )
-	oggvorbis? ( media-sound/vorbis-tools )
-	media-libs/id3lib"
+	 vorbis? ( media-sound/vorbis-tools )
+	 mp3? ( media-libs/id3lib )"
 
 src_install() {
 	dobin audiotag
diff --git a/media-sound/aumix/ChangeLog b/media-sound/aumix/ChangeLog
index 02b013cb8d9a..02f4480715c9 100644
--- a/media-sound/aumix/ChangeLog
+++ b/media-sound/aumix/ChangeLog
@@ -1,11 +1,166 @@
 # ChangeLog for media-sound/aumix
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aumix/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/media-sound/aumix/ChangeLog,v 1.1.1.1 2005/11/30 09:38:02 chriswhite Exp $
+
+  07 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org> files/aumix.rc6:
+  Updated init script to work with sparc audio. Closes bug #84412 thanks to
+  Peter Schloemer <dapete@dapete.de>.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org> aumix-2.8-r2.ebuild:
+  Stable on ppc64
+
+  11 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> aumix-2.8-r2.ebuild:
+  Stable on alpha.
+
+  10 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  files/aumix-2.8-nls.patch:
+  Prevent auto* from rerunning... closes bug #70379.
+
+  08 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -aumix-2.7-r4.ebuild, -aumix-2.8.ebuild:
+  Removing old versions.
+
+  08 Nov 2004; Hardave Riar <hardave@gentoo.org> aumix-2.8-r2.ebuild:
+  Stable on mips, bug #69587.
+
+  01 Nov 2004; Markus Rothe <corsair@gentoo.org>
+
+  aumix-2.8-r2.ebuild:
+  Marked ~ppc64; bug #64627
+
+  31 Oct 2004; Michael Hanselmann <hansmi@gentoo.org> aumix-2.8-r2.ebuild:
+  Stable on ppc.
+
+  31 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> files/aumix.rc6:
+  Fixed depend()
+
+  31 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/aumix-2.8-nls.patch:
+  Only installing .desktop file to applications dir. Fixed building with -nls
+  to close bug #58897.
+
+  15 Oct 2004; David Holm <dholm@gentoo.org> aumix-2.8-r2.ebuild:
+  Added to ~ppc.
+
+  06 Oct 2004; Guy Martin <gmsoft@gentoo.org> aumix-2.8-r2.ebuild:
+  Stable on hppa.
+
+  03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> aumix-2.8-r2.ebuild:
+  Stable amd64, sparc, x86.
+
+  29 Aug 2004; Jeremy Huddleston <eradicator@gentoo.org> files/aumix.rc6:
+  Added 'usr hotplug' to init script for bug #62091.
+
+  23 Jul 2004; Seemant Kulleen <seemant@gentoo.org> aumix-2.8-r2.ebuild:
+  add nls check in the configure -- no nls now = no .mofiles being installed
+
+  22 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/aumix-2.8-close-dialogs.patch, +files/aumix-2.8-save_load.patch:
+  Added aumix-2.8-close-dialogs.patch aumix-2.8-save_load.patch from upstream.
+
+*aumix-2.8-r2 (22 Jul 2004)
+
+  22 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/aumix-2.8-nohome.patch, +aumix-2.8-r2.ebuild:
+  Fix aumix segfaulting when env(HOME) is not defined. Thanks to Collins Richey
+  <erichey2@comcast.net>. Closes bug #57291
+
+  13 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> aumix-2.8-r1.ebuild:
+  Stable on alpha.
+
+  10 Jun 2004; Guy Martin <gmsoft@gentoo.org> aumix-2.8-r1.ebuild:
+  Marked stable on hppa.
+
+  06 Jun 2004; Jason Wever <weeve@gentoo.org> aumix-2.8-r1.ebuild:
+  Sparc me like a hurricane.
+
+  30 May 2004; Jeremy Huddleston <eradicator@gentoo.org> aumix-2.8-r1.ebuild:
+  Stable x86.
+
+  28 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> aumix-2.8-r1.ebuild:
+  Removed gnome form IUSE.
+
+  26 Apr 2004; Stephen P. Becker <geoman@gentoo.org> aumix-2.8-r1.ebuild,
+  aumix-2.8.ebuild:
+  2.8 stable on mips, ~mips keyword added to 2.8-r1
+
+  25 Apr 2004; Aron Griffis <agriffis@gentoo.org> aumix-2.7-r4.ebuild:
+  Add die following econf for bug 48950
+
+*aumix-2.8-r1 (18 Apr 2004)
+
+  18 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> aumix-2.8-r1.ebuild:
+  USE flag support fixed for bug #48101.
+
+  02 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> aumix-2.8.ebuild:
+  Removed alsa IUSE.  Fixed myconf.  Closes bug #46475.
+
+  22 Feb 2004; Aron Griffis <agriffis@gentoo.org> aumix-2.8.ebuild:
+  stable on alpha and ia64
+
+  23 Feb 2004; Seemant Kulleen <seemant@gentoo.org> files/aumix.rc6:
+  grammar fix in the initscript
+
+  26 Jan 2004; <gustavoz@gentoo.org> aumix-2.8.ebuild:
+  stable on sparc
+
+  24 Jan 2004; Brad House <brad_mssw@gentoo.org> aumix-2.8.ebuild:
+  stable on amd64
+
+  10 Jan 2004; Jason Wever <weeve@gentoo.org> aumix-2.8.ebuild:
+  Added ~sparc keyword.
+
+  09 Dec 2003; Seemant Kulleen <seemant@gentoo.org> aumix-2.7-r4.ebuild,
+  aumix-2.8.ebuild:
+  fix gtk/gtk2 issue so that it compiles gtk1 interface if -gtk in USE. Thanks
+  to: Will Richey <w-gentoo@mulm.org> in bug #35444
+
+  18 May 2003; Seemant Kulleen <seemant@gentoo.org> files/aumix.rc6:
+  Added support for OSS detection in the initscript. Thanks to: Jarkko
+  Haapalainen <dragon@opp.ysao.fi> in bug #20691
+
+*aumix-2.8 (16 Dec 2002)
+
+  04 Nov 2003; Joshua Kinard <kumba@gentoo.org> aumix-2.8.ebuild:
+  Added ~mips to KEYWORDS
+
+  04 Aug 2003; Guy Martin <gmsoft@gentoo.org> aumix-2.8.ebuild :
+  Added hppa to KEYWORDS.
+
+  16 Dec 2002; Seemant Kulleen <seemant@gentoo.org> aumix-2.8.ebuild
+  files/digest-aumix-2.8 :
+
+  New version which can use either/both gtk versions.  Ebuild by:
+  cardoe@cardoe.com (Doug Goldstein) in bug #12287
+
+*aumix-2.7-r4 (21 May 2002)
+
+  20 Jun 2003; Guy Martin <gmsoft@gento.org> aumix-2.7-r4.ebuild :
+  Added hppa to KEYWORDS.
+
+  16 Dec 2002; Seemant Kulleen <seemant@gentoo.org> aumix-2.7-r4.ebuild :
+
+  Fixed the myconf stuff.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  15 Dec 2002; Bjoern Brauel <bjb@gentoo.org> aumix-2.7-r4.ebuild :
+  unmask on alpha
+
+  18 Sep 2002; Owen Stampflee <owen@gentoo.org> :
+  Added PPC to KEYWORDS.
+
+  16 Sep 2002; Maarten Thibaut <murphy@gentoo.org> aumix-2.7-r4.ebuild : Added
+  sparc/sparc64 keywords
+
+  21 May 2002; Martin Schlemmer <azarah@gentoo.org> : Resolve bug #2777.
 
 *aumix-2.7-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
diff --git a/media-sound/aumix/Manifest b/media-sound/aumix/Manifest
index ab81acdd1bce..fd212ea12782 100644
--- a/media-sound/aumix/Manifest
+++ b/media-sound/aumix/Manifest
@@ -1,7 +1,20 @@
-MD5 05bd9079fa86b4b9855b02ceea41b7e5 aumix-2.8.ebuild 1372
-MD5 48ef5c0b9712085a65e1bd23ba88a977 aumix-2.7-r4.ebuild 1240
-MD5 8300b217b6ed2b55c13908202907962b ChangeLog 1660
-MD5 857a1fe260905ab09b7befd877affafd files/digest-aumix-2.8 62
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 cb709e469cc3b60af59e1a8ffa21a8b8 ChangeLog 5981
+MD5 92391e16e18a77102b7975e5dc1ce49d aumix-2.8-r2.ebuild 1848
+MD5 00da88dc336799f1385f518dd005dd5a files/aumix-2.8-close-dialogs.patch 613
+MD5 a685fd4f0649bfb0c7fd4860eda0caa7 files/aumix-2.8-nls.patch 829
+MD5 6c8d691beb495257d8309e58c127acd2 files/aumix-2.8-nohome.patch 529
+MD5 221509621be1606c1a61dfc8fcd4991e files/aumix-2.8-save_load.patch 1331
 MD5 f39abfbf49ff4a33e109eeb14a4325c2 files/aumix.desktop 124
-MD5 a5a819c8a63eb3433b5532ba487a888a files/aumix.rc6 1138
-MD5 e4d29edb4b7c339ca310738a7e9dd174 files/digest-aumix-2.7-r4 61
+MD5 1ddf032a74e8441c64775370c1b446bd files/aumix.rc6 1155
+MD5 857a1fe260905ab09b7befd877affafd files/digest-aumix-2.8-r2 62
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDcO0BOpjtAl+gMRURAuO9AJ4x63qBZb6NmvMZw5yeUVSsNgcm7QCgnqc+
+1gmltxYQc41LjbdOBpeW5Bw=
+=Iver
+-----END PGP SIGNATURE-----
diff --git a/media-sound/aumix/aumix-2.8-r2.ebuild b/media-sound/aumix/aumix-2.8-r2.ebuild
index 4467d0763ac2..c69e237b8e16 100644
--- a/media-sound/aumix/aumix-2.8-r2.ebuild
+++ b/media-sound/aumix/aumix-2.8-r2.ebuild
@@ -1,32 +1,42 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aumix/aumix-2.8-r2.ebuild,v 1.1 2004/07/22 08:31:24 eradicator Exp $
-
-IUSE="gtk gtk2 gpm nls"
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aumix/aumix-2.8-r2.ebuild,v 1.1.1.1 2005/11/30 09:38:02 chriswhite Exp $
 
 inherit eutils
 
-DESCRIPTION="Aumix volume/mixer control program."
-SRC_URI="http://jpj.net/~trevor/aumix/${P}.tar.bz2"
+DESCRIPTION="Aumix volume/mixer control program"
 HOMEPAGE="http://jpj.net/~trevor/aumix/"
+SRC_URI="http://jpj.net/~trevor/aumix/${P}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~hppa ~amd64 ~sparc ~alpha ~ia64 ~mips"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
+IUSE="gtk gtk2 gpm nls"
 
 #alsa support is broken in 2.8	alsa? ( >=media-libs/alsa-lib-0.9.0_rc1 )
-DEPEND=">=sys-libs/ncurses-5.2
-	gpm?  ( >=sys-libs/gpm-1.19.3 )
-	gtk?  (
-			!gtk2? ( =x11-libs/gtk+-1.2* )
-			gtk2? ( >=x11-libs/gtk+-2.0.0 )
-	)
+RDEPEND=">=sys-libs/ncurses-5.2
+	gpm? ( >=sys-libs/gpm-1.19.3 )
+	gtk? ( !gtk2? ( =x11-libs/gtk+-1.2* )
+	       gtk2? ( >=x11-libs/gtk+-2.0.0 ) )"
+
+DEPEND="${RDEPEND}
+	>=sys-apps/portage-2.0.51
+	sys-apps/findutils
 	nls? ( sys-devel/gettext )"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${P}-nohome.patch
+	epatch ${FILESDIR}/${P}-close-dialogs.patch
+	epatch ${FILESDIR}/${P}-save_load.patch
+	epatch ${FILESDIR}/${P}-nls.patch
+
+	# Prevent auto* from rerunning... bug #70379
+	touch aclocal.m4
+	find . -name Makefile.in -exec touch {} \;
+	find . -name stamp-h.in -exec touch {} \;
+	touch configure
 }
 
 src_compile() {
@@ -47,24 +57,22 @@ src_compile() {
 		myconf="${myconf} --without-gpm"
 	fi
 
-	econf ${myconf} || die
+	econf \
+		`use_enable nls` \
+		${myconf} || die
 	emake || die "make failed"
 }
 
 src_install() {
 	einstall
 
-	dodoc AUTHORS BUGS COPYING ChangeLog NEWS README TODO
+	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
 
-	insinto /usr/share/gnome/apps/Multimedia
-	doins ${FILESDIR}/aumix.desktop
-	insinto /usr/share/applnk/Multimedia
-	doins ${FILESDIR}/aumix.desktop
 	insinto /usr/share/applications
 	doins ${FILESDIR}/aumix.desktop
 
 	dodir /usr/share/pixmaps
 	ln -s ../aumix/aumix.xpm ${D}/usr/share/pixmaps
 
-	exeinto /etc/init.d ; newexe ${FILESDIR}/aumix.rc6 aumix
+	newinitd ${FILESDIR}/aumix.rc6 aumix
 }
diff --git a/media-sound/aumix/files/aumix-2.8-nls.patch b/media-sound/aumix/files/aumix-2.8-nls.patch
index 3243d48409f3..7c79d9ebd6b3 100644
--- a/media-sound/aumix/files/aumix-2.8-nls.patch
+++ b/media-sound/aumix/files/aumix-2.8-nls.patch
@@ -1,6 +1,6 @@
 diff -Naur aumix-2.8.orig/configure aumix-2.8/configure
 --- aumix-2.8.orig/configure	2002-11-24 17:35:48.000000000 -0800
-+++ aumix-2.8/configure	2004-10-31 02:11:40.038574588 -0800
++++ aumix-2.8/configure	2002-11-24 17:35:48.000000000 -0800
 @@ -3801,10 +3801,6 @@
  USE_INCLUDED_LIBINTL=no
  
@@ -14,7 +14,7 @@ diff -Naur aumix-2.8.orig/configure aumix-2.8/configure
  # This file is a shell script that caches the results of configure
 diff -Naur aumix-2.8.orig/configure.in aumix-2.8/configure.in
 --- aumix-2.8.orig/configure.in	2002-11-24 17:04:16.000000000 -0800
-+++ aumix-2.8/configure.in	2004-10-31 02:11:09.622964264 -0800
++++ aumix-2.8/configure.in	2002-11-24 17:04:16.000000000 -0800
 @@ -240,9 +240,6 @@
  USE_INCLUDED_LIBINTL=no
  AC_SUBST(USE_INCLUDED_LIBINTL)
diff --git a/media-sound/aumix/files/aumix.rc6 b/media-sound/aumix/files/aumix.rc6
index 142c52dacb33..e4cfd79fe2ed 100644
--- a/media-sound/aumix/files/aumix.rc6
+++ b/media-sound/aumix/files/aumix.rc6
@@ -1,25 +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/media-sound/aumix/files/aumix.rc6,v 1.1 2001/12/23 23:01:00 azarah Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aumix/files/aumix.rc6,v 1.1.1.1 2005/11/30 09:38:02 chriswhite Exp $
 
 depend() {
-	# User could have some wierd setup that uses /etc/init.d/local ?
-	need modules local
-	use alsa
+	use modules hotplug coldplug alsasound
 }
 
 checkconfig() {
-	if [ -z "`grep 'sound' /proc/devices`" ] && [ ! -d /proc/asound ]
-	then
+	if ! grep -q -E 'sound|OSS|sparcaudio' /proc/devices && [[ ! -d /proc/asound ]] ; then
 		eerror "Sound support has not been compiled into the kernel,"
 		eerror "or is disabled.  Please check that the correct modules"
 		eerror "is loaded."
 		return 1
 	fi
 	# /dev/mixer can be a symlink
-	if [ ! -e /dev/mixer ] ; then
-		eerror "/dev/mixer do not exist, please create it, or load the"
+	if [[ ! -e /dev/mixer ]] ; then
+		eerror "/dev/mixer does not exist, please create it, or load the"
 		eerror "correct modules to enable your card's mixer"
 		return 1
 	fi
@@ -27,7 +24,7 @@ checkconfig() {
 
 start() {
 	checkconfig || return 1
-	if [ -f /etc/aumixrc ] ; then
+	if [[ -f /etc/aumixrc ]] ; then
 		ebegin "Loading Mixer settings"
 		/usr/bin/aumix -f /etc/aumixrc -L >/dev/null 2>&1
 	else
diff --git a/media-sound/awesfx/ChangeLog b/media-sound/awesfx/ChangeLog
index 512a82f16e0f..e8390373b2d7 100644
--- a/media-sound/awesfx/ChangeLog
+++ b/media-sound/awesfx/ChangeLog
@@ -1,6 +1,59 @@
 # ChangeLog for media-sound/awesfx
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/awesfx/ChangeLog,v 1.1 2002/05/22 11:46:45 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/awesfx/ChangeLog,v 1.1.1.1 2005/11/30 09:37:49 chriswhite Exp $
+
+  19 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> awesfx-0.5.0c.ebuild,
+  awesfx-0.5.0d.ebuild:
+  Don't try to link to libdl unconditionally, use dlopen_lib from portability
+  eclass.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  awesfx-0.5.0d.ebuild:
+  Stable amd64, sparc, x86.
+
+*awesfx-0.5.0d (08 Dec 2004)
+
+  08 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -awesfx-0.4.4.ebuild, -awesfx-0.5.0b.ebuild, awesfx-0.5.0c.ebuild,
+  +awesfx-0.5.0d.ebuild:
+  Version bump.  Added to ~sparc.  Removing old versions.
+
+  14 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  awesfx-0.4.4.ebuild:
+  Using toolchain-funcs eclass.
+
+  03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> awesfx-0.5.0c.ebuild:
+  Stable amd64, x86.
+
+  22 Jul 2004; David Holm <dholm@gentoo.org> awesfx-0.5.0c.ebuild:
+  Added to ~ppc.
+
+*awesfx-0.5.0c (21 Jul 2004)
+
+  21 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +awesfx-0.5.0c.ebuild:
+  Version bump closes bug #57503.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> awesfx-0.4.4.ebuild,
+  awesfx-0.5.0b.ebuild:
+  virtual/glibc -> virtual/libc
+
+  08 Jun 2004; Nick Hadaway <raker@gentoo.org> awesfx-0.5.0b.ebuild :
+  Added ~amd64 to keywords.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> awesfx-0.4.4.ebuild:
+  Added IUSE.
+
+  08 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> awesfx-0.5.0b.ebuild:
+  Stable x86.
+
+  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> awesfx-0.4.4.ebuild:
+  Removed explicit S=
+
+*awesfx-0.5.0b (28 Feb 2004)
+
+  28 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> awesfx-0.5.0b.ebuild:
+  Version bump.  Closes bug #39743.
 
 *awesfx-0.4.4 (22 May 2002)
 
diff --git a/media-sound/awesfx/Manifest b/media-sound/awesfx/Manifest
index e69de29bb2d1..4e3fc80cefa3 100644
--- a/media-sound/awesfx/Manifest
+++ b/media-sound/awesfx/Manifest
@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a74d0ace4a10bb444f1c0a2972e96a7f awesfx-0.5.0c.ebuild 1275
+MD5 6a3801726b0073f12ab43ff0af1c80be ChangeLog 2119
+MD5 5f3d314fe7cc4940884de1dd700d27f9 awesfx-0.5.0d.ebuild 1274
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 413587b49e630a9b899620cc979a5a5d files/digest-awesfx-0.5.0c 65
+MD5 a2f1d07a053240ebc621d1834c928e6f files/awesfx-0.5.0b-makefile-noalsa.patch 3507
+MD5 f2718083317de4e006954291d3da6f4e files/awesfx-0.5.0b-configure-noalsa.patch 7814
+MD5 a1f68aeea912a0dfbc5ed004d02b2bda files/digest-awesfx-0.5.0d 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDLgBuj5H05b2HAEkRArP3AJ9RPi6Q6SjAJqt8hyXt2QqFycaJ+QCeNHGw
+oDsrpaA5awm46NtERsCM1eI=
+=QgKm
+-----END PGP SIGNATURE-----
diff --git a/media-sound/awesfx/awesfx-0.5.0c.ebuild b/media-sound/awesfx/awesfx-0.5.0c.ebuild
index 5f05823dc351..a02703b32d74 100644
--- a/media-sound/awesfx/awesfx-0.5.0c.ebuild
+++ b/media-sound/awesfx/awesfx-0.5.0c.ebuild
@@ -1,29 +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/media-sound/awesfx/awesfx-0.5.0c.ebuild,v 1.1 2004/07/21 19:55:23 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/awesfx/awesfx-0.5.0c.ebuild,v 1.1.1.1 2005/11/30 09:37:49 chriswhite Exp $
 
 IUSE="alsa"
 
-inherit eutils
+inherit eutils portability
 
 DESCRIPTION="AWE Utilities - sfxload"
 HOMEPAGE="http://www.alsa-project.org/~iwai/awedrv.html#Utils"
 SRC_URI=http://www.alsa-project.org/~iwai/${P}.tar.gz
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+
 DEPEND="virtual/libc
 	alsa? ( >=media-libs/alsa-lib-1.0.0 )"
 
+BANK_LOC="/usr/share/sounds/sf2"
+
 src_compile() {
 	if ! use alsa; then
 		einfo "Removing ALSA support!"
 		epatch ${FILESDIR}/${PN}-0.5.0b-configure-noalsa.patch
-		econf --with-sfpath=/usr/share/sfbank || die
+		econf --with-sfpath=${BANK_LOC} || die
 		epatch ${FILESDIR}/${PN}-0.5.0b-makefile-noalsa.patch
-		sed -i -e 's/'^LIBS.*-lasound.*$'/LIBS = -lm -ldl -lpthread/' Makefile
+		sed -i -e 's/'^LIBS.*-lasound.*$'/LIBS = -lm $(dlopen_lib) -lpthread/' Makefile
 	else
-		econf --with-sfpath=/usr/share/sfbank || die
+		econf --with-sfpath=${BANK_LOC} || die
 	fi
 
 	emake || die
@@ -31,12 +35,12 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog INSTALL README SBKtoSF2.txt
+	dodoc AUTHORS ChangeLog README SBKtoSF2.txt
+	dodoc ${D}/usr/share/sounds/sf2/README-bank
+	rm ${D}/usr/share/sounds/sf2/README-bank
 }
 
 pkg_postinst() {
 	einfo "Please copy your SoundFont files from the original CD-ROM"
-	einfo "shipped with your soundcard to"
-	einfo "/usr/share/sfbank"
+	einfo "shipped with your soundcard to ${BANK_LOC}"
 }
-
diff --git a/media-sound/awesfx/awesfx-0.5.0d.ebuild b/media-sound/awesfx/awesfx-0.5.0d.ebuild
index 204e5f13ebd1..fae9e27c06d6 100644
--- a/media-sound/awesfx/awesfx-0.5.0d.ebuild
+++ b/media-sound/awesfx/awesfx-0.5.0d.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/media-sound/awesfx/awesfx-0.5.0d.ebuild,v 1.1 2004/12/08 12:05:53 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/awesfx/awesfx-0.5.0d.ebuild,v 1.1.1.1 2005/11/30 09:37:49 chriswhite Exp $
 
 IUSE="alsa"
 
-inherit eutils
+inherit eutils portability
 
 DESCRIPTION="AWE Utilities - sfxload"
 HOMEPAGE="http://www.alsa-project.org/~iwai/awedrv.html#Utils"
@@ -12,7 +12,7 @@ SRC_URI=http://www.alsa-project.org/~iwai/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 
 DEPEND="virtual/libc
 	alsa? ( >=media-libs/alsa-lib-1.0.0 )"
@@ -25,7 +25,7 @@ src_compile() {
 		epatch ${FILESDIR}/${PN}-0.5.0b-configure-noalsa.patch
 		econf --with-sfpath=${BANK_LOC} || die
 		epatch ${FILESDIR}/${PN}-0.5.0b-makefile-noalsa.patch
-		sed -i -e 's/'^LIBS.*-lasound.*$'/LIBS = -lm -ldl -lpthread/' Makefile
+		sed -i -e 's/'^LIBS.*-lasound.*$'/LIBS = -lm $(dlopen_lib) -lpthread/' Makefile
 	else
 		econf --with-sfpath=${BANK_LOC} || die
 	fi
diff --git a/media-sound/aylet/ChangeLog b/media-sound/aylet/ChangeLog
index 3e941dd4cd17..d4ebe80b46d1 100644
--- a/media-sound/aylet/ChangeLog
+++ b/media-sound/aylet/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for media-sound/aylet
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aylet/ChangeLog,v 1.1 2004/04/03 11:12:06 eradicator Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aylet/ChangeLog,v 1.1.1.1 2005/11/30 09:38:35 chriswhite Exp $
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> aylet-0.3.ebuild:
+  Stable amd64, sparc.
+
+  05 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> aylet-0.3.ebuild:
+  ~amd64 ~sparc
+
+  06 May 2004; Jeremy Huddleston <eradicator@gentoo.org> aylet-0.3.ebuild:
+  Stable x86.
+
+  04 Apr 2004; David Holm <dholm@gentoo.org> aylet-0.3.ebuild:
+  Added to ~ppc.
 
 *aylet-0.3 (03 Apr 2004)
 
diff --git a/media-sound/aylet/Manifest b/media-sound/aylet/Manifest
index 927ea6ae4f46..e040eaefce6c 100644
--- a/media-sound/aylet/Manifest
+++ b/media-sound/aylet/Manifest
@@ -1,2 +1,4 @@
-MD5 d87ba42769f7e0ad1ff90a934dfa4420 aylet-0.3.ebuild 701
+MD5 cd98817379a05b1b06c2ce19f25adf09 ChangeLog 771
+MD5 2d9292181cf5692e42f553073a23dcd0 aylet-0.3.ebuild 861
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 2c462fe69672cb9029e08e2cb3729351 files/digest-aylet-0.3 60
diff --git a/media-sound/aylet/aylet-0.3.ebuild b/media-sound/aylet/aylet-0.3.ebuild
index 25554da52173..1d88c8cd5f50 100644
--- a/media-sound/aylet/aylet-0.3.ebuild
+++ b/media-sound/aylet/aylet-0.3.ebuild
@@ -1,13 +1,13 @@
-# 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/media-sound/aylet/aylet-0.3.ebuild,v 1.1 2004/04/03 11:12:06 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aylet/aylet-0.3.ebuild,v 1.1.1.1 2005/11/30 09:38:36 chriswhite Exp $
 
 DESCRIPTION="Aylet plays music files in the .ay format"
 HOMEPAGE="http://rus.members.beeb.net/aylet.html"
 SRC_URI="ftp://ftp.ibiblio.org/pub/Linux/apps/sound/players/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc amd64 sparc"
 IUSE="gtk"
 
 DEPEND="sys-libs/ncurses
diff --git a/media-sound/beast-data/ChangeLog b/media-sound/beast-data/ChangeLog
index 77e7df726c6e..a8a9fcb60174 100644
--- a/media-sound/beast-data/ChangeLog
+++ b/media-sound/beast-data/ChangeLog
@@ -1,9 +1,25 @@
 # ChangeLog for media-sound/beast-data
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/beast-data/ChangeLog,v 1.1 2002/11/02 04:51:36 agenkin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beast-data/ChangeLog,v 1.1.1.1 2005/11/30 09:38:27 chriswhite Exp $
+
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> beast-data-0.3.ebuild:
+  Don't install COPYING and INSTALL files.
+
+  06 Jul 2005; Herbie Hopkins <herbs@gentoo.org> beast-data-0.3.ebuild:
+  Marked ~amd64 wrt bug #93673.
+
+  03 Aug 2004; David Holm <dholm@gentoo.org> beast-data-0.3.ebuild:
+  Added to ~ppc.
+
+  26 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  beast-data-0.3.ebuild:
+  Ebuild cleanup.
 
 *beast-data-0.3 (01 Nov 2002)
 
+  03 Mar 2003; <vladimir@gentoo.org> beast-data-0.3.ebuild:
+  Fixed minor problem in KEYWORDS
+
   01 Nov 2002; Arcady Genkin <agenkin@gentoo.org> beast-data-0.3.ebuild :
 
   Initial version, submitted by Rigo Ketelings <rigo@home.nl>.
diff --git a/media-sound/beast-data/Manifest b/media-sound/beast-data/Manifest
index e69de29bb2d1..64d76ecf5676 100644
--- a/media-sound/beast-data/Manifest
+++ b/media-sound/beast-data/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8663d2503bc4be3773ecc458ffd41716 ChangeLog 896
+MD5 cb80e7ce669939273755d34ee289bdbf beast-data-0.3.ebuild 567
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 106b042e6e015f0dcb795dc74d5dc797 files/digest-beast-data-0.3 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGtLQj5H05b2HAEkRAtDtAJ4rBwaO3qur8XH9Ub7MWOl8ba72/gCgoKdn
+AQ7x8YE/vnTjOFtjjl3+Y08=
+=LJmK
+-----END PGP SIGNATURE-----
diff --git a/media-sound/beast-data/beast-data-0.3.ebuild b/media-sound/beast-data/beast-data-0.3.ebuild
index 20331d42f479..e00a2a153210 100644
--- a/media-sound/beast-data/beast-data-0.3.ebuild
+++ b/media-sound/beast-data/beast-data-0.3.ebuild
@@ -1,28 +1,21 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# /space/gentoo/cvsroot/gentoo-x86/skel.ebuild,v 1.8 2002/05/30 01:54:49 sandymac Exp
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beast-data/beast-data-0.3.ebuild,v 1.1.1.1 2005/11/30 09:38:27 chriswhite Exp $
 
 DESCRIPTION="BEAST - the Bedevilled Sound Engine (datafiles)"
 HOMEPAGE="http://beast.gtk.org"
-LICENSE="GPL"
+LICENSE="GPL-2"
 
 DEPEND=">=media-sound/beast-0.4.1"
 
 SRC_URI="ftp://beast.gtk.org/pub/beast/v0.3/${P}.tar.gz"
-KEYWORDS='x86'
-SLOT="0"
-S=${WORKDIR}/${P}
+KEYWORDS="~amd64 ~ppc ~x86"
 
-src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
-	emake || die
-}
+IUSE=""
+
+SLOT="0"
 
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYING INSTALL NEWS README TODO
+	dodoc AUTHORS NEWS README TODO
 }
diff --git a/media-sound/beast/ChangeLog b/media-sound/beast/ChangeLog
index 4011dcd000a3..d2d361d93a96 100644
--- a/media-sound/beast/ChangeLog
+++ b/media-sound/beast/ChangeLog
@@ -1,9 +1,91 @@
 # ChangeLog for media-sound/beast
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/beast/ChangeLog,v 1.1 2002/11/02 04:51:55 agenkin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beast/ChangeLog,v 1.1.1.1 2005/11/30 09:38:36 chriswhite Exp $
+
+  07 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> beast-0.6.4.ebuild,
+  beast-0.6.5.ebuild, beast-0.6.6.ebuild:
+  Don't assume GNU ld (with configure at least).
+
+*beast-0.6.6 (20 Sep 2005)
+
+  20 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> +beast-0.6.6.ebuild:
+  Version bump for bug 95623. Thanks to Francesco Tamagni <minchiahead at
+  hacari dot org>.
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> beast-0.6.4.ebuild:
+  Stable on ppc.
+
+*beast-0.6.5 (13 Apr 2005)
+
+  13 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -files/beast-0.6.0-docs.patch, -files/docs-reorg-0.5.4.patch,
+  -beast-0.5.4.ebuild, -beast-0.6.0.ebuild, -beast-0.6.2.ebuild,
+  beast-0.6.4.ebuild, +beast-0.6.5.ebuild:
+  new upstream version, fixes #88979. also added ~amd64 to KEYWORDS and did some
+  cleanup, marked 0.6.4 stable on x86.
+
+*beast-0.6.4 (18 Feb 2005)
+
+  18 Feb 2005; Tony Vroon <chainsaw@gentoo.org> +beast-0.6.4.ebuild:
+  Version bump to 0.6.4; closes bug #63027.
+
+  03 Aug 2004; David Holm <dholm@gentoo.org> beast-0.6.2.ebuild:
+  Added to ~ppc.
+
+*beast-0.6.2 (31 Jul 2004)
+
+  31 Jul 2004; Chris White <chriswhite@gentoo.org> +beast-0.6.2.ebuild:
+  Version bump to 0.6.2 per request in Bug #58873. Thanks to alec zorab for
+  reporting.
+
+  03 May 2004; Jeremy Huddleston <eradicator@gentoo.org> beast-0.5.4.ebuild,
+  beast-0.6.0.ebuild:
+  Changing mad dep to madplay.
+
+  22 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> beast-0.5.4.ebuild,
+  beast-0.6.0.ebuild:
+  Inherit eutils.
+
+*beast-0.6.0 (15 Feb 2004)
+
+  15 Feb 2004; Alastair Tse <liquidx@gentoo.org> beast-0.5.3.ebuild,
+  beast-0.6.0.ebuild, files/beast-0.6.0-docs.patch:
+  version bump. note that beast is continually in development release status.
+
+*beast-0.5.4 (26 Jul 2003)
+
+  26 Jul 2003; Nick Hadaway <raker@gentoo.org> beast-0.5.4.ebuild,
+  files/docs-reorg-0.5.4 patch:
+  Version bump.  Upstream fixes include bug fixes, a gui pretty-up,
+  and some other feature adds like a synthetic drum generator.
+  Added mad, debug, and static to USE.  Other ebuild cleanups.
+
+  19 Jul 2003; Nick Hadaway <raker@gentoo.org>:
+  Reverted back to 0.5.3
+
+*beast-0.5.3-r1 (17 Jul 2003)
+
+  17 Jul 2003; Nick Hadaway <raker@gentoo.org> beast-0.5.3-r1.ebuild:
+  Changed to media-libs/{libmad,libid3tag} from media-sound/mad
+
+*beast-0.5.3 (29 Jun 2003)
+
+  29 Jun 2003; Alastair Tse <liquidx@gentoo.org> beast-0.5.3.ebuild:
+  new version. upped to guile-1.6
+
+*beast-0.5.1 (27 Apr 2003)
+
+  27 Apr 2003; Alastair Tse <liquidx@gentoo.org> beast-0.5.1.ebuild:
+  version bump
 
 *beast-0.4.1 (01 Nov 2002)
 
+  03 Mar 2003; <vladimir@gentoo.org> beast-0.4.1.ebuild:
+  Changed LICENSE from GPL to GPL-2 LGPL-2.1
+
+  03 Mar 2003; <vladimir@gentoo.org> beast-0.4.1.ebuild:
+  Fixed minor problem in KEYWORDS
+
   01 Nov 2002; Arcady Genkin <agenkin@gentoo.org> beast-0.4.1.ebuild :
 
   Initial version, submitted by Rigo Ketelings <rigo@home.nl>.
diff --git a/media-sound/beast/Manifest b/media-sound/beast/Manifest
index f145aaa6141d..b81bf32b1291 100644
--- a/media-sound/beast/Manifest
+++ b/media-sound/beast/Manifest
@@ -1,5 +1,8 @@
-MD5 440a538c524983e32bab41630a87b99f ChangeLog 688
-MD5 d93ba949d63b72a4a35d6c9661b8e972 beast-0.4.1.ebuild 910
-MD5 2012350a9ef7e1ebb6f687260f82fcb0 beast-0.5.1.ebuild 898
-MD5 8cd691568a4570ed11560f171865a9cf files/digest-beast-0.4.1 64
-MD5 fc1f874c4c36a71ccc5a9cc6d4bef6a4 files/digest-beast-0.5.1 64
+MD5 3a3117eefee7635c632472526f29388d ChangeLog 3093
+MD5 23005388ada2c5bb5b685cfc9f96aa23 beast-0.6.4.ebuild 1076
+MD5 e76478bb21c068b2aa3878832c7ad79c beast-0.6.5.ebuild 1084
+MD5 2da0bf34b348acd11db0cea0d47e033a beast-0.6.6.ebuild 1165
+MD5 0b77b5cbace4f1933b8a5f3fa5375b6f files/digest-beast-0.6.4 64
+MD5 4b4e3a3330b9a7ee302a339373a41a22 files/digest-beast-0.6.5 64
+MD5 e623a662c32981677d9ab1570ebe5c76 files/digest-beast-0.6.6 64
+MD5 b263ff7675308d90b75a170acae3f5ff metadata.xml 177
diff --git a/media-sound/beast/beast-0.6.4.ebuild b/media-sound/beast/beast-0.6.4.ebuild
index 7bcac9b6ecc6..859e449b731f 100644
--- a/media-sound/beast/beast-0.6.4.ebuild
+++ b/media-sound/beast/beast-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/media-sound/beast/beast-0.6.4.ebuild,v 1.1 2005/02/18 21:31:42 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beast/beast-0.6.4.ebuild,v 1.1.1.1 2005/11/30 09:38:36 chriswhite Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://beast.gtk.org"
 SRC_URI="ftp://beast.gtk.org/pub/beast/v${PV%.[0-9]}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc"
 SLOT="0"
 
 RDEPEND=">=dev-libs/glib-2.0
@@ -30,25 +30,17 @@ DEPEND="dev-util/pkgconfig
 	media-libs/ladspa-sdk
 	${RDEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-
 src_compile() {
-	local myconf="--with-gnu-ld"
-
-	use debug || myconf="${myconf} --disable-debug"
-
-	use static || myconf="${myconf} --disable-static"
-
-	econf ${myconf} || die "configure failed"
+	econf ${myconf} \
+		$(use_enable debug) \
+		$(use_enable static) \
+		|| die "configure failed"
 
-	emake || die "configure failed"
+	emake || die "make failed"
 }
 
 src_install() {
 	make DESTDIR=${D} install || die "make install failed"
 
-	dodoc AUTHORS ChangeLog COPYING NEWS README TODO
+	dodoc AUTHORS ChangeLog NEWS README TODO
 }
diff --git a/media-sound/beast/beast-0.6.5.ebuild b/media-sound/beast/beast-0.6.5.ebuild
index 4d0e210b9c2a..62d14d42a101 100644
--- a/media-sound/beast/beast-0.6.5.ebuild
+++ b/media-sound/beast/beast-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/media-sound/beast/beast-0.6.5.ebuild,v 1.1 2005/04/13 20:18:47 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beast/beast-0.6.5.ebuild,v 1.1.1.1 2005/11/30 09:38:36 chriswhite Exp $
 
 inherit eutils
 
@@ -30,8 +30,6 @@ DEPEND="dev-util/pkgconfig
 	${RDEPEND}"
 
 src_compile() {
-	local myconf="--with-gnu-ld"
-
 	econf ${myconf} \
 		$(use_enable debug) \
 		$(use_enable static) \
diff --git a/media-sound/beast/beast-0.6.6.ebuild b/media-sound/beast/beast-0.6.6.ebuild
index 1d039728eff1..aecb27d13a77 100644
--- a/media-sound/beast/beast-0.6.6.ebuild
+++ b/media-sound/beast/beast-0.6.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/media-sound/beast/beast-0.6.6.ebuild,v 1.1 2005/09/20 02:58:39 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beast/beast-0.6.6.ebuild,v 1.1.1.1 2005/11/30 09:38:36 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -33,8 +33,6 @@ src_compile() {
 	# avoid suid related security issues.
 	append-ldflags -Wl,-z,now
 
-	local myconf="--with-gnu-ld"
-
 	econf ${myconf} \
 		$(use_enable debug) \
 		$(use_enable static) \
diff --git a/media-sound/beast/metadata.xml b/media-sound/beast/metadata.xml
index da6fd63d0085..b016c18b5446 100644
--- a/media-sound/beast/metadata.xml
+++ b/media-sound/beast/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
+<herd>sound</herd>
 </pkgmetadata>
diff --git a/media-sound/beep-media-player/ChangeLog b/media-sound/beep-media-player/ChangeLog
index c52bbea6af64..1cc511e530c1 100644
--- a/media-sound/beep-media-player/ChangeLog
+++ b/media-sound/beep-media-player/ChangeLog
@@ -1,6 +1,359 @@
 # ChangeLog for media-sound/beep-media-player
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/beep-media-player/ChangeLog,v 1.1 2003/11/29 22:04:18 hanno Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beep-media-player/ChangeLog,v 1.1.1.1 2005/11/30 09:38:17 chriswhite Exp $
+
+  11 Nov 2005; Michael Hanselmann <hansmi@gentoo.org>
+  beep-media-player-0.9.7-r8.ebuild:
+  Stable on ppc.
+
+  29 Oct 2005; <chainsaw@gentoo.org> beep-media-player-0.9.7.1.ebuild:
+  Use eautoreconf instead of regular autoreconf, as suggested by Diego
+  Pettenò <flameeyes@gentoo.org>. Closes bug #110208.
+
+  26 Oct 2005; Luis Medinas <metalgod@gentoo.org>
+  beep-media-player-0.9.7-r8.ebuild:
+  Marked Stable on amd64.
+
+  25 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  beep-media-player-0.9.7-r8.ebuild:
+  Stable on sparc
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  beep-media-player-0.9.7-r8.ebuild:
+  Stable on x86; bug #110159
+
+  22 Oct 2005; Tony Vroon <chainsaw@gentoo.org>
+  beep-media-player-0.9.7.1.ebuild:
+  USE-flag oggvorbis is deprecated, use vorbis instead. As requested by tove
+  on IRC.
+
+*beep-media-player-0.9.7.1 (22 Oct 2005)
+
+  22 Oct 2005; Tony Vroon <chainsaw@gentoo.org>
+  -files/0.9.7-bigendian.patch, +beep-media-player-0.9.7.1.ebuild:
+  Version bump. Final release from upstream. Deleted obsolete patch. Install
+  gentoo_ice skin, closes bug #109772.
+
+  14 Sep 2005; <chainsaw@gentoo.org> -beep-media-player-0.9.7-r4.ebuild:
+  Remove old ebuild.
+
+  14 Sep 2005; Aron Griffis <agriffis@gentoo.org>
+  beep-media-player-0.9.7-r6.ebuild:
+  Mark 0.9.7-r6 stable on alpha
+
+*beep-media-player-0.9.7-r8 (26 Aug 2005)
+
+  26 Aug 2005; Tony Vroon <chainsaw@gentoo.org>
+  +files/0.9.7-link-gconf.patch, +files/0.9.7-volume-crash.patch,
+  +beep-media-player-0.9.7-r8.ebuild:
+  Revision bump, patch from Mike Lundy <novas007@gmx.net> closes bug #103825.
+  Linking fix from azarah. ipv6 patch is back.
+
+  24 Aug 2005; Aron Griffis <agriffis@gentoo.org>
+  beep-media-player-0.9.7-r6.ebuild:
+  stable on ia64
+
+  22 Aug 2005; Luis Medinas <metalgod@gentoo.org>
+  beep-media-player-0.9.7-r6.ebuild:
+  Marked Stable on AMD64.
+
+  30 Jul 2005; Tony Vroon <chainsaw@gentoo.org> -files/0.9.7-unicode.patch,
+  -beep-media-player-0.9.7-r7.ebuild:
+  Pull broken release, closes bug #100560. Unicode patch was defective.
+
+*beep-media-player-0.9.7-r7 (24 Jul 2005)
+
+  24 Jul 2005; Tony Vroon <chainsaw@gentoo.org> +files/0.9.7-ipv6.patch,
+  +files/0.9.7-unicode.patch, -beep-media-player-0.9.7-r5.ebuild,
+  +beep-media-player-0.9.7-r7.ebuild:
+  Revision bump. Proper IPv6 support in HTTP streams, closes bug #94493 (BMP
+  bug #293), patch by Christophe Saout. UTF16 support for ID3v2 tags, closes
+  bug #99882 (BMP bug #101). -r5 ebuild removed.
+
+  21 Jul 2005; Joseph Jezak <josejx@gentoo.org>
+  beep-media-player-0.9.7-r6.ebuild:
+  Marked ppc stable.
+
+  20 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  beep-media-player-0.9.7-r6.ebuild:
+  Stable on ppc64
+
+  18 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  beep-media-player-0.9.7-r6.ebuild:
+  Stable on sparc
+
+  17 Jul 2005; Tony Vroon <chainsaw@gentoo.org>
+  beep-media-player-0.9.7-r6.ebuild:
+  Mark -r6 stable on x86.
+
+  13 Jun 2005; Sven Wegener <swegener@gentoo.org>
+  beep-media-player-0.9.7-r4.ebuild, beep-media-player-0.9.7-r5.ebuild,
+  beep-media-player-0.9.7-r6.ebuild:
+  Added a fix for bug #86689.
+
+*beep-media-player-0.9.7-r6 (29 May 2005)
+
+  29 May 2005; Tony Vroon <chainsaw@gentoo.org>
+  +files/0.9.7-bogus-songinfo.patch, +beep-media-player-0.9.7-r6.ebuild:
+  Add patch to resolve bogus song information exported through infopipe.
+  Closes bug #87049, patch by Frank Groeneveld <frankgroeneveld@gmail.com>.
+
+  09 May 2005; Aron Griffis <agriffis@gentoo.org>
+  beep-media-player-0.9.7-r4.ebuild:
+  stable on ia64
+
+  02 May 2005; Tony Vroon <chainsaw@gentoo.org>
+  -beep-media-player-0.9.7-r2.ebuild, -beep-media-player-0.9.7-r3.ebuild:
+  Removing old ebuilds.
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org>
+  beep-media-player-0.9.7-r4.ebuild:
+  Stable on ppc.
+
+  08 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  beep-media-player-0.9.7-r4.ebuild:
+  Stable on ppc64
+
+  07 Apr 2005; Simon Stelling <blubb@gentoo.org>
+  beep-media-player-0.9.7-r4.ebuild:
+  stable on amd64
+
+*beep-media-player-0.9.7-r5 (01 Apr 2005)
+
+  01 Apr 2005; Tony Vroon <chainsaw@gentoo.org>
+  +files/0.9.7-playlist-deadfile-delete.patch,
+  +files/0.9.7-window-focus.patch, +beep-media-player-0.9.7-r5.ebuild:
+  Version bump, updated ALSA depend, closes bug #86066. Patch for upstream
+  bug #260. Patch from Dale Whittaker applied, closes bug #83702 (upstream bug
+  #94).
+
+  31 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  beep-media-player-0.9.7-r4.ebuild:
+  Stable on sparc
+
+  30 Mar 2005; Tony Vroon <chainsaw@gentoo.org>
+  beep-media-player-0.9.7-r2.ebuild, beep-media-player-0.9.7-r3.ebuild,
+  beep-media-player-0.9.7-r4.ebuild:
+  -r4 stable on x86. Dependency update, pkg-config wasnt explicitly depended
+  upon. Closes bug #87311.
+
+  04 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  beep-media-player-0.9.7-r3.ebuild:
+  Stable on sparc
+
+*beep-media-player-0.9.7-r4 (28 Feb 2005)
+
+  28 Feb 2005; Tony Vroon <chainsaw@gentoo.org>
+  +files/0.9.7-hidden-window.patch, +files/0.9.7-vorbis-date.patch,
+  beep-media-player-0.9.7-r3.ebuild, +beep-media-player-0.9.7-r4.ebuild:
+  Added vorbis date-field patch (upstream bug #244) and hidden-window patch
+  (bug #82337). -r3 stable on x86.
+
+  28 Feb 2005; Tony Vroon <chainsaw@gentoo.org> metadata.xml,
+  -beep-media-player-0.9.7-r1.ebuild, -beep-media-player-0.9.7.ebuild:
+  Purge old ebuilds.
+
+  20 Feb 2005; Aron Griffis <agriffis@gentoo.org>
+  beep-media-player-0.9.7-r3.ebuild:
+  add ~ia64 #68223
+
+*beep-media-player-0.9.7-r3 (12 Feb 2005)
+
+  12 Feb 2005; Tony Vroon <chainsaw@gentoo.org>
+  +files/0.9.7-desktop-icon.patch, +beep-media-player-0.9.7-r3.ebuild:
+  Depend on id3lib, closes bug #79608. Install icons differently, closes bug
+  #81050. Run elibtoolize to stop libtool panic in install stage.
+
+  05 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
+  beep-media-player-0.9.7-r2.ebuild:
+  ~alpha keyword, bug 68223.
+
+  03 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  beep-media-player-0.9.7-r2.ebuild:
+  Stable on sparc
+
+  28 Dec 2004; Dylan Carlson <absinthe@gentoo.org>
+  beep-media-player-0.9.7-r2.ebuild:
+  Stable on amd64.
+
+  28 Dec 2004; Tony Vroon <chainsaw@gentoo.org>
+  beep-media-player-0.9.7-r1.ebuild, beep-media-player-0.9.7-r2.ebuild,
+  beep-media-player-0.9.7.ebuild:
+  Homepage update, closes bug #75570.
+
+  23 Dec 2004; Markus Rothe <corsair@gentoo.org>
+  beep-media-player-0.9.7-r2.ebuild:
+  Stable on ppc64
+
+*beep-media-player-0.9.7-r2 (23 Dec 2004)
+
+  23 Dec 2004; Tony Vroon <chainsaw@gentoo.org>
+  +files/0.9.7-bigendian.patch,
+  -files/beep-media-player-0.9.7_rc2-includefix.patch,
+  -files/beep-media-player-0.9.7_rc2-mime.patch,
+  +beep-media-player-0.9.7-r2.ebuild,
+  -beep-media-player-0.9.7_rc2-r3.ebuild:
+  Added bigendian patch by Yuta Satoh <gentoo@0x100.com> from bug #68223;
+  stable on x86. Old ebuild and patches cleaned.
+
+  20 Dec 2004; Tony Vroon <chainsaw@gentoo.org>
+  beep-media-player-0.9.7-r1.ebuild:
+  Removed invalid dependency on old libxml 1.X version. Closes bug #74959.
+
+  20 Dec 2004; Dylan Carlson <absinthe@gentoo.org>
+  beep-media-player-0.9.7.ebuild:
+  Stable on amd64.
+
+  19 Dec 2004; Tony Vroon <chainsaw@gentoo.org>
+  beep-media-player-0.9.7-r1.ebuild:
+  Added warnings if the user did not enable MP3 support.
+
+*beep-media-player-0.9.7-r1 (19 Dec 2004)
+
+  19 Dec 2004; Tony Vroon <chainsaw@gentoo.org> metadata.xml,
+  +files/0.9.7-noclick-resize.patch, +beep-media-player-0.9.7-r1.ebuild:
+  Added upstream patch for playlist doubleclick segfault, closes bug #73297.
+  MP3 support now a USE-flag. Took maintainership.
+
+  17 Dec 2004; Tony Vroon <chainsaw@gentoo.org>
+  beep-media-player-0.9.7.ebuild:
+  Stable on x86 for better plugin stability.
+
+*beep-media-player-0.9.7 (16 Dec 2004)
+
+  16 Dec 2004; Tony Vroon <chainsaw@gentoo.org>
+  +beep-media-player-0.9.7.ebuild:
+  Version bump. Closes bugs #70697 and #74126. Gnome VFS support has been
+  explicitly disabled, most plugins hate it.
+
+  03 Dec 2004; Tom Martin <slarti@gentoo.org>
+  beep-media-player-0.9.7_rc2-r3.ebuild:
+  Stable on amd64, resolves bug 73213.
+
+  24 Nov 2004; Stephen P. Becker <geoman@gentoo.org>
+  beep-media-player-0.9.7_rc2-r3.ebuild:
+  added ~mips keyword wrt bug 68223
+
+  15 Nov 2004; Tony Vroon <chainsaw@gentoo.org>
+  beep-media-player-0.9.7_rc2-r3.ebuild:
+  Added missing dependency on libogg, closes bug #71225.
+
+*beep-media-player-0.9.7_rc2-r3 (07 Nov 2004)
+
+  07 Nov 2004; Tony Vroon <chainsaw@gentoo.org>
+  -beep-media-player-0.9.7_rc2-r2.ebuild,
+  +beep-media-player-0.9.7_rc2-r3.ebuild:
+  Fix plugindir bug in beep-config, fix icon installation. Stable on x86.
+
+  31 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  beep-media-player-0.9.7_rc2-r2.ebuild:
+  Only install .desktop to applications.
+
+  22 Oct 2004; Guy Martin <gmsoft@gentoo.org>
+  beep-media-player-0.9.7_rc2-r2.ebuild:
+  Added ~hppa.
+
+  20 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  beep-media-player-0.9.7_rc2-r2.ebuild:
+  Removing plugins from PDEPEND until xmms-plugin.eclass stabilizes.
+
+  20 Oct 2004; Guy Martin <gmsoft@gentoo.org> :
+  Stable on hppa.
+
+  20 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/beep-media-player-0.9.7_rc2-includefix.patch:
+  Fixed missing include in plugin.h
+
+  19 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  beep-media-player-0.9.7_rc2-r2.ebuild:
+  Added default plugin set to PDEPEND.
+
+  19 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> files/beep-config:
+  Added support for FAKE_XMMS_VERSION to beep-config.
+
+*beep-media-player-0.9.7_rc2-r2 (19 Oct 2004)
+
+  19 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/beep-media-player-0.9.6.1-gcc34.patch,
+  -files/beep-media-player.desktop, -beep-media-player-0.9.6.1-r1.ebuild,
+  -beep-media-player-0.9.7_rc2-r1.ebuild,
+  +beep-media-player-0.9.7_rc2-r2.ebuild:
+  Removing old version. Moved header files and setup symlinks to make more
+  compatible with xmms plugins in the upcomming xmms-plugin.eclass.
+
+  05 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  beep-media-player-0.9.7_rc2-r1.ebuild:
+  fixed multilib problems (bug #64580). Fixed mime options in .desktop (bug
+  #65918). Fixed DEPEND (bug #65510).
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  beep-media-player-0.9.6.1-r1.ebuild:
+  Stable sparc.
+
+  31 Aug 2004; Tony Vroon <chainsaw@gentoo.org>
+  -beep-media-player-0.9.7_rc2.ebuild:
+  Removing old ebuild and keeping stable 0.9.6.1-r1 around.
+
+  31 Aug 2004; Tony Vroon <chainsaw@gentoo.org>
+  beep-media-player-0.9.7_rc2-r1.ebuild:
+  Adding missing depend on libglade. Reported by both Tim Gurr (bug #62154) and
+  Stefan Tittel (bug #61211).
+
+*beep-media-player-0.9.7_rc2-r1 (30 Aug 2004)
+
+  30 Aug 2004; Tony Vroon <chainsaw@gentoo.org> +files/beep-config,
+  +beep-media-player-0.9.7_rc2-r1.ebuild:
+  Add mmx and oss USE-flags. Enable more gnome functionality. Add beep-config to
+  get more plugins building. ~amd64, no longer segfaults.
+
+  30 Aug 2004; Luca Barbato <lu_zero@gentoo.org>
+  beep-media-player-0.9.7_rc2.ebuild:
+  Marked ~ppc
+
+*beep-media-player-0.9.7_rc2 (28 Aug 2004)
+
+  28 Aug 2004; Tony Vroon <chainsaw@gentoo.org>
+  +beep-media-player-0.9.7_rc2.ebuild:
+  Version bump to 0.9.7rc2. Dropped GCC 3.4 patch, no longer needed.
+
+  07 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/beep-media-player-0.9.6.1-gcc34.patch:
+  gcc-3.4 fixes submitted by Matthew Kennedy <mkennedy@gentoo.org> in bug
+  #55352. Removed old version.  -amd64
+
+  29 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  beep-media-player-0.9.6.1-r1.ebuild:
+  inherit flag-o-matic and replace-flags in src_compile
+
+  10 Mar 2004; <spider@gentoo.org> beep-media-player-0.9.6.1-r1.ebuild,
+  beep-media-player-1.0.0_pre5-r1.ebuild:
+  Fixed another braindead case of DEPEND on gnome-base/gnome.
+  AGH
+
+*beep-media-player-0.9.6.1-r1 (03 Mar 2004)
+
+  03 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  beep-media-player-0.9.6.1.ebuild, metadata.xml:
+  -Os borks... filtering out.  See bug #42893.  Stable x86.
+
+*beep-media-player-0.9.6.1 (06 Feb 2004)
+  06 Feb 2004; Thomas Raschbacher <lordvan@gento.org>
+  beep-media-player-0.9.6.1.ebuild, beep-mediao-player-1.0.0_pre5.ebuild,
+  beep-media-player-1.0.0_pre5-r1.ebuild:
+  version bump + added alsa deps and ./configure switches for alsa
+  according to http://beepmp.sourceforge.net/index.php#BMP%20version%20numbers
+  0.9.6 is newer than 1.0.0_pre5
+  changed 1.0.0-pre5* to -<arch>
+	
+*beep-media-player-1.0.0_pre5-r1 (05 Feb 2004)
+
+  05 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  beep-media-player-1.0.0_pre5-r1.ebuild, beep-media-player-1.0.0_pre5.ebuild:
+  The previous fix should've resulted in a revision bump, so here's the bump.
+
+  04 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  beep-media-player-1.0.0_pre5.ebuild:
+  Fixed DEPEND/RDEPEND mixup.  Closes bug #40316.
 
 *beep-media-player-1.0.0_pre5 (29 Nov 2003)
 
diff --git a/media-sound/beep-media-player/Manifest b/media-sound/beep-media-player/Manifest
index aaca998a122b..3787a2f4dfe1 100644
--- a/media-sound/beep-media-player/Manifest
+++ b/media-sound/beep-media-player/Manifest
@@ -1,5 +1,19 @@
-MD5 68f1ea3ff6ffaf948b1dbf3fd7021b04 ChangeLog 464
-MD5 0bef0def285dd795012114c51edea772 beep-media-player-1.0.0_pre5.ebuild 2088
-MD5 a72a06a37ca4e5905085ebff07fe9e9e metadata.xml 217
-MD5 3c076f9d2b4d924ac325af974986ed77 files/digest-beep-media-player-1.0.0_pre5 81
-MD5 49ac6fbcf87a9de0e4fb7f349c53805c files/beep-media-player.desktop 281
+MD5 9e05560f5c42cac0e8832ed532b1d27c ChangeLog 13228
+MD5 3e970dc883c7abdd6bf77e8ee07f6ad3 beep-media-player-0.9.7-r6.ebuild 2769
+MD5 e0968520fca7326abf9fc501b5bfc305 beep-media-player-0.9.7-r8.ebuild 2993
+MD5 3f2f400d73900f5350c9617ce677977e beep-media-player-0.9.7.1.ebuild 2692
+MD5 4fe36295e02a77ccc81d9f710ebcc9fb files/0.9.7-bogus-songinfo.patch 517
+MD5 d14dde91067c784f210c19e1e4024650 files/0.9.7-desktop-icon.patch 535
+MD5 32c2097467512370b951158b88abbeda files/0.9.7-hidden-window.patch 658
+MD5 3f601435320f38af453b506ced22e342 files/0.9.7-ipv6.patch 10063
+MD5 0e011dce894959d58bb98199a10b9a6a files/0.9.7-link-gconf.patch 1173
+MD5 533bcd69c3357e3b6dd5b3a49afbb6bf files/0.9.7-noclick-resize.patch 974
+MD5 07dd84987f30f2cbb9ca16ec80cb6962 files/0.9.7-playlist-deadfile-delete.patch 540
+MD5 e279329d65732e4ce62f2ea78badc901 files/0.9.7-volume-crash.patch 600
+MD5 893b0d5bce79831b0f71aae51af7440d files/0.9.7-vorbis-date.patch 637
+MD5 539d031b4930b4ce080fbe0804edfc28 files/0.9.7-window-focus.patch 850
+MD5 e0224d7dcc5a2cb1af6ea6b18a6daea8 files/beep-config 3347
+MD5 8b9a3f5a01668b72272dc2f8b2969659 files/digest-beep-media-player-0.9.7-r6 62
+MD5 8b9a3f5a01668b72272dc2f8b2969659 files/digest-beep-media-player-0.9.7-r8 62
+MD5 18a0c44ab6e0927dc058a0f43f0795f4 files/digest-beep-media-player-0.9.7.1 135
+MD5 319fe8f45b51a2d31f8d4e9a4071ca10 metadata.xml 248
diff --git a/media-sound/beep-media-player/beep-media-player-0.9.7-r6.ebuild b/media-sound/beep-media-player/beep-media-player-0.9.7-r6.ebuild
index 34e6ad4cf3e9..c7041e836d0d 100644
--- a/media-sound/beep-media-player/beep-media-player-0.9.7-r6.ebuild
+++ b/media-sound/beep-media-player/beep-media-player-0.9.7-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/media-sound/beep-media-player/beep-media-player-0.9.7-r6.ebuild,v 1.1 2005/05/29 15:02:32 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beep-media-player/beep-media-player-0.9.7-r6.ebuild,v 1.1.1.1 2005/11/30 09:38:17 chriswhite Exp $
 
 IUSE="nls gnome mp3 oggvorbis alsa oss esd mmx old-eq"
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/beepmp/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~hppa ~mips ~ppc64 ~alpha ~ia64"
+KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
 
 # beep-config has a runtime depend on pkg-config
 RDEPEND="app-arch/unzip
@@ -56,6 +56,8 @@ src_unpack() {
 src_compile() {
 	# Bug #42893
 	replace-flags "-Os" "-O2"
+	# Bug #86689
+	is-flag "-O*" || append-flags -O
 
 	econf \
 		--with-dev-dsp=/dev/sound/dsp \
diff --git a/media-sound/beep-media-player/beep-media-player-0.9.7-r8.ebuild b/media-sound/beep-media-player/beep-media-player-0.9.7-r8.ebuild
index 5932dc015ecb..fa2712aabfb9 100644
--- a/media-sound/beep-media-player/beep-media-player-0.9.7-r8.ebuild
+++ b/media-sound/beep-media-player/beep-media-player-0.9.7-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/media-sound/beep-media-player/beep-media-player-0.9.7-r8.ebuild,v 1.1 2005/08/26 23:32:10 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beep-media-player/beep-media-player-0.9.7-r8.ebuild,v 1.1.1.1 2005/11/30 09:38:17 chriswhite Exp $
 
 IUSE="nls gnome mp3 oggvorbis alsa oss esd mmx old-eq"
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/beepmp/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ~ppc64 sparc x86"
 
 # beep-config has a runtime depend on pkg-config
 RDEPEND="app-arch/unzip
diff --git a/media-sound/beep-media-player/beep-media-player-0.9.7.1.ebuild b/media-sound/beep-media-player/beep-media-player-0.9.7.1.ebuild
index 612a55b30133..580fcb3cca9d 100644
--- a/media-sound/beep-media-player/beep-media-player-0.9.7.1.ebuild
+++ b/media-sound/beep-media-player/beep-media-player-0.9.7.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/media-sound/beep-media-player/beep-media-player-0.9.7.1.ebuild,v 1.1 2005/10/22 12:38:33 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beep-media-player/beep-media-player-0.9.7.1.ebuild,v 1.1.1.1 2005/11/30 09:38:17 chriswhite Exp $
 
-IUSE="nls gnome mp3 oggvorbis alsa oss esd mmx old-eq"
+IUSE="nls gnome mp3 vorbis alsa oss esd mmx old-eq"
 
-inherit flag-o-matic eutils libtool
+inherit flag-o-matic eutils libtool autotools
 
 MY_PN="bmp"
 MY_P=bmp-${PV/_/}
@@ -27,7 +27,7 @@ RDEPEND="app-arch/unzip
 	>=gnome-base/libglade-2.3.1
 	>=dev-util/pkgconfig-0.9.0
 	esd? ( >=media-sound/esound-0.2.30 )
-	oggvorbis? ( >=media-libs/libvorbis-1.0 )
+	vorbis? ( >=media-libs/libvorbis-1.0 )
 	alsa? ( >=media-libs/alsa-lib-1.0.9_rc2 )
 	gnome? ( >=gnome-base/gconf-2.6.0 )
 	mp3? ( media-libs/id3lib )"
@@ -47,10 +47,7 @@ src_unpack() {
 	epatch ${FILESDIR}/0.9.7-window-focus.patch
 	epatch ${FILESDIR}/0.9.7-ipv6.patch
 
-	ebegin "Rebuilding configure script (this will take a while)"
-	autoreconf -f -i &> /dev/null
-	eend $?
-
+	eautoreconf
 	elibtoolize
 }
 
@@ -67,7 +64,7 @@ src_compile() {
 		`use_with old-eq xmms-eq` \
 		`use_enable mmx simd` \
 		`use_enable gnome gconf` \
-		`use_enable oggvorbis vorbis` \
+		`use_enable vorbis` \
 		`use_enable esd` \
 		`use_enable mp3` \
 		`use_enable nls` \
diff --git a/media-sound/beep-media-player/files/beep-config b/media-sound/beep-media-player/files/beep-config
index 9ff712fe6810..717d922e068e 100644
--- a/media-sound/beep-media-player/files/beep-config
+++ b/media-sound/beep-media-player/files/beep-config
@@ -72,7 +72,11 @@ while test $# -gt 0; do
 	    ;;
 
 	--version)
-	    echo $version
+	    if [ -n "${FAKE_XMMS_VERSION}" ]; then
+		echo ${FAKE_XMMS_VERSION}
+	    else
+	        echo $version
+	    fi
 	    ;;
 
 	--cflags)
diff --git a/media-sound/beep-media-player/metadata.xml b/media-sound/beep-media-player/metadata.xml
index efa54454de71..a025c77c7636 100644
--- a/media-sound/beep-media-player/metadata.xml
+++ b/media-sound/beep-media-player/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>no-herd</herd>
-<maintainer><email>hanno@gentoo.org</email></maintainer>
+<herd>sound</herd>
+<maintainer>
+  <email>chainsaw@gentoo.org</email>
+  <name>Tony Vroon</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/bitscope/ChangeLog b/media-sound/bitscope/ChangeLog
index 114f73f1fe5b..37695e753347 100644
--- a/media-sound/bitscope/ChangeLog
+++ b/media-sound/bitscope/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for media-sound/bitscope
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bitscope/ChangeLog,v 1.1 2004/08/20 17:36:07 fvdpol Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bitscope/ChangeLog,v 1.1.1.1 2005/11/30 09:38:29 chriswhite Exp $
+
+  09 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> bitscope-1.1.ebuild:
+  Don't install INSTALL file.
+
+  19 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  bitscope-1.1.ebuild:
+  Stable sparc.
+
+  28 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  bitscope-1.1.ebuild:
+  Stable amd64, x86.  Added to ~sparc.  Fixed DEPEND.
+  Using DESTDIR.  Removed auto* from deps.
+
+  02 Sep 2004; David Holm <dholm@gentoo.org> bitscope-1.1.ebuild:
+  Added to ~ppc.
+
+*bitscope-1.1 (21 Aug 2004)
+
+  21 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org> bitscope-1.1.ebuild:
+  Fix dep; use generic src_compile; tidy
 
   20 Aug 2004; <frank@gentoo.org> :
   New ebuild submitted by  
diff --git a/media-sound/bitscope/Manifest b/media-sound/bitscope/Manifest
index d4bb7735a856..4b0eabdde088 100644
--- a/media-sound/bitscope/Manifest
+++ b/media-sound/bitscope/Manifest
@@ -1,4 +1,14 @@
-MD5 f8c4b4ae66c1d0e2ea37b5b84a4e8fa6 bitscope-1.1.ebuild 678
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f0959486cd9536df104f6ad8c108c477 ChangeLog 938
 MD5 2f758c82434233f84f01f80f850a1112 metadata.xml 217
-MD5 61354c4a3e928b3cd89072cdddc38380 ChangeLog 232
+MD5 f1b89e4b35a8b98161fe77d772036805 bitscope-1.1.ebuild 644
 MD5 54a4bc1b3f50bc6d61e19dcaa815d091 files/digest-bitscope-1.1 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDIYw5j5H05b2HAEkRAgCCAJ0WfrVEM3eIL8cJSCHpHsc6l/ZbhACfW52z
+iyS7DBrVOFL+TvmIKXXpyws=
+=iMFL
+-----END PGP SIGNATURE-----
diff --git a/media-sound/bitscope/bitscope-1.1.ebuild b/media-sound/bitscope/bitscope-1.1.ebuild
index c9e2fff0eb0d..d83ba3308536 100644
--- a/media-sound/bitscope/bitscope-1.1.ebuild
+++ b/media-sound/bitscope/bitscope-1.1.ebuild
@@ -1,32 +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/media-sound/bitscope/bitscope-1.1.ebuild,v 1.1 2004/08/20 17:36:07 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bitscope/bitscope-1.1.ebuild,v 1.1.1.1 2005/11/30 09:38:29 chriswhite Exp $
 
 IUSE=""
 
 DESCRIPTION="A diagnosis tool for JACK audio software"
 HOMEPAGE="http://www.ecs.soton.ac.uk/~njl98r/code/ladspa/"
 SRC_URI="http://www.ecs.soton.ac.uk/~njl98r/code/ladspa/${P}.tar.gz"
-RESTRICT=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86 ~ppc sparc"
 
-#first two for WANT_AUTOMAKE/CONF
-DEPEND=">=sys-devel/autoconf-2.58
-	>=sys-devel/automake-1.7.2
-	virtual/glibc
-	virtual/jack
-	>=x11-libs/gtk+-2.0.0"
-
-src_compile() {
-	econf || die
-	emake || die
-}
+DEPEND="media-sound/jack-audio-connection-kit
+	>=x11-libs/gtk+-2"
 
 src_install() {
-	einstall || die "make install failed"
-	dodoc COPYING INSTALL README
+	make DESTDIR="${D}" install || die
+	dodoc README
 	dohtml doc/*png doc/index.html
 }
diff --git a/media-sound/bladeenc/ChangeLog b/media-sound/bladeenc/ChangeLog
index c4e862856b41..b38eb85f70dd 100644
--- a/media-sound/bladeenc/ChangeLog
+++ b/media-sound/bladeenc/ChangeLog
@@ -1,9 +1,48 @@
 # ChangeLog for media-sound/bladeenc
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bladeenc/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/media-sound/bladeenc/ChangeLog,v 1.1.1.1 2005/11/30 09:38:13 chriswhite Exp $
+
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  bladeenc-0.94.2-r1.ebuild:
+  Don't install COPYING and INSTALL files.
+
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org> bladeenc-0.94.2-r1.ebuild:
+  Stable on ppc64
+
+  03 Nov 2004; Markus Rothe <corsair@gentoo.org> bladeenc-0.94.2-r1.ebuild:
+  Marked ~ppc64; bug #69135
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  bladeenc-0.94.2-r1.ebuild:
+  virtual/glibc -> virtual/libc
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  bladeenc-0.94.2-r1.ebuild, bladeenc-0.94.2.ebuild:
+  Added IUSE.
+
+  14 Mar 2004; Jason Wever <weeve@gentoo.org> bladeenc-0.94.2-r1.ebuild:
+  Stable on sparc.
+
+  28 Jan 2004; Brad House <brad_mssw@gentoo.org> bladeenc-0.94.2-r1.ebuild:
+  mark stable on amd64
+
+  05 Dec 2003; Jason Wever <weeve@gentoo.org> bladeenc-0.94.2-r1.ebuild:
+  Added ~sparc to keywords.
+
+*bladeenc-0.94.2-r1 (5 Feb 2003)
+
+  5 Feb 2003; Joachim Blaabjerg <styx@gentoo.org> bladeenc-0.94.2-r1.ebuild,
+  files/bladeenc-0.94.2-secfix.diff, files/digest-bladeenc-0.94.2-r1,
+  ChangeLog :
+
+  Added a small patch to fix a security problem, fixes bug #15154.
 
 *bladeenc-0.94.2 (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/media-sound/bladeenc/Manifest b/media-sound/bladeenc/Manifest
index e69de29bb2d1..ade9e5166d91 100644
--- a/media-sound/bladeenc/Manifest
+++ b/media-sound/bladeenc/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 84a55895b0e8fac923b2bad30542d9d8 ChangeLog 1892
+MD5 5e987e5bf573456e8866c150a8b1ad0a bladeenc-0.94.2-r1.ebuild 630
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 b582b66a647571df5d3507528f8548cf files/bladeenc-0.94.2-secfix.diff 394
+MD5 a1cd123ae2cdc12d1c72ecb7d52df91d files/digest-bladeenc-0.94.2-r1 78
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGtUcj5H05b2HAEkRAvkTAKCjCyrA3FwFcWihkpTYKeT7YpYgSQCeNx/s
+fxKG3XEo/QhH9KslXImpuzQ=
+=5DOX
+-----END PGP SIGNATURE-----
diff --git a/media-sound/bladeenc/bladeenc-0.94.2-r1.ebuild b/media-sound/bladeenc/bladeenc-0.94.2-r1.ebuild
index 5fbbacbb5cf2..e2e9849c21e0 100644
--- a/media-sound/bladeenc/bladeenc-0.94.2-r1.ebuild
+++ b/media-sound/bladeenc/bladeenc-0.94.2-r1.ebuild
@@ -1,31 +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/media-sound/bladeenc/bladeenc-0.94.2-r1.ebuild,v 1.1 2003/02/05 10:29:51 styx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bladeenc/bladeenc-0.94.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:13 chriswhite Exp $
+
+IUSE=""
 
 inherit eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="An mp3 encoder"
 SRC_URI="http://bladeenc.mp3.no/source/${P}-src-stable.tar.gz"
-HOMEPAGE="http://bladeenc.mp3.no/deenc.mp3.no/"
+HOMEPAGE="http://bladeenc.mp3.no/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc"
+KEYWORDS="x86 ppc sparc amd64 ppc64"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/${P}-secfix.diff
 }
 
-src_compile() {
-	econf || die
-	emake || die
-}
-
 src_install () {
 	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog COPYING INSTALL README TODO
+	dodoc AUTHORS ChangeLog README TODO
 }
diff --git a/media-sound/bmpx/ChangeLog b/media-sound/bmpx/ChangeLog
index 97641598a985..74b0a000f13f 100644
--- a/media-sound/bmpx/ChangeLog
+++ b/media-sound/bmpx/ChangeLog
@@ -1,6 +1,95 @@
 # ChangeLog for media-sound/bmpx
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bmpx/ChangeLog,v 1.1 2005/09/21 19:27:26 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bmpx/ChangeLog,v 1.1.1.1 2005/11/30 09:38:33 chriswhite Exp $
+
+  20 Nov 2005; Joseph Jezak <josejx@gentoo.org> bmpx-0.12.6.1.ebuild:
+  Marked ~ppc for bug #112622.
+
+*bmpx-0.12.6.1 (14 Nov 2005)
+
+  14 Nov 2005; Martin Schlemmer <azarah@gentoo.org> +bmpx-0.12.6.1.ebuild:
+  New release.
+
+*bmpx-0.12.6 (13 Nov 2005)
+
+  13 Nov 2005; Martin Schlemmer <azarah@gentoo.org> +bmpx-0.12.6.ebuild:
+  New release.
+
+*bmpx-0.12.5 (13 Nov 2005)
+
+  13 Nov 2005; Martin Schlemmer <azarah@gentoo.org> +bmpx-0.12.5.ebuild:
+  New release.
+
+  12 Nov 2005; Martin Schlemmer <azarah@gentoo.org> bmpx-0.12.4.ebuild:
+  Add gnome2_pkg_postinst stuff back.
+
+*bmpx-0.12.4 (11 Nov 2005)
+
+  11 Nov 2005; Martin Schlemmer <azarah@gentoo.org> +bmpx-0.12.4.ebuild:
+  New release.
+
+*bmpx-0.12.3 (08 Nov 2005)
+
+  08 Nov 2005; Martin Schlemmer <azarah@gentoo.org> +bmpx-0.12.3.ebuild:
+  New release.
+
+  01 Nov 2005; Martin Schlemmer <azarah@gentoo.org> bmpx-0.12.2.ebuild:
+  Fix dbus version (bug #111146).  Add perl, python and xchat depends.
+
+*bmpx-0.12.2 (31 Oct 2005)
+
+  31 Oct 2005; Martin Schlemmer <azarah@gentoo.org> +bmpx-0.12.2.ebuild:
+  New release.  Add perl/python/xchat USE flags.
+
+*bmpx-0.12.1 (26 Oct 2005)
+
+  26 Oct 2005; Martin Schlemmer <azarah@gentoo.org> +bmpx-0.12.1.ebuild:
+  New release.  I fixed the major leak, so it should be good.
+
+*bmpx-0.12 (24 Oct 2005)
+
+  24 Oct 2005; Martin Schlemmer <azarah@gentoo.org> +bmpx-0.12.ebuild:
+  Version bump, bug #109776 (I am still not happy, as there is a memory leak
+  that we have difficulty to track). Should also resolve bug #109494. Add the
+  gentoo_ice skin, which is also in XMMS (bug #109772). Some tweaks from Tony
+  Vroon <chainsaw@gentoo.org>.
+
+*bmpx-0.12_rc2 (04 Oct 2005)
+
+  04 Oct 2005; Martin Schlemmer <azarah@gentoo.org> +bmpx-0.12_rc2.ebuild:
+  New release.
+
+*bmpx-0.12_rc1 (03 Oct 2005)
+
+  03 Oct 2005; Martin Schlemmer <azarah@gentoo.org> +bmpx-0.12_rc1.ebuild:
+  New release.
+
+*bmpx-0.12_rc0 (03 Oct 2005)
+
+  03 Oct 2005; Martin Schlemmer <azarah@gentoo.org> +bmpx-0.12_rc0.ebuild:
+  New release.
+
+  02 Oct 2005; Martin Schlemmer <azarah@gentoo.org> bmpx-0.11.5.1.ebuild:
+  Fix dbus enabling, bug #107789.
+
+  30 Sep 2005; Martin Schlemmer <azarah@gentoo.org> bmpx-0.11.5.1.ebuild:
+  Update homepage, bug #107696.
+
+*bmpx-0.11.5.1 (30 Sep 2005)
+
+  30 Sep 2005; Martin Schlemmer <azarah@gentoo.org> +bmpx-0.11.5.1.ebuild:
+  New release.
+
+*bmpx-0.11.4 (28 Sep 2005)
+
+  28 Sep 2005; Martin Schlemmer <azarah@gentoo.org> +bmpx-0.11.4.ebuild:
+  New release.
+
+*bmpx-0.11.3 (23 Sep 2005)
+
+  23 Sep 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/bmpx-0.11.3-desktop.patch, +bmpx-0.11.3.ebuild:
+  New release.
 
 *bmpx-0.11.2 (21 Sep 2005)
 
diff --git a/media-sound/bmpx/Manifest b/media-sound/bmpx/Manifest
index a6c829008945..18c207b69e8c 100644
--- a/media-sound/bmpx/Manifest
+++ b/media-sound/bmpx/Manifest
@@ -1,2 +1,14 @@
-MD5 ea1823b78341f77ad5d597eece9dc658 bmpx-0.11.2.ebuild 1837
-MD5 278bfefa3b03e686b43c85755dc0957d files/digest-bmpx-0.11.2 64
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ff1f3419b16fbf170ecde234c5d70ccd ChangeLog 2980
+MD5 94b783350318bde8ad524625dc572691 bmpx-0.12.6.1.ebuild 2451
+MD5 0a184bb0709b591642e5fb7040cf2919 files/digest-bmpx-0.12.6.1 138
+MD5 b612d343db3c54560665171eb7db245c metadata.xml 223
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDf9x+csIHjyDViGQRAm6uAJ47oCzpiVni9azJwQcsqUWuoWtq5gCffJQL
+0ccqUxv0SjUK8jWKjP6myQk=
+=E1e5
+-----END PGP SIGNATURE-----
diff --git a/media-sound/bmpx/bmpx-0.12.6.1.ebuild b/media-sound/bmpx/bmpx-0.12.6.1.ebuild
index f9cc0bd79aae..f9e4cfa98b3f 100644
--- a/media-sound/bmpx/bmpx-0.12.6.1.ebuild
+++ b/media-sound/bmpx/bmpx-0.12.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/media-sound/bmpx/bmpx-0.12.6.1.ebuild,v 1.1 2005/11/14 17:29:37 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bmpx/bmpx-0.12.6.1.ebuild,v 1.1.1.1 2005/11/30 09:38:33 chriswhite Exp $
 
 inherit gnome2 eutils
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/beepmp/${MY_P}.tar.bz2
 	mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="a52 dbus debug flac irssi mad ogg perl python theora vorbis xchat xine"
 
 RDEPEND=">=dev-libs/glib-2.8.0
diff --git a/media-sound/bossogg/ChangeLog b/media-sound/bossogg/ChangeLog
index 842b19aed28e..1ed4dc439087 100644
--- a/media-sound/bossogg/ChangeLog
+++ b/media-sound/bossogg/ChangeLog
@@ -1,6 +1,73 @@
 # ChangeLog for media-sound/bossogg
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bossogg/ChangeLog,v 1.1 2004/03/05 02:49:12 eradicator Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bossogg/ChangeLog,v 1.1.1.1 2005/11/30 09:38:36 chriswhite Exp $
+
+  07 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> bossogg-0.13.5.ebuild,
+  bossogg-0.13.6.ebuild, bossogg-0.13.6-r2.ebuild, bossogg-0.13.6-r3.ebuild:
+  Don't install INSTALL and COPYING files. When using eautoreconf it takes
+  care of using foreign automake when needed, so no need to touch NEWS and
+  AUTHORS.
+
+*bossogg-0.13.6-r3 (02 Sep 2005)
+
+  02 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/bossogg-0.13.6-gcc4.patch, +bossogg-0.13.6-r3.ebuild:
+  Cleanup of ebuild: use $( ) for use_enable, use eautoreconf to recreate
+  autotools scripts, oggvorbis useflag is not vorbis, use [[ ]] for tests,
+  bossogg user does not need a /bin/bash shell, fixed the dependency over
+  sqlite and autoconf, use newinitd, don't install license and installation
+  documentation. Added patch to compile on gcc4.
+
+  19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  Remove retired developer from metadata.xml.
+
+  13 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> bossogg-0.13.6.ebuild:
+  added libtoolize call, fixes #83775
+
+*bossogg-0.13.6-r2 (01 Mar 2005)
+
+  01 Mar 2005; Eric Shattow <jnc@gentoo.org> +bossogg-0.13.6-r2.ebuild:
+  Closes bug# 83003.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  bossogg-0.13.6.ebuild:
+  Stable amd64, sparc.
+
+  27 Aug 2004; Chris White <chriswhite@gentoo.org> metadata.xml:
+  Added myself as maintainer.
+
+  04 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  bossogg-0.13.6.ebuild:
+  ~amd64 ~sparc
+
+  06 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  bossogg-0.13.6.ebuild:
+  Stable x86.
+
+  03 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  bossogg-0.13.5.ebuild, bossogg-0.13.6.ebuild:
+  Changing mad dep to madplay.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> bossogg-0.13.6.ebuild:
+  Add inherit eutils
+
+  17 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  bossogg-0.13.5.ebuild:
+  eutils
+
+  08 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  bossogg-0.13.5.ebuild:
+  Stable x86.
+
+  08 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  bossogg-0.13.5.ebuild:
+  Stable x86.
+
+*bossogg-0.13.6 (03 Apr 2004)
+
+  03 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  bossogg-0.13.6.ebuild:
+  Version bump and ebuild cleanup.  Closes bug #46625.
 
 *bossogg-0.13.5 (04 Mar 2004)
 
diff --git a/media-sound/bossogg/Manifest b/media-sound/bossogg/Manifest
index 0e18fc9708b7..b62ad5614b8a 100644
--- a/media-sound/bossogg/Manifest
+++ b/media-sound/bossogg/Manifest
@@ -1,3 +1,23 @@
-MD5 5f1f6ba2e032e122f424f707df1a35d7 bossogg-0.13.5.ebuild 1074
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c3ae78fc66e214142614e5d050490e21 ChangeLog 2708
+MD5 ac9153525f6e57cb0b23cbb51ea677c0 bossogg-0.13.5.ebuild 1468
+MD5 99b3537223e28eee0f2f9b0c4887dcbd bossogg-0.13.6-r2.ebuild 1749
+MD5 9ba7855ea78c0f05c792b402f1108a3c bossogg-0.13.6-r3.ebuild 1670
+MD5 09d56222eddb522af24f43b7846bb58e bossogg-0.13.6.ebuild 1710
+MD5 1258e23a47f430724dd4a6b18798641c files/bossogg-0.13.6-Makefile.patch 1673
+MD5 986dd155135ce535ebc1b77485b6bd40 files/bossogg-0.13.6-gcc4.patch 1099
+MD5 3089685b6a78e3a1a57cd7315f1245b4 files/bossogg.initd 609
 MD5 5744dec050eb39224fe02fcdd1e74bed files/digest-bossogg-0.13.5 66
-MD5 8a9d691f2fa54f64626613d8e88804f4 files/bossogg.initd 554
+MD5 ba402f47f5f8d4052e2c61b26b6ba547 files/digest-bossogg-0.13.6 66
+MD5 ba402f47f5f8d4052e2c61b26b6ba547 files/digest-bossogg-0.13.6-r2 66
+MD5 ba402f47f5f8d4052e2c61b26b6ba547 files/digest-bossogg-0.13.6-r3 66
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD4DBQFDby/Ij5H05b2HAEkRAu6uAJsFo0Vz0EPi7zuaZ3zLca1EGgJz1ACXepcP
+s8CBmKxDCtLEbuNKMab7cw==
+=/NnS
+-----END PGP SIGNATURE-----
diff --git a/media-sound/bossogg/bossogg-0.13.5.ebuild b/media-sound/bossogg/bossogg-0.13.5.ebuild
index 589d06ed1fa8..97fbd2f29a3d 100644
--- a/media-sound/bossogg/bossogg-0.13.5.ebuild
+++ b/media-sound/bossogg/bossogg-0.13.5.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/media-sound/bossogg/bossogg-0.13.5.ebuild,v 1.1 2004/03/05 02:49:12 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bossogg/bossogg-0.13.5.ebuild,v 1.1.1.1 2005/11/30 09:38:36 chriswhite Exp $
+
+inherit eutils
 
 IUSE="oggvorbis mad"
 
@@ -9,13 +11,13 @@ HOMEPAGE="http://bossogg.wishy.org"
 SRC_URI="mirror://sourceforge/bossogg/${P}.tar.gz"
 RESTRICT="nomirror"
 
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND=">=media-libs/libao-0.8.3
 	oggvorbis? ( media-libs/libvorbis )
-	mad? ( media-sound/mad media-libs/id3lib )"
+	mad? ( media-sound/madplay media-libs/id3lib )"
 
 RDEPEND="${DEPEND}
 	 dev-python/pysqlite"
@@ -37,7 +39,7 @@ src_compile() {
 src_install() {
 	# borks make DESTDIR=${D} install || die
 	einstall || die
-	dodoc README TODO INSTALL COPYING
+	dodoc README TODO
 
 	exeinto /etc/init.d; newexe ${FILESDIR}/bossogg.initd bossogg
 }
diff --git a/media-sound/bossogg/bossogg-0.13.6-r2.ebuild b/media-sound/bossogg/bossogg-0.13.6-r2.ebuild
index d2900ab4a29c..4d26acb3b30d 100644
--- a/media-sound/bossogg/bossogg-0.13.6-r2.ebuild
+++ b/media-sound/bossogg/bossogg-0.13.6-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/media-sound/bossogg/bossogg-0.13.6-r2.ebuild,v 1.1 2005/03/02 05:05:55 jnc Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bossogg/bossogg-0.13.6-r2.ebuild,v 1.1.1.1 2005/11/30 09:38:36 chriswhite Exp $
 
 inherit eutils
 
@@ -53,7 +53,7 @@ src_compile() {
 
 src_install() {
 	make DESTDIR="${D}" install || die
-	dodoc README TODO INSTALL COPYING API
+	dodoc README TODO API
 
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/bossogg.initd bossogg
diff --git a/media-sound/bossogg/bossogg-0.13.6-r3.ebuild b/media-sound/bossogg/bossogg-0.13.6-r3.ebuild
index 7bd5bbc257e9..79c2fa65f2cb 100644
--- a/media-sound/bossogg/bossogg-0.13.6-r3.ebuild
+++ b/media-sound/bossogg/bossogg-0.13.6-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/media-sound/bossogg/bossogg-0.13.6-r3.ebuild,v 1.1 2005/09/02 16:59:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bossogg/bossogg-0.13.6-r3.ebuild,v 1.1.1.1 2005/11/30 09:38:36 chriswhite Exp $
 
 inherit eutils autotools
 
@@ -35,7 +35,6 @@ src_unpack() {
 
 	epatch ${FILESDIR}/${P}-Makefile.patch
 	epatch ${FILESDIR}/${P}-gcc4.patch
-	touch NEWS AUTHORS
 
 	eautoreconf
 }
diff --git a/media-sound/bossogg/bossogg-0.13.6.ebuild b/media-sound/bossogg/bossogg-0.13.6.ebuild
index 5bdbebb7d676..8e0479d788f8 100644
--- a/media-sound/bossogg/bossogg-0.13.6.ebuild
+++ b/media-sound/bossogg/bossogg-0.13.6.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/media-sound/bossogg/bossogg-0.13.6.ebuild,v 1.1 2004/04/03 10:31:49 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bossogg/bossogg-0.13.6.ebuild,v 1.1.1.1 2005/11/30 09:38:36 chriswhite Exp $
+
+inherit eutils
 
 IUSE="oggvorbis mad flac"
 
 DESCRIPTION="Bossogg Music Server"
 HOMEPAGE="http://bossogg.wishy.org"
 SRC_URI="mirror://sourceforge/bossogg/${P}.tar.gz"
-RESTRICT="nomirror"
 
-KEYWORDS="~x86"
+KEYWORDS="x86 sparc amd64"
 SLOT="0"
 LICENSE="GPL-2"
 
@@ -17,11 +18,29 @@ DEPEND=">=media-libs/libao-0.8.3
 	media-libs/libshout
 	flac? ( media-libs/flac )
 	oggvorbis? ( media-libs/libvorbis )
-	mad? ( media-sound/mad media-libs/id3lib )"
+	mad? ( media-sound/madplay media-libs/id3lib )"
 
 RDEPEND="${DEPEND}
 	 dev-python/pysqlite"
 
+DEPEND="${DEPEND}
+	>=sys-devel/automake-1.7"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-Makefile.patch
+	touch NEWS AUTHORS
+
+	export WANT_AUTOMAKE=1.7
+	export WANT_AUTOCONF=2.5
+	aclocal || die
+	automake || die
+	autoconf || die
+	elibtoolize
+}
+
 src_compile() {
 	econf --enable-shout \
 	      `use_enable oggvorbis vorbis` \
@@ -33,11 +52,11 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
-	# einstall || die
-	dodoc README TODO INSTALL COPYING API
+	make DESTDIR="${D}" install || die
+	dodoc README TODO API
 
-	exeinto /etc/init.d; newexe ${FILESDIR}/bossogg.initd bossogg
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/bossogg.initd bossogg
 }
 
 pkg_postinst() {
diff --git a/media-sound/bossogg/files/bossogg.initd b/media-sound/bossogg/files/bossogg.initd
index 480fb4083de6..0a4225a3c458 100644
--- a/media-sound/bossogg/files/bossogg.initd
+++ b/media-sound/bossogg/files/bossogg.initd
@@ -1,21 +1,21 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bossogg/files/bossogg.initd,v 1.1 2004/03/05 02:49:12 eradicator Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bossogg/files/bossogg.initd,v 1.1.1.1 2005/11/30 09:38:36 chriswhite Exp $
 
 depend() {
-   after alsasound
+	after alsasound
 }
 
 start() {
-   ebegin "Starting Boss Ogg"
-   HOME="/var/bossogg" start-stop-daemon --chuid bossogg --quiet --start --exec /usr/bin/bossogg -- --pidfile /var/bossogg/bossogg.pid -d
-   eend $?
+	ebegin "Starting Boss Ogg"
+	HOME="/var/bossogg" start-stop-daemon --chuid bossogg --quiet --start --exec /usr/bin/bossogg -- --pidfile /var/bossogg/bossogg.pid -d
+	eend $?
 }
 
 stop() {
-   ebegin "Stopping Boss Ogg"
-   start-stop-daemon --quiet --stop --pidfile /var/bossogg/bossogg.pid
-   rm -f /var/bossogg/bossogg.pid
-   eend $?
+	ebegin "Stopping Boss Ogg"
+	start-stop-daemon --quiet --stop --pidfile /var/bossogg/bossogg.pid
+	rm -f /var/bossogg/bossogg.pid
+	eend $?
 } 
diff --git a/media-sound/bplay/ChangeLog b/media-sound/bplay/ChangeLog
index 00a6f8d7d31b..70e8ef9dad5b 100644
--- a/media-sound/bplay/ChangeLog
+++ b/media-sound/bplay/ChangeLog
@@ -1,9 +1,30 @@
 # ChangeLog for media-sound/bplay
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bplay/ChangeLog,v 1.1 2002/03/13 06:00:55 agenkin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bplay/ChangeLog,v 1.1.1.1 2005/11/30 09:38:32 chriswhite Exp $
 
-*bplay-0.991 (<Mar 13, 2002>)
+  25 Jul 2005; David Holm <dholm@gentoo.org> bplay-0.991.ebuild:
+  Added to ~ppc.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> bplay-0.991.ebuild:
+  Stable sparc.
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> bplay-0.991.ebuild:
+  Added to ~sparc.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> bplay-0.991.ebuild:
+  Stable amd64.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> bplay-0.991.ebuild:
+  virtual/glibc -> virtual/libc
+
+  27 Apr 2004; Dylan Carlson <absinthe@gentoo.org> bplay-0.991.ebuild:
+  Added ~amd64 to KEYWORDS.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> bplay-0.991.ebuild:
+  Added IUSE.
+
+*bplay-0.991 (Mar 13 2002)
 
   13 Mar 2002; Arcady Genkin <agenkin@thpoon.com> bplay-0.991.ebuild:
   
-  First version of this package.
\ No newline at end of file
+  First version of this package.
diff --git a/media-sound/bplay/Manifest b/media-sound/bplay/Manifest
index e69de29bb2d1..10f2e89ee140 100644
--- a/media-sound/bplay/Manifest
+++ b/media-sound/bplay/Manifest
@@ -0,0 +1,4 @@
+MD5 b1ffba81c93270ed82c6f3d7e9e36744 ChangeLog 1011
+MD5 bc7c1c564aa6196b12660d359b09ac71 bplay-0.991.ebuild 683
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 456f4e1dc90197fd9d52549fbc1913fe files/digest-bplay-0.991 62
diff --git a/media-sound/bplay/bplay-0.991.ebuild b/media-sound/bplay/bplay-0.991.ebuild
index 199f98e5f375..b388d62ae067 100644
--- a/media-sound/bplay/bplay-0.991.ebuild
+++ b/media-sound/bplay/bplay-0.991.ebuild
@@ -1,24 +1,26 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2
-# Maintainer: Arcady Genkin <agenkin@thpoon.com>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bplay/bplay-0.991.ebuild,v 1.1 2002/03/13 06:00:55 agenkin Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bplay/bplay-0.991.ebuild,v 1.1.1.1 2005/11/30 09:38:32 chriswhite Exp $
+
+IUSE=""
 
 DESCRIPTION="No-frills command-line buffered player and recorder."
 HOMEPAGE="http://www.amberdata.demon.co.uk/bplay/"
-
 SRC_URI="http://www.amberdata.demon.co.uk/bplay/${P}.tar.gz"
-S="${WORKDIR}/${P}"
 
-DEPEND="virtual/glibc"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ~ppc sparc x86"
+
+DEPEND="virtual/libc"
 
 src_compile() {
-    emake CFLAGS="${CFLAGS} -Wall -DUSEBUFFLOCK" bplay || die
+	emake CFLAGS="${CFLAGS} -Wall -DUSEBUFFLOCK" bplay || die
 }
 
 src_install () {
-    exeinto /usr/bin
-    doexe bplay
-    dosym /usr/bin/bplay /usr/bin/brec
-    doman bplay.1 brec.1
-    dodoc COPYING README
+	dobin bplay || die
+	dosym /usr/bin/bplay /usr/bin/brec
+	doman bplay.1 brec.1
+	dodoc README
 }
diff --git a/media-sound/bpmdj/ChangeLog b/media-sound/bpmdj/ChangeLog
index 8bdded836c7a..68cfafac9e85 100644
--- a/media-sound/bpmdj/ChangeLog
+++ b/media-sound/bpmdj/ChangeLog
@@ -1,15 +1,105 @@
 # ChangeLog for media-sound/bpmdj
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bpmdj/ChangeLog,v 1.1 2003/02/02 19:30:08 pvdabeel Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bpmdj/ChangeLog,v 1.1.1.1 2005/11/30 09:38:39 chriswhite Exp $
 
-*bpmdj-1.5.ebuild (15 jan 2003)
+  23 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> bpmdj-2.7.ebuild:
+  Don't use cp -a.
 
-  First release, tested on PPC
+  28 Jul 2005; Caleb Tennis <caleb@gentoo.org> bpmdj-2.6.ebuild,
+  bpmdj-2.7.ebuild:
+  Fix qt dep per bug #100235
+
+  17 Jul 2005; Frank van de Pol <fvdpol@gentoo.org> :
+  Version bump to 2.7 + cleanup old versions. Closes bug #84810.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> bpmdj-2.6.ebuild:
+  Stable x86.
+
+  07 Dec 2004; Joseph Jezak <josejx@gentoo.org> bpmdj-2.6.ebuild:
+  Marked ~ppc for bug #56199.
+
+  30 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> bpmdj-2.5.ebuild,
+  bpmdj-2.6.ebuild:
+  toolchain-funcs eclass goodness for bug #69007.
+
+*bpmdj-2.6 (19 Oct 2004)
+
+  19 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/fabsl-1.7.patch, -files/fabsl-1.8.patch, -files/gcc.patch,
+  -files/makefile, -bpmdj-1.6.ebuild, -bpmdj-2.0.1.ebuild,
+  -bpmdj-2.3.ebuild, -bpmdj-2.4.ebuild, +bpmdj-2.6.ebuild:
+  Version bump closes bug #67539.  Removing old versions.
+
+  03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> bpmdj-2.5.ebuild:
+  Stable x86.
+
+*bpmdj-2.5 (20 Jul 2004)
+
+  20 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> +bpmdj-2.5.ebuild:
+  Version bump closes bug #57562
+
+  05 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> bpmdj-1.6.ebuild,
+  bpmdj-1.9.ebuild, bpmdj-2.0.1.ebuild, bpmdj-2.3.ebuild, bpmdj-2.4.ebuild:
+  -amd64.  Added alsamixergui to RDEP.
+
+*bpmdj-2.4 (04 Jul 2004)
+
+  04 Jul 2004; Frank van de Pol <fvdpol@gentoo.org> +bpmdj-2.4.ebuild:
+  Version bump.
+
+  30 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> bpmdj-2.3.ebuild:
+  Stable x86.
+
+*bpmdj-2.3 (31 Mar 2004)
+
+  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> bpmdj-1.6.ebuild,
+  bpmdj-1.9.ebuild, bpmdj-2.0.1.ebuild, bpmdj-2.3.ebuild:
+  Added addwrites for QT bug #45658.  Version bump closes bug #40503.
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  19 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> bpmdj-1.5.ebuild,
+  bpmdj-1.6.ebuild, bpmdj-1.7.ebuild, bpmdj-1.8.ebuild, bpmdj-1.9.ebuild,
+  bpmdj-2.0.1.ebuild:
+  fixed dep.  bump to stable x86
+
+*bpmdj-2.0.1 (29 Sep 2003)
+
+  29 Sep 2003; jje <jje@gentoo.org> bpmdj-2.0.1.ebuild, files/gcc.patch:
+  Version bump. Includes patch for gcc 3.3.
   
-  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.
+  Submitted by: Wade Brown <wandy@nmt.edu>
+
+*bpmdj-1.9 (15 Jul 2003)
+
+  21 Aug 2003; Mamoru KOMACHI <usata@gentoo.org> bpmdj-1.5.ebuild,
+  bpmdj-1.6.ebuild, bpmdj-1.7.ebuild, bpmdj-1.8.ebuild, bpmdj-1.9.ebuild:
+  Added tetex to DEPEND list. Thanks to Rossen Apostolov
+  <rossen@protein.osaka-u.ac.jp> for reporting.  Closing bug #27031
+
+  15 Jul 2003; root <root@gentoo.org> bpmdj-1.9.ebuild:
+  yet another release
+
+*bpmdj-1.8 (14 Jul 2003)
+
+  14 Jul 2003; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  added ebuild - contacted author about upstream patch ~ppc and ~x86
+
+*bpmdj-1.7 (14 Jul 2003)
+
+  14 Jul 2003; Pieter Van den Abeele <pvdabeel@gentoo.org> 
+  added ebuild - contacted author about upstream patch ~ppc and ~x86
+
+*bpmdj-1.6 (28 Feb 2003)
+
+  14 Jul 2003; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  added to stable 
+
+  12 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
+*bpmdj-1.5.ebuild (15 jan 2003)
+
+  14 Jul 2003; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  added to stable 
+
+  15 Jan 2003; Pieter Van den Abeele <pvdabeel@gentoo.org> 
+  First release, tested on PPC
diff --git a/media-sound/bpmdj/Manifest b/media-sound/bpmdj/Manifest
index e69de29bb2d1..1daf36d37c7c 100644
--- a/media-sound/bpmdj/Manifest
+++ b/media-sound/bpmdj/Manifest
@@ -0,0 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 cd7d00901325249ad32ac915384d81db bpmdj-2.7.ebuild 1681
+MD5 64b006a88b659ba45a655e892d156563 ChangeLog 3521
+MD5 e8c601c4f54359cb867907c9701ad0a8 bpmdj-2.6.ebuild 1599
+MD5 f14eac4b2cc948a5ae6ca37b64372555 bpmdj-2.5.ebuild 1102
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 3a9529455bb8bc91f60925011fb648bb files/bpmdj-2.6-errno.patch 375
+MD5 fa52f73194ecd28f22727e5d107a839b files/digest-bpmdj-2.7 65
+MD5 2b34dadd03537b0845c2d9133f59def2 files/digest-bpmdj-2.5 65
+MD5 02340215aa4fd9277ca1ccdc0d252e3e files/digest-bpmdj-2.6 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDC1pOj5H05b2HAEkRAj1FAJwKdl4IqQc5RdyJC83P8I+UXg3soACeNN+x
+ks5Z2S/3S2A8xkdQctjnOyI=
+=yUuW
+-----END PGP SIGNATURE-----
diff --git a/media-sound/bpmdj/bpmdj-2.5.ebuild b/media-sound/bpmdj/bpmdj-2.5.ebuild
index d4a897f2e81f..efaa719d4904 100644
--- a/media-sound/bpmdj/bpmdj-2.5.ebuild
+++ b/media-sound/bpmdj/bpmdj-2.5.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/media-sound/bpmdj/bpmdj-2.5.ebuild,v 1.1 2004/07/21 00:14:45 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bpmdj/bpmdj-2.5.ebuild,v 1.1.1.1 2005/11/30 09:38:39 chriswhite Exp $
+
+inherit toolchain-funcs
 
 DESCRIPTION="Bpmdj, software for measuring the BPM of music and mixing"
 HOMEPAGE="http://bpmdj.sourceforge.net/"
@@ -9,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.source.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 #-amd64: 2.5: kbpm-play: common.cpp:64: void common_init(): Assertion `sizeof(signed4)==4'
-KEYWORDS="~x86 -amd64"
+KEYWORDS="x86 -amd64"
 
 IUSE=""
 
@@ -24,7 +26,7 @@ src_compile() {
 	addwrite "${QTDIR}/etc/settings"
 
 	cp defines.gentoo defines
-	make ${MAKEOPTS} CPP=g++ CC=gcc VARTEXFONTS=${T}/fonts || die
+	emake CPP=$(tc-getCXX) CC=$(tc-getCC) VARTEXFONTS=${T}/fonts || die
 }
 
 src_install () {
diff --git a/media-sound/bpmdj/bpmdj-2.6.ebuild b/media-sound/bpmdj/bpmdj-2.6.ebuild
index 64d03e284907..244c04b58690 100644
--- a/media-sound/bpmdj/bpmdj-2.6.ebuild
+++ b/media-sound/bpmdj/bpmdj-2.6.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/media-sound/bpmdj/bpmdj-2.6.ebuild,v 1.1 2004/10/20 04:00:05 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bpmdj/bpmdj-2.6.ebuild,v 1.1.1.1 2005/11/30 09:38:39 chriswhite Exp $
 
 IUSE="mp3 oggvorbis"
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Bpmdj, software for measuring the BPM of music and mixing"
 HOMEPAGE="http://bpmdj.sourceforge.net/"
@@ -13,9 +13,9 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.source.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 #-amd64: 2.6 - kbpm-play: common.cpp:42: void common_init(): Assertion `sizeof(signed4)==4' failed. - eradicator
-KEYWORDS="-amd64 ~x86"
+KEYWORDS="-amd64 x86 ~ppc"
 
-DEPEND="x11-libs/qt"
+DEPEND="=x11-libs/qt-3*"
 
 RDEPEND="${DEPEND}
 	 mp3? ( dev-perl/MP3-Tag )
@@ -33,7 +33,7 @@ src_compile() {
 	addwrite "${QTDIR}/etc/settings"
 
 	cp defines.gentoo defines
-	make ${MAKEOPTS} CPP=g++ CC=gcc VARTEXFONTS=${T}/fonts || die "make failed"
+	emake CPP=$(tc-getCXX) CC=$(tc-getCC) VARTEXFONTS=${T}/fonts || die "make failed"
 }
 
 src_install () {
@@ -44,7 +44,7 @@ src_install () {
 	exeinto /usr/bin
 	doexe alsamixerguis bpmdj-raw bpmdj-record bpmdj-replay copydirstruct fetchdirstruct fetchfiles kbpm-batch kbpm-dj kbpm-merge kbpm-mix kbpm-play rbpm-play record_mixer xmms-play || die "doexe failed"
 	use mp3 && doexe bpmdj-import-mp3.pl
-	use oggvorbis && doexe bpmdj-import-ogg.pl 
+	use oggvorbis && doexe bpmdj-import-ogg.pl
 	dodoc authors changelog copyright readme todo || die "dodoc failed"
 	mkdir -p ${D}/usr/share/bpmdj
 	cp -a sequences ${D}/usr/share/bpmdj/ || die "cp failed"
diff --git a/media-sound/bpmdj/bpmdj-2.7.ebuild b/media-sound/bpmdj/bpmdj-2.7.ebuild
index e4f93b592abb..3348fc743609 100644
--- a/media-sound/bpmdj/bpmdj-2.7.ebuild
+++ b/media-sound/bpmdj/bpmdj-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/media-sound/bpmdj/bpmdj-2.7.ebuild,v 1.1 2005/07/17 19:24:46 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bpmdj/bpmdj-2.7.ebuild,v 1.1.1.1 2005/11/30 09:38:39 chriswhite Exp $
 
 IUSE="mp3 oggvorbis"
 
@@ -15,7 +15,7 @@ SLOT="0"
 #-amd64: 2.6-2.7 - kbpm-play: common.cpp:42: void common_init(): Assertion `sizeof(signed4)==4' failed. - eradicator
 KEYWORDS="-amd64 ~x86 ~ppc"
 
-DEPEND="x11-libs/qt"
+DEPEND="=x11-libs/qt-3*"
 
 RDEPEND="${DEPEND}
 	 mp3? ( dev-perl/MP3-Tag )
@@ -47,5 +47,5 @@ src_install () {
 	use oggvorbis && doexe bpmdj-import-ogg.pl
 	dodoc authors changelog copyright readme todo || die "dodoc failed"
 	mkdir -p ${D}/usr/share/bpmdj
-	cp -a sequences ${D}/usr/share/bpmdj/ || die "cp failed"
+	cp -pPR sequences ${D}/usr/share/bpmdj/ || die "cp failed"
 }
diff --git a/media-sound/brutefir/ChangeLog b/media-sound/brutefir/ChangeLog
index f14007cfa183..670518ca023a 100644
--- a/media-sound/brutefir/ChangeLog
+++ b/media-sound/brutefir/ChangeLog
@@ -1,6 +1,36 @@
 # ChangeLog for media-sound/brutefir
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/brutefir/ChangeLog,v 1.1 2004/08/17 22:55:24 fvdpol Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/brutefir/ChangeLog,v 1.1.1.1 2005/11/30 09:38:26 chriswhite Exp $
+
+*brutefir-1.0f (18 Oct 2005)
+
+  18 Oct 2005; Tony Vroon <chainsaw@gentoo.org> +brutefir-1.0f.ebuild:
+  Version bump, closes bug #108906.
+
+  04 May 2005; David Holm <dholm@gentoo.org> brutefir-1.0c.ebuild:
+  Readded to ~ppc. Please don't remove it without filing a proper bugreport.
+
+*brutefir-1.0c (22 Jan 2005)
+
+  22 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> +brutefir-1.0c.ebuild:
+  new upstream version, fixes #77637
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  brutefir-1.0a.ebuild:
+  multilib fixes.
+
+  28 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  brutefir-1.0a.ebuild:
+  Stable amd64, x86.
+
+  28 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  brutefir-1.0a.ebuild:
+  Stable amd64, x86.  Added to ~sparc.
+
+*brutefir-1.0a (28 Aug 2004)
+
+  28 Aug 2004; David Holm <dholm@gentoo.org> brutefir-1.0a.ebuild:
+  Added to ~ppc.
 
   18 Aug 2004; <frank@gentoo.org> :
   New ebuild for brutefir 1.0 submitted by Ed Wildgoose <gentoo@wildgooses.com>.
diff --git a/media-sound/brutefir/Manifest b/media-sound/brutefir/Manifest
index 0d14bea97f06..54e68bfe4425 100644
--- a/media-sound/brutefir/Manifest
+++ b/media-sound/brutefir/Manifest
@@ -1,4 +1,18 @@
-MD5 c0faf8d46bf8efe84da104677f1f1ba5 brutefir-1.0a.ebuild 1163
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 2b9d1299955f281f9d0d0f25328fe19f ChangeLog 260
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3884dd6c510ff66ae3aaa3a4081329cd ChangeLog 1219
+MD5 c43ff38601053da1c3c6b7ee55c36be3 brutefir-1.0a.ebuild 1375
+MD5 6436e194d5f16699d8e192a981c3664f brutefir-1.0c.ebuild 1440
+MD5 5fb30fa19c4e9cab5fb9106ddae5f903 brutefir-1.0f.ebuild 1440
 MD5 e53cb835af1469d768807b0fd8ba01b5 files/digest-brutefir-1.0a 65
+MD5 f3fe2cc506000749fab46ac8f60f5a77 files/digest-brutefir-1.0c 65
+MD5 61cb56ec32c0be03de77091426320138 files/digest-brutefir-1.0f 65
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDVXtep5vW4rUFj5oRAkUkAJ9yubyR9rfAWsCPPk8cCQdRvokiFgCfczzg
+snmXZ9Ju+tX85eENnAyKNiY=
+=ER23
+-----END PGP SIGNATURE-----
diff --git a/media-sound/brutefir/brutefir-1.0a.ebuild b/media-sound/brutefir/brutefir-1.0a.ebuild
index f629ab3c15d7..45384a5fe0e7 100644
--- a/media-sound/brutefir/brutefir-1.0a.ebuild
+++ b/media-sound/brutefir/brutefir-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/media-sound/brutefir/brutefir-1.0a.ebuild,v 1.1 2004/08/17 22:55:24 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/brutefir/brutefir-1.0a.ebuild,v 1.1.1.1 2005/11/30 09:38:26 chriswhite Exp $
 
 IUSE=""
 
@@ -12,12 +12,15 @@ SRC_URI="http://www.ludd.luth.se/~torger/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64 ~ppc"
 
-DEPEND="virtual/libc
-	>=media-libs/alsa-lib-0.9.1
+DEPEND=">=media-libs/alsa-lib-0.9.1
 	media-sound/jack-audio-connection-kit
-	>=dev-libs/fftw-3.0.0"
+	>=sci-libs/fftw-3.0.0"
+
+src_compile() {
+	emake || die
+}
 
 src_install() {
 
@@ -27,6 +30,10 @@ src_install() {
 	einstall DESTDIR=${D} \
 		INSTALL_PREFIX=${D}/usr	|| die
 
+	if [ "$(get_libdir)" != "lib" ]; then
+		mv ${D}/usr/lib ${D}/usr/$(get_libdir)
+	fi
+
 	dodoc CHANGES README LICENSE
 
 	insinto usr/share/brutefir
diff --git a/media-sound/brutefir/brutefir-1.0c.ebuild b/media-sound/brutefir/brutefir-1.0c.ebuild
index 73df6928dc93..9000f8dd24f2 100644
--- a/media-sound/brutefir/brutefir-1.0c.ebuild
+++ b/media-sound/brutefir/brutefir-1.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/media-sound/brutefir/brutefir-1.0c.ebuild,v 1.1 2005/01/22 11:53:26 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/brutefir/brutefir-1.0c.ebuild,v 1.1.1.1 2005/11/30 09:38:26 chriswhite Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.ludd.luth.se/~torger/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86 ~amd64 ~ppc"
 
 DEPEND=">=media-libs/alsa-lib-0.9.1
 	media-sound/jack-audio-connection-kit
@@ -40,10 +40,10 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo ""
+	einfo
 	einfo "Brutefir is a complicated piece of software. Please"
-	einfo "read the documentation first! You can find "
+	einfo "read the documentation first! You can find"
 	einfo "documentation here: http://www.ludd.luth.se/~torger/brutefir.html"
 	einfo "Example config files are in /usr/share/brutefir"
-	einfo ""
+	einfo
 }
diff --git a/media-sound/brutefir/brutefir-1.0f.ebuild b/media-sound/brutefir/brutefir-1.0f.ebuild
index 277afa389037..49ea1ebd6202 100644
--- a/media-sound/brutefir/brutefir-1.0f.ebuild
+++ b/media-sound/brutefir/brutefir-1.0f.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/brutefir/brutefir-1.0f.ebuild,v 1.1 2005/10/18 22:37:56 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/brutefir/brutefir-1.0f.ebuild,v 1.1.1.1 2005/11/30 09:38:26 chriswhite Exp $
 
 inherit eutils
 
diff --git a/media-sound/cantus/ChangeLog b/media-sound/cantus/ChangeLog
index 7900bdc6ed7a..ec0be506cdcf 100644
--- a/media-sound/cantus/ChangeLog
+++ b/media-sound/cantus/ChangeLog
@@ -1,6 +1,44 @@
 # ChangeLog for media-sound/cantus
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cantus/ChangeLog,v 1.1 2002/12/22 21:05:03 mjc Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cantus/ChangeLog,v 1.1.1.1 2005/11/30 09:38:45 chriswhite Exp $
+
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> cantus-1.99.9.ebuild:
+  Don't install COPYING, INSTALL and ABOUT-NLS files.
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> cantus-1.99.9.ebuild:
+  Added to ~ppc.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  cantus-1.99.9.ebuild:
+  Added to ~sparc.
+
+  26 May 2004; Brian Harring <ferringb@gentoo.org> cantus-1.07.ebuild:
+  Fix cantus-1.07's deps, similar to bug 36009
+
+  17 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> cantus-1.07.ebuild:
+  IUSE=oggvorbis.
+
+  26 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> cantus-1.07.ebuild,
+  cantus-1.99.9.ebuild:
+  HOMEPAGE fix.
+
+  26 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> cantus-1.0.3.ebuild,
+  cantus-1.07.ebuild, cantus-1.99.9.ebuild:
+  Fixed USE flags.  Stable in x86.
+
+*cantus-1.99.9 (28 Oct 2003)
+
+  28 Oct 2003; Hanno Boeck <hanno@gentoo.org> cantus-1.0.3.ebuild,
+  cantus-1.07.ebuild, cantus-1.99.9.ebuild, files/cantus2.desktop,
+  files/cantus_icon.png:
+  Add slottet ebuild for cantus 2. Resolves bug 28081.
+
+*cantus-1.07 (19 Jun 2003)
+
+  19 Jun 2003; Michael J. Cohen <mjc@gentoo.org> cantus-1.07.ebuild :
+
+  Tagging has been updated along with quite a few bugfixes.  Cantus 2.0
+  is due out soon, which uses gtk2.
 
 *cantus-1.0.3 (22 Dec 2002)
   
diff --git a/media-sound/cantus/Manifest b/media-sound/cantus/Manifest
index e69de29bb2d1..ee805f604af8 100644
--- a/media-sound/cantus/Manifest
+++ b/media-sound/cantus/Manifest
@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 156bfb2c44484effd2f18b3b0eb016c1 ChangeLog 1673
+MD5 e1c0448875256ae32dd30b59c34abc24 cantus-1.99.9.ebuild 1010
+MD5 833259978e23fdf9d26df6e66615f5f5 cantus-1.07.ebuild 753
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 58a1fb57ff41438716c82931fad1de38 files/digest-cantus-1.99.9 69
+MD5 8b5db6b15a4f68cd42cae62e38bd9b14 files/digest-cantus-1.07 65
+MD5 44ff3a2ea695f3802155a2942d88c8ad files/cantus.png 2383
+MD5 04283eca3698674fa0da073ba44d14af files/cantus2.desktop 186
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGtBNj5H05b2HAEkRAiNcAJ97aHealR9L8iVLqOpPTXkAh3cHegCfZMpb
+VMvfj1qARtKLI0MxAnQNJS0=
+=zem/
+-----END PGP SIGNATURE-----
diff --git a/media-sound/cantus/cantus-1.07.ebuild b/media-sound/cantus/cantus-1.07.ebuild
index f4dde47a2c7e..3b6d108ca616 100644
--- a/media-sound/cantus/cantus-1.07.ebuild
+++ b/media-sound/cantus/cantus-1.07.ebuild
@@ -1,19 +1,20 @@
-# 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/media-sound/cantus/cantus-1.07.ebuild,v 1.1 2003/06/19 11:39:23 mjc Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cantus/cantus-1.07.ebuild,v 1.1.1.1 2005/11/30 09:38:45 chriswhite Exp $
 
 DESCRIPTION="easy to use tool for tagging and renaming MP3 and OGG/Vorbis files"
-HOMEPAGE="http://software.manicsadness.com/?site=project&project=1"
+HOMEPAGE="http://software.manicsadness.com/?site=project&project=3"
 SRC_URI="http://sam.homeunix.com/software.manicsadness.com-step3/releases/cantus/${P}-1.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
+SLOT="1"
+KEYWORDS="x86 amd64"
 
-DEPEND="vorbis? ( media-libs/libvorbis
-		media-libs/libogg )"
+IUSE="oggvorbis"
 
-S="${WORKDIR}/${P}"
+DEPEND="oggvorbis? ( media-libs/libvorbis )
+	gnome-base/libgnome
+	=x11-libs/gtk+-1.2*"
 
 src_compile() {
 	econf || die "configure failed"
@@ -23,4 +24,3 @@ src_compile() {
 src_install() {
 	einstall || die "Install failed"
 }
-					
diff --git a/media-sound/cantus/cantus-1.99.9.ebuild b/media-sound/cantus/cantus-1.99.9.ebuild
index 4e9a314a63bb..ad6234e8699c 100644
--- a/media-sound/cantus/cantus-1.99.9.ebuild
+++ b/media-sound/cantus/cantus-1.99.9.ebuild
@@ -1,36 +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/media-sound/cantus/cantus-1.99.9.ebuild,v 1.1 2003/10/28 11:05:25 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cantus/cantus-1.99.9.ebuild,v 1.1.1.1 2005/11/30 09:38:45 chriswhite Exp $
+
+IUSE="oggvorbis"
 
 DESCRIPTION="Easy to use tool for tagging and renaming MP3 and OGG/Vorbis files"
-HOMEPAGE="http://www.debain.org/?session=&site=project&project=1"
+HOMEPAGE="http://www.debain.org/?session=&site=project&project=3"
 SRC_URI="http://sam.homeunix.com/software.manicsadness.com-step4/releases/cantus_2/${PN}_2-${PV}-1.tar.gz"
-IUSE="gnome"
+
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 
-DEPEND="vorbis? ( media-libs/libvorbis
-		media-libs/libogg )
-		>=x11-libs/gtk+-2.2
-		>=gnome-base/libglade-2.0.1"
-
-RDEPEND="${DEPEND}"
+DEPEND="oggvorbis? ( media-libs/libvorbis media-libs/libogg )
+	>=x11-libs/gtk+-2.2
+	>=gnome-base/libglade-2.0.1"
 
 S="${WORKDIR}/${PN}-2-${PV}"
 
-src_compile() {
-	econf || die
-	emake || die
-}
-
 src_install() {
 	einstall || die
 	rm -rf ${D}/usr/doc
-	dodoc TODO README NEWS INSTALL ChangeLog COPYING AUTHORS ABOUT-NLS
-	doins ${FILESDIR}/cantus_icon.png
-	if [ "`use gnome`" ] ; then
-		insinto /usr/share/gnome/apps/Multimedia
-		doins ${FILESDIR}/cantus2.desktop
-	fi
+	dodoc TODO README NEWS ChangeLog AUTHORS
+	insinto /usr/share/pixmaps
+	doins ${FILESDIR}/cantus.png
+
+	insinto /usr/share/gnome/apps/Multimedia
+	doins ${FILESDIR}/cantus2.desktop
+
+	insinto /usr/share/applnk/Multimedia
+	doins ${FILESDIR}/cantus2.desktop
 }
diff --git a/media-sound/cantus/files/cantus2.desktop b/media-sound/cantus/files/cantus2.desktop
index 8a75bab0c13c..1016855ca774 100644
--- a/media-sound/cantus/files/cantus2.desktop
+++ b/media-sound/cantus/files/cantus2.desktop
@@ -2,7 +2,7 @@
 Name=Cantus Music Tag Editor (Development version)
 Comment=No comment
 Exec=cantus_2
-Icon=/usr/share/pixmaps/cantus/cantus_icon.png
+Icon=/usr/share/pixmaps/cantus.png
 Terminal=false
 MultipleArgs=false
 Type=Application
diff --git a/media-sound/cd-discid/ChangeLog b/media-sound/cd-discid/ChangeLog
index a5c641ec055d..ed15eef10f47 100644
--- a/media-sound/cd-discid/ChangeLog
+++ b/media-sound/cd-discid/ChangeLog
@@ -1,13 +1,50 @@
 # ChangeLog for media-sound/cd-discid
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cd-discid/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/media-sound/cd-discid/ChangeLog,v 1.1.1.1 2005/11/30 09:38:31 chriswhite Exp $
 
-*cd-discid-0.6 (1 Feb 2002)
+  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> cd-discid-0.9.ebuild:
+  Stable on ppc.
+
+  17 Mar 2005; Yuta SATOH <nigoro@gentoo.org> cd-discid-0.9.ebuild:
+  Stable on ppc64
+
+  12 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -cd-discid-0.6.ebuild, cd-discid-0.8.ebuild, cd-discid-0.9.ebuild:
+  Stable amd64, sparc, x86.
+
+  28 Sep 2004; Tom Gall <tgall@gentoo.org> cd-discid-0.9.ebuild:
+  added ~ppc64, bug #64231
+
+*cd-discid-0.9 (15 Sep 2004)
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +cd-discid-0.9.ebuild:
+  Version bump closes bug #64067.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> cd-discid-0.6.ebuild,
+  cd-discid-0.8.ebuild:
+  virtual/glibc -> virtual/libc
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  22 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> cd-discid-0.6.ebuild,
+  cd-discid-0.8.ebuild:
+  Removed explicit S=.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> cd-discid-0.6.ebuild,
+  cd-discid-0.8.ebuild:
+  Added IUSE.
+
+  10 Feb 2004; <augustus@gentoo.org> cd-discid-0.8.ebuild:
+  Not much to it.  Works on amd64.  ~amd64 added.
+
+*cd-discid-0.8 (21 Sep 2003)
+
+  21 Sep 2003; Daniel Robbins <drobbins@gentoo.org>: cd-discid-0.8.ebuild:
+  0.6 tarball was not on our mirrors, new version.
   
-  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.
+  18 Jan 2003; Bryon Roche <kain@kain.org> ChangeLog, cd-discid-0.6.ebuild :
+
+  Added ppc to keywords.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*cd-discid-0.6 (1 Feb 2002)
diff --git a/media-sound/cd-discid/Manifest b/media-sound/cd-discid/Manifest
index e69de29bb2d1..027de5fc3840 100644
--- a/media-sound/cd-discid/Manifest
+++ b/media-sound/cd-discid/Manifest
@@ -0,0 +1,6 @@
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 b2d5c9d9ba53141cd54581ebec88f51e ChangeLog 1655
+MD5 084c94b334c5b6ccdda2fd5da8ca7679 cd-discid-0.8.ebuild 723
+MD5 c81dbf9bf86551541103dd01a73a506e cd-discid-0.9.ebuild 729
+MD5 b0c6b5b4e405c5e736b2a03fa724a533 files/digest-cd-discid-0.9 69
+MD5 46a28720bb5f8a1eca5efc9cf06e3a59 files/digest-cd-discid-0.8 69
diff --git a/media-sound/cd-discid/cd-discid-0.8.ebuild b/media-sound/cd-discid/cd-discid-0.8.ebuild
index 7706a03ffdc6..a6ea1f998e2e 100644
--- a/media-sound/cd-discid/cd-discid-0.8.ebuild
+++ b/media-sound/cd-discid/cd-discid-0.8.ebuild
@@ -1,29 +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/media-sound/cd-discid/cd-discid-0.8.ebuild,v 1.1 2003/09/21 21:14:55 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cd-discid/cd-discid-0.8.ebuild,v 1.1.1.1 2005/11/30 09:38:31 chriswhite Exp $
+
+IUSE=""
+
+inherit toolchain-funcs
 
-S=${WORKDIR}/${P}
 DESCRIPTION="returns the disc id for the cd in the cd-rom drive"
 SRC_URI="http://lly.org/~rcw/cd-discid/${PN}_${PV}.orig.tar.gz"
 HOMEPAGE="http://lly.org/~rcw/abcde/page/"
 
-DEPEND="virtual/glibc"
-
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc ppc"
+KEYWORDS="amd64 ppc sparc x86"
 
-src_compile() {
+DEPEND="virtual/libc"
 
-	echo gcc ${CFLAGS} -o cd-discid cd-discid.c
-	gcc ${CFLAGS} -o cd-discid cd-discid.c
+src_compile() {
+	echo $(tc-getCC) ${CFLAGS} -o cd-discid cd-discid.c
+	$(tc-getCC) ${CFLAGS} -o cd-discid cd-discid.c
 }
 
 src_install () {
-
 	into /usr
 	dobin cd-discid
 	doman cd-discid.1
 
-	dodoc COPYING README changelog
+	dodoc README changelog
 }
diff --git a/media-sound/cd-discid/cd-discid-0.9.ebuild b/media-sound/cd-discid/cd-discid-0.9.ebuild
index b82a29031d86..7bfc1c76ac16 100644
--- a/media-sound/cd-discid/cd-discid-0.9.ebuild
+++ b/media-sound/cd-discid/cd-discid-0.9.ebuild
@@ -1,22 +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/media-sound/cd-discid/cd-discid-0.9.ebuild,v 1.1 2004/09/15 20:16:39 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cd-discid/cd-discid-0.9.ebuild,v 1.1.1.1 2005/11/30 09:38:31 chriswhite Exp $
 
 IUSE=""
 
+inherit toolchain-funcs
+
 DESCRIPTION="returns the disc id for the cd in the cd-rom drive"
 SRC_URI="http://lly.org/~rcw/cd-discid/${PN}_${PV}.orig.tar.gz"
 HOMEPAGE="http://lly.org/~rcw/abcde/page/"
 
-DEPEND="virtual/libc"
-
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+
+DEPEND="virtual/libc"
 
 src_compile() {
-	echo gcc ${CFLAGS} -o cd-discid cd-discid.c
-	gcc ${CFLAGS} -o cd-discid cd-discid.c
+	echo $(tc-getCC) ${CFLAGS} -o cd-discid cd-discid.c
+	$(tc-getCC) ${CFLAGS} -o cd-discid cd-discid.c
 }
 
 src_install () {
diff --git a/media-sound/cdcd/ChangeLog b/media-sound/cdcd/ChangeLog
index 62158afd1f38..0ab5e29d4f32 100644
--- a/media-sound/cdcd/ChangeLog
+++ b/media-sound/cdcd/ChangeLog
@@ -1,6 +1,81 @@
 # ChangeLog for media-sound/cdcd
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cdcd/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/media-sound/cdcd/ChangeLog,v 1.1.1.1 2005/11/30 09:38:32 chriswhite Exp $
+
+*cdcd-0.6.6-r1 (17 Aug 2005)
+
+  17 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/cdcd-0.6.6-fbsd.patch, +cdcd-0.6.6-r1.ebuild:
+  Added patch for G/FBSD compatibility, updated HOMEPAGE and removed
+  installation of COPYING file.
+
+  08 Apr 2005; Markus Rothe <corsair@gentoo.org> cdcd-0.6.6.ebuild:
+  Stable on ppc64
+
+  18 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/cdcd-0.5.0-r1-gentoo.patch, -cdcd-0.5.0-r1.ebuild:
+  Removed old version. Readded ~ppc64 to ebuild as it seems to have been
+  mistakenly removed.
+
+  04 Oct 2004; Jason Wever <weeve@gentoo.org> cdcd-0.6.6.ebuild:
+  Stable on sparc.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> cdcd-0.6.6.ebuild:
+  Readding ~sparc.
+
+  03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> cdcd-0.6.6.ebuild:
+  Stable amd64, x86.
+
+  29 Jul 2004; Tom Gall <tgall@gentoo.org> cdcd-0.64.ebuild:
+  stable on ppc64, bug #55567
+
+  04 Jul 2004; David Holm <dholm@gentoo.org> cdcd-0.6.6.ebuild:
+  Added to ~ppc.
+
+*cdcd-0.6.6 (03 Jul 2004)
+
+  03 Jul 2004; Frank van de Pol <fvdpol@gentoo.org> +cdcd-0.6.6.ebuild:
+  Version bump to 0.6.6. Closes bug #54717.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> cdcd-0.5.0-r1.ebuild,
+  cdcd-0.6.4.ebuild:
+  virtual/glibc -> virtual/libc
+
+  22 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> cdcd-0.5.0-r1.ebuild,
+  cdcd-0.6.4.ebuild:
+  Removed explicit S=.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> cdcd-0.5.0-r1.ebuild,
+  cdcd-0.6.4.ebuild:
+  Added IUSE.
+
+  07 Apr 2004; Jason Eric Huebel <jhuebel@gentoo.org> :
+  added gnuconfig_update
+
+*cdcd-0.6.4 (19 Jul 2002)
+
+  03 Feb 2003; Stefan Jones <cretin@gentoo.org> files/cdcd-0.5.0-r1-gentoo.patch :
+  Fix build issue. Unmasking
+
+  07 Dec 2002; Jack Morgan <jmorgan@gentoo.org> cdcd-0.6.4.ebuild :
+  Changed sparc64 to sparc keyword
+
+  19 Jul 2002; Seeamnt Kulleen <seemant@gentoo.org> cdcd-0.6.4.ebuild
+  files/digest-cdcd-0.6.4 :
+
+  Version bump. I forget who, might have been a bugzilla report.  Apologies.
+
+*cdcd-0.5.0-r1 (13 Jul 2002)
+
+  18 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> cdcd-0.5.0-r1.ebuild :
+
+  Cleaned the ebuild up a bit.
+
+
+  13 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> cdcd-0.5.0-r1.ebuild :
+
+  Fixed a library ordering issue, found and fixed by Sam Yates (sam@quux.dropbear.id.au).
+  Closes bug #4904.
 
 *cdcd-0.5.0 (1 Feb 2002)
 
diff --git a/media-sound/cdcd/Manifest b/media-sound/cdcd/Manifest
index e69de29bb2d1..1ce76b95b20f 100644
--- a/media-sound/cdcd/Manifest
+++ b/media-sound/cdcd/Manifest
@@ -0,0 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 78bacf9692f3817fae73ed93086f19c2 ChangeLog 2997
+MD5 a15728e5d34aa48f21368d9600654c41 cdcd-0.6.6.ebuild 736
+MD5 405089b53190476bb2494a4ed11bd348 cdcd-0.6.6-r1.ebuild 811
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 94ddd3305c2a35012c44768f37ea30f2 cdcd-0.6.4.ebuild 775
+MD5 0046c0fdb538d85b9b5fd853815a0956 files/digest-cdcd-0.6.4 62
+MD5 87fbaee82f519b5db720d80f64dbed8e files/cdcd-0.6.4-gentoo.patch 346
+MD5 e177c90f7b82ca5b8744a9f573dce5f0 files/digest-cdcd-0.6.6 62
+MD5 7e17a3eb77b8594b8d24a6fd9ac374ba files/cdcd-0.6.6-fbsd.patch 811
+MD5 e177c90f7b82ca5b8744a9f573dce5f0 files/digest-cdcd-0.6.6-r1 62
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDAxFIj5H05b2HAEkRAhVIAKCO24DSGmZptYn4Ntd+tlnysimiWwCfeVMY
+c3WoZbH2VwuO+Yrx0CdUgYc=
+=09OS
+-----END PGP SIGNATURE-----
diff --git a/media-sound/cdcd/cdcd-0.6.4.ebuild b/media-sound/cdcd/cdcd-0.6.4.ebuild
index 42db85046c32..bb80ae172bde 100644
--- a/media-sound/cdcd/cdcd-0.6.4.ebuild
+++ b/media-sound/cdcd/cdcd-0.6.4.ebuild
@@ -1,24 +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/media-sound/cdcd/cdcd-0.6.4.ebuild,v 1.1 2002/07/19 13:13:39 seemant Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdcd/cdcd-0.6.4.ebuild,v 1.1.1.1 2005/11/30 09:38:32 chriswhite Exp $
+
+IUSE=""
+
+inherit eutils gnuconfig
 
-S=${WORKDIR}/${P}
 DESCRIPTION="a simple yet powerful command line cd player"
 SRC_URI="mirror://sourceforge/libcdaudio/${P}.tar.gz"
 HOMEPAGE="http://cdcd.undergrid.net/"
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=sys-libs/ncurses-5.0
 	>=sys-libs/readline-4.0
 	>=media-libs/libcdaudio-0.99.4"
 
-src_compile() {
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 sparc ~amd64 ppc64"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	epatch ${FILESDIR}/cdcd-0.6.4-gentoo.patch
 
-	econf || die
-	make || die
+	cd ${S}
+	gnuconfig_update
 }
 
 src_install () {
-	cd ${S}
 	make DESTDIR=${D} install || die
 	dodoc AUTHORS COPYING ChangeLog NEWS README
 }
diff --git a/media-sound/cdcd/cdcd-0.6.6-r1.ebuild b/media-sound/cdcd/cdcd-0.6.6-r1.ebuild
index 99d962860f38..2eefa1884d52 100644
--- a/media-sound/cdcd/cdcd-0.6.6-r1.ebuild
+++ b/media-sound/cdcd/cdcd-0.6.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/media-sound/cdcd/cdcd-0.6.6-r1.ebuild,v 1.1 2005/08/17 10:27:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdcd/cdcd-0.6.6-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:32 chriswhite Exp $
 
 IUSE=""
 
diff --git a/media-sound/cdcd/cdcd-0.6.6.ebuild b/media-sound/cdcd/cdcd-0.6.6.ebuild
index 41e1089091b7..5c3e7b51a2fd 100644
--- a/media-sound/cdcd/cdcd-0.6.6.ebuild
+++ b/media-sound/cdcd/cdcd-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: /var/cvsroot/gentoo-x86/media-sound/cdcd/cdcd-0.6.6.ebuild,v 1.1 2004/07/03 21:09:42 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdcd/cdcd-0.6.6.ebuild,v 1.1.1.1 2005/11/30 09:38:32 chriswhite Exp $
 
 IUSE=""
 
@@ -16,7 +16,7 @@ DEPEND="virtual/libc
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64 ~ppc sparc ppc64"
 
 src_unpack() {
 	unpack ${P}.tar.gz
diff --git a/media-sound/cdmp3/ChangeLog b/media-sound/cdmp3/ChangeLog
index 6ca82ca378cf..fc7ce1dd8600 100644
--- a/media-sound/cdmp3/ChangeLog
+++ b/media-sound/cdmp3/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for media-sound/cdmp3
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cdmp3/ChangeLog,v 1.1 2003/11/26 02:07:37 mkennedy Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdmp3/ChangeLog,v 1.1.1.1 2005/11/30 09:38:28 chriswhite Exp $
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> cdmp3-0.5.0.ebuild:
+  Added to ~ppc.
+
+*cdmp3-0.5.0 (14 May 2005)
+
+  14 May 2005; Jan Brinkmann <luckyduck@gentoo.org> cdmp3-0.4.1.ebuild,
+  +cdmp3-0.5.0.ebuild:
+  new upstream version, 0.4.1 stable on amd64
+
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org> cdmp3-0.4.1.ebuild:
+  Stable on ppc64
+
+  04 Nov 2004; Markus Rothe <corsair@gentoo.org> cdmp3-0.4.1.ebuild:
+  Marked ~ppc64; bug #70048
+
+  06 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> cdmp3-0.4.1.ebuild:
+  ~amd64 ~sparc.
+
+  10 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> cdmp3-0.4.1.ebuild:
+  DEPEND -> RDEPEND since it's not needed to compile.  Moved to stable x86.
 
 *cdmp3-0.4.1 (25 Nov 2003)
 
diff --git a/media-sound/cdmp3/Manifest b/media-sound/cdmp3/Manifest
index b56a4edf5fd2..ff22f0f2942a 100644
--- a/media-sound/cdmp3/Manifest
+++ b/media-sound/cdmp3/Manifest
@@ -1,5 +1,6 @@
-MD5 125ee013081b112d56a1d15507d72ef2 skel.ChangeLog 3674
-MD5 a4de292547a7d4fbe157a4ecb4ce2193 skel.metadata.xml 821
-MD5 a7f56029dfcf7a3ba425efca1bf86c72 cdmp3-0.4.1.ebuild 700
-MD5 652f011c07ca925858993d5f54bc1f06 cdmp3-0.4.1.ebuild~ 6006
+MD5 cef58dee7ba4d8a6eb75cc01f8c59ab1 ChangeLog 1073
+MD5 0074ad103192624fd16e5490d75620f2 cdmp3-0.4.1.ebuild 706
+MD5 e04729f5c4d3e5799eb0aab8ce67fe88 metadata.xml 498
+MD5 e84bd32d334f141f41b49a4161cbd143 cdmp3-0.5.0.ebuild 710
 MD5 2e0a4d59a5adc8792d86200bdc4ce8de files/digest-cdmp3-0.4.1 62
+MD5 19dd060f5782d2ea9a2f23010f386cf5 files/digest-cdmp3-0.5.0 62
diff --git a/media-sound/cdmp3/cdmp3-0.4.1.ebuild b/media-sound/cdmp3/cdmp3-0.4.1.ebuild
index ce5a0ee6da79..0cc44a81ebf1 100644
--- a/media-sound/cdmp3/cdmp3-0.4.1.ebuild
+++ b/media-sound/cdmp3/cdmp3-0.4.1.ebuild
@@ -1,24 +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/media-sound/cdmp3/cdmp3-0.4.1.ebuild,v 1.1 2003/11/26 02:07:38 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdmp3/cdmp3-0.4.1.ebuild,v 1.1.1.1 2005/11/30 09:38:28 chriswhite Exp $
 
 DESCRIPTION="Conveniently rip audio CDs to MP3 or OGG files."
 HOMEPAGE="http://www.roland-riegel.de/cdmp3/index_en.html"
 SRC_URI="http://www.roland-riegel.de/${PN}/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-DEPEND="media-sound/cdparanoia
+KEYWORDS="x86 amd64 ~sparc ppc64"
+IUSE=""
+
+RDEPEND="media-sound/cdparanoia
 	app-cdr/cdrtools
 	media-sound/lame
 	media-sound/vorbis-tools
 	dev-perl/CDDB_get
 	app-misc/bfr"
 
-S=${WORKDIR}/${P}
-
 src_install() {
-	dodoc LICENSE README AUTHORS ChangeLog
 	dobin cdmp3 get_cddb
 	dosym /usr/bin/cdmp3 /usr/bin/cdogg
+	dodoc ChangeLog AUTHORS README
 }
diff --git a/media-sound/cdmp3/cdmp3-0.5.0.ebuild b/media-sound/cdmp3/cdmp3-0.5.0.ebuild
index e6349e1f9509..311e0093001a 100644
--- a/media-sound/cdmp3/cdmp3-0.5.0.ebuild
+++ b/media-sound/cdmp3/cdmp3-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/media-sound/cdmp3/cdmp3-0.5.0.ebuild,v 1.1 2005/05/14 22:01:53 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdmp3/cdmp3-0.5.0.ebuild,v 1.1.1.1 2005/11/30 09:38:28 chriswhite Exp $
 
 DESCRIPTION="Conveniently rip audio CDs to MP3 or OGG files."
 HOMEPAGE="http://www.roland-riegel.de/cdmp3/index_en.html"
@@ -8,7 +8,7 @@ SRC_URI="http://www.roland-riegel.de/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc64"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="media-sound/cdparanoia
diff --git a/media-sound/cdparanoia/ChangeLog b/media-sound/cdparanoia/ChangeLog
index 09c788925a9c..c218bf2f0624 100644
--- a/media-sound/cdparanoia/ChangeLog
+++ b/media-sound/cdparanoia/ChangeLog
@@ -1,6 +1,88 @@
 # ChangeLog for media-sound/cdparanoia
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/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/media-sound/cdparanoia/ChangeLog,v 1.1.1.1 2005/11/30 09:38:09 chriswhite Exp $
+
+  02 Jul 2005; Hardave Riar <hardave@gentoo.org> cdparanoia-3.9.8-r2.ebuild:
+  Stable on mips
+
+  31 May 2005; Sven Wegener <swegener@gentoo.org>
+  cdparanoia-3.9.8-r1.ebuild, cdparanoia-3.9.8-r2.ebuild:
+  Let portage handle the stripping of binaries.
+
+  20 May 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  cdparanoia-3.9.8-r2.ebuild:
+  Stable on hppa
+
+  09 May 2005; Aron Griffis <agriffis@gentoo.org>
+  cdparanoia-3.9.8-r2.ebuild:
+  stable on ia64
+
+  04 Mar 2005; Lars Weiler <pylon@gentoo.org> cdparanoia-3.9.8-r2.ebuild:
+  Stable on ppc.
+
+  01 Mar 2005; Markus Rothe <corsair@gentoo.org> cdparanoia-3.9.8-r2.ebuild:
+  Stable on ppc64
+
+  14 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
+  cdparanoia-3.9.8-r2.ebuild:
+  Stable on alpha.
+
+  12 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  cdparanoia-3.9.8-r2.ebuild:
+  Stable sparc, x86.
+
+  21 Sep 2004; Travis Tilley <lv@gentoo.org>
+  +files/cdparanoia-3.9.8-use-destdir.patch, cdparanoia-3.9.8-r2.ebuild:
+  fixed sandbox violations when CONF_LIBDIR is set by adding DESTDIR support to
+  the makefile. marked stable on amd64 for this fix
+
+*cdparanoia-3.9.8-r2 (01 Sep 2004)
+
+  01 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/cdparanoia-3.9.8-identify_crash.patch,
+  +files/cdparanoia-3.9.8-toc.patch, +cdparanoia-3.9.8-r2.ebuild:
+  Added patches for a couple bugs to close bug #62386. Thanks to Alan Swanson
+  <swanson@ukfsn.org>.
+
+  15 Jul 2004; Tom Gall <tgall@gentoo.org> cdparanoia-3.9.8-r1.ebuild:
+  stable on ppc64, bug #55563
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  cdparanoia-3.9.8-r1.ebuild:
+  virtual/glibc -> virtual/libc
+
+*cdparanoia-3.9.8-r1 (22 Apr 2004)
+
+  23 Apr 2004; Mike Frysinger <vapier@gentoo.org> :
+  Add gcc-3.4 patch (#47869 by Tamran Lengyel), fix include path with 
+  the new cdda_interface patch (#48776 by Carmine Moleti), and use econf 
+  instead of ./configure (me).
+
+  22 Apr 2004; Martin Schlemmer <azarah@gentoo.org>
+  cdparanoia-3.9.8-r1.ebuild,
+  files/cdparanoia-3.9.8-include-cdda_interface_h.patch:
+  cdda_paranoia.h should include cdda_interface_h, else most configure
+  scripts testing for support fails (gnome-vfs, etc).
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  cdparanoia-3.9.8.ebuild:
+  Added IUSE.
+
+  07 Mar 2004; Stephen P. Becker <geoman@gentoo.org> cdparanoia-3.9.8.ebuild:
+  Added ~mips keyword.
+
+  28 Jan 2004; Aron Griffis <agriffis@gentoo.org> cdparanoia-3.9.8.ebuild:
+  stable on ia64
+
+  18 Jan 2003; Bryon Roche <kain@kain.org> ChangeLog, cdparanoia-3.9.8.ebuild :
+  
+  Added ppc to keywords.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  13 Apr 2002; M.Schlemmer <azarah@gentoo.org> cdparanoia-3.9.8.ebuild :
+
+  Fix the creation of the invalid dir, /usr/share/man1.
 
 *cdparanoia-3.9.8 (1 Feb 2002)
 
diff --git a/media-sound/cdparanoia/Manifest b/media-sound/cdparanoia/Manifest
index e69de29bb2d1..a2b5c2b604a5 100644
--- a/media-sound/cdparanoia/Manifest
+++ b/media-sound/cdparanoia/Manifest
@@ -0,0 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 d8b949816db2ef3bd2884e73e2f40fa4 cdparanoia-3.9.8-r1.ebuild 1325
+MD5 a22ca8ded5dc7838500b2d40b4518787 cdparanoia-3.9.8-r2.ebuild 1554
+MD5 69b600cdc9725153164a57014aed249c ChangeLog 3462
+MD5 532963b39bb2da5b1961bcf17fb11e68 files/cdparanoia-3.9.8-include-cdda_interface_h.patch 452
+MD5 0c381b5b41380f5a4a92f3e018fe16fe files/cdparanoia-3.9.8-identify_crash.patch 536
+MD5 9d2dfbe5871d672111900f8d3fd09880 files/digest-cdparanoia-3.9.8-r1 76
+MD5 9d2dfbe5871d672111900f8d3fd09880 files/digest-cdparanoia-3.9.8-r2 76
+MD5 22fcfd4883bc0ce781d42429655a4a3d files/cdparanoia-3.9.8-use-destdir.patch 2468
+MD5 8dfcb53296c1e66ba13fb02d81eef39b files/3.9.8-gcc34.patch 772
+MD5 ab34ae9f60b4a00e3a9e6b7310b84746 files/cdparanoia-3.9.8-toc.patch 778
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCzyhigIKl8Uu19MoRAgkeAJ0UUdj4incn87SgtR81ME4kJeK5eQCfcSQa
+f37jcIhStbf53jsFU92Z8Lk=
+=1djB
+-----END PGP SIGNATURE-----
diff --git a/media-sound/cdparanoia/cdparanoia-3.9.8-r1.ebuild b/media-sound/cdparanoia/cdparanoia-3.9.8-r1.ebuild
index c5ae6edd1b99..f5a8fefefb0d 100644
--- a/media-sound/cdparanoia/cdparanoia-3.9.8-r1.ebuild
+++ b/media-sound/cdparanoia/cdparanoia-3.9.8-r1.ebuild
@@ -1,46 +1,52 @@
-# 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/media-sound/cdparanoia/cdparanoia-3.9.8-r1.ebuild,v 1.1 2004/04/22 19:43:52 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/cdparanoia-3.9.8-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:09 chriswhite Exp $
 
-IUSE=
-
-inherit eutils
+inherit eutils flag-o-matic gnuconfig
 
 MY_P=${PN}-III-alpha9.8
-S=${WORKDIR}/${MY_P}
 DESCRIPTION="an advanced CDDA reader with error correction"
-SRC_URI="http://www.xiph.org/paranoia/download/${MY_P}.src.tgz"
 HOMEPAGE="http://www.xiph.org/paranoia/"
+SRC_URI="http://www.xiph.org/paranoia/download/${MY_P}.src.tgz"
 
-DEPEND="virtual/glibc"
-
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64 ~mips"
+SLOT="0"
+KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64 ~mips ppc64"
+IUSE=""
+
+DEPEND="virtual/libc"
+
+S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A}
-	
 	cd ${S}
+
 	# cdda_paranoia.h should include cdda_interface_h, else most configure
 	# scripts testing for support fails (gnome-vfs, etc).
 	epatch ${FILESDIR}/${P}-include-cdda_interface_h.patch
+	epatch ${FILESDIR}/${PV}-gcc34.patch
+
+	# Let portage handle the stripping of binaries
+	sed -i -e "/strip cdparanoia/d" Makefile.in
+
+	ln -s configure.guess config.guess
+	ln -s configure.sub config.sub
+	gnuconfig_update
+	rm config.{guess,sub}
 }
 
 src_compile() {
-	./configure --prefix=/usr || die
-	# The configure script doesn't recognize i686-pc-linux-gnu
-	# --host=${CHOST}
-
+	append-flags -I${S}/interface
+	econf || die
 	make OPT="${CFLAGS}" || die
 }
 
 src_install() {
 	dodir /usr/{bin,lib,include} /usr/share/man/man1
-	make prefix=${D}/usr \
+	make \
+		prefix=${D}/usr \
 		MANDIR=${D}/usr/share/man \
 		install || die
-
-	dodoc FAQ.txt GPL README
+	dodoc FAQ.txt README
 }
-
diff --git a/media-sound/cdparanoia/cdparanoia-3.9.8-r2.ebuild b/media-sound/cdparanoia/cdparanoia-3.9.8-r2.ebuild
index 6bc0ec52cd3d..b120d006e8d0 100644
--- a/media-sound/cdparanoia/cdparanoia-3.9.8-r2.ebuild
+++ b/media-sound/cdparanoia/cdparanoia-3.9.8-r2.ebuild
@@ -1,23 +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/media-sound/cdparanoia/cdparanoia-3.9.8-r2.ebuild,v 1.1 2004/09/01 08:03:09 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/cdparanoia-3.9.8-r2.ebuild,v 1.1.1.1 2005/11/30 09:38:09 chriswhite Exp $
+
+IUSE=""
 
 inherit eutils flag-o-matic gnuconfig
 
 MY_P=${PN}-III-alpha9.8
+S=${WORKDIR}/${MY_P}
+
 DESCRIPTION="an advanced CDDA reader with error correction"
 HOMEPAGE="http://www.xiph.org/paranoia/"
 SRC_URI="http://www.xiph.org/paranoia/download/${MY_P}.src.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips ~ppc64"
-IUSE=""
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
 
 DEPEND="virtual/libc"
 
-S=${WORKDIR}/${MY_P}
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -27,6 +28,14 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-toc.patch
 	epatch ${FILESDIR}/${P}-identify_crash.patch
 	epatch ${FILESDIR}/${PV}-gcc34.patch
+
+	# if libdir is specified, cdparanoia causes sandbox violations, and using
+	# einstall doesnt work around it. so lets patch in DESTDIR support
+	epatch ${FILESDIR}/${P}-use-destdir.patch
+
+	# Let portage handle the stripping of binaries
+	sed -i -e "/strip cdparanoia/d" Makefile.in
+
 	ln -s configure.guess config.guess
 	ln -s configure.sub config.sub
 	gnuconfig_update
@@ -41,9 +50,6 @@ src_compile() {
 
 src_install() {
 	dodir /usr/{bin,lib,include} /usr/share/man/man1
-	make \
-		prefix=${D}/usr \
-		MANDIR=${D}/usr/share/man \
-		install || die
+	make DESTDIR=${D} install || die
 	dodoc FAQ.txt README
 }
diff --git a/media-sound/cdplay/ChangeLog b/media-sound/cdplay/ChangeLog
index a63741893e1d..83745af345e7 100644
--- a/media-sound/cdplay/ChangeLog
+++ b/media-sound/cdplay/ChangeLog
@@ -1,9 +1,47 @@
 # ChangeLog for media-sound/cdplay
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cdplay/ChangeLog,v 1.1 2002/05/06 00:45:18 rphillips Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdplay/ChangeLog,v 1.1.1.1 2005/11/30 09:38:38 chriswhite Exp $
+
+  14 Sep 2005; Aron Griffis <agriffis@gentoo.org> cdplay-0.9-r1.ebuild:
+  Mark 0.9-r1 stable on alpha
+
+*cdplay-0.9-r1 (20 Apr 2005)
+
+  20 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> -cdplay-0.8.ebuild,
+  +cdplay-0.9-r1.ebuild, -cdplay-0.9.ebuild:
+  now blocking media-sound/cdtool, see #76896. also did some cleanup
+
+  30 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> cdplay-0.9.ebuild:
+  Stable on ppc.
+
+  18 Oct 2004; Tom Gall <tgall@gentoo.org> cdplayer-0.9.ebuild:
+  stable on ppc64, bug #64542
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> cdplay-0.9.ebuild:
+  Stable amd64, sparc.
+
+  07 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> cdplay-0.9.ebuild:
+  ~sparc ~amd64
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> cdplay-0.8.ebuild,
+  cdplay-0.9.ebuild:
+  virtual/glibc -> virtual/libc
+
+  26 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> cdplay-0.8.ebuild,
+  cdplay-0.9.ebuild:
+  Stable on x86.
+
+*cdplay-0.9 (20 Sep 2003)
+
+  20 Sep 2003; jje <jje@gentoo.org> cdplay-0.9.ebuild:
+  Version bump.
 
 *cdplay-0.8 (5 May 2002)
 
+  05 Aug 2002; Calum Selkirk <cselkirk@gentoo.org> cdplay-0.8.ebuild :
+
+  Added ppc to KEYWORDS.
+
   5 May 2002; Ryan Phillips <rphillips@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/media-sound/cdplay/Manifest b/media-sound/cdplay/Manifest
index e69de29bb2d1..dd53145a29aa 100644
--- a/media-sound/cdplay/Manifest
+++ b/media-sound/cdplay/Manifest
@@ -0,0 +1,4 @@
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 7a86e22c8f3a71f94663d9e641cb2cb1 ChangeLog 1820
+MD5 b4b89e4e41245cea0c980e94054f760a cdplay-0.9-r1.ebuild 580
+MD5 3e3dde53ad1c4a5636e01d91fb71de37 files/digest-cdplay-0.9-r1 61
diff --git a/media-sound/cdplay/cdplay-0.9-r1.ebuild b/media-sound/cdplay/cdplay-0.9-r1.ebuild
index df036ac1f96f..f0260ce3b58b 100644
--- a/media-sound/cdplay/cdplay-0.9-r1.ebuild
+++ b/media-sound/cdplay/cdplay-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/media-sound/cdplay/cdplay-0.9-r1.ebuild,v 1.1 2005/04/20 19:00:52 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdplay/cdplay-0.9-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:38 chriswhite Exp $
 
 DESCRIPTION="Console CD Player"
 HOMEPAGE="http://www.x-paste.de/projects/index.php"
@@ -12,7 +12,7 @@ IUSE=""
 SLOT="0"
 LICENSE="GPL-2"
 
-KEYWORDS="x86 ppc ~alpha sparc amd64 ppc64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 
 src_compile() {
 	make || die "make failed"
diff --git a/media-sound/cdstatus/ChangeLog b/media-sound/cdstatus/ChangeLog
index 2a24b93f7f67..347de89e28c9 100644
--- a/media-sound/cdstatus/ChangeLog
+++ b/media-sound/cdstatus/ChangeLog
@@ -1,6 +1,39 @@
 # ChangeLog for media-sound/cdstatus
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cdstatus/ChangeLog,v 1.1 2003/08/09 01:16:54 jje Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdstatus/ChangeLog,v 1.1.1.1 2005/11/30 09:38:07 chriswhite Exp $
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> cdstatus-0.95.04.ebuild:
+  Added to ~ppc.
+
+*cdstatus-0.95.04 (23 Apr 2005)
+
+  23 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> -cdstatus-0.95.03.ebuild,
+  +cdstatus-0.95.04.ebuild:
+  new upstream version, fixes #89649. thanks to Nathanael Hoyle
+  <nhoyle@speedexpress.net>
+
+  19 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> cdstatus-0.95.03.ebuild:
+  some minor changes
+
+*cdstatus-0.95.03 (18 Apr 2005)
+
+  18 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> +cdstatus-0.95.03.ebuild:
+  new upstream version, fixes #89497
+
+  28 Sep 2004; Tom Gall <tgall@gentoo.org> cdstatus-0.94a.ebuild:
+  added ~ppc64, bug #64239
+
+  08 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  cdstatus-0.94a.ebuild:
+  -amd64 -sparc
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  cdstatus-0.94a.ebuild:
+  virtual/glibc -> virtual/libc
+
+  26 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  cdstatus-0.94a.ebuild:
+  Stable on x86.
 
 *cdstatus-0.94a (09 Aug 2003)
 
diff --git a/media-sound/cdstatus/Manifest b/media-sound/cdstatus/Manifest
index 9b351980e28c..082e8030ce44 100644
--- a/media-sound/cdstatus/Manifest
+++ b/media-sound/cdstatus/Manifest
@@ -1,2 +1,7 @@
-MD5 5e2c31fa2c62bb380b442999f0cdd41d cdstatus-0.94a.ebuild 695
+MD5 e02fb0101ed27dfed119e5311373a73a ChangeLog 1393
+MD5 6868d6423e8bf3f2ec2c5ab80d84c7e1 cdstatus-0.94a.ebuild 861
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 ce12461ce36ca8d32968846035bc60bb cdstatus-0.95.04.ebuild 799
+MD5 7d77c0a6fe47b0367208d789a05fd9a0 files/cdstatus-0.94a-gentoo.diff 388
 MD5 95dd0efca17c0f05af4c3ef97ba73161 files/digest-cdstatus-0.94a 64
+MD5 19ee36986d4ae4f0166b022f820c75a4 files/digest-cdstatus-0.95.04 67
diff --git a/media-sound/cdstatus/cdstatus-0.94a.ebuild b/media-sound/cdstatus/cdstatus-0.94a.ebuild
index 1409c8bdbedd..9efb875639c9 100644
--- a/media-sound/cdstatus/cdstatus-0.94a.ebuild
+++ b/media-sound/cdstatus/cdstatus-0.94a.ebuild
@@ -1,38 +1,38 @@
-# 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/media-sound/cdstatus/cdstatus-0.94a.ebuild,v 1.1 2003/08/09 01:16:54 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdstatus/cdstatus-0.94a.ebuild,v 1.1.1.1 2005/11/30 09:38:07 chriswhite Exp $
+
+inherit eutils
 
 MY_P="cdstatus${PV}"
 DESCRIPTION="Tool for diagnosing cdrom drive and digital data (audio) extraction"
 HOMEPAGE="http://cdstatus.sourceforge.net/"
-SRC_URI="http://umn.dl.sourceforge.net/sourceforge/cdstatus/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/cdstatus/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+#-sparc -amd64: 0.94a: Generates bad wav files  x86 is good...
+KEYWORDS="x86 -amd64 -sparc ~ppc64"
 IUSE=""
 
-DEPEND="virtual/glibc"
-RDEPEND="${DEPEND}"
+DEPEND="virtual/libc"
 
 S=${WORKDIR}/${MY_P}
 
 src_compile() {
-	
 	epatch ${FILESDIR}/${P}-gentoo.diff
 	make || die
 }
 
 src_install() {
-	into /usr
 	dobin cdstatus
 	fperms 755 /usr/bin/cdstatus
 	dodoc docs/*
 }
 
 pkg_postinst() {
-	einfo ""
+	einfo
 	einfo "Check /usr/share/doc/cdstatus-${PV} for help"
-	einfo ""
+	einfo
 }
 
diff --git a/media-sound/cdstatus/cdstatus-0.95.04.ebuild b/media-sound/cdstatus/cdstatus-0.95.04.ebuild
index 8415169391ec..43b1094de811 100644
--- a/media-sound/cdstatus/cdstatus-0.95.04.ebuild
+++ b/media-sound/cdstatus/cdstatus-0.95.04.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cdstatus/cdstatus-0.95.04.ebuild,v 1.1 2005/04/23 10:42:23 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdstatus/cdstatus-0.95.04.ebuild,v 1.1.1.1 2005/11/30 09:38:07 chriswhite Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/cdstatus/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 #-sparc -amd64: 0.94a: Generates bad wav files  x86 is good...
-KEYWORDS="~x86 -amd64 -sparc ~ppc64"
+KEYWORDS="-amd64 ~ppc ~ppc64 -sparc ~x86"
 IUSE=""
 
 DEPEND="virtual/libc"
@@ -21,8 +21,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo ""
+	einfo
 	einfo "Copy cdstatus.cfg from /usr/share/cdstatus.cfg"
 	einfo "to your home directory and edit as needed."
-	einfo ""
+	einfo
 }
diff --git a/media-sound/cdtool/ChangeLog b/media-sound/cdtool/ChangeLog
index bdbbb8b1245d..cc885d96b284 100644
--- a/media-sound/cdtool/ChangeLog
+++ b/media-sound/cdtool/ChangeLog
@@ -1,8 +1,26 @@
 # ChangeLog for media-sound/cdtool
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cdtool/ChangeLog,v 1.1 2003/04/22 20:51:40 coredumb Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdtool/ChangeLog,v 1.1.1.1 2005/11/30 09:38:00 chriswhite Exp $
 
-*cdtool-2.1.5 (22 04 2003)
+*cdtool-2.1.5-r1 (20 Apr 2005)
+
+  20 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> +cdtool-2.1.5-r1.ebuild,
+  -cdtool-2.1.5.ebuild:
+  now blocking media-sound/cdplay, see #76896
+
+  22 Oct 2004; Lars Weiler <pylon@gentoo.org> cdtool-2.1.5.ebuild:
+  Stable on ppc.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> cdtool-2.1.5.ebuild:
+  Stable amd64, sparc.
+
+  09 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> cdtool-2.1.5.ebuild:
+  ~sparc ~amd64
+
+  22 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> cdtool-2.1.5.ebuild:
+  Removed explicit S=.
+
+*cdtool-2.1.5 (22 Apr 2003)
 
   22 04 2003; Jens Hoffrichter <joho@hausboot.org> :
   Initial import.  Ebuild submitted by Jens Hoffrichter <joho@hausboot.org>.
diff --git a/media-sound/cdtool/Manifest b/media-sound/cdtool/Manifest
index e69de29bb2d1..094464455cc3 100644
--- a/media-sound/cdtool/Manifest
+++ b/media-sound/cdtool/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 bcac26b390343ebbdaf6c49f959ed01a cdtool-2.1.5-r1.ebuild 961
+MD5 2a9af6849625470a91329548034e096c ChangeLog 935
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 d29e321ea1fc813d76ee1f28bf711a47 files/digest-cdtool-2.1.5-r1 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCZqcb06ebR+OMO78RArrDAJ4/pHHPTkuFm4fxdg7jOHEUK4gipwCgj6Gh
+/w6/+OvzNsAR3iE9tfxg3uc=
+=Sxyq
+-----END PGP SIGNATURE-----
diff --git a/media-sound/cdtool/cdtool-2.1.5-r1.ebuild b/media-sound/cdtool/cdtool-2.1.5-r1.ebuild
index 8d9c2720f4d4..bfd9c6ba77ab 100644
--- a/media-sound/cdtool/cdtool-2.1.5-r1.ebuild
+++ b/media-sound/cdtool/cdtool-2.1.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/media-sound/cdtool/cdtool-2.1.5-r1.ebuild,v 1.1 2005/04/20 19:01:26 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdtool/cdtool-2.1.5-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:00 chriswhite Exp $
 
 DESCRIPTION="A package of command-line utilities to play and catalog cdroms."
 HOMEPAGE=""
diff --git a/media-sound/cheesetracker/ChangeLog b/media-sound/cheesetracker/ChangeLog
index cdeb96a0ceab..faa723981762 100644
--- a/media-sound/cheesetracker/ChangeLog
+++ b/media-sound/cheesetracker/ChangeLog
@@ -1,6 +1,61 @@
 # ChangeLog for media-sound/cheesetracker
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cheesetracker/ChangeLog,v 1.1 2004/02/27 02:50:47 eradicator Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cheesetracker/ChangeLog,v 1.1.1.1 2005/11/30 09:38:11 chriswhite Exp $
+
+  22 Oct 2005; Jose Luis Rivero <yoswink@gentoo.org>
+  cheesetracker-0.9.9.ebuild:
+  Marked ~alpha wrt #108472
+
+  09 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  cheesetracker-0.9.9.ebuild:
+  Don't install INSTALL file.
+
+  07 Jul 2005; Caleb Tennis <caleb@gentoo.org> cheesetracker-0.9.9.ebuild:
+  Fix qt dep
+
+  12 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -cheesetracker-0.9.1.ebuild, cheesetracker-0.9.9.ebuild:
+  Removing old version.  0.9.9 stable sparc.
+
+  07 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  cheesetracker-0.9.9.ebuild:
+  Added to ~sparc.
+
+  23 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  cheesetracker-0.9.9.ebuild:
+  Stable x86 amd64.
+
+  13 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  cheesetracker-0.9.1.ebuild, cheesetracker-0.9.9.ebuild:
+  Getting rid of virtual/jack.
+
+  01 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  cheesetracker-0.9.9.ebuild:
+  inherit eutils.
+
+  01 Jun 2004; Danny van Dyk <kugelfang@gentoo.org>
+  +files/cheesetracker-0.9.9-64bit-clean.diff, cheesetracker-0.9.9.ebuild:
+  Fixed BUG #52426.
+
+*cheesetracker-0.9.9 (22 May 2004)
+
+  22 May 2004; Jon Hood <squinky86@gentoo.org> +cheesetracker-0.9.9.ebuild:
+  version bump, closes #49803, thanks to Priit Laes <amd@tt.ee> for the fixes
+
+  09 May 2004; Danny van Dyk <kugelfang@gentoo.org>
+  cheesetracker-0.9.1.ebuild:
+  Marked ~amd64.
+
+  29 Apr 2004; David Holm <dholm@gentoo.org> cheesetracker-0.9.1.ebuild:
+  Added to ~ppc.
+
+  14 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  cheesetracker-0.9.1.ebuild:
+  Stable on x86.
+
+  08 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  cheesetracker-0.9.1.ebuild:
+  Added virtual/jack to DEPEND as an option.
 
 *cheesetracker-0.9.1 (26 Feb 2004)
 
diff --git a/media-sound/cheesetracker/Manifest b/media-sound/cheesetracker/Manifest
index a5628c712964..60d0cacd36e5 100644
--- a/media-sound/cheesetracker/Manifest
+++ b/media-sound/cheesetracker/Manifest
@@ -1,2 +1,15 @@
-MD5 ee3963cf4c73f127d02b890e196301d0 cheesetracker-0.9.1.ebuild 675
-MD5 9a021f83c28ea2197e9b09b6fe1c1a6d files/digest-cheesetracker-0.9.1 71
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1cb3526d6b86236cc5ad54516ad4c6b4 cheesetracker-0.9.9.ebuild 905
+MD5 7ef271efee86fda7f67aa12b7d4fe026 ChangeLog 2262
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 c434058097d9333a5c15d70afd4d861c files/cheesetracker-0.9.9-64bit-clean.diff 4677
+MD5 494c01057ccc3d858baac01aead9b270 files/digest-cheesetracker-0.9.9 71
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDWkdv3og80iZgVQgRAqV8AKCFxviLhUBAwTPboiBTvI2+hqDgRACgnGGo
+w5OOs/xMa/dgcBpGrCsJbLY=
+=+2/w
+-----END PGP SIGNATURE-----
diff --git a/media-sound/cheesetracker/cheesetracker-0.9.9.ebuild b/media-sound/cheesetracker/cheesetracker-0.9.9.ebuild
index 59c754ee8ee9..a37629250498 100644
--- a/media-sound/cheesetracker/cheesetracker-0.9.9.ebuild
+++ b/media-sound/cheesetracker/cheesetracker-0.9.9.ebuild
@@ -1,24 +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/media-sound/cheesetracker/cheesetracker-0.9.9.ebuild,v 1.1 2004/05/22 21:29:28 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cheesetracker/cheesetracker-0.9.9.ebuild,v 1.1.1.1 2005/11/30 09:38:11 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="A clone of Impulse Tracker with some extensions and a built-in sample editor; uses QT"
 HOMEPAGE="http://cheesetronic.sf.net/"
 SRC_URI="mirror://sourceforge/cheesetronic/${P}.tar.gz"
-RESTRICT="nomirror"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-
+KEYWORDS="~alpha amd64 ~ppc sparc x86"
 IUSE="jack"
 
-RDEPEND="jack? ( virtual/jack )
+RDEPEND="jack? ( media-sound/jack-audio-connection-kit )
 	=dev-libs/libsigc++-1.2*
-	>=x11-libs/qt-3.0"
-
+	=x11-libs/qt-3*"
 DEPEND="${RDEPEND}
 	>=dev-util/scons-0.94-r2"
 
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-64bit-clean.diff
+}
+
 src_compile() {
 	scons || die
 }
@@ -26,5 +31,5 @@ src_compile() {
 src_install() {
 	dodir /usr/bin
 	scons prefix=${D}/usr install || die
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO docs/*.txt
+	dodoc AUTHORS ChangeLog NEWS README TODO docs/*.txt
 }
diff --git a/media-sound/choad/ChangeLog b/media-sound/choad/ChangeLog
index 70bdcc401248..9623b1d3cf0e 100644
--- a/media-sound/choad/ChangeLog
+++ b/media-sound/choad/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for media-sound/choad
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/choad/ChangeLog,v 1.1 2004/05/14 02:07:30 jmglov Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/choad/ChangeLog,v 1.1.1.1 2005/11/30 09:38:10 chriswhite Exp $
+
+  10 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> choad-0.822.ebuild:
+  Don't install INSTALL file.
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> choad-0.822.ebuild:
+  Added to ~ppc.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> choad-0.822.ebuild:
+  Stable amd64, sparc.
+
+  15 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org> choad-0.822.ebuild:
+  Stable x86.  Added ~amd64 and ~sparc.
+
+  06 Jun 2004; Josh Glover <jmglov@gentoo.org> choad-0.822.ebuild:
+  README.1ST could be deemed offencive by some, so it is now only installed if
+  the 'offensive' USE flag is set
 
 *choad-0.822 (13 May 2004)
 
diff --git a/media-sound/choad/Manifest b/media-sound/choad/Manifest
index 29689c5ea44b..03a78046b68e 100644
--- a/media-sound/choad/Manifest
+++ b/media-sound/choad/Manifest
@@ -1,4 +1,14 @@
-MD5 4683c172fe553220cefff3360e841743 choad-0.822.ebuild 854
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9c23ce1723346d4012f32803a0b2bf91 choad-0.822.ebuild 890
+MD5 59eab97f125f1c71dc256928c67b5083 ChangeLog 967
 MD5 0b6d88be572f75159b312e97f13e6fe4 metadata.xml 250
-MD5 82e40749e7ddbfb54a0d79839d10192e ChangeLog 296
 MD5 0acb1ee7c98e5fa7e4698b38f5741a92 files/digest-choad-0.822 52
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDIwFlj5H05b2HAEkRAk7DAJ9mntdOll2/cHAXsrDE0UQ/epqxGQCeO6Gb
+8kKuMOxAu0VDutTOOAs/1o8=
+=2N+O
+-----END PGP SIGNATURE-----
diff --git a/media-sound/choad/choad-0.822.ebuild b/media-sound/choad/choad-0.822.ebuild
index 3765092cae52..9ebac3dfa453 100644
--- a/media-sound/choad/choad-0.822.ebuild
+++ b/media-sound/choad/choad-0.822.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/media-sound/choad/choad-0.822.ebuild,v 1.1 2004/05/14 02:07:30 jmglov Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/choad/choad-0.822.ebuild,v 1.1.1.1 2005/11/30 09:38:10 chriswhite Exp $
 
 DESCRIPTION="a command-line, Perl-based CD-ripping-ID3-tagging-and-mp3-encoding utility"
 HOMEPAGE="http://ftso.org/choad/index1.html"
@@ -8,10 +8,9 @@ SRC_URI="http://ftso.org/choad/choad.tgz"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 
-IUSE=""
-RESTRICT="nomirror"
+IUSE="offensive"
 
 DEPEND=">=dev-lang/perl-5
 	dev-perl/CDDB
@@ -32,5 +31,8 @@ src_install() {
 	dobin choad
 
 	# Documentation
-	dodoc INSTALL README.1ST README.2ND
+	dodoc README.2ND
+
+	# README.1ST is a little... colourful piece of ASCII art. :)
+	if use offensive; then dodoc README.1ST; fi
 }
diff --git a/media-sound/cm/ChangeLog b/media-sound/cm/ChangeLog
index d4b48e4ea0ea..01613e684b03 100644
--- a/media-sound/cm/ChangeLog
+++ b/media-sound/cm/ChangeLog
@@ -1,6 +1,35 @@
 # ChangeLog for media-sound/cm
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cm/ChangeLog,v 1.1 2003/05/18 13:16:12 jje Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cm/ChangeLog,v 1.1.1.1 2005/11/30 09:38:31 chriswhite Exp $
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> cm-2.4.2.ebuild:
+  Added to ~ppc.
+
+  20 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> -cm-2.4.0.ebuild:
+  Removing old version.  Ebuild cleanup.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> cm-2.4.2.ebuild:
+  Stable amd64, sparc.
+
+  05 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> cm-2.4.2.ebuild:
+  Added ~amd64 ~sparc.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> cm-2.4.0.ebuild,
+  cm-2.4.2.ebuild:
+  Added IUSE.
+
+  22 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> cm-2.4.0.ebuild,
+  cm-2.4.2.ebuild:
+  Using keepdir to fix bug #45361.
+
+  19 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> cm-2.4.0.ebuild,
+  cm-2.4.2.ebuild:
+  Fixing dep and moving to stable x86.
+
+*cm-2.4.2 (29 Feb 2004)
+
+  29 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> cm-2.4.2.ebuild:
+  Version bump.  Closes bug #39677.
 
 *cm-2.4.0 (18 May 2003)
 
diff --git a/media-sound/cm/Manifest b/media-sound/cm/Manifest
index 00d4a727a36e..d1f83b3a9908 100644
--- a/media-sound/cm/Manifest
+++ b/media-sound/cm/Manifest
@@ -1,2 +1,5 @@
-MD5 1fba8e6627b29a9f473692227d97e57c cm-2.4.0.ebuild 1457
-MD5 606a027bb2fa39a2aec9c66ca394eaa8 files/digest-cm-2.4.0 60
+MD5 76d3d1cf698ec9337fce239938cf8b57 ChangeLog 1296
+MD5 753ffd7bf6711cb5c626b19aafacc0d8 cm-2.4.2.ebuild 966
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 96488265785c0bf4e9e394238f5b8e23 files/digest-cm-2.4.2 60
+MD5 39b2e2aa6a9ea57538cfaf1b1967f197 files/cm-2.4.0-exec 160
diff --git a/media-sound/cm/cm-2.4.2.ebuild b/media-sound/cm/cm-2.4.2.ebuild
index 94a99f0ba1e3..e59cef8ba9be 100644
--- a/media-sound/cm/cm-2.4.2.ebuild
+++ b/media-sound/cm/cm-2.4.2.ebuild
@@ -1,56 +1,39 @@
-# 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/media-sound/cm/cm-2.4.2.ebuild,v 1.1 2004/03/01 04:18:01 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cm/cm-2.4.2.ebuild,v 1.1.1.1 2005/11/30 09:38:31 chriswhite Exp $
+
+IUSE="doc"
 
 DESCRIPTION="Common Music: An object oriented music composition environment in LISP/scheme"
 HOMEPAGE="http://commonmusic.sourceforge.net"
 SRC_URI="mirror://sourceforge/commonmusic/${P}.tar.gz"
-RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 
-DEPEND=">=guile-1.6.4"
-RDEPEND="${DEPEND}"
+DEPEND=">=dev-util/guile-1.6.4"
 
 src_install() {
-	dodir /usr/share/${PN}
+	newbin ${FILESDIR}/${PN}-2.4.0-exec ${PN}
+
 	# the installer part needs the bin dir created
-	dodir /usr/share/${PN}/bin
-	touch ${D}/usr/share/${PN}/bin/.keep
-	dodir /usr/share/${PN}/src
+	keepdir /usr/share/${PN}/bin
+
 	insinto /usr/share/${PN}/src
 	doins ${S}/src/*
-	insinto /usr/share/${PN}/src/plotter
-	doins ${S}/src/plotter/*
-	dodir /usr/share/${PN}/etc
+
 	insinto /usr/share/${PN}/etc
 	doins ${S}/etc/*
-	dodir /usr/share/${PN}/contrib
+
 	insinto /usr/share/${PN}/contrib
 	doins ${S}/etc/contrib/*
-	dodir /usr/share/${PN}/examples
-	insinto /usr/share/${PN}/examples
-	doins ${S}/etc/examples/*
-	dohtml -r doc/*
-	dodoc ${S}/readme.text ${S}/doc/changelog.text
-}
 
-pkg_postinst() {
-	# when the package is first run it generates the cm script
-	# that will load the necessary source files into guile when run
-	guile -c "(load \"/usr/share/cm/src/cm.scm\")"
-	ln /usr/share/cm/bin/cm /usr/bin/cm
-	chmod +x /usr/bin/cm
-}
+	if use doc; then
+		insinto /usr/share/doc/${PF}/examples
+		doins ${S}/etc/examples/*
+		dohtml -r doc/*
+	fi
 
-#This will break upgrades
-#pkg_prerm() {
-#	if [ -e /usr/bin/cm ]; then
-#	    rm /usr/bin/cm
-#	fi
-#	if [ -e /usr/share/cm/bin ]; then
-#		rm -rf /usr/share/cm/bin
-#	fi
-#}
+	dodoc ${S}/readme.text ${S}/doc/changelog.text
+}
diff --git a/media-sound/cmix/ChangeLog b/media-sound/cmix/ChangeLog
index 1956eb8d31c8..6714172f9769 100644
--- a/media-sound/cmix/ChangeLog
+++ b/media-sound/cmix/ChangeLog
@@ -1,7 +1,21 @@
 # ChangeLog for media-sound/cmix
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cmix/ChangeLog,v 1.1 2003/03/04 22:17:50 agenkin Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cmix/ChangeLog,v 1.1.1.1 2005/11/30 09:38:10 chriswhite Exp $
 
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> cmix-1.6.ebuild:
+  Don't install COPYING file.
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> cmix-1.6.ebuild:
+  Added to ~ppc.
+
+  06 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> cmix-1.6.ebuild:
+  -amd64
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> cmix-1.6.ebuild:
+  virtual/glibc -> virtual/libc
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> cmix-1.6.ebuild:
+  Added IUSE.
 
 *cmix-1.6 (04 Mar 2003)
 
diff --git a/media-sound/cmix/Manifest b/media-sound/cmix/Manifest
index e69de29bb2d1..40e23094a26f 100644
--- a/media-sound/cmix/Manifest
+++ b/media-sound/cmix/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 804ed737b735d9722ef0617a88fb8d52 ChangeLog 813
+MD5 dcddef402b2a96b9712a41fccc45d848 cmix-1.6.ebuild 633
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 d5fd0bc80214a2081086243b86dfbb14 files/digest-cmix-1.6 57
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGs3rj5H05b2HAEkRAhUtAJ9UwL5aUEwP6gLUfIR7+ZsoIklnjACfS6yQ
+nA4DPRIu11H174M2e66cYh8=
+=0D+d
+-----END PGP SIGNATURE-----
diff --git a/media-sound/cmix/cmix-1.6.ebuild b/media-sound/cmix/cmix-1.6.ebuild
index b6b22a26b70d..00ced6c4979a 100644
--- a/media-sound/cmix/cmix-1.6.ebuild
+++ b/media-sound/cmix/cmix-1.6.ebuild
@@ -1,33 +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/media-sound/cmix/cmix-1.6.ebuild,v 1.1 2003/03/04 22:17:50 agenkin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cmix/cmix-1.6.ebuild,v 1.1.1.1 2005/11/30 09:38:10 chriswhite Exp $
 
-DESCRIPTION="cmix is a command line audio mixer :D"
-HOMEPAGE="http://cmix.sourceforge.net/"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~x86"
 IUSE=""
-DEPEND="virtual/glibc"
 
+DESCRIPTION="command line audio mixer"
+HOMEPAGE="http://cmix.sourceforge.net/"
 SRC_URI="http://antipoder.dyndns.org/downloads/${P}.tbz2"
-S=${WORKDIR}/${P}
 
-src_unpack() {
-	
-	unpack ${A}
-	cd ${S}
-}
+LICENSE="GPL-2"
+SLOT="0"
+#-amd64: 1.6: 'cmix list' gives: MIXER_READ(SOUND_MIXER_OUTSRC): Input/output error 
+KEYWORDS="-amd64 ~ppc sparc x86"
 
-src_compile() {
+DEPEND="virtual/libc"
 
+src_compile() {
 	make || die
 }
 
 src_install() {
-
-	einstall
+	einstall || die
 	dobin cmix
-	dodoc COPYING README || die
-}			
+	dodoc README || die
+}
diff --git a/media-sound/cplay/ChangeLog b/media-sound/cplay/ChangeLog
index fb672d3666f8..9ec4d689c6a5 100644
--- a/media-sound/cplay/ChangeLog
+++ b/media-sound/cplay/ChangeLog
@@ -1,10 +1,60 @@
 # ChangeLog for media-sound/cplay
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cplay/ChangeLog,v 1.1 2002/12/12 22:16:19 blauwers Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cplay/ChangeLog,v 1.1.1.1 2005/11/30 09:38:20 chriswhite Exp $
+
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> cplay-1.49.ebuild:
+  Stable sparc.
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> cplay-1.49.ebuild:
+  Added to ~sparc.
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> cplay-1.49.ebuild:
+  Cleaned up deps and added to ~sparc.
+
+  18 Oct 2004; Tom Gall <tgall@gentoo.org> cplay-1.49.ebuild:
+  stable on ppc64, bug #64531
+
+  06 Oct 2004; <SeJo@gentoo.org> cplay-1.49.ebuild:
+  unstable on ppc
+
+  26 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> cplay-1.47.ebuild,
+  cplay-1.49.ebuild:
+  Stable on x86.
+
+*cplay-1.49 (20 Feb 2004)
+
+  20 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> cplay-1.47.ebuild,
+  cplay-1.49.ebuild, metadata.xml:
+  Version bump.  Add metadata.  Header change.
+
+  26 Sep 2003; Martin Holzer <mholzer@gentoo.org> cplay-1.47.ebuild:
+  Marked stable. Closes #29304.
+
+  20 Sep 2003; jje <jje@gentoo.org> cplay-1.47.ebuild:
+  Fix source URI. See #27946.
+
+*cplay-1.47 (15 Aug 2003)
+
+  15 Aug 2003; Nick Hadaway <raker@gentoo.org> cplay-1.47.ebuild:
+  Version bump.  No other changes needed.  Thanks to Frank Tobin on bug
+  #26667 for the heads up.
+
+*cplay-1.46-r1 (03 Jan 2003)
+
+  03 Jan 2003; B.Lauwers <blauwers@gentoo.org> :
+  Fix per Bug# 7806
+
+*cplay-1.46 (17 Dec 2002)
+
+  17 Dec 2002; B.Lauwers <blauwers@gentoo.org> ;
+  Version bump, new homepage and source location
 
 *cplay-1.45 (12 Dec 2002)
 
-  11 Sep 2002; V�in� J�rvel� <vaino.jarvela@pp.inet.fi> cplay-1.45.ebuild, Changelog :
+  11 Sep 2002; Väinö Järvelä <vaino.jarvela@pp.inet.fi> cplay-1.45.ebuild, Changelog :
 
   Initial release of cplay, which is curses based audio frontend that uses
   external programs for playing files. Supported players are:
diff --git a/media-sound/cplay/Manifest b/media-sound/cplay/Manifest
index e69de29bb2d1..c256af842314 100644
--- a/media-sound/cplay/Manifest
+++ b/media-sound/cplay/Manifest
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a0010a9338b9af3d7b3392c6b8c74eba cplay-1.49.ebuild 655
+MD5 e64c1e7fb8caa590aa7b28da69b8ba19 cplay-1.47.ebuild 623
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 ee6b127bf12f66fab7257446010f4cd9 ChangeLog 2006
+MD5 55de049593073f2d00a07b2faa3c2699 files/digest-cplay-1.49 61
+MD5 632775f1f76bed5f99e1dfd788e50bee files/digest-cplay-1.47 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDK0/eLLFUmVNQ7rkRAjBtAKC8/FJ34cFUdlQscl4kPACF01fz8ACeMLOK
+MSkx6b6e2XWUUTsl3xnGE4Q=
+=8UCy
+-----END PGP SIGNATURE-----
diff --git a/media-sound/cplay/cplay-1.47.ebuild b/media-sound/cplay/cplay-1.47.ebuild
index 1bee492b4588..ddbf1129bc4f 100644
--- a/media-sound/cplay/cplay-1.47.ebuild
+++ b/media-sound/cplay/cplay-1.47.ebuild
@@ -1,14 +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/media-sound/cplay/cplay-1.47.ebuild,v 1.1 2003/08/16 01:23:08 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cplay/cplay-1.47.ebuild,v 1.1.1.1 2005/11/30 09:38:20 chriswhite Exp $
 
 DESCRIPTION="A Curses front-end for various audio players."
-SRC_URI="http://www.tf.hut.fi/~flu/hacks/cplay/${P}.tar.gz"
+SRC_URI="http://www.tf.hut.fi/~flu/cplay/old/${P}.tar.gz"
 HOMEPAGE="http://www.tf.hut.fi/~flu/hacks/cplay/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86"
+
+IUSE=""
 
 DEPEND="virtual/python"
 
diff --git a/media-sound/cplay/cplay-1.49.ebuild b/media-sound/cplay/cplay-1.49.ebuild
index e1b9a15cf7c0..9ea51e98aeac 100644
--- a/media-sound/cplay/cplay-1.49.ebuild
+++ b/media-sound/cplay/cplay-1.49.ebuild
@@ -1,6 +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/media-sound/cplay/cplay-1.49.ebuild,v 1.1 2004/02/21 00:29:08 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cplay/cplay-1.49.ebuild,v 1.1.1.1 2005/11/30 09:38:20 chriswhite Exp $
+
+IUSE=""
 
 DESCRIPTION="A Curses front-end for various audio players."
 SRC_URI="http://www.tf.hut.fi/~flu/cplay/${P}.tar.gz"
@@ -8,9 +10,10 @@ HOMEPAGE="http://www.tf.hut.fi/~flu/hacks/cplay/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="amd64 ~ppc ppc64 sparc x86"
 
-DEPEND="virtual/python"
+DEPEND=""
+RDEPEND="virtual/python"
 
 src_install () {
 	make PREFIX=${D}/usr recursive-install || die
diff --git a/media-sound/creox/ChangeLog b/media-sound/creox/ChangeLog
index 5bec813d1375..ce1ee62d7b24 100644
--- a/media-sound/creox/ChangeLog
+++ b/media-sound/creox/ChangeLog
@@ -1,6 +1,31 @@
 # ChangeLog for media-sound/creox
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/creox/ChangeLog,v 1.1 2004/05/04 01:36:58 eradicator Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/creox/ChangeLog,v 1.1.1.1 2005/11/30 09:38:46 chriswhite Exp $
+
+  13 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> creox-0.2.2_rc2.ebuild:
+  Added strict dependency on arts as per bug #81919.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  creox-0.2.2_rc2.ebuild:
+  Stable amd64.
+
+  03 Jul 2004; Carsten Lohrke <carlo@gentoo.org> creox-0.2.2_rc2.ebuild:
+  QA: need-kde after R/DEPEND
+
+  15 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/creox-0.2.2_rc2-ebusy.patch:
+  Added to ~amd64.  Stable x86.  Added patch to fix nptl support.
+
+  13 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  creox-0.2.2_rc2.ebuild:
+  Getting rid of virtual/jack.
+
+  06 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  creox-0.2.2_rc2.ebuild:
+  Added IUSE.
+
+  04 May 2004; David Holm <dholm@gentoo.org> creox-0.2.2_rc2.ebuild:
+  Added to ~ppc.
 
 *creox-0.2.2_rc2 (03 May 2004)
 
diff --git a/media-sound/creox/Manifest b/media-sound/creox/Manifest
index e17816f57cd7..456fd881dbc8 100644
--- a/media-sound/creox/Manifest
+++ b/media-sound/creox/Manifest
@@ -1,2 +1,5 @@
-MD5 70a7261b2107c06060ca8b9e70ffbe3f creox-0.2.2_rc2.ebuild 519
+MD5 e6df99423f5b4a2a16f3f9cea66be950 ChangeLog 1203
+MD5 49e5bf909b12ec8bd6061c105fe47f8b creox-0.2.2_rc2.ebuild 826
+MD5 63cdddedab359f2b04ae837290c459e6 files/creox-0.2.2_rc2-ebusy.patch 3129
 MD5 b4a14d554e1672d522b4030363f02999 files/digest-creox-0.2.2_rc2 67
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
diff --git a/media-sound/creox/creox-0.2.2_rc2.ebuild b/media-sound/creox/creox-0.2.2_rc2.ebuild
index 42973de83b17..7a415f41dad6 100644
--- a/media-sound/creox/creox-0.2.2_rc2.ebuild
+++ b/media-sound/creox/creox-0.2.2_rc2.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/media-sound/creox/creox-0.2.2_rc2.ebuild,v 1.1 2004/05/04 01:37:10 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/creox/creox-0.2.2_rc2.ebuild,v 1.1.1.1 2005/11/30 09:38:46 chriswhite Exp $
 
-inherit kde
+inherit kde eutils
 
 MY_P=${P/_/}
 S="${WORKDIR}/${MY_P}"
@@ -11,9 +11,25 @@ DESCRIPTION="CREOX Real Time Effects Processor"
 HOMEPAGE="http://www.uid0.sk/zyzstar/?creox"
 SRC_URI="http://www.uid0.sk/zyzstar/projects/creox/downloads/${MY_P}.tar.bz2"
 
-KEYWORDS="~x86"
+SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="x86 ~ppc amd64"
+IUSE=""
 
+DEPEND="media-sound/jack-audio-connection-kit
+	kde-base/arts"
 need-kde 3
 
-DEPEND="virtual/jack"
+pkg_setup() {
+	if ! built_with_use kde-base/kdelibs arts ; then
+		eerror "${CATEGORY}/${P} requires you to build kdelibs with arts useflag on."
+		die
+	fi
+}
+
+src_unpack() {
+	kde_src_unpack
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-ebusy.patch
+}
diff --git a/media-sound/ctrlxmms/ChangeLog b/media-sound/ctrlxmms/ChangeLog
index faf7df53581d..fe90bdf87884 100644
--- a/media-sound/ctrlxmms/ChangeLog
+++ b/media-sound/ctrlxmms/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for media-sound/ctrlxmms
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ctrlxmms/ChangeLog,v 1.1 2003/07/30 11:58:43 mcummings Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ctrlxmms/ChangeLog,v 1.1.1.1 2005/11/30 09:38:28 chriswhite Exp $
+
+  14 Sep 2005; Aron Griffis <agriffis@gentoo.org> ctrlxmms-1.1.ebuild:
+  Mark 1.1 stable on alpha
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> ctrlxmms-1.1.ebuild:
+  Stable on ppc.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> ctrlxmms-1.1.ebuild:
+  Stable amd64, sparc.
+
+  06 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> ctrlxmms-1.1.ebuild:
+  ~amd64
+
+  18 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> ctrlxmms-1.1.ebuild:
+  ctrlxmms SRC_URI changed.  Fixes bug #48110.
+
+  26 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> ctrlxmms-1.1.ebuild:
+  Stable x86.
 
 *ctrlxmms-1.1 (30 Jul 2003)
 
diff --git a/media-sound/ctrlxmms/Manifest b/media-sound/ctrlxmms/Manifest
index 406fb6b3a3b5..5ad4183aabf5 100644
--- a/media-sound/ctrlxmms/Manifest
+++ b/media-sound/ctrlxmms/Manifest
@@ -1,2 +1,4 @@
-MD5 2904a2d4a22ee6962912a9100ab8653f ctrlxmms-1.1.ebuild 468
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 f6b407b045da6bb349d28e83b6df7f13 ChangeLog 986
+MD5 7ba68a404467522c74009cca4617f9cf ctrlxmms-1.1.ebuild 553
 MD5 3861297d7bc79cb7fc08e57426531eca files/digest-ctrlxmms-1.1 62
diff --git a/media-sound/ctrlxmms/ctrlxmms-1.1.ebuild b/media-sound/ctrlxmms/ctrlxmms-1.1.ebuild
index ba970149e031..d65cfc5d71fa 100644
--- a/media-sound/ctrlxmms/ctrlxmms-1.1.ebuild
+++ b/media-sound/ctrlxmms/ctrlxmms-1.1.ebuild
@@ -1,19 +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/media-sound/ctrlxmms/ctrlxmms-1.1.ebuild,v 1.1 2003/07/30 11:58:43 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ctrlxmms/ctrlxmms-1.1.ebuild,v 1.1.1.1 2005/11/30 09:38:28 chriswhite Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="A script to control XMMS from the command line"
-SRC_URI="http://www.smidsrod.no/download/ctrlxmms-1.1.tar.gz"
+SRC_URI="http://files.smidsrod.no/${P}.tar.gz"
 HOMEPAGE="http://www.smidsrod.no"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="alpha amd64 ppc sparc x86"
+
+IUSE=""
 
 DEPEND="dev-perl/Xmms-Perl
 	media-sound/xmms"
 
-
 src_install () {
 	exeinto /usr/bin
 	doexe ctrlxmms
diff --git a/media-sound/cvoicecontrol/ChangeLog b/media-sound/cvoicecontrol/ChangeLog
index 307e072eb3f3..8adfdb5fc2ad 100644
--- a/media-sound/cvoicecontrol/ChangeLog
+++ b/media-sound/cvoicecontrol/ChangeLog
@@ -1,8 +1,40 @@
 # ChangeLog for media-sound/cvoicecontrol
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cvoicecontrol/ChangeLog,v 1.1 2002/06/22 01:07:04 george Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cvoicecontrol/ChangeLog,v 1.1.1.1 2005/11/30 09:38:13 chriswhite Exp $
 
-*cvoicecontrol-0.9_alpha.ebuild (20 Jun 2002)
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  cvoicecontrol-0.9_alpha.ebuild:
+  Stable on ppc.
+
+  15 Jul 2005; Diego Pettenò <flameeyes@gentoo.org>
+  cvoicecontrol-0.9_alpha.ebuild:
+  Fixed URL for cvoicecontrol. Thanks to Benjie Gillam in bug #98015.
+
+  10 May 2005; David Holm <dholm@gentoo.org> cvoicecontrol-0.9_alpha.ebuild:
+  Added to ~ppc.
+
+  12 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  cvoicecontrol-0.9_alpha.ebuild:
+  Stable amd64, sparc.
+
+  12 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  cvoicecontrol-0.9_alpha.ebuild:
+  Added to ~amd64 ~sparc.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  cvoicecontrol-0.9_alpha.ebuild:
+  virtual/glibc -> virtual/libc
+
+  17 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  cvoicecontrol-0.9_alpha.ebuild:
+  inline sed.  epatch.  IUSE.
+
+  05 Feb 2003; George Shapovalov <george@gentoo.org> files/digest-cvoicecontrol-0.9_alpha :
+
+  Upstream has silently made some changes to the source, updated digest accordingly.
+  See #15064 for more details on source change
+
+*cvoicecontrol-0.9_alpha (20 Jun 2002)
   
   20 Jun 2002; George Shapovalov <george@gentoo.org> all :
   
diff --git a/media-sound/cvoicecontrol/Manifest b/media-sound/cvoicecontrol/Manifest
index e69de29bb2d1..8b27b3080570 100644
--- a/media-sound/cvoicecontrol/Manifest
+++ b/media-sound/cvoicecontrol/Manifest
@@ -0,0 +1,5 @@
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 fd6e506a6d20d6995b84ec53fc4771a0 ChangeLog 1466
+MD5 4544b32ece2734cc55686463f6a20553 cvoicecontrol-0.9_alpha.ebuild 1087
+MD5 07de3af430261f9f254dfa78a2b4702a files/cvoicecontrol-0.9_alpha-gentoo.diff 442
+MD5 3618ff772e58c07e7505ccb582258dfe files/digest-cvoicecontrol-0.9_alpha 74
diff --git a/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha.ebuild b/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha.ebuild
index 716337dccfdf..a35cb9ba2d96 100644
--- a/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha.ebuild
+++ b/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha.ebuild
@@ -1,42 +1,45 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha.ebuild,v 1.1 2002/06/22 01:07:04 george Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha.ebuild,v 1.1.1.1 2005/11/30 09:38:13 chriswhite Exp $
 
-S=${WORKDIR}/cvoicecontrol-0.9alpha
-A=cvoicecontrol-0.9alpha.tar.bz2
+IUSE=""
+
+inherit eutils
+
+MY_P=${P/_/}
+S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="Console based speech recognition system"
-HOMEPAGE="http://www.kiecza.de/daniel/linux/cvoicecontrol/index.html"
-SRC_URI="http://www.kiecza.de/daniel/linux/${A}"
+HOMEPAGE="http://www.kiecza.net/daniel/linux/"
+SRC_URI="http://www.kiecza.net/daniel/linux/${MY_P}.tar.bz2"
 
-DEPEND="virtual/glibc"
-RDEPEND="${DEPEND}"
+DEPEND="virtual/libc"
 
-LICENSE=""
 SLOT="0"
+LICENSE="GPL-2"
+
+KEYWORDS="amd64 ppc sparc x86"
 
 src_unpack() {
 	unpack ${A}
 
-	patch -p0 <${FILESDIR}/${P}-gentoo.diff || die
-	
-	#remove "docs" from SUBDIRS in Makefile.in 
+	epatch ${FILESDIR}/${P}-gentoo.diff
+
+	#remove "docs" from SUBDIRS in Makefile.in
 	#Makefile will try to install few html files directly under the /usr
 	#much easier to do with dohtml
 	cd ${S}/cvoicecontrol/
-	mv Makefile.in Makefile.in-orig
-	sed -e "s:SUBDIRS = docs:#SUBDIRS = docs:" Makefile.in-orig > Makefile.in
+	sed -i "s:SUBDIRS = docs:#SUBDIRS = docs:" Makefile.in
 
 	cd ${S}
-	mv Makefile.in Makefile.in-orig
-	sed -e "s/install-data-am: install-data-local/install-data-am:/" Makefile.in-orig > Makefile.in
+	sed -i "s/install-data-am: install-data-local/install-data-am:/" Makefile.in
 }
 
 
 src_install () {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 
 	#install documentation
-	dodoc AUTHORS BUGS COPYING ChangeLog FAQ README
+	dodoc AUTHORS BUGS ChangeLog FAQ README
 	dohtml cvoicecontrol/docs/en/*.html
 }
diff --git a/media-sound/cvoicecontrol/files/digest-cvoicecontrol-0.9_alpha b/media-sound/cvoicecontrol/files/digest-cvoicecontrol-0.9_alpha
index fe13822ac56b..58dbcf8b868e 100644
--- a/media-sound/cvoicecontrol/files/digest-cvoicecontrol-0.9_alpha
+++ b/media-sound/cvoicecontrol/files/digest-cvoicecontrol-0.9_alpha
@@ -1 +1 @@
-MD5 ebc82a6d15d5450b2b1c25486c2e1602 cvoicecontrol-0.9alpha.tar.bz2 78013
+MD5 3668adb6e97b7cf2f81acfc244044abf cvoicecontrol-0.9alpha.tar.bz2 78081
diff --git a/media-sound/darkice/ChangeLog b/media-sound/darkice/ChangeLog
index e65752caa63f..3b9390f1a511 100644
--- a/media-sound/darkice/ChangeLog
+++ b/media-sound/darkice/ChangeLog
@@ -1,9 +1,73 @@
 # ChangeLog for media-sound/darkice
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/darkice/ChangeLog,v 1.1 2002/08/13 18:34:47 agenkin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/darkice/ChangeLog,v 1.1.1.1 2005/11/30 09:38:09 chriswhite Exp $
+
+  07 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> darkice-0.14.ebuild:
+  Don't install COPYING file.
+
+  14 Sep 2005; Aron Griffis <agriffis@gentoo.org> darkice-0.14.ebuild:
+  Mark 0.14 stable on alpha
+
+  04 May 2005; Jan Brinkmann <luckyduck@gentoo.org> darkice-0.15.ebuild:
+  introduced support for the jack useflag. fixes #90995
+
+*darkice-0.15 (25 Apr 2005)
+
+  25 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> -darkice-0.13.2.ebuild,
+  -darkice-0.13.ebuild, +darkice-0.15.ebuild:
+  new upstream version, fixes #90268. changed oggvorbis useflag to vorbis,
+  oggvorbis is deprecated.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> darkice-0.14.ebuild:
+  Stable amd64, sparc.
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> darkice-0.13.2.ebuild,
+  darkice-0.13.ebuild, darkice-0.14.ebuild:
+  Typo in DESCRIPTION: simulatenously -> simultaneously. Bug 59717.
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> darkice-0.14.ebuild:
+  ~amd64
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org> darkice-0.13.2.ebuild,
+  darkice-0.13.ebuild, darkice-0.14.ebuild:
+  Fix use invocation
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> darkice-0.13.2.ebuild,
+  darkice-0.13.ebuild:
+  Add die following econf for bug 48950
+
+  08 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> darkice-0.14.ebuild:
+  Stable x86.
+
+  03 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> darkice-0.14.ebuild:
+  Back in ~x86 as it has an alsa-1.0 dep in this new version.
+
+  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  darkice-0.13.2.ebuild, darkice-0.13.ebuild, darkice-0.14.ebuild:
+  Removed explicit S=.  Stable on x86.
+
+*darkice-0.14 (01 Mar 2004)
+
+  01 Mar 2004; Martin Holzer <mholzer@gentoo.org> darkice-0.14.ebuild:
+  Version bumped.
+
+*darkice-0.13.2 (20 Jan 2004)
+
+  20 Jan 2004; Martin Holzer <mholzer@gentoo.org> darkice-0.13.2.ebuild:
+  Version bumped. Closes 38758
+
+*darkice-0.13 (14 Mar 2003)
+
+  14 Mar 2003; Seemant Kulleen <seemant@gentoo.org> darkice-0.13.ebuild:
+  version bump, thanks to: Otavio R. Piske <angusy@brturbo.com> in bug #15670
+
+*darkice-0.12 (14 Jan 2003)
+
+  14 Jan 2003; L. Boshell <leonardop@gentoo.org> : New version. Thanks to
+  Blake Watters for his report (bug #12037).
 
 *darkice-0.10.1 (13 Aug 2002)
 
   13 Aug 2002; Arcady Genkin <agenkin@thpoon.com> darkice-0.10.1.ebuild :
 
-  Initial version, submitted by Blake Watters <sbw@ibiblio.org>.
\ No newline at end of file
+  Initial version, submitted by Blake Watters <sbw@ibiblio.org>.
diff --git a/media-sound/darkice/Manifest b/media-sound/darkice/Manifest
index e69de29bb2d1..e645b28aabb7 100644
--- a/media-sound/darkice/Manifest
+++ b/media-sound/darkice/Manifest
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 780f08b5bfc4806c5443d5717a1ca3ad ChangeLog 2606
+MD5 85ac496be5992038963ed465d5447042 darkice-0.14.ebuild 1336
+MD5 a6fa2a58462e830a1944700fc5794839 darkice-0.15.ebuild 1418
+MD5 dc687438c29f2bf61a02265c3c1632ce files/digest-darkice-0.14 64
+MD5 90f40fff234ed9f0943b2afd28765961 files/digest-darkice-0.15 65
+MD5 527dcfe3ce0f0b53c6b6aa8b82eb930c metadata.xml 252
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDby5Yj5H05b2HAEkRAnT1AJ9rPP44jAv7iF1pH8N4AvJz0DvKHACdEmgs
+3UOLsiVhKLgWNn6P+R4MAfk=
+=x9Gb
+-----END PGP SIGNATURE-----
diff --git a/media-sound/darkice/darkice-0.14.ebuild b/media-sound/darkice/darkice-0.14.ebuild
index 3026513f3a29..0e4d5d165ca7 100644
--- a/media-sound/darkice/darkice-0.14.ebuild
+++ b/media-sound/darkice/darkice-0.14.ebuild
@@ -1,27 +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/media-sound/darkice/darkice-0.14.ebuild,v 1.1 2004/03/01 18:51:56 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/darkice/darkice-0.14.ebuild,v 1.1.1.1 2005/11/30 09:38:09 chriswhite Exp $
 
-IUSE="encode oggvorbis"
+IUSE="encode oggvorbis alsa"
 
-S=${WORKDIR}/${P}
-DESCRIPTION="IceCast live streamer delivering Ogg and mp3 streams simulatenously to multiple hosts."
+DESCRIPTION="IceCast live streamer delivering Ogg and mp3 streams simultaneously to multiple hosts."
 HOMEPAGE="http://darkice.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 RESTRICT="nomirror"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa"
-
+KEYWORDS="alpha amd64 ~hppa ~ppc sparc x86"
 
 DEPEND="encode?	( >=media-sound/lame-1.89 )
-	oggvorbis? ( >=media-libs/libvorbis-1.0 )"
+	oggvorbis? ( >=media-libs/libvorbis-1.0 )
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )"
 
 src_compile() {
-	local myconf=""
-
-	if [ ! "`use encode`" ] && [ ! "`use oggvorbis`" ]
+	if ! use encode && ! use oggvorbis
 	then
 
 		eerror "You need support for mp3 or Ogg Vorbis enconding for this"
@@ -33,10 +30,9 @@ src_compile() {
 		die "Won't build without support for lame nor vorbis"
 	fi
 
-	use encode    || myconf="--without-lame"
-	use oggvorbis || myconf="--without-vorbis"
-
-	econf ${myconf}
+	econf `use_with alsa` \
+	      `use_with encode lame` \
+	      `use_with oggvorbis vorbis` || die
 
 	emake || die "Compilation failed"
 }
@@ -44,5 +40,5 @@ src_compile() {
 src_install() {
 	einstall darkicedocdir=${D}/usr/share/doc/${PF} || die
 
-	dodoc AUTHORS ChangeLog COPYING NEWS README TODO
+	dodoc AUTHORS ChangeLog NEWS README TODO
 }
diff --git a/media-sound/darkice/darkice-0.15.ebuild b/media-sound/darkice/darkice-0.15.ebuild
index 38dc704c14df..2408b1c9ad50 100644
--- a/media-sound/darkice/darkice-0.15.ebuild
+++ b/media-sound/darkice/darkice-0.15.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/darkice/darkice-0.15.ebuild,v 1.1 2005/04/25 16:34:54 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/darkice/darkice-0.15.ebuild,v 1.1.1.1 2005/11/30 09:38:09 chriswhite Exp $
 
-
-DESCRIPTION="IceCast live streamer delivering Ogg and mp3 streams simultaneously to multiple hosts."
+DESCRIPTION="IceCast live streamer, delivering ogg and mp3 streams simultaneously to multiple hosts."
 HOMEPAGE="http://darkice.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
-IUSE="encode vorbis alsa"
+IUSE="alsa encode jack vorbis"
 
 DEPEND="encode?	( >=media-sound/lame-1.89 )
 	vorbis? ( >=media-libs/libvorbis-1.0 )
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )"
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	jack? ( media-sound/jack-audio-connection-kit )"
 
 src_compile() {
 	if ! use encode && ! use vorbis
@@ -31,8 +31,8 @@ src_compile() {
 
 	econf $(use_with alsa) \
 	      $(use_with encode lame) \
+		  $(use_with jack) \
 	      $(use_with vorbis) || die "configuration failed"
-
 	emake || die "Compilation failed"
 }
 
diff --git a/media-sound/darksnow/ChangeLog b/media-sound/darksnow/ChangeLog
index a19d7db2153d..a1e05f2bac71 100644
--- a/media-sound/darksnow/ChangeLog
+++ b/media-sound/darksnow/ChangeLog
@@ -1,6 +1,31 @@
 # ChangeLog for media-sound/darksnow
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/darksnow/ChangeLog,v 1.1 2004/10/19 05:26:20 chriswhite Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/darksnow/ChangeLog,v 1.1.1.1 2005/11/30 09:38:41 chriswhite Exp $
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> darksnow-0.5.ebuild:
+  Added to ~ppc.
+
+  19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  Remove retired developer from metadata.xml.
+
+*darksnow-0.5 (18 Apr 2005)
+
+  18 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> +darksnow-0.5.ebuild:
+  new upstream version, fixes #65596
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  darksnow-0.4.4.ebuild:
+  Stable amd64, sparc, x86.
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  darksnow-0.4.4.ebuild:
+  Added to ~amd64 and ~sparc.
+
+  19 Oct 2004; Chris White <chriswhite@gentoo.org> darksnow-0.4.4.ebuild:
+  One more QA issue for the road.
+
+  19 Oct 2004; Chris White <chriswhite@gentoo.org> darksnow-0.4.4.ebuild:
+  Fixed some QA issues.
 
 *darksnow-0.4.4 (19 Oct 2004)
 
diff --git a/media-sound/darksnow/Manifest b/media-sound/darksnow/Manifest
index 7cd343870f18..fec8072e26f0 100644
--- a/media-sound/darksnow/Manifest
+++ b/media-sound/darksnow/Manifest
@@ -1,2 +1,6 @@
-MD5 2c41a64c6424733a520176a92fe8ca33 darksnow-0.4.4.ebuild 707
+MD5 7435314f946956305eed3082a5d4f036 ChangeLog 1229
+MD5 d24d5d1264c01757904d8fb178e91048 darksnow-0.4.4.ebuild 949
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 c1ccc7ef6d3cca1e26f54fc31a3e1bef darksnow-0.5.ebuild 888
 MD5 0648bf168b7cdfc3363612992c5d0b51 files/digest-darksnow-0.4.4 65
+MD5 4d7563472944d5a6c367a66783fed768 files/digest-darksnow-0.5 63
diff --git a/media-sound/darksnow/darksnow-0.4.4.ebuild b/media-sound/darksnow/darksnow-0.4.4.ebuild
index db52fabf605c..9f54130fc8ef 100644
--- a/media-sound/darksnow/darksnow-0.4.4.ebuild
+++ b/media-sound/darksnow/darksnow-0.4.4.ebuild
@@ -1,41 +1,38 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/darksnow/darksnow-0.4.4.ebuild,v 1.1 2004/10/19 05:26:20 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/darksnow/darksnow-0.4.4.ebuild,v 1.1.1.1 2005/11/30 09:38:41 chriswhite Exp $
 
+IUSE=""
 
 DESCRIPTION="Streaming GTK2 Front-End based in Darkice Ice Streamer"
 HOMEPAGE="http://darksnow.radiolivre.org"
 SRC_URI="http://darksnow.radiolivre.org/${P}.tar.gz"
-SLOT="0"
-
-KEYWORDS="~x86"
-IUSE=""
 
+SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="amd64 sparc x86"
 
 DEPEND=">=x11-libs/gtk+-2
-		>=media-sound/darkice-0.14"
+	>=media-sound/darkice-0.14"
 
 src_unpack() {
-		unpack ${A}
-		einfo "Patching Makefile..."
-		cd ${S}
-
-		#fix some makefile issues
-		sed -i "s:^PREFIX=.*:PREFIX=${D}/usr:" Makefile
-		sed -i "s:^INTLPREFIX=.*:INTLPREFIX=${D}/usr:" Makefile
-		sed -i "s:^CFLAGS=:CFLAGS=${CFLAGS} :" Makefile
-
-		# sue me, I like funny things
-		sed -i "s:#CFLAGS+=-DFUNNY:CFLAGS+=-DFUNNY:" Makefile
+	unpack ${A}
+	einfo "Patching Makefile..."
+	cd ${S}
+
+	#fix some makefile issues
+	sed -i -e "s:^PREFIX=.*:PREFIX=${D}/usr:" \
+	-e "s:^INTLPREFIX=.*:INTLPREFIX=${D}/usr:" \
+	-e "s:^CFLAGS=:CFLAGS=${CFLAGS} :" \
+	Makefile \
+	|| die "could not patch Makefile"
 }
 
 src_compile() {
-		emake || die "Compilation failed"
+	emake || die "Compilation failed"
 }
 
 src_install () {
-		dobin darksnow
-		cd ${S}/documentation
-		dodoc *
+	dobin darksnow || die "could not install darksnow executable"
+	dodoc ${S}/documentation/*
 }
diff --git a/media-sound/darksnow/darksnow-0.5.ebuild b/media-sound/darksnow/darksnow-0.5.ebuild
index 9e38a8161b7b..cda3fa8fcd79 100644
--- a/media-sound/darksnow/darksnow-0.5.ebuild
+++ b/media-sound/darksnow/darksnow-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/media-sound/darksnow/darksnow-0.5.ebuild,v 1.1 2005/04/18 15:50:42 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/darksnow/darksnow-0.5.ebuild,v 1.1.1.1 2005/11/30 09:38:41 chriswhite Exp $
 
 
 DESCRIPTION="Streaming GTK2 Front-End based in Darkice Ice Streamer"
@@ -9,7 +9,7 @@ SRC_URI="http://darksnow.radiolivre.org/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
 DEPEND=">=x11-libs/gtk+-2
diff --git a/media-sound/darksnow/metadata.xml b/media-sound/darksnow/metadata.xml
index ec6a427b666f..e1774e3d9ad7 100644
--- a/media-sound/darksnow/metadata.xml
+++ b/media-sound/darksnow/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sound</herd>
-<maintainer>
-  <email>chriswhite@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/media-sound/daudio/ChangeLog b/media-sound/daudio/ChangeLog
index 6dfcad49d68b..65626bf0e7a7 100644
--- a/media-sound/daudio/ChangeLog
+++ b/media-sound/daudio/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for media-sound/daudio
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/daudio/ChangeLog,v 1.1 2004/06/19 15:58:20 squinky86 Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/daudio/ChangeLog,v 1.1.1.1 2005/11/30 09:38:26 chriswhite Exp $
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> daudio-0.3.ebuild:
+  Added to ~ppc.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> daudio-0.3.ebuild:
+  Stable amd64.
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> daudio-0.3.ebuild:
+  Stable x86.
+
+  12 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> daudio-0.3.ebuild:
+  ~amd64 -sparc
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> daudio-0.3.ebuild:
+  virtual/glibc -> virtual/libc
 
 *daudio-0.3 (19 Jun 2004)
 
diff --git a/media-sound/daudio/Manifest b/media-sound/daudio/Manifest
index e155e6a37e21..96ce2ef4903a 100644
--- a/media-sound/daudio/Manifest
+++ b/media-sound/daudio/Manifest
@@ -1,2 +1,15 @@
-MD5 a8d289983094eb1ee5660e0810b26799 daudio-0.3.ebuild 605
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2bcd690dc227658160fcb053065837c9 daudio-0.3.ebuild 859
+MD5 0f8cea6d35874a690c812eaa32edfad9 ChangeLog 885
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 640efb652053494b2f0e86908f564444 files/daudio.rc 535
 MD5 1a45fb71ea5e016c3603b5efdd1fd8b1 files/digest-daudio-0.3 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDIMd4V3J2n04EauwRAqhrAJ9PhEk+ayHZuXmr74z6n/3F6IKU/QCdESci
+8o/oCAa9+udLlt0OozQ0kOc=
+=XW3I
+-----END PGP SIGNATURE-----
diff --git a/media-sound/daudio/daudio-0.3.ebuild b/media-sound/daudio/daudio-0.3.ebuild
index e315dfe17bf6..1ae3ae033642 100644
--- a/media-sound/daudio/daudio-0.3.ebuild
+++ b/media-sound/daudio/daudio-0.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/media-sound/daudio/daudio-0.3.ebuild,v 1.1 2004/06/19 15:58:20 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/daudio/daudio-0.3.ebuild,v 1.1.1.1 2005/11/30 09:38:26 chriswhite Exp $
 
 DESCRIPTION="Distributed audio on the local network"
 HOMEPAGE="http://daudio.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+#-sparc: 0.3: static audio on local daemon.  No audio when client connects to amd64 daemon
+KEYWORDS="amd64 ~ppc -sparc x86"
 
 IUSE=""
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=media-libs/libmad-0.15.0b-r1"
 
 src_compile() {
diff --git a/media-sound/daudio/files/daudio.rc b/media-sound/daudio/files/daudio.rc
index 258834d30a1b..36039f5da831 100644
--- a/media-sound/daudio/files/daudio.rc
+++ b/media-sound/daudio/files/daudio.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/media-sound/daudio/files/daudio.rc,v 1.1 2004/06/19 15:58:20 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/daudio/files/daudio.rc,v 1.1.1.1 2005/11/30 09:38:26 chriswhite Exp $
 
 depend() {
 	use net
diff --git a/media-sound/daudio/metadata.xml b/media-sound/daudio/metadata.xml
index b401bb87f474..e1774e3d9ad7 100644
--- a/media-sound/daudio/metadata.xml
+++ b/media-sound/daudio/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sound</herd>
-<maintainer>
- <email>squinky86@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/media-sound/dcd/ChangeLog b/media-sound/dcd/ChangeLog
index 782b596507a2..d638725988c2 100644
--- a/media-sound/dcd/ChangeLog
+++ b/media-sound/dcd/ChangeLog
@@ -1,6 +1,35 @@
 # ChangeLog for media-sound/dcd
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/dcd/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/media-sound/dcd/ChangeLog,v 1.1.1.1 2005/11/30 09:38:12 chriswhite Exp $
+
+  14 Sep 2005; Aron Griffis <agriffis@gentoo.org> dcd-0.95.ebuild:
+  Mark 0.95 stable on alpha
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> dcd-0.95.ebuild:
+  Added to ~ppc.
+
+  18 Oct 2004; Tom Gall <tgall@gentoo.org> dcd-0.95.ebuild:
+  stable on ppc64, bug #64541
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> dcd-0.95.ebuild:
+  Stable amd64, sparc.
+
+  12 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> dcd-0.95.ebuild:
+  ~amd64 ~sparc
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> dcd-0.90.ebuild,
+  dcd-0.95.ebuild:
+  virtual/glibc -> virtual/libc
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> dcd-0.90.ebuild,
+  dcd-0.95.ebuild:
+  Added IUSE.
+
+*dcd-0.95 (28 Aug 2002)
+
+  28 Aug 2002; Ryan Phillips <rphillips@gentoo.org> :
+
+  Fixes a sandbox bug and updates to the latest version
 
 *dcd-0.90 (1 Feb 2002)
 
diff --git a/media-sound/dcd/Manifest b/media-sound/dcd/Manifest
index e69de29bb2d1..4f6812248d6b 100644
--- a/media-sound/dcd/Manifest
+++ b/media-sound/dcd/Manifest
@@ -0,0 +1,6 @@
+MD5 c8a2b440d02e7678dafd30d64ca68c6d dcd-0.95.ebuild 938
+MD5 3aeeee0f3e2f48dce924217bc622f538 dcd-0.90.ebuild 864
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 388e6efb44a97fd46a018fcad94f3757 ChangeLog 1489
+MD5 37b75fcbb3400c97fbed557d65239563 files/digest-dcd-0.95 60
+MD5 9a48cf3703f5a7e7dda289f1e64f1c2c files/digest-dcd-0.90 60
diff --git a/media-sound/dcd/dcd-0.90.ebuild b/media-sound/dcd/dcd-0.90.ebuild
index e55ee311a1aa..ad412333bb67 100644
--- a/media-sound/dcd/dcd-0.90.ebuild
+++ b/media-sound/dcd/dcd-0.90.ebuild
@@ -1,34 +1,41 @@
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Ryan Tolboom <ryan@intphsys.com>
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/dcd/dcd-0.90.ebuild,v 1.1.1.1 2005/11/30 09:38:12 chriswhite Exp $
 
-S=${WORKDIR}/dcd-0.90
-SRC_URI="http://www.technopagan.org/dcd/dcd-0.90.tar.bz2"
+IUSE=""
 
+S=${WORKDIR}/dcd-0.90
+DESCRIPTION="A simple command-line based CD Player"
 HOMEPAGE="http://www.technopagan.org/dcd"
+SRC_URI="http://www.technopagan.org/dcd/dcd-0.90.tar.bz2"
 
-DESCRIPTION="A simple command-line based CD Player"
+DEPEND="virtual/libc"
 
-DEPEND=">=sys-libs/glibc-2.1.3"
+SLOT="0"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="x86"
 
 src_unpack() {
 
-    unpack ${A}
-    cd ${S}
-    cat Makefile | sed "s:PREFIX = .*$:PREFIX = \"${D}/usr\":" |\
-    sed "s:# CDROM = /dev/cdroms/cdrom0:CDROM = \"/dev/cdroms/cdrom0\":"\
-    > Makefile
-   
+	unpack ${A}
+	cd ${S}
+	cp Makefile Makefile.orig
+	sed -e "s:PREFIX = .*$:PREFIX = \"${D}/usr\":" \
+		-e "s:/man/:/share/man/:" \
+		-e "s:# CDROM = /dev/cdroms/cdrom0:CDROM = \"/dev/cdroms/cdrom0\":"\
+		Makefile.orig > Makefile
+
 }
- 
+
 src_compile() {
 
-    try make
+	make EXTRA_CFLAGS="$CFLAGS" || die
 
 }
 
 src_install() {
 
-    try make PREFIX=${D}/usr install
-    dodoc README BUGS
+	make PREFIX=${D}/usr install || die
+	dodoc README BUGS ChangeLog
 
 }
diff --git a/media-sound/dcd/dcd-0.95.ebuild b/media-sound/dcd/dcd-0.95.ebuild
index 749f31a2e2f8..b3b7ed06062c 100644
--- a/media-sound/dcd/dcd-0.95.ebuild
+++ b/media-sound/dcd/dcd-0.95.ebuild
@@ -1,17 +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/media-sound/dcd/dcd-0.95.ebuild,v 1.1 2002/08/28 17:35:26 rphillips Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/dcd/dcd-0.95.ebuild,v 1.1.1.1 2005/11/30 09:38:12 chriswhite Exp $
+
+IUSE=""
 
 S=${WORKDIR}/dcd-0.95
 DESCRIPTION="A simple command-line based CD Player"
 HOMEPAGE="http://www.technopagan.org/dcd"
 SRC_URI="http://www.technopagan.org/dcd/dcd-0.95.tar.bz2"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 SLOT="0"
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="x86"
+KEYWORDS="alpha amd64 ~ppc ppc64 sparc x86"
 
 src_unpack() {
 
@@ -23,9 +25,9 @@ src_unpack() {
 		-e "s:# CDROM = /dev/cdroms/cdrom0:CDROM = \"/dev/cdroms/cdrom0\":"\
 		-e "/install -m 755 -d \${HOME}\/\${CDI}/d"\
 		Makefile.orig > Makefile
-   
+
 }
- 
+
 src_compile() {
 
 	make EXTRA_CFLAGS="$CFLAGS" || die
diff --git a/media-sound/dcd/files/digest-dcd-0.90 b/media-sound/dcd/files/digest-dcd-0.90
index 82cb17a9673d..6bae53482d5c 100644
--- a/media-sound/dcd/files/digest-dcd-0.90
+++ b/media-sound/dcd/files/digest-dcd-0.90
@@ -1 +1 @@
-MD5 23ec47c09b2b414cb54e421746074ae0 dcd-0.90.tar.bz2
+MD5 23ec47c09b2b414cb54e421746074ae0 dcd-0.90.tar.bz2 32225
diff --git a/media-sound/demolition/ChangeLog b/media-sound/demolition/ChangeLog
index ffc2289176a0..4f328b2a4827 100644
--- a/media-sound/demolition/ChangeLog
+++ b/media-sound/demolition/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for media-sound/demolition
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/demolition/ChangeLog,v 1.1 2004/08/25 12:56:50 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/demolition/ChangeLog,v 1.1.1.1 2005/11/30 09:38:13 chriswhite Exp $
+
+  30 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  demolition-0.9.ebuild:
+  Stable sparc.  Fixed DEPEND.
+
+  28 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  demolition-0.9.ebuild:
+  Stable amd64, x86.  Added to ~sparc.
+
+  03 Sep 2004; David Holm <dholm@gentoo.org> demolition-0.9.ebuild:
+  Added to ~ppc.
+
+*demolition-0.9 (27 Aug 2004)
+
+  27 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org> demolition-0.9.ebuild:
+  dep fix; tidy
 
   25 Aug 2004; <frank@gentoo.org> :
   New ebuild submitted by Ron Widler <ron@einfach.org>. Closes #61420.
diff --git a/media-sound/demolition/Manifest b/media-sound/demolition/Manifest
index 65bd2b21c731..b4028f1c3d9b 100644
--- a/media-sound/demolition/Manifest
+++ b/media-sound/demolition/Manifest
@@ -1,3 +1,14 @@
-MD5 4f27ea68e30066e47130cdac5f0b1a8c demolition-0.9.ebuild 766
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3b5f20a433873076f2dcf27924439e76 ChangeLog 777
+MD5 6bf30463d4e9c35a5c4f68adc70f38d6 demolition-0.9.ebuild 791
 MD5 2f758c82434233f84f01f80f850a1112 metadata.xml 217
 MD5 2cf577846c4458e9cf655d35bf0d5ee5 files/digest-demolition-0.9 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBg3fFArHZZzCEUG0RAiZgAJ0eLhWLvNHkim7QmP6qJ+DtaKb3BQCdG7o0
+OgRXv7zNs98SNSzpoRO8mUM=
+=36Za
+-----END PGP SIGNATURE-----
diff --git a/media-sound/demolition/demolition-0.9.ebuild b/media-sound/demolition/demolition-0.9.ebuild
index b210ca2e97ff..5b9313c2c1dd 100644
--- a/media-sound/demolition/demolition-0.9.ebuild
+++ b/media-sound/demolition/demolition-0.9.ebuild
@@ -1,6 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/demolition/demolition-0.9.ebuild,v 1.1 2004/08/25 12:56:50 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/demolition/demolition-0.9.ebuild,v 1.1.1.1 2005/11/30 09:38:13 chriswhite Exp $
+
+IUSE=""
+
+S="${WORKDIR}/demolition"
 
 DESCRIPTION="A destruction/stress testing tool for LADSPA plugins. It's intended mostly for sanity checking your own code before you release it to the world."
 HOMEPAGE="http://www.ecs.soton.ac.uk/~njl98r/code/ladspa/demolition.html"
@@ -8,17 +12,10 @@ SRC_URI="http://www.ecs.soton.ac.uk/~njl98r/code/ladspa/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-S=${WORKDIR}/demolition
+KEYWORDS="x86 amd64 ~ppc sparc"
 
-RDEPEND="virtual/glibc
-	>=dev-libs/glib-1.2.0
-	media-libs/ladspa-sdk"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.58
-	>=sys-devel/automake-1.7.2"
+RDEPEND=">=dev-libs/glib-1.2.0
+	 media-libs/ladspa-sdk"
 
 src_compile() {
 	emake || die "emake failed"
@@ -26,5 +23,4 @@ src_compile() {
 
 src_install() {
 	dobin demolition || die "dobin failed"
-	dodoc COPYING
 }
diff --git a/media-sound/denemo/ChangeLog b/media-sound/denemo/ChangeLog
index 6d67199da7e9..ef0079a50961 100644
--- a/media-sound/denemo/ChangeLog
+++ b/media-sound/denemo/ChangeLog
@@ -1,6 +1,37 @@
 # ChangeLog for media-sound/denemo
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/denemo/ChangeLog,v 1.1 2003/03/15 10:02:45 jje Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/denemo/ChangeLog,v 1.1.1.1 2005/11/30 09:38:23 chriswhite Exp $
+
+  19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  Remove retired developer from metadata.xml.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> denemo-0.7.2.ebuild:
+  Stable amd64, sparc.
+
+  25 Aug 2004; Sven Wegener <swegener@gentoo.org> denemo-0.5.9.ebuild,
+  denemo-0.7.2.ebuild:
+  Changed SRC_URI to use mirror:// syntax.
+
+  03 Aug 2004; David Holm <dholm@gentoo.org> denemo-0.7.2.ebuild:
+  Added to ~ppc.
+
+  12 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> denemo-0.7.2.ebuild:
+  Added -fpermissive to work with gcc-3.4.  Adde ~sparc and ~amd64.
+  Thanks to Patrick Dawson <pkdawson@buffalo.edu> for getting us the 3.4 fix.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> denemo-0.5.9.ebuild:
+  virtual/glibc -> virtual/libc
+
+  10 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> denemo-0.5.9.ebuild,
+  denemo-0.7.2.ebuild:
+  ebuild cleanup.  0.7.2 stable x86.
+
+*denemo-0.7.2 (18 Feb 2004)
+
+  18 Feb 2004; <torbenh@gentoo.org> denemo-0.5.9.ebuild, denemo-0.7.2.ebuild,
+  metadata.xml:
+  Version bump.
+  Added metadata.xml
 
 *denemo-0.5.9 (15 Mar 2003)
 
diff --git a/media-sound/denemo/Manifest b/media-sound/denemo/Manifest
index e69de29bb2d1..b257759205de 100644
--- a/media-sound/denemo/Manifest
+++ b/media-sound/denemo/Manifest
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b1472fffba8bfa37a861d444bb645dbe ChangeLog 1407
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 25d2623b0aafb762049394cb5a982bc9 denemo-0.5.9.ebuild 640
+MD5 7c9230d3694419b6ee417d5a997c9509 denemo-0.7.2.ebuild 702
+MD5 cf903ece8513fee0c0c41f6af8f1c32b files/digest-denemo-0.7.2 64
+MD5 3f6f1cf45c08fe02d8aa60b1aeb756dd files/digest-denemo-0.5.9 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCZL0mKf2g/qXtneoRAlYWAKCJtIdz0myaQEanqJEEUasa1TzgYACdG0bG
+rXxNXWMsn0HO5EOvn3gTktk=
+=1FHq
+-----END PGP SIGNATURE-----
diff --git a/media-sound/denemo/denemo-0.5.9.ebuild b/media-sound/denemo/denemo-0.5.9.ebuild
index fa2800c2fa94..a6670b15f7b9 100644
--- a/media-sound/denemo/denemo-0.5.9.ebuild
+++ b/media-sound/denemo/denemo-0.5.9.ebuild
@@ -1,33 +1,26 @@
-# 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/media-sound/denemo/denemo-0.5.9.ebuild,v 1.1 2003/03/15 10:02:45 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/denemo/denemo-0.5.9.ebuild,v 1.1.1.1 2005/11/30 09:38:23 chriswhite Exp $
 
 DESCRIPTION="GTK+ graphical music notation editor"
 HOMEPAGE="http://denemo.sourceforge.net/"
-SRC_URI="http://dl.sourceforge.net/sourceforge/denemo/denemo-${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/denemo/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	=x11-libs/gtk+-1.2*
 	dev-libs/libxml
-        dev-util/yacc
-        sys-devel/flex
-        sys-devel/gettext"
-RDEPEND="virtual/glibc
-        =x11-libs/gtk+-1.2*
+	dev-util/yacc
+	sys-devel/flex
+	sys-devel/gettext"
+RDEPEND="virtual/libc
+	=x11-libs/gtk+-1.2*
 	dev-libs/libxml"
 
-S=${WORKDIR}/${P}
-
-src_compile() {
-    econf
-    emake || die
-}
-
 src_install() {
-    make DESTDIR=${D} install || die
+	make DESTDIR=${D} install || die
 }
diff --git a/media-sound/denemo/denemo-0.7.2.ebuild b/media-sound/denemo/denemo-0.7.2.ebuild
index 03672876d8c6..1c291179233d 100644
--- a/media-sound/denemo/denemo-0.7.2.ebuild
+++ b/media-sound/denemo/denemo-0.7.2.ebuild
@@ -1,30 +1,29 @@
-# 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/media-sound/denemo/denemo-0.7.2.ebuild,v 1.1 2004/02/18 10:27:33 torbenh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/denemo/denemo-0.7.2.ebuild,v 1.1.1.1 2005/11/30 09:38:23 chriswhite Exp $
+
+inherit flag-o-matic
 
 DESCRIPTION="GTK+ graphical music notation editor"
 HOMEPAGE="http://denemo.sourceforge.net/"
-SRC_URI="http://dl.sourceforge.net/sourceforge/denemo/denemo-${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/denemo/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 sparc amd64 ~ppc"
 IUSE=""
 
-DEPEND="virtual/glibc
-	=x11-libs/gtk+-1.2*
-	dev-libs/libxml
+RDEPEND="=x11-libs/gtk+-1.2*
+	dev-libs/libxml"
+
+DEPEND="${RDEPEND}
 	dev-util/yacc
 	sys-devel/flex
 	sys-devel/gettext"
-RDEPEND="virtual/glibc
-	=x11-libs/gtk+-1.2*
-	dev-libs/libxml"
-
-S=${WORKDIR}/${P}
 
 src_compile() {
-	econf
+	append-flags -fpermissive
+	econf || die
 	emake || die
 }
 
diff --git a/media-sound/denemo/metadata.xml b/media-sound/denemo/metadata.xml
index d4ce46c038ab..e1774e3d9ad7 100644
--- a/media-sound/denemo/metadata.xml
+++ b/media-sound/denemo/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sound</herd>
-<maintainer>
-  <email>torbenh@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/media-sound/digitaldj/ChangeLog b/media-sound/digitaldj/ChangeLog
index fa488ffd239f..cd47f14888ba 100644
--- a/media-sound/digitaldj/ChangeLog
+++ b/media-sound/digitaldj/ChangeLog
@@ -1,6 +1,46 @@
 # ChangeLog for media-sound/digitaldj
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/digitaldj/ChangeLog,v 1.1 2003/06/17 12:38:16 twp Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/digitaldj/ChangeLog,v 1.1.1.1 2005/11/30 09:38:40 chriswhite Exp $
+
+  14 Sep 2005; Aron Griffis <agriffis@gentoo.org> digitaldj-0.7.3-r1.ebuild:
+  Mark 0.7.3-r1 stable on alpha
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> digitaldj-0.7.5.ebuild:
+  Added to ~ppc.
+
+*digitaldj-0.7.5 (02 Mar 2005)
+
+  02 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> +digitaldj-0.7.5.ebuild:
+  version bump. fixes #78031
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  digitaldj-0.7.3-r1.ebuild:
+  Readding ~sparc.
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  digitaldj-0.7.3-r1.ebuild:
+  -amd64
+
+  25 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  digitaldj-0.7.3-r1.ebuild, digitaldj-0.7.3.ebuild:
+  Stable x86.  Removing old ebiuld.
+
+*digitaldj-0.7.3-r1 (26 Mar 2004)
+
+  26 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  digitaldj-0.7.3-r1.ebuild:
+  Added lirc support
+
+  26 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  digitaldj-0.7.3.ebuild:
+  Stable on x86.
+
+  29 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  digitaldj-0.7.3.ebuild, metadata.xml:
+  Removing ~mips because it lacks DEPs
+
+  17 Jun 2003; Tom Payne <twp@gentoo.org> digitaldj-0.7.3.ebuild :
+  Added pkg_config to create database.
 
 *digitaldj-0.7.3 (17 Jun 2003)
 
diff --git a/media-sound/digitaldj/Manifest b/media-sound/digitaldj/Manifest
index 02089f805805..34b84917327f 100644
--- a/media-sound/digitaldj/Manifest
+++ b/media-sound/digitaldj/Manifest
@@ -1,3 +1,6 @@
-MD5 89671cb261e02a71d767555433fa16a9 digitaldj-0.7.3.ebuild 593
-MD5 2abbdad5b4f24403b91820089be2021f ChangeLog 299
-MD5 03a2eb2ddc802f49217df9f438f3efd3 files/digest-digitaldj-0.7.3 67
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 ff61e9fbda8e32cd63722705f6e5357a ChangeLog 1560
+MD5 4e76b144cf517935038b8b14d1bc1985 digitaldj-0.7.3-r1.ebuild 1372
+MD5 332636039e7077b8e7159c30876f627d digitaldj-0.7.5.ebuild 1371
+MD5 e667da2e8eb6c938822d4f66ea6fe0a8 files/digest-digitaldj-0.7.5 67
+MD5 03a2eb2ddc802f49217df9f438f3efd3 files/digest-digitaldj-0.7.3-r1 67
diff --git a/media-sound/digitaldj/digitaldj-0.7.3-r1.ebuild b/media-sound/digitaldj/digitaldj-0.7.3-r1.ebuild
index a6c160904394..29d57cdb9b68 100644
--- a/media-sound/digitaldj/digitaldj-0.7.3-r1.ebuild
+++ b/media-sound/digitaldj/digitaldj-0.7.3-r1.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/media-sound/digitaldj/digitaldj-0.7.3-r1.ebuild,v 1.1 2004/03/27 03:03:26 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/digitaldj/digitaldj-0.7.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:40 chriswhite Exp $
 
 DESCRIPTION="A SQL-based mp3-player frontend designed to work with Grip"
 HOMEPAGE="http://www.nostatic.org/ddj/"
 SRC_URI="http://www.nostatic.org/ddj/${P}.tar.gz"
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="~alpha ~hppa ~sparc ~x86"
+#-amd64: 0.7.3-r1: segfault when "attempt to configure database->yes"
+KEYWORDS="alpha -amd64 ~hppa sparc x86"
 IUSE="lirc"
 DEPEND="dev-db/mysql
 	lirc? ( app-misc/lirc )
diff --git a/media-sound/digitaldj/digitaldj-0.7.5.ebuild b/media-sound/digitaldj/digitaldj-0.7.5.ebuild
index d098f204bf19..37cd27769288 100644
--- a/media-sound/digitaldj/digitaldj-0.7.5.ebuild
+++ b/media-sound/digitaldj/digitaldj-0.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/media-sound/digitaldj/digitaldj-0.7.5.ebuild,v 1.1 2005/03/02 21:08:23 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/digitaldj/digitaldj-0.7.5.ebuild,v 1.1.1.1 2005/11/30 09:38:40 chriswhite Exp $
 
 DESCRIPTION="A SQL-based mp3-player frontend designed to work with Grip"
 HOMEPAGE="http://www.nostatic.org/ddj/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/ddj/${P}.tar.gz"
 LICENSE="GPL-1"
 SLOT="0"
 #-amd64: 0.7.3-r1: segfault when "attempt to configure database->yes"
-KEYWORDS="~alpha ~hppa ~sparc ~x86 -amd64"
+KEYWORDS="~alpha -amd64 ~hppa ~ppc ~sparc ~x86"
 IUSE="lirc"
 DEPEND="dev-db/mysql
 	lirc? ( app-misc/lirc )
diff --git a/media-sound/dir2ogg/ChangeLog b/media-sound/dir2ogg/ChangeLog
index bf180f4f4f88..928d6d0d230a 100644
--- a/media-sound/dir2ogg/ChangeLog
+++ b/media-sound/dir2ogg/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for media-sound/dir2ogg
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/dir2ogg/ChangeLog,v 1.1 2004/10/11 23:13:38 pkdawson Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/dir2ogg/ChangeLog,v 1.1.1.1 2005/11/30 09:37:48 chriswhite Exp $
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> dir2ogg-0.9.1.ebuild:
+  Added to ~ppc.
+
+*dir2ogg-0.9.1 (16 May 2005)
+
+  16 May 2005; Jan Brinkmann <luckyduck@gentoo.org> dir2ogg-0.8.ebuild,
+  +dir2ogg-0.9.1.ebuild:
+  new upstream version, fixes #87626
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> dir2ogg-0.8.ebuild:
+  Stable amd64, sparc.
+
+  21 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> dir2ogg-0.8.ebuild:
+  Stable x86.  Added to ~amd64 and ~sparc.
 
 *dir2ogg-0.8 (11 Oct 2004)
 
diff --git a/media-sound/dir2ogg/Manifest b/media-sound/dir2ogg/Manifest
index 9f1d3dd78826..0b4652daa847 100644
--- a/media-sound/dir2ogg/Manifest
+++ b/media-sound/dir2ogg/Manifest
@@ -1,2 +1,6 @@
-MD5 c13115d67340853156e271346d55ae8a dir2ogg-0.8.ebuild 542
+MD5 36e3f0a784b2d698295c371eb56ad2b4 ChangeLog 844
+MD5 894ea2276b999998ce510c2ed07cbc51 dir2ogg-0.8.ebuild 708
+MD5 83c2574543d0501303b57050254e3880 metadata.xml 222
+MD5 bd402c5339a2e6bf4e188c687fb57b78 dir2ogg-0.9.1.ebuild 695
 MD5 7b57084575150811bffbfa840c520ad2 files/digest-dir2ogg-0.8 61
+MD5 ba3646bdab28c0c3788100d82c9ce9a9 files/digest-dir2ogg-0.9.1 63
diff --git a/media-sound/dir2ogg/dir2ogg-0.8.ebuild b/media-sound/dir2ogg/dir2ogg-0.8.ebuild
index 708848a05347..83ec8facbc4f 100644
--- a/media-sound/dir2ogg/dir2ogg-0.8.ebuild
+++ b/media-sound/dir2ogg/dir2ogg-0.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/media-sound/dir2ogg/dir2ogg-0.8.ebuild,v 1.1 2004/10/11 23:13:38 pkdawson Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/dir2ogg/dir2ogg-0.8.ebuild,v 1.1.1.1 2005/11/30 09:37:48 chriswhite Exp $
+
+S=${WORKDIR}/${PN}
 
 DESCRIPTION="Converts MP3, M4A, and WAV files to OGG format."
 HOMEPAGE="http://badcomputer.no-ip.com/linux/dir2ogg/"
 SRC_URI="http://badcomputer.no-ip.com/linux/dir2ogg/${P}.tar.gz"
-LICENSE="Artistic"
 
+LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="amd64 sparc x86"
 IUSE=""
 
+DEPEND=""
 RDEPEND="virtual/python
-	dev-python/pyid3lib
-	media-sound/vorbis-tools
-	media-sound/mpg123"
+	 dev-python/pyid3lib
+	 media-sound/vorbis-tools
+	 media-sound/mpg123"
 
-S=${WORKDIR}/${PN}
+src_compile() {
+	einfo "Nothing to compile"
+}
 
 src_install() {
 	dobin dir2ogg
 	doman dir2ogg.1
-	dodoc README LICENSE
+	dodoc README
 }
diff --git a/media-sound/dir2ogg/dir2ogg-0.9.1.ebuild b/media-sound/dir2ogg/dir2ogg-0.9.1.ebuild
index 91ae9b65ffd4..7de589963471 100644
--- a/media-sound/dir2ogg/dir2ogg-0.9.1.ebuild
+++ b/media-sound/dir2ogg/dir2ogg-0.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/dir2ogg/dir2ogg-0.9.1.ebuild,v 1.1 2005/05/16 14:57:13 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/dir2ogg/dir2ogg-0.9.1.ebuild,v 1.1.1.1 2005/11/30 09:37:48 chriswhite Exp $
 
 
 DESCRIPTION="Converts MP3, M4A, and WAV files to OGG format."
@@ -9,7 +9,7 @@ SRC_URI="http://badcomputer.no-ip.com/linux/dir2ogg/${P}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/media-sound/easytag/ChangeLog b/media-sound/easytag/ChangeLog
index 09eb4c11a220..f16541bce87c 100644
--- a/media-sound/easytag/ChangeLog
+++ b/media-sound/easytag/ChangeLog
@@ -1,6 +1,333 @@
 # ChangeLog for media-sound/easytag
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/ChangeLog,v 1.1 2002/04/17 08:24:59 rphillips Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/ChangeLog,v 1.1.1.1 2005/11/30 09:38:12 chriswhite Exp $
+
+*easytag-1.99.9 (04 Nov 2005)
+
+  04 Nov 2005; Daniel Drake <dsd@gentoo.org> +easytag-1.99.9.ebuild:
+  Version bump, adds mp4 support, thanks to Scott Alfter
+  <gentoo@salfter.dyndns.org> in bug #105708
+
+*easytag-1.99.7 (10 Aug 2005)
+
+  10 Aug 2005; Daniel Drake <dsd@gentoo.org> -easytag-1.99.6.ebuild,
+  +easytag-1.99.7.ebuild:
+  Version bump
+
+*easytag-1.99.6 (26 Jun 2005)
+
+  26 Jun 2005; Daniel Drake <dsd@gentoo.org> -easytag-1.99.5.ebuild,
+  +easytag-1.99.6.ebuild:
+  Version bump
+
+  21 Jun 2005; Olivier Crête <tester@gentoo.org> easytag-1.1.ebuild:
+  Stable on amd64
+
+  12 Jun 2005; Bryan Østergaard <kloeri@gentoo.org> easytag-1.1.ebuild:
+  Stable on alpha.
+
+*easytag-1.99.5 (09 Jun 2005)
+
+  09 Jun 2005; Daniel Drake <dsd@gentoo.org> -easytag-1.99.4.ebuild,
+  +easytag-1.99.5.ebuild:
+  Version bump to 1.99.5
+
+  06 Jun 2005; Markus Rothe <corsair@gentoo.org> easytag-1.1.ebuild:
+  Stable on ppc64
+
+  03 Jun 2005; Joseph Jezak <josejx@gentoo.org> easytag-1.1.ebuild:
+  Marked ppc stable.
+
+  02 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> easytag-1.1.ebuild:
+  Stable on sparc
+
+  01 Jun 2005; Daniel Drake <dsd@gentoo.org> easytag-1.1.ebuild,
+  -easytag-1.99.3.ebuild:
+  1.1 stable on x86
+
+*easytag-1.1 (02 May 2005)
+
+  02 May 2005; Daniel Drake <dsd@gentoo.org> +easytag-1.1.ebuild:
+  Version bump for the GTK1.x version to easytag 1.1
+
+*easytag-1.99.4 (02 May 2005)
+
+  02 May 2005; Daniel Drake <dsd@gentoo.org> +easytag-1.99.4.ebuild:
+  Version 1.99.4 - fixes UTF8 issues. Make sure you set conversion from UTF-8
+  to UTF-8 under Tag Settings Preferences
+
+  05 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> easytag-1.0-r1.ebuild:
+  Stable on alpha, bug 76329.
+
+*easytag-1.99.3 (21 Jan 2005)
+
+  21 Jan 2005; Daniel Drake <dsd@gentoo.org> -easytag-1.99.2-r1.ebuild,
+  +easytag-1.99.3.ebuild:
+  Version bump
+
+  03 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> easytag-1.0-r1.ebuild:
+  Stable on sparc wrt #76329
+
+  02 Jan 2005; Markus Rothe <corsair@gentoo.org> easytag-1.0-r1.ebuild,
+  easytag-1.99.2-r1.ebuild:
+  Stable on ppc64 and added gnuconfig_update
+
+  02 Jan 2005; Joseph Jezak <josejx@gentoo.org> easytag-1.0-r1.ebuild:
+  Marked ppc stable for bug #76329.
+
+  02 Jan 2005; Tom Martin <slarti@gentoo.org> easytag-1.0-r1.ebuild:
+  Stable on amd64.
+
+  01 Jan 2005; Daniel Drake <dsd@gentoo.org> easytag-1.0-r1.ebuild:
+  Stable on x86
+
+*easytag-1.99.2-r1 (30 Dec 2004)
+
+  30 Dec 2004; Daniel Drake <dsd@gentoo.org> +easytag-1.99.2-r1.ebuild:
+  Add APE crash fix, bug 70754
+
+*easytag-1.0-r1 (30 Dec 2004)
+
+  30 Dec 2004; Daniel Drake <dsd@gentoo.org> +files/easytag-ape-fix.patch,
+  +easytag-1.0-r1.ebuild:
+  Add APE crash fix, bug 70754
+
+  04 Dec 2004; Tom Martin <slarti@gentoo.org> easytag-1.0.ebuild:
+  Stable on amd64.
+
+  30 Nov 2004; Jason Huebel <jhuebel@gentoo.org> :
+  version bump to 1.99.2
+
+  10 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> easytag-1.0.ebuild:
+  Stable on sparc
+
+  09 Nov 2004; Daniel Drake <dsd@gentoo.org> easytag-1.0.ebuild:
+  Stable on x86
+
+*easytag-1.99.1 (29 Oct 2004)
+*easytag-1.0 (29 Oct 2004)
+
+  29 Oct 2004; Daniel Drake <dsd@gentoo.org> -easytag-0.31-r7.ebuild,
+  +easytag-1.0.ebuild, +easytag-1.99.1.ebuild:
+  Version bump to 1.0 (gtk1) and 1.99.1 (gtk2) releases
+
+*easytag-0.31-r7 (16 Oct 2004)
+
+  16 Oct 2004; Daniel Drake <dsd@gentoo.org> -easytag-0.31-r4.ebuild,
+  -easytag-0.31-r6.ebuild, +easytag-0.31-r7.ebuild:
+  Some homegrown crash and bug fixes
+
+  30 Sep 2004; Daniel Drake <dsd@gentoo.org> easytag-0.31-r6.ebuild:
+  Fix compilation on gcc 3.4
+
+*easytag-0.31-r6 (30 Sep 2004)
+
+  30 Sep 2004; Daniel Drake <dsd@gentoo.org> -easytag-0.31-r5.ebuild,
+  +easytag-0.31-r6.ebuild:
+  Version bump to 0.31_gtk2.4_pre3
+
+*easytag-0.31-r5 (26 Sep 2004)
+
+  26 Sep 2004; Daniel Drake <dsd@gentoo.org> +easytag-0.31-r5.ebuild:
+  Add patch to fix filename handling, please report success/failure. There is
+  one more issue left to solve, please don't mark as stable yet.
+
+*easytag-0.31-r4 (12 Sep 2004)
+
+  12 Sep 2004; Daniel Drake <dsd@gentoo.org> easytag-0.31-r1.ebuild,
+  easytag-0.31-r3.ebuild, easytag-0.31-r4.ebuild:
+  Version bump to 0.31_gtk2.4_pre2. Please don't mark any easytag GTK2 ebuilds
+  as stable on any arch until the issues are ironed out (I'll note here when
+  that is).
+
+  17 Aug 2004; Tom Gall <tgall@gentoo.org> easytag-0.31-r2.ebuild:
+  stable on ppc64, bug #58311
+
+  14 Aug 2004; Sven Wegener <swegener@gentoo.org> metadata.xml:
+  Corrected metadata.xml to match DTD.
+
+  10 Aug 2004; Daniel Drake <dsd@gentoo.org> easytag-0.31-r1.ebuild,
+  easytag-0.31-r2.ebuild, easytag-0.31.ebuild:
+  Fix depend (flac requires libvorbis)
+
+*easytag-0.31-r3 (10 Aug 2004)
+
+  10 Aug 2004; Daniel Drake <dsd@gentoo.org> easytag-0.31-r3.ebuild:
+  Bump to 0.31_gtk2.4_pre1, plus a configure fix, and a crashfix of my own
+
+*easytag-0.31-r2 (13 Jul 2004)
+
+  13 Jul 2004; Daniel Drake <dsd@gentoo.org> :
+  Bugfixes for 0.31-r1 (leaks, rename dir, undefined behaviour)
+
+*easytag-0.31-r1 (03 Jul 2004)
+
+  03 Jul 2004; Daniel Drake <dsd@gentoo.org> easytag-0.31-r1.ebuild,
+  metadata.xml:
+  EasyTAG 0.31_gtk2.4_pre0 - GTK2-only version - please report all bugs
+
+  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> easytag-0.31.ebuild:
+  Stable x86, amd64, sparc.
+
+  15 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org> easytag-0.31.ebuild:
+  Added ~amd64.
+
+  05 Jun 2004; Aron Griffis <agriffis@gentoo.org> easytag-0.31.ebuild,
+  easytag-0.31_pre2-r5.ebuild:
+  Minor ebuild syntax cleanups
+
+*easytag-0.31 (02 Jun 2004)
+
+  02 Jun 2004; Seemant Kulleen <seemant@gentoo.org> +easytag-0.31.ebuild,
+  -easytag-0.31_pre2-r3.ebuild, -easytag-0.31_pre2-r4.ebuild:
+  Version bump to newest upstream release WITH Daniel Drake <dsd@gentoo.org>
+  coming in with a brand new gtk2 patch for it, Thanks to him and Tristen for
+  testing in bug #52447
+
+*easytag-0.31_pre2-r5 (14 May 2004)
+
+  14 May 2004; Seemant Kulleen <seemant@gentoo.org>
+  +easytag-0.31_pre2-r5.ebuild:
+  The unrivalled dsd_ (Daniel Drake) <dsd@gentoo.org> has another update to the
+  gtk2 patchset. Again, this was tested by Tristan Henderson
+  <T.Henderson@cs.ucl.ac.uk>. All this happened in bug #51062
+
+*easytag-0.31_pre2-r4 (04 May 2004)
+
+  04 May 2004; Seemant Kulleen <seemant@gentoo.org> -easytag-0.30c.ebuild,
+  -easytag-0.31_pre2-r2.ebuild, +easytag-0.31_pre2-r4.ebuild:
+  dsd updated his patch again, verified to compile with gcc2 as well. Thanks to
+  Daniel Drake <dsd@gentoo.org> for the patch and Tristan Henderson
+  <T.Henderson@cs.ucl.ac.uk> for the gcc2 test, in bug #49968
+
+  29 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  easytag-0.31_pre2-r3.ebuild, files/easytag-0.31_pre2-gcc2.patch:
+  Yet another gcc2 fix closing bug #49427.  Thanks again Tristan.
+
+*easytag-0.31_pre2-r3 (27 Apr 2004)
+
+  27 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  easytag-0.31_pre2-r3.ebuild:
+  Bumping the version of the gtk2 patch. Provided by Daniel Drake
+  <dsd@gentoo.org> in bug #49156
+
+  22 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  easytag-0.31_pre2-r2.ebuild, files/easytag-0.30.2-gcc2.patch:
+  gcc2 compilation fix thanks to Tristan Henderson <T.Henderson@cs.ucl.ac.uk> in
+  bug #48672.
+
+*easytag-0.31_pre2-r2 (13 Apr 2004)
+
+  13 Apr 2004; Seemant Kulleen <seemant@gentoo.org>
+  easytag-0.31_pre2-r1.ebuild, easytag-0.31_pre2-r2.ebuild:
+  updated GTK2 patch from Daniel Drake <dsd@gentoo.org> in bug #47728
+
+*easytag-0.31_pre2-r1 (09 Apr 2004)
+
+  09 Apr 2004; Seemant Kulleen <seemant@gentoo.org>
+  easytag-0.31_pre2-r1.ebuild, easytag-0.31_pre2.ebuild:
+  nls fix thanks again to Daniel Drake, fixing bug #47373 by Jordan
+  <lx_xero@comcast.net>
+
+  09 Apr 2004; Seemant Kulleen <seemant@gentoo.org> easytag-0.30c.ebuild,
+  easytag-0.30d.ebuild, easytag-0.31_pre2.ebuild:
+  fix depend string, thanks to daniel in irc
+
+*easytag-0.31_pre2 (09 Apr 2004)
+
+  09 Apr 2004; Seemant Kulleen <seemant@gentoo.org> easytag-0.31_pre2.ebuild,
+  files/easytag-0.30.2-fix-configure.patch:
+  version bump to easytag-0.30.2, which is named 0.31_pre2 here because of
+  portage's version thingy which thinks 0.30d is a higher version than 0.30.2.
+  Included in this version is optional GTK2 support thanks to the venerable
+  Daniel Drake! Look for him to be a Gentoo developer soon, anyway. So, this was
+  all put together by: Daniel Drake <dan@reactivated.net> in bug #45479
+
+*easytag-0.30d (22 Mar 2004)
+
+  22 Mar 2004; Seemant Kulleen <seemant@gentoo.org> easytag-0.30.ebuild,
+  easytag-0.30d.ebuild:
+  version bump thanks to Daniel Drake <dan@reactivated.net> (who's doing a gtk2
+  port for us too) in bug #44841
+
+  17 Jan 2004; Seemant Kulleen <seemant@gentoo.org> easytag-0.30c.ebuild: 
+  set x86 and sparc in keywords
+
+  16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> easytag-0.30c.ebuild:
+  set ppc in keywords
+
+*easytag-0.30c (01 Dec 2003)
+
+  01 Dec 2003; Seemant Kulleen <seemant@gentoo.org> easytag-0.28.ebuild,
+  easytag-0.29.ebuild, easytag-0.30c.ebuild:
+  this version bump adds three patches: to fix a bug when renaming files with
+  the scanner and using the character conversion; to fix a bug that doesn't save
+  the changed files, which aren't selected, when changing of directory or
+  exiting, even if you select the button Yes in the dialog box; and to fix a bug
+  when using the check button Repeat action for the rest of the files in the
+  dialog box, when deleting files.
+
+  01 Dec 2003; Ciaran McCreesh <ciaranm@gentoo.org> easytag-0.30.ebuild:
+  moved to stable on sparc
+
+*easytag-0.30 (08 Sep 2003)
+
+  08 Sep 2003; Seemant Kulleen <seemant@gentoo.org> easytag-0.30.ebuild:
+  another version bump
+
+  01 Sep 2003; Seemant Kulleen <seemant@gentoo.org> easytag-0.29.ebuild:
+  version bump
+
+*easytag-0.28 (2 Jun 2003)
+
+  02 Jun 2003; robh <robh@gentoo.org> easytag-0.28.ebuild:
+  version bump. closes #22088. reported by: Gregorio Guidi <g.guidi@sns.it>
+
+*easytag-0.27 (19 Feb 2003)
+
+  11 Mar 2003; Seemant Kulleen <seemant@gentoo.org> easytag-0.27.ebuild:
+  sed fix for my fix. thanks to: Tristan Henderson <T.Henderson@cs.ucl.ac.uk> in
+  bug #17326
+
+  05 Mar 2003; Seemant Kulleen <seemant@gentoo.org> easytag-0.27.ebuild:
+  errno fixes
+
+  19 Feb 2003; Seemant Kulleen <seemant@gentoo.org> easytag-0.23.ebuild easytag-0.25.ebuild easytag-0.27.ebuild files/digest-easytag-0.27 :
+  other arches to testing; and version bump thanks to: Jay Pfeifer <jay@jdp.cc> in bug #15782
+
+*easytag-0.25 (11 Nov 2002)
+
+  11 Nov 2002; Seemant Kulleen <seemant@gentoo.org> easytag-0.25.ebuild
+  files/digest-easytag-0.25 :
+
+  Version bump.
+
+*easytag-0.23 (19 Jul 2002)
+
+  19 Jul 2002; Seemant Kulleen <seemant@gentoo.org> easytag-0.23.ebuild
+  files/digest-easytag-0.23 :
+
+  Update version.
+
+*easytag-0.21 (26 Apr 2002)
+
+  26 May 2002; Ryan Phillips <rphillips@gentoo.org> easytag-0.21.ebuild :
+
+  Updated version.
+  support for mirror:// added
+  builds without ogg support if USE variable is not set
+
+*easytag-0.18 (26 Apr 2002)
+
+  26 May 2002; Ryan Phillips <rphillips@gentoo.org> easytag-0.18.ebuild :
+
+  Actually builds easytag without ogg support
+  Changed to mirror:// support
+
+  26 Apr 2002; Ryan Phillips <rphillips@gentoo.org> easytag-0.18.ebuild :
+
+  Error in setting the myconf variable when using use oggvorbin.
+  Fixes (#2125)
 
 *easytag-0.18 (17 Apr 2002)
 
diff --git a/media-sound/easytag/Manifest b/media-sound/easytag/Manifest
index e69de29bb2d1..ac2263b9af73 100644
--- a/media-sound/easytag/Manifest
+++ b/media-sound/easytag/Manifest
@@ -0,0 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 47d31e84c98784c88f825859e67f022c easytag-1.0-r1.ebuild 1227
+MD5 2d431f0585b1ef6ba722f6d3aac5db80 easytag-1.99.7.ebuild 1245
+MD5 898596764300bc5f2b42995253b41b1c easytag-1.99.9.ebuild 1270
+MD5 c098be94d123e11991c84dc35fd2be93 easytag-1.1.ebuild 1183
+MD5 1734be7e994bcecbe33013c85e085c19 ChangeLog 11540
+MD5 79119f45cab878d56945e1c66e22550c metadata.xml 402
+MD5 bfafbbfb1a845e93498456dafa59b9ca files/digest-easytag-1.1 65
+MD5 bed011d8cb53800acb92633c0341a526 files/digest-easytag-1.0-r1 65
+MD5 ebff0425ede09fdd1218fee1fc3b0daa files/digest-easytag-1.99.7 68
+MD5 06108156dd5eb758f4ceabc882bc6a98 files/digest-easytag-1.99.9 68
+MD5 86777318233983d77338c33ab4bf266b files/easytag-ape-fix.patch 684
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDarIfTOXg++0VvJQRAnKXAJ9exzIPw2no/gmlQ/6J1t5169JDqACbBn5L
+ExndvwfNbhqpnY7NtEwDxJc=
+=purH
+-----END PGP SIGNATURE-----
diff --git a/media-sound/easytag/easytag-1.0-r1.ebuild b/media-sound/easytag/easytag-1.0-r1.ebuild
index d0c79398e777..dc6a36d1a70d 100644
--- a/media-sound/easytag/easytag-1.0-r1.ebuild
+++ b/media-sound/easytag/easytag-1.0-r1.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/media-sound/easytag/easytag-1.0-r1.ebuild,v 1.1 2004/12/30 22:24:08 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/easytag-1.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:13 chriswhite Exp $
 
 inherit eutils gnuconfig
 
-IUSE="nls oggvorbis flac"
-
 DESCRIPTION="EasyTAG mp3/ogg ID3 tag editor"
 HOMEPAGE="http://easytag.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
+IUSE="nls oggvorbis flac"
+
 RDEPEND=">=media-libs/id3lib-3.8.2
 	=x11-libs/gtk+-1.2*
 	flac? ( >=media-libs/flac-1.1.0 >=media-libs/libvorbis-1.0 )
 	oggvorbis? ( >=media-libs/libvorbis-1.0 )"
 
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ppc64"
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/easytag-ape-fix.patch
+	gnuconfig_update
 }
 
 src_compile() {
@@ -40,7 +40,7 @@ src_install() {
 		GNOME_SYSCONFDIR=${D}/etc \
 		|| die
 
-	dodoc ChangeLog COPYING NEWS README TODO THANKS USERS-GUIDE
+	dodoc ChangeLog NEWS README TODO THANKS USERS-GUIDE
 }
 
 pkg_postinst() {
diff --git a/media-sound/easytag/easytag-1.1.ebuild b/media-sound/easytag/easytag-1.1.ebuild
index 92a0558c6d63..78eb1e761f39 100644
--- a/media-sound/easytag/easytag-1.1.ebuild
+++ b/media-sound/easytag/easytag-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/media-sound/easytag/easytag-1.1.ebuild,v 1.1 2005/05/02 21:13:07 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/easytag-1.1.ebuild,v 1.1.1.1 2005/11/30 09:38:12 chriswhite Exp $
 
 inherit eutils gnuconfig
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~hppa ppc ppc64 sparc x86"
 IUSE="nls oggvorbis flac"
 
 RDEPEND=">=media-libs/id3lib-3.8.2
diff --git a/media-sound/easytag/easytag-1.99.7.ebuild b/media-sound/easytag/easytag-1.99.7.ebuild
index ac1bb0e8d932..35d98fe19431 100644
--- a/media-sound/easytag/easytag-1.99.7.ebuild
+++ b/media-sound/easytag/easytag-1.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/media-sound/easytag/easytag-1.99.7.ebuild,v 1.1 2005/08/10 21:15:02 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/easytag-1.99.7.ebuild,v 1.1.1.1 2005/11/30 09:38:13 chriswhite Exp $
 
 DESCRIPTION="EasyTAG mp3/ogg ID3 tag editor"
 HOMEPAGE="http://easytag.sourceforge.net/"
diff --git a/media-sound/easytag/easytag-1.99.9.ebuild b/media-sound/easytag/easytag-1.99.9.ebuild
index 6e692a3d1903..3502df9f0720 100644
--- a/media-sound/easytag/easytag-1.99.9.ebuild
+++ b/media-sound/easytag/easytag-1.99.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/media-sound/easytag/easytag-1.99.9.ebuild,v 1.1 2005/11/04 00:57:33 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/easytag-1.99.9.ebuild,v 1.1.1.1 2005/11/30 09:38:13 chriswhite Exp $
 
 DESCRIPTION="EasyTAG mp3/ogg ID3 tag editor"
 HOMEPAGE="http://easytag.sourceforge.net/"
diff --git a/media-sound/easytag/metadata.xml b/media-sound/easytag/metadata.xml
index ce95093a6270..3d7ea73069d1 100644
--- a/media-sound/easytag/metadata.xml
+++ b/media-sound/easytag/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sound</herd>
+<maintainer>
+	<email>dsd@gentoo.org</email>
+	<name>Daniel Drake</name>
+</maintainer>
 <longdescription>a utility for viewing and editing tags for MP3, MP2, FLAC
 and OGG files. It features a simple and attractive GTK+
 interface</longdescription>
diff --git a/media-sound/ecamegapedal/ChangeLog b/media-sound/ecamegapedal/ChangeLog
index 68e6a2a7ebaa..81594e2ee6db 100644
--- a/media-sound/ecamegapedal/ChangeLog
+++ b/media-sound/ecamegapedal/ChangeLog
@@ -1,6 +1,50 @@
 # ChangeLog for media-sound/ecamegapedal
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ecamegapedal/ChangeLog,v 1.1 2003/06/21 04:00:07 jje Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ecamegapedal/ChangeLog,v 1.1.1.1 2005/11/30 09:37:52 chriswhite Exp $
+
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  ecamegapedal-0.4.2.ebuild, ecamegapedal-0.4.3.ebuild:
+  Don't install COPYING file.
+
+  28 Jul 2005; Caleb Tennis <caleb@gentoo.org> ecamegapedal-0.4.2.ebuild,
+  ecamegapedal-0.4.3.ebuild:
+  qt dep to qt3 per bug #100235
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> ecamegapedal-0.4.3.ebuild:
+  Added to ~ppc.
+
+  22 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ecamegapedal-0.4.3.ebuild:
+  Removed sparc conditional around jack.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ecamegapedal-0.4.3.ebuild:
+  Stable amd64, sparc.
+
+  12 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ecamegapedal-0.4.3.ebuild:
+  ~amd64 ~sparc
+
+  13 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ecamegapedal-0.4.2.ebuild, ecamegapedal-0.4.3.ebuild:
+  Getting rid of virtual/jack.
+
+  22 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ecamegapedal-0.4.2.ebuild, ecamegapedal-0.4.3.ebuild:
+  Removed explicit S=.
+
+  11 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ecamegapedal-0.4.2.ebuild, ecamegapedal-0.4.3.ebuild:
+  Stable on x86 and added jack USE flag support to close bug #31263.
+
+  07 Dec 2003; Heinrich Wendel <lanius@gentoo.org> ecamegapedal-0.4.2.ebuild,
+  ecamegapedal-0.4.3.ebuild:
+  removed unnecessary alsa-driver dep
+
+*ecamegapedal-0.4.3 (17 Oct 2003)
+
+  17 Oct 2003; Martin Holzer <mholzer@gentoo.org> ecamegapedal-0.4.3.ebuild:
+  Version bumped. Closes #31266.
 
 *ecamegapedal-0.4.2 (21 Jun 2003)
 
diff --git a/media-sound/ecamegapedal/Manifest b/media-sound/ecamegapedal/Manifest
index bc4fe01c4f59..3178aa608965 100644
--- a/media-sound/ecamegapedal/Manifest
+++ b/media-sound/ecamegapedal/Manifest
@@ -1,2 +1,16 @@
-MD5 148bc7f5150dffd270345ab7222f8b5a ecamegapedal-0.4.2.ebuild 581
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 741a6b2a4f902511a27938a086b9512f ecamegapedal-0.4.3.ebuild 716
+MD5 3eb44b3d483242ff37e5bd0b443691b1 ChangeLog 1865
+MD5 0de897fd3e53036e1f536600ae7b5a5d ecamegapedal-0.4.2.ebuild 703
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 0a2a4a63266522dbf31c4a1e4eef2af2 files/digest-ecamegapedal-0.4.3 70
 MD5 ce26a7e7befbc810c5b105b259a8eb20 files/digest-ecamegapedal-0.4.2 70
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGs2Pj5H05b2HAEkRAkePAJ9gVN/FDf2Ml89Qgb3BzXgblo+URwCfZTY4
+34c++gcgoNS8UiZx9LZ7qXg=
+=R1Im
+-----END PGP SIGNATURE-----
diff --git a/media-sound/ecamegapedal/ecamegapedal-0.4.2.ebuild b/media-sound/ecamegapedal/ecamegapedal-0.4.2.ebuild
index b3533148a0ed..d1bf17cdb810 100644
--- a/media-sound/ecamegapedal/ecamegapedal-0.4.2.ebuild
+++ b/media-sound/ecamegapedal/ecamegapedal-0.4.2.ebuild
@@ -1,28 +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/media-sound/ecamegapedal/ecamegapedal-0.4.2.ebuild,v 1.1 2003/06/21 04:00:07 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ecamegapedal/ecamegapedal-0.4.2.ebuild,v 1.1.1.1 2005/11/30 09:37:53 chriswhite Exp $
 
 DESCRIPTION="Ecamegapedal is a real-time effect processor."
 HOMEPAGE="http://www.wakkanet.fi/~kaiv/ecamegapedal/"
 SRC_URI="http://ecasound.seul.org/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
-DEPEND="x11-libs/qt \
-	virtual/jack \
-	media-sound/alsa-driver \
-	media-sound/ecasound"
+IUSE="jack"
 
-S=${WORKDIR}/${P}
+DEPEND="=x11-libs/qt-3* \
+	jack? ( media-sound/jack-audio-connection-kit ) \
+	media-sound/ecasound"
 
 src_compile() {
-	econf || die
+	econf `use_enable jack` || die
 	emake || die
 }
 
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc COPYING NEWS README TODO
+	dodoc NEWS README TODO
 }
 
diff --git a/media-sound/ecamegapedal/ecamegapedal-0.4.3.ebuild b/media-sound/ecamegapedal/ecamegapedal-0.4.3.ebuild
index 3ffdff077107..1ffd3df6163d 100644
--- a/media-sound/ecamegapedal/ecamegapedal-0.4.3.ebuild
+++ b/media-sound/ecamegapedal/ecamegapedal-0.4.3.ebuild
@@ -1,27 +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/media-sound/ecamegapedal/ecamegapedal-0.4.3.ebuild,v 1.1 2003/10/16 19:34:06 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ecamegapedal/ecamegapedal-0.4.3.ebuild,v 1.1.1.1 2005/11/30 09:37:52 chriswhite Exp $
 
 DESCRIPTION="Ecamegapedal is a real-time effect processor."
 HOMEPAGE="http://www.wakkanet.fi/~kaiv/ecamegapedal/"
 SRC_URI="http://ecasound.seul.org/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 
-DEPEND="x11-libs/qt \
-	virtual/jack \
-	media-sound/alsa-driver \
-	media-sound/ecasound"
+IUSE="jack"
 
-S=${WORKDIR}/${P}
+DEPEND="=x11-libs/qt-3*
+	jack? ( media-sound/jack-audio-connection-kit )
+	media-sound/ecasound"
 
 src_compile() {
-	econf || die
+	econf `use_enable jack` || die
 	emake || die
 }
 
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc COPYING NEWS README TODO
+	dodoc NEWS README TODO
 }
diff --git a/media-sound/ecasound/ChangeLog b/media-sound/ecasound/ChangeLog
index 031e16a7a2f8..bf84f72b9762 100644
--- a/media-sound/ecasound/ChangeLog
+++ b/media-sound/ecasound/ChangeLog
@@ -1,8 +1,136 @@
-# ChangeLog for media-sound/ecasound-2.0.4.ebuild
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ecasound/ChangeLog,v 1.1 2002/08/05 04:50:56 naz Exp $
+# ChangeLog for media-sound/ecasound
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ecasound/ChangeLog,v 1.1.1.1 2005/11/30 09:38:15 chriswhite Exp $
 
-*ecasound-2.0.4.ebuild (04 Aug 2002)
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> ecasound-2.3.2.ebuild,
+  ecasound-2.3.3.ebuild, ecasound-2.4.0.ebuild, ecasound-2.4.1.ebuild,
+  ecasound-2.4.2.ebuild:
+  Don't install COPYING and INSTALL files.
+
+*ecasound-2.4.2 (07 Aug 2005)
+
+  07 Aug 2005; Kito <kito@gentoo.org> +ecasound-2.4.2.ebuild:
+  version bump. Ebuild cleanup, several use flags added -
+  debug,ruby,sndfile,libsamplerate.
+
+*ecasound-2.4.1 (21 Apr 2005)
+
+  21 Apr 2005; Kito <kito@gentoo.org> +ecasound-2.4.1.ebuild:
+  version bump. closes Bug #87392
+
+*ecasound-2.4.0 (29 Mar 2005)
+
+  29 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> metadata.xml,
+  +ecasound-2.4.0.ebuild:
+  new upstream release, fixes #86668. updated metadata.xml, torbenh is retired.
+
+  22 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ecasound-2.3.3.ebuild:
+  Removed sparc conditional around jack.
+
+  12 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ecasound-2.3.3.ebuild:
+  Stable amd64
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ecasound-2.3.2.ebuild, ecasound-2.3.3.ebuild:
+  virtual/glibc -> virtual/libc
+
+  28 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ecasound-2.3.3.ebuild:
+  --with-pic for amd64.  Marking ~amd64.
+
+  15 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -ecasound-2.2.3.ebuild, -ecasound-2.3.0.ebuild:
+  Stable sparc and x86.  Added -amd64 (Bug #54034).  Removed old versions.
+
+  13 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ecasound-2.2.3.ebuild, ecasound-2.3.0.ebuild, ecasound-2.3.2.ebuild,
+  ecasound-2.3.3.ebuild:
+  Getting rid of virtual/jack.
+
+  07 May 2004; David Holm <dholm@gentoo.org> ecasound-2.3.3.ebuild:
+  Added to ~ppc.
+
+  06 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ecasound-2.3.3.ebuild:
+  Added to ~sparc.
+
+*ecasound-2.3.3 (06 May 2004)
+
+  06 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ecasound-2.3.3.ebuild:
+  Version bump closes bug #50102.
+
+  11 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ecasound-2.3.0.ebuild, ecasound-2.3.2.ebuild:
+  Stable on x86.
+
+  28 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ecasound-2.2.3.ebuild, ecasound-2.3.0.ebuild, ecasound-2.3.2.ebuild:
+  Added audiofile local USE flag for audiofile support checking.
+
+*ecasound-2.3.2 (22 Jan 2004)
+
+  22 Jan 2004; <torbenh@gentoo.org> ecasound-2.3.0.ebuild,
+  ecasound-2.3.2.ebuild:
+  fixed ecasound-2.3.0
+  added ecasound-2.3.2
+
+  22 Jan 2004; <torbenh@gentoo.org> ecasound-2.2.3.ebuild,
+  ecasound-2.3.0.ebuild, metadata.xml:
+  Added sed Statements to fix alsa-1.0 compile Bug
+
+  17 Oct 2003; Martin Holzer <mholzer@gentoo.org> ecasound-2.2.3.ebuild,
+  ecasound-2.3.0.ebuild:
+  adding jack IUSE. Closes #31048.
+
+*ecasound-2.3.0 (20 Sep 2003)
+
+  20 Sep 2003; jje <jje@gentoo.org> ecasound-2.3.0.ebuild:
+  Version bump. Closes #27593.
+  
+  Submitted by:	Kasper Souren <Kasper.Souren@ircam.fr>
+
+*ecasound-2.2.3 (18 May 2003)
+
+  18 May 2003; jje <jje@gentoo.org> ecasound-2.0.4.ebuild,
+  ecasound-2.0.4.ebuild, ecasound-2.2.0.ebuild, ecasound-2.2.0.ebuild,
+  ecasound-2.2.3.ebuild:
+  Fix IUSE, no audiofile use flag. Remove old versions.
+
+  18 May 2003; jje <jje@gentoo.org> ecasound-2.2.3.ebuild:
+  Version bump.
+
+*ecasound-2.2.0 (29 Jan 2003)
+
+  29 Jan 2003; Tobias Eichert <viz@gentoo.org> ecasound-2.2.0.ebuild
+  files/digest-ecasound-2.2.0:
+  
+  Version bump.
+
+  15 Jan 2003; Nick Hadaway <raker@gentoo.org> ecasound-2.2.0_rc1.ebuild :
+  changed jack depend to virtual/jack
+
+*ecasound-2.2.0_rc1 ( 8 Jan 2003)
+
+  8 Jan 2003; Tobias Eichert <viz@gentoo.org> ecasound-2.2.0_rc1.ebuild
+  files/digest-ecasound-2.2.0_rc1
+
+  Version bump.
+  Added "media-sound/jack-audio-connection-kit" as a dependency.
+  Anyways, jack support is optional but we don't have a jack USE
+  flag (see bug #12527). If you really like to compile ecasound
+  with jack disabled, just remove this dependency.
+  Thanks to Paul Thompson <thompson@pobox.com> for contribution
+  and minor ebuild cleanups. Closes bug #12381.
+
+*ecasound-2.0.4 (04 Aug 2002)
+
+  25 Mar 2003; Seemant Kulleen <seemant@gentoo.org> ecasound-2.0.4.ebuild,
+  ecasound-2.2.0.ebuild, ecasound-2.2.0_rc1.ebuild, ecasound-2.2.0_rc1.ebuild:
+  libmikmod to mikmod in USE, ffs, please check use.desc before adding flags
+  haphazardly
 
   04 Aug 2002; Michael Nazaroff <naz@gentoo.org> ecasound-2.0.4.ebuild: 
   
diff --git a/media-sound/ecasound/Manifest b/media-sound/ecasound/Manifest
index 2cc0da0abbf4..a40eeb933578 100644
--- a/media-sound/ecasound/Manifest
+++ b/media-sound/ecasound/Manifest
@@ -1,3 +1,22 @@
-MD5 afeca00f9629f53e3274f17aff800ca3 ChangeLog 2164
-MD5 bdfe68a16abf81affbfcca3f31d9b89e ecasound-2.2.3.ebuild 2605
-MD5 3bb7f0619e719cccec8c69b4f84788c3 files/digest-ecasound-2.2.3 66
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3237077f3c91fda85143a17cbf7006a5 ecasound-2.4.2.ebuild 3147
+MD5 f526f631ca93dd5e5cfaea7405b8e234 ecasound-2.3.2.ebuild 2745
+MD5 c060f2da2dbf2edc3fe71b6ae8819320 ChangeLog 4981
+MD5 25330851b444faf6739c8118fd706830 ecasound-2.4.0.ebuild 2796
+MD5 5f2fc64f6af27a2898f7fe24b1aafcea ecasound-2.4.1.ebuild 2858
+MD5 79df26ffb46ccf0e6c7fe0e2ba26aa14 ecasound-2.3.3.ebuild 2794
+MD5 eadab3941f136b871837953c9d1472d5 metadata.xml 753
+MD5 6a3363beab079c4f667c48d887782a04 files/digest-ecasound-2.4.0 66
+MD5 e68dadbc41193dfa31762ee90a4b2271 files/digest-ecasound-2.3.2 66
+MD5 92bd0b879f6e514225f5db2a2d474688 files/digest-ecasound-2.3.3 66
+MD5 ad606cf29183d19c00c3f0c8679b759d files/digest-ecasound-2.4.2 67
+MD5 a17b7c260bfe07eb12d6b70ffcfbe01b files/digest-ecasound-2.4.1 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGs6ej5H05b2HAEkRAofXAKCVYQu0SmPywhBMhF3DWCd5CPqYRQCcC74q
+bHFBCs6rfLWozR7ZpOa8dGM=
+=XQJy
+-----END PGP SIGNATURE-----
diff --git a/media-sound/ecasound/ecasound-2.3.2.ebuild b/media-sound/ecasound/ecasound-2.3.2.ebuild
index e965e00e689e..6d67d008b3c8 100644
--- a/media-sound/ecasound/ecasound-2.3.2.ebuild
+++ b/media-sound/ecasound/ecasound-2.3.2.ebuild
@@ -1,22 +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/media-sound/ecasound/ecasound-2.3.2.ebuild,v 1.1 2004/01/22 12:26:31 torbenh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ecasound/ecasound-2.3.2.ebuild,v 1.1.1.1 2005/11/30 09:38:15 chriswhite Exp $
 
-IUSE="ncurses arts alsa python oss mikmod oggvorbis jack"
+IUSE="ncurses arts alsa python oss mikmod oggvorbis jack audiofile"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="A package for multitrack audio processing"
 SRC_URI="http://ecasound.seul.org/download/${P}.tar.gz"
 HOMEPAGE="http://eca.cx/"
 LICENSE="GPL-2"
 
 SLOT="1"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
-DEPEND="virtual/glibc
-	jack?	( virtual/jack )
+DEPEND="virtual/libc
+	jack?	( media-sound/jack-audio-connection-kit )
 	media-libs/ladspa-sdk
-	media-libs/audiofile
+	audiofile? ( media-libs/audiofile )
 	alsa?	( media-libs/alsa-lib )
 	oggvorbis?	( media-libs/libvorbis )
 	arts?	( kde-base/arts )
@@ -83,7 +82,7 @@ src_install () {
 		cd ..
 	fi
 
-	dodoc INSTALL FAQ BUGS COPYING NEWS README TODO
+	dodoc FAQ BUGS NEWS README TODO
 	dohtml `find Documentation -name "*.html"`
 	dodoc Documentation/edi-list.txt
 }
diff --git a/media-sound/ecasound/ecasound-2.3.3.ebuild b/media-sound/ecasound/ecasound-2.3.3.ebuild
index fec86a7415af..9c0d4bcabaf2 100644
--- a/media-sound/ecasound/ecasound-2.3.3.ebuild
+++ b/media-sound/ecasound/ecasound-2.3.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/media-sound/ecasound/ecasound-2.3.3.ebuild,v 1.1 2004/05/06 09:35:34 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ecasound/ecasound-2.3.3.ebuild,v 1.1.1.1 2005/11/30 09:38:15 chriswhite Exp $
 
 IUSE="ncurses arts alsa python oss mikmod oggvorbis jack audiofile"
 
@@ -10,18 +10,17 @@ HOMEPAGE="http://eca.cx/"
 LICENSE="GPL-2"
 
 SLOT="1"
-KEYWORDS="~x86"
+KEYWORDS="x86 sparc ~ppc amd64"
 
-DEPEND="virtual/glibc
-	jack?	( virtual/jack )
+DEPEND="jack? ( media-sound/jack-audio-connection-kit )
 	media-libs/ladspa-sdk
 	audiofile? ( media-libs/audiofile )
-	alsa?	( media-libs/alsa-lib )
-	oggvorbis?	( media-libs/libvorbis )
-	arts?	( kde-base/arts )
-	mikmod?	( media-libs/libmikmod )
-	python?		( dev-lang/python )
-	ncurses?	( sys-libs/ncurses )"
+	alsa? ( media-libs/alsa-lib )
+	oggvorbis? ( media-libs/libvorbis )
+	arts? ( kde-base/arts )
+	mikmod? ( media-libs/libmikmod )
+	python? ( dev-lang/python )
+	ncurses? ( sys-libs/ncurses )"
 
 # We don't make RDEPEND for vorbis-tools, mpg123/mpg321, timidity++ or lame -- no
 # use flags for them.
@@ -29,6 +28,7 @@ DEPEND="virtual/glibc
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+
 	sed -i 's:map.h:map:g' configure
 }
 
@@ -42,6 +42,8 @@ src_compile () {
 	use audiofile || myconf="$myconf --disable-audiofile"
 	use oss || myconf="$myconf --disable-oss"
 
+	use amd64 && myconf="${myconf} --with-pic"
+
 	if use python; then
 		#
 		# ecasound is braindead about finding python includes/libdirs and
@@ -82,7 +84,7 @@ src_install () {
 		cd ..
 	fi
 
-	dodoc INSTALL FAQ BUGS COPYING NEWS README TODO
+	dodoc FAQ BUGS NEWS README TODO
 	dohtml `find Documentation -name "*.html"`
 	dodoc Documentation/edi-list.txt
 }
diff --git a/media-sound/ecasound/ecasound-2.4.0.ebuild b/media-sound/ecasound/ecasound-2.4.0.ebuild
index e71de143772c..3a8b0c419eb0 100644
--- a/media-sound/ecasound/ecasound-2.4.0.ebuild
+++ b/media-sound/ecasound/ecasound-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/media-sound/ecasound/ecasound-2.4.0.ebuild,v 1.1 2005/03/29 09:16:16 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ecasound/ecasound-2.4.0.ebuild,v 1.1.1.1 2005/11/30 09:38:15 chriswhite Exp $
 
 IUSE="ncurses arts alsa python oss mikmod oggvorbis jack audiofile"
 
@@ -84,7 +84,7 @@ src_install () {
 		cd ..
 	fi
 
-	dodoc INSTALL FAQ BUGS COPYING NEWS README TODO
+	dodoc FAQ BUGS NEWS README TODO
 	dohtml `find Documentation -name "*.html"`
 	dodoc Documentation/edi-list.txt
 }
diff --git a/media-sound/ecasound/ecasound-2.4.1.ebuild b/media-sound/ecasound/ecasound-2.4.1.ebuild
index f73b795fb7d4..04c0e8ee3a22 100644
--- a/media-sound/ecasound/ecasound-2.4.1.ebuild
+++ b/media-sound/ecasound/ecasound-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/media-sound/ecasound/ecasound-2.4.1.ebuild,v 1.1 2005/04/21 21:36:41 kito Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ecasound/ecasound-2.4.1.ebuild,v 1.1.1.1 2005/11/30 09:38:15 chriswhite Exp $
 
 IUSE="ncurses arts alsa python oss mikmod oggvorbis jack audiofile"
 
@@ -80,15 +80,15 @@ src_install () {
 		cd ..
 	fi
 
-	dodoc INSTALL FAQ BUGS COPYING NEWS README TODO
+	dodoc FAQ BUGS NEWS README TODO
 	dohtml `find Documentation -name "*.html"`
 	dodoc Documentation/edi-list.txt
 }
 
 pkg_postinst() {
 	if use arts; then
-		ewarn "WARNING: You have requested ecasound ARTS support, 	"
-		ewarn "this is no longer supported and may go away in 		"
-		ewarn "future releases.										"
+		ewarn "WARNING: You have requested ecasound ARTS support,"
+		ewarn "this is no longer supported and may go away in"
+		ewarn "future releases."
 	fi
 }
diff --git a/media-sound/ecasound/ecasound-2.4.2.ebuild b/media-sound/ecasound/ecasound-2.4.2.ebuild
index 330aeb348d04..b189c065f4df 100644
--- a/media-sound/ecasound/ecasound-2.4.2.ebuild
+++ b/media-sound/ecasound/ecasound-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/media-sound/ecasound/ecasound-2.4.2.ebuild,v 1.1 2005/08/10 20:54:34 kito Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ecasound/ecasound-2.4.2.ebuild,v 1.1.1.1 2005/11/30 09:38:15 chriswhite Exp $
 
 IUSE="alsa arts audiofile debug jack libsamplerate mikmod ncurses oggvorbis oss pic python ruby sndfile"
 
@@ -95,7 +95,7 @@ src_install () {
 		cd ..
 	fi
 
-	dodoc INSTALL FAQ BUGS COPYING NEWS README TODO
+	dodoc FAQ BUGS NEWS README TODO
 	dohtml `find Documentation -name "*.html"`
 	dodoc Documentation/edi-list.txt
 }
diff --git a/media-sound/ecasound/metadata.xml b/media-sound/ecasound/metadata.xml
index d4ce46c038ab..d1333edae365 100644
--- a/media-sound/ecasound/metadata.xml
+++ b/media-sound/ecasound/metadata.xml
@@ -2,7 +2,17 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sound</herd>
-<maintainer>
-  <email>torbenh@gentoo.org</email>
-</maintainer>
+
+<longdescription>
+	Ecasound is a software package designed for multitrack audio 
+	processing. It can be used for simple tasks like audio playback,
+	recording and format conversions, as well as for multitrack 
+	effect processing, mixing, recording and signal recycling. 
+	Ecasound supports a wide range of audio inputs, outputs and 
+	effect algorithms. Effects and audio objects can be combined 
+	in various ways, and their parameters can be controlled by operator
+	objects like oscillators and MIDI-CCs. A versatile console mode 
+	user-interface is included in the package.
+</longdescription>
+
 </pkgmetadata>
diff --git a/media-sound/edna/ChangeLog b/media-sound/edna/ChangeLog
index 9e2c6f7e1345..f77fcd64a35f 100644
--- a/media-sound/edna/ChangeLog
+++ b/media-sound/edna/ChangeLog
@@ -1,6 +1,80 @@
 # ChangeLog for media-sound/edna
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/edna/ChangeLog,v 1.1 2003/12/14 22:57:58 nerdboy Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/edna/ChangeLog,v 1.1.1.1 2005/11/30 09:38:42 chriswhite Exp $
+
+  14 Sep 2005; Aron Griffis <agriffis@gentoo.org> edna-0.5-r4.ebuild:
+  Mark 0.5-r4 stable on alpha
+
+  09 Sep 2005; Steve Arnold <nerdboy@gentoo.org> files/edna.gentoo:
+  reverting init script change (seems to be a baselayout _pre issue)
+
+*edna-0.5-r5 (09 Sep 2005)
+
+  09 Sep 2005; Steve Arnold <nerdboy@gentoo.org>
+  +files/edna-0.5-pep-0263.patch, files/edna.gentoo, -edna-0.5-r3.ebuild,
+  +edna-0.5-r5.ebuild:
+  fixed some new baselayout and python issues; init script and pep0263 patch
+  amd64 needed a stable bump, Lance's bug (Bug #103346)got an einfo message.
+
+  24 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> edna-0.5-r4.ebuild:
+  Cleaned up dependency variables, use newinitd to install init.d file, don't
+  install COPYING.
+
+  19 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> edna-0.5-r4.ebuild:
+  Stable on hppa and ppc.
+
+  28 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> edna-0.5-r4.ebuild:
+  Stable on sparc
+
+  22 May 2005; Steve Arnold <nerdboy@gentoo.org> edna-0.5-r4.ebuild:
+  bump stable on x86
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> edna-0.5-r3.ebuild:
+  Stable on ppc.
+
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org> edna-0.5-r4.ebuild:
+  Stable on ppc64
+
+  03 Nov 2004; Markus Rothe <corsair@gentoo.org> edna-0.5-r4.ebuild:
+  Marked ~ppc64; bug #69126
+
+  26 Oct 2004; Steve Arnold <nerdboy@gentoo.org> metadata.xml,
+  files/edna.gentoo, edna-0.5-r3.ebuild, edna-0.5-r4.ebuild:
+  added USE flag for oggvorbis support, update comments and einfo
+
+  15 Oct 2004; Sven Wegener <swegener@gentoo.org> edna-0.5-r3.ebuild:
+  Added inherit eutils for get_libdir. Thanks to Thomas Kirchner
+  <gentoo@halffull.org> in bug #67669.
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> edna-0.5-r3.ebuild:
+  get_libdir fixes.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> edna-0.5-r3.ebuild:
+  Stable amd64, sparc.
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> edna-0.5-r3.ebuild:
+  ~amd64
+
+  06 May 2004; Jeremy Huddleston <eradicator@gentoo.org> edna-0.5-r3.ebuild:
+  removed explicit setting of RDEPEND to DEPEND.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> edna-0.5-r3.ebuild:
+  QA fix.
+
+*edna-0.5-r3 (14 Dec 2003)
+
+  14 Dec 2003; <nerdboy@gentoo.org> edna-0.5-r3.ebuild, files/edna.gentoo:
+  finally fixed init script and env stuff
+
+*edna-0.5-r2 (14 Dec 2003)
+
+  14 Dec 2003; <nerdboy@gentoo.org> edna-0.5-r2.ebuild, files/edna.gentoo:
+  changed init script and got rid of local USE flag (still has pidfile glitch)
+
+*edna-0.5-r1 (14 Dec 2003)
+
+  14 Dec 2003; <nerdboy@gentoo.org> edna-0.5-r1.ebuild, edna-0.5.ebuild:
+  added html docs (doh!) and cleaned up ebuilds a bit
 
 *edna-0.5 (14 Dec 2003)
 
diff --git a/media-sound/edna/Manifest b/media-sound/edna/Manifest
index 4d3f4d795dcf..a791e72856ea 100644
--- a/media-sound/edna/Manifest
+++ b/media-sound/edna/Manifest
@@ -1,5 +1,8 @@
-MD5 0b483aba2ed17a04eacbd735d1b234af edna-0.5.ebuild 1423
-MD5 7b52e105c2857fc04035cd20183d8ee2 metadata.xml 324
-MD5 e5a7bb53ed116d5d4fa02e0101dddc7f ChangeLog 284
-MD5 1ec24bb2d64996afa8b8a32d8ba3c39e files/edna.gentoo 492
-MD5 0afeb0ec9a434506f2b38f2e66dbb0e3 files/digest-edna-0.5 59
+MD5 8221e3990883569e1f24440fbd48e25b metadata.xml 330
+MD5 21256039c7beb0b32be5f7daa53d9616 edna-0.5-r4.ebuild 1614
+MD5 8436b37775f8cf23a2928cc37d502d1f ChangeLog 3021
+MD5 e728c7b4841998d8ef4d8172a9ebac6d edna-0.5-r5.ebuild 1774
+MD5 4cebb18eae4b5f56b639e8418f677992 files/edna.gentoo 585
+MD5 0afeb0ec9a434506f2b38f2e66dbb0e3 files/digest-edna-0.5-r5 59
+MD5 6f8bb1ccb9018d0196cea623e4e01998 files/edna-0.5-pep-0263.patch 317
+MD5 0afeb0ec9a434506f2b38f2e66dbb0e3 files/digest-edna-0.5-r4 59
diff --git a/media-sound/edna/edna-0.5-r4.ebuild b/media-sound/edna/edna-0.5-r4.ebuild
index d83650dc4f6c..221912dcee08 100644
--- a/media-sound/edna/edna-0.5-r4.ebuild
+++ b/media-sound/edna/edna-0.5-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/media-sound/edna/edna-0.5-r4.ebuild,v 1.1 2004/10/26 16:25:13 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/edna/edna-0.5-r4.ebuild,v 1.1.1.1 2005/11/30 09:38:42 chriswhite Exp $
 
 inherit eutils
 
@@ -13,18 +13,15 @@ SRC_URI="mirror://sourceforge/edna/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~amd64"
+KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
 
 DEPEND="dev-lang/python
-	oggvorbis? ( dev-python/pyogg )
-	oggvorbis? ( dev-python/pyvorbis )"
+	oggvorbis? ( dev-python/pyogg
+		dev-python/pyvorbis )"
 
 src_install() {
-
 	einfo "Installing in daemon mode"
-	insinto /etc/init.d
-	insopts -m 755
-	newins ${FILESDIR}/edna.gentoo edna
+	newinitd ${FILESDIR}/edna.gentoo edna
 
 	dodir /usr/bin /usr/$(get_libdir)/edna /usr/$(get_libdir)/edna/templates
 	exeinto /usr/bin ; newexe edna.py edna
@@ -39,18 +36,19 @@ src_install() {
 	doins edna.conf
 	dosym /usr/$(get_libdir)/edna/templates /etc/edna/templates
 
-	dodoc COPYING README ChangeLog
+	dodoc README ChangeLog
 	dohtml -r www/*
 }
 
 pkg_postinst() {
 	ewarn
 	einfo "Edit edna.conf to taste before starting (multiple source"
-	einfo "directories are allowed).  Test ednad from a shell prompt"
+	einfo "directories are allowed).  Test edna from a shell prompt"
 	einfo "until you have it configured properly, then add edna to"
 	einfo "the default runlevel when you're ready.  Add the USE flag"
 	einfo "oggvorbis if you want edna to serve ogg files."
-	einfo ""
-	einfo "See edna.conf and the html docs for more info."
+	einfo
+	einfo "See edna.conf and the html docs for more info, and set"
+	einfo "PYTHONPATH=/usr/lib/edna to run from a shell prompt."
 	ewarn
 }
diff --git a/media-sound/edna/edna-0.5-r5.ebuild b/media-sound/edna/edna-0.5-r5.ebuild
index 57311eedad1a..d1ca025b022b 100644
--- a/media-sound/edna/edna-0.5-r5.ebuild
+++ b/media-sound/edna/edna-0.5-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/media-sound/edna/edna-0.5-r5.ebuild,v 1.1 2005/09/09 04:51:11 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/edna/edna-0.5-r5.ebuild,v 1.1.1.1 2005/11/30 09:38:42 chriswhite Exp $
 
 inherit eutils
 
@@ -51,11 +51,12 @@ src_install() {
 pkg_postinst() {
 	ewarn
 	einfo "Edit edna.conf to taste before starting (multiple source"
-	einfo "directories are allowed).  Test ednad from a shell prompt"
+	einfo "directories are allowed).  Test edna from a shell prompt"
 	einfo "until you have it configured properly, then add edna to"
 	einfo "the default runlevel when you're ready.  Add the USE flag"
 	einfo "oggvorbis if you want edna to serve ogg files."
 	einfo
-	einfo "See edna.conf and the html docs for more info."
+	einfo "See edna.conf and the html docs for more info, and set"
+	einfo "PYTHONPATH=/usr/lib/edna to run from a shell prompt."
 	ewarn
 }
diff --git a/media-sound/edna/files/edna.gentoo b/media-sound/edna/files/edna.gentoo
index 9199e00764b8..cf46fc45398f 100644
--- a/media-sound/edna/files/edna.gentoo
+++ b/media-sound/edna/files/edna.gentoo
@@ -5,7 +5,12 @@
 # description: edna is a mini mp3 webserver
 # processname: python
 # pidfile: /var/run/ednad.pid
-# config: 
+# config:
+
+export PYTHONPATH=/usr/lib/edna
+EDNA=/usr/bin/edna
+EDNACONF=/etc/edna/edna.conf
+PIDFILE=/var/run/edna.pid
 
 depend() {
         need local
@@ -13,13 +18,13 @@ depend() {
 
 start() {
     ebegin "Starting ednad mp3 server"
-    start-stop-daemon -b -m --quiet --start --exec /usr/bin/ednad \
-	--pidfile /var/run/ednad.pid
+    start-stop-daemon -m -b --start --quiet --pidfile $PIDFILE \
+    --exec $EDNA -- $EDNACONF
     eend $?
 }
 
 stop() {
     ebegin "Stopping ednad"
-    start-stop-daemon -o --quiet --stop --pidfile /var/run/ednad.pid
+    start-stop-daemon -o --quiet --stop --pidfile $PIDFILE
     eend $?
 }
diff --git a/media-sound/edna/metadata.xml b/media-sound/edna/metadata.xml
index 133ef831146b..855babe4c7c7 100644
--- a/media-sound/edna/metadata.xml
+++ b/media-sound/edna/metadata.xml
@@ -3,9 +3,9 @@
 <pkgmetadata>
 <herd>sound</herd>
 <maintainer>
-  <email>nerdboy@gentoo.org</email>
+  <email>sound@gentoo.org</email>
 </maintainer>
-<description>
+<longdescription>
   Edna is Greg Stein's http streaming audio server for mp3 and ogg files.
-</description>
+</longdescription>
 </pkgmetadata>
diff --git a/media-sound/erec/ChangeLog b/media-sound/erec/ChangeLog
index 14046b46d70a..639016850650 100644
--- a/media-sound/erec/ChangeLog
+++ b/media-sound/erec/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for media-sound/erec
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/erec/ChangeLog,v 1.1 2004/03/18 15:44:17 eradicator Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/erec/ChangeLog,v 1.1.1.1 2005/11/30 09:38:23 chriswhite Exp $
+
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> erec-2.2.0.1.ebuild:
+  Don't install COPYING file.
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> erec-2.2.0.1.ebuild:
+  Added to ~ppc.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> erec-2.2.0.1.ebuild:
+  Stable amd64, sparc.
+
+  12 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> erec-2.2.0.1.ebuild:
+  ~sparc ~amd64
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> erec-2.2.0.1.ebuild:
+  virtual/glibc -> virtual/libc
+
+  17 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> erec-2.2.0.1.ebuild:
+  Stable x86.
 
 *erec-2.2.0.1 (18 Mar 2004)
 
diff --git a/media-sound/erec/Manifest b/media-sound/erec/Manifest
index 8eff57f7e1ed..717fa76a8136 100644
--- a/media-sound/erec/Manifest
+++ b/media-sound/erec/Manifest
@@ -1,2 +1,14 @@
-MD5 fbdb20b8546b8b13ed50d5efcdd2167d erec-2.2.0.1.ebuild 722
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 70cba84393718b7dc83c1df9b74182cc ChangeLog 974
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 84648330dbdd3f4f6711eef792fb5f8c erec-2.2.0.1.ebuild 993
 MD5 1521d3a5461176a80cf73b2467e5fffe files/digest-erec-2.2.0.1 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGs5jj5H05b2HAEkRAiToAJ9TCgGom4gwzNIDPovEq/4C+0RLnwCeO2bT
+xfyW25eQw4Aqdh1KDSzaY30=
+=JdiD
+-----END PGP SIGNATURE-----
diff --git a/media-sound/erec/erec-2.2.0.1.ebuild b/media-sound/erec/erec-2.2.0.1.ebuild
index 36cbc19a1d5c..8958da3c75c5 100644
--- a/media-sound/erec/erec-2.2.0.1.ebuild
+++ b/media-sound/erec/erec-2.2.0.1.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/media-sound/erec/erec-2.2.0.1.ebuild,v 1.1 2004/03/18 15:44:17 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/erec/erec-2.2.0.1.ebuild,v 1.1.1.1 2005/11/30 09:38:23 chriswhite Exp $
 
 DESCRIPTION="A shared audio recording server"
 HOMEPAGE="http://bisqwit.iki.fi/source/erec.html"
 SRC_URI="http://bisqwit.iki.fi/src/arch/${P}.tar.bz2"
 
-KEYWORDS="~x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 LICENSE="GPL-2"
 SLOT="0"
 
-RDEPEND="virtual/glibc"
+RDEPEND="virtual/libc"
 DEPEND="sys-apps/sed"
 
 IUSE=""
@@ -41,6 +41,6 @@ src_compile() {
 
 src_install() {
 	dobin erec
-	dodoc README COPYING
+	dodoc README
 	dohtml README.html
 }
diff --git a/media-sound/ermixer/ChangeLog b/media-sound/ermixer/ChangeLog
index cb650fdefa39..e7cc3d35822c 100644
--- a/media-sound/ermixer/ChangeLog
+++ b/media-sound/ermixer/ChangeLog
@@ -1,9 +1,69 @@
 # ChangeLog for media-sound/ermixer
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ermixer/ChangeLog,v 1.1 2002/07/24 04:21:29 agenkin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ermixer/ChangeLog,v 1.1.1.1 2005/11/30 09:38:27 chriswhite Exp $
 
+  28 Jul 2005; Caleb Tennis <caleb@gentoo.org> ermixer-0.8.ebuild:
+  made qt dep qt3 explicit per bug #100235
+
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org> ermixer-0.8.ebuild:
+  Stable on ppc64
+
+  01 Dec 2004; Carsten Lohrke <carlo@gentoo.org> metadata.xml:
+  QA: brain is not a Gentoo dev anymore
+
+  01 Nov 2004; Markus Rothe <corsair@gentoo.org> ermixer-0.8.ebuild:
+  Marked ~ppc64; bug #64633
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> ermixer-0.8.ebuild:
+  Added to ~amd64.
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org> ermixer-0.8.ebuild:
+  Fix use invocation
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> ermixer-0.7.1.ebuild,
+  ermixer-0.7.ebuild:
+  Added IUSE.
+
+  30 Mar 2004; Sven Blumenstein <bazik@gentoo.org> ermixer-0.8.ebuild:
+  Fixed handling of qt USE variable, marked stable on sparc.
+
+  16 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> ermixer-0.7.1.ebuild,
+  ermixer-0.7.ebuild, ermixer-0.8.ebuild:
+  Added IUSE and cleaned up ebuild.
+
+  22 Sep 2003; <paul@gentoo.org> metadata.xml:
+  Fix metadata.xml
+
+  03 Sep 2003; Tavis Ormandy <taviso@gentoo.org> ermixer-0.8.ebuild:
+  stable on alpha
+
+  02 Jul 2003; Michele Balistreri <brain@gentoo.org> ermixer-0.8.ebuild:
+  ppc keyword
+
+  01 Jul 2003; Michele Balistreri <brain@gentoo.org> ermixer-0.8.ebuild:
+  marking as stable on x86
+  
+  12 Jun 2003; <msterret@gentoo.org> ermixer-0.8.ebuild:
+  add Header
+
+  27 Feb 2003; Luca Barbato <lu_zero@gentoo.org> :
+  SRC_URI change  Thanks to Michele Balistreri <brain87@gmx.net> for the notice.
+
+*ermixer-0.8 (18 Jan 2003)
+
+  04 Apr 2003; Jason Wever <weeve@gentoo.org> ermixer-0.8.ebuild:
+  Added ~sparc to keywords.
+
+  18 Jan 2003; Luca Barbato <lu_zero@gentoo.org> :
+  Version update.  Thanks to Michele Balistreri <brain87@gmx.net> for heads-up.
+
+*ermixer-0.7.1 (05 Jan 2003)
+
+  03 Jan 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Version update.  Thanks to Michele Balistreri <brain87@gmx.net> for heads-up.
+	
 *ermixer-0.7 (23 Jul 2002)
 
   23 Jul 2002; Arcady Genkin <agenkin@thpoon.com> ermixer-0.7.ebuild :
 
-  Initial version, submitted by Michele Balistreri <brain87@gmx.net>.
\ No newline at end of file
+  Initial version, submitted by Michele Balistreri <brain87@gmx.net>.
diff --git a/media-sound/ermixer/Manifest b/media-sound/ermixer/Manifest
index e69de29bb2d1..cbf104db6730 100644
--- a/media-sound/ermixer/Manifest
+++ b/media-sound/ermixer/Manifest
@@ -0,0 +1,4 @@
+MD5 973e58000217ccda3d3c053658e622cb ermixer-0.8.ebuild 741
+MD5 40e434e126bed413a00fd40235a33062 ChangeLog 2347
+MD5 70f06600556327dcfbc31fa03f610042 metadata.xml 155
+MD5 f9f03bb14f488877dc9415c2e0432428 files/digest-ermixer-0.8 63
diff --git a/media-sound/ermixer/ermixer-0.8.ebuild b/media-sound/ermixer/ermixer-0.8.ebuild
index 53712c623187..a8b638a40619 100644
--- a/media-sound/ermixer/ermixer-0.8.ebuild
+++ b/media-sound/ermixer/ermixer-0.8.ebuild
@@ -1,24 +1,29 @@
-# 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/media-sound/ermixer/ermixer-0.8.ebuild,v 1.1.1.1 2005/11/30 09:38:27 chriswhite Exp $
+
+IUSE="qt"
 
 DESCRIPTION="A full featured console-based audio mixer."
 HOMEPAGE="http://ermixer.sourceforge.net"
 LICENSE="GPL-2"
 
 DEPEND=">=sys-libs/ncurses-5.2
-		qt? ( x11-libs/qt )"
+	qt? ( =x11-libs/qt-3* )"
 
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ppc sparc alpha ~amd64 ppc64"
 
-SRC_URI="http://erevan.cuore.org/files/ermixer/${P}.tar.gz"
-S="${WORKDIR}/${P}"
+SRC_URI="mirror://sourceforge/ermixer/${P}.tar.gz"
+RESTRICT="nomirror"
 
 src_compile() {
-	local myconf
+	if use qt; then
+		econf --enable-qt || die
+	else
+		econf || die
+	fi
 
-	use qt && myconf="--enable-qt=yes"
-	econf ${myconf}|| die
 	emake || die
 }
 
diff --git a/media-sound/ermixer/metadata.xml b/media-sound/ermixer/metadata.xml
index 32e165509a7e..dc439f7e84f5 100644
--- a/media-sound/ermixer/metadata.xml
+++ b/media-sound/ermixer/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>qt</herd>
-<maintainer>
-  <email>brain@gentoo.org</email>
-</mantainer>  
 </pkgmetadata>
diff --git a/media-sound/esound/ChangeLog b/media-sound/esound/ChangeLog
index db4395ddff65..9bdea57f8972 100644
--- a/media-sound/esound/ChangeLog
+++ b/media-sound/esound/ChangeLog
@@ -1,13 +1,243 @@
 # ChangeLog for media-sound/esound
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/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/media-sound/esound/ChangeLog,v 1.1.1.1 2005/11/30 09:37:52 chriswhite Exp $
 
-*esound-0.2.23 (1 Feb 2002)
+  10 Oct 2005; Hardave Riar <hardave@gentoo.org> esound-0.2.36-r1.ebuild:
+  Stable on mips.
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  14 Sep 2005; Aron Griffis <agriffis@gentoo.org> esound-0.2.36-r1.ebuild:
+  Mark 0.2.36-r1 stable on alpha
+
+  03 Sep 2005; Markus Rothe <corsair@gentoo.org> esound-0.2.36-r1.ebuild:
+  Stable on ppc64
+
+  03 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
+  esound-0.2.36-r1.ebuild:
+  Stable on ppc.
+
+  31 Aug 2005; Herbie Hopkins <herbs@gentoo.org> esound-0.2.36-r1.ebuild:
+  Stable on amd64.
+
+  29 Aug 2005; Guy Martin <gmsoft@gentoo.org> esound-0.2.36-r1.ebuild:
+  Stable on hppa.
+
+  28 Aug 2005; Fabian Groffen <grobian@gentoo.org>
+  -files/esound-0.2.35-ppc-macos.patch,
+  +files/esound-0.2.36-ppc-macos.patch, esound-0.2.36-r1.ebuild:
+  Replacing patch for ppc-macos to reflect version 0.2.36, the old one for
+  0.2.35 was reused without testing.  See bug #103969
+
+  26 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  esound-0.2.36-r1.ebuild:
+  Stable on sparc
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> esound-0.2.36-r1.ebuild:
+  stable on ia64
+
+  25 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
+  -esound-0.2.35.ebuild, esound-0.2.36-r1.ebuild:
+  Stable on x86.
+
+  24 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  esound-0.2.36-r1.ebuild:
+  Use newconfd/doinitd.
+
+  07 Aug 2005; Leonardo Boshell <leonardop@gentoo.org> esound-0.2.34.ebuild:
+  Setting LC_ALL=C before econf/make to avoid problems in the configure
+  script. See bug #99013.
+
+*esound-0.2.36-r1 (24 Jul 2005)
+
+  24 Jul 2005; Leonardo Boshell <leonardop@gentoo.org> esound-0.2.36-r1.ebuild:
+  New revision. Install esd.conf in the right location. Thanks to reporter
+  TGL for noticing this on bug #100162.
+
+*esound-0.2.36 (03 Jul 2005)
+
+  03 Jul 2005; Leonardo Boshell <leonardop@gentoo.org> esound-0.2.36.ebuild:
+  New release. Added support for 'debug' and 'static' USE flags. Replaced
+  einstall with "make DESTDIR=$D install".
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  03 Oct 2004; Kito <kito@gentoo.org> +files/esound-0.2.35-ppc-macos.patch,
+  esound-0.2.35.ebuild:
+  added patch from fink to improve CoreAudio functionality and keyworded
+  ~ppc-macos
+
+*esound-0.2.35 (18 Aug 2004)
+
+  18 Aug 2004; Mike Gardiner <obz@gentoo.org> +esound-0.2.35.ebuild:
+  Added new version 0.2.35, as requested in bug #60231
+
+  25 Jul 2004; Lina Pezzella <j4rg0n@gentoo.org>
+  Fixed Manifest.
+
+  23 Jul 2004; Lina Pezzella <j4rg0n@gentoo.org> :
+  esound-0.2.34.ebuild: Unstable macos. Fully functional, except for init script
+  due to conflicts between baselayout and MacOS files.
+
+  04 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> esound-0.2.34.ebuild:
+  Stable on alpha.
+
+  20 Jun 2004; Tom Gall <tgall@gentoo.org> esound-0.2.34.ebuild:
+  stable on ppc64
+
+  04 Jun 2004; Stephen P. Becker <geoman@gentoo.org> esound-0.2.34.ebuild:
+  Stable on mips.
+
+  26 May 2004; Jason Wever <weeve@gentoo.org> esound-0.2.34.ebuild:
+  And you, sparc'd me all night long...
+
+  14 Apr 2004; Stephen P. Becker <geoman@gentoo.org> esound-0.2.32.ebuild,
+  esound-0.2.33.ebuild:
+  Marked stable on mips.
+
+  24 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org> esound-0.2.33.ebuild:
+  stable on sparc
+
+*esound-0.2.34 (24 Mar 2004)
+
+  24 Mar 2004; foser <foser@gentoo.org> esound-0.2.34.ebuild :
+  New release
+
+  10 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> esound-0.2.33.ebuild,
+  files/esound-0.2.33-gcc2_fix.patch:
+  gcc2 patch submitted by Tristan Henderson <T.Henderson@cs.ucl.ac.uk> in bug
+  #44168.
+
+*esound-0.2.33 (07 Mar 2004)
+
+  07 Mar 2004; foser <foser@gentoo.org> esound-0.2.33.ebuild :
+  New release
+  alsa patch got included upstream
+  made amd64 patch apply in general
+
+  07 Mar 2004; Stephen P. Becker <geoman@gentoo.org> esound-0.2.32.ebuild:
+  Added ~mips keyword.
+
+  04 Feb 2004; <augustus@gentoo.org> esound-0.2.32-r1.ebuild,
+  files/esound-0.2.32-amd64.patch:
+  Fixed amd64 compilation. -Werror is set and there was a warning. I'm surprised
+  this doesn't affect other platforms. If so, just remove my use condition.
+
+*esound-0.2.32-r1 (01 Feb 2004)
+
+  01 Feb 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bumped to fix segfaults with new alsa #36417.
+
+  14 Nov 2003; Aron Griffis <agriffis@gentoo.org> esound-0.2.32.ebuild:
+  Stable on ia64
+
+  08 Nov 2003; Todd Sunderlin <todd@gentoo.org> esound-0.2.32.ebuild:
+  added sparc keyword
+
+  22 Oct 2003; Bartosch Pixa <darkspecter@gentoo.org> esound-0.2.32.ebuild:
+  set ppc in keywords
+
+  17 Oct 2003; Aron Griffis <agriffis@gentoo.org> esound-0.2.32.ebuild:
+  Stable on alpha
+
+  28 Sep 2003; foser <foser@gentoo.org> esound-0.2.29{-r1}.ebuild :
+  Fix SRC_URI (#29793)
+
+*esound-0.2.32 (06 Sep 2003)
+
+  13 Dec 2003; Guy Martin <gmsoft@gentoo.org> esound-0.2.32.ebuild :
+  Marked stable on hppa.
+
+  06 Sep 2003; foser <foser@gentoo.org> esound-0.2.32.ebuild :
+  New version, added ipv6 USE for real now, esthetic cleanups
+
+*esound-0.2.30 (11 Aug 2003)
+
+  11 Aug 2003; foser <foser@gentoo.org> esound-0.2.31.ebuild :
+  New version
+
+  10 Jun 2003; Tavis Ormandy <taviso@gentoo.org> esound-0.2.29-r1.ebuild:
+  make sure esdlib linked applications obey $ESPEAKER, even if a local
+  esd is present. (bug #18000)
+
+  changed epatch commands to use ${P}.
+
+  changing minimum required alsa-lib version to 5.10b, to make repoman 
+  happy.
+
+*esound-0.2.29-r1 (30 May 2003)
+
+  04 Aug 2003; Guy Martin <gmsoft@gentooo.org> esound-0.2.29-r1.ebuild :
+  Marked stable on hppa.
+
+  01 Jul 2003; Guy Martin <gmsoft@gentoo.org> esound-0.2.29-r1.ebuild :
+  Added ~hppa to KEYWORDS.
+
+  31 May 2003; Stanislav Brabec <utx@gentoo.org> esound-0.2.29-r1.ebuild,
+  files/esound.conf.d, files/esound.init.d:
+  Masked for testing. Added warning about client setup to global daemon config
+  files.
+
+  30 May 2003; Stanislav Brabec <utx@gentoo.org> esound-0.2.29-r1.ebuild,
+  files/esound-0.2.29-alsa-period.diff, files/esound.conf.d,
+  files/esound.init.d:
+  Added init scripts for remote sound access. Fixed ALSA maximum periods (CVS
+  fix from Takashi Iwai <tiwai@suse.de>).
+
+*esound-0.2.29 (06 Sep 2002)
+
+  01 Jul 2003; Guy Marin <gmsoft@gentoo.org> esound-0.2.29.ebuild :
+  Added hppa to KEYWORDS.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+
+  17 Sep 2002; Spider <spider@gentoo.org> esound-0.2.29.ebuild :
+  added ppc keyword 
   
-  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.
+  16 Sep 2002; Maarten Thibaut <murphy@gentoo.org> esound-0.2.29.ebuild, ChangeLog :
+  Adding sparc/sparc64 keywords. Revamping ChangeLog layout.
+
+  06 Sep 2002; Spider <spider@gentoo.org> esound-0.2.29.ebuild : New version
+  
+*esound-0.2.28-r1 (28 Jun 2002)
+
+  28 Jun 2002; Seemant Kulleen <seemant@gentoo.org> esound-0.2.28-r1.ebuild,
+  files/digest-esound-0.2.28-r1 : LFH/man page fixes and elibtoolize
+
+*esound-0.2.28 (19 Jun 2002)
+
+  19 Jun 2002; Gabriele Giorgetti <stroke@gentoo.org> : New version.
+
+*esound-0.2.27 (07 Jun 2002)
+
+  07 Jun 2002; Martin Schlemmer <azarah@gentoo.org> : Bump version.
+
+*esound-0.2.26 (07 May 2002)
+
+  07 May 2002; Spider <spider@gentoo.org> esound-0.2.26.ebuild : Latest version.
+
+*esound-0.2.25 (24 Apr 2002)
+
+  24 Apr 2002; Spider <spider@gentoo.org> esound-0.2.25.ebuild : Update to latest
+  version that has alsa 0.9 support
+  Note: Me, Verwilst, added a SLOT="0" to this ebuild, to enable auto-unmerging
+  of previous versions
+
+*esound-0.2.24-r2 (03 Apr 2002)
+
+  03 Apr 2002; M.Schlemmer <azarah@gentoo.org> esound-0.2.24-r2.ebuild : Libtoolize.
+
+*esound-0.2.24-r1 (20 Mar 2002)
+
+  20 Mar 2002; Bruce A. Locke <blocke@shivan.org> esound-0.2.24-r1.ebuild :
+  Fixed some silly typos... building without tcpwrappers should work again
+
+*esound-0.2.24	(16 Mar 2002)
+
+  16 Mar 2002; Seemant Kulleen <seemant@gentoo.org> esound-0.2.24.ebuild :
+  Copied over the 0.2.23 ebuild to upgrade the version.
+
+*esound-0.2.24-r50
+
+  28 Mar 2002; Spider <spider@gentoo.org> :
+  Updated to -r50 that applies alsa patches, masked for the moment, should be stable
+  and working though
diff --git a/media-sound/esound/Manifest b/media-sound/esound/Manifest
index f480bd7c1188..24c016bccc81 100644
--- a/media-sound/esound/Manifest
+++ b/media-sound/esound/Manifest
@@ -1,10 +1,10 @@
-MD5 fae8132d80bf05c52fc6a8a9fbfaa6fa esound-0.2.28-r1.ebuild 1219
-MD5 9c603a83589f11f690e43e0eebbb3dc4 esound-0.2.29.ebuild 1116
-MD5 3c433dac58e1d3aec22a282a6ca452c8 ChangeLog 2025
-MD5 f2b8a8bdf91bae62638bb4d6bbe075fc esound-0.2.29-r1.ebuild 1667
-MD5 ff77029d87c0470ecc3ce2b013f84fa6 files/digest-esound-0.2.28-r1 66
-MD5 249e1fd14f662bce76093bb7685f7eb2 files/digest-esound-0.2.29 66
-MD5 340b8af9191cda014c7963617ede9b77 files/esound-0.2.29-alsa-period.diff 473
-MD5 6644892a9c43e55f65f7bb3a2656eb72 files/esound.conf.d 479
-MD5 2e3225b9445a793f3e36d09f7ec48e76 files/esound.init.d 542
-MD5 249e1fd14f662bce76093bb7685f7eb2 files/digest-esound-0.2.29-r1 66
+MD5 37409df834b9f797736faea77a75fb3e ChangeLog 8161
+MD5 55ffdb8d9699f20f3a0c2994775803dc esound-0.2.36-r1.ebuild 1690
+MD5 2ae97f9dc69d72d4632482df2f5cf95c esound-0.2.34.ebuild 1369
+MD5 b263ff7675308d90b75a170acae3f5ff metadata.xml 177
+MD5 8d815255ab6890911dd9b2bd7904d363 files/digest-esound-0.2.36-r1 66
+MD5 defad2b109b564a607b57788a05e139d files/esound-0.2.36-ppc-macos.patch 4067
+MD5 e2bd989e15dcb9b15096d1a9cd29edf0 files/digest-esound-0.2.34 66
+MD5 abf9fa5dcfe799ee75cb17808b389739 files/esound-0.2.32-amd64.patch 686
+MD5 6a04ae174ae4b2bb4ad9734fe09d32e2 files/esound.conf.d 737
+MD5 0af490e6c9b79db177214d01027e800e files/esound.init.d 862
diff --git a/media-sound/esound/esound-0.2.34.ebuild b/media-sound/esound/esound-0.2.34.ebuild
index f41b2e6a3a80..e43b50979897 100644
--- a/media-sound/esound/esound-0.2.34.ebuild
+++ b/media-sound/esound/esound-0.2.34.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/media-sound/esound/esound-0.2.34.ebuild,v 1.1 2004/03/24 14:11:06 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/esound-0.2.34.ebuild,v 1.1.1.1 2005/11/30 09:37:52 chriswhite Exp $
 
 inherit libtool gnome.org eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.tux.org/~ricdude/EsounD.html"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips"
+KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64 mips ppc64 arm"
 IUSE="tcpd alsa ipv6"
 
 DEPEND=">=media-libs/audiofile-0.1.5
@@ -29,6 +29,9 @@ src_compile() {
 
 	elibtoolize
 
+	# Work-around for old auto-stuff. See bug #99013.
+	export LC_ALL=C
+
 	econf \
 		`use_with tcpd libwrap` \
 		`use_enable alsa` \
diff --git a/media-sound/esound/esound-0.2.36-r1.ebuild b/media-sound/esound/esound-0.2.36-r1.ebuild
index 23222194b1ba..8b523b8f08d7 100644
--- a/media-sound/esound/esound-0.2.36-r1.ebuild
+++ b/media-sound/esound/esound-0.2.36-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/media-sound/esound/esound-0.2.36-r1.ebuild,v 1.1 2005/07/25 00:08:19 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/esound-0.2.36-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:52 chriswhite Exp $
 
 inherit libtool gnome.org eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.tux.org/~ricdude/EsounD.html"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips ~ppc64 ~ppc-macos ~arm"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ~ppc-macos ppc64 sparc x86"
 IUSE="alsa debug ipv6 static tcpd"
 
 # esound comes with arts support, but it hasn't been tested yet, feel free to
@@ -25,7 +25,9 @@ src_unpack() {
 	cd ${S}
 
 	epatch ${FILESDIR}/${PN}-0.2.32-amd64.patch
-	use ppc-macos && epatch ${FILESDIR}/${PN}-0.2.35-ppc-macos.patch
+	# please note, this is a conditional, version specific patch!!!
+	# when bumping avoid bugs like #103969
+	use ppc-macos && epatch ${FILESDIR}/${P}-ppc-macos.patch
 }
 
 src_compile() {
@@ -48,14 +50,12 @@ src_install() {
 
 	[ -d "docs/html" ] && dohtml -r docs/html/*
 
-	insinto /etc/conf.d
-	newins ${FILESDIR}/esound.conf.d esound
+	newconfd ${FILESDIR}/esound.conf.d esound
 
-	exeinto /etc/init.d
 	extradepend=""
 	use tcpd && extradepend=" portmap"
 	use alsa && extradepend="$extradepend alsasound"
 	sed "s/@extradepend@/$extradepend/" <${FILESDIR}/esound.init.d >${T}/esound
-	doexe ${T}/esound
+	doinitd ${T}/esound
 
 }
diff --git a/media-sound/esound/files/esound.conf.d b/media-sound/esound/files/esound.conf.d
index 0a3faa37dbec..243feeb971e4 100644
--- a/media-sound/esound/files/esound.conf.d
+++ b/media-sound/esound/files/esound.conf.d
@@ -2,6 +2,11 @@
 
 # Note: You need to start esound on boot, only if you want to use it over network.
 
+# Warning: To use global esound daemon, you must also set spawn_options
+# in /etc/esd/esd.conf to the same protocol (i. e. add "-tcp") and unset
+# "Enable sound server startup" in gnome-sound-properties for all users
+# and optionally handle authentization.
+
 # For more see "esd -h".
 
 
diff --git a/media-sound/esound/files/esound.init.d b/media-sound/esound/files/esound.init.d
index ae1efd1449eb..f5923dd140f3 100644
--- a/media-sound/esound/files/esound.init.d
+++ b/media-sound/esound/files/esound.init.d
@@ -1,11 +1,14 @@
 #!/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/media-sound/esound/files/esound.init.d,v 1.1 2003/05/29 22:36:51 utx Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/files/esound.init.d,v 1.1.1.1 2005/11/30 09:37:52 chriswhite Exp $
 
 # Note: You need to start esound on boot, only if you want to use it over network.
 
-. /etc/conf.d/esound
+# Warning: To use global esound daemon, you must also set spawn_options
+# in /etc/esd/esd.conf to the same protocol (i. e. add "-tcp") and unset
+# "Enable sound server startup" in gnome-sound-properties for all users
+# and optionally handle authentization.
 
 depend() {
 	use net@extradepend@
diff --git a/media-sound/esound/metadata.xml b/media-sound/esound/metadata.xml
index da6fd63d0085..b016c18b5446 100644
--- a/media-sound/esound/metadata.xml
+++ b/media-sound/esound/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
+<herd>sound</herd>
 </pkgmetadata>
diff --git a/media-sound/extace/ChangeLog b/media-sound/extace/ChangeLog
index eebd1d281272..1acaf24657e0 100644
--- a/media-sound/extace/ChangeLog
+++ b/media-sound/extace/ChangeLog
@@ -1,6 +1,34 @@
 # ChangeLog for media-sound/extace
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/extace/ChangeLog,v 1.1 2003/08/21 08:41:15 avenj Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/extace/ChangeLog,v 1.1.1.1 2005/11/30 09:38:25 chriswhite Exp $
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> extace-1.9.2.ebuild:
+  Added to ~ppc.
+
+  14 May 2005; Jan Brinkmann <luckyduck@gentoo.org> extace-1.8.11.ebuild,
+  extace-1.9.2.ebuild:
+  added missing gtk+-1.2 dependency, fixes #92266
+
+*extace-1.9.2 (18 Dec 2004)
+
+  18 Dec 2004; Tony Vroon <chainsaw@gentoo.org> extace-1.8.11.ebuild,
+  +extace-1.9.2.ebuild:
+  Version bump and portability update. Closes bug #73839.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> extace-1.8.11.ebuild:
+  Stable amd64, sparc.
+
+  05 Aug 2004; Jeremy Huddleston <eradicator@gentoo.org> extace-1.8.11.ebuild:
+  Added documentation.  Fixed fftw DEP to be versioned... bug #58614.
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> extace-1.8.11.ebuild:
+  ~amd64
+
+  22 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> extace-1.8.11.ebuild:
+  Removed explicit S=.
+
+  29 Nov 2003; Chuck Short <zul@gentoo.org> extace-1.8.11.ebuild:
+  Added ~sparc keyword, closes #34308.
 
 *extace-1.8.11 (18 Aug 2003)
 
diff --git a/media-sound/extace/Manifest b/media-sound/extace/Manifest
index abfc0b865972..66b2a4f25cac 100644
--- a/media-sound/extace/Manifest
+++ b/media-sound/extace/Manifest
@@ -1,2 +1,6 @@
-MD5 d114eecf1c559b46ab020ac27a4a74ac extace-1.8.11.ebuild 487
+MD5 d3c6becace404991ed2008fb3f3ea39c ChangeLog 1291
+MD5 b72f5750da14a2befe6a1807db7d0220 extace-1.8.11.ebuild 636
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 6a01680a55afb192aace5364e66030c4 extace-1.9.2.ebuild 638
 MD5 d637bf3e0ef939bc46066ee0e1601827 files/digest-extace-1.8.11 65
+MD5 52b9310a8b82c68fcbe7a9bacc401b50 files/digest-extace-1.9.2 64
diff --git a/media-sound/extace/extace-1.8.11.ebuild b/media-sound/extace/extace-1.8.11.ebuild
index b03432ef0cd2..64fdbb5342c7 100644
--- a/media-sound/extace/extace-1.8.11.ebuild
+++ b/media-sound/extace/extace-1.8.11.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/media-sound/extace/extace-1.8.11.ebuild,v 1.1 2003/08/21 08:41:15 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/extace/extace-1.8.11.ebuild,v 1.1.1.1 2005/11/30 09:38:25 chriswhite Exp $
 
 DESCRIPTION="eXtace is an ESD audio visualization application"
 HOMEPAGE="http://extace.sourceforge.net"
-SRC_URI="mirror://sourceforge/extace/extace-1.8.11.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 sparc amd64"
 IUSE=""
 
 DEPEND="media-sound/esound
-	dev-libs/fftw"
-
-S=${WORKDIR}/${P}
-
-src_compile() {
-	econf || die
-	emake || die
-}
+	=sci-libs/fftw-2*
+	=x11-libs/gtk+-1.2*"
 
 src_install() {
-	einstall || die
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS CREDITS ChangeLog NEWS README TODO
 }
diff --git a/media-sound/extace/extace-1.9.2.ebuild b/media-sound/extace/extace-1.9.2.ebuild
index c56a55bbaef0..be29aedc52f2 100644
--- a/media-sound/extace/extace-1.9.2.ebuild
+++ b/media-sound/extace/extace-1.9.2.ebuild
@@ -1,20 +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/media-sound/extace/extace-1.9.2.ebuild,v 1.1 2004/12/18 13:26:04 chainsaw Exp $
-
-IUSE=""
+# $Header: /var/cvsroot/gentoo-x86/media-sound/extace/extace-1.9.2.ebuild,v 1.1.1.1 2005/11/30 09:38:25 chriswhite Exp $
 
 DESCRIPTION="eXtace is an ESD audio visualization application"
 HOMEPAGE="http://extace.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~amd64"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
 
 DEPEND="media-sound/esound
-	=dev-libs/fftw-2*"
+	=sci-libs/fftw-2*
+	=x11-libs/gtk+-1.2*"
 
 src_install() {
-	make DESTDIR="${D}" install || die
+	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS CREDITS ChangeLog NEWS README TODO
 }
diff --git a/media-sound/ezstream/ChangeLog b/media-sound/ezstream/ChangeLog
index 84932ed2df82..3a29f3fef6ca 100644
--- a/media-sound/ezstream/ChangeLog
+++ b/media-sound/ezstream/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/ezstream
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ezstream/ChangeLog,v 1.1 2005/05/19 17:25:21 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ezstream/ChangeLog,v 1.1.1.1 2005/11/30 09:38:10 chriswhite Exp $
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> ezstream-0.2.0.ebuild:
+  Added to ~ppc.
 
 *ezstream-0.2.0 (19 May 2005)
 
diff --git a/media-sound/ezstream/Manifest b/media-sound/ezstream/Manifest
index 5accde57e939..c56ec59adce0 100644
--- a/media-sound/ezstream/Manifest
+++ b/media-sound/ezstream/Manifest
@@ -1,4 +1,4 @@
-MD5 9e89282286b95f57b8177ae2399d1819 ezstream-0.2.0.ebuild 664
-MD5 e45f9a8111869dc9f8cd4677872bf557 ChangeLog 366
+MD5 a5719df6b25a8cf28d588d975e287d19 ChangeLog 543
+MD5 f0fb34f24ec59d8866e279fcadd05d01 ezstream-0.2.0.ebuild 772
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 493472d9222fd2005bcdf752923fbc23 files/digest-ezstream-0.2.0 66
diff --git a/media-sound/ezstream/ezstream-0.2.0.ebuild b/media-sound/ezstream/ezstream-0.2.0.ebuild
index 7a0f2762ad28..3234d2d2d87b 100644
--- a/media-sound/ezstream/ezstream-0.2.0.ebuild
+++ b/media-sound/ezstream/ezstream-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/media-sound/ezstream/ezstream-0.2.0.ebuild,v 1.1 2005/05/19 17:25:21 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ezstream/ezstream-0.2.0.ebuild,v 1.1.1.1 2005/11/30 09:38:10 chriswhite Exp $
 
 DESCRIPTION="Enables you to stream mp3 or vorbis files to an icecast server without reencoding"
 HOMEPAGE="http://www.icecast.org/ezstream.php"
@@ -8,7 +8,7 @@ SRC_URI="http://downloads.xiph.org/releases/ezstream/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="media-libs/libvorbis
diff --git a/media-sound/fapg/ChangeLog b/media-sound/fapg/ChangeLog
index 8027c104c892..16a0b6d9cfc9 100644
--- a/media-sound/fapg/ChangeLog
+++ b/media-sound/fapg/ChangeLog
@@ -1,9 +1,38 @@
 # ChangeLog for media-sound/fapg
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/fapg/ChangeLog,v 1.1 2004/08/09 19:29:49 pkdawson Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/fapg/ChangeLog,v 1.1.1.1 2005/11/30 09:38:41 chriswhite Exp $
+
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> fapg-0.30.ebuild:
+  Stable on ppc.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> fapg-0.30.ebuild:
+  Stable amd64, sparc, x86.
+
+*fapg-0.30 (24 Oct 2004)
+
+  24 Oct 2004; Patrick Dawson <pkdawson@gentoo.org> +fapg-0.30.ebuild:
+  Version bump.
+
+  19 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> fapg-0.22.ebuild:
+  Stable sparc.  Using toolchain-funs to get the compiler now.
+
+  28 Sep 2004; Tom Gall <tgall@gentoo.org> fapg-0.22.ebuild:
+  added ~ppc64, bug #64240
+
+  28 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> fapg-0.22.ebuild:
+  Stable amd64.  Added to ~sparc.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> fapg-0.22.ebuild:
+  Stable x86.  Added ~amd64.  Respect user CFLAGS.
+
+  29 Aug 2004; David Holm <dholm@gentoo.org> fapg-0.22.ebuild:
+  Added to ~ppc.
 
 *fapg-0.22 (09 Aug 2004)
 
   09 Aug 2004; Patrick Dawson <pkdawson@gentoo.org> fapg-0.22.ebuild :
-  Initial import.  Ebuild submitted by Dennis Nienh�ser <fragfred@gmx.de>.
+  Initial import.  Ebuild submitted by Dennis Nienhüser <fragfred@gmx.de>.
   Closes bug #37842.
diff --git a/media-sound/fapg/Manifest b/media-sound/fapg/Manifest
index bb472523f6a8..4773eee94028 100644
--- a/media-sound/fapg/Manifest
+++ b/media-sound/fapg/Manifest
@@ -1,4 +1,16 @@
-MD5 928a29b82d56def16ca4b1979fa8df71 fapg-0.22.ebuild 441
-MD5 0056f1243580bf5e7d64770bc6d97ad4 ChangeLog 310
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 cf55184a84d96ab9285ef10a7cade3aa fapg-0.22.ebuild 629
+MD5 4cdc7053f76ead3be35dfd4c99e6116e fapg-0.30.ebuild 608
 MD5 83c2574543d0501303b57050254e3880 metadata.xml 222
+MD5 e9a562990270cabe9ffcfca50b1f6e57 ChangeLog 1365
 MD5 9bfbe301dd02f72bf1161e8c551528e5 files/digest-fapg-0.22 60
+MD5 9a29e9fac459746a8e85af7fe70eb336 files/digest-fapg-0.30 60
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDK0/9LLFUmVNQ7rkRAnkEAKC5S1BxfdJ6ywjNrnzocFJ/J38SXACfa3Io
+QLvA1+DKVyhV7NcHBepWI5g=
+=lzGp
+-----END PGP SIGNATURE-----
diff --git a/media-sound/fapg/fapg-0.22.ebuild b/media-sound/fapg/fapg-0.22.ebuild
index 4333fa5ab815..8a04dd964687 100644
--- a/media-sound/fapg/fapg-0.22.ebuild
+++ b/media-sound/fapg/fapg-0.22.ebuild
@@ -1,23 +1,28 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/fapg/fapg-0.22.ebuild,v 1.1 2004/08/09 19:29:49 pkdawson Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/fapg/fapg-0.22.ebuild,v 1.1.1.1 2005/11/30 09:38:41 chriswhite Exp $
+
+IUSE=""
+
+inherit toolchain-funcs
 
 DESCRIPTION="Fast Audio Playlist Generator"
 HOMEPAGE="http://royale.zerezo.com/fapg/"
 SRC_URI="http://royale.zerezo.com/fapg/${P}.tar.gz"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
+KEYWORDS="x86 ~ppc amd64 sparc ~ppc64"
+
 DEPEND="virtual/libc"
 
 src_compile() {
-	emake || die
+	# emake || die
+	$(tc-getCC) ${CFLAGS} -o fapg fapg.c || die
 }
 
 src_install() {
 	dobin fapg
-	dodoc CHANGELOG COPYING README
+	dodoc CHANGELOG README
 	doman fapg.1
 }
diff --git a/media-sound/fapg/fapg-0.30.ebuild b/media-sound/fapg/fapg-0.30.ebuild
index b93cebd90be9..6e5cb51b2bcf 100644
--- a/media-sound/fapg/fapg-0.30.ebuild
+++ b/media-sound/fapg/fapg-0.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/media-sound/fapg/fapg-0.30.ebuild,v 1.1 2004/10/24 23:15:31 pkdawson Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/fapg/fapg-0.30.ebuild,v 1.1.1.1 2005/11/30 09:38:41 chriswhite Exp $
 
 IUSE=""
 
@@ -12,7 +12,7 @@ SRC_URI="http://royale.zerezo.com/fapg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc ~ppc64"
+KEYWORDS="amd64 ppc ~ppc64 sparc x86"
 
 DEPEND="virtual/libc"
 
diff --git a/media-sound/flac123/ChangeLog b/media-sound/flac123/ChangeLog
index fe886e3cfd3e..a8eb6bb00706 100644
--- a/media-sound/flac123/ChangeLog
+++ b/media-sound/flac123/ChangeLog
@@ -1,6 +1,36 @@
 # ChangeLog for media-sound/flac123
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/flac123/ChangeLog,v 1.1 2004/10/15 09:59:49 eradicator Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/flac123/ChangeLog,v 1.1.1.1 2005/11/30 09:38:46 chriswhite Exp $
+
+  06 Jun 2005; Markus Rothe <corsair@gentoo.org> flac123-0.0.8.ebuild:
+  stable on ppc64
+
+  02 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> flac123-0.0.8.ebuild:
+  Stable on sparc
+
+*flac123-0.0.9 (14 May 2005)
+
+  14 May 2005; Jan Brinkmann <luckyduck@gentoo.org> flac123-0.0.8.ebuild,
+  +flac123-0.0.9.ebuild:
+  new upstream version, fixes #92051. marked 0.0.8 stable on amd64 and x86.
+
+  10 May 2005; David Holm <dholm@gentoo.org> flac123-0.0.8.ebuild:
+  Added to ~ppc.
+
+*flac123-0.0.8 (02 Mar 2005)
+
+  02 Mar 2005; Tony Vroon <chainsaw@gentoo.org> +flac123-0.0.8.ebuild:
+  Version bump, closes bug #83730.
+
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org> flac123-0.0.7.ebuild:
+  Stable on ppc64
+
+  21 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  flac123-0.0.7.ebuild:
+  Stable amd64, sparc, x86.
+
+  03 Nov 2004; Markus Rothe <corsair@gentoo.org> flac123-0.0.7.ebuild:
+  Added ~ppc64 keyword, bug #69716
 
 *flac123-0.0.7 (15 Oct 2004)
 
diff --git a/media-sound/flac123/Manifest b/media-sound/flac123/Manifest
index 7660eff10a3f..82f677a9bbb2 100644
--- a/media-sound/flac123/Manifest
+++ b/media-sound/flac123/Manifest
@@ -1,2 +1,8 @@
-MD5 17e843b4e1736da5fe1858263a61bb71 flac123-0.0.7.ebuild 574
+MD5 19250c51801bb2a36200ccc941a5b20d flac123-0.0.7.ebuild 614
+MD5 5cf211645de6cb3122c11bc97fa4c17c ChangeLog 1337
+MD5 290aeca38e2e250be6435cc78b09e822 flac123-0.0.9.ebuild 656
+MD5 5a8290e44006ccff0dff3094555d6366 metadata.xml 257
+MD5 9dccbc702a44babf2040141279efc2b3 flac123-0.0.8.ebuild 640
 MD5 708afe0f2fd79d27b976776a01a1d07f files/digest-flac123-0.0.7 64
+MD5 616f4d5d8ec1aaafd68c0fb6d90a53d1 files/digest-flac123-0.0.8 64
+MD5 c4da1b50688b9220ac0aa88a4b6e914b files/digest-flac123-0.0.9 64
diff --git a/media-sound/flac123/flac123-0.0.7.ebuild b/media-sound/flac123/flac123-0.0.7.ebuild
index b30ab2c63383..5cd9328c80b2 100644
--- a/media-sound/flac123/flac123-0.0.7.ebuild
+++ b/media-sound/flac123/flac123-0.0.7.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/media-sound/flac123/flac123-0.0.7.ebuild,v 1.1 2004/10/15 09:59:49 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/flac123/flac123-0.0.7.ebuild,v 1.1.1.1 2005/11/30 09:38:46 chriswhite Exp $
 
 IUSE=""
 
 DESCRIPTION="flac-tools provides flac123 a console app for playing FLAC audio files."
-SRC_URI="mirror://sourceforge/flac-tools/${P}.tar.gz"
 HOMEPAGE="http://flac-tools.sourceforge.net"
+SRC_URI="mirror://sourceforge/flac-tools/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~sparc ~x86"
 SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="amd64 ppc64 sparc x86"
 
 DEPEND="media-libs/flac
 	media-libs/libao"
diff --git a/media-sound/flac123/flac123-0.0.8.ebuild b/media-sound/flac123/flac123-0.0.8.ebuild
index efd220d3e126..51155d116503 100644
--- a/media-sound/flac123/flac123-0.0.8.ebuild
+++ b/media-sound/flac123/flac123-0.0.8.ebuild
@@ -1,21 +1,20 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/flac123/flac123-0.0.8.ebuild,v 1.1 2005/03/02 16:55:07 chainsaw Exp $
-
-IUSE=""
+# $Header: /var/cvsroot/gentoo-x86/media-sound/flac123/flac123-0.0.8.ebuild,v 1.1.1.1 2005/11/30 09:38:46 chriswhite Exp $
 
 DESCRIPTION="flac-tools provides flac123 a console app for playing FLAC audio files."
 HOMEPAGE="http://flac-tools.sourceforge.net"
 SRC_URI="mirror://sourceforge/flac-tools/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ppc64 sparc x86"
+IUSE=""
 
 DEPEND="media-libs/flac
 	media-libs/libao"
 
 src_install() {
-	make DESTDIR="${D}" install || die
+	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS BUGS NEWS README* TODO
 }
diff --git a/media-sound/flac123/flac123-0.0.9.ebuild b/media-sound/flac123/flac123-0.0.9.ebuild
index 0876cc155f5f..69458a2e96a5 100644
--- a/media-sound/flac123/flac123-0.0.9.ebuild
+++ b/media-sound/flac123/flac123-0.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/media-sound/flac123/flac123-0.0.9.ebuild,v 1.1 2005/05/14 10:30:48 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/flac123/flac123-0.0.9.ebuild,v 1.1.1.1 2005/11/30 09:38:46 chriswhite Exp $
 
 DESCRIPTION="flac-tools provides flac123 a console app for playing FLAC audio files."
 HOMEPAGE="http://flac-tools.sourceforge.net"
diff --git a/media-sound/fluidsynth/ChangeLog b/media-sound/fluidsynth/ChangeLog
index 10b7a95f08b5..6524cf389820 100644
--- a/media-sound/fluidsynth/ChangeLog
+++ b/media-sound/fluidsynth/ChangeLog
@@ -1,6 +1,79 @@
 # ChangeLog for media-sound/fluidsynth
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/fluidsynth/ChangeLog,v 1.1 2003/05/24 09:26:43 jje Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/fluidsynth/ChangeLog,v 1.1.1.1 2005/11/30 09:38:21 chriswhite Exp $
+
+*fluidsynth-1.0.6 (11 Jul 2005)
+
+  11 Jul 2005; Frank van de Pol <fvdpol@gentoo.org>
+  +files/fluidsynth-1.0.6.amd64.patch, +fluidsynth-1.0.6.ebuild:
+  Version bump. Included quickfix by Josh Green for crashes on amd64
+  (http://lists.nongnu.org/archive/html/fluid-dev/2005-07/msg00003.html)
+
+  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  fluidsynth-1.0.5.ebuild:
+  Stable on ppc.
+
+  12 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -fluidsynth-1.0.1.ebuild, fluidsynth-1.0.5.ebuild:
+  Removing 1.0.1.  Stable amd64, sparc, x86.
+
+*fluidsynth-1.0.5 (28 Sep 2004)
+
+  28 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +fluidsynth-1.0.5.ebuild:
+  Version bump.  Added ~sparc.  static USE flag support. Now using DESTDIR.
+
+  03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  fluidsynth-1.0.3.ebuild:
+  Stable amd64.
+
+  13 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  fluidsynth-1.0.3.ebuild:
+  Getting rid of virtual/jack.
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org> fluidsynth-1.0.3.ebuild:
+  Fix use invocation
+
+  06 May 2004; David Holm <dholm@gentoo.org> fluidsynth-1.0.3.ebuild:
+  Removed ppc-specific version mask.
+
+  17 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  fluidsynth-1.0.3.ebuild:
+  IUSE=ladcca
+
+  16 Apr 2004; Travis Tilley <lv@gentoo.org> fluidsynth-1.0.3.ebuild:
+  adding ~amd64 keyword and versioned ladcca dependency - see bug #46916 for
+  more information
+
+  08 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  fluidsynth-1.0.1.ebuild, fluidsynth-1.0.3.ebuild:
+  Removed ladcca support.  See bug #46916.
+
+  03 Apr 2004; Lars Weiler <pylon@gentoo.org> fluidsynth-1.0.3.ebuild:
+  stable on ppc
+
+  26 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  fluidsynth-1.0.1.ebuild, fluidsynth-1.0.3.ebuild:
+  Stable on x86.
+
+  21 Mar 2004; David Holm <dholm@gentoo.org> fluidsynth-1.0.3.ebuild:
+  Added to ~ppc.
+
+  15 Feb 2004; David Holm <dholm@gentoo.org> fluidsynth-1.0.3.ebuild:
+  Added fix for nonx86 archs submitted by Axxackall. Keyworded ~ppc.
+
+  07 Dec 2003; Heinrich Wendel <lanius@gentoo.org> fluidsynth-1.0.1.ebuild,
+  fluidsynth-1.0.3.ebuild:
+  removed unnecessary dep on alsa-driver, alsa-utils
+
+*fluidsynth-1.0.3 (21 Sep 2003)
+
+  21 Sep 2003; jje <jje@gentoo.org> fluidsynth-1.0.3.ebuild:
+  Version bump. Now checks USE=sse, codified some comments from Jonathan Kraut
+  on not enabling -msse2 and having USE=sse.
+  
+  Submitted by: Jonathan Kraut <krautj@earthlink.net>
+		Rossen Apostolov <rossen@protein.osaka-u.ac.jp>
 
 *fluidsynth-1.0.1 (24 May 2003)
 
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index cb72a1c1db8e..adc46d619629 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1,3 +1,10 @@
-MD5 4b2043e12ad55057b2ec40133d34b3a0 fluidsynth-1.0.1.ebuild 1282
-MD5 ab7efbc03faa1fa26459bfc11d0e969a ChangeLog 301
-MD5 76597f227dd6266c408aab1d4f58da85 files/digest-fluidsynth-1.0.1 68
+MD5 00705e9c967054e0db107272a92ef82a fluidsynth-1.0.6.ebuild 1632
+MD5 b1ec0b159ee4b09353cd22add80ddbc4 fluidsynth-1.0.3.ebuild 1649
+MD5 4c8fbc12d12848250b73b2c72860ffcd fluidsynth-1.0.5.ebuild 1606
+MD5 8584c6baa0df131151da18bb2904afad ChangeLog 2898
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 c1870b0eef4d2331c692f1206a55ac6d files/1.0.3-nonx86.patch 215
+MD5 7931c5e28d7e79e8b665caf0613cec38 files/fluidsynth-1.0.6.amd64.patch 625
+MD5 751ab7ab31fc6b9ccf266a683545b750 files/digest-fluidsynth-1.0.3 68
+MD5 7f3eace12f38e061b55b4b207bc65184 files/digest-fluidsynth-1.0.5 68
+MD5 fae86296e0239d950f90b2b6f170070a files/digest-fluidsynth-1.0.6 69
diff --git a/media-sound/fluidsynth/files/fluidsynth-1.0.6.amd64.patch b/media-sound/fluidsynth/files/fluidsynth-1.0.6.amd64.patch
index f08652ec083e..4af11d88911c 100644
--- a/media-sound/fluidsynth/files/fluidsynth-1.0.6.amd64.patch
+++ b/media-sound/fluidsynth/files/fluidsynth-1.0.6.amd64.patch
@@ -1,15 +1,16 @@
---- fluidsynth-1.0.6/src/fluidsynth_priv.h      2005-06-11 16:40:01.000000000 -0500

-+++ fluidsynth-1.0.6-new/src/fluidsynth_priv.h  2005-07-06 00:38:10.000000000 -0500

-@@ -285,7 +285,12 @@

-  * As soon as proper alignment is supported by the compiler, this

-  * can be removed.

-  */

-+#ifdef ENABLE_SSE

-+/* FIXME - This is broken on AMD 64 - only used if SSE enabled */

- #define FLUID_ALIGN16BYTE(ptr)(((int)(ptr)+15) & (~0xFL))

-+#else

-+#define FLUID_ALIGN16BYTE(ptr) ptr

-+#endif

-

- #if WITH_FTS

- #define FLUID_PRINTF                 post

+diff -Naur fluidsynth-1.0.6.orig/src/fluidsynth_priv.h fluidsynth-1.0.6/src/fluidsynth_priv.h
+--- fluidsynth-1.0.6.orig/src/fluidsynth_priv.h	2005-06-12 06:40:01.000000000 +0900
++++ fluidsynth-1.0.6/src/fluidsynth_priv.h	2005-10-06 00:22:28.000000000 +0900
+@@ -285,7 +285,12 @@
+  * As soon as proper alignment is supported by the compiler, this
+  * can be removed.
+  */
++#ifdef ENABLE_SSE
++/* FIXME - This is broken on AMD 64 - only used if SSE enabled */
+ #define FLUID_ALIGN16BYTE(ptr)(((int)(ptr)+15) & (~0xFL))
++#else
++#define FLUID_ALIGN16BYTE(ptr) ptr
++#endif
+ 
+ #if WITH_FTS
+ #define FLUID_PRINTF                 post
diff --git a/media-sound/fluidsynth/fluidsynth-1.0.3.ebuild b/media-sound/fluidsynth/fluidsynth-1.0.3.ebuild
index ac4ea3dc5212..a061ba380be4 100644
--- a/media-sound/fluidsynth/fluidsynth-1.0.3.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-1.0.3.ebuild
@@ -1,34 +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/media-sound/fluidsynth/fluidsynth-1.0.3.ebuild,v 1.1 2003/09/21 02:23:34 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/fluidsynth/fluidsynth-1.0.3.ebuild,v 1.1.1.1 2005/11/30 09:38:21 chriswhite Exp $
 
-inherit flag-o-matic
+inherit flag-o-matic eutils
 
-DESCRIPTION="IIWU Synth is a software real-time synthesizer based on the
-Soundfont 2 specifications."
+DESCRIPTION="IIWU Synth is a software real-time synthesizer based on the Soundfont 2 specifications."
 HOMEPAGE="http://www.fluidsynth.org/"
 SRC_URI="http://savannah.nongnu.org/download/fluid/stable.pkg/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc amd64"
 
-IUSE="alsa ladcca jack sse"
+IUSE="alsa jack sse ladcca"
 
-DEPEND="ladcca? ( media-libs/ladcca ) \
-	jack? ( virtual/jack ) \
-	media-libs/ladspa-sdk \
-	alsa? ( media-sound/alsa-driver \
-	media-libs/alsa-lib \
-	media-sound/alsa-utils )"
+DEPEND="jack? ( media-sound/jack-audio-connection-kit )
+	media-libs/ladspa-sdk
+	ladcca? ( =media-libs/ladcca-0.3* )
+	alsa? ( media-libs/alsa-lib )"
+
+# ladcca-0.4 support is broken.  bug #46916
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-nonx86.patch
+}
 
 src_compile() {
 	local myconf
 	myconf="--enable-ladspa"
-	use ladcca || myconf="--disable-ladcca ${myconf}"
+	#use ladcca || myconf="--disable-ladcca ${myconf}"
+	use amd64 && myconf="`use_enable ladcca` ${myconf}" \
+		|| myconf="--disable-ladcca ${myconf}"
 	use alsa || myconf="--disable-alsa ${myconf}"
 	use jack || myconf="--disable-jack-support ${myconf}"
-	if [ `use sse` ]; then
+	if use sse; then
 		myconf="--enable-SSE ${myconf}"
 		# If your CFLAGS include optimizations for sse, ie:
 		# -march=pentium4 -mfpmath=sse -msse2
diff --git a/media-sound/fluidsynth/fluidsynth-1.0.5.ebuild b/media-sound/fluidsynth/fluidsynth-1.0.5.ebuild
index 95bb79193861..7d76a71757ec 100644
--- a/media-sound/fluidsynth/fluidsynth-1.0.5.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-1.0.5.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/media-sound/fluidsynth/fluidsynth-1.0.5.ebuild,v 1.1 2004/09/28 20:15:08 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/fluidsynth/fluidsynth-1.0.5.ebuild,v 1.1.1.1 2005/11/30 09:38:21 chriswhite Exp $
 
-IUSE="alsa jack sse ladcca"
+IUSE="alsa jack sse ladcca static"
 
 inherit flag-o-matic eutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://savannah.nongnu.org/download/fluid/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+KEYWORDS="amd64 ppc sparc x86"
 
 DEPEND="jack? ( media-sound/jack-audio-connection-kit )
 	media-libs/ladspa-sdk
@@ -30,13 +30,14 @@ asrc_unpack() {
 
 src_compile() {
 	local myconf
-	myconf="--enable-ladspa"
+	myconf="--enable-ladspa `use_enable jack jack-support` `use_enable static`"
+
 	if use alsa; then
 		myconf="${myconf} --enable-alsa `use_enable ladcca`"
 	else
 		myconf="${myconf} --disable-alsa --disable-ladcca"
 	fi
-	use jack || myconf="--disable-jack-support ${myconf}"
+
 	if use sse; then
 		myconf="--enable-SSE ${myconf}"
 		# If your CFLAGS include optimizations for sse, ie:
@@ -48,13 +49,12 @@ src_compile() {
 			filter-flags "-mfpmath=sse"
 		fi
 	fi
+
 	econf ${myconf} || die "./configure failed"
 	emake || die
 }
 
 src_install() {
-	einstall || die
-	dodoc AUTHORS COPYING INSTALL NEWS README THANKS TODO
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS NEWS README THANKS TODO
 }
-
-
diff --git a/media-sound/fluidsynth/fluidsynth-1.0.6.ebuild b/media-sound/fluidsynth/fluidsynth-1.0.6.ebuild
index ccaa55d91478..e86161967c7a 100644
--- a/media-sound/fluidsynth/fluidsynth-1.0.6.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-1.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/media-sound/fluidsynth/fluidsynth-1.0.6.ebuild,v 1.1 2005/07/11 19:41:43 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/fluidsynth/fluidsynth-1.0.6.ebuild,v 1.1.1.1 2005/11/30 09:38:21 chriswhite Exp $
 
 IUSE="alsa jack sse ladcca static"
 
diff --git a/media-sound/fmdrv/ChangeLog b/media-sound/fmdrv/ChangeLog
index 19748ae39ecd..aa16fb38c965 100644
--- a/media-sound/fmdrv/ChangeLog
+++ b/media-sound/fmdrv/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for media-sound/fmdrv
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/fmdrv/ChangeLog,v 1.1 2004/03/18 16:21:50 eradicator Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/fmdrv/ChangeLog,v 1.1.1.1 2005/11/30 09:37:56 chriswhite Exp $
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> fmdrv-1.0.7.ebuild:
+  Stable amd64.
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> fmdrv-1.0.7.ebuild:
+  ~amd64
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> fmdrv-1.0.7.ebuild:
+  virtual/glibc -> virtual/libc
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> fmdrv-1.0.7.ebuild:
+  Stable x86.
 
 *fmdrv-1.0.7 (18 Mar 2004)
 
diff --git a/media-sound/fmdrv/Manifest b/media-sound/fmdrv/Manifest
index ae0a23bd252d..98f9b52badf4 100644
--- a/media-sound/fmdrv/Manifest
+++ b/media-sound/fmdrv/Manifest
@@ -1,3 +1,4 @@
-MD5 7976de9185196f463eb2f4f30f4d83b6 fmdrv-1.0.7.ebuild 848
+MD5 889576f9f89a1effd453c853aa8ea274 ChangeLog 838
+MD5 c1ff24209976a27869d359a7f6958241 fmdrv-1.0.7.ebuild 856
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 e68bba812789f80c1584df638769a3a1 files/digest-fmdrv-1.0.7 63
diff --git a/media-sound/fmdrv/fmdrv-1.0.7.ebuild b/media-sound/fmdrv/fmdrv-1.0.7.ebuild
index 32ba01adffeb..a45ba115473f 100644
--- a/media-sound/fmdrv/fmdrv-1.0.7.ebuild
+++ b/media-sound/fmdrv/fmdrv-1.0.7.ebuild
@@ -1,18 +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/media-sound/fmdrv/fmdrv-1.0.7.ebuild,v 1.1 2004/03/18 16:21:50 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/fmdrv/fmdrv-1.0.7.ebuild,v 1.1.1.1 2005/11/30 09:37:56 chriswhite Exp $
+
+IUSE=""
 
 DESCRIPTION="Console mode MIDI player with builtin userland OPL2 driver"
 HOMEPAGE="http://bisqwit.iki.fi/source/fmdrv.html"
 SRC_URI="http://bisqwit.iki.fi/src/arch/${P}.tar.bz2"
 
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 
-# See file
 LICENSE="as-is"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
@@ -32,7 +33,8 @@ src_compile() {
 
 src_install() {
 	dobin fmdrv
-	dodoc TINYFREELICENSE README README.html
+	dodoc README
+	dohtml README.html
 }
 
 pkg_postinst() {
diff --git a/media-sound/fmtools/ChangeLog b/media-sound/fmtools/ChangeLog
index ae04251136c2..38003d640c29 100644
--- a/media-sound/fmtools/ChangeLog
+++ b/media-sound/fmtools/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for media-sound/fmtools
-# Copyright 2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/fmtools/ChangeLog,v 1.1 2003/03/01 10:48:14 seemant Exp $
+# Copyright 2003-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/fmtools/ChangeLog,v 1.1.1.1 2005/11/30 09:38:29 chriswhite Exp $
+
+  07 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> fmtools-0.99.1.ebuild,
+  fmtools-1.0.ebuild:
+  Don't install COPYING file. Don't depend on virtual/libc. Use emake instead
+  of make.
+
+  04 Sep 2005; Jason Wever <weeve@gentoo.org> fmtools-1.0.ebuild:
+  Changed -sparc keyword to ~sparc wrt bug #104809.
+
+*fmtools-1.0 (29 Mar 2005)
+
+  29 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> fmtools-0.99.1.ebuild,
+  +fmtools-1.0.ebuild:
+  new upstream version, updated HOMEPAGE. fixes #86891
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  fmtools-0.99.1.ebuild:
+  virtual/glibc -> virtual/libc
+
+  16 Nov 2003; Brad House <brad_mssw@gentoo.org> fmtools-0.99.1.ebuild:
+  mark stable on amd64
 
 *fmtools-0.99.1 (12 Feb 2003)
 
diff --git a/media-sound/fmtools/Manifest b/media-sound/fmtools/Manifest
index e69de29bb2d1..5cad544d3cb1 100644
--- a/media-sound/fmtools/Manifest
+++ b/media-sound/fmtools/Manifest
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e928d85a9f56f01da471407f7ecaf9f7 ChangeLog 1235
+MD5 fa94f4db1de686293eed401f22883e5b files/digest-fmtools-0.99.1 65
+MD5 786cb9e92477ee620abefa7a3e0cf12b files/digest-fmtools-1.0 62
+MD5 47bf9bd39c80f8005ac919303cac9020 fmtools-0.99.1.ebuild 626
+MD5 5ec5f637b0eaef8a1e96efe20c5c0f5c fmtools-1.0.ebuild 625
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD4DBQFDby81j5H05b2HAEkRAiKGAKCGEwUhRHT73L/+nkwkXBwwlA1WoACXeocD
+du4JPelcbsshFf7q4iQxQg==
+=6hNY
+-----END PGP SIGNATURE-----
diff --git a/media-sound/fmtools/fmtools-0.99.1.ebuild b/media-sound/fmtools/fmtools-0.99.1.ebuild
index 09ab539507ca..5246e25ad92f 100644
--- a/media-sound/fmtools/fmtools-0.99.1.ebuild
+++ b/media-sound/fmtools/fmtools-0.99.1.ebuild
@@ -1,21 +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/media-sound/fmtools/fmtools-0.99.1.ebuild,v 1.1 2003/02/12 08:47:04 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/fmtools/fmtools-0.99.1.ebuild,v 1.1.1.1 2005/11/30 09:38:29 chriswhite Exp $
 
 IUSE=""
 
 DESCRIPTION="A collection of programs for controlling v4l radio card drivers."
-HOMEPAGE="http://www.exploits.org/v4l/fmtools/index.html"
-SRC_URI="http://www.exploits.org/v4l/fmtools/${P}.tar.gz"
+HOMEPAGE="http://www.stanford.edu/~blp/fmtools/"
+SRC_URI="http://www.stanford.edu/~blp/fmtools/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 -ppc -sparc  -alpha"
+KEYWORDS="amd64 x86 -ppc -sparc -alpha"
 
-DEPEND="virtual/glibc"
+DEPEND=""
 
 src_compile() {
-	make || die
+	emake || die
 }
 
 src_install() {
@@ -23,5 +23,5 @@ src_install() {
 	dobin fmscan
 	doman fm.1
 	doman fmscan.1
-	dodoc README CHANGES COPYING
+	dodoc README CHANGES
 }
diff --git a/media-sound/fmtools/fmtools-1.0.ebuild b/media-sound/fmtools/fmtools-1.0.ebuild
index 24ecfbe96ea6..102ce6ea6b1a 100644
--- a/media-sound/fmtools/fmtools-1.0.ebuild
+++ b/media-sound/fmtools/fmtools-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/media-sound/fmtools/fmtools-1.0.ebuild,v 1.1 2005/03/29 02:11:39 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/fmtools/fmtools-1.0.ebuild,v 1.1.1.1 2005/11/30 09:38:29 chriswhite Exp $
 
 IUSE=""
 
@@ -10,12 +10,12 @@ SRC_URI="http://www.stanford.edu/~blp/fmtools/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 -ppc -sparc -alpha"
+KEYWORDS="-alpha ~amd64 -ppc ~sparc ~x86"
 
-DEPEND="virtual/libc"
+DEPEND=""
 
 src_compile() {
-	make || die
+	emake || die
 }
 
 src_install() {
@@ -23,5 +23,5 @@ src_install() {
 	dobin fmscan
 	doman fm.1
 	doman fmscan.1
-	dodoc README CHANGES COPYING
+	dodoc README CHANGES
 }
diff --git a/media-sound/fobbit/ChangeLog b/media-sound/fobbit/ChangeLog
index 52955fe478bc..24737ee7f4ac 100644
--- a/media-sound/fobbit/ChangeLog
+++ b/media-sound/fobbit/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-sound/fobbit
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/fobbit/ChangeLog,v 1.1 2003/08/10 04:23:57 jje Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/fobbit/ChangeLog,v 1.1.1.1 2005/11/30 09:38:07 chriswhite Exp $
+
+  04 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> fobbit-0.56.ebuild:
+  || die
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> fobbit-0.56.ebuild:
+  virtual/glibc -> virtual/libc
+
+  26 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> fobbit-0.56.ebuild:
+  Stable on x86.
 
 *fobbit-0.56 (10 Aug 2003)
 
diff --git a/media-sound/fobbit/Manifest b/media-sound/fobbit/Manifest
index 033d90fc45df..c403cca0dc48 100644
--- a/media-sound/fobbit/Manifest
+++ b/media-sound/fobbit/Manifest
@@ -1,2 +1,14 @@
-MD5 66e9afaa57ed92c3c15b4a5f57c50d21 fobbit-0.56.ebuild 2401
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d8e2b163e0c21703ef338f89c8d953fb ChangeLog 662
 MD5 983c4f24367fac5d8213c436907d699b files/digest-fobbit-0.56 66
+MD5 8820627ec0355a84d3d5f78d9356d84a fobbit-0.56.ebuild 2491
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC0CGpI1lqEGTUzyQRAmoNAJ48kSTchgX0vEU49/jWerxiG2HT4QCfTmvh
+BJq1Qono9O590ADt7vyetZI=
+=U9hO
+-----END PGP SIGNATURE-----
diff --git a/media-sound/fobbit/fobbit-0.56.ebuild b/media-sound/fobbit/fobbit-0.56.ebuild
index 01ab138dc59a..10b0b281896a 100644
--- a/media-sound/fobbit/fobbit-0.56.ebuild
+++ b/media-sound/fobbit/fobbit-0.56.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/media-sound/fobbit/fobbit-0.56.ebuild,v 1.1 2003/08/10 04:23:57 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/fobbit/fobbit-0.56.ebuild,v 1.1.1.1 2005/11/30 09:38:07 chriswhite Exp $
 
 MY_P="${PN}-0.60rc1"
 S="${WORKDIR}/${MY_P}/src"
@@ -8,11 +8,13 @@ DESCRIPTION="Software to use the Creative VoiceBlaster USB VoIP phone device"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 HOMEPAGE="http://www.fobbit.org/ http://www.sourceforge.net/projects/fobbit/"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~x86"
+KEYWORDS="x86"
+
+IUSE=""
 
 src_compile() {
 	check_KV
@@ -23,9 +25,9 @@ src_compile() {
 	einfo "Building kernel module"
 
 	cd ${S}/linux_drv/
-	
+
 	# the linux driver for kernel series 2.4.20 is different than for
-	# earlier kernels, so we have to detect the kernel version and 
+	# earlier kernels, so we have to detect the kernel version and
 	# manually select the source file.
 
 	# snippet courtesy of media-video/nvidia-kernel
@@ -45,7 +47,7 @@ src_compile() {
 		mv usbvb-2.4.20.c usbvb.c
 	fi
 
-	make
+	make || die
 }
 
 src_install() {
@@ -72,16 +74,16 @@ pkg_config() {
 }
 
 pkg_postinst() {
-	einfo ""
+	einfo
 	einfo "Execute:"
-	einfo ""
+	einfo
 	einfo " \"ebuild /var/db/pkg/media-sound/${P}/${P}.ebuild config\""
-	einfo ""
+	einfo
 	einfo "to create the USB VB devices in /dev/vbc[0-3] and /dev/vbv[0-3]."
-	einfo ""
+	einfo
 	einfo "To load the usbvb module, you may type \"insmod usbvb\". To have"
 	einfo "the module load automatically at boot time, add the line \"usbvb\""
 	einfo "to /etc/modules.autoload"
-	einfo ""
+	einfo
 }
 
diff --git a/media-sound/freebirth/ChangeLog b/media-sound/freebirth/ChangeLog
index 974177ab875a..f4387684e48c 100644
--- a/media-sound/freebirth/ChangeLog
+++ b/media-sound/freebirth/ChangeLog
@@ -1,6 +1,28 @@
 # ChangeLog for media-sound/freebirth
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/freebirth/ChangeLog,v 1.1 2003/06/21 00:41:11 jje Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/freebirth/ChangeLog,v 1.1.1.1 2005/11/30 09:37:54 chriswhite Exp $
+
+  09 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> freebirth-0.3.2.ebuild:
+  Don't install INSTALL file.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  freebirth-0.3.2.ebuild:
+  Stable sparc.
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  freebirth-0.3.2.ebuild:
+  Added to ~sparc.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  freebirth-0.3.2.ebuild:
+  Stable amd64.
+
+  03 Sep 2004; David Holm <dholm@gentoo.org> freebirth-0.3.2.ebuild:
+  Added to ~ppc.
+
+  26 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  freebirth-0.3.2.ebuild:
+  Stable on x86.
 
 *freebirth-0.3.2 (21 Jun 2003)
 
diff --git a/media-sound/freebirth/Manifest b/media-sound/freebirth/Manifest
index 50d5ef6db9f6..5b16f56b5ec7 100644
--- a/media-sound/freebirth/Manifest
+++ b/media-sound/freebirth/Manifest
@@ -1,3 +1,15 @@
-MD5 99d300c813c51d138528ce37f7865035 freebirth-0.3.2.ebuild 716
-MD5 54ab60ea448a7b59b936c3edb81674c9 files/digest-freebirth-0.3.2 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7e9ce465190cb0fb52bace20e61efda6 freebirth-0.3.2.ebuild 823
+MD5 f2d360e16470ed79161ff7a7873ec4dc ChangeLog 1019
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 a90a6b74ba5285b9775589995af079fc files/freebirth-0.3.2-gentoo.patch 433
+MD5 54ab60ea448a7b59b936c3edb81674c9 files/digest-freebirth-0.3.2 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDIYkQj5H05b2HAEkRAgBCAJ4nqaJTgs/mHuhXUwEZDaebaNS7EgCeJhdZ
+WG7TLcF+SKAMi8zj+O8VHpg=
+=/cfT
+-----END PGP SIGNATURE-----
diff --git a/media-sound/freebirth/freebirth-0.3.2.ebuild b/media-sound/freebirth/freebirth-0.3.2.ebuild
index ff8f4e6c7d16..025e522a41c0 100644
--- a/media-sound/freebirth/freebirth-0.3.2.ebuild
+++ b/media-sound/freebirth/freebirth-0.3.2.ebuild
@@ -1,6 +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/media-sound/freebirth/freebirth-0.3.2.ebuild,v 1.1 2003/06/21 00:41:11 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/freebirth/freebirth-0.3.2.ebuild,v 1.1.1.1 2005/11/30 09:37:54 chriswhite Exp $
+
+IUSE=""
+
+inherit eutils
 
 DESCRIPTION="Free software bass synthesizer step sequencer"
 HOMEPAGE="http://www.bitmechanic.com/projects/freebirth/"
@@ -8,14 +12,11 @@ SRC_URI="http://www.bitmechanic.com/projects/freebirth/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
+KEYWORDS="amd64 ~ppc sparc x86"
 
 DEPEND="=x11-libs/gtk+-1.2*
 	=dev-libs/glib-1.2*"
 
-S=${WORKDIR}/${P}
-
 src_unpack() {
 	unpack ${A}
 
@@ -33,6 +34,5 @@ src_install() {
 	insinto /usr/lib/${PN}/raw
 	doins raw/*.raw
 
-	dodoc CHANGES INSTALL NEXT_VERSION README
+	dodoc CHANGES NEXT_VERSION README
 }
-
diff --git a/media-sound/freewheeling/ChangeLog b/media-sound/freewheeling/ChangeLog
index 74a03aff14c7..14badad7e3be 100644
--- a/media-sound/freewheeling/ChangeLog
+++ b/media-sound/freewheeling/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-sound/freewheeling
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/freewheeling/ChangeLog,v 1.1 2005/07/14 20:57:08 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/freewheeling/ChangeLog,v 1.1.1.1 2005/11/30 09:38:28 chriswhite Exp $
+
+  08 Oct 2005; MATSUU Takuto <matsuu@gentoo.org>
+  freewheeling-0.5_pre4.ebuild:
+  Replace virtual/jack to media-sound/jack-audio-connection-kit.
+
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  freewheeling-0.5_pre4.ebuild:
+  Don't install COPYING file.
+
+  15 Jul 2005; David Holm <dholm@gentoo.org> freewheeling-0.5_pre4.ebuild:
+  Added to ~ppc.
 
 *freewheeling-0.5_pre4 (14 Jul 2005)
 
diff --git a/media-sound/freewheeling/Manifest b/media-sound/freewheeling/Manifest
index 07ef5d3ed0ed..cd58be6d619b 100644
--- a/media-sound/freewheeling/Manifest
+++ b/media-sound/freewheeling/Manifest
@@ -1,4 +1,4 @@
-MD5 1f95e7af3020cc2eb855030785e3efb5 freewheeling-0.5_pre4.ebuild 982
-MD5 29547c6f692f13832df884aec455a40d ChangeLog 366
+MD5 f77384ff1d6b8d869cb92781ce3fae59 freewheeling-0.5_pre4.ebuild 1000
+MD5 4a8fc25d75d382bc9a4840e46084562d ChangeLog 818
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 9c1ff5e41342fba4d582fa173b7b8ea3 files/digest-freewheeling-0.5_pre4 72
diff --git a/media-sound/freewheeling/freewheeling-0.5_pre4.ebuild b/media-sound/freewheeling/freewheeling-0.5_pre4.ebuild
index e42b20ef6f33..fb13a87b2aeb 100644
--- a/media-sound/freewheeling/freewheeling-0.5_pre4.ebuild
+++ b/media-sound/freewheeling/freewheeling-0.5_pre4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/freewheeling/freewheeling-0.5_pre4.ebuild,v 1.1 2005/07/14 20:57:08 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/freewheeling/freewheeling-0.5_pre4.ebuild,v 1.1.1.1 2005/11/30 09:38:29 chriswhite Exp $
 
 IUSE="fluidsynth"
 MY_P="fweelin-0.5pre4"
@@ -14,11 +14,10 @@ LICENSE="GPL-2"
 SLOT="0"
 
 # don't keyword it stable on amd64 before talking to fvdpol@gentoo.org
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 
-DEPEND="
-	virtual/libc
-	virtual/jack
+DEPEND="virtual/libc
+	media-sound/jack-audio-connection-kit
 	>=media-libs/libsdl-1.2.4
 	dev-libs/libxml2
 	media-libs/libvorbis
@@ -35,5 +34,5 @@ src_compile() {
 src_install() {
 	cd ${WORKDIR}/${MY_P} && \
 	einstall || die
-	dodoc COPYING README TODO EVOLUTION THANKS TUNING NEWS AUTHORS
+	dodoc README TODO EVOLUTION THANKS TUNING NEWS AUTHORS
 }
diff --git a/media-sound/freqtweak/ChangeLog b/media-sound/freqtweak/ChangeLog
index bd6647221dfc..fb7534fa8d34 100644
--- a/media-sound/freqtweak/ChangeLog
+++ b/media-sound/freqtweak/ChangeLog
@@ -1,9 +1,69 @@
 # ChangeLog for media-sound/freqtweak
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/freqtweak/ChangeLog,v 1.1 2003/03/02 08:07:50 jje Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/freqtweak/ChangeLog,v 1.1.1.1 2005/11/30 09:38:01 chriswhite Exp $
+
+*freqtweak-0.6.0-r1 (25 Apr 2005)
+
+  25 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> -freqtweak-0.4.7.ebuild,
+  -freqtweak-0.5.0.ebuild, -freqtweak-0.5.2.ebuild,
+  +freqtweak-0.6.0-r1.ebuild:
+  added modified ebuild for version 0.6.0, fixes #83999. Thanks to Rob Cakebread
+  <pythonhead@gentoo.org>
+
+  16 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> freqtweak-0.6.0.ebuild:
+  fixed libsigc++ dependency to fix bug #75012.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  freqtweak-0.6.0.ebuild:
+  Stable sparc.
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  freqtweak-0.6.0.ebuild:
+  Added to ~sparc.
+
+  03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  freqtweak-0.6.0.ebuild:
+  Stable amd64, x86.
+
+*freqtweak-0.6.0 (05 Jul 2004)
+
+  05 Jul 2004; David Holm <dholm@gentoo.org> freqtweak-0.6.0.ebuild:
+  Added to ~ppc.
+
+  05 Jul 2004; Frank van de Pol <fvdpol@gentoo.org> :
+  Updated to new upstream release 0.6.0, added ~amd64 keyword, fixed gcc-3.4
+  issue. Closes bug #56034
+
+  13 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  freqtweak-0.4.7.ebuild, freqtweak-0.5.0.ebuild, freqtweak-0.5.2.ebuild:
+  Getting rid of virtual/jack.
+
+  26 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  freqtweak-0.4.7.ebuild, freqtweak-0.5.0.ebuild, freqtweak-0.5.2.ebuild:
+  Stable on x86.
+
+  10 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  freqtweak-0.4.7.ebuild, freqtweak-0.5.0.ebuild, freqtweak-0.5.2.ebuild:
+  Added check for wxGTK being compiled without unicode support to close bug
+  #37573.
+
+*freqtweak-0.5.2 (16 Sep 2003)
+
+  16 Sep 2003; rob holland <tigger@gentoo.org> freqtweak-0.5.2.ebuild,
+  metadata.xml:
+  version bump. reported by the infamous Kasper Souren <Kasper.Souren@ircam.fr>
+  ;) closes #27194
+
+*freqtweak-0.5.0 (17 Jul 2003)
+
+  17 Jul 2003; torbenh <torbenh@gentoo.org> Manifest freqtweak-0.5.0.ebuild files/digest-freqtweak-0.5.0 :
+  Version Bump
+
+  12 Jun 2003; <msterret@gentoo.org> freqtweak-0.4.7.ebuild:
+  fix Header
 
 *freqtweak-0.4.7 (02 Mar 2003)
 
-  02 Mar 2003; root <root@gentoo.org> freqtweak-0.4.7.ebuild:
+  02 Mar 2003; jje <jje@gentoo.org> freqtweak-0.4.7.ebuild:
   Initial revision.
 
diff --git a/media-sound/freqtweak/Manifest b/media-sound/freqtweak/Manifest
index e69de29bb2d1..3dcdbe8a278c 100644
--- a/media-sound/freqtweak/Manifest
+++ b/media-sound/freqtweak/Manifest
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 73af02ea72b48ef2f99547d41bca8f06 freqtweak-0.6.0-r1.ebuild 1065
+MD5 d608a782a685e981370c23c50af796c3 freqtweak-0.6.0.ebuild 1141
+MD5 553787fb33d706b6eb7f0a1365b7beec ChangeLog 2324
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 062012a13f18c48f506d4fb6597159fa files/digest-freqtweak-0.6.0-r1 67
+MD5 062012a13f18c48f506d4fb6597159fa files/digest-freqtweak-0.6.0 67
+MD5 74886188a273ea8c0fbe08d4f8c24cc4 files/freqtweak-0.6.0-gcc34.patch 583
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCbSAA06ebR+OMO78RAvrGAJwPjonFs1XrwIG2EHIdG++lshVOfQCglikX
+ba8U6Nkx+lNTEk52di5UkX4=
+=zBzh
+-----END PGP SIGNATURE-----
diff --git a/media-sound/freqtweak/freqtweak-0.6.0-r1.ebuild b/media-sound/freqtweak/freqtweak-0.6.0-r1.ebuild
index 8b4329d3acc1..7c5f7af5eb7d 100644
--- a/media-sound/freqtweak/freqtweak-0.6.0-r1.ebuild
+++ b/media-sound/freqtweak/freqtweak-0.6.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/media-sound/freqtweak/freqtweak-0.6.0-r1.ebuild,v 1.1 2005/04/25 16:50:52 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/freqtweak/freqtweak-0.6.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:01 chriswhite Exp $
 
 inherit eutils wxwidgets
 
diff --git a/media-sound/freqtweak/freqtweak-0.6.0.ebuild b/media-sound/freqtweak/freqtweak-0.6.0.ebuild
index c151593b6fa6..9fa0498ecc50 100644
--- a/media-sound/freqtweak/freqtweak-0.6.0.ebuild
+++ b/media-sound/freqtweak/freqtweak-0.6.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/media-sound/freqtweak/freqtweak-0.6.0.ebuild,v 1.1 2004/07/04 22:22:31 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/freqtweak/freqtweak-0.6.0.ebuild,v 1.1.1.1 2005/11/30 09:38:01 chriswhite Exp $
+
+IUSE=""
 
 inherit eutils
 
@@ -10,13 +12,11 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-IUSE=""
+KEYWORDS="amd64 ~ppc sparc x86"
 
 DEPEND="x11-libs/wxGTK
-	>=dev-libs/fftw-3.0
-	>=dev-libs/libsigc++-0.14
+	>=sci-libs/fftw-3.0
+	=dev-libs/libsigc++-1.2*
 	dev-libs/libxml2
 	media-sound/jack-audio-connection-kit"
 
@@ -36,6 +36,6 @@ pkg_setup() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYING ChangeLog NEWS README THANKS
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README THANKS
 }
diff --git a/media-sound/galan/ChangeLog b/media-sound/galan/ChangeLog
index 00e68a29e72a..ceb4b63d0a83 100644
--- a/media-sound/galan/ChangeLog
+++ b/media-sound/galan/ChangeLog
@@ -1,6 +1,73 @@
 # ChangeLog for media-sound/galan
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/galan/ChangeLog,v 1.1 2003/03/15 11:49:28 jje Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/galan/ChangeLog,v 1.1.1.1 2005/11/30 09:38:26 chriswhite Exp $
+
+  12 Jun 2005; Sven Wegener <swegener@gentoo.org> galan-0.2.14.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  Remove retired developer from metadata.xml.
+
+  12 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  galan-0.2.14.ebuild, galan-0.3.0_beta6.ebuild:
+  Stable sparc and cleanups.
+
+  22 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -galan-0.3.0_beta3.ebuild, -galan-0.3.0_beta5.ebuild:
+  Added ~sparc.  Removed old versions.
+
+*galan-0.3.0_beta6 (23 Jun 2004)
+
+  23 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +galan-0.3.0_beta6.ebuild:
+  Version bump.
+
+  27 Apr 2004; Danny van Dyk <kugelfang@gentoo.org> galan-0.3.0_beta5.ebuild:
+  marked ~amd64.
+
+  17 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  galan-0.3.0_beta3.ebuild, galan-0.3.0_beta5.ebuild:
+  IUSE=jack
+
+  26 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> galan-0.2.14.ebuild,
+  galan-0.3.0_beta3.ebuild, galan-0.3.0_beta5.ebuild:
+  ebuild cleanup.
+
+  11 Mar 2004; David Holm <dholm@gentoo.org> galan-0.3.0_beta5.ebuild:
+  Added to ~ppc.
+
+*galan-0.3.0_beta5 (10 Mar 2004)
+
+  10 Mar 2004; <torbenh@gentoo.org> galan-0.3.0_beta5.ebuild:
+  Version bump. i think i have fixed the gcc-2.x issue upstream. if not mail me
+  please.
+
+  06 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  galan-0.3.0_beta3.ebuild, files/galan-0.3.0_beta3-gcc2_fix.patch:
+  Added patch to fix gcc2 compile (Bug #40515). Added =dev-libs/fftw-2* to
+  DEPEND (Bug #40514). Both fixes thanks to Tristan Henderson
+  <T.Henderson@cs.ucl.ac.uk>.
+
+*galan-0.3.0_beta3 (04 Feb 2004)
+
+  04 Feb 2004; <torbenh@gentoo.org> galan-0.2.13d.ebuild, galan-0.2.14.ebuild,
+  galan-0.3.0_beta3.ebuild, metadata.xml:
+  Added galan-0.3.0_beta3.
+  removed the other arch keywords, because repoman mourns around.
+  liblrdf is not in the other archs and jack-audio-connection-kit
+  neither.
+
+  01 Feb 2004; Brian Harring <ferringb@gentoo.org> galan-0.2.14.ebuild, 
+  files/galan-0.2.14-alsalib-fix.patch:
+  Patch to fix alsalib-1.0 compilation issues (38995)
+
+  12 Jun 2003; <msterret@gentoo.org> galan-0.2.14.ebuild:
+  fix Header
+
+*galan-0.2.14 (24 Mar 2003)
+
+  24 Mar 2003; jje <jje@gentoo.org> galan-0.2.14.ebuild:
+  Version bump.
 
 *galan-0.2.13d (15 Mar 2003)
 
diff --git a/media-sound/galan/Manifest b/media-sound/galan/Manifest
index e69de29bb2d1..4aaedcee18ec 100644
--- a/media-sound/galan/Manifest
+++ b/media-sound/galan/Manifest
@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 468ec2b089e648a0589672f4865a2692 galan-0.2.14.ebuild 990
+MD5 c9ee5e89cb6b4fa53c0f6ba647602b3a galan-0.3.0_beta6.ebuild 940
+MD5 01c10fc903bc1a38ff3b46a0a7047bc7 ChangeLog 2693
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 38bdd7c55254e5267b7daa66e27d1fea files/digest-galan-0.2.14 64
+MD5 f291c312c9ac1307d9821704d09ed26b files/galan-0.2.14-alsalib-fix.patch 1862
+MD5 5765c1e52d2d54a3c3f9563437b9a248 files/digest-galan-0.3.0_beta6 70
+MD5 80af60dfcd3796ed3347b6a5306dba94 files/galan-0.3.0_beta3-gcc2_fix.patch 726
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCrCcoI1lqEGTUzyQRAlvbAKCYfi3xhyK4X/pWm2Mwg2JB/gQrYQCeMRFA
+Tnb4H7FGDOU+3vMMo70q9f8=
+=4VP6
+-----END PGP SIGNATURE-----
diff --git a/media-sound/galan/galan-0.2.14.ebuild b/media-sound/galan/galan-0.2.14.ebuild
index c99983b62576..6e291707305a 100644
--- a/media-sound/galan/galan-0.2.14.ebuild
+++ b/media-sound/galan/galan-0.2.14.ebuild
@@ -1,43 +1,38 @@
-# Copyright 1999-2002 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/media-sound/galan/galan-0.2.14.ebuild,v 1.1.1.1 2005/11/30 09:38:26 chriswhite Exp $
 
+IUSE="oggvorbis alsa opengl esd"
+
+inherit eutils
 
 DESCRIPTION="gAlan - Graphical Audio Language"
-SRC_URI="mirror://sourceforge/galan/${P}.tar.gz"
 HOMEPAGE="http://galan.sourceforge.net/"
+SRC_URI="mirror://sourceforge/galan/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="sparc x86"
 
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
-
-IUSE="oggvorbis alsa opengl esd"
-
-S=${WORKDIR}/${P}
-DEPEND=">=x11-libs/gtk+-1.2* 
-        media-libs/gdk-pixbuf
+DEPEND=">=x11-libs/gtk+-1.2
+	media-libs/gdk-pixbuf
 	oggvorbis? ( >=media-sound/vorbis-tools-1.0 )
 	alsa? ( >=media-libs/alsa-lib-0.9.0_rc1 )
-	opengl? ( >=x11-libs/gtkglarea-1.2* )
+	opengl? ( >=x11-libs/gtkglarea-1.2 )
 	esd? ( media-sound/esound )
-        media-libs/liblrdf
-        media-libs/ladspa-sdk
-        media-libs/audiofile
-        media-libs/libsndfile"
+	media-libs/liblrdf
+	media-libs/ladspa-sdk
+	media-libs/audiofile
+	media-libs/libsndfile"
 
+DOC="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO doc/"
 
 src_unpack() {
 	unpack ${A}
-}
-
-src_compile() {
-	econf || die "configure failed"
-	emake || die "build failed"
+	epatch ${FILESDIR}/${P}-alsalib-fix.patch || die "Alsalib patch failed"
 }
 
 src_install() {
-    einstall || dies "install failed"
+	einstall || dies "install failed"
+	dodoc ${DOC}
 }
-
-DOC="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO doc/"
diff --git a/media-sound/galan/galan-0.3.0_beta6.ebuild b/media-sound/galan/galan-0.3.0_beta6.ebuild
index d19894d442e0..96d39dfbdbfb 100644
--- a/media-sound/galan/galan-0.3.0_beta6.ebuild
+++ b/media-sound/galan/galan-0.3.0_beta6.ebuild
@@ -1,18 +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/media-sound/galan/galan-0.3.0_beta6.ebuild,v 1.1 2004/06/24 07:24:48 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/galan/galan-0.3.0_beta6.ebuild,v 1.1.1.1 2005/11/30 09:38:25 chriswhite Exp $
+
+IUSE="oggvorbis alsa opengl esd jack"
 
 DESCRIPTION="gAlan - Graphical Audio Language"
 HOMEPAGE="http://galan.sourceforge.net/"
 SRC_URI="mirror://sourceforge/galan/${P}.tar.gz"
-RESTRICT="nomirror"
 
 SLOT="0"
 LICENSE="GPL-2"
 
-KEYWORDS="~x86 ~ppc ~amd64"
-
-IUSE="oggvorbis alsa opengl esd jack"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 DEPEND=">=x11-libs/gtk+-2.0
 	oggvorbis? ( >=media-sound/vorbis-tools-1.0 )
@@ -24,12 +23,10 @@ DEPEND=">=x11-libs/gtk+-2.0
 	media-libs/ladspa-sdk
 	media-libs/audiofile
 	media-libs/libsndfile
-	=dev-libs/fftw-2*"
-
-DOC="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO doc/"
+	=sci-libs/fftw-2*"
 
 src_install() {
-	make DESTDIR=${D} install || die "install failed"
-	dodoc ${DOC}
+	make DESTDIR="${D}" install || die "install failed"
+	dodoc AUTHORS ChangeLog NEWS README TODO doc/
 }
 
diff --git a/media-sound/galan/metadata.xml b/media-sound/galan/metadata.xml
index d4ce46c038ab..e1774e3d9ad7 100644
--- a/media-sound/galan/metadata.xml
+++ b/media-sound/galan/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sound</herd>
-<maintainer>
-  <email>torbenh@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/media-sound/gamix/ChangeLog b/media-sound/gamix/ChangeLog
index e6758f5273e2..7b22f4179c96 100644
--- a/media-sound/gamix/ChangeLog
+++ b/media-sound/gamix/ChangeLog
@@ -1,9 +1,77 @@
 # ChangeLog for media-sound/gamix
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gamix/ChangeLog,v 1.1 2002/05/24 02:57:19 rphillips Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gamix/ChangeLog,v 1.1.1.1 2005/11/30 09:38:11 chriswhite Exp $
+
+  07 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  gamix-1.99_p14-r1.ebuild:
+  Don't install COPYING, ABOUT-NLS and INSTALL files.
+
+*gamix-1.99_p14-r2 (23 Oct 2005)
+
+  23 Oct 2005; MATSUU Takuto <matsuu@gentoo.org> +gamix-1.99_p14-r2.ebuild:
+  Removed gtk2 use flag, Bug 106560.
+
+  14 Sep 2005; Aron Griffis <agriffis@gentoo.org> gamix-1.99_p14-r1.ebuild:
+  Mark 1.99_p14-r1 stable on alpha
+
+  24 Aug 2005; Aron Griffis <agriffis@gentoo.org> gamix-1.99_p14-r1.ebuild:
+  stable on ia64
+
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org> gamix-1.99_p14-r1.ebuild:
+  Stable on ppc64
+
+  01 Nov 2004; Markus Rothe <corsair@gentoo.org> gamix-1.99_p14-r1.ebuild:
+  Marked ~ppc64; bug #64631
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gamix-1.99_p14-r1.ebuild:
+  Stable amd64.
+
+  26 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gamix-1.99_p14-r1.ebuild:
+  Stable x86.
+
+  24 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  gamix-1.99_p14-r1.ebuild:
+  don't use deprecated ? : use syntax
+
+  14 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gamix-1.99_p14-r1.ebuild:
+  readonly bug fix for bug #44712.
+
+  29 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gamix-1.99_p13-r1.ebuild, gamix-1.99_p14-r1.ebuild, metadata.xml:
+  Removing ~mips because it can't satisfy DEPEND.
+
+  17 Feb 2004; Ciaran McCreesh <ciaranm@gentoo.org> gamix-1.99_p13-r1.ebuild,
+  gamix-1.99_p14-r1.ebuild:
+  Changing to -sparc as we don't have ALSA support
+
+*gamix-1.99_p13-r1 (04 Dec 2003)
+*gamix-1.99_p14-r1 (04 Dec 2003)
+
+  04 Dec 2003; Seemant Kulleen <seemant@gentoo.org> gamix-1.99_p13-r1.ebuild,
+  gamix-1.99_p14-r1.ebuild:
+  fixed dependency information. This sorts out virtual/alsa and the gtk/gtk2 use
+  flag situation. Spider opened bug #34564, but Jonathan Kraut
+  <krautj@earthlink.net> did the excellent work to fix them up
+
+*gamix-1.99_p14 (20 Sep 2003)
+
+  20 Sep 2003; jje <jje@gentoo.org> gamix-1.99_p14.ebuild:
+  Version bump.
+  
+  Submitted by: Jonathan Kraut <krautj@earthlink.net>
 
 *gamix-1.99_p13 (19 May 2002)
 
+  26 Jan 2003; Jon Nall <nall@gentoo.org> gamix-1.99_p13.ebuild :
+  added ~ppc
+
+  08 Aug 2002; Seemant Kulleen <seemant@gentoo.org> gamix-1.99_p13.ebuild :
+
+  nls bloat reduction.
+
   19 May 2002; Ryan Phillips <rphillips@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/media-sound/gamix/Manifest b/media-sound/gamix/Manifest
index e69de29bb2d1..39d457f3d8d2 100644
--- a/media-sound/gamix/Manifest
+++ b/media-sound/gamix/Manifest
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ba188703f0e7e19b60c4f5acf199f3ab ChangeLog 2877
+MD5 1d7e7372df02540d8ef3dc067b2185e9 files/digest-gamix-1.99_p14-r1 66
+MD5 1d7e7372df02540d8ef3dc067b2185e9 files/digest-gamix-1.99_p14-r2 66
+MD5 a3547f9aa64075464e1e7964c85214cc gamix-1.99_p14-r1.ebuild 836
+MD5 a7ec7e2b684b443d7c54d4c22812cfd5 gamix-1.99_p14-r2.ebuild 800
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDbzA5j5H05b2HAEkRAtoXAKCNSvMgIk8vCEu9DiapOiXl8mYP+gCgikXz
+Ld5IJ0OxCSGC/6kAPUwWsLA=
+=hW8G
+-----END PGP SIGNATURE-----
diff --git a/media-sound/gamix/gamix-1.99_p14-r1.ebuild b/media-sound/gamix/gamix-1.99_p14-r1.ebuild
index 9fc51a3056bc..89e077157d9c 100644
--- a/media-sound/gamix/gamix-1.99_p14-r1.ebuild
+++ b/media-sound/gamix/gamix-1.99_p14-r1.ebuild
@@ -1,21 +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/media-sound/gamix/gamix-1.99_p14-r1.ebuild,v 1.1 2003/12/04 17:33:51 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gamix/gamix-1.99_p14-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:11 chriswhite Exp $
 
-IUSE="nls gtk2"
-
-PV=${P/_p/.p}
-S=${WORKDIR}/${PV}
+MY_P=${P/_p/.p}
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="GTK ALSA audio mixer"
 HOMEPAGE="http://www1.tcnet.ne.jp/fmurata/linux/down"
-SRC_URI="http://www1.tcnet.ne.jp/fmurata/linux/down/${PV}.tar.gz"
+SRC_URI="http://www1.tcnet.ne.jp/fmurata/linux/down/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~arm ~amd64 ~ia64"
+KEYWORDS="alpha amd64 ia64 ~ppc ppc64 -sparc x86"
+IUSE="nls gtk2"
 
-DEPEND="virtual/alsa \
-	gtk2? ( >=x11-libs/gtk+-2.2.1 ) : ( =x11-libs/gtk+-1.2* )"
+DEPEND="virtual/alsa
+	gtk2? ( >=x11-libs/gtk+-2.2.1 )
+	!gtk2? ( =x11-libs/gtk+-1.2* )"
 
 src_compile() {
 	local myconf
@@ -26,5 +26,5 @@ src_compile() {
 
 src_install() {
 	einstall || die
-	dodoc README README.euc TODO NEWS INSTALL AUTHORS ABOUT-NLS COPYING
+	dodoc README README.euc TODO NEWS AUTHORS
 }
diff --git a/media-sound/gamix/gamix-1.99_p14-r2.ebuild b/media-sound/gamix/gamix-1.99_p14-r2.ebuild
index d49c0b211e80..de12b02c1646 100644
--- a/media-sound/gamix/gamix-1.99_p14-r2.ebuild
+++ b/media-sound/gamix/gamix-1.99_p14-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/media-sound/gamix/gamix-1.99_p14-r2.ebuild,v 1.1 2005/10/23 02:26:41 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gamix/gamix-1.99_p14-r2.ebuild,v 1.1.1.1 2005/11/30 09:38:11 chriswhite Exp $
 
 MY_P=${P/_p/.p}
 S=${WORKDIR}/${MY_P}
diff --git a/media-sound/gini/ChangeLog b/media-sound/gini/ChangeLog
index c96e2f2fdeef..43742e0c7a34 100644
--- a/media-sound/gini/ChangeLog
+++ b/media-sound/gini/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-sound/gini
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gini/ChangeLog,v 1.1 2003/12/18 21:34:20 mholzer Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gini/ChangeLog,v 1.1.1.1 2005/11/30 09:38:08 chriswhite Exp $
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> gini-0.5.1.ebuild:
+  Stable amd64, sparc.
+
+  12 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> gini-0.5.1.ebuild:
+  ~amd64 ~sparc
+
+  26 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> gini-0.5.1.ebuild:
+  Stable on x86.
 
 *gini-0.5.1 (18 Dec 2003)
 
diff --git a/media-sound/gini/Manifest b/media-sound/gini/Manifest
index 26a110dc66fc..2d6bef09c4be 100644
--- a/media-sound/gini/Manifest
+++ b/media-sound/gini/Manifest
@@ -1,2 +1,4 @@
-MD5 fc1f68c2b4356cab03cd70be48f99820 gini-0.5.1.ebuild 516
+MD5 c689d1975dc1b38493dba4d12a04d360 ChangeLog 667
+MD5 395307af5a1497adf9a64c1c5fee21b5 gini-0.5.1.ebuild 554
+MD5 d0d7ea03e238a808414b4426394c100f metadata.xml 221
 MD5 438508978232933c04138cbb268b4afe files/digest-gini-0.5.1 63
diff --git a/media-sound/gini/gini-0.5.1.ebuild b/media-sound/gini/gini-0.5.1.ebuild
index f1157c677e07..1a6a387bba7f 100644
--- a/media-sound/gini/gini-0.5.1.ebuild
+++ b/media-sound/gini/gini-0.5.1.ebuild
@@ -1,27 +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/media-sound/gini/gini-0.5.1.ebuild,v 1.1 2003/12/18 21:34:20 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gini/gini-0.5.1.ebuild,v 1.1.1.1 2005/11/30 09:38:08 chriswhite Exp $
 
 IUSE=""
 
 DESCRIPTION="gini is a free streaming media server for unix-like operating systems"
 HOMEPAGE="http://gini.sf.net"
 SRC_URI="mirror://sourceforge/gini/${P}.tar.bz2"
-RESTRICT="nomirror"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~x86"
+KEYWORDS="x86 sparc amd64"
 
 DEPEND="dev-libs/glib"
 
-src_compile() {
-	econf || die
-	emake || die
-}
-
 src_install() {
 	einstall || die
 
-	dodoc AUTHORS BUGS README TODO COPYING ChangeLog INSTALL NEWS
+	dodoc AUTHORS BUGS README TODO ChangeLog NEWS
 }
diff --git a/media-sound/glame/ChangeLog b/media-sound/glame/ChangeLog
index 5fa6b5882c3f..29654b8a2aaf 100644
--- a/media-sound/glame/ChangeLog
+++ b/media-sound/glame/ChangeLog
@@ -1,9 +1,104 @@
 # ChangeLog for media-sound/glame
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/glame/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/media-sound/glame/ChangeLog,v 1.1.1.1 2005/11/30 09:38:19 chriswhite Exp $
 
+  10 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> glame-1.0.2.ebuild,
+  glame-2.0.1.ebuild:
+  Don't install ABOUT-NLS file.
+
+  27 Jun 2005; David Holm <dholm@gentoo.org> glame-2.0.1.ebuild:
+  Added to ~ppc.
+
+*glame-2.0.1 (14 May 2005)
+
+  14 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/glame-2.0.1-cflags.patch, +glame-2.0.1.ebuild:
+  new upstream version, fixes #90707
+
+  10 May 2005; David Holm <dholm@gentoo.org> glame-1.0.2.ebuild:
+  Added to ~ppc.
+
+  15 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -glame-0.6.3.ebuild, -glame-0.6.4.ebuild, -glame-1.0.1.ebuild:
+  Cleaning out old versions.
+
+  15 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/glame-1.0.2-cflags.patch:
+  Make glame honor user CFLAGS.  Closes bug #67070.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> glame-1.0.2.ebuild:
+  Stable amd64, sparc.
+
+  23 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> glame-0.6.4.ebuild:
+  Moved auto* out of RDEPEND.
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> glame-1.0.2.ebuild:
+  Added to ~amd64
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org> glame-0.6.3.ebuild,
+  glame-0.6.4.ebuild, glame-1.0.1.ebuild, glame-1.0.2.ebuild:
+  Fix use invocation
+
+  03 May 2004; Jeremy Huddleston <eradicator@gentoo.org> glame-1.0.1.ebuild,
+  glame-1.0.2.ebuild:
+  Changing mad dep to madplay.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> glame-1.0.2.ebuild:
+  QA fix.
+
+  26 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> glame-0.6.3.ebuild,
+  glame-0.6.4.ebuild, glame-1.0.1.ebuild, glame-1.0.2.ebuild:
+  1.0.2 stable on x86.  Cleaned up all ebuilds.  Fixed DEPs.
+
+*glame-1.0.2 (21 Jan 2004)
+
+  21 Jan 2004; Nick Hadaway <raker@gentoo.org> glame-1.0.2.ebuild,
+  gentoo.patch:
+  Version bump.  Fixed libxml/libxml2 detection.  Fixed alsa detection
+  and added the alsa USE variable.  Added support for fftw and ladspa.
+  Please comment and reopen bug #35948 if you find any problems.
+
+  12 Nov 2003; Todd Sunderlin <todd@gentoo.org> glame-1.0.1.ebuild:
+  added ~sparc keyword
+
+  19 Jul 2003; Nick Hadaway <raker@gentoo.org>:
+  Reverted back to 1.0.1
+
+*glame-1.0.1-r1 (17 Jul 2003)
+
+  17 Jul 2003; Nick Hadaway <raker@gentoo.org> glame-1.0.1-r1.ebuild:
+  Changed media-sound/mad dep to media-libs/{libmad,libid3tag}
+
+*glame-1.0.1 (30 Jun 2003)
+
+  30 Jun 2003; torbenh <torbenh@gentoo.org> Manifest glame-1.0.1.ebuild :
+  Version bumped to 1.0.1
+  Added dependencies to media-sound/vorbis-tools and media-sound/mad
+
+*glame-0.6.4 (30 Nov 2002)
+
+  04 Dec 2002; foser <foser@gentoo.org> glame-0.6.4.ebuild :
+  Fix make issues in a cleaner way
+
+  30 Nov 2002; foser <foser@gentoo.org> glame-0.6.4.ebuild :
+  New minor version
+
+*glame-0.6.3 (05 Aug 2002)
+
+  22 Nov 2002; foser <foser@gentoo.org> glame-0.6.3.ebuild :
+  Add sed for removing NLS include (bug #7587)
+
+  18 Nov 2002; foser <foser@gentoo.org> glame-0.6.3.ebuild :
+  unset CFLAGS to fix possible problems with configure (bug #7587)
+
+  05 Aug 2002; Leonardo Boshell <leonardop@gentoo.org> glame-0.6.3.ebuild:
+  New version. Thanks to Chris Arndt for pointing it out in bug #5987.
+  
 *glame-0.6.0 (1 Feb 2002)
 
+  20 Sep 2002; Mike Frysinger <vapier@gentoo.org> :
+  Updated SRC_URI (to use mirror://) and HOMEPAGE variables
+
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/media-sound/glame/Manifest b/media-sound/glame/Manifest
index e69de29bb2d1..225dc6e7aa8f 100644
--- a/media-sound/glame/Manifest
+++ b/media-sound/glame/Manifest
@@ -0,0 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 692120dd98349f06c4ee3a739b220819 ChangeLog 3897
+MD5 f6a859ee960cd4ab1eb3bdc6588ea688 glame-2.0.1.ebuild 1850
+MD5 69af57f13aca79e319dcffb0a52e00a0 glame-1.0.2.ebuild 2278
+MD5 552d4fdf9e391a7631494186974bdb80 metadata.xml 266
+MD5 54ea3169510093db3d31eb388e8e8a0c files/glame-2.0.1-cflags.patch 612
+MD5 992f68dfecc733f0bbb14079e1a70f3a files/glame-1.0.2-cflags.patch 1063
+MD5 140e5f563ba5d7d92fa89504677497e7 files/digest-glame-2.0.1 64
+MD5 f96064bc6c40df179eea7502e0999af8 files/digest-glame-1.0.2 64
+MD5 1414bd1790705dfed4d11d93033cbda8 files/gentoo.patch 1532
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDIwG1j5H05b2HAEkRAlq2AJ98SUkJnGzMKIOvamqz+OAAm/A9xwCgktCs
+6AUQuYezVCHr8OI6iV6/DEo=
+=j1Bo
+-----END PGP SIGNATURE-----
diff --git a/media-sound/glame/glame-1.0.2.ebuild b/media-sound/glame/glame-1.0.2.ebuild
index 8d960409df0e..bce018e20d45 100644
--- a/media-sound/glame/glame-1.0.2.ebuild
+++ b/media-sound/glame/glame-1.0.2.ebuild
@@ -1,37 +1,41 @@
-# 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/media-sound/glame/glame-1.0.2.ebuild,v 1.1 2004/01/21 18:42:53 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/glame/glame-1.0.2.ebuild,v 1.1.1.1 2005/11/30 09:38:19 chriswhite Exp $
 
 IUSE="nls gnome oggvorbis debug alsa"
 
-S=${WORKDIR}/${P}
-DESCRIPTION="Glame is an audio file editing utility"
-SRC_URI="mirror://sourceforge/glame/${P}.tar.gz"
+inherit eutils
+
+DESCRIPTION="an audio file editing utility"
 HOMEPAGE="http://glame.sourceforge.net/"
+SRC_URI="mirror://sourceforge/glame/${P}.tar.gz"
+RESTRICT="nomirror"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
+SLOT="0"
+KEYWORDS="x86 sparc amd64 ~ppc"
 
-DEPEND=">=dev-util/guile-1.4-r3
+RDEPEND=">=dev-util/guile-1.4-r3
 	>=dev-libs/libxml-1.8.0
 	>=dev-libs/libxml2-2.0.0
 	>=media-sound/esound-0.2
 	>=media-libs/audiofile-0.2.2
-	=dev-libs/fftw-2*
-	media-sound/mad
+	=sci-libs/fftw-2*
+	media-sound/madplay
 	media-libs/ladspa-sdk
 	oggvorbis? ( >=media-libs/libvorbis-1.0 )
 	gnome? ( <gnome-base/libglade-2 gnome-base/gnome-libs )
 	alsa? ( media-libs/alsa-lib )"
 
-RDEPEND="nls? ( >=sys-devel/gettext-0.11.3 )"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.58
+	nls? ( >=sys-devel/gettext-0.11.3 )"
 
 src_unpack() {
 	unpack ${A}
 
 	# fix NLS problem (bug #7587)
-	if [ ! "`use nls`" ]
+	if ! use nls
 	then
 		cd ${S}/src/gui
 		mv swapfilegui.c swapfilegui.c.bad
@@ -39,18 +43,19 @@ src_unpack() {
 	fi
 
 	# fix makefile problem
-	export WANT_AUTOCONF_2_5=1
+	export WANT_AUTOCONF=2.5
 	cd ${S}/libltdl
 	autoconf -f
 
 	cd ${S}
 	epatch ${FILESDIR}/gentoo.patch
+	epatch ${FILESDIR}/${P}-cflags.patch
 }
 
 src_compile() {
 	local myconf="--enable-ladspa"
 
-	if [ "`use gnome`" ]
+	if use gnome
 	then
 		# Use a valid icon for the GNOME menu entry
 		cp src/gui/glame.desktop src/gui/glame.desktop.old
@@ -78,14 +83,13 @@ src_compile() {
 src_install () {
 	einstall || die "Installation failed"
 
-	if [ "`use gnome`" ]
+	if use gnome
 	then
 		dodir /usr/share/pixmaps
 		dosym ../glame/pixmaps/glame-logo.jpg \
 		      /usr/share/pixmaps/glame-logo.jpg
 	fi
 
-	dodoc ABOUT-NLS AUTHORS BUGS COPYING CREDITS ChangeLog MAINTAINERS \
+	dodoc AUTHORS BUGS CREDITS ChangeLog MAINTAINERS \
 		NEWS README TODO
 }
-
diff --git a/media-sound/glame/glame-2.0.1.ebuild b/media-sound/glame/glame-2.0.1.ebuild
index 71fb02222c47..8b0f9e6b1baa 100644
--- a/media-sound/glame/glame-2.0.1.ebuild
+++ b/media-sound/glame/glame-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/media-sound/glame/glame-2.0.1.ebuild,v 1.1 2005/05/14 10:40:25 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/glame/glame-2.0.1.ebuild,v 1.1.1.1 2005/11/30 09:38:19 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/glame/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~amd64"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="nls gnome vorbis debug alsa"
 
 RDEPEND=">=dev-util/guile-1.4-r3
@@ -73,6 +73,6 @@ src_install () {
 		      /usr/share/pixmaps/glame-logo.jpg
 	fi
 
-	dodoc ABOUT-NLS AUTHORS BUGS CREDITS ChangeLog MAINTAINERS \
+	dodoc AUTHORS BUGS CREDITS ChangeLog MAINTAINERS \
 		NEWS README TODO
 }
diff --git a/media-sound/glmix/ChangeLog b/media-sound/glmix/ChangeLog
index 4d3bcf556a69..9bb8268b77cd 100644
--- a/media-sound/glmix/ChangeLog
+++ b/media-sound/glmix/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for media-sound/glmix
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/glmix/ChangeLog,v 1.1 2004/08/22 21:47:21 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/glmix/ChangeLog,v 1.1.1.1 2005/11/30 09:38:01 chriswhite Exp $
+
+  12 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> glmix-0.1.ebuild:
+  Stable sparc.
+
+  28 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> glmix-0.1.ebuild:
+  Ebuild cleanup.  Added to ~sparc.  Stable on amd64 and x86.
+
+  03 Sep 2004; David Holm <dholm@gentoo.org> glmix-0.1.ebuild:
+  Added to ~ppc.
+
+  23 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org> glmix-0.1.ebuild:
+  fix deps; tidy
 
 *glmix-0.1 (22 Aug 2004)
 
diff --git a/media-sound/glmix/Manifest b/media-sound/glmix/Manifest
index 8cd182d62ca4..c6af2fdaa61b 100644
--- a/media-sound/glmix/Manifest
+++ b/media-sound/glmix/Manifest
@@ -1,3 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0a684e9948812f1d0f68aad03682294f ChangeLog 779
+MD5 e365fad8794d5045525aaab6801e1b7a glmix-0.1.ebuild 772
 MD5 2f758c82434233f84f01f80f850a1112 metadata.xml 217
-MD5 dc59bd8030152a276dbeeb71356bb6e2 glmix-0.1.ebuild 752
 MD5 976305ee1d5b57f1fe6319ccec43b0c7 files/digest-glmix-0.1 60
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBlHR1ArHZZzCEUG0RAhcgAJ9qjlurUHRidZOXI6vnknWGYk9tgACfewTq
+6jDwBCVB0xMjP+5ygE4fSJA=
+=OnzF
+-----END PGP SIGNATURE-----
diff --git a/media-sound/glmix/glmix-0.1.ebuild b/media-sound/glmix/glmix-0.1.ebuild
index 21b27abdc6d8..f2cade8e5a72 100644
--- a/media-sound/glmix/glmix-0.1.ebuild
+++ b/media-sound/glmix/glmix-0.1.ebuild
@@ -1,34 +1,29 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/glmix/glmix-0.1.ebuild,v 1.1 2004/08/22 21:47:21 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/glmix/glmix-0.1.ebuild,v 1.1.1.1 2005/11/30 09:38:01 chriswhite Exp $
 
 IUSE=""
 
 DESCRIPTION="A 3D widget for mixing up to eight JACK audio streams down to stereo"
 HOMEPAGE="http://www.ecs.soton.ac.uk/~njl98r/code/ladspa/"
 SRC_URI="http://www.ecs.soton.ac.uk/~njl98r/code/ladspa/${P}.tar.gz"
-RESTRICT=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86 ~ppc sparc"
 
-#first two for WANT_AUTOMAKE/CONF
-DEPEND=">=sys-devel/autoconf-2.58
-	>=sys-devel/automake-1.7.2
-	>=dev-util/pkgconfig-0.12.0
-	virtual/glibc
-	virtual/jack
-	>=x11-libs/gtkglext-1.0.0
-	>=x11-libs/gtk+-2.0.0"
+S="${WORKDIR}/glmix"
+
+DEPEND="media-sound/jack-audio-connection-kit
+	 >=x11-libs/gtkglext-1.0.0
+	 >=x11-libs/gtk+-2.0.0
+	 >=dev-util/pkgconfig-0.12.0"
 
 src_compile() {
-	cd ${WORKDIR}/glmix && \
-	emake || die
+	emake || die "emake failed"
 }
 
 src_install() {
-	cd ${WORKDIR}/glmix && \
-	dobin glmix
-	dodoc COPYING README TODO
+	dobin glmix || die "dobin failed"
+	dodoc README TODO
 }
diff --git a/media-sound/glurp/ChangeLog b/media-sound/glurp/ChangeLog
index 6100fbfaf2de..49a5af30e987 100644
--- a/media-sound/glurp/ChangeLog
+++ b/media-sound/glurp/ChangeLog
@@ -1,6 +1,67 @@
 # ChangeLog for media-sound/glurp
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/glurp/ChangeLog,v 1.1 2004/08/11 19:30:59 pkdawson Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/glurp/ChangeLog,v 1.1.1.1 2005/11/30 09:38:41 chriswhite Exp $
+
+  20 Oct 2005; Andrej Kacian <ticho@gentoo.org> -glurp-0.11.2.ebuild,
+  -glurp-0.11.3.ebuild, -glurp-0.11.4.ebuild:
+  Getting rid of old ebuilds.
+
+  17 Sep 2005; Andrej Kacian <ticho@gentoo.org> glurp-0.11.6.ebuild:
+  Stable on x86.
+
+  24 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> glurp-0.11.6.ebuild:
+  Stable on sparc
+
+*glurp-0.11.6 (05 Jun 2005)
+
+  05 Jun 2005; Andrej Kacian <ticho@gentoo.org> +glurp-0.11.6.ebuild:
+  Version bump.
+
+  01 May 2005; Tom Martin <slarti@gentoo.org> glurp-0.11.5.ebuild:
+  Stable on amd64.
+
+  27 Apr 2005; Andrej Kacian <ticho@gentoo.org> glurp-0.11.4.ebuild,
+  glurp-0.11.5.ebuild:
+  Stable on x86.
+
+*glurp-0.11.4 (29 Dec 2004)
+
+  29 Dec 2004; Andrej Kacian <ticho@gentoo.org> +glurp-0.11.4.ebuild:
+  Version bump.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  glurp-0.11.3.ebuild:
+  Stable sparc.
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  glurp-0.11.3.ebuild:
+  Added to ~sparc.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> glurp-0.11.3.ebuild:
+  Stable on amd64.
+
+  23 Sep 2004; Andrej Kacian <ticho@gentoo.org> glurp-0.11.3.ebuild:
+  Stable on x86.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> glurp-0.11.2.ebuild:
+  Stable amd64.
+
+  07 Sep 2004; Andrej Kacian <ticho@gentoo.org> glurp-0.11.2.ebuild:
+  Stable on x86.
+
+*glurp-0.11.3 (06 Sep 2004)
+
+  06 Sep 2004; Andrej Kacian <ticho@gentoo.org> +glurp-0.11.3.ebuild:
+  Version bump.
+
+  03 Sep 2004; Tom Martin <slarti@gentoo.org> glurp-0.11.2.ebuild:
+  Marked ~amd64.
+
+  03 Sep 2004; Andrej Kacian <ticho@gentoo.org> metadata.xml:
+  Changed maintainership in metadata.xml to me.
+
+  30 Aug 2004; David Holm <dholm@gentoo.org> glurp-0.11.2.ebuild:
+  Added to ~ppc.
 
 *glurp-0.11.2 (11 Aug 2004)
 
diff --git a/media-sound/glurp/Manifest b/media-sound/glurp/Manifest
index e9bc73eab291..9f19a6b3f87b 100644
--- a/media-sound/glurp/Manifest
+++ b/media-sound/glurp/Manifest
@@ -1,4 +1,16 @@
-MD5 06bf47968530db91e85a4da17171d863 glurp-0.11.2.ebuild 577
-MD5 6e56eaa68f42b0eccc4e265127834ad3 ChangeLog 316
-MD5 83c2574543d0501303b57050254e3880 metadata.xml 222
-MD5 ac9e071393589dec888716d4cdb12d81 files/digest-glurp-0.11.2 63
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 59165be97788d78bedc86137c0605266 ChangeLog 2116
+MD5 ea7e81fd74d0a020a28c17bb293bb394 files/digest-glurp-0.11.5 64
+MD5 98ec2e88a5663f422daf8920ae34cebb files/digest-glurp-0.11.6 64
+MD5 e1180c288ea49e235f3a3601e91233cb glurp-0.11.5.ebuild 681
+MD5 4794cc09c012a223aa0fece559ba6282 glurp-0.11.6.ebuild 680
+MD5 39ca3cc9726f35001924ecf3baea20d1 metadata.xml 219
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDV1q+QlM6RnzZP+IRAr4lAJ9jwQCW0ceWNsaH7fQIP6tT9I1+kACfX+CX
+mJJnr1CpoRg/2al32m4HD9w=
+=qcWU
+-----END PGP SIGNATURE-----
diff --git a/media-sound/glurp/glurp-0.11.5.ebuild b/media-sound/glurp/glurp-0.11.5.ebuild
index 36df93b8b3e0..b96c50f1417c 100644
--- a/media-sound/glurp/glurp-0.11.5.ebuild
+++ b/media-sound/glurp/glurp-0.11.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/media-sound/glurp/glurp-0.11.5.ebuild,v 1.1 2005/04/11 03:09:58 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/glurp/glurp-0.11.5.ebuild,v 1.1.1.1 2005/11/30 09:38:41 chriswhite Exp $
 
 IUSE="debug"
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/glurp/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 
 DEPEND=">=x11-libs/gtk+-2.4.0
 	>=gnome-base/libglade-2.3.6"
diff --git a/media-sound/glurp/glurp-0.11.6.ebuild b/media-sound/glurp/glurp-0.11.6.ebuild
index 9e62bfd3dd6a..6b11b62a9202 100644
--- a/media-sound/glurp/glurp-0.11.6.ebuild
+++ b/media-sound/glurp/glurp-0.11.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/media-sound/glurp/glurp-0.11.6.ebuild,v 1.1 2005/06/05 20:26:15 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/glurp/glurp-0.11.6.ebuild,v 1.1.1.1 2005/11/30 09:38:41 chriswhite Exp $
 
 IUSE="debug"
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/glurp/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc sparc x86"
 
 DEPEND=">=x11-libs/gtk+-2.4.0
 	>=gnome-base/libglade-2.3.6"
diff --git a/media-sound/glurp/metadata.xml b/media-sound/glurp/metadata.xml
index f82b535a5130..adfa29451406 100644
--- a/media-sound/glurp/metadata.xml
+++ b/media-sound/glurp/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>sound</herd>
 <maintainer>
-  <email>pkdawson@gentoo.org</email>
+  <email>ticho@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/media-sound/gmorgan/ChangeLog b/media-sound/gmorgan/ChangeLog
index 587170a82230..38ff1248e3bb 100644
--- a/media-sound/gmorgan/ChangeLog
+++ b/media-sound/gmorgan/ChangeLog
@@ -1,6 +1,59 @@
 # ChangeLog for media-sound/gmorgan
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gmorgan/ChangeLog,v 1.1 2003/08/15 02:50:33 g2boojum Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gmorgan/ChangeLog,v 1.1.1.1 2005/11/30 09:38:10 chriswhite Exp $
+
+  07 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> gmorgan-0.16.ebuild,
+  gmorgan-0.22-r1.ebuild:
+  Don't install COPYING and INSTALL files.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gmorgan-0.23.ebuild:
+  Stable amd64, sparc, x86.
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gmorgan-0.23.ebuild:
+  Added to ~sparc.
+
+  03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> gmorgan-0.23.ebuild:
+  Stable amd64, x86.
+
+*gmorgan-0.23 (03 Jul 2004)
+
+  03 Jul 2004; Frank van de Pol <fvdpol@gentoo.org> metadata.xml,
+  +gmorgan-0.23.ebuild:
+  Version bump to new upstream release. Closes bug #54699.
+
+  28 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gmorgan-0.22-r1.ebuild:
+  Stable x86.
+
+  25 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> gmorgan-0.12.ebuild,
+  gmorgan-0.22.ebuild:
+  Version bump.  Removed old ebuilds.
+
+  10 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> gmorgan-0.22.ebuild:
+  Stable x86.
+
+  27 Mar 2004; David Holm <dholm@gentoo.org> gmorgan-0.22-r1.ebuild:
+  Added to ~ppc.
+
+*gmorgan-0.22-r1 (26 Mar 2004)
+
+  26 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> gmorgan-0.12.ebuild,
+  gmorgan-0.16.ebuild, gmorgan-0.22-r1.ebuild, gmorgan-0.22.ebuild:
+  Cleaned up all ebuilds.  Added nls support in 22-r1.  Marked 16 stable on x86.
+
+*gmorgan-0.22 (28 Feb 2004)
+
+  28 Feb 2004; <torbenh@gentoo.org> gmorgan-0.22.ebuild, metadata.xml:
+  Version bump.
+
+*gmorgan-0.16 (20 Sep 2003)
+
+  20 Sep 2003; jje <jje@gentoo.org> gmorgan-0.16.ebuild:
+  Version bump (log over due...) Closes #26886.
+  
+  Submitted by: Josep Andreu <holborn@telefonica.net>
 
 *gmorgan-0.12 (14 Aug 2003)
 
diff --git a/media-sound/gmorgan/Manifest b/media-sound/gmorgan/Manifest
index 29ea445f260d..ae0445bb940d 100644
--- a/media-sound/gmorgan/Manifest
+++ b/media-sound/gmorgan/Manifest
@@ -1,2 +1,18 @@
-MD5 f46b1b8b8bdd9fd0923f8f2e551a507f gmorgan-0.12.ebuild 619
-MD5 1a67870af6d88cfc3b565dfd65415d13 files/digest-gmorgan-0.12 64
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0bdaf2cfc686c6167fd0873d8cb5a26b ChangeLog 1991
+MD5 62394940168b5d609833cdbc5a89d3cd files/digest-gmorgan-0.16 64
+MD5 19dd8c42204a066ea57a537453d294be files/digest-gmorgan-0.22-r1 64
+MD5 1228b302acf942da77c35e02c1a4c170 files/digest-gmorgan-0.23 64
+MD5 9f9c7e33e88dfa646f1dc907afbee901 gmorgan-0.16.ebuild 617
+MD5 7c6c082c2f00e5b80d2fa2591b9fc6cb gmorgan-0.22-r1.ebuild 861
+MD5 6354f8e7b9bdc8d0cea81e4fae2c87c2 gmorgan-0.23.ebuild 859
+MD5 4e5a50f7aee667b932576ab7fdcfc85f metadata.xml 219
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDbzC6j5H05b2HAEkRAu2pAJ9Sv/BMCnbqz48Ekj6PIYAk/lh1bACdFifn
+7X8pIjCbsaRNrOA3g5h3SOk=
+=CKkZ
+-----END PGP SIGNATURE-----
diff --git a/media-sound/gmorgan/gmorgan-0.16.ebuild b/media-sound/gmorgan/gmorgan-0.16.ebuild
index 4c43f6c2c06d..52c238970665 100644
--- a/media-sound/gmorgan/gmorgan-0.16.ebuild
+++ b/media-sound/gmorgan/gmorgan-0.16.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/media-sound/gmorgan/gmorgan-0.16.ebuild,v 1.1 2003/09/20 12:13:52 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gmorgan/gmorgan-0.16.ebuild,v 1.1.1.1 2005/11/30 09:38:10 chriswhite Exp $
 
 DESCRIPTION="gmorgan is an opensource software rhythm station."
 HOMEPAGE="http://personal.telefonica.terra.es/web/soudfontcombi/"
@@ -8,24 +8,17 @@ SRC_URI="http://personal.telefonica.terra.es/web/soudfontcombi/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 IUSE=""
 
 DEPEND=">=x11-libs/fltk-1.1.2
 	virtual/alsa"
 
-S="${WORKDIR}/${P}"
-
-src_compile() {
-	./configure --prefix=/usr || die "./configure failed"
-	emake || die "compile failed"
-}
-
 src_install() {
 	make \ prefix=${D}/usr \
 	install || die
-	dodoc AUTHORS COPYING INSTALL NEWS README
+	dodoc AUTHORS NEWS README
 }
 
 
diff --git a/media-sound/gmorgan/gmorgan-0.22-r1.ebuild b/media-sound/gmorgan/gmorgan-0.22-r1.ebuild
index f9e542490605..d6c12ea28de1 100644
--- a/media-sound/gmorgan/gmorgan-0.22-r1.ebuild
+++ b/media-sound/gmorgan/gmorgan-0.22-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/media-sound/gmorgan/gmorgan-0.22-r1.ebuild,v 1.1 2004/03/27 03:28:22 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gmorgan/gmorgan-0.22-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:10 chriswhite Exp $
 
 DESCRIPTION="gmorgan is an opensource software rhythm station."
 HOMEPAGE="http://personal.telefonica.terra.es/web/soudfontcombi/"
@@ -8,7 +8,7 @@ SRC_URI="http://personal.telefonica.terra.es/web/soudfontcombi/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc ~amd64"
 
 IUSE="nls"
 
@@ -26,5 +26,5 @@ src_unpack() {
 
 src_install() {
 	make prefix=${D}/usr localedir=${D}/usr/share/locale install || die
-	dodoc AUTHORS COPYING INSTALL NEWS README
+	dodoc AUTHORS NEWS README
 }
diff --git a/media-sound/gmorgan/gmorgan-0.23.ebuild b/media-sound/gmorgan/gmorgan-0.23.ebuild
index f105afb4dc7f..009bce82fd91 100644
--- a/media-sound/gmorgan/gmorgan-0.23.ebuild
+++ b/media-sound/gmorgan/gmorgan-0.23.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gmorgan/gmorgan-0.23.ebuild,v 1.1 2004/07/02 23:08:25 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gmorgan/gmorgan-0.23.ebuild,v 1.1.1.1 2005/11/30 09:38:10 chriswhite Exp $
+
+IUSE="nls"
 
 DESCRIPTION="gmorgan is an opensource software rhythm station."
 HOMEPAGE="http://personal.telefonica.terra.es/web/soudfontcombi/"
@@ -8,9 +10,7 @@ SRC_URI="http://personal.telefonica.terra.es/web/soudfontcombi/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-IUSE="nls"
+KEYWORDS="amd64 sparc x86"
 
 RDEPEND=">=x11-libs/fltk-1.1.2
 	>=media-libs/alsa-lib-0.9.0"
@@ -26,5 +26,5 @@ src_unpack() {
 
 src_install() {
 	make prefix=${D}/usr localedir=${D}/usr/share/locale install || die
-	dodoc AUTHORS COPYING INSTALL NEWS README
+	dodoc AUTHORS NEWS README
 }
diff --git a/media-sound/gmorgan/metadata.xml b/media-sound/gmorgan/metadata.xml
index d4ce46c038ab..1e8035259e42 100644
--- a/media-sound/gmorgan/metadata.xml
+++ b/media-sound/gmorgan/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>sound</herd>
 <maintainer>
-  <email>torbenh@gentoo.org</email>
+  <email>sound@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/media-sound/gmpc/ChangeLog b/media-sound/gmpc/ChangeLog
index 43de9e72e37a..f684d44577c1 100644
--- a/media-sound/gmpc/ChangeLog
+++ b/media-sound/gmpc/ChangeLog
@@ -1,6 +1,59 @@
 # ChangeLog for media-sound/gmpc
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gmpc/ChangeLog,v 1.1 2004/07/23 20:17:44 axxo Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gmpc/ChangeLog,v 1.1.1.1 2005/11/30 09:38:38 chriswhite Exp $
+
+  11 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> gmpc-0.12.0-r1.ebuild:
+  Stable on ppc.
+
+  25 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> gmpc-0.12.0-r1.ebuild:
+  Stable on sparc
+
+  25 Oct 2005; Andrej Kacian <ticho@gentoo.org> -gmpc-0.12.0.ebuild,
+  gmpc-0.12.0-r1.ebuild:
+  0.12.0-r1 stable on x86. Removed 0.12.0.
+
+  24 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> gmpc-0.12.0-r1.ebuild:
+  ~sparc wrt #103486
+
+  23 Aug 2005; Herbie Hopkins <herbs@gentoo.org> gmpc-0.12.0-r1.ebuild:
+  Marked ~amd64 wrt bug #103486.
+
+  23 Aug 2005; Lars Weiler <pylon@gentoo.org> gmpc-0.12.0.ebuild,
+  gmpc-0.12.0-r1.ebuild:
+  Added ~ppc-keyword as requested in Bug #103486.
+
+*gmpc-0.12.0-r1 (23 Aug 2005)
+
+  23 Aug 2005; Andrej Kacian <ticho@gentoo.org> +gmpc-0.12.0-r1.ebuild:
+  Make gnome-vfs dependency optional.
+
+*gmpc-0.12.0 (23 Aug 2005)
+
+  23 Aug 2005; Andrej Kacian <ticho@gentoo.org> metadata.xml,
+  +gmpc-0.12.0.ebuild:
+  Version bump. Taking over the maintainership.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> gmpc-0.11.2.ebuild:
+  Stable amd64, sparc, x86.
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> gmpc-0.11.2.ebuild:
+  Stable amd64, x86.  Added to ~sparc.
+
+  06 Nov 2004; Lars Weiler <pylon@gentoo.org> gmpc-0.11.2.ebuild:
+  Stable on ppc.
+
+*gmpc-0.11.2 (01 Nov 2004)
+
+  01 Nov 2004; Lars Weiler <pylon@gentoo.org> +gmpc-0.11.2.ebuild:
+  Version bump.
+
+  03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> gmpc-0.11.1.ebuild:
+  Stable amd64, x86.
+
+*gmpc-0.11.1 (24 Jul 2004)
+
+  24 Jul 2004; Lars Weiler <pylon@gentoo.org> gmpc-0.11.1.ebuild:
+  Stable on ppc.
 
   23 Jul 2004; Thomas Matthijs <axxo@gentoo.org> :
   ebuild submitted by Bert Geens <theblackdragon@linux.be>
diff --git a/media-sound/gmpc/Manifest b/media-sound/gmpc/Manifest
index 54590468b7ea..ef672b034963 100644
--- a/media-sound/gmpc/Manifest
+++ b/media-sound/gmpc/Manifest
@@ -1,4 +1,8 @@
-MD5 284e194e8761fa3d46dbfa11dd8d2850 gmpc-0.11.1.ebuild 500
-MD5 03859512b2c8c891525d103e6e11f235 ChangeLog 228
-MD5 15c11d01a98fb40c59cc86da0969ba7c metadata.xml 204
+MD5 ea04f1d574537e01a3a5edb3244a0ff2 ChangeLog 1927
 MD5 5567d1af31dd0e2b12ef5a6e1b890b07 files/digest-gmpc-0.11.1 63
+MD5 6e064fd7bebd731f2ac30ae1e51ecd97 files/digest-gmpc-0.11.2 63
+MD5 5214ef3146f35bdf9c44402a2c3a05fe files/digest-gmpc-0.12.0-r1 63
+MD5 8a1baa3abf6a035b9c379964deaaa01d gmpc-0.11.1.ebuild 598
+MD5 fbad4b1626dce9cca4aad2c05cf64e11 gmpc-0.11.2.ebuild 608
+MD5 e0ce08f07f6816bb2adc9c07fec724ae gmpc-0.12.0-r1.ebuild 836
+MD5 3a05fb17d7dc8a018b36f13aea905095 metadata.xml 246
diff --git a/media-sound/gmpc/gmpc-0.11.1.ebuild b/media-sound/gmpc/gmpc-0.11.1.ebuild
index e3887d0e1d31..26a8b570e4ea 100644
--- a/media-sound/gmpc/gmpc-0.11.1.ebuild
+++ b/media-sound/gmpc/gmpc-0.11.1.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/media-sound/gmpc/gmpc-0.11.1.ebuild,v 1.1 2004/07/23 20:17:44 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gmpc/gmpc-0.11.1.ebuild,v 1.1.1.1 2005/11/30 09:38:38 chriswhite Exp $
 #
 inherit gnome2
 
 DESCRIPTION="A Gnome client for the Music Player Daemon."
 HOMEPAGE="http://gmpc.qballcow.nl/"
 SRC_URI="http://download.qballcow.nl/programs/${PN}/${P}.tar.gz"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="x86 amd64 ppc"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
diff --git a/media-sound/gmpc/gmpc-0.11.2.ebuild b/media-sound/gmpc/gmpc-0.11.2.ebuild
index e39352b6f5c4..0944a7d5bded 100644
--- a/media-sound/gmpc/gmpc-0.11.2.ebuild
+++ b/media-sound/gmpc/gmpc-0.11.2.ebuild
@@ -1,21 +1,23 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gmpc/gmpc-0.11.2.ebuild,v 1.1 2004/11/01 17:39:32 pylon Exp $
-#
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gmpc/gmpc-0.11.2.ebuild,v 1.1.1.1 2005/11/30 09:38:38 chriswhite Exp $
+
+IUSE=""
+
 inherit gnome2
 
 DESCRIPTION="A Gnome client for the Music Player Daemon."
 HOMEPAGE="http://gmpc.qballcow.nl/"
 SRC_URI="http://download.qballcow.nl/programs/${PN}/${P}.tar.gz"
-KEYWORDS="~x86 ~amd64 ~ppc"
+
+KEYWORDS="amd64 ppc sparc x86"
 SLOT="0"
 LICENSE="GPL-2"
-IUSE=""
 
 DEPEND=">=x11-libs/gtk+-2.4
-		>=gnome-base/libglade-2.3
-		>=gnome-base/gnome-vfs-2.6
-		dev-perl/XML-Parser"
+	>=gnome-base/libglade-2.3
+	>=gnome-base/gnome-vfs-2.6
+	dev-perl/XML-Parser"
 
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
+DOCS="AUTHORS ChangeLog NEWS README"
 
diff --git a/media-sound/gmpc/gmpc-0.12.0-r1.ebuild b/media-sound/gmpc/gmpc-0.12.0-r1.ebuild
index 6f780c1563dd..f8ce3d4a9413 100644
--- a/media-sound/gmpc/gmpc-0.12.0-r1.ebuild
+++ b/media-sound/gmpc/gmpc-0.12.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/media-sound/gmpc/gmpc-0.12.0-r1.ebuild,v 1.1 2005/08/23 19:14:42 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gmpc/gmpc-0.12.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:38 chriswhite Exp $
 
 IUSE="gnome"
 
@@ -8,7 +8,7 @@ DESCRIPTION="A Gnome client for the Music Player Daemon."
 HOMEPAGE="http://etomite.qballcow.nl/qgmpc-0.12.html"
 SRC_URI="http://download.qballcow.nl/programs/${PN}/${P}.tar.gz"
 
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ppc sparc x86"
 SLOT="0"
 LICENSE="GPL-2"
 
@@ -23,5 +23,9 @@ src_compile() {
 	emake || die "make failed"
 }
 
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+}
+
 DOCS="AUTHORS ChangeLog NEWS README"
 
diff --git a/media-sound/gmpc/metadata.xml b/media-sound/gmpc/metadata.xml
index caad3576e7f5..a33352d68f6d 100644
--- a/media-sound/gmpc/metadata.xml
+++ b/media-sound/gmpc/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 <herd>sound</herd>
 <maintainer>
-  <email>axxo@gentoo.org</email>
+	<email>ticho@gentoo.org</email>
+	<name>Andrej Kacian</name>
 </maintainer>
 </pkgmetadata>
diff --git a/media-sound/gnomad/ChangeLog b/media-sound/gnomad/ChangeLog
index 40da037cce71..9a89772212d7 100644
--- a/media-sound/gnomad/ChangeLog
+++ b/media-sound/gnomad/ChangeLog
@@ -1,6 +1,84 @@
 # ChangeLog for media-sound/gnomad
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomad/ChangeLog,v 1.1 2004/03/04 01:33:36 eradicator Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomad/ChangeLog,v 1.1.1.1 2005/11/30 09:37:50 chriswhite Exp $
+
+*gnomad-2.8.2 (25 Oct 2005)
+
+  25 Oct 2005; Thomas Matthijs <axxo@gentoo.org> +gnomad-2.8.2.ebuild:
+  Version bump
+
+  13 Aug 2005; Thomas Matthijs <axxo@gentoo.org> gnomad-2.8.0.ebuild:
+  keyword x86
+
+*gnomad-2.8.0 (16 Jul 2005)
+
+  16 Jul 2005; Thomas Matthijs <axxo@gentoo.org> -gnomad-2.4.4.ebuild,
+  -gnomad-2.6.3.ebuild, -gnomad-2.7.1.ebuild, +gnomad-2.8.0.ebuild:
+  version bump
+
+*gnomad-2.7.1 (13 Jun 2005)
+
+  13 Jun 2005; Thomas Matthijs <axxo@gentoo.org> +gnomad-2.7.1.ebuild:
+  version bump
+
+*gnomad-2.6.3 (11 Feb 2005)
+
+  11 Feb 2005; Thomas Matthijs <axxo@gentoo.org> +gnomad-2.6.3.ebuild:
+  version bump
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gnomad-2.5.0.ebuild:
+  Stable amd64, x86.
+
+  31 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -gnomad-2.3.0.ebuild:
+  Only install .desktop to applications.
+
+  06 Oct 2004; Thomas Matthijs <axxo@gentoo.org> gnomad-2.5.0.ebuild:
+  2.5 uses media-libs/libid3tag and not media-libs/id3lib
+
+*gnomad-2.5.0 (05 Oct 2004)
+
+  05 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +gnomad-2.5.0.ebuild:
+  Version bump.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> gnomad-2.4.4.ebuild:
+  Stable amd64.
+
+  13 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> gnomad-2.4.4.ebuild:
+  -sparc
+
+  24 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org> gnomad-2.4.4.ebuild:
+  Stable x86. Added ~amd64.
+
+  09 May 2004; Michael Sterrett <mr_bones_@gentoo.org> gnomad-2.4.4.ebuild:
+  fix bug #50516; tidy
+
+  03 May 2004; David Holm <dholm@gentoo.org> gnomad-2.4.4.ebuild:
+  Added to ~ppc.
+
+*gnomad-2.4.4 (02 May 2004)
+
+  02 May 2004; Jeremy Huddleston <eradicator@gentoo.org> gnomad-2.4.2.ebuild,
+  gnomad-2.4.4.ebuild:
+  Version bump.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> gnomad-2.3.0.ebuild,
+  gnomad-2.4.2.ebuild:
+  Added IUSE.
+
+  08 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> gnomad-2.3.0.ebuild:
+  Stable x86.
+
+  29 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> gnomad-2.3.0.ebuild,
+  gnomad-2.4.2.ebuild:
+  add flag-o-matic for strip-flags
+
+*gnomad-2.4.2 (04 Mar 2004)
+
+  04 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> gnomad-2.4.2.ebuild:
+  Version bump.
 
 *gnomad-2.3.0 (03 Mar 2004)
 
diff --git a/media-sound/gnomad/Manifest b/media-sound/gnomad/Manifest
index 15766591fddf..3f0b0da9c534 100644
--- a/media-sound/gnomad/Manifest
+++ b/media-sound/gnomad/Manifest
@@ -1,3 +1,20 @@
-MD5 4290a6e3fa5ca4e380ac4c38cf224de6 gnomad-2.3.0.ebuild 637
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f526079b084f41d35f0e261ab9108eba ChangeLog 2643
+MD5 cc066dd71ec9b6e6d8ff876563b3e439 files/digest-gnomad-2.5.0 65
+MD5 a8c5c20a3bc558a4b463423ffb3468ed files/digest-gnomad-2.8.0 65
+MD5 cf580ca69bd597754a1517db48b214af files/digest-gnomad-2.8.1 65
+MD5 ac76d37b624ce889aac4eda6fb651b3d files/digest-gnomad-2.8.2 65
+MD5 8eafe6959e135e08fcceaa2db4fa34e5 gnomad-2.5.0.ebuild 932
+MD5 66de909fc3d85474c3201a422a89ce2e gnomad-2.8.0.ebuild 1019
+MD5 fe388a490837009a1a3bd51c783833b9 gnomad-2.8.1.ebuild 1019
+MD5 185cb85f4c29172c54782e10a8f9f16e gnomad-2.8.2.ebuild 1022
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 4c8ad0d963cc45e9daa4f57571d21e65 files/digest-gnomad-2.3.0 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDXffp/rLF9B432nYRAg8YAKC8de6l7CVvKfYfCwWeZ42G7bB8uACgi2T0
+rsDTGBtaKCZjdfTCojhcriE=
+=ZrE8
+-----END PGP SIGNATURE-----
diff --git a/media-sound/gnomad/gnomad-2.5.0.ebuild b/media-sound/gnomad/gnomad-2.5.0.ebuild
index 103d2c1b9106..8a7a57763208 100644
--- a/media-sound/gnomad/gnomad-2.5.0.ebuild
+++ b/media-sound/gnomad/gnomad-2.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/media-sound/gnomad/gnomad-2.5.0.ebuild,v 1.1 2004/10/05 20:17:56 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomad/gnomad-2.5.0.ebuild,v 1.1.1.1 2005/11/30 09:37:50 chriswhite Exp $
 
 IUSE=""
 
@@ -20,11 +20,11 @@ SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 #-sparc: 2.4.4: Application crashes on startup (Gnome crash detection)
-KEYWORDS="~x86 ~ppc ~amd64 -sparc"
+KEYWORDS="amd64 ~ppc -sparc x86"
 
 DEPEND=">=gnome-base/libgnomeui-2
 	>=media-libs/libnjb-1.2
-	media-libs/id3lib
+	media-libs/libid3tag
 	>=gnome-base/gconf-1.2"
 
 RDEPEND="${DEPEND}
@@ -33,9 +33,6 @@ RDEPEND="${DEPEND}
 
 src_install() {
 	make DESTDIR="${D}" install || die
-	dodir /usr/share/gnome/apps/Multimedia
-	cp ${D}/usr/share/applications/${MY_PN}.desktop ${D}/usr/share/gnome/apps/Multimedia
-	dodir /usr/share/applnk/Multimedia
-	cp ${D}/usr/share/applications/${MY_PN}.desktop ${D}/usr/share/applnk/Multimedia
+
 	dodoc AUTHORS ChangeLog NEWS README TODO
 }
diff --git a/media-sound/gnomad/gnomad-2.8.0.ebuild b/media-sound/gnomad/gnomad-2.8.0.ebuild
index 6c7f71ca5196..5423527f1665 100644
--- a/media-sound/gnomad/gnomad-2.8.0.ebuild
+++ b/media-sound/gnomad/gnomad-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/media-sound/gnomad/gnomad-2.8.0.ebuild,v 1.1 2005/07/16 21:02:37 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomad/gnomad-2.8.0.ebuild,v 1.1.1.1 2005/11/30 09:37:50 chriswhite Exp $
 
 IUSE=""
 
@@ -20,7 +20,7 @@ SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 #-sparc: 2.4.4: Application crashes on startup (Gnome crash detection)
-KEYWORDS="~amd64 ~ppc -sparc ~x86"
+KEYWORDS="~amd64 ~ppc -sparc x86"
 
 RDEPEND=">=dev-libs/glib-2.6.0
 	>=gnome-base/libgnomeui-2
diff --git a/media-sound/gnomad/gnomad-2.8.1.ebuild b/media-sound/gnomad/gnomad-2.8.1.ebuild
index a26fc106af2f..3b9b8daccf7c 100644
--- a/media-sound/gnomad/gnomad-2.8.1.ebuild
+++ b/media-sound/gnomad/gnomad-2.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/media-sound/gnomad/gnomad-2.8.1.ebuild,v 1.1 2005/09/08 13:41:41 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomad/gnomad-2.8.1.ebuild,v 1.1.1.1 2005/11/30 09:37:50 chriswhite Exp $
 
 IUSE=""
 
diff --git a/media-sound/gnomad/gnomad-2.8.2.ebuild b/media-sound/gnomad/gnomad-2.8.2.ebuild
index 91e94164aec5..e9aacf295f92 100644
--- a/media-sound/gnomad/gnomad-2.8.2.ebuild
+++ b/media-sound/gnomad/gnomad-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/media-sound/gnomad/gnomad-2.8.2.ebuild,v 1.1 2005/10/25 09:16:04 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomad/gnomad-2.8.2.ebuild,v 1.1.1.1 2005/11/30 09:37:50 chriswhite Exp $
 
 inherit flag-o-matic gnome2
 
diff --git a/media-sound/gnome-alsamixer/ChangeLog b/media-sound/gnome-alsamixer/ChangeLog
index d5d0134c9602..36ee7ad10c47 100644
--- a/media-sound/gnome-alsamixer/ChangeLog
+++ b/media-sound/gnome-alsamixer/ChangeLog
@@ -1,6 +1,61 @@
 # ChangeLog for media-sound/gnome-alsamixer
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnome-alsamixer/ChangeLog,v 1.1 2003/03/01 03:01:38 liquidx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnome-alsamixer/ChangeLog,v 1.1.1.1 2005/11/30 09:38:39 chriswhite Exp $
+
+  24 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  gnome-alsamixer-0.9.6.ebuild:
+  Forgot to inherit fdo-mime.  This closes bug #90275.
+
+  21 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/gnome-alsamixer-0.9.6-fixpath.patch, gnome-alsamixer-0.9.6.ebuild:
+  Added patch to fix path to alsa includes. This closes bug #88730 thanks to
+  Alexey Maximov <amax@mail.ru>.
+
+  21 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -gnome-alsamixer-0.9.3.ebuild, gnome-alsamixer-0.9.6.ebuild:
+  Use fdo-mime_desktop_database_update in postinst.  Closes bug #71904.
+
+  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  gnome-alsamixer-0.9.6.ebuild:
+  Stable on ppc.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gnome-alsamixer-0.9.6.ebuild:
+  Stable amd64.
+
+  15 Jul 2004; Tom Martin <slarti@gentoo.org> :
+  Marked ~amd64; closing 51724.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gnome-alsamixer-0.9.6.ebuild:
+  inherit eutils.
+
+  04 Apr 2004; Alastair Tse <liquidx@gentoo.org> gnome-alsamixer-0.9.6.ebuild,
+  files/gnome-alsamixer-0.9.6-gtk24.patch:
+  fixed GTK 2.4 support (#45947)
+
+  26 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gnome-alsamixer-0.9.3.ebuild, gnome-alsamixer-0.9.6.ebuild:
+  Stable on x86.
+
+  18 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gnome-alsamixer-0.9.3.ebuild:
+  Back to einstall to fix bug #42019
+
+*gnome-alsamixer-0.9.6 (17 Feb 2004)
+
+  17 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gnome-alsamixer-0.9.3.ebuild, gnome-alsamixer-0.9.6.ebuild, metadata.xml,
+  files/gnome-alsamixer.desktop:
+  Version bump closes bug #35870.
+
+  17 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org>
+  gnome-alsamixer-0.9.3.ebuild:
+  manifest fix
+
+  16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org>
+  gnome-alsamixer-0.9.3.ebuild:
+  set ppc in keywords
 
 *gnome-alsamixer-0.9.3 (01 Mar 2003)
 
diff --git a/media-sound/gnome-alsamixer/Manifest b/media-sound/gnome-alsamixer/Manifest
index e69de29bb2d1..ef5083b3fae0 100644
--- a/media-sound/gnome-alsamixer/Manifest
+++ b/media-sound/gnome-alsamixer/Manifest
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 349fb02ec51c5f5cbc40683b460f300f ChangeLog 2270
+MD5 cc6d1cd861a12dbccd852adf616cc0cf gnome-alsamixer-0.9.6.ebuild 1033
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 8ee992b81ac5ed728c89cea5addf5dff files/digest-gnome-alsamixer-0.9.6 72
+MD5 82b95a0df43429da5098b4da883f6bd0 files/gnome-alsamixer-0.9.6-gtk24.patch 699
+MD5 62622a38c69e0f766d8f8f1f4948dadc files/gnome-alsamixer.desktop 290
+MD5 70fddaa0dbd47bb15360b6bad9d496b7 files/gnome-alsamixer-0.9.6-fixpath.patch 1330
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCa+v3ArHZZzCEUG0RApduAJsE5m0FzHqdVKjXJQDgugxtqBGuoACfX/vh
+r1y0H+syjllbcim5UY9qdp8=
+=5s9s
+-----END PGP SIGNATURE-----
diff --git a/media-sound/gnome-alsamixer/gnome-alsamixer-0.9.6.ebuild b/media-sound/gnome-alsamixer/gnome-alsamixer-0.9.6.ebuild
index d955f8c5a30e..c3fe3cd50bce 100644
--- a/media-sound/gnome-alsamixer/gnome-alsamixer-0.9.6.ebuild
+++ b/media-sound/gnome-alsamixer/gnome-alsamixer-0.9.6.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/media-sound/gnome-alsamixer/gnome-alsamixer-0.9.6.ebuild,v 1.1 2004/02/17 12:06:26 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnome-alsamixer/gnome-alsamixer-0.9.6.ebuild,v 1.1.1.1 2005/11/30 09:38:39 chriswhite Exp $
+
+inherit eutils fdo-mime
 
 IUSE=""
 DESCRIPTION="Gnome 2 based ALSA Mixer"
@@ -8,13 +10,20 @@ HOMEPAGE="http://www.paw.co.za/projects/gnome-alsamixer"
 SRC_URI="ftp://ftp.paw.co.za/pub/PAW/sources/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc amd64"
 RDEPEND=">=media-libs/alsa-lib-0.9.0_rc1
 	 >=x11-libs/gtk+-2.0.6
 	 >=gnome-base/libgnomeui-2.0.5"
+
 DEPEND="${RDEPEND}
-		dev-util/pkgconfig
-		dev-util/desktop-file-utils"
+	dev-util/pkgconfig
+	dev-util/desktop-file-utils"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-gtk24.patch
+	epatch ${FILESDIR}/${P}-fixpath.patch
+}
 
 src_install() {
 	make DESTDIR=${D} install || die
@@ -25,3 +34,8 @@ src_install() {
 
 	dodoc AUTHORS COPYING ChangeLog INSTALL
 }
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}
diff --git a/media-sound/gnomeradio/ChangeLog b/media-sound/gnomeradio/ChangeLog
index 21454958e5cd..0fc4fef69fe7 100644
--- a/media-sound/gnomeradio/ChangeLog
+++ b/media-sound/gnomeradio/ChangeLog
@@ -1,6 +1,45 @@
 # ChangeLog for media-sound/gnomeradio
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomeradio/ChangeLog,v 1.1 2002/07/16 13:50:00 stroke Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomeradio/ChangeLog,v 1.1.1.1 2005/11/30 09:38:23 chriswhite Exp $
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> gnomeradio-1.4.ebuild:
+  Stable on ppc.
+
+*gnomeradio-1.6 (25 Apr 2005)
+
+  25 Apr 2005; foser <foser@gentoo.org> gnomeradio-1.6.ebuild :
+  New release (#89465)
+
+  28 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gnomeradio-1.4.ebuild:
+  Added to ~sparc
+
+  19 Aug 2004; foser <foser@gentoo.org> gnomeradio-1.4.ebuild gnomeradio-1.4-gcc34.patch :
+  Add fix for gtk+-2.4 & gcc34 compilation issues (#54115)
+
+  18 Jun 2004; David Holm <dholm@gentoo.org> gnomeradio-1.4.ebuild:
+  Added to ~ppc.
+
+  27 Aug 2003; Mike Gardiner <obz@gentoo.org> gnomeradio-1.4.ebuild:
+  Added scrollkeeper to depends
+
+*gnomeradio-1.4 (15 Feb 2003)
+
+  23 Aug 2003; foser <foser@gentoo.org> gnomeradio-1.4.ebuild :
+  Added lirc USE flag stuff (#9072)
+  fix (R)DEP order
+
+  15 Feb 2003; foser <foser@gentoo.org> gnomeradio-1.4.ebuild :
+  New version, fixed deps
+
+*gnomeradio-1.3 (23 Oct 2002)
+
+  23 Oct 2002; foser <foser@gentoo.org> :
+  New version, fixed deps. Thanks to Markus Bertheau <twanger@bluetwanger.de>
+
+*gnomeradio-1.2.1 (26 Jul 2002)
+  26 Jul 2002; Spider <spider@gentoo.org> gnomeradio-1.2.1.ebuild:
+  eclassified, new version
 
 *gnomeradio-1.2 (16 Jul 2002)
 
diff --git a/media-sound/gnomeradio/Manifest b/media-sound/gnomeradio/Manifest
index e69de29bb2d1..ec386f869ebf 100644
--- a/media-sound/gnomeradio/Manifest
+++ b/media-sound/gnomeradio/Manifest
@@ -0,0 +1,7 @@
+MD5 d0d9611526517e3c6e5b398d7d4ff98e gnomeradio-1.6.ebuild 834
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 cd2d64e31048e387c58288acd7ea2155 ChangeLog 1552
+MD5 2a48e9070352d466297ad0bae11e4fb2 gnomeradio-1.4.ebuild 1013
+MD5 ecd09176a359fc04fc85895ae49e9b20 files/gnomeradio-1.4-gcc34.patch 263
+MD5 55867869ca6a4013df54d68e22156011 files/digest-gnomeradio-1.6 66
+MD5 ae87ec7d399d7b593b65aee83ea7e440 files/digest-gnomeradio-1.4 66
diff --git a/media-sound/gnomeradio/gnomeradio-1.4.ebuild b/media-sound/gnomeradio/gnomeradio-1.4.ebuild
index 18d1c3fae26f..0520d8ff6a38 100644
--- a/media-sound/gnomeradio/gnomeradio-1.4.ebuild
+++ b/media-sound/gnomeradio/gnomeradio-1.4.ebuild
@@ -1,24 +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/media-sound/gnomeradio/gnomeradio-1.4.ebuild,v 1.1 2003/02/15 16:11:53 foser Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomeradio/gnomeradio-1.4.ebuild,v 1.1.1.1 2005/11/30 09:38:23 chriswhite Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="A GNOME2 radio tuner"
 SRC_URI="http://mfcn.ilo.de/gnomeradio/${P}.tar.gz"
 HOMEPAGE="http://mfcn.ilo.de/gnomeradio/"
 
+IUSE="lirc"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 
-DEPEND=">=gnome-base/libgnomeui-2
-	>=gnome-base/gconf-1.2"
+RDEPEND=">=gnome-base/libgnomeui-2
+	>=gnome-base/gconf-1.2
+	lirc? ( app-misc/lirc )"
 
-RDEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.21"
+	>=dev-util/intltool-0.21
+	>=app-text/scrollkeeper-0.3.11"
 
 DOCS="ABOUT-NLS AUTHORS ChangeLog COPYING README* INSTALL NEWS TODO"
 
+use lirc \
+	&& G2CONF="${G2CONF} --enable-lirc " \
+	|| G2CONF="${G2CONF} --enable-lirc "
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gcc34.patch
+
+}
+
+CFLAGS="${CFLAGS} -UGNOME_DISABLE_DEPRECATED \
+	-UGTK_DISABLE_DEPRECATED \
+	-UGDK_DISABLE_DEPRECATED \
+	-UG_DISABLE_DEPRECATED"
diff --git a/media-sound/gnomeradio/gnomeradio-1.6.ebuild b/media-sound/gnomeradio/gnomeradio-1.6.ebuild
index 0d35d6ddf67b..55816430c914 100644
--- a/media-sound/gnomeradio/gnomeradio-1.6.ebuild
+++ b/media-sound/gnomeradio/gnomeradio-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/media-sound/gnomeradio/gnomeradio-1.6.ebuild,v 1.1 2005/04/25 10:44:56 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomeradio/gnomeradio-1.6.ebuild,v 1.1.1.1 2005/11/30 09:38:23 chriswhite Exp $
 
 inherit gnome2
 
diff --git a/media-sound/gnomoradio/ChangeLog b/media-sound/gnomoradio/ChangeLog
index 70f22f53e88d..0631b5fc2b51 100644
--- a/media-sound/gnomoradio/ChangeLog
+++ b/media-sound/gnomoradio/ChangeLog
@@ -1,6 +1,48 @@
 # ChangeLog for media-sound/gnomoradio
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomoradio/ChangeLog,v 1.1 2004/05/03 23:14:03 zx Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomoradio/ChangeLog,v 1.1.1.1 2005/11/30 09:38:26 chriswhite Exp $
+
+  23 Dec 2004; Simon Stelling <blubb@gentoo.org> gnomoradio-0.15.1.ebuild:
+  added ~amd64
+
+  08 Dec 2004; Michael Hanselmann <hansmi@gentoo.org>
+  gnomoradio-0.15.1.ebuild:
+  Added to ~ppc.
+
+  23 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gnomoradio-0.15.1.ebuild:
+  Added to ~sparc
+
+*gnomoradio-0.15.1 (12 Nov 2004)
+
+  12 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -gnomoradio-0.11.2.ebuild, gnomoradio-0.13.ebuild,
+  +gnomoradio-0.15.1.ebuild:
+  Version bump closes bug #61726.
+
+  12 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gnomoradio-0.13.ebuild:
+  Stable amd64, x86.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gnomoradio-0.11.2.ebuild:
+  virtual/glibc -> virtual/libc
+
+  18 Jun 2004; David Holm <dholm@gentoo.org> gnomoradio-0.13.ebuild:
+  Added to ~ppc.
+
+*gnomoradio-0.13 (15 Jun 2004)
+
+  15 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +gnomoradio-0.13.ebuild:
+  Version bump closes bug #53543.  Added ~amd64.
+
+  30 May 2004; Yi Qiang <khai@gentoo.org> gnomoradio-0.11.2.ebuild:
+  Fixed gtkmm deps
+
+  06 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gnomoradio-0.11.2.ebuild:
+  Added oggvorbis to IUSE.
 
 *gnomoradio-0.11.2 (08 May 2004)
 
diff --git a/media-sound/gnomoradio/Manifest b/media-sound/gnomoradio/Manifest
index 3dd9618b5cb2..919fa98cef2c 100644
--- a/media-sound/gnomoradio/Manifest
+++ b/media-sound/gnomoradio/Manifest
@@ -1,4 +1,6 @@
-MD5 7fdd41a4b4f30690a2259b4f63240232 gnomoradio-0.11.2.ebuild 642
-MD5 59048b4ffcbdaa7432f82b0084914cc2 ChangeLog 357
+MD5 98ea9af0d5c46571535e0fc105311c5d ChangeLog 1623
+MD5 beb871215e05dd7c085d4492bd944b58 gnomoradio-0.13.ebuild 711
+MD5 5b9e6e7921323b2007d27ad79581b462 gnomoradio-0.15.1.ebuild 865
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 cd24553d4f0e2f6cae13c3f853ee1e9c files/digest-gnomoradio-0.11.2 69
+MD5 c4cf022e140c042009d8b9ea8545dd80 files/digest-gnomoradio-0.13 68
+MD5 410961a71f17292b8829bb17d1587eb9 files/digest-gnomoradio-0.15.1 70
diff --git a/media-sound/gnomoradio/gnomoradio-0.13.ebuild b/media-sound/gnomoradio/gnomoradio-0.13.ebuild
index bd9871fbacc3..36ab1c48c77b 100644
--- a/media-sound/gnomoradio/gnomoradio-0.13.ebuild
+++ b/media-sound/gnomoradio/gnomoradio-0.13.ebuild
@@ -1,18 +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/media-sound/gnomoradio/gnomoradio-0.13.ebuild,v 1.1 2004/06/15 20:40:29 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomoradio/gnomoradio-0.13.ebuild,v 1.1.1.1 2005/11/30 09:38:26 chriswhite Exp $
+
+IUSE="oggvorbis"
 
 DESCRIPTION="Finds, fetches, shares, and plays freely licensed music."
 HOMEPAGE="http://gnomoradio.org/"
 SRC_URI="http://savannah.nongnu.org/download/gnomoradio/${P}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="oggvorbis"
+KEYWORDS="amd64 ~ppc x86"
 
 DEPEND="=dev-cpp/gtkmm-2.2.11
 	=dev-cpp/gconfmm-2.0.2
-	>=dev-cpp/libxmlpp-1.0
+	=dev-cpp/libxmlpp-1.0*
 	media-sound/esound
 	oggvorbis? ( media-libs/libvorbis )"
 
diff --git a/media-sound/gnomoradio/gnomoradio-0.15.1.ebuild b/media-sound/gnomoradio/gnomoradio-0.15.1.ebuild
index f8845690f720..bf8a6dd811fc 100644
--- a/media-sound/gnomoradio/gnomoradio-0.15.1.ebuild
+++ b/media-sound/gnomoradio/gnomoradio-0.15.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/media-sound/gnomoradio/gnomoradio-0.15.1.ebuild,v 1.1 2004/11/14 18:57:11 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomoradio/gnomoradio-0.15.1.ebuild,v 1.1.1.1 2005/11/30 09:38:26 chriswhite Exp $
 
 IUSE="oggvorbis"
 
@@ -13,7 +13,7 @@ SLOT="0"
 #KEYWORDS="~amd64 ~ppc ~x86"
 # not linking for me on amd64 - eradicator
 # ~ppc - needs gconfmm keyworded
-KEYWORDS="-amd64 ~x86"
+KEYWORDS="~amd64 ~sparc ~x86 ~ppc"
 
 DEPEND=">=dev-cpp/gtkmm-2.4
 	>=dev-cpp/glibmm-2.4
diff --git a/media-sound/gnump3d/ChangeLog b/media-sound/gnump3d/ChangeLog
index 40bc2c91754d..637bf7066129 100644
--- a/media-sound/gnump3d/ChangeLog
+++ b/media-sound/gnump3d/ChangeLog
@@ -1,6 +1,194 @@
 # ChangeLog for media-sound/gnump3d
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnump3d/ChangeLog,v 1.1 2002/04/18 08:06:37 mkennedy Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnump3d/ChangeLog,v 1.1.1.1 2005/11/30 09:37:57 chriswhite Exp $
+
+  18 Nov 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  gnump3d-2.9.7-r1.ebuild:
+  stable on alpha wrt bug #111990
+
+  18 Nov 2005; Markus Rothe <corsair@gentoo.org> gnump3d-2.9.7-r1.ebuild:
+  Stable on ppc64; bug #111990
+
+*gnump3d-2.9.8 (18 Nov 2005)
+*gnump3d-2.9.7-r1 (18 Nov 2005)
+
+  18 Nov 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/gnump3d-index.lok.diff, +files/gnump3d-traversal.diff,
+  +files/gnump3d-tmpfile.diff, +gnump3d-2.9.7-r1.ebuild,
+  +gnump3d-2.9.8.ebuild:
+  Revbump and version bump for security bug #111990.
+
+  16 Nov 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -gnump3d-2.9.3.ebuild, -gnump3d-2.9.6.ebuild:
+  Removing insecure versions.
+
+  04 Nov 2005; <dang@gentoo.org> gnump3d-2.9.7.ebuild:
+  Marked stable on amd64
+
+  04 Nov 2005; Fernando J. Pereda <ferdy@gentoo.org> gnump3d-2.9.7.ebuild:
+  stable on alpha wrt bug #109667
+
+  04 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> gnump3d-2.9.7.ebuild:
+  Stable on sparc wrt #109667
+
+  04 Nov 2005; Mark Loeser <halcy0n@gentoo.org> gnump3d-2.9.7.ebuild:
+  Stable on x86; bug #109667
+
+  03 Nov 2005; Brent Baude <ranger@gentoo.org> gnump3d-2.9.7.ebuild:
+  Marking gnump3d-2.9.7 ppc64 stable for bug 109667
+
+*gnump3d-2.9.7 (03 Nov 2005)
+
+  03 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> +gnump3d-2.9.7.ebuild:
+  Bump to 2.9.7 as per bug #109667.
+
+  28 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org> gnump3d-2.9.6.ebuild:
+  stable on alpha as per bug #109667
+
+*gnump3d-2.9.6 (28 Oct 2005)
+
+  28 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -gnump3d-2.8.ebuild, -gnump3d-2.9.4.ebuild, +gnump3d-2.9.6.ebuild:
+  Version bump for security bug #109667.
+
+  14 Sep 2005; Aron Griffis <agriffis@gentoo.org> gnump3d-2.9.3.ebuild:
+  Mark 2.9.3 stable on alpha
+
+  24 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> gnump3d-2.9.4.ebuild:
+  Use newconfd/newinitd.
+
+  01 Aug 2005; Fabian Groffen <grobian@gentoo.org> gnump3d-2.9.4.ebuild:
+  Marking ~ppc-macos
+
+  28 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> gnump3d-2.9.3.ebuild:
+  Stable on sparc
+
+  19 Jun 2005; Fernando J. Pereda <ferdy@gentoo.org> gnump3d-2.9.3.ebuild,
+  gnump3d-2.9.4.ebuild:
+  marked ~alpha wrt bug #94429
+
+  06 Jun 2005; Markus Rothe <corsair@gentoo.org> gnump3d-2.9.3.ebuild:
+  Stable on ppc64
+
+*gnump3d-2.9.4 (29 May 2005)
+
+  29 May 2005; Jan Brinkmann <luckyduck@gentoo.org> -gnump3d-2.9.ebuild,
+  gnump3d-2.9.3.ebuild, +gnump3d-2.9.4.ebuild:
+  New upstream version. Also gnump3d-top needs patchting, fixes #89604. Marked
+  2.0.3 stable on amd64 and x86.
+
+*gnump3d-2.9.3 (17 Apr 2005)
+
+  17 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> -gnump3d-2.7.ebuild,
+  +gnump3d-2.9.3.ebuild:
+  new upstream version, fixes #86342
+
+*gnump3d-2.9 (18 Feb 2005)
+
+  18 Feb 2005; Tony Vroon <chainsaw@gentoo.org> +gnump3d-2.9.ebuild:
+  Version bump, closes bug #80170.
+
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org> gnump3d-2.8.ebuild:
+  Stable on ppc64
+
+  03 Nov 2004; Markus Rothe <corsair@gentoo.org> gnump3d-2.8.ebuild:
+  Marked ~ppc64, bug #69716
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> gnump3d-2.8.ebuild:
+  get_libdir fixes.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> gnump3d-2.8.ebuild:
+  Stable amd64, sparc.
+
+  29 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org> gnump3d-2.8.ebuild:
+  Stable x86.  Added to ~amd64 ~sparc.
+
+*gnump3d-2.8 (30 May 2004)
+
+  30 May 2004; Jeremy Huddleston <eradicator@gentoo.org> gnump3d-2.8.ebuild:
+  Version bump.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> gnump3d-2.7.ebuild:
+  Add inherit eutils
+
+  24 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gnump3d-2.2-r1.ebuild, gnump3d-2.6-r1.ebuild, gnump3d-2.7.ebuild,
+  files/gnump3d-2.2-gentoo.diff, files/gnump3d-2.2-initd,
+  files/gnump3d-2.6-gentoo.patch, files/gnump3d-2.6-initd:
+  Stable x86.
+
+  24 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> gnump3d-2.7.ebuild,
+  files/gnump3d.conf.d, files/gnump3d.init.d:
+  Do mp3 indexing in init file.  Closes bug #48828.
+
+  01 Apr 2004; David Holm <dholm@gentoo.org> gnump3d-2.7.ebuild:
+  Added to ~ppc.
+
+*gnump3d-2.7 (30 Mar 2004)
+
+  30 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gnump3d-2.2-r1.ebuild, gnump3d-2.6-r1.ebuild, gnump3d-2.7.ebuild,
+  files/gnump3d.init.d:
+  Version bump closes bug #46146.
+
+  22 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gnump3d-2.2-r1.ebuild, gnump3d-2.6-r1.ebuild, gnump3d-2.6.ebuild:
+  Fixed HOMEPAGE.
+
+*gnump3d-2.6-r1 (22 Mar 2004)
+
+  22 Mar 2004; <mkennedy@gentoo.org> gnump3d-2.6-r1.ebuild,
+  files/gnump3d-2.6-gentoo.patch, files/gnump3d-2.6-initd:
+  Corrected boot-time failure to load problem
+
+*gnump3d-2.6 (24 Nov 2003)
+
+  24 Nov 2003; <mkennedy@gentoo.org> gnump3d-2.6.ebuild,
+  files/gnump3d-2.6-initd:
+  simplification of the port (no need for gentoo-diffs for install and pid), add
+  a gnump3d user to the system, version bump
+
+*gnump3d-2.4 (25 Jun 2003)
+
+  25 Jun 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump. Found by Shaun Guth <l8nite@l8nite.net>.
+
+*gnump3d-2.2-r1 (10 May 2003)
+
+  10 May 2003; jje <jje@gentoo.org> gnump3d-2.2-r1.ebuild:
+  Updated ebuild with init script.
+  
+  Submitted by: Jyrki Muukkonen
+
+*gnump3d-2.2 (09 Mar 2003)
+
+  18 Apr 2003; Philip Walls <malverian@gentoo.org> gnump3d-2.2.ebuild :
+  bug #18967
+
+  09 Mar 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump.
+
+*gnump3d-1.0 (18 Dec 2002)
+
+  16 Jan 2003; Nick Hadaway <raker@gentoo.org> gnump3d-1.0.ebuild :
+  Marked stable.  
+
+  01 Jan 2002; Nick Hadaway <raker@gentoo.org> gnump3d-1.0.ebuild :
+  new rc scripts, removed a debian-specific gnump3d-config, and
+  gnump3d-specific libraries are now in /usr/lib/gnump3d instead of
+  /usr/lib.  Ebuild now creates /var/log/gnump3d. 
+
+  18 Dec 2002; Nick Hadaway <raker@gentoo.org> gnump3d-1.0.ebuild,
+  files/digest-gnump3d-1.0 :
+  Version bump.
+
+  01 Dec 2002; Daniel Ahlberg <aliz@gentoo.org> files/doc-Makefile-gentoo.patch :
+  Closes #11396.
+
+*gnump3d-1.0_pre1 (05 Nov 2002)
+
+  05 Nov 2002; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump.
 
 *gnump3d-0.9.9.4 (18 Apr 2002)
 
diff --git a/media-sound/gnump3d/Manifest b/media-sound/gnump3d/Manifest
index 00efbf4f82c8..704872c76ee5 100644
--- a/media-sound/gnump3d/Manifest
+++ b/media-sound/gnump3d/Manifest
@@ -1,13 +1,23 @@
-MD5 189ebefd77e7bdae8e7cfe34238268b7 ChangeLog 1418
-MD5 b834a3556fab57689814993ff7d5c31e gnump3d-0.9.9.4.ebuild 1181
-MD5 8f41800bb8d64c16fbf86868ba070cd6 gnump3d-1.0.ebuild 1413
-MD5 4355369e2f282694d98e0e200c2ace74 gnump3d-2.2.ebuild 1142
-MD5 88a7d8bd4d3497fa0746c27a8028981f files/digest-gnump3d-0.9.9.4 67
-MD5 2a8a844e5947e1cbb8a977c47c259834 files/digest-gnump3d-1.0 64
-MD5 ed2b7457b2cfbdbc3f20a448938c725a files/digest-gnump3d-2.2 63
-MD5 4cd80c2edb14b3d0c90f74cd0a925c16 files/doc-Makefile-gentoo.patch 439
-MD5 22e31b3d4f3dcf42f9034102f5d980a8 files/gnump3d-1.0-gentoo.diff.bz2 359
-MD5 c44501012e6fe922cc2c7e06f1245614 files/gnump3d-1.0.rc6 405
-MD5 c44501012e6fe922cc2c7e06f1245614 files/gnump3d-2.2.rc6 405
-MD5 5322bda842b45879eacae850ac48caa2 files/gnump3d.rc6 388
-MD5 1cc59e977b80559a3ca4360188e824c7 files/mp3d.conf-gentoo.patch 581
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 cb9bb8fdb84fc2146a4324aed5703bbb gnump3d-2.9.7.ebuild 2100
+MD5 9c542b70012885e88f1a63a5322b78f1 gnump3d-2.9.8.ebuild 2111
+MD5 eca6a561be42c7d6eaad53fd257495e1 ChangeLog 6558
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 83ff000b1e4413fa245c1917f2322526 gnump3d-2.9.7-r1.ebuild 2235
+MD5 53ddcd88da020240ac2ec48f0100c4a9 files/gnump3d.conf.d 159
+MD5 27e1721a1708176c950425eeb3d4cfdd files/gnump3d.init.d 740
+MD5 fc8c45be4cb18a2b33cd0c321917b268 files/digest-gnump3d-2.9.7-r1 66
+MD5 fc8c45be4cb18a2b33cd0c321917b268 files/digest-gnump3d-2.9.7 66
+MD5 0bc04392e8eeeaff28091d69ab5e3b12 files/digest-gnump3d-2.9.8 66
+MD5 f82313fc517478141296f216e4e835d0 files/gnump3d-index.lok.diff 3249
+MD5 27b7feff197e10f51c5607f4bfccbcf4 files/gnump3d-tmpfile.diff 1197
+MD5 eef3ef350b208e39d1c1b99ac54b4b7e files/gnump3d-traversal.diff 702
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfZqgViELBEf1JB0RArTNAJ9n6KrtaxBOdPzKqR5zfNMSPDbbQACfW692
+IhRsGYOIINI+3ZG+mskzrvI=
+=yTg9
+-----END PGP SIGNATURE-----
diff --git a/media-sound/gnump3d/files/gnump3d.init.d b/media-sound/gnump3d/files/gnump3d.init.d
index d20da60d369d..1af261298010 100644
--- a/media-sound/gnump3d/files/gnump3d.init.d
+++ b/media-sound/gnump3d/files/gnump3d.init.d
@@ -1,14 +1,22 @@
 #!/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/media-sound/gnump3d/files/gnump3d.init.d,v 1.1 2004/03/30 18:46:34 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnump3d/files/gnump3d.init.d,v 1.1.1.1 2005/11/30 09:37:58 chriswhite Exp $
 
 depend() {
 	need net
+	after netmount nfsmount
 }
 
 start() {
 	ebegin "Starting gnump3d"
+
+	if [ ${DO_INDEX} -eq 1 ]; then
+		ebegin "Updating index of music files (may take a while for the first time)"
+		/usr/bin/gnump3d-index
+		eend $?
+	fi
+
 	start-stop-daemon --start --quiet --exec /usr/bin/gnump3d2 --make-pidfile \
 		--pidfile /var/run/gnump3d.pid --background -- --quiet
 	eend $?
diff --git a/media-sound/gnump3d/gnump3d-2.9.7-r1.ebuild b/media-sound/gnump3d/gnump3d-2.9.7-r1.ebuild
index da0a21168867..2f03eb600988 100644
--- a/media-sound/gnump3d/gnump3d-2.9.7-r1.ebuild
+++ b/media-sound/gnump3d/gnump3d-2.9.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/media-sound/gnump3d/gnump3d-2.9.7-r1.ebuild,v 1.1 2005/11/18 01:32:46 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnump3d/gnump3d-2.9.7-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:58 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://savannah.gnu.org/download/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc-macos ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~ppc ~ppc-macos ppc64 sparc x86"
 IUSE=""
 
 DEPEND="sys-apps/sed"
diff --git a/media-sound/gnump3d/gnump3d-2.9.7.ebuild b/media-sound/gnump3d/gnump3d-2.9.7.ebuild
index 1a5123e35336..c7645dddf891 100644
--- a/media-sound/gnump3d/gnump3d-2.9.7.ebuild
+++ b/media-sound/gnump3d/gnump3d-2.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/media-sound/gnump3d/gnump3d-2.9.7.ebuild,v 1.1 2005/11/03 11:12:39 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnump3d/gnump3d-2.9.7.ebuild,v 1.1.1.1 2005/11/30 09:37:58 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://savannah.gnu.org/download/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~ppc ~ppc-macos ppc64 sparc x86"
 IUSE=""
 
 DEPEND="sys-apps/sed"
diff --git a/media-sound/gnump3d/gnump3d-2.9.8.ebuild b/media-sound/gnump3d/gnump3d-2.9.8.ebuild
index 1978b372d3b3..d84fa4c83393 100644
--- a/media-sound/gnump3d/gnump3d-2.9.8.ebuild
+++ b/media-sound/gnump3d/gnump3d-2.9.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/media-sound/gnump3d/gnump3d-2.9.8.ebuild,v 1.1 2005/11/18 01:32:46 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnump3d/gnump3d-2.9.8.ebuild,v 1.1.1.1 2005/11/30 09:37:57 chriswhite Exp $
 
 inherit eutils
 
diff --git a/media-sound/gnusound/ChangeLog b/media-sound/gnusound/ChangeLog
index 102fbaf49370..3546d21dc124 100644
--- a/media-sound/gnusound/ChangeLog
+++ b/media-sound/gnusound/ChangeLog
@@ -1,6 +1,35 @@
 # ChangeLog for media-sound/gnusound
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnusound/ChangeLog,v 1.1 2004/02/11 21:19:33 jake Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnusound/ChangeLog,v 1.1.1.1 2005/11/30 09:38:13 chriswhite Exp $
+
+*gnusound-0.7 (27 Apr 2005)
+
+  27 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/gnusound-0.7-destdir.patch, +gnusound-0.7.ebuild:
+  new upstream version, fixes #90560. added ~amd64 back, seems to work now.
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/gnusound-0.6.2-destdir.patch, +files/gnusound-0.6.2-gcc34.patch,
+  -gnusound-0.6.1.ebuild, gnusound-0.6.2.ebuild:
+  Cleaned up and added to -amd64, -sparc.
+
+  08 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> metadata.xml,
+  gnusound-0.6.2.ebuild, +files/gnusound-0.6.2-gtkdep.patch:
+  Patch to fix compilation with new versions of gtk/glib.
+
+  06 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gnusound-0.6.2.ebuild:
+  gnuconfig_update
+
+*gnusound-0.6.2 (26 Mar 2004)
+
+  26 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gnusound-0.6.2.ebuild:
+  Version bump.
+
+  26 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gnusound-0.6.1.ebuild:
+  Stable in x86.  Fixed USE flags
 
 *gnusound-0.6.1 (11 Feb 2004)
 
diff --git a/media-sound/gnusound/Manifest b/media-sound/gnusound/Manifest
index a5d59d4abe5f..c0bc7a64073a 100644
--- a/media-sound/gnusound/Manifest
+++ b/media-sound/gnusound/Manifest
@@ -1,2 +1,20 @@
-MD5 35f98fb7a466b4ddbfd6c8d87772818e gnusound-0.6.1.ebuild 1111
-MD5 144ea19f7fb52c88a88e39c3abe72dba files/digest-gnusound-0.6.1 67
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 07601b528b7a41c46c73d9dea840fbe4 gnusound-0.7.ebuild 1325
+MD5 c592b8fca93ad1001aae03ecfcdc1291 gnusound-0.6.2.ebuild 1359
+MD5 cd031a9ab932a0d76a9522a0bac2bf9f ChangeLog 1334
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 f9d51bdd31b53726a453e8107f952c06 files/gnusound-0.6.2-destdir.patch 1524
+MD5 2fc6416b1d46e2e4b4cd98881e3b6ca6 files/digest-gnusound-0.6.2 67
+MD5 0ea9eb52808da58d3b31485199b74e65 files/digest-gnusound-0.7 65
+MD5 81cee6b7a949cef7e03d3a57349701c9 files/gnusound-0.7-destdir.patch 2451
+MD5 ea52d3ae47017d356eddec26a196bd51 files/gnusound-0.6.2-gcc34.patch 425
+MD5 7664f0269c796f265829b3d0fc5690c8 files/gnusound-0.6.2-gtkdep.patch 1673
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCb8Q006ebR+OMO78RAqzKAJ0ZYY5csbTgona8b8+VUE9/QB6r1ACglBNm
+CZ3kqFcNwHaZTVVH3K9E0iA=
+=KQwb
+-----END PGP SIGNATURE-----
diff --git a/media-sound/gnusound/gnusound-0.6.2.ebuild b/media-sound/gnusound/gnusound-0.6.2.ebuild
index 81c2adcf071c..d8955f086e2d 100644
--- a/media-sound/gnusound/gnusound-0.6.2.ebuild
+++ b/media-sound/gnusound/gnusound-0.6.2.ebuild
@@ -1,6 +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/media-sound/gnusound/gnusound-0.6.2.ebuild,v 1.1 2004/03/27 03:41:02 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnusound/gnusound-0.6.2.ebuild,v 1.1.1.1 2005/11/30 09:38:13 chriswhite Exp $
+
+IUSE="libsamplerate"
+
+inherit gnuconfig eutils
 
 DESCRIPTION="GNUsound is a sound editor for Linux/x86"
 HOMEPAGE="http://gnusound.sourceforge.net/"
@@ -8,8 +12,8 @@ SRC_URI="http://gnusound.sourceforge.net/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
-IUSE="libsamplerate"
+# -amd64, -sparc: 0.6.2 - eradicator - segfault on startup
+KEYWORDS="-amd64 x86 -sparc"
 
 DEPEND=">=gnome-base/libglade-2.0.1
 	gnome-base/gnome-libs
@@ -23,15 +27,24 @@ src_unpack() {
 	rm -f doc/Makefile || die "could not remove doc Makefile"
 	rm -f modules/Makefile || die "could not remove modules Makefile"
 	sed -i "s:docrootdir:datadir:" doc/Makefile.in
+
+	# Bug #54980
+	epatch ${FILESDIR}/${P}-gtkdep.patch
+
+	# Bug #68345
+	epatch ${FILESDIR}/${P}-gcc34.patch
+
+	epatch ${FILESDIR}/${P}-destdir.patch
+
+	gnuconfig_update
 }
 
 src_compile() {
 	econf `use_with libsamplerate` --enable-optimization || die "Configure failure"
-
 	emake || die "Make failure"
 }
 
 src_install() {
-	einstall || die "make install failure"
-	dodoc LICENSE README NOTES TODO CHANGES
+	make DESTDIR="${D}" install || die
+	dodoc README NOTES TODO CHANGES
 }
diff --git a/media-sound/gnusound/gnusound-0.7.ebuild b/media-sound/gnusound/gnusound-0.7.ebuild
index e5613803820f..21c54c520996 100644
--- a/media-sound/gnusound/gnusound-0.7.ebuild
+++ b/media-sound/gnusound/gnusound-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/media-sound/gnusound/gnusound-0.7.ebuild,v 1.1 2005/04/27 16:55:56 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnusound/gnusound-0.7.ebuild,v 1.1.1.1 2005/11/30 09:38:13 chriswhite Exp $
 
 IUSE="libsamplerate"
 
diff --git a/media-sound/gnusound/metadata.xml b/media-sound/gnusound/metadata.xml
index cc0775da35be..e1774e3d9ad7 100644
--- a/media-sound/gnusound/metadata.xml
+++ b/media-sound/gnusound/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sound</herd>
-<maintainer>
-  <email>jake@gentoo.org</email>
-  <name>Blake Matheny</name>
-</maintainer>
 </pkgmetadata>
diff --git a/media-sound/gogo/ChangeLog b/media-sound/gogo/ChangeLog
index 440aae52df55..f5bc43de6e0d 100644
--- a/media-sound/gogo/ChangeLog
+++ b/media-sound/gogo/ChangeLog
@@ -1 +1,36 @@
-Initial create 053002
+# ChangeLog for media-sound/gogo
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gogo/ChangeLog,v 1.1.1.1 2005/11/30 09:38:41 chriswhite Exp $
+
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> gogo-3.10-r1.ebuild:
+  Don't install COPYING and INSTALL files.
+
+  06 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> gogo-3.10-r1.ebuild:
+  gnuconfig_update
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> gogo-3.10-r1.ebuild:
+  virtual/glibc -> virtual/libc
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org> gogo-3.10-r1.ebuild:
+  Fix use invocation
+
+  21 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> gogo-3.10-r1.ebuild:
+  debug added to IUSE.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> gogo-3.10-r1.ebuild:
+  QA fix.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*gogo-3.10-r1 (1 Jul 2002)
+  1 Jul 2002; Ben Lutgens <lamer@gentoo.org> gogo-3.10-r1.ebuild :
+
+    The workdir was wrong, removed the src_unpack() because it was useless
+    and corrected the dodoc stuff at the end of src_install()
+
+
+*gogo-3.10 (20 Jun 2002)
+
+  20 Jun 2002; Phil Bordelon <sunflare@gentoo.org> gogo-3.10.ebuild :
+
+  Unmasked ebuild, submitted by mjc <mjc@gentoo.org>.
diff --git a/media-sound/gogo/Manifest b/media-sound/gogo/Manifest
index e69de29bb2d1..bf3a6a957abc 100644
--- a/media-sound/gogo/Manifest
+++ b/media-sound/gogo/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5a15a6b77f5b518c5e7e42152e3a7f01 ChangeLog 1286
+MD5 7780c8edafd71c5b2246ff11ff6ed17a gogo-3.10-r1.ebuild 1576
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 0430e73f78121a38a515d3ce790499f9 files/digest-gogo-3.10-r1 60
+MD5 a67a51f56c8df1bb12c29dcab4ef1242 files/make-work-3.10pl3.patch 282
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGtS8j5H05b2HAEkRApfWAJ49Wd2+FvnbFYqDEDWmjEckY1QATACePchC
+mwtw7s6/vSco27MbXiKcw9U=
+=rC4l
+-----END PGP SIGNATURE-----
diff --git a/media-sound/gogo/gogo-3.10-r1.ebuild b/media-sound/gogo/gogo-3.10-r1.ebuild
index 58ae53744bb4..95364b4bba4e 100644
--- a/media-sound/gogo/gogo-3.10-r1.ebuild
+++ b/media-sound/gogo/gogo-3.10-r1.ebuild
@@ -1,65 +1,72 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Michael Cohen <mjc@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gogo/gogo-3.10-r1.ebuild,v 1.1 2002/07/02 03:08:33 lamer Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gogo/gogo-3.10-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:41 chriswhite Exp $
 
-S=${WORKDIR}/petit310pl3
+inherit eutils gnuconfig
+IUSE="debug"
+
+MY_PV=310pl3
 DESCRIPTION="GoGo is an assembly optimized version of LAME 3.91"
-SRC_URI="http://member.nifty.ne.jp/~pen/free/gogo3/down/petit310pl3.tgz"
 HOMEPAGE="http://member.nifty.ne.jp/~pen/free/gogo3/mct_gogo.htm"
+SRC_URI="http://member.nifty.ne.jp/~pen/free/gogo3/down/petit${MY_PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 -ppc -sparc"
 
-DEPEND="virtual/glibc
-	dev-lang/nasm"
+DEPEND="dev-lang/nasm"
 #	>=sys-libs/ncurses-5.H2
 #	gtk?    ( =x11-libs/gtk+-1.2* )"
 #	oggvorbis? ( >=media-libs/libvorbis-1.0_rc3 )"
-# Oggvorbis support breaks with -rc3 
-RDEPEND="virtual/glibc"
+# Oggvorbis support breaks with -rc3
+#RDEPEND="virtual/libc"
 #	>=sys-libs/ncurses-5.2
 #	gtk?    ( =x11-libs/gtk+-1.2* )"
 #	oggvorbis? ( >=media-libs/libvorbis-1.0_rc3 )"
 
-src_compile() {
+S=${WORKDIR}/petit${MY_PV}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	gnuconfig_update
+}
 
+src_compile() {
 	local myconf=""
-#	if [ "`use oggvorbis`" ] ; then
+#	if use oggvorbis ; then
 #		myconf="--with-vorbis"
 		myconf="--without-vorbis"
 #	else
 #		myconf="--without-vorbis"
 #	fi
-#	if [ "`use gtk`" ] ; then
+#	if use gtk ; then
 #		myconf="$myconf --enable-mp3x"
 #	fi
-	if [ "$DEBUG" ] ; then
-		myconf="$myconf --enable-debug=yes"
-	else
-		myconf="$myconf --enable-debug=no"
-	fi
-	
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
+	use debug \
+		&& myconf="$myconf --enable-debug=yes" \
+		|| myconf="$myconf --enable-debug=no"
+
+	econf \
 		--enable-shared \
 		--enable-nasm \
 		--enable-extopt=full \
 		$myconf || die
-		
+
 	emake || die
 }
 
 src_install () {
+	epatch ${FILESDIR}/make-work-3.10pl3.patch
+
+	dodir /usr/bin
+	dodir /usr/share/man
+	dodir /usr/share/doc
 
-	cd /var/tmp/portage/gogo-${PV}/work/petit310pl3
-	patch -p0 < ${FILESDIR}/make-work-3.10pl3.patch || die
-	mkdir ${D}/usr
-	mkdir ${D}/usr/bin
-	mkdir ${D}/usr/share
-	mkdir ${D}/usr/share/man
-	mkdir ${D}/usr/share/doc
 	make exec_prefix=${D}usr \
 		mandir=${D}usr/share/man \
 		install || die
 
-	dodoc  COPYING readme_e.txt
+	dodoc readme_e.txt
 	dohtml -r ./
 }
diff --git a/media-sound/gom/ChangeLog b/media-sound/gom/ChangeLog
index b3f359b7d2ce..25f3b9235678 100644
--- a/media-sound/gom/ChangeLog
+++ b/media-sound/gom/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for media-sound/gom
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gom/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/media-sound/gom/ChangeLog,v 1.1.1.1 2005/11/30 09:38:26 chriswhite Exp $
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> gom-0.29.103-r1.ebuild:
+  Added to ~ppc.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gom-0.29.103-r1.ebuild:
+  Stable amd64, sparc.
+
+  12 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gom-0.29.103-r1.ebuild:
+  ~sparc ~amd64
+
+  22 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gom-0.29.103-r1.ebuild:
+  Removed explicit S=.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gom-0.29.103-r1.ebuild:
+  Added IUSE.
 
 *gom-0.29.103-r1 (1 Feb 2002)
 
diff --git a/media-sound/gom/Manifest b/media-sound/gom/Manifest
index e69de29bb2d1..1e96b2240eb1 100644
--- a/media-sound/gom/Manifest
+++ b/media-sound/gom/Manifest
@@ -0,0 +1,4 @@
+MD5 8325d949b4beac6380f9f167871eeb0c ChangeLog 1164
+MD5 d2070afdb470a51702c4f2ac6c6e4e96 gom-0.29.103-r1.ebuild 834
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 bc245f4bc3e32559ed3fe94e007b846e files/digest-gom-0.29.103-r1 63
diff --git a/media-sound/gom/files/digest-gom-0.29.103-r1 b/media-sound/gom/files/digest-gom-0.29.103-r1
index 00d910b00a80..0ad7fb2fefb1 100644
--- a/media-sound/gom/files/digest-gom-0.29.103-r1
+++ b/media-sound/gom/files/digest-gom-0.29.103-r1
@@ -1 +1 @@
-MD5 c2c6ecef7f2cc7eafe81d6d70f2ba132 gom-0.29.103.tar.gz 90112
+MD5 c2c6ecef7f2cc7eafe81d6d70f2ba132 gom-0.29.103.tar.gz 88269
diff --git a/media-sound/gom/gom-0.29.103-r1.ebuild b/media-sound/gom/gom-0.29.103-r1.ebuild
index fe98d8918a64..3815423dba71 100644
--- a/media-sound/gom/gom-0.29.103-r1.ebuild
+++ b/media-sound/gom/gom-0.29.103-r1.ebuild
@@ -1,34 +1,34 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Ryan Tolboom <ryan@gentoo.org>
-# /space/gentoo/cvsroot/gentoo-x86/media-sound/gom/gom-0.29.103.ebuild,v 1.3 2001/08/11 03:50:11 drobbins Exp
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gom/gom-0.29.103-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:26 chriswhite Exp $
+
+IUSE=""
 
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
 DESCRIPTION="Console Mixer Program for OSS"
-SRC_URI="http://www.Fh-Worms.DE./~inf222/code/c/gom/released/${A}"
+SRC_URI="http://www.Fh-Worms.DE./~inf222/code/c/gom/released/${P}.tar.gz"
 HOMEPAGE="http://www.fh-worms.de/~inf222"
 
 DEPEND=">=sys-libs/ncurses-5.2"
 
-src_compile() {
-
-    try ./configure --prefix=/usr --mandir=/usr/share/man
-    try make CFLAGS="${CFLAGS}"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~ppc sparc x86"
 
+src_compile() {
+	econf || die
+	make CFLAGS="${CFLAGS}" || die
 }
 
 src_install () {
-
-    try make DESTDIR=${D} install
-    dodoc NEWS ChangeLog README
-    docinto examples
-    dodoc README 
-    docinto examples/default
-    dodoc examples/default/*
-    docinto examples/standard
-    dodoc examples/standard/*
-    docinto examples/two-mixers
-    dodoc examples/two-mixers/*
-
+	make DESTDIR=${D} install || die
+
+	dodoc AUTHORS NEWS ChangeLog README
+	docinto examples
+	dodoc README
+	docinto examples/default
+	dodoc examples/default/*
+	docinto examples/standard
+	dodoc examples/standard/*
+	docinto examples/two-mixers
+	dodoc examples/two-mixers/*
 }
diff --git a/media-sound/gqmpeg/ChangeLog b/media-sound/gqmpeg/ChangeLog
index d090ebfb79fe..e07e05bea427 100644
--- a/media-sound/gqmpeg/ChangeLog
+++ b/media-sound/gqmpeg/ChangeLog
@@ -1,6 +1,59 @@
 # ChangeLog for media-sound/gqmpeg
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gqmpeg/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/media-sound/gqmpeg/ChangeLog,v 1.1.1.1 2005/11/30 09:38:14 chriswhite Exp $
+
+  14 Sep 2005; Aron Griffis <agriffis@gentoo.org> gqmpeg-0.20.0.ebuild:
+  Mark 0.20.0 stable on alpha
+
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org> gqmpeg-0.20.0.ebuild:
+  Stable on ppc64
+
+*gqmpeg-0.91.1 (21 Nov 2004)
+
+  21 Nov 2004; Tony Vroon <chainsaw@gentoo.org> +gqmpeg-0.91.1.ebuild:
+  Version bump, closes bug #71131.
+
+  01 Nov 2004; Markus Rothe <corsair@gentoo.org>
+
+  gqmpeg-0.20.0.ebuild:
+  Marked ~ppc64; bug #64630
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> gqmpeg-0.20.0.ebuild:
+  Stable amd64, sparc.
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> gqmpeg-0.20.0.ebuild:
+  ~amd64
+
+  15 May 2004; Jason Wever <weeve@gentoo.org> gqmpeg-0.20.0.ebuild:
+  Added ~sparc keyword.
+
+  13 May 2004; David Holm <dholm@gentoo.org> gqmpeg-0.20.0.ebuild:
+  Added to ~ppc.
+
+  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> gqmpeg-0.17.0.ebuild,
+  gqmpeg-0.19.0.ebuild, gqmpeg-0.20.0.ebuild:
+  Ebuild cleanup.  Stable on x86.
+
+  09 Sep 2003; Aron Griffis <agriffis@gentoo.org> gqmpeg-0.20.0.ebuild:
+  Add ~alpha
+
+*gqmpeg-0.20.0 (25 Jun 2003)
+
+  25 Jun 2003; Martin Holzer <mholzer@gentoo.org> gqmpeg-0.20.0.ebuild:
+  Version bumped. Closes #19017.
+
+*gqmpeg-0.19.0 (22 Oct 2002)
+
+  22 Oct 2202; Seemant Kulleen <seemant@gentoo.org> gqmpeg-0.19.0.ebuild
+  files/digest-gqmpeg-0.19.0 :
+
+  Version bump, thanks to: rectrix@rectrix.cx (Tim Hobbs) in bug #9400.
+
+*gqmpeg-0.17.0 (26 Aug 2002)
+
+  26 Aug 2002; Paul Belt <gaarde@gentoo.org> ChangeLog :
+
+  Version bump.
 
 *gqmpeg-0.9.0 (1 Feb 2002)
 
diff --git a/media-sound/gqmpeg/Manifest b/media-sound/gqmpeg/Manifest
index e69de29bb2d1..9606cc845da8 100644
--- a/media-sound/gqmpeg/Manifest
+++ b/media-sound/gqmpeg/Manifest
@@ -0,0 +1,11 @@
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 af9fee704f6caf70441789d4cab0a108 ChangeLog 2170
+MD5 e92f7a8a3f4ee4fc13e5c8603d86ea90 gqmpeg-0.20.0.ebuild 869
+MD5 cb66068e4da644c587189991148f35f7 gqmpeg-0.19.0.ebuild 840
+MD5 113c31bd970813123ab98a63008ab48e gqmpeg-0.17.0.ebuild 840
+MD5 a1f9152950ee75282f33a5f4c068b3d6 gqmpeg-0.91.1.ebuild 916
+MD5 d026bbc7331c7e0dad3113596eb7f586 files/digest-gqmpeg-0.20.0 65
+MD5 51b49ffafcd770b19ac5237f2796a17d files/gqmpeg.desktop 127
+MD5 be1b3faf99db9557e7027df5192256a8 files/digest-gqmpeg-0.19.0 65
+MD5 ff0bee6a22fe1bec9c30a5628821e89c files/digest-gqmpeg-0.17.0 65
+MD5 b094af61165ed9b9bfd70aa11e6535db files/digest-gqmpeg-0.91.1 66
diff --git a/media-sound/gqmpeg/gqmpeg-0.17.0.ebuild b/media-sound/gqmpeg/gqmpeg-0.17.0.ebuild
index b465924933a2..309d21f59939 100644
--- a/media-sound/gqmpeg/gqmpeg-0.17.0.ebuild
+++ b/media-sound/gqmpeg/gqmpeg-0.17.0.ebuild
@@ -1,11 +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/media-sound/gqmpeg/gqmpeg-0.17.0.ebuild,v 1.1 2002/08/27 00:56:08 gaarde Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gqmpeg/gqmpeg-0.17.0.ebuild,v 1.1.1.1 2005/11/30 09:38:14 chriswhite Exp $
+
+IUSE="nls gnome"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="front end to various audio players, including mpg123"
-SRC_URI="mirror://sourceforge/gqmpeg/${P}.tar.gz"
 HOMEPAGE="http://gqmpeg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gqmpeg/${P}.tar.gz"
+RESTRICT="nomirror"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/media-sound/gqmpeg/gqmpeg-0.19.0.ebuild b/media-sound/gqmpeg/gqmpeg-0.19.0.ebuild
index 1e86fda0486c..69939fb24ace 100644
--- a/media-sound/gqmpeg/gqmpeg-0.19.0.ebuild
+++ b/media-sound/gqmpeg/gqmpeg-0.19.0.ebuild
@@ -1,17 +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/media-sound/gqmpeg/gqmpeg-0.19.0.ebuild,v 1.1 2002/10/22 09:54:30 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gqmpeg/gqmpeg-0.19.0.ebuild,v 1.1.1.1 2005/11/30 09:38:14 chriswhite Exp $
 
 IUSE="nls gnome"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="front end to various audio players, including mpg123"
-SRC_URI="mirror://sourceforge/gqmpeg/${P}.tar.gz"
 HOMEPAGE="http://gqmpeg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gqmpeg/${P}.tar.gz"
+RESTRICT="nomirror"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 DEPEND="=x11-libs/gtk+-1.2*
 	>=media-libs/gdk-pixbuf-0.13.0"
diff --git a/media-sound/gqmpeg/gqmpeg-0.20.0.ebuild b/media-sound/gqmpeg/gqmpeg-0.20.0.ebuild
index 15efd295e88e..f7dfbf2bc35f 100644
--- a/media-sound/gqmpeg/gqmpeg-0.20.0.ebuild
+++ b/media-sound/gqmpeg/gqmpeg-0.20.0.ebuild
@@ -1,17 +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/media-sound/gqmpeg/gqmpeg-0.20.0.ebuild,v 1.1 2003/06/25 20:46:19 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gqmpeg/gqmpeg-0.20.0.ebuild,v 1.1.1.1 2005/11/30 09:38:15 chriswhite Exp $
 
 IUSE="nls gnome"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="front end to various audio players, including mpg123"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://gqmpeg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+RESTRICT="nomirror"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="alpha amd64 ~ppc ppc64 sparc x86"
 
 DEPEND="=x11-libs/gtk+-1.2*
 	>=media-libs/gdk-pixbuf-0.13.0"
diff --git a/media-sound/gqmpeg/gqmpeg-0.91.1.ebuild b/media-sound/gqmpeg/gqmpeg-0.91.1.ebuild
index d36ae922a8a3..06da1680f3e2 100644
--- a/media-sound/gqmpeg/gqmpeg-0.91.1.ebuild
+++ b/media-sound/gqmpeg/gqmpeg-0.91.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/media-sound/gqmpeg/gqmpeg-0.91.1.ebuild,v 1.1 2004/11/21 20:53:59 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gqmpeg/gqmpeg-0.91.1.ebuild,v 1.1.1.1 2005/11/30 09:38:14 chriswhite Exp $
 
 IUSE="nls gnome"
 
diff --git a/media-sound/gqradio/ChangeLog b/media-sound/gqradio/ChangeLog
index 7b1f7304f021..f0a112b29288 100644
--- a/media-sound/gqradio/ChangeLog
+++ b/media-sound/gqradio/ChangeLog
@@ -1,8 +1,39 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gqradio/ChangeLog,v 1.1 2003/03/02 20:14:55 weeve Exp $
+# ChangeLog for media-sound/gqradio
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gqradio/ChangeLog,v 1.1.1.1 2005/11/30 09:38:12 chriswhite Exp $
+
+  04 Sep 2005; Jason Wever <weeve@gentoo.org> gqradio-1.9.2.ebuild:
+  Added dependency fix from bug #103744.
+
+*gqradio-1.9.2 (27 Feb 2005)
+
+  27 Feb 2005; Jason Wever <weeve@gentoo.org> gqradio-1.9.1.ebuild,
+  +gqradio-1.9.2.ebuild:
+  Marked 1.9.1 stable, version bump for 1.9.2.
+
+  12 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> gqradio-1.9.1.ebuild:
+  ~sparc ~amd64
+
+  13 May 2004; David Holm <dholm@gentoo.org> gqradio-1.9.1.ebuild:
+  Added to ~ppc.
+
+*gqradio-1.9.1 (10 Apr 2004)
+
+  10 Apr 2004; Jason Wever <weeve@gentoo.org> gqradio-1.9.1.ebuild:
+  Version bump.  New version includes gtk+2 interface and new theme.
+
+*gqradio-1.0 (17 Mar 2004)
+
+  17 Mar 2004; Jason Wever <weeve@gentoo.org> gqradio-1.0.ebuild:
+  Version bump.
+
+  02 Jul 2003; Jason Wever <weeve@gentoo.org> metadata.xml:
+  Added metadata.xml
 
 *gqradio-0.99.0 (02 Mar 2003)
 
+  10 Mar 2003; Jason Wever <weeve@gentoo.org> gqradio-0.99.0.ebuild:
+  Changed ~x86 keyword to x86.
+
   02 Mar 2003; Jason Wever <weeve@gentoo.org> gqradio-0.99.0.ebuild :
   Initial import.
diff --git a/media-sound/gqradio/Manifest b/media-sound/gqradio/Manifest
index e69de29bb2d1..e7737880e429 100644
--- a/media-sound/gqradio/Manifest
+++ b/media-sound/gqradio/Manifest
@@ -0,0 +1,10 @@
+MD5 4d301c8ccf7dc1d68ec040ffe59c0fe2 ChangeLog 1254
+MD5 024f2b369a536414e57f969aa5b508dc gqradio-0.99.0.ebuild 913
+MD5 1b793a31dda7b1103d417edbb2ba9781 gqradio-1.0.ebuild 910
+MD5 c057c7779ebb7e6084b0f7049d4058f8 gqradio-1.9.1.ebuild 960
+MD5 f9efa15a074c3e08ab71dc0be502c885 gqradio-1.9.2.ebuild 891
+MD5 410ba85ea646aebd9294eedbe9d03357 metadata.xml 573
+MD5 87ec30922a2f44298b9c38259b3ade9b files/digest-gqradio-0.99.0 66
+MD5 7f894cfa4e1a1b3a997de47953b311f4 files/digest-gqradio-1.0 63
+MD5 3f92a1dd7d9e42d66251e12d81099748 files/digest-gqradio-1.9.1 65
+MD5 53dffcf5437f89aa1f59abe35cc5ea68 files/digest-gqradio-1.9.2 65
diff --git a/media-sound/gqradio/gqradio-0.99.0.ebuild b/media-sound/gqradio/gqradio-0.99.0.ebuild
index e26d85e5aea5..b50bfe6df3b5 100644
--- a/media-sound/gqradio/gqradio-0.99.0.ebuild
+++ b/media-sound/gqradio/gqradio-0.99.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/media-sound/gqradio/gqradio-0.99.0.ebuild,v 1.1 2003/03/02 20:14:55 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gqradio/gqradio-0.99.0.ebuild,v 1.1.1.1 2005/11/30 09:38:12 chriswhite Exp $
 
 IUSE="nls gnome"
 
@@ -10,29 +10,29 @@ SRC_URI="mirror://sourceforge/gqmpeg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 DEPEND="=x11-libs/gtk+-1.2*
-        >=media-libs/gdk-pixbuf-0.13.0"
-	
+	>=media-libs/gdk-pixbuf-0.13.0"
+
 RDEPEND="nls? ( sys-devel/gettext )"
-	
+
 src_compile() {
-        local myconf
-        use nls || myconf="--disable-nls"
+	local myconf
+	use nls || myconf="--disable-nls"
 
-        econf ${myconf} || die
-        emake || die
+	econf ${myconf} || die
+	emake || die
 }
 
 src_install() {
 	make DESTDIR=${D} install || die
-	
+
 	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README SKIN-SPECS TODO
 
-        use gnome && ( \
-                insinto /usr/share/gnome/apps/Multimedia
-                doins ${FILESDIR}/gqmpeg.desktop
-        )
+	use gnome && ( \
+		insinto /usr/share/gnome/apps/Multimedia
+		doins ${FILESDIR}/gqmpeg.desktop
+	)
 
 }
diff --git a/media-sound/gqradio/gqradio-1.0.ebuild b/media-sound/gqradio/gqradio-1.0.ebuild
index 73ec5cdded8a..0db2e0d3cf6e 100644
--- a/media-sound/gqradio/gqradio-1.0.ebuild
+++ b/media-sound/gqradio/gqradio-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/media-sound/gqradio/gqradio-1.0.ebuild,v 1.1 2004/03/18 05:27:33 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gqradio/gqradio-1.0.ebuild,v 1.1.1.1 2005/11/30 09:38:12 chriswhite Exp $
 
 IUSE="nls gnome"
 
diff --git a/media-sound/gqradio/gqradio-1.9.1.ebuild b/media-sound/gqradio/gqradio-1.9.1.ebuild
index f90cc5fd9e45..eecf12cd9251 100644
--- a/media-sound/gqradio/gqradio-1.9.1.ebuild
+++ b/media-sound/gqradio/gqradio-1.9.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/media-sound/gqradio/gqradio-1.9.1.ebuild,v 1.1 2004/04/10 23:27:13 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gqradio/gqradio-1.9.1.ebuild,v 1.1.1.1 2005/11/30 09:38:12 chriswhite Exp $
 
 IUSE="nls gnome"
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/gqmpeg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc ~sparc ~amd64"
 
 DEPEND="=x11-libs/gtk+-2*
 	>=media-libs/gdk-pixbuf-0.7.0
diff --git a/media-sound/gqradio/gqradio-1.9.2.ebuild b/media-sound/gqradio/gqradio-1.9.2.ebuild
index 3b23dbdda21f..30cf73f092db 100644
--- a/media-sound/gqradio/gqradio-1.9.2.ebuild
+++ b/media-sound/gqradio/gqradio-1.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/media-sound/gqradio/gqradio-1.9.2.ebuild,v 1.1 2005/02/27 15:32:08 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gqradio/gqradio-1.9.2.ebuild,v 1.1.1.1 2005/11/30 09:38:12 chriswhite Exp $
 
 IUSE="nls gnome"
 
@@ -12,9 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 
-DEPEND=">=x11-libs/gtk+-2.4.0
-	>=media-libs/gdk-pixbuf-0.7.0
-	>=media-libs/gdk-pixbuf-0.13.0"
+DEPEND=">=x11-libs/gtk+-2.4.0"
 
 RDEPEND="nls? ( sys-devel/gettext )"
 
diff --git a/media-sound/gradio/ChangeLog b/media-sound/gradio/ChangeLog
index 553d4fa4f66d..801b98fcb65e 100644
--- a/media-sound/gradio/ChangeLog
+++ b/media-sound/gradio/ChangeLog
@@ -1,7 +1,25 @@
-# ChangeLog for app-games/angband
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# Author TrAns13nT (blonde_les_cutie@hotmail.com)
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gradio/ChangeLog,v 1.1 2002/07/17 22:47:13 bass Exp $
+# ChangeLog for media-sound/gradio
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gradio/ChangeLog,v 1.1.1.1 2005/11/30 09:37:53 chriswhite Exp $
+
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> gradio-1.0.1.ebuild:
+  Don't install COPYING file.
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> gradio-1.0.1.ebuild:
+  Added to ~ppc.
+
+  12 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gradio-1.0.1.ebuild:
+  Stable amd64, sparc.
+
+  13 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> gradio-1.0.1.ebuild:
+  Added ~amd64 ~sparc
+
+  22 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> gradio-1.0.1.ebuild:
+  Removed explicit S=.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> gradio-1.0.1.ebuild:
+  Added IUSE.
 
 *gradio-1.0.1 (18 Jul 2002)
 
diff --git a/media-sound/gradio/Manifest b/media-sound/gradio/Manifest
index e69de29bb2d1..18600003f50a 100644
--- a/media-sound/gradio/Manifest
+++ b/media-sound/gradio/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f76a2701ed8bf335791ce79c4e07cb86 ChangeLog 925
+MD5 5b761d9226128cf4145865afb263e564 gradio-1.0.1.ebuild 673
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 19e9fb238c3e6fb321cc0580dfb8e15c files/digest-gradio-1.0.1 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGtQoj5H05b2HAEkRAudCAJ4mXvkLyLFZDjFtM8V2c+TP8AfoCQCfVbGL
+NEqsiwiNm8CQSRPkzW46XTo=
+=1Vk5
+-----END PGP SIGNATURE-----
diff --git a/media-sound/gradio/gradio-1.0.1.ebuild b/media-sound/gradio/gradio-1.0.1.ebuild
index ca92b5787c84..5bb75011fcb1 100644
--- a/media-sound/gradio/gradio-1.0.1.ebuild
+++ b/media-sound/gradio/gradio-1.0.1.ebuild
@@ -1,31 +1,31 @@
-# Copyright 2002 Gentoo 
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gradio/gradio-1.0.1.ebuild,v 1.1 2002/07/17 22:47:13 bass Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gradio/gradio-1.0.1.ebuild,v 1.1.1.1 2005/11/30 09:37:53 chriswhite Exp $
+
+IUSE=""
 
-S=${WORKDIR}/${P}
 DESCRIPTION="GTK based app for radio tuner cards"
 SRC_URI="ftp://ftp.foobazco.org/pub/gradio/${P}.tar.gz"
-
 HOMEPAGE="http://foobazco.org/projects/gradio/"
-LICENSE="GPL-2"
+
 SLOT="0"
-KEYWORDS="x86"
+LICENSE="GPL-2"
+
+KEYWORDS="amd64 ~ppc sparc x86"
 
 DEPEND="=x11-libs/gtk+-1.2*"
-RDEPEND="${DEPEND}"
- 
 
 src_compile() {
-	
 	emake || die
 }
 
 src_install () {
-	
 	dodir /usr/bin
 	dodir /usr/share/man/man1
+
 	einstall \
-	BINDIR=${D}/usr/bin \
-	MANDIR=${D}/usr/share/man/man1 || die
-	
-	dodoc Changes COPYING README
+		BINDIR=${D}/usr/bin \
+		MANDIR=${D}/usr/share/man/man1 || die
+
+	dodoc Changes README
 }
diff --git a/media-sound/gramofile/ChangeLog b/media-sound/gramofile/ChangeLog
index 2609c4675cf0..1ab20103c959 100644
--- a/media-sound/gramofile/ChangeLog
+++ b/media-sound/gramofile/ChangeLog
@@ -1,10 +1,42 @@
 # ChangeLog for media-sound/gramofile
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gramofile/ChangeLog,v 1.1 2003/03/02 09:04:17 jje Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gramofile/ChangeLog,v 1.1.1.1 2005/11/30 09:38:10 chriswhite Exp $
+
+*gramofile-1.6-r1 (08 Oct 2005)
+
+  08 Oct 2005; Simon Stelling <blubb@gentoo.org>
+  +files/gramofile-1.6-64bit.patch, +gramofile-1.6-r1.ebuild:
+  revision bump to fix bug 95727
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> gramofile-1.6.ebuild:
+  Added to ~ppc.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> gramofile-1.6.ebuild:
+  Stable amd64, sparc.
+
+  13 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> gramofile-1.6.ebuild:
+  Added ~sparc and ~amd64
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> gramofile-1.6.ebuild:
+  QA fix.
+
+  09 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> gramofile-1.6.ebuild:
+  DESCRIPTION update. fftw DEPEND is now =dev-libs/fftw-2*.  This closes bug #44097.
 
 *gramofile-1.6 (02 Mar 2003)
 
-  02 Mar 2003; root <root@gentoo.org> gramofile-1.6.ebuild:
+  22 Mar 2003; jje <jje@gentoo.org> gramofile-1.6.ebuild:
+  Updated DEPEND to include fftw.
+
+  15 Mar 2003; jje gramofile-1.6.ebuild:
+  Added two patches for plugin filters.
+  
+  Submitted by: Roland "Robelix" Obermayer
+
+  03 Mar 2003; <vladimir@gentoo.org> gramofile-1.6.ebuild:
+  Fixed small LICENSE problem
+
+  02 Mar 2003; jje <jje@gentoo.org> gramofile-1.6.ebuild:
   Initial revision.
 
   Submitted by Georg Sauthoff.
diff --git a/media-sound/gramofile/Manifest b/media-sound/gramofile/Manifest
index ed2c19ccb467..b60c5e203489 100644
--- a/media-sound/gramofile/Manifest
+++ b/media-sound/gramofile/Manifest
@@ -1,3 +1,7 @@
-MD5 fb50866d7d82e0a86b65ddaae0d26471 ChangeLog 674
-MD5 9474be2d7feae2671ee1d4e62007b90b gramofile-1.6.ebuild 1110
+MD5 b75a25622e0a19865c7e963eff34a49d ChangeLog 1393
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 dd83a3fb7795e208d9f4eb892de33eb0 gramofile-1.6-r1.ebuild 1187
+MD5 a72455a7fd09563b0dd7d46e71d859d1 gramofile-1.6.ebuild 1145
 MD5 9b67a0ae80d507fff7c72c73a58c9506 files/digest-gramofile-1.6 180
+MD5 40aee998927430b81f1b483ccaed615c files/gramofile-1.6-64bit.patch 1332
+MD5 9b67a0ae80d507fff7c72c73a58c9506 files/digest-gramofile-1.6-r1 180
diff --git a/media-sound/gramofile/files/digest-gramofile-1.6 b/media-sound/gramofile/files/digest-gramofile-1.6
index 0ec6f1f9fef4..42ed41e916e7 100644
--- a/media-sound/gramofile/files/digest-gramofile-1.6
+++ b/media-sound/gramofile/files/digest-gramofile-1.6
@@ -1 +1,3 @@
 MD5 986c86c6fa17c064bc17c2936cc833e0 gramofile-1.6.tar.gz 108596
+MD5 6e38044d77f8e4d63dfd7e0b441cf39f tappin3a.patch 1593
+MD5 8b21276b022d4e0ed224be9eb0181391 tappin3b.patch 40893
diff --git a/media-sound/gramofile/gramofile-1.6-r1.ebuild b/media-sound/gramofile/gramofile-1.6-r1.ebuild
index 6a14b14cd0b8..21cc4877338e 100644
--- a/media-sound/gramofile/gramofile-1.6-r1.ebuild
+++ b/media-sound/gramofile/gramofile-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/media-sound/gramofile/gramofile-1.6-r1.ebuild,v 1.1 2005/10/08 10:59:10 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gramofile/gramofile-1.6-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:10 chriswhite Exp $
 
 inherit eutils
 
diff --git a/media-sound/gramofile/gramofile-1.6.ebuild b/media-sound/gramofile/gramofile-1.6.ebuild
index 5f55f62990ee..76214f66e353 100644
--- a/media-sound/gramofile/gramofile-1.6.ebuild
+++ b/media-sound/gramofile/gramofile-1.6.ebuild
@@ -1,29 +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/media-sound/gramofile/gramofile-1.6.ebuild,v 1.1 2003/03/02 09:04:17 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gramofile/gramofile-1.6.ebuild,v 1.1.1.1 2005/11/30 09:38:10 chriswhite Exp $
 
-DESCRIPTION="Gramofile"
+inherit eutils
+
+DESCRIPTION="Gramofile is an audio recording/editing program whose main goal is to allow recording of analog audio for digital remastering."
 HOMEPAGE="http://panic.et.tudelft.nl/~costar/gramofile/"
-SRC_URI="http://panic.et.tudelft.nl/~costar/gramofile/${P}.tar.gz"
+SRC_URI="http://panic.et.tudelft.nl/~costar/gramofile/${P}.tar.gz
+	http://panic.et.tudelft.nl/~costar/gramofile/tappin3a.patch
+	http://panic.et.tudelft.nl/~costar/gramofile/tappin3b.patch"
 
-LICENSE="GPL2"
+LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 IUSE=""
 
-DEPEND="sys-libs/ncurses"
+DEPEND="sys-libs/ncurses \
+	=sci-libs/fftw-2*"
 
-S=${WORKDIR}/${P}
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${S}
+	epatch ${DISTDIR}/tappin3a.patch
+	epatch ${DISTDIR}/tappin3b.patch
+}
 
 src_compile() {
-	sed -e "s/CFLAGS = -Wall -O2 -DTURBO_MEDIAN -DTURBO_BUFFER/CFLAGS \= -Wall `echo ${CFLAGS}` -DTURBO_MEDIAN -DTURBO_BUFFER/" Makefile > Makefile.new
-	mv Makefile.new Makefile
+	sed -i -e "s/CFLAGS = -Wall -O2 -DTURBO_MEDIAN -DTURBO_BUFFER/CFLAGS \= -Wall `echo ${CFLAGS}` -DTURBO_MEDIAN -DTURBO_BUFFER/" Makefile
 	make || die
 }
 
 src_install() {
 	dobin gramofile bplay_gramo brec_gramo
-    dodoc Signproc.txt  Tracksplit2.txt README ChangeLog TODO
+	dodoc Signproc.txt  Tracksplit2.txt README ChangeLog TODO
 }
-
diff --git a/media-sound/grip/ChangeLog b/media-sound/grip/ChangeLog
index dfe530a811e9..c135ed71fc50 100644
--- a/media-sound/grip/ChangeLog
+++ b/media-sound/grip/ChangeLog
@@ -1,7 +1,270 @@
 # ChangeLog for media-sound/grip
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/grip/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/media-sound/grip/ChangeLog,v 1.1.1.1 2005/11/30 09:37:57 chriswhite Exp $
 
+  07 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> grip-3.3.0.ebuild,
+  grip-3.3.1.ebuild:
+  Don't require db-1 as that is probably an old dependency no more needed as
+  far as I can see. Look at bug #111766. Also use $(tc-arch) to see if it's
+  x86 architecture.
+
+*grip-3.3.1 (09 Oct 2005)
+
+  09 Oct 2005; <chainsaw@gentoo.org> +grip-3.3.1.ebuild:
+  Version bump, closes bug #104104.
+
+  02 Oct 2005; Aron Griffis <agriffis@gentoo.org> grip-3.3.0.ebuild:
+  Mark 3.3.0 stable on ia64
+
+  31 Aug 2005; Aron Griffis <agriffis@gentoo.org> grip-3.3.0.ebuild:
+  add ~ia64
+
+  18 Mar 2005; Chris White <chriswhite@gentoo.org> -grip-3.2.0-r1.ebuild,
+  -grip-3.2.0.ebuild:
+  Removing insecure versions per bug #84704.
+
+  17 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> grip-3.3.0.ebuild:
+  Stable on alpha, bug 84704.
+
+  14 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> grip-3.3.0.ebuild:
+  stable on amd64 and x86 wrt #84704
+
+  14 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> grip-3.3.0.ebuild:
+  Stable on sparc wrt #84704
+
+  14 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> grip-3.3.0.ebuild:
+  Stable on ppc.
+
+  14 Mar 2005; Markus Rothe <corsair@gentoo.org> grip-3.3.0.ebuild:
+  Stable on ppc64; bug #84704
+
+*grip-3.3.0 (13 Mar 2005)
+
+  13 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/3.3.0-crashfix.patch, +grip-3.3.0.ebuild:
+  new upstream version, fixes #84223. added a patch to fix a buffer overflow,
+  see #84704
+
+*grip-3.2.0-r1 (02 Mar 2005)
+
+  02 Mar 2005; Tony Vroon <chainsaw@gentoo.org>
+  -files/grip-3.0.6-NPTL-compat.patch, -files/grip-3.1.4-cdda.patch,
+  -files/grip-3.1.8-statuscheck-lp64.patch,
+  -files/grip-3.1.9-statuscheck-lp64.patch, +files/grip-3.2.0-proxy.patch,
+  -grip-3.0.3.ebuild, +grip-3.2.0-r1.ebuild:
+  Patch to fix proxy support for CDDB fetches, closes bug #83539. Also purged
+  one old ebuild and several stale patches.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org> grip-3.2.0.ebuild:
+  Stable on ppc64
+
+  28 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> grip-3.2.0.ebuild:
+  Added -mno-sse to fix bug #69536.
+
+  08 Nov 2004; Michael Sterrett <mr_bones_@gentoo.org> grip-3.2.0.ebuild:
+  gnuconfig_update in src_unpack
+
+  06 Nov 2004; Lars Weiler <pylon@gentoo.org> grip-3.2.0.ebuild:
+  Stable on ppc.
+
+  01 Nov 2004; Markus Rothe <corsair@gentoo.org>
+
+  grip-3.2.0.ebuild:
+  Marked ~ppc64; bug #64636
+
+  31 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> grip-3.2.0.ebuild:
+  Only install .desktop to applications.
+
+  19 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> -grip-3.0.7.ebuild,
+  -grip-3.1.10.ebuild, -grip-3.1.9.ebuild:
+  Removing old versions.
+
+  13 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> grip-3.2.0.ebuild:
+  Stable on alpha.
+
+  18 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org> grip-3.2.0.ebuild:
+  Stable amd64.
+
+  13 Jun 2004; Jason Wever <weeve@gentoo.org> grip-3.2.0.ebuild:
+  Stable on sparc.
+
+  30 May 2004; Jeremy Huddleston <eradicator@gentoo.org> grip-3.2.0.ebuild:
+  Stable x86.
+
+*grip-3.2.0 (28 Apr 2004)
+
+  28 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> grip-3.2.0.ebuild:
+  Version bump closes bug #49186.
+
+*grip-3.1.10 (24 Apr 2004)
+
+  24 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> grip-3.1.10.ebuild,
+  grip-3.1.5.ebuild, grip-3.1.8.ebuild:
+  Version bump and removed old versions.
+
+  03 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> grip-3.1.9.ebuild,
+  files/grip-3.1.9-statuscheck-lp64.patch:
+  Readding the amd64 fix for the new version.
+
+*grip-3.1.9 (03 Apr 2004)
+
+  03 Apr 2004; Brandon Low <lostlogic@gentoo.org> grip-3.1.9.ebuild:
+  Bump unstable
+
+  02 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> grip-3.1.8.ebuild:
+  Added net-misc/curl dep.  Only 3.1.8 seems to need it.  Closes bug #46398.
+
+  01 Apr 2004; Jason Eric Huebel <jhuebel@gentoo.org> grip-3.1.8.ebuild,
+  files/grip-3.1.8-statuscheck-lp64.patch:
+  patch for AMD64 SMP crash, submitted by Brian Silverthorn <bcs26@cornell.edu>
+
+*grip-3.1.8 (30 Mar 2004)
+
+  30 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> grip-3.0.3.ebuild,
+  grip-3.0.7.ebuild, grip-3.1.7.ebuild, grip-3.1.8.ebuild:
+  Version bump.  Removing buggy version.  See bug #45922
+
+*grip-3.1.7 (22 Mar 2004)
+
+  22 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> grip-3.1.4.ebuild,
+  grip-3.1.7.ebuild:
+  Removing old ebuild.  Version bump closes bug #45449.
+
+*grip-3.1.5 (07 Mar 2004)
+
+  07 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> grip-3.1.5.ebuild:
+  Version bump.  Closes bug #43805.
+
+  07 Feb 2004; Aron Griffis <agriffis@gentoo.org> grip-3.1.4.ebuild:
+  stable on alpha
+
+  27 Jan 2004; Jason Wever <weeve@gentoo.org> grip-3.1.4.ebuild:
+  Added ~sparc keyword.
+
+  23 Jan 2004; Nick Hadaway <raker@gentoo.org> grip-*.ebuild:
+  Loosened gtk+ dependancy on the 3.1.x series.  See bug #36490.  Thanks
+  to Adam for testing grip with gtk+-2.3.1.  Also updated copyright 
+  years.
+
+*grip-3.1.4 (03 Jan 2004)
+
+  03 Jan 2004; Martin Holzer <mholzer@gentoo.org> grip-3.1.4.ebuild,
+  files/grip-3.1.4-cdda.patch:
+  Version bumped. Closes 36744
+
+  20 Dec 2003; Guy Martin <gmsoft@gentoo.org> grip-3.1.3.ebuild:
+  Marked stable on hppa.
+
+*grip-3.1.3 (04 Nov 2003)
+
+  04 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org> grip-3.1.3.ebuild:
+  development version bump
+
+  27 Oct 2003; Brad House <brad_mssw@gentoo.org> grip-3.1.2.ebuild:
+  add ~amd64 flag
+
+*grip-3.1.2 (19 Oct 2003)
+
+  19 Oct 2003; Martin Holzer <mholzer@gentoo.org> grip-3.1.2.ebuild:
+  Version bumped. Closes #30914
+
+*grip-3.1.1-r1 (13 Jul 2003)
+
+  13 Jul 2003; <spider@gentoo.org> grip-3.1.1-r1.ebuild:
+  Removing old dependency of gnome-libs (those are gnome 1.4 not 2.x)
+
+  11 Jul 2003; Martin Holzer <mholzer@gentoo.org> grip-3.1.1.ebuild:
+  Added Depend. Closes #24310.
+
+*grip-3.1.1 (11 Jul 2003)
+
+  11 Jul 2003; Martin Holzer <mholzer@gentoo.org> grip-3.1.1.ebuild:
+  Version bumped. Closes #24275
+
+  26 Apr 2003; Martin Schlemmer <azarah@gentoo.org> :
+  Rip NPTL stuff, as its no longer needed.
+
+*grip-3.0.7 (23 Apr 2003)
+
+  23 Apr 2003;  Arcady Genkin <agenkin@gentoo.org> :
+  Version bump.
+
+*grip-3.0.6 (16 Feb 2003)
+
+  25 Mar 2003; Aron Griffis <agriffis@gentoo.org> grip-3.0.6.ebuild:
+  Add ~alpha to KEYWORDS
+
+  06 March 2003; Martin Schlemmer <azarah@gentoo.org> grip-3.0.6.ebuild :
+  The NPTL pthreads implementation do not support the
+  pthread_kill_other_threads_np function, as its a true posix threading
+  library .. patch grip thus to use pthread_kill if we are using NPTL.
+
+  16 Feb 2003;  Arcady Genkin <agenkin@gentoo.org> :
+  Version bump.
+
+*grip-3.0.5 (21 Jan 2003)
+
+  21 Jan 2003;  Arcady Genkin <agenkin@gentoo.org> :
+  Version bump.
+
+*grip-3.0.4 (30 Dec 2002)
+
+  30 Dec 2002; Ryan Phillips <rphillips@gentoo.org> grip-3.0.4.ebuild :
+  Version bump
+
+*grip-3.0.3 (26 Sep 2002)
+
+  26 Sep 2002; Arcady Genkin <agenkin@gentoo.org> grip-3.0.3.ebuild :
+
+  Update to 3.0.3.
+  Moved Makefile.in mangling into src_unpack(), where it belongs.
+  Commented out src_unpack(), since the aforementioned mangling no
+  longer seems to be required.
+
+*grip-3.0.1 (19 Jun 2002)
+
+  19 Jun 2002; Arcady Genkin <agenkin@thpoon.com> grip-3.0.1.ebuild :
+
+  Version 3.0.1 is out.
+
+*grip-3.0.0-r1 (25 Apr 2002)
+
+  25 Apr 2002; Seemant Kulleen <seemant@gentoo.org> grip-3.0.0-r1.ebuild
+  files/digest-grip-3.0.0 :
+
+  Added db1 to the DEPEND list. Thanks to: ivar_k@hotmail.com (Ivar Kvalvik)
+  in bug #1980
+
+*grip-3.0.0 (19 Apr 2002)
+
+  19 Apr 2002; Seemant Kulleen <seemant@gentoo.org> grip-3.0.0.ebuild :
+
+  Version bump to newest stable
+
+*grip-2.98.6-r1 (12 Apr 2002)
+
+  12 Apr 2002; Seemant Kulleen <seemant@gentoo.org> grip-2.98.6-r1.ebuild :
+
+  Changed ogg flag to oggvorbis instead.
+
+*grip-2.98.6 (11 Feb 2002)
+
+  11 Feb 2002; Bruce A. Locke <blocke@shivan.org> ChangeLog:
+
+  Grip 2.98.6 with added optional ogg dependency
+
+*grip-2.98.5 (1 Feb 2002)
+  
+  1 Feb 2002; T.Neidt <tod@gentoo.org> ChangeLog :
+
+  New version released to fix nasty bug in 2.98.3 that caused grip to crash
+  after ripping the last track of a cd.  No changes to the ebuild, just a 
+  copy of grip-2.98.3-r1.ebuild to grip-2.98.5.ebuild. =media-sound/grip-2.98.3
+  has been package masked.
+  
 *grip-2.98.3-r1 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
index 1e7f9696a07a..16c127ecba92 100644
--- a/media-sound/grip/Manifest
+++ b/media-sound/grip/Manifest
@@ -1,14 +1,18 @@
-MD5 da088bd2fa8490495376a153b7ea518e ChangeLog 2944
-MD5 f57f2b97e2b36ca78dec595610293a64 grip-3.0.1.ebuild 1199
-MD5 330da5cfedf6d9b9b92f71d1f3ffac2b grip-3.0.3.ebuild 1394
-MD5 b9a7176ba5b3dcd50ff01de56e4cabe0 grip-3.0.4.ebuild 1396
-MD5 7cf6912f0e32f597e7f2fe9ba5a3f1dd grip-3.0.5.ebuild 1485
-MD5 68ee36815df39d41611b91bba0582b72 grip-3.0.6.ebuild 1285
-MD5 3be90f76397e62aea6d0b9948a35b98d grip-3.0.7.ebuild 930
-MD5 0aaf56ba948a1b19df62d606a39ed864 files/digest-grip-3.0.1 62
-MD5 f278e502d9b42a41a2f29773883d1d9a files/digest-grip-3.0.3 62
-MD5 2eb2d11f11495870924f47df1d332b98 files/digest-grip-3.0.4 62
-MD5 bddfd71a50f7cbbd6bd3531436bf63ac files/digest-grip-3.0.5 62
-MD5 7240ed7c44c2713a76c347be846c479a files/digest-grip-3.0.6 62
-MD5 894e3e78526e61bb0ca317e3c0ee5687 files/grip-3.0.6-NPTL-compat.patch 348
-MD5 815db67c2d74e6a43bf909ea9ec870cb files/digest-grip-3.0.7 62
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b750040b46ac4c3a3800156ee526a3d3 ChangeLog 8900
+MD5 c130fa68ebab7bcfec283e3daa759b65 files/3.3.0-crashfix.patch 845
+MD5 2ec6b15aa9b163f9c0a79e80038f987e files/digest-grip-3.3.0 62
+MD5 5c87b956404dc4e17c37d3c39e1337e6 files/digest-grip-3.3.1 62
+MD5 994c1c45aa0d6d352db1b5dbd94b9248 files/grip-3.2.0-proxy.patch 1291
+MD5 31c1bb68652bca39ce9cd4c0d4c07d7e grip-3.3.0.ebuild 1253
+MD5 b67ddbafdfaf6a7b31d1a9819a2b10ad grip-3.3.1.ebuild 1205
+MD5 527dcfe3ce0f0b53c6b6aa8b82eb930c metadata.xml 252
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDby12j5H05b2HAEkRArPZAKCdRgC4lgVJU4BAIBl51ZXar81d8QCglQMx
+iU+UW8/ORjJ2RXoEiewu8BA=
+=Tk4N
+-----END PGP SIGNATURE-----
diff --git a/media-sound/grip/grip-3.3.0.ebuild b/media-sound/grip/grip-3.3.0.ebuild
index 7c162b40bf21..4b99b08d79c9 100644
--- a/media-sound/grip/grip-3.3.0.ebuild
+++ b/media-sound/grip/grip-3.3.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/media-sound/grip/grip-3.3.0.ebuild,v 1.1 2005/03/13 01:04:44 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/grip/grip-3.3.0.ebuild,v 1.1.1.1 2005/11/30 09:37:57 chriswhite Exp $
 
-inherit gnuconfig flag-o-matic eutils
+inherit gnuconfig flag-o-matic eutils toolchain-funcs
 
 IUSE="nls oggvorbis"
 
@@ -12,11 +12,10 @@ SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~ppc64"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86"
 
 RDEPEND=">=x11-libs/gtk+-2.2
 	x11-libs/vte
-	=sys-libs/db-1*
 	media-sound/lame
 	media-sound/cdparanoia
 	>=media-libs/id3lib-3.8.3
@@ -41,7 +40,7 @@ src_unpack() {
 
 src_compile() {
 	# Bug #69536
-	use x86 && append-flags "-mno-sse"
+	[[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse"
 
 	econf \
 		--disable-dependency-tracking \
diff --git a/media-sound/grip/grip-3.3.1.ebuild b/media-sound/grip/grip-3.3.1.ebuild
index 08d6125cc052..fbcb39c80ef3 100644
--- a/media-sound/grip/grip-3.3.1.ebuild
+++ b/media-sound/grip/grip-3.3.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/media-sound/grip/grip-3.3.1.ebuild,v 1.1 2005/10/09 22:18:25 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/grip/grip-3.3.1.ebuild,v 1.1.1.1 2005/11/30 09:37:57 chriswhite Exp $
 
-inherit gnuconfig flag-o-matic eutils
+inherit gnuconfig flag-o-matic eutils toolchain-funcs
 
 IUSE="nls oggvorbis"
 
@@ -16,7 +16,6 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND=">=x11-libs/gtk+-2.2
 	x11-libs/vte
-	=sys-libs/db-1*
 	media-sound/lame
 	media-sound/cdparanoia
 	>=media-libs/id3lib-3.8.3
@@ -39,7 +38,7 @@ src_unpack() {
 
 src_compile() {
 	# Bug #69536
-	use x86 && append-flags "-mno-sse"
+	[[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse"
 
 	econf \
 		--disable-dependency-tracking \
diff --git a/media-sound/gsm/ChangeLog b/media-sound/gsm/ChangeLog
index 029bde656e43..324dd5e0b673 100644
--- a/media-sound/gsm/ChangeLog
+++ b/media-sound/gsm/ChangeLog
@@ -1,9 +1,34 @@
 # ChangeLog for media-sound/gsm
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gsm/ChangeLog,v 1.1 2002/07/24 03:07:06 agenkin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gsm/ChangeLog,v 1.1.1.1 2005/11/30 09:37:53 chriswhite Exp $
 
-*gsm-1.0.10 (04 Feb 2002)
+  01 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/gsm-1.0.10-amd64.diff, gsm-1.0.10.ebuild:
+  added a patch for amd64, fixes #86593
 
-  04 Feb 2002; Arcady Genkin <agenkin@thpoon.com> gsm-1.0.10 :
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> gsm-1.0.10.ebuild:
+  Stable sparc.
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> gsm-1.0.10.ebuild:
+  Added to ~sparc.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> gsm-1.0.10.ebuild:
+  Stable amd64.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> gsm-1.0.10.ebuild:
+  virtual/glibc -> virtual/libc
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> gsm-1.0.10.ebuild:
+  Added IUSE.
+
+  15 Feb 2004; David Holm <dholm@gentoo.org> gsm-1.0.10.ebuild:
+  Added to ~ppc.
+
+  02 Oct 2003; Brad House <brad_mssw@gentoo.org> gsm-1.0.10.ebuild:
+  add ~amd64 flag
+
+*gsm-1.0.10 (23 Jul 2002)
+
+  23 Jul 2002; Arcady Genkin <agenkin@thpoon.com> gsm-1.0.10 :
 
   Initial version, submitted by Justin Huff <jjhuff@mspin.net>.
\ No newline at end of file
diff --git a/media-sound/gsm/Manifest b/media-sound/gsm/Manifest
index e69de29bb2d1..42df9417b790 100644
--- a/media-sound/gsm/Manifest
+++ b/media-sound/gsm/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 93d65c607af137f63978eb02811f7195 gsm-1.0.10.ebuild 1079
+MD5 6635d133f9e8b74cfebb930330144f8f ChangeLog 1156
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 8179ccaf93a92a8a0dedf55cea8eb26f files/digest-gsm-1.0.10 61
+MD5 cf99fa6ecbaddb1c554a36ba9ca4169f files/gsm-1.0.10-amd64.diff 591
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCTbCV06ebR+OMO78RAuJOAJ4iRqOx/GOir0gAU6SMPHi5iHHt/ACbBPbg
+9aQBd+wI8COrSIOTLnPzKjI=
+=rMzH
+-----END PGP SIGNATURE-----
diff --git a/media-sound/gsm/gsm-1.0.10.ebuild b/media-sound/gsm/gsm-1.0.10.ebuild
index a2980fb056cb..7bb04bc81d94 100644
--- a/media-sound/gsm/gsm-1.0.10.ebuild
+++ b/media-sound/gsm/gsm-1.0.10.ebuild
@@ -1,30 +1,40 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gsm/gsm-1.0.10.ebuild,v 1.1 2002/07/24 03:07:06 agenkin Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gsm/gsm-1.0.10.ebuild,v 1.1.1.1 2005/11/30 09:37:53 chriswhite Exp $
+
+IUSE=""
+
+inherit eutils versionator
+
+S="${WORKDIR}/${PN}-$(replace_version_separator 2 '-pl' )"
 
 DESCRIPTION="Lossy speech compression library and tool."
 HOMEPAGE="http://kbs.cs.tu-berlin.de/~jutta/toast.html"
-LICENSE="Other"
+SRC_URI="ftp://ftp.cs.tu-berlin.de/pub/local/kbs/tubmik/gsm/${P}.tar.gz"
 
-DEPEND="virtual/glibc"
+SLOT="0"
+LICENSE="OSI-Approved"
+KEYWORDS="amd64 ppc sparc x86"
 
-S="${WORKDIR}/${PN}-$(echo ${PV} | sed 's/\.\([0-9]*\)$/-pl\1/')"
-SRC_URI="ftp://ftp.cs.tu-berlin.de/pub/local/kbs/tubmik/gsm/${P}.tar.gz"
+DEPEND="virtual/libc"
 
-src_compile() {
+src_unpack() {
+	unpack ${A}
+	cd ${A}
+	use amd64 && epatch ${FILESDIR}/${P}-amd64.diff
+}
 
+src_compile() {
 	emake CCFLAGS="${CFLAGS} -c -DNeedFunctionPrototypes=1" || die
-
 }
 
 src_install() {
-
-	dodir /usr/bin /usr/lib /usr/include /usr/share/man/man3 /usr/share/man/man1
-	make INSTALL_ROOT="${D}/usr"			    \
-		GSM_INSTALL_INC="${D}/usr/include"	    \
-		GSM_INSTALL_MAN="${D}/usr/share/man/man3"   \
+	dodir /usr/bin /usr/lib /usr/include /usr/share/man/man{1,3}
+	make INSTALL_ROOT="${D}/usr" \
+		GSM_INSTALL_INC="${D}/usr/include" \
+		GSM_INSTALL_MAN="${D}/usr/share/man/man3" \
 		TOAST_INSTALL_MAN="${D}/usr/share/man/man1" \
 		install || die
-	dodoc COPYRIGHT ChangeLog ChangeLog.orig MACHINES MANIFEST README
 
+	dodoc COPYRIGHT ChangeLog* MACHINES MANIFEST README
 }
diff --git a/media-sound/gstreamripper/ChangeLog b/media-sound/gstreamripper/ChangeLog
index b62febefad8c..aa64248fc74f 100644
--- a/media-sound/gstreamripper/ChangeLog
+++ b/media-sound/gstreamripper/ChangeLog
@@ -1,6 +1,36 @@
 # ChangeLog for media-sound/gstreamripper
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gstreamripper/ChangeLog,v 1.1 2004/06/15 07:39:34 eradicator Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gstreamripper/ChangeLog,v 1.1.1.1 2005/11/30 09:38:22 chriswhite Exp $
+
+  12 Jun 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  gstreamripper-0.2.ebuild:
+  Stable on ppc.
+
+  12 Jun 2005; Sven Wegener <swegener@gentoo.org> gstreamripper-0.2.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gstreamripper-0.2.ebuild:
+  Stable sparc.
+
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org> gstreamripper-0.2.ebuild:
+  Stable on ppc64
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gstreamripper-0.2.ebuild:
+  Added to ~sparc.
+
+  01 Nov 2004; Markus Rothe <corsair@gentoo.org>
+
+  gstreamripper-0.2.ebuild:
+  Marked ~ppc64; bug #64639
+
+  26 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gstreamripper-0.2.ebuild:
+  Stable amd64 and x86.
+
+  18 Jun 2004; David Holm <dholm@gentoo.org> gstreamripper-0.2.ebuild:
+  Added to ~ppc.
 
 *gstreamripper-0.2 (15 Jun 2004)
 
diff --git a/media-sound/gstreamripper/Manifest b/media-sound/gstreamripper/Manifest
index d4d928b12857..0c1fec848e54 100644
--- a/media-sound/gstreamripper/Manifest
+++ b/media-sound/gstreamripper/Manifest
@@ -1,3 +1,4 @@
+MD5 cf37387785cc7d588751774cf5a5653c ChangeLog 1335
+MD5 2e7d14346037e6c95709052c3f40b1cd gstreamripper-0.2.ebuild 721
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 0f31677d5e665396d45e78ceafbd2354 gstreamripper-0.2.ebuild 568
 MD5 f2f7863467789259db6c78fff9fe410d files/digest-gstreamripper-0.2 70
diff --git a/media-sound/gstreamripper/gstreamripper-0.2.ebuild b/media-sound/gstreamripper/gstreamripper-0.2.ebuild
index 0526cee26846..b08f86bb0e0a 100644
--- a/media-sound/gstreamripper/gstreamripper-0.2.ebuild
+++ b/media-sound/gstreamripper/gstreamripper-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/media-sound/gstreamripper/gstreamripper-0.2.ebuild,v 1.1 2004/06/15 07:39:34 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gstreamripper/gstreamripper-0.2.ebuild,v 1.1.1.1 2005/11/30 09:38:22 chriswhite Exp $
 
 IUSE=""
 
@@ -12,13 +12,12 @@ DESCRIPTION="GStreamripper, a GTK front-end to streamripper"
 
 HOMEPAGE="http://sourceforge.net/projects/gstreamripper/"
 SRC_URI="mirror://sourceforge/gstreamripper/${MY_P}.tar.gz"
-RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 
-DEPEND=">=x11-libs/gtk+-2.4*
+DEPEND=">=x11-libs/gtk+-2.4
 	>=media-sound/streamripper-1.60.5"
 
 src_install() {
diff --git a/media-sound/gtick/ChangeLog b/media-sound/gtick/ChangeLog
index c7fa59d24ff8..20d5ed5e2664 100644
--- a/media-sound/gtick/ChangeLog
+++ b/media-sound/gtick/ChangeLog
@@ -1,11 +1,69 @@
 # ChangeLog for media-sound/gtick
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gtick/ChangeLog,v 1.1 2003/08/06 11:31:55 jje Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gtick/ChangeLog,v 1.1.1.1 2005/11/30 09:38:18 chriswhite Exp $
+
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> gtick-0.2.4.ebuild,
+  gtick-0.2.13.ebuild, gtick-0.3.0.ebuild, gtick-0.3.4.ebuild:
+  Don't install COPYING and ABOUT-NLS files.
+
+  19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  Remove retired developer from metadata.xml.
+
+*gtick-0.3.4 (18 Dec 2004)
+
+  18 Dec 2004; Tony Vroon <chainsaw@gentoo.org> +gtick-0.3.4.ebuild:
+  Version bump, closes bug #73416.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> gtick-0.3.0.ebuild:
+  Stable amd64, sparc.
+
+  13 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> gtick-0.3.0.ebuild:
+  Added ~sparc ~amd64
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> gtick-0.2.4.ebuild:
+  virtual/glibc -> virtual/libc
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> gtick-0.2.13.ebuild,
+  gtick-0.2.4.ebuild, gtick-0.3.0.ebuild:
+  Added IUSE.
+
+  14 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> gtick-0.3.0.ebuild:
+  Stable x86.
+
+  07 Mar 2004; David Holm <dholm@gentoo.org> gtick-0.3.0.ebuild:
+  Added to ~ppc.
+
+*gtick-0.3.0 (07 Mar 2004)
+
+  07 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> gtick-0.3.0.ebuild,
+  gtick-0.2.13.ebuild:
+  Version bump.  Closes bug #43810.
+  0.2.13 to stable
+
+*gtick-0.2.13 (23 Jan 2004)
+
+  23 Jan 2004; <torbenh@gentoo.org> gtick-0.2.13.ebuild, gtick-0.2.2.ebuild,
+  gtick-0.2.4.ebuild, metadata.xml:
+  version bump
+  made 0.2.4 stable
+  removed 0.2.2
+
+*gtick-0.2.4 (20 Sep 2003)
+
+  20 Sep 2003; root <root@gentoo.org> gtick-0.2.4.ebuild:
+  Version bump.
+  
+  Sumbitted by: Nicolas GRANDCLAUDE <ngclaude@visitmail.com>
+
+  09 Aug 2003; jje <jje@gentoo.org> gtick-0.2.1.ebuild:
+  Version bump and remove hardcoded version number.
+
+  Submitted by: Nicolas GRANDCLAUDE <ngclaude@visitmail.com>
 
 *gtick-0.2.1 (06 Aug 2003)
 
   06 Aug 2003; jje <jje@gentoo.org> gtick-0.2.1.ebuild:
   Initial revision.
   
-  Submitted by Nicolas GRANDCLAUDE <ngclaude@visitmail.com>
+  Submitted by: Nicolas GRANDCLAUDE <ngclaude@visitmail.com>
 
diff --git a/media-sound/gtick/Manifest b/media-sound/gtick/Manifest
index 70c145aed48c..5d9e7a6cfd21 100644
--- a/media-sound/gtick/Manifest
+++ b/media-sound/gtick/Manifest
@@ -1,2 +1,20 @@
-MD5 d1b2ae3806489e9dec6e4d770c08a61b gtick-0.2.1.ebuild 597
-MD5 560a3663eae48d550d484092cc4d08ff files/digest-gtick-0.2.1 63
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d6b6f61c28f3fa597424906b09e96d5e gtick-0.2.13.ebuild 548
+MD5 aa5ace7b59fd7543d0fb0f0400f42c1b ChangeLog 2146
+MD5 cb6663f5a9cc04a8425e3dd6d469f57b gtick-0.3.4.ebuild 606
+MD5 70180f0241efce6cd6e47bbe5751d7ba gtick-0.2.4.ebuild 584
+MD5 a0fe62caa29da4546b00ec6610bdfcb7 gtick-0.3.0.ebuild 604
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 e3a5325eb7038c07fb9b9a784f50ecba files/digest-gtick-0.3.4 64
+MD5 a0b3ffc484fedb3547eabe3ca9c8cc1b files/digest-gtick-0.3.0 64
+MD5 963ec566bcc173d8386ef3f1d7ade6e4 files/digest-gtick-0.2.4 63
+MD5 ef0dad6558842cb8241917c7d78f655c files/digest-gtick-0.2.13 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGtRVj5H05b2HAEkRAsoWAJ9JGwCouHN0lKRCfGUM4Co8lVVt0wCaAu2H
+F4JOtNzkaT5KfOoyMDiWpN0=
+=zoWh
+-----END PGP SIGNATURE-----
diff --git a/media-sound/gtick/gtick-0.2.13.ebuild b/media-sound/gtick/gtick-0.2.13.ebuild
index 701f2aa0e52b..018e978334a6 100644
--- a/media-sound/gtick/gtick-0.2.13.ebuild
+++ b/media-sound/gtick/gtick-0.2.13.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/media-sound/gtick/gtick-0.2.13.ebuild,v 1.1 2004/01/23 12:53:39 torbenh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gtick/gtick-0.2.13.ebuild,v 1.1.1.1 2005/11/30 09:38:18 chriswhite Exp $
+
+IUSE=""
 
 DESCRIPTION="a metronome application supporting different meters and speeds ranging"
 HOMEPAGE="http://www.antcom.de/gtick/"
@@ -8,17 +10,11 @@ SRC_URI="http://www.antcom.de/gtick/download/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-
-DEPEND=">=x11-libs/gtk+-2.0
-	virtual/glibc"
+KEYWORDS="x86"
 
-src_compile() {
-	econf || die "configure failed"
-	emake || die
-}
+DEPEND=">=x11-libs/gtk+-2.0"
 
 src_install() {
 	einstall || die
-	dodoc AUTHORS COPYING REAME NEWS
+	dodoc AUTHORS REAME NEWS
 }
diff --git a/media-sound/gtick/gtick-0.2.4.ebuild b/media-sound/gtick/gtick-0.2.4.ebuild
index fbc6b9a0dd73..e649026a9a94 100644
--- a/media-sound/gtick/gtick-0.2.4.ebuild
+++ b/media-sound/gtick/gtick-0.2.4.ebuild
@@ -1,28 +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/media-sound/gtick/gtick-0.2.4.ebuild,v 1.1 2003/09/20 10:15:00 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gtick/gtick-0.2.4.ebuild,v 1.1.1.1 2005/11/30 09:38:18 chriswhite Exp $
 
-DESCRIPTION="GTick is a metronome application supporting different meters and speeds ranging"
+IUSE=""
+
+DESCRIPTION="a metronome application supporting different meters and speeds ranging"
 HOMEPAGE="http://www.antcom.de/gtick/"
 SRC_URI="http://savannah.nongnu.org/download/gtick/default.pkg/${PV}/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
-RDEPEND=">=x11-libs/gtk+-2.0"
-DEPEND="virtual/glibc
-		${RDEPEND}"
-
-S=${WORKDIR}/${P}
-
-src_compile() {
-	econf || die "configure failed"
-	emake || die
-}
+DEPEND=">=x11-libs/gtk+-2.0
+	virtual/libc"
 
 src_install() {
 	einstall || die
-	dodoc AUTHORS COPYING REAME NEWS
+	dodoc AUTHORS REAME NEWS
 }
-
-
diff --git a/media-sound/gtick/gtick-0.3.0.ebuild b/media-sound/gtick/gtick-0.3.0.ebuild
index 0a343246da07..a9fa897f41d1 100644
--- a/media-sound/gtick/gtick-0.3.0.ebuild
+++ b/media-sound/gtick/gtick-0.3.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/media-sound/gtick/gtick-0.3.0.ebuild,v 1.1 2004/03/07 09:55:35 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gtick/gtick-0.3.0.ebuild,v 1.1.1.1 2005/11/30 09:38:18 chriswhite Exp $
+
+IUSE=""
 
 DESCRIPTION="a metronome application supporting different meters and speeds ranging"
 HOMEPAGE="http://www.antcom.de/gtick/"
@@ -8,11 +10,11 @@ SRC_URI="http://www.antcom.de/gtick/download/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc sparc amd64"
 
 DEPEND=">=x11-libs/gtk+-2.0"
 
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog NEWS README THANKS TODO
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
 }
diff --git a/media-sound/gtick/gtick-0.3.4.ebuild b/media-sound/gtick/gtick-0.3.4.ebuild
index 8fe4d01028f5..7de993d22efb 100644
--- a/media-sound/gtick/gtick-0.3.4.ebuild
+++ b/media-sound/gtick/gtick-0.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/media-sound/gtick/gtick-0.3.4.ebuild,v 1.1 2004/12/18 13:35:05 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gtick/gtick-0.3.4.ebuild,v 1.1.1.1 2005/11/30 09:38:18 chriswhite Exp $
 
 IUSE=""
 
@@ -16,5 +16,5 @@ DEPEND=">=x11-libs/gtk+-2.0"
 
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog NEWS README THANKS TODO
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
 }
diff --git a/media-sound/gtick/metadata.xml b/media-sound/gtick/metadata.xml
index d4ce46c038ab..e1774e3d9ad7 100644
--- a/media-sound/gtick/metadata.xml
+++ b/media-sound/gtick/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sound</herd>
-<maintainer>
-  <email>torbenh@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/media-sound/gtkguitune/ChangeLog b/media-sound/gtkguitune/ChangeLog
index e9e53cad8aae..e7ef93ae7a17 100644
--- a/media-sound/gtkguitune/ChangeLog
+++ b/media-sound/gtkguitune/ChangeLog
@@ -1,6 +1,36 @@
 # ChangeLog for media-sound/gtkguitune
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gtkguitune/ChangeLog,v 1.1 2003/06/06 19:44:49 robh Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gtkguitune/ChangeLog,v 1.1.1.1 2005/11/30 09:38:26 chriswhite Exp $
+
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> gtkguitune-0.7.ebuild:
+  Don't install COPYING file.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gtkguitune-0.7.ebuild:
+  Stable amd64, sparc.
+
+  03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gtkguitune-0.7.ebuild:
+  Readded missing ~amd64 ~sparc.  Stable x86.
+
+  01 Aug 2004; David Holm <dholm@gentoo.org> gtkguitune-0.7.ebuild:
+  Added to ~ppc.
+
+*gtkguitune-0.7 (23 Jul 2004)
+
+  23 Jul 2004; Chris White <chriswhite@gentoo.org> +gtkguitune-0.7.ebuild:
+  Version bump to close Bug #45340.  Thanks to Keith Lea for reporting.
+
+  13 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gtkguitune-0.6.ebuild:
+  Added to ~sparc and ~amd64
+
+  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gtkguitune-0.6.ebuild:
+  Stable x86.
+
+  13 Jul 2003; Martin Holzer <mholzer@gentoo.org> gtkguitune-0.6.ebuild:
+  update x11-libs/gtkmm to dev-cpp/gtkmm
 
 *gtkguitune-0.6 (06 Jun 2003)
 
diff --git a/media-sound/gtkguitune/Manifest b/media-sound/gtkguitune/Manifest
index 6487b42d21b7..265a56bdcfd1 100644
--- a/media-sound/gtkguitune/Manifest
+++ b/media-sound/gtkguitune/Manifest
@@ -1,3 +1,16 @@
-MD5 6377a61d25ad4bb25dcac7294a98f1fd ChangeLog 286
-MD5 e0defd841e47c916c63a69183ef87d07 gtkguitune-0.6.ebuild 549
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2862b90e6d61372cdecfaa52587432fa gtkguitune-0.7.ebuild 666
+MD5 44ed83478119e64fc98cae2f9114b8fd ChangeLog 1307
+MD5 d631948b51f499d717a275d9d63e4a0b gtkguitune-0.6.ebuild 661
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 7b256e0ae0aa9b2d7dca1963fccc78e0 files/digest-gtkguitune-0.7 65
 MD5 b6dfa204fcb2153265aa873e6813f74c files/digest-gtkguitune-0.6 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGtQWj5H05b2HAEkRAvHdAKCexxleHzd8CMRmPypEPMVIgDguMACff4fF
+NtRh4hbjDKbuTuQbj9og3Ww=
+=AWST
+-----END PGP SIGNATURE-----
diff --git a/media-sound/gtkguitune/gtkguitune-0.6.ebuild b/media-sound/gtkguitune/gtkguitune-0.6.ebuild
index 73a4d162e6d1..890aa41a5da6 100644
--- a/media-sound/gtkguitune/gtkguitune-0.6.ebuild
+++ b/media-sound/gtkguitune/gtkguitune-0.6.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/media-sound/gtkguitune/gtkguitune-0.6.ebuild,v 1.1 2003/06/06 19:44:49 robh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gtkguitune/gtkguitune-0.6.ebuild,v 1.1.1.1 2005/11/30 09:38:26 chriswhite Exp $
+
+IUSE=""
 
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~sparc ~amd64"
 DESCRIPTION="Guitune is a linux program for tuning guitars and other instruments by using the method of Schmitt-triggering."
 SRC_URI="http://www.geocities.com/harpin_floh/mysoft/${P}.tar.gz"
 HOMEPAGE="http://www.geocities.com/harpin_floh/kguitune_page.html"
 SLOT="0"
 
-IUSE=""
-
 DEPEND="=x11-libs/gtk+-1.2*
-	=x11-libs/gtkmm-1.2*"
-		
+	=dev-cpp/gtkmm-1.2*"
+
 src_install() {
 	einstall || die
 	dodoc README AUTHORS
diff --git a/media-sound/gtkguitune/gtkguitune-0.7.ebuild b/media-sound/gtkguitune/gtkguitune-0.7.ebuild
index 3105b71c1832..94dcf3d3dc07 100644
--- a/media-sound/gtkguitune/gtkguitune-0.7.ebuild
+++ b/media-sound/gtkguitune/gtkguitune-0.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gtkguitune/gtkguitune-0.7.ebuild,v 1.1 2004/07/23 06:07:10 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gtkguitune/gtkguitune-0.7.ebuild,v 1.1.1.1 2005/11/30 09:38:26 chriswhite Exp $
 
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc sparc amd64"
 DESCRIPTION="A guitar tuning program that uses Schmitt-triggering for quick feedback."
 SRC_URI="http://www.geocities.com/harpin_floh/mysoft/${P}.tar.gz"
 HOMEPAGE="http://www.geocities.com/harpin_floh/kguitune_page.html"
@@ -14,14 +14,9 @@ IUSE=""
 DEPEND="=x11-libs/gtk+-1.2*
 	=dev-cpp/gtkmm-1.2*"
 
-src_compile() {
-	econf || die "configure failed"
-	emake || die "make failed"
-}
-
 src_install() {
 	einstall || die
-	dodoc README AUTHORS COPYING
+	dodoc README AUTHORS
 	insinto /usr/share/pixmaps
 	doins *.xpm
 }
diff --git a/media-sound/hearnet/ChangeLog b/media-sound/hearnet/ChangeLog
index c3d578856079..6ec15a6e82e4 100644
--- a/media-sound/hearnet/ChangeLog
+++ b/media-sound/hearnet/ChangeLog
@@ -1,10 +1,28 @@
 # ChangeLog for media-sound/hearnet
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/hearnet/ChangeLog,v 1.1 2004/02/15 08:10:48 eradicator Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hearnet/ChangeLog,v 1.1.1.1 2005/11/30 09:38:18 chriswhite Exp $
+
+  30 Jan 2005; Daniel Black <dragonheart@gentoo.org> hearnet-0.0.2.ebuild:
+  dependancy transition net-libs/libpcap -> virtual/libpcap
+
+  03 Aug 2004; David Holm <dholm@gentoo.org> hearnet-0.0.2.ebuild:
+  Added to ~ppc.
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> hearnet-0.0.2.ebuild:
+  -amd64
+
+  13 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org> hearnet-0.0.2.ebuild:
+  Getting rid of virtual/jack.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> hearnet-0.0.2.ebuild:
+  Added IUSE.
+
+  10 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> hearnet-0.0.2.ebuild:
+  jack dep to virtual.  Stable x86.
 
 *hearnet-0.0.2 (15 Feb 2004)
 
   15 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> hearnet-0.0.2.ebuild:
-  Listen to your network... Ebuild submitted by Kasper Souren
-  <Kasper.Souren@ircam.fr> in bug #33688.
+  Listen to your network... Ebuild submitted by sven.wegener@stealer.net in 
+  bug #33688.
 
diff --git a/media-sound/hearnet/Manifest b/media-sound/hearnet/Manifest
index 96f420b34bb5..b65980ea949d 100644
--- a/media-sound/hearnet/Manifest
+++ b/media-sound/hearnet/Manifest
@@ -1,2 +1,14 @@
-MD5 daa6d46ec2053e4bef27360656f3dd83 hearnet-0.0.2.ebuild 725
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e92ff9e0e3aabe5ad4854369d8a63c7a ChangeLog 1048
+MD5 b2812acff31f51a1926764115c276a98 hearnet-0.0.2.ebuild 867
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 3d52d7932f2eaf092421d0a83e1bbb8a files/digest-hearnet-0.0.2 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFB/AOvmdTrptrqvGERAvC3AJ441KSboHNGT6BPpLW8g3dilGlOBACdECM/
+QuoLsYmzy6qK652hcF7a1qU=
+=pxFM
+-----END PGP SIGNATURE-----
diff --git a/media-sound/hearnet/hearnet-0.0.2.ebuild b/media-sound/hearnet/hearnet-0.0.2.ebuild
index f2ef3a17e32d..60c0b5e0684a 100644
--- a/media-sound/hearnet/hearnet-0.0.2.ebuild
+++ b/media-sound/hearnet/hearnet-0.0.2.ebuild
@@ -1,15 +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/media-sound/hearnet/hearnet-0.0.2.ebuild,v 1.1 2004/02/15 08:10:48 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hearnet/hearnet-0.0.2.ebuild,v 1.1.1.1 2005/11/30 09:38:18 chriswhite Exp $
+
+IUSE=""
 
 DESCRIPTION="Listen to your network"
 HOMEPAGE="http://falcon.fugal.net/~fugalh/hearnet/"
 SRC_URI="http://falcon.fugal.net/~fugalh/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+#-amd64: 0.0.2: No sound sent to jack server
+KEYWORDS="x86 -amd64 ~ppc"
 
-DEPEND=">=net-libs/libpcap-0.4
+DEPEND="virtual/libpcap
 	media-sound/jack-audio-connection-kit"
 
 S=${WORKDIR}/${PN}
diff --git a/media-sound/horgand/ChangeLog b/media-sound/horgand/ChangeLog
index dd89965657bb..88fa6df2f502 100644
--- a/media-sound/horgand/ChangeLog
+++ b/media-sound/horgand/ChangeLog
@@ -1,6 +1,36 @@
 # ChangeLog for media-sound/horgand
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/horgand/ChangeLog,v 1.1 2003/06/06 22:37:42 robh Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/horgand/ChangeLog,v 1.1.1.1 2005/11/30 09:38:05 chriswhite Exp $
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> horgand-1.06.ebuild:
+  Added to ~ppc.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  horgand-1.06.ebuild:
+  Stable sparc.
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  horgand-1.06.ebuild:
+  Added to ~sparc.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> horgand-1.06.ebuild:
+  Stable amd64.
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> horgand-1.06.ebuild:
+  ~amd64
+
+  13 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org> horgand-0.91.ebuild,
+  horgand-1.06.ebuild:
+  Getting rid of virtual/jack.
+
+  20 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> horgand-1.06.ebuild:
+  Stable in x86.
+
+*horgand-1.06 (25 Feb 2004)
+
+  25 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> horgand-1.06.ebuild,
+  metadata.xml:
+  Version bump.  Hopefully fixes bug #42030.
 
 *horgand-0.91 (06 Jun 2003)
 
diff --git a/media-sound/horgand/Manifest b/media-sound/horgand/Manifest
index d869f0b9aef9..a0c0cac26ee8 100644
--- a/media-sound/horgand/Manifest
+++ b/media-sound/horgand/Manifest
@@ -1,2 +1,6 @@
-MD5 5fe808af10e1b298ca72a79ed36399e6 horgand-0.91.ebuild 554
+MD5 2ae6f16de45ae88038f31223f382c3e8 ChangeLog 1248
+MD5 27751442fc730c76fe0a4f3bd4224635 horgand-0.91.ebuild 757
+MD5 8e4b455101da5a97a99d83e8455ad511 horgand-1.06.ebuild 673
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 3ddaec66640532a300bf88ed3f05fe47 files/digest-horgand-0.91 63
+MD5 81b9ca40ecea06bde638c645123ce5f4 files/digest-horgand-1.06 65
diff --git a/media-sound/horgand/horgand-0.91.ebuild b/media-sound/horgand/horgand-0.91.ebuild
index cfd28338c5a8..ca6611227939 100644
--- a/media-sound/horgand/horgand-0.91.ebuild
+++ b/media-sound/horgand/horgand-0.91.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/media-sound/horgand/horgand-0.91.ebuild,v 1.1 2003/06/06 22:37:42 robh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/horgand/horgand-0.91.ebuild,v 1.1.1.1 2005/11/30 09:38:05 chriswhite Exp $
 
 DESCRIPTION="horgand is an opensource software organ."
 HOMEPAGE="http://personal.telefonica.terra.es/web/soudfontcombi/"
@@ -8,25 +8,23 @@ SRC_URI="http://personal.telefonica.terra.es/web/soudfontcombi/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 IUSE=""
 
 DEPEND=">=x11-libs/fltk-1.1.2
-	virtual/jack"
-
-S="${WORKDIR}/${P}"
+	media-sound/jack-audio-connection-kit"
 
 src_compile() {
-        emake || die "compile failed"
+	emake || die "compile failed"
 }
 
 src_install() {
-        cp Makefile Makefile~
-        sed -e "s:PREFIX = /usr/local:PREFIX = /usr:" Makefile~ > Makefile
+	cp Makefile Makefile~
+	sed -e "s:PREFIX = /usr/local:PREFIX = /usr:" Makefile~ > Makefile
 
 	dodir /usr/bin
-	
+
 	einstall DESTDIR=${D}
 
 	prepalldocs
diff --git a/media-sound/horgand/horgand-1.06.ebuild b/media-sound/horgand/horgand-1.06.ebuild
index 9917ea290d1d..350ece149689 100644
--- a/media-sound/horgand/horgand-1.06.ebuild
+++ b/media-sound/horgand/horgand-1.06.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/media-sound/horgand/horgand-1.06.ebuild,v 1.1 2004/02/26 07:55:35 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/horgand/horgand-1.06.ebuild,v 1.1.1.1 2005/11/30 09:38:05 chriswhite Exp $
+
+IUSE=""
 
 DESCRIPTION="horgand is an opensource software organ."
 HOMEPAGE="http://personal.telefonica.terra.es/web/soudfontcombi/"
@@ -8,16 +10,14 @@ SRC_URI="http://download.berlios.de/horgand/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-
-IUSE=""
+KEYWORDS="amd64 ~ppc sparc x86"
 
 DEPEND=">=x11-libs/fltk-1.1.2
 	media-libs/libsndfile
 	media-libs/alsa-lib
-	virtual/jack"
+	media-sound/jack-audio-connection-kit"
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog NEWS README
 }
diff --git a/media-sound/hydrogen/ChangeLog b/media-sound/hydrogen/ChangeLog
index 7d36ba5e759f..5b057e4cc4c9 100644
--- a/media-sound/hydrogen/ChangeLog
+++ b/media-sound/hydrogen/ChangeLog
@@ -1,6 +1,151 @@
 # ChangeLog for media-sound/hydrogen
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/ChangeLog,v 1.1 2003/03/09 02:41:03 jje Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/ChangeLog,v 1.1.1.1 2005/11/30 09:38:28 chriswhite Exp $
+
+  07 Jul 2005; Caleb Tennis <caleb@gentoo.org> hydrogen-0.9.0.ebuild,
+  hydrogen-0.9.1.ebuild:
+  Fix qt dep
+
+  27 May 2005; Jan Brinkmann <luckyduck@gentoo.org> hydrogen-0.9.1.ebuild:
+  install a .desktop file for hydrogen, fixes #93253
+
+  08 May 2005; Joseph Jezak <josejx@gentoo.org> +files/0.9.1-OSS.patch,
+  hydrogen-0.9.1.ebuild:
+  Added patch to fix white noise when using OSS on ppc.
+
+*hydrogen-0.9.1 (11 Apr 2005)
+
+  11 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> metadata.xml,
+  -files/hydrogen-0.8.2-64bit.patch, -files/hydrogen-0.8.2-gcc34.patch,
+  -files/hydrogen-0.8.2-ui-spacer.patch,
+  -files/hydrogen-0.9.0_beta1-math.patch, -hydrogen-0.8.2-r4.ebuild,
+  +hydrogen-0.9.1.ebuild:
+  new upstream version, fixes #72986. updated maintainer information, chriswhite
+  is retired. did some cleanup.
+
+  05 Apr 2005; Eric Shattow <jnc@gentoo.org> hydrogen-0.9.0.ebuild:
+  Depend on libsndfile. Closes #88053
+
+  11 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> hydrogen-0.9.0.ebuild:
+  added missing qt dependency, fixes #84590
+
+  05 Mar 2005; Markus Rothe <corsair@gentoo.org> hydrogen-0.9.0.ebuild:
+  Stable on ppc64
+
+  03 Jan 2005; Markus Rothe <corsair@gentoo.org> hydrogen-0.9.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  hydrogen-0.9.0.ebuild, -hydrogen-0.9.0_beta1.ebuild:
+  Stable amd64, sparc, x86.
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  hydrogen-0.9.0.ebuild:
+  Added to ~sparc.
+
+  12 Nov 2004; Chris White <chriswhite@gentoo.org> hydrogen-0.9.0.ebuild:
+  Readded keywords back like a good little dev.
+
+*hydrogen-0.9.0 (08 Nov 2004)
+
+  08 Nov 2004; Chris White <chriswhite@gentoo.org> +hydrogen-0.9.0.ebuild:
+  Version bump to 0.9.0 per bug 68418. Thanks goes to Eric Shattow for providing
+  the ebuild.
+
+  19 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -hydrogen-0.8.1-r1.ebuild, -hydrogen-0.8.1.ebuild,
+  -hydrogen-0.8.2-r1.ebuild, -hydrogen-0.8.2-r2.ebuild,
+  -hydrogen-0.8.2-r3.ebuild, -hydrogen-0.8.2.ebuild:
+  Removing old versions.
+
+  20 Aug 2004; <frank@gentoo.org> hydrogen-0.9.0_beta1.ebuild:
+  Added media-libs/flac dependency. Closes bug #60977.
+
+*hydrogen-0.9.0_beta1 (18 Aug 2004)
+
+  18 Aug 2004; <frank@gentoo.org> +files/hydrogen-0.9.0_beta1-math.patch,
+  +hydrogen-0.9.0_beta1.ebuild:
+  Version bump to 0.9.0_beta1. Closes bug #59580.
+
+  26 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  hydrogen-0.8.2-r4.ebuild:
+  Stable amd64 and x86.
+
+*hydrogen-0.8.2-r4 (01 Jul 2004)
+
+  01 Jul 2004; Frank van de Pol <fvdpol@gentoo.org>
+  +files/hydrogen-0.8.2-gcc34.patch, +hydrogen-0.8.2-r4.ebuild:
+  New revision to fix a gcc-3.4 compilation error. Closes bug #52185
+
+*hydrogen-0.8.2-r3 (23 Jun 2004)
+
+  23 Jun 2004; Frank van de Pol <fvdpol@gentoo.org> +hydrogen-0.8.2-r3.ebuild:
+  New revision with reworked installation of drumkits and demo songs. Includes
+  new kits, closing bug #54570.
+
+  19 Jun 2004; David Holm <dholm@gentoo.org> hydrogen-0.8.2-r2.ebuild:
+  Added to ~ppc.
+
+*hydrogen-0.8.2-r2 (19 Jun 2004)
+
+  19 Jun 2004; Frank van de Pol <fvdpol@gentoo.org>
+  +files/hydrogen-0.8.2-64bit.patch, +hydrogen-0.8.2-r2.ebuild:
+  Added patch to fix noise on amd64. Closes bug #54340
+
+*hydrogen-0.8.2-r1 (18 Jun 2004)
+
+  18 Jun 2004; Frank van de Pol <fvdpol@gentoo.org> metadata.xml,
+  +files/hydrogen-0.8.2-ui-spacer.patch, +hydrogen-0.8.2-r1.ebuild:
+  Compilation fixes, thanks to Michael Schnake <schnake@composition.de>
+  closes bug #46568
+
+  13 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  hydrogen-0.8.1-r1.ebuild, hydrogen-0.8.1.ebuild, hydrogen-0.8.2.ebuild:
+  Getting rid of virtual/jack.
+
+  28 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  hydrogen-0.8.2.ebuild:
+  Stable x86.
+
+  03 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  hydrogen-0.8.0.ebuild, hydrogen-0.8.1-r1.ebuild, hydrogen-0.8.1.ebuild,
+  hydrogen-0.8.1_beta5.ebuild, hydrogen-0.8.2.ebuild:
+  Adding workaround for QT bug.  Removing old ebuilds.
+
+*hydrogen-0.8.2 (29 Mar 2004)
+
+  29 Mar 2004; <torbenh@gentoo.org> hydrogen-0.8.2.ebuild:
+  Version bump to 0.8.2
+
+  27 Feb 2004; <torbenh@gentoo.org> hydrogen-0.8.1-r1.ebuild,
+  hydrogen-0.8.1.ebuild:
+  Fixed Dependecies
+
+*hydrogen-0.8.1-r1 (22 Jan 2004)
+
+  22 Jan 2004; <torbenh@gentoo.org> hydrogen-0.8.1-r1.ebuild:
+  Added drumkit downloading.
+
+*hydrogen-0.8.1 (21 Jan 2004)
+*hydrogen-0.8.1_beta5 (21 Jan 2004)
+
+  21 Jan 2004; <torbenh@gentoo.org> hydrogen-0.8.0.ebuild,
+  hydrogen-0.8.1.ebuild, hydrogen-0.8.1_beta5.ebuild:
+  Version bump
+
+*hydrogen-0.8.0 (25 May 2003)
+
+  25 May 2003; jje <jje@gentoo.org> hydrogen-0.7.4.ebuild,
+  hydrogen-0.7.4.ebuild, hydrogen-0.7.6.ebuild, hydrogen-0.7.6.ebuild,
+  hydrogen-0.8.0.ebuild:
+  Version bump and removing old versions.
+
+*hydrogen-0.7.6 (12 Apr 2003)
+
+  12 Apr 2003; jje hydrogen-0.7.6.ebuild:
+  Version Bump.
+  
+  Submitted by: Marc Hildebrand
 
 *hydrogen-0.7.4 (09 Mar 2003)
 
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index b63789bb683a..0835171b7bcc 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,5 +1,7 @@
-MD5 34a6d0dd44a30b8be4f5010eb491d1e6 hydrogen-0.7.4.ebuild 656
-MD5 9985267140bf5ede8f9aeb7bbc943cea ChangeLog 490
-MD5 d66989e208f7952b689859918f3c5e40 hydrogen-0.7.6.ebuild 554
-MD5 2bca495d9f9154d2363ca88f2d9a1f1d files/digest-hydrogen-0.7.4 66
-MD5 13b6a7d1984cc812a24d0285707e0464 files/digest-hydrogen-0.7.6 66
+MD5 1b1895dce78bfd8a8b7a7320e0c2ee68 hydrogen-0.9.1.ebuild 1271
+MD5 2c91c719bf6645bafb66b6d990f717e2 hydrogen-0.9.0.ebuild 1040
+MD5 fb7cbdf3a70c2365e09f8a7155270f5c ChangeLog 5225
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 1755f7143c139eddaed591c6ea39e695 files/digest-hydrogen-0.9.0 67
+MD5 c2de54ec169afbb90c9eaa6440bafed5 files/digest-hydrogen-0.9.1 67
+MD5 6b397bce8176411819610e6b92401be2 files/0.9.1-OSS.patch 995
diff --git a/media-sound/hydrogen/hydrogen-0.9.0.ebuild b/media-sound/hydrogen/hydrogen-0.9.0.ebuild
index 6b3b1c4f5d1f..7b1f43dafa9d 100644
--- a/media-sound/hydrogen/hydrogen-0.9.0.ebuild
+++ b/media-sound/hydrogen/hydrogen-0.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/media-sound/hydrogen/hydrogen-0.9.0.ebuild,v 1.1 2004/11/07 22:04:20 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.0.ebuild,v 1.1.1.1 2005/11/30 09:38:28 chriswhite Exp $
 
 IUSE="alsa jack ladspa"
 
@@ -14,27 +14,26 @@ SRC_URI="mirror://sourceforge/hydrogen/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-
+KEYWORDS="amd64 ~ppc sparc x86 ppc64"
 
 DEPEND=">=media-libs/libsndfile-1.0.0
 	alsa? ( media-libs/alsa-lib )
 	>=media-libs/audiofile-0.2.3
 	>=media-libs/flac-1
 	jack? ( media-sound/jack-audio-connection-kit )
-	ladspa? ( media-libs/liblrdf )"
+	ladspa? ( media-libs/liblrdf )
+	=x11-libs/qt-3*"
 
 src_compile() {
-	need-automake 2.5
-	econf \
-	$(use_enable jack jack-support) \
-	$(use_enable alsa alsa-seq) \
-	$(use_enable ladspa lrdf-support) \
-	|| die "Failed configuring hydrogen!"
+	need-autoconf 2.5
+	econf $(use_enable jack jack-support) \
+	      $(use_enable alsa alsa-seq) \
+	      $(use_enable ladspa lrdf-support) \
+	      || die "Failed configuring hydrogen!"
 	emake || die "Failed making hydrogen!"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog README TODO
 }
diff --git a/media-sound/hydrogen/hydrogen-0.9.1.ebuild b/media-sound/hydrogen/hydrogen-0.9.1.ebuild
index e9ed8a76f2e8..c85df94932e6 100644
--- a/media-sound/hydrogen/hydrogen-0.9.1.ebuild
+++ b/media-sound/hydrogen/hydrogen-0.9.1.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/media-sound/hydrogen/hydrogen-0.9.1.ebuild,v 1.1 2005/04/11 13:55:30 luckyduck Exp $
-
-IUSE="alsa jack ladspa"
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.1.ebuild,v 1.1.1.1 2005/11/30 09:38:28 chriswhite Exp $
 
 inherit eutils kde-functions
 
@@ -15,14 +13,23 @@ SRC_URI="mirror://sourceforge/hydrogen/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~ppc64"
+IUSE="alsa jack ladspa"
 
 DEPEND=">=media-libs/libsndfile-1.0.0
-	alsa? ( media-libs/alsa-lib )
 	>=media-libs/audiofile-0.2.3
 	>=media-libs/flac-1
+	=x11-libs/qt-3*
+	alsa? ( media-libs/alsa-lib )
 	jack? ( media-sound/jack-audio-connection-kit )
-	ladspa? ( media-libs/liblrdf )
-	>=x11-libs/qt-3"
+	ladspa? ( media-libs/liblrdf )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	if use ppc; then
+		epatch ${FILESDIR}/${PV}-OSS.patch
+	fi
+}
 
 src_compile() {
 	need-autoconf 2.5
@@ -36,4 +43,7 @@ src_compile() {
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS ChangeLog README TODO
+
+	newicon hydrogen_gui/img/icon32.png hydrogen.png
+	make_desktop_entry hydrogen hydrogen hydrogen.png Audio
 }
diff --git a/media-sound/hydrogen/metadata.xml b/media-sound/hydrogen/metadata.xml
index d4ce46c038ab..e1774e3d9ad7 100644
--- a/media-sound/hydrogen/metadata.xml
+++ b/media-sound/hydrogen/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sound</herd>
-<maintainer>
-  <email>torbenh@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/media-sound/icecream/ChangeLog b/media-sound/icecream/ChangeLog
index 2e75e8cdfc3d..f9551150ac6e 100644
--- a/media-sound/icecream/ChangeLog
+++ b/media-sound/icecream/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-sound/icecream
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/icecream/ChangeLog,v 1.1 2004/09/16 20:20:10 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/icecream/ChangeLog,v 1.1.1.1 2005/11/30 09:38:02 chriswhite Exp $
+
+  21 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  icecream-0.8.ebuild:
+  Stable sparc.
+
+  12 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  icecream-0.8.ebuild:
+  Added to ~sparc.  Stable amd64, x86.
+
+  17 Oct 2004; David Holm <dholm@gentoo.org> icecream-0.8.ebuild:
+  Added to ~ppc.
 
 *icecream-0.8 (16 Sep 2004)
 
diff --git a/media-sound/icecream/Manifest b/media-sound/icecream/Manifest
index 0936aef31831..2ec5731bfc0f 100644
--- a/media-sound/icecream/Manifest
+++ b/media-sound/icecream/Manifest
@@ -1,3 +1,14 @@
-MD5 4f57ef8fffbf687ca843760b12bb4aa2 icecream-0.8.ebuild 558
-MD5 41f130fbfa7efe68854087a4768393b1 ChangeLog 217
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 aaecb4ad8f680a5aaeb2df8333b847aa icecream-0.8.ebuild 567
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 fb185ba7cb6450e7603f46799ac1f3ed ChangeLog 688
 MD5 b658c59f4fd9c2a3f1ac545c636410ef files/digest-icecream-0.8 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBoXh2ArHZZzCEUG0RAlzEAJ9bd26BTkjvzGLYesxdI6Xs3Je2VACfVFWS
+zNIXUYywdAtGzY753Dz2+kY=
+=hM4M
+-----END PGP SIGNATURE-----
diff --git a/media-sound/icecream/icecream-0.8.ebuild b/media-sound/icecream/icecream-0.8.ebuild
index 61fcb5df8276..419465095220 100644
--- a/media-sound/icecream/icecream-0.8.ebuild
+++ b/media-sound/icecream/icecream-0.8.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: /home/cvsroot/gentoo-x86/media-sound/icecream-0.8, 2004/04/13 10:11:00
+# $Header: /var/cvsroot/gentoo-x86/media-sound/icecream/icecream-0.8.ebuild,v 1.1.1.1 2005/11/30 09:38:02 chriswhite Exp $
 
 IUSE=""
 
@@ -10,12 +10,11 @@ SRC_URI="mirror://sourceforge/icecream/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ~ppc sparc x86"
 
 RDEPEND="dev-lang/perl"
 
 src_install() {
-	dodoc COPYING
-	mv icecream.man icecream.1 && doman icecream.1
+	newman icecream.man icecream.1
 	dobin icecream
 }
diff --git a/media-sound/id3/ChangeLog b/media-sound/id3/ChangeLog
index a30a5712c846..54d5b75fb374 100644
--- a/media-sound/id3/ChangeLog
+++ b/media-sound/id3/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for media-sound/id3
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/id3/ChangeLog,v 1.1 2002/02/01 21:53:31 gbevin Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/id3/ChangeLog,v 1.1.1.1 2005/11/30 09:38:24 chriswhite Exp $
+
+  28 Sep 2004; Tom Gall <tgall@gentoo.org> id3-0.12-r1.ebuild:
+  added ~ppc64, bug #64243
+
+  21 Apr 2004; Gustavo Zacarias <gustavoz@gentoo.org> id3-0.12-r1.ebuild:
+  keyworded sparc
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> id3-0.12-r1.ebuild:
+  Added IUSE.
+
+  10 Feb 2004; <augustus@gentoo.org> id3-0.12-r1.ebuild:
+  Added ~amd64 keyword.
+
+  18 Jan 2002; Bryon Roche <kain@kain.org> ChangeLog, id3-0.12-r1.ebuild :
+
+  Added ppc to keywords.
 
 *id3-0.12-r1 (1 Feb 2002)
 
diff --git a/media-sound/id3/Manifest b/media-sound/id3/Manifest
index e69de29bb2d1..3b1ec1a2f0f4 100644
--- a/media-sound/id3/Manifest
+++ b/media-sound/id3/Manifest
@@ -0,0 +1,4 @@
+MD5 e2f15459bd2b6166b332eb6bca659270 ChangeLog 1121
+MD5 4fe3d9a1e2f460729a041d3f7eea1dea id3-0.12-r1.ebuild 558
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 4472061e0ed6527823be042b47c71b7a files/digest-id3-0.12-r1 64
diff --git a/media-sound/id3/files/digest-id3-0.12-r1 b/media-sound/id3/files/digest-id3-0.12-r1
index ab001464230e..dd29e766cd8d 100644
--- a/media-sound/id3/files/digest-id3-0.12-r1
+++ b/media-sound/id3/files/digest-id3-0.12-r1
@@ -1 +1 @@
-MD5 5791f634b928f39ec9eaa59efb3f9315 id3_0.12.orig.tar.gz
+MD5 5791f634b928f39ec9eaa59efb3f9315 id3_0.12.orig.tar.gz 12492
diff --git a/media-sound/id3/id3-0.12-r1.ebuild b/media-sound/id3/id3-0.12-r1.ebuild
index 32b738a75b38..4480d7966a80 100644
--- a/media-sound/id3/id3-0.12-r1.ebuild
+++ b/media-sound/id3/id3-0.12-r1.ebuild
@@ -1,23 +1,22 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Peter Gavin <pbg1854@garnet.acns.fsu.edu>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/id3/id3-0.12-r1.ebuild,v 1.1 2001/04/23 01:00:39 pete Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/id3/id3-0.12-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:24 chriswhite Exp $
+
+IUSE=""
 
-A=${PN}_${PV}.orig.tar.gz
-S=${WORKDIR}/${P}
 DESCRIPTION="changes the id3 tag in an mp3 file"
-SRC_URI="http://lly.org/~rcw/id3/${A}"
 HOMEPAGE="http://lly.org/~rcw/abcde/page/"
+SRC_URI="http://lly.org/~rcw/id3/${PN}_${PV}.orig.tar.gz"
 
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc amd64 sparc ~ppc64"
 
 src_compile() {
-
-    try make CFLAGS=\"${CFLAGS}\"
+	make CFLAGS="${CFLAGS}" || die
 }
 
-src_install () {
-
-    try make DESTDIR=${D} install
-    dodoc COPYING README
-
+src_install() {
+	make install DESTDIR=${D} || die
+	dodoc README
 }
diff --git a/media-sound/id3ed/ChangeLog b/media-sound/id3ed/ChangeLog
index be389b9c30bb..d5d51dafdcfd 100644
--- a/media-sound/id3ed/ChangeLog
+++ b/media-sound/id3ed/ChangeLog
@@ -1,9 +1,35 @@
 # ChangeLog for media-sound/id3ed
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/id3ed/ChangeLog,v 1.1 2003/02/08 01:09:15 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/id3ed/ChangeLog,v 1.1.1.1 2005/11/30 09:38:11 chriswhite Exp $
+
+  07 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> id3ed-1.10.4.ebuild:
+  Don't install INSTALL file.
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> id3ed-1.10.4.ebuild:
+  Stable on ppc.
+
+  25 Sep 2004; Tom Gall <tgall@gentoo.org> id3ed-1.10.4.ebuild:
+  added ~ppc64, bug #64102
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> id3ed-1.10.4.ebuild:
+  Stable amd64, sparc.
+
+  07 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> id3ed-1.10.4.ebuild:
+  ~sparc ~amd64
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> id3ed-1.10.4.ebuild:
+  Added IUSE.
 
 *id3ed-1.10.4 (07 Feb 2003)
 
+  24 Mar 2003; Graham Forest <vladimir@gentoo.org> id3ed-1.10.4.ebuild:
+  set ~ppc in keywords
+
+  15 Feb 2003;  Seemant Kulleen <seemant@gentoo.org> id3ed-1.10.4.ebuild :
+  
+  Added "-I./" to the CFLAGS to allow compilation against readline-4.2a.
+  Thanks to: warp\0x00\ in #gentoo-ppc
+
   07 Feb 2003; Seemant Kulleen <seemant@gentoo.org> id3ed-1.10.4.ebuild
   ChangeLog files/digest-id3ed-1.10.4 :
 
diff --git a/media-sound/id3ed/Manifest b/media-sound/id3ed/Manifest
index e69de29bb2d1..dcf3123a92bb 100644
--- a/media-sound/id3ed/Manifest
+++ b/media-sound/id3ed/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 836e3fe8ca202a0b84fa8c4a4a3072f1 ChangeLog 1266
+MD5 4903f4a6e6159e7c4591b263142ce087 files/digest-id3ed-1.10.4 63
+MD5 16750b4d229e7c60276e49a96b9162a8 id3ed-1.10.4.ebuild 686
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDbzVEj5H05b2HAEkRAmXyAJ946lXsQsA1C3euPK3fr0pKXgB6hQCfXbcI
+rwCnYIIcET1a550a8KzyeCk=
+=n8ha
+-----END PGP SIGNATURE-----
diff --git a/media-sound/id3ed/id3ed-1.10.4.ebuild b/media-sound/id3ed/id3ed-1.10.4.ebuild
index e89e86c8df15..dae8e38a4cd9 100644
--- a/media-sound/id3ed/id3ed-1.10.4.ebuild
+++ b/media-sound/id3ed/id3ed-1.10.4.ebuild
@@ -1,29 +1,28 @@
-# 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/media-sound/id3ed/id3ed-1.10.4.ebuild,v 1.1 2003/02/08 01:09:15 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/id3ed/id3ed-1.10.4.ebuild,v 1.1.1.1 2005/11/30 09:38:11 chriswhite Exp $
 
-IUSE="X gnome"
+IUSE=""
 
-S=${WORKDIR}/${P}
-DESCRIPTION="id3ed is an ID3 tag editor for mp3 files. You can set tags interactively or from the command line, or a combination of both. id3ed can set genre by name or number. You can also remove or view tags."
+DESCRIPTION="ID3 tag editor for mp3 files"
 HOMEPAGE="http://www.azstarnet.com/~donut/programs/id3ed.html"
 SRC_URI="http://www.azstarnet.com/~donut/programs/${PN}/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+SLOT="0"
+KEYWORDS="x86 ppc sparc amd64 ~ppc64"
 
 DEPEND="sys-libs/ncurses
 	sys-libs/readline"
 
 src_compile() {
 	econf || die
-	emake || die
+	emake CFLAGS="${CFLAGS} -I./" || die
 }
 
 src_install() {
 	dodir /usr/bin /usr/share/man/man1
 	einstall || die
 
-	dodoc README ChangeLog INSTALL
+	dodoc README ChangeLog
 }
diff --git a/media-sound/id3tool/ChangeLog b/media-sound/id3tool/ChangeLog
index b683d4832b1d..9dbe12d0912f 100644
--- a/media-sound/id3tool/ChangeLog
+++ b/media-sound/id3tool/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for media-sound/id3tool
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/id3tool/ChangeLog,v 1.1 2003/02/27 18:30:41 mkennedy Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/id3tool/ChangeLog,v 1.1.1.1 2005/11/30 09:38:05 chriswhite Exp $
+
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> id3tool-1.2.ebuild:
+  Don't install COPYING file.
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> id3tool-1.2.ebuild:
+  Added to ~ppc.
+
+  04 Oct 2004; Tom Gall <tgall@gentoo.org> id3tool-1.2.ebuild:
+  stable on ppc64, bug #64244
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> id3tool-1.2.ebuild:
+  Stable amd64, sparc.
+
+  13 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> id3tool-1.2.ebuild:
+  Added ~sparc and ~amd64
+
+  08 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> id3tool-1.2.ebuild:
+  Removed explicit S= and src_compile
 
 *id3tool-1.2 (27 Feb 2003)
 
diff --git a/media-sound/id3tool/Manifest b/media-sound/id3tool/Manifest
index e69de29bb2d1..0b21aa5b5de7 100644
--- a/media-sound/id3tool/Manifest
+++ b/media-sound/id3tool/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3b670704865ba8e0b8c77a5331341626 ChangeLog 1004
+MD5 5a832d4e50a3374600052b531918cd4b id3tool-1.2.ebuild 571
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 5569ac794ae0b6860a6c4e007a286696 files/digest-id3tool-1.2 62
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGtUIj5H05b2HAEkRAlIaAJ49aW0EbCdDTeJKMXqPRE9ZEQk8JQCeJCi8
+ltoP3b4I5dfaSJKvzcQbsJs=
+=94vu
+-----END PGP SIGNATURE-----
diff --git a/media-sound/id3tool/id3tool-1.2.ebuild b/media-sound/id3tool/id3tool-1.2.ebuild
index c54275abaf8a..fbe410ce2771 100644
--- a/media-sound/id3tool/id3tool-1.2.ebuild
+++ b/media-sound/id3tool/id3tool-1.2.ebuild
@@ -1,24 +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/media-sound/id3tool/id3tool-1.2.ebuild,v 1.1 2003/02/27 18:30:41 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/id3tool/id3tool-1.2.ebuild,v 1.1.1.1 2005/11/30 09:38:05 chriswhite Exp $
+
+IUSE=""
 
 DESCRIPTION="A command line utility for easy manipulation of the ID3 tags present in MPEG Layer 3 audio files"
 HOMEPAGE="http://nekohako.xware.cx/id3tool/"
 SRC_URI="http://nekohako.xware.cx/id3tool/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
+KEYWORDS="amd64 ~ppc ppc64 sparc x86"
 DEPEND=""
 
-S=${WORKDIR}/${P}
-
-src_compile() {
-	econf
-	emake || die
-}
-
 src_install() {
 	einstall
-	dodoc CHANGELOG COPYING README 
+	dodoc CHANGELOG README
 }
diff --git a/media-sound/id3v2/ChangeLog b/media-sound/id3v2/ChangeLog
index 9b95a8d1d427..5267c43421a5 100644
--- a/media-sound/id3v2/ChangeLog
+++ b/media-sound/id3v2/ChangeLog
@@ -1,10 +1,82 @@
 # ChangeLog for media-sound/id3v2
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/id3v2/ChangeLog,v 1.1 2002/05/22 20:24:55 agenkin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/id3v2/ChangeLog,v 1.1.1.1 2005/11/30 09:38:33 chriswhite Exp $
+
+  14 Sep 2005; Aron Griffis <agriffis@gentoo.org> id3v2-0.1.11.ebuild:
+  Mark 0.1.11 stable on alpha
+
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> id3v2-0.1.7.ebuild,
+  id3v2-0.1.9-r1.ebuild, id3v2-0.1.10.ebuild, id3v2-0.1.11.ebuild:
+  Don't install COPYING and INSTALL files.
+
+  01 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> id3v2-0.1.11.ebuild:
+  Stable on ppc.
+
+  18 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  id3v2-0.1.11.ebuild:
+  Stable amd64, sparc, x86.
+
+  04 Oct 2004; Tom Gall <tgall@gentoo.org> id3v2-0.1.11.ebuild:
+  added ~ppc64, bug #64245
+
+*id3v2-0.1.11 (01 Sep 2004)
+
+  01 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/id3v2-0.1.11-alpha.patch, +id3v2-0.1.11.ebuild:
+  Version bump closes bug #62102.
+
+  16 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org> id3v2-0.1.10.ebuild:
+  Stable x86, sparc, and amd64.
+
+*id3v2-0.1.10 (04 May 2004)
+
+  04 May 2004; Jeremy Huddleston <eradicator@gentoo.org> id3v2-0.1.10.ebuild,
+  id3v2-0.1.9.ebuild, files/id3v2-0.1.10-noinline.patch:
+  Version bump closes bug #50010.
+
+  21 Apr 2004; Gustavo Zacarias <gustavoz@gentoo.org> id3v2-0.1.9-r1.ebuild:
+  keyworded sparc
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> id3v2-0.1.7.ebuild,
+  id3v2-0.1.9-r1.ebuild, id3v2-0.1.9.ebuild:
+  QA fix.
+
+  08 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  id3v2-0.1.9-r1.ebuild:
+  nomirror and stable on x86.
+
+  29 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  id3v2-0.1.9-r1.ebuild, id3v2-0.1.9.ebuild, metadata.xml:
+  Removing ~mips due to lack of dependencies.
+
+  17 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> id3v2-0.1.9-r1.ebuild:
+  AMD64 keyword.
+
+*id3v2-0.1.9-r1 (07 Feb 2004)
+
+  07 Feb 2004; Aron Griffis <agriffis@gentoo.org> id3v2-0.1.9-r1.ebuild,
+  files/id3v2-0.1.9-alpha.patch:
+  Fix bug 33814 with a patch to prevent an uninitialized variable
+
+  22 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org> id3v2-0.1.7.ebuild,
+  id3v2-0.1.9.ebuild:
+  fix for bug 39075; tidy
+
+*id3v2-0.1.9 (27 Mar 2003)
+
+  27 Mar 2003; Seemant Kulleen <seemant@gentoo.org> id3v2-0.1.9.ebuild:
+  version bump
+
+  18 Jan 2003; Bryon Roche <kain@kain.org> ChangeLog, id3v2-0.1.7.ebuild :
+
+  Added ppc to keywords.
 
 *id3v2-0.1.7 (22 May 2002)
 
+  25 Mar 2003; Seemant Kulleen <seemant@gentoo.org> :
+  version bump
+
   22 May 2002; Arcady Genkin <agenkin@thpoon.com> id3v2-0.1.7.ebuild :
 
   Initial ebuild, submitted by smitchell@phoenix-interactive.com (Sean
-  Mitchell).
\ No newline at end of file
+  Mitchell).
diff --git a/media-sound/id3v2/Manifest b/media-sound/id3v2/Manifest
index e69de29bb2d1..1eec69c9d544 100644
--- a/media-sound/id3v2/Manifest
+++ b/media-sound/id3v2/Manifest
@@ -0,0 +1,13 @@
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 5fd785c4772d2dde1c96cffe261092ed id3v2-0.1.9-r1.ebuild 927
+MD5 2d6c97b1bdf1b14484bc6e45b65eb836 ChangeLog 2672
+MD5 0aef0f94cab41f659dc89b5df72206d4 id3v2-0.1.11.ebuild 901
+MD5 d7f030b6dddc326540deaf5734ae6681 id3v2-0.1.10.ebuild 1011
+MD5 d00150d90e04006fc2353967bfa35c1c id3v2-0.1.7.ebuild 735
+MD5 d83139c5005dc921def0cf8550f53526 files/id3v2-0.1.10-noinline.patch 491
+MD5 735e277d7328b86d3b121b158473d939 files/id3v2-0.1.9-alpha.patch 679
+MD5 faa1968a6beab48f51e58bfc2cb66bf2 files/digest-id3v2-0.1.10 63
+MD5 c6d37db10f48d3d1bd9a5ff283f8095d files/digest-id3v2-0.1.9-r1 62
+MD5 f9825612d1693530b1873e998cd9aaa4 files/digest-id3v2-0.1.11 63
+MD5 0c2b40f0a45bf5c1c8ff2b2953bef0c8 files/id3v2-0.1.11-alpha.patch 655
+MD5 d99b419340bbb9a9027cbf9a6f70c0ac files/digest-id3v2-0.1.7 62
diff --git a/media-sound/id3v2/id3v2-0.1.10.ebuild b/media-sound/id3v2/id3v2-0.1.10.ebuild
index fcc15e62de21..d8a74ee19596 100644
--- a/media-sound/id3v2/id3v2-0.1.10.ebuild
+++ b/media-sound/id3v2/id3v2-0.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/media-sound/id3v2/id3v2-0.1.10.ebuild,v 1.1 2004/05/04 19:25:18 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/id3v2/id3v2-0.1.10.ebuild,v 1.1.1.1 2005/11/30 09:38:33 chriswhite Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/id3v2/${P}.tar.gz"
 RESTRICT="nomirror"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
+KEYWORDS="x86 ~ppc sparc ~alpha ~hppa amd64"
 
 DEPEND="media-libs/id3lib"
 
@@ -42,5 +42,5 @@ src_install()
 {
 	dobin id3v2
 	doman id3v2.1
-	dodoc COPYING INSTALL README
+	dodoc README
 }
diff --git a/media-sound/id3v2/id3v2-0.1.11.ebuild b/media-sound/id3v2/id3v2-0.1.11.ebuild
index 41eb37b9d5f4..613b0360f3a9 100644
--- a/media-sound/id3v2/id3v2-0.1.11.ebuild
+++ b/media-sound/id3v2/id3v2-0.1.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/media-sound/id3v2/id3v2-0.1.11.ebuild,v 1.1 2004/09/01 07:56:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/id3v2/id3v2-0.1.11.ebuild,v 1.1.1.1 2005/11/30 09:38:33 chriswhite Exp $
 
 IUSE=""
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://id3v2.sourceforge.net/"
 SRC_URI="mirror://sourceforge/id3v2/${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
+KEYWORDS="alpha amd64 ~hppa ppc ~ppc64 sparc x86"
 
 DEPEND="media-libs/id3lib"
 
@@ -35,5 +35,5 @@ src_compile() {
 src_install() {
 	dobin id3v2
 	doman id3v2.1
-	dodoc COPYING INSTALL README
+	dodoc README
 }
diff --git a/media-sound/id3v2/id3v2-0.1.7.ebuild b/media-sound/id3v2/id3v2-0.1.7.ebuild
index 47e6efdb4a3e..2c1f73a67070 100644
--- a/media-sound/id3v2/id3v2-0.1.7.ebuild
+++ b/media-sound/id3v2/id3v2-0.1.7.ebuild
@@ -1,23 +1,27 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/id3v2/id3v2-0.1.7.ebuild,v 1.1 2002/05/22 20:24:55 agenkin Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/id3v2/id3v2-0.1.7.ebuild,v 1.1.1.1 2005/11/30 09:38:33 chriswhite Exp $
+
+IUSE=""
 
 DESCRIPTION="A command line editor for id3v2 tags."
 HOMEPAGE="http://id3v2.sourceforge.net/"
+SRC_URI="mirror://sourceforge/id3v2/${P}.tar.gz"
 
 DEPEND="media-libs/id3lib"
 
-SRC_URI="http://unc.dl.sourceforge.net/sourceforge/id3v2/${P}.tar.gz"
-S=${WORKDIR}/${P}
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc"
 
 src_unpack()
 {
 	unpack "${A}"
-        cd "${S}"
-        # The tarball came with a compiled binary. ;^)
-        make clean
-        sed -e "/g++/ s|-g|${CFLAGS}|" < Makefile > Makefile.hacked
-        mv Makefile.hacked Makefile
+	cd "${S}"
+	# The tarball came with a compiled binary. ;^)
+	make clean
+	sed -e "/g++/ s|-g|${CFLAGS}|" < Makefile > Makefile.hacked
+	mv Makefile.hacked Makefile
 }
 
 src_compile()
@@ -25,9 +29,9 @@ src_compile()
 	emake || die
 }
 
-src_install ()
+src_install()
 {
-        dobin id3v2
-        doman id3v2.1
-        dodoc COPYING INSTALL README
+	dobin id3v2
+	doman id3v2.1
+	dodoc README
 }
diff --git a/media-sound/id3v2/id3v2-0.1.9-r1.ebuild b/media-sound/id3v2/id3v2-0.1.9-r1.ebuild
index 0cf171380170..4e10c527be27 100644
--- a/media-sound/id3v2/id3v2-0.1.9-r1.ebuild
+++ b/media-sound/id3v2/id3v2-0.1.9-r1.ebuild
@@ -1,13 +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/media-sound/id3v2/id3v2-0.1.9-r1.ebuild,v 1.1 2004/02/08 03:40:57 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/id3v2/id3v2-0.1.9-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:33 chriswhite Exp $
+
+inherit eutils
+
+IUSE=""
 
 DESCRIPTION="A command line editor for id3v2 tags."
 HOMEPAGE="http://id3v2.sourceforge.net/"
 SRC_URI="mirror://sourceforge/id3v2/${P}.tar.gz"
+RESTRICT="nomirror"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
+KEYWORDS="x86 ~ppc sparc ~alpha ~hppa amd64"
 
 DEPEND="media-libs/id3lib"
 
@@ -34,5 +39,5 @@ src_install()
 {
 	dobin id3v2
 	doman id3v2.1
-	dodoc COPYING INSTALL README
+	dodoc README
 }
diff --git a/media-sound/imp3sh/ChangeLog b/media-sound/imp3sh/ChangeLog
index 85b85931e18b..92b672cb520a 100644
--- a/media-sound/imp3sh/ChangeLog
+++ b/media-sound/imp3sh/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for media-sound/imp3sh
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/imp3sh/ChangeLog,v 1.1 2003/03/27 10:13:31 mkeadle Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/imp3sh/ChangeLog,v 1.1.1.1 2005/11/30 09:38:05 chriswhite Exp $
+
+  30 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  imp3sh-0.2.3.ebuild:
+  toolchain love for bug #69009.
+
+  06 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> imp3sh-0.2.3.ebuild:
+  gnuconfig_update
+
+  21 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> imp3sh-0.2.3.ebuild:
+  oggvorbis added to IUSE.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> imp3sh-0.2.3.ebuild:
+  Added IUSE.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> imp3sh-0.2.3.ebuild:
+  gcc 3.3 fixen for bug #47914.
+
+  12 Jun 2003; <msterret@gentoo.org> imp3sh-0.2.3.ebuild:
+  fix Header
 
 *imp3sh-0.2.3 (16 Mar 2003)
   
diff --git a/media-sound/imp3sh/Manifest b/media-sound/imp3sh/Manifest
index e69de29bb2d1..2ba9815501be 100644
--- a/media-sound/imp3sh/Manifest
+++ b/media-sound/imp3sh/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 19dbf4d12414132f75ddf5d533fb9929 ChangeLog 1067
+MD5 4ee8fedaa26cd27c15b4476c10082277 imp3sh-0.2.3.ebuild 946
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 4d1434c3d39acf852b9df3514a1640fe files/digest-imp3sh-0.2.3 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBg3KoArHZZzCEUG0RAgraAJ4rA20rTh3e+/IHDsOxcy1nAvslugCaAno+
+o97oETDojuVtl/EiFo6AIRI=
+=7KKC
+-----END PGP SIGNATURE-----
diff --git a/media-sound/imp3sh/imp3sh-0.2.3.ebuild b/media-sound/imp3sh/imp3sh-0.2.3.ebuild
index 44dcc98f3235..4fda9f1273c4 100644
--- a/media-sound/imp3sh/imp3sh-0.2.3.ebuild
+++ b/media-sound/imp3sh/imp3sh-0.2.3.ebuild
@@ -1,34 +1,37 @@
-# 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/media-sound/imp3sh/imp3sh-0.2.3.ebuild,v 1.1.1.1 2005/11/30 09:38:05 chriswhite Exp $
+
+IUSE="oggvorbis"
+
+inherit gnuconfig toolchain-funcs
 
-S=${WORKDIR}/${P}
 DESCRIPTION="flexible playlist manipulation shell and song player/streamer"
-SRC_URI="http://www.geocities.com/kman_can/${P}.tar.gz"
 HOMEPAGE="http://www.geocities.com/kman_can/"
+SRC_URI="http://www.geocities.com/kman_can/${P}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="~x86"
 SLOT="0"
-
-IUSE=""
+KEYWORDS="x86"
 
 DEPEND="sys-libs/ncurses
-		oggvorbis? ( media-libs/libvorbis
-					 media-libs/libogg
-					 media-libs/libao )"
-RDEPEND=""
+	oggvorbis? ( media-libs/libvorbis
+	             media-libs/libao )"
 
+src_unpack() {
+	unpack ${A}
 
-src_compile() {
+	cd ${S}
+	gnuconfig_update
+}
 
+src_compile() {
 	econf || die
-	emake || die
-	
+	emake CCLD=$(tc-getCXX) || die
 }
 
-src_install () {
-
-	make DESTDIR=${D} install || die
+src_install() {
+	make DESTDIR="${D}" install || die
 	dodoc README* CHANGES web/README.imp3web web/imp3web.php EXAMPLE.imp3sh EXTERNAL.players
 	# Some docs are liner notes in the actual .c files. UHG.
 	dodoc piped-io/imp3sh*.c
diff --git a/media-sound/ipodder/ChangeLog b/media-sound/ipodder/ChangeLog
index 064afeec14ad..621bffdd6227 100644
--- a/media-sound/ipodder/ChangeLog
+++ b/media-sound/ipodder/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for media-sound/ipodder
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ipodder/ChangeLog,v 1.1 2005/07/09 09:27:28 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ipodder/ChangeLog,v 1.1.1.1 2005/11/30 09:38:24 chriswhite Exp $
 
 *ipodder-2.0_rc4 (09 Jul 2005)
 
diff --git a/media-sound/ipodder/Manifest b/media-sound/ipodder/Manifest
index 80cf0d758144..300640d79dd4 100644
--- a/media-sound/ipodder/Manifest
+++ b/media-sound/ipodder/Manifest
@@ -1,3 +1,15 @@
-MD5 7c8aa9fa70be4a4cc2e6f738165ead65 ipodder-2.0_rc4.ebuild 1153
-MD5 1d983b972f7bd801d6b38e6a48c8318c files/digest-ipodder-2.0_rc4 74
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e108b7bac01ae88bcc6015f9a1e2ba25 ChangeLog 563
 MD5 535cd8628eb9d4003ab9bd7e653fc205 files/2.0_rc4-wx26-selector.patch 1953
+MD5 1d983b972f7bd801d6b38e6a48c8318c files/digest-ipodder-2.0_rc4 74
+MD5 c39dd502528c73e8b6e27a083394b9cb ipodder-2.0_rc4.ebuild 1257
+MD5 89548ff452209f596c02be0e9571ba88 metadata.xml 414
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDSTQYI1lqEGTUzyQRAvwCAJ92sKGZ3GMIhHNYjsJzAteZpZlvHQCghkZg
+YbWYOoFgifCnrPMURxGq79U=
+=TQFJ
+-----END PGP SIGNATURE-----
diff --git a/media-sound/ipodder/ipodder-2.0_rc4.ebuild b/media-sound/ipodder/ipodder-2.0_rc4.ebuild
index 1c5af4efecba..2bcd91f29542 100644
--- a/media-sound/ipodder/ipodder-2.0_rc4.ebuild
+++ b/media-sound/ipodder/ipodder-2.0_rc4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ipodder/ipodder-2.0_rc4.ebuild,v 1.1 2005/07/09 09:27:28 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ipodder/ipodder-2.0_rc4.ebuild,v 1.1.1.1 2005/11/30 09:38:24 chriswhite Exp $
 
 inherit eutils
 
diff --git a/media-sound/jaaa/ChangeLog b/media-sound/jaaa/ChangeLog
index f24602fe1b8b..ddbb4d36b057 100644
--- a/media-sound/jaaa/ChangeLog
+++ b/media-sound/jaaa/ChangeLog
@@ -1,6 +1,41 @@
 # ChangeLog for media-sound/jaaa
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jaaa/ChangeLog,v 1.1 2004/10/09 22:32:58 trapni Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jaaa/ChangeLog,v 1.1.1.1 2005/11/30 09:38:23 chriswhite Exp $
+
+  08 Oct 2005; MATSUU Takuto <matsuu@gentoo.org> jaaa-0.1.1.ebuild,
+  jaaa-0.1.2.ebuild, jaaa-0.1.2-r1.ebuild:
+  Fixed dependency issue with virtual/jack. Bug 108444.
+
+  10 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> jaaa-0.1.1.ebuild,
+  jaaa-0.1.2.ebuild, jaaa-0.1.2-r1.ebuild:
+  Don't install INSTALL file.
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> jaaa-0.1.2-r1.ebuild:
+  Added to ~ppc.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  jaaa-0.1.2-r1.ebuild:
+  Stable amd64, sparc, x86.
+
+*jaaa-0.1.2-r1 (28 Nov 2004)
+
+  28 Nov 2004; Frank van de Pol <fvdpol@gentoo.org>
+  +files/jaaa-0.1.2-amd64.patch, +jaaa-0.1.2-r1.ebuild:
+  Fixed initialisation on amd64, thanks to Fons Adriaensen
+  <fons.adriaensen@skynet.be>. Closing bug 72657.
+
+*jaaa-0.1.2 (27 Nov 2004)
+
+  27 Nov 2004; Frank van de Pol <fvdpol@gentoo.org> +jaaa-0.1.2.ebuild:
+  Version bump to 0.1.2
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> jaaa-0.1.1.ebuild:
+  Added to ~amd64 and ~sparc.  Stable x86.
+
+*jaaa-0.1.1 (14 Oct 2004)
+
+  14 Oct 2004; Michael Sterrett <mr_bones_@gentoo.org> jaaa-0.1.1.ebuild:
+  fix dep; tidy
 
   10 Oct 2004; Christian Parpart <trapni@gentoo.org> :
   Ebuild submitted by ron widler <ron@einfach.org> (bug #66620)
diff --git a/media-sound/jaaa/Manifest b/media-sound/jaaa/Manifest
index b6821dd4aa72..ad210672765e 100644
--- a/media-sound/jaaa/Manifest
+++ b/media-sound/jaaa/Manifest
@@ -1,4 +1,9 @@
-MD5 8bfa0fc4fd43992fe0fa651069889ee4 jaaa-0.1.1.ebuild 813
+MD5 2480b4ef47cef1b5807f2946277ff7a1 jaaa-0.1.2.ebuild 864
+MD5 92912b7b925423f46adfb36ef3598d74 jaaa-0.1.2-r1.ebuild 987
+MD5 94a0126df92dc6f5a6bda5f235c1a49b jaaa-0.1.1.ebuild 863
+MD5 a201482a9b1ab5ea5c718e07f6e9c9ca ChangeLog 1476
 MD5 ae2f0ce6b633cd6e8ea199bdabb85098 metadata.xml 227
-MD5 20f67c63c02c152800191b602b307129 ChangeLog 269
+MD5 9872cd47e792a3ca678b392be2c49e3e files/jaaa-0.1.2-amd64.patch 427
+MD5 c5fa8f63fe2bbc7af6e782c5af3f1e69 files/digest-jaaa-0.1.2-r1 62
 MD5 e6c376d9556fb2165bb225a463160036 files/digest-jaaa-0.1.1 62
+MD5 c5fa8f63fe2bbc7af6e782c5af3f1e69 files/digest-jaaa-0.1.2 62
diff --git a/media-sound/jaaa/jaaa-0.1.1.ebuild b/media-sound/jaaa/jaaa-0.1.1.ebuild
index 57027369809b..8303e8040eb5 100644
--- a/media-sound/jaaa/jaaa-0.1.1.ebuild
+++ b/media-sound/jaaa/jaaa-0.1.1.ebuild
@@ -1,35 +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/media-sound/jaaa/jaaa-0.1.1.ebuild,v 1.1 2004/10/09 22:32:58 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jaaa/jaaa-0.1.1.ebuild,v 1.1.1.1 2005/11/30 09:38:23 chriswhite Exp $
+
+IUSE=""
 
 DESCRIPTION="The JACK and ALSA Audio Analyser is an audio signal generator and spectrum analyser designed to make accurate measurements."
 HOMEPAGE="http://users.skynet.be/solaris/linuxaudio"
 SRC_URI="http://users.skynet.be/solaris/linuxaudio/downloads/${P}.tar.bz2"
-LICENSE="GPL-2"
-RESTRICT=""
-IUSE=""
 
+LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~sparc x86"
 
-DEPEND="
-	>=sys-devel/autoconf-2.58
-	>=sys-devel/automake-1.7.2
-	virtual/glibc
-	virtual/jack
-	media-libs/alsa-lib
+DEPEND="media-sound/jack-audio-connection-kit
 	>=media-libs/libclalsadrv-1.0.0
 	>=media-libs/libclthreads-1.0.0
 	>=media-libs/libclxclient-1.0.0
-	>=dev-libs/fftw-3.0.0
-	>=x11-libs/gtk+-2.0.0
-"
+	>=sci-libs/fftw-3.0.0
+	>=x11-libs/gtk+-2.0.0"
 
 src_compile() {
-	emake || die
+	emake || die "emake failed"
 }
 
 src_install() {
-	dobin jaaa
-	dodoc COPYING AUTHORS INSTALL README
+	dobin jaaa || die "dobin failed"
+	dodoc AUTHORS README
 }
diff --git a/media-sound/jaaa/jaaa-0.1.2-r1.ebuild b/media-sound/jaaa/jaaa-0.1.2-r1.ebuild
index db8b88af24a6..65d5f88f2ba5 100644
--- a/media-sound/jaaa/jaaa-0.1.2-r1.ebuild
+++ b/media-sound/jaaa/jaaa-0.1.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/media-sound/jaaa/jaaa-0.1.2-r1.ebuild,v 1.1 2004/11/28 13:30:31 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jaaa/jaaa-0.1.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:23 chriswhite Exp $
 
 inherit eutils
 
@@ -12,13 +12,13 @@ SRC_URI="http://users.skynet.be/solaris/linuxaudio/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 
-DEPEND="virtual/jack
+DEPEND="media-sound/jack-audio-connection-kit
 	>=media-libs/libclalsadrv-1.0.1
 	>=media-libs/libclthreads-1.0.2
 	>=media-libs/libclxclient-1.0.1
-	>=dev-libs/fftw-3.0.0
+	>=sci-libs/fftw-3.0.0
 	>=x11-libs/gtk+-2.0.0"
 
 src_unpack() {
@@ -34,5 +34,5 @@ src_compile() {
 
 src_install() {
 	dobin jaaa || die "dobin failed"
-	dodoc AUTHORS INSTALL README
+	dodoc AUTHORS README
 }
diff --git a/media-sound/jaaa/jaaa-0.1.2.ebuild b/media-sound/jaaa/jaaa-0.1.2.ebuild
index 6957a4e3ea8a..d9575175ad0f 100644
--- a/media-sound/jaaa/jaaa-0.1.2.ebuild
+++ b/media-sound/jaaa/jaaa-0.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/media-sound/jaaa/jaaa-0.1.2.ebuild,v 1.1 2004/11/27 18:46:24 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jaaa/jaaa-0.1.2.ebuild,v 1.1.1.1 2005/11/30 09:38:23 chriswhite Exp $
 
 IUSE=""
 
@@ -12,11 +12,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~sparc ~x86"
 
-DEPEND="virtual/jack
+DEPEND="media-sound/jack-audio-connection-kit
 	>=media-libs/libclalsadrv-1.0.1
 	>=media-libs/libclthreads-1.0.2
 	>=media-libs/libclxclient-1.0.1
-	>=dev-libs/fftw-3.0.0
+	>=sci-libs/fftw-3.0.0
 	>=x11-libs/gtk+-2.0.0"
 
 src_compile() {
@@ -25,5 +25,5 @@ src_compile() {
 
 src_install() {
 	dobin jaaa || die "dobin failed"
-	dodoc AUTHORS INSTALL README
+	dodoc AUTHORS README
 }
diff --git a/media-sound/jack-audio-connection-kit/ChangeLog b/media-sound/jack-audio-connection-kit/ChangeLog
index 40b0325ee98d..c2e55c034749 100644
--- a/media-sound/jack-audio-connection-kit/ChangeLog
+++ b/media-sound/jack-audio-connection-kit/ChangeLog
@@ -1,13 +1,341 @@
 # ChangeLog for media-sound/jack-audio-connection-kit
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/ChangeLog,v 1.1 2002/06/06 12:22:31 stroke Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/ChangeLog,v 1.1.1.1 2005/11/30 09:38:08 chriswhite Exp $
+
+  19 Nov 2005; Matthias Schwarzott <zzam@gentoo.org>
+  jack-audio-connection-kit-0.100.0-r1.ebuild:
+  Added to ~x86
+
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org>
+  jack-audio-connection-kit-0.99.0-r2.ebuild:
+  Mark 0.99.0-r2 stable on alpha
+
+*jack-audio-connection-kit-0.100.0-r1 (11 Sep 2005)
+
+  11 Sep 2005; Kito <kito@gentoo.org>
+  files/jack-audio-connection-kit-0.100.0-coreaudio.patch,
+  +files/jack-audio-connection-kit-0.100.0-driver_interface.patch,
+  +jack-audio-connection-kit-0.100.0-r1.ebuild:
+  Updated coreaudio patch to allow for >32 character devicenames. 
+  Make jackstart a symlink on >=2.6 kernels.
+
+*jack-audio-connection-kit-0.100.0 (05 Aug 2005)
+
+  05 Aug 2005; Kito <kito@gentoo.org>
+  +files/jack-audio-connection-kit-transport.patch, metadata.xml,
+  +jack-audio-connection-kit-0.100.0.ebuild:
+  version bump. add IUSE coreaudio,mmx,pic,sndfile,sse. No more glib DEPEND.
+  Fix altivec for Darwin assembler. Take over maintainership. ~ppc ~ppc-macos
+  keywords until archs can test new drivers
+
+*jack-audio-connection-kit-0.99.0-r3 (14 Jul 2005)
+
+  14 Jul 2005; Frank van de Pol <fvdpol@gentoo.org>
+  +jack-audio-connection-kit-0.99.0-r3.ebuild:
+  Added fix to make jackstart dependent on caps flag. Thanks to Daniel Thaler
+  <daniel@dthaler.de> for the patch. Closes bug #94887.
+
+  13 Jun 2005; Joseph Jezak <josejx@gentoo.org>
+  jack-audio-connection-kit-0.99.0-r1.ebuild:
+  Marked ppc stable.
+
+  21 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/jack-audio-connection-kit-0.99.0-jackstart.patch,
+  jack-audio-connection-kit-0.99.0-r2.ebuild:
+  cleaned up the 0.99.0-r2 ebuild, added a patch to install the jackstart
+  command (again). fixes #92895
+
+  09 May 2005; Aron Griffis <agriffis@gentoo.org>
+  jack-audio-connection-kit-0.99.0-r2.ebuild:
+  stable on ia64
+
+*jack-audio-connection-kit-0.99.0-r2 (02 May 2005)
+
+  02 May 2005; Frank van de Pol <fvdpol@gentoo.org>
+  +jack-audio-connection-kit-0.99.0-r2.ebuild:
+  Install example-clients to jack documentation. Closes bug#91029.
+
+  08 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  jack-audio-connection-kit-0.99.0-r1.ebuild:
+  Stable on ppc64
+
+  17 Feb 2005; Michael Hanselmann <hansmi@gentoo.org>
+  jack-audio-connection-kit-0.99.0-r1.ebuild:
+  Added to ~hppa.
+
+*jack-audio-connection-kit-0.99.0-r1 (05 Dec 2004)
+
+  05 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +jack-audio-connection-kit-0.99.0-r1.ebuild,
+  -jack-audio-connection-kit-0.99.0.ebuild:
+  Don't assume optimized... let users set CFLAGS... --enable-optimize breaks
+  sometimes. Closes bug #73406.
+
+  12 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  jack-audio-connection-kit-0.99.0.ebuild:
+  Stable amd64, x86.
+
+  03 Nov 2004; Stephen P. Becker <geoman@gentoo.org>
+  jack-audio-connection-kit-0.99.0.ebuild:
+  added ~mips keyword
+
+  19 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -jack-audio-connection-kit-0.91.1.ebuild,
+  -jack-audio-connection-kit-0.94.0.ebuild:
+  Removing old versions.
+
+  27 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  jack-audio-connection-kit-0.99.0.ebuild:
+  Gave warning about ABI changes.
+
+  22 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  jack-audio-connection-kit-0.99.0.ebuild:
+  Marking stable on sparc as it is the only version and many jack-capable
+  packages are already stable on sparc. If it breaks, sorry... come bitch me
+  out.
+
+  22 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  jack-audio-connection-kit-0.99.0.ebuild:
+  Added to ~sparc.
+
+  22 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/jack-audio-connection-kit-configure.patch,
+  jack-audio-connection-kit-0.99.0.ebuild:
+  ebuild cleanup.  Readded missing archs to KEYWORDS.
+
+*jack-audio-connection-kit-0.99.0 (22 Sep 2004)
+
+  22 Sep 2004; kito@gentoo.org +jack-audio-connection-kit-0.99.0.ebuild:
+  Version Bump. Initial support for ppc-macos native coreaudio driver
+
+  02 Sep 2004; Tom Gall <tgall@gentoo.org> 
+  jack-audio-connection-kit-0.98.1-r1.ebuild:
+  stable on ppc64
+
+  23 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -jack-audio-connection-kit-0.75.0.ebuild,
+  -jack-audio-connection-kit-0.90.1-r1.ebuild,
+  -jack-audio-connection-kit-0.90.1.ebuild:
+  Removing old versions.  Moving auto* and doxygen out of RDEPEND.
+
+  09 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  jack-audio-connection-kit-0.75.0.ebuild,
+  jack-audio-connection-kit-0.80.0.ebuild,
+  jack-audio-connection-kit-0.90.1-r1.ebuild,
+  jack-audio-connection-kit-0.90.1.ebuild,
+  jack-audio-connection-kit-0.91.1.ebuild,
+  jack-audio-connection-kit-0.94.0.ebuild,
+  jack-audio-connection-kit-0.98.1-r1.ebuild,
+  jack-audio-connection-kit-0.98.1.ebuild:
+  Removed virtual/jack PROVIDE.
+
+  09 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  jack-audio-connection-kit-0.98.1-r1.ebuild:
+  -sparc
+
+  24 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  jack-audio-connection-kit-0.98.1-r1.ebuild:
+  Stable x86 amd64.
+
+*jack-audio-connection-kit-0.98.1-r1 (22 May 2004)
+
+  22 May 2004; Jon Hood <squinky86@gentoo.org>
+  +jack-audio-connection-kit-0.98.1-r1.ebuild:
+  add better tempdir support irt #50231
+
+*jack-audio-connection-kit-0.98.1 (04 May 2004)
+
+  04 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  jack-audio-connection-kit-0.94.0.ebuild,
+  jack-audio-connection-kit-0.98.1.ebuild,
+  files/jack-audio-connection-kit-0.98.1-configure.patch:
+  0.94.0 Stable x86. 0.98.1 version bump closes bug #48840.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  jack-audio-connection-kit-0.90.1-r1.ebuild,
+  jack-audio-connection-kit-0.91.1.ebuild,
+  jack-audio-connection-kit-0.94.0.ebuild:
+  Removed message about deprecated jack-caps USE flag.
+
+  18 Apr 2004; Travis Tilley <lv@gentoo.org>
+  jack-audio-connection-kit-0.90.1.ebuild:
+  moving this from stable back into testing on amd64, as i cant even get this to
+  work properly
+
+  26 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  jack-audio-connection-kit-0.80.0.ebuild,
+  jack-audio-connection-kit-0.90.1-r1.ebuild,
+  jack-audio-connection-kit-0.90.1.ebuild,
+  jack-audio-connection-kit-0.91.1.ebuild,
+  jack-audio-connection-kit-0.94.0.ebuild:
+  inherit eutils.
+
+  26 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  jack-audio-connection-kit-0.90.1-r1.ebuild,
+  jack-audio-connection-kit-0.91.1.ebuild,
+  jack-audio-connection-kit-0.94.0.ebuild:
+  Changed jack-caps USE flag to caps
+
+  17 Feb 2004; Aron Griffis <agriffis@gentoo.org>
+  jack-audio-connection-kit-0.94.0.ebuild:
+  add ~alpha and ~ia64
+
+*jack-audio-connection-kit-0.94.0 (04 Feb 2004)
+
+  04 Feb 2004; Brian Harring <ferringb@gentoo.org>
+  jack-audio-connection-kit-0.80.0.ebuild,
+  jack-audio-connection-kit-0.90.1-r1.ebuild,
+  jack-audio-connection-kit-0.90.1.ebuild,
+  jack-audio-connection-kit-0.91.1.ebuild,
+  jack-audio-connection-kit-0.94.0.ebuild,
+  files/jack-audio-connection-kit-doc-option.patch:
+  Closing documentation installation bug 35749, affects all versions. Patch
+  being sent upstream, if integrated the sys-devel/autoconf dep can be removed.
+
+  01 Feb 2004; Brian Harring <ferringb@gentoo.org>
+  jack-audio-connection-kit-0.80.0.ebuild,
+  files/jack-audio-connection-kit-0.80.0-alsalib-fix.patch:
+  Alsalib-1.0 compilation fix (39095)
+
+  18 Dec 2003; Martin Holzer <mholzer@gentoo.org>
+  jack-audio-connection-kit-0.75.0.ebuild,
+  jack-audio-connection-kit-0.80.0.ebuild,
+  jack-audio-connection-kit-0.90.1-r1.ebuild,
+  jack-audio-connection-kit-0.90.1.ebuild,
+  jack-audio-connection-kit-0.91.1.ebuild:
+  adding RESTRICT=nomirror
+
+*jack-audio-connection-kit-0.90.1-r1 (09 Dec 2003)
+*jack-audio-connection-kit-0.91.1 (09 Dec 2003)
+
+  09 Dec 2003; <torbenh@gentoo.org> jack-audio-connection-kit-0.70.4.ebuild,
+  jack-audio-connection-kit-0.71.1.ebuild,
+  jack-audio-connection-kit-0.71.2-r1.ebuild,
+  jack-audio-connection-kit-0.71.2.ebuild,
+  jack-audio-connection-kit-0.74.1-r1.ebuild,
+  jack-audio-connection-kit-0.74.1.ebuild,
+  jack-audio-connection-kit-0.80.0.ebuild,
+  jack-audio-connection-kit-0.90.1-r1.ebuild,
+  jack-audio-connection-kit-0.91.1.ebuild, files/libsndfile-1.0.diff:
+  Removed old versions.
+  marked 0.80.0 stable
+  Version bump
+  Added jack-caps
+
+*jack-audio-connection-kit-0.90.1 (02 Dec 2003)
+
+  02 Dec 2003; rob holland <tigger@gentoo.org>
+  jack-audio-connection-kit-0.90.1.ebuild:
+  Version bump. Thanks to Kasper Souren <Kasper.Souren@ircam.fr>. Closes #34821
+
+  29 Nov 2003; Brad House <brad_mssw@gentoo.org>
+  jack-audio-connection-kit-0.80.0.ebuild:
+  mark stable on amd64
+
+  22 Sep 2003; <paul@gentoo.org> metadata.xml:
+  Fix metadata.xml
+
+*jack-audio-connection-kit-0.80.0 (16 Sep 2003)
+
+  16 Sep 2003; rob holland <tigger@gentoo.org>
+  jack-audio-connection-kit-0.80.0.ebuild:
+  Added jack 0.80.0. Thanks to Kasper Souren <Kasper.Souren@ircam.fr> for the
+  report. Closes #27534
+
+*jack-audio-connection-kit-0.75.0 (24 Aug 2003)
+
+  24 Aug 2003; rob holland <tigger@gentoo.org>
+  jack-audio-connection-kit-0.75.0.ebuild:
+  Version bump, thanks to Kasper Souren <Kasper.Souren@ircam.fr> for letting us
+  know. Closes #27195
+
+*jack-audio-connection-kit-0.74.1-r1 (24 Jul 2003)
+
+  24 Jul 2003; torbenh <torbenh@gentoo.org> Manifest jack-audio-connection-kit-0.74.1-r1.ebuild jack-audio-connection-kit-0.74.1.ebuild files/digest-jack-audio-connection-kit-0.74.1-r1 :
+  Added some flag-o-matic and sed to specify -march=xxx for the build.
+  Fixed missing jack-tmpfs.
+  this file is a merge between jack-audio-connection-kit-0.71.2-r1.ebuild
+  and jack-audio-connection-kit-0.74.1.ebuild
+
+
+*jack-audio-connection-kit-0.74.1 (22 Jul 2003)
+
+  22 Jul 2003; Nick Hadaway <raker@gentoo.org>
+  jack-audio-connection-kit-0.74.1.ebuild:
+  Version bump.  Added doc and debug use variables.  Added TODO and 
+  AUTHORS docs.  Updated depends.  Added some comments for other
+  configure options.
+
+*jack-audio-connection-kit-0.71.2-r1 (31 May 2003)
+
+  31 May 2003; jje <jje@gentoo.org>
+  jack-audio-connection-kit-0.71.2-r1.ebuild:
+  Updated to be in sync with changes to jack-cvs ebuild.
+
+*jack-audio-connection-kit-0.71.2 (18 May 2003)
+
+  18 May 2003; jje <jje@gentoo.org> jack-audio-connection-kit-0.71.2.ebuild:
+  Marked stable on x86.
+
+  15 May 2003; torbenh <torbenh@gentoo.org> :
+  Version bump.
+  removed fltk dependency because fltk_client is no more included.
+  changed to use correct econf, emake.
+
+*jack-audio-connection-kit-0.71.1 (11 May 2003)
+
+  11 May 2003; jje <jje@gentoo.org> jack-audio-connection-kit-0.71.1.ebuild:
+  Version bump.
+
+  09 May 2003; jje <jje@gentoo.org>
+  jack-audio-connection-kit-0.34.0-r2.ebuild,
+  jack-audio-connection-kit-0.50.0.ebuild,
+  jack-audio-connection-kit-0.61.0.ebuild:
+  Removed out of date ebuilds. Marked 0.70.4 as stable on ~x86.
+
+*jack-audio-connection-kit-0.70.4 (07 May 2003)
+
+  07 May 2003; jje <jje@gentoo.org> jack-audio-connection-kit-0.70.4.ebuild:
+  Version bump.
+
+*jack-audio-connection-kit-0.61.0 (07 Mar 2003)
+
+  07 Mar 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Version bump.
+
+*jack-audio-connection-kit-0.50.0 (01 Mar 2003)
+
+  01 Mar 2003;  <jje@gentoo.org> jack-audio-connection-kit-0.50.0.ebuild files/digest-jack-audio-connection-kit-0.50.0 :
+  Added updated jack build for latest jack release 0.50.0.
+
+*jack-audio-connection-kit-0.34.0-r2 (30 Oct 2002)
+
+  07 Jan 2002; Nick Hadaway <raker@gentoo.org> :
+  Now provides virtual/jack.
+
+  02 Jan 2002; Nick Hadaway <raker@gentoo.org> :
+  add a depend that stops installation if jack-cvs is installed.
+
+  30 Oct 2002; Nick Hadaway <raker@gentoo.org>
+  jack-audio-connection-kit-0.34.0-r2.ebuild,
+  files/digest-jack-audio-connection-kit-0.34.0-r2,
+  files/libsndfile-1.0.diff :
+  libsndfile-1.0.? compatible ebuild.  Masked until libsndfile-1.0.? is
+  unmasked.
+
+*jack-audio-connection-kit-0.34.0-r1 (26 Oct 2002)
+
+  26 Oct 2002; Nick Hadaway <raker@gentoo.org>
+  jack-audio-connection-kit-0.34.0-r1.ebuild,
+  files/digest-jack-audio-connection-kit-0.34.0-r1 :
+  Added dependancies info for fltk and libsndfile.  Added fixes for
+  detecting the fltk libraries.
 
 *jack-audio-connection-kit-0.34.0 (6 Jun 2002)
-  
-  6 Jun 2002; Ryan Shaw <ryan.shaw@stanfordalumni.org> ChangeLog :
 
+  6 Jun 2002; Ryan Shaw <ryan.shaw@stanfordalumni.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.
\ No newline at end of file
+  can find in the root directory of the portage repository.
diff --git a/media-sound/jack-audio-connection-kit/Manifest b/media-sound/jack-audio-connection-kit/Manifest
index 4872f0b8710d..9d8d7fd16147 100644
--- a/media-sound/jack-audio-connection-kit/Manifest
+++ b/media-sound/jack-audio-connection-kit/Manifest
@@ -1,10 +1,23 @@
-MD5 29c9b5da91926eefc53c2fb8d2462afc ChangeLog 2043
-MD5 131a6a4ce3e51f2827b54d9cb4a238af jack-audio-connection-kit-0.34.0-r2.ebuild 1003
-MD5 58ebeed95d3418126f3034cb51bdea23 jack-audio-connection-kit-0.50.0.ebuild 872
-MD5 22130379b5c3f4ab64d248e9926b4936 jack-audio-connection-kit-0.61.0.ebuild 879
-MD5 df68b9faa78a68558429491b45a8d788 jack-audio-connection-kit-0.70.4.ebuild 737
-MD5 d59ee1f9918c07214e0ce381152a097c files/digest-jack-audio-connection-kit-0.34.0-r2 84
-MD5 3e1dc144327ef2dc8ca82e4a7959f931 files/libsndfile-1.0.diff 1799
-MD5 776d3264ec92597a219519b9f82acf1d files/digest-jack-audio-connection-kit-0.50.0 84
-MD5 340cc5aee6cf8074317ddbdf86ab35f3 files/digest-jack-audio-connection-kit-0.61.0 84
-MD5 788850175553fcbbaba8701e4e68d07b files/digest-jack-audio-connection-kit-0.70.4 84
+MD5 e908ec8467eb0ced024bbb594cabebaa jack-audio-connection-kit-0.99.0-r1.ebuild 2404
+MD5 79cfb94890d2d1d32fb0331bc01cc022 jack-audio-connection-kit-0.99.0-r3.ebuild 2318
+MD5 0d56eae2a04a15dbe5e7ca024a87a097 jack-audio-connection-kit-0.80.0.ebuild 1771
+MD5 de43c85f549fb9f68102ff44ba2d3476 jack-audio-connection-kit-0.100.0.ebuild 2948
+MD5 4bce9829bab867d02155ac1a3f8308ef jack-audio-connection-kit-0.100.0-r1.ebuild 3489
+MD5 4ee3c27feb88ab9f33c934e0262fbc45 jack-audio-connection-kit-0.98.1-r1.ebuild 2116
+MD5 aa8ace272092dee1f0391e64569d045d jack-audio-connection-kit-0.99.0-r2.ebuild 2284
+MD5 a6c8c13a98bc0145eae5312dd7c4e405 ChangeLog 12721
+MD5 e9914343b13388692a7ed11361d53724 metadata.xml 218
+MD5 1081e2f37f20874fb10b5a9c183df0b4 files/digest-jack-audio-connection-kit-0.98.1-r1 84
+MD5 e1e0561e8f67b2f527014a57f5eb7a05 files/digest-jack-audio-connection-kit-0.99.0-r1 84
+MD5 e1e0561e8f67b2f527014a57f5eb7a05 files/digest-jack-audio-connection-kit-0.99.0-r2 84
+MD5 e1e0561e8f67b2f527014a57f5eb7a05 files/digest-jack-audio-connection-kit-0.99.0-r3 84
+MD5 cb8756e396d8d311dbcd4440fd483fc9 files/jack-audio-connection-kit-0.99.0-jackstart.patch 515
+MD5 b5dc5c728b1bdc6c5ebf5e54dc3ca246 files/jack-audio-connection-kit-0.98.1-configure.patch 1459
+MD5 a3265365ae4f49605813783bb1b87306 files/jack-audio-connection-kit-0.100.0-driver_interface.patch 374
+MD5 176e3d4dbee7533b6a08863ed1f74079 files/digest-jack-audio-connection-kit-0.100.0-r1 85
+MD5 0ad8a4c606e807460bce497d044044ef files/jack-audio-connection-kit-doc-option.patch 1103
+MD5 8e9c72734364a9d7e4a6d781e13beec8 files/jack-audio-connection-kit-transport.patch 309
+MD5 b029501b88782a0cca9e2f3d64812e63 files/jack-audio-connection-kit-0.80.0-alsalib-fix.patch 575
+MD5 176e3d4dbee7533b6a08863ed1f74079 files/digest-jack-audio-connection-kit-0.100.0 85
+MD5 464df562168e8de76000186ea43932b7 files/jack-audio-connection-kit-0.100.0-coreaudio.patch 13398
+MD5 9068d5fd09d15355ad0ff859b82f5038 files/digest-jack-audio-connection-kit-0.80.0 84
diff --git a/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.100.0-coreaudio.patch b/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.100.0-coreaudio.patch
index e69de29bb2d1..0a77c8e42726 100644
--- a/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.100.0-coreaudio.patch
+++ b/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.100.0-coreaudio.patch
@@ -0,0 +1,389 @@
+--- jack-audio-connection-kit-0.100.0/drivers/coreaudio/coreaudio_driver.c	2005-06-09 13:14:45 -0500
++++ jack-cvs/drivers/coreaudio/coreaudio_driver.c	2005-09-10 18:47:27 -0500
+@@ -37,10 +37,10 @@
+  May 20, 2005: S.Letz: Add "systemic" latencies management.
+  Jun 06, 2005: S.Letz: Remove the "-I" parameter, change the semantic of "-n" parameter : -n (driver name) now correctly uses the PropertyDeviceUID
+ 					   (persistent accross reboot...) as the identifier for the used coreaudio driver.
++ Jun 14, 2005: S.Letz: Since the "-I" parameter is not used anymore, rename the "systemic" latencies management parametes "-I" and "-O" like for the ALSA driver.
++ Aug 16, 2005: S.Letz: Remove get_device_id_from_num, use get_default_device instead. If the -n option is not used or the device name cannot
++					   be found, the default device is used. Note: the default device can be used only if both default input and default output are the same.
+  
+- TODO:
+-	- fix cpu load behavior.
+-	- multiple-device processing.
+  */
+ 
+ #include <stdio.h>
+@@ -98,15 +98,15 @@
+             JCALog("error code : kAudioDevicePermissionsError\n");
+             break;
+         default:
+-            JCALog("error code : unknown\n");
++            JCALog("error code : unknown %ld\n", err);
+             break;
+     }
+ #endif
+ }
+ 
+-static OSStatus get_device_name_from_id(AudioDeviceID id, char name[60])
++static OSStatus get_device_name_from_id(AudioDeviceID id, char name[256])
+ {
+-    UInt32 size = sizeof(char) * 60;
++    UInt32 size = sizeof(char) * 256;
+     OSStatus res = AudioDeviceGetProperty(id, 0, false,
+ 					   kAudioDevicePropertyDeviceName,
+ 					   &size,
+@@ -124,27 +124,35 @@
+ 	} else {
+ 		OSStatus res = AudioHardwareGetProperty(kAudioHardwarePropertyDeviceForUID, &size, &value);
+ 		CFRelease(inIUD);
+-		return res;
++		JCALog("get_device_id_from_uid %s %ld \n", UID, *id);
++		return (*id == kAudioDeviceUnknown) ? kAudioHardwareBadDeviceError : res;
+ 	}
+ }
+ 
+-static OSStatus get_device_id_from_num(int i, AudioDeviceID * id)
++static OSStatus get_default_device(AudioDeviceID * id)
+ {
+-    OSStatus theStatus;
+-    UInt32 theSize;
+-    int nDevices;
+-    AudioDeviceID* theDeviceList;
+-
+-    theStatus = AudioHardwareGetPropertyInfo(kAudioHardwarePropertyDevices,
+-				     &theSize, NULL);
+-    nDevices = theSize / sizeof(AudioDeviceID);
+-    theDeviceList =
+-	(AudioDeviceID*) malloc(nDevices * sizeof(AudioDeviceID));
+-    theStatus = AudioHardwareGetProperty(kAudioHardwarePropertyDevices, 
+-					&theSize, theDeviceList);
+-
+-    *id = theDeviceList[i];
+-    return theStatus;
++    OSStatus res;
++    UInt32 theSize = sizeof(UInt32);
++	AudioDeviceID inDefault;
++	AudioDeviceID outDefault;
++  
++	if ((res = AudioHardwareGetProperty(kAudioHardwarePropertyDefaultInputDevice, 
++					&theSize, &inDefault)) != noErr)
++		return res;
++	
++	if ((res = AudioHardwareGetProperty(kAudioHardwarePropertyDefaultOutputDevice, 
++					&theSize, &outDefault)) != noErr)
++		return res;
++		
++	JCALog("get_default_device: input %ld output %ld\n", inDefault, outDefault);
++	
++	// Get the device only if default input and ouput are the same
++	if (inDefault == outDefault) {
++		*id = inDefault;
++		return noErr;
++	} else {
++		return kAudioHardwareBadDeviceError;
++	}
+ }
+ 
+ static OSStatus render(void *inRefCon, 
+@@ -257,8 +265,6 @@
+ 	*/
+ 
+     for (chn = 0; chn < driver->capture_nchannels; chn++) {
+-		//snprintf (buf, sizeof(buf) - 1, "capture_%lu", chn+1);
+-		
+ 		err = AudioDeviceGetPropertyInfo(driver->device_id, chn + 1, true, kAudioDevicePropertyChannelName, &size, &isWritable);
+ 		if (err == noErr && size > 0)  {
+ 			err = AudioDeviceGetProperty(driver->device_id, chn + 1, true, kAudioDevicePropertyChannelName, &size, channel_name);	
+@@ -293,8 +299,6 @@
+     port_flags = JackPortIsInput | JackPortIsPhysical | JackPortIsTerminal;
+ 
+ 	for (chn = 0; chn < driver->playback_nchannels; chn++) {
+-		//snprintf (buf, sizeof(buf) - 1, "playback_%lu", chn+1);
+-		
+ 		err = AudioDeviceGetPropertyInfo(driver->device_id, chn + 1, false, kAudioDevicePropertyChannelName, &size, &isWritable);
+ 		if (err == noErr && size > 0)  {
+ 			err = AudioDeviceGetProperty(driver->device_id, chn + 1, false, kAudioDevicePropertyChannelName, &size, channel_name);	
+@@ -428,8 +432,9 @@
+ 	ComponentResult err1;
+     UInt32 outSize;
+     Boolean isWritable;
+-	AudioStreamBasicDescription srcFormat, dstFormat, sampleRate;
++	AudioStreamBasicDescription srcFormat, dstFormat;
+ 	int in_nChannels, out_nChannels, i;
++	Float64 nominalSampleRate;
+ 
+     driver = (coreaudio_driver_t *) calloc(1, sizeof(coreaudio_driver_t));
+     jack_driver_init((jack_driver_t *) driver);
+@@ -459,14 +464,17 @@
+ 	driver->playback_frame_latency = playback_latency;
+ 
+ 	if (driver_uid) {
+-		if (get_device_id_from_uid(driver_uid, &driver->device_id) != noErr)
+-		return NULL;
++		if (get_device_id_from_uid(driver_uid, &driver->device_id) != noErr) {
++			if (get_default_device(&driver->device_id) != noErr) 
++				goto error;
++		}
+ 	} else {
+-		get_device_id_from_num(0, &driver->device_id); // takes a default value (first device)
++		if (get_default_device(&driver->device_id) != noErr) 
++			goto error;
+ 	}
+ 		
+ 	if (get_device_name_from_id(driver->device_id, driver->driver_name) != noErr)
+-		return NULL;
++		goto error;
+ 
+ 	driver->client = client;
+     driver->period_usecs =
+@@ -481,31 +489,42 @@
+     err = AudioDeviceSetProperty(driver->device_id, NULL, 0, false, 
+ 		kAudioDevicePropertyBufferFrameSize, outSize, &frames_per_cycle);
+     if (err != noErr) {
+-        jack_error("Cannot set buffer size %ld\n", frames_per_cycle);
++        JCALog("Cannot set buffer size %ld\n", frames_per_cycle);
+         printError1(err);
+-        return NULL;
++		goto error;
+     }
+-
+-    // Setting sample rate
+-    outSize = sizeof(AudioStreamBasicDescription);
++	
++	outSize = sizeof(Float64);
+     err = AudioDeviceGetProperty(driver->device_id, 0, false, 
+-		kAudioDevicePropertyStreamFormat, &outSize, &sampleRate);
++		kAudioDevicePropertyNominalSampleRate, &outSize, &nominalSampleRate);
+     if (err != noErr) {
+-        jack_error("Cannot get sample rate\n");
++        JCALog("Cannot get sample rate\n");
+         printError1(err);
+-        return NULL;
+-    }
++		goto error;
++    } else {
++		JCALog("Read nominalSampleRate %f\n", nominalSampleRate);
++	}
+ 
+-    if (rate != (unsigned long)sampleRate.mSampleRate) {
+-        sampleRate.mSampleRate = (Float64)rate;
++    if (rate != (jack_nframes_t)nominalSampleRate) {
++        nominalSampleRate = (Float64)rate;
+         err = AudioDeviceSetProperty(driver->device_id, NULL, 0, 
+-			false, kAudioDevicePropertyStreamFormat, outSize, &sampleRate);
++			false, kAudioDevicePropertyNominalSampleRate, outSize, &nominalSampleRate);
+         if (err != noErr) {
+-            jack_error("Cannot set sample rate %ld\n", rate);
++            JCALog("Cannot set sample rate %ld\n", rate);
+             printError1(err);
+-            return NULL;
++ 			goto error;
+         }
+     }
++	
++	err = AudioDeviceGetProperty(driver->device_id, 0, false, 
++		kAudioDevicePropertyNominalSampleRate, &outSize, &nominalSampleRate);
++    if (err != noErr) {
++        JCALog("Cannot get sample rate\n");
++        printError1(err);
++ 		goto error;
++    } else {
++		JCALog("Read again nominalSampleRate %f\n", nominalSampleRate);
++	}
+ 
+ 	// AUHAL
+ 	ComponentDescription cd = {kAudioUnitType_Output, 
+@@ -516,22 +535,18 @@
+ 	if (err1 != noErr)
+         goto error;
+ 
+-	err1 = AudioUnitSetProperty(driver->au_hal, kAudioOutputUnitProperty_CurrentDevice, 
+-		kAudioUnitScope_Global, 0, &driver->device_id, sizeof(AudioDeviceID));
+-	if (err1 != noErr) { 
+-		JCALog("error: calling AudioUnitSetProperty - kAudioOutputUnitProperty_CurrentDevice\n"); 
+-		return NULL; 
+-	}
+-	
+ 	err1 = AudioUnitInitialize(driver->au_hal); 
+-	if (err1 != noErr)
++	if (err1 != noErr) {
++		printError1(err1);
+         goto error;
++	}
+ 	
+ 	outSize = 1;
+ 	err1 = AudioUnitSetProperty(driver->au_hal, kAudioOutputUnitProperty_EnableIO,
+ 		kAudioUnitScope_Output, 0, &outSize, sizeof(outSize));
+ 	if (err1 != noErr) { 
+ 		JCALog("error: calling AudioUnitSetProperty - kAudioOutputUnitProperty_EnableIO,kAudioUnitScope_Output\n"); 
++		printError1(err1);
+ 		goto error; 
+ 	}
+ 	
+@@ -541,28 +556,42 @@
+ 			kAudioUnitScope_Input, 1, &outSize, sizeof(outSize));
+ 		if (err1 != noErr) { 
+ 			JCALog("error: calling AudioUnitSetProperty - kAudioOutputUnitProperty_EnableIO,kAudioUnitScope_Input\n"); 
++			printError1(err1);
+ 			goto error; 
+ 		}
+ 	}
+ 	
++	err1 = AudioUnitSetProperty(driver->au_hal, kAudioOutputUnitProperty_CurrentDevice, 
++		kAudioUnitScope_Global, 0, &driver->device_id, sizeof(AudioDeviceID));
++	if (err1 != noErr) { 
++		JCALog("error: calling AudioUnitSetProperty - kAudioOutputUnitProperty_CurrentDevice\n"); 
++		printError1(err1);
++		goto error;
++	}
++	
+ 	err1 = AudioUnitSetProperty(driver->au_hal, kAudioUnitProperty_MaximumFramesPerSlice, 
+ 		kAudioUnitScope_Global, 0, (UInt32*)&frames_per_cycle, sizeof(UInt32));
+ 	if (err1 != noErr) { 
+ 		JCALog("error: calling AudioUnitSetProperty - kAudioUnitProperty_MaximumFramesPerSlice\n"); 
++		printError1(err1);
+ 		goto error; 
+ 	}
+ 
+ 	err1 = AudioUnitGetPropertyInfo(driver->au_hal, kAudioOutputUnitProperty_ChannelMap, 
+ 		kAudioUnitScope_Input, 1, &outSize, &isWritable);
+-	if (err1 != noErr) 
++	if (err1 != noErr) {
+ 		JCALog("error: calling AudioUnitSetProperty - kAudioOutputUnitProperty_ChannelMap-INFO 1\n");
++		printError1(err1);
++	}
+ 	
+ 	in_nChannels = outSize / sizeof(SInt32);
+ 	
+ 	err1 = AudioUnitGetPropertyInfo(driver->au_hal, kAudioOutputUnitProperty_ChannelMap, 
+ 		kAudioUnitScope_Output, 0, &outSize, &isWritable);
+-	if (err1 != noErr) 
++	if (err1 != noErr) {
+ 		JCALog("error: calling AudioUnitSetProperty - kAudioOutputUnitProperty_ChannelMap-INFO 0\n");
++		printError1(err1);
++	}
+ 
+ 	out_nChannels = outSize / sizeof(SInt32);
+ 	
+@@ -576,7 +605,7 @@
+ 	}
+ 
+ 	if (chan_out < out_nChannels) {
+-		SInt32 chanArr[out_nChannels]; // ???
++		SInt32 chanArr[out_nChannels]; 
+ 		for (i = 0;i < out_nChannels; i++) {
+ 			chanArr[i] = -1;
+ 		}
+@@ -585,8 +614,10 @@
+ 		}
+ 		err1 = AudioUnitSetProperty(driver->au_hal, kAudioOutputUnitProperty_ChannelMap, 
+ 			kAudioUnitScope_Output, 0, chanArr, sizeof(SInt32) * out_nChannels);
+-		if (err1 != noErr) 
++		if (err1 != noErr) {
+ 			JCALog("error: calling AudioUnitSetProperty - kAudioOutputUnitProperty_ChannelMap 0\n");
++			printError1(err1);
++		}
+ 	}
+ 	
+ 	if (chan_in < in_nChannels) {
+@@ -599,8 +630,10 @@
+ 		}
+ 		AudioUnitSetProperty(driver->au_hal, kAudioOutputUnitProperty_ChannelMap, 
+ 			kAudioUnitScope_Input, 1, chanArr, sizeof(SInt32) * in_nChannels);
+-		if (err1 != noErr) 
++		if (err1 != noErr) {
+ 			JCALog("error: calling AudioUnitSetProperty - kAudioOutputUnitProperty_ChannelMap 1\n");
++			printError1(err1);
++		}
+ 	}
+ 
+ 	srcFormat.mSampleRate = rate;
+@@ -617,8 +650,10 @@
+ 
+ 	err1 = AudioUnitSetProperty(driver->au_hal, kAudioUnitProperty_StreamFormat, 
+ 		kAudioUnitScope_Input, 0, &srcFormat, sizeof(AudioStreamBasicDescription));
+-	if (err1 != noErr) 
++	if (err1 != noErr) {
+ 		JCALog("error: calling AudioUnitSetProperty - kAudioUnitProperty_StreamFormat kAudioUnitScope_Input\n");
++		printError1(err1);
++	}
+ 		
+ 	dstFormat.mSampleRate = rate;
+     dstFormat.mFormatID = kAudioFormatLinearPCM;
+@@ -634,8 +669,10 @@
+ 	
+ 	err1 = AudioUnitSetProperty(driver->au_hal, kAudioUnitProperty_StreamFormat, 
+ 		kAudioUnitScope_Output, 1, &dstFormat, sizeof(AudioStreamBasicDescription));
+-	if (err1 != noErr) 
++	if (err1 != noErr) {
+ 		JCALog("error: calling AudioUnitSetProperty - kAudioUnitProperty_StreamFormat kAudioUnitScope_Output\n");
++		printError1(err1);
++	}
+ 	
+ 	if (chan_in > 0 && chan_out== 0) {
+ 		AURenderCallbackStruct output;
+@@ -645,6 +682,7 @@
+ 			kAudioUnitScope_Output, 1, &output, sizeof(output));
+ 		if (err1 != noErr) { 
+ 			JCALog("AudioUnitSetProperty - kAudioUnitProperty_SetRenderCallback 1\n"); 
++			printError1(err1);
+ 			goto error; 
+ 		}
+ 	} else {
+@@ -655,6 +693,7 @@
+ 			kAudioUnitScope_Input, 0, &output, sizeof(output));
+ 		if (err1 != noErr) { 
+ 			JCALog("AudioUnitSetProperty - kAudioUnitProperty_SetRenderCallback 0\n"); 
++			printError1(err1);
+ 			goto error; 
+ 		}
+ 	}
+@@ -689,7 +728,7 @@
+   error:
+ 	AudioUnitUninitialize(driver->au_hal);
+ 	CloseComponent(driver->au_hal);
+-    jack_error("Cannot open the coreaudio driver\n");
++    jack_error("Cannot open the coreaudio driver");
+     free(driver);
+     return NULL;
+ }
+@@ -796,7 +835,7 @@
+ 
+  	i++;
+ 	strcpy(desc->params[i].name, "input-latency");
+-	desc->params[i].character  = 'l';
++	desc->params[i].character  = 'I';
+ 	desc->params[i].type = JackDriverParamUInt;
+ 	desc->params[i].value.i = 0;
+ 	strcpy(desc->params[i].short_desc, "Extra input latency");
+@@ -804,7 +843,7 @@
+ 
+ 	i++;
+ 	strcpy(desc->params[i].name, "output-latency");
+-	desc->params[i].character  = 'L';
++	desc->params[i].character  = 'O';
+ 	desc->params[i].type = JackDriverParamUInt;
+ 	desc->params[i].value.i  = 0;
+ 	strcpy(desc->params[i].short_desc, "Extra output latency");
+@@ -870,18 +909,17 @@
+ 			frames_per_interrupt = (unsigned int) param->value.ui;
+ 			break;
+ 
+-		case 'l':
++		case 'I':
+ 			systemic_input_latency = param->value.ui;
+ 			break;
+ 
+-		case 'L':
++		case 'O':
+ 			systemic_output_latency = param->value.ui;
+ 			break;
+ 		}
+     }
+ 
+     /* duplex is the default */
+-
+     if (!capture && !playback) {
+ 		capture = TRUE;
+ 		playback = TRUE;
diff --git a/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-doc-option.patch b/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-doc-option.patch
index 60d9542fdf6f..69a684b8ba3e 100644
--- a/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-doc-option.patch
+++ b/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-doc-option.patch
@@ -23,7 +23,7 @@
 +if test "$ENABLE_HTML_DOCS" == "yes" ; then
 +	# you need doxygen to make dist.
 +	AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, true, false)
-+	if test $HAVE_DOXYGEN = "false"; then
++	if test $HAVE_DOXYGEN == "false"; then
 +		AC_MSG_ERROR([*** doxygen not found, unable to build docs.])
 +	fi
 +else
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.100.0-r1.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.100.0-r1.ebuild
index eb8ad6716a23..48f05784ec29 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.100.0-r1.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.100.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/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.100.0-r1.ebuild,v 1.1 2005/09/11 00:57:39 kito Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.100.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:08 chriswhite Exp $
 
 inherit flag-o-matic eutils multilib
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/jackit/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="-alpha -amd64 -hppa -ia64 -mips ~ppc ~ppc-macos -ppc64 -sparc -x86"
+KEYWORDS="-alpha -amd64 -hppa -ia64 -mips ~ppc ~ppc-macos -ppc64 -sparc ~x86"
 IUSE="altivec alsa caps coreaudio doc debug jack-tmpfs mmx oss portaudio sndfile sse"
 
 RDEPEND="dev-util/pkgconfig
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.100.0.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.100.0.ebuild
index a05f082b7494..d3d96c54b9ea 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.100.0.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.100.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.100.0.ebuild,v 1.1 2005/08/05 20:25:22 kito Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.100.0.ebuild,v 1.1.1.1 2005/11/30 09:38:08 chriswhite Exp $
 
 inherit flag-o-matic eutils multilib
 
@@ -41,10 +41,11 @@ src_unpack() {
 
 	# compile and install jackstart, see #92895, #94887
 	if use caps ; then
-		epatch ${FILESDIR}/${P}-jackstart.patch
+		epatch ${FILESDIR}/${PN}-0.99.0-jackstart.patch
 	fi
 
 	epatch ${FILESDIR}/${PN}-transport.patch
+	epatch ${FILESDIR}/${P}-coreaudio.patch
 }
 
 src_compile() {
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.80.0.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.80.0.ebuild
index 11013212d72e..47d32c1fc088 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.80.0.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.80.0.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/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.80.0.ebuild,v 1.1 2003/09/16 13:51:32 tigger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.80.0.ebuild,v 1.1.1.1 2005/11/30 09:38:08 chriswhite Exp $
 
-inherit flag-o-matic
+inherit flag-o-matic eutils
 
 IUSE="doc debug jack-tmpfs"
 
 DESCRIPTION="A low-latency audio server"
 HOMEPAGE="http://jackit.sourceforge.net/"
 SRC_URI="mirror://sourceforge/jackit/${P}.tar.gz"
+RESTRICT="nomirror"
 
 SLOT="0"
 LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc amd64"
 
 DEPEND=">=media-libs/alsa-lib-0.9.1
 	>=media-libs/libsndfile-1.0.0
@@ -22,9 +23,17 @@ DEPEND=">=media-libs/alsa-lib-0.9.1
 	doc? ( app-doc/doxygen )
 	!media-sound/jack-cvs"
 
-PROVIDE="virtual/jack"
 
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-alsalib-fix.patch || \
+		die "Alsalib-1.0 patch failed"
+	epatch ${FILESDIR}/${PN}-doc-option.patch || \
+		die "Documentation configure option patch failed"
+	autoconf
+}
 
 src_compile() {
 	local myconf
@@ -36,8 +45,8 @@ src_compile() {
 	cd $S
 	sed -i "s/^CFLAGS=\$JACK_CFLAGS/CFLAGS=\"\$JACK_CFLAGS $myarch\"/" configure
 	use doc \
-		&& myconf="--with-html-dir=/usr/share/doc/${PF}/html" \
-		|| myconf="--without-html-dir"
+		&& myconf="--enable-html-docs --with-html-dir=/usr/share/doc/${PF}/html" \
+		|| myconf="--disable-html-docs"
 
 	use jack-tmpfs && myconf="${myconf} --with-default-tmpdir=/dev/shm"
 	use debug && myconf="${myconf} --enable-debug"
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.98.1-r1.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.98.1-r1.ebuild
index dbb18cb2317e..f8611282b826 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.98.1-r1.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.98.1-r1.ebuild
@@ -1,29 +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/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.98.1-r1.ebuild,v 1.1 2004/05/23 03:05:55 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.98.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:08 chriswhite Exp $
+
+IUSE="doc debug jack-tmpfs caps"
 
 inherit flag-o-matic eutils
 
 DESCRIPTION="A low-latency audio server"
 HOMEPAGE="http://jackit.sourceforge.net/"
 SRC_URI="mirror://sourceforge/jackit/${P}.tar.gz"
-RESTRICT="nomirror"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~alpha ~ia64"
-IUSE="doc debug jack-tmpfs caps"
+#-sparc: 0.98.1-r1: config/sysdeps/cycles.h:27:2: warning: #warning You are compiling JACK on a platform for which jack/cycles.h needs work
+KEYWORDS="x86 ~ppc amd64 ~alpha ~ia64 ppc64 -sparc"
 
-DEPEND=">=media-libs/alsa-lib-0.9.1
+RDEPEND=">=media-libs/alsa-lib-0.9.1
 	>=media-libs/libsndfile-1.0.0
 	dev-libs/glib
 	dev-util/pkgconfig
 	sys-libs/ncurses
 	caps? ( sys-libs/libcap )
-	doc? ( app-doc/doxygen )
-	sys-devel/autoconf
 	!media-sound/jack-cvs"
-PROVIDE="virtual/jack"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	sys-devel/autoconf"
 
 src_unpack() {
 	unpack ${A}
@@ -44,7 +46,12 @@ src_compile() {
 		&& myconf="--enable-html-docs --with-html-dir=/usr/share/doc/${PF}" \
 		|| myconf="--disable-html-docs"
 
-	use jack-tmpfs && myconf="${myconf} --with-default-tmpdir=/dev/shm" || myconf="${myconf} --with-default-tmpdir=/var/run/jack"
+	if use jack-tmpfs; then
+		myconf="${myconf} --with-default-tmpdir=/dev/shm"
+	else
+		myconf="${myconf} --with-default-tmpdir=/var/run/jack"
+	fi
+
 	use caps && myconf="${myconf} --enable-capabilities --enable-stripped-jackd"
 	use debug && myconf="${myconf} --enable-debug"
 
@@ -59,11 +66,15 @@ src_install() {
 		datadir=${D}/usr/share \
 		install || die
 
-	use jack-tmpfs || keepdir /var/run/jack && chmod 4777 ${D}/var/run/jack
+	if ! use jack-tmpfs; then
+		keepdir /var/run/jack
+		chmod 4777 ${D}/var/run/jack
+	fi
 
 	if use doc; then
 		mv ${D}/usr/share/doc/${PF}/reference/html \
 		   ${D}/usr/share/doc/${PF}/
-		rm -rf ${D}/usr/share/doc/${PF}/reference
 	fi
+
+	rm -rf ${D}/usr/share/doc/${PF}/reference
 }
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0-r1.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0-r1.ebuild
index 53e8dad9ceba..505bfa6776aa 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0-r1.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0-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/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0-r1.ebuild,v 1.1 2004/12/06 07:33:24 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:07 chriswhite Exp $
 
 IUSE="altivec alsa caps doc debug jack-tmpfs oss portaudio"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/jackit/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc-macos ppc64 sparc x86"
 
 RDEPEND=">=media-libs/libsndfile-1.0.0
 	dev-libs/glib
@@ -67,7 +67,6 @@ src_compile() {
 src_install() {
 	make DESTDIR=${D} \
 		datadir=${D}/usr/share \
-		program_transform_name="s,x,x," \
 		install || die
 
 	if ! use jack-tmpfs; then
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0-r2.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0-r2.ebuild
index a4d9befe75b0..15c757aad3a7 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0-r2.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0-r2.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/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0-r2.ebuild,v 1.1 2005/05/02 20:41:57 fvdpol Exp $
-
-IUSE="altivec alsa caps doc debug jack-tmpfs oss portaudio"
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0-r2.ebuild,v 1.1.1.1 2005/11/30 09:38:08 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
@@ -12,17 +10,17 @@ SRC_URI="mirror://sourceforge/jackit/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ppc64 ~ppc-macos ~sparc ~x86 ~hppa"
+KEYWORDS="alpha ~amd64 ~hppa ia64 ~mips ~ppc ~ppc-macos ppc64 ~sparc ~x86"
+IUSE="altivec alsa caps doc debug jack-tmpfs oss portaudio"
 
-RDEPEND=">=media-libs/libsndfile-1.0.0
-	dev-libs/glib
+RDEPEND="dev-libs/glib
 	dev-util/pkgconfig
+	>=media-libs/libsndfile-1.0.0
 	sys-libs/ncurses
+	caps? ( sys-libs/libcap )
 	!ppc64? ( !alpha? ( !ia64? ( portaudio? ( media-libs/portaudio ) ) ) )
 	!sparc? ( alsa? ( >=media-libs/alsa-lib-0.9.1 ) )
-	caps? ( sys-libs/libcap )
 	!media-sound/jack-cvs"
-
 DEPEND="${RDEPEND}
 	!ppc-macos? ( sys-devel/autoconf )
 	doc? ( app-doc/doxygen )"
@@ -33,21 +31,24 @@ src_unpack() {
 
 	if use !ppc-macos ; then
 		# Add doc option and fix --march=pentium2 in caps test
-		epatch ${FILESDIR}/${PN}-0.98.1-configure.patch && WANT_AUTOCONF=2.5 autoconf \
-			|| die
+		epatch ${FILESDIR}/${PN}-0.98.1-configure.patch && \
+		WANT_AUTOCONF=2.5 autoconf
 	fi
+
+	# compile and install jackstart, see #92895
+	epatch ${FILESDIR}/${P}-jackstart.patch
 }
 
 src_compile() {
 	local myconf
-	local myarch
 
-	myarch=`get-flag -march`
+	sed -i "s/^CFLAGS=\$JACK_CFLAGS/CFLAGS=\"\$JACK_CFLAGS $(get-flag -march)\"/" configure
 
-	sed -i "s/^CFLAGS=\$JACK_CFLAGS/CFLAGS=\"\$JACK_CFLAGS $myarch\"/" configure
-	use doc \
-		&& myconf="--enable-html-docs --with-html-dir=/usr/share/doc/${PF}" \
-		|| myconf="--disable-html-docs"
+	if use doc; then
+		myconf="--enable-html-docs --with-html-dir=/usr/share/doc/${PF}"
+	else
+		myconf="--disable-html-docs"
+	fi
 
 	if use jack-tmpfs; then
 		myconf="${myconf} --with-default-tmpdir=/dev/shm"
@@ -55,19 +56,19 @@ src_compile() {
 		myconf="${myconf} --with-default-tmpdir=/var/run/jack"
 	fi
 
-	use caps && myconf="${myconf} --enable-capabilities --enable-stripped-jackd"
-	use debug && myconf="${myconf} --enable-debug"
-
-	myconf="${myconf} `use_enable altivec` `use_enable alsa` `use_enable oss` `use_enable portaudio`"
-
-	econf ${myconf} || die "configure failed"
+	econf \
+		$(use_enable altivec) \
+		$(use_enable alsa) \
+		$(use_enable caps capabilities) $(use_enable caps stripped-jackd) \
+		$(use_enable debug) \
+		$(use_enable oss) \
+		$(use_enable portaudio) \
+		${myconf} || die "configure failed"
 	emake || die "compilation failed"
 }
 
 src_install() {
-	make DESTDIR=${D} \
-		datadir=${D}/usr/share \
-		install || die
+	make DESTDIR=${D} datadir=${D}/usr/share install || die
 
 	if ! use jack-tmpfs; then
 		keepdir /var/run/jack
@@ -84,9 +85,3 @@ src_install() {
 
 	rm -rf ${D}/usr/share/doc/${PF}/reference
 }
-
-#pkg_postinst() {
-#	einfo "Because of some ABI changes in jack, you may need to re-emerge."
-#	einfo "packages that use jack by running the following:"
-#	einfo "  revdep-rebuild --soname libjack.so.0"
-#}
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0-r3.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0-r3.ebuild
index 5f22220e829b..9587d167c9f0 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0-r3.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.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/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0-r3.ebuild,v 1.1 2005/07/14 18:44:15 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0-r3.ebuild,v 1.1.1.1 2005/11/30 09:38:08 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
diff --git a/media-sound/jack-audio-connection-kit/metadata.xml b/media-sound/jack-audio-connection-kit/metadata.xml
index 25cdf89e6a50..1080b4b5c1fa 100644
--- a/media-sound/jack-audio-connection-kit/metadata.xml
+++ b/media-sound/jack-audio-connection-kit/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>sound</herd>
 <maintainer>
-  <email>robh@gentoo.org</email>
+  <email>kito@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/media-sound/jack-rack/ChangeLog b/media-sound/jack-rack/ChangeLog
index cd715de27083..35b13dc0964b 100644
--- a/media-sound/jack-rack/ChangeLog
+++ b/media-sound/jack-rack/ChangeLog
@@ -1,6 +1,68 @@
 # ChangeLog for media-sound/jack-rack
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-rack/ChangeLog,v 1.1 2003/03/06 13:13:45 jje Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-rack/ChangeLog,v 1.1.1.1 2005/11/30 09:37:49 chriswhite Exp $
+
+*jack-rack-1.4.4 (07 Nov 2005)
+
+  07 Nov 2005; MATSUU Takuto <matsuu@gentoo.org>
+  +files/jack-rack-1.4.4-gtkdep.patch, +jack-rack-1.4.4.ebuild:
+  Version bumped. Bug 109836.
+  Added nls and xml2 USE flag.
+
+  12 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -jack-rack-1.4.1.ebuild, -jack-rack-1.4.2.ebuild, jack-rack-1.4.3.ebuild:
+  Stable sparc.
+
+  29 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  jack-rack-1.4.3.ebuild:
+  Added ladcca USE flag support.
+
+  22 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  jack-rack-1.4.3.ebuild:
+  Added to ~sparc.
+
+  16 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/jack-rack-1.4.3-gtkdep.patch:
+  Stable amd64.  Added patch to fix bug #50500 with gtk-2.4 and higher installed.
+
+  13 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  jack-rack-1.4.1.ebuild, jack-rack-1.4.2.ebuild, jack-rack-1.4.3.ebuild:
+  Getting rid of virtual/jack.
+
+  25 Apr 2004; Aron Griffis <agriffis@gentoo.org> jack-rack-1.4.3.ebuild:
+  Add die following econf for bug 48950
+
+  18 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> jack-rack-1.4.3.ebuild:
+  Adding amd64 keyword, closing #48174.
+
+  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  jack-rack-1.4.3.ebuild:
+  Stable x86.
+
+  19 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  jack-rack-1.4.1.ebuild, jack-rack-1.4.2.ebuild, jack-rack-1.4.3.ebuild:
+  fixed dep to have category.
+
+  14 Mar 2004; David Holm <dholm@gentoo.org> jack-rack-1.4.3.ebuild:
+  Added to ~ppc.
+
+  13 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  jack-rack-1.4.1.ebuild, jack-rack-1.4.2.ebuild:
+  ~arch because of bug #43572
+
+*jack-rack-1.4.3 (13 Mar 2004)
+
+  13 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  jack-rack-1.4.1.ebuild, jack-rack-1.4.2.ebuild, jack-rack-1.4.3.ebuild:
+  Version bump and update HOMEPAGE/SRC_URI on all ebuilds.
+
+*jack-rack-1.4.2 (17 Oct 2003)
+
+  17 Oct 2003; Martin Holzer <mholzer@gentoo.org> jack-rack-1.4.2.ebuild:
+  Version bumped. Closes #31270.
+
+  17 Oct 2003; Martin Holzer <mholzer@gentoo.org> jack-rack-1.4.1.ebuild:
+  configure uses IUSE. Closes #31269.
 
 *jack-rack-1.4.1 (06 Mar 2003)
 
diff --git a/media-sound/jack-rack/Manifest b/media-sound/jack-rack/Manifest
index e69de29bb2d1..f61d914b3402 100644
--- a/media-sound/jack-rack/Manifest
+++ b/media-sound/jack-rack/Manifest
@@ -0,0 +1,8 @@
+MD5 9738c0c2c0af2b7d99ff8d591f8fff74 ChangeLog 2437
+MD5 8b7cce360d598905bd5ec710481f6d51 files/digest-jack-rack-1.4.3 67
+MD5 d1d9d148663fd21962290044ef719dbc files/digest-jack-rack-1.4.4 67
+MD5 243499f60b0a83ef519784e6fd3b8ddf files/jack-rack-1.4.3-gtkdep.patch 1165
+MD5 61300f433a057fcf44b34fd04ee68139 files/jack-rack-1.4.4-gtkdep.patch 1163
+MD5 002833e5e5fe8c09899c673593e7802e jack-rack-1.4.3.ebuild 919
+MD5 0196af73aca3c2eaf03431e2d85a2436 jack-rack-1.4.4.ebuild 1134
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
diff --git a/media-sound/jack-rack/jack-rack-1.4.3.ebuild b/media-sound/jack-rack/jack-rack-1.4.3.ebuild
index b47fa3f32b01..ae04f60940d0 100644
--- a/media-sound/jack-rack/jack-rack-1.4.3.ebuild
+++ b/media-sound/jack-rack/jack-rack-1.4.3.ebuild
@@ -1,6 +1,10 @@
-# 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/media-sound/jack-rack/jack-rack-1.4.3.ebuild,v 1.1 2004/03/13 21:17:32 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-rack/jack-rack-1.4.3.ebuild,v 1.1.1.1 2005/11/30 09:37:49 chriswhite Exp $
+
+IUSE="gnome ladcca"
+
+inherit eutils
 
 DESCRIPTION="JACK Rack is an effects rack for the JACK low latency audio API."
 HOMEPAGE="http://arb.bash.sh/~rah/software/jack-rack/"
@@ -8,24 +12,26 @@ SRC_URI="http://arb.bash.sh/~rah/software/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 
-IUSE="gnome"
+DEPEND="ladcca? ( >=media-libs/ladcca-0.4 )
+	media-libs/liblrdf
+	>=x11-libs/gtk+-2.0.6-r2
+	>=media-libs/ladspa-sdk-1.12
+	dev-libs/libxml2
+	media-sound/jack-audio-connection-kit"
 
-DEPEND="media-libs/ladcca \
-	media-libs/liblrdf \
-	>=gtk+-2.0.6-r2 \
-	>=ladspa-sdk-1.12 \
-	dev-libs/libxml2 \
-	virtual/jack"
-
-S=${WORKDIR}/${P}
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gtkdep.patch
+}
 
 src_compile() {
-	econf `use_enable gnome`
-	make || die
+	econf `use_enable gnome` || die "econf failed"
+	emake -j1 || die
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 }
diff --git a/media-sound/jack-rack/jack-rack-1.4.4.ebuild b/media-sound/jack-rack/jack-rack-1.4.4.ebuild
index cb97b46a0ace..7fd9c3588296 100644
--- a/media-sound/jack-rack/jack-rack-1.4.4.ebuild
+++ b/media-sound/jack-rack/jack-rack-1.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/media-sound/jack-rack/jack-rack-1.4.4.ebuild,v 1.1 2005/11/07 14:09:42 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-rack/jack-rack-1.4.4.ebuild,v 1.1.1.1 2005/11/30 09:37:49 chriswhite Exp $
 
 IUSE="gnome ladcca nls xml2"
 
diff --git a/media-sound/jack/ChangeLog b/media-sound/jack/ChangeLog
index 9c6a9e2be650..0507b0f94230 100644
--- a/media-sound/jack/ChangeLog
+++ b/media-sound/jack/ChangeLog
@@ -1,6 +1,39 @@
 # ChangeLog for media-sound/jack
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jack/ChangeLog,v 1.1 2003/07/27 21:25:29 raker Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack/ChangeLog,v 1.1.1.1 2005/11/30 09:38:33 chriswhite Exp $
+
+  19 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> :
+  new upstream version, fixes #77390
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> jack-3.0.0.ebuild:
+  get_libdir fixes.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> jack-3.0.0.ebuild:
+  Stable sparc.
+
+  02 Sep 2004; Tom Gall <tgall@gentoo.org> jack-3.0.0.ebuild:
+  stable on ppc64
+
+  29 Aug 2004; Travis Tilley <lv@gentoo.org> jack-3.0.0.ebuild:
+  stable on amd64
+
+  04 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> jack-3.0.0.ebuild:
+  ~sparc ~amd64
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> jack-3.0.0.ebuild:
+  Added IUSE.
+
+  20 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> jack-2.99.9.ebuild,
+  jack-3.0.0.ebuild:
+  Bumped to stable x86.  added pyvorbis dep to close bug #43934.
+
+  15 Feb 2004; David Holm <dholm@gentoo.org> jack-3.0.0.ebuild:
+  Added to ~ppc.
+
+*jack-3.0.0 (19 Dec 2003)
+
+  19 Dec 2003; Martin Holzer <mholzer@gentoo.org> jack-3.0.0.ebuild:
+  Version bumped. Closes 32488
 
 *jack-2.99.9 (28 Jul 2003)
 
diff --git a/media-sound/jack/Manifest b/media-sound/jack/Manifest
index e82d5c09db56..29a4c20d85be 100644
--- a/media-sound/jack/Manifest
+++ b/media-sound/jack/Manifest
@@ -1,3 +1,16 @@
-MD5 bf00aa1dcac81a40e8476cf90b72af6b jack-2.99.9.ebuild 1009
-MD5 2d85d4daf58f46dce5287b8448a1e2c7 ChangeLog 299
-MD5 7dd1ea9b996352ba655ff2925ee07403 files/digest-jack-2.99.9 63
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1785fa28422eca351bfc1e5cd5bb77d1 jack-3.1.1.ebuild 1142
+MD5 ac14f2577b1cedab8f2cd627a92c3770 ChangeLog 1387
+MD5 d0d7ea03e238a808414b4426394c100f metadata.xml 221
+MD5 0c05d65270a463422f0d6166e67d4a31 jack-3.0.0.ebuild 1173
+MD5 e9353981f9cfeeae48a5377c9335e9b6 files/digest-jack-3.0.0 62
+MD5 83d9fea395055fa44c1ad095836c4c6a files/digest-jack-3.1.1 62
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCPCYD06ebR+OMO78RAuiQAJ9StSMaa4hAhe0hTVlRE1p0r/FK6wCggTlC
+8kdLWHxyM8PALhWM5cyDGto=
+=VVJe
+-----END PGP SIGNATURE-----
diff --git a/media-sound/jack/jack-3.0.0.ebuild b/media-sound/jack/jack-3.0.0.ebuild
index bf7ddc00c6ae..19e2917ac58b 100644
--- a/media-sound/jack/jack-3.0.0.ebuild
+++ b/media-sound/jack/jack-3.0.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/media-sound/jack/jack-3.0.0.ebuild,v 1.1 2003/12/18 23:16:26 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack/jack-3.0.0.ebuild,v 1.1.1.1 2005/11/30 09:38:33 chriswhite Exp $
+
+IUSE=""
 
 inherit distutils
 
@@ -8,16 +10,19 @@ DESCRIPTION="A frontend for several cd-rippers and mp3 encoders"
 HOMEPAGE="http://www.home.unix-ag.org/arne/jack/"
 SRC_URI="http://www.home.unix-ag.org/arne/jack/${P}.tar.gz"
 
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc amd64 sparc ppc64"
 SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND=">=virtual/python-1.5.2
+	sys-libs/ncurses"
+
+RDEPEND="${DEPEND}
 	dev-python/cddb-py
 	dev-python/id3-py
+	dev-python/pyid3lib
+	dev-python/pyvorbis
 	media-libs/flac
-	media-libs/libogg
-	media-libs/libvorbis
 	media-sound/lame
 	media-sound/cdparanoia"
 
@@ -32,8 +37,8 @@ src_install() {
 	dobin jack
 
 	distutils_python_version
-	dodir /usr/lib/python${PYVER}/site-packages
-	insinto /usr/lib/python${PYVER}/site-packages
+	dodir /usr/$(get_libdir)/python${PYVER}/site-packages
+	insinto /usr/$(get_libdir)/python${PYVER}/site-packages
 	doins jack_*py
 
 	newman jack.man jack.1
diff --git a/media-sound/jack/jack-3.1.1.ebuild b/media-sound/jack/jack-3.1.1.ebuild
index 39562585fabb..eea3f5a5c249 100644
--- a/media-sound/jack/jack-3.1.1.ebuild
+++ b/media-sound/jack/jack-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/media-sound/jack/jack-3.1.1.ebuild,v 1.1 2005/03/19 13:15:36 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack/jack-3.1.1.ebuild,v 1.1.1.1 2005/11/30 09:38:33 chriswhite Exp $
 
 IUSE=""
 
diff --git a/media-sound/jamin/ChangeLog b/media-sound/jamin/ChangeLog
index 3882c05f228f..bbe89de6f871 100644
--- a/media-sound/jamin/ChangeLog
+++ b/media-sound/jamin/ChangeLog
@@ -1,6 +1,60 @@
 # ChangeLog for media-sound/jamin
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jamin/ChangeLog,v 1.1 2004/01/19 09:23:26 torbenh Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jamin/ChangeLog,v 1.1.1.1 2005/11/30 09:38:42 chriswhite Exp $
+
+  09 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> jamin-0.9.0-r1.ebuild,
+  jamin-0.95.0.ebuild, jamin-0.95.0-r1.ebuild:
+  Don't install COPYING and INSTALL files.
+
+*jamin-0.95.0-r1 (26 Apr 2005)
+
+  26 Apr 2005; Frank van de Pol <fvdpol@gentoo.org> +jamin-0.95.0-r1.ebuild:
+  Added support of Open Sound Control (USE=osc)
+
+*jamin-0.95.0 (20 Apr 2005)
+
+  20 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> -jamin-0.8.0.ebuild,
+  +jamin-0.95.0.ebuild:
+  new upstream version, fixes #89806
+
+  19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  Remove retired developer from metadata.xml.
+
+  29 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/jamin-0.9.0-jack99.patch:
+  Stable on amd64 and x86. Added a patch to work with jack-0.99.0. Closes bug
+  #65098 thanks to Reuben Martin <martinr@jbu.edu>.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> jamin-0.8.0.ebuild:
+  Stable amd64.
+
+  30 Aug 2004; David Holm <dholm@gentoo.org> jamin-0.9.0-r1.ebuild:
+  Added to ~ppc.
+
+  23 Aug 2004; <frank@gentoo.org> files/jamin-0.9.0-geq.patch:
+  Fixed files/jamin-0.9.0-geq.patch which failed on cvs contained in the file's
+  header. Closes bug #61308.
+
+*jamin-0.9.0-r1 (22 Aug 2004)
+
+  22 Aug 2004; <frank@gentoo.org> +files/jamin-0.9.0-geq.patch,
+  +jamin-0.9.0-r1.ebuild:
+  New release 0.9.0-r1 to fix a problem with spline lenghts of 1024.
+
+*jamin-0.9.0 (18 Aug 2004)
+
+  18 Aug 2004; <frank@gentoo.org> +files/jamin-0.9.0-scenes.patch,
+  +jamin-0.9.0.ebuild:
+  Version bump to 0.9.0.
+
+  06 May 2004; Jeremy Huddleston <eradicator@gentoo.org> jamin-0.8.0.ebuild:
+  Stable x86.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> jamin-0.8.0.ebuild:
+  Added IUSE.
+
+  18 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> jamin-0.8.0.ebuild:
+  Adding amd64 keyword, closing #48176.
 
 *jamin-0.8.0 (19 Jan 2004)
 
diff --git a/media-sound/jamin/Manifest b/media-sound/jamin/Manifest
index 67b1b9064d45..d94ec6583547 100644
--- a/media-sound/jamin/Manifest
+++ b/media-sound/jamin/Manifest
@@ -1,2 +1,21 @@
-MD5 306d079e57f7be53dcbb402dcf98d3c3 jamin-0.8.0.ebuild 694
-MD5 f9f97d3a8e8236e3a30e311e8ba05bb1 files/digest-jamin-0.8.0 63
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 91e3c425d7ab351d8f58068c5d5d812a ChangeLog 2134
+MD5 93e81a5dbe1b00ed3498b25043da3442 jamin-0.9.0-r1.ebuild 956
+MD5 f78db7e0f94b1c250e9cfe3bdea3b4ec jamin-0.95.0.ebuild 832
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 d61090a271d16f78652d4bf4175d4623 jamin-0.95.0-r1.ebuild 871
+MD5 31f727fa79944e6a60ea0330aefad397 files/jamin-0.9.0-geq.patch 674
+MD5 ef5d979eb9bd22e6d049ac3d034975e1 files/jamin-0.9.0-jack99.patch 7535
+MD5 a9a10dbf44f9cf0902bde6113cbb305f files/digest-jamin-0.9.0-r1 63
+MD5 831ad9b4be45cbf00053c4254f64a055 files/jamin-0.9.0-scenes.patch 666
+MD5 e4c7f947b6008bcea0a8d4643548232f files/digest-jamin-0.95.0-r1 65
+MD5 e4c7f947b6008bcea0a8d4643548232f files/digest-jamin-0.95.0 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDIYi8j5H05b2HAEkRAoHhAKCKNG5X51SAcC6279xYgliZoifNLQCfbpsI
+/r6PZtbjbPwOxXCR7X6S3g8=
+=9MKQ
+-----END PGP SIGNATURE-----
diff --git a/media-sound/jamin/files/jamin-0.9.0-geq.patch b/media-sound/jamin/files/jamin-0.9.0-geq.patch
index 1bc60aa57c33..6c37e64d0780 100644
--- a/media-sound/jamin/files/jamin-0.9.0-geq.patch
+++ b/media-sound/jamin/files/jamin-0.9.0-geq.patch
@@ -1,15 +1,6 @@
-diff -u -r1.31 -r1.32
---- jamin-0.9.0/src/geq.c	2004/05/08 21:29:39	1.31
-+++ jamin-0.9.0/src/geq.c	2004/08/20 22:56:08	1.32
-@@ -11,7 +11,7 @@
-  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  *  GNU General Public License for more details.
-  *
-- *  $Id: jamin-0.9.0-geq.patch,v 1.1 2004/08/22 21:24:09 fvdpol Exp $
-+ *  $Id: jamin-0.9.0-geq.patch,v 1.1 2004/08/22 21:24:09 fvdpol Exp $
-  */
- 
- /* code to control the graphic eq's, swh */
+diff -ur jamin-0.9.0-orig/src/geq.c jamin-0.9.0/src/geq.c
+--- jamin-0.9.0-orig/src/geq.c	2004-08-05 21:29:29.576383960 +0200
++++ jamin-0.9.0/src/geq.c	2004-08-20 22:56:08.970301536 +0200
 @@ -122,7 +122,7 @@
      int i, bin;
  
diff --git a/media-sound/jamin/jamin-0.9.0-r1.ebuild b/media-sound/jamin/jamin-0.9.0-r1.ebuild
index 3379d75a1244..0e51146d4014 100644
--- a/media-sound/jamin/jamin-0.9.0-r1.ebuild
+++ b/media-sound/jamin/jamin-0.9.0-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/media-sound/jamin/jamin-0.9.0-r1.ebuild,v 1.1 2004/08/22 21:24:09 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jamin/jamin-0.9.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:42 chriswhite Exp $
 
 inherit eutils
 
@@ -8,29 +8,31 @@ IUSE=""
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64 ~ppc"
 
 DESCRIPTION="JAMin is the JACK Audio Connection Kit (JACK) Audio Mastering interface"
 HOMEPAGE="http://jamin.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 DEPEND=">=media-sound/jack-audio-connection-kit-0.80.0
-		>=media-plugins/swh-plugins-0.4.6
-		media-libs/ladspa-sdk
-		>=dev-libs/fftw-3.0.1
-		media-libs/libsndfile
-		>=media-libs/alsa-lib-0.9.0
-		>=dev-libs/libxml2-2.5.0
-		>=x11-libs/gtk+-2.0.0"
+	>=media-plugins/swh-plugins-0.4.6
+	media-libs/ladspa-sdk
+	>=sci-libs/fftw-3.0.1
+	media-libs/libsndfile
+	>=media-libs/alsa-lib-0.9.0
+	>=dev-libs/libxml2-2.5.0
+	>=x11-libs/gtk+-2.0.0"
 
 src_unpack() {
 	unpack ${A}
 
+	cd ${S}
 	epatch ${FILESDIR}/${P}-scenes.patch
 	epatch ${FILESDIR}/${P}-geq.patch
+	epatch ${FILESDIR}/${P}-jack99.patch
 }
 
 src_install() {
 	make install DESTDIR=${D}
-	dodoc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO
+	dodoc AUTHORS ChangeLog NEWS README TODO
 }
diff --git a/media-sound/jamin/jamin-0.95.0-r1.ebuild b/media-sound/jamin/jamin-0.95.0-r1.ebuild
index 9a608b6f8a83..1242d4043c21 100644
--- a/media-sound/jamin/jamin-0.95.0-r1.ebuild
+++ b/media-sound/jamin/jamin-0.95.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/media-sound/jamin/jamin-0.95.0-r1.ebuild,v 1.1 2005/04/26 21:29:31 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jamin/jamin-0.95.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:42 chriswhite Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE=""
+IUSE="osc"
 
 DEPEND=">=media-sound/jack-audio-connection-kit-0.80.0
 	>=media-plugins/swh-plugins-0.4.6
@@ -21,9 +21,9 @@ DEPEND=">=media-sound/jack-audio-connection-kit-0.80.0
 	>=media-libs/alsa-lib-0.9.0
 	>=dev-libs/libxml2-2.5.0
 	>=x11-libs/gtk+-2.0.0
-	osc? (>=media-libs/liblo-0.5)"
+	osc? ( >=media-libs/liblo-0.5 )"
 
 src_install() {
 	make install DESTDIR=${D} || die "make install failed"
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+	dodoc AUTHORS ChangeLog NEWS README TODO
 }
diff --git a/media-sound/jamin/jamin-0.95.0.ebuild b/media-sound/jamin/jamin-0.95.0.ebuild
index b083f72d268e..37c7cf68e880 100644
--- a/media-sound/jamin/jamin-0.95.0.ebuild
+++ b/media-sound/jamin/jamin-0.95.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jamin/jamin-0.95.0.ebuild,v 1.1 2005/04/20 17:03:12 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jamin/jamin-0.95.0.ebuild,v 1.1.1.1 2005/11/30 09:38:42 chriswhite Exp $
 
 inherit eutils
 
@@ -24,5 +24,5 @@ DEPEND=">=media-sound/jack-audio-connection-kit-0.80.0
 
 src_install() {
 	make install DESTDIR=${D} || die "make install failed"
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+	dodoc AUTHORS ChangeLog NEWS README TODO
 }
diff --git a/media-sound/jamin/metadata.xml b/media-sound/jamin/metadata.xml
index d4ce46c038ab..e1774e3d9ad7 100644
--- a/media-sound/jamin/metadata.xml
+++ b/media-sound/jamin/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sound</herd>
-<maintainer>
-  <email>torbenh@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/media-sound/jmax/ChangeLog b/media-sound/jmax/ChangeLog
index 2b8564cbce39..df1d3ea946a3 100644
--- a/media-sound/jmax/ChangeLog
+++ b/media-sound/jmax/ChangeLog
@@ -1,6 +1,41 @@
 # ChangeLog for media-sound/jmax
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jmax/ChangeLog,v 1.1 2004/01/19 08:47:46 torbenh Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jmax/ChangeLog,v 1.1.1.1 2005/11/30 09:37:50 chriswhite Exp $
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> jmax-4.1.0.ebuild:
+  Added to ~ppc.
+
+  17 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> metadata.xml,
+  jmax-4.1.0.ebuild:
+  libtoolize, fixes #74760. also updated metadata.xml, torbenh is retired.
+
+  09 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> jmax-4.1.0.ebuild:
+  added use_enable jack call to econf, fixes #67371.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  files/jmax-4.1.0-fix-java-check.patch:
+  Fix java detection in executeable.
+
+  22 Jul 2004; Thomas Matthijs <axxo@gentoo.org>
+  +files/jmax-4.1.0-fix-java-check.patch, jmax-4.1.0.ebuild:
+  fix java checking 57691
+
+*jmax-4.1.0 (08 Jul 2004)
+
+  08 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> jmax-4.0.2.ebuild,
+  jmax-4.1.0.ebuild, files/jmax-4.1.0-gcc34.patch,
+  files/jmax-4.1.0-otherArch.patch:
+  Version bump. -sparc, -amd64. Direct to stable as the old version no longer
+  compiles.
+
+  05 May 2004; Jeremy Huddleston <eradicator@gentoo.org> jmax-4.0.2.ebuild:
+  emake -j1 becasue of bug #47978.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> jmax-4.0.2.ebuild:
+  Added IUSE.
+
+  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> jmax-4.0.2.ebuild:
+  Stable x86.  Ebuild cleanup.
 
 *jmax-4.0.2 (19 Jan 2004)
 
diff --git a/media-sound/jmax/Manifest b/media-sound/jmax/Manifest
index d7895a6b86c0..eff415ff0a13 100644
--- a/media-sound/jmax/Manifest
+++ b/media-sound/jmax/Manifest
@@ -1,3 +1,8 @@
-MD5 66ea6387de45e7c3aaba76c3416209b4 jmax-4.0.2.ebuild 1102
-MD5 ce7938192f9fef7f13fa7fe709c6f3ad jmax-4.0.2-work_with_recent_alsa-lib.patch 991
-MD5 52b60310d899a94c7402ebed98ca9c71 files/digest-jmax-4.0.2 63
+MD5 a926628a402b570d581e849a52a99638 ChangeLog 1606
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 bcb1b9c6771c7598f6293e94657b8c03 jmax-4.1.0.ebuild 1679
+MD5 ce7938192f9fef7f13fa7fe709c6f3ad files/jmax-4.0.2-work_with_recent_alsa-lib.patch 991
+MD5 bc96e130e7d54a74caa5c39641d6e898 files/digest-jmax-4.1.0 125
+MD5 14eb868795e30de75f2f6bcd7a962de3 files/jmax-4.1.0-gcc34.patch 968
+MD5 a2964306dfa904cce770a5be6a3492d0 files/jmax-4.1.0-otherArch.patch 651
+MD5 25c6fe2b25184c40b3096887923ecf85 files/jmax-4.1.0-fix-java-check.patch 1206
diff --git a/media-sound/jmax/files/jmax-4.1.0-fix-java-check.patch b/media-sound/jmax/files/jmax-4.1.0-fix-java-check.patch
index 7d0d1f96d589..a63af7dcf704 100644
--- a/media-sound/jmax/files/jmax-4.1.0-fix-java-check.patch
+++ b/media-sound/jmax/files/jmax-4.1.0-fix-java-check.patch
@@ -9,3 +9,14 @@
    java_major_version=`echo $java_version | sed 's/\([[0-9]][[0-9]]*\)\..*/\1/'`
    java_minor_version=`echo $java_version | sed 's/[[0-9]][[0-9]]*\.\([[0-9]][[0-9]]*\)\(\.[[0-9]][[0-9]]*\)*/\1/' | sed 's/_.*//g'`
  
+--- bin/jmax.in.orig	2004-09-15 11:59:41.575144987 -0700
++++ bin/jmax.in	2004-09-15 12:02:31.142218132 -0700
+@@ -208,7 +208,7 @@
+ check_java_version ()
+ {
+     java_to_test="$1"
+-    java_version=`$java_to_test -version 2>&1 | grep "version" | sed 's/java version//' | sed 's/\"//g' `
++    java_version=`$java_to_test -version 2>&1 | grep "version" | sed 's/java version//' | sed 's/\"//g' | sed 's/-.*//' `
+     if test -z $java_version; then
+ 	# domething bad with java version
+ 	return 1
diff --git a/media-sound/jmax/jmax-4.1.0.ebuild b/media-sound/jmax/jmax-4.1.0.ebuild
index 9fb77b42da8e..c87e3e215cce 100644
--- a/media-sound/jmax/jmax-4.1.0.ebuild
+++ b/media-sound/jmax/jmax-4.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/media-sound/jmax/jmax-4.1.0.ebuild,v 1.1 2004/07/09 02:38:51 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jmax/jmax-4.1.0.ebuild,v 1.1.1.1 2005/11/30 09:37:50 chriswhite Exp $
 
 IUSE="alsa jack doc"
 
@@ -15,7 +15,7 @@ SLOT="0"
 LICENSE="GPL-2"
 #-amd64, -sparc: 4.1.0: fts/linux.c has only code for ppc and ix86
 
-KEYWORDS="x86 -amd64 -sparc"
+KEYWORDS="-amd64 ~ppc -sparc x86"
 
 RDEPEND=">=virtual/jre-1.4
 	jack? ( media-sound/jack-audio-connection-kit )
@@ -33,6 +33,8 @@ src_unpack() {
 	unpack jmax-m4-1.0.tar.bz2
 	epatch ${FILESDIR}/${P}-otherArch.patch
 	epatch ${FILESDIR}/${P}-gcc34.patch
+	# fixed 57691
+	epatch ${FILESDIR}/${P}-fix-java-check.patch
 
 	export WANT_AUTOMAKE=1.6
 	export WANT_AUTOCONF=2.5
@@ -41,14 +43,14 @@ src_unpack() {
 	automake # this will fail because of bad upstream Makefile.am
 	autoconf || die
 
-	elibtoolize
+	libtoolize --copy --force
 }
 
 src_compile() {
-	econf
-
+	econf \
+		`use_enable jack` || die "econf failed"
 	# -j2 fails.  See bug #47978
-	emake -j1
+	emake -j1 || die "emake failed"
 }
 
 src_install () {
diff --git a/media-sound/jmax/metadata.xml b/media-sound/jmax/metadata.xml
index d4ce46c038ab..e1774e3d9ad7 100644
--- a/media-sound/jmax/metadata.xml
+++ b/media-sound/jmax/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sound</herd>
-<maintainer>
-  <email>torbenh@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/media-sound/jsynthlib/ChangeLog b/media-sound/jsynthlib/ChangeLog
index 842dfd23130c..79df687a658d 100644
--- a/media-sound/jsynthlib/ChangeLog
+++ b/media-sound/jsynthlib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/jsynthlib
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jsynthlib/ChangeLog,v 1.1 2005/01/10 04:50:56 jnc Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jsynthlib/ChangeLog,v 1.1.1.1 2005/11/30 09:38:10 chriswhite Exp $
+
+  25 Jul 2005; David Holm <dholm@gentoo.org>
+  jsynthlib-0.19_pre20041220.ebuild:
+  Added to ~ppc.
 
   09 Jan 2005; Eric Shattow <jnc@gentoo.org> +metadata.xml:
   Initial revision. closes bug #75139.
diff --git a/media-sound/jsynthlib/Manifest b/media-sound/jsynthlib/Manifest
index 152087371283..95fcfa684d65 100644
--- a/media-sound/jsynthlib/Manifest
+++ b/media-sound/jsynthlib/Manifest
@@ -1,3 +1,4 @@
+MD5 4877169e0970c9c89fb74118d0031265 ChangeLog 414
+MD5 bc2a60e4548f54961cd97887074a9203 jsynthlib-0.19_pre20041220.ebuild 908
 MD5 4e5a50f7aee667b932576ab7fdcfc85f metadata.xml 219
-MD5 56eda1706b96c642906a05ff1477fbb0 jsynthlib-0.19_pre20041220.ebuild 787
 MD5 51f01127e6698ee2c46c991861fc3142 files/digest-jsynthlib-0.19_pre20041220 80
diff --git a/media-sound/jsynthlib/jsynthlib-0.19_pre20041220.ebuild b/media-sound/jsynthlib/jsynthlib-0.19_pre20041220.ebuild
index 23d23dab53b9..37b5124e12e8 100644
--- a/media-sound/jsynthlib/jsynthlib-0.19_pre20041220.ebuild
+++ b/media-sound/jsynthlib/jsynthlib-0.19_pre20041220.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jsynthlib/jsynthlib-0.19_pre20041220.ebuild,v 1.1 2005/01/10 04:50:56 jnc Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jsynthlib/jsynthlib-0.19_pre20041220.ebuild,v 1.1.1.1 2005/11/30 09:38:10 chriswhite Exp $
 
 inherit java-pkg
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.jsynthlib.org/"
 SRC_URI="http://dev.gentoo.org/~jnc/files/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 IUSE="jikes"
 
 DEPEND=">=virtual/jdk-1.4
diff --git a/media-sound/k3guitune/ChangeLog b/media-sound/k3guitune/ChangeLog
index e681bb73ad28..46bbc1373fdf 100644
--- a/media-sound/k3guitune/ChangeLog
+++ b/media-sound/k3guitune/ChangeLog
@@ -1,6 +1,44 @@
 # ChangeLog for media-sound/k3guitune
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/k3guitune/ChangeLog,v 1.1 2004/08/05 18:55:05 pkdawson Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/k3guitune/ChangeLog,v 1.1.1.1 2005/11/30 09:38:05 chriswhite Exp $
+
+*k3guitune-0.5 (24 Aug 2005)
+
+  24 Aug 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/k3guitune-0.5-configure.patch, +k3guitune-0.5.ebuild:
+  New version.
+
+  30 Jun 2005; Dan Armak <danarmak@gentoo.org>
+  files/k3guitune-0.4.1-configure.patch:
+  Fix 96577: compilation without arts installed.
+
+  03 Apr 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/k3guitune-0.4.1-configure.patch, metadata.xml,
+  k3guitune-0.4.1.ebuild:
+  Change the ebuild to use the kde eclass.
+
+  15 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> :
+  Added arts as a dependency because you can't build without mcopidl.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  k3guitune-0.4.1.ebuild:
+  Stable amd64.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  k3guitune-0.4.1.ebuild:
+  Added ~amd64.  Stable x86.
+
+  30 Aug 2004; David Holm <dholm@gentoo.org> k3guitune-0.4.1.ebuild:
+  Added to ~ppc.
+
+*k3guitune-0.4.1 (24 Aug 2004)
+
+  24 Aug 2004; Patrick Dawson <pkdawson@gentoo.org>
+  k3guitune-0.4.1.ebuild, k3guitune-0.4.ebuild:
+  Version bump. Changed description, removed unnecessary inherit.
+
+  08 Aug 2004; Patrick Dawson <pkdawson@gentoo.org> k3guitune-0.4.ebuild:
+  Changed `` to $(). This is a purely stylistic change to the ebuild.
 
 *k3guitune-0.4 (05 Aug 2004)
 
diff --git a/media-sound/k3guitune/Manifest b/media-sound/k3guitune/Manifest
index 29c4a694238f..840909c74d15 100644
--- a/media-sound/k3guitune/Manifest
+++ b/media-sound/k3guitune/Manifest
@@ -1,2 +1,8 @@
-MD5 9369dbfea7acfed4d5604f1ce2cd8506 k3guitune-0.4.ebuild 709
-MD5 4f7d4ccbd1226af07dbc2aefd7531053 files/digest-k3guitune-0.4 66
+MD5 b6cbf50982296a5907d8a6de4a0963c2 metadata.xml 239
+MD5 a0702ab57f1f7c889f5d3870d89b3818 k3guitune-0.5.ebuild 854
+MD5 8a6010e5ef689fcd4b7e6e2d73fae2e4 k3guitune-0.4.1.ebuild 762
+MD5 f9ff7f5063706462a843be1414ba11ce ChangeLog 1585
+MD5 78dbcff7a5cfeefae7ca2772b582de38 files/digest-k3guitune-0.4.1 68
+MD5 3bfcf57528d09141c6758e44e42a9f66 files/k3guitune-0.4.1-configure.patch 4998
+MD5 449dc6448a0879a730c86cfc9dc441a0 files/digest-k3guitune-0.5 66
+MD5 0ba2c944a63ec8ff3bcaf317177024c3 files/k3guitune-0.5-configure.patch 3654
diff --git a/media-sound/k3guitune/files/k3guitune-0.4.1-configure.patch b/media-sound/k3guitune/files/k3guitune-0.4.1-configure.patch
index de1e258c9a1a..c7fb661c4eee 100644
--- a/media-sound/k3guitune/files/k3guitune-0.4.1-configure.patch
+++ b/media-sound/k3guitune/files/k3guitune-0.4.1-configure.patch
@@ -1,7 +1,6 @@
-diff -Nur k3guitune-0.4.1.orig/configure k3guitune-0.4.1/configure
---- k3guitune-0.4.1.orig/configure	2004-08-18 15:10:29.000000000 +0200
-+++ k3guitune-0.4.1/configure	2005-04-03 18:41:51.000000000 +0200
-@@ -14073,71 +14073,6 @@
+--- configure.orig	2005-06-30 20:27:58.000000000 +0300
++++ configure	2005-06-30 20:28:25.000000000 +0300
+@@ -14073,138 +14073,6 @@
     fi
  
  
@@ -70,6 +69,95 @@ diff -Nur k3guitune-0.4.1.orig/configure k3guitune-0.4.1/configure
 -
 -   fi
 -
+-
+-   echo "$as_me:$LINENO: checking for artsc-config" >&5
+-echo $ECHO_N "checking for artsc-config... $ECHO_C" >&6
+-   if test -n "$ARTSCCONFIG"; then
+-        kde_cv_path="$ARTSCCONFIG";
+-   else
+-        kde_cache=`echo artsc-config | sed 'y%./+-%__p_%'`
+-
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+-        kde_cv_path="NONE"
+-	dirs="$kde_default_bindirs"
+-	kde_save_IFS=$IFS
+-	IFS=':'
+-	for dir in $PATH; do
+-	  dirs="$dirs $dir"
+-        done
+-	IFS=$kde_save_IFS
+-
+-        for dir in $dirs; do
+-	  if test -x "$dir/artsc-config"; then
+-	    if test -n ""
+-	    then
+-              evalstr="$dir/artsc-config  2>&1 "
+-	      if eval $evalstr; then
+-                kde_cv_path="$dir/artsc-config"
+-                break
+-	      fi
+-            else
+-		kde_cv_path="$dir/artsc-config"
+-                break
+-	    fi
+-          fi
+-        done
+-
+-        eval "kde_cv_path_$kde_cache=$kde_cv_path"
+-
+-
+-fi
+-
+-
+-      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
+-
+-   fi
+-
+-   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
+-
+-    { { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
+-Please check whether you installed KDE correctly.
+-" >&5
+-echo "$as_me: error: The important program artsc-config was not found!
+-Please check whether you installed KDE correctly.
+-" >&2;}
+-   { (exit 1); exit 1; }; }
+-
+-   else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
+-      ARTSCCONFIG=$kde_cv_path
+-
+-   fi
+-
+-
+    echo "$as_me:$LINENO: checking for kde-config" >&5
+ echo $ECHO_N "checking for kde-config... $ECHO_C" >&6
+    if test -n "$KDECONFIG"; then
+--- k3guitune/Makefile.am	2004-07-12 12:08:48.000000000 +0300
++++ k3guitune/Makefile.am	2005-06-30 20:30:54.000000000 +0300
+@@ -4,7 +4,7 @@
+ ## INCLUDES were found outside kdevelop specific part
+ 
+ k3guitune_SOURCES = audiodlg.cpp soundinput.cpp k2guitune.cpp guitune.cpp osziview.cpp main.cpp logview.cpp k2guitune_meta_unload.cpp
+-k3guitune_LDADD = -lartsc -lkdeui -lkdecore $(LIBSOCKET)
++k3guitune_LDADD = -lkdeui -lkdecore $(LIBSOCKET)
+ 
+ 
+ EXTRA_DIST = k3guitune.desktop k2guitune_meta_unload.cpp logview.cpp logview.h main.cpp osziview.cpp osziview.h resources.h guitune.cpp guitune.h k2guitune.cpp k2guitune.h k3guituneui.rc soundinput.h soundinput.cpp audiodlg.h audiodlg.cpp 
+--- k3guitune/Makefile.in	2005-06-30 20:31:48.000000000 +0300
++++ k3guitune/Makefile.in	2005-06-30 20:31:03.000000000 +0300
+@@ -305,7 +305,7 @@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ k3guitune_SOURCES = audiodlg.cpp soundinput.cpp k2guitune.cpp guitune.cpp osziview.cpp main.cpp logview.cpp k2guitune_meta_unload.cpp
+-k3guitune_LDADD = -lartsc -lkdeui -lkdecore $(LIBSOCKET)
++k3guitune_LDADD = -lkdeui -lkdecore $(LIBSOCKET)
+ EXTRA_DIST = k3guitune.desktop k2guitune_meta_unload.cpp logview.cpp logview.h main.cpp osziview.cpp osziview.h resources.h guitune.cpp guitune.h k2guitune.cpp k2guitune.h k3guituneui.rc soundinput.h soundinput.cpp audiodlg.h audiodlg.cpp 
  
-    echo "$as_me:$LINENO: checking for artsc-config" >&5
- echo $ECHO_N "checking for artsc-config... $ECHO_C" >&6
+ ####### kdevelop will overwrite this part!!! (end)############
diff --git a/media-sound/k3guitune/k3guitune-0.4.1.ebuild b/media-sound/k3guitune/k3guitune-0.4.1.ebuild
index 70ee2cbe2e25..fd8dfbf6c79d 100644
--- a/media-sound/k3guitune/k3guitune-0.4.1.ebuild
+++ b/media-sound/k3guitune/k3guitune-0.4.1.ebuild
@@ -1,27 +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/media-sound/k3guitune/k3guitune-0.4.1.ebuild,v 1.1 2004/08/24 20:09:38 pkdawson Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/k3guitune/k3guitune-0.4.1.ebuild,v 1.1.1.1 2005/11/30 09:38:05 chriswhite Exp $
 
-DESCRIPTION="A program for KDE 3 that lets you tune musical instruments."
+inherit kde eutils
+
+DESCRIPTION="A program for KDE that lets you tune musical instruments."
 HOMEPAGE="http://home.planet.nl/~lamer024/k3guitune.html"
 SRC_URI="http://home.planet.nl/~lamer024/files/${P}.tar.bz2"
-
 LICENSE="GPL-2"
+
 SLOT="0"
-KEYWORDS="~x86"
-IUSE="alsa arts oss debug xinerama"
+KEYWORDS="x86 ~ppc amd64"
+IUSE="alsa arts oss"
 
-DEPEND=">=kde-base/kdelibs-3
-	alsa? ( media-libs/alsa-lib )"
+DEPEND="alsa? ( media-libs/alsa-lib )"
 
-src_compile() {
-	local myconf
-	myconf="$(use_enable alsa) $(use_enable arts) $(use_enable oss) $(use_enable debug) $(use_with xinerama)"
-	econf ${myconf} || die
-	emake || die
+need-kde 3
+
+src_unpack() {
+	kde_src_unpack
+
+	use arts || epatch "${FILESDIR}/${P}-configure.patch"
 }
 
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYING ChangeLog INSTALL README TODO
+src_compile() {
+	local myconf="$(use_enable alsa) $(use_enable arts) $(use_enable oss)"
+
+	kde_src_compile
 }
diff --git a/media-sound/k3guitune/k3guitune-0.5.ebuild b/media-sound/k3guitune/k3guitune-0.5.ebuild
index a9d951be14c7..8c45602a0c5a 100644
--- a/media-sound/k3guitune/k3guitune-0.5.ebuild
+++ b/media-sound/k3guitune/k3guitune-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/media-sound/k3guitune/k3guitune-0.5.ebuild,v 1.1 2005/08/24 09:19:00 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/k3guitune/k3guitune-0.5.ebuild,v 1.1.1.1 2005/11/30 09:38:05 chriswhite Exp $
 
 inherit kde eutils
 
@@ -24,7 +24,7 @@ src_unpack() {
 }
 
 src_compile() {
-	# the test for jack always fails.
+	# jack support needs a version of bio2jack not released yet.
 	local myconf="$(use_enable alsa) $(use_enable arts)
 	              $(use_enable oss) --disable-jack"
 
diff --git a/media-sound/k3guitune/metadata.xml b/media-sound/k3guitune/metadata.xml
index f82b535a5130..c88401988b91 100644
--- a/media-sound/k3guitune/metadata.xml
+++ b/media-sound/k3guitune/metadata.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sound</herd>
+<herd>kde</herd>
 <maintainer>
   <email>pkdawson@gentoo.org</email>
 </maintainer>
diff --git a/media-sound/kaconnect/ChangeLog b/media-sound/kaconnect/ChangeLog
index 4e0779f8bd07..be7607106a80 100644
--- a/media-sound/kaconnect/ChangeLog
+++ b/media-sound/kaconnect/ChangeLog
@@ -1,6 +1,31 @@
 # ChangeLog for media-sound/kaconnect
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kaconnect/ChangeLog,v 1.1 2004/03/06 12:48:41 eradicator Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kaconnect/ChangeLog,v 1.1.1.1 2005/11/30 09:38:01 chriswhite Exp $
+
+  25 Jul 2005; Caleb Tennis <caleb@gentoo.org> kaconnect-1.1.1.ebuild:
+  Change dep per bug #100235
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  kaconnect-1.1.1.ebuild:
+  Stable sparc.
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  kaconnect-1.1.1.ebuild:
+  Added to ~sparc.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  kaconnect-1.1.1.ebuild:
+  Stable amd64.
+
+  03 Aug 2004; David Holm <dholm@gentoo.org> kaconnect-1.1.1.ebuild:
+  Added to ~ppc.
+
+  26 May 2004; Danny van Dyk <kugelfang@gentoo.org> kaconnect-1.1.1.ebuild:
+  Marked ~amd64.
+
+  10 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  kaconnect-1.1.1.ebuild:
+  Stable x86.
 
 *kaconnect-1.1.1 (06 Mar 2004)
 
diff --git a/media-sound/kaconnect/Manifest b/media-sound/kaconnect/Manifest
index e554d536834a..ed61ed646624 100644
--- a/media-sound/kaconnect/Manifest
+++ b/media-sound/kaconnect/Manifest
@@ -1,2 +1,4 @@
-MD5 ee40f3eb2b455e7ac3628e5127f3286d kaconnect-1.1.1.ebuild 675
+MD5 c2618643c96f5bc072163d76a5edc345 kaconnect-1.1.1.ebuild 839
+MD5 9710b0909aff16282b1fad5d81cd2c57 ChangeLog 1120
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 98997067af96998c349ab336b8b097f9 files/digest-kaconnect-1.1.1 67
diff --git a/media-sound/kaconnect/kaconnect-1.1.1.ebuild b/media-sound/kaconnect/kaconnect-1.1.1.ebuild
index 091a2b91f52b..26102d863bdf 100644
--- a/media-sound/kaconnect/kaconnect-1.1.1.ebuild
+++ b/media-sound/kaconnect/kaconnect-1.1.1.ebuild
@@ -1,18 +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/media-sound/kaconnect/kaconnect-1.1.1.ebuild,v 1.1 2004/03/06 12:48:41 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kaconnect/kaconnect-1.1.1.ebuild,v 1.1.1.1 2005/11/30 09:38:01 chriswhite Exp $
 
-DESCRIPTION="a QT based aconnect frontend"
+inherit qt3
+
+IUSE=""
+
+DESCRIPTION="Part of Kalsatools - QT based frontend to aconnect"
 HOMEPAGE="http://www.suse.de/~mana/kalsatools.html"
 SRC_URI="ftp://ftp.suse.com/pub/people/mana/kalsatools-current/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
-IUSE=""
+KEYWORDS="amd64 ~ppc sparc x86"
 
 RDEPEND="media-sound/alsa-utils
-	>=x11-libs/qt-3.0.5"
+	$(qt_min_version 3.1)"
 
 DEPEND="${RDEPEND}
 	sys-apps/sed"
@@ -29,5 +32,5 @@ src_compile() {
 
 src_install () {
 	dobin kaconnect
-	dodoc INSTALL README THANKS LICENSE kalsatools.changes
+	dodoc README THANKS LICENSE kalsatools.changes
 }
diff --git a/media-sound/kamix/ChangeLog b/media-sound/kamix/ChangeLog
index a9ce78762ef2..9725951de83d 100644
--- a/media-sound/kamix/ChangeLog
+++ b/media-sound/kamix/ChangeLog
@@ -1,6 +1,80 @@
 # ChangeLog for media-sound/kamix
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kamix/ChangeLog,v 1.1 2004/08/11 05:45:55 pkdawson Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kamix/ChangeLog,v 1.1.1.1 2005/11/30 09:38:31 chriswhite Exp $
+
+  11 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> kamix-0.6.1.ebuild:
+  Stable on ppc.
+
+*kamix-0.6.5 (10 Nov 2005)
+
+  10 Nov 2005; Gregorio Guidi <greg_g@gentoo.org> +kamix-0.6.5.ebuild:
+  New version.
+
+*kamix-0.6.4 (30 Oct 2005)
+
+  30 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kamix-0.6.4-misc.patch, +kamix-0.6.4.ebuild:
+  Updated to 0.6.4 and added patch to compile with GCC4 and without vumeter
+  (arts).
+
+*kamix-0.6.3 (10 Oct 2005)
+
+  10 Oct 2005; MATSUU Takuto <matsuu@gentoo.org> kamix-0.6.1.ebuild,
+  +kamix-0.6.3.ebuild:
+  Version bumped. Bug 95979.
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> kamix-0.5.7.ebuild:
+  Stable on ppc.
+
+  18 Feb 2005; Gregorio Guidi <greg_g@gentoo.org> kamix-0.6.1.ebuild:
+  Make arts support optional again.
+
+*kamix-0.6.1 (23 Dec 2004)
+
+  23 Dec 2004; Patrick Dawson <pkdawson@gentoo.org> +kamix-0.6.1.ebuild:
+  version bump
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> kamix-0.5.7.ebuild:
+  Stable amd64.
+
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org> kamix-0.5.7.ebuild:
+  Stable on ppc64
+
+  17 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> kamix-0.5.7.ebuild:
+  Assume vumeter.
+
+  08 Nov 2004; Patrick Dawson <pkdawson@gentoo.org> kamix-0.5.7.ebuild:
+  Stable x86.
+
+  01 Nov 2004; Markus Rothe <corsair@gentoo.org>
+
+  kamix-0.5.7.ebuild:
+  Marked ~ppc64; bug #64641
+
+  22 Oct 2004; Simone Gotti <motaboy@gentoo.org> kamix-0.5.7.ebuild:
+  Disable the VUMETER if 'arts' USE flag is disabled too. This should be fixed
+  upstream
+
+  15 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> kamix-0.5.7.ebuild:
+  Added arts as a DEPENDency.
+
+  11 Oct 2004; Patrick Dawson <pkdawson@gentoo.org> -kamix-0.5.4.ebuild,
+  -kamix-0.5.5.ebuild:
+  Removed old versions.
+
+*kamix-0.5.7 (04 Oct 2004)
+
+  04 Oct 2004; Patrick Dawson <pkdawson@gentoo.org> +kamix-0.5.7.ebuild:
+  version bump
+
+  23 Sep 2004; Patrick Dawson <pkdawson@gentoo.org> +kamix-0.5.5.ebuild:
+  version bump
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> kamix-0.5.4.ebuild:
+  Added ~amd64.  Stable x86.
+
+  30 Aug 2004; David Holm <dholm@gentoo.org> kamix-0.5.4.ebuild:
+  Added to ~ppc.
 
 *kamix-0.5.4 (11 Aug 2004)
 
diff --git a/media-sound/kamix/Manifest b/media-sound/kamix/Manifest
index 46cf37f021fa..119989519112 100644
--- a/media-sound/kamix/Manifest
+++ b/media-sound/kamix/Manifest
@@ -1,4 +1,13 @@
-MD5 56eb4ddf3d63b38d0fb757b0344766c2 kamix-0.5.4.ebuild 392
-MD5 c07f5985203f29caea45da707dacb69b ChangeLog 317
+MD5 a3eefcd4594b4ea2507be3d41c2cf766 ChangeLog 2553
+MD5 7fcb080495d5a1a3f902288032ef4025 files/digest-kamix-0.5.7 64
+MD5 235e2f9a7ebc68ce021272095ef6f4cd files/digest-kamix-0.6.1 64
+MD5 d6dacb863546456ed26bc2240d101fd3 files/digest-kamix-0.6.3 64
+MD5 eb69f9b32a908975ebc052ccd250d626 files/digest-kamix-0.6.4 66
+MD5 bae98cc9535c5e35a42ece295c633016 files/digest-kamix-0.6.5 64
+MD5 43a9be2869b8a5e16fa75ef96354a0df files/kamix-0.6.4-misc.patch 907
+MD5 c5b779c22120e92b83d42d9a79a0d146 kamix-0.5.7.ebuild 640
+MD5 30b9f40dff6becd5c32bf2da7d4986f1 kamix-0.6.1.ebuild 571
+MD5 da8117cd5d1b103680fecbfcb9cb6848 kamix-0.6.3.ebuild 574
+MD5 81c353a9546f3c484c93c32fee47a659 kamix-0.6.4.ebuild 669
+MD5 0ad7766e86c61f11e6eb9470db7a49e2 kamix-0.6.5.ebuild 576
 MD5 83c2574543d0501303b57050254e3880 metadata.xml 222
-MD5 f129e2fc0b169d2924ce941e7cfec3b4 files/digest-kamix-0.5.4 64
diff --git a/media-sound/kamix/kamix-0.5.7.ebuild b/media-sound/kamix/kamix-0.5.7.ebuild
index 06ef956a8c48..abda2c22c7ca 100644
--- a/media-sound/kamix/kamix-0.5.7.ebuild
+++ b/media-sound/kamix/kamix-0.5.7.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/media-sound/kamix/kamix-0.5.7.ebuild,v 1.1 2004/10/04 23:20:08 pkdawson Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kamix/kamix-0.5.7.ebuild,v 1.1.1.1 2005/11/30 09:38:31 chriswhite Exp $
+
+IUSE=""
 
 inherit kde
 need-kde 3
@@ -11,9 +13,15 @@ SRC_URI="mirror://sourceforge/kamix/${P}.tar.bz2"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE=""
+KEYWORDS="amd64 ppc ppc64 x86"
 DEPEND="${DEPEND}
+	>=kde-base/arts-1.2.0
 	>=media-libs/alsa-lib-0.9"
 
 S=${WORKDIR}/${PN}
+
+src_compile() {
+	kde_src_compile myconf
+	myconf="$myconf --enable-vumeter"
+	kde_src_compile configure make
+}
diff --git a/media-sound/kamix/kamix-0.6.1.ebuild b/media-sound/kamix/kamix-0.6.1.ebuild
index fa6ef57dd061..3feef156fd38 100644
--- a/media-sound/kamix/kamix-0.6.1.ebuild
+++ b/media-sound/kamix/kamix-0.6.1.ebuild
@@ -1,11 +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/media-sound/kamix/kamix-0.6.1.ebuild,v 1.1 2004/12/24 04:19:09 pkdawson Exp $
-
-IUSE=""
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kamix/kamix-0.6.1.ebuild,v 1.1.1.1 2005/11/30 09:38:31 chriswhite Exp $
 
 inherit kde
-need-kde 3
 
 DESCRIPTION="A mixer for KDE and ALSA."
 HOMEPAGE="http://kamix.sourceforge.net/"
@@ -13,15 +10,17 @@ SRC_URI="mirror://sourceforge/kamix/${P}.tar.bz2"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-DEPEND="${DEPEND}
-	>=kde-base/arts-1.2.0
-	>=media-libs/alsa-lib-0.9"
+KEYWORDS="amd64 ppc ~ppc64 x86"
+IUSE=""
+
+DEPEND=">=media-libs/alsa-lib-0.9"
+
+need-kde 3
 
 S=${WORKDIR}/${PN}
 
 src_compile() {
-	kde_src_compile myconf
-	myconf="$myconf --enable-vumeter"
-	kde_src_compile configure make
+	myconf="$(use_enable arts vumeter)"
+
+	kde_src_compile
 }
diff --git a/media-sound/kamix/kamix-0.6.3.ebuild b/media-sound/kamix/kamix-0.6.3.ebuild
index 9b0f127f6dfb..4d4b79d6d76c 100644
--- a/media-sound/kamix/kamix-0.6.3.ebuild
+++ b/media-sound/kamix/kamix-0.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/media-sound/kamix/kamix-0.6.3.ebuild,v 1.1 2005/10/13 22:40:44 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kamix/kamix-0.6.3.ebuild,v 1.1.1.1 2005/11/30 09:38:31 chriswhite Exp $
 
 inherit kde
 
diff --git a/media-sound/kamix/kamix-0.6.4.ebuild b/media-sound/kamix/kamix-0.6.4.ebuild
index afa6726fb6a2..e8e8c9692401 100644
--- a/media-sound/kamix/kamix-0.6.4.ebuild
+++ b/media-sound/kamix/kamix-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/media-sound/kamix/kamix-0.6.4.ebuild,v 1.1 2005/10/30 22:02:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kamix/kamix-0.6.4.ebuild,v 1.1.1.1 2005/11/30 09:38:31 chriswhite Exp $
 
 inherit kde
 
diff --git a/media-sound/kamix/kamix-0.6.5.ebuild b/media-sound/kamix/kamix-0.6.5.ebuild
index 4436d7e7634c..c57872e036f2 100644
--- a/media-sound/kamix/kamix-0.6.5.ebuild
+++ b/media-sound/kamix/kamix-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/media-sound/kamix/kamix-0.6.5.ebuild,v 1.1 2005/11/10 15:30:22 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kamix/kamix-0.6.5.ebuild,v 1.1.1.1 2005/11/30 09:38:31 chriswhite Exp $
 
 inherit kde
 
diff --git a/media-sound/kid3/ChangeLog b/media-sound/kid3/ChangeLog
index 616e140ab548..2432ed311953 100644
--- a/media-sound/kid3/ChangeLog
+++ b/media-sound/kid3/ChangeLog
@@ -1,6 +1,68 @@
 # ChangeLog for media-sound/kid3
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/ChangeLog,v 1.1 2004/04/26 21:37:08 centic Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/ChangeLog,v 1.1.1.1 2005/11/30 09:38:12 chriswhite Exp $
+
+  06 Nov 2005; Gregorio Guidi <greg_g@gentoo.org> kid3-0.6.ebuild:
+  Forcing KDE support on, as kid3 cannot be configured without having the KDE
+  libraries installed. Also fixes bug #111692.
+
+*kid3-0.6 (05 Nov 2005)
+
+  05 Nov 2005; Gregorio Guidi <greg_g@gentoo.org> +kid3-0.6.ebuild:
+  New version (#110998). Make kde support optional. Ad support for vorbis,
+  flac, musicbrainz.
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> kid3-0.5.ebuild:
+  Stable on ppc.
+
+  20 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org> kid3-0.5.ebuild:
+  Stable ppc64 fixing my 2 month old mistake.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> kid3-0.4.ebuild,
+  kid3-0.5.ebuild:
+  Stable amd64, sparc, x86.  Added arts to IUSE.
+
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org> kid3-0.5.ebuild:
+  Stable on ppc64
+
+  28 Nov 2004; Simone Gotti <motaboy@gentoo.org>
+  +files/kid3-0.4-configure.patch, kid3-0.4.ebuild:
+  Added a patch to the configure script to honor the arts USE flag. Fixes bug
+  #70703.
+
+  28 Nov 2004; Simone Gotti <motaboy@gentoo.org>
+  +files/kid3-0.5-configure.patch, kid3-0.5.ebuild:
+  Added a patch to the configure script to honor the arts USE flag. Fixes bug
+  #70703.
+
+  01 Nov 2004; Markus Rothe <corsair@gentoo.org>
+
+  kid3-0.5.ebuild:
+  Marked ~ppc64; bug #64642
+
+*kid3-0.5 (20 Oct 2004)
+
+  20 Oct 2004; Patrick Dawson <pkdawson@gentoo.org> +kid3-0.5.ebuild:
+  version bump
+
+  28 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> kid3-0.4.ebuild:
+  Stable amd64 sparc.
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> kid3-0.4.ebuild:
+  Stable x86.
+
+  14 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/kid3-0.4-gcc34.patch:
+  gcc-3.4 fixes provided by Patrick Dawson <pkdawson@buffalo.edu> to close bug
+  #56070. Added to ~sparc and ~amd64.
+
+  03 Jul 2004; Carsten Lohrke <carlo@gentoo.org> kid3-0.4.ebuild:
+  QA: need-kde after R/DEPEND
+
+*kid3-0.4 (28 Apr 2004)
+
+  28 Apr 2004; David Holm <dholm@gentoo.org> kid3-0.4.ebuild:
+  Added to ~ppc.
 
   26 Apr 2004; Dominik Stadler <centic@gentoo.org> :
   Add new ebuild for kid3, see Bug 23014.
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index 0272be1b26f6..e25240b6788a 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,3 +1,7 @@
-MD5 deb11947513885cd3cc71e3d80437393 kid3-0.4.ebuild 625
-MD5 7d9e72368621e7f2e5ee693864eb5162 files/digest-kid3-0.3 60
-MD5 befd953f34b4f39db828edf76972c91b files/digest-kid3-0.4 60
+MD5 b23600108f12c98a4fd574d3487ee598 metadata.xml 175
+MD5 b62054eaf83f84b725f18f59dde0df8d kid3-0.6.ebuild 920
+MD5 6ca26f56ffac2eb93fce9bc9c0d14d7a ChangeLog 2306
+MD5 3544b5449cbb9584580e2ce00130e9e5 kid3-0.5.ebuild 587
+MD5 3031e9d49aa3af808d9a046e281ab344 files/digest-kid3-0.5 60
+MD5 ca598674409d4fdd5c48e17ef0d436f7 files/digest-kid3-0.6 60
+MD5 a12901d96c0d25c91a53e560ad3b540c files/kid3-0.5-configure.patch 3567
diff --git a/media-sound/kid3/kid3-0.5.ebuild b/media-sound/kid3/kid3-0.5.ebuild
index 3cdac2546a65..005b25f9c7f1 100644
--- a/media-sound/kid3/kid3-0.5.ebuild
+++ b/media-sound/kid3/kid3-0.5.ebuild
@@ -1,20 +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/media-sound/kid3/kid3-0.5.ebuild,v 1.1 2004/10/20 19:34:13 pkdawson Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/kid3-0.5.ebuild,v 1.1.1.1 2005/11/30 09:38:12 chriswhite Exp $
 
-IUSE=""
+IUSE="arts"
 
 inherit kde eutils
 
-DESCRIPTION="A simple id3 tag editor for QT/KDE with automatic string replacements, case conversion etc."
+DESCRIPTION="A simple ID3 tag editor for QT/KDE."
 HOMEPAGE="http://kid3.sourceforge.net/"
 SRC_URI="mirror://sourceforge/kid3/${P}.tar.gz"
 
 SLOT="0"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 
 DEPEND=">=media-libs/id3lib-3.8.3"
 need-kde 3.1
 
+src_unpack() {
+	kde_src_unpack
+
+	use arts || epatch ${FILESDIR}/${P}-configure.patch
+}
diff --git a/media-sound/kid3/kid3-0.6.ebuild b/media-sound/kid3/kid3-0.6.ebuild
index 3c04ad520566..093a9da2743d 100644
--- a/media-sound/kid3/kid3-0.6.ebuild
+++ b/media-sound/kid3/kid3-0.6.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/media-sound/kid3/kid3-0.6.ebuild,v 1.1 2005/11/05 20:07:00 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/kid3-0.6.ebuild,v 1.1.1.1 2005/11/30 09:38:12 chriswhite Exp $
 
-inherit kde-functions
+inherit kde
 
 DESCRIPTION="A simple ID3 tag editor for QT/KDE."
 HOMEPAGE="http://kid3.sourceforge.net/"
@@ -11,28 +11,24 @@ LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="flac kde musicbrainz vorbis"
+IUSE="flac musicbrainz vorbis"
 
-DEPEND="=x11-libs/qt-3*
-	>=media-libs/id3lib-3.8.3
-	kde? ( kde-base/kdelibs )
+DEPEND=">=media-libs/id3lib-3.8.3
 	vorbis? ( media-libs/libvorbis )
 	flac? ( media-libs/flac )
 	musicbrainz? ( media-libs/tunepimp )"
 
-set-kdedir 3
+need-kde 3
+
+# Support for the KDE libraries is optional,
+# but the configure step that detects them
+# cannot be avoided. So KDE support is forced on.
 
 src_compile() {
-	local myconf="$(use_with kde)
+	local myconf="--with-kde
 	              $(use_with vorbis)
 	              $(use_with flac)
 	              $(use_with musicbrainz)"
 
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
+	kde_src_compile
 }
diff --git a/media-sound/kid3/metadata.xml b/media-sound/kid3/metadata.xml
index 57e62fafef00..ede2e3c0508d 100644
--- a/media-sound/kid3/metadata.xml
+++ b/media-sound/kid3/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>kde-other</herd>
+<herd>kde</herd>
 <herd>sound</herd>
 </pkgmetadata>
diff --git a/media-sound/kmp/ChangeLog b/media-sound/kmp/ChangeLog
index eea7053020bf..0bd64820e899 100644
--- a/media-sound/kmp/ChangeLog
+++ b/media-sound/kmp/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for media-sound/kmp
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kmp/ChangeLog,v 1.1 2004/08/08 00:40:59 pkdawson Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kmp/ChangeLog,v 1.1.1.1 2005/11/30 09:37:53 chriswhite Exp $
+
+*kmp-0.5 (04 May 2005)
+
+  04 May 2005; Jan Brinkmann <luckyduck@gentoo.org> kmp-0.01.ebuild,
+  +kmp-0.5.ebuild:
+  new upstream version, fixes #91395
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> kmp-0.01.ebuild:
+  Stable sparc.
+
+  28 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> kmp-0.01.ebuild:
+  Stable amd64.  Added ~sparc.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> kmp-0.01.ebuild:
+  Added ~amd64.  Stable x86.
+
+  30 Aug 2004; David Holm <dholm@gentoo.org> kmp-0.01.ebuild:
+  Added to ~ppc.
+
+  25 Aug 2004; Patrick Dawson <pkdawson@gentoo.org> kmp-0.01.ebuild :
+  Added a fix for gcc-3.4.
 
 *kmp-0.01 (07 Aug 2004)
 
diff --git a/media-sound/kmp/Manifest b/media-sound/kmp/Manifest
index a45394c693d0..4d58a24f9b1c 100644
--- a/media-sound/kmp/Manifest
+++ b/media-sound/kmp/Manifest
@@ -1,2 +1,17 @@
-MD5 5db4f734238e0574c13f0ba990a55e23 kmp-0.01.ebuild 812
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1886dd8195044f32f4692757e418cfa6 kmp-0.5.ebuild 933
+MD5 82a7d1c387aba4b058366445cedf1fdb kmp-0.01.ebuild 986
+MD5 08e6634feb7b0ad27349b9505a1d18c0 ChangeLog 949
+MD5 83c2574543d0501303b57050254e3880 metadata.xml 222
 MD5 6f827d1afc639044d5838cbf0c834d85 files/digest-kmp-0.01 61
+MD5 4a3ebfe8bfb67de92e1cb05bec2e65af files/digest-kmp-0.5 60
+MD5 367223b8cfcde84caf89a4f46cab4e8e files/kmp-0.01-gcc34.patch 483
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCePKV06ebR+OMO78RAiQFAJ4nGYX9j/9d/adsLuGr7yT3rkIrrQCfdyZs
+JfI2xrPU11FJothMk7/Ltd4=
+=+8Dp
+-----END PGP SIGNATURE-----
diff --git a/media-sound/kmp/kmp-0.01.ebuild b/media-sound/kmp/kmp-0.01.ebuild
index af1a537a3fdb..86833570f934 100644
--- a/media-sound/kmp/kmp-0.01.ebuild
+++ b/media-sound/kmp/kmp-0.01.ebuild
@@ -1,8 +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/media-sound/kmp/kmp-0.01.ebuild,v 1.1 2004/08/08 00:40:59 pkdawson Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kmp/kmp-0.01.ebuild,v 1.1.1.1 2005/11/30 09:37:53 chriswhite Exp $
 
-inherit eutils
+inherit eutils kde-functions
+
+need-qt 3
 
 DESCRIPTION="An MPD client that uses Qt"
 HOMEPAGE="http://www.threadbox.net/kmp.php"
@@ -10,23 +12,25 @@ SRC_URI="http://www.threadbox.net/code/files/kmp/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 IUSE=""
 
-DEPEND=">=x11-libs/qt-3.0"
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/kmp-0.01-gcc34.patch
+}
 
 src_compile() {
 	echo QMAKE_CFLAGS_RELEASE=${CFLAGS} >> kmp.pro
 	echo QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS} >> kmp.pro
 
-	addwrite ${QTDIR}/etc/settings
-	econf || die
-	emake || die
+	econf || die "configure failed"
+	emake || die "make failed"
 }
 
 src_install() {
 	dobin kmp
-	dodoc LICENSE README
+	dodoc README
 
 	insinto /usr/share/pixmaps
 	newins pics/icon.png kmp.png
diff --git a/media-sound/kmp/kmp-0.5.ebuild b/media-sound/kmp/kmp-0.5.ebuild
index e46ed5cc4b3a..38c79abfd7d1 100644
--- a/media-sound/kmp/kmp-0.5.ebuild
+++ b/media-sound/kmp/kmp-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/media-sound/kmp/kmp-0.5.ebuild,v 1.1 2005/05/04 16:04:18 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kmp/kmp-0.5.ebuild,v 1.1.1.1 2005/11/30 09:37:53 chriswhite Exp $
 
 inherit eutils kde-functions
 
diff --git a/media-sound/kmp/metadata.xml b/media-sound/kmp/metadata.xml
index 4ed99a00fe81..f82b535a5130 100644
--- a/media-sound/kmp/metadata.xml
+++ b/media-sound/kmp/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>media-sound</herd>
+<herd>sound</herd>
 <maintainer>
   <email>pkdawson@gentoo.org</email>
 </maintainer>
diff --git a/media-sound/knob/ChangeLog b/media-sound/knob/ChangeLog
index b5969caf65df..f66865fb2759 100644
--- a/media-sound/knob/ChangeLog
+++ b/media-sound/knob/ChangeLog
@@ -1,6 +1,27 @@
-# ChangeLog for media-tv/kwintv
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/knob/ChangeLog,v 1.1 2003/08/12 03:48:29 caleb Exp $
+# ChangeLog for media-sound/knob
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/knob/ChangeLog,v 1.1.1.1 2005/11/30 09:38:11 chriswhite Exp $
+
+  05 Oct 2005; MATSUU Takuto <matsuu@gentoo.org> knob-1.2-r1.ebuild:
+  Added kde-base/arts to DEPEND. Bug 108130.
+
+  15 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> knob-1.2-r1.ebuild:
+  Stable on alpha.
+
+  03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> knob-1.2-r1.ebuild:
+  Stable amd64, sparc, x86.
+
+*knob-1.2-r1 (05 Jul 2004)
+
+  05 Jul 2004; Frank van de Pol <fvdpol@gentoo.org>
+  +files/knob-1.2-fPIC.patch, +knob-1.2-r1.ebuild:
+  Added -fPIC patch for amd64. Closing bug #56071.
+
+  29 Jun 2004; Carsten Lohrke <carlo@gentoo.org> knob-1.2.ebuild:
+  QA: inherit kde-base -> inherit kde, IUSE
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> knob-1.2.ebuild:
+  Added IUSE.
 
 *knob-1.2 (11 Aug 2003)
 
diff --git a/media-sound/knob/Manifest b/media-sound/knob/Manifest
index d3afbb35ddc7..852b4d099e1c 100644
--- a/media-sound/knob/Manifest
+++ b/media-sound/knob/Manifest
@@ -1,2 +1,5 @@
-MD5 5434d41252cc63ff62d1381b219f3ef7 knob-1.2.ebuild 488
-MD5 a56cfa065796d6825807406e890476e5 files/digest-knob-1.2 60
+MD5 dbad4c0791d33b8066a7500c811ea12a knob-1.2-r1.ebuild 584
+MD5 8d09f07e1b75dd42f55d859acfb8ab99 ChangeLog 1004
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 a56cfa065796d6825807406e890476e5 files/digest-knob-1.2-r1 60
+MD5 e19a414c89ffe94dfd4cae80e1da4248 files/knob-1.2-fPIC.patch 375
diff --git a/media-sound/knob/knob-1.2-r1.ebuild b/media-sound/knob/knob-1.2-r1.ebuild
index f8e2846cc07b..5b352bf4c7e2 100644
--- a/media-sound/knob/knob-1.2-r1.ebuild
+++ b/media-sound/knob/knob-1.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/media-sound/knob/knob-1.2-r1.ebuild,v 1.1 2004/07/04 23:33:37 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/knob/knob-1.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:11 chriswhite Exp $
 
 inherit kde eutils
 
@@ -10,9 +10,11 @@ SRC_URI="http://lichota.net/~krzysiek/projects/knob/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc alpha ~ppc ~amd64"
+KEYWORDS="x86 sparc alpha ~ppc amd64"
 IUSE=""
 
+DEPEND="kde-base/arts"
+
 need-kde 3
 
 src_unpack() {
diff --git a/media-sound/kradio/ChangeLog b/media-sound/kradio/ChangeLog
index ad8c47529944..dd76f79933c3 100644
--- a/media-sound/kradio/ChangeLog
+++ b/media-sound/kradio/ChangeLog
@@ -1,6 +1,44 @@
 # ChangeLog for media-sound/kradio
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kradio/ChangeLog,v 1.1 2003/12/12 10:34:33 phosphan Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kradio/ChangeLog,v 1.1.1.1 2005/11/30 09:38:41 chriswhite Exp $
+
+*kradio-1.0b_beta3 (05 Sep 2005)
+
+  05 Sep 2005; Patrick Kursawe <phosphan@gentoo.org>
+  +kradio-1.0b_beta3.ebuild:
+  Adding 1.0beta3b as 1.0b_beta3
+
+*kradio-1.0_beta3 (26 Aug 2005)
+
+  26 Aug 2005; Patrick Kursawe <phosphan@gentoo.org> +kradio-1.0_beta3.ebuild:
+  Version bump - does no longer need unsermake, depends on arts if arts in USE
+
+  27 May 2005; Patrick Kursawe <phosphan@gentoo.org> kradio-1.0_beta1.ebuild:
+  Updating DEPEND/RDEPEND because of trouble with older unsermake versions
+
+*kradio-1.0_beta1 (24 May 2005)
+
+  24 May 2005; Patrick Kursawe <phosphan@gentoo.org>
+  -kradio-0.3.0_alpha2.ebuild, +kradio-1.0_beta1.ebuild:
+  Version bump (bug #93682) - uses unsermake now, supports USE flags
+  arts, encode, ogg, vorbis.
+
+*kradio-0.3.0_alpha20041207 (07 Dec 2004)
+
+  07 Dec 2004; Patrick Kursawe <phosphan@gentoo.org>
+  +files/0.3.0_alpha20041207-gcc.patch, +kradio-0.3.0_alpha20041207.ebuild:
+  Made CVS snapshot and a little patch to get it through gcc 3.4 (bug #73336)
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  kradio-0.3.0_alpha2.ebuild:
+  Added to ~sparc.
+
+  29 Jun 2004; Carsten Lohrke <carlo@gentoo.org> kradio-0.3.0_alpha2.ebuild:
+  QA: inherit kde-base -> inherit kde, need-kde after R/DEPEND
+
+  07 Mar 2004; root <root@gentoo.org> kradio-0.3.0_alpha2.ebuild:
+  Added a dependency on libsndfile, see Bug #36595. Also make use of the
+  USE-Flag lirc and depend on it if needed.
 
 *kradio-0.3.0_alpha2 (12 Dec 2003)
 
diff --git a/media-sound/kradio/Manifest b/media-sound/kradio/Manifest
index 0b9a2e37b853..52eecf09c890 100644
--- a/media-sound/kradio/Manifest
+++ b/media-sound/kradio/Manifest
@@ -1,2 +1,11 @@
-MD5 63555135df55323c49db8cd4500005d5 kradio-0.3.0_alpha2.ebuild 539
-MD5 64227e42b8068964bd71a8ebf9741357 files/digest-kradio-0.3.0_alpha2 72
+MD5 5476db5166c8c47d9803887120b66db3 kradio-1.0_beta1.ebuild 1429
+MD5 80d1bec2c22b6683540d06284d306ec1 kradio-1.0_beta3.ebuild 1313
+MD5 7641a174b3552f6e1e2e899c60d3c730 kradio-0.3.0_alpha20041207.ebuild 670
+MD5 d9a9da73c6bea3194bb3451998737516 ChangeLog 1785
+MD5 9d3144020349b12bd44321fcd3b72069 metadata.xml 220
+MD5 94be1438d2dcde8fd25291704967e2fe kradio-1.0b_beta3.ebuild 1315
+MD5 ee47af0a474d75351f4f0a88b087752e files/digest-kradio-1.0_beta1 69
+MD5 d50f532f68fb07c187dfd279a61ee36c files/digest-kradio-1.0_beta3 69
+MD5 4c782588fc9a607d0ddbaced504a9ba8 files/0.3.0_alpha20041207-gcc.patch 556
+MD5 ae65eb1e2ac124f1898a6be7bcd4c376 files/digest-kradio-0.3.0_alpha20041207 79
+MD5 88c3b63a3aebe2f1f776899932fbef7b files/digest-kradio-1.0b_beta3 70
diff --git a/media-sound/kradio/kradio-0.3.0_alpha20041207.ebuild b/media-sound/kradio/kradio-0.3.0_alpha20041207.ebuild
index e4e6db557173..ccba056b59d1 100644
--- a/media-sound/kradio/kradio-0.3.0_alpha20041207.ebuild
+++ b/media-sound/kradio/kradio-0.3.0_alpha20041207.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/media-sound/kradio/kradio-0.3.0_alpha20041207.ebuild,v 1.1 2004/12/07 08:29:31 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kradio/kradio-0.3.0_alpha20041207.ebuild,v 1.1.1.1 2005/11/30 09:38:41 chriswhite Exp $
 
 inherit kde
 
diff --git a/media-sound/kradio/kradio-1.0_beta1.ebuild b/media-sound/kradio/kradio-1.0_beta1.ebuild
index 855f64bb8008..23bbf8089d3c 100644
--- a/media-sound/kradio/kradio-1.0_beta1.ebuild
+++ b/media-sound/kradio/kradio-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/media-sound/kradio/kradio-1.0_beta1.ebuild,v 1.1 2005/05/24 09:46:16 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kradio/kradio-1.0_beta1.ebuild,v 1.1.1.1 2005/11/30 09:38:41 chriswhite Exp $
 
 inherit kde
 
@@ -16,12 +16,15 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 IUSE="lirc encode vorbis ogg"
 
-DEPEND="lirc? ( app-misc/lirc )
+RDEPEND="lirc? ( app-misc/lirc )
 	media-libs/libsndfile
-	kde-base/unsermake
 	encode? ( media-sound/lame )
 	vorbis? ( media-libs/libvorbis )
 	ogg? ( media-libs/libogg )"
+
+DEPEND="${RDEPEND}
+	>=kde-base/unsermake-0.3.1.4319.0"
+
 need-kde 3.2
 
 src_compile() {
diff --git a/media-sound/kradio/kradio-1.0_beta3.ebuild b/media-sound/kradio/kradio-1.0_beta3.ebuild
index 68641af67403..313fd27fec82 100644
--- a/media-sound/kradio/kradio-1.0_beta3.ebuild
+++ b/media-sound/kradio/kradio-1.0_beta3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kradio/kradio-1.0_beta3.ebuild,v 1.1 2005/08/26 10:01:45 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kradio/kradio-1.0_beta3.ebuild,v 1.1.1.1 2005/11/30 09:38:41 chriswhite Exp $
 
 inherit kde
 
diff --git a/media-sound/kradio/kradio-1.0b_beta3.ebuild b/media-sound/kradio/kradio-1.0b_beta3.ebuild
index 7b9d2fc87c7c..16ff5f66f707 100644
--- a/media-sound/kradio/kradio-1.0b_beta3.ebuild
+++ b/media-sound/kradio/kradio-1.0b_beta3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kradio/kradio-1.0b_beta3.ebuild,v 1.1 2005/09/05 09:12:13 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kradio/kradio-1.0b_beta3.ebuild,v 1.1.1.1 2005/11/30 09:38:41 chriswhite Exp $
 
 inherit kde
 
diff --git a/media-sound/kradio/metadata.xml b/media-sound/kradio/metadata.xml
index bce3a70882f8..5d7e35b9404a 100644
--- a/media-sound/kradio/metadata.xml
+++ b/media-sound/kradio/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>kde</herd>
 <maintainer>
   <email>phosphan@gentoo.org</email>
 </maintainer>
diff --git a/media-sound/krecord/ChangeLog b/media-sound/krecord/ChangeLog
index acb1ddae6e99..131e076901ca 100644
--- a/media-sound/krecord/ChangeLog
+++ b/media-sound/krecord/ChangeLog
@@ -1,6 +1,31 @@
 # ChangeLog for media-sound/krecord
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/krecord/ChangeLog,v 1.1 2002/07/28 16:56:34 danarmak Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/krecord/ChangeLog,v 1.1.1.1 2005/11/30 09:38:27 chriswhite Exp $
+
+*krecord-1.16 (17 Oct 2005)
+
+  17 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> +krecord-1.16.ebuild:
+  New version (#109408). Cleanup.
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  krecord-1.14.ebuild:
+  Added to ~sparc.
+
+  29 Jun 2004; Carsten Lohrke <carlo@gentoo.org> krecord-1.11.ebuild,
+  krecord-1.14.ebuild:
+  QA: inherit kde-base -> inherit kde, IUSE
+
+  02 May 2004; Danny van Dyk <kugelfang@gentoo.org> krecord-1.14.ebuild:
+  Marked ~amd64.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> krecord-1.11.ebuild,
+  krecord-1.14.ebuild:
+  Added IUSE.
+
+*krecord-1.14 (11 Aug 2003)
+
+  11 Aug 2003; Caleb Tennis <caleb@gentoo.org>
+  Version bump
 
 *krecord-1.11 (28 Jul 2002)
 
diff --git a/media-sound/krecord/Manifest b/media-sound/krecord/Manifest
index e69de29bb2d1..ce9cefe759dd 100644
--- a/media-sound/krecord/Manifest
+++ b/media-sound/krecord/Manifest
@@ -0,0 +1,6 @@
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 3918473e58ab864302f78c60c94eed45 krecord-1.14.ebuild 543
+MD5 c5f2e5325f37148310a9ad27a01bb242 krecord-1.16.ebuild 791
+MD5 11cbc6d798e53c7ea1eecac1535f9121 ChangeLog 1104
+MD5 2fab5ef6807980c4614875cc700cac45 files/digest-krecord-1.14 63
+MD5 548cd8736591da19d5005b3c86c98cbd files/digest-krecord-1.16 63
diff --git a/media-sound/krecord/krecord-1.14.ebuild b/media-sound/krecord/krecord-1.14.ebuild
index 74f78dadfeca..3a07c2ab97f9 100644
--- a/media-sound/krecord/krecord-1.14.ebuild
+++ b/media-sound/krecord/krecord-1.14.ebuild
@@ -1,16 +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/media-sound/krecord/krecord-1.14.ebuild,v 1.1 2003/08/12 14:25:50 caleb Exp $
-inherit kde-base
+# $Header: /var/cvsroot/gentoo-x86/media-sound/krecord/krecord-1.14.ebuild,v 1.1.1.1 2005/11/30 09:38:27 chriswhite Exp $
 
-DESCRIPTION="KDE sound recorder app"
+IUSE=""
+
+inherit kde
+
+DESCRIPTION="A KDE sound recorder."
 HOMEPAGE="http://bytesex.org/krecord.html"
 SRC_URI="http://bytesex.org/misc/${PN}_${PV}.tar.gz"
-KEYWORDS="~x86"
+
+SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="~amd64 ~sparc x86"
 
 need-kde 3
-
 #RDEPEND="media-libs/alsa-lib"
 
 src_compile() {
@@ -18,6 +22,5 @@ src_compile() {
 }
 
 src_install() {
-	cd ${S}
-	make prefix=${D}/${PREFIX} install
+	einstall || die
 }
diff --git a/media-sound/krecord/krecord-1.16.ebuild b/media-sound/krecord/krecord-1.16.ebuild
index a0eb271b20f0..c09c1595419d 100644
--- a/media-sound/krecord/krecord-1.16.ebuild
+++ b/media-sound/krecord/krecord-1.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/media-sound/krecord/krecord-1.16.ebuild,v 1.1 2005/10/17 15:17:53 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/krecord/krecord-1.16.ebuild,v 1.1.1.1 2005/11/30 09:38:27 chriswhite Exp $
 
 inherit kde-functions
 
diff --git a/media-sound/krecord/metadata.xml b/media-sound/krecord/metadata.xml
index b435a8440ccd..8d1e86a9cefb 100644
--- a/media-sound/krecord/metadata.xml
+++ b/media-sound/krecord/metadata.xml
@@ -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/media-sound/kstreamripper/ChangeLog b/media-sound/kstreamripper/ChangeLog
index c8684ab855e1..684697d8f607 100644
--- a/media-sound/kstreamripper/ChangeLog
+++ b/media-sound/kstreamripper/ChangeLog
@@ -1,5 +1,32 @@
 # ChangeLog for media-sound/kstreamripper
-# Copyright 2004-2004 Gentoo Technologies, Inc.; Distributed under the GPL
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kstreamripper/ChangeLog,v 1.1.1.1 2005/11/30 09:38:14 chriswhite Exp $
+
+  03 Feb 2005; Carsten Lohrke <carlo@gentoo.org> kstreamripper-0.2.ebuild:
+  QA: inherit kde-base -> inherit kde, need-kde after R/DEPEND
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  kstreamripper-0.2.ebuild:
+  Stable amd64.
+
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org> kstreamripper-0.2.ebuild:
+  Stable on ppc64
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  kstreamripper-0.2.ebuild:
+  Added to ~sparc.
+
+  01 Nov 2004; Markus Rothe <corsair@gentoo.org>
+
+  kstreamripper-0.2.ebuild:
+  Marked ~ppc64; bug #64640
+
+  17 Oct 2004; David Holm <dholm@gentoo.org> kstreamripper-0.2.ebuild:
+  Added to ~ppc.
+
+  22 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  kstreamripper-0.2.ebuild:
+  Removed explicit S=.
 
 *kstreamripper-0.2 (16 Sep 2004)
 
diff --git a/media-sound/kstreamripper/Manifest b/media-sound/kstreamripper/Manifest
index def55bfe07d4..77250679ee6d 100644
--- a/media-sound/kstreamripper/Manifest
+++ b/media-sound/kstreamripper/Manifest
@@ -1,4 +1,4 @@
-MD5 996a4e05db485638d252f0dbbe887e7b ChangeLog 742
+MD5 d7c3a382cb62bacef2d72cb0cb27c520 kstreamripper-0.2.ebuild 561
+MD5 7ea52231b6eac4c59ddab4c9e6e9e225 ChangeLog 1219
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 ecc730f1930f483699d01f11b1916711 kstreamripper-0.2.ebuild 481
 MD5 e305dcc4ef30bf8f188f8122c3259736 files/digest-kstreamripper-0.2 69
diff --git a/media-sound/kstreamripper/kstreamripper-0.2.ebuild b/media-sound/kstreamripper/kstreamripper-0.2.ebuild
index a5e9a412f1fd..6220eb653b8a 100644
--- a/media-sound/kstreamripper/kstreamripper-0.2.ebuild
+++ b/media-sound/kstreamripper/kstreamripper-0.2.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/media-sound/kstreamripper/kstreamripper-0.2.ebuild,v 1.1 2004/09/16 20:28:01 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kstreamripper/kstreamripper-0.2.ebuild,v 1.1.1.1 2005/11/30 09:38:14 chriswhite Exp $
 
-IUSE=""
-
-inherit kde-base
-
-need-kde 3.2
+inherit kde
 
-S="${WORKDIR}/${P}"
 DESCRIPTION="KStreamripper - a nice KDE3 frontend to media-sound/streamripper"
 HOMEPAGE="http://developer.berlios.de/projects/kstreamripper/"
 SRC_URI="http://www.tuxipuxi.de/${P}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
 SLOT="0"
+KEYWORDS="amd64 ~ppc ppc64 sparc x86"
+IUSE=""
+
 DEPEND=">=media-sound/streamripper-1.32-r2"
+need-kde 3.2
\ No newline at end of file
diff --git a/media-sound/kzenexplorer/ChangeLog b/media-sound/kzenexplorer/ChangeLog
index 7d7d7aba2163..ce713fff5d91 100644
--- a/media-sound/kzenexplorer/ChangeLog
+++ b/media-sound/kzenexplorer/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for media-sound/kzenexplorer
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kzenexplorer/ChangeLog,v 1.1 2005/06/20 21:51:18 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kzenexplorer/ChangeLog,v 1.1.1.1 2005/11/30 09:38:26 chriswhite Exp $
+
+  23 Oct 2005; Carsten Lohrke <carlo@gentoo.org> kzenexplorer-0.6.ebuild:
+  QA: inheriting eutils not necessary, need-kde() belongs after R/DEPEND
+
+  17 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -kzenexplorer-0.6_rc1.ebuild:
+  Remove old version.
+
+*kzenexplorer-0.6 (06 Jul 2005)
+
+  06 Jul 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +kzenexplorer-0.6.ebuild:
+  Version bump, thanks to edudlive.
+
+  22 Jun 2005; Danny van Dyk <kugelfang@gentoo.org>
+  kzenexplorer-0.6_rc1.ebuild:
+  Marked ~amd64.
+
+  21 Jun 2005; David Holm <dholm@gentoo.org> kzenexplorer-0.6_rc1.ebuild:
+  Added to ~ppc.
 
 *kzenexplorer-0.6_rc1 (20 Jun 2005)
 
diff --git a/media-sound/kzenexplorer/Manifest b/media-sound/kzenexplorer/Manifest
index cc7ab4a66c85..90b6c694e4c0 100644
--- a/media-sound/kzenexplorer/Manifest
+++ b/media-sound/kzenexplorer/Manifest
@@ -1,4 +1,4 @@
-MD5 c803c8ca73d520ad771b38627768f039 kzenexplorer-0.6_rc1.ebuild 437
-MD5 b88129e8b67b246bf4fa740511bac717 ChangeLog 334
+MD5 11671005cf48b3f7ec57f059fddac1e8 kzenexplorer-0.6.ebuild 540
+MD5 70c8550df5104292f879efc955f825d8 ChangeLog 1027
 MD5 36e01e1ff9f8e46f1839e5902ce056cb metadata.xml 540
-MD5 0f25745222a80d2b706615d9e279ea0e files/digest-kzenexplorer-0.6_rc1 73
+MD5 fee18d7e81f0aeed65b03656e9421079 files/digest-kzenexplorer-0.6 69
diff --git a/media-sound/kzenexplorer/kzenexplorer-0.6.ebuild b/media-sound/kzenexplorer/kzenexplorer-0.6.ebuild
index 3773cf92a4a7..314d0b5e415e 100644
--- a/media-sound/kzenexplorer/kzenexplorer-0.6.ebuild
+++ b/media-sound/kzenexplorer/kzenexplorer-0.6.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/media-sound/kzenexplorer/kzenexplorer-0.6.ebuild,v 1.1 2005/07/06 02:29:48 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kzenexplorer/kzenexplorer-0.6.ebuild,v 1.1.1.1 2005/11/30 09:38:26 chriswhite Exp $
+
+inherit kde
 
-inherit kde eutils
-need-kde 3.3
 
 DESCRIPTION="A QT frontend for libnjb and its supported players."
 HOMEPAGE="http://kzenexplorer.sourceforge.net/"
@@ -13,6 +13,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND="${DEPEND}
-	>=media-libs/libnjb-2.0
+DEPEND=">=media-libs/libnjb-2.0
 	>=media-libs/taglib-1.3"
+need-kde 3.3
\ No newline at end of file
diff --git a/media-sound/lame/ChangeLog b/media-sound/lame/ChangeLog
index 334130bcb63f..a59c49c552de 100644
--- a/media-sound/lame/ChangeLog
+++ b/media-sound/lame/ChangeLog
@@ -1,6 +1,245 @@
 # ChangeLog for media-sound/lame
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/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/media-sound/lame/ChangeLog,v 1.1.1.1 2005/11/30 09:38:24 chriswhite Exp $
+
+*lame-3.96.1-r1 (25 Aug 2005)
+
+  25 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/lame-3.96.1-largefile.patch, +lame-3.96.1-r1.ebuild:
+  Added patch to have largefile support actually working as per bug #103578.
+
+  02 Jul 2005; Hardave Riar <hardave@gentoo.org> lame-3.96.1.ebuild:
+  Stable on mips
+
+  21 May 2005; Jan Brinkmann <luckyduck@gentoo.org> lame-3.96.1.ebuild:
+  dont force the use of nasm by default on x86, fixes bug #93279
+
+  15 May 2005; Diego Pettenò <flameeyes@gentoo.org> lame-3.96.ebuild,
+  lame-3.96.1.ebuild:
+  Moved using toolchain-funcs eclass.
+
+  08 Apr 2005; Markus Rothe <corsair@gentoo.org> lame-3.96.1.ebuild:
+  Stable on ppc64
+
+  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> lame-3.96.1.ebuild:
+  Stable on ppc.
+
+  15 Mar 2005; Yuta SATOH <nigoro@gentoo.org> lame-3.96.1.ebuild:
+  added ~ppc64
+
+  24 Feb 2005; Lina Pezzella <j4rg0n@gentoo.org> lame-3.96.1.ebuild,
+  lame-3.96.ebuild:
+  Stable ppc-macos
+
+  03 Feb 2005; <solar@gentoo.org> lame-3.96.1.ebuild, lame-3.96.ebuild:
+  - epunt_cxx embedded bug #74498
+
+  23 Jan 2005; Lina Pezzella <j4rg0n@gentoo.org> lame-3.96.ebuild:
+  Unstable ppc-macos. Bug #65990
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  12 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/lame-3.91-gcc3.diff, -lame-3.92.ebuild, -lame-3.93.1-r1.ebuild:
+  Cleaning out old versions.
+
+  12 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> lame-3.96.1.ebuild:
+  Stable on alpha.
+
+  16 Oct 2004; <gongloo@gentoo.org> lame-3.96.1.ebuild:
+  Keyworded ~ppc-macos.
+
+  12 Oct 2004; Guy Martin <gmsoft@gentoo.org> lame-3.96.1.ebuild:
+  Stable on hppa.
+
+  03 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/lame-3.96.1-shared-frontend.patch:
+  link against shared libs.  Closes bug #58547.  Stable amd64, sparc, x86.
+
+  29 Jul 2004; Tom Gall <tgall@gentoo.org> lame-3.96.ebuild:
+  stable on ppc64, bug #55429
+
+  28 Jul 2004; Aron Griffis <agriffis@gentoo.org> +files/lame-3.96-ccc.patch,
+  lame-3.92.ebuild, lame-3.93.1-r1.ebuild, lame-3.96.1.ebuild,
+  lame-3.96.ebuild:
+  If ccc (alpha compiler) is installed on the system, the default configure is
+  broken, fix it to respect CC. This is only directly broken for ARCH=alpha but
+  would affect anybody with a ccc binary in their PATH. #41908
+
+*lame-3.96.1 (25 Jul 2004)
+
+  25 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> +lame-3.96.1.ebuild:
+  Version bump for upstream bugfix release.
+
+  25 Jul 2004; Lina Pezzella <j4rg0n@gentoo.org>
+  Fixed Manifest.
+
+  23 Jul 2004; Hasan Khalil <gongloo@gentoo.org> lame-3.96.ebuild:
+  Stable on macos.
+
+  13 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> lame-3.96.ebuild:
+  Stable on alpha.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> lame-3.92.ebuild:
+  virtual/glibc -> virtual/libc
+
+  26 Jun 2004; Danny van Dyk <kugelfang@gentoo.org> -files/intcast.spider,
+  lame-3.96.ebuild:
+  Removed bogus patch (intcast.spider). This one broke libmp3lame.so on 64bit
+  archs and has been unnecessary.
+
+  16 Jun 2004; Gustavo Zacarias <gustavoz@gentoo.org> lame-3.96.ebuild:
+  Stable on hppa
+
+  07 Jun 2004; Travis Tilley <lv@gentoo.org> lame-3.96.ebuild:
+  stable on amd64
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org> lame-3.92.ebuild,
+  lame-3.93.1-r1.ebuild, lame-3.96.ebuild:
+  Fix use invocation
+
+  13 May 2004; Gustavo Zacarias <gustavoz@gentoo.org> lame-3.96.ebuild:
+  Stable on sparc
+
+  12 May 2004; Jeremy Huddleston <eradicator@gentoo.org> lame-3.96.ebuild:
+  Stable x86.
+
+  06 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  lame-3.93.1-r1.ebuild:
+  Fix bug #50099.
+
+  22 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> lame-3.95.1.ebuild:
+  Removed buggy version.
+
+*lame-3.96 (11 Apr 2004)
+
+  11 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> lame-3.95.1.ebuild,
+  lame-3.96.ebuild:
+  Version bump.
+
+  04 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> lame-3.95.1.ebuild:
+  Back to ~arch because of bug #46672.
+
+  01 Apr 2004; Gustavo Zacarias <gustavoz@gentoo.org> lame-3.95.1.ebuild:
+  stable on sparc
+
+  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> lame-3.95.1.ebuild:
+  Stable x86.  cp -> dobin.  nomirror.
+
+  15 Mar 2004; Stephen P. Becker <geoman@gentoo.org> lame-3.95.1.ebuild:
+  Added ~mips keyword.
+
+  23 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> lame-3.92.ebuild,
+  lame-3.93.1-r1.ebuild, lame-3.95.1.ebuild:
+  Removing redundant html files.  DESTDIR instead of einstall
+
+  21 Jan 2004; Nick Hadaway <raker@gentoo.org> lame-3.95.1.ebuild:
+  Added the mlame binary as noted on bug #35978 and added spider's
+  tcc compiler fix as seen on bug #31191.
+
+  21 Jan 2004; Nick Hadaway <raker@gentoo.org> lame-3.95.1.ebuild:
+  Changed emake to make as it seems to be a little finicky with 
+  parallelism.  See bug #38896.
+
+*lame-3.95.1 (20 Jan 2004)
+
+  20 Jan 2004; Nick Hadaway <raker@gentoo.org> lame-3.95.1.ebuild:
+  Version bump.  Upstream bug fixes, and feature adds.  Updated the
+  debug target.  Fixed tyop :) extopt to expopt but commented out
+  as optimizations are set by the user.  Also added some ebuild
+  fixes as suggested by Gregorio Guidi on bug #38006.
+
+  12 Jan 2004; <agriffis@gentoo.org> lame-3.93.1-r1.ebuild:
+  stable on ia64
+
+  16 Nov 2003; Brad House <brad_mssw@gentoo.org> lame-3.93.1-r1.ebuild:
+  mark stable on amd64
+
+  08 May 2003; jje <jje@gentoo.org> lame-3.93.1-r1.ebuild:
+  Fix flag striping. Was using strip-flags when it should have been filter-flags.
+
+  13 Mar 2003; Olivier Reisch <doctomoe@gentoo.org> lame-3.93.1-r1.ebuild
+  Marked ppc stable
+
+*lame-3.93.1-r1 (28 Jan 2003)
+
+  10 Mar 2003; Seemant Kulleen <seemant@gentoo.org> lame-3.93.0.ebuild,
+  lame-3.93.0.ebuild, lame-3.93.1-r1.ebuild, lame-3.93.1.ebuild,
+  lame-3.93.1.ebuild:
+  filter out -fomit-frame-pointer for k6 based cpu's. Thanks to: sinterklaas
+  <jerroose@xs4all.nl> in bug #15559
+
+  28 Jan 2003; Nick Hadaway <raker@gentoo.org> lame-3.93.1-r1.ebuild,
+  files/digest-lame-3.93.1-r1 :
+  Got rid of the autotools and libtool workarounds and just sed'd the
+  configure script gtk detection.
+
+  16 Dec 2002; Martin Schlemmer <azarah@gentoo.org> lame-3.93.1.ebuild :
+  Run autoreconf to fix the ./configure script not detecting gtk-config
+  properly.
+
+*lame-3.93.1 (11 Dec 2002)
+
+  31 Dec 2002: Joshua Brindle <method@gentoo.org> lame-3.93.1.ebuild :
+  Change ~sparc to sparc
+
+  15 Dec 2002; Bjoern Brauel <bjb@gentoo.org> lame-3.93.1.ebuild :
+  Add alpha to KEYWORDS
+
+  12 Dec 2002; phoen][x <phoenix@gentoo.org> lame-3.93.1.ebuild :
+  Tagging this ebuild stable ("x86").
+
+  11 Dec 2002; phoen][x <phoenix@gentoo.org> lame-3.93.1.ebuild,
+  files/digest-lame-3.93.1 :
+  Bumped to new version. Hopefully, the need for these quality problem 
+  patches is gone now. 
+
+* Autoupdate keywords (12-6-02)
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*lame-3.93.0-r1 (23 Nov 2002)
+
+  01 Dec 2002; phoen][x <phoenix@gentoo.org> lame-3.93.0-r1.ebuild, 
+  files/lame-3.93.0-npsytunefix.diff, files/lame-3.93.0-q0fix.diff :
+  Incorporated the fixes from bug #11194. Thanks to Sebastian Droege 
+  <sebastian.droege@gmx.de> for the contribution.
+
+  12 Dec 2002; phoen][x <phoenix@gentoo.org> lame-3.93.0-r1.ebuild,
+  files/lame-3.93.0-npsytunefix.diff, files/lame-3.93.0-q0fix.diff :
+  Removing this ebuild - lame-3.93.1 comes with these patches.
+ 
+*lame-3.93.0 (23 Nov 2002)
+  
+  23 Nov 2002; Spider <spider@gentoo.org> lame-3.93.0.ebuild :
+  new versioning scheme, unfortunately not followed inside the tarball so I 
+  had to hack some there. The vorbis support was cut out from this release 
+  (at least according to the changelog)  so I removed the IUSE and USE flags 
+  accordingly.
+
+*lame-3.92 (23 Apr 2002)
+  29 Sep 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Libtoolize to fix bug #5638.
+
+  09 Sep 2002; Jack Morgan <jmorgan@gentoo.org> :
+  Added sparc/saprc64 keywords
+
+  07 Aug 2002; Mark Guertin <gerk@gentoo.org> :
+  Adjusted nasm dep for x86 only
+
+  23 Apr 2002; Spider <spider@gentoo.org> lame-3.92.ebuild: 
+  update new version, remove gcc3 fixes (in mainline now)
+
+  06 Apr 2002; Geert Bevin <gbevin@gentoo.org> lame-3.91.ebuild,
+  files/lame-3.91-gcc3.diff :
+
+  Little preprocessor fix to help it compile with gcc 3.
+
+*lame-3.91 (28 Mar 2002)
+
+  28 Mar 2002; Seemant Kulleen <seemant@gentoo.org> lame-3.91.ebuild :
+
+  Changed the USE flag to "oggvorbis" instead of just "vorbis"
 
 *lame-3.91 (1 Feb 2002)
 
diff --git a/media-sound/lame/Manifest b/media-sound/lame/Manifest
index 982828500cf1..b13fe3458351 100644
--- a/media-sound/lame/Manifest
+++ b/media-sound/lame/Manifest
@@ -1,6 +1,21 @@
-MD5 03c4ea569707da29b0b9c4950c57db2a ChangeLog 3750
-MD5 322253260f0ae7aed4b1770f9e16164c lame-3.92.ebuild 1572
-MD5 a4c108035cbef4af86f3a854277e2075 lame-3.93.1-r1.ebuild 1505
-MD5 2b1af4843f5ca4107de793b7a584db34 files/digest-lame-3.92 61
-MD5 aefad4480f6888fcee536e08205804b1 files/digest-lame-3.93.1-r1 64
-MD5 1dfbfacec1d8f89bf39620c15becb6bc files/lame-3.91-gcc3.diff 383
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 804da09bcbf2d4367b474f44dedcb5ff lame-3.96.1.ebuild 2284
+MD5 a1601938e8cb931bd0b5eb533b9e4c74 lame-3.96.ebuild 2183
+MD5 05ab4d4775083f0930841e415df18ad6 metadata.xml 160
+MD5 1c9416532365eb635dd2931fd8ac0723 lame-3.96.1-r1.ebuild 2296
+MD5 19603784f5e337f3e80a8f9b90f693e1 ChangeLog 9090
+MD5 3b8e04486d3959e978f2466bdc621a59 files/digest-lame-3.96 62
+MD5 f7a856198d82691c0506cfc77fa95e87 files/digest-lame-3.96.1 64
+MD5 af03fdd6d579097e09e99b9faeaf929b files/lame-3.96-ccc.patch 658
+MD5 77956e1d8bad436bc943b5005842aa80 files/lame-3.96.1-shared-frontend.patch 945
+MD5 f7a856198d82691c0506cfc77fa95e87 files/digest-lame-3.96.1-r1 64
+MD5 50949fbea82d13653e29566d7a070f83 files/lame-3.96.1-largefile.patch 437
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDLAWBKf2g/qXtneoRAvUHAJ4pen2hH6X6mM9Uo/DtgJgX9rHAFQCguvoE
++dZe19HrY8qe50UCpLSadIo=
+=Ldsm
+-----END PGP SIGNATURE-----
diff --git a/media-sound/lame/lame-3.96.1-r1.ebuild b/media-sound/lame/lame-3.96.1-r1.ebuild
index ae4fe82740bc..e867511495fd 100644
--- a/media-sound/lame/lame-3.96.1-r1.ebuild
+++ b/media-sound/lame/lame-3.96.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/media-sound/lame/lame-3.96.1-r1.ebuild,v 1.1 2005/08/25 12:03:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.96.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:24 chriswhite Exp $
 
 inherit flag-o-matic toolchain-funcs eutils
 
@@ -58,7 +58,7 @@ src_compile() {
 		$(use_enable debug debug norm) \
 		$(use_enable gtk mp3x) \
 		${myconf} || die "econf failed"
-	
+
 	# Parallel make isn't happy
 	emake -j1 || die "emake failed"
 }
diff --git a/media-sound/lame/lame-3.96.1.ebuild b/media-sound/lame/lame-3.96.1.ebuild
index f901433a8288..93cd06b27afe 100644
--- a/media-sound/lame/lame-3.96.1.ebuild
+++ b/media-sound/lame/lame-3.96.1.ebuild
@@ -1,24 +1,38 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.96.1.ebuild,v 1.1 2004/07/26 04:55:07 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.96.1.ebuild,v 1.1.1.1 2005/11/30 09:38:24 chriswhite Exp $
 
-IUSE="gtk debug"
-
-inherit flag-o-matic gcc eutils
+inherit flag-o-matic toolchain-funcs eutils
 
-DESCRIPTION="LAME Ain't an Mp3 Encoder"
+DESCRIPTION="LAME Ain't an MP3 Encoder"
 HOMEPAGE="http://lame.sourceforge.net"
 SRC_URI="mirror://sourceforge/lame/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc-macos ppc64 sparc x86"
+IUSE="gtk debug"
 
 RDEPEND=">=sys-libs/ncurses-5.2
 	gtk? ( =x11-libs/gtk+-1.2* )"
-
 DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )"
+	sys-devel/autoconf"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S} || die
+
+	# The frontened tries to link staticly, but we prefer shared libs
+	epatch ${FILESDIR}/${P}-shared-frontend.patch
+
+	# If ccc (alpha compiler) is installed on the system, the default
+	# configure is broken, fix it to respect CC.  This is only
+	# directly broken for ARCH=alpha but would affect anybody with a
+	# ccc binary in their PATH.  Bug #41908  (26 Jul 2004 agriffis)
+	epatch ${FILESDIR}/${PN}-3.96-ccc.patch
+	autoconf || die
+	epunt_cxx # embedded bug #74498
+}
 
 src_compile() {
 	# take out -fomit-frame-pointer from CFLAGS if k6-2
@@ -45,7 +59,6 @@ src_compile() {
 
 	econf \
 		--enable-shared \
-		`use_enable x86 nasm` \
 		--enable-mp3rtp \
 		${myconf} || die
 
diff --git a/media-sound/lame/lame-3.96.ebuild b/media-sound/lame/lame-3.96.ebuild
index 5f5ede863207..b6b41e141f16 100644
--- a/media-sound/lame/lame-3.96.ebuild
+++ b/media-sound/lame/lame-3.96.ebuild
@@ -1,29 +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/media-sound/lame/lame-3.96.ebuild,v 1.1 2004/04/11 19:06:35 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.96.ebuild,v 1.1.1.1 2005/11/30 09:38:24 chriswhite Exp $
 
-inherit flag-o-matic gcc eutils
+inherit flag-o-matic toolchain-funcs eutils
 
-DESCRIPTION="LAME Ain't an Mp3 Encoder"
+DESCRIPTION="LAME Ain't an MP3 Encoder"
 HOMEPAGE="http://lame.sourceforge.net"
 SRC_URI="mirror://sourceforge/lame/${P}.tar.gz"
 RESTRICT="nomirror"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips"
+KEYWORDS="x86 ppc sparc alpha hppa amd64 ~ia64 ~mips ppc64 ppc-macos"
 IUSE="gtk debug"
 
 RDEPEND=">=sys-libs/ncurses-5.2
 	gtk? ( =x11-libs/gtk+-1.2* )"
 
 DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )"
+	sys-devel/autoconf"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/intcast.spider
+	cd ${S} || die
+
+	# If ccc (alpha compiler) is installed on the system, the default
+	# configure is broken, fix it to respect CC.  This is only
+	# directly broken for ARCH=alpha but would affect anybody with a
+	# ccc binary in their PATH.  Bug #41908  (26 Jul 2004 agriffis)
+	epatch ${FILESDIR}/lame-3.96-ccc.patch
+	autoconf || die
+	epunt_cxx # embedded bug #74498
 }
 
 src_compile() {
@@ -40,7 +47,7 @@ src_compile() {
 	fi
 
 	# as of 3.95.1 changed from "yes" to "norm" ("alot" is also accepted)
-	[ `use debug` ] \
+	use debug \
 		&& myconf="${myconf} --enable-debug=norm" \
 		|| myconf="${myconf} --enable-debug=no"
 
@@ -51,7 +58,6 @@ src_compile() {
 
 	econf \
 		--enable-shared \
-		--enable-nasm \
 		--enable-mp3rtp \
 		${myconf} || die
 
diff --git a/media-sound/lilycomp/ChangeLog b/media-sound/lilycomp/ChangeLog
index 70c481c12595..7b0e9557fc10 100644
--- a/media-sound/lilycomp/ChangeLog
+++ b/media-sound/lilycomp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/lilycomp
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lilycomp/ChangeLog,v 1.1 2004/11/22 04:56:20 agriffis Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilycomp/ChangeLog,v 1.1.1.1 2005/11/30 09:38:17 chriswhite Exp $
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> lilycomp-1.0.2.ebuild:
+  Added to ~ppc.
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  lilycomp-1.0.2.ebuild:
+  Added to ~amd64 and ~sparc.
 
 *lilycomp-1.0.2 (21 Nov 2004)
 
diff --git a/media-sound/lilycomp/Manifest b/media-sound/lilycomp/Manifest
index 9212f5cb6acf..7d32d1ffbf15 100644
--- a/media-sound/lilycomp/Manifest
+++ b/media-sound/lilycomp/Manifest
@@ -1,2 +1,4 @@
-MD5 ae242e8b55df616f488fa40c6ce43249 lilycomp-1.0.2.ebuild 672
+MD5 b28526bac138c4f46b7c841aa3a3dc86 ChangeLog 612
+MD5 a1eddbdb056da9279b7463dcda9d0642 lilycomp-1.0.2.ebuild 616
+MD5 50117cfdeb267d9181cf9cacac87d8a6 metadata.xml 256
 MD5 700516518a5197099a6b2c344f5247f9 files/digest-lilycomp-1.0.2 65
diff --git a/media-sound/lilycomp/lilycomp-1.0.2.ebuild b/media-sound/lilycomp/lilycomp-1.0.2.ebuild
index 6a1bd35af4a7..32a7895960a3 100644
--- a/media-sound/lilycomp/lilycomp-1.0.2.ebuild
+++ b/media-sound/lilycomp/lilycomp-1.0.2.ebuild
@@ -1,21 +1,22 @@
-# Copyright 2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lilycomp/lilycomp-1.0.2.ebuild,v 1.1 2004/11/22 04:56:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilycomp/lilycomp-1.0.2.ebuild,v 1.1.1.1 2005/11/30 09:38:17 chriswhite Exp $
 
 DESCRIPTION="graphical note entry program for use with LilyPond"
 HOMEPAGE="http://lilycomp.sourceforge.net/"
 SRC_URI="mirror://sourceforge/lilycomp/${P/-/.}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
 RDEPEND="dev-lang/python"
 
-S=${WORKDIR}/${P/-/.}
+S="${WORKDIR}/${P/-/.}"
 
 src_install() {
-	newbin lilycomp.py lilycomp
+	newbin lilycomp.py lilycomp || die "newbin failed"
 	dohtml *.html
 	dodoc [[:upper:]]*
 }
diff --git a/media-sound/lilypond/ChangeLog b/media-sound/lilypond/ChangeLog
index 45b5cc99245d..993143a790f3 100644
--- a/media-sound/lilypond/ChangeLog
+++ b/media-sound/lilypond/ChangeLog
@@ -1,6 +1,146 @@
 # ChangeLog for media-sound/lilypond
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/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/media-sound/lilypond/ChangeLog,v 1.1.1.1 2005/11/30 09:38:14 chriswhite Exp $
+
+  29 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> lilypond-2.5.2.ebuild:
+  updated sys-apps/texinfo dependency , fixes #86611
+
+  20 Feb 2005; Aron Griffis <agriffis@gentoo.org> lilypond-2.5.2.ebuild:
+  Depend on guile-1.6.5 so that lilypond works on ~amd64 #72811
+
+  27 Dec 2004; Jason Wever <weeve@gentoo.org> lilypond-2.5.2.ebuild:
+  Added ~sparc keyword.
+
+*lilypond-2.5.2 (28 Nov 2004)
+
+  28 Nov 2004; Aron Griffis <agriffis@gentoo.org> +lilypond-2.5.2.ebuild:
+  Add lilypond-2.5.2 development version #71234
+
+*lilypond-2.4.2 (28 Nov 2004)
+
+  28 Nov 2004; Aron Griffis <agriffis@gentoo.org> +lilypond-2.4.2.ebuild:
+  Bump to 2.4.2. Add DEPEND on ec-fonts-mftraced which requires dropping some
+  KEYWORDS for now. #69594
+
+*lilypond-2.2.6 (02 Nov 2004)
+
+  02 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/lilypond-1.8.2-coreutils-compat.patch, -lilypond-2.2.1.ebuild,
+  -lilypond-2.2.2.ebuild, +lilypond-2.2.6.ebuild:
+  Version bump.
+
+  02 Sep 2004; Mamoru KOMACHI <usata@gentoo.org> lilypond-2.2.1.ebuild,
+  lilypond-2.2.2.ebuild, lilypond-2.2.4.ebuild:
+  app-text/tetex -> virtual/tetex
+
+*lilypond-2.2.4 (19 Jul 2004)
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +lilypond-2.2.4.ebuild:
+  ~sparc -amd64.  Version bump.
+
+*lilypond-2.2.2 (11 Jun 2004)
+
+  11 Jun 2004; Aron Griffis <agriffis@gentoo.org> +lilypond-2.2.2.ebuild:
+  Update to 2.2.2, thanks to Maarten Wisse in bug 46701
+
+*lilypond-2.2.1 (28 May 2004)
+
+  28 May 2004; Aron Griffis <agriffis@gentoo.org> -lilypond-1.5.15.ebuild,
+  -lilypond-1.6.6.ebuild, -lilypond-1.6.9.ebuild, -lilypond-1.8.2.ebuild,
+  -lilypond-2.0.0.ebuild, lilypond-2.0.3.ebuild, +lilypond-2.2.1.ebuild:
+  Mark 2.0.3 stable on alpha and x86; prune old ebuilds. Add ebuild for version
+  2.2.1, thanks to Maarten Wisse in bug 46701 for the ebuild
+
+  18 May 2004; Mamoru KOMACHI <usata@gentoo.org> lilypond-1.5.15.ebuild,
+  lilypond-1.6.6.ebuild, lilypond-1.6.9.ebuild, lilypond-1.8.2.ebuild,
+  lilypond-2.0.0.ebuild, lilypond-2.0.3.ebuild:
+  Changed app-text/tetex to virtual/tetex, see bug #50865
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> lilypond-1.8.2.ebuild,
+  lilypond-2.0.0.ebuild, lilypond-2.0.3.ebuild:
+  Add inherit eutils
+
+  25 Apr 2004; Jon Hood <squinky86@gentoo.org> lilypond-1.6.6.ebuild:
+  added "die"
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  lilypond-1.5.15.ebuild, lilypond-1.6.9.ebuild:
+  Added IUSE.
+
+  21 Mar 2004; David Holm <dholm@gentoo.org> lilypond-2.0.3.ebuild:
+  Added to ~ppc.
+
+*lilypond-2.0.3 (20 Mar 2004)
+
+  20 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  lilypond-1.6.9.ebuild, lilypond-2.0.3.ebuild:
+  Version bump.
+
+  14 Jan 2004; Aron Griffis <agriffis@gentoo.org> lilypond-2.0.0.ebuild:
+  Fix bison dependency from !sys-devel/bison-1.75 to !=sys-devel/bison-1.75
+
+  03 Jan 2004; Aron Griffis <agriffis@gentoo.org> lilypond-2.0.0.ebuild:
+  Fix bison dependency to prevent flip-flops
+
+  09 Dec 2003; Heinrich Wendel <lanius@gentoo.org> lilypond-1.6.6.ebuild,
+  lilypond-1.6.9.ebuild, lilypond-1.8.2.ebuild, lilypond-2.0.0.ebuild:
+  changed app-text/ghostscript to virtual/ghostscript
+
+  03 Dec 2003; Aron Griffis <agriffis@gentoo.org> lilypond-1.8.2.ebuild:
+  Stable on alpha and x86
+
+  01 Oct 2003; Aron Griffis <agriffis@gentoo.org> lilypond-2.0.0.ebuild:
+  Fix trailing whitespace for repoman
+
+*lilypond-2.0.0 (27 Sep 2003)
+
+  27 Sep 2003; Aron Griffis <agriffis@gentoo.org> lilypond-2.0.0.ebuild,
+  files/lilypond-2.0.0-coreutils-compat.patch:
+  Update to 2.0.0.  Thanks to Mike Ossmann in bug 29619
+
+*lilypond-1.8.2 (12 Sep 2003)
+
+  12 Sep 2003; Aron Griffis <agriffis@gentoo.org> lilypond-1.8.2.ebuild,
+  files/lilypond-1.8.2-coreutils-compat.patch:
+  Update to 1.8.2.  Thanks to Mike Ossmann and Chandler Carruth in bug 26136
+
+  12 Sep 2003; Aron Griffis <agriffis@gentoo.org> lilypond-1.6.9.ebuild:
+  Remove web-doc building since it's broken in this ebuild and the 1.8.0 ebuild
+  will have it fixed. This finishes bug 21305
+
+  12 Sep 2003; Aron Griffis <agriffis@gentoo.org> lilypond-1.6.9.ebuild:
+  Fix (part of) bug 21305 by disabling ccache.
+
+  27 May 2003; jje <jje@gentoo.org> lilypond-1.6.9.ebuild:
+  Fixed web-doc target, die was missing...
+
+*lilypond-1.6.9 (17 May 2003)
+
+  17 May 2003; jje <jje@gentoo.org> lilypond-1.6.9.ebuild:
+  Simplified src_compile to reflect current compiler usage.
+  
+  The web-doc target is also being built.
+
+  18 Jan 2003; Aron Griffis <agriffis@gentoo.org> lilypond-1.6.6.ebuild :
+  Fix bug 13396 by requiring tetex-1.0.7-r12 which should fix the missing
+  mf.base compilation problem.
+
+*lilypond-1.6.6 (03 Dec 2002)
+
+  09 Mar 2003; Aron Griffis <agriffis@gentoo.org> lilypond-1.6.6.ebuild:
+  Mark stable on alpha
+
+  21 Feb 2003; Aron Griffis <agriffis@gentoo.org> lilypond-1.6.6.ebuild :
+  Add ~alpha to KEYWORDS
+
+  03 Dec 2002; Aron Griffis <agriffis@gentoo.org> lilypond-1.6.6.ebuild :
+
+  Update to version 1.6.6 which compiles with at least gcc-2.95.3 and
+  gcc-3.2.1.  I put clauses in the ebuild to help compile for gcc-3.[01] but
+  haven't been able to test them.  It shouldn't matter (much) since Gentoo 1.2
+  is using gcc-2.95.3 and Gentoo 1.4 is using gcc-3.2.  This fixes BUG #4682.
+  Thanks to Mike Ossmann <mike@ossmann.com> for his work on this version.
 
 *lilypond-1.5.15 (1 Feb 2002)
 
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 3f586be077f3..f3e1dc8cc471 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,7 +1,23 @@
-MD5 ea919e44e30c68c99cb19a93bc8f4d6c ChangeLog 1745
-MD5 3ff192bc173c8ccb0d20ac4bf9a41a53 lilypond-1.5.15.ebuild 778
-MD5 77426c96564993e8e9d2a8563b16e218 lilypond-1.6.9.ebuild 2764
-MD5 e6eb2f63459d9809c9c749f2bd0cf56f lilypond-1.6.6.ebuild 3062
-MD5 598b545eba349fc6f14f888818c1a8f7 files/digest-lilypond-1.5.15 68
-MD5 42dc732527fc9a940a950f3a498a8b48 files/digest-lilypond-1.6.6 67
-MD5 be5450deeb374c228e7584c880fd8c08 files/digest-lilypond-1.6.9 67
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e69b72dc2cb57ef5aab79bc1f53a09b8 lilypond-2.5.2.ebuild 3191
+MD5 e56175709d41910021947125161f06ca lilypond-2.0.3.ebuild 2825
+MD5 adacedd1390222f66e9fe3b618cb6fb0 lilypond-2.2.4.ebuild 3019
+MD5 34c4dc6ccfca3fe894500789f7358960 lilypond-2.2.6.ebuild 3019
+MD5 32fb9d4eaa870b862af5a62928f7d40f ChangeLog 5931
+MD5 43019364cb417a83e797b197dcda4b82 lilypond-2.4.2.ebuild 3183
+MD5 50117cfdeb267d9181cf9cacac87d8a6 metadata.xml 256
+MD5 d3708d2873d08b1272e434098fd1ad85 files/lilypond-2.0.0-coreutils-compat.patch 5638
+MD5 0c696acd218d39a22a32db326ac9d5b0 files/digest-lilypond-2.0.3 67
+MD5 be315c1b4040c4985ede01deff60d51a files/digest-lilypond-2.2.4 67
+MD5 529bea6c58e6c0407e9eab6ab8f5ecbe files/digest-lilypond-2.2.6 67
+MD5 f21b6776d2f09f88b6dba504afa8ed29 files/digest-lilypond-2.4.2 67
+MD5 16a923371e2af6d883c782b974b6d32f files/digest-lilypond-2.5.2 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCSWBv06ebR+OMO78RApnXAJ9B0mc6+stfiVQnc/OCM/CKZI/4PACbBerY
+DeykSHEt1BmS0XK3h4RdEAU=
+=JX5r
+-----END PGP SIGNATURE-----
diff --git a/media-sound/lilypond/lilypond-2.0.3.ebuild b/media-sound/lilypond/lilypond-2.0.3.ebuild
index 963c276b46a6..e9bfd3d253cf 100644
--- a/media-sound/lilypond/lilypond-2.0.3.ebuild
+++ b/media-sound/lilypond/lilypond-2.0.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/media-sound/lilypond/lilypond-2.0.3.ebuild,v 1.1 2004/03/20 16:40:56 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.0.3.ebuild,v 1.1.1.1 2005/11/30 09:38:14 chriswhite Exp $
+
+inherit eutils
 
 IUSE="doc"
 
@@ -10,11 +12,11 @@ SRC_URI="http://www.lilypond.org/ftp/${MY_PV}/${P}.tar.gz"
 HOMEPAGE="http://lilypond.org/"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~x86"
+KEYWORDS="alpha x86 ~ppc"
 
 RDEPEND=">=dev-util/guile-1.6.4
 	virtual/ghostscript
-	>=app-text/tetex-1.0.7-r12
+	virtual/tetex
 	>=dev-lang/python-2.2.3-r1"
 
 DEPEND="${RDEPEND}
diff --git a/media-sound/lilypond/lilypond-2.2.4.ebuild b/media-sound/lilypond/lilypond-2.2.4.ebuild
index ac468dfeef7a..bf7347d3b120 100644
--- a/media-sound/lilypond/lilypond-2.2.4.ebuild
+++ b/media-sound/lilypond/lilypond-2.2.4.ebuild
@@ -1,13 +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/media-sound/lilypond/lilypond-2.2.4.ebuild,v 1.1 2004/07/19 09:39:15 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.2.4.ebuild,v 1.1.1.1 2005/11/30 09:38:14 chriswhite Exp $
 
 IUSE="doc"
 
 MY_PV="v$(echo ${PV} | cut -d. -f1,2)"
+
 DESCRIPTION="GNU Music Typesetter"
 SRC_URI="http://www.lilypond.org/ftp/${MY_PV}/${P}.tar.gz"
 HOMEPAGE="http://lilypond.org/"
+
 SLOT="0"
 LICENSE="GPL-2"
 #-amd64: 2.2.4: lilypond-bin exits error code 139 ... upstream needs to fix it...
@@ -15,10 +17,11 @@ KEYWORDS="~alpha ~x86 ~ppc ~sparc -amd64"
 
 RDEPEND=">=dev-util/guile-1.6.4
 	virtual/ghostscript
-	>=app-text/tetex-2.0.2
+	virtual/tetex
 	>=dev-lang/python-2.2.3-r1"
 
 DEPEND="${RDEPEND}
+	>=app-text/t1utils-1.32
 	>=dev-lang/perl-5.8.0-r12
 	>=sys-apps/texinfo-4.6
 	>=sys-devel/flex-2.5.4a-r5
diff --git a/media-sound/lilypond/lilypond-2.2.6.ebuild b/media-sound/lilypond/lilypond-2.2.6.ebuild
index 109543b8a7f1..66061b7a617e 100644
--- a/media-sound/lilypond/lilypond-2.2.6.ebuild
+++ b/media-sound/lilypond/lilypond-2.2.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/media-sound/lilypond/lilypond-2.2.6.ebuild,v 1.1 2004/11/03 02:30:46 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.2.6.ebuild,v 1.1.1.1 2005/11/30 09:38:14 chriswhite Exp $
 
 IUSE="doc"
 
diff --git a/media-sound/lilypond/lilypond-2.4.2.ebuild b/media-sound/lilypond/lilypond-2.4.2.ebuild
index a396e8c9b09a..1336dbfdb7f8 100644
--- a/media-sound/lilypond/lilypond-2.4.2.ebuild
+++ b/media-sound/lilypond/lilypond-2.4.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/media-sound/lilypond/lilypond-2.4.2.ebuild,v 1.1 2004/11/28 18:33:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.4.2.ebuild,v 1.1.1.1 2005/11/30 09:38:14 chriswhite Exp $
 
 IUSE="doc"
 
diff --git a/media-sound/lilypond/lilypond-2.5.2.ebuild b/media-sound/lilypond/lilypond-2.5.2.ebuild
index 56e46595ac8c..72dfed9e1970 100644
--- a/media-sound/lilypond/lilypond-2.5.2.ebuild
+++ b/media-sound/lilypond/lilypond-2.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/media-sound/lilypond/lilypond-2.5.2.ebuild,v 1.1 2004/11/28 19:46:52 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.5.2.ebuild,v 1.1.1.1 2005/11/30 09:38:14 chriswhite Exp $
 
 IUSE="doc"
 
@@ -13,9 +13,9 @@ HOMEPAGE="http://lilypond.org/"
 SLOT="0"
 LICENSE="GPL-2"
 #-amd64: 2.2.6: lilypond-bin exits error code 139 ... upstream needs to fix it...
-KEYWORDS="~x86 -amd64"
+KEYWORDS="~x86 ~amd64 ~sparc"
 
-RDEPEND=">=dev-util/guile-1.6.4
+RDEPEND=">=dev-util/guile-1.6.5
 	virtual/ghostscript
 	virtual/tetex
 	>=dev-lang/python-2.2.3-r1
@@ -24,7 +24,7 @@ RDEPEND=">=dev-util/guile-1.6.4
 DEPEND="${RDEPEND}
 	>=app-text/t1utils-1.32
 	>=dev-lang/perl-5.8.0-r12
-	>=sys-apps/texinfo-4.6
+	>=sys-apps/texinfo-4.7
 	>=sys-devel/flex-2.5.4a-r5
 	>=sys-devel/gcc-3.1-r8
 	>=sys-devel/make-3.80
diff --git a/media-sound/linuxsampler/ChangeLog b/media-sound/linuxsampler/ChangeLog
index 18f97e84efaf..45e6d82b94c7 100644
--- a/media-sound/linuxsampler/ChangeLog
+++ b/media-sound/linuxsampler/ChangeLog
@@ -1,6 +1,33 @@
 # ChangeLog for media-sound/linuxsampler
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/linuxsampler/ChangeLog,v 1.1 2005/05/29 23:32:02 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/linuxsampler/ChangeLog,v 1.1.1.1 2005/11/30 09:38:01 chriswhite Exp $
+
+  10 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  linuxsampler-0.3.1.ebuild, linuxsampler-0.3.2.ebuild,
+  linuxsampler-0.3.3.ebuild:
+  Don't install INSTALL file.
+
+*linuxsampler-0.3.3 (17 Jul 2005)
+
+  17 Jul 2005; Frank van de Pol <fvdpol@gentoo.org>
+  +linuxsampler-0.3.3.ebuild:
+  Version bump to 0.3.3. It solves one
+  usability issue regarding small fragments / high sampling rates of audio
+  drivers, fixes some compile time errors with GCC 4.0 and a general efficiency
+  bug.
+
+  12 Jul 2005; Frank van de Pol <fvdpol@gentoo.org> linuxsampler-0.3.2.ebuild:
+  unmasked for amd64
+
+  11 Jul 2005; Frank van de Pol <fvdpol@gentoo.org>
+  linuxsampler-0.3.1.ebuild, linuxsampler-0.3.2.ebuild:
+  masked amd64 architecture
+
+*linuxsampler-0.3.2 (10 Jul 2005)
+
+  10 Jul 2005; Frank van de Pol <fvdpol@gentoo.org>
+  +linuxsampler-0.3.2.ebuild:
+  version bump
 
   30 May 2005; Frank van de Pol <fvdpol@gentoo.org> :
   New ebuild for LinuxSampler
diff --git a/media-sound/linuxsampler/Manifest b/media-sound/linuxsampler/Manifest
index 961d45da1ad8..341a24ad121c 100644
--- a/media-sound/linuxsampler/Manifest
+++ b/media-sound/linuxsampler/Manifest
@@ -1,3 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0dfbacd532963f9b8232ede9e67a3a51 ChangeLog 1168
+MD5 190a5ec8f9b515dec4614356e4c4e9be linuxsampler-0.3.3.ebuild 842
+MD5 4582c8b2de32522ebb5f202edbaca9df linuxsampler-0.3.1.ebuild 863
+MD5 7b2e7aa720566b4325452c391a185156 linuxsampler-0.3.2.ebuild 842
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 ddfaee607b8d041ff01c417d54e1f5c6 linuxsampler-0.3.1.ebuild 751
+MD5 f19df7afadd03508e29a934891935c17 files/digest-linuxsampler-0.3.3 71
+MD5 36b57a6a6d9ff8583dc3af371354dedb files/digest-linuxsampler-0.3.2 71
 MD5 82837a2c0c98e7edc0c15f8d2ba502c3 files/digest-linuxsampler-0.3.1 71
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDIwHIj5H05b2HAEkRAhnPAJ93T5RARiO1H7voY9//ayQDUmuwZQCePx4v
+yl/VwYT8tb8w8jdbxsbqZaY=
+=rmy1
+-----END PGP SIGNATURE-----
diff --git a/media-sound/linuxsampler/linuxsampler-0.3.1.ebuild b/media-sound/linuxsampler/linuxsampler-0.3.1.ebuild
index 1b9ebed7827e..9baba77e122a 100644
--- a/media-sound/linuxsampler/linuxsampler-0.3.1.ebuild
+++ b/media-sound/linuxsampler/linuxsampler-0.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 2005-2005 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/linuxsampler/linuxsampler-0.3.1.ebuild,v 1.1 2005/05/29 23:32:02 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/linuxsampler/linuxsampler-0.3.1.ebuild,v 1.1.1.1 2005/11/30 09:38:01 chriswhite Exp $
 
 inherit eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.linuxsampler.org/"
 SRC_URI="http://download.linuxsampler.org/packages/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="-amd64 ~x86"
 IUSE="jack"
 RDEPEND="
 	>=media-libs/liblscp-0.2.9
@@ -27,5 +27,5 @@ src_compile() {
 
 src_install() {
 	einstall || die "einstall failed"
-	dodoc AUTHORS ChangeLog INSTALL README
+	dodoc AUTHORS ChangeLog README
 }
diff --git a/media-sound/linuxsampler/linuxsampler-0.3.2.ebuild b/media-sound/linuxsampler/linuxsampler-0.3.2.ebuild
index 98f25ea4cc11..36f28f726f58 100644
--- a/media-sound/linuxsampler/linuxsampler-0.3.2.ebuild
+++ b/media-sound/linuxsampler/linuxsampler-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/media-sound/linuxsampler/linuxsampler-0.3.2.ebuild,v 1.1 2005/07/10 21:12:55 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/linuxsampler/linuxsampler-0.3.2.ebuild,v 1.1.1.1 2005/11/30 09:38:01 chriswhite Exp $
 
 inherit eutils
 
@@ -26,5 +26,5 @@ src_compile() {
 
 src_install() {
 	einstall || die "einstall failed"
-	dodoc AUTHORS ChangeLog INSTALL README
+	dodoc AUTHORS ChangeLog README
 }
diff --git a/media-sound/linuxsampler/linuxsampler-0.3.3.ebuild b/media-sound/linuxsampler/linuxsampler-0.3.3.ebuild
index 4562fdc86752..9a0d4b42d59c 100644
--- a/media-sound/linuxsampler/linuxsampler-0.3.3.ebuild
+++ b/media-sound/linuxsampler/linuxsampler-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/media-sound/linuxsampler/linuxsampler-0.3.3.ebuild,v 1.1 2005/07/17 12:22:54 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/linuxsampler/linuxsampler-0.3.3.ebuild,v 1.1.1.1 2005/11/30 09:38:01 chriswhite Exp $
 
 inherit eutils
 
@@ -26,5 +26,5 @@ src_compile() {
 
 src_install() {
 	einstall || die "einstall failed"
-	dodoc AUTHORS ChangeLog INSTALL README
+	dodoc AUTHORS ChangeLog README
 }
diff --git a/media-sound/liteamp/ChangeLog b/media-sound/liteamp/ChangeLog
index 827650036f7c..010a584c1370 100644
--- a/media-sound/liteamp/ChangeLog
+++ b/media-sound/liteamp/ChangeLog
@@ -1,6 +1,75 @@
 # ChangeLog for media-sound/liteamp
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/liteamp/ChangeLog,v 1.1 2003/01/28 16:27:33 seo Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/liteamp/ChangeLog,v 1.1.1.1 2005/11/30 09:38:40 chriswhite Exp $
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org>
+  liteamp-0.2.3.2.ebuild:
+  Stable on ppc.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  liteamp-0.2.4.1.ebuild:
+  Stable sparc.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  liteamp-0.2.3.2.ebuild:
+  Stable amd64, sparc.
+
+  08 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  liteamp-0.2.3.2.ebuild, liteamp-0.2.4.1.ebuild:
+  0.2.4.1 no longer compiles on x86 (maybe gtk-2.4 issues). marking 0.2.3.2
+  stable x86. Adding 0.2.3.2 to ~amd64 and 0.2.4.1 ~sparc
+
+  03 May 2004; Jeremy Huddleston <eradicator@gentoo.org> liteamp-0.2.1.ebuild,
+  liteamp-0.2.2.ebuild, liteamp-0.2.3.2.ebuild, liteamp-0.2.4.1.ebuild:
+  Changing mad dep to madplay.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> liteamp-0.2.1.ebuild,
+  liteamp-0.2.2.ebuild, liteamp-0.2.3.2.ebuild, liteamp-0.2.4.1.ebuild:
+  Added IUSE.
+
+  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> liteamp-0.2.1.ebuild,
+  liteamp-0.2.2.ebuild, liteamp-0.2.4.1.ebuild:
+  Stable on x86.
+
+*liteamp-0.2.4.1 (20 Jan 2004)
+
+  20 Jan 2004; Martin Holzer <mholzer@gentoo.org> liteamp-0.2.4.1.ebuild:
+  Version bumped. Closes 38754
+
+*liteamp-0.2.3.2 (19 Jul 2003)
+
+  19 Jul 2003; Nick Hadaway <raker@gentoo.org> liteamp-0.2.3.2.ebuild:
+  Reverted mad change
+
+  19 Jul 2003; lanius@gentoo.org :
+  version bump
+
+*liteamp-0.2.2-r1 (17 Jul 2003)
+
+  17 Jul 2003; Nick Hadaway <raker@gentoo.org> liteamp-0.2.2-r1.ebuild:
+  Now depending on media-libs/{libmad,libid3tag} instead of 
+  media-sound/mad
+
+*liteamp-0.2.2 (17 Apr 2003)
+
+  17 Apr 2003; Jungmin Seo <seo@gentoo.org> liteamp-0.2.2.ebuild,
+  files/liteamp-0.2.2 :
+  new version
+
+*liteamp-0.2.1 (19 Feb 2003)
+
+  02 Mar 2003; Jungmin Seo <seo@gentoo.org> liteamp-0.2.1.ebuild :
+  it is stable on x86 and ppc now
+
+  19 Feb 2003; Jungmin Seo <seo@gentoo.org> liteamp-0.2.1.ebuild,
+  files/liteamp-0.2.1 :
+  new version
+
+*liteamp-0.2 (17 Feb 2003)
+
+  17 Feb 2003; Jungmin Seo <seo@gentoo.org> liteamp-0.2.ebuild,
+  files/liteamp-0.2 :
+  new version
 
 *liteamp-0.1 (28 Jan 2003)
 
diff --git a/media-sound/liteamp/Manifest b/media-sound/liteamp/Manifest
index e69de29bb2d1..384b8f569d40 100644
--- a/media-sound/liteamp/Manifest
+++ b/media-sound/liteamp/Manifest
@@ -0,0 +1,10 @@
+MD5 ad6bc9369c6a3761a67ff26950395ee4 liteamp-0.2.4.1.ebuild 762
+MD5 5175472e729f22373e4624ec88e9b1c7 liteamp-0.2.3.2.ebuild 693
+MD5 cb8d3b689d9f73e7718f034e199911cc liteamp-0.2.2.ebuild 680
+MD5 527dcfe3ce0f0b53c6b6aa8b82eb930c metadata.xml 252
+MD5 bb05bb8853b5b57820436884dac14ab4 liteamp-0.2.1.ebuild 678
+MD5 7e543f8b16532f59baadd97efcfe8c25 ChangeLog 2439
+MD5 c1e711378c5a97218bbd9966784e0021 files/digest-liteamp-0.2.1 65
+MD5 3952cbd33851a9265a2b576f539d3aac files/digest-liteamp-0.2.3.2 67
+MD5 f9a722717eeb0e4294b14f7a0327eaec files/digest-liteamp-0.2.4.1 67
+MD5 fbdf683fb18e52943ed11a8bc2483302 files/digest-liteamp-0.2.2 65
diff --git a/media-sound/liteamp/liteamp-0.2.1.ebuild b/media-sound/liteamp/liteamp-0.2.1.ebuild
index c78aa14b327c..8825d358365b 100644
--- a/media-sound/liteamp/liteamp-0.2.1.ebuild
+++ b/media-sound/liteamp/liteamp-0.2.1.ebuild
@@ -1,21 +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/media-sound/liteamp/liteamp-0.2.1.ebuild,v 1.1 2003/02/18 20:23:05 seo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/liteamp/liteamp-0.2.1.ebuild,v 1.1.1.1 2005/11/30 09:38:40 chriswhite Exp $
+
+IUSE=""
 
 inherit eutils gnome2
 
-S="${WORKDIR}/${P}"
 DESCRIPTION="Liteamp - yet another light-weight ogg and mp3 player for gnome"
 SRC_URI="http://download.kldp.net/liteamp/${P}.tar.gz"
 HOMEPAGE="http://liteamp.kldp.net"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc"
 
 DEPEND=">=x11-libs/gtk+-2.0.0
 	>=gnome-base/libgnomeui-2.0
-	>=media-sound/mad-0.14
+	>=media-sound/madplay-0.14
 	>=media-libs/libvorbis-1.0
 	media-libs/libao
 	media-libs/libogg"
diff --git a/media-sound/liteamp/liteamp-0.2.2.ebuild b/media-sound/liteamp/liteamp-0.2.2.ebuild
index 63bbb2346425..35851cda72ed 100644
--- a/media-sound/liteamp/liteamp-0.2.2.ebuild
+++ b/media-sound/liteamp/liteamp-0.2.2.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/media-sound/liteamp/liteamp-0.2.2.ebuild,v 1.1 2003/04/16 17:07:47 seo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/liteamp/liteamp-0.2.2.ebuild,v 1.1.1.1 2005/11/30 09:38:40 chriswhite Exp $
+
+IUSE=""
 
 inherit eutils gnome2
 
-S="${WORKDIR}/${P}"
 DESCRIPTION="Liteamp - yet another light-weight ogg and mp3 player for gnome"
 SRC_URI="http://download.kldp.net/liteamp/${P}.tar.gz"
 HOMEPAGE="http://liteamp.kldp.net"
@@ -15,7 +16,7 @@ KEYWORDS="~x86 ~ppc"
 
 DEPEND=">=x11-libs/gtk+-2.0.0
 	>=gnome-base/libgnomeui-2.0
-	>=media-sound/mad-0.14
+	>=media-sound/madplay-0.14
 	>=media-libs/libvorbis-1.0
 	media-libs/libao
 	media-libs/libogg"
diff --git a/media-sound/liteamp/liteamp-0.2.3.2.ebuild b/media-sound/liteamp/liteamp-0.2.3.2.ebuild
index baed144ddff0..323504e0120a 100644
--- a/media-sound/liteamp/liteamp-0.2.3.2.ebuild
+++ b/media-sound/liteamp/liteamp-0.2.3.2.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/media-sound/liteamp/liteamp-0.2.3.2.ebuild,v 1.1 2003/07/19 12:22:10 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/liteamp/liteamp-0.2.3.2.ebuild,v 1.1.1.1 2005/11/30 09:38:40 chriswhite Exp $
+
+IUSE=""
 
 inherit eutils gnome2
 
@@ -10,13 +12,12 @@ HOMEPAGE="http://liteamp.kldp.net"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc sparc amd64"
 
 DEPEND=">=x11-libs/gtk+-2.0.0
 	>=gnome-base/libgnomeui-2.0
-	>=media-libs/libmad-0.15.0b
-	>=media-libs/libid3tag-0.15.0b
 	>=media-libs/libvorbis-1.0
+	>=media-sound/madplay-0.14.2b
 	media-libs/libao
 	media-libs/libogg"
 
diff --git a/media-sound/liteamp/liteamp-0.2.4.1.ebuild b/media-sound/liteamp/liteamp-0.2.4.1.ebuild
index 99cdeaba548b..33b87e0ac42b 100644
--- a/media-sound/liteamp/liteamp-0.2.4.1.ebuild
+++ b/media-sound/liteamp/liteamp-0.2.4.1.ebuild
@@ -1,6 +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/media-sound/liteamp/liteamp-0.2.4.1.ebuild,v 1.1 2004/01/20 18:38:43 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/liteamp/liteamp-0.2.4.1.ebuild,v 1.1.1.1 2005/11/30 09:38:40 chriswhite Exp $
+
+IUSE=""
 
 inherit eutils gnome2
 
@@ -10,12 +12,13 @@ HOMEPAGE="http://liteamp.kldp.net"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+#-x86, -amd64: 0.2.4.1 no longer compiles on x86 or amd64 ... 
+KEYWORDS="-x86 -amd64 ~ppc sparc"
 
 DEPEND=">=x11-libs/gtk+-2.0.0
 	>=gnome-base/libgnomeui-2.0
 	>=media-libs/libvorbis-1.0
-	>=media-sound/mad-0.14.2b
+	>=media-sound/madplay-0.14.2b
 	media-libs/libao
 	media-libs/libogg"
 
diff --git a/media-sound/litestream/ChangeLog b/media-sound/litestream/ChangeLog
index 74d87a94e9f3..c8461a92dc8d 100644
--- a/media-sound/litestream/ChangeLog
+++ b/media-sound/litestream/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for media-sound/litestream
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/litestream/ChangeLog,v 1.1 2004/03/24 22:53:14 eradicator Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/litestream/ChangeLog,v 1.1.1.1 2005/11/30 09:38:28 chriswhite Exp $
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  litestream-1.2.ebuild:
+  Stable sparc.
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  litestream-1.2.ebuild:
+  Added to ~sparc.
+
+  23 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  litestream-1.2.ebuild:
+  Stable x86.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  litestream-1.2.ebuild:
+  Added IUSE.
+
+  25 Mar 2004; David Holm <dholm@gentoo.org> litestream-1.2.ebuild:
+  Added to ~ppc.
 
 *litestream-1.2 (24 Mar 2004)
 
diff --git a/media-sound/litestream/Manifest b/media-sound/litestream/Manifest
index d6cf5d2f5d49..ed9995ee7dac 100644
--- a/media-sound/litestream/Manifest
+++ b/media-sound/litestream/Manifest
@@ -1,2 +1,16 @@
-MD5 3cb271d1169190169e9b74be52dd011f litestream-1.2.ebuild 516
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 78998e72514b65c181f8737b0688a46c ChangeLog 1027
+MD5 225c616601758f1965284c5d9922de26 litestream-1.2.ebuild 1048
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 7b22396a0ce85c0f2f7260047052237c files/digest-litestream-1.2 65
+MD5 75c1a84a3546138fc57472a7c9882e14 files/litestream-1.2-Makefile.patch 331
+MD5 ed48bbd28f65e23350257f8daabf6102 files/vargs.h 4939
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBxRdOArHZZzCEUG0RApHuAJ49hSoDTqwDHYbAxGMXsryrLsLbiwCdFw6v
+6r3B43Q+m0mHIi416fSC33I=
+=RRce
+-----END PGP SIGNATURE-----
diff --git a/media-sound/litestream/litestream-1.2.ebuild b/media-sound/litestream/litestream-1.2.ebuild
index cf76dd89cc25..c8c4ae04ed02 100644
--- a/media-sound/litestream/litestream-1.2.ebuild
+++ b/media-sound/litestream/litestream-1.2.ebuild
@@ -1,21 +1,21 @@
-# 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/media-sound/litestream/litestream-1.2.ebuild,v 1.1 2004/03/24 22:53:14 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/litestream/litestream-1.2.ebuild,v 1.1.1.1 2005/11/30 09:38:28 chriswhite Exp $
 
-inherit eutils
+IUSE=""
+
+inherit eutils flag-o-matic
 
 DESCRIPTION="Litstream is a lightweight and robust shoutcast-compatible streaming mp3 server."
 HOMEPAGE="http://www.litestream.org/"
 SRC_URI="http://litestream.org/litestream/${P}.tar.gz"
-LICENSE="BSD"
 
-IUSE=""
+LICENSE="BSD"
 SLOT="0"
-
-KEYWORDS="~x86"
+# -amd64: 1.2 build errors - eradicator
+KEYWORDS="-amd64 sparc ~ppc x86"
 
 DEPEND=""
-RDEPEND=""
 
 S=${WORKDIR}/${PN}
 
@@ -35,11 +35,10 @@ src_compile() {
 }
 
 src_install() {
-	exeinto /usr/bin
-	doexe litestream literestream
-	newexe source litestream-source
-	newexe server litestream-server
-	newexe client litestream-client
+	dobin litestream literestream
+	newbin source litestream-source
+	newbin server litestream-server
+	newbin client litestream-client
 
-	dodoc ABOUT ACKNOWLEDGEMENTS BUGS CHANGELOG CONTACT FILES LICENSE MAKEITGO README
+	dodoc ABOUT ACKNOWLEDGEMENTS BUGS CHANGELOG CONTACT FILES MAKEITGO README
 }
diff --git a/media-sound/longplayer/ChangeLog b/media-sound/longplayer/ChangeLog
index 991315420ab9..367e9e53cccc 100644
--- a/media-sound/longplayer/ChangeLog
+++ b/media-sound/longplayer/ChangeLog
@@ -1,6 +1,35 @@
 # ChangeLog for media-sound/longplayer
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/longplayer/ChangeLog,v 1.1 2004/03/31 18:43:05 eradicator Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/longplayer/ChangeLog,v 1.1.1.1 2005/11/30 09:37:53 chriswhite Exp $
+
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  longplayer-0.99.2.ebuild, longplayer-0.99.3.ebuild:
+  Don't install COPYING and INSTALL files.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  longplayer-0.99.3.ebuild:
+  Stable amd64, sparc.
+
+  08 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  longplayer-0.99.3.ebuild:
+  ~sparc ~amd64
+
+  03 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  longplayer-0.99.2.ebuild, longplayer-0.99.3.ebuild:
+  fix dir -> die typo
+
+  30 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  longplayer-0.99.3.ebuild:
+  Stable x86.
+
+  01 Apr 2004; David Holm <dholm@gentoo.org> longplayer-0.99.3.ebuild:
+  Added to ~ppc.
+
+*longplayer-0.99.3 (31 Mar 2004)
+
+  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  longplayer-0.99.3.ebuild, files/longplayer-0.99.3-gentoo.patch:
+  Version bump already.
 
 *longplayer-0.99.2 (31 Mar 2004)
 
diff --git a/media-sound/longplayer/Manifest b/media-sound/longplayer/Manifest
index b13796cb42a8..21861bb8346c 100644
--- a/media-sound/longplayer/Manifest
+++ b/media-sound/longplayer/Manifest
@@ -1,2 +1,18 @@
-MD5 1754366f0900ebcc58c6e6e7b32b3192 longplayer-0.99.2.ebuild 782
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 89eba551617d661435562fcf521a9450 ChangeLog 1325
+MD5 8c29302e3cd7f7120aa5abb9e80ed185 longplayer-0.99.3.ebuild 1192
+MD5 c79cb3c3f0baed883d13703e4f88f244 longplayer-0.99.2.ebuild 1176
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 bb7969244a37d3e41a8474ca19ec3d2a files/digest-longplayer-0.99.3 68
+MD5 f7b6a99c9f4d84b13528d7920d1081bd files/longplayer-0.99.2-gentoo.patch 2663
 MD5 a819deed9f561df692db6d72da7e27c4 files/digest-longplayer-0.99.2 68
+MD5 52a613b3b558065c366e5f197753e617 files/longplayer-0.99.3-gentoo.patch 2608
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGs+vj5H05b2HAEkRAuroAJ9RDXhWL0/KsF2zA+KQum/jb2QsmQCfQFNa
+SVpa61jlk0KVsUIiW63Oezo=
+=5xKC
+-----END PGP SIGNATURE-----
diff --git a/media-sound/longplayer/longplayer-0.99.2.ebuild b/media-sound/longplayer/longplayer-0.99.2.ebuild
index 155c513bc493..13724c407749 100644
--- a/media-sound/longplayer/longplayer-0.99.2.ebuild
+++ b/media-sound/longplayer/longplayer-0.99.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/media-sound/longplayer/longplayer-0.99.2.ebuild,v 1.1 2004/03/31 18:43:05 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/longplayer/longplayer-0.99.2.ebuild,v 1.1.1.1 2005/11/30 09:37:54 chriswhite Exp $
 
 inherit eutils kde
 
@@ -38,14 +38,13 @@ src_unpack() {
 }
 
 src_compile() {
-	addwrite ${QTDIR}/etc/settings/.qt_plugins_${QTVER}rc.lock
-	econf `use_enable berkdb berkeleydb` || die "econf failed"
-
 	addwrite "${QTDIR}/etc/settings"
+
+	econf `use_enable berkdb berkeleydb` || die "econf failed"
 	emake || die "emake failed"
 }
 
 src_install () {
-	einstall || dir "einstall failed"
-	dodoc AUTHORS BUGS COPYING FAQ ChangeLog INSTALL NEWS README TODO
+	einstall || die "einstall failed"
+	dodoc AUTHORS BUGS FAQ ChangeLog NEWS README TODO
 }
diff --git a/media-sound/longplayer/longplayer-0.99.3.ebuild b/media-sound/longplayer/longplayer-0.99.3.ebuild
index 90cc18723563..71f28a20cf86 100644
--- a/media-sound/longplayer/longplayer-0.99.3.ebuild
+++ b/media-sound/longplayer/longplayer-0.99.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/media-sound/longplayer/longplayer-0.99.3.ebuild,v 1.1 2004/04/01 06:24:47 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/longplayer/longplayer-0.99.3.ebuild,v 1.1.1.1 2005/11/30 09:37:54 chriswhite Exp $
 
 inherit eutils kde
 
@@ -15,7 +15,7 @@ RESTRICT="nomirror"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc sparc amd64"
 
 RDEPEND="x11-libs/qt
 	media-sound/xmms
@@ -45,6 +45,6 @@ src_compile() {
 }
 
 src_install () {
-	einstall || dir "einstall failed"
-	dodoc AUTHORS BUGS COPYING FAQ ChangeLog INSTALL NEWS README TODO
+	einstall || die "einstall failed"
+	dodoc AUTHORS BUGS FAQ ChangeLog NEWS README TODO
 }
diff --git a/media-sound/madman/ChangeLog b/media-sound/madman/ChangeLog
index 552db376e1f8..3c92259a4b28 100644
--- a/media-sound/madman/ChangeLog
+++ b/media-sound/madman/ChangeLog
@@ -1,6 +1,40 @@
 # ChangeLog for media-sound/madman
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/madman/ChangeLog,v 1.1 2003/07/19 06:56:18 jje Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/madman/ChangeLog,v 1.1.1.1 2005/11/30 09:38:09 chriswhite Exp $
+
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> madman-0.93.ebuild:
+  Don't install COPYING file.
+
+  28 Jul 2005; Caleb Tennis <caleb@gentoo.org> madman-0.91.1.ebuild,
+  madman-0.93.ebuild:
+  Fix qt dep per bug #100235
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> madman-0.93.ebuild:
+  Fixed dependency to require libid3tag.  Closes bug #63158.
+
+  03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> madman-0.93.ebuild:
+  Stable sparc, x86.
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> madman-0.91.1.ebuild,
+  madman-0.93.ebuild:
+  Typo in DESCRIPTION: extrodinaire -> extraordinaire. Bug 59717.
+
+  17 Jul 2004; David Holm <dholm@gentoo.org> madman-0.93.ebuild:
+  Added to ~ppc.
+
+*madman-0.93 (12 Jul 2004)
+
+  12 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> madman-0.93.ebuild:
+  Version bump.  ~sparc -amd64.
+
+  25 Apr 2004; Aron Griffis <agriffis@gentoo.org> madman-0.91.1.ebuild:
+  Add die following econf for bug 48950
+
+  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> madman-0.91.1.ebuild:
+  Stable on x86.
+
+  11 Feb 2004; Caleb Tennis <caleb@gentoo.org> madman-0.91.1.ebuild:
+  addwrite $QTDIR/etc/settings for sandbox fixes
 
 *madman-0.91.1 (19 Jul 2003)
 
diff --git a/media-sound/madman/Manifest b/media-sound/madman/Manifest
index d2b0b2165d39..08f90d68e2b2 100644
--- a/media-sound/madman/Manifest
+++ b/media-sound/madman/Manifest
@@ -1,2 +1,17 @@
-MD5 bca0ec181fcec8acbf96446c03bf553a madman-0.91.1.ebuild 603
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d1d0e6679b7737c1e388fcbe77994d3d ChangeLog 1548
+MD5 e5ee123151b0b6d9db0a21f6a90ee969 madman-0.93.ebuild 1721
+MD5 0b1ac79422a317fe951de73f7e0d4b33 madman-0.91.1.ebuild 726
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 619eaa44f6cc47b3f9c27a0f4f7fb0f8 files/madman-0.93-gcc34.patch 408
+MD5 552d34016df5811e777e48617ac62c35 files/digest-madman-0.93 63
 MD5 cf5b2760fca097c0c04b4566fad931ce files/digest-madman-0.91.1 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGtBmj5H05b2HAEkRAiMyAKCdEHbh6bNSw9z6Vxo7hH8PWckTZwCfYNDI
+hC4KydIbrxvKLyNIbFMKpLA=
+=2CXY
+-----END PGP SIGNATURE-----
diff --git a/media-sound/madman/madman-0.91.1.ebuild b/media-sound/madman/madman-0.91.1.ebuild
index 9c01f1ce7f16..002d7053032c 100644
--- a/media-sound/madman/madman-0.91.1.ebuild
+++ b/media-sound/madman/madman-0.91.1.ebuild
@@ -1,26 +1,28 @@
-# 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/media-sound/madman/madman-0.91.1.ebuild,v 1.1 2003/07/19 06:56:18 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/madman/madman-0.91.1.ebuild,v 1.1.1.1 2005/11/30 09:38:09 chriswhite Exp $
 
-S="${WORKDIR}/${P}"
-DESCRIPTION="MP3 organizer/ID3 tag-editor extrodinaire"
+DESCRIPTION="MP3 organizer/ID3 tag-editor extraordinaire"
 HOMEPAGE="http://madman.sf.net"
 SRC_URI="mirror://sourceforge/madman/${P}.tar.gz"
+RESTRICT="nomirror"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
-DEPEND=">=x11-libs/qt-3.1.0-r3
-       >=media-libs/libvorbis-1.0
-       >=media-sound/xmms-1.2.7-r20
-       >=media-libs/id3lib-3.8.3"
+DEPEND="=x11-libs/qt-3*
+	>=media-libs/libvorbis-1.0
+	>=media-sound/xmms-1.2.7-r20
+	>=media-libs/id3lib-3.8.3"
 
 src_compile() {
-	econf --prefix=/usr --libdir=/usr/lib
-	emake
+	addwrite "${QTDIR}/etc/settings"
+	econf --prefix=/usr --libdir=/usr/lib || die "econf failed"
+	emake || die
 }
 
 src_install() {
 	einstall libdir=${D}/usr/lib || die
-} 
+}
diff --git a/media-sound/madman/madman-0.93.ebuild b/media-sound/madman/madman-0.93.ebuild
index 92429f6102df..af91405cbec0 100644
--- a/media-sound/madman/madman-0.93.ebuild
+++ b/media-sound/madman/madman-0.93.ebuild
@@ -1,25 +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/media-sound/madman/madman-0.93.ebuild,v 1.1 2004/07/12 19:43:15 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/madman/madman-0.93.ebuild,v 1.1.1.1 2005/11/30 09:38:09 chriswhite Exp $
 
 IUSE=""
 
 inherit eutils
 
-DESCRIPTION="MP3 organizer/ID3 tag-editor extrodinaire"
+DESCRIPTION="MP3 organizer/ID3 tag-editor extraordinaire"
 HOMEPAGE="http://madman.sf.net"
 SRC_URI="mirror://sourceforge/madman/${P}.tar.gz"
-RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
 #-amd64: 0.93: see bug #56821
-KEYWORDS="~x86 -amd64 ~sparc"
+KEYWORDS="x86 -amd64 sparc ~ppc"
 
-DEPEND=">=x11-libs/qt-3.1.0-r3
+DEPEND="=x11-libs/qt-3*
 	>=media-libs/libvorbis-1.0
 	>=media-sound/xmms-1.2.7-r20
-	>=media-libs/id3lib-3.8.3"
+	>=media-libs/libid3tag-0.15.1b"
 
 src_unpack() {
 	unpack ${A}
@@ -57,7 +56,6 @@ src_install() {
 	# madman "by hand".
 	dobin main/madman
 	dodoc README
-	dodoc COPYING
 	newdoc plugins/README README.plugins
 	dodir /usr/lib/${PN}/plugins
 	exeinto /usr/lib/${PN}/plugins
diff --git a/media-sound/madplay/ChangeLog b/media-sound/madplay/ChangeLog
index 85dd6dff36b2..50881882eb9e 100644
--- a/media-sound/madplay/ChangeLog
+++ b/media-sound/madplay/ChangeLog
@@ -1,6 +1,121 @@
 # ChangeLog for media-sound/madplay
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/madplay/ChangeLog,v 1.1 2003/07/19 06:01:55 raker Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/madplay/ChangeLog,v 1.1.1.1 2005/11/30 09:38:10 chriswhite Exp $
+
+  03 Aug 2005; Kito <kito@gentoo.org> +files/madplay-macos.patch,
+  madplay-0.15.2b.ebuild:
+  add Fink patch to audio_carbon.c to avoid conflicting types on OS X 10.4:
+
+  14 Apr 2005; Stephen P. Becker <geoman@gentoo.org> madplay-0.15.0b.ebuild,
+  madplay-0.15.0b-r1.ebuild, madplay-0.15.1b.ebuild, madplay-0.15.2b.ebuild:
+  changed to -mips keywords
+
+  10 Apr 2005; Lina Pezzella <j4rg0n@gentoo.org> madplay-0.15.2b.ebuild:
+  Testing ppc-macos
+
+  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  madplay-0.15.2b.ebuild:
+  Stable on ppc.
+
+  11 Jan 2005; Mike Frysinger <vapier@gentoo.org> madplay-0.15.2b.ebuild:
+  Disable C++ checks #74499.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  11 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> madplay-0.15.2b.ebuild:
+  Stable on alpha.
+
+  03 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> madplay-0.15.1b.ebuild:
+  Stable on alpha.
+
+  29 Jul 2004; Tom Gall <tgall@gentoo.org> madplay-0.15.2b.ebuild:
+  stable on ppc64, bug #55426
+
+  25 Jul 2004; Lina Pezzella <j4rg0n@gentoo.org>
+  madplay-0.15.2b.ebuild:
+  Reverted to unstable macos. Waiting on esound to stable.
+
+  25 Jul 2004; Lina Pezzella <j4rg0n@gentoo.org>
+  Fixed Manifest.
+
+  23 Jul 2004; Lina Pezzella <j4rg0n@gentoo.org> :
+  madplay-0.15.2b.ebuild:
+  Stable macos.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  madplay-0.15.0b-r1.ebuild, madplay-0.15.0b.ebuild, madplay-0.15.1b.ebuild:
+  virtual/glibc -> virtual/libc
+
+  17 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  madplay-0.15.2b.ebuild:
+  Stable amd64.
+
+  16 Jun 2004; Gustavo Zacarias <gustavoz@gentoo.org> madplay-0.15.2b.ebuild:
+  Stable on hppa
+
+  06 Jun 2004; Jason Wever <weeve@gentoo.org> madplay-0.15.2b.ebuild:
+  Stable on sparc.
+
+  30 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  madplay-0.15.2b.ebuild:
+  Stable x86.
+
+  26 Apr 2004; Stephen P. Becker <geoman@gentoo.org>
+  madplay-0.15.0b-r1.ebuild:
+  Marked stable on mips.
+
+*madplay-0.15.2b (21 Apr 2004)
+
+  21 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  madplay-0.15.2b.ebuild:
+  Version bump closes bug #48646.  Ebuild cleanup.  USE=esd support.
+
+  21 Apr 2004; Guy Martin <gmsoft@gentoo.org> madplay-0.15.1b.ebuild:
+  Marked stable on hppa.
+
+  29 Mar 2004; Jason Wever <weeve@gentoo.org> madplay-0.15.1b.ebuild:
+  Stable on sparc.
+
+  28 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  madplay-0.15.1b.ebuild:
+  Stable on x86.
+
+*madplay-0.15.1b (18 Feb 2004)
+
+  18 Feb 2004; Martin Holzer <mholzer@gentoo.org> madplay-0.15.1b.ebuild:
+  Version bumped.
+
+  28 Jan 2004; Aron Griffis <agriffis@gentoo.org> madplay-0.15.0b-r1.ebuild:
+  stable on alpha and ia64
+
+  28 Jan 2004; Brad House <brad_mssw@gentoo.org> madplay-0.15.0b-r1.ebuild:
+  mark stable on amd64
+
+  17 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org>
+  madplay-0.15.0b-r1.ebuild:
+  set ppc in keywords
+
+  16 Jan 2004; Martin Guy <gmsoft@gentoo.org> madplay-0.15.0b-r1.ebuild:
+  Marked stable on hppa.
+
+  13 Jan 2004; Jason Wever <jwever@gentoo.org> madplay-0.15.0b-r1.ebuild,
+  Marked stable on sparc.
+
+  01 Jan 2004; Martin Holzer <mholzer@gentoo.org> madplay-0.15.0b-r1.ebuild,
+  madplay-0.15.0b.ebuild:
+  x86 stable
+
+*madplay-0.15.0b-r1 (18 Aug 2003)
+
+  04 Nov 2003; Joshua Kinard <kumba@gentoo.org> madplay-0.15.0b-r1.ebuild:
+  Added ~mips to KEYWORDS
+
+  18 Aug 2003; Nick Hadaway <raker@gentoo.org> madplay-0.15.0b-r1.ebuild:
+  Alsa output is broken.  Removed alsa-related code.  See bug #25783.
+
+  19 Jul 2003; Nick Hadaway <raker@gentoo.org> madplay-0.15.0b.ebuild:
+  Added libmad and libid3tag to the depends.
 
 *madplay-0.15.0b (19 Jul 2003)
 
diff --git a/media-sound/madplay/Manifest b/media-sound/madplay/Manifest
index da1924eae8df..7afce20eebca 100644
--- a/media-sound/madplay/Manifest
+++ b/media-sound/madplay/Manifest
@@ -1,2 +1,11 @@
-MD5 9fa749e61122a7f8ff41518083b4f536 madplay-0.15.0b.ebuild 881
+MD5 66e9d6ba643ffd3c3270c19e608b0134 ChangeLog 3980
+MD5 109babf7d08d84fcfb584106f40e2343 madplay-0.15.0b-r1.ebuild 1158
+MD5 94ed6008e35fad6158f3b0665a42ca5f madplay-0.15.0b.ebuild 1239
+MD5 06639223982da098aa63b6205f9c78c8 madplay-0.15.1b.ebuild 1156
+MD5 8652917886b1aee6f43d50c794a5b02a madplay-0.15.2b.ebuild 1226
+MD5 527dcfe3ce0f0b53c6b6aa8b82eb930c metadata.xml 252
 MD5 0fc07eafcb4326558f0a89f1ec6d7702 files/digest-madplay-0.15.0b 67
+MD5 0fc07eafcb4326558f0a89f1ec6d7702 files/digest-madplay-0.15.0b-r1 67
+MD5 8841a359fd11baf1be0358c2fbe136b7 files/digest-madplay-0.15.1b 67
+MD5 71a82995eb3d84560fb0d9a075110d74 files/digest-madplay-0.15.2b 67
+MD5 961b0a6e966c3b0723a2c8fa83ee129c files/madplay-macos.patch 593
diff --git a/media-sound/madplay/madplay-0.15.0b-r1.ebuild b/media-sound/madplay/madplay-0.15.0b-r1.ebuild
index 49aaa5f53ad3..2a0cefbd861a 100644
--- a/media-sound/madplay/madplay-0.15.0b-r1.ebuild
+++ b/media-sound/madplay/madplay-0.15.0b-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/media-sound/madplay/madplay-0.15.0b-r1.ebuild,v 1.1 2003/08/18 10:57:45 g2boojum Exp $
-
-IUSE="debug nls"
+# $Header: /var/cvsroot/gentoo-x86/media-sound/madplay/madplay-0.15.0b-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:10 chriswhite Exp $
 
 DESCRIPTION="The MAD audio player"
 HOMEPAGE="http://mad.sourceforge.net"
@@ -10,9 +8,10 @@ SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa"
+KEYWORDS="alpha amd64 arm hppa ia64 -mips ppc sparc x86"
+IUSE="debug nls"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	~media-libs/libmad-${PV}
 	~media-libs/libid3tag-${PV}
 	nls? ( >=sys-devel/gettext-0.11.2 )"
diff --git a/media-sound/madplay/madplay-0.15.0b.ebuild b/media-sound/madplay/madplay-0.15.0b.ebuild
index 2c34c256eb9c..247e4e11efca 100644
--- a/media-sound/madplay/madplay-0.15.0b.ebuild
+++ b/media-sound/madplay/madplay-0.15.0b.ebuild
@@ -1,25 +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/media-sound/madplay/madplay-0.15.0b.ebuild,v 1.1 2003/07/19 06:01:55 raker Exp $
-
-IUSE="debug nls alsa"
+# $Header: /var/cvsroot/gentoo-x86/media-sound/madplay/madplay-0.15.0b.ebuild,v 1.1.1.1 2005/11/30 09:38:10 chriswhite Exp $
 
 DESCRIPTION="The MAD audio player"
-HOMEPAGE="http://mad.sourceforge.net/
-	http://www.underbit.com/products/mad/"
+HOMEPAGE="http://mad.sourceforge.net"
 SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~alpha ~arm ~hppa ~ppc ~sparc ~x86 -mips"
+IUSE="debug nls alsa"
 
-DEPEND="virtual/glibc
-	!media-sound/mad
-	nls? ( sys-devel/gettext )
+DEPEND="virtual/libc
+	~media-libs/libmad-${PV}
+	~media-libs/libid3tag-${PV}
+	nls? ( >=sys-devel/gettext-0.11.2 )
 	alsa? ( >=media-libs/alsa-lib-0.9.0 )"
 
-S=${WORKDIR}/${P}
-
 src_compile() {
 	local myconf
 
@@ -36,12 +33,12 @@ src_compile() {
 
 	use alsa && myconf="${myconf} --with-alsa"
 
-	econf ${myconf} || die
-	emake || die
+	econf ${myconf} || die "configure failed"
+	emake || die "make failed"
 }
 
 src_install() {
-	einstall || die
+	einstall || die "make install failed"
 
 	dodoc CHANGES COPYRIGHT CREDITS README TODO VERSION
 }
diff --git a/media-sound/madplay/madplay-0.15.1b.ebuild b/media-sound/madplay/madplay-0.15.1b.ebuild
index 3024fd778494..83a920afca89 100644
--- a/media-sound/madplay/madplay-0.15.1b.ebuild
+++ b/media-sound/madplay/madplay-0.15.1b.ebuild
@@ -1,19 +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/media-sound/madplay/madplay-0.15.1b.ebuild,v 1.1 2004/02/18 09:37:45 mholzer Exp $
-
-IUSE="debug nls"
+# $Header: /var/cvsroot/gentoo-x86/media-sound/madplay/madplay-0.15.1b.ebuild,v 1.1.1.1 2005/11/30 09:38:10 chriswhite Exp $
 
 DESCRIPTION="The MAD audio player"
 HOMEPAGE="http://mad.sourceforge.net"
 SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
-RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~mips ~ia64 ~amd64"
+KEYWORDS="alpha amd64 arm hppa ia64 -mips ~ppc sparc x86"
+IUSE="debug nls"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	~media-libs/libmad-${PV}
 	~media-libs/libid3tag-${PV}
 	nls? ( >=sys-devel/gettext-0.11.2 )"
diff --git a/media-sound/madplay/madplay-0.15.2b.ebuild b/media-sound/madplay/madplay-0.15.2b.ebuild
index bb512f284451..f8ef776e8dfc 100644
--- a/media-sound/madplay/madplay-0.15.2b.ebuild
+++ b/media-sound/madplay/madplay-0.15.2b.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/media-sound/madplay/madplay-0.15.2b.ebuild,v 1.1 2004/04/22 06:39:46 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/madplay/madplay-0.15.2b.ebuild,v 1.1.1.1 2005/11/30 09:38:10 chriswhite Exp $
 
-IUSE="debug nls esd"
+inherit eutils
 
 DESCRIPTION="The MAD audio player"
-HOMEPAGE="http://mad.sourceforge.net"
+HOMEPAGE="http://mad.sourceforge.net/"
 SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
-RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~mips ~ia64 ~amd64"
+KEYWORDS="alpha amd64 arm hppa ia64 -mips ppc ppc64 sparc x86 ~ppc-macos"
+IUSE="debug nls esd"
 
 #	~media-libs/libmad-${PV}
 #	~media-libs/libid3tag-${PV}
@@ -21,20 +21,26 @@ KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~mips ~ia64 ~amd64"
 RDEPEND="esd? ( media-sound/esound )
 	~media-libs/libmad-0.15.1b
 	~media-libs/libid3tag-0.15.1b"
-
 DEPEND="${RDEPEND}
 	nls? ( >=sys-devel/gettext-0.11.2 )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epunt_cxx #74499
+	epatch ${FILESDIR}/${PN}-macos.patch
+}
+
 src_compile() {
 	econf \
-	      `use_enable nls` \
-	      `use_enable debug debugging` \
-	      `use_with esd` \
-	      || die "configure failed"
+		$(use_enable nls) \
+		$(use_enable debug debugging) \
+		$(use_with esd) \
+		|| die "configure failed"
 	emake || die "make failed"
 }
 
 src_install() {
 	make DESTDIR="${D}" install || die
-	dodoc CHANGES COPYRIGHT CREDITS README TODO VERSION
+	dodoc CHANGES CREDITS README TODO VERSION
 }
diff --git a/media-sound/mcdp/ChangeLog b/media-sound/mcdp/ChangeLog
index a27cd675b466..008785e04676 100644
--- a/media-sound/mcdp/ChangeLog
+++ b/media-sound/mcdp/ChangeLog
@@ -1,11 +1,42 @@
 # ChangeLog for media-sound/mcdp
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mcdp/ChangeLog,v 1.1 2003/07/11 09:36:23 jje Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mcdp/ChangeLog,v 1.1.1.1 2005/11/30 09:38:01 chriswhite Exp $
+
+  10 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> mcdp-0.3j.ebuild:
+  Don't install INSTALL file.
+
+  28 Aug 2005; Mike Frysinger <vapier@gentoo.org> mcdp-0.3j.ebuild:
+  Punt USE=diet.
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> mcdp-0.3j.ebuild:
+  Added to ~ppc.
+
+  03 Feb 2005; Robin H. Johnson <robbat2@gentoo.org> mcdp-0.3j.ebuild,
+  +files/mcdp-0.3j-dietlibc-fix.patch:
+  Fix bug #50447 properly. It's not hard dammit.
+
+  30 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> mcdp-0.3j.ebuild:
+  toolchain love for bug #69011.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> mcdp-0.3j.ebuild:
+  Stable amd64, sparc.
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> mcdp-0.3j.ebuild:
+  Made dietlibc optional.  Added to ~sparc.
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> mcdp-0.3j.ebuild:
+  Added to ~amd64
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> mcdp-0.3j.ebuild:
+  Added IUSE.
+
+  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> mcdp-0.3j.ebuild:
+  Stable x86.  Ebuild cleanup.
 
 *mcdp-0.3j (11 Jul 2003)
 
   11 Jul 2003; jje <jje@gentoo.org> mcdp-0.3j.ebuild:
   Initial revision.
   
-  Submitted by: Freyr Gunnar Ólafsson <gnarlin@utopia.is>
+  Submitted by: Freyr Gunnar Ólafsson <gnarlin@utopia.is>
 
diff --git a/media-sound/mcdp/Manifest b/media-sound/mcdp/Manifest
index dc09d93c217a..ad839dc31c5c 100644
--- a/media-sound/mcdp/Manifest
+++ b/media-sound/mcdp/Manifest
@@ -1,2 +1,15 @@
-MD5 838141c3231906bb9b9ef6700a0e64b5 mcdp-0.3j.ebuild 523
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 665c40292df80db15daa43a21867e813 mcdp-0.3j.ebuild 727
+MD5 1e2c625943f1ad16dfd10ea24aa72aef ChangeLog 1422
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 1159831fecf7d200807f7dc82bfa5bb1 files/mcdp-0.3j-dietlibc-fix.patch 365
 MD5 65c764f79941bf06a15e474906cc1458 files/digest-mcdp-0.3j 60
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDIwEzj5H05b2HAEkRAsOeAJ0eMlYMAhBdGghELIiTdgtKJQFLAQCeMy4l
+jwcBL78Jezv/884Jx+uMat8=
+=zcGF
+-----END PGP SIGNATURE-----
diff --git a/media-sound/mcdp/mcdp-0.3j.ebuild b/media-sound/mcdp/mcdp-0.3j.ebuild
index fd9032bb30f8..e91a7d2ca79b 100644
--- a/media-sound/mcdp/mcdp-0.3j.ebuild
+++ b/media-sound/mcdp/mcdp-0.3j.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/media-sound/mcdp/mcdp-0.3j.ebuild,v 1.1 2003/07/11 09:36:25 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mcdp/mcdp-0.3j.ebuild,v 1.1.1.1 2005/11/30 09:38:01 chriswhite Exp $
+
+inherit eutils toolchain-funcs
 
 DESCRIPTION="A very small console cd player"
 HOMEPAGE="http://www.mcmilk.de/projects/mcdp/"
 SRC_URI="http://www.mcmilk.de/projects/mcdp/dl/${P}.tar.gz"
 
-SLOT="0"
-KEYWORDS="~x86"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc sparc x86"
+IUSE=""
 
-DEPEND="dev-libs/dietlibc"
+DEPEND=""
+RDEPEND=""
 
-src_unpack()
-{
-	unpack ${P}.tar.gz
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-dietlibc-fix.patch
 }
 
-src_compile()
-{
-	cd ${P}
-	make || die
+src_compile() {
+	emake CC="$(tc-getCC)" || die
 }
 
-src_install() 
-{
-	DESTDIR=${D}	
+src_install() {
 	dobin mcdp || die
 	doman mcdp.1 || die
-}
-
 
+	cd doc
+	dodoc CHANGES README THANKS profile.sh
+}
diff --git a/media-sound/metadata.xml b/media-sound/metadata.xml
index 0eda150def6c..aa8073e8c261 100644
--- a/media-sound/metadata.xml
+++ b/media-sound/metadata.xml
@@ -4,5 +4,29 @@
 	<longdescription lang="en">
 		The media-sound category contains sound, music and audio applications.
 	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie media-sound enthält verschiedenste Audio-Applikationen.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría media-sound contiene aplicaciones de sonido, música y
+		audio.
+	</longdescription>
+	<longdescription lang="ja">
+		media-soundカテゴリーにはサウンドやミュージックやオーデイオの
+		アプリケーションが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De media-sound categorie bevat applicaties voor geluid en muziek.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm media-sound chứa các ứng dụng liên quan đến âm thanh, nhạc, tiếng nói.
+	</longdescription>
+	<longdescription lang="sk">
+		Kategória media-sound obsahuje aplikácie pre prácu so zvukom a hudbou.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria media-sound contiene applicazioni per suono, musica e
+		audio.
+	</longdescription>
 </catmetadata>
 
diff --git a/media-sound/meterbridge/ChangeLog b/media-sound/meterbridge/ChangeLog
index 52716888844b..70869e9872cf 100644
--- a/media-sound/meterbridge/ChangeLog
+++ b/media-sound/meterbridge/ChangeLog
@@ -1,6 +1,40 @@
 # ChangeLog for media-sound/meterbridge
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/meterbridge/ChangeLog,v 1.1 2003/05/28 12:35:32 jje Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/meterbridge/ChangeLog,v 1.1.1.1 2005/11/30 09:38:44 chriswhite Exp $
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  meterbridge-0.9.2.ebuild:
+  Stable on ppc.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  meterbridge-0.9.2.ebuild:
+  Stable sparc.
+
+  23 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  meterbridge-0.9.2.ebuild:
+  Added to ~sparc
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  meterbridge-0.9.2.ebuild:
+  Stable amd64.
+
+  03 Jul 2004; David Holm <dholm@gentoo.org> meterbridge-0.9.2.ebuild:
+  Added to ~ppc.
+
+  13 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  meterbridge-0.9.0.ebuild, meterbridge-0.9.2.ebuild:
+  Getting rid of virtual/jack.
+
+  18 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> meterbridge-0.9.2.ebuild:
+  Adding amd64 keyword, closing #48172.
+
+*meterbridge-0.9.2 (09 Jun 2003)
+
+  09 Jun 2003; Torben Hohn <torbenh@gentoo.org> Manifest meterbridge-0.9.2.ebuild files/digest-meterbridge-0.9.2 :
+  Version bump
+
+  29 May 2003; jje <jje@gentoo.org> meterbridge-0.9.0.ebuild:
+  Fixed ebuild description.
 
 *meterbridge-0.9.0 (28 May 2003)
 
diff --git a/media-sound/meterbridge/Manifest b/media-sound/meterbridge/Manifest
index d6a15addba46..31150941671d 100644
--- a/media-sound/meterbridge/Manifest
+++ b/media-sound/meterbridge/Manifest
@@ -1,2 +1,6 @@
-MD5 1284dcb4d318ce8a093f687c1672b826 meterbridge-0.9.0.ebuild 497
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 bd9fc81e611531471bf14a09a15863ba ChangeLog 1348
+MD5 2985bdd294112beb7a2073b0f141c74f meterbridge-0.9.2.ebuild 621
+MD5 e133c0604d65895e1c861d93b96f5ac2 meterbridge-0.9.0.ebuild 646
 MD5 c50f792290721fb1e38d3eb3f55be86e files/digest-meterbridge-0.9.0 69
+MD5 5cb258c131d546109669030240fc59ab files/digest-meterbridge-0.9.2 69
diff --git a/media-sound/meterbridge/meterbridge-0.9.0.ebuild b/media-sound/meterbridge/meterbridge-0.9.0.ebuild
index 294082244cb9..ec49d8c92a4d 100644
--- a/media-sound/meterbridge/meterbridge-0.9.0.ebuild
+++ b/media-sound/meterbridge/meterbridge-0.9.0.ebuild
@@ -1,18 +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/media-sound/meterbridge/meterbridge-0.9.0.ebuild,v 1.1 2003/05/28 12:35:32 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/meterbridge/meterbridge-0.9.0.ebuild,v 1.1.1.1 2005/11/30 09:38:44 chriswhite Exp $
 
-DESCRIPTION="This is a sample skeleton ebuild file"
+DESCRIPTION="Software meterbridge for the UNIX based JACK audio system."
 HOMEPAGE="http://plugin.org.uk/meterbridge/"
 SRC_URI="http://plugin.org.uk/meterbridge/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 IUSE=""
 
-DEPEND="virtual/jack \
+DEPEND="media-sound/jack-audio-connection-kit \
 	media-libs/sdl-image"
 
 src_compile() {
diff --git a/media-sound/meterbridge/meterbridge-0.9.2.ebuild b/media-sound/meterbridge/meterbridge-0.9.2.ebuild
index 7c71f5fb9bff..feefe8fc8901 100644
--- a/media-sound/meterbridge/meterbridge-0.9.2.ebuild
+++ b/media-sound/meterbridge/meterbridge-0.9.2.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/media-sound/meterbridge/meterbridge-0.9.2.ebuild,v 1.1 2003/06/09 16:29:44 torbenh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/meterbridge/meterbridge-0.9.2.ebuild,v 1.1.1.1 2005/11/30 09:38:44 chriswhite Exp $
+
+IUSE=""
 
 DESCRIPTION="Software meterbridge for the UNIX based JACK audio system."
 HOMEPAGE="http://plugin.org.uk/meterbridge/"
@@ -8,19 +10,12 @@ SRC_URI="http://plugin.org.uk/meterbridge/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-
-IUSE=""
+KEYWORDS="amd64 ppc sparc x86"
 
-DEPEND="virtual/jack \
+DEPEND="media-sound/jack-audio-connection-kit
 	media-libs/sdl-image"
 
-src_compile() {
-	econf || die
-	emake || die
-}
-
 src_install() {
-	make DESTDIR=${D} install || die
-	#einstall || die
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog
 }
diff --git a/media-sound/mhwaveedit/ChangeLog b/media-sound/mhwaveedit/ChangeLog
index 0e7f205afc17..820bbf1f464d 100644
--- a/media-sound/mhwaveedit/ChangeLog
+++ b/media-sound/mhwaveedit/ChangeLog
@@ -1,6 +1,57 @@
 # ChangeLog for media-sound/mhwaveedit
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mhwaveedit/ChangeLog,v 1.1 2003/05/12 19:35:30 avenj Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mhwaveedit/ChangeLog,v 1.1.1.1 2005/11/30 09:37:52 chriswhite Exp $
+
+  25 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  mhwaveedit-1.4.5b.ebuild:
+  Stable on sparc
+
+  21 Oct 2005; MATSUU Takuto <matsuu@gentoo.org> mhwaveedit-1.4.5b.ebuild:
+  Stable on x86.
+
+*mhwaveedit-1.4.5b (08 Oct 2005)
+
+  08 Oct 2005; MATSUU Takuto <matsuu@gentoo.org> +mhwaveedit-1.4.5b.ebuild:
+  Version bumped. Bug 108372.
+  Added some USE flag.
+
+  14 Jul 2005; David Holm <dholm@gentoo.org> mhwaveedit-1.4.1.ebuild:
+  Added to ~ppc.
+
+*mhwaveedit-1.4.1 (13 Jul 2005)
+
+  13 Jul 2005; Jonathan Smith <smithj@gentoo.org> metadata.xml,
+  -mhwaveedit-1.2.1.ebuild, -mhwaveedit-1.2.3.ebuild,
+  +mhwaveedit-1.4.1.ebuild:
+  #93680: version bump even though upstream seems dead
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mhwaveedit-1.3.3.ebuild:
+  Stable amd64, sparc, x86.
+
+  13 Dec 2004; Aron Griffis <agriffis@gentoo.org> mhwaveedit-1.3.3.ebuild:
+  mhwaveedit-1.3.3 doesn't build with libsndfile-1.0.4: undefined reference to
+  `sf_open_fd'. Increase dep to >=libsndfile-1.0.10
+
+  23 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mhwaveedit-1.3.3.ebuild:
+  Added to ~amd64 and ~sparc.
+
+*mhwaveedit-1.3.3 (22 Oct 2004)
+
+  22 Oct 2004; Jon Hood <squinky86@gentoo.org> +files/1.2.3-gcc34.patch,
+  mhwaveedit-1.2.3.ebuild, +mhwaveedit-1.3.3.ebuild:
+  Added gcc-3.4 fix, #68158; version bump.
+
+  03 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> metadata.xml,
+  mhwaveedit-1.2.1.ebuild, mhwaveedit-1.2.3.ebuild:
+  Switching to 'use_with' and 'use_enable' cor econf options. Fixes typo-bug
+  #40213.
+
+*mhwaveedit-1.2.3 (22 Sep 2003)
+
+  22 Sep 2003; Markus Nigbur <pyrania@gentoo.org> mhwaveedit-1.2.3.ebuild:
+  version bump
 
 *mhwaveedit-1.2.1 (12 May 2003)
 
diff --git a/media-sound/mhwaveedit/Manifest b/media-sound/mhwaveedit/Manifest
index 4eb9c79bbab3..804c1697bc71 100644
--- a/media-sound/mhwaveedit/Manifest
+++ b/media-sound/mhwaveedit/Manifest
@@ -1,2 +1,18 @@
-MD5 9061065f17329094fba0e29c8f7f902a mhwaveedit-1.2.1.ebuild 850
-MD5 807f0008db82800a528b2e7aec8cdc4c files/digest-mhwaveedit-1.2.1 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 612220fac03cb84ed6a909dd28bb4154 mhwaveedit-1.3.3.ebuild 833
+MD5 8a6015332fe4653a9492dd82a1315123 mhwaveedit-1.4.1.ebuild 971
+MD5 028a17de520f0704e2a980bb61dbca52 ChangeLog 2059
+MD5 3d396644f49363450640af614648d74a metadata.xml 227
+MD5 9ed9eb675bffc045c4a3f14b67176bd5 mhwaveedit-1.4.5b.ebuild 1389
+MD5 7ca7e59ea083c20a28e0886347bcca9c files/digest-mhwaveedit-1.3.3 68
+MD5 0a8c9cc0089d3e4f69e46ebc925ba355 files/digest-mhwaveedit-1.4.1 69
+MD5 201a685f1b417668b3a46957a010d947 files/digest-mhwaveedit-1.4.5b 70
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDXkWIKRy60XGEcJIRAiLxAJ98Pe+B4EvZUn2yGNBPgU7mnYcmZgCeKmpo
+POEHogSIVcFvIPpTfsXuxok=
+=rVpc
+-----END PGP SIGNATURE-----
diff --git a/media-sound/mhwaveedit/metadata.xml b/media-sound/mhwaveedit/metadata.xml
index e1774e3d9ad7..43669bc20ca8 100644
--- a/media-sound/mhwaveedit/metadata.xml
+++ b/media-sound/mhwaveedit/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sound</herd>
+
+<!-- sound can't take care of this package, so it needs a home -->
+
 </pkgmetadata>
diff --git a/media-sound/mhwaveedit/mhwaveedit-1.3.3.ebuild b/media-sound/mhwaveedit/mhwaveedit-1.3.3.ebuild
index 0de47522e71c..27558e99bfcf 100644
--- a/media-sound/mhwaveedit/mhwaveedit-1.3.3.ebuild
+++ b/media-sound/mhwaveedit/mhwaveedit-1.3.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/media-sound/mhwaveedit/mhwaveedit-1.3.3.ebuild,v 1.1 2004/10/22 11:48:46 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mhwaveedit/mhwaveedit-1.3.3.ebuild,v 1.1.1.1 2005/11/30 09:37:52 chriswhite Exp $
 
 IUSE="gtk2 oss sdl"
 
@@ -10,12 +10,12 @@ HOMEPAGE="http://www.mtek.chalmers.se/~hjormagn/mhwaveedit.html"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="amd64 sparc x86"
 
 DEPEND="gtk2? ( >=x11-libs/gtk+-2.0.0 )
 	!gtk2? ( =x11-libs/gtk+-1.2* )
 	sdl? ( >=media-libs/libsdl-1.2.3 )
-	>=media-libs/libsndfile-1.0.1
+	>=media-libs/libsndfile-1.0.10
 	>=media-libs/portaudio-18"
 
 src_compile() {
@@ -25,6 +25,5 @@ src_compile() {
 
 src_install() {
 	einstall || die
-
-	dodoc COPYING ChangeLog AUTHORS README* NEWS BUGS
+	dodoc ChangeLog AUTHORS README* NEWS BUGS
 }
diff --git a/media-sound/mhwaveedit/mhwaveedit-1.4.1.ebuild b/media-sound/mhwaveedit/mhwaveedit-1.4.1.ebuild
index 94d7ca7ddf99..03ba1316cf9c 100644
--- a/media-sound/mhwaveedit/mhwaveedit-1.4.1.ebuild
+++ b/media-sound/mhwaveedit/mhwaveedit-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/media-sound/mhwaveedit/mhwaveedit-1.4.1.ebuild,v 1.1 2005/07/13 20:26:16 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mhwaveedit/mhwaveedit-1.4.1.ebuild,v 1.1.1.1 2005/11/30 09:37:52 chriswhite Exp $
 
 IUSE="gtk2 oss sdl"
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.mtek.chalmers.se/~hjormagn/mhwaveedit.html"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 DEPEND="gtk2? ( =x11-libs/gtk+-2* )
 	!gtk2? ( =x11-libs/gtk+-1.2* )
diff --git a/media-sound/mhwaveedit/mhwaveedit-1.4.5b.ebuild b/media-sound/mhwaveedit/mhwaveedit-1.4.5b.ebuild
index 6b8aaa46bd0d..a9a5758e2131 100644
--- a/media-sound/mhwaveedit/mhwaveedit-1.4.5b.ebuild
+++ b/media-sound/mhwaveedit/mhwaveedit-1.4.5b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mhwaveedit/mhwaveedit-1.4.5b.ebuild,v 1.1 2005/10/08 00:37:52 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mhwaveedit/mhwaveedit-1.4.5b.ebuild,v 1.1.1.1 2005/11/30 09:37:52 chriswhite Exp $
 
 IUSE="alsa arts esd jack ladspa libsamplerate nls oss portaudio sdl sndfile sox"
 
@@ -10,12 +10,12 @@ SRC_URI="http://download.gna.org/mhwaveedit/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc sparc x86"
 
 DEPEND=">=x11-libs/gtk+-2
 	sndfiile? ( >=media-libs/libsndfile-1.0.10 )
 	sdl? ( >=media-libs/libsdl-1.2.3 )
-	alsa? ( >=media-libs/alsa-lib )
+	alsa? ( media-libs/alsa-lib )
 	arts? ( >=kde-base/arts-3.4.1 )
 	portaudio? ( >=media-libs/portaudio-18 )
 	jack? ( >=media-sound/jack-audio-connection-kit-0.98.0 )
diff --git a/media-sound/mikmod/ChangeLog b/media-sound/mikmod/ChangeLog
index 5ad1dfb69356..cdbd76904f8e 100644
--- a/media-sound/mikmod/ChangeLog
+++ b/media-sound/mikmod/ChangeLog
@@ -1,10 +1,42 @@
 # ChangeLog for media-sound/mikmod
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mikmod/ChangeLog,v 1.1 2002/07/28 07:53:10 cybersystem Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mikmod/ChangeLog,v 1.1.1.1 2005/11/30 09:38:25 chriswhite Exp $
 
-*mikmod-3.1.6 (28 July 2002)
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> mikmod-3.2.1.ebuild:
+  Stable amd64, sparc.
 
-  28 July 2002; Sascha Schwabbauer <cybersystem@gentoo.org> ChangeLog, mikmod-3.1.6.ebuild, files/digest-mikmod-3.1.6 :
+  10 Jul 2004; Michael Hanselmann <hansmi@gentoo.org> mikmod-3.2.1.ebuild:
+  Added to ~ppc. Bug #51952.
+
+  06 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> mikmod-3.2.1.ebuild:
+  ~sparc
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> mikmod-3.1.6a.ebuild,
+  mikmod-3.2.1.ebuild:
+  Added IUSE.
+
+  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> mikmod-3.1.6a.ebuild,
+  mikmod-3.2.1.ebuild:
+  Stable on x86.  Ebuild cleanup.
+
+*mikmod-3.2.1 (28 Nov 2003)
+
+  28 Nov 2003; Daniel Ahlberg <aliz@gentoo.org> mikmod-3.2.1.ebuild:
+  Version bump
 
-  Initial version in Portage now..
+  23 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org> mikmod-3.1.6.ebuild,
+  mikmod-3.1.6a.ebuild:
+  fix HOMEPAGE (bug 34204)
 
+  21 Sep 2003; jje <jje@gentoo.org> mikmod-3.1.6a.ebuild:
+  SRC_URI update, now hosted on gentoo.
+
+*mikmod-3.1.6a (28 Jun 2003)
+
+  28 Jun 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Security update.
+
+*mikmod-3.1.6 (28 July 2002)
+
+  28 July 2002; Sascha Schwabbauer <cybersystem@gentoo.org> ChangeLog, mikmod-3.1.6.ebuild, files/digest-mikmod-3.1.6 :
+  Initial version in Portage now.
diff --git a/media-sound/mikmod/Manifest b/media-sound/mikmod/Manifest
index e69de29bb2d1..038ab34c7894 100644
--- a/media-sound/mikmod/Manifest
+++ b/media-sound/mikmod/Manifest
@@ -0,0 +1,7 @@
+MD5 103b795fb84298eaa891ed820e1826bc ChangeLog 1388
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 a79e90bf57de3659ab6b1b752b247a71 mikmod-3.1.6a.ebuild 777
+MD5 b54f92b8c1d676f0075a6f4b5bb4b898 mikmod-3.2.1.ebuild 560
+MD5 3691ea094d354f67619abf35f5c69d98 files/digest-mikmod-3.1.6a 128
+MD5 5a79f789225e07ce736e284ecc3d989a files/digest-mikmod-3.2.1 64
+MD5 4543887d2f464e8562d5f5969c80fd6c files/mikmod-3.1.6-security.patch 2314
diff --git a/media-sound/mikmod/mikmod-3.1.6a.ebuild b/media-sound/mikmod/mikmod-3.1.6a.ebuild
index 1b3a80bf5d36..a30d0ef010bc 100644
--- a/media-sound/mikmod/mikmod-3.1.6a.ebuild
+++ b/media-sound/mikmod/mikmod-3.1.6a.ebuild
@@ -1,19 +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/media-sound/mikmod/mikmod-3.1.6a.ebuild,v 1.1 2003/06/28 21:15:02 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mikmod/mikmod-3.1.6a.ebuild,v 1.1.1.1 2005/11/30 09:38:25 chriswhite Exp $
+
+IUSE=""
+
+inherit eutils
 
 MY_P=${PN}-${PV/a}
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="MikMod is a console MOD-Player based on libmikmod"
-HOMEPAGE="http://www.mikmod.org/"
-LICENSE="GPL-2"
-SRC_URI="http://www.mikmod.org/files/mikmod/${MY_P}.tar.gz
-	http://www.mikmod.org/files/patches/patch-${MY_P}-a"
-S=${WORKDIR}/${PN}-${PV/a}
+HOMEPAGE="http://mikmod.raphnet.net/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz
+	mirror://gentoo/patch-${MY_P}-a"
 
-DEPEND=">=media-libs/libmikmod-3.1.5"
 SLOT="0"
+LICENSE="GPL-2"
 KEYWORDS="x86"
 
+DEPEND=">=media-libs/libmikmod-3.1.5"
+
 src_unpack() {
 	unpack ${MY_P}.tar.gz ; cd ${S}
 	epatch ${DISTDIR}/patch-${MY_P}-a
@@ -22,7 +27,7 @@ src_unpack() {
 
 src_compile() {
 	econf || die
-        	
+
 	emake || die
 }
 
diff --git a/media-sound/mikmod/mikmod-3.2.1.ebuild b/media-sound/mikmod/mikmod-3.2.1.ebuild
index b57a6de4dd91..d8e2fc69380a 100644
--- a/media-sound/mikmod/mikmod-3.2.1.ebuild
+++ b/media-sound/mikmod/mikmod-3.2.1.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/media-sound/mikmod/mikmod-3.2.1.ebuild,v 1.1 2003/11/28 13:48:47 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mikmod/mikmod-3.2.1.ebuild,v 1.1.1.1 2005/11/30 09:38:25 chriswhite Exp $
+
+IUSE=""
 
-S=${WORKDIR}/${P}
 DESCRIPTION="MikMod is a console MOD-Player based on libmikmod"
 HOMEPAGE="http://mikmod.raphnet.net/"
 SRC_URI="http://mikmod.raphnet.net/files/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64 sparc ~ppc"
 
 DEPEND=">=media-libs/libmikmod-3.1.5"
 
 src_install () {
 	make DESTDIR=${D} install || die
-	dodoc README NEWS 
+	dodoc README NEWS
 }
-
diff --git a/media-sound/mimd/ChangeLog b/media-sound/mimd/ChangeLog
index 98342ca145eb..1c21b63a824d 100644
--- a/media-sound/mimd/ChangeLog
+++ b/media-sound/mimd/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for media-sound/mimd
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mimd/ChangeLog,v 1.1 2005/01/18 23:39:52 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mimd/ChangeLog,v 1.1.1.1 2005/11/30 09:38:33 chriswhite Exp $
 
 *mimd-0.30.1 (19 Jan 2005)
 
diff --git a/media-sound/mimd/Manifest b/media-sound/mimd/Manifest
index 79b250ee2812..fe1c8cb379db 100644
--- a/media-sound/mimd/Manifest
+++ b/media-sound/mimd/Manifest
@@ -1,4 +1,14 @@
-MD5 a257753f49226335d49da50bc84b68bd mimd-0.30.1.ebuild 1376
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 be2ee9f7c3673757152fe69b122f0dc9 mimd-0.30.1.ebuild 1474
+MD5 4d8c570a08400dd08870a2ef604913ce ChangeLog 424
 MD5 4e5a50f7aee667b932576ab7fdcfc85f metadata.xml 219
-MD5 9ba6fa299a9871a277829dd6eecd97af ChangeLog 332
 MD5 c7bbbe3d74e59b00c50be012c04f184f files/digest-mimd-0.30.1 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCO3xlI1lqEGTUzyQRAtBqAKDW40OBD/XNV81LcOSJB6awnRYaAACfcnFH
+dWlo9hzBxH6gsmWN9U5RsIc=
+=0lsW
+-----END PGP SIGNATURE-----
diff --git a/media-sound/mimd/mimd-0.30.1.ebuild b/media-sound/mimd/mimd-0.30.1.ebuild
index 93fea182a004..5534e46ce98d 100644
--- a/media-sound/mimd/mimd-0.30.1.ebuild
+++ b/media-sound/mimd/mimd-0.30.1.ebuild
@@ -1,6 +1,6 @@
-# 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/media-sound/mimd/mimd-0.30.1.ebuild,v 1.1 2005/01/18 23:39:52 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mimd/mimd-0.30.1.ebuild,v 1.1.1.1 2005/11/30 09:38:33 chriswhite Exp $
 
 DESCRIPTION="Multicast streaming server for MPEG1/2 and MP3 files."
 
diff --git a/media-sound/mixxx/ChangeLog b/media-sound/mixxx/ChangeLog
index 7414cea9a03b..9320b5c2348c 100644
--- a/media-sound/mixxx/ChangeLog
+++ b/media-sound/mixxx/ChangeLog
@@ -1,7 +1,125 @@
 # ChangeLog for media-sound/mixxx
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/ChangeLog,v 1.1 2002/10/14 11:32:14 verwilst Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/ChangeLog,v 1.1.1.1 2005/11/30 09:37:51 chriswhite Exp $
 
-*mixxx-0.9.1 (14 Okt 2002) Bart Verwilst <verwilst@gentoo.org>
+  25 Jul 2005; Caleb Tennis <caleb@gentoo.org> mixxx-1.2.1.ebuild,
+  mixxx-1.4.1.ebuild, mixxx-1.4.2.ebuild:
+  Fix qt dep per bug #100235
+
+  11 May 2005; David Holm <dholm@gentoo.org> mixxx-1.4.2.ebuild:
+  Added to ~ppc.
+
+  19 Dec 2004; Eldad Zack <eldad@gentoo.org> mixxx-1.4.2.ebuild:
+  Fixed configure options for jack and alsa.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> mixxx-1.4.2.ebuild:
+  Stable sparc, x86.
+
+*mixxx-1.4.2 (16 Nov 2004)
+
+  16 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +mixxx-1.4.2.ebuild:
+  Version bump.
+
+  19 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -mixxx-1.3.2.ebuild, -mixxx-1.4.ebuild:
+  Removing old versions.
+
+*mixxx-1.4.1 (19 Oct 2004)
+
+  19 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +mixxx-1.4.1.ebuild:
+  Version bump to close bug #67919.
+
+*mixxx-1.4 (13 Oct 2004)
+
+  13 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> +mixxx-1.4.ebuild:
+  Version bump for gcc-3.4 fixes.  Closes bug #67366.  -amd64
+
+*mixxx-1.3.2 (08 Oct 2004)
+
+  08 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/mixxx-1.3.2-gentoo.patch, -files/mixxx-fixINSTALL.patch,
+  -mixxx-0.9.2.ebuild, -mixxx-1.1-r1.ebuild, -mixxx-1.1.ebuild,
+  +mixxx-1.3.2.ebuild:
+  Version bump and cleanup.  Added to ~sparc.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> mixxx-0.9.2.ebuild,
+  mixxx-1.1-r1.ebuild, mixxx-1.1.ebuild, mixxx-1.2.1.ebuild:
+  virtual/glibc -> virtual/libc
+
+  13 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org> mixxx-1.2.1.ebuild:
+  Getting rid of virtual/jack.
+
+  03 May 2004; Jeremy Huddleston <eradicator@gentoo.org> mixxx-0.9.2.ebuild,
+  mixxx-1.1-r1.ebuild, mixxx-1.1.ebuild, mixxx-1.2.1.ebuild:
+  Changing mad dep to madplay.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> mixxx-0.9.2.ebuild,
+  mixxx-1.1-r1.ebuild, mixxx-1.1.ebuild:
+  Added IUSE.
+
+  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> mixxx-1.2.1.ebuild:
+  Stable on x86.
+
+*mixxx-1.2.1 (27 Jan 2004)
+
+  27 Jan 2004; Nick Hadaway <raker@gentoo.org> mixxx-1.2.1.ebuild:
+  Version bump.  Some ebuild changes contributed by Mike Verdone on bug
+  #28548.  Added some of my own changes as well.
+
+*mixxx-1.1-r1 (29 Dec 2003)
+
+  29 Dec 2003; Wout Mertens <wmertens@gentoo.org> mixxx-1.1-r1.ebuild:
+  g++ now also has cflags (bad spacing in sed call). Bumping revision so
+  people can rebuild.
+  
+  19 Dec 2003; Martin Holzer <mholzer@gentoo.org> mixxx-1.1.ebuild:
+  now uses cflags. closes 36092
+
+  18 Dec 2003; Martin Holzer <mholzer@gentoo.org> mixxx-0.9.1.ebuild,
+  mixxx-0.9.2.ebuild, mixxx-1.0.ebuild, mixxx-1.1.ebuild:
+  correcting header + adding RESTRICT=nomirror
+
+*mixxx-1.1 (18 Dec 2003)
+
+  18 Dec 2003; Martin Holzer <mholzer@gentoo.org> mixxx-1.1.ebuild:
+  Version bumped.
+
+*mixxx-1.1 (24 Dec 2003)
+
+  24 Dec 2003; Wout Mertens <wmertens@gentoo.org> mixxx-1.1.ebuild:
+  Version bump
+
+  30 Sep 2003; jje <jje@gentoo.org> mixxx-1.0.ebuild:
+  Fixed fftw depend - needs 2.1.5.
+
+*mixxx-1.0 (28 Sep 2003)
+
+  28 Sep 2003; jje <jje@gentoo.org> mixxx-1.0.ebuild,
+  files/mixxx-fixINSTALL.patch:
+  Version bump.
+  
+  Submitted by: Rossen Apostolov <rossen@protein.osaka-u.ac.jp>
+
+  19 Jul 2003; Nick Hadaway <raker@gentoo.org> :
+  Reverted back to 0.9.2
+
+*mixxx-0.9.2-r1 (17 Jul 2003)
+
+  17 Jul 2003; Nick Hadaway <raker@gentoo.org> mixxx-0.9.2-r1.ebuild:
+  Moved from media-sound/mad to media-libs/{libmad,libid3tag}
+
+*mixxx-0.9.2 (12 Apr 2003)
+
+  12 Apr 2003; jje <jje@gentoo.org> mixxx-0.9.2.ebuild:
+  Version bump to fix #18081.
+
+*mixxx-0.9.1 (14 Oct 2002) 
 
   Initial import. Ebuild by Tue Haste Andersen <haste@diku.dk>. 
+ 
+  26 Okt 2002, Bart Verwilst <verwilst@gentoo.org>
+
+  Added to stable tree (removed ~).
+
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 246793092772..edf47cc6f966 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,5 +1,10 @@
-MD5 b7dac29138714f353e45bb405a2bfed2 ChangeLog 553
-MD5 55e2c9062ad1ba5ad6f528ad92aca5c4 mixxx-0.9.1.ebuild 698
-MD5 9e15a878deadfdf5fae406a2be2c9037 mixxx-0.9.2.ebuild 722
-MD5 7070a236d2f7c217c751a35c5a234065 files/digest-mixxx-0.9.1 63
-MD5 940b03d92d814ef3ab091d118fe837d6 files/digest-mixxx-0.9.2 63
+MD5 42b38ad91f48abaee56a479dbd9bac19 mixxx-1.2.1.ebuild 1490
+MD5 1ec99256c93cf572fa331e0d0caed42f mixxx-1.4.2.ebuild 1438
+MD5 66057fe9c210feb358a22f8cc29a61d8 mixxx-1.4.1.ebuild 1445
+MD5 09f32a099835defb0821676985c429f1 ChangeLog 3902
+MD5 d0d7ea03e238a808414b4426394c100f metadata.xml 221
+MD5 e7c3a488b82537d2e1912239a42453c0 files/mixxx.pro 13666
+MD5 f3543ce61c9d39860076bad6d555d3bb files/digest-mixxx-1.2.1 64
+MD5 f25d0518f6fa31ce0950ba6960246f49 files/digest-mixxx-1.4.1 64
+MD5 a17a2d5788ac463f0c92292648430f77 files/digest-mixxx-1.4.2 64
+MD5 5794a39e6d1cd6f615c7c853b050f19d files/mixxx-1.3.2-gentoo.patch 3606
diff --git a/media-sound/mixxx/mixxx-1.2.1.ebuild b/media-sound/mixxx/mixxx-1.2.1.ebuild
index 9682b601f103..4d3f159930ca 100644
--- a/media-sound/mixxx/mixxx-1.2.1.ebuild
+++ b/media-sound/mixxx/mixxx-1.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/media-sound/mixxx/mixxx-1.2.1.ebuild,v 1.1 2004/01/28 04:30:19 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.2.1.ebuild,v 1.1.1.1 2005/11/30 09:37:51 chriswhite Exp $
+
+inherit qt3
 
 IUSE="jack"
 
@@ -10,18 +12,18 @@ SRC_URI="mirror://sourceforge/mixxx/${P}.tar.gz"
 RESTRICT="nomirror"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 SLOT="0"
 
-DEPEND="virtual/glibc
-	>=x11-libs/qt-3.1.0
-	media-sound/mad
-	=dev-libs/fftw-2*
+DEPEND="virtual/libc
+	$(qt_min_version 3.1)
+	media-sound/madplay
+	=sci-libs/fftw-2*
 	media-libs/libogg
 	media-libs/libvorbis
 	dev-lang/perl
 	media-libs/audiofile
-	jack? ( virtual/jack )"
+	jack? ( media-sound/jack-audio-connection-kit )"
 
 src_compile() {
 	cd ${S}/src
@@ -35,7 +37,7 @@ INSTALL_ROOT=${D}
 " Makefile
 	sed -i -e 's/COPY_FILE= \$\(COPY\) -p/COPY_FILE= $(COPY) -pr/' Makefile
 
-	addpredict  /usr/qt/3/etc/settings
+	addpredict  ${QTDIR}/etc/settings
 
 	make || die
 }
@@ -45,9 +47,9 @@ src_install() {
 
 	make install || die
 
-	einfo ""
+	einfo
 	einfo "Fixing permissions..."
-	einfo ""
+	einfo
 
 	chmod 644 ${D}/usr/share/doc/${PF}/*
 	chmod 644 ${D}/usr/share/mixxx/midi/*
diff --git a/media-sound/mixxx/mixxx-1.4.1.ebuild b/media-sound/mixxx/mixxx-1.4.1.ebuild
index c5ac4b8c583e..8c632999a3b4 100644
--- a/media-sound/mixxx/mixxx-1.4.1.ebuild
+++ b/media-sound/mixxx/mixxx-1.4.1.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/media-sound/mixxx/mixxx-1.4.1.ebuild,v 1.1 2004/10/20 04:01:17 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.4.1.ebuild,v 1.1.1.1 2005/11/30 09:37:51 chriswhite Exp $
 
 IUSE="alsa jack"
 
-inherit eutils
+inherit eutils qt3
 
 S="${WORKDIR}/${P}/src"
 
@@ -17,7 +17,7 @@ SLOT="0"
 # -amd64: 1.4.1 - static noise comes out of speakers at startup - eradicator
 KEYWORDS="-amd64 ~sparc ~x86"
 
-DEPEND=">=x11-libs/qt-3.1.0
+DEPEND="$(qt_min_version 3.1)
 	media-sound/madplay
 	media-libs/libogg
 	media-libs/libvorbis
diff --git a/media-sound/mixxx/mixxx-1.4.2.ebuild b/media-sound/mixxx/mixxx-1.4.2.ebuild
index 59c4f309efeb..9f884508c598 100644
--- a/media-sound/mixxx/mixxx-1.4.2.ebuild
+++ b/media-sound/mixxx/mixxx-1.4.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/media-sound/mixxx/mixxx-1.4.2.ebuild,v 1.1 2004/11/17 05:37:38 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.4.2.ebuild,v 1.1.1.1 2005/11/30 09:37:51 chriswhite Exp $
 
 IUSE="alsa jack"
 
-inherit eutils
+inherit eutils qt3
 
 S="${WORKDIR}/${P}/src"
 
@@ -15,9 +15,9 @@ SRC_URI="mirror://sourceforge/mixxx/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 # -amd64: 1.4.2 - static noise comes out of speakers at startup - eradicator
-KEYWORDS="-amd64 ~sparc ~x86"
+KEYWORDS="-amd64 sparc x86 ~ppc"
 
-DEPEND=">=x11-libs/qt-3.1.0
+DEPEND="$(qt_min_version 3.1)
 	media-sound/madplay
 	media-libs/libogg
 	media-libs/libvorbis
@@ -42,7 +42,7 @@ src_unpack() {
 }
 
 src_compile() {
-	./configure `use_enable alsa Alsa` `use_enable jack Jack` || die "configure failed"
+	./configure `use_enable alsa` `use_enable jack` || die "configure failed"
 
 	sed -i -e "s/CFLAGS *= -pipe -w -O2/CFLAGS   = ${CFLAGS} -w/" \
 	       -e "s/CXXFLAGS *= -pipe -w -O2/CXXFLAGS   = ${CXXFLAGS} -w/" Makefile
diff --git a/media-sound/moc/ChangeLog b/media-sound/moc/ChangeLog
index fe8b237a1a8f..34e3c9bc7a45 100644
--- a/media-sound/moc/ChangeLog
+++ b/media-sound/moc/ChangeLog
@@ -1,6 +1,65 @@
 # ChangeLog for media-sound/moc
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/ChangeLog,v 1.1 2003/06/26 15:21:29 robh Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/ChangeLog,v 1.1.1.1 2005/11/30 09:38:29 chriswhite Exp $
+
+  14 Jul 2005; David Holm <dholm@gentoo.org> moc-2.3.0.ebuild:
+  Added to ~ppc.
+
+*moc-2.3.0 (13 Jul 2005)
+
+  13 Jul 2005; Jonathan Smith <smithj@gentoo.org> +moc-2.3.0.ebuild:
+  #98736: version bump
+
+*moc-2.2.0-r1 (18 Apr 2005)
+
+  18 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -files/moc-1.1.0-gcc3.patch, -files/moc-1.1.0-gcc34.patch,
+  -moc-1.1.0.ebuild, +moc-2.1.4-r1.ebuild, -moc-2.1.4.ebuild,
+  +moc-2.2.0-r1.ebuild, -moc-2.2.0.ebuild:
+  neither a binary nor a symlink named moc gets installed any longer, fixes bug
+  #76702. also did some cleanup and moved oggvorbis useflag to vorbis, oggvorbis
+  is deprecated.
+
+  29 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> moc-2.2.0.ebuild:
+  introduced support for the flac useflag, fixes #86226
+
+*moc-2.2.0 (27 Feb 2005)
+
+  27 Feb 2005; Karol Wojtaszek <sekretarz@gentoo.org> +moc-2.2.0.ebuild:
+  Version bump, bug #83402
+
+*moc-2.1.4 (21 Jan 2005)
+
+  21 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> +moc-2.1.4.ebuild:
+  new version released. fixes #76588.
+
+  11 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org> moc-1.1.0.ebuild:
+  Added media-libs/libid3tag to depend to fix bug #74533. Thanks go to Pinky
+  <master_up@post.cz> for the fix.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> moc-1.1.0.ebuild:
+  Stable amd64, x86.
+
+  23 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> moc-1.1.0.ebuild:
+  Added to ~sparc.
+
+  16 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/moc-1.1.0-gcc34.patch, moc-1.1.0.ebuild:
+  Ebuild cleanup. Added gcc-3.4 fix thanks to James
+  <James@superbug.demon.co.uk> in bug #71139. Added to ~amd64.
+
+  24 Sep 2004; Sven Wegener <swegener@gentoo.org> moc-1.1.0.ebuild:
+  Fixed CVS keyword replacement.
+
+  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> moc-1.1.0.ebuild:
+  Stable x86.  Added inherit eutils and removed explicit S=.
+
+  28 Oct 2003; Martin Holzer <mholzer@gentoo.org> moc-1.1.0.ebuild:
+  more config through IUSE. Closes #31568.
+
+  19 Oct 2003; Martin Holzer <mholzer@gentoo.org> moc-1.1.0.ebuild,
+  files/moc-1.1.0-gcc3.patch:
+  Adding gcc3 patch. Closes #31399.
 
 *moc-1.1.0 (26 Jun 2003)
 
diff --git a/media-sound/moc/Manifest b/media-sound/moc/Manifest
index 58ea2e50553e..37e7e685e7eb 100644
--- a/media-sound/moc/Manifest
+++ b/media-sound/moc/Manifest
@@ -1,2 +1,18 @@
-MD5 22dcf20ad3c5496716bd248cea45e633 moc-1.1.0.ebuild 624
-MD5 a90f9e3223b6e3cb5a0bf42b862d130e files/digest-moc-1.1.0 61
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1d04660d81ce79bde16fdeb59d181d43 ChangeLog 2451
+MD5 986d4f67476a2c02f6ca1b20e7c57c0b files/digest-moc-2.1.4-r1 61
+MD5 285908314a37f1af4c045d98d60a1e0d files/digest-moc-2.2.0-r1 61
+MD5 397ca78b313594b61d6b090a5c9e7fd0 files/digest-moc-2.3.0 62
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 48cea70afc23ce66ecfdf65f749fd08f moc-2.1.4-r1.ebuild 1097
+MD5 2b58a49dbe642ee3cee6254157ac2c5f moc-2.2.0-r1.ebuild 1201
+MD5 67bdf1e18ab8094ed9524b8ad9c580fc moc-2.3.0.ebuild 1225
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDSTQsI1lqEGTUzyQRAicHAJ0ZjKcUwPGwPdXuINWWzEQ5ozoCrgCbB8Y+
+majRuoIR7VeciqAm/kHrKds=
+=sbAQ
+-----END PGP SIGNATURE-----
diff --git a/media-sound/moc/moc-2.1.4-r1.ebuild b/media-sound/moc/moc-2.1.4-r1.ebuild
index 1971b3e308f2..ec86de2d5798 100644
--- a/media-sound/moc/moc-2.1.4-r1.ebuild
+++ b/media-sound/moc/moc-2.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/media-sound/moc/moc-2.1.4-r1.ebuild,v 1.1 2005/04/18 19:13:29 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/moc-2.1.4-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:29 chriswhite Exp $
 
 IUSE="vorbis mad oss"
 
diff --git a/media-sound/moc/moc-2.2.0-r1.ebuild b/media-sound/moc/moc-2.2.0-r1.ebuild
index 19e8bf59e963..fed841e5f99d 100644
--- a/media-sound/moc/moc-2.2.0-r1.ebuild
+++ b/media-sound/moc/moc-2.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/media-sound/moc/moc-2.2.0-r1.ebuild,v 1.1 2005/04/18 19:13:29 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/moc-2.2.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:29 chriswhite Exp $
 
 inherit eutils
 
diff --git a/media-sound/moc/moc-2.3.0.ebuild b/media-sound/moc/moc-2.3.0.ebuild
index 7a06e2e66e9e..93bb285cc1f6 100644
--- a/media-sound/moc/moc-2.3.0.ebuild
+++ b/media-sound/moc/moc-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/media-sound/moc/moc-2.3.0.ebuild,v 1.1 2005/07/13 17:58:55 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/moc-2.3.0.ebuild,v 1.1.1.1 2005/11/30 09:38:30 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.daper.net/pub/soft/${PN}/stable/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="flac mad oss vorbis"
 
 DEPEND="media-libs/libao
diff --git a/media-sound/modplugplay/ChangeLog b/media-sound/modplugplay/ChangeLog
index 2a9ee3ef7555..c9ae4f84e97a 100644
--- a/media-sound/modplugplay/ChangeLog
+++ b/media-sound/modplugplay/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/modplugplay
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/modplugplay/ChangeLog,v 1.1 2004/11/11 22:28:14 eradicator Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/modplugplay/ChangeLog,v 1.1.1.1 2005/11/30 09:37:51 chriswhite Exp $
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> modplugplay-1.0.ebuild:
+  Added to ~ppc.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  modplugplay-1.0.ebuild:
+  Stable amd64, x86.
 
 *modplugplay-1.0 (11 Nov 2004)
 
diff --git a/media-sound/modplugplay/Manifest b/media-sound/modplugplay/Manifest
index d5f0f92437ac..689212e163f8 100644
--- a/media-sound/modplugplay/Manifest
+++ b/media-sound/modplugplay/Manifest
@@ -1,3 +1,4 @@
+MD5 b95e889c6fd75151921f9f30e60ab610 ChangeLog 575
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 8230064b797dcd1e7f484ac84e90fe73 modplugplay-1.0.ebuild 579
+MD5 08a5b79dc6d48dc328f3664d7a3fd2f6 modplugplay-1.0.ebuild 802
 MD5 53bae16c517e3a8b9b5a3ca824f5c7df files/digest-modplugplay-1.0 66
diff --git a/media-sound/modplugplay/modplugplay-1.0.ebuild b/media-sound/modplugplay/modplugplay-1.0.ebuild
index 75dd83adc85c..00fe731f06d9 100644
--- a/media-sound/modplugplay/modplugplay-1.0.ebuild
+++ b/media-sound/modplugplay/modplugplay-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/media-sound/modplugplay/modplugplay-1.0.ebuild,v 1.1 2004/11/11 22:28:14 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/modplugplay/modplugplay-1.0.ebuild,v 1.1.1.1 2005/11/30 09:37:51 chriswhite Exp $
 
 IUSE=""
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.linuks.mine.nu/modplugplay/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 #-sparc: 1.0 - Bus Error on play
-KEYWORDS="~amd64 -sparc ~x86"
+KEYWORDS="amd64 ~ppc -sparc x86"
 
 RDEPEND=">=media-libs/libmodplug-0.7"
 DEPEND="${RDEPEND}
diff --git a/media-sound/moosic/ChangeLog b/media-sound/moosic/ChangeLog
index b68ec0a02969..b702f198f71d 100644
--- a/media-sound/moosic/ChangeLog
+++ b/media-sound/moosic/ChangeLog
@@ -1,6 +1,51 @@
 # ChangeLog for media-sound/moosic
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/moosic/ChangeLog,v 1.1 2003/03/15 09:02:32 jje Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/moosic/ChangeLog,v 1.1.1.1 2005/11/30 09:38:38 chriswhite Exp $
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> moosic-1.5.0.ebuild:
+  Stable amd64, sparc.
+
+  13 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> moosic-1.5.0.ebuild:
+  Added ~sparc ~amd64
+
+  06 May 2004; Jeremy Huddleston <eradicator@gentoo.org> moosic-1.5.0.ebuild:
+  Stable x86.
+
+  04 Apr 2004; David Holm <dholm@gentoo.org> moosic-1.5.0.ebuild:
+  Added to ~ppc.
+
+*moosic-1.5.0 (03 Apr 2004)
+
+  03 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> moosic-1.5.0.ebuild:
+  Version bump.  Closes bug #46712.
+
+  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> moosic-1.4.10.ebuild,
+  moosic-1.4.3.ebuild:
+  Version bump.
+
+*moosic-1.4.10 (01 Jan 2004)
+
+  01 Jan 2004; Martin Holzer <mholzer@gentoo.org> moosic-1.4.10.ebuild:
+  Version bumped. Closes 36681
+
+*moosic-1.4.3 (25 May 2003)
+
+  25 May 2003; jje <jje@gentoo.org> moosic-1.4.3.ebuild:
+  Version bump.
+  
+  Submitted by: Björn Lindström <bkhl@privat.utfors.se>
+
+*moosic-1.3.3 (12 Apr 2003)
+
+  12 Apr 2003; jje moosic-1.3.3.ebuild:
+  Version bump.
+
+  Submited by: Björn Lindström
+
+*moosic-1.3.2 (16 Mar 2003)
+
+  16 Mar 2003; jje <jje@gentoo.org> moosic-1.3.2.ebuild:
+  Version bump. Cleaner install.
 
 *moosic-1.3 (15 Mar 2003)
 
diff --git a/media-sound/moosic/Manifest b/media-sound/moosic/Manifest
index eb74a4a71748..29477b6c23a4 100644
--- a/media-sound/moosic/Manifest
+++ b/media-sound/moosic/Manifest
@@ -1,7 +1,8 @@
-MD5 fea0e2e47cd0044c24b16d80068393af moosic-1.3.ebuild 605
-MD5 3d58d15f7789a337b9569fd5da367ed8 ChangeLog 591
-MD5 67a123e51fa3bae9fa20ac7085d93262 moosic-1.3.2.ebuild 595
-MD5 274b56f59abc2b5526b674166424dca5 moosic-1.3.3.ebuild 556
-MD5 843bad51c6fe2b9a416489771a7dbfb5 files/digest-moosic-1.3 61
-MD5 13f734210bd60ac0f35a3e53ede8fc95 files/digest-moosic-1.3.3 63
-MD5 81b6fd9af38a20892262e5f897c782d8 files/digest-moosic-1.3.2 63
+MD5 a0d55d612abeaa02d9b3c0948fc40221 ChangeLog 1531
+MD5 527dcfe3ce0f0b53c6b6aa8b82eb930c metadata.xml 252
+MD5 32032ea8174c6b54124d9c7e634cd114 moosic-1.4.10.ebuild 599
+MD5 eb183fc13e74cc6dd1f85fc7a245c41d moosic-1.4.3.ebuild 598
+MD5 71ad6d6224b2c00977af0a76ba003435 moosic-1.5.0.ebuild 681
+MD5 2a2779a23d2afad669c3e4c92d851ec3 files/digest-moosic-1.4.10 65
+MD5 ef80e93bcecce0dc3fed7c80ff1e5516 files/digest-moosic-1.4.3 63
+MD5 6b21fbeec63b1fdeb8aa5f16dafb40ba files/digest-moosic-1.5.0 64
diff --git a/media-sound/moosic/moosic-1.4.10.ebuild b/media-sound/moosic/moosic-1.4.10.ebuild
index 2dd3dd46cc82..35aa5fb0a9ca 100644
--- a/media-sound/moosic/moosic-1.4.10.ebuild
+++ b/media-sound/moosic/moosic-1.4.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/media-sound/moosic/moosic-1.4.10.ebuild,v 1.1 2004/01/01 16:02:30 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/moosic/moosic-1.4.10.ebuild,v 1.1.1.1 2005/11/30 09:38:38 chriswhite Exp $
 
 DESCRIPTION="Moosic is a music player that focuses on easy playlist management"
 HOMEPAGE="http://www.nanoo.org/~daniel/moosic/"
@@ -8,10 +8,9 @@ SRC_URI="http://www.nanoo.org/~daniel/moosic/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 DEPEND="virtual/python"
-S=${WORKDIR}/${P}
 
 src_install() {
 	make install INSTALL_PREFIX=$D/usr
diff --git a/media-sound/moosic/moosic-1.4.3.ebuild b/media-sound/moosic/moosic-1.4.3.ebuild
index 486c98879a9b..99231a19abaf 100644
--- a/media-sound/moosic/moosic-1.4.3.ebuild
+++ b/media-sound/moosic/moosic-1.4.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/media-sound/moosic/moosic-1.4.3.ebuild,v 1.1 2003/05/25 13:45:47 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/moosic/moosic-1.4.3.ebuild,v 1.1.1.1 2005/11/30 09:38:38 chriswhite Exp $
 
 DESCRIPTION="Moosic is a music player that focuses on easy playlist management"
 HOMEPAGE="http://www.nanoo.org/~daniel/moosic/"
@@ -8,10 +8,9 @@ SRC_URI="http://www.nanoo.org/~daniel/moosic/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 DEPEND="virtual/python"
-S=${WORKDIR}/${P}
 
 src_install() {
 	make install INSTALL_PREFIX=$D/usr
diff --git a/media-sound/moosic/moosic-1.5.0.ebuild b/media-sound/moosic/moosic-1.5.0.ebuild
index 67aafa8d6e8f..fd80fd458fb4 100644
--- a/media-sound/moosic/moosic-1.5.0.ebuild
+++ b/media-sound/moosic/moosic-1.5.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/media-sound/moosic/moosic-1.5.0.ebuild,v 1.1 2004/04/04 00:10:29 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/moosic/moosic-1.5.0.ebuild,v 1.1.1.1 2005/11/30 09:38:38 chriswhite Exp $
 
 DESCRIPTION="Moosic is a music player that focuses on easy playlist management"
 HOMEPAGE="http://www.nanoo.org/~daniel/moosic/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.nanoo.org/~daniel/moosic/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc sparc amd64"
 IUSE=""
 DEPEND="virtual/python"
 
diff --git a/media-sound/mp32ogg/ChangeLog b/media-sound/mp32ogg/ChangeLog
index b0efddaf9523..45f5af895db4 100644
--- a/media-sound/mp32ogg/ChangeLog
+++ b/media-sound/mp32ogg/ChangeLog
@@ -1,6 +1,52 @@
 # ChangeLog for media-sound/mp32ogg
-# Copyright 2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp32ogg/ChangeLog,v 1.1 2003/05/12 19:45:57 avenj Exp $
+# Copyright 2003-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp32ogg/ChangeLog,v 1.1.1.1 2005/11/30 09:37:49 chriswhite Exp $
+
+*mp32ogg-0.11-r4 (01 Jan 2005)
+
+  01 Jan 2005; Tony Vroon <chainsaw@gentoo.org>
+  +files/mp32ogg-0.11-r4-mpg321.patch, +files/mp32ogg-0.11-r4-quality.patch,
+  +mp32ogg-0.11-r4.ebuild:
+  Ported debian patches for --quality commandline option and non-zero exitcode
+  on failure. Closes bug #76267.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mp32ogg-0.11-r3.ebuild:
+  Stable amd64, sparc.
+
+  12 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mp32ogg-0.11-r3.ebuild:
+  ~sparc ~amd64
+
+  12 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mp32ogg-0.11-r3.ebuild:
+  ~sparc ~amd64
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mp32ogg-0.11-r3.ebuild:
+  QA fix.
+
+  15 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mp32ogg-0.11-r2.ebuild, mp32ogg-0.11-r3.ebuild:
+  media-sound/mpg123 dep changed to virtual/mpg123
+
+*mp32ogg-0.11-r3 (03 Feb 2004)
+
+  03 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mp32ogg-0.11-r1.ebuild, mp32ogg-0.11-r3.ebuild,
+  files/mp32ogg-0.11-r3-mpg321.patch:
+  Added a patch to fallback on mpg321 if mpg123 is not installed.
+
+*mp32ogg-0.11-r2 (01 Feb 2004)
+
+  01 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mp32ogg-0.11-r1.ebuild, mp32ogg-0.11-r2.ebuild, mp32ogg-0.11.ebuild:
+  Added mpg123 dependency to close bug #40106
+
+*mp32ogg-0.11-r1 (11 Jun 2003)
+
+  11 Jun 2003; Patrick Kursawe <phosphan@gentoo.org> mp32ogg-0.11-r1.ebuild:
+  Fixing dependencies (bug 22612)
 
 *mp32ogg-0.11 (12 May 2003)
 
diff --git a/media-sound/mp32ogg/Manifest b/media-sound/mp32ogg/Manifest
index 6feeb338f94c..86d7fb1d9662 100644
--- a/media-sound/mp32ogg/Manifest
+++ b/media-sound/mp32ogg/Manifest
@@ -1,4 +1,9 @@
-MD5 80f44b610398649ecf03e06133dbfeb0 ChangeLog 342
-MD5 f6bd25d44353daaa9da6fcd8945db69c mp32ogg-0.11.ebuild 497
-MD5 7da7d3b125d2d0a6c12bbb0e9cdb93ff files/mp32ogg 9216
-MD5 4fcc8bfffdd7c8012b2eb9afeb2daa4a files/digest-mp32ogg-0.11 50
+MD5 535b4a092933b5e59dc9bb5e50461e8f mp32ogg-0.11-r3.ebuild 719
+MD5 f0d7111cf68cf0e796b3c4f3a9344885 mp32ogg-0.11-r4.ebuild 762
+MD5 25e5b93c423052675c387de167d1d96f ChangeLog 1885
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 8a1a0f2baeac67e5e561aa9112aacf02 files/mp32ogg-0.11-r4-mpg321.patch 781
+MD5 4fcc8bfffdd7c8012b2eb9afeb2daa4a files/digest-mp32ogg-0.11-r3 50
+MD5 4fcc8bfffdd7c8012b2eb9afeb2daa4a files/digest-mp32ogg-0.11-r4 50
+MD5 ddb7a92debd73a42b9ed9746856f1077 files/mp32ogg-0.11-r4-quality.patch 2749
+MD5 8a1a0f2baeac67e5e561aa9112aacf02 files/mp32ogg-0.11-r3-mpg321.patch 781
diff --git a/media-sound/mp32ogg/mp32ogg-0.11-r3.ebuild b/media-sound/mp32ogg/mp32ogg-0.11-r3.ebuild
index 895f62c8646a..3b4d89d62079 100644
--- a/media-sound/mp32ogg/mp32ogg-0.11-r3.ebuild
+++ b/media-sound/mp32ogg/mp32ogg-0.11-r3.ebuild
@@ -1,6 +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/media-sound/mp32ogg/mp32ogg-0.11-r3.ebuild,v 1.1 2004/02/03 09:34:12 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp32ogg/mp32ogg-0.11-r3.ebuild,v 1.1.1.1 2005/11/30 09:37:49 chriswhite Exp $
+
+inherit eutils
+IUSE=""
 
 DESCRIPTION="A perl script to convert MP3 files to Ogg Vorbis files."
 
@@ -10,10 +13,10 @@ SRC_URI="ftp://ftp.faceprint.com/pub/software/scripts/mp32ogg"
 LICENSE="Artistic"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 sparc amd64"
 
 DEPEND=""
-RDEPEND="|| ( media-sound/mpg123 media-sound/mpg321 )
+RDEPEND="virtual/mpg123
 	dev-perl/MP3-Info
 	dev-perl/String-ShellQuote
 	media-sound/vorbis-tools"
diff --git a/media-sound/mp32ogg/mp32ogg-0.11-r4.ebuild b/media-sound/mp32ogg/mp32ogg-0.11-r4.ebuild
index 3012c645059d..6e2e2c22b801 100644
--- a/media-sound/mp32ogg/mp32ogg-0.11-r4.ebuild
+++ b/media-sound/mp32ogg/mp32ogg-0.11-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/media-sound/mp32ogg/mp32ogg-0.11-r4.ebuild,v 1.1 2005/01/01 15:59:45 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp32ogg/mp32ogg-0.11-r4.ebuild,v 1.1.1.1 2005/11/30 09:37:49 chriswhite Exp $
 
 inherit eutils
 IUSE=""
diff --git a/media-sound/mp3_check/ChangeLog b/media-sound/mp3_check/ChangeLog
index 6b509298089d..dee1938956bd 100644
--- a/media-sound/mp3_check/ChangeLog
+++ b/media-sound/mp3_check/ChangeLog
@@ -1,8 +1,33 @@
 # ChangeLog for media-sound/mp3_check
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3_check/ChangeLog,v 1.1 2002/06/28 16:27:52 lostlogic Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3_check/ChangeLog,v 1.1.1.1 2005/11/30 09:38:31 chriswhite Exp $
 
-* mp3_check-1.98 (28 Jun 2002)
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mp3_check-1.98.ebuild:
+  Stable amd64, sparc.
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> mp3_check-1.98.ebuild:
+  Typo in DESCRIPTION: consistancy -> consistency. Bug 59717.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mp3_check-1.98.ebuild:
+  virtual/glibc -> virtual/libc
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mp3_check-1.98.ebuild:
+  QA fix.
+
+  18 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> mp3_check-1.98.ebuild:
+  Adding amd64 keyword, closing #48152.
+
+  05 Dec 2003; Jason Wever <weeve@gentoo.org> mp3_check-1.98.ebuild:
+  Added ~sparc keyword.
+
+*mp3_check-1.98 (28 Jun 2002)
+
+  14 Aug 2002; Pieter Van den Abeele <pvdabeel@gentoo.org> :
+
+  Added ppc keyword
 
   28 Jun 2002: Brandon Low <lostlogic@gentoo.org> mp3_check-1.98.ebuild:
 
diff --git a/media-sound/mp3_check/Manifest b/media-sound/mp3_check/Manifest
index e69de29bb2d1..fa22554a5122 100644
--- a/media-sound/mp3_check/Manifest
+++ b/media-sound/mp3_check/Manifest
@@ -0,0 +1,4 @@
+MD5 c5274259d111ad669cdfb7ad681916b7 ChangeLog 1116
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 1f31c263b00afb2d13a70ad697a1d0d9 mp3_check-1.98.ebuild 750
+MD5 2ce2df63f669e37a9afe8d5a8416c197 files/digest-mp3_check-1.98 65
diff --git a/media-sound/mp3_check/mp3_check-1.98.ebuild b/media-sound/mp3_check/mp3_check-1.98.ebuild
index a25a4f1c165c..d473c107008f 100644
--- a/media-sound/mp3_check/mp3_check-1.98.ebuild
+++ b/media-sound/mp3_check/mp3_check-1.98.ebuild
@@ -1,15 +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/media-sound/mp3_check/mp3_check-1.98.ebuild,v 1.1 2002/06/28 16:27:52 lostlogic Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3_check/mp3_check-1.98.ebuild,v 1.1.1.1 2005/11/30 09:38:31 chriswhite Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION="MP3 consistancy checker"
+IUSE=""
+
+DESCRIPTION="MP3 consistency checker"
 HOMEPAGE="http://sourceforge.net/projects/mp3check/"
-SRC_URI="http://telia.dl.sourceforge.net/sourceforge/mp3check/${P}.tar.gz"
-DEPEND="virtual/glibc"
-RDEPEND="${DEPEND}"
-LICENSE="GPL"
+SRC_URI="mirror://sourceforge/mp3check/${P}.tar.gz"
+
+DEPEND="virtual/libc"
+
 SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc sparc amd64"
 
 src_unpack() {
 	unpack ${A}
@@ -24,5 +27,5 @@ src_compile() {
 }
 src_install () {
 	dobin mp3_check
-	dodoc WISHLIST TODO THANKYOU README NOTES MY_NOTES FOR_TESTING GOALS MILESTONE MILESTONE.INTRO
+	dodoc WISHLIST TODO THANKYOU README *NOTES FOR_TESTING GOALS MILESTONE*
 }
diff --git a/media-sound/mp3asm/ChangeLog b/media-sound/mp3asm/ChangeLog
index de11a546faec..3397a8391f74 100644
--- a/media-sound/mp3asm/ChangeLog
+++ b/media-sound/mp3asm/ChangeLog
@@ -1,6 +1,28 @@
 # ChangeLog for media-sound/mp3asm
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3asm/ChangeLog,v 1.1 2003/03/09 04:54:50 jje Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3asm/ChangeLog,v 1.1.1.1 2005/11/30 09:38:11 chriswhite Exp $
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  mp3asm-0.1.3-r1.ebuild:
+  Stable on ppc.
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> mp3asm-0.1.3-r1.ebuild:
+  Added to ~ppc.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mp3asm-0.1.3-r1.ebuild:
+  Stable amd64, sparc.
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mp3asm-0.1.3-r1.ebuild:
+  Added ~amd64
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mp3asm-0.1.3-r1.ebuild:
+  Added IUSE.
+
+  28 Nov 2003; Jason Wever <weeve@gentoo.org> mp3asm-0.1.3-r1.ebuild:
+  Added ~sparc keyword, resolves bug #34523.
 
 *mp3asm-0.1.3-r1 (09 Mar 2003)
 
diff --git a/media-sound/mp3asm/Manifest b/media-sound/mp3asm/Manifest
index e69de29bb2d1..1a0eada391f6 100644
--- a/media-sound/mp3asm/Manifest
+++ b/media-sound/mp3asm/Manifest
@@ -0,0 +1,4 @@
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 6cd30b94be539ca0c56655c916c594f7 ChangeLog 962
+MD5 ad96f5c720c05588d465aa89afff76f0 mp3asm-0.1.3-r1.ebuild 656
+MD5 0736440395f09ae9b943d15af93724dc files/digest-mp3asm-0.1.3-r1 66
diff --git a/media-sound/mp3asm/mp3asm-0.1.3-r1.ebuild b/media-sound/mp3asm/mp3asm-0.1.3-r1.ebuild
index 1eab85fe6ac8..e8c63e526b46 100644
--- a/media-sound/mp3asm/mp3asm-0.1.3-r1.ebuild
+++ b/media-sound/mp3asm/mp3asm-0.1.3-r1.ebuild
@@ -1,29 +1,29 @@
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3asm/mp3asm-0.1.3-r1.ebuild,v 1.1 2003/03/09 04:54:50 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3asm/mp3asm-0.1.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:11 chriswhite Exp $
 
+IUSE=""
+
+MY_P=${PN}-${PV}-${PR/r/}
 DESCRIPTION="A command line tool to clean and edit mp3 files."
 HOMEPAGE="http://sourceforge.net/projects/mp3asm/"
-MY_P=${PN}-${PV}-${PR/r/}
 SRC_URI="mirror://sourceforge/mp3asm/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="amd64 ppc sparc x86"
 
-IUSE=""
 DEPEND=""
-RDEPEND=""
 
 # the author uses weird numbering...
 S=${WORKDIR}/mp3asm-0.1
 
 src_compile() {
-        econf
-        emake || die
+	econf || die
+	emake || die
 }
 
 src_install() {
-        dodoc ${S}/README
-        dodoc ${S}/COPYING
-        dobin ${S}/src/mp3asm
+	dodoc README
+	dobin src/mp3asm
 }
diff --git a/media-sound/mp3blaster/ChangeLog b/media-sound/mp3blaster/ChangeLog
index 110f71c5a1ae..12c354c5464d 100644
--- a/media-sound/mp3blaster/ChangeLog
+++ b/media-sound/mp3blaster/ChangeLog
@@ -1,6 +1,80 @@
 # ChangeLog for media-sound/mp3blaster
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/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/media-sound/mp3blaster/ChangeLog,v 1.1.1.1 2005/11/30 09:38:29 chriswhite Exp $
+
+  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  mp3blaster-3.2.0.ebuild:
+  Stable on ppc.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  22 Nov 2004; Markus Rothe <corsair@gentoo.org> mp3blaster-3.2.0.ebuild:
+  Added ~ppc64 to KEYWORDS; bug #72100
+
+  30 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -mp3blaster-3.1.1.ebuild:
+  toolchain love for bug #69012.
+
+  13 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> mp3blaster-3.2.0.ebuild:
+  Stable on alpha.
+
+  23 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mp3blaster-3.2.0.ebuild:
+  Stable amd64 and sparc.  Added USE=lirc support.
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org> mp3blaster-3.1.3.ebuild,
+  mp3blaster-3.2.0.ebuild:
+  Fix use invocation
+
+  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mp3blaster-3.2.0.ebuild:
+  Stable on x86.
+
+*mp3blaster-3.2.0 (28 Nov 2003)
+
+  28 Nov 2003; Greg Fitzgerald <gregf@gentoo.org> mp3blaster-3.2.0.ebuild:
+  Version bump.
+
+  16 Nov 2003; Brad House <brad_mssw@gentoo.org> mp3blaster-3.1.3.ebuild:
+  mark stable on amd64
+
+  12 May 2003; Jason Wever <weeve@gentoo.org> mp3blaster-3.1.1.ebuild,
+  mp3blaster-3.1.3.ebuild:
+  Added ~sparc to keywords.
+
+*mp3blaster-3.1.3 (05 Nov 2002)
+
+  15 Dec 2002; Bjoern Brauel <bjb@gentoo.org> mp3blaster-3.1.3.ebuild :
+  Add ~alpha to KEYWORDS
+
+  08 Nov 2002; Daniel Ahlberg <aliz@gentoo.org> mp3blaster-3.1.3.ebuild :
+  Updated SRC_URI.
+
+  05 Nov 2002; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump.
+
+*mp3blaster-3.1.1 (13 Aug 2002)
+
+  15 Dec 2002; Bjoern Brauel <bjb@gentoo.org> mp3blaster-3.1.1.ebuild :
+  Add alpha to KEYWORDS
+
+  13 Aug 2002; Arcady Genkin <agenkin@thpoon.com> mp3blaster-3.1.1.ebuild :
+
+  Updated the ebuild for 3.1.1 to exclude support for NAS, as it appears
+  to be broken (see bug 5183).
+	
+*mp3blaster-3.1 (10 Jun 2002)
+
+  10 Jun 2002; Ryan Phillips <rphillips@gentoo.org> mp3blaster-3.1.ebuild :
+
+  New versionn
+
+*mp3blaster-3.0_p8 (28 Mar 2002)
+
+  28 Mar 2002; Seemant Kulleen <seemant@gentoo.org> mp3blaster-3.0_p8.ebuild :
+
+  the vorbis USE flag is now called oggvorbis
 
 *mp3blaster-3.0_p8 (1 Feb 2002)
 
diff --git a/media-sound/mp3blaster/Manifest b/media-sound/mp3blaster/Manifest
index e69de29bb2d1..0ba6caa335f1 100644
--- a/media-sound/mp3blaster/Manifest
+++ b/media-sound/mp3blaster/Manifest
@@ -0,0 +1,7 @@
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 9f35ba49409f7058554fc672d1a1b4b7 mp3blaster-3.1.3.ebuild 1452
+MD5 8c17b59e8a80193be3bd17789fc567eb ChangeLog 2820
+MD5 ee0b87c7e07476e37465ab15d0c5e0eb mp3blaster-3.2.0.ebuild 1445
+MD5 7a841800d584eafa732f19ccceab4eba files/mp3blaster-3.1.1-gcc3.1-fixes_cl.patch 591
+MD5 441643269ce24bf3d921465d51b702c4 files/digest-mp3blaster-3.2.0 68
+MD5 5b6f9d99b3e96b63be78c5d7a7b951ee files/digest-mp3blaster-3.1.3 68
diff --git a/media-sound/mp3blaster/mp3blaster-3.1.3.ebuild b/media-sound/mp3blaster/mp3blaster-3.1.3.ebuild
index 9b5e2610fcd1..9f7b25b89e48 100644
--- a/media-sound/mp3blaster/mp3blaster-3.1.3.ebuild
+++ b/media-sound/mp3blaster/mp3blaster-3.1.3.ebuild
@@ -1,27 +1,27 @@
-# 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/media-sound/mp3blaster/mp3blaster-3.1.3.ebuild,v 1.1 2002/11/05 19:29:05 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/mp3blaster-3.1.3.ebuild,v 1.1.1.1 2005/11/30 09:38:29 chriswhite Exp $
 
-IUSE="oggvorbis mysql"
+inherit toolchain-funcs
 
 DESCRIPTION="Command line MP3 player."
 HOMEPAGE="http://www.stack.nl/~brama/mp3blaster/"
+SRC_URI="http://www.stack.nl/~brama/mp3blaster/src/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="x86 ppc ~alpha ~sparc amd64"
 LICENSE="GPL-2"
+IUSE="oggvorbis mysql"
 
 DEPEND=">=sys-libs/ncurses-5.2
 	mysql? ( >=dev-db/mysql-3.23.36 )
 	oggvorbis? ( >=media-libs/libvorbis-1.0_beta1 )"
 #	nas? ( >=media-libs/nas-1.4.1 )
 
-SLOT="0"
-KEYWORDS="~x86"
-SRC_URI="ftp://mud.stack.nl/pub/mp3blaster/${P}.tar.gz"
-S=${WORKDIR}/${P}
-
 src_unpack() {
 	unpack ${A}
 
-	#if [ "`use nas`" ]; then
+	#if use nas; then
 	#	cd src
 	#	sed -e "s:^INCLUDES =:INCLUDES = -I/usr/X11R6/include:" \
 	#		-e "s:^splay_LDADD =:splay_LDADD = \$(NAS_LIBS):" \
@@ -40,10 +40,10 @@ src_compile() {
 	use oggvorbis || myconf="${myconf} --without-oggvorbis"
 
 	econf ${myconf} || die
-	make CC="gcc ${CFLAGS}" CXX="c++ ${CXXFLAGS}" || die
+	make CC="$(tc-getCC) ${CFLAGS}" CXX="$(tc-getCXX) ${CXXFLAGS}" || die
 }
 
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc ANNOUNCE AUTHORS COPYING CREDITS ChangeLog FAQ NEWS README TODO
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc ANNOUNCE AUTHORS CREDITS ChangeLog FAQ NEWS README TODO
 }
diff --git a/media-sound/mp3blaster/mp3blaster-3.2.0.ebuild b/media-sound/mp3blaster/mp3blaster-3.2.0.ebuild
index a07918b5e133..74806a29d787 100644
--- a/media-sound/mp3blaster/mp3blaster-3.2.0.ebuild
+++ b/media-sound/mp3blaster/mp3blaster-3.2.0.ebuild
@@ -1,25 +1,28 @@
-# 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/media-sound/mp3blaster/mp3blaster-3.2.0.ebuild,v 1.1 2003/11/28 21:49:04 gregf Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/mp3blaster-3.2.0.ebuild,v 1.1.1.1 2005/11/30 09:38:29 chriswhite Exp $
+
+inherit toolchain-funcs
 
 DESCRIPTION="Command line MP3 player."
 HOMEPAGE="http://www.stack.nl/~brama/mp3blaster/"
 SRC_URI="http://www.stack.nl/~brama/mp3blaster/src/${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~amd64"
+KEYWORDS="x86 ppc alpha sparc amd64 ~ppc64"
 LICENSE="GPL-2"
-IUSE="oggvorbis mysql"
+IUSE="oggvorbis mysql lirc"
 
 DEPEND=">=sys-libs/ncurses-5.2
 	mysql? ( >=dev-db/mysql-3.23.36 )
+	lirc? ( app-misc/lirc )
 	oggvorbis? ( >=media-libs/libvorbis-1.0_beta1 )"
 #	nas? ( >=media-libs/nas-1.4.1 )
 
 src_unpack() {
 	unpack ${A}
 
-	#if [ "`use nas`" ]; then
+	#if use nas; then
 	#	cd src
 	#	sed -e "s:^INCLUDES =:INCLUDES = -I/usr/X11R6/include:" \
 	#		-e "s:^splay_LDADD =:splay_LDADD = \$(NAS_LIBS):" \
@@ -31,17 +34,17 @@ src_compile() {
 	local myconf
 	### Looks like NAS support is broken, at least with NAS 1.5 and
 	### mp3player 3.1.1 (Aug 13, agenkin@thpoon.com)
-	#use nas && myconf="${myconf} --with-nas"
-	#use nas || myconf="${myconf} --disable-nas"
-	myconf="${myconf} --disable-nas"
-	use mysql && myconf="${myconf} --with-mysql"
-	use oggvorbis || myconf="${myconf} --without-oggvorbis"
+	### Ditto nas-1.6c-r1, mp3blaster-3.2.0 (2004.06.23 - eradicator)
+	myconf="${myconf} --without-nas \
+	        `use_with lirc` \
+	        `use_with mysql` \
+	        `use_with oggvorbis`"
 
 	econf ${myconf} || die
-	make CC="gcc ${CFLAGS}" CXX="c++ ${CXXFLAGS}" || die
+	make CC="$(tc-getCC) ${CFLAGS}" CXX="$(tc-getCXX) ${CXXFLAGS}" || die
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
-	dodoc ANNOUNCE AUTHORS COPYING CREDITS ChangeLog FAQ NEWS README TODO
+	make DESTDIR="${D}" install || die
+	dodoc ANNOUNCE AUTHORS CREDITS ChangeLog FAQ NEWS README TODO
 }
diff --git a/media-sound/mp3c/ChangeLog b/media-sound/mp3c/ChangeLog
index 22484520ebc1..b740c0625a42 100644
--- a/media-sound/mp3c/ChangeLog
+++ b/media-sound/mp3c/ChangeLog
@@ -1,5 +1,30 @@
 # ChangeLog for media-sound/mp3c
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3c/ChangeLog,v 1.1.1.1 2005/11/30 09:38:25 chriswhite Exp $
+
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> mp3c-0.27.ebuild,
+  mp3c-0.29.ebuild:
+  Don't install COPYING file.
+
+  16 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> mp3c-0.29.ebuild:
+  changed app-cdr/cdrtools dependency to virtual/cdrtools. see bug #77817.
+
+  26 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> mp3c-0.29.ebuild:
+  Stable x86, amd64, sparc.
+
+  13 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> mp3c-0.29.ebuild:
+  Added ~amd64 ~sparc.
+
+  08 Jun 2004; David Holm <dholm@gentoo.org> mp3c-0.29.ebuild:
+  Added to ~ppc.
+
+*mp3c-0.29 (07 Jun 2004)
+
+  07 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org> mp3c-0.29.ebuild:
+  Version bump closes bug #53088.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> mp3c-0.27.ebuild:
+  QA fix.
 
 *mp3c-0.27 (18 Jun 2002)
 
diff --git a/media-sound/mp3c/Manifest b/media-sound/mp3c/Manifest
index e69de29bb2d1..80f0eb8fd290 100644
--- a/media-sound/mp3c/Manifest
+++ b/media-sound/mp3c/Manifest
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e79dca2ea8dc3a8ffe18dd87612ae645 ChangeLog 1076
+MD5 d25caf4798188a2c3a7574aa9220c102 mp3c-0.29.ebuild 731
+MD5 663e993926010ba72cb195f6807362c8 mp3c-0.27.ebuild 769
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 ac6f72506b937f4570c84d940edb0fa6 files/digest-mp3c-0.27 61
+MD5 ca3b0017f91b25623f25eeddba87153e files/digest-mp3c-0.29 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGtR4j5H05b2HAEkRAtiyAJwNgFfddu95oGsmNqnVPhQVTC0kjwCeLF8G
+0Kgzuj03kM84O/CsBr7vU8M=
+=/ouR
+-----END PGP SIGNATURE-----
diff --git a/media-sound/mp3c/mp3c-0.27.ebuild b/media-sound/mp3c/mp3c-0.27.ebuild
index 4f7517090013..483145c7f434 100644
--- a/media-sound/mp3c/mp3c-0.27.ebuild
+++ b/media-sound/mp3c/mp3c-0.27.ebuild
@@ -1,25 +1,18 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# Author: Felix Kurth <felix@fkurth.de>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3c/mp3c-0.27.ebuild,v 1.1 2002/06/21 21:51:26 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3c/mp3c-0.27.ebuild,v 1.1.1.1 2005/11/30 09:38:25 chriswhite Exp $
 
-S=${WORKDIR}/${P}
+IUSE=""
 DESCRIPTION="console based mp3 ripper, with cddb support"
 HOMEPAGE="http://mp3c.wspse.de/WSPse/Linux-MP3c.php3?lang=en"
-LICENSE="GPL�2"
 SRC_URI="ftp://excelsior.kullen.rwth-aachen.de/pub/linux/wspse/${P}.tar.gz"
 DEPEND=">=media-sound/bladeenc-0.94.2 \
 	>=media-sound/cdparanoia-3.9.8 \
 	>=media-sound/mp3info-0.8.4-r1"
 
-src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
-	emake || die
-}
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
 src_install () {
 	make \
@@ -27,5 +20,5 @@ src_install () {
 		mandir=${D}/usr/share/man \
 		infodir=${D}/usr/share/info \
 		install || die
-	dodoc ABOUT-NLS AUTHORS BATCH.README BUGS CDDB_HOWTO COPYING ChangeLog FAQ INSTALL NEWS OTHERS README TODO          
+	dodoc AUTHORS *README BUGS CDDB_HOWTO ChangeLog FAQ NEWS OTHERS TODO
 }
diff --git a/media-sound/mp3c/mp3c-0.29.ebuild b/media-sound/mp3c/mp3c-0.29.ebuild
index 222b96b8ec85..c9a722eb4912 100644
--- a/media-sound/mp3c/mp3c-0.29.ebuild
+++ b/media-sound/mp3c/mp3c-0.29.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/media-sound/mp3c/mp3c-0.29.ebuild,v 1.1 2004/06/08 05:10:54 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3c/mp3c-0.29.ebuild,v 1.1.1.1 2005/11/30 09:38:25 chriswhite Exp $
 
 IUSE="oggvorbis"
 
@@ -10,19 +10,14 @@ SRC_URI="ftp://excelsior.kullen.rwth-aachen.de/pub/linux/wspse/${P}.tar.gz"
 
 DEPEND="media-sound/lame
 	>=media-sound/mp3info-0.8.4-r1
-	app-cdr/cdrtools
+	virtual/cdrtools
 	oggvorbis? ( media-libs/libvorbis )"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
-
-src_compile() {
-	econf || die "./configure failed"
-	emake || die "make failed"
-}
+KEYWORDS="x86 ~ppc amd64 sparc"
 
 src_install () {
 	make DESTDIR="${D}" install || die
-	dodoc AUTHORS *README BUGS CDDB_HOWTO COPYING ChangeLog FAQ NEWS OTHERS TODO
+	dodoc AUTHORS *README BUGS CDDB_HOWTO ChangeLog FAQ NEWS OTHERS TODO
 }
diff --git a/media-sound/mp3cat/ChangeLog b/media-sound/mp3cat/ChangeLog
index c438558822c4..900d3409ae11 100644
--- a/media-sound/mp3cat/ChangeLog
+++ b/media-sound/mp3cat/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/mp3cat
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3cat/ChangeLog,v 1.1 2005/01/27 21:15:57 pkdawson Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3cat/ChangeLog,v 1.1.1.1 2005/11/30 09:38:35 chriswhite Exp $
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> mp3cat-0.4.ebuild:
+  Added to ~ppc.
 
 *mp3cat-0.4 (27 Jan 2005)
 
diff --git a/media-sound/mp3cat/Manifest b/media-sound/mp3cat/Manifest
index ec756d741211..2897b0410d6b 100644
--- a/media-sound/mp3cat/Manifest
+++ b/media-sound/mp3cat/Manifest
@@ -1,4 +1,4 @@
-MD5 41b1810ef6369f40f821746cf66ee001 ChangeLog 287
+MD5 9c2055a0298860d54c5e2936bb28441c ChangeLog 458
 MD5 08aa57227627a54ee75b0fb5d484e67d metadata.xml 255
-MD5 57e154f0290f6b9f071b832b896923c3 mp3cat-0.4.ebuild 505
+MD5 0698abe5b8f17cf7fe932c3c15911a2d mp3cat-0.4.ebuild 607
 MD5 0a37efcd5b65bfeddce3de57c80aa5e5 files/digest-mp3cat-0.4 61
diff --git a/media-sound/mp3cat/mp3cat-0.4.ebuild b/media-sound/mp3cat/mp3cat-0.4.ebuild
index 4703fc7a29b7..1f09ee3d9860 100644
--- a/media-sound/mp3cat/mp3cat-0.4.ebuild
+++ b/media-sound/mp3cat/mp3cat-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/media-sound/mp3cat/mp3cat-0.4.ebuild,v 1.1 2005/01/27 21:15:57 pkdawson Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3cat/mp3cat-0.4.ebuild,v 1.1.1.1 2005/11/30 09:38:35 chriswhite Exp $
 
 DESCRIPTION="mp3cat reads and writes MP3 files"
 HOMEPAGE="http://tomclegg.net/mp3cat"
@@ -8,7 +8,7 @@ SRC_URI="http://tomclegg.net/software/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 IUSE=""
 
 DEPEND="virtual/libc"
diff --git a/media-sound/mp3check/ChangeLog b/media-sound/mp3check/ChangeLog
index 6f93241749de..54823aefe62e 100644
--- a/media-sound/mp3check/ChangeLog
+++ b/media-sound/mp3check/ChangeLog
@@ -1,5 +1,26 @@
-# ChangeLog for media-sound/kstreamripper
-# Copyright 2004-2004 Gentoo Technologies, Inc.; Distributed under the GPL
+# ChangeLog for media-sound/mp3check
+# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3check/ChangeLog,v 1.1.1.1 2005/11/30 09:38:01 chriswhite Exp $
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mp3check-0.8.0.ebuild:
+  Stable amd64, sparc, x86.
+
+  23 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mp3check-0.8.0.ebuild:
+  Added to ~sparc.
+
+  17 Oct 2004; David Holm <dholm@gentoo.org> mp3check-0.8.0.ebuild:
+  Added to ~ppc.
+
+  28 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Gentoo Technologies, Inc. -> Gentoo Foundation
+
+  19 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  16 Sep 2004; Michael Sterrett <mr_bones_@gentoo.org> mp3check-0.8.0.ebuild:
+  header fix; tidy
 
 *mp3check-0.8.0 (16 Sep 2004)
 
diff --git a/media-sound/mp3check/Manifest b/media-sound/mp3check/Manifest
index 39ae3a6a1230..8b5af828ee96 100644
--- a/media-sound/mp3check/Manifest
+++ b/media-sound/mp3check/Manifest
@@ -1,5 +1,15 @@
-MD5 b77093e6f1c43db8d90d7be6127e335d ChangeLog 310
-MD5 63cede719e22d2767ab1567461f311a9 README 515
-MD5 f03343b99e5a95456103948b1299ad1f mp3check-0.8.0.ebuild 602
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4f9ab9eec20cce1d0a10226fbfd7337f ChangeLog 1071
+MD5 63ba390811844c674c08a1e82d5e20be mp3check-0.8.0.ebuild 686
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 0e4355f7afa9cfc73b2c06420a9923b5 files/digest-mp3check-0.8.0 66
 MD5 738499728009660d6d5d4f50515c6ff7 files/mp3check-0.8.0-gcc34.diff 2675
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBxRg0ArHZZzCEUG0RAl5RAKCKxdapiuV4pUG3AY2tzpe/vm94GwCfTLog
+t6oznrm69ZzGw5TmoXrL/1U=
+=wNmj
+-----END PGP SIGNATURE-----
diff --git a/media-sound/mp3check/mp3check-0.8.0.ebuild b/media-sound/mp3check/mp3check-0.8.0.ebuild
index 1e68496ea8fc..41d819e67f04 100644
--- a/media-sound/mp3check/mp3check-0.8.0.ebuild
+++ b/media-sound/mp3check/mp3check-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/media-sound/mp3check/mp3check-0.8.0.ebuild,v 1.1 2004/09/16 20:32:08 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3check/mp3check-0.8.0.ebuild,v 1.1.1.1 2005/11/30 09:38:01 chriswhite Exp $
 
 IUSE=""
 
@@ -9,16 +9,17 @@ inherit eutils
 DESCRIPTION="Checks mp3 files for consistency and prints several errors and warnings."
 HOMEPAGE="http://jo.ath.cx/soft/mp3check/mp3check.html"
 SRC_URI="http://jo.ath.cx/soft/mp3check/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ~ppc sparc x86"
 
 DEPEND=""
 
 src_unpack() {
-	unpack ${P}.tar.gz || die
-	cd ${S} || die
-	epatch "${FILESDIR}/mp3check-0.8.0-gcc34.diff" || die
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/mp3check-0.8.0-gcc34.diff"
 }
 
 src_install() {
diff --git a/media-sound/mp3gain/ChangeLog b/media-sound/mp3gain/ChangeLog
index b6e379b37678..10edd480fc45 100644
--- a/media-sound/mp3gain/ChangeLog
+++ b/media-sound/mp3gain/ChangeLog
@@ -1,6 +1,52 @@
 # ChangeLog for media-sound/mp3gain
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3gain/ChangeLog,v 1.1 2004/01/14 00:10:22 mholzer Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3gain/ChangeLog,v 1.1.1.1 2005/11/30 09:38:20 chriswhite Exp $
+
+  20 Nov 2005; <chainsaw@gentoo.org> mp3gain-1.4.6.ebuild:
+  Respect user CFLAGS & use proper CC, closes bug #113047.
+
+  14 Sep 2005; Aron Griffis <agriffis@gentoo.org> mp3gain-1.4.6.ebuild:
+  Mark 1.4.6 stable on alpha
+
+  28 Aug 2005; Simon Stelling <blubb@gentoo.org> mp3gain-1.4.6.ebuild:
+  stable on amd64
+
+  24 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> mp3gain-1.4.6.ebuild:
+  Stable on sparc
+
+  23 Aug 2005; Tony Vroon <chainsaw@gentoo.org> mp3gain-1.4.5.ebuild,
+  mp3gain-1.4.6.ebuild:
+  Stable on x86.
+
+*mp3gain-1.4.6 (03 Feb 2005)
+
+  03 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +mp3gain-1.4.6.ebuild:
+  Version bump closes bug #80476.
+
+*mp3gain-1.4.5 (28 Nov 2004)
+
+  28 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +mp3gain-1.4.5.ebuild:
+  Version bump closes bug #72714.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> mp3gain-1.4.3.ebuild:
+  Stable amd64, sparc.
+
+  14 Aug 2004; Sven Wegener <swegener@gentoo.org> mp3gain-1.4.3.ebuild:
+  Trimmed trailing whitespace.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> mp3gain-1.4.3.ebuild:
+  virtual/glibc -> virtual/libc
+
+  02 Jun 2004; Jon Hood <squinky86@gentoo.org> mp3gain-1.4.3.ebuild:
+  added unzip to DEPEND (#52768, thanks Arno <gentoo@onra.org>)
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> mp3gain-1.4.3.ebuild:
+  Added IUSE.
+
+  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> mp3gain-1.4.3.ebuild:
+  Stable on x86.
 
 *mp3gain-1.4.3 (14 Jan 2004)
 
diff --git a/media-sound/mp3gain/Manifest b/media-sound/mp3gain/Manifest
index 6fad2b918f6f..4fae5add2926 100644
--- a/media-sound/mp3gain/Manifest
+++ b/media-sound/mp3gain/Manifest
@@ -1,2 +1,18 @@
-MD5 c3a902e41e81b97691454ffd372b288c mp3gain-1.4.3.ebuild 634
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 23ee3d9d750991c8ef1d621954716d1f ChangeLog 1843
 MD5 2cb475750ac933f3189041233d1d250e files/digest-mp3gain-1.4.3 66
+MD5 71c78a129e96365bed918bc9b5659547 files/digest-mp3gain-1.4.5 66
+MD5 e22b92b5f03b1c1ac2b4a33f54df7249 files/digest-mp3gain-1.4.6 66
+MD5 319fe8f45b51a2d31f8d4e9a4071ca10 metadata.xml 248
+MD5 204786aa53423e8583f48da41b915518 mp3gain-1.4.3.ebuild 743
+MD5 da1bfaea7b754adcf542e1d9c55c4a9b mp3gain-1.4.5.ebuild 724
+MD5 7ae073d9d30800fef1bde46505feb4d6 mp3gain-1.4.6.ebuild 820
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDgOiEp5vW4rUFj5oRAs1oAKCjd00eyFsjzQ7of2Nm9C0XQ9FsfwCeMNp8
+bAC++Enloceb6dWbR8ozRZ8=
+=9GnS
+-----END PGP SIGNATURE-----
diff --git a/media-sound/mp3gain/metadata.xml b/media-sound/mp3gain/metadata.xml
index 78ec7f6984fe..a025c77c7636 100644
--- a/media-sound/mp3gain/metadata.xml
+++ b/media-sound/mp3gain/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>sound</herd>
 <maintainer>
-  <email>sound@gentoo.org</email>
-  <name>Gentoo Sound Team</name>
+  <email>chainsaw@gentoo.org</email>
+  <name>Tony Vroon</name>
 </maintainer>
 </pkgmetadata>
diff --git a/media-sound/mp3gain/mp3gain-1.4.3.ebuild b/media-sound/mp3gain/mp3gain-1.4.3.ebuild
index d1efc017e276..8253341c48eb 100644
--- a/media-sound/mp3gain/mp3gain-1.4.3.ebuild
+++ b/media-sound/mp3gain/mp3gain-1.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/media-sound/mp3gain/mp3gain-1.4.3.ebuild,v 1.1 2004/01/14 00:10:22 mholzer Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3gain/mp3gain-1.4.3.ebuild,v 1.1.1.1 2005/11/30 09:38:20 chriswhite Exp $
+
+IUSE=""
 
 S=${WORKDIR}
 DESCRIPTION="MP3Gain automatically adjusts mp3s so that they all have the same volume"
@@ -11,7 +13,11 @@ RESTRICT="nomirror"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~hppa"
+KEYWORDS="x86 amd64 ~ppc sparc ~alpha ~hppa"
+
+RDEPEND="virtual/libc"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
 
 src_compile() {
 	sed -i 's:INSTALL_PATH= /usr/local/bin:INSTALL_PATH= /usr/bin:' Makefile
diff --git a/media-sound/mp3gain/mp3gain-1.4.5.ebuild b/media-sound/mp3gain/mp3gain-1.4.5.ebuild
index a146b79987dc..51dba0d3fa5b 100644
--- a/media-sound/mp3gain/mp3gain-1.4.5.ebuild
+++ b/media-sound/mp3gain/mp3gain-1.4.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/media-sound/mp3gain/mp3gain-1.4.5.ebuild,v 1.1 2004/11/28 22:49:33 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3gain/mp3gain-1.4.5.ebuild,v 1.1.1.1 2005/11/30 09:38:20 chriswhite Exp $
 
 IUSE=""
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.zip"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc x86"
 
 RDEPEND="virtual/libc"
 DEPEND="${RDEPEND}
diff --git a/media-sound/mp3gain/mp3gain-1.4.6.ebuild b/media-sound/mp3gain/mp3gain-1.4.6.ebuild
index 9950e1004604..0eeeca3caa88 100644
--- a/media-sound/mp3gain/mp3gain-1.4.6.ebuild
+++ b/media-sound/mp3gain/mp3gain-1.4.6.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/media-sound/mp3gain/mp3gain-1.4.6.ebuild,v 1.1 2005/02/03 10:14:16 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3gain/mp3gain-1.4.6.ebuild,v 1.1.1.1 2005/11/30 09:38:20 chriswhite Exp $
+
+inherit toolchain-funcs
 
 IUSE=""
 
@@ -13,12 +15,21 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.zip"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 ~hppa ~ppc sparc x86"
 
 RDEPEND="virtual/libc"
 DEPEND="${RDEPEND}
 	app-arch/unzip"
 
+src_unpack() {
+	unpack ${A}
+	sed -i -e "s:-Wall -O3 -DHAVE_MEMCPY:-Wall ${CFLAGS} -DHAVE_MEMCPY:" ${S}/Makefile
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die "Compile failed"
+}
+
 src_install () {
 	dobin mp3gain
 }
diff --git a/media-sound/mp3info/ChangeLog b/media-sound/mp3info/ChangeLog
index 65d375c753ba..7006630e718a 100644
--- a/media-sound/mp3info/ChangeLog
+++ b/media-sound/mp3info/ChangeLog
@@ -1,11 +1,54 @@
 # ChangeLog for media-sound/mp3info
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3info/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/media-sound/mp3info/ChangeLog,v 1.1.1.1 2005/11/30 09:37:59 chriswhite Exp $
 
+  10 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  mp3info-0.8.4-r1.ebuild, mp3info-0.8.4-r2.ebuild:
+  Don't install INSTALL and LICENSE files.
+
+  31 Aug 2005; Fabian Groffen <grobian@gentoo.org> mp3info-0.8.4-r2.ebuild:
+  Marking ~ppc-macos (bug #104325)
+
+*mp3info-0.8.4-r2 (13 Aug 2005)
+
+  13 Aug 2005; Tony Vroon <chainsaw@gentoo.org> +files/cast.patch,
+  +files/sanity-checks.patch, +mp3info-0.8.4-r2.ebuild:
+  Add sanity checks & fix a cast, based on patches by Ben Bennett
+  <sink@limey.net> in bug #85100.
+
+  17 Dec 2004; Markus Rothe <corsair@gentoo.org> mp3info-0.8.4-r1.ebuild:
+  Stable on ppc64
+
+  15 Nov 2004; Markus Rothe <corsair@gentoo.org> mp3info-0.8.4-r1.ebuild:
+  Marked ~ppc64; bug #71290
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org> mp3info-0.8.4-r1.ebuild:
+  Fix use invocation
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mp3info-0.8.4-r1.ebuild:
+  QA fix.
+
+  28 Nov 2003; Brad House <brad_mssw@gentoo.org> mp3info-0.8.4-r1.ebuild:
+  mark stable on amd64
+
+  16 Sep 2003; Martin Holzer <mholzer@gentoo.org> mp3info-0.8.4-r1.ebuild:
+  Added patch to compile with gcc3. Closes #28834.
+
+*mp3info-0.8.4-r1 (18 May 2002)
+
+  31 Dec 2002; Joshua Brindle <method@gentoo.org> : mp3info-0.8.4-r1.ebuild
+  added sparc keyword
+
+  14 Aug 2002; Pieter Van den Abeele <pvdabeel@gentoo.org> :
+  Added ppc keyword
+
+  18 May 2002; Spider <spider@gentoo.org> :
+  fix the gtk+ dependencies so it actually works.
+   
 *mp3info-0.8.4 (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/media-sound/mp3info/Manifest b/media-sound/mp3info/Manifest
index e69de29bb2d1..388f2695cd74 100644
--- a/media-sound/mp3info/Manifest
+++ b/media-sound/mp3info/Manifest
@@ -0,0 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b7d6c465ac5d1d7bb1338b4d36355bae ChangeLog 2116
+MD5 4fbf04b95be8684b7d17839c70708fba mp3info-0.8.4-r2.ebuild 947
+MD5 05a119f1f1c4675a5c3073ef525347af mp3info-0.8.4-r1.ebuild 858
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 ad2d1f86b64479bc8dd0b27b192d606f files/digest-mp3info-0.8.4-r2 61
+MD5 8051859c5524c1f7dc847f4a2557a474 files/sanity-checks.patch 487
+MD5 ad2d1f86b64479bc8dd0b27b192d606f files/digest-mp3info-0.8.4-r1 61
+MD5 2be66b044256d5db41bb23da1d53b133 files/gcc.patch 825
+MD5 7e73f6eeb2bb3e8971c487c5a9b6a0f8 files/cast.patch 449
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDIwGLj5H05b2HAEkRAvEPAJ0eTmcRviJ4byvs1PU/VDMs/CCSvwCcCkWZ
++965f/dbmrnLwKaFhOfQ7RE=
+=jBoE
+-----END PGP SIGNATURE-----
diff --git a/media-sound/mp3info/mp3info-0.8.4-r1.ebuild b/media-sound/mp3info/mp3info-0.8.4-r1.ebuild
index 38b0648e12d1..9386459d8058 100644
--- a/media-sound/mp3info/mp3info-0.8.4-r1.ebuild
+++ b/media-sound/mp3info/mp3info-0.8.4-r1.ebuild
@@ -1,39 +1,40 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Claes N�sten <pekdon@gmx.net>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3info/mp3info-0.8.4-r1.ebuild,v 1.1 2002/05/18 19:37:56 spider Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3info/mp3info-0.8.4-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:59 chriswhite Exp $
+
+inherit eutils
+
+IUSE="gtk"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="An MP3 technical info viewer and ID3 1.x tag editor"
-SRC_URI="ftp://ftp.ibiblio.org/pub/linux/apps/sound/mp3-utils/${PN}/${P}.tgz"
+SRC_URI="http://ibiblio.org/pub/linux/apps/sound/mp3-utils/${PN}/${P}.tgz"
 HOMEPAGE="http://ibiblio.org/mp3info/"
 
-DEPEND="virtual/glibc
-	gtk? ( >=x11-libs/gtk+-1.2 )"
+DEPEND="gtk? ( =x11-libs/gtk+-1.2* )"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc sparc amd64 ppc64"
 
 src_unpack() {
-
 	unpack ${A}
-	
+
 	cd ${S}
-	cp Makefile Makefile.orig
-	sed -e "s:-O2:${CFLAGS}:" Makefile.orig > Makefile
+	sed -i "s:-O2:${CFLAGS}:" Makefile
+	epatch ${FILESDIR}/gcc.patch
 }
 
 src_compile() {
-
 	emake mp3info || die
-	if [ `use gtk` ]; then
-		emake gmp3info || die "gtk mp3info failed" 
+	if use gtk; then
+		emake gmp3info || die "gtk mp3info failed"
 	fi
 }
 
 src_install() {
-
 	dobin mp3info
 	use gtk && dobin gmp3info
-	
-	dodoc ChangeLog INSTALL LICENSE README
+
+	dodoc ChangeLog README
 	doman mp3info.1
 }
diff --git a/media-sound/mp3info/mp3info-0.8.4-r2.ebuild b/media-sound/mp3info/mp3info-0.8.4-r2.ebuild
index a1d10b3ef359..125f991702b2 100644
--- a/media-sound/mp3info/mp3info-0.8.4-r2.ebuild
+++ b/media-sound/mp3info/mp3info-0.8.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/media-sound/mp3info/mp3info-0.8.4-r2.ebuild,v 1.1 2005/08/13 13:06:12 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3info/mp3info-0.8.4-r2.ebuild,v 1.1.1.1 2005/11/30 09:37:59 chriswhite Exp $
 
 inherit eutils
 
@@ -14,13 +14,13 @@ DEPEND="gtk? ( =x11-libs/gtk+-1.2* )"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~ppc64"
+KEYWORDS="~amd64 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
 
 src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-	sed -i "s:-O2:${CFLAGS}:" Makefile
+	sed -i -e "s:-O2:${CFLAGS}:" Makefile
 	epatch ${FILESDIR}/gcc.patch
 	epatch ${FILESDIR}/cast.patch
 	epatch ${FILESDIR}/sanity-checks.patch
@@ -37,6 +37,6 @@ src_install() {
 	dobin mp3info
 	use gtk && dobin gmp3info
 
-	dodoc ChangeLog INSTALL LICENSE README
+	dodoc ChangeLog README
 	doman mp3info.1
 }
diff --git a/media-sound/mp3kult/ChangeLog b/media-sound/mp3kult/ChangeLog
index 026a9d97164a..4777cbcbefe6 100644
--- a/media-sound/mp3kult/ChangeLog
+++ b/media-sound/mp3kult/ChangeLog
@@ -1,8 +1,27 @@
 # ChangeLog for media-sound/mp3kult
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3kult/ChangeLog,v 1.1 2002/12/05 22:52:19 rphillips Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3kult/ChangeLog,v 1.1.1.1 2005/11/30 09:38:42 chriswhite Exp $
+
+*mp3kult-0.7-r3 (30 Oct 2005)
+
+  30 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> +mp3kult-0.7-r3.ebuild:
+  Cleanup of ebuild as per bug #109784 to use kde eclass.
+
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> mp3kult-0.7-r1.ebuild,
+  mp3kult-0.7-r2.ebuild:
+  Don't install COPYING, INSTALL and ABOUT-NLS files. Use double brakets for
+  tests.
+
+*mp3kult-0.7-r2 (11 Jul 2005)
+
+  11 Jul 2005; Frank van de Pol <fvdpol@gentoo.org> +mp3kult-0.7-r2.ebuild:
+  Added fake homedir to fix kde/qt sandbox problems. Closes bug #82376.
+
+  03 Aug 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mp3kult-0.7-r1.ebuild:
+  Added kdelibs to DEPEND to fix bug #58549.
+
+  13 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mp3kult-0.7-r1.ebuild:
+  Added to ~sparc and ~amd64
 
-*mp3kult-0.7 (05 Dec 2002)
-  05 Dec 2002; Ryan Phillips <rphillips@gentoo.org> mp3kult-0.7.ebuild :
-  New package. Submitted by Tobias Bayer. Fixes #8570
-  
diff --git a/media-sound/mp3kult/Manifest b/media-sound/mp3kult/Manifest
index e69de29bb2d1..223080eed648 100644
--- a/media-sound/mp3kult/Manifest
+++ b/media-sound/mp3kult/Manifest
@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9a4e9a125501febfc016ad98f748b499 ChangeLog 990
+MD5 7b989c066e996f89f577698ff23a71ed files/digest-mp3kult-0.7-r1 63
+MD5 7b989c066e996f89f577698ff23a71ed files/digest-mp3kult-0.7-r2 63
+MD5 7b989c066e996f89f577698ff23a71ed files/digest-mp3kult-0.7-r3 63
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 345a61e8b9807860f5d029d4219895df mp3kult-0.7-r1.ebuild 894
+MD5 d5961a558aa43f5438f74222062f1497 mp3kult-0.7-r2.ebuild 1368
+MD5 f262116e7ba5dc8e832ccaed8e9eb028 mp3kult-0.7-r3.ebuild 594
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDZOesj5H05b2HAEkRArowAJ9gTK15Cv+hFOEweBJiK2DbVyVczwCfTGlB
+ZBlltVX0wLQwjvfqd8vKgWw=
+=9g5p
+-----END PGP SIGNATURE-----
diff --git a/media-sound/mp3kult/mp3kult-0.7-r1.ebuild b/media-sound/mp3kult/mp3kult-0.7-r1.ebuild
index cb77b8650e0a..454005b2b2c5 100644
--- a/media-sound/mp3kult/mp3kult-0.7-r1.ebuild
+++ b/media-sound/mp3kult/mp3kult-0.7-r1.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/media-sound/mp3kult/mp3kult-0.7-r1.ebuild,v 1.1 2003/06/21 11:29:17 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3kult/mp3kult-0.7-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:42 chriswhite Exp $
+
+IUSE=""
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Mp3Kult organizes your mp3/ogg collection in a Mysql database."
 HOMEPAGE="http://mp3kult.sourceforge.net"
 SRC_URI="mirror://sourceforge/mp3kult/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~sparc ~amd64"
 
 DEPEND=">=dev-db/mysql-3.22.32
+	kde-base/kdelibs
 	>=media-libs/id3lib-3.7.13
 	>=media-libs/libogg-1.0
 	>=media-libs/libvorbis-1.0"
 
-RDEPEND="${DEPEND}"
-
 src_compile() {
 	export CXXFLAGS="${CXXFLAGS} -DUSE_OLD_FUNCTIONS=1"
+	# For whatever reason defining USE_OLD_FUNCTIONS causes
+	# link errors for ssl; the next line fixes it.
+	export LDFLAGS="-lssl"
 	econf || die
 	emake || die
 }
 
 src_install () {
 	einstall || die
-	dodoc ABOUT-NLS AUTHORS COPYING INSTALL MANUAL NEWS README
+	dodoc AUTHORS MANUAL NEWS README
 }
diff --git a/media-sound/mp3kult/mp3kult-0.7-r2.ebuild b/media-sound/mp3kult/mp3kult-0.7-r2.ebuild
index 92e30b904ebf..42a3a1c16172 100644
--- a/media-sound/mp3kult/mp3kult-0.7-r2.ebuild
+++ b/media-sound/mp3kult/mp3kult-0.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/media-sound/mp3kult/mp3kult-0.7-r2.ebuild,v 1.1 2005/07/11 20:22:07 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3kult/mp3kult-0.7-r2.ebuild,v 1.1.1.1 2005/11/30 09:38:42 chriswhite Exp $
 
 IUSE=""
 
@@ -35,7 +35,7 @@ src_compile() {
 	addwrite "${QTDIR}/etc/settings"
 
 	# things that should access the real homedir
-	[ -d "$REALHOME/.ccache" ] && ln -sf "$REALHOME/.ccache" "$HOME/"
+	[[ -d "$REALHOME/.ccache" ]] && ln -sf "$REALHOME/.ccache" "$HOME/"
 
 	export LDFLAGS="-lssl"
 	econf || die
@@ -44,5 +44,5 @@ src_compile() {
 
 src_install () {
 	einstall || die
-	dodoc ABOUT-NLS AUTHORS COPYING INSTALL MANUAL NEWS README
+	dodoc AUTHORS MANUAL NEWS README
 }
diff --git a/media-sound/mp3kult/mp3kult-0.7-r3.ebuild b/media-sound/mp3kult/mp3kult-0.7-r3.ebuild
index 8f0ec99f6d77..be3e65646a8e 100644
--- a/media-sound/mp3kult/mp3kult-0.7-r3.ebuild
+++ b/media-sound/mp3kult/mp3kult-0.7-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/media-sound/mp3kult/mp3kult-0.7-r3.ebuild,v 1.1 2005/10/30 15:32:47 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3kult/mp3kult-0.7-r3.ebuild,v 1.1.1.1 2005/11/30 09:38:42 chriswhite Exp $
 
 inherit kde
 
diff --git a/media-sound/mp3report/ChangeLog b/media-sound/mp3report/ChangeLog
index c93a93ab8456..3c3fc40d3ed8 100644
--- a/media-sound/mp3report/ChangeLog
+++ b/media-sound/mp3report/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/mp3report
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3report/ChangeLog,v 1.1 2005/10/01 22:05:14 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3report/ChangeLog,v 1.1.1.1 2005/11/30 09:38:23 chriswhite Exp $
+
+  01 Oct 2005; Andrej Kacian <ticho@gentoo.org> mp3report-1.0.2.ebuild:
+  Keyworded ~x86.
 
 *mp3report-1.0.2 (01 Oct 2005)
 
diff --git a/media-sound/mp3report/Manifest b/media-sound/mp3report/Manifest
index 8932bfde823d..3a797e722fcb 100644
--- a/media-sound/mp3report/Manifest
+++ b/media-sound/mp3report/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4a8de1ef1fee740f1ba7d0bd83b68b51 ChangeLog 513
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 0d5c5cba64545b3a2a83a9ef028a63fe ChangeLog 313
-MD5 1c325a6ea7ca56a70e065fdc9c9e76b6 mp3report-1.0.2.ebuild 691
+MD5 08fc5f196c234a78e464e35f4828938c mp3report-1.0.2.ebuild 802
 MD5 ca8b09983e4851f3667c8e3d6d44ed41 files/digest-mp3report-1.0.2 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDPwz8QlM6RnzZP+IRAgYpAJ9+cPGS5c51y6NiWSh0Q5/eLa5TJgCgxR51
+R7HSQ0FTBmAyFXQSApMXXt0=
+=Wdw3
+-----END PGP SIGNATURE-----
diff --git a/media-sound/mp3report/mp3report-1.0.2.ebuild b/media-sound/mp3report/mp3report-1.0.2.ebuild
index 9903c87b97b3..d8f1206f0602 100644
--- a/media-sound/mp3report/mp3report-1.0.2.ebuild
+++ b/media-sound/mp3report/mp3report-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/media-sound/mp3report/mp3report-1.0.2.ebuild,v 1.1 2005/10/01 22:05:14 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3report/mp3report-1.0.2.ebuild,v 1.1.1.1 2005/11/30 09:38:23 chriswhite Exp $
 
 DESCRIPTION="Perl script to create an HTML report of MP3 files in a directory."
 HOMEPAGE="http://mp3report.sourceforge.net/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PF}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/perl-5.8.6
diff --git a/media-sound/mp3splt/ChangeLog b/media-sound/mp3splt/ChangeLog
index 7701184f79cd..6de4bd7a5a43 100644
--- a/media-sound/mp3splt/ChangeLog
+++ b/media-sound/mp3splt/ChangeLog
@@ -1,6 +1,51 @@
 # ChangeLog for media-sound/mp3splt
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt/ChangeLog,v 1.1 2003/05/13 09:43:19 jje Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt/ChangeLog,v 1.1.1.1 2005/11/30 09:38:24 chriswhite Exp $
+
+  14 Sep 2005; Aron Griffis <agriffis@gentoo.org> mp3splt-2.0.ebuild:
+  Mark 2.0 stable on alpha
+
+  28 May 2005; Jan Brinkmann <luckyduck@gentoo.org> mp3splt-2.1.ebuild:
+  Dont make use of the deprecated oggvorbis useflag any longer, see #94254.
+
+  15 Apr 2005; Stephen P. Becker <geoman@gentoo.org> mp3splt-1.9.ebuild,
+  mp3splt-2.0.ebuild, mp3splt-2.1.ebuild:
+  changed to -mips until mad issues are worked out
+
+  23 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> mp3splt-2.1.ebuild:
+  --enable-ogg is broken...
+
+*mp3splt-2.1 (21 Nov 2004)
+
+  21 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +mp3splt-2.1.ebuild:
+  Version bump.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> mp3splt-2.0.ebuild:
+  Stable amd64, sparc.
+
+  03 May 2004; Jeremy Huddleston <eradicator@gentoo.org> mp3splt-1.9.ebuild,
+  mp3splt-2.0.ebuild:
+  Changing mad dep to madplay.
+
+  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> mp3splt-1.9.ebuild,
+  mp3splt-2.0.ebuild:
+  Removed explicit S=.  Stable x86.
+
+*mp3splt-2.0 (18 Jan 2004)
+  
+  18 Jan 2004; Seemant Kulleen <seemant@gentoo.org> mp3splt-2.0.ebuild :
+
+  Version bump
+
+  20 Sep 2003; jje <jje@gentoo.org> mp3splt-1.9.ebuild:
+  Fixed up v1.9 ebuild. Not sure what happened, it was missing install. Closes
+  #29161.
+
+*mp3splt-1.9 (16 Sep 2003)
+
+  16 Sep 2003; Daniel Ahlberg <aliz@gentoo.org> mp3splt-1.9.ebuild :
+  Version bump.
 
 *mp3splt-1.7 (13 May 2003)
 
diff --git a/media-sound/mp3splt/Manifest b/media-sound/mp3splt/Manifest
index d69de599a59e..a4f6f24b37a6 100644
--- a/media-sound/mp3splt/Manifest
+++ b/media-sound/mp3splt/Manifest
@@ -1,3 +1,8 @@
-MD5 d62271564883004361bdfa487ff5d323 mp3splt-1.7.ebuild 498
-MD5 737e1c5b424940a7a28de2520411606e ChangeLog 309
-MD5 ed40267a97242002b30b8c7b6b782309 files/digest-mp3splt-1.7 67
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 52c51e2a9422ff12852e7da7cf1ae387 ChangeLog 1788
+MD5 ab873096f16ae0e4b7dfbad39097b51b mp3splt-1.9.ebuild 626
+MD5 738b93770ae4836639d7976e5b70284b mp3splt-2.1.ebuild 845
+MD5 bed32af5a7e11a8e751ce85933c14e57 mp3splt-2.0.ebuild 656
+MD5 ec72cb8362f4c7c6639a753caae578c5 files/digest-mp3splt-1.9 67
+MD5 cad024d0f5e134b2da7e63f728f73cdd files/digest-mp3splt-2.1 67
+MD5 d36042050af0b92de170e23cd2240e19 files/digest-mp3splt-2.0 67
diff --git a/media-sound/mp3splt/mp3splt-1.9.ebuild b/media-sound/mp3splt/mp3splt-1.9.ebuild
index ab826ea938e8..90b6fc6d5e6e 100644
--- a/media-sound/mp3splt/mp3splt-1.9.ebuild
+++ b/media-sound/mp3splt/mp3splt-1.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/media-sound/mp3splt/mp3splt-1.9.ebuild,v 1.1 2003/09/16 09:12:59 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt/mp3splt-1.9.ebuild,v 1.1.1.1 2005/11/30 09:38:24 chriswhite Exp $
 
 IUSE=""
 
@@ -8,10 +8,19 @@ DESCRIPTION="A command line utility to split mp3 and ogg files"
 HOMEPAGE="http://mp3splt.sourceforge.net/"
 SRC_URI="mirror://sourceforge/mp3splt/${P}-src.tar.gz"
 
-LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+LICENSE="GPL-2"
+KEYWORDS="~x86 -mips"
+
 DEPEND="media-libs/libogg
 	media-libs/libvorbis
-	media-sound/mad"
-S=${WORKDIR}/${P}
+	media-sound/madplay"
+
+src_compile() {
+	econf || die
+	emake || die "build failed"
+}
+
+src_install() {
+	einstall || die "install failed"
+}
diff --git a/media-sound/mp3splt/mp3splt-2.0.ebuild b/media-sound/mp3splt/mp3splt-2.0.ebuild
index f303fd6c0202..48d3d62856f2 100644
--- a/media-sound/mp3splt/mp3splt-2.0.ebuild
+++ b/media-sound/mp3splt/mp3splt-2.0.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/media-sound/mp3splt/mp3splt-2.0.ebuild,v 1.1 2004/01/18 08:49:21 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt/mp3splt-2.0.ebuild,v 1.1.1.1 2005/11/30 09:38:24 chriswhite Exp $
 
 IUSE=""
 
-S=${WORKDIR}/${P}
 DESCRIPTION="A command line utility to split mp3 and ogg files"
 HOMEPAGE="http://mp3splt.sourceforge.net/"
 SRC_URI="mirror://sourceforge/mp3splt/${P}-src.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~amd64"
+KEYWORDS="alpha amd64 ~hppa -mips ~ppc sparc x86"
 
 DEPEND="media-libs/libogg
 	media-libs/libvorbis
-	media-sound/mad"
+	media-sound/madplay"
 
 src_compile() {
 	econf || die
diff --git a/media-sound/mp3splt/mp3splt-2.1.ebuild b/media-sound/mp3splt/mp3splt-2.1.ebuild
index 72dcc6dcc418..05712209c81e 100644
--- a/media-sound/mp3splt/mp3splt-2.1.ebuild
+++ b/media-sound/mp3splt/mp3splt-2.1.ebuild
@@ -1,28 +1,31 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt/mp3splt-2.1.ebuild,v 1.1 2004/11/21 21:41:37 eradicator Exp $
-
-IUSE="oggvorbis"
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt/mp3splt-2.1.ebuild,v 1.1.1.1 2005/11/30 09:38:24 chriswhite Exp $
 
 DESCRIPTION="A command line utility to split mp3 and ogg files"
 HOMEPAGE="http://mp3splt.sourceforge.net/"
 SRC_URI="mirror://sourceforge/mp3splt/${P}-src.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa -mips ~ppc ~sparc ~x86"
+IUSE="ogg"
 
-DEPEND="oggvorbis? ( media-libs/libogg
-	             media-libs/libvorbis )
+DEPEND="ogg? ( media-libs/libogg
+	media-libs/libvorbis )
 	media-libs/libmad"
 
 src_compile() {
-	econf $(use_enable oggvorbis ogg) || die "econf failed"
+	local myconf
+
+	# --enable-ogg doesn't enable ogg...
+	use ogg || myconf="--disable-ogg"
+	econf ${myconf} || die "econf failed"
 
 	emake || die "build failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
+	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS ChangeLog NEWS README
 }
diff --git a/media-sound/mp3wrap/ChangeLog b/media-sound/mp3wrap/ChangeLog
index 99d521c89fd9..26e4f3b782cc 100644
--- a/media-sound/mp3wrap/ChangeLog
+++ b/media-sound/mp3wrap/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for media-sound/mp3wrap
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3wrap/ChangeLog,v 1.1 2003/05/24 11:38:29 jje Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3wrap/ChangeLog,v 1.1.1.1 2005/11/30 09:38:18 chriswhite Exp $
+
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> mp3wrap-0.5.ebuild:
+  Don't install COPYING and INSTALL files. Fixed HOMEPAGE.
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> mp3wrap-0.5.ebuild:
+  Added to ~ppc.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> mp3wrap-0.5.ebuild:
+  Stable sparc.
+
+  23 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> mp3wrap-0.5.ebuild:
+  Added to ~sparc
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> mp3wrap-0.5.ebuild:
+  Stable amd64.
+
+  12 Jun 2003; <msterret@gentoo.org> mp3wrap-0.5.ebuild:
+  fix Header
 
 *mp3wrap-0.5 (24 May 2003)
 
diff --git a/media-sound/mp3wrap/Manifest b/media-sound/mp3wrap/Manifest
index 16baa6da9f9b..25dc267610b2 100644
--- a/media-sound/mp3wrap/Manifest
+++ b/media-sound/mp3wrap/Manifest
@@ -1,2 +1,14 @@
-MD5 c1d36549828f8fe57ec4eff9474b78a5 mp3wrap-0.5.ebuild 517
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 972ebc6aa2821fc9596c76084f7d7d19 ChangeLog 940
+MD5 3d7e926a2667dffcb84aa59057b940cd mp3wrap-0.5.ebuild 611
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 1994c1fb3d9fb7df05b514eb9543a5d8 files/digest-mp3wrap-0.5 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGtMKj5H05b2HAEkRApm9AKCeckDsqtKA9/qS0h4g38L8klXoBgCffy5e
+pd8ywSZWpWKO81BbUzSufcA=
+=urEj
+-----END PGP SIGNATURE-----
diff --git a/media-sound/mp3wrap/mp3wrap-0.5.ebuild b/media-sound/mp3wrap/mp3wrap-0.5.ebuild
index b8f23497bf4e..58d9c315b70b 100644
--- a/media-sound/mp3wrap/mp3wrap-0.5.ebuild
+++ b/media-sound/mp3wrap/mp3wrap-0.5.ebuild
@@ -1,23 +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: 
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3wrap/mp3wrap-0.5.ebuild,v 1.1.1.1 2005/11/30 09:38:18 chriswhite Exp $
+
+IUSE=""
 
 DESCRIPTION="Command-line utility that wraps quickly two or more mp3 files in one single large playable mp3."
 SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
-HOMEPAGE="http://${PN}.sourceforge.net/"
+HOMEPAGE="http://mp3wrap.sourceforge.net/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
-
-IUSE=""
+KEYWORDS="amd64 ~ppc sparc x86"
 
 DEPEND=""
 
 src_install() {
-  dobin mp3wrap
-  doman mp3wrap.1
-  dodoc AUTHORS ChangeLog COPYING INSTALL README
-  dohtml doc/*.html
+	dobin mp3wrap
+	doman mp3wrap.1
+	dodoc AUTHORS ChangeLog README
+	dohtml doc/*.html
 }
-
diff --git a/media-sound/mpc/ChangeLog b/media-sound/mpc/ChangeLog
index 4dcb5fff5b2f..e497b5f3b784 100644
--- a/media-sound/mpc/ChangeLog
+++ b/media-sound/mpc/ChangeLog
@@ -1,6 +1,116 @@
 # ChangeLog for media-sound/mpc
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpc/ChangeLog,v 1.1 2003/08/10 05:29:56 jje Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpc/ChangeLog,v 1.1.1.1 2005/11/30 09:38:28 chriswhite Exp $
+
+*mpc-0.11.2-r1 (16 Oct 2005)
+
+  16 Oct 2005; Andrej Kacian <ticho@gentoo.org> +mpc-0.11.2-r1.ebuild:
+  Added nls USE flag to the ebuild and --disable-dependency-tracking to econf.
+  Closes bug #108822, reported by Natanael Copa <natanael.copa at gmail.com>.
+
+  22 May 2005; Guy Martin <gmsoft@gentoo.org> mpc-0.11.2.ebuild:
+  Stable on hppa.
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> mpc-0.11.2.ebuild:
+  Stable on ppc.
+
+*mpc-0.11.2 (12 Mar 2005)
+
+  12 Mar 2005; Thomas Matthijs <axxo@gentoo.org> +mpc-0.11.2.ebuild:
+  version bump
+
+  11 Feb 2005; Thomas Matthijs <axxo@gentoo.org> mpc-0.11.1.ebuild:
+  enable bash completing w/ bash-completion-config
+
+  19 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> -mpc-0.10.3.ebuild,
+  -mpc-0.11.0.ebuild, -mpc-0.9.2.ebuild:
+  Removing old versions.
+
+  03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> mpc-0.11.1.ebuild:
+  Stable amd64, sparc, x86.
+
+  12 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> mpc-0.11.1.ebuild:
+  ~sparc ~amd64
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> mpc-0.10.3.ebuild,
+  mpc-0.11.0.ebuild, mpc-0.11.1.ebuild, mpc-0.9.2.ebuild:
+  virtual/glibc -> virtual/libc
+
+*mpc-0.11.1 (27 Jun 2004)
+
+  27 Jun 2004; Martin Holzer <mholzer@gentoo.org> mpc-0.11.1.ebuild:
+  Version bumped.
+
+  27 Jun 2004; David Holm <dholm@gentoo.org> mpc-0.11.0.ebuild:
+  Added to ~ppc.
+
+*mpc-0.11.0 (26 Jun 2004)
+
+  26 Jun 2004; Martin Holzer <mholzer@gentoo.org> mpc-0.11.0.ebuild:
+  Version bumped.
+
+  25 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> mpc-0.10.2.ebuild,
+  mpc-0.10.3.ebuild:
+  Stable x86.  Removing old ebuild.
+
+  14 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> mpc-0.10.0.ebuild,
+  mpc-0.10.1.ebuild:
+  Removing old ebuilds.
+
+*mpc-0.10.3 (03 Apr 2004)
+
+  03 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> mpc-0.10.3.ebuild:
+  Version bump.  Bug #46662.
+
+*mpc-0.10.2 (25 Mar 2004)
+
+  25 Mar 2004; Martin Holzer <mholzer@gentoo.org> mpc-0.10.2.ebuild:
+  Version bumped.
+
+*mpc-0.10.1 (14 Mar 2004)
+
+  14 Mar 2004; Martin Holzer <mholzer@gentoo.org> mpc-0.10.1.ebuild:
+  Version bumped.
+
+*mpc-0.10.1 (14 Mar 2004)
+
+  14 Mar 2004; Martin Holzer <mholzer@gentoo.org> mpc-0.10.1.ebuild:
+  Version bumped.
+
+*mpc-0.10.0 (03 Mar 2004)
+
+  03 Mar 2004; Martin Holzer <mholzer@gentoo.org> mpc-0.10.0.ebuild:
+  Version bumped.
+
+  24 Jan 2004; Nick Hadaway <raker@gentoo.org> mpg-0.9.2.ebuild:
+  Marked stable for x86.
+
+*mpc-0.9.2 (31 Oct 2003)
+
+  31 Oct 2003; Martin Holzer <mholzer@gentoo.org> mpc-0.9.1.ebuild,
+  mpc-0.9.2.ebuild:
+  Version bumped & changing to sf
+
+*mpc-0.9.1 (09 Oct 2003)
+
+  09 Oct 2003; Martin Holzer <mholzer@gentoo.org> mpc-0.9.1.ebuild:
+  Version bumped.
+
+*mpc-0.9.0 (08 Oct 2003)
+
+  08 Oct 2003; Martin Holzer <mholzer@gentoo.org> mpc-0.9.0.ebuild:
+  Version bumped.
+
+  21 Sep 2003; jje <jje@gentoo.org> mpc-0.8.0.ebuild, mpc-0.8.1.ebuild:
+  Bump to stable.
+
+*mpc-0.8.1 (13 Aug 2003)
+
+  13 Aug 2003; Nick Hadaway <raker@gentoo.org> mpc-0.8.1.ebuild:
+  Version bump.  Minor ebuild cleanups.
+
+  10 Aug 2003; jje <jje@gentoo.org> mpc-0.8.0.ebuild:
+  Removed RDEPEND. It's doesn't need mpd on the same box...
 
 *mpc-0.8.0 (10 Aug 2003)
 
diff --git a/media-sound/mpc/Manifest b/media-sound/mpc/Manifest
index 443d5a1d7c65..99edcf21b41d 100644
--- a/media-sound/mpc/Manifest
+++ b/media-sound/mpc/Manifest
@@ -1,2 +1,18 @@
-MD5 d46ca1be8543849b5e5d1d53ec30bd47 mpc-0.8.0.ebuild 716
-MD5 7fc16b864e05439382933d91fe71b942 files/digest-mpc-0.8.0 61
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3197109c284471f1405f4cf51d53c811 ChangeLog 3483
+MD5 ab013848b29e651a3af56444dec8b576 files/digest-mpc-0.11.1 62
+MD5 bd15a464df3a1f1cd0f65b81b8aa0b47 files/digest-mpc-0.11.2 62
+MD5 bd15a464df3a1f1cd0f65b81b8aa0b47 files/digest-mpc-0.11.2-r1 62
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 bf405a486f32cddcd75183730f1bea40 mpc-0.11.1.ebuild 633
+MD5 b95814bc24ce83d2211a48e98d76b02a mpc-0.11.2-r1.ebuild 882
+MD5 50de6aa005d4c19ddffa4cd2d3ee1bbd mpc-0.11.2.ebuild 685
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDUuJFQlM6RnzZP+IRAg5MAJ9t4sk/ACj8br5Z/4guuZyY87Kc0gCfX0LO
+3jeS4u60Odsm4E3KEallK5E=
+=z3y6
+-----END PGP SIGNATURE-----
diff --git a/media-sound/mpc/mpc-0.11.1.ebuild b/media-sound/mpc/mpc-0.11.1.ebuild
index f896824d77f4..62837eea749e 100644
--- a/media-sound/mpc/mpc-0.11.1.ebuild
+++ b/media-sound/mpc/mpc-0.11.1.ebuild
@@ -1,30 +1,23 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpc/mpc-0.11.1.ebuild,v 1.1 2004/06/27 11:13:03 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpc/mpc-0.11.1.ebuild,v 1.1.1.1 2005/11/30 09:38:28 chriswhite Exp $
 
-IUSE=""
+inherit bash-completion
 
 DESCRIPTION="A commandline client for Music Player Daemon (media-sound/mpd)"
 SRC_URI="mirror://sourceforge/musicpd/${P}.tar.gz"
 HOMEPAGE="http://www.musicpd.org"
+IUSE=""
 
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc sparc amd64"
 SLOT="0"
 LICENSE="GPL-2"
 
-DEPEND="virtual/glibc"
-
-src_compile() {
-	local myconf
-	myconf="--with-gnu-ld"
-
-	econf ${myconf} || die "could not configure"
-
-	emake || die "emake failed"
-}
+DEPEND="virtual/libc"
 
 src_install() {
-	emake install DESTDIR=${D} || die
-	rm -rf ${D}/usr/share/doc/mpc/
-	dodoc AUTHORS COPYING ChangeLog INSTALL README doc/mpc-bashrc
+	emake install DESTDIR="${D}" || die
+	mv ${D}/usr/share/doc/mpc/ ${D}/usr/share/doc/${PF}
+
+	dobashcompletion doc/mpc-bashrc
 }
diff --git a/media-sound/mpc/mpc-0.11.2-r1.ebuild b/media-sound/mpc/mpc-0.11.2-r1.ebuild
index daa5a4442030..90202500fe6d 100644
--- a/media-sound/mpc/mpc-0.11.2-r1.ebuild
+++ b/media-sound/mpc/mpc-0.11.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/media-sound/mpc/mpc-0.11.2-r1.ebuild,v 1.1 2005/10/16 23:26:38 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpc/mpc-0.11.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:28 chriswhite Exp $
 
 inherit bash-completion
 
diff --git a/media-sound/mpc/mpc-0.11.2.ebuild b/media-sound/mpc/mpc-0.11.2.ebuild
index c481374a4c92..98fa2984eb0d 100644
--- a/media-sound/mpc/mpc-0.11.2.ebuild
+++ b/media-sound/mpc/mpc-0.11.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/media-sound/mpc/mpc-0.11.2.ebuild,v 1.1 2005/03/12 18:15:00 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpc/mpc-0.11.2.ebuild,v 1.1.1.1 2005/11/30 09:38:28 chriswhite Exp $
 
 inherit bash-completion
 
@@ -9,21 +9,12 @@ SRC_URI="mirror://sourceforge/musicpd/${P}.tar.gz http://mercury.chem.pitt.edu/~
 HOMEPAGE="http://www.musicpd.org"
 IUSE=""
 
-KEYWORDS="x86 ~ppc sparc amd64"
+KEYWORDS="x86 ppc sparc amd64 hppa"
 SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="virtual/libc"
 
-src_compile() {
-	local myconf
-	myconf="--with-gnu-ld"
-
-	econf ${myconf} || die "could not configure"
-
-	emake || die "emake failed"
-}
-
 src_install() {
 	emake install DESTDIR="${D}" || die
 	mv ${D}/usr/share/doc/mpc/ ${D}/usr/share/doc/${PF}
diff --git a/media-sound/mpd-svn/ChangeLog b/media-sound/mpd-svn/ChangeLog
index c2ccbd68c540..365b92990128 100644
--- a/media-sound/mpd-svn/ChangeLog
+++ b/media-sound/mpd-svn/ChangeLog
@@ -1,6 +1,127 @@
 # ChangeLog for media-sound/mpd-svn
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd-svn/ChangeLog,v 1.1 2004/11/29 21:55:04 ticho Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd-svn/ChangeLog,v 1.1.1.1 2005/11/30 09:38:20 chriswhite Exp $
+
+  24 Oct 2005; Andrej Kacian <ticho@gentoo.org> files/mpd.rc6:
+  Use nfsmount in initscript depend(). Closes bug #110065, reported by Daniel
+  Willmann <willmann.daniel at web.de>.
+
+*mpd-svn-20051009-r1 (17 Oct 2005)
+
+  17 Oct 2005; Andrej Kacian <ticho@gentoo.org> -files/mpd.pidfile.rc6,
+  files/mpd.rc6, -mpd-svn-20050408-r1.ebuild, -mpd-svn-20050601.ebuild,
+  -mpd-svn-20050731.ebuild, -mpd-svn-20050823.ebuild,
+  -mpd-svn-20050907.ebuild, +mpd-svn-20051009-r1.ebuild:
+  Changed ogg USE flag to vorbis, bug #101877. Changed home directory of mpd
+  user and all related config settings to /var/lib/mpd, bug #101662. Added
+  'use netmount' to initscript depend(). Removed old ebuilds.
+
+*mpd-svn-20051009 (10 Oct 2005)
+
+  10 Oct 2005; Andrej Kacian <ticho@gentoo.org> +mpd-svn-20051009.ebuild:
+  Snapshot update. Upstream fixed configure.ac tests to use .
+
+*mpd-svn-20050907 (07 Sep 2005)
+
+  07 Sep 2005; Andrej Kacian <ticho@gentoo.org> +mpd-svn-20050907.ebuild:
+  Snapshot update. Depend on libmpcdec instead of libmusepack for MPC support.
+  Added oss USE flag. Fixed the use_depend call for mpd-id3tag. Made relevant
+  USE flags also turn on/off appropriate tests (configure switches). Change
+  default db_file, so it doesn't reference user's home directory, since that
+  is set to /dev/null. Suggestions by jat from FreeNode's #mpd channel.
+
+*mpd-svn-20050823 (23 Aug 2005)
+
+  23 Aug 2005; Andrej Kacian <ticho@gentoo.org> +mpd-svn-20050823.ebuild:
+  Updated snapshot.
+
+*mpd-svn-20050731 (30 Jul 2005)
+
+  30 Jul 2005; Andrej Kacian <ticho@gentoo.org> +mpd-svn-20050731.ebuild:
+  Snapshot update.
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> mpd-svn-20050601.ebuild:
+  Added to ~ppc.
+
+*mpd-svn-20050601 (01 Jun 2005)
+
+  01 Jun 2005; Andrej Kacian <ticho@gentoo.org> +mpd-svn-20050601.ebuild:
+  Update.
+
+  28 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -mpd-svn-20041207.ebuild, -mpd-svn-20050131.ebuild,
+  -mpd-svn-20050308.ebuild, -mpd-svn-20050312.ebuild,
+  -mpd-svn-20050328.ebuild, -mpd-svn-20050408.ebuild,
+  mpd-svn-20050408-r1.ebuild:
+  Dont make use of the deprecated oggvorbis useflag any longer, see #94254.
+
+  12 May 2005; Andrej Kacian <ticho@gentoo.org> mpd-svn-20050408-r1.ebuild:
+  Changed 'mpc' USE flag to 'musepack'. Suggested by Andreas Claesson
+  <andreas.claesson@gmail.com>.
+
+  11 May 2005; Andrej Kacian <ticho@gentoo.org> mpd-svn-20050408-r1.ebuild:
+  Require libmusepack >=1.1. Bug spotted by Andreas Claesson
+  <andreas.claesson@gmail.com>, bug #92207.
+
+*mpd-svn-20050408-r1 (09 May 2005)
+
+  09 May 2005; Andrej Kacian <ticho@gentoo.org> +mpd-svn-20050408-r1.ebuild:
+  Added ~amd64 keyword. Added support for musepack, suggested by Nuno
+  Alexandre <ikaro@fluxbox.org>. Closes bug #91993.
+
+*mpd-svn-20050408 (07 Apr 2005)
+
+  07 Apr 2005; Andrej Kacian <ticho@gentoo.org> +mpd-svn-20050408.ebuild:
+  New snapshot. Modify the initscript to 'need alsasound' if alsa USE flag is
+  enabled, so mpd doesn't start without alsa.
+
+*mpd-svn-20050328 (28 Mar 2005)
+
+  28 Mar 2005; Andrej Kacian <ticho@gentoo.org> +mpd-svn-20050328.ebuild:
+  New snapshot.
+
+  13 Mar 2005; Andrej Kacian <ticho@gentoo.org> files/mpd.pidfile.rc6:
+  Fixed pidfile location in initscript.
+
+*mpd-svn-20050312 (13 Mar 2005)
+
+  13 Mar 2005; Andrej Kacian <ticho@gentoo.org> +files/mpd.pidfile.rc6,
+  +mpd-svn-20050312.ebuild:
+  Snapshot update. Use new initfile, based on pidfile, provided by Avuton
+  Olrich <avuton@gmail.com>.
+
+*mpd-svn-20050308 (11 Mar 2005)
+
+  11 Mar 2005; Andrej Kacian <ticho@gentoo.org> files/mpd.rc6,
+  mpd-svn-20041207.ebuild, mpd-svn-20050131.ebuild,
+  +mpd-svn-20050308.ebuild:
+  New snapshot. Made libao dependency optional.
+
+  20 Feb 2005; Andrej Kacian <ticho@gentoo.org> files/mpd.rc6,
+  mpd-svn-20050131.ebuild:
+  Added icecast USE flag.
+
+  14 Feb 2005; Andrej Kacian <ticho@gentoo.org> files/mpd.rc6:
+  Added --signal 1 to initscript's stop function, for proper state file
+  saving. Suggested by Avuton Olrich <avuton@gmail.com>.
+
+*mpd-svn-20050131 (31 Jan 2005)
+
+  31 Jan 2005; Andrej Kacian <ticho@gentoo.org> -mpd-svn-20041129-r1.ebuild,
+  +mpd-svn-20050131.ebuild:
+  Version bump. Fixes memory leak on db update. Closes #80126, reported by
+  Avuton Olrich <avuton@gmail.com>. Removed old ebuild.
+
+*mpd-svn-20041207 (07 Dec 2004)
+
+  07 Dec 2004; Andrej Kacian <ticho@gentoo.org> mpd-svn-20041129-r1.ebuild,
+  -mpd-svn-20041129.ebuild, +mpd-svn-20041207.ebuild:
+  Version bump, some QA.
+
+*mpd-svn-20041129-r1 (30 Nov 2004)
+
+  30 Nov 2004; Andrej Kacian <ticho@gentoo.org> +mpd-svn-20041129-r1.ebuild:
+  Added gperf as a dependency, as pointed out by Warren Dukes.
 
 *mpd-svn-20041129 (29 Nov 2004)
 
diff --git a/media-sound/mpd-svn/Manifest b/media-sound/mpd-svn/Manifest
index c606373434e1..46a0ce1ebc77 100644
--- a/media-sound/mpd-svn/Manifest
+++ b/media-sound/mpd-svn/Manifest
@@ -1,4 +1,17 @@
-MD5 f777a1aecc3dbdf27f435050987cf767 mpd-svn-20041129.ebuild 2767
-MD5 ab49b3978e51630cd199bddd4321bd49 metadata.xml 221
-MD5 a34abcb2b1dc91b330a868d8145e0ac6 files/digest-mpd-svn-20041129 69
-MD5 e1942b96aae7fa8cbc9b738857b5988f files/mpd.rc6 870
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5aaee4580a08242489e872abe32b56e8 ChangeLog 5013
+MD5 5d7578fe5b1a752eac4f981a7c53c4bf files/digest-mpd-svn-20051009 69
+MD5 5d7578fe5b1a752eac4f981a7c53c4bf files/digest-mpd-svn-20051009-r1 69
+MD5 36e14440a7c1815b23099ef9947b6b7f files/mpd.rc6 732
+MD5 28ed49040b6ddc36def2c2a536394b37 metadata.xml 251
+MD5 4e1010fedc8f20c6380e75590d058437 mpd-svn-20051009-r1.ebuild 4518
+MD5 39c2a66ba6d81e6b63a3aaa9ed58223c mpd-svn-20051009.ebuild 3965
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDXOTdQlM6RnzZP+IRAr/nAKCUvggIL4JgA6FLK8tIxrwOj0LleQCeIkgn
+OXbsKtzW81UJLsux6v1YpOs=
+=Vnek
+-----END PGP SIGNATURE-----
diff --git a/media-sound/mpd-svn/files/mpd.rc6 b/media-sound/mpd-svn/files/mpd.rc6
index 074db91e1803..b550fd624c30 100755
--- a/media-sound/mpd-svn/files/mpd.rc6
+++ b/media-sound/mpd-svn/files/mpd.rc6
@@ -1,18 +1,16 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd-svn/files/mpd.rc6,v 1.1 2004/11/29 21:55:04 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd-svn/files/mpd.rc6,v 1.1.1.1 2005/11/30 09:38:20 chriswhite Exp $
+
+pidfile="/var/run/mpd/mpd.pid"
 
 depend() {
 	need localmount
+	use netmount nfsmount
 } 
 
 checkconfig() {
-	if [ -f /etc/conf.d/mpd ]; then
-		eerror "Please remove the /etc/conf.d/mpd file as it is no longer used."
-		eerror "You may configure your mpd settings in /etc/mpd.conf"
-	fi
-
 	if ! [ -f /etc/mpd.conf ]; then
 		eerror "Configuration file /etc/mpd.conf does not exist."
 		return 1
@@ -25,12 +23,12 @@ start() {
 	checkconfig || return 1
 
 	ebegin "Starting Music Player Daemon" 
-	start-stop-daemon --start --quiet --exec /usr/bin/mpd -- --no-create-db /etc/mpd.conf
+	start-stop-daemon --start --exec /usr/bin/mpd -- --no-create-db /etc/mpd.conf
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping Music Player Daemon"
-	start-stop-daemon --stop --quiet --exec /usr/bin/mpd 
+	start-stop-daemon --stop --pidfile ${pidfile}
 	eend $? 
 }
diff --git a/media-sound/mpd-svn/mpd-svn-20051009-r1.ebuild b/media-sound/mpd-svn/mpd-svn-20051009-r1.ebuild
index 42dba12c8278..68d952bfb993 100644
--- a/media-sound/mpd-svn/mpd-svn-20051009-r1.ebuild
+++ b/media-sound/mpd-svn/mpd-svn-20051009-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/media-sound/mpd-svn/mpd-svn-20051009-r1.ebuild,v 1.1 2005/10/17 00:52:17 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd-svn/mpd-svn-20051009-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:20 chriswhite Exp $
 
 inherit eutils
 
@@ -105,7 +105,7 @@ src_install() {
 	dosed 's:^error_file.*$:error_file "/var/log/mpd.error.log":' /etc/mpd.conf
 	dosed 's:^pid_file.*$:pid_file "/var/run/mpd/mpd.pid":' /etc/mpd.conf
 	dosed 's:^db_file.*:db_file "/var/lib/mpd/database":' /etc/mpd.conf
-	dosed 's:^#state_file.*$:state_file "/var/lib/mpd/state:' /etc/mpd.conf
+	dosed 's:^#state_file.*$:state_file "/var/lib/mpd/state":' /etc/mpd.conf
 	diropts -m0755 -o mpd -g audio
 	dodir /var/lib/mpd/music
 	keepdir /var/lib/mpd/music
diff --git a/media-sound/mpd-svn/mpd-svn-20051009.ebuild b/media-sound/mpd-svn/mpd-svn-20051009.ebuild
index a5a79af57a6c..7e2856fd1c6c 100644
--- a/media-sound/mpd-svn/mpd-svn-20051009.ebuild
+++ b/media-sound/mpd-svn/mpd-svn-20051009.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd-svn/mpd-svn-20051009.ebuild,v 1.1 2005/10/10 14:01:49 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd-svn/mpd-svn-20051009.ebuild,v 1.1.1.1 2005/11/30 09:38:20 chriswhite Exp $
 
 inherit eutils
 
diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index 12366ac59d17..e35479d57801 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,285 @@
 # ChangeLog for media-sound/mpd
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.1 2003/07/17 10:10:51 raker Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.1.1.1 2005/11/30 09:37:49 chriswhite Exp $
+
+*mpd-0.11.5-r2 (01 Nov 2005)
+
+  01 Nov 2005; Andrej Kacian <ticho@gentoo.org> +mpd-0.11.5-r2.ebuild:
+  Changed home directory of mpd user and all related config settings to
+  /var/lib/mpd. Closes bug #83644.
+
+  24 Oct 2005; Andrej Kacian <ticho@gentoo.org> files/mpd.rc6:
+  Use nfsmount in initscript depend(). Closes bug #110065, reported by Daniel
+  Willmann <willmann.daniel at web.de>.
+
+  16 Oct 2005; Andrej Kacian <ticho@gentoo.org> mpd-0.11.5.ebuild,
+  mpd-0.11.5-r1.ebuild:
+  Added a notice about the ogg->vorbis USE flag change.
+
+*mpd-0.11.5-r1 (16 Oct 2005)
+
+  16 Oct 2005; Andrej Kacian <ticho@gentoo.org> files/mpd.rc6,
+  mpd-0.11.5.ebuild, +mpd-0.11.5-r1.ebuild:
+  Modify installed initscript to need alsasound if alsa USE flag is set.
+  Closes bug #99969 by Mike Kelly <pioto01 at gmail.com>. Change ogg USE flag
+  to vorbis, bug #101877. Removed conditional dependency on libogg, as
+  libvorbis itself depends on it. 'use netmount' in initscript depend(),
+  closes bug #103458, by Nikolay Pashenkov <wildfire at ufanet.ru>.
+
+  28 May 2005; Jan Brinkmann <luckyduck@gentoo.org> -mpd-0.11.4.ebuild,
+  -mpd-0.11.4-r1.ebuild, -mpd-0.11.4-r2.ebuild, mpd-0.11.5.ebuild:
+  Dont make use of the deprecated oggvorbis useflag any longer, see #94254.
+
+  22 May 2005; Guy Martin <gmsoft@gentoo.org> mpd-0.11.5.ebuild:
+  Stable on hppa.
+
+  05 May 2005; Jan Brinkmann <luckyduck@gentoo.org> files/mpd.rc6:
+  added option to stop() in the initscript, see #89180 for details
+
+  04 Apr 2005; Thomas Matthijs <axxo@gentoo.org> files/mpd.rc6:
+  add use alsasound to init script
+
+  14 Feb 2005; Andrej Kacian <ticho@gentoo.org> mpd-0.11.4-r1.ebuild,
+  mpd-0.11.4-r2.ebuild, mpd-0.11.4.ebuild, mpd-0.11.5.ebuild:
+  Block media-sound/mpd-svn. Should have done this long ago.
+
+  21 Jan 2005; Lars Weiler <pylon@gentoo.org> mpd-0.11.5.ebuild:
+  Stable on ppc.
+
+*mpd-0.11.5 (07 Nov 2004)
+
+  07 Nov 2004; Thomas Matthijs <axxo@gentoo.org> +mpd-0.11.5.ebuild:
+  Version bump + included some suggestions from Avuton Olrich (#70293)
+
+  06 Nov 2004; Lars Weiler <pylon@gentoo.org> mpd-0.11.4-r2.ebuild:
+  Stable on ppc.
+
+  30 Oct 2004; Chris White <chriswhite@gentoo.org> mpd-0.11.4-r2.ebuild:
+  Fixed some permissions issues in mpd for ferringb as per bug #64558.
+
+*mpd-0.11.4-r2 (29 Oct 2004)
+
+  29 Oct 2004; Brian Harring <ferringb@gentoo.org> +mpd-0.11.4-r2.ebuild:
+  Create the initial log files/directories w/ appropriate perms. (#64558)
+
+  20 Oct 2004; Guy Martin <gmsoft@gentoo.org> mpd-0.11.4-r1.ebuild:
+  Stable on hppa.
+
+  19 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -mpd-0.11.0-r2.ebuild, -mpd-0.11.1-r2.ebuild, -mpd-0.11.2-r2.ebuild,
+  -mpd-0.11.3.ebuild:
+  Removing old versions.
+
+  18 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mpd-0.11.4-r1.ebuild:
+  Stable amd64, sparc, x86.
+
+*mpd-0.11.4-r1 (17 Sep 2004)
+
+  17 Sep 2004; Brian Harring <ferringb@gentoo.org> +mpd-0.11.4-r1.ebuild:
+  removed USE="droproot", it's now default.
+
+  16 Sep 2004; Guy Martin <gmsoft@gentoo.org> mpd-0.11.4.ebuild:
+  Stable on hppa.
+
+  03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> mpd-0.11.4.ebuild:
+  Stable amd64, sparc, x86.
+
+*mpd-0.11.4 (08 Aug 2004)
+
+  08 Aug 2004; Martin Holzer <mholzer@gentoo.org> +mpd-0.11.4.ebuild:
+  Version bumped. Closes 58022
+
+*mpd-0.11.4 (29 Jul 2004)
+
+  29 Jul 2004; Brian Harring <ferringb@gentoo.org> mpd-0.11.3.ebuild,
+  +mpd-0.11.4.ebuild:
+  version bumped.  added ~ppc back into 0.11.3 .
+
+*mpd-0.11.3 (28 Jul 2004)
+
+  28 Jul 2004; Martin Holzer <mholzer@gentoo.org> mpd-0.11.3.ebuild:
+  Version bumped.
+
+  26 Jul 2004; Brian Harring <ferringb@gentoo.org> mpd-0.11.0-r2.ebuild,
+  mpd-0.11.1-r2.ebuild, mpd-0.11.2-r2.ebuild:
+  corrected invalib depend syntax for libmikmod, bug #58347
+
+  26 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> mpd-0.11.2-r2.ebuild:
+  Syncing USE flags... adding missing alsa to IUSE.
+
+*mpd-0.11.2-r2 (22 Jul 2004)
+
+  22 Jul 2004; Brian Harring <ferringb@gentoo.org> mpd-0.11.0-r1.ebuild,
+  mpd-0.11.0-r2.ebuild, mpd-0.11.1-r1.ebuild, mpd-0.11.1-r2.ebuild,
+  mpd-0.11.2-r1.ebuild, mpd-0.11.2-r2.ebuild, files/mpd.rc6:
+  revbumping due to error in the installed config :/ .  See bug #57999 .
+  Many thanks to Antoine Marmignon for catching it.
+
+*mpd-0.11.2-r1 (22 Jul 2004)
+
+  22 Jul 2004; Brian Harring <ferringb@gentoo.org> mpd-0.10.3-r1.ebuild,
+  mpd-0.10.4.ebuild, mpd-0.11.2.ebuild, mpd-0.9.4-r1.ebuild, mpd-0.11.2-r1.ebuild:
+  Cleaning up of older versions, fixed depends in 0.11.2 and added
+  USE="droproot" in a revbump.
+
+*mpd-0.11.1-r1 (22 Jul 2004)
+
+  22 Jul 2004; Brian Harring <ferringb@gentoo.org> metadata.xml,
+  mpd-0.11.0-r1.ebuild, mpd-0.11.0.ebuild, mpd-0.11.1-r1.ebuild,
+  mpd-0.11.1.ebuild, files/mpd.rc6:
+  revbumping 0.11.0 and 0.11.1 to push out corrected deps/configuration
+  handling, added USE="droproot" option to control whether mpd runs as root, or
+  user mpd, and adjusted the default configuration so that it binds strictly to
+  localhost. These changes are intended to secure the default install- versions
+  beyond 0.11.2 will install mpd as non-root by default.  Corrected init.d script
+  so that /etc/mpd.conf is used (was fixed once upon a time, but crept back in)
+  which closes bug #56132 .
+
+*mpd-0.11.2 (21 Jul 2004)
+
+  21 Jul 2004; Martin Holzer <mholzer@gentoo.org> mpd-0.11.2.ebuild:
+  Version bumped.
+
+  16 Jul 2004; Brian Harring <ferringb@gentoo.org> mpd-0.11.0.ebuild:
+  Stabling 0.11.0 for x86.
+
+*mpd-0.11.1 (27 Jun 2004)
+
+  27 Jun 2004; Martin Holzer <mholzer@gentoo.org> mpd-0.11.1.ebuild:
+  Version bumped. Closes 54616
+
+  27 Jun 2004; Martin Holzer <mholzer@gentoo.org> mpd-0.11.0.ebuild:
+  changed the port to std port
+
+  27 Jun 2004; David Holm <dholm@gentoo.org> mpd-0.11.0.ebuild:
+  Added to ~ppc.
+
+*mpd-0.11.0 (26 Jun 2004)
+
+  26 Jun 2004; Martin Holzer <mholzer@gentoo.org> mpd-0.11.0.ebuild:
+  Version bumped.
+
+*mpd-0.10.4 (26 May 2004)
+
+  26 May 2004; Martin Holzer <mholzer@gentoo.org> mpd-0.10.4.ebuild:
+  Version bumped.
+
+*mpd-0.9.4-r1 (24 May 2004)
+
+  24 May 2004; Brian Harring <ferringb@gentoo.org> mpd-0.10.3-r1.ebuild,
+  mpd-0.10.3.ebuild, mpd-0.9.4-r1.ebuild, mpd-0.9.4.ebuild, files/mpd.rc6:
+  Rev-bumped 0.9.4 and 10.3 to -r1, fixed init script.  bug #51748
+
+  03 May 2004; Jeremy Huddleston <eradicator@gentoo.org> mpd-0.10.3.ebuild,
+  mpd-0.9.4.ebuild:
+  Changing mad dep to madplay.
+
+  25 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> mpd-0.10.2.ebuild,
+  mpd-0.10.3.ebuild:
+  Stable x86.  Removing old ebuild.
+
+  22 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> mpd-0.10.2.ebuild,
+  mpd-0.10.3.ebuild:
+  flac added to IUSE to close bug #48656.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> mpd-0.10.2.ebuild,
+  mpd-0.10.3.ebuild, mpd-0.9.4.ebuild, files/mpd.conf, files/mpd.rc6:
+  Init script reworked per upstream request.  Bug #48210.
+
+  14 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> mpd-0.10.1.ebuild:
+  Removing old ebuilds.
+
+  13 Apr 2004; Jason Wever <weeve@gentoo.org> mpd-0.10.3.ebuild:
+  Added ~sparc keyword.
+
+*mpd-0.10.3 (03 Apr 2004)
+
+  03 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> mpd-0.10.3.ebuild:
+  Version bump.  Bug #46662.
+
+  30 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> mpd-0.10.0.ebuild,
+  mpd-0.10.1.ebuild, mpd-0.10.2.ebuild, mpd-0.9.2.ebuild, mpd-0.9.3.ebuild,
+  mpd-0.9.4.ebuild:
+  Removing old ebuilds... updating libao DEPEND for bug #46067.
+
+  28 Mar 2004; Jon Portnoy <avenj@gentoo.org> mpd-0.10.2.ebuild :
+  AMD64 keywords.
+
+  26 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> mpd-0.10.2.ebuild:
+  Added USE flags to control more configure options.
+
+*mpd-0.10.2 (25 Mar 2004)
+
+  25 Mar 2004; Martin Holzer <mholzer@gentoo.org> mpd-0.10.2.ebuild:
+  Version bumped.
+
+*mpd-0.10.1 (10 Mar 2004)
+
+  10 Mar 2004; Martin Holzer <mholzer@gentoo.org> mpd-0.10.1.ebuild:
+  Version bumped.
+
+  04 Mar 2004; Brian Harring <ferringb@gentoo.org> mpd-0.9.4.ebuild,
+  files/mpd.rc6:
+  Bumping to stable on x86, adding ~amd64 keywording.
+
+*mpd-0.10.0 (03 Mar 2004)
+
+  03 Mar 2004; Martin Holzer <mholzer@gentoo.org> mpd-0.10.0.ebuild,
+  files/mpd.rc6:
+  Version bumped.
+
+  27 Jan 2004; Nick Hadaway <raker@gentoo.org> files/mpd.rc6:
+  Added a more robust mpd.rc6 as suggested by Starz McCllelan on
+  bug #39270.  It allows for reading in daemon config values from
+  /etc/mpd.conf or ~/.mpd/mpdconf instead of from conf.d. 
+
+*mpd-0.9.4 (20 Jan 2004)
+
+  20 Jan 2004; Nick Hadaway <raker@gentoo.org> mpd-0.9.4.ebuild:
+  Version bump.  Please comment on bug #38880 so we can get this marked
+  stable. :)
+
+  19 Nov 2003; Martin Holzer <mholzer@gentoo.org> mpd-0.9.3.ebuild,
+  files/mpd.conf, files/mpd.rc6:
+  adding init script. submitted by Nikl <gentoo-bugzilla@nikl.net> in #26513.
+
+*mpd-0.9.3 (31 Oct 2003)
+
+  31 Oct 2003; Martin Holzer <mholzer@gentoo.org> mpd-0.9.2.ebuild,
+  mpd-0.9.3.ebuild:
+  Version bumped & changed SRC_RI to sf
+
+*mpd-0.9.2 (09 Oct 2003)
+
+  09 Oct 2003; Martin Holzer <mholzer@gentoo.org> mpd-0.9.2.ebuild:
+  Version bumped.
+
+*mpd-0.9.1 (08 Oct 2003)
+
+  08 Oct 2003; Martin Holzer <mholzer@gentoo.org> mpd-0.9.1.ebuild:
+  Version bumped.
+
+*mpd-0.8.7 (21 Sep 2003)
+
+  21 Sep 2003; jje <jje@gentoo.org> mpd-0.8.5.ebuild, mpd-0.8.7.ebuild:
+  Version bump. Removed old version. Closes #27331.
+
+*mpd-0.8.5 (18 Aug 2003)
+
+  18 Aug 2003; Nick Hadaway <raker@gentoo.org> mpd-0.8.5.ebuild:
+  Version bump.  Removed 0.8.4 as there is a typo in the sources,
+  etc.  See bug #26841.
+
+*mpd-0.8.4 (13 Aug 2003)
+
+  13 Aug 2003; Nick Hadaway <raker@gentoo.org> mpd-0.8.4.ebuild:
+  Version bump.  Closes bug #26548
+
+*mpd-0.8.2 (31 Jul 2003)
+
+  31 Jul 2003; rob holland <tigger@gentoo.org> mpd-0.8.2.ebuild:
+  Version bump, noted by sbh <starz@antisocial.com>, closes #25147
 
 *mpd-0.8.1 (17 Jul 2003)
 
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 949310f72da9..1c242df2d2b7 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,3 +1,19 @@
-MD5 c7076c364d6baeca26c6a83d88b49c06 mpd-0.8.1.ebuild 1047
-MD5 fd85617c8a07405f9dec0cebe8387ac9 ChangeLog 311
-MD5 584e630a8aba4c01febb8248c9f3247b files/digest-mpd-0.8.1 61
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 75cfbff39f9d16eaefad863150504743 ChangeLog 10093
+MD5 aaa9ab8f094750f87da906c9b0e28a5c files/digest-mpd-0.11.5 63
+MD5 aaa9ab8f094750f87da906c9b0e28a5c files/digest-mpd-0.11.5-r1 63
+MD5 aaa9ab8f094750f87da906c9b0e28a5c files/digest-mpd-0.11.5-r2 63
+MD5 18eeb3875218f95e4351130c755f38e6 files/mpd.rc6 898
+MD5 9fd12e4e26817b28026335eff94d2fde metadata.xml 252
+MD5 93b346619a73f75c37dfc54a54966374 mpd-0.11.5-r1.ebuild 3137
+MD5 d14431a80b5a4b25f2d976f818420759 mpd-0.11.5-r2.ebuild 3341
+MD5 d785bc485b235bd032eca3d7a23a938a mpd-0.11.5.ebuild 2948
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDZ0kgQlM6RnzZP+IRAkbmAJ0WpooUKhEHqKjJYuGr7R5YPhfbNgCfQKtc
+yYzCdm16+I84GsYwUO+GQYQ=
+=yGAt
+-----END PGP SIGNATURE-----
diff --git a/media-sound/mpd/files/mpd.rc6 b/media-sound/mpd/files/mpd.rc6
index f9e0983ad364..19ee5f08e9bd 100644
--- a/media-sound/mpd/files/mpd.rc6
+++ b/media-sound/mpd/files/mpd.rc6
@@ -1,42 +1,37 @@
 #!/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/media-sound/mpd/files/mpd.rc6,v 1.1.1.1 2005/11/30 09:37:49 chriswhite Exp $
 
 depend() {
 	need localmount
+	use netmount nfsmount
 } 
 
 checkconfig() {
-	if [ -z "$PORT" ] || \
-	   [ -z "$MUSIC_DIR" ] || \
-	   [ -z "$PLAYLIST_DIR" ] || \
-	   [ -z "$LOG_FILE" ] || \
-	   [ -z "$ERROR_FILE" ]
-	then
-		eerror "You need to set PORT, MUSIC_DIR, PLAYLIST_DIR,"
-		eerror "	LOG_FILE and ERROR_FILE in /etc/conf.d/mpd"
-                return 1
-        fi
+	if [ -f /etc/conf.d/mpd ]; then
+		eerror "Please remove the /etc/conf.d/mpd file as it is no longer used."
+		eerror "You may configure your mpd settings in /etc/mpd.conf"
+	fi
+
+	if ! [ -f /etc/mpd.conf ]; then
+		eerror "Configuration file /etc/mpd.conf does not exist."
+		return 1
+	fi
+
+	return 0
 }
 
 start() {
 	checkconfig || return 1
-	ebegin "Starting Music Player Daemon" 
-
-	/usr/bin/mpd ${PORT} \
-	             ${MUSIC_DIR} \
-	             ${PLAYLIST_DIR} \
-                     ${LOG_FILE} \
-	             ${ERROR_FILE}
 
+	ebegin "Starting Music Player Daemon" 
+	start-stop-daemon --start --quiet --exec /usr/bin/mpd -- --no-create-db /etc/mpd.conf
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping Music Player Daemon"
-
-   killall mpd &>/dev/null 
-
-   eend $? 
+	start-stop-daemon --stop --quiet --exec /usr/bin/mpd --oknodo
+	eend $? 
 }
diff --git a/media-sound/mpd/metadata.xml b/media-sound/mpd/metadata.xml
index e1774e3d9ad7..8aae7e08cc37 100644
--- a/media-sound/mpd/metadata.xml
+++ b/media-sound/mpd/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>sound</herd>
+	<herd>sound</herd>
+	<maintainer>
+		<email>ticho@gentoo.org</email>
+		<name>Andrej Kacian></name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-sound/mpd/mpd-0.11.5-r1.ebuild b/media-sound/mpd/mpd-0.11.5-r1.ebuild
index c23b9304ae21..3a86ca8e07af 100644
--- a/media-sound/mpd/mpd-0.11.5-r1.ebuild
+++ b/media-sound/mpd/mpd-0.11.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/media-sound/mpd/mpd-0.11.5-r1.ebuild,v 1.1 2005/10/16 21:11:44 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.11.5-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:49 chriswhite Exp $
 
 inherit eutils
 
@@ -26,6 +26,11 @@ DEPEND=">=media-libs/libao-0.8.4
 	vorbis? ( media-libs/libvorbis )"
 
 pkg_setup() {
+	echo
+	ewarn "This package now uses 'vorbis' USE flag, instead of 'ogg'."
+	ewarn "See http://bugs.gentoo.org/show_bug.cgi?id=101877 for details."
+	echo
+
 	enewuser mpd '' '' '' audio || die "problem adding user mpd"
 }
 
diff --git a/media-sound/mpd/mpd-0.11.5-r2.ebuild b/media-sound/mpd/mpd-0.11.5-r2.ebuild
index 09f6439e4f46..c869a92b49a8 100644
--- a/media-sound/mpd/mpd-0.11.5-r2.ebuild
+++ b/media-sound/mpd/mpd-0.11.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/media-sound/mpd/mpd-0.11.5-r2.ebuild,v 1.1 2005/11/01 10:48:50 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.11.5-r2.ebuild,v 1.1.1.1 2005/11/30 09:37:49 chriswhite Exp $
 
 inherit eutils
 
@@ -92,11 +92,10 @@ src_install() {
 	dosed 's:^#state_file.*$:state_file "/var/lib/mpd/state":' /etc/mpd.conf
 
 	diropts -m0755 -o mpd -g audio
-	dodir /usr/share/mpd/music
-	keepdir /usr/share/mpd/music
-	dodir /usr/share/mpd/playlists
-	keepdir /usr/share/mpd/playlists
-	dodir /usr/share/mpd/
+	dodir /var/lib/mpd/music
+	keepdir /var/lib/mpd/music
+	dodir /var/lib/mpd/playlists
+	keepdir /var/lib/mpd/playlists
 	insinto /var/log
 	touch ${T}/blah
 	insopts -m0640 -o mpd -g audio
diff --git a/media-sound/mpd/mpd-0.11.5.ebuild b/media-sound/mpd/mpd-0.11.5.ebuild
index 0a95b3b7ae41..acc494ee90e8 100644
--- a/media-sound/mpd/mpd-0.11.5.ebuild
+++ b/media-sound/mpd/mpd-0.11.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/media-sound/mpd/mpd-0.11.5.ebuild,v 1.1 2004/11/07 10:04:53 axxo Exp $
-
-IUSE="oggvorbis mad aac audiofile ipv6 flac mikmod alsa unicode"
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.11.5.ebuild,v 1.1.1.1 2005/11/30 09:37:49 chriswhite Exp $
 
 inherit eutils
 
@@ -10,47 +8,57 @@ DESCRIPTION="Music Player Daemon (mpd)"
 HOMEPAGE="http://www.musicpd.org"
 SRC_URI="http://mercury.chem.pitt.edu/~shank/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc sparc x86"
+IUSE="aac alsa audiofile flac ipv6 mad mikmod unicode vorbis"
 
-DEPEND="oggvorbis? ( media-libs/libvorbis )
-	mad? ( media-libs/libmad
-	       media-libs/libid3tag )
+DEPEND=">=media-libs/libao-0.8.4
+	!media-sound/mpd-svn
+	sys-libs/zlib
 	aac? ( >=media-libs/faad2-2.0_rc2 )
+	alsa? ( media-libs/alsa-lib )
 	audiofile? ( media-libs/audiofile )
 	flac? ( >=media-libs/flac-1.1.0 )
+	mad? ( media-libs/libmad
+	       media-libs/libid3tag )
 	mikmod? ( media-libs/libmikmod )
-	alsa? ( media-libs/alsa-lib )
-	>=media-libs/libao-0.8.4
-	sys-libs/zlib"
+	vorbis? ( media-libs/libvorbis )"
 
 pkg_setup() {
+	echo
+	ewarn "This package now uses 'vorbis' USE flag, instead of 'ogg'."
+	ewarn "See http://bugs.gentoo.org/show_bug.cgi?id=101877 for details."
+	echo
+
 	enewuser mpd '' '' '' audio || die "problem adding user mpd"
 }
 
 src_compile() {
-	econf `use_enable aac` \
-		`use_enable oggvorbis ogg` \
-		`use_enable oggvorbis oggtest` \
-		`use_enable oggvorbis vorbistest` \
-		`use_enable audiofile` \
-		`use_enable audiofile audiofiletest` \
-		`use_enable ipv6` \
-		`use_enable flac libFLACtest` \
-		`use_enable flac` \
-		`use_enable !mad mpd-mad` \
-		`use_enable !mad id3tag` \
-		`use_enable mikmod libmikmodtest` \
-		`use_enable mikmod mod` || die "could not configure"
+	econf \
+		$(use_enable aac) \
+		$(use_enable audiofile) \
+		$(use_enable audiofile audiofiletest) \
+		$(use_enable flac libFLACtest) \
+		$(use_enable flac) \
+		$(use_enable ipv6) \
+		$(use_enable !mad mpd-mad) \
+		$(use_enable !mad id3tag) \
+		$(use_enable mikmod libmikmodtest) \
+		$(use_enable mikmod mod) \
+		$(use_enable vorbis ogg) \
+		$(use_enable vorbis oggtest) \
+		$(use_enable vorbis vorbistest) \
+		|| die "could not configure"
 
 	emake || die "emake failed"
 }
 
 src_install() {
-	emake install DESTDIR=${D} || die
+	make install DESTDIR=${D} || die "make install failed"
+
 	rm -rf ${D}/usr/share/doc/mpd/
-	dodoc COPYING ChangeLog INSTALL README TODO UPGRADING
+	dodoc ChangeLog INSTALL README TODO UPGRADING
 	dodoc doc/COMMANDS doc/mpdconf.example
 
 	insinto /etc
@@ -80,12 +88,14 @@ src_install() {
 	insopts -m0640 -o mpd -g audio
 	newins ${T}/blah mpd.log
 	newins ${T}/blah mpd.error.log
+
+	use alsa && \
+		dosed 's:need :need alsasound :' /etc/init.d/mpd
 }
 
 pkg_postinst() {
-	einfo "libao prior to 0.8.4 has issues with the ALSA drivers"
-	einfo "please refer to the FAQ"
-	einfo "http://www.musicpd.org/wiki/moin.cgi/MpdFAQ if you are having problems."
-	einfo
-	einfo "The default config now binds the daemon strictly to localhost, rather then all available IPs."
+	echo
+	einfo "The default config now binds the daemon strictly to localhost,"
+	einfo "rather then all available IPs."
+	echo
 }
diff --git a/media-sound/mpdscribble/ChangeLog b/media-sound/mpdscribble/ChangeLog
index 6c16902f9fca..0d458aa5b5af 100644
--- a/media-sound/mpdscribble/ChangeLog
+++ b/media-sound/mpdscribble/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for media-sound/mpdscribble
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpdscribble/ChangeLog,v 1.1 2005/09/15 18:15:32 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpdscribble/ChangeLog,v 1.1.1.1 2005/11/30 09:38:23 chriswhite Exp $
+
+*mpdscribble-0.2.7 (10 Nov 2005)
+
+  10 Nov 2005; Tom Martin <slarti@gentoo.org> +mpdscribble-0.2.7.ebuild:
+  Version bump to 0.2.7.
+
+  29 Oct 2005; Tom Martin <slarti@gentoo.org> files/mpdscribble.rc:
+  A few grammar and consistency corrections in the RC script's messages.
+
+  15 Oct 2005; Joseph Jezak <josejx@gentoo.org> mpdscribble-0.2.6.ebuild:
+  Marked ~ppc for bug #107814.
+
+  17 Sep 2005; Thomas Matthijs <axxo@gentoo.org> mpdscribble-0.2.6.ebuild:
+  Fix dep, keyword ~x86
+
+  17 Sep 2005; Tom Martin <slarti@gentoo.org> mpdscribble-0.2.6.ebuild:
+  Alter DEPEND, resolves bug #106172.
+
+  16 Sep 2005; Tom Martin <slarti@gentoo.org> mpdscribble-0.2.6.ebuild:
+  Added an RDEPEND for mpd or mpd-svn. I really am scatter-brained.
 
 *mpdscribble-0.2.6 (15 Sep 2005)
 
diff --git a/media-sound/mpdscribble/Manifest b/media-sound/mpdscribble/Manifest
index 206b4769a6e4..4a575f587f4a 100644
--- a/media-sound/mpdscribble/Manifest
+++ b/media-sound/mpdscribble/Manifest
@@ -1,4 +1,17 @@
-MD5 d8df40b157d2fe2a7de7bdc3c586aded mpdscribble-0.2.6.ebuild 1113
-MD5 ac8292cf54418efa89fa3e29c0c1cacb metadata.xml 686
-MD5 22daeb4585fbe5bdb0cd7f98277cded9 files/mpdscribble.rc 477
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4eb28b99b4da5134c166ccecdd5edf21 ChangeLog 1174
 MD5 bb3bc554122fe799b840d3af19e2a511 files/digest-mpdscribble-0.2.6 69
+MD5 6abc4c9fdc278789d117ab53d6747338 files/digest-mpdscribble-0.2.7 69
+MD5 71c7208eb53a7506d94cb45fe106edd2 files/mpdscribble.rc 464
+MD5 ac8292cf54418efa89fa3e29c0c1cacb metadata.xml 686
+MD5 fa1fa2167fa5e50ef66faded5580d395 mpdscribble-0.2.6.ebuild 1114
+MD5 1ffd7069d44142008df7c3d2c273209c mpdscribble-0.2.7.ebuild 1114
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDc7A+CHk4+ZoBpvsRAu8pAKCA6zjQS9RafQw947RY5ersj2sJdwCgr6jV
+caQf806IVTVtOG4fTq8AHGY=
+=RliA
+-----END PGP SIGNATURE-----
diff --git a/media-sound/mpdscribble/files/mpdscribble.rc b/media-sound/mpdscribble/files/mpdscribble.rc
index 6aa6cd5c46c1..09beb6a32e42 100644
--- a/media-sound/mpdscribble/files/mpdscribble.rc
+++ b/media-sound/mpdscribble/files/mpdscribble.rc
@@ -12,7 +12,7 @@ start () {
 }
 
 stop () {
-	ebegin "Stopping Music Player Daemon Audioscrobbler Client: mpdscribble"
+	ebegin "Stopping Music Player Daemon Audioscrobbler client"
 	start-stop-daemon --stop --quiet -p /var/run/mpdscribble.pid -m --exec /usr/bin/mpdscribble || eerror "mpdscribble is not running"
 	rm -f /var/run/mpdscribble.pid
 	eend $?
diff --git a/media-sound/mpdscribble/mpdscribble-0.2.6.ebuild b/media-sound/mpdscribble/mpdscribble-0.2.6.ebuild
index 13a5ffc27b87..f518dca4976c 100644
--- a/media-sound/mpdscribble/mpdscribble-0.2.6.ebuild
+++ b/media-sound/mpdscribble/mpdscribble-0.2.6.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/media-sound/mpdscribble/mpdscribble-0.2.6.ebuild,v 1.1 2005/09/15 18:15:32 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpdscribble/mpdscribble-0.2.6.ebuild,v 1.1.1.1 2005/11/30 09:38:23 chriswhite Exp $
 
 DESCRIPTION="An MPD client that submits information to audioscrobbler."
 HOMEPAGE="http://scribble.frob.nl/"
 SRC_URI="http://warp.frob.nl/projects/scribble/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
-DEPEND=">=dev-libs/glib-2.0
-	>=net-libs/libsoup-2.0
-	>=dev-libs/libxml2-2.0
-	>=net-libs/gnutls-1.2.4
-	>=dev-libs/libgcrypt-1.2.1"
+DEPEND=">=net-libs/libsoup-2.0"
 
 src_install() {
 	make DESTDIR=${D} install || die
@@ -22,8 +18,7 @@ src_install() {
 	doexe setup.sh
 
 	doman mpdscribble.1
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/mpdscribble.rc mpdscribble
+	newinitd ${FILESDIR}/mpdscribble.rc mpdscribble
 
 	dodoc AUTHORS ChangeLog NEWS README TODO
 
diff --git a/media-sound/mpdscribble/mpdscribble-0.2.7.ebuild b/media-sound/mpdscribble/mpdscribble-0.2.7.ebuild
index 0a6315846d12..ba16f3e23326 100644
--- a/media-sound/mpdscribble/mpdscribble-0.2.7.ebuild
+++ b/media-sound/mpdscribble/mpdscribble-0.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/media-sound/mpdscribble/mpdscribble-0.2.7.ebuild,v 1.1 2005/11/10 20:40:17 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpdscribble/mpdscribble-0.2.7.ebuild,v 1.1.1.1 2005/11/30 09:38:23 chriswhite Exp $
 
 DESCRIPTION="An MPD client that submits information to audioscrobbler."
 HOMEPAGE="http://scribble.frob.nl/"
diff --git a/media-sound/mpfc/ChangeLog b/media-sound/mpfc/ChangeLog
index 38ce123f69f8..cccd20928b28 100644
--- a/media-sound/mpfc/ChangeLog
+++ b/media-sound/mpfc/ChangeLog
@@ -1,6 +1,37 @@
 # ChangeLog for media-sound/mpfc
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpfc/ChangeLog,v 1.1 2004/09/29 21:18:45 pkdawson Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpfc/ChangeLog,v 1.1.1.1 2005/11/30 09:38:30 chriswhite Exp $
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> mpfc-1.3.5.ebuild:
+  Stable on ppc.
+
+  28 May 2005; Jan Brinkmann <luckyduck@gentoo.org> -mpfc-1.3.2.ebuild,
+  -mpfc-1.3.3.ebuild, -mpfc-1.3.4.ebuild, mpfc-1.3.5.ebuild:
+  Dont make use of the deprecated oggvorbis useflag any longer, see #94254.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> mpfc-1.3.5.ebuild:
+  Stable amd64, sparc, x86.
+
+*mpfc-1.3.5 (18 Nov 2004)
+
+  18 Nov 2004; Patrick Dawson <pkdawson@gentoo.org> +mpfc-1.3.5.ebuild:
+  Version bump.
+
+*mpfc-1.3.4 (25 Oct 2004)
+
+  25 Oct 2004; Patrick Dawson <pkdawson@gentoo.org> +mpfc-1.3.4.ebuild:
+  Version bump.
+
+*mpfc-1.3.3 (24 Oct 2004)
+
+  24 Oct 2004; Patrick Dawson <pkdawson@gentoo.org> +mpfc-1.3.3.ebuild:
+  Version bump.
+
+  17 Oct 2004; David Holm <dholm@gentoo.org> mpfc-1.3.2.ebuild:
+  Added to ~ppc.
+
+  29 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> mpfc-1.3.2.ebuild:
+  Added to ~sparc and ~amd64.  get_libdir support added.
 
 *mpfc-1.3.2 (29 Sep 2004)
 
diff --git a/media-sound/mpfc/Manifest b/media-sound/mpfc/Manifest
index 712102ad64da..67734e8282a2 100644
--- a/media-sound/mpfc/Manifest
+++ b/media-sound/mpfc/Manifest
@@ -1,2 +1,4 @@
-MD5 4138e3c9d5869364757a4e8d41b4be0a mpfc-1.3.2.ebuild 913
-MD5 7efeab71fe6d7846f773eee95fa30adf files/digest-mpfc-1.3.2 62
+MD5 83c2574543d0501303b57050254e3880 metadata.xml 222
+MD5 1b502c101bce2118591e56b47a144fe9 ChangeLog 1293
+MD5 19bc8d221f73a481c63912439448e667 mpfc-1.3.5.ebuild 1205
+MD5 c0c7b69cf8c28de749eb8f5f3866c91a files/digest-mpfc-1.3.5 62
diff --git a/media-sound/mpfc/mpfc-1.3.5.ebuild b/media-sound/mpfc/mpfc-1.3.5.ebuild
index e42091abbac8..c9db8c36e332 100644
--- a/media-sound/mpfc/mpfc-1.3.5.ebuild
+++ b/media-sound/mpfc/mpfc-1.3.5.ebuild
@@ -1,28 +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/media-sound/mpfc/mpfc-1.3.5.ebuild,v 1.1 2004/11/18 18:02:23 pkdawson Exp $
-
-IUSE="alsa oss esd mad oggvorbis gpm"
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpfc/mpfc-1.3.5.ebuild,v 1.1.1.1 2005/11/30 09:38:30 chriswhite Exp $
 
 inherit eutils
 
 DESCRIPTION="Music Player For Console"
 HOMEPAGE="http://mpfc.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86 ~ppc"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE="alsa esd gpm mad ogg oss"
 
 RDEPEND="alsa? ( >=media-libs/alsa-lib-0.9.0 )
 	esd? ( >=media-sound/esound-0.2.22 )
+	gpm? ( >=sys-libs/gpm-1.19.3 )
 	mad? ( media-libs/libmad )
-	oggvorbis? ( media-libs/libvorbis )
-	gpm? ( >=sys-libs/gpm-1.19.3 )"
-
-DEPEND="${RDEPEND}
-	sys-apps/findutils
-	sys-apps/grep
-	sys-apps/sed"
+	ogg? ( media-libs/libogg
+		media-libs/libvorbis )"
 
 src_unpack() {
 	unpack ${A}
@@ -36,20 +32,21 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf="
+	econf \
 		$(use_enable alsa) \
-		$(use_enable oss) \
 		$(use_enable esd) \
-		$(use_enable mad mp3) \
-		$(use_enable oggvorbis ogg) \
 		$(use_enable gpm) \
-		--sysconfdir=/etc"
-	econf ${myconf} || die
+		$(use_enable mad mp3) \
+		$(use_enable ogg) \
+		$(use_enable oss) \
+		--sysconfdir=/etc \
+		|| die "configure failed"
+
 	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
+	make DESTDIR="${D}" install || die "make install failed"
 
 	insinto /etc
 	doins mpfcrc
diff --git a/media-sound/mpg123/ChangeLog b/media-sound/mpg123/ChangeLog
index b4929a554d7e..c6ff714ae699 100644
--- a/media-sound/mpg123/ChangeLog
+++ b/media-sound/mpg123/ChangeLog
@@ -1,6 +1,367 @@
 # ChangeLog for media-sound/mpg123
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/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/media-sound/mpg123/ChangeLog,v 1.1.1.1 2005/11/30 09:38:16 chriswhite Exp $
+
+  17 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/mpg123-respectusercflags.patch, mpg123-0.59s-r10.ebuild:
+  Added patch to respect user-defined CFLAGS on amd64. Patch by Simon
+  Strandman in bug #87539.
+
+  02 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> mpg123-0.59s-r8.ebuild,
+  mpg123-0.59s-r9.ebuild, mpg123-0.59s-r10.ebuild:
+  Cleanup of latest ebuild (double brackets tests, don't install COPYING).
+  Avoid cp -d on others.
+
+*mpg123-0.59s-r10 (13 Aug 2005)
+
+  13 Aug 2005; Tony Vroon <chainsaw@gentoo.org>
+  +files/0.59s-set-terminal-line-settings-once.patch,
+  +mpg123-0.59s-r10.ebuild:
+  Revision bump; only set terminal line settings once, not for every new song
+  (can make terminal unusable after use of -c option). Patch by Andrzej
+  Zaborowski <balrogg@gmail.com>, closes bug #70592.
+
+  27 Jun 2005; Lina Pezzella <j4rg0n@gentoo.org> mpg123-0.59s-r9.ebuild:
+  Stable ppc-macos
+
+  10 Apr 2005; Lina Pezzella <j4rg0n@gentoo.org> +files/mpg123-osx.diff,
+  mpg123-0.59s-r9.ebuild:
+  Patched and testing ppc-macos.
+
+  10 Jan 2005; Hardave Riar <hardave@gentoo.org> mpg123-0.59s-r9.ebuild:
+  Stable on mips, bug #76862.
+
+  08 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> mpg123-0.59s-r9.ebuild:
+  Stable on alpha, bug 76862.
+
+  08 Jan 2005; Guy Martin <gmsoft@gentoo.org> mpg123-0.59s-r9.ebuild:
+  Stable on hppa.
+
+  07 Jan 2005; <plasmaroo@gentoo.org> mpg123-0.59s-r9.ebuild:
+  Stable on IA64; bug #76862.
+
+  07 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  mpg123-0.59s-r9.ebuild:
+  Stable ppc64.  Bugs #69512, #76862.
+
+  06 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -mpg123-0.59s-r6.ebuild, -mpg123-0.59s-r7.ebuild:
+  Removing some older insecure versions.
+
+  06 Jan 2005; Michael Hanselmann <hansmi@gentoo.org>
+  mpg123-0.59s-r9.ebuild:
+  Stable on ppc.
+
+*mpg123-0.59s-r9 (06 Jan 2005)
+
+  06 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +mpg123-0.59s-r9.ebuild:
+  Revision bump for CAN-2004-0991.
+
+  30 Dec 2004; Hardave Riar <hardave@gentoo.org> mpg123-0.59s-r8.ebuild:
+  Stable on mips, bug #74692
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  20 Dec 2004; Markus Rothe <corsair@gentoo.org> mpg123-0.59s-r8.ebuild:
+  Stable on ppc64
+
+  19 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> mpg123-0.59s-r8.ebuild:
+  Stable on alpha, bug 74692.
+
+  19 Dec 2004; Michael Hanselmann <hansmi@gentoo.org>
+  mpg123-0.59s-r8.ebuild:
+  Stable on ppc.
+
+*mpg123-0.59s-r8 (18 Dec 2004)
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +mpg123-0.59s-r8.ebuild:
+  Security fix for bug #74692.
+
+  23 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mpg123-0.59s-r7.ebuild:
+  Changing default sparc player to '-generic' to work with 2.6 kernels.
+
+*mpg123-0.59s-r7 (03 Nov 2004)
+
+  03 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/mpg123-0.59s-r6-ppc64.patch, +mpg123-0.59s-r7.ebuild:
+  Revbump to fix 64bit problem.  See bugs #25587 and #69512.
+
+  03 Nov 2004; Markus Rothe <corsair@gentoo.org>
+  +files/mpg123-0.59s-r6-ppc64.patch, mpg123-0.59s-r6.ebuild:
+  Added ppc64 specific patch
+
+  30 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/0.59s-generic.patch, -files/mpg123-0.59s-CAN-2004-0805.patch,
+  -files/mpg123-0.59s-Makefile.patch, -files/mpg123-0.59s-amd64.patch,
+  -files/mpg123-0.59s-heapfix.diff, -files/mpg123-0.59s-ppc64.patch,
+  -files/mpg123-0.59s-security.diff, -mpg123-0.59s-r4.ebuild,
+  -mpg123-0.59s-r5.ebuild:
+  Removing insecure versions.
+
+  30 Oct 2004; Stephen P. Becker <geoman@gentoo.org> mpg123-0.59s-r6.ebuild:
+  stable on mips
+
+  30 Oct 2004; Tom Gall <tgall@gentoo.org> mpg123-0.59s-r6.ebuild:
+  stable on ppc64 bug #68343
+
+  30 Oct 2004; Tom Gall <tgall@gentoo.org> mpg123-0.59s-r5.ebuild:
+  stable on ppc64 bug #68343
+
+  30 Oct 2004; Guy Martin <gmsoft@gentoo.org> mpg123-0.59s-r6.ebuild:
+  Stable on hppa.
+
+  25 Oct 2004; Aron Griffis <agriffis@gentoo.org> mpg123-0.59s-r6.ebuild:
+  stable on ia64
+
+  26 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> mpg123-0.59s-r6.ebuild:
+  Stable on alpha, bug 68343.
+
+  26 Oct 2004; Joseph Jezak <josejx@gentoo.org> mpg123-0.59s-r6.ebuild:
+  Marked ppc stable, bug #68343
+
+*mpg123-0.59s-r6 (25 Oct 2004)
+
+  25 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +mpg123-0.59s-r6.ebuild:
+  More security bugfixes.  See bug #68343.
+
+  24 Oct 2004; Aron Griffis <agriffis@gentoo.org> mpg123-0.59s-r5.ebuild:
+  stable on ia64
+
+  22 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> mpg123-0.59s-r5.ebuild:
+  Stable on alpha, bug 68343.
+
+  22 Oct 2004; Guy Martin <gmsoft@gentoo.org> mpg123-0.59s-r5.ebuild:
+  Stable on hppa.
+
+  22 Oct 2004; Joseph Jezak <josejx@gentoo.org> mpg123-0.59s-r5.ebuild:
+  Fixed patchdir and marked ppc stable, bug #68343
+
+*mpg123-0.59s-r5 (21 Oct 2004)
+
+  21 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -mpg123-0.59s-r2.ebuild, -mpg123-0.59s-r3.ebuild, +mpg123-0.59s-r5.ebuild:
+  Revbump for security bug #68343. Moved patches out of files and onto
+  mirrors. Cleaned up patches.
+
+  18 Oct 2004; Tom Gall <tgall@gentoo.org> mpg123-0.59s-r4.ebuild,
+  +files/mpg123-0.59s-ppc64.patch:
+  stable on ppc64, bug 64490
+
+  18 Sep 2004; Joshua Kinard <kumba@gentoo.org> mpg123-0.59s-r4.ebuild:
+  Marked stable on mips.
+
+  16 Sep 2004; Bryan Østergaard,,, <kloeri@gentoo.org> mpg123-0.59s-r4.ebuild:
+  Stable on alpha, bug 63079.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mpg123-0.59s-r4.ebuild:
+  Stable amd64.
+
+  15 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> mpg123-0.59s-r4.ebuild:
+  Stable on sparc wrt #63079
+
+  15 Sep 2004; Guy Martin <gmsoft@gentoo.org> mpg123-0.59s-r4.ebuild:
+  Stable on hppa.
+
+  14 Sep 2004; Olivier Crete <tester@gentoo.org> mpg123-0.59s-r4.ebuild:
+  Stable on x86
+
+*mpg123-0.59s-r4 (14 Sep 2004)
+
+  14 Sep 2004; <solar@gentoo.org> +files/mpg123-0.59s-CAN-2004-0805.patch,
+  +mpg123-0.59s-r4.ebuild:
+  security bump. bug #63079 : A malicious formatted mp3/2 causes mpg123 to fail
+  header checks, this may allow arbitrary code to be executed with the privilege
+  of the user trying to play the mp3.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mpg123-0.59s-r2.ebuild, mpg123-0.59s-r3.ebuild:
+  virtual/glibc -> virtual/libc
+
+  16 Jun 2004; Gustavo Zacarias <gustavoz@gentoo.org> mpg123-0.59s-r3.ebuild:
+  Fix for hppa & stable
+
+  06 Jun 2004; Jason Wever <weeve@gentoo.org> mpg123-0.59s-r3.ebuild:
+  Stable on sparc.
+
+  31 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mpg123-0.59s-r3.ebuild:
+  Readded ~mips using -generic by default.
+
+  31 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mpg123-0.59s-r3.ebuild:
+  Stable x86.  Assume default settings if no USE flags match to close bug #51750.
+  Removed ~mips as there is no logic to support it.
+
+  26 Apr 2004; Stephen P. Becker <geoman@gentoo.org> mpg123-0.59s-r3.ebuild:
+  Added ~mips keyword.
+
+  12 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mpg123-0.59s-r3.ebuild:
+  Added missing oss to IUSE.
+  sparc + esd build fix.
+
+*mpg123-0.59s-r3 (12 Apr 2004)
+
+  12 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mpg123-0.59s-r3.ebuild:
+  Support for more nas and esd added.  Alsa is broken.  Closes bug #47269.
+
+  18 Feb 2004; Martin Schlemmer <azarah@gentoo.org> mpg123-0.59s-r2.ebuild:
+  Remove -m486 based on patch from Thomas Veith <th_veith@web.de>, closing bug
+  #41021. Also remove the added -O2, and fix build to always use our CFLAGS -
+  there was an issue with USE=mmx that CFLAGS was not set.
+
+  18 Feb 2004; Martin Holzer <mholzer@gentoo.org> mpg123-0.59s-r2.ebuild:
+  adding IUSE. Closes 41890
+
+  17 Feb 2004; Joshua Kinard <kumba@gentoo.org> mpg123-0.59r-r2.ebuild,
+  mpg123-0.59r-r3.ebuild, mpg123-0.59s-r2.ebuild:
+  Masked on mips until further notice. This package does appear to have the
+  capability to compile on mips, but it requires a dep on the alsa driver, and
+  attempts to compile have so far failed. Will look into it later.
+
+  15 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mpg123-0.59s-r1.ebuild:
+  Removing unsecure ebuild.
+
+  15 Feb 2004; Jon Portnoy <avenj@gentoo.org> mpg123-0.59s-r2.ebuild :
+  Stable on AMD64.
+
+*mpg123-0.59s-r2 (15 Feb 2004)
+
+  15 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> metadata.xml,
+  mpg123-0.59r-r2.ebuild, mpg123-0.59r-r3.ebuild, mpg123-0.59s-r1.ebuild,
+  mpg123-0.59s-r2.ebuild:
+  PROVIDE="virtual/mpg123" for bug #14940.
+
+  15 Feb 2004; <solar@gentoo.org> mpg123-0.59r-r2.ebuild,
+  mpg123-0.59r-r3.ebuild, files/mpg123-0.59s-heapfix.diff:
+  fix heap overflow... bug #40631
+
+  15 Feb 2004; Luca Barbato <lu_zero@gentoo.org> mpg123-0.59s-r1.ebuild:
+  Marked stable on ppc to fix bug #40631
+
+  15 Feb 2004; Aron Griffis <agriffis@gentoo.org> metadata.xml,
+  mpg123-0.59s-r1.ebuild, mpg123-0.59s.ebuild:
+  Mark 0.59s-r1 stable on x86 for bug 40631. Remove older ebuilds. Add this
+  ebuild to the sound herd.  Remove ~arm from KEYWORDS since there isn't even
+  a bugzilla account to get somebody to test.
+
+  15 Feb 2004; Jason Wever <weeve@gentoo.org> mpg123-0.59s-r1.ebuild:
+  Marked stable on sparc to fix bug #40631.
+
+  09 Feb 2004; Luca Barbato <lu_zero@gentoo.org> mpg123-0.59s-r1.ebuild:
+  Fixed a glitch in the ppc related section of Makefile.
+
+  07 Feb 2004; Aron Griffis <agriffis@gentoo.org> mpg123-0.59s-r1.ebuild:
+  Majorly clean up the arch support in this ebuild
+
+  11 Jan 2004; Aron Griffis <agriffis@gentoo.org> mpg123-0.59s-r1.ebuild:
+  stable on alpha and ia64
+
+  23 Nov 2003; Mike Frysinger <vapier@gentoo.org> :
+  Add generic patch for hppa support.
+
+  04 Nov 2003; Will Woods <wwoods@gentoo.org> mpg123-0.59s-r1.ebuild,
+  mpg123-0.59s.ebuild:
+  Added MAKESTYLE for alpha (somehow this didn't get carried over from the 0.59r
+  ebuilds)
+
+  07 Oct 2003; Brad House <brad_mssw@gentoo.org> mpg123-0.59r-r3.ebuild,
+  files/mpg123-0.59r-amd64.diff, files/mpg123-0.59s-amd64.patch:
+  fix mpg123-0.59r-r3 as it was marked stable on amd64. The amd64 patch wasn't
+  being pulled out of the patch ball, manually epatch it. The diff for
+  mpg123-0.59s had a bunch of .orig files in it which made the patch huge,
+  remove. Remove the diff for mpg123-0.59r as it's in the patchball.
+
+  06 Oct 2003; Brad House <brad_mssw@gentoo.org> mpg123-0.59s-r1.ebuild,
+  files/mpg123-0.59s-amd64.patch:
+  patch for 0.59s and amd64
+
+  06 Oct 2003; Brad House <brad_mssw@gentoo.org>
+  files/mpg123-0.59r-amd64.diff:
+  removal of amd64 patch broke mpg123 on amd64. apparently whatever was done to
+  put it in a package on the server, this patch wasn't part of that and should
+  not have been removed.
+
+*mpg123-0.59s-r1 (30 Sep 2003)
+
+  30 Sep 2003; Seemant Kulleen <seemant@gentoo.org> mpg123-0.59r-r1.ebuild,
+  mpg123-0.59r-r3.ebuild, mpg123-0.59s-r1.ebuild,
+  files/mpg123-0.59r-alpha.diff, files/mpg123-0.59r-amd64.diff,
+  files/mpg123-0.59r-hppa.diff, files/mpg123-0.59r-make-fix.diff,
+  files/mpg123-0.59r-sparc.diff, files/mpg123-0.59s-security.diff:
+  Bug 26787 alerts to a local/remote exploit in mpg123-0.59s. In the process of
+  fixing this bug with patches available at:
+  http://archives.neohapsis.com/archives/bugtraq/2003-01/0117.html a potential
+  security fix in 0.59r was also fixed. Additionally, the patches for 0.59r now
+  reside in their own tarball on the mirrors, instead of cluttering up the files
+  subdirectory.
+
+  18 Sep 2003; Todd Sunderlin <todd@gentoo.org> mpg123-0.59s.ebuild:
+  Marked unstable for sparc
+
+*mpg123-0.59s (19 Jul 2003)
+
+  10 Aug 2003; Olivier Crete <tester@gentoo.org> files/mpg123-0.59r-amd64.diff:
+  Newer amd64 patch, the original version produced garbled sound, fixed
+  version from Andres Meyer <andres.meyer@computer.org>, fixes bug #25587
+
+  19 Jul 2003; jje <jje@gentoo.org> mpg123-0.59s.ebuild:
+  Last development version. Adds support for id3_v2 tags. I'm a little nervous 
+  about adding this as it doesn't look like it is still being worked on 
+  upstream. If it proves to be stable it may be what we live with.
+  
+  Submitted by: Turambar <pete@SiliconMetrics.com>
+
+  18 Jul 2003; Olivier Crete <tester@gentoo.org> mpg123-0.59r-r2.ebuild,
+  files/mpg123-0.59r-amd64.diff:
+  add amd64 patch and config things
+
+  28 May 2003; Jason Wever <weeve@gentoo.org> mpg123-0.59r-r1.ebuild,
+  mpg123-0.59r-r2.ebuild:
+  Removed mistaken esound dependency and added audiofile dependency for sparc to
+  fix bug #21731.
+
+  28 May 2003; Jason Wever <weeve@gentoo.org> mpg123-0.59r-r1.ebuild,
+  mpg123-0.59r-r2.ebuild:
+  Added esound dependency for sparc to fix bug #21731.
+
+*mpg123-0.59r-r2 (19 Mar 2003)
+
+  17 Jul 2003; Guy Martin <gmsoft@gentoo.org> mpg123-0.59r-r2.ebuild :
+  Marked stable on hppa.
+
+  23 Jun 2003; Guy Martin <gmsoft@gentoo.org> mpg123-0.59r-r2.ebuild,
+  files/mpg123-0.59r-hppa.diff :
+  Fix build for hppa. Added ~hppa to KEYWORDS.
+
+  19 Mar 2003; Zach Welch <zwelch@gentoo.org> mpg123-0.59r-r2.ebuild,
+  files/mpg123-0.59r-make-fix.diff:
+  fix distcc compiles; see bug 16116
+
+*mpg123-0.59r-r1 (27 Apr 2002)
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : 
+  changed sparc ~sparc keywords
+ 
+  22 Nov 2002; Will Woods <wwoods@gentoo.org> mpg123-0.59r-r1.ebuild :
+  Added alpha keyword and patch.
+
+  15 Sep 2002; Maarten Thibaut <murphy@gentoo.org> mpg123-0.59r-r1.ebuild :
+  Added sparc and sparc64 keywords.
+
+  13 May 2002; daybird <daybird@gentoo.org> :
+  another ppc fix - ppc CFLAGS now get written to Makefile.
+
+  27 Apr 2002; pvdabeel <pvdabeel@gentoo.org> :
+  ppc fix 
 
 *mpg123-0.59r (1 Feb 2002)
 
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 32499caa7f82..6ade7041fe37 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,8 +1,21 @@
-MD5 a25bb3615ffc0b3060b17f8c981dd32d ChangeLog 1507
-MD5 36761f3f732b341c97c8786957d9bed1 mpg123-0.59r-r1.ebuild 1416
-MD5 23037ee0550de2ef84fb58829513bda8 mpg123-0.59r-r2.ebuild 1459
-MD5 8936a4142ebda9826bda6818a51e1524 files/digest-mpg123-0.59r-r1 64
-MD5 8936a4142ebda9826bda6818a51e1524 files/digest-mpg123-0.59r-r2 64
-MD5 660470ffc0acfb171f08032a4d727cba files/mpg123-0.59r-alpha.diff 17451
-MD5 b8cddd1215747a09daf3476eb7290bc6 files/mpg123-0.59r-make-fix.diff 7832
-MD5 95c31be37fcef2c3d007c5ae0a069863 files/mpg123-0.59r-sparc.diff 405
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 dbf0274154aae330c7a1c46aa462beda ChangeLog 14073
+MD5 a147137fdcd756dd021b9807a2fae2b6 files/0.59s-set-terminal-line-settings-once.patch 767
+MD5 31d9204617f76bd0b55e6f1c7242886a files/digest-mpg123-0.59s-r10 141
+MD5 12a16d9aafab05a0ad9eace12cf3596a files/digest-mpg123-0.59s-r8 141
+MD5 31d9204617f76bd0b55e6f1c7242886a files/digest-mpg123-0.59s-r9 141
+MD5 154058014fa42867a57faa57b857521a files/mpg123-osx.diff 11227
+MD5 083de56193d644c972c2cf5034aaa100 files/mpg123-respectusercflags.patch 854
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 c7bd4d6de9a930e986e8c396f2459e04 mpg123-0.59s-r10.ebuild 3384
+MD5 f0035c0fdcb5496afb587c41ea83c1a3 mpg123-0.59s-r8.ebuild 2875
+MD5 05675bb6e6c4d77cf959c767dfa1eaf9 mpg123-0.59s-r9.ebuild 3101
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDU5Dmj5H05b2HAEkRAsmnAJ9bizjoSwQidexc00WvniF/DpSb+wCdFKbB
+DiJ68kET8anFRNLMAUW2MpI=
+=eq1X
+-----END PGP SIGNATURE-----
diff --git a/media-sound/mpg123/files/digest-mpg123-0.59s-r9 b/media-sound/mpg123/files/digest-mpg123-0.59s-r9
index e14c9f29b929..36b99f70c718 100644
--- a/media-sound/mpg123/files/digest-mpg123-0.59s-r9
+++ b/media-sound/mpg123/files/digest-mpg123-0.59s-r9
@@ -1,2 +1,2 @@
 MD5 a63675b0ea7990d4a7d7e7e14f23a3e4 mpg123-pre0.59s.tar.gz 244899
-MD5 52ee919909bbf24650b4be23734ab179 mpg123-0.59s-gentoo-1.4.tar.bz2 7190
+MD5 e7ec309a2108b53f03ef1c32f1111538 mpg123-0.59s-gentoo-1.5.tar.bz2 7207
diff --git a/media-sound/mpg123/metadata.xml b/media-sound/mpg123/metadata.xml
index 78ec7f6984fe..e1774e3d9ad7 100644
--- a/media-sound/mpg123/metadata.xml
+++ b/media-sound/mpg123/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sound</herd>
-<maintainer>
-  <email>sound@gentoo.org</email>
-  <name>Gentoo Sound Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/media-sound/mpg123/mpg123-0.59s-r10.ebuild b/media-sound/mpg123/mpg123-0.59s-r10.ebuild
index 599212d78069..f29e12c00187 100644
--- a/media-sound/mpg123/mpg123-0.59s-r10.ebuild
+++ b/media-sound/mpg123/mpg123-0.59s-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/media-sound/mpg123/mpg123-0.59s-r10.ebuild,v 1.1 2005/08/13 12:41:48 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59s-r10.ebuild,v 1.1.1.1 2005/11/30 09:38:16 chriswhite Exp $
 
 inherit eutils
 
@@ -42,6 +42,9 @@ src_unpack() {
 	# Bug #70592; terminal line settings should only be set once; not everytime a new song starts
 	epatch ${FILESDIR}/${PV}-set-terminal-line-settings-once.patch
 
+	# Bug #87539; user CFLAGS are not respected on amd64
+	epatch ${FILESDIR}/${PN}-respectusercflags.patch
+
 	if use ppc-macos;
 	then
 		einfo "Patching for OSX build"
@@ -66,17 +69,17 @@ src_compile() {
 			use esd && styles="${styles} -ppc64-esd"
 			use oss && styles="${styles} -ppc64"
 
-			[ -z "${styles}" ] && styles="-ppc64"
+			[[ -z "${styles}" ]] && styles="-ppc64"
 			;;
 		ppc)
 			if use ppc-macos; then
-				[ -z "${styles}" ] && styles="macos"
+				[[ -z "${styles}" ]] && styles="macos"
 				atype=""
 			else
 				use esd && styles="${styles} -ppc-esd"
 				use oss && styles="${styles} -ppc"
 
-				[ -z "${styles}" ] && styles="-ppc"
+				[[ -z "${styles}" ]] && styles="-ppc"
 			fi
 			;;
 		x86)
@@ -88,7 +91,7 @@ src_compile() {
 			# use alsa && styles="${styles} -alsa"
 			# use alsa && use 3dnow && styles="${styles} -3dnow-alsa"
 
-			[ -z "${styles}" ] && styles="-generic"
+			[[ -z "${styles}" ]] && styles="-generic"
 			;;
 		sparc*)
 			use esd && styles="${styles} -sparc-esd"
@@ -99,19 +102,19 @@ src_compile() {
 			use oss && styles="${styles} -x86_64"
 			# use alsa && styles="${styles} -x86_64-alsa"
 
-			[ -z "${styles}" ] && styles="-x86_64"
+			[[ -z "${styles}" ]] && styles="-x86_64"
 			;;
 		alpha)
 			use esd && styles="${styles} -alpha-esd"
 			use oss && styles="${styles} -alpha"
 			# use alsa && styles="${styles} -alpha-alsa"
 
-			[ -z "${styles}" ] && styles="-generic"
+			[[ -z "${styles}" ]] && styles="-generic"
 			;;
 		mips|hppa|ia64)
 			# use alsa && styles="${styles} -mips-alsa"
 
-			[ -z "${styles}" ] && styles="-generic"
+			[[ -z "${styles}" ]] && styles="-generic"
 			;;
 		*)
 			eerror "No support has been added for your architecture."
@@ -123,18 +126,14 @@ src_compile() {
 	do
 		make clean ${atype}${style} CFLAGS="${CFLAGS}" || die
 		mv mpg123 gentoo-bin/mpg123${style}
-		[ -L "gentoo-bin/mpg123" ] && rm gentoo-bin/mpg123
+		[[ -L "gentoo-bin/mpg123" ]] && rm gentoo-bin/mpg123
 		ln -s mpg123${style} gentoo-bin/mpg123
 	done
 }
 
 src_install() {
 	dodir /usr
-	if use ppc-macos; then
-		cp -R gentoo-bin ${D}/usr/bin
-	else
-		cp -dR gentoo-bin ${D}/usr/bin
-	fi
+	cp -R gentoo-bin ${D}/usr/bin
 	doman mpg123.1
-	dodoc BENCHMARKING BUGS CHANGES COPYING JUKEBOX README* TODO
+	dodoc BENCHMARKING BUGS CHANGES JUKEBOX README* TODO
 }
diff --git a/media-sound/mpg123/mpg123-0.59s-r8.ebuild b/media-sound/mpg123/mpg123-0.59s-r8.ebuild
index 52ace4bcb04e..9a10574ece83 100644
--- a/media-sound/mpg123/mpg123-0.59s-r8.ebuild
+++ b/media-sound/mpg123/mpg123-0.59s-r8.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/media-sound/mpg123/mpg123-0.59s-r8.ebuild,v 1.1 2004/12/19 02:01:14 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59s-r8.ebuild,v 1.1.1.1 2005/11/30 09:38:16 chriswhite Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.mpg123.de/mpg123/${PN}-pre${PV}.tar.gz
 
 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="mmx 3dnow esd nas oss"
 
 RDEPEND="virtual/libc
@@ -114,7 +114,7 @@ src_compile() {
 
 src_install() {
 	dodir /usr
-	cp -dR gentoo-bin ${D}/usr/bin
+	cp -R gentoo-bin ${D}/usr/bin
 	doman mpg123.1
 	dodoc BENCHMARKING BUGS CHANGES COPYING JUKEBOX README* TODO
 }
diff --git a/media-sound/mpg123/mpg123-0.59s-r9.ebuild b/media-sound/mpg123/mpg123-0.59s-r9.ebuild
index 1b0b7200e0f5..a073fc03440e 100644
--- a/media-sound/mpg123/mpg123-0.59s-r9.ebuild
+++ b/media-sound/mpg123/mpg123-0.59s-r9.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/media-sound/mpg123/mpg123-0.59s-r9.ebuild,v 1.1 2005/01/06 09:38:25 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59s-r9.ebuild,v 1.1.1.1 2005/11/30 09:38:16 chriswhite Exp $
 
 inherit eutils
 
-PATCH_VER=1.4
+PATCH_VER=1.5
 S="${WORKDIR}/${PN}"
 
 DESCRIPTION="Real Time mp3 player"
@@ -14,7 +14,7 @@ SRC_URI="http://www.mpg123.de/mpg123/${PN}-pre${PV}.tar.gz
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc-macos ppc64 sparc x86"
 IUSE="mmx 3dnow esd nas oss"
 
 RDEPEND="virtual/libc
@@ -35,9 +35,16 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
+
 	EPATCH_SUFFIX="patch"
 	epatch ${PATCHDIR}
 
+	if use ppc-macos;
+	then
+		einfo "Patching for OSX build"
+		epatch ${FILESDIR}/${PN}-osx.diff
+	fi
+
 	sed -i "s:${PV}-mh4:${PVR}:" version.h
 }
 
@@ -49,6 +56,7 @@ src_compile() {
 
 	use nas && styles="${styles} -nas"
 	use oss && styles="${styles} -generic"
+	atype="linux"
 
 	case $ARCH in
 		ppc64)
@@ -58,10 +66,15 @@ src_compile() {
 			[ -z "${styles}" ] && styles="-ppc64"
 			;;
 		ppc)
-			use esd && styles="${styles} -ppc-esd"
-			use oss && styles="${styles} -ppc"
-
-			[ -z "${styles}" ] && styles="-ppc"
+			if use ppc-macos; then
+				[ -z "${styles}" ] && styles="macos"
+				atype=""
+			else
+				use esd && styles="${styles} -ppc-esd"
+				use oss && styles="${styles} -ppc"
+
+				[ -z "${styles}" ] && styles="-ppc"
+			fi
 			;;
 		x86)
 			use esd && styles="${styles} -esd"
@@ -105,7 +118,7 @@ src_compile() {
 
 	for style in ${styles};
 	do
-		make clean linux${style} CFLAGS="${CFLAGS}" || die
+		make clean ${atype}${style} CFLAGS="${CFLAGS}" || die
 		mv mpg123 gentoo-bin/mpg123${style}
 		[ -L "gentoo-bin/mpg123" ] && rm gentoo-bin/mpg123
 		ln -s mpg123${style} gentoo-bin/mpg123
@@ -114,7 +127,7 @@ src_compile() {
 
 src_install() {
 	dodir /usr
-	cp -dR gentoo-bin ${D}/usr/bin
+	cp -R gentoo-bin ${D}/usr/bin
 	doman mpg123.1
 	dodoc BENCHMARKING BUGS CHANGES COPYING JUKEBOX README* TODO
 }
diff --git a/media-sound/mpg321/ChangeLog b/media-sound/mpg321/ChangeLog
index 3d9decc6c75d..78f8d9386cee 100644
--- a/media-sound/mpg321/ChangeLog
+++ b/media-sound/mpg321/ChangeLog
@@ -1,6 +1,120 @@
 # ChangeLog for media-sound/mpg321
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg321/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/media-sound/mpg321/ChangeLog,v 1.1.1.1 2005/11/30 09:38:27 chriswhite Exp $
+
+  07 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  mpg321-0.2.10-r1.ebuild, mpg321-0.2.10-r2.ebuild:
+  Don't install INSTALL and COPYING files.
+
+*mpg321-0.2.10-r3 (29 Aug 2005)
+
+  29 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -files/mpg321-0.1.5-ao.diff, +files/mpg321-0.2.10-useragent.patch,
+  +mpg321-0.2.10-r3.ebuild:
+  Added patch to provide UserAgent while requesting a stream via HTTP. Patch
+  by Frank Ruell, in FreeBSD PR 84898.
+
+  15 Apr 2005; Stephen P. Becker <geoman@gentoo.org>
+  mpg321-0.2.10-r1.ebuild, mpg321-0.2.10-r2.ebuild:
+  changed to -mips until mad issues are worked out
+
+  03 Apr 2005; Hardave Riar <hardave@gentoo.org> mpg321-0.2.10-r2.ebuild:
+  Stable on mips, bug #86033.
+
+  26 Mar 2005; Markus Rothe <corsair@gentoo.org> mpg321-0.2.10-r2.ebuild:
+  Stable on ppc64; bug #86033
+
+  24 Mar 2005; Bryan Østergaard <kloeri@gentoo.org>
+  mpg321-0.2.10-r2.ebuild:
+  Stable on alpha, bug 86033.
+
+  23 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> mpg321-0.2.10-r2.ebuild:
+  Stable on ppc.
+
+  23 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> mpg321-0.2.10-r2.ebuild:
+  stable on amd64 and x86 wrt #86033
+
+  23 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> mpg321-0.2.10-r2.ebuild:
+  Stable on sparc wrt #86033
+
+  13 Nov 2004; Kito <kito@gentoo.org> :
+  added patch from FreeBSD ports. Fixes mem leaks and minor display bugs.
+  ~ppc-macos keyword
+
+  30 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mpg321-0.2.10-r1.ebuild:
+  Fix DEPEND for bug #68815.
+
+  29 Jul 2004; Tom Gall <tgall@gentoo.org> mpg321-0.2.10-r1.ebuild:
+  stable on ppc64, bug #55428
+
+  12 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mpg321-0.2.10-r1.ebuild:
+  Added missing ${ROOT}
+
+  12 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mpg321-0.2.10-r1.ebuild:
+  postrm removes the symlink now.
+
+  12 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> :
+  Make ebuild play nicer with GRP.
+
+  03 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mpg321-0.2.10-r1.ebuild:
+  Changing mad dep to madplay.
+
+  26 Apr 2004; Stephen P. Becker <geoman@gentoo.org> mpg321-0.2.10-r1.ebuild:
+  Marked stable on mips.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mpg321-0.2.10-r1.ebuild:
+  QA fixes.
+
+  15 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> metadata.xml,
+  mpg321-0.2.10-r1.ebuild:
+  PROVIDE="virtual/mpg123" for bug #14940.  Now using make DESTDIR=${D} install.
+
+  01 Dec 2003; Aron Griffis <agriffis@gentoo.org> mpg321-0.2.10-r1.ebuild:
+  Stable on alpha
+
+*mpg321-0.2.10-r2 (17 Jul 2003)
+
+  04 Nov 2003; Joshua Kinard <kumba@gentoo.org> mpg321-0.2.10-r1.ebuild:
+  Added ~mips to KEYWORDS
+
+  07 Oct 2003; Todd Sunderlin <todd@gentoo.org> mpg321-0.2.10-r1.ebuild:
+  changed keyword to sparc
+
+  01 Sep 2003; Jason Wever <weeve@gentoo.org> mpg321-0.2.10-r1.ebuild:
+  Added ~sparc to keywords to fix bug #27687.
+
+  19 Jul 2003; Nick Hadaway <raker@gentoo.org:
+  Removed unneeded mpg321-0.2.10-r2 
+
+  17 Jul 2003; Nick Hadaway <raker@gentoo.org> mpg321-0.2.10-r2.ebuild:
+  Changed mad depend to media-libs/{libmad,libid3tag}
+
+*mpg321-0.2.10-r1 (27 May 2002)
+
+  14 Jan 2003; Jon Nall <nall@gentoo.org> mpg321-0.2.10-r1.ebuild :
+  added ~ppc
+
+  27 May 2002; Seemant Kulleen <seemant@gentoo.org> mpg321-0.2.10-r1.ebuild
+  files/digest-mpg321-0.2.10-r1.ebuild :
+
+  The mpg123->mpg321 symlink is now only created if mpg123 doesn't own that
+  file.  This is done using the configure option, by the way.  Thanks to
+  Rachel Holmes for pointing that out.
+
+*mpg321-0.2.10 (30 Mar 2002)
+  30 Mar 2002; Spider <spider@gentoo.org>
+  Same procedure as last time
+
+*mpg321-0.2.9 (16 Mar 2002)
+
+  16 Mar 2002; Seemant Kulleen <seemant@gentoo.org> mpg321-0.2.9.ebuild :
+
+  Version upgrade, by copying the old ebuild to a new name.
 
 *mpg321-0.2.3 (1 Feb 2002)
 
diff --git a/media-sound/mpg321/Manifest b/media-sound/mpg321/Manifest
index e69de29bb2d1..f62bc0fed33b 100644
--- a/media-sound/mpg321/Manifest
+++ b/media-sound/mpg321/Manifest
@@ -0,0 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9e94d13f9f7d9874fdcc3cbeb822501a ChangeLog 4437
+MD5 7f4e867ab9a86c4f3618228fdccc48f4 files/digest-mpg321-0.2.10-r1 65
+MD5 7f4e867ab9a86c4f3618228fdccc48f4 files/digest-mpg321-0.2.10-r2 65
+MD5 7f4e867ab9a86c4f3618228fdccc48f4 files/digest-mpg321-0.2.10-r3 65
+MD5 04fe11f18e972320df81edfc63d7418a files/mpg321-0.2.10-useragent.patch 629
+MD5 330f91ff24a94b674063b6fc2d0e04af files/mpg321-0.2.10.diff 1862
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 a1d77c22265e044894eba32cee17b2ab mpg321-0.2.10-r1.ebuild 1397
+MD5 3b49b319cd80db365c301d73227e17cf mpg321-0.2.10-r2.ebuild 1484
+MD5 2f0c8df9662fc45a2385c3e10999faf6 mpg321-0.2.10-r3.ebuild 1673
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDbzcsj5H05b2HAEkRAuG7AKCR3XRKsL/65lxLtNHE8xzVxYdZiwCfV5Ko
+aXYYPnpBiWD59fasg8XtrbI=
+=KPle
+-----END PGP SIGNATURE-----
diff --git a/media-sound/mpg321/mpg321-0.2.10-r1.ebuild b/media-sound/mpg321/mpg321-0.2.10-r1.ebuild
index 542791fb4845..ad22df26298e 100644
--- a/media-sound/mpg321/mpg321-0.2.10-r1.ebuild
+++ b/media-sound/mpg321/mpg321-0.2.10-r1.ebuild
@@ -1,53 +1,46 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: David Rufino <daverufino@btinternet.com>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg321/mpg321-0.2.10-r1.ebuild,v 1.1 2002/05/27 15:04:10 seemant Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg321/mpg321-0.2.10-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:27 chriswhite Exp $
+
+IUSE=""
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Free MP3 player, drop-in replacement for mpg123"
-SRC_URI="http://unc.dl.sourceforge.net/sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://sourceforge.net/projects/mpg321/"
 
-DEPEND="virtual/glibc
-	>=media-sound/mad-0.14.2b
+DEPEND="media-libs/libmad
+	media-libs/libid3tag
 	>=media-libs/libao-0.8.0"
 
 SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="amd64 x86 ~ppc sparc -mips alpha ppc64"
 
-MPG123="false"
-
-pkg_setup() {
-	
-	# test if mpg123 owns the /usr/bin/mpg123 file. If it does, then do not
-	# create a symlink.  If it is already a symlink or does not exist, then
-	# we create it
-	if [ -f /usr/bin/mpg123 ]
-	then
-		if [ -L /usr/bin/mpg123 ]
-		then
-			MPEG123="false"
-		else
-			MPEG123="true"
-		fi
-	else
-		MPEG123="false"
-	fi
-}
+PROVIDE="virtual/mpg123"
 
 src_compile() {
-	local myconf
-	if [ ${MPEG123} = "true" ]
-	then
-		myconf="--disable-mpg123-symlink"
-	else
-		myconf="--enable-mpg123-symlink"
-	fi
-	einfo ${myconf}
-	econf ${myconf} || die
+	# disabling the symlink here and doing it in postinst is better for GRP
+	econf --disable-mpg123-symlink || die
 	emake || die
 }
 
 src_install () {
-	einstall || die
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS BUGS ChangeLog HACKING NEWS README README.remote THANKS TODO
+}
+
+pkg_postinst() {
+	# We create a symlink for /usr/bin/mpg123 if it doesn't already exist
+	if ! [ -f ${ROOT}/usr/bin/mpg123 ]; then
+		ln -s mpg321 ${ROOT}/usr/bin/mpg123
+	fi
+}
+
+pkg_postrm() {
+	# We delete the symlink if it's nolonger valid.
+	if [ -L "${ROOT}/usr/bin/mpg123" ] && [ ! -x "${ROOT}/usr/bin/mpg123" ]; then
+		einfo "We are removing the ${ROOT}/usr/bin/mpg123 symlink since it is no longer valid."
+		einfo "If you are using another virtual/mpg123 program, you should setup the appropriate symlink."
+		rm ${ROOT}/usr/bin/mpg123
+	fi
 }
diff --git a/media-sound/mpg321/mpg321-0.2.10-r2.ebuild b/media-sound/mpg321/mpg321-0.2.10-r2.ebuild
index 5596dce2aba7..b0cc17b9f767 100644
--- a/media-sound/mpg321/mpg321-0.2.10-r2.ebuild
+++ b/media-sound/mpg321/mpg321-0.2.10-r2.ebuild
@@ -1,53 +1,53 @@
-# 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/media-sound/mpg321/mpg321-0.2.10-r2.ebuild,v 1.1 2003/07/17 21:12:09 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg321/mpg321-0.2.10-r2.ebuild,v 1.1.1.1 2005/11/30 09:38:27 chriswhite Exp $
+
+inherit eutils
+
+IUSE=""
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Free MP3 player, drop-in replacement for mpg123"
-SRC_URI="http://unc.dl.sourceforge.net/sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://sourceforge.net/projects/mpg321/"
 
-DEPEND=">=media-libs/libmad-0.15.0b
-	>=media-libs/libid3tag-0.15.0b
+DEPEND="media-libs/libmad
+	media-libs/libid3tag
 	>=media-libs/libao-0.8.0"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-
-MPG123="false"
-
-pkg_setup() {
-	
-	# test if mpg123 owns the /usr/bin/mpg123 file. If it does, then do not
-	# create a symlink.  If it is already a symlink or does not exist, then
-	# we create it
-	if [ -f /usr/bin/mpg123 ]
-	then
-		if [ -L /usr/bin/mpg123 ]
-		then
-			MPEG123="false"
-		else
-			MPEG123="true"
-		fi
-	else
-		MPEG123="false"
-	fi
+KEYWORDS="amd64 x86 ppc sparc -mips alpha ppc64 ~ppc-macos"
+
+PROVIDE="virtual/mpg123"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}.diff
 }
 
 src_compile() {
-	local myconf
-	if [ ${MPEG123} = "true" ]
-	then
-		myconf="--disable-mpg123-symlink"
-	else
-		myconf="--enable-mpg123-symlink"
-	fi
-	einfo ${myconf}
-	econf ${myconf} || die
+	# disabling the symlink here and doing it in postinst is better for GRP
+	econf --disable-mpg123-symlink || die
 	emake || die
 }
 
 src_install () {
-	einstall || die
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS BUGS ChangeLog HACKING NEWS README README.remote THANKS TODO
+}
+
+pkg_postinst() {
+	# We create a symlink for /usr/bin/mpg123 if it doesn't already exist
+	if ! [ -f ${ROOT}/usr/bin/mpg123 ]; then
+		ln -s mpg321 ${ROOT}/usr/bin/mpg123
+	fi
+}
+
+pkg_postrm() {
+	# We delete the symlink if it's nolonger valid.
+	if [ -L "${ROOT}/usr/bin/mpg123" ] && [ ! -x "${ROOT}/usr/bin/mpg123" ]; then
+		einfo "We are removing the ${ROOT}/usr/bin/mpg123 symlink since it is no longer valid."
+		einfo "If you are using another virtual/mpg123 program, you should setup the appropriate symlink."
+		rm ${ROOT}/usr/bin/mpg123
+	fi
 }
diff --git a/media-sound/mpg321/mpg321-0.2.10-r3.ebuild b/media-sound/mpg321/mpg321-0.2.10-r3.ebuild
index 373d704c023f..1d9088f848c2 100644
--- a/media-sound/mpg321/mpg321-0.2.10-r3.ebuild
+++ b/media-sound/mpg321/mpg321-0.2.10-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/media-sound/mpg321/mpg321-0.2.10-r3.ebuild,v 1.1 2005/08/29 09:48:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg321/mpg321-0.2.10-r3.ebuild,v 1.1.1.1 2005/11/30 09:38:27 chriswhite Exp $
 
 inherit eutils
 
diff --git a/media-sound/mpio/ChangeLog b/media-sound/mpio/ChangeLog
index 607db6342b64..f8f72366c149 100644
--- a/media-sound/mpio/ChangeLog
+++ b/media-sound/mpio/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/mpio
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpio/ChangeLog,v 1.1 2004/11/12 19:46:55 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpio/ChangeLog,v 1.1.1.1 2005/11/30 09:37:59 chriswhite Exp $
+
+  23 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mpio-0.7.1_pre2.ebuild:
+  Added to ~sparc.
 
   12 Nov 2004; Frank van de Pol <fvdpol@gentoo.org> :
   Initial ebuild, submitted by Martin Scmitz <martin@linux-tv.org> and Peter Ton
diff --git a/media-sound/mpio/Manifest b/media-sound/mpio/Manifest
index c191c893387d..40f119937ba3 100644
--- a/media-sound/mpio/Manifest
+++ b/media-sound/mpio/Manifest
@@ -1,4 +1,14 @@
-MD5 4eec101ce2715a677e207cc152f4688e mpio-0.7.1_pre2.ebuild 671
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f6646bd6f157f135c30094646b157e70 ChangeLog 490
 MD5 2f758c82434233f84f01f80f850a1112 metadata.xml 217
-MD5 d7cb1db91eb8a2baf4ef5c95a0ae1d1f ChangeLog 295
+MD5 0ecfed16af7b122fc4d6203e3087c70f mpio-0.7.1_pre2.ebuild 702
 MD5 b7f578774e464427f1f9e07a36135268 files/digest-mpio-0.7.1_pre2 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBowjtArHZZzCEUG0RAjAuAJ4/43ymKDavNdpc0tWmn8hGVPRBbgCbBQ4X
+pVpBNSc6oVf+9wQlIxnI0mA=
+=VZYt
+-----END PGP SIGNATURE-----
diff --git a/media-sound/mpio/mpio-0.7.1_pre2.ebuild b/media-sound/mpio/mpio-0.7.1_pre2.ebuild
index 773b8989c818..d37565feec1c 100644
--- a/media-sound/mpio/mpio-0.7.1_pre2.ebuild
+++ b/media-sound/mpio/mpio-0.7.1_pre2.ebuild
@@ -1,19 +1,16 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpio/mpio-0.7.1_pre2.ebuild,v 1.1 2004/11/12 19:46:55 fvdpol Exp $
-
-DESCRIPTION="Tool for the Digit@lway/Adtec MPIO MP3 players (DMG, DMK, DME, DMB, FD 100, FL100, FY100, FY200)"
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpio/mpio-0.7.1_pre2.ebuild,v 1.1.1.1 2005/11/30 09:37:59 chriswhite Exp $
 
+IUSE=""
 
+DESCRIPTION="Tool for the Digit@lway/Adtec MPIO MP3 players (DMG, DMK, DME, DMB, FD 100, FL100, FY100, FY200)"
 HOMEPAGE="http://mpio.sourceforge.net/"
-
 SRC_URI="mirror://sourceforge/mpio/${P}.tar.gz"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
-
-KEYWORDS="~x86 ~amd64"
-IUSE=""
+KEYWORDS="~amd64 ~sparc ~x86"
 
 DEPEND="dev-libs/libusb
 	sys-libs/readline"
@@ -21,12 +18,7 @@ RDEPEND=">=dev-libs/libusb-0.1.7
 	>=sys-libs/readline-4.3
 	sys-apps/hotplug"
 
-src_compile() {
-	econf || die
-	emake || die "emake failed"
-}
-
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYING Changelog INSTALL README TODO
+	dodoc AUTHORS Changelog README TODO
 }
diff --git a/media-sound/mplay/ChangeLog b/media-sound/mplay/ChangeLog
index af66b106f612..94b7f2e38c17 100644
--- a/media-sound/mplay/ChangeLog
+++ b/media-sound/mplay/ChangeLog
@@ -1,6 +1,34 @@
 # ChangeLog for media-sound/mplay
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mplay/ChangeLog,v 1.1 2004/09/02 22:42:35 chriswhite Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mplay/ChangeLog,v 1.1.1.1 2005/11/30 09:38:19 chriswhite Exp $
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> mplay-0.68.ebuild,
+  mplay-0.80.ebuild:
+  dev-perl/Time-HiRes => perl-core/Time-Hires migration
+
+  25 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> mplay-0.80.ebuild:
+  we now depend on dev-perl/Video-Info, fixes #90422
+
+*mplay-0.80 (19 Apr 2005)
+
+  19 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> +mplay-0.80.ebuild:
+  new upstream version, fixes #74394. thanks a lot for mcummings for his effort.
+
+  19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  Remove retired developer from metadata.xml.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> mplay-0.68.ebuild:
+  Stable x86.  Added to ~amd64 and ~sparc.
+
+  05 Sep 2004; David Holm <dholm@gentoo.org> mplay-0.68.ebuild:
+  Added to ~ppc.
+
+  04 Sep 2004; Chris White <chriswhite@gentoo.org> mplay-0.68.ebuild:
+  Fixed the docs installation. mplay was looking for help_de/en in
+  /usr/share/mplay, wasn't finding them(because they weren't installed in the
+  first place :). Installed them in /usr/share/mplay, left the rest of the docs
+  installed in /usr/share/doc/ nice and gzipped to save space. This closes bug
+  #62726.
 
 *mplay-0.68 (03 Sep 2004)
 
diff --git a/media-sound/mplay/Manifest b/media-sound/mplay/Manifest
index a4d8574c5e6e..7a2172784968 100644
--- a/media-sound/mplay/Manifest
+++ b/media-sound/mplay/Manifest
@@ -1,2 +1,16 @@
-MD5 68a80c335704e19804dba70421d3c29d mplay-0.68.ebuild 747
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9f892fb6dd1190c4d6c2c1e0baf2b0e4 ChangeLog 1627
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 4142d9cbec4b06894346d91d5a951ae5 mplay-0.68.ebuild 1548
+MD5 07a3598b27e34e8dd1e44fbe28915d84 mplay-0.80.ebuild 1106
 MD5 838c391e7aec39ea78815167f2d55fc3 files/digest-mplay-0.68 62
+MD5 a8be53d15a20aee8bf09a3c17c7b9219 files/digest-mplay-0.80 62
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFClKiktG5z4I8BtQoRAldFAJ9vTn72qnOaCB6Cy5o7EpfTDVQqiACfY6el
+zCliQ5CsiDJu9ik6kHj4qYQ=
+=vdUa
+-----END PGP SIGNATURE-----
diff --git a/media-sound/mplay/metadata.xml b/media-sound/mplay/metadata.xml
index ec6a427b666f..e1774e3d9ad7 100644
--- a/media-sound/mplay/metadata.xml
+++ b/media-sound/mplay/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sound</herd>
-<maintainer>
-  <email>chriswhite@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/media-sound/mplay/mplay-0.68.ebuild b/media-sound/mplay/mplay-0.68.ebuild
index d605cdc7a281..c811ac81c8c0 100644
--- a/media-sound/mplay/mplay-0.68.ebuild
+++ b/media-sound/mplay/mplay-0.68.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/media-sound/mplay/mplay-0.68.ebuild,v 1.1 2004/09/02 22:42:35 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mplay/mplay-0.68.ebuild,v 1.1.1.1 2005/11/30 09:38:19 chriswhite Exp $
+
+IUSE=""
 
 inherit perl-module
 
@@ -16,15 +18,13 @@ SRC_URI="mirror://sourceforge/mplay/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-
-IUSE=""
+KEYWORDS="~amd64 ~sparc ~ppc x86"
 
 DEPEND="dev-lang/perl
 	dev-perl/TermReadKey
 	dev-perl/MP3-Info
 	dev-perl/Term-ANSIScreen
-	dev-perl/Time-HiRes
+	perl-core/Time-HiRes
 	media-video/mplayer"
 
 src_unpack() {
@@ -54,10 +54,13 @@ src_install() {
 
 	dobin mplay
 
+	dodoc README
+
+	cd ${S}/help
 	insinto /usr/share/mplay
-	doins help_en help_de
+	doins help_en help_de mplayconf
+	doman mplay.1
 
-	dodoc README
 
 	cd ${AMIX_D}
 	#make install
diff --git a/media-sound/mplay/mplay-0.80.ebuild b/media-sound/mplay/mplay-0.80.ebuild
index b05b49d839ff..837b5d94aab9 100644
--- a/media-sound/mplay/mplay-0.80.ebuild
+++ b/media-sound/mplay/mplay-0.80.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mplay/mplay-0.80.ebuild,v 1.1 2005/04/19 16:03:33 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mplay/mplay-0.80.ebuild,v 1.1.1.1 2005/11/30 09:38:19 chriswhite Exp $
 
 
 DESCRIPTION="A Curses front-end for mplayer"
@@ -17,8 +17,9 @@ DEPEND="dev-lang/perl
 	>=dev-perl/Class-MakeMethods-1.01
 	dev-perl/Audio-Mixer
 	dev-perl/Ogg-Vorbis-Header-PurePerl
-	>=dev-perl/Time-HiRes-1.56
+	>=perl-core/Time-HiRes-1.56
 	>=dev-perl/TermReadKey-2.21
+	dev-perl/Video-Info
 	media-video/mplayer"
 
 src_unpack() {
diff --git a/media-sound/mserv/ChangeLog b/media-sound/mserv/ChangeLog
index c5ede1c66ee0..55e0324d3c46 100644
--- a/media-sound/mserv/ChangeLog
+++ b/media-sound/mserv/ChangeLog
@@ -1,6 +1,36 @@
 # ChangeLog for media-sound/mserv
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mserv/ChangeLog,v 1.1 2004/03/11 08:23:42 eradicator Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mserv/ChangeLog,v 1.1.1.1 2005/11/30 09:38:07 chriswhite Exp $
+
+  24 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> mserv-0.35.ebuild:
+  Use newconfd/newinitd.
+
+  23 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> mserv-0.35.ebuild:
+  Use -1 instead of /bin/false on enewuser call. Removed || die where not needed.
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> mserv-0.35.ebuild:
+  Added to ~ppc.
+
+  28 May 2005; Jan Brinkmann <luckyduck@gentoo.org> mserv-0.35.ebuild:
+  Dont make use of the deprecated oggvorbis useflag any longer, see #94254.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> mserv-0.35.ebuild:
+  Stable amd64, sparc.
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> mserv-0.35.ebuild:
+  Added to ~sparc ~amd64
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> mserv-0.35.ebuild:
+  virtual/glibc -> virtual/libc
+
+  14 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> mserv-0.35.ebuild:
+  Stable x86.  Removed apache2 from IUSE.
+
+  22 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> mserv-0.35.ebuild:
+  Using keepdir to fix bug #45361.
+
+  11 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> mserv-0.35.ebuild:
+  ebuild cleanup.
 
 *mserv-0.35 (10 Mar 2004)
 
diff --git a/media-sound/mserv/Manifest b/media-sound/mserv/Manifest
index 7d65df04d921..fac8d480cc3f 100644
--- a/media-sound/mserv/Manifest
+++ b/media-sound/mserv/Manifest
@@ -1,9 +1,21 @@
-MD5 28dc28764dcb2e1ebb2f211b6bc8a46d mserv-0.35.ebuild 3158
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6a26beb7d45a4d3c335db226d08c4329 mserv-0.35.ebuild 2556
+MD5 141e115247cb7e4f02e114676ea8f169 ChangeLog 1556
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 bab25861d10f61d56534a40883052be3 files/mserv-0.35-paths.patch.html 2673
-MD5 80c9282eed058c3239f45586473cbf70 files/mserv-0.35-mservplay.patch 430
-MD5 a39d7ec86bff6b0a01eb8ca5a1e3db32 files/mserv-0.35-config 1520
-MD5 a823115f64db37b88b25a3689b0f9e19 files/mserv-0.35-webacl 39
-MD5 313b2052cc248bbf295578281cd7acdc files/mserv-0.35-initd 451
+MD5 85efb51a180ddf66f95a59ffbbb9f81a files/mserv-0.35-confd 230
 MD5 d1973ea3781773cbbe8510ea648ddb19 files/digest-mserv-0.35 62
+MD5 bab25861d10f61d56534a40883052be3 files/mserv-0.35-paths.patch 2673
+MD5 324eccbee0054d56a6da344d0712b2cc files/mserv-0.35-initd 580
+MD5 80c9282eed058c3239f45586473cbf70 files/mserv-0.35-mservplay.patch 430
 MD5 d5465c51ab8fd155dab29a702c04897a files/mserv-0.35-acl 52
+MD5 a823115f64db37b88b25a3689b0f9e19 files/mserv-0.35-webacl 39
+MD5 e4b81c74040c77c60a324f42646e960e files/mserv-0.35-config 1515
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDDKXmj5H05b2HAEkRAlixAJ9bDtz3BIduJA0mIcGbIswdHGRNcwCgnGoR
+Sm4yVWIfuiDHW+kbkonkdCQ=
+=e3sW
+-----END PGP SIGNATURE-----
diff --git a/media-sound/mserv/files/mserv-0.35-initd b/media-sound/mserv/files/mserv-0.35-initd
index fec0aadaf10b..1acbf7da3be5 100644
--- a/media-sound/mserv/files/mserv-0.35-initd
+++ b/media-sound/mserv/files/mserv-0.35-initd
@@ -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 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mserv/files/mserv-0.35-initd,v 1.1 2004/03/11 08:23:42 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mserv/files/mserv-0.35-initd,v 1.1.1.1 2005/11/30 09:38:07 chriswhite Exp $
 
 depend() {
 	need net
diff --git a/media-sound/mserv/mserv-0.35.ebuild b/media-sound/mserv/mserv-0.35.ebuild
index 69d3dd3296d9..b217cae0e10f 100644
--- a/media-sound/mserv/mserv-0.35.ebuild
+++ b/media-sound/mserv/mserv-0.35.ebuild
@@ -1,33 +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/media-sound/mserv/mserv-0.35.ebuild,v 1.1 2004/03/11 08:23:42 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mserv/mserv-0.35.ebuild,v 1.1.1.1 2005/11/30 09:38:07 chriswhite Exp $
 
 inherit webapp-apache eutils
 
 DESCRIPTION="Jukebox-style music server"
 HOMEPAGE="http://www.mserv.org"
 SRC_URI="mirror://sourceforge/mserv/${P}.tar.gz"
-RESTRICT="nomirror"
-LICENSE="mserv"
 
+LICENSE="mserv"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE="apache2 oggvorbis"
+KEYWORDS="amd64 ~ppc sparc x86"
+IUSE="vorbis"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 RDEPEND=">=dev-lang/perl-5.6.1
 	 virtual/mpg123
 	 media-sound/sox
 	 net-www/apache
-	 oggvorbis? ( media-sound/vorbis-tools )"
-
-S=${WORKDIR}/${P}
-
-webapp-detect
+	 vorbis? ( media-sound/vorbis-tools )"
 
 pkg_setup() {
-	enewgroup mserv > /dev/null || die
-	enewuser mserv -1 /bin/false /dev/null mserv -G audio > /dev/null || die
+	enewgroup mserv
+	enewuser mserv -1 -1 /dev/null mserv -G audio
 }
 
 src_unpack() {
@@ -35,14 +30,16 @@ src_unpack() {
 	cd ${S}
 
 	# Adjust paths to match Gentoo
-	epatch ${FILESDIR}/${P}-paths.patch || die
+	epatch ${FILESDIR}/${P}-paths.patch
 	# Mservplay uses stricmp - should be strcasecmp
-	epatch ${FILESDIR}/${P}-mservplay.patch || die
+	epatch ${FILESDIR}/${P}-mservplay.patch
 }
 
 src_compile() {
-	econf || die
-	emake || die
+	webapp-detect
+
+	econf || die "configure failed"
+	emake || die "make failed"
 
 	# Optional suid wrapper
 	cd ${S}/support
@@ -50,10 +47,12 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	webapp-detect
+
+	make DESTDIR=${D} install || die "make install failed"
 
 	dobin support/mservedit support/mservripcd support/mservplay
-	dodoc AUTHORS COPYING ChangeLog docs/quick-start.txt
+	dodoc AUTHORS ChangeLog docs/quick-start.txt
 
 	# Web client
 	exeinto ${HTTPD_CGIBIN}/mserv
@@ -70,11 +69,8 @@ src_install() {
 	newins ${FILESDIR}/${P}-acl acl
 	fperms 0600 /etc/mserv/acl
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/${P}-initd ${PN}
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/${P}-confd ${PN}
+	newinitd ${FILESDIR}/${P}-initd ${PN}
+	newconfd ${FILESDIR}/${P}-confd ${PN}
 
 	# Log file
 	dodir /var/log
@@ -82,10 +78,8 @@ src_install() {
 	fowners mserv:mserv /var/log/mserv.log
 
 	# Track and album info
-	dodir /var/lib/mserv/trackinfo
+	keepdir /var/lib/mserv/trackinfo
 	fowners mserv:mserv /var/lib/mserv/trackinfo
-	touch ${D}/var/lib/mserv/trackinfo/.keep
-	fowners mserv:mserv /var/lib/mserv/trackinfo/.keep
 
 	# Current track output
 	dodir /var/spool/mserv
@@ -94,6 +88,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	webapp-detect
+
 	einfo
 	einfo "The wrapper program 'mservplay' is disabled for"
 	einfo "security reasons.  If you wish to use mservplay"
diff --git a/media-sound/mt-daapd/ChangeLog b/media-sound/mt-daapd/ChangeLog
index cf80d7e715ac..85b275734f9e 100644
--- a/media-sound/mt-daapd/ChangeLog
+++ b/media-sound/mt-daapd/ChangeLog
@@ -1,6 +1,37 @@
 # ChangeLog for media-sound/mt-daapd
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mt-daapd/ChangeLog,v 1.1 2005/04/29 21:37:17 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mt-daapd/ChangeLog,v 1.1.1.1 2005/11/30 09:38:32 chriswhite Exp $
+
+  30 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> files/mt-daapd.init.2:
+  Don't provide daap to avoid warnings during start/stop of services. mt-daapd
+  is going to be the only daapd server for now anyway.
+
+*mt-daapd-0.2.3-r1 (21 Oct 2005)
+
+  21 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/mt-daapd-0.2.3-pidfile.patch, +files/mt-daapd.init.2,
+  +mt-daapd-0.2.3-r1.ebuild:
+  New revision, patched to allow launching more than one instance of mt-daapd.
+  Also new init.d file that allows symlinked-launches.
+
+  04 Oct 2005; MATSUU Takuto <matsuu@gentoo.org> mt-daapd-0.2.3.ebuild:
+  Added ~sh.
+
+*mt-daapd-0.2.3 (03 Oct 2005)
+
+  03 Oct 2005; MATSUU Takuto <matsuu@gentoo.org> +mt-daapd-0.2.3.ebuild:
+  Version bumped, Bug 106032.
+  Fixed howl USE flag problem, Bug 94899.
+  Fixed vorbis USE flag problem, Bug 96202.
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> mt-daapd-0.2.1.1.ebuild:
+  Added to ~ppc.
+
+  28 May 2005; Jan Brinkmann <luckyduck@gentoo.org> mt-daapd-0.2.1.1.ebuild:
+  cosmetic changes
+
+  25 May 2005; Jan Brinkmann <luckyduck@gentoo.org> mt-daapd-0.2.1.1.ebuild:
+  stable on amd64 and x86
 
 *mt-daapd-0.2.1.1 (29 Apr 2005)
 
diff --git a/media-sound/mt-daapd/Manifest b/media-sound/mt-daapd/Manifest
index 00f93df82ab9..1aebd883ddcb 100644
--- a/media-sound/mt-daapd/Manifest
+++ b/media-sound/mt-daapd/Manifest
@@ -1,5 +1,21 @@
-MD5 86153400b887ad048a220b5380ca5db5 mt-daapd-0.2.1.1.ebuild 1849
-MD5 92f80581f3f7c49a72048243a8400d2d ChangeLog 380
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ccd559c5c3db699e318634d7fdeab22a ChangeLog 1596
 MD5 804311ec22b1fba76a61411d0c752a15 files/digest-mt-daapd-0.2.1.1 68
+MD5 a83c2c2bb548a45b8b1294e009aff64d files/digest-mt-daapd-0.2.3 66
+MD5 a83c2c2bb548a45b8b1294e009aff64d files/digest-mt-daapd-0.2.3-r1 66
+MD5 b6ec66b0ccfd69869025f1bba1421dd6 files/mt-daapd-0.2.3-pidfile.patch 1918
 MD5 d14aca83cf21b8c519b42962ba276e42 files/mt-daapd.init 540
+MD5 674db97976bcc4e34df95a17ffe8750c files/mt-daapd.init.2 1200
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 880127a188cf908b0ad84221e48eeebf mt-daapd-0.2.1.1.ebuild 1936
+MD5 d0c63660504430046e9346fd83773454 mt-daapd-0.2.3-r1.ebuild 2509
+MD5 14f69e3681187656efa996600cdf20d9 mt-daapd-0.2.3.ebuild 1959
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDZQP1j5H05b2HAEkRAqjlAJ9OCVFiQ3WOhjxtgQst0bkvNmke5gCfdiB/
+JY4wCqab7KmVcYn8Sr3IOcA=
+=QEND
+-----END PGP SIGNATURE-----
diff --git a/media-sound/mt-daapd/files/mt-daapd.init.2 b/media-sound/mt-daapd/files/mt-daapd.init.2
index 05c7265584bc..3f5ccec30969 100755
--- a/media-sound/mt-daapd/files/mt-daapd.init.2
+++ b/media-sound/mt-daapd/files/mt-daapd.init.2
@@ -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/media-sound/mt-daapd/files/mt-daapd.init.2,v 1.1 2005/10/21 10:10:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mt-daapd/files/mt-daapd.init.2,v 1.1.1.1 2005/11/30 09:38:32 chriswhite Exp $
 # Somehow based on init.d file shipped with mt-daapd itself.
 #
 # You can run multiple copies of this service just symlinking them to
@@ -23,7 +23,6 @@ fi
 depend() {
 	need net
 	#USEHOWL need mDNSResponder
-	provide daap
 }
 
 start() {
diff --git a/media-sound/mt-daapd/mt-daapd-0.2.1.1.ebuild b/media-sound/mt-daapd/mt-daapd-0.2.1.1.ebuild
index ebb63b3aa823..419c32722015 100644
--- a/media-sound/mt-daapd/mt-daapd-0.2.1.1.ebuild
+++ b/media-sound/mt-daapd/mt-daapd-0.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/media-sound/mt-daapd/mt-daapd-0.2.1.1.ebuild,v 1.1 2005/04/29 21:37:17 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mt-daapd/mt-daapd-0.2.1.1.ebuild,v 1.1.1.1 2005/11/30 09:38:32 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
@@ -12,14 +12,14 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="debug howl vorbis"
 
 DEPEND="sys-libs/zlib
 	media-libs/libid3tag
 	sys-libs/gdbm
-	howl? ( >=net-misc/howl-0.9.2 )
 	debug? ( dev-util/efence )
+	howl? ( >=net-misc/howl-0.9.2 )
 	vorbis? ( media-libs/libvorbis )"
 
 src_compile() {
@@ -38,10 +38,9 @@ src_compile() {
 		myconf="--disable-howl"
 	fi
 
-	# vorbis support?
-	use vorbis && myconf="${myconf} --enable-oggvorbis"
-
-	econf ${myconf} || die "configure failed"
+	econf \
+		$(use_enable vorbis oggvorbis) \
+		${myconf} || die "configure failed"
 	emake || die "make failed"
 }
 
diff --git a/media-sound/mt-daapd/mt-daapd-0.2.3-r1.ebuild b/media-sound/mt-daapd/mt-daapd-0.2.3-r1.ebuild
index f3e80f72e52c..eddbbea4e7dd 100644
--- a/media-sound/mt-daapd/mt-daapd-0.2.3-r1.ebuild
+++ b/media-sound/mt-daapd/mt-daapd-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/media-sound/mt-daapd/mt-daapd-0.2.3-r1.ebuild,v 1.1 2005/10/21 10:10:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mt-daapd/mt-daapd-0.2.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:32 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
diff --git a/media-sound/mt-daapd/mt-daapd-0.2.3.ebuild b/media-sound/mt-daapd/mt-daapd-0.2.3.ebuild
index a7bb1e34a734..9a47ecb953af 100644
--- a/media-sound/mt-daapd/mt-daapd-0.2.3.ebuild
+++ b/media-sound/mt-daapd/mt-daapd-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/media-sound/mt-daapd/mt-daapd-0.2.3.ebuild,v 1.1 2005/10/03 16:08:13 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mt-daapd/mt-daapd-0.2.3.ebuild,v 1.1.1.1 2005/11/30 09:38:32 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~sh ~x86"
 IUSE="debug howl vorbis"
 
 DEPEND="sys-libs/zlib
diff --git a/media-sound/muine/ChangeLog b/media-sound/muine/ChangeLog
index 53935f2b9b43..7bf835ae4ad3 100644
--- a/media-sound/muine/ChangeLog
+++ b/media-sound/muine/ChangeLog
@@ -1,6 +1,93 @@
 # ChangeLog for media-sound/muine
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/ChangeLog,v 1.1 2004/06/21 00:55:28 latexer Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/ChangeLog,v 1.1.1.1 2005/11/30 09:38:13 chriswhite Exp $
+
+  18 Oct 2005; Herbie Hopkins <herbs@gentoo.org>
+  +files/muine-0.8.3-64-bit-int.diff, muine-0.8.3.ebuild:
+  Add a patch to fix a bad int definition which lead to the plugins not
+  working on amd64.
+
+  16 Sep 2005; Peter Johanson <latexer@gentoo.org> muine-0.8.3.ebuild:
+  Change *-sharp deps to better reflect versions in portage.
+
+  16 Aug 2005; Peter Johanson <latexer@gentoo.org>
+  +files/muine-0.8.3-gtk-sharp-2.x.90-compat.diff, -muine-0.8.2.ebuild,
+  muine-0.8.3.ebuild:
+  Add patch to add compat with new gtk-sharp releases. Remove one older version.
+
+  08 Jul 2005; David Holm <dholm@gentoo.org> muine-0.8.3.ebuild:
+  Added to ~ppc.
+
+  14 Jun 2005; Daniel Drake <dsd@gentoo.org> muine-0.8.3.ebuild:
+  Fix depdendencies on gtk-sharp-1.9.2
+
+  25 May 2005; Peter Johanson <latexer@gentoo.org> muine-0.6.3-r2.ebuild,
+  muine-0.6.3-r3.ebuild, muine-0.8.2.ebuild, muine-0.8.3.ebuild:
+  Add dep on new enough intltool. See bug #93705.
+
+*muine-0.8.3 (06 May 2005)
+
+  06 May 2005; Peter Johanson <latexer@gentoo.org> +muine-0.8.3.ebuild:
+  Bump.
+
+  19 Apr 2005; <zaheerm@gentoo.org> metadata.xml, muine-0.6.3-r2.ebuild,
+  muine-0.6.3-r3.ebuild, muine-0.8.2.ebuild:
+  Replaced deprecated oggvorbis use flag with vorbis use flag and made 
+  sure ogg gstreamer plugin is depped on
+
+  07 Apr 2005; Peter Johanson <latexer@gentoo.org> muine-0.8.2.ebuild:
+  Add check and warning about dbus being built with the mono USE flag.
+
+  04 Apr 2005; <zaheerm@gentoo.org> muine-0.8.2.ebuild:
+  updated the gstreamer deps
+
+*muine-0.8.2 (02 Apr 2005)
+
+  02 Apr 2005; Peter Johanson <latexer@gentoo.org>
+  +files/muine-0.8.2-autoconf.diff, +muine-0.8.2.ebuild:
+  Bump.
+
+*muine-0.6.3-r3 (16 Mar 2005)
+
+  16 Mar 2005; <zaheerm@gentoo.org> +files/muine-0.6.3-libgstplay.diff,
+  +muine-0.6.3-r3.ebuild:
+  Fix bug in muine's gst engine that causes it not to work with recent 
+  gst-plugins (#85017)
+
+  14 Mar 2005; Peter Johanson <latexer@gentoo.org>
+  +files/muine-0.6.3-gnome-2.10-compat.diff, -muine-0.6.3-r1.ebuild,
+  muine-0.6.3-r2.ebuild:
+  Remove one older version, fix deps to account for future SLOT of gtk-sharp-2.0
+  stuff, and add a patch to fix compilation with libgnome-2.10 (See bug #83419).
+
+  10 Mar 2005; Peter Johanson <latexer@gentoo.org> muine-0.6.3-r1.ebuild,
+  muine-0.6.3-r2.ebuild:
+  mono moved from dev-dotnet -> dev-lang
+
+  22 Feb 2005; Peter Johanson <latexer@gentoo.org> muine-0.6.3-r2.ebuild,
+  -muine-0.6.3.ebuild:
+  Fix deps for broken out gtk-sharp deps. See bug #82963. Remove one older
+  version.
+
+  20 Feb 2005; David Holm <dholm@gentoo.org> muine-0.6.3-r2.ebuild:
+  Added to ~ppc.
+
+*muine-0.6.3-r2 (08 Feb 2005)
+
+  08 Feb 2005; Peter Johanson <latexer@gentoo.org>
+  +files/muine-0.6.3-mono-1.1.1-compat.diff, +muine-0.6.3-r2.ebuild:
+  Revision bump to add mono-1.1.x compat.
+
+*muine-0.6.3-r1 (01 Dec 2004)
+
+  01 Dec 2004; Peter Johanson <latexer@gentoo.org> +muine-0.6.3-r1.ebuild:
+  Revision bump with new split up gtk-sharp deps.
+
+  26 Oct 2004; Peter Johanson <latexer@gentoo.org> muine-0.6.3.ebuild:
+  Move gtk-sharp dep from x11-libs -> dev-dotnet
+
+  12 Jul 2004; Peter Johanson <latexer@gentoo.org> muine-0.6.3.ebuild:
+  Added a dep on gst-plugins-gnomevfs. See bug #56634
 
 *muine-0.6.3 (20 Jun 2004)
 
diff --git a/media-sound/muine/Manifest b/media-sound/muine/Manifest
index f8b82a3f4ef0..f0ab45478a69 100644
--- a/media-sound/muine/Manifest
+++ b/media-sound/muine/Manifest
@@ -1,3 +1,24 @@
-MD5 a60fdfbce7c7cfc52187ff86a7f8bbf8 metadata.xml 222
-MD5 f29618e36dc5bcbfd7ef4d35621e84ec muine-0.6.3.ebuild 1085
-MD5 94649610e3e4a64b74b8e868c0b7d2ca files/digest-muine-0.6.3 63
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 af87588eb658574edf44f9c033ae3c7e ChangeLog 3550
+MD5 94649610e3e4a64b74b8e868c0b7d2ca files/digest-muine-0.6.3-r2 63
+MD5 94649610e3e4a64b74b8e868c0b7d2ca files/digest-muine-0.6.3-r3 63
+MD5 80e26562df326c5879e45ac707aa7923 files/digest-muine-0.8.3 63
+MD5 e8f743f78010f9e787d738c4dc2c3afa files/muine-0.6.3-gnome-2.10-compat.diff 846
+MD5 005546051d7ebbbbc94daf145d59b104 files/muine-0.6.3-libgstplay.diff 1412
+MD5 23905e3a18ad036ce42ccb76c81f1096 files/muine-0.6.3-mono-1.1.1-compat.diff 3384
+MD5 d5dc53fe5feabb06a5204e6e51934bc7 files/muine-0.8.2-autoconf.diff 1187
+MD5 c8375c619daa713f08a6a564fb7b67a5 files/muine-0.8.3-64-bit-int.diff 439
+MD5 31aa500432a0c61481b3c6b02dd0c37d files/muine-0.8.3-gtk-sharp-2.x.90-compat.diff 490
+MD5 42dcaa983276bbd8e849c07f13677337 metadata.xml 245
+MD5 efc18f554d45025127675ee4601d23e8 muine-0.6.3-r2.ebuild 1642
+MD5 49f354dc1e312093cd9012b8933da075 muine-0.6.3-r3.ebuild 1751
+MD5 f4ef8887344cdabeb17f5640c301ab6a muine-0.8.3.ebuild 2819
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDVUiF2G5bA0cA/ScRAraGAJ4kN+nqsxugroUEulGoiOnMfSwF4wCfWmaK
+YY86YowlvremjN64m24rbQE=
+=H7Sn
+-----END PGP SIGNATURE-----
diff --git a/media-sound/muine/metadata.xml b/media-sound/muine/metadata.xml
index ba7eb92cb2fb..6a639e343e63 100644
--- a/media-sound/muine/metadata.xml
+++ b/media-sound/muine/metadata.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>dotnet</herd>
+<herd>gstreamer</herd>
 <maintainer>
   <email>latexer@gentoo.org</email>
 </maintainer>
diff --git a/media-sound/muine/muine-0.6.3-r2.ebuild b/media-sound/muine/muine-0.6.3-r2.ebuild
index e300a90a2508..185ce23964ee 100644
--- a/media-sound/muine/muine-0.6.3-r2.ebuild
+++ b/media-sound/muine/muine-0.6.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/media-sound/muine/muine-0.6.3-r2.ebuild,v 1.1 2005/02/09 03:17:29 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/muine-0.6.3-r2.ebuild,v 1.1.1.1 2005/11/30 09:38:13 chriswhite Exp $
 
 inherit gnome2 mono eutils
 
@@ -8,19 +8,27 @@ DESCRIPTION="A music player for GNOME"
 HOMEPAGE="http://muine.gooeylinux.org/"
 SRC_URI="${HOMEPAGE}${P}.tar.gz"
 LICENSE="GPL-2"
-IUSE="xine mad oggvorbis flac"
+IUSE="xine mad vorbis flac"
 SLOT="0"
-KEYWORDS="~x86"
-
-RDEPEND=">=dev-dotnet/mono-0.96
-	>=dev-dotnet/gtk-sharp-0.98
+KEYWORDS="~x86 ~ppc"
+
+RDEPEND=">=dev-lang/mono-1.0
+	>=dev-dotnet/gtk-sharp-1.0.4-r1
+	>=dev-dotnet/gnome-sharp-1.0.4
+	>=dev-dotnet/glade-sharp-1.0.4
+	>=dev-dotnet/gconf-sharp-1.0.4
+	=dev-dotnet/gtk-sharp-1.0*
+	=dev-dotnet/gnome-sharp-1.0*
+	=dev-dotnet/glade-sharp-1.0*
+	=dev-dotnet/gconf-sharp-1.0*
 	xine? ( >=media-libs/xine-lib-1_rc4 )
 	!xine? (
 		>=media-libs/gstreamer-0.8.0
 		>=media-libs/gst-plugins-0.8.0
 		>=media-plugins/gst-plugins-gnomevfs-0.8.0
 		mad? ( >=media-plugins/gst-plugins-mad-0.8.0 )
-		oggvorbis? ( >=media-plugins/gst-plugins-vorbis-0.8.0 )
+		vorbis? ( >=media-plugins/gst-plugins-ogg-0.8.0
+			>=media-plugins/gst-plugins-vorbis-0.8.0 )
 		flac? ( >=media-plugins/gst-plugins-flac-0.8.0 )
 	)
 	>=media-libs/libid3tag-0.15.0b
@@ -29,6 +37,7 @@ RDEPEND=">=dev-dotnet/mono-0.96
 	>=gnome-base/gconf-2.0.0
 	>=gnome-base/gnome-vfs-2.0.0
 	>=x11-libs/gtk+-2.0.0
+	>=dev-util/intltool-0.29
 	media-libs/flac"
 
 DEPEND="${RDEPEND}
@@ -46,4 +55,5 @@ DOCS="AUTHORS COPYING ChangeLog INSTALL \
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/${P}-mono-1.1.1-compat.diff
+	epatch ${FILESDIR}/${P}-gnome-2.10-compat.diff
 }
diff --git a/media-sound/muine/muine-0.6.3-r3.ebuild b/media-sound/muine/muine-0.6.3-r3.ebuild
index 909933232a89..d9ddc6574a43 100644
--- a/media-sound/muine/muine-0.6.3-r3.ebuild
+++ b/media-sound/muine/muine-0.6.3-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/media-sound/muine/muine-0.6.3-r3.ebuild,v 1.1 2005/03/16 15:36:09 zaheerm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/muine-0.6.3-r3.ebuild,v 1.1.1.1 2005/11/30 09:38:13 chriswhite Exp $
 
 inherit gnome2 mono eutils
 
@@ -8,7 +8,7 @@ DESCRIPTION="A music player for GNOME"
 HOMEPAGE="http://muine.gooeylinux.org/"
 SRC_URI="${HOMEPAGE}${P}.tar.gz"
 LICENSE="GPL-2"
-IUSE="xine mad oggvorbis flac"
+IUSE="xine mad vorbis flac"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
 
@@ -27,7 +27,8 @@ RDEPEND=">=dev-lang/mono-1.0
 		>=media-libs/gst-plugins-0.8.0
 		>=media-plugins/gst-plugins-gnomevfs-0.8.0
 		mad? ( >=media-plugins/gst-plugins-mad-0.8.0 )
-		oggvorbis? ( >=media-plugins/gst-plugins-vorbis-0.8.0 )
+		vorbis? ( >=media-plugins/gst-plugins-ogg-0.8.0
+			>=media-plugins/gst-plugins-vorbis-0.8.0 )
 		flac? ( >=media-plugins/gst-plugins-flac-0.8.0 )
 	)
 	>=media-libs/libid3tag-0.15.0b
@@ -36,6 +37,7 @@ RDEPEND=">=dev-lang/mono-1.0
 	>=gnome-base/gconf-2.0.0
 	>=gnome-base/gnome-vfs-2.0.0
 	>=x11-libs/gtk+-2.0.0
+	>=dev-util/intltool-0.29
 	media-libs/flac"
 
 DEPEND="${RDEPEND}
diff --git a/media-sound/muine/muine-0.8.3.ebuild b/media-sound/muine/muine-0.8.3.ebuild
index 877d9113a679..938e1087d6f4 100644
--- a/media-sound/muine/muine-0.8.3.ebuild
+++ b/media-sound/muine/muine-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/media-sound/muine/muine-0.8.3.ebuild,v 1.1 2005/05/06 13:29:43 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/muine-0.8.3.ebuild,v 1.1.1.1 2005/11/30 09:38:13 chriswhite Exp $
 
 inherit gnome2 mono eutils multilib
 
@@ -11,14 +11,14 @@ SRC_URI="${HOMEPAGE}/${P}.tar.gz"
 LICENSE="GPL-2"
 IUSE="xine mad vorbis flac aac"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 
 RDEPEND=">=dev-lang/mono-0.96
-	>=dev-dotnet/gtk-sharp-1.9.1
-	>=dev-dotnet/gnome-sharp-1.9.1
-	>=dev-dotnet/gnomevfs-sharp-1.9.1
-	>=dev-dotnet/glade-sharp-1.9.1
-	>=dev-dotnet/gconf-sharp-1.9.1
+	>=dev-dotnet/gtk-sharp-2.3.90
+	>=dev-dotnet/gnome-sharp-2.3.90
+	>=dev-dotnet/gnomevfs-sharp-2.3.90
+	>=dev-dotnet/glade-sharp-2.3.90
+	>=dev-dotnet/gconf-sharp-2.3.90
 	xine? ( >=media-libs/xine-lib-1_rc4 )
 	!xine? (
 		>=media-libs/gstreamer-0.8.9-r3
@@ -39,6 +39,7 @@ RDEPEND=">=dev-lang/mono-0.96
 	>=gnome-base/gconf-2.0.0
 	>=gnome-base/gnome-vfs-2.0.0
 	>=x11-libs/gtk+-2.6.0
+	>=dev-util/intltool-0.29
 	>=sys-apps/dbus-0.23.2-r1
 	media-libs/flac"
 
@@ -74,6 +75,9 @@ src_unpack() {
 	sed -i "s:libdir)/dbus-1.0:datadir)/dbus-1:" \
 		${S}/data/Makefile.am || die "sed failed"
 
+	epatch ${FILESDIR}/${P}-gtk-sharp-2.x.90-compat.diff || die
+	epatch ${FILESDIR}/${P}-64-bit-int.diff || die
+
 	autoconf || die "autoconf failed"
 	automake || die "automake failed"
 }
diff --git a/media-sound/multimux/ChangeLog b/media-sound/multimux/ChangeLog
index 60d85d49b573..592d646843ec 100644
--- a/media-sound/multimux/ChangeLog
+++ b/media-sound/multimux/ChangeLog
@@ -1,8 +1,24 @@
 # ChangeLog for media-sound/multimux
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/multimux/ChangeLog,v 1.1 2004/10/07 08:44:12 trapni Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/multimux/ChangeLog,v 1.1.1.1 2005/11/30 09:38:26 chriswhite Exp $
+
+*multimux-0.2.4 (31 Oct 2005)
+
+  31 Oct 2005; MATSUU Takuto <matsuu@gentoo.org> +multimux-0.2.4.ebuild:
+  Version bumped.
+  Cleanup ebuild.
+
+  27 Aug 2005; Pieter Van den Abeele <pvdabeel@gentoo.org> multimux-0.2.3.ebuild:
+  Ebuild submitted by Davy Van Nieuwenborgh. Version bump, new src_uri
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> multimux-0.1.ebuild:
+  Added to ~ppc.
+
+  07 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  multimux-0.1.ebuild:
+  Added to ~amd64 and ~sparc.
 
   07 Oct 2004; Christian Parpart <trapni@gentoo.org> :
   EBuild submitted by Stefan Briesenick <sbriesen@gmx.de>
-  I just changed foo.
+  I just adapted to meet ebuild policies.
 
diff --git a/media-sound/multimux/Manifest b/media-sound/multimux/Manifest
index be99fa1456d3..9cf1a8771ef5 100644
--- a/media-sound/multimux/Manifest
+++ b/media-sound/multimux/Manifest
@@ -1,4 +1,8 @@
-MD5 58b7995b5111adffb9f79145c49d5f85 multimux-0.1.ebuild 519
+MD5 f29c09f8a2e23029f6c2a2e1bb651fbc multimux-0.2.3.ebuild 659
+MD5 038529ded9a3d6817e13b22d43055f2d multimux-0.1.ebuild 632
+MD5 21bd1cd3efe884c41178968613e3e222 ChangeLog 859
+MD5 6796af42a6e4fc8cb7d98b99b951ef94 multimux-0.2.4.ebuild 714
 MD5 05ab4d4775083f0930841e415df18ad6 metadata.xml 160
-MD5 63463bd6b729517afa261ef5e7ec80dd ChangeLog 257
+MD5 f61218b80cb9228b63c2491d819df215 files/digest-multimux-0.2.3 62
+MD5 7e75a5c44f4a653a8bf8683771812349 files/digest-multimux-0.2.4 62
 MD5 004e8cfcff5f02f9f588de131f43f552 files/digest-multimux-0.1 60
diff --git a/media-sound/multimux/multimux-0.1.ebuild b/media-sound/multimux/multimux-0.1.ebuild
index 1aa1585f4a1d..8a9605573a37 100644
--- a/media-sound/multimux/multimux-0.1.ebuild
+++ b/media-sound/multimux/multimux-0.1.ebuild
@@ -1,14 +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/media-sound/multimux/multimux-0.1.ebuild,v 1.1 2004/10/07 08:44:12 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/multimux/multimux-0.1.ebuild,v 1.1.1.1 2005/11/30 09:38:26 chriswhite Exp $
+
+IUSE=""
 
 DESCRIPTION="combines up to 8 audio mono wave ch. into one big multi ch. wave file."
 HOMEPAGE="http://home.zonnet.nl/panteltje/dvd/"
 SRC_URI="http://home.zonnet.nl/panteltje/dvd/${P}.tgz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
 DEPEND=""
 
 src_compile() {
diff --git a/media-sound/multimux/multimux-0.2.3.ebuild b/media-sound/multimux/multimux-0.2.3.ebuild
index f5c488904f64..40290a9e7de2 100644
--- a/media-sound/multimux/multimux-0.2.3.ebuild
+++ b/media-sound/multimux/multimux-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/media-sound/multimux/multimux-0.2.3.ebuild,v 1.1 2005/08/27 21:35:18 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/multimux/multimux-0.2.3.ebuild,v 1.1.1.1 2005/11/30 09:38:27 chriswhite Exp $
 
 IUSE=""
 
diff --git a/media-sound/multimux/multimux-0.2.4.ebuild b/media-sound/multimux/multimux-0.2.4.ebuild
index 99b55b620c8f..5ccb5877450c 100644
--- a/media-sound/multimux/multimux-0.2.4.ebuild
+++ b/media-sound/multimux/multimux-0.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/media-sound/multimux/multimux-0.2.4.ebuild,v 1.1 2005/10/31 22:29:34 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/multimux/multimux-0.2.4.ebuild,v 1.1.1.1 2005/11/30 09:38:27 chriswhite Exp $
 
 IUSE=""
 
diff --git a/media-sound/mup/ChangeLog b/media-sound/mup/ChangeLog
index 2beba31b25da..6dfa06b2139d 100644
--- a/media-sound/mup/ChangeLog
+++ b/media-sound/mup/ChangeLog
@@ -1,8 +1,63 @@
 # ChangeLog for media-sound/mup
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/ChangeLog,v 1.1 2002/02/26 07:31:02 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/ChangeLog,v 1.1.1.1 2005/11/30 09:38:22 chriswhite Exp $
 
-*mup-4.3 (26/02/2002)
+*mup-5.1 (05 Oct 2005)
+
+  05 Oct 2005; MATSUU Takuto <matsuu@gentoo.org> +files/mup-5.1css.patch,
+  +mup-5.1.ebuild:
+  Version bumped. Bug 18636.
+
+  24 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> mup-5.0.ebuild:
+  Just chown root if you need to make setuid a binary, the group can be
+  different.
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> mup-5.0.ebuild:
+  Added to ~ppc.
+
+  15 May 2005; Diego Pettenò <flameeyes@gentoo.org> mup-4.6.ebuild,
+  mup-5.0.ebuild:
+  Converted to toolchain-funcs eclass.
+
+*mup-5.0 (09 Mar 2005)
+
+  09 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/5.0-beaming-bug.patch, +mup-5.0.ebuild:
+  version bump, fixes #18636
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> mup-4.6.ebuild:
+  Stable amd64, sparc.
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> mup-4.6.ebuild:
+  Added to ~amd64 and ~sparc
+
+  25 Jun 2004; Aron Griffis <agriffis@gentoo.org> mup-4.4.ebuild:
+  QA - fix use invocation
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org> mup-4.4.ebuild,
+  mup-4.6.ebuild:
+  Fix use invocation and add DEPEND on >=sed-4
+
+  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> mup-4.6.ebuild:
+  Stable x86.
+
+*mup-4.6 (14 Jan 2004)
+
+  14 Jan 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bump + more cleanups ;).
+
+*mup-4.5 (31 Jul 2003)
+
+  31 Jul 2003; rob holland <tigger@gentoo.org> :
+  Version bump and tidied ebuild to make version bumps easier. Prompted by
+  Wilbert Berendsen <wilbert@oswf.org>, closes #18636
+
+*mup-4.4 (21 Oct 2002)
+
+  21 Oct 2002; Maik Schreiber <blizzy@gentoo.org> :
+  New version, closes bug #7880.
+
+*mup-4.3 (26 Feb 2002)
 
   26 Feb 2002; G.Bevin <gbevin@gentoo.org> :
   
diff --git a/media-sound/mup/Manifest b/media-sound/mup/Manifest
index e69de29bb2d1..8b5425b27253 100644
--- a/media-sound/mup/Manifest
+++ b/media-sound/mup/Manifest
@@ -0,0 +1,13 @@
+MD5 29305b73b9a0aeb40e32f659dc2547e8 mup-5.1.ebuild 2106
+MD5 948103f2005dce62a32f289b0981a282 mup-5.0.ebuild 2119
+MD5 2aa7f964e840bea93ea0ceb418be50ed mup-4.4.ebuild 2103
+MD5 3235bb9d5dd4d39647bc3c03e2d6be0a ChangeLog 2076
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 41c3b17508896d4f8d030ffa37446b2a mup-4.6.ebuild 2134
+MD5 234ec2d99e4c992ccc12fa76de885a0e files/5.0-beaming-bug.patch 928
+MD5 af5a1af06445e7d8e07f574d0c40c3c6 files/mup-5.1css.patch 7807
+MD5 d73a9c5effa0eb340ee9eb4b799e32b8 files/4.6-gcc.patch 272
+MD5 3cdff463ef32c2e7b16982e0db999cfa files/digest-mup-4.4 120
+MD5 54c05300dd4879fbf61504bc145fc1ef files/digest-mup-4.6 120
+MD5 631bd9db6b998acd073dbeae3e9cc0b8 files/digest-mup-5.0 120
+MD5 f4346f0c55847eeae7adeb14cce4f6c4 files/digest-mup-5.1 120
diff --git a/media-sound/mup/mup-4.4.ebuild b/media-sound/mup/mup-4.4.ebuild
index dd55c3da3ab3..8219b66d67d5 100644
--- a/media-sound/mup/mup-4.4.ebuild
+++ b/media-sound/mup/mup-4.4.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/media-sound/mup/mup-4.4.ebuild,v 1.1 2002/10/21 17:53:34 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/mup-4.4.ebuild,v 1.1.1.1 2005/11/30 09:38:22 chriswhite Exp $
 
 MY_P="${PN}44"
 
@@ -10,9 +10,10 @@ SRC_URI="ftp://ftp.arkkra.com/pub/unix/${MY_P}src.tar.gz
 HOMEPAGE="http://www.arkkra.com"
 LICENSE="Arkkra"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="X svga"
 
+DEPEND=">=sys-apps/sed-4"
 RDEPEND="X? ( virtual/x11 )
 	svga? ( >=media-libs/svgalib-1.4.3 )"
 
@@ -20,9 +21,9 @@ S="${WORKDIR}"
 
 src_unpack() {
 	mkdir doc
-	
+
 	unpack ${MY_P}src.tar.gz
-	
+
 	cd doc
 	unpack ${MY_P}doc.tar.gz
 }
@@ -31,26 +32,24 @@ src_compile() {
 	local param
 
 	cd mup
-	cc -O2 -o mup *.c -lm
+	cc -O2 -o mup *.c -lm || die "compile mup failed"
 
 	cd ../mkmupfnt
-	cc -o mkmupfnt *.c
+	cc -o mkmupfnt *.c || die "compile mkmupfnt failed"
 
-	if [ -n "`use X`" -o -n "`use svga`" ] ; then
+	if use X || use svga; then
 		cd ../mupdisp
-		if [ -n "`use X`" ] ; then
+		if use X ; then
 			param="-lX11 -L/usr/X11R6/lib"
 		else
-			mv dispttyp.h dispttyp.h.orig
-			sed <dispttyp.h.orig >dispttyp.h \
-				-e '/^#define XWINDOW/ d'
+			sed -i '/^#define XWINDOW/d' dispttyp.h || die "sed failed"
 		fi
-		if [ -n "`use svga`" ] ; then
+		if use svga ; then
 			param="${param} -lvga"
 		else
 			param="${param} -DNO_VGA_LIB"
 		fi
-		cc -o mupdisp *.c -lm ${param}
+		cc -o mupdisp *.c -lm ${param} || die "compile mupdisp failed"
 	fi
 }
 
@@ -58,7 +57,7 @@ src_install () {
 	dobin mup/mup
 	dobin mkmupfnt/mkmupfnt
 	dobin mupprnt
-	if [ -n "`use X`" -o -n "`use svga`" ] ; then
+	if use X || use svga ; then
 		dobin mupdisp/mupdisp
 	fi
 
@@ -68,7 +67,7 @@ src_install () {
 		mkmupfnt.ps mupdisp.ps mupprnt.ps mup.ps mupqref.ps oddeven.ps uguide.ps
 
 	doman mup.1 mupprnt.1 mkmupfnt.1
-	if [ -n "`use X`" -o -n "`use svga`" ] ; then
+	if use X || use svga; then
 		doman mupdisp.1
 	fi
 
@@ -79,15 +78,15 @@ src_install () {
 }
 
 pkg_postinst() {
-	if [ "`use svga`" ] ; then
+	if use svga ; then
 		einfo "Please note that using mupdisp in SVGA mode on the console"
 		einfo "requires that it can write to the console device. To allow"
 		einfo "this, make mupdisp setuid to root, like this:"
-		einfo ""
+		einfo
 		einfo "\tchown root:root /usr/bin/mupdisp"
 		einfo "\tchmod u+s /usr/bin/mupdisp"
 	fi
-	if [ -n "`use X`" -o -n "`use svga`" ] ; then
+	if use X || use svga; then
 		echo
 		einfo "If you want to use mupdisp, make sure you also install ghostscript."
 	fi
diff --git a/media-sound/mup/mup-4.6.ebuild b/media-sound/mup/mup-4.6.ebuild
index 154d8b688299..d4661669914d 100644
--- a/media-sound/mup/mup-4.6.ebuild
+++ b/media-sound/mup/mup-4.6.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/media-sound/mup/mup-4.6.ebuild,v 1.1 2004/01/14 06:04:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/mup-4.6.ebuild,v 1.1.1.1 2005/11/30 09:38:22 chriswhite Exp $
 
-inherit eutils gcc
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Program for printing music scores"
 HOMEPAGE="http://www.arkkra.com/"
@@ -11,9 +11,10 @@ SRC_URI="ftp://ftp.arkkra.com/pub/unix/mup${PV//.}src.tar.gz
 
 LICENSE="Arkkra"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64 sparc"
 IUSE="X svga"
 
+DEPEND=">=sys-apps/sed-4"
 RDEPEND="X? ( virtual/x11 )
 	svga? ( >=media-libs/svgalib-1.4.3 )"
 
@@ -27,33 +28,33 @@ src_compile() {
 	local param
 
 	cd ${S}/mup
-	echo $(gcc-getCC) ${CFLAGS} -o mup *.c -lm
-	$(gcc-getCC) ${CFLAGS} -o mup *.c -lm || die "mup compile failed"
+	echo $(tc-getCC) ${CFLAGS} -o mup *.c -lm
+	$(tc-getCC) ${CFLAGS} -o mup *.c -lm || die "mup compile failed"
 
 	cd ${S}/mkmupfnt
-	echo $(gcc-getCC) ${CFLAGS} -o mkmupfnt *.c
-	$(gcc-getCC) ${CFLAGS} -o mkmupfnt *.c || die "mkmupfnt compile failed"
+	echo $(tc-getCC) ${CFLAGS} -o mkmupfnt *.c
+	$(tc-getCC) ${CFLAGS} -o mkmupfnt *.c || die "mkmupfnt compile failed"
 
-	if [ `use X` ] || [ `use svga` ] ; then
+	if use X || use svga ; then
 		cd ${S}/mupdisp
-		if [ `use X` ] ; then
+		if use X ; then
 			param="-lX11 -L/usr/X11R6/lib"
 		else
 			sed -i '/XWINDOW/s:.*::' dispttyp.h
 		fi
-		if [ `use svga` ] ; then
+		if use svga ; then
 			param="${param} -lvga"
 		else
 			param="${param} -DNO_VGA_LIB"
 		fi
-		echo $(gcc-getCC) ${CFLAGS} -o mupdisp *.c -lm ${param}
-		$(gcc-getCC) ${CFLAGS} -o mupdisp *.c -lm ${param} || die "mupdisp compile failed"
+		echo $(tc-getCC) ${CFLAGS} -o mupdisp *.c -lm ${param}
+		$(tc-getCC) ${CFLAGS} -o mupdisp *.c -lm ${param} || die "mupdisp compile failed"
 	fi
 }
 
 src_install() {
 	dobin mup/mup mkmupfnt/mkmupfnt mupprnt || die
-	if [ `use X` ] || [ `use svga` ] ; then
+	if use X || use svga ; then
 		dobin mupdisp/mupdisp || die
 	fi
 
@@ -61,7 +62,7 @@ src_install() {
 	cd docs
 	dodoc *.txt README1
 	doman mup.1 mkmupfnt.1 mupprnt.1
-	if [ `use X` ] || [ `use svga` ] ; then
+	if use X || use svga ; then
 		doman mupdisp.1
 	fi
 	dohtml uguide/*
@@ -70,15 +71,15 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [ `use svga` ] ; then
+	if use svga ; then
 		einfo "Please note that using mupdisp in SVGA mode on the console"
 		einfo "requires that it can write to the console device. To allow"
 		einfo "this, make mupdisp setuid to root, like this:"
-		einfo ""
+		einfo
 		einfo "\tchown root:root /usr/bin/mupdisp"
 		einfo "\tchmod u+s /usr/bin/mupdisp"
 	fi
-	if [ `use X` ] || [ `use svga` ] ; then
+	if use X || use svga ; then
 		echo
 		einfo "If you want to use mupdisp, make sure you also install ghostscript."
 	fi
diff --git a/media-sound/mup/mup-5.0.ebuild b/media-sound/mup/mup-5.0.ebuild
index ca17aa24043f..8758da53b814 100644
--- a/media-sound/mup/mup-5.0.ebuild
+++ b/media-sound/mup/mup-5.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/media-sound/mup/mup-5.0.ebuild,v 1.1 2005/03/09 19:17:02 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/mup-5.0.ebuild,v 1.1.1.1 2005/11/30 09:38:22 chriswhite Exp $
 
-inherit eutils gcc
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Program for printing music scores"
 HOMEPAGE="http://www.arkkra.com/"
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.arkkra.com/pub/unix/mup${PV//.}src.tar.gz
 
 LICENSE="Arkkra"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~sparc"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="X svga"
 
 RDEPEND="X? ( virtual/x11 )
@@ -27,33 +27,33 @@ src_compile() {
 	local param
 
 	cd ${S}/mup
-	echo $(gcc-getCC) ${CFLAGS} -o mup *.c -lm
-	$(gcc-getCC) ${CFLAGS} -o mup *.c -lm || die "mup compile failed"
+	echo $(tc-getCC) ${CFLAGS} -o mup *.c -lm
+	$(tc-getCC) ${CFLAGS} -o mup *.c -lm || die "mup compile failed"
 
 	cd ${S}/mkmupfnt
-	echo $(gcc-getCC) ${CFLAGS} -o mkmupfnt *.c
-	$(gcc-getCC) ${CFLAGS} -o mkmupfnt *.c || die "mkmupfnt compile failed"
+	echo $(tc-getCC) ${CFLAGS} -o mkmupfnt *.c
+	$(tc-getCC) ${CFLAGS} -o mkmupfnt *.c || die "mkmupfnt compile failed"
 
-	if [ `use X` ] || [ `use svga` ] ; then
+	if use X || use svga ; then
 		cd ${S}/mupdisp
-		if [ `use X` ] ; then
+		if use X ; then
 			param="-lX11 -L/usr/X11R6/lib"
 		else
 			sed -i '/XWINDOW/s:.*::' dispttyp.h
 		fi
-		if [ `use svga` ] ; then
+		if use svga ; then
 			param="${param} -lvga"
 		else
 			param="${param} -DNO_VGA_LIB"
 		fi
-		echo $(gcc-getCC) ${CFLAGS} -o mupdisp *.c -lm ${param}
-		$(gcc-getCC) ${CFLAGS} -o mupdisp *.c -lm ${param} || die "mupdisp compile failed"
+		echo $(tc-getCC) ${CFLAGS} -o mupdisp *.c -lm ${param}
+		$(tc-getCC) ${CFLAGS} -o mupdisp *.c -lm ${param} || die "mupdisp compile failed"
 	fi
 }
 
 src_install() {
 	dobin mup/mup mkmupfnt/mkmupfnt mupprnt || die
-	if [ `use X` ] || [ `use svga` ] ; then
+	if use X || use svga ; then
 		dobin mupdisp/mupdisp || die
 	fi
 
@@ -61,7 +61,7 @@ src_install() {
 	cd docs
 	dodoc *.txt README1
 	doman mup.1 mkmupfnt.1 mupprnt.1
-	if [ `use X` ] || [ `use svga` ] ; then
+	if use X || use svga ; then
 		doman mupdisp.1
 	fi
 	dohtml uguide/*
@@ -70,15 +70,15 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [ `use svga` ] ; then
+	if use svga ; then
 		einfo "Please note that using mupdisp in SVGA mode on the console"
 		einfo "requires that it can write to the console device. To allow"
 		einfo "this, make mupdisp setuid to root, like this:"
-		einfo ""
-		einfo "\tchown root:root /usr/bin/mupdisp"
+		einfo
+		einfo "\tchown root /usr/bin/mupdisp"
 		einfo "\tchmod u+s /usr/bin/mupdisp"
 	fi
-	if [ `use X` ] || [ `use svga` ] ; then
+	if use X || use svga ; then
 		echo
 		einfo "If you want to use mupdisp, make sure you also install ghostscript."
 	fi
diff --git a/media-sound/mup/mup-5.1.ebuild b/media-sound/mup/mup-5.1.ebuild
index a78572f6df22..f9812bd176fd 100644
--- a/media-sound/mup/mup-5.1.ebuild
+++ b/media-sound/mup/mup-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/media-sound/mup/mup-5.1.ebuild,v 1.1 2005/10/05 21:28:48 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/mup-5.1.ebuild,v 1.1.1.1 2005/11/30 09:38:22 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
diff --git a/media-sound/muse/ChangeLog b/media-sound/muse/ChangeLog
index 82384042d5a7..6cdeb0a23d75 100644
--- a/media-sound/muse/ChangeLog
+++ b/media-sound/muse/ChangeLog
@@ -1,6 +1,61 @@
 # ChangeLog for media-sound/muse
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/muse/ChangeLog,v 1.1 2003/03/08 12:23:34 jje Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/muse/ChangeLog,v 1.1.1.1 2005/11/30 09:38:44 chriswhite Exp $
+
+  28 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -files/muse-0.8.1-strings.patch, -muse-0.7.2.ebuild,
+  -muse-0.8.1-r1.ebuild, muse-0.9.1.ebuild:
+  Dont make use of the deprecated oggvorbis useflag any longer, see #94254.
+  0.9.1 stable on amd64.
+
+  29 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> muse-0.9.1.ebuild:
+  added ~amd64 to KEYWORDS. fixes #79925
+
+*muse-0.9.1 (21 Jan 2005)
+
+  21 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/muse-0.9.1-include.patch, +files/muse-0.9.1-miscfixes.patch,
+  +muse-0.9.1.ebuild:
+  added a patch that fixes compilation issues. version bump. fixes bug #75986.
+  thanks to Diego Pettenò <dgp85@users.sourceforge.net>
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> muse-0.9.ebuild:
+  Stable sparc.
+
+  23 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> muse-0.9.ebuild:
+  Added to ~sparc.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> muse-0.7.2.ebuild:
+  virtual/glibc -> virtual/libc
+
+  30 May 2004; Jeremy Huddleston <eradicator@gentoo.org> muse-0.9.ebuild:
+  Stable x86.
+
+  25 Apr 2004; Aron Griffis <agriffis@gentoo.org> muse-0.7.2.ebuild:
+  Add die following econf for bug 48950
+
+  19 Apr 2004; David Holm <dholm@gentoo.org> muse-0.9.ebuild:
+  Added to ~ppc.
+
+*muse-0.9 (18 Apr 2004)
+
+  18 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> muse-0.9.ebuild,
+  files/muse-0.9-locale-Makefile.patch:
+  Version bump closes bug #32933.
+
+  03 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> muse-0.8.1-r1.ebuild:
+  Stable on x86
+
+*muse-0.8.1-r1 (03 Mar 2004)
+
+  03 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> muse-0.8.1-r1.ebuild,
+  files/muse-0.8.1-strings.patch:
+  Fix multi-line strings.  vorbis is required.  Fixes bug #32933.
+
+*muse-0.8.1 (27 Sep 2003)
+
+  27 Sep 2003; jje <jje@gentoo.org> :
+  Version bump.
 
 *muse-0.7.2 (08 Mar 2003)
 
diff --git a/media-sound/muse/Manifest b/media-sound/muse/Manifest
index e69de29bb2d1..5eee06d7f67d 100644
--- a/media-sound/muse/Manifest
+++ b/media-sound/muse/Manifest
@@ -0,0 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 92720495f557964f0ed682102113bf9e muse-0.9.ebuild 1208
+MD5 540a48956b2088157cba74d811d31e8f muse-0.9.1.ebuild 1327
+MD5 0a21fc6ac9f356d57177a63300b36084 ChangeLog 2181
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 4ae600228fc21c5df407174af307f157 files/muse-0.9.1-miscfixes.patch 1914
+MD5 e3cdfa1976dbb65fae01a6e45ed737f8 files/muse-0.9-locale-Makefile.patch 267
+MD5 7c0ac892f30b155f79f3588857ab378f files/muse-0.9.1-include.patch 549
+MD5 7163bb4ec5bd71ef481511af79dfe698 files/digest-muse-0.9.1 63
+MD5 45c92a3f89ef7adfee831d69fe5ea32f files/digest-muse-0.9 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCmHde06ebR+OMO78RAoHwAJ4g+bvDNHHvKwl9cd2gbogfQQj/cgCgjB7n
+WO2nKJiwJbIW5XYX1xXr+HU=
+=Zhkv
+-----END PGP SIGNATURE-----
diff --git a/media-sound/muse/muse-0.9.1.ebuild b/media-sound/muse/muse-0.9.1.ebuild
index 2f6f47ed6eb4..02e4b5146289 100644
--- a/media-sound/muse/muse-0.9.1.ebuild
+++ b/media-sound/muse/muse-0.9.1.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/media-sound/muse/muse-0.9.1.ebuild,v 1.1 2005/01/21 21:29:29 luckyduck Exp $
-
-IUSE="ncurses gtk debug"
+# $Header: /var/cvsroot/gentoo-x86/media-sound/muse/muse-0.9.1.ebuild,v 1.1.1.1 2005/11/30 09:38:44 chriswhite Exp $
 
 inherit eutils
 
@@ -13,9 +11,10 @@ DESCRIPTION="Multiple Streaming Engine, an icecast source streamer"
 SRC_URI="ftp://ftp.dyne.org/muse/releases/${MY_P}.tar.gz"
 HOMEPAGE="http://muse.dyne.org/"
 
-KEYWORDS="~ppc sparc x86"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc sparc x86 amd64"
+IUSE="ncurses gtk debug"
 
 DEPEND="media-sound/lame
 	media-libs/libvorbis
@@ -36,21 +35,24 @@ src_unpack() {
 
 src_compile() {
 	econf \
-	`use_with gtk x` \
-	`use_with ncurses rubik` \
-	`use_enable debug` || die "econf failed"
+		$(use_enable debug) \
+		$(use_with gtk x) \
+		$(use_with ncurses rubik) \
+		|| die "econf failed"
 
-	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS} -fpermissive" || die "emake failed"
+	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS} -fpermissive" \
+		|| die "emake failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
+	make DESTDIR="${D}" install || die "make install failed"
 	rm -rf ${D}/usr/doc
 	dodoc AUTHORS ChangeLog NEWS README TODO KNOWN-BUGS USAGE
 }
 
 pkg_postinst() {
 	einfo
-	einfo "You may want to have a look at /usr/share/doc/${PF}/README.gz for more info."
+	einfo "You may want to have a look at /usr/share/doc/${PF}/README.gz"
+	einfo "for more info."
 	einfo
 }
diff --git a/media-sound/muse/muse-0.9.ebuild b/media-sound/muse/muse-0.9.ebuild
index 7ba893bad9d9..3c637e0b25c4 100644
--- a/media-sound/muse/muse-0.9.ebuild
+++ b/media-sound/muse/muse-0.9.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/media-sound/muse/muse-0.9.ebuild,v 1.1 2004/04/18 20:01:51 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/muse/muse-0.9.ebuild,v 1.1.1.1 2005/11/30 09:38:44 chriswhite Exp $
+
+IUSE="ncurses gtk debug"
 
 inherit eutils
 
@@ -11,10 +13,9 @@ DESCRIPTION="Multiple Streaming Engine, an icecast source streamer"
 SRC_URI="ftp://ftp.dyne.org/muse/releases/${MY_P}.tar.gz"
 HOMEPAGE="http://muse.dyne.org/"
 
-KEYWORDS="~x86"
+KEYWORDS="~ppc sparc x86"
 SLOT="0"
 LICENSE="GPL-2"
-IUSE="ncurses gtk debug"
 
 DEPEND="media-sound/lame
 	media-libs/libvorbis
diff --git a/media-sound/musepack-tools/ChangeLog b/media-sound/musepack-tools/ChangeLog
index a2c397044897..050d899b0ee8 100644
--- a/media-sound/musepack-tools/ChangeLog
+++ b/media-sound/musepack-tools/ChangeLog
@@ -1,6 +1,132 @@
 # ChangeLog for media-sound/musepack-tools
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/ChangeLog,v 1.1 2004/04/22 09:31:01 eradicator Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/ChangeLog,v 1.1.1.1 2005/11/30 09:38:37 chriswhite Exp $
+
+  18 Oct 2005; Tony Vroon <chainsaw@gentoo.org> musepack-tools-1.15v.ebuild:
+  Do not attempt to redirect output to /dev/tty, this makes no sense. Closes
+  bug #109699.
+
+  04 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  files/musepack-tools-1.15v-Makefile.patch, musepack-tools-1.15v.ebuild:
+  Fixed patch for +esd/-esd handling. See bug #104147.
+
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  musepack-tools-1.15s-r2.ebuild, musepack-tools-1.15t.ebuild,
+  musepack-tools-1.15u.ebuild, musepack-tools-1.15v.ebuild:
+  Don't install COPYING file.
+
+  23 Aug 2005; Tony Vroon <chainsaw@gentoo.org> musepack-tools-1.15v.ebuild:
+  1.15v stable on x86.
+
+  11 Jun 2005; Diego Pettenò <flameeyes@gentoo.org>
+  musepack-tools-1.15v.ebuild:
+  Fix dependency over esd just when needed. Made it link to libm else it fails
+  to link.
+
+*musepack-tools-1.15v (19 Mar 2005)
+
+  19 Mar 2005; Tony Vroon <chainsaw@gentoo.org>
+  +files/musepack-tools-1.15v-Makefile.patch,
+  +files/musepack-tools-1.15v-gcc4.patch, musepack-tools-1.15s-r2.ebuild,
+  musepack-tools-1.15t.ebuild, musepack-tools-1.15u.ebuild,
+  +musepack-tools-1.15v.ebuild:
+  Version bump, closes bug #83365. Correct LICENSE in all ebuilds.
+
+*musepack-tools-1.15u (08 Mar 2005)
+
+  08 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/musepack-tools-1.15u-Makefile.patch,
+  +files/musepack-tools-1.15u-gcc4.patch, +musepack-tools-1.15u.ebuild:
+  new upstream version, fixes #83528
+
+  09 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  musepack-tools-1.15s-r2.ebuild, musepack-tools-1.15t.ebuild:
+  corrected issue with esound dependency, fixes #81311
+
+  11 Feb 2005; Tony Vroon <chainsaw@gentoo.org>
+  +files/musepack-tools-1.15t-gcc4.patch, musepack-tools-1.15t.ebuild:
+  GCC 4 compatability fix by Radoslaw -AstralStorm- Szkodzinski
+  <astralstorm@gorzow.mm.pl> closes bug #81443.
+
+  07 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  files/musepack-tools-1.15t-Makefile.patch:
+  modified the makefile patch to preserve UNBREAK cflags. see #81033
+
+  07 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  musepack-tools-1.15s-r2.ebuild, musepack-tools-1.15t.ebuild:
+  removed wrong homepage urls, fixes #81157
+
+*musepack-tools-1.15t (07 Feb 2005)
+
+  07 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/musepack-tools-1.15t-Makefile.patch, +musepack-tools-1.15t.ebuild:
+  new upstream release. fixes #81033
+
+*musepack-tools-1.15s-r2 (17 Jan 2005)
+
+  17 Jan 2005; Tony Vroon <chainsaw@gentoo.org>
+  -musepack-tools-1.15s-r1.ebuild, +musepack-tools-1.15s-r2.ebuild:
+  Portability fix, do not try to use x86 asm on amd64. Closes bug #78336,
+  patch by Tom Martin <slarti@gentoo.org>.
+
+  22 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -musepack-tools-1.15r-r2.ebuild:
+  Removing old version.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  musepack-tools-1.15s-r1.ebuild:
+  Stable amd64, x86.
+
+  04 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  musepack-tools-1.15r-r2.ebuild, musepack-tools-1.15s-r1.ebuild:
+  Added missing esd? around esound DEPEND.  Closes bug #72287.
+
+*musepack-tools-1.15s-r1 (27 Nov 2004)
+
+  27 Nov 2004; Tony Vroon <chainsaw@gentoo.org>
+  +musepack-tools-1.15s-r1.ebuild, -musepack-tools-1.15s.ebuild:
+  Add 16bit local USE-flag, closes bug #72500. Made oss dependency explicit as
+  to never break emerge world.
+
+*musepack-tools-1.15s (26 Nov 2004)
+
+  26 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/musepack-tools-1.15r-Makefile.patch,
+  +files/musepack-tools-1.15s-Makefile.patch, +musepack-tools-1.15s.ebuild:
+  Version bump closes bug #72486.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -musepack-tools-1.15r.ebuild, -musepack-tools-1.15r-r1.ebuild,
+  musepack-tools-1.15r-r2.ebuild:
+  Stable x86.  Removing old ebuilds.
+
+*musepack-tools-1.15r-r2 (05 Sep 2004)
+
+  05 Sep 2004; Patrick Dawson <pkdawson@gentoo.org>
+  +musepack-tools-1.15r-r2.ebuild:
+  Added filters for some mfpmath flags. Thanks to <numlock@freesurf.ch>
+  Closes bug #62224.
+
+*musepack-tools-1.15r-r1 (07 Jul 2004)
+
+  07 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/musepack-tools-1.15r-r1-Makefile.patch,
+  +musepack-tools-1.15r-r1.ebuild:
+  prelink bug fix thanks to 4nykey@nm.ru closes bug #49821. -* because of nasm
+  dep.
+
+  16 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  musepack-tools-1.15r.ebuild:
+  SRC_URI fixed for bug #52148.
+
+  14 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  musepack-tools-1.15r.ebuild:
+  Removed nomirror so we can get source from the gentoo mirror. Added nasm
+  dependency. Added to ~amd64. Removed -mpreferred-stack-boundary=2 from vendor
+  CFLAGS.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> musepack-tools-1.15r.ebuild:
+  Add flag-o-matic for bug 49179
 
 *musepack-tools-1.15r (22 Apr 2004)
 
diff --git a/media-sound/musepack-tools/Manifest b/media-sound/musepack-tools/Manifest
index 64e53fb40869..e0bd2676940a 100644
--- a/media-sound/musepack-tools/Manifest
+++ b/media-sound/musepack-tools/Manifest
@@ -1,3 +1,28 @@
-MD5 9370faec70889f169b855b1f9d157d4e musepack-tools-1.15r.ebuild 1384
-MD5 1455d6a964f7627af39de693f68a6069 files/musepack-tools-1.15r-Makefile.patch 3459
-MD5 da322e6de9051b732f4d858efb9656e5 files/digest-musepack-tools-1.15r 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9fc93a1f8febe405a0114b704d0daf9e ChangeLog 5210
+MD5 b81fa7225bc172daee43e316eba11fa0 files/digest-musepack-tools-1.15s-r2 68
+MD5 d81d9df24aeee0d861392505d4941067 files/digest-musepack-tools-1.15t 69
+MD5 ed58f526be4bbd9e940db917d7821d74 files/digest-musepack-tools-1.15u 69
+MD5 83959d8ebd21d40ec956ac942fa6b9f1 files/digest-musepack-tools-1.15v 69
+MD5 e2b1a42af0b2661239d43baa7204cdf7 files/musepack-tools-1.15r-r1-Makefile.patch 3748
+MD5 cfc4d714a4dc0419ccc7091a89543824 files/musepack-tools-1.15s-Makefile.patch 2893
+MD5 9765f2db5f70d381035134cc86fcf06b files/musepack-tools-1.15t-Makefile.patch 750
+MD5 ede8b7ca4902507ed93207bf753b9402 files/musepack-tools-1.15t-gcc4.patch 288
+MD5 9765f2db5f70d381035134cc86fcf06b files/musepack-tools-1.15u-Makefile.patch 750
+MD5 ede8b7ca4902507ed93207bf753b9402 files/musepack-tools-1.15u-gcc4.patch 288
+MD5 22a0f1804346128859f9a99ff9305cf4 files/musepack-tools-1.15v-Makefile.patch 572
+MD5 ede8b7ca4902507ed93207bf753b9402 files/musepack-tools-1.15v-gcc4.patch 288
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 1bae02184cdfee099296b98e4f09a0ba musepack-tools-1.15s-r2.ebuild 1588
+MD5 2c6f59eed8f1893c3be3699b0d7e19e9 musepack-tools-1.15t.ebuild 1427
+MD5 c6772fd586092e9a311f2b643eafbf3f musepack-tools-1.15u.ebuild 1506
+MD5 4af7abeddbf1aca4eb83f37f3d62660d musepack-tools-1.15v.ebuild 1614
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDVW9Xp5vW4rUFj5oRArZLAKCaxEnMSz/i1pRMK7BneY7WZ0gE8QCgjKMB
+VN7AqpbOUhGXDLAYeKH4W+0=
+=nWOt
+-----END PGP SIGNATURE-----
diff --git a/media-sound/musepack-tools/files/musepack-tools-1.15t-Makefile.patch b/media-sound/musepack-tools/files/musepack-tools-1.15t-Makefile.patch
index 72910b140e5a..4011fdc02959 100644
--- a/media-sound/musepack-tools/files/musepack-tools-1.15t-Makefile.patch
+++ b/media-sound/musepack-tools/files/musepack-tools-1.15t-Makefile.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2005-02-07 15:56:48.517585552 +0100
-+++ Makefile	2005-02-07 16:04:53.878799432 +0100
+--- Makefile.orig	2005-02-07 15:56:48.000000000 +0100
++++ Makefile	2005-02-07 23:23:20.422596896 +0100
 @@ -36,7 +36,7 @@
  # If unset Intel 386 with optimization for Pentium is selected.
  
@@ -23,10 +23,10 @@
  endif
  
 -OPTIM_SPEED = -O2 $(FLAGS) $(UNBREAK)
-+OPTIM_SPEED = #-O2 $(FLAGS) $(UNBREAK)
++OPTIM_SPEED = $(UNBREAK)
  
 -OPTIM_SIZE = -Os $(FLAGS) $(UNBREAK)
-+OPTIM_SIZE = #-Os $(FLAGS) $(UNBREAK)
++OPTIM_SIZE = $(UNBREAK)
  
  # Options to generate Assembly code for inspecting
  
diff --git a/media-sound/musepack-tools/files/musepack-tools-1.15v-Makefile.patch b/media-sound/musepack-tools/files/musepack-tools-1.15v-Makefile.patch
index 4011fdc02959..b6e1d16c5293 100644
--- a/media-sound/musepack-tools/files/musepack-tools-1.15v-Makefile.patch
+++ b/media-sound/musepack-tools/files/musepack-tools-1.15v-Makefile.patch
@@ -9,15 +9,6 @@
  endif
  
  ifdef MINGW
-@@ -97,7 +97,7 @@
- # Name of libraries you need for linking
- 
- ifndef MINGW
--LDADD    = -lm
-+LDADD    = `esd-config --libs`
- #LDADD   += -lesd
- else
- LDADD    = -lwinmm -lws2_32
 @@ -176,9 +176,9 @@
  	-fno-finite-math-only -fno-unsafe-math-optimizations
  endif
diff --git a/media-sound/musepack-tools/musepack-tools-1.15s-r2.ebuild b/media-sound/musepack-tools/musepack-tools-1.15s-r2.ebuild
index 00b0acfc6aaa..2eb6f3f56f0c 100644
--- a/media-sound/musepack-tools/musepack-tools-1.15s-r2.ebuild
+++ b/media-sound/musepack-tools/musepack-tools-1.15s-r2.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/media-sound/musepack-tools/musepack-tools-1.15s-r2.ebuild,v 1.1 2005/01/17 20:52:11 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/musepack-tools-1.15s-r2.ebuild,v 1.1.1.1 2005/11/30 09:38:37 chriswhite Exp $
 
-IUSE="static esd 16bit"
+IUSE="static 16bit"
 
 inherit eutils flag-o-matic
 
 S="${WORKDIR}/sv7"
 
 DESCRIPTION="Musepack audio compression tools"
-HOMEPAGE="http://www.uni-jena.de/~pfk/mpp/ http://corecodec.org/projects/mpc/ http://www.musepack.net"
+HOMEPAGE="http://www.musepack.net"
 SRC_URI="http://www.saunalahti.fi/grimmel/musepack.net/source/mpcsv7-src-${PV}.tar.gz"
 
 SLOT="0"
-LICENSE="GPL-2 LGPL-2.1"
+LICENSE="LGPL-2.1"
 KEYWORDS="amd64 x86"
 
-RDEPEND="esd? ( media-sound/esound )
+RDEPEND="media-sound/esound
 	 media-libs/id3lib"
 
 DEPEND="${RDEPEND}
@@ -56,5 +56,5 @@ src_compile() {
 
 src_install() {
 	dobin mppenc mppdec replaygain tagger
-	dodoc COPYING* README doc/ChangeLog doc/MANUAL.TXT doc/NEWS doc/SV7.txt doc/TODO*
+	dodoc README doc/ChangeLog doc/MANUAL.TXT doc/NEWS doc/SV7.txt doc/TODO*
 }
diff --git a/media-sound/musepack-tools/musepack-tools-1.15t.ebuild b/media-sound/musepack-tools/musepack-tools-1.15t.ebuild
index 663a500f66e1..46ab596d5e57 100644
--- a/media-sound/musepack-tools/musepack-tools-1.15t.ebuild
+++ b/media-sound/musepack-tools/musepack-tools-1.15t.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/media-sound/musepack-tools/musepack-tools-1.15t.ebuild,v 1.1 2005/02/07 15:10:21 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/musepack-tools-1.15t.ebuild,v 1.1.1.1 2005/11/30 09:38:37 chriswhite Exp $
 
-IUSE="static esd 16bit"
+IUSE="static 16bit"
 
 inherit eutils flag-o-matic
 
 S="${WORKDIR}/sv7"
 
 DESCRIPTION="Musepack audio compression tools"
-HOMEPAGE="http://www.uni-jena.de/~pfk/mpp/ http://corecodec.org/projects/mpc/ http://www.musepack.net"
+HOMEPAGE="http://www.musepack.net"
 SRC_URI="http://files.musepack.net/source/mpcsv7-src-${PV}.tar.bz2"
 
 SLOT="0"
-LICENSE="GPL-2 LGPL-2.1"
+LICENSE="LGPL-2.1"
 KEYWORDS="amd64 x86"
 
-RDEPEND="esd? ( media-sound/esound )
+RDEPEND="media-sound/esound
 	 media-libs/id3lib"
 
 DEPEND="${RDEPEND}
@@ -28,6 +28,7 @@ src_unpack() {
 	cd ${S}
 
 	epatch ${FILESDIR}/${P}-Makefile.patch
+	epatch ${FILESDIR}/${P}-gcc4.patch
 
 	sed -i 's/#define USE_IRIX_AUDIO/#undef USE_IRIX_AUDIO/' mpp.h
 
@@ -53,5 +54,5 @@ src_compile() {
 
 src_install() {
 	dobin mppenc mppdec replaygain
-	dodoc COPYING* README doc/ChangeLog doc/MANUAL.TXT doc/NEWS doc/SV7.txt doc/TODO*
+	dodoc README doc/ChangeLog doc/MANUAL.TXT doc/NEWS doc/SV7.txt doc/TODO*
 }
diff --git a/media-sound/musepack-tools/musepack-tools-1.15u.ebuild b/media-sound/musepack-tools/musepack-tools-1.15u.ebuild
index ec9f7b87e750..7bd9a2c9e3a6 100644
--- a/media-sound/musepack-tools/musepack-tools-1.15u.ebuild
+++ b/media-sound/musepack-tools/musepack-tools-1.15u.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/musepack-tools-1.15u.ebuild,v 1.1 2005/03/08 18:27:03 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/musepack-tools-1.15u.ebuild,v 1.1.1.1 2005/11/30 09:38:37 chriswhite Exp $
 
 IUSE="static 16bit"
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.musepack.net"
 SRC_URI="http://files.musepack.net/source/mpcsv7-src-${PV}.tar.bz2"
 
 SLOT="0"
-LICENSE="GPL-2 LGPL-2.1"
+LICENSE="LGPL-2.1"
 KEYWORDS="amd64 x86"
 
 RDEPEND="media-sound/esound
@@ -57,5 +57,5 @@ src_compile() {
 
 src_install() {
 	dobin mppenc mppdec replaygain
-	dodoc COPYING* README doc/ChangeLog doc/MANUAL.TXT doc/NEWS doc/SV7.txt doc/TODO*
+	dodoc README doc/ChangeLog doc/MANUAL.TXT doc/NEWS doc/SV7.txt doc/TODO*
 }
diff --git a/media-sound/musepack-tools/musepack-tools-1.15v.ebuild b/media-sound/musepack-tools/musepack-tools-1.15v.ebuild
index 163fbc5d48c7..fffa877f4e4b 100644
--- a/media-sound/musepack-tools/musepack-tools-1.15v.ebuild
+++ b/media-sound/musepack-tools/musepack-tools-1.15v.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/musepack-tools-1.15v.ebuild,v 1.1 2005/03/19 14:06:14 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/musepack-tools-1.15v.ebuild,v 1.1.1.1 2005/11/30 09:38:37 chriswhite Exp $
 
 IUSE="static 16bit esd"
 
@@ -14,9 +14,9 @@ SRC_URI="http://files.musepack.net/source/mpcsv7-src-${PV}.tar.bz2"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
-RDEPEND="media-sound/esound
+RDEPEND="esd? ( media-sound/esound )
 	 media-libs/id3lib"
 
 DEPEND="${RDEPEND}
@@ -33,9 +33,10 @@ src_unpack() {
 	sed -i 's/#define USE_IRIX_AUDIO/#undef USE_IRIX_AUDIO/' mpp.h
 
 	if ! use esd ; then
-		sed -i 's/#define USE_ESD_AUDIO/#undef USE_ESD_AUDIO/' mpp.h
+		sed -i -e 's/#define USE_ESD_AUDIO/#undef USE_ESD_AUDIO/' mpp.h
 	else
-		sed -i 's/#LDADD   += -lesd/LDADD   += -lesd/' Makefile
+		sed -i -e 's/^LDADD    = -lm$/LDADD    = $(shell esd-config --libs)/' \
+			Makefile
 	fi
 
 	if ! use x86 ; then
@@ -43,16 +44,21 @@ src_unpack() {
 	fi
 
 	use 16bit && sed -i 's|//#define MAKE_16BIT|#define MAKE_16BIT|' mpp.h
+
+	# Bug #109699; console redirection to /dev/tty makes no sense
+	sed -i -e 's/$(LDADD) &> $(LOGFILE)/$(LDADD)/' Makefile
 }
 
 src_compile() {
 	filter-flags "-fprefetch-loop-arrays"
 	filter-flags "-mfpmath=sse" "-mfpmath=sse,387"
 	use static && export BLD_STATIC=1
+
+	append-flags -I${S}
 	ARCH= emake mppenc mppdec replaygain || die
 }
 
 src_install() {
 	dobin mppenc mppdec replaygain
-	dodoc COPYING* README doc/ChangeLog doc/MANUAL.TXT doc/NEWS doc/SV7.txt doc/TODO*
+	dodoc README doc/ChangeLog doc/MANUAL.TXT doc/NEWS doc/SV7.txt doc/TODO*
 }
diff --git a/media-sound/musescore/ChangeLog b/media-sound/musescore/ChangeLog
index 6c9bb6df0d39..5658e28e7081 100644
--- a/media-sound/musescore/ChangeLog
+++ b/media-sound/musescore/ChangeLog
@@ -1,6 +1,28 @@
 # ChangeLog for media-sound/musescore
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musescore/ChangeLog,v 1.1 2003/03/08 12:54:09 jje Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musescore/ChangeLog,v 1.1.1.1 2005/11/30 09:38:42 chriswhite Exp $
+
+  25 Jul 2005; Caleb Tennis <caleb@gentoo.org> musescore-0.0.6.ebuild:
+  Fix qt dep per bug #100235
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  musescore-0.0.6.ebuild:
+  Stable sparc.
+
+  23 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  musescore-0.0.6.ebuild:
+  Added to ~sparc.
+
+  01 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  musescore-0.0.6.ebuild, files/musescore-0.0.6-assert.patch:
+  Fix bug #49377.
+
+  17 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  musescore-0.0.6.ebuild:
+  removed IUSE=X.  Removed einstall.
+
+  12 Jun 2003; <msterret@gentoo.org> musescore-0.0.6.ebuild:
+  fix Header
 
 *musescore-0.0.6 (08 Mar 2003)
 
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index e69de29bb2d1..8667fbe64e27 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -0,0 +1,5 @@
+MD5 2b04178707740f5095b2f1aae65b76cb musescore-0.0.6.ebuild 807
+MD5 872e8ec88bb6582274b5ef3a7d7df5b1 ChangeLog 997
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 56eb9287f3dd49624e640674d5c2ead2 files/musescore-0.0.6-assert.patch 1572
+MD5 727e72b54693e0734a6d0a66159140ea files/digest-musescore-0.0.6 65
diff --git a/media-sound/musescore/musescore-0.0.6.ebuild b/media-sound/musescore/musescore-0.0.6.ebuild
index 6682cf566d62..63981c2c63ee 100644
--- a/media-sound/musescore/musescore-0.0.6.ebuild
+++ b/media-sound/musescore/musescore-0.0.6.ebuild
@@ -1,28 +1,38 @@
-# Copyright 1999-2002 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/media-sound/musescore/musescore-0.0.6.ebuild,v 1.1.1.1 2005/11/30 09:38:42 chriswhite Exp $
 
-DESCRIPTION="Music Score Typesetter"
-HOMEPAGE="http://muse.seh.de/mscore/index.php"
-LICENSE="GPL-2"
+IUSE=""
+
+inherit qt3 eutils
 
 MY_P=mscore-${PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Music Score Typesetter"
+HOMEPAGE="http://muse.seh.de/mscore/index.php"
 SRC_URI="http://muse.seh.de/mscore/bin//${MY_P}.tar.bz2"
 
+LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE="X"
-S=${WORKDIR}/${MY_P}
+KEYWORDS="sparc x86"
+
+DEPEND="$(qt_min_version 3.1)"
 
-DEPEND=">=x11-libs/qt-3.1.0"
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-assert.patch
+}
 
 src_compile() {
-	econf
+	addwrite "${QTDIR}/etc/settings"
+	econf --disable-qttest || die
 	emake || die
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
-	einstall
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README README.translate TODO
 }
-
diff --git a/media-sound/museseq/ChangeLog b/media-sound/museseq/ChangeLog
index 2ad29f6cd967..ef4acc07a63c 100644
--- a/media-sound/museseq/ChangeLog
+++ b/media-sound/museseq/ChangeLog
@@ -1,6 +1,145 @@
 # ChangeLog for media-sound/museseq
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/museseq/ChangeLog,v 1.1 2003/06/21 02:39:22 jje Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/museseq/ChangeLog,v 1.1.1.1 2005/11/30 09:38:05 chriswhite Exp $
+
+  07 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  museseq-0.6.2-r1.ebuild, museseq-0.7.0-r1.ebuild,
+  museseq-0.7.1_pre3.ebuild, museseq-0.7.1.ebuild,
+  museseq-0.7.2_pre2.ebuild:
+  Don't install COPYING and INSTALL files.
+
+  25 Jul 2005; Caleb Tennis <caleb@gentoo.org> museseq-0.6.2-r1.ebuild,
+  museseq-0.7.0-r1.ebuild, museseq-0.7.1_pre3.ebuild, museseq-0.7.1.ebuild,
+  museseq-0.7.2_pre2.ebuild:
+  Fix qt dep per bug #100235
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> museseq-0.7.2_pre2.ebuild:
+  Added to ~ppc.
+
+*museseq-0.7.2_pre2 (24 Jul 2005)
+
+  24 Jul 2005; Frank van de Pol <fvdpol@gentoo.org>
+  +museseq-0.7.2_pre2.ebuild:
+  Version bump to 0.7.2_pre2
+
+  15 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  museseq-0.7.0-r1.ebuild, museseq-0.7.1_pre3.ebuild, museseq-0.7.1.ebuild:
+  Removed inheritance of gcc eclass which isn't necessary.
+
+  27 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  museseq-0.7.1.ebuild:
+  Use proper toolchain ld.  Added to ~sparc.
+
+  18 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -files/museseq-0.6.2-int2ptr.patch, +files/museseq-0.6.2-int2ptr.patch.gz,
+  museseq-0.6.2-r1.ebuild, museseq-0.7.1.ebuild:
+  updated digest and SRC_URI to fix #82162. also gziped patch for 0.6.2 to make
+  it <20k.
+
+  06 Feb 2005; Frank van de Pol <fvdpol@gentoo.org>
+  -museseq-0.7.0.20040925.ebuild:
+  cleaning up... removed  museseq-0.7.0.20040925
+
+*museseq-0.7.1 (01 Feb 2005)
+
+  01 Feb 2005; Frank van de Pol <fvdpol@gentoo.org> +museseq-0.7.1.ebuild:
+  Version bump to 0.7.1.
+
+  13 Jan 2005; Frank van de Pol <fvdpol@gentoo.org> museseq-0.7.1_pre3.ebuild:
+  Updated dependencies. Closes Bug #77807 and #77373.
+
+*museseq-0.7.1_pre3 (09 Jan 2005)
+
+  09 Jan 2005; Frank van de Pol <fvdpol@gentoo.org>
+  +museseq-0.7.1_pre3.ebuild:
+  Updated to new upstream release 0.7.1pre3.
+
+  19 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -museseq-0.6.0.ebuild, -museseq-0.6.2.ebuild:
+  Removing old versions.
+
+  18 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  museseq-0.7.0.20040925.ebuild:
+  Removed explicit RDEPEND=DEPEND statement.
+
+  28 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  museseq-0.6.2-r1.ebuild, museseq-0.7.0-r1.ebuild:
+  Added eutils to inherit.
+
+*museseq-0.7.0.20040925 (28 Sep 2004)
+
+  28 Sep 2004; Chris White <chriswhite@gentoo.org>
+  +files/museseq-0.7.0.20040925-gcc34_typeid_fix.patch,
+  +museseq-0.7.0.20040925.ebuild:
+  Bumped to a cvs snapshot provided by Eric Shattow <shadow@serverart.org> which
+  fixes lots of runtime issues. Closes bug #65287.
+
+*museseq-0.7.0-r1 (25 Sep 2004)
+
+  25 Sep 2004; Chris White <chriswhite@gentoo.org>
+  +files/museseq-0.7.0-suidinstall.patch, +museseq-0.7.0-r1.ebuild:
+  Bump to 0.7.0. Big thanks to Eric Shattow <shadow@serverart.org> for his help
+  in cleaning up. Closes bug #57740.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  museseq-0.6.2-r1.ebuild:
+  Stable amd64, x86.
+
+  08 Sep 2004; Mamoru KOMACHI <usata@gentoo.org> museseq-0.6.2-r1.ebuild:
+  Fixed missing doc problem. This closes bug #49381.
+
+  04 Sep 2004; Chris White <chriswhite@gentoo.org> :
+  Fixed strange manifest errors.
+
+*museseq-0.6.2-r1 (11 Jul 2004)
+
+  11 Jul 2004; Frank van de Pol <fvdpol@gentoo.org>
+  +files/museseq-0.6.2-drumport.patch, +files/museseq-0.6.2-gcc34.patch,
+  +files/museseq-0.6.2-int2ptr.patch, +files/museseq-0.6.2-memory.patch,
+  +museseq-0.6.2-r1.ebuild:
+  Fixes to get MuSE running on amd64. Thanks to Andreas Pokorny
+  <diemumiee@gmx.org> for the hard work in QT and the memory allocator. Closes
+  bug #54569.
+
+  13 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org> museseq-0.6.0.ebuild,
+  museseq-0.6.2.ebuild:
+  Getting rid of virtual/jack.
+
+  26 May 2004; Danny van Dyk <kugelfang@gentoo.org> museseq-0.6.2.ebuild:
+  Removed addwrite "/usr/qt/3/etc/settings". The proper way to handle this
+  sandbox violation is to add inherit kde-function and need-qt 3. Fixes BUG
+  #47975 finally.
+
+  16 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> museseq-0.6.2.ebuild,
+  files/museseq-0.6.2-fPIC.patch:
+  Added amd64 keyword and fixed -fPIC compilation. Closing #47975.
+
+  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> museseq-0.6.2.ebuild:
+  Stable x86.
+
+  17 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> museseq-0.6.0.ebuild,
+  museseq-0.6.2.ebuild:
+  Allow access to /dev/dri/card* to close bug #43134
+
+  19 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> museseq-0.6.0.ebuild,
+  museseq-0.6.2.ebuild:
+  Resolving conflict in executable name with media-sound/muse. We install
+  as lmuse and setup a symlink if muse is not installed. Closes bug #34973.
+
+  02 Feb 2004; Martin Holzer <mholzer@gentoo.org> museseq-0.6.2.ebuild:
+  fixing sandbox.
+
+  07 Dec 2003; Heinrich Wendel <lanius@gentoo.org> museseq-0.6.0.ebuild,
+  museseq-0.6.2.ebuild:
+  fixed alsa deps
+
+  05 Dec 2003; <torbenh@gentoo.org> museseq-0.6.2.ebuild:
+  added a fix for alsa-1.0
+
+*museseq-0.6.2 (03 Dec 2003)
+
+  03 Dec 2003; <torbenh@gentoo.org> museseq-0.6.2.ebuild:
+  New Verion muse-6.2
 
 *museseq-0.6.0 (21 Jun 2003)
 
diff --git a/media-sound/museseq/Manifest b/media-sound/museseq/Manifest
index 11277a651cbf..93485ed05514 100644
--- a/media-sound/museseq/Manifest
+++ b/media-sound/museseq/Manifest
@@ -1,3 +1,28 @@
-MD5 979351c6b2df8ab858143e010b432c45 museseq-0.6.0.ebuild 1334
-MD5 5679680576de2540a44f6dec4c1e7e23 ChangeLog 271
-MD5 cbc52b356437ff53ced441374a08d178 files/digest-museseq-0.6.0 64
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1429094b2c1e97db91ace88fa6685c1d ChangeLog 5366
+MD5 fbb837028f0103f8c2775f24e661888b files/digest-museseq-0.6.2-r1 64
+MD5 20ef97c251eae618ada71d7493308b96 files/digest-museseq-0.7.0-r1 64
+MD5 1006036f5832dc460206b706858ff87b files/digest-museseq-0.7.1 69
+MD5 8e4317aae91e4f07628431262e27ad09 files/digest-museseq-0.7.1_pre3 68
+MD5 2c6c891ab9c7acc10851768de6961ade files/digest-museseq-0.7.2_pre2 68
+MD5 49c3c1f0136766a89c7cd1ba91006bc6 files/museseq-0.6.2-drumport.patch 771
+MD5 08b5947de834c47253a313e6a7d0a3e5 files/museseq-0.6.2-fPIC.patch 4002
+MD5 8bf0be08b3013a6047aecad1e99bc1fb files/museseq-0.6.2-gcc34.patch 5500
+MD5 135d65fe445ace2c95913e681e7a7b68 files/museseq-0.6.2-int2ptr.patch.gz 4000
+MD5 7fb0bc9c25aa67018b8c07120f4f16a1 files/museseq-0.6.2-memory.patch 2032
+MD5 fd23ed0d1b20d7ed5f18d26d4a45acc1 files/museseq-0.7.0-suidinstall.patch 837
+MD5 d0d7ea03e238a808414b4426394c100f metadata.xml 221
+MD5 2f43456dafba0a81b8a39b8073ac34aa museseq-0.6.2-r1.ebuild 3135
+MD5 62d7f40fb8e1d22a6d8869c45eb07cd4 museseq-0.7.0-r1.ebuild 1962
+MD5 6baf2685f122326e713790145fba19cc museseq-0.7.1.ebuild 1754
+MD5 6333dbe21d61980bb1bc89d625d36620 museseq-0.7.1_pre3.ebuild 1698
+MD5 2774e4cfd7bb2f6924e6419df0178279 museseq-0.7.2_pre2.ebuild 1722
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDbzflj5H05b2HAEkRAnkJAKCFYx0pvCYre1nCmdzLalFtiUeadwCeOd/p
+kvea7MWQGIrIH6cidRX2N3c=
+=jxnz
+-----END PGP SIGNATURE-----
diff --git a/media-sound/museseq/files/digest-museseq-0.7.1 b/media-sound/museseq/files/digest-museseq-0.7.1
index 38be58eddfd8..b6b1923b8ee1 100644
--- a/media-sound/museseq/files/digest-museseq-0.7.1
+++ b/media-sound/museseq/files/digest-museseq-0.7.1
@@ -1 +1 @@
-MD5 0e47ab9ba98d230e4fd7ea7ef40ed37c muse-0.7.1.tar.bz2 1644403
+MD5 0e47ab9ba98d230e4fd7ea7ef40ed37c muse-0.7.1fixed.tar.bz2 1644403
diff --git a/media-sound/museseq/files/museseq-0.6.2-gcc34.patch b/media-sound/museseq/files/museseq-0.6.2-gcc34.patch
index 06c372a74bba..9599755a4ca6 100644
--- a/media-sound/museseq/files/museseq-0.6.2-gcc34.patch
+++ b/media-sound/museseq/files/museseq-0.6.2-gcc34.patch
@@ -101,7 +101,7 @@ diff -ru muse-0.6.2-orig/midithread.cpp muse-0.6.2/midithread.cpp
 +
  //  MusE
  //  Linux Music Editor
- //  $Id: museseq-0.6.2-gcc34.patch,v 1.1 2004/07/11 22:21:52 fvdpol Exp $
+ //  $Id: museseq-0.6.2-gcc34.patch,v 1.1.1.1 2005/11/30 09:38:06 chriswhite Exp $
 @@ -570,7 +570,7 @@
                    panic();
                    break;
diff --git a/media-sound/museseq/museseq-0.6.2-r1.ebuild b/media-sound/museseq/museseq-0.6.2-r1.ebuild
index 34156db82688..acdb36d50d66 100644
--- a/media-sound/museseq/museseq-0.6.2-r1.ebuild
+++ b/media-sound/museseq/museseq-0.6.2-r1.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/media-sound/museseq/museseq-0.6.2-r1.ebuild,v 1.1 2004/07/11 22:21:52 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/museseq/museseq-0.6.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:05 chriswhite Exp $
+
+IUSE="jack fluidsynth ladcca doc alsa"
 
 inherit virtualx eutils kde-functions
-need-qt 3
 
 MY_P=muse-${PV}
 DESCRIPTION="The Linux (midi) MUSic Editor (a sequencer)"
 HOMEPAGE="http://muse.seh.de"
 SRC_URI="mirror://sourceforge/lmuse/${MY_P}.tar.bz2"
-RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-IUSE="jack fluidsynth ladcca"
+KEYWORDS="x86 amd64 ~sparc"
 
-DEPEND="media-libs/alsa-lib \
-	>=media-libs/libsndfile-1.0.4 \
-	>=x11-libs/qt-3.1.0
-	ladcca? ( >=media-libs/ladcca-0.4.0 ) \
-	jack? ( media-sound/jack-audio-connection-kit ) \
-	fluidsynth? ( media-sound/fluidsynth )"
+DEPEND="alsa? ( media-libs/alsa-lib )
+	>=media-libs/libsndfile-1.0.4
+	$(qt_min_version 3.1)
+	ladcca? ( >=media-libs/ladcca-0.4.0 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	fluidsynth? ( media-sound/fluidsynth )
+	doc? ( app-text/openjade
+		app-text/docbook-dsssl-stylesheets )"
 
 S=${WORKDIR}/${MY_P}
 
@@ -32,7 +32,7 @@ src_unpack() {
 	sed -i "s/HAVE_JACK_JACK_H/HAVE_JACK/" widgets/audioconf.cpp
 	sed -i "/#include <alsa\\/asoundlib.h>/i\\#define ALSA_PCM_OLD_HW_PARAMS_API 1\\" driver/alsaaudio.cpp
 	epatch ${FILESDIR}/${P}-fPIC.patch
-	epatch ${FILESDIR}/${P}-int2ptr.patch
+	epatch ${FILESDIR}/${P}-int2ptr.patch.gz
 	epatch ${FILESDIR}/${P}-memory.patch
 	epatch ${FILESDIR}/${P}-drumport.patch
 	epatch ${FILESDIR}/${P}-gcc34.patch
@@ -44,6 +44,11 @@ src_compile() {
 	use ladcca || myconf="${myconf} --disable-ladcca"
 	use jack || myconf="${myconf} --disable-jack"
 	use fluidsynth || myconf="${myconf} --disable-fluidsynth"
+	if use doc ; then
+		# bug 49381
+		local stylesheets="$(echo /usr/share/sgml/docbook/dsssl-stylesheets-*)"
+		myconf="${myconf} --with-docbook-stylesheets=${stylesheets}"
+	fi
 	Xeconf ${myconf} || die "configure failed"
 
 	### borrowed from kde.eclass #
@@ -67,11 +72,16 @@ src_compile() {
 	addpredict /dev/dri/card*
 
 	emake || die
+	use doc && ( cd doc ; make manual )
 }
 
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc COPYING INSTALL README README.softsynth SECURITY TODO
+	dodoc README README.softsynth SECURITY TODO
+
+	mv ${D}/usr/share/muse/html ${D}/usr/share/doc/${PF}/html
+	dosym /usr/share/doc/${PF}/html /usr/share/muse/html
+	use doc && dohtml doc/*
 
 	# Name conflict with media-sound/muse.  See bug #34973
 	mv ${D}/usr/bin/muse ${D}/usr/bin/lmuse
@@ -81,13 +91,13 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo ""
+	einfo
 	einfo "Muse has been installed normally. If,"
 	einfo "you would like to use muse with real time"
 	einfo "time capabilities for the sequencer then do"
 	einfo "chmod 4755 /usr/bin/lmuse"
-	einfo ""
+	einfo
 	einfo "Muse can use /dev/rtc if it is compiled in"
 	einfo "to your kernel, or available as a module."
-	einfo ""
+	einfo
 }
diff --git a/media-sound/museseq/museseq-0.7.0-r1.ebuild b/media-sound/museseq/museseq-0.7.0-r1.ebuild
index 6c5199de5b05..bfca50ab7581 100644
--- a/media-sound/museseq/museseq-0.7.0-r1.ebuild
+++ b/media-sound/museseq/museseq-0.7.0-r1.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/media-sound/museseq/museseq-0.7.0-r1.ebuild,v 1.1 2004/09/25 06:00:22 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/museseq/museseq-0.7.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:06 chriswhite Exp $
 
-inherit kde-functions gcc virtualx
-need-qt 3
+inherit kde-functions virtualx eutils
 
 MY_P=${P/museseq/muse}
 DESCRIPTION="The Linux (midi) MUSic Editor (a sequencer)"
@@ -16,7 +15,7 @@ KEYWORDS="~x86"
 #IUSE="fluidsynth doc ladcca sdk debug"
 IUSE="fluidsynth doc ladcca debug"
 
-DEPEND=">=x11-libs/qt-3.2.0
+DEPEND="$(qt_min_version 3.2)
 	>=media-libs/alsa-lib-0.9.0
 	fluidsynth?	( media-sound/fluidsynth )
 	doc? ( app-text/openjade
@@ -42,7 +41,7 @@ src_compile() {
 	use ladcca		|| myconf="${myconf} --disable-ladcca"
 #	use sdk			&& myconf="${myconf} --enable-vst"
 	use debug		&& myconf="${myconf} --enable-debug"
-#	[ "`gcc-version`" == "3.4" ] && myconf="${myconf} --enable-pch"
+
 	Xeconf ${myconf} || die "configure failed"
 
 	emake || die
@@ -51,7 +50,7 @@ src_compile() {
 src_install() {
 	cd ${WORKDIR}/${MY_P}
 	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog INSTALL NEWS README README.CVS README.de README.instruments README.ladspaguis README.shortcuts README.softsynth README.translate SECURITY
+	dodoc AUTHORS ChangeLog NEWS README README.CVS README.de README.instruments README.ladspaguis README.shortcuts README.softsynth README.translate SECURITY
 	mv ${D}/usr/bin/muse ${D}/usr/bin/museseq
 }
 
diff --git a/media-sound/museseq/museseq-0.7.1.ebuild b/media-sound/museseq/museseq-0.7.1.ebuild
index a1a8dc2576b3..c2e8443b342f 100644
--- a/media-sound/museseq/museseq-0.7.1.ebuild
+++ b/media-sound/museseq/museseq-0.7.1.ebuild
@@ -1,24 +1,23 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/museseq/museseq-0.7.1.ebuild,v 1.1 2005/02/01 22:51:32 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/museseq/museseq-0.7.1.ebuild,v 1.1.1.1 2005/11/30 09:38:06 chriswhite Exp $
 
-inherit kde-functions gcc virtualx eutils
-need-qt 3
+inherit kde-functions virtualx eutils toolchain-funcs
 
 MY_P=${P/museseq/muse}
 MY_P=${MY_P/_/}
 
 DESCRIPTION="The Linux (midi) MUSic Editor (a sequencer)"
-SRC_URI="mirror://sourceforge/lmuse/${MY_P}.tar.bz2"
+SRC_URI="mirror://sourceforge/lmuse/${MY_P}fixed.tar.bz2"
 HOMEPAGE="http://lmuse.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="doc ladcca debug"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="alsa doc ladcca debug"
 
-DEPEND=">=x11-libs/qt-3.2.0
-	>=media-libs/alsa-lib-0.9.0
+DEPEND="$(qt_min_version 3.2)
+	alsa? ( media-libs/alsa-lib )
 	media-sound/fluidsynth
 	doc? ( app-text/openjade
 		   app-doc/doxygen
@@ -35,6 +34,8 @@ src_compile() {
 	myconf="--disable-suid-build" # instead, use CONFIG_RTC and realtime-lsm
 	use ladcca		|| myconf="${myconf} --disable-ladcca"
 	use debug		&& myconf="${myconf} --enable-debug"
+
+	export LD="$(tc-getLD)"
 	Xeconf ${myconf} || die "configure failed"
 
 	emake || die
@@ -43,7 +44,7 @@ src_compile() {
 src_install() {
 	cd ${WORKDIR}/${MY_P}
 	make DESTDIR=${D} install || die "install failed"
-	dodoc AUTHORS ChangeLog INSTALL NEWS README SECURITY README.*
+	dodoc AUTHORS ChangeLog NEWS README SECURITY README.*
 	mv ${D}/usr/bin/muse ${D}/usr/bin/museseq
 }
 
diff --git a/media-sound/museseq/museseq-0.7.1_pre3.ebuild b/media-sound/museseq/museseq-0.7.1_pre3.ebuild
index 32da459ecc5a..0ad8bb05e90e 100644
--- a/media-sound/museseq/museseq-0.7.1_pre3.ebuild
+++ b/media-sound/museseq/museseq-0.7.1_pre3.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/media-sound/museseq/museseq-0.7.1_pre3.ebuild,v 1.1 2005/01/09 22:19:14 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/museseq/museseq-0.7.1_pre3.ebuild,v 1.1.1.1 2005/11/30 09:38:05 chriswhite Exp $
 
-inherit kde-functions gcc virtualx eutils
-need-qt 3
+inherit kde-functions virtualx eutils
 
 MY_P=${P/museseq/muse}
 MY_P=${MY_P/_/}
@@ -15,24 +14,24 @@ HOMEPAGE="http://lmuse.sourceforge.net/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="fluidsynth doc ladcca debug"
+IUSE="doc ladcca debug"
 
-DEPEND=">=x11-libs/qt-3.2.0
+DEPEND="$(qt_min_version 3.2)
 	>=media-libs/alsa-lib-0.9.0
-	fluidsynth?	( media-sound/fluidsynth )
+	media-sound/fluidsynth
 	doc? ( app-text/openjade
 		   app-doc/doxygen
 		   media-gfx/graphviz )
 	dev-lang/perl
-	>=media-libs/libsndfile-1.0.0
-	>=media-sound/jack-audio-connection-kit-0.90.0
+	>=media-libs/libsndfile-1.0.1
+	>=media-libs/libsamplerate-0.1.0
+	>=media-sound/jack-audio-connection-kit-0.98.0
 	ladcca?		( >=media-libs/ladcca-0.4.0 )"
 
 src_compile() {
 	cd ${WORKDIR}/${MY_P}
 	local myconf
 	myconf="--disable-suid-build" # instead, use CONFIG_RTC and realtime-lsm
-	use fluidsynth	|| myconf="${myconf} --disable-fluidsynth"
 	use ladcca		|| myconf="${myconf} --disable-ladcca"
 	use debug		&& myconf="${myconf} --enable-debug"
 	Xeconf ${myconf} || die "configure failed"
@@ -43,7 +42,7 @@ src_compile() {
 src_install() {
 	cd ${WORKDIR}/${MY_P}
 	make DESTDIR=${D} install || die "install failed"
-	dodoc AUTHORS ChangeLog INSTALL NEWS README SECURITY README.*
+	dodoc AUTHORS ChangeLog NEWS README SECURITY README.*
 	mv ${D}/usr/bin/muse ${D}/usr/bin/museseq
 }
 
diff --git a/media-sound/museseq/museseq-0.7.2_pre2.ebuild b/media-sound/museseq/museseq-0.7.2_pre2.ebuild
index c4be7d099ccd..8a6d4a60d233 100644
--- a/media-sound/museseq/museseq-0.7.2_pre2.ebuild
+++ b/media-sound/museseq/museseq-0.7.2_pre2.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/media-sound/museseq/museseq-0.7.2_pre2.ebuild,v 1.1 2005/07/24 17:25:36 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/museseq/museseq-0.7.2_pre2.ebuild,v 1.1.1.1 2005/11/30 09:38:06 chriswhite Exp $
 
 inherit kde-functions virtualx eutils
-need-qt 3
 
 MY_P=${P/museseq/muse}
 MY_P=${MY_P/_/}
@@ -14,10 +13,10 @@ HOMEPAGE="http://lmuse.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc ladcca debug"
 
-DEPEND=">=x11-libs/qt-3.2.0
+DEPEND="$(qt_min_version 3.2)
 	>=media-libs/alsa-lib-0.9.0
 	media-sound/fluidsynth
 	doc? ( app-text/openjade
@@ -43,7 +42,7 @@ src_compile() {
 src_install() {
 	cd ${WORKDIR}/${MY_P}
 	make DESTDIR=${D} install || die "install failed"
-	dodoc AUTHORS ChangeLog INSTALL NEWS README SECURITY README.*
+	dodoc AUTHORS ChangeLog NEWS README SECURITY README.*
 	mv ${D}/usr/bin/muse ${D}/usr/bin/museseq
 }
 
diff --git a/media-sound/musicman/ChangeLog b/media-sound/musicman/ChangeLog
index 763d5a1e2a47..49e130e6a83f 100644
--- a/media-sound/musicman/ChangeLog
+++ b/media-sound/musicman/ChangeLog
@@ -1,6 +1,56 @@
 # ChangeLog for media-sound/musicman
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musicman/ChangeLog,v 1.1 2004/07/07 21:20:18 fvdpol Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musicman/ChangeLog,v 1.1.1.1 2005/11/30 09:38:26 chriswhite Exp $
+
+  30 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  musicman-0.11-r1.ebuild, musicman-0.14.ebuild, musicman-0.15.ebuild:
+  Make sure that this is compiled with arts enabled. See bug #110725.
+
+*musicman-0.15 (30 Aug 2005)
+
+  30 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> +musicman-0.15.ebuild:
+  Updated to latest upstream version.
+
+*musicman-0.14 (04 Aug 2005)
+
+  04 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> +musicman-0.14.ebuild:
+  Added last upstream version.
+
+  04 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  musicman-0.11-r1.ebuild:
+  Cleaned up dependencies.
+
+  18 Jan 2005; Gregorio Guidi <greg_g@gentoo.org> musicman-0.11-r1.ebuild:
+  Added missing call to need-kde().
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> musicman-0.11-r1.ebuild:
+  Changed dep on kdebase to accept kdebase-meta, the split 'meta' package.
+  This dep will be narrowed down in the future to the precise split packages
+  required.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  musicman-0.11-r1.ebuild:
+  Stable sparc.
+
+  29 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  musicman-0.11-r1.ebuild, -musicman-0.11.ebuild:
+  Changing fam depend to virtual.
+
+  23 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  musicman-0.11-r1.ebuild:
+  Added to ~sparc.
+
+  03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  musicman-0.11-r1.ebuild:
+  Stable amd64, x86.
+
+*musicman-0.11-r1 (17 Jul 2004)
+
+  17 Jul 2004; David Holm <dholm@gentoo.org> musicman-0.11-r1.ebuild:
+  Added to ~ppc.
+
+  08 Jul 2004; Frank van de Pol <fvdpol@gentoo.org> :
+  Added amd64 and gcc34 patches.
 
   07 Jul 2004; Frank van de Pol <fvdpol@gentoo.org> :
   New ebuild submitted by Daniel Rendall <gentoo@danielrendall.co.uk>. Closes
diff --git a/media-sound/musicman/Manifest b/media-sound/musicman/Manifest
index b3375b6dfb9c..c49823e38e78 100644
--- a/media-sound/musicman/Manifest
+++ b/media-sound/musicman/Manifest
@@ -1,4 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 415d6270e991fcf1c07e6a2170f7877a ChangeLog 1961
+MD5 a58a50415fde57a82addf30f60a148b0 files/digest-musicman-0.11-r1 66
+MD5 753e111a286622934d862faa982f33fe files/digest-musicman-0.14 66
+MD5 bd407db3ed242d94c796ff61ba2349c1 files/digest-musicman-0.15 66
+MD5 4892a92b0613b41678edd70a8a159c73 files/musicman-0.11-amd64.patch 1545
+MD5 ff2d1e9a961983e13704bcffb9510e4a files/musicman-0.11-gcc34.patch 1055
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 8e8e8460fe5ee26f42f81ef278ebc2e5 musicman-0.11.ebuild 964
-MD5 94f7aae19f5b81f123495d49d687446a ChangeLog 268
-MD5 a58a50415fde57a82addf30f60a148b0 files/digest-musicman-0.11 66
+MD5 740d92aebf6ae912af6d17b16647854e musicman-0.11-r1.ebuild 857
+MD5 55076627115dbebca11570dae985dc97 musicman-0.14.ebuild 827
+MD5 57533dbe1279eb910c89580e2831e353 musicman-0.15.ebuild 827
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDZUrlj5H05b2HAEkRAiwWAKCf/3Gox8gUsq3R5COR+1WvTgWYqACcDlTv
+KlHnUImX4aLf5x/eGqkb1jo=
+=Z+1H
+-----END PGP SIGNATURE-----
diff --git a/media-sound/musicman/musicman-0.11-r1.ebuild b/media-sound/musicman/musicman-0.11-r1.ebuild
index 696fa6e86168..598972b87095 100644
--- a/media-sound/musicman/musicman-0.11-r1.ebuild
+++ b/media-sound/musicman/musicman-0.11-r1.ebuild
@@ -1,37 +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/media-sound/musicman/musicman-0.11-r1.ebuild,v 1.1 2004/07/07 22:55:31 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musicman/musicman-0.11-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:26 chriswhite Exp $
+
+IUSE=""
 
 inherit eutils kde
 
+S="${WORKDIR}/musicman"
+
 DESCRIPTION="A Konqueror plugin for manipulating ID3 tags in MP3 files"
 HOMEPAGE="http://musicman.sourceforge.net/"
 SRC_URI="mirror://sourceforge/musicman/${P}.tar.gz"
 
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
+KEYWORDS="amd64 ~ppc sparc x86"
 
-DEPEND=">=kde-base/kdebase-3.2.1 \
-	>=media-libs/jpeg-6b-r3 \
-	>=app-admin/fam-2.7.0 \
-	>=media-libs/libart_lgpl-2.3.16"
+DEPEND="|| ( kde-base/libkonq >=kde-base/kdebase-3.2.1 )"
 
-# The tar.gz doesn't create a musicman-0.11 directory
-S="${WORKDIR}/musicman"
+need-kde 3.2
+
+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
+}
 
 src_unpack() {
 	unpack ${A}
+	cd ${S}
 
 	epatch ${FILESDIR}/${P}-gcc34.patch
 	epatch ${FILESDIR}/${P}-amd64.patch
 }
 
-src_install() {
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
-}
diff --git a/media-sound/musicman/musicman-0.14.ebuild b/media-sound/musicman/musicman-0.14.ebuild
index 6315fcde0a18..f6301bee0b59 100644
--- a/media-sound/musicman/musicman-0.14.ebuild
+++ b/media-sound/musicman/musicman-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/media-sound/musicman/musicman-0.14.ebuild,v 1.1 2005/08/04 16:42:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musicman/musicman-0.14.ebuild,v 1.1.1.1 2005/11/30 09:38:26 chriswhite Exp $
 
 IUSE=""
 
@@ -20,6 +20,13 @@ DEPEND="|| ( kde-base/libkonq >=kde-base/kdebase-3.2.1 )"
 
 need-kde 3.2
 
+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
+}
+
 src_unpack() {
 	kde_src_unpack
 
diff --git a/media-sound/musicman/musicman-0.15.ebuild b/media-sound/musicman/musicman-0.15.ebuild
index 9431e3f2b9e3..a06e0529b241 100644
--- a/media-sound/musicman/musicman-0.15.ebuild
+++ b/media-sound/musicman/musicman-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/media-sound/musicman/musicman-0.15.ebuild,v 1.1 2005/08/30 14:13:39 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musicman/musicman-0.15.ebuild,v 1.1.1.1 2005/11/30 09:38:26 chriswhite Exp $
 
 IUSE=""
 
@@ -20,6 +20,13 @@ DEPEND="|| ( kde-base/libkonq >=kde-base/kdebase-3.2.1 )"
 
 need-kde 3.2
 
+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
+}
+
 src_unpack() {
 	kde_src_unpack
 
diff --git a/media-sound/ncmpc/ChangeLog b/media-sound/ncmpc/ChangeLog
index 724678b411df..b5a6c00455a6 100644
--- a/media-sound/ncmpc/ChangeLog
+++ b/media-sound/ncmpc/ChangeLog
@@ -1,6 +1,59 @@
 # ChangeLog for media-sound/ncmpc
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ChangeLog,v 1.1 2004/06/27 06:15:22 ferringb Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ChangeLog,v 1.1.1.1 2005/11/30 09:37:58 chriswhite Exp $
+
+  11 Nov 2005; Michael Hanselmann <hansmi@gentoo.org>
+  ncmpc-0.11.1-r1.ebuild:
+  Stable on ppc.
+
+  26 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  ncmpc-0.11.1-r1.ebuild:
+  Stable on sparc
+
+  25 Oct 2005; Andrej Kacian <ticho@gentoo.org> ncmpc-0.11.1-r1.ebuild:
+  Stable on x86.
+
+  12 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> ncmpc-0.11.1.ebuild:
+  Stable on ppc.
+
+  12 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org> ncmpc-0.11.1.ebuild:
+  Stable on sparc
+
+*ncmpc-0.11.1-r1 (08 Sep 2005)
+
+  08 Sep 2005; Thomas Matthijs <axxo@gentoo.org> -ncmpc-0.10.1.ebuild,
+  ncmpc-0.11.1.ebuild, +ncmpc-0.11.1-r1.ebuild:
+  fix bug #61212
+
+  22 May 2005; Guy Martin <gmsoft@gentoo.org> ncmpc-0.11.1.ebuild:
+  Stable on hppa.
+
+*ncmpc-0.11.1 (11 Feb 2005)
+
+  11 Feb 2005; Thomas Matthijs <axxo@gentoo.org> metadata.xml,
+  +ncmpc-0.11.1.ebuild:
+  version bump
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> ncmpc-0.11.0.ebuild:
+  Stable amd64, sparc.
+
+  29 Jul 2004; Brian Harring <ferringb@gentoo.org> ncmpc-0.11.0.ebuild:
+  Stable on x86.
+
+  24 Jul 2004; Lars Weiler <pylon@gentoo.org> ncmpc-0.11.0.ebuild:
+  Stable on ppc.
+
+*ncmpc-0.11.0 (17 Jul 2004)
+
+  17 Jul 2004; Brian Harring <ferringb@gentoo.org> ncmpc-0.10.1.ebuild,
+  +ncmpc-0.11.0.ebuild:
+  stabling 0.10.1 for x86 and ppc, adding 0.11.0.
+
+  12 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> ncmpc-0.10.1.ebuild:
+  ~amd64
+
+  09 Jul 2004; Ciaran McCreesh <ciaranm@gentoo.org> ncmpc-0.10.1.ebuild:
+  Added ~sparc, bug #56543
 
 *ncmpc-0.10.1 (27 Jun 2004)
 
diff --git a/media-sound/ncmpc/Manifest b/media-sound/ncmpc/Manifest
index 02bd4522e7d1..6642283ebdc8 100644
--- a/media-sound/ncmpc/Manifest
+++ b/media-sound/ncmpc/Manifest
@@ -1,4 +1,8 @@
-MD5 80b09ad4cf1d90ea002c65027541c616 ncmpc-0.10.1.ebuild 555
-MD5 4083d4fa099c30891582885d734b73dd ChangeLog 134
-MD5 c4e28bd2fb3236dbb92211b844c34d44 metadata.xml 222
-MD5 981af082baec0896a3afa3f9c79df043 files/digest-ncmpc-0.10.1 64
+MD5 a789652d3f5127ca3b297f22b78080ff ChangeLog 1963
+MD5 15d947021147e010e4721bd8acb0cbd2 files/digest-ncmpc-0.11.0 64
+MD5 f618389275480629891a25befac11a7f files/digest-ncmpc-0.11.1 64
+MD5 f618389275480629891a25befac11a7f files/digest-ncmpc-0.11.1-r1 64
+MD5 3a05fb17d7dc8a018b36f13aea905095 metadata.xml 246
+MD5 cf38d881dcdcc6e98cf3bdf2a48e6060 ncmpc-0.11.0.ebuild 659
+MD5 711f891a3d9baae284a16e02635dee90 ncmpc-0.11.1-r1.ebuild 1127
+MD5 6778e9c294a67065bd0a8130a6690b58 ncmpc-0.11.1.ebuild 715
diff --git a/media-sound/ncmpc/metadata.xml b/media-sound/ncmpc/metadata.xml
index 97892ab37d4c..a33352d68f6d 100644
--- a/media-sound/ncmpc/metadata.xml
+++ b/media-sound/ncmpc/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 <herd>sound</herd>
 <maintainer>
-  <email>ferringb@gentoo.org</email>
+	<email>ticho@gentoo.org</email>
+	<name>Andrej Kacian</name>
 </maintainer>
 </pkgmetadata>
diff --git a/media-sound/ncmpc/ncmpc-0.11.0.ebuild b/media-sound/ncmpc/ncmpc-0.11.0.ebuild
index 6abf301d8a7d..3f77d62305d2 100644
--- a/media-sound/ncmpc/ncmpc-0.11.0.ebuild
+++ b/media-sound/ncmpc/ncmpc-0.11.0.ebuild
@@ -1,15 +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/media-sound/ncmpc/ncmpc-0.11.0.ebuild,v 1.1 2004/07/18 04:13:09 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ncmpc-0.11.0.ebuild,v 1.1.1.1 2005/11/30 09:37:58 chriswhite Exp $
+
+IUSE=""
 
 DESCRIPTION="A ncurses client for the Music Player Daemon (MPD)"
 HOMEPAGE="http://www.musicpd.org/?page=ncmpc"
 SRC_URI="mirror://sourceforge/musicpd/${P}.tar.gz"
 LICENSE="GPL-2"
 
-IUSE=""
 SLOT="0"
-KEYWORDS="~ppc ~x86 ~sparc ~amd64"
+KEYWORDS="ppc x86 sparc amd64"
 
 RDEPEND="virtual/libc
 	sys-libs/ncurses
diff --git a/media-sound/ncmpc/ncmpc-0.11.1-r1.ebuild b/media-sound/ncmpc/ncmpc-0.11.1-r1.ebuild
index 202d918184f7..16017f650a4e 100644
--- a/media-sound/ncmpc/ncmpc-0.11.1-r1.ebuild
+++ b/media-sound/ncmpc/ncmpc-0.11.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/media-sound/ncmpc/ncmpc-0.11.1-r1.ebuild,v 1.1 2005/09/08 14:29:13 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ncmpc-0.11.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:58 chriswhite Exp $
 
 DESCRIPTION="A ncurses client for the Music Player Daemon (MPD)"
 HOMEPAGE="http://www.musicpd.org/?page=ncmpc"
@@ -9,7 +9,7 @@ LICENSE="GPL-2"
 IUSE="clock-screen mouse search-screen key-screen raw-mode nls debug"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~hppa ppc sparc x86"
 
 RDEPEND="virtual/libc
 	sys-libs/ncurses
diff --git a/media-sound/ncmpc/ncmpc-0.11.1.ebuild b/media-sound/ncmpc/ncmpc-0.11.1.ebuild
index 8487b5fed7e8..6171e16ad740 100644
--- a/media-sound/ncmpc/ncmpc-0.11.1.ebuild
+++ b/media-sound/ncmpc/ncmpc-0.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/media-sound/ncmpc/ncmpc-0.11.1.ebuild,v 1.1 2005/02/10 23:49:25 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ncmpc-0.11.1.ebuild,v 1.1.1.1 2005/11/30 09:37:58 chriswhite Exp $
 
 IUSE=""
 
@@ -10,7 +10,7 @@ SRC_URI="http://mercury.chem.pitt.edu/~shank/${P}.tar.gz mirror://sourceforge/mu
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~ppc ~x86 ~sparc ~amd64"
+KEYWORDS="~amd64 hppa ppc sparc x86"
 
 RDEPEND="virtual/libc
 	sys-libs/ncurses
diff --git a/media-sound/neutrino/ChangeLog b/media-sound/neutrino/ChangeLog
index 97f0167a1880..cf1b4030ed73 100644
--- a/media-sound/neutrino/ChangeLog
+++ b/media-sound/neutrino/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for media-sound/neutrino
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/neutrino/ChangeLog,v 1.1 2005/07/30 15:14:15 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/neutrino/ChangeLog,v 1.1.1.1 2005/11/30 09:38:18 chriswhite Exp $
 
 *neutrino-0.8.3 (30 Jul 2005)
 
diff --git a/media-sound/neutrino/Manifest b/media-sound/neutrino/Manifest
index 90e1070d54e9..f17349064926 100644
--- a/media-sound/neutrino/Manifest
+++ b/media-sound/neutrino/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 319fe8f45b51a2d31f8d4e9a4071ca10 metadata.xml 248
-MD5 1696689435a694b21402c9f80126e713 ChangeLog 279
-MD5 0afcddd0d4c47ce7847f79ea8dc152df neutrino-0.8.3.ebuild 752
+MD5 598c4564f791cc02718bf16ad418d2c2 ChangeLog 373
+MD5 b95a7b67fbfde4414d530bc2bb776af7 neutrino-0.8.3.ebuild 858
 MD5 a640d6a1e8c22c49f019eaae79c51ea0 files/digest-neutrino-0.8.3 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFC65kVp5vW4rUFj5oRAscmAJ434CsIVKr/DWKv6EvagrIi25fhpQCfQWPE
+PaYP12ali3CuQ3vOhcL58d4=
+=ke1w
+-----END PGP SIGNATURE-----
diff --git a/media-sound/neutrino/neutrino-0.8.3.ebuild b/media-sound/neutrino/neutrino-0.8.3.ebuild
index 614667897e26..9990cbc0b7f9 100644
--- a/media-sound/neutrino/neutrino-0.8.3.ebuild
+++ b/media-sound/neutrino/neutrino-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/media-sound/neutrino/neutrino-0.8.3.ebuild,v 1.1 2005/07/30 15:14:15 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/neutrino/neutrino-0.8.3.ebuild,v 1.1.1.1 2005/11/30 09:38:18 chriswhite Exp $
 
 IUSE=""
 
diff --git a/media-sound/nforce-audio/ChangeLog b/media-sound/nforce-audio/ChangeLog
index 5b4b67ab6b9c..de9f6d4b3773 100644
--- a/media-sound/nforce-audio/ChangeLog
+++ b/media-sound/nforce-audio/ChangeLog
@@ -1,7 +1,61 @@
 # ChangeLog for media-sound/nforce-audio
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/nforce-audio/ChangeLog,v 1.1 2003/05/07 23:59:27 alron Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/nforce-audio/ChangeLog,v 1.1.1.1 2005/11/30 09:38:43 chriswhite Exp $
 
-*nforce-audio-1.0.256 (07 May 2003)
+  19 Oct 2005; Tony Vroon <chainsaw@gentoo.org>
+  nforce-audio-1.0.0301.ebuild:
+  Modify einfo statements in pkg_postinst, closes bug #94869.
+
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  30 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  nforce-audio-1.0.0301.ebuild:
+  now we also install nvmix-reg, fixes #87292
+
+*nforce-audio-1.0.0301 (25 Mar 2005)
+
+  25 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  nforce-audio-1.0.0292-r1.ebuild, +nforce-audio-1.0.0301.ebuild:
+  new upstream version, fixes #84975. also fixed #86084
+
+  12 Mar 2005; Stefan Schweizer <genstef@gentoo.org>
+  -nforce-audio-1.0.0256.ebuild, -nforce-audio-1.0.0261.ebuild,
+  nforce-audio-1.0.0292-r1.ebuild, -nforce-audio-1.0.0292.ebuild:
+  latest version stable, prune older versions.
+
+*nforce-audio-1.0.0292-r1 (07 Mar 2005)
+
+  07 Mar 2005; Stefan Schweizer <genstef@gentoo.org>
+  +files/nforce-2.6.10.patch, +files/nforce-2.6.11.patch,
+  +nforce-audio-1.0.0292-r1.ebuild:
+  Adding patches for 2.6.10/11 closes bug 82350 by Félix Dewaleyne
+  <draco.brasier@gmail.com>, thanks to Bols <bols2000@ibelgique.com> and Paul
+  Marks <pmarks@purdue.edu> for the patches in bug 81838 by Alain
+  <myth.384@wanadoo.nl>
+
+*nforce-audio-1.0.0292 (04 Feb 2005)
+
+  04 Feb 2005; Stefan Schweizer <genstef@gentoo.org>
+  +nforce-audio-1.0.0292.ebuild:
+  New ebuild thanks to Benoit C <bchesneau@gmail.com>, Lukas Miczka
+  <cpu@ztpnet.pl>, Jeremy Huddleston <eradicator@gentoo.org>, guiseppe
+  <giupil@aliceposta.it>, Cyrille M <cyrille.mertz@gmail.com>, Rav
+  <reen@otakumail.com>, Roel Brook <Rainmaker526@hotmail.com>, Justin
+  <yoosty69@netzero.net> and Bols <bols2000@ibelgique.com> in bug 68346
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  nforce-audio-1.0.0256.ebuild, nforce-audio-1.0.0261.ebuild:
+  Added IUSE.
+
+*nforce-audio-1.0.0261 (11 Jun 2003)
+
+  11 Jun 2003; Daniel Robbins <drobbins@gentoo.org>: updated build that now
+  disables SPDIF digital audio output by default, but tells the user how to
+  enable it. It needs to be disabled because with SPDIF enabled by default, the
+  sound chip will only play back at 48KHz, causing several audio players to
+  play back CD audio at the wrong speed.
+
+*nforce-audio-1.0.0256 (07 May 2003)
 
   07 May 2003; Dean Bailey <alron@gentoo.org> :initial ebuild.
diff --git a/media-sound/nforce-audio/Manifest b/media-sound/nforce-audio/Manifest
index e69de29bb2d1..a221ee36e646 100644
--- a/media-sound/nforce-audio/Manifest
+++ b/media-sound/nforce-audio/Manifest
@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e9bad194f3ede6e23b330b02c5a81b84 ChangeLog 2573
+MD5 f4086b92b1ebc4bcb2c158a4562c0c76 files/digest-nforce-audio-1.0.0292-r1 163
+MD5 e511938c1bb02442f98225418c8c11bd files/digest-nforce-audio-1.0.0301 163
+MD5 f0522771af3cee1921f08aa5b46f930a files/nforce-2.6.10.patch 1437
+MD5 30f72f2393d741767765a6e7fd6ca8d0 files/nforce-2.6.11.patch 1222
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 e479a1ee6a738e548ee22b4069a88bab nforce-audio-1.0.0292-r1.ebuild 1616
+MD5 0382d12941bf866611a99d6303616f5a nforce-audio-1.0.0301.ebuild 1716
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDVo+6p5vW4rUFj5oRAhMCAJ9SWBn8FUi4BWhPa9h460fYSpcyjQCfRFED
+5Pok6jN3nGoaZxzQMtquQp0=
+=UuAo
+-----END PGP SIGNATURE-----
diff --git a/media-sound/nforce-audio/nforce-audio-1.0.0292-r1.ebuild b/media-sound/nforce-audio/nforce-audio-1.0.0292-r1.ebuild
index c3ecfb940333..36d9f053dfff 100644
--- a/media-sound/nforce-audio/nforce-audio-1.0.0292-r1.ebuild
+++ b/media-sound/nforce-audio/nforce-audio-1.0.0292-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/media-sound/nforce-audio/nforce-audio-1.0.0292-r1.ebuild,v 1.1 2005/03/07 21:19:58 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/nforce-audio/nforce-audio-1.0.0292-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:43 chriswhite Exp $
 
 inherit eutils linux-mod
 
@@ -11,8 +11,8 @@ AMD64_NV_PACKAGE="NFORCE-Linux-x86_64-${NV_V}"
 
 DESCRIPTION="Linux kernel module for the NVIDIA's nForce SoundStorm audio chipset"
 HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? (http://download.nvidia.com/XFree86/nforce/${NV_V}/${X86_NV_PACKAGE}-${PKG_V}.run)
-	amd64? (http://download.nvidia.com/XFree86/nforce/amd64/${NV_V}/${AMD64_NV_PACKAGE}-${PKG_V}.run)"
+SRC_URI="x86? ( http://download.nvidia.com/XFree86/nforce/${NV_V}/${X86_NV_PACKAGE}-${PKG_V}.run )
+	amd64? ( http://download.nvidia.com/XFree86/nforce/amd64/${NV_V}/${AMD64_NV_PACKAGE}-${PKG_V}.run )"
 
 if use x86; then
 	NV_PACKAGE="${X86_NV_PACKAGE}"
@@ -24,7 +24,7 @@ S=${WORKDIR}/${NV_PACKAGE}-${PKG_V}/nvsound
 
 LICENSE="NVIDIA"
 SLOT="0"
-KEYWORDS="-* ~x86 ~amd64"
+KEYWORDS="-* x86 ~amd64"
 RESTRICT="nostrip"
 IUSE=""
 
@@ -59,13 +59,6 @@ src_compile() {
 
 src_install() {
 	linux-mod_src_install
-	dodir /etc/modules.d
-	cat > ${D}/etc/modules.d/nvsound << EOF
-# change spdif_status to 1 to enable digital out; this will cause audio
-# playback to be clamped to 48KHz which can cause some programs to play
-# back audio at the wrong speed.
-options nvsound spdif_status=0
-EOF
 
 	dobin nvmixer
 	dodoc ${S}/ReleaseNotes.html
diff --git a/media-sound/nforce-audio/nforce-audio-1.0.0301.ebuild b/media-sound/nforce-audio/nforce-audio-1.0.0301.ebuild
index 30004dd4c7a2..d6c161bdd8cd 100644
--- a/media-sound/nforce-audio/nforce-audio-1.0.0301.ebuild
+++ b/media-sound/nforce-audio/nforce-audio-1.0.0301.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/nforce-audio/nforce-audio-1.0.0301.ebuild,v 1.1 2005/03/25 17:51:04 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/nforce-audio/nforce-audio-1.0.0301.ebuild,v 1.1.1.1 2005/11/30 09:38:44 chriswhite Exp $
 
 inherit eutils linux-mod
 
@@ -11,8 +11,8 @@ AMD64_NV_PACKAGE="NFORCE-Linux-x86_64-${NV_V}"
 
 DESCRIPTION="Linux kernel module for the NVIDIA's nForce SoundStorm audio chipset"
 HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? (http://download.nvidia.com/XFree86/nforce/${NV_V}/${X86_NV_PACKAGE}-${PKG_V}.run)
-	amd64? (http://download.nvidia.com/XFree86/nforce/amd64/${NV_V}/${AMD64_NV_PACKAGE}-${PKG_V}.run)"
+SRC_URI="x86? ( http://download.nvidia.com/XFree86/nforce/${NV_V}/${X86_NV_PACKAGE}-${PKG_V}.run )
+	amd64? ( http://download.nvidia.com/XFree86/nforce/amd64/${NV_V}/${AMD64_NV_PACKAGE}-${PKG_V}.run )"
 
 if use x86; then
 	NV_PACKAGE="${X86_NV_PACKAGE}"
@@ -53,12 +53,16 @@ src_compile() {
 
 src_install() {
 	linux-mod_src_install
-	dobin nvmixer
+	dobin nvmixer nvmix-reg
 	dodoc ${S}/ReleaseNotes.html
 }
 
 pkg_postinst() {
 	linux-mod_pkg_postinst
 
-	einfo "You may also be interested in media-sound/nforce-nvmixer"
+	einfo "If you want to restore your volume settings between sessions add this line to your"
+	einfo "/etc/conf.d/local.start:"
+	einfo "/usr/bin/nvmix-reg -f /etc/nvmixrc -L >/dev/null 2>&1"
+	einfo "And this line to your /etc/conf.d/local.stop"
+	einfo "/usr/bin/nvmix-reg -f /etc/nvmixrc -S >/dev/null 2>&1"
 }
diff --git a/media-sound/normalize/ChangeLog b/media-sound/normalize/ChangeLog
index 096cb11adf7a..abd77384f8a1 100644
--- a/media-sound/normalize/ChangeLog
+++ b/media-sound/normalize/ChangeLog
@@ -1,12 +1,68 @@
 # ChangeLog for media-sound/normalize
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/normalize/ChangeLog,v 1.1 2002/06/05 00:06:26 stroke Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/normalize/ChangeLog,v 1.1.1.1 2005/11/30 09:38:39 chriswhite Exp $
+
+  05 Feb 2005; Michael Hanselmann <hansmi@gentoo.org>
+  normalize-0.7.6-r2.ebuild:
+  Stable on ppc.
+
+  25 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  normalize-0.7.6-r2.ebuild:
+  Added nls USE flag and fixed mad dependency.  Closes bug #72187.
+
+  01 Sep 2004; Tom Gall <tgall@gentoo.org> normalize-0.7.6-r2.ebuild:
+  stable on ppc64, bug #61787
+
+  03 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  normalize-0.7.4.ebuild, normalize-0.7.6-r1.ebuild,
+  normalize-0.7.6-r2.ebuild:
+  Changing mad dep to madplay.
+
+  28 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  normalize-0.7.6-r2.ebuild:
+  Stable x86.
+
+*normalize-0.7.6-r2 (28 Mar 2004)
+
+  28 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  normalize-0.7.6-r2.ebuild, normalize-0.7.6.ebuild:
+  Fixed USE flag support.  Closes bug #45944.
+
+  14 Mar 2004; Jason Wever <weeve@gentoo.org> normalize-0.7.6-r1.ebuild:
+  Stable on sparc.
+
+  28 Jan 2004; Brad House <brad_mssw@gentoo.org> normalize-0.7.6-r1.ebuild:
+  mark stable on amd64
+
+  05 Dec 2003; Jason Wever <weeve@gentoo.org> normalize-0.7.6-r1.ebuild:
+  Added ~sparc keyword.
+
+  19 Jul 2003; Nick Hadaway <raker@gentoo.org> normalize-0.7.6-r1.ebuild:
+  Added mad use variable and marked stable for x86.
+
+*normalize-0.7.6-r1 (17 Jul 2003)
+
+  17 Jul 2003; Nick Hadaway <raker@gentoo.org> normalize-0.7.6-r1.ebuild:
+  Now depends on media-libs/{libmad,libid3tag} instead of 
+  media-sound/mad
+
+  07 Jul 2003; Caleb Tennis <caleb@gentoo.org> normalize-0.7.6.ebuild:
+  Made it stable x86
+
+*normalize-0.7.6 (05 Nov 2002)
+
+  05 Nov 2002; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump.
 
 *normalize-0.7.4 (5 May 2002)
+  14 Aug 2002; Pieter Van den Abeele <pvdabeel@gentoo.org> :
+
+  Added ppc keyword
+
   5 May 2002; Bardur Arantsson <bardur-gta@odense.kollegienet.dk> 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.
\ No newline at end of file
+  can find in the root directory of the portage repository.
diff --git a/media-sound/normalize/Manifest b/media-sound/normalize/Manifest
index e69de29bb2d1..42e0e5d5e753 100644
--- a/media-sound/normalize/Manifest
+++ b/media-sound/normalize/Manifest
@@ -0,0 +1,8 @@
+MD5 9d5c3158b526b03757b0bc90788af40e normalize-0.7.6-r1.ebuild 813
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 f8dcf0aa6df4bfb293a1653d58e477ef ChangeLog 2400
+MD5 e7767f72e85a0b8425aa20c3b61f643f normalize-0.7.4.ebuild 974
+MD5 9f89abaca136b315d398c97bc527e60d normalize-0.7.6-r2.ebuild 917
+MD5 d5be91906061cbb310757eeccd79c6cc files/digest-normalize-0.7.4 68
+MD5 ca7f6d0db3e04885c8412eb70cb1a482 files/digest-normalize-0.7.6-r1 68
+MD5 ca7f6d0db3e04885c8412eb70cb1a482 files/digest-normalize-0.7.6-r2 68
diff --git a/media-sound/normalize/normalize-0.7.4.ebuild b/media-sound/normalize/normalize-0.7.4.ebuild
index cd3f3bc91832..8f36ea7da97e 100644
--- a/media-sound/normalize/normalize-0.7.4.ebuild
+++ b/media-sound/normalize/normalize-0.7.4.ebuild
@@ -1,18 +1,20 @@
-# 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/media-sound/normalize/normalize-0.7.4.ebuild,v 1.1 2002/06/05 00:06:26 stroke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/normalize/normalize-0.7.4.ebuild,v 1.1.1.1 2005/11/30 09:38:39 chriswhite Exp $
+
+IUSE="xmms"
 
 DESCRIPTION="Audio file volume normalizer"
 HOMEPAGE="http://www.cs.columbia.edu/~cvaill/normalize"
 SRC_URI="http://www.cs.columbia.edu/~cvaill/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2" 
+
 SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc"
 
-RDEPEND="xmms? ( >= xmms-1.2.7r6 )
+RDEPEND="xmms? ( >=media-sound/xmms-1.2.7-r6 )
 	>=media-libs/audiofile-0.2.3-r1
-	>=media-sound/mad-0.14.2b-r1"
-
-DEPEND="${RDEPEND}"
+	>=media-sound/madplay-0.14.2b-r1"
 
 # NOTE: the "audiofile" and "mad" dependencies are NOT
 # actually *required*, they are optional, but there are no
@@ -23,13 +25,9 @@ DEPEND="${RDEPEND}"
 #
 
 src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
+	econf \
 		--with-audiofile \
-		--with-mad
+		--with-mad || die
 
 	emake || die "emake failed"
 }
diff --git a/media-sound/normalize/normalize-0.7.6-r1.ebuild b/media-sound/normalize/normalize-0.7.6-r1.ebuild
index 2fbad26a51f4..2352934d8369 100644
--- a/media-sound/normalize/normalize-0.7.6-r1.ebuild
+++ b/media-sound/normalize/normalize-0.7.6-r1.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/media-sound/normalize/normalize-0.7.6-r1.ebuild,v 1.1 2003/07/17 22:18:41 raker Exp $
-
-IUSE="xmms"
+# $Header: /var/cvsroot/gentoo-x86/media-sound/normalize/normalize-0.7.6-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:39 chriswhite Exp $
 
 DESCRIPTION="Audio file volume normalizer"
 HOMEPAGE="http://www.cs.columbia.edu/~cvaill/normalize"
-SRC_URI="http://www.cs.columbia.edu/~cvaill/normalize/${P}.tar.bz2"
+SRC_URI="http://www1.cs.columbia.edu/~cvaill/normalize/${P}.tar.bz2"
 
+LICENSE="GPL-2"
 SLOT="0"
-LICENSE="GPL-2" 
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc sparc amd64"
+IUSE="xmms mad"
 
 RDEPEND="xmms? ( >=media-sound/xmms-1.2.7-r6 )
-	>=media-libs/audiofile-0.2.3-r1
-	>=media-libs/libmad-0.15.0b
-	>=media-libs/libid3tag-0.15.0b"
+	mad? ( >=media-sound/madplay-0.14.2b )
+	>=media-libs/audiofile-0.2.3-r1"
 
 src_compile() {
+	local myconf
+	myconf=""
+	use mad && myconf="${myconf} --with-mad"
 	econf \
 		--with-audiofile \
-		--with-mad || die
+		${myconf} || die
 
 	emake || die "emake failed"
 }
 
-src_install () {
+src_install() {
 	make DESTDIR=${D} install || die
 }
diff --git a/media-sound/normalize/normalize-0.7.6-r2.ebuild b/media-sound/normalize/normalize-0.7.6-r2.ebuild
index fd3815dff34b..a77e80255323 100644
--- a/media-sound/normalize/normalize-0.7.6-r2.ebuild
+++ b/media-sound/normalize/normalize-0.7.6-r2.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/media-sound/normalize/normalize-0.7.6-r2.ebuild,v 1.1 2004/03/29 00:39:36 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/normalize/normalize-0.7.6-r2.ebuild,v 1.1.1.1 2005/11/30 09:38:39 chriswhite Exp $
+
+IUSE="xmms mad audiofile nls"
 
 DESCRIPTION="Audio file volume normalizer"
 HOMEPAGE="http://www.cs.columbia.edu/~cvaill/normalize"
@@ -8,18 +10,22 @@ SRC_URI="http://www1.cs.columbia.edu/~cvaill/normalize/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc sparc amd64"
-IUSE="xmms mad audiofile"
+KEYWORDS="amd64 ppc ~ppc64 sparc x86"
+
+RDEPEND="xmms? ( >=media-sound/xmms-1.2.7-r6 )
+	 mad? ( media-libs/libmad )
+	 audiofile? ( >=media-libs/audiofile-0.2.3-r1 )"
 
-DEPEND="xmms? ( >=media-sound/xmms-1.2.7-r6 )
-	mad? ( >=media-sound/mad-0.14.2b )
-	audiofile? ( >=media-libs/audiofile-0.2.3-r1 )"
+DEPEND="${RDEPEND}
+	nls? ( dev-util/intltool )"
 
 src_compile() {
-	econf `use_with mad` \
-	      `use_enable xmms` \
-	      `use_with audiofile` \
-	      ${myconf} || die
+	econf \
+		`use_enable nls` \
+		`use_with mad` \
+		`use_enable xmms` \
+		`use_with audiofile` \
+		${myconf} || die
 
 	emake || die "emake failed"
 }
diff --git a/media-sound/noteedit/ChangeLog b/media-sound/noteedit/ChangeLog
index 0c79284bc7d1..31f95c12679a 100644
--- a/media-sound/noteedit/ChangeLog
+++ b/media-sound/noteedit/ChangeLog
@@ -1,6 +1,74 @@
 # ChangeLog for media-sound/noteedit
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/noteedit/ChangeLog,v 1.1 2003/09/28 07:57:37 jje Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/noteedit/ChangeLog,v 1.1.1.1 2005/11/30 09:38:27 chriswhite Exp $
+
+  07 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> noteedit-2.6.2.ebuild,
+  noteedit-2.7.4.ebuild:
+  Don't install COPYING and INSTALL files.
+
+*noteedit-2.8.0 (30 Oct 2005)
+
+  30 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/noteedit-gcc4.patch, +files/noteedit-2.8.0-qt-3.3.5.patch,
+  +noteedit-2.8.0.ebuild:
+  Updated to version 2.8.0 as per bug #99305 (and masked because it crashes
+  here). Also applied GCC4 patch as per bug #99988.
+
+  04 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> noteedit-2.7.4.ebuild:
+  Narrowed down kde-meta dependencies.
+
+*noteedit-2.7.4 (24 Apr 2005)
+
+  24 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +noteedit-2.7.4.ebuild:
+  Version bump closes bug #82309.
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> noteedit-2.6.2.ebuild:
+  Changed dep on kdemultimedia to accept kdemultimedia-meta, the split 'meta'
+  packages. This dep will be narrowed down in the future to the precise split
+  packages required.
+
+  15 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -noteedit-2.5.3.ebuild, noteedit-2.6.2.ebuild:
+  Added arts as a dependency because you can't build without mcopidl.
+
+  03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  noteedit-2.6.2.ebuild:
+  Stable amd64, sparc, x86.  Added inherit flag-o-matic.
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/noteedit-2.6.2-gcc34.patch:
+  Gcc-3.4 fixes.  Added to ~amd64.
+
+  12 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  noteedit-2.6.2.ebuild:
+  ~sparc
+
+*noteedit-2.6.2 (18 Jun 2004)
+
+  18 Jun 2004; Jon Hood <squinky86@gentoo.org> -noteedit-2.5.0.ebuild,
+  noteedit-2.5.3.ebuild, +noteedit-2.6.2.ebuild:
+  version bump; ebuild cleanups; stable on x86; thanks Till Maas
+  <opensource@gmx.net>
+
+*noteedit-2.5.3 (22 May 2004)
+
+  22 May 2004; Jon Hood <squinky86@gentoo.org> -noteedit-2.3.2.ebuild,
+  +noteedit-2.5.3.ebuild:
+  version bump, closes #50491, ebuild cleanups
+
+  17 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  noteedit-2.5.0.ebuild:
+  Stable x86.
+
+  19 Mar 2004; David Holm <dholm@gentoo.org> noteedit-2.5.0.ebuild:
+  Added to ~ppc.
+
+*noteedit-2.5.0 (18 Mar 2004)
+
+  18 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  noteedit-2.3.2.ebuild, noteedit-2.5.0.ebuild:
+  Version bump for bug #44644.
 
 *noteedit-2.3.2 (28 Sep 2003)
 
diff --git a/media-sound/noteedit/Manifest b/media-sound/noteedit/Manifest
index 9c02a89ee0bf..2865477becd5 100644
--- a/media-sound/noteedit/Manifest
+++ b/media-sound/noteedit/Manifest
@@ -1,2 +1,21 @@
-MD5 569be128095a11cbca29ceea6fe2ea90 noteedit-2.3.2.ebuild 521
-MD5 88c3dbf1f810a538adc2fd37155ac7d4 files/digest-noteedit-2.3.2 64
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 02b4f28906d61f2034d3403caf00fa01 ChangeLog 2642
+MD5 872c8c5d5228329ce0f644c2b5a542da files/digest-noteedit-2.6.2 64
+MD5 59bc45abcb4453ffe5b57bc2ff83c3a8 files/digest-noteedit-2.7.4 67
+MD5 60892ba74f680cb83f554f7ee038b017 files/digest-noteedit-2.8.0 67
+MD5 e4d9e7d1a9ceafde0c6cbe9a7c9692b7 files/noteedit-2.6.2-gcc34.patch 2142
+MD5 d95dc7b5a8641782c01f35eb18b26a98 files/noteedit-2.8.0-qt-3.3.5.patch 1149
+MD5 a0edf432c74d20c17c78a828167cd272 files/noteedit-gcc4.patch 1073
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 7a58a30a31eced3414dfed83a0738ee1 noteedit-2.6.2.ebuild 948
+MD5 9a077b36f700cdfad993fec824d5ecf1 noteedit-2.7.4.ebuild 811
+MD5 7c37d213730443ff8089ef54fbbe2fe2 noteedit-2.8.0.ebuild 920
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDbzzgj5H05b2HAEkRAgkgAKCGhw7sTKAEkhDUgYFtL7a+DvEzSwCbBXAE
+21kycggjSkl6J/gjPhPBjP4=
+=LMVP
+-----END PGP SIGNATURE-----
diff --git a/media-sound/noteedit/noteedit-2.6.2.ebuild b/media-sound/noteedit/noteedit-2.6.2.ebuild
index cbf118e86126..c89c7ebf8a3b 100644
--- a/media-sound/noteedit/noteedit-2.6.2.ebuild
+++ b/media-sound/noteedit/noteedit-2.6.2.ebuild
@@ -1,8 +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/media-sound/noteedit/noteedit-2.6.2.ebuild,v 1.1 2004/06/19 04:17:11 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/noteedit/noteedit-2.6.2.ebuild,v 1.1.1.1 2005/11/30 09:38:27 chriswhite Exp $
 
-inherit kde-functions kde
+IUSE=""
+
+inherit kde-functions kde eutils flag-o-matic
 
 DESCRIPTION="Musical score editor (for Linux)."
 HOMEPAGE="http://rnvs.informatik.tu-chemnitz.de/~jan/noteedit/"
@@ -10,18 +12,29 @@ SRC_URI="http://rnvs.informatik.tu-chemnitz.de/cgi-bin/nph-sendbin.cgi/~jan/${PN
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE="arts"
+KEYWORDS="x86 ~ppc sparc amd64"
 
-DEPEND="arts? ( kde-base/kdemultimedia )
+DEPEND="|| ( kde-base/kdemultimedia-meta kde-base/kdemultimedia )
+	kde-base/arts
 	media-libs/tse3"
 
 need-kde 3
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gcc34.patch
+}
+
+src_compile() {
+	kde_src_compile myconf configure || die
+	append-flags -fpermissive
+	emake -j1 || die
+}
 
 src_install() {
 	kde_src_install
-	dodoc FAQ FAQ.de INSTALL INSTALL.de examples
+	dodoc FAQ FAQ.de examples
 	docinto examples
 	dodoc noteedit/examples/*
 }
diff --git a/media-sound/noteedit/noteedit-2.7.4.ebuild b/media-sound/noteedit/noteedit-2.7.4.ebuild
index 3033228cd402..5191e3d6fafd 100644
--- a/media-sound/noteedit/noteedit-2.7.4.ebuild
+++ b/media-sound/noteedit/noteedit-2.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/media-sound/noteedit/noteedit-2.7.4.ebuild,v 1.1 2005/04/24 23:04:13 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/noteedit/noteedit-2.7.4.ebuild,v 1.1.1.1 2005/11/30 09:38:27 chriswhite Exp $
 
 IUSE=""
 
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~sparc ~ppc ~x86"
 
-DEPEND="|| ( kde-base/kdemultimedia-meta kde-base/kdemultimedia )
+DEPEND="|| ( kde-base/kmid kde-base/kdemultimedia )
 	kde-base/arts
 	media-libs/tse3"
 
@@ -28,7 +28,7 @@ src_compile() {
 
 src_install() {
 	kde_src_install
-	dodoc FAQ FAQ.de INSTALL INSTALL.de examples
+	dodoc FAQ FAQ.de examples
 	docinto examples
 	dodoc noteedit/examples/*
 }
diff --git a/media-sound/noteedit/noteedit-2.8.0.ebuild b/media-sound/noteedit/noteedit-2.8.0.ebuild
index 89961f921a54..641267eb19f7 100644
--- a/media-sound/noteedit/noteedit-2.8.0.ebuild
+++ b/media-sound/noteedit/noteedit-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/media-sound/noteedit/noteedit-2.8.0.ebuild,v 1.1 2005/10/30 15:12:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/noteedit/noteedit-2.8.0.ebuild,v 1.1.1.1 2005/11/30 09:38:27 chriswhite Exp $
 
 IUSE=""
 
@@ -28,7 +28,7 @@ src_unpack() {
 	kde_src_unpack
 	epatch "${FILESDIR}/${PN}-gcc4.patch"
 	epatch "${FILESDIR}/${P}-qt-3.3.5.patch"
-	
+
 	# Force rebuilding configure for the patch above
 	rm configure
 }
diff --git a/media-sound/noxmms/ChangeLog b/media-sound/noxmms/ChangeLog
index 55a5ab25651b..c067bea954de 100644
--- a/media-sound/noxmms/ChangeLog
+++ b/media-sound/noxmms/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for media-sound/noxmms
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/noxmms/ChangeLog,v 1.1 2004/01/25 04:33:51 eradicator Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/noxmms/ChangeLog,v 1.1.1.1 2005/11/30 09:38:21 chriswhite Exp $
+
+  18 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> noxmms-1.2.7.ebuild:
+  modified message in pkg_postinst, fixes #89210. also moved oggvorbis useflag
+  to vorbis, oggvorbis is deprecated.
+
+  07 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  noxmms-1.2.7.ebuild:
+  multilib fixes.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> noxmms-1.2.7.ebuild:
+  Stable amd64, sparc.
+
+  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> noxmms-1.2.7.ebuild:
+  Stable x86.
+
+  11 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> noxmms-1.2.7.ebuild:
+  ppc64 needs deps first
+
+  19 Feb 2004; Martin Holzer <mholzer@gentoo.org> :
+  adding digest. closes 42069
 
 *noxmms-1.2.7 (24 Jan 2004)
 
diff --git a/media-sound/noxmms/Manifest b/media-sound/noxmms/Manifest
index 23b07dbed0ae..c920a0a75501 100644
--- a/media-sound/noxmms/Manifest
+++ b/media-sound/noxmms/Manifest
@@ -1,3 +1,14 @@
-MD5 ed7c8060a82e3886494404f7ce276e3e noxmms-1.2.7.ebuild 1171
-MD5 4e0f6aded883018288a5cd5b1ced483f ChangeLog 466
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4ff34f050ef1cbb0f0fccb132fea3caa noxmms-1.2.7.ebuild 1200
+MD5 97c772c0d5c523fbdcf9abf81f704d73 ChangeLog 1126
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 589aef8c3c91720720d7fd9c473db41d files/digest-noxmms-1.2.7 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCY9Uf06ebR+OMO78RAo3gAJwKbVBP+OHqkm+pAV7Jkgc3JzjXfQCfXOUR
+ciSybbJOgBIt2yNrAwHgjT4=
+=rhnE
+-----END PGP SIGNATURE-----
diff --git a/media-sound/noxmms/noxmms-1.2.7.ebuild b/media-sound/noxmms/noxmms-1.2.7.ebuild
index 50c975ab82b6..90b66b8143b3 100644
--- a/media-sound/noxmms/noxmms-1.2.7.ebuild
+++ b/media-sound/noxmms/noxmms-1.2.7.ebuild
@@ -1,15 +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/media-sound/noxmms/noxmms-1.2.7.ebuild,v 1.1 2004/01/25 04:33:51 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/noxmms/noxmms-1.2.7.ebuild,v 1.1.1.1 2005/11/30 09:38:21 chriswhite Exp $
+
 
 DESCRIPTION="a stripped down (command line only) version of XMMS."
 HOMEPAGE="http://xmmsd.sourceforge.net/noxmms/"
 SRC_URI="http://xmmsd.sourceforge.net/noxmms/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~ppc64 ~sparc"
-IUSE="oggvorbis esd 3dnow nls"
-DEPEND="oggvorbis? ( media-libs/libvorbis )
+KEYWORDS="x86 amd64 ~ppc sparc"
+IUSE="vorbis esd 3dnow nls"
+
+DEPEND="vorbis? ( media-libs/libvorbis )
 	esd? ( media-sound/esound )"
 RDEPEND="${DEPEND}
 	nls? ( dev-util/intltool )"
@@ -18,22 +21,22 @@ src_compile() {
 	econf \
 		--with-dev-dsp=/dev/sound/dsp \
 		--with-dev-mixer=/dev/sound/mixer \
-		`use_enable oggvorbis vorbis` \
-		`use_enable esd` \
-		`use_enable nls` \
-		`use_enable 3dnow` \
-		|| die
-	emake || die
+		$(use_enable vorbis) \
+		$(use_enable esd) \
+		$(use_enable nls) \
+		$(use_enable 3dnow) \
+		|| die "configure failed"
+	emake || die "make failed"
 }
 
 src_install() {
-	einstall || die
+	make DESTDIR="${D}" install || die "make install failed"
 
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog FAQ NEWS README README.noxmms TODO
+	dodoc AUTHORS ChangeLog FAQ NEWS README README.noxmms TODO
 }
 
 pkg_postinst() {
 	einfo "If you do not plan on installing xmms, you may want to setup the following symlink before"
 	einfo "installing xmms plugins."
-	einfo "/usr/bin/xmms-config -> /usr/bin/xmms-config"
+	einfo "/usr/bin/noxmms-config -> /usr/bin/xmms-config"
 }
diff --git a/media-sound/ogg2mp3/ChangeLog b/media-sound/ogg2mp3/ChangeLog
index 21d78fc9c072..9f5ddcb768d0 100644
--- a/media-sound/ogg2mp3/ChangeLog
+++ b/media-sound/ogg2mp3/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for media-sound/ogg2mp3
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ogg2mp3/ChangeLog,v 1.1 2004/11/30 14:29:31 chainsaw Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ogg2mp3/ChangeLog,v 1.1.1.1 2005/11/30 09:38:18 chriswhite Exp $
+
+  23 Aug 2005; Tony Vroon <chainsaw@gentoo.org> ogg2mp3-0.5.ebuild:
+  Stable on x86.
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> ogg2mp3-0.5.ebuild:
+  Added to ~ppc.
+
+*ogg2mp3-0.5 (09 Jun 2005)
+
+  09 Jun 2005; Tony Vroon <chainsaw@gentoo.org> -ogg2mp3-0.3.ebuild,
+  +ogg2mp3-0.5.ebuild:
+  Version bump. License changed to GPL-2.
+
+  03 Apr 2005; Simon Stelling <blubb@gentoo.org> ogg2mp3-0.3.ebuild:
+  added ~amd64
 
 *ogg2mp3-0.3 (30 Nov 2004)
 
diff --git a/media-sound/ogg2mp3/Manifest b/media-sound/ogg2mp3/Manifest
index 25f9591f84da..34a87fbd66c0 100644
--- a/media-sound/ogg2mp3/Manifest
+++ b/media-sound/ogg2mp3/Manifest
@@ -1,3 +1,14 @@
-MD5 0554c55adae6caeb6eb0b0fa79c00cdd ogg2mp3-0.3.ebuild 539
-MD5 cd81ccf108e2a701eb51110d7f464a65 ChangeLog 326
-MD5 c52ea9dbd6cf7693705785b4fb1db3bd files/digest-ogg2mp3-0.3 50
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 9eb47c0a3421b53792f408a0f124b375 ChangeLog 836
+MD5 83d82cd656f00739ff801e22b42c8558 ogg2mp3-0.5.ebuild 600
+MD5 94ab85f7f30706aa09034b3839c38a86 files/digest-ogg2mp3-0.5 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDC6P2p5vW4rUFj5oRAiFoAJ0aRBlFhV/mDqjjAI/jZNX5V3zeeQCeIS+s
+f9/CNV1f2LLO0tINYA2HCj8=
+=ehBS
+-----END PGP SIGNATURE-----
diff --git a/media-sound/ogg2mp3/ogg2mp3-0.5.ebuild b/media-sound/ogg2mp3/ogg2mp3-0.5.ebuild
index e936ddb39a65..49ca14a81271 100644
--- a/media-sound/ogg2mp3/ogg2mp3-0.5.ebuild
+++ b/media-sound/ogg2mp3/ogg2mp3-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/media-sound/ogg2mp3/ogg2mp3-0.5.ebuild,v 1.1 2005/06/09 22:52:58 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ogg2mp3/ogg2mp3-0.5.ebuild,v 1.1.1.1 2005/11/30 09:38:18 chriswhite Exp $
 
 IUSE=""
 
@@ -12,7 +12,7 @@ SRC_URI="http://amor.cms.hu-berlin.de/~h0444y2j/pub/${P}.tar.bz2"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~ppc x86"
 
 RDEPEND="media-sound/lame
 	dev-perl/String-ShellQuote
diff --git a/media-sound/oggtst/ChangeLog b/media-sound/oggtst/ChangeLog
index 2935cf1897f2..670277979bb8 100644
--- a/media-sound/oggtst/ChangeLog
+++ b/media-sound/oggtst/ChangeLog
@@ -1,9 +1,24 @@
 # ChangeLog for media-sound/oggtst
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/oggtst/ChangeLog,v 1.1 2002/02/01 21:53:31 gbevin Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/oggtst/ChangeLog,v 1.1.1.1 2005/11/30 09:38:01 chriswhite Exp $
+
+  26 Aug 2004; Tom Gall <tgall@gentoo.org> oggtst-0.0.ebuild:
+  stable on ppc64 bug #58694
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> oggtst-0.0.ebuild:
+  Added IUSE.
+
+  05 Dec 2003; Jason Wever <weeve@gentoo.org> oggtst-0.0.ebuild:
+  Marked stable on sparc to fix broken dependencies.
+
+  28 Nov 2003; Brad House <brad_mssw@gentoo.org> oggtst-0.0.ebuild:
+  mark stable on amd64
 
 *oggtst-0.0 (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/media-sound/oggtst/Manifest b/media-sound/oggtst/Manifest
index e69de29bb2d1..e5f47fc75081 100644
--- a/media-sound/oggtst/Manifest
+++ b/media-sound/oggtst/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c5bf78ecc0a2c2e5bd58b0d3fc9b3b5f ChangeLog 1142
+MD5 860ec3791ff09efa67e7fb565ff45e49 oggtst-0.0.ebuild 682
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 7b4de568f8bc930b486c68c50956ae31 files/digest-oggtst-0.0 54
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBxvuEroRuSHgZdywRAja2AJ9b6U91WGfiRj2cKWfWMTnyyOQdZQCfWeCo
+0O9quTZbMoXWihmglpjt814=
+=EbNV
+-----END PGP SIGNATURE-----
diff --git a/media-sound/oggtst/files/digest-oggtst-0.0 b/media-sound/oggtst/files/digest-oggtst-0.0
index 28ec9a0c502d..ffd159d1f777 100644
--- a/media-sound/oggtst/files/digest-oggtst-0.0
+++ b/media-sound/oggtst/files/digest-oggtst-0.0
@@ -1 +1 @@
-MD5 8d35377ce3e72f4a01440d7f121d4f68 oggtst.tgz 20480
+MD5 8d35377ce3e72f4a01440d7f121d4f68 oggtst.tgz 19382
diff --git a/media-sound/oggtst/oggtst-0.0.ebuild b/media-sound/oggtst/oggtst-0.0.ebuild
index ead945e39fc1..d717ce6cff91 100644
--- a/media-sound/oggtst/oggtst-0.0.ebuild
+++ b/media-sound/oggtst/oggtst-0.0.ebuild
@@ -1,35 +1,27 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Claes N�sten <pekdon@gmx.net>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/oggtst/oggtst-0.0.ebuild,v 1.1 2001/11/02 22:59:10 azarah Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/oggtst/oggtst-0.0.ebuild,v 1.1.1.1 2005/11/30 09:38:01 chriswhite Exp $
 
-S=${WORKDIR}/${PN}
-DESCRIPTION="A tool for calculate ogg-vorbis playing time."
-SRC_URI="http://gnometoaster.rulez.org/archive//${PN}.tgz"
+DESCRIPTION="A tool for calculating ogg-vorbis playing time"
 HOMEPAGE="http://gnometoaster.rulez.org/"
+SRC_URI="http://gnometoaster.rulez.org/archive/${PN}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
+IUSE=""
 
-DEPEND="virtual/glibc
-	>=media-libs/libao-0.8.0
-	>=media-libs/libogg-1.0_rc2
+DEPEND=">=media-libs/libao-0.8.0
 	>=media-libs/libvorbis-1.0_rc2"
 
+S=${WORKDIR}/${PN}
 
 src_compile() {
-
-	./configure \
-		--host=${CHOST}				\
-		--prefix=/usr				\
-		--infodir=/usr/share/info		\
-		--mandir=/usr/share/man			\
-		|| die
-		
-	make || die
+	econf || die
+	emake -j1 || die
 }
 
 src_install() {
-
-	make DESTDIR=${D}				\
-		install || die
-	
+	make DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog README
 }
diff --git a/media-sound/ogmtools/ChangeLog b/media-sound/ogmtools/ChangeLog
index aa56a462a49e..3dfd1921ba80 100644
--- a/media-sound/ogmtools/ChangeLog
+++ b/media-sound/ogmtools/ChangeLog
@@ -1,9 +1,101 @@
 # ChangeLog for media-sound/ogmtools
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ogmtools/ChangeLog,v 1.1 2002/11/17 09:17:03 phoenix Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ogmtools/ChangeLog,v 1.1.1.1 2005/11/30 09:38:22 chriswhite Exp $
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> ogmtools-1.5.ebuild:
+  Stable on ppc.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ogmtools-1.5.ebuild:
+  Stable amd64, sparc, x86.
+
+  23 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ogmtools-1.5.ebuild:
+  Added to ~sparc.
+
+*ogmtools-1.5 (17 Nov 2004)
+
+  17 Nov 2004; Tony Vroon <chainsaw@gentoo.org>
+  +files/ogmtools-1.5-endian-fix.patch, +ogmtools-1.5.ebuild:
+  Version bump, closes bug #71564.
+
+  19 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -ogmtools-1.0.3.ebuild, -ogmtools-1.2.ebuild, -ogmtools-1.3.ebuild:
+  Removing old versions.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ogmtools-1.4.1.ebuild:
+  Stable amd64, x86.
+
+*ogmtools-1.4.1 (05 Aug 2004)
+
+  05 Aug 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +ogmtools-1.4.1.ebuild:
+  Version bump closes bug #59552.
+
+  22 Jun 2004; <malc@gentoo.org> ogmtools-1.4.ebuild:
+  Mark stable on amd64
+
+  30 May 2004; Jeremy Huddleston <eradicator@gentoo.org> ogmtools-1.4.ebuild:
+  Stable x86.
+
+*ogmtools-1.4 (18 Apr 2004)
+
+  18 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> ogmtools-1.4.ebuild,
+  files/ogmtools-1.4-endian-fix.patch:
+  Version bump.  Bug #47898.
+
+  16 Apr 2004; Luca Barbato <lu_zero@gentoo.org>
+  +files/ogmtools-1.3-endian-fix.patch, ogmtools-1.3.ebuild:
+  Fix endianess
+
+*ogmtools-1.3 (12 Apr 2004)
+
+  12 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> :
+  Version bump closes bug #47196.
+
+  21 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ogmtools-1.0.2.ebuild, ogmtools-1.0.3.ebuild, ogmtools-1.2.ebuild:
+  Fixed DEPENDs, removed old ebuild, and fixed USE=-dvd for bug #43988.
+
+  04 Mar 2004; David Holm <dholm@gentoo.org> ogmtools-1.2.ebuild:
+  Added to ~ppc.
+
+  23 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ogmtools-1.0.3.ebuild, ogmtools-1.2.ebuild:
+  Stability in x86
+
+*ogmtools-1.2 (18 Dec 2003)
+
+  18 Dec 2003; Martin Holzer <mholzer@gentoo.org> ogmtools-1.2.ebuild:
+  Version bumped.
+
+*ogmtools-1.0.3 (19 Jul 2003)
+
+  19 Jul 2003; jje <jje@gentoo.org> ogmtools-1.0.3.ebuild:
+  Version bump. Closes #23251.
+
+*ogmtools-1.0.2 (09 May 2003)
+
+  09 May 2003; Martin Holzer <mholzer@gentoo.org> ogmtools-0.954.ebuild,
+  ogmtools-0.954.ebuild, ogmtools-1.0.1.ebuild, ogmtools-1.0.2.ebuild:
+  Version bumped. Marked stable. Cleanup
+
+*ogmtools-1.0.1 (16 Apr 2003)
+
+  16 Apr 2003; Martin Holzer <mholzer@gentoo.org> Manifest, ogmtools-1.0.1.ebuild:
+  Version bumped. Closes #19386.
+
+*ogmtools-0.973.ebuild (14 Feb 2003)
+
+  14 Feb 2003; Martin Holzer <mholzer@gentoo.org ogmtools-0.973.ebuild :
+  Version bumped. Closes #13564.
 
 *ogmtools-0.954.ebuild (16 Nov 2002)
 
+  14 Feb 2003; Martin Holzer <mholzer@gentoo.org ogmtools-0.954.ebuild :
+  Added >=automake-1.6.0 to DEPEND. Closes #11871.
+
   16 Nov 2002; phoen][x <phoenix@gentoo.org> ogmtools-0.954.ebuild, 
   files/digest-ogmtools-0.954, ChangeLog :
   Initial import.  Ebuild submitted by David Nielsen <Lovechild@foolclan.com>.
diff --git a/media-sound/ogmtools/Manifest b/media-sound/ogmtools/Manifest
index 55e013d8c1c7..a172083a7328 100644
--- a/media-sound/ogmtools/Manifest
+++ b/media-sound/ogmtools/Manifest
@@ -1,7 +1,11 @@
-MD5 59cb9172deaedfb47d24331dd8ee25b8 ChangeLog 768
-MD5 c2b82ce172e94a467a1f799c19636ab0 ogmtools-0.954.ebuild 939
-MD5 6bcbd2e92114becb00cfccaa68d80b33 ogmtools-0.973.ebuild 939
-MD5 be3e935b5fe0dd13d4d1232ca5798d16 ogmtools-1.0.1.ebuild 940
-MD5 e216c5eb4a8e656c484a14a1050e5285 files/digest-ogmtools-0.954 67
-MD5 22efbdf53f05e41e4896faad29cad2cc files/digest-ogmtools-0.973 67
-MD5 ee02db5fbe8d2f0f7c0418a6fb371264 files/digest-ogmtools-1.0.1 67
+MD5 d0d7ea03e238a808414b4426394c100f metadata.xml 221
+MD5 320e68c5246df3a06ac4fdb585471101 ogmtools-1.5.ebuild 1010
+MD5 04e31508cf08a77fe3af3ad4460f21ac ChangeLog 3251
+MD5 ecc522a3c339ebf582a4b39cc755f336 ogmtools-1.4.ebuild 1014
+MD5 fd266b183ab7c000bbfb8eb349acba47 ogmtools-1.4.1.ebuild 1023
+MD5 8926ba6de9fcdedf970cd572020fb4de files/ogmtools-1.5-endian-fix.patch 406
+MD5 9138778818ef5ac3688b89f874798b29 files/ogmtools-1.4-endian-fix.patch 406
+MD5 23dedffee5d4028d0336292bf046fb7a files/ogmtools-1.3-endian-fix.patch 509
+MD5 1d3c84770e67882725503e7237fe56d5 files/digest-ogmtools-1.4 65
+MD5 b761ed0428ae14a6836e25964a36e5f0 files/digest-ogmtools-1.5 65
+MD5 1d1619956bd0f7029e7450c0ec898626 files/digest-ogmtools-1.4.1 67
diff --git a/media-sound/ogmtools/ogmtools-1.4.1.ebuild b/media-sound/ogmtools/ogmtools-1.4.1.ebuild
index 49ae21be7a8e..e2c5a3099ddc 100644
--- a/media-sound/ogmtools/ogmtools-1.4.1.ebuild
+++ b/media-sound/ogmtools/ogmtools-1.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/media-sound/ogmtools/ogmtools-1.4.1.ebuild,v 1.1 2004/08/05 20:13:50 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ogmtools/ogmtools-1.4.1.ebuild,v 1.1.1.1 2005/11/30 09:38:22 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.bunkus.org/videotools/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="x86 amd64 ~ppc"
 IUSE="dvd"
 
 RDEPEND="dvd? ( media-libs/libdvdread )
diff --git a/media-sound/ogmtools/ogmtools-1.4.ebuild b/media-sound/ogmtools/ogmtools-1.4.ebuild
index f1573c2b8a3a..f57745978344 100644
--- a/media-sound/ogmtools/ogmtools-1.4.ebuild
+++ b/media-sound/ogmtools/ogmtools-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/media-sound/ogmtools/ogmtools-1.4.ebuild,v 1.1 2004/04/18 08:27:14 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ogmtools/ogmtools-1.4.ebuild,v 1.1.1.1 2005/11/30 09:38:22 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.bunkus.org/videotools/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="x86 amd64 ~ppc"
 IUSE="dvd"
 
 RDEPEND="dvd? ( media-libs/libdvdread )
diff --git a/media-sound/ogmtools/ogmtools-1.5.ebuild b/media-sound/ogmtools/ogmtools-1.5.ebuild
index 987ca4e50402..eeebe4886eee 100644
--- a/media-sound/ogmtools/ogmtools-1.5.ebuild
+++ b/media-sound/ogmtools/ogmtools-1.5.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/media-sound/ogmtools/ogmtools-1.5.ebuild,v 1.1 2004/11/17 19:15:52 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ogmtools/ogmtools-1.5.ebuild,v 1.1.1.1 2005/11/30 09:38:22 chriswhite Exp $
+
+IUSE="dvd"
 
 inherit eutils
 
@@ -10,8 +12,7 @@ SRC_URI="http://www.bunkus.org/videotools/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE="dvd"
+KEYWORDS="amd64 ppc sparc x86"
 
 RDEPEND="dvd? ( media-libs/libdvdread )
 	media-sound/vorbis-tools"
@@ -31,6 +32,6 @@ src_compile() {
 src_install() {
 	dobin ogmmerge ogmdemux ogminfo ogmsplit ogmcat || die
 	use dvd && dobin dvdxchap
-	dodoc INSTALL TODO README ChangeLog
+	dodoc TODO README ChangeLog
 	doman dvdxchap.1 ogmcat.1 ogmdemux.1 ogminfo.1 ogmmerge.1 ogmsplit.1
 }
diff --git a/media-sound/opmixer/ChangeLog b/media-sound/opmixer/ChangeLog
index d907705863ad..1f774b828c2c 100644
--- a/media-sound/opmixer/ChangeLog
+++ b/media-sound/opmixer/ChangeLog
@@ -1,9 +1,35 @@
 # ChangeLog for media-sound/opmixer
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/opmixer/ChangeLog,v 1.1 2002/07/11 22:05:13 stroke Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/opmixer/ChangeLog,v 1.1.1.1 2005/11/30 09:38:06 chriswhite Exp $
+
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> opmixer-0.75.ebuild:
+  Don't install COPYING and INSTALL files.
+
+  13 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> +files/0.75-gcc34.patch,
+  opmixer-0.75.ebuild:
+  added patch for gcc3.4, fixes #77451
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> opmixer-0.75.ebuild:
+  Stable sparc.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> opmixer-0.75.ebuild:
+  Added IUSE.
 
 *opmixer-0.75 (11 Jul 2002)
 
+  04 Apr 2003; Jason Wever <weeve@gentoo.org> opmixer-0.75.ebuild:
+  Added ~sparc to keywords.
+
+  27 Jan 2003; foser <foser@gentoo.org> opmixer-0.75.ebuild :
+  Fixed gtkmm dep (#14151)
+
+  19 Oct 2002; Calum Selkirk <cselkirk@gentoo.org> opmixer-0.75.ebuild :
+
+  Added ppc to KEYWORDS.
+
+  04 Oct 2002; Mike Frysinger <vapier@gentoo.org> :
+  Added a small gcc3.2 fix for #8760
+
   11 Jul 2002; Gabriele Giorgetti <stroke@gentoo.org> opmixer-0.75.ebuild :
   
   New package 
diff --git a/media-sound/opmixer/Manifest b/media-sound/opmixer/Manifest
index e69de29bb2d1..6a9369264185 100644
--- a/media-sound/opmixer/Manifest
+++ b/media-sound/opmixer/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5ea1ef68d4bc88db064bb29400189eae ChangeLog 1219
+MD5 658a7374ea3d67d3a39c4d6eaf8b872d opmixer-0.75.ebuild 1068
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 5c5aff3a5d8372e6a48046af97b6343c files/digest-opmixer-0.75 64
+MD5 c84f0516671e975810adc32baf3ad8f3 files/0.75-gcc34.patch 1354
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGtSij5H05b2HAEkRAuCmAKCBoV3k8iE6G0Ur7whdb1k/xYVIMwCfUeQn
+dD9f4Hj06sGlJQKfTUcrcFs=
+=GhOx
+-----END PGP SIGNATURE-----
diff --git a/media-sound/opmixer/opmixer-0.75.ebuild b/media-sound/opmixer/opmixer-0.75.ebuild
index 3f517bfff04a..923bbcce0bed 100644
--- a/media-sound/opmixer/opmixer-0.75.ebuild
+++ b/media-sound/opmixer/opmixer-0.75.ebuild
@@ -1,33 +1,44 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/opmixer/opmixer-0.75.ebuild,v 1.1 2002/07/11 22:05:13 stroke Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/opmixer/opmixer-0.75.ebuild,v 1.1.1.1 2005/11/30 09:38:06 chriswhite Exp $
 
+inherit eutils
+
+IUSE=""
+
+MY_P=${P/opm/opM}
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="An oss mixer written in c++ using the gtkmm gui-toolkit. Supports saving, loading and muting of volumes for channels and autoloading via a consoleapp"
 HOMEPAGE="http://optronic.sourceforge.net/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="*"
-
-PKGVER=`echo ${P}|cut -d \- -f2`
-SRC_URI="http://optronic.sourceforge.net/files/opMixer-${PKGVER}.tar.bz2"
+SRC_URI="http://optronic.sourceforge.net/files/${MY_P}.tar.bz2"
 
-S="${WORKDIR}/opMixer-${PKGVER}"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc sparc ~amd64"
 
 DEPEND="=x11-libs/gtk+-1.2*
-	>=x11-libs/gtkmm-1.2.2"
+	=dev-cpp/gtkmm-1.2*"
+
+src_unpack() {
+	unpack ${A}
 
-RDEPEND="${DEPEND}"
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-gcc34.patch
+}
 
 src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
-	emake || die
+	econf || die "configure failed"
+
+	#gcc3.2 fix for #8760
+	cd ${S}/src
+	cp volset.cc volset.cc.old
+	sed -e 's/ endl/ std::endl/' \
+		volset.cc.old > volset.cc
+
+	emake || die "make failed"
 }
 
 src_install() {
-    make DESTDIR=${D} install || die
-    dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
+	make DESTDIR=${D} install || die "make install failed"
+	dodoc AUTHORS ChangeLog NEWS README
 }
diff --git a/media-sound/orpheus/ChangeLog b/media-sound/orpheus/ChangeLog
index 396f1196e945..57d8a57ede26 100644
--- a/media-sound/orpheus/ChangeLog
+++ b/media-sound/orpheus/ChangeLog
@@ -1,6 +1,62 @@
 # ChangeLog for media-sound/orpheus
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/orpheus/ChangeLog,v 1.1 2003/08/03 12:35:11 coredumb Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/orpheus/ChangeLog,v 1.1.1.1 2005/11/30 09:38:19 chriswhite Exp $
+
+  14 Sep 2005; Aron Griffis <agriffis@gentoo.org> orpheus-1.5.ebuild:
+  Mark 1.5 stable on alpha
+
+  28 May 2005; Jan Brinkmann <luckyduck@gentoo.org> orpheus-1.5.ebuild:
+  Dont make use of the deprecated oggvorbis useflag any longer, see #94254.
+
+  30 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -orpheus-1.3.ebuild:
+  toolchain love for bug #69013.
+
+  19 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -orpheus-1.2.ebuild, -orpheus-1.4.ebuild:
+  Removing old versions.
+
+  28 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> orpheus-1.5.ebuild:
+  Stable amd64.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> orpheus-1.5.ebuild:
+  Stable sparc.  Added ~amd64.
+
+  04 Sep 2004; Sven Wegener <swegener@gentoo.org> +files/1.5-gcc34.patch,
+  orpheus-1.2.ebuild, orpheus-1.3.ebuild, orpheus-1.4.ebuild,
+  orpheus-1.5.ebuild:
+  Fixed compilation errors with gcc-3.4. Thanks to Bjarke Istrup Pedersen
+  <Bjarke.ip@tekpunkt.dk> in bug #61223. Don't install ABOUT-NLS, COPYING and
+  INSTALL doc files.
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org> orpheus-1.2.ebuild,
+  orpheus-1.3.ebuild, orpheus-1.4.ebuild, orpheus-1.5.ebuild:
+  Fix use invocation
+
+  06 May 2004; Jeremy Huddleston <eradicator@gentoo.org> orpheus-1.5.ebuild:
+  Stable x86.
+
+*orpheus-1.5 (02 Apr 2004)
+
+  02 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> orpheus-1.5.ebuild:
+  Version bump.  Closes bug #46202.
+
+  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> orpheus-1.4.ebuild:
+  Stable x86.
+
+  23 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> orpheus-1.2.ebuild,
+  orpheus-1.3.ebuild, orpheus-1.4.ebuild:
+  mpg123 dep changed to virtual
+
+*orpheus-1.4 (19 Dec 2003)
+
+  19 Dec 2003; Ciaran McCreesh <ciaranm@gentoo.org> orpheus-1.4.ebuild:
+  Version bump
+
+*orpheus-1.3 (19 Nov 2003)
+
+  19 Nov 2003; Martin Holzer <mholzer@gentoo.org> orpheus-1.3.ebuild:
+  Version bumped. Closes #31683.
 
 *orpheus-1.2 (03 Aug 2003)
 
diff --git a/media-sound/orpheus/Manifest b/media-sound/orpheus/Manifest
index cbef350a2e58..6d43c131b1e7 100644
--- a/media-sound/orpheus/Manifest
+++ b/media-sound/orpheus/Manifest
@@ -1,3 +1,5 @@
-MD5 a3e7784b437516c4b25efaef72aff999 orpheus-1.2.ebuild 1308
-MD5 2e0c7a2b64233ac6732b717cb617cd47 files/digest-orpheus-1.1 63
-MD5 fb24e10c417c43c6d78d208574f36979 files/digest-orpheus-1.2 63
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 c367a2005bb4c6f528a29a41633299f6 ChangeLog 2343
+MD5 0eeae011f78dd7e29e64584242c419a6 orpheus-1.5.ebuild 1406
+MD5 8a5d258c9488ec265c5b8005714062a3 files/1.5-gcc34.patch 1505
+MD5 fa0df30aebd90a38b5816d42237e0372 files/digest-orpheus-1.5 63
diff --git a/media-sound/orpheus/files/1.5-gcc34.patch b/media-sound/orpheus/files/1.5-gcc34.patch
index ba6c7f5af4bd..fbbe3d900664 100644
--- a/media-sound/orpheus/files/1.5-gcc34.patch
+++ b/media-sound/orpheus/files/1.5-gcc34.patch
@@ -11,14 +11,15 @@ diff -Naur old/src/mixerctl.cc new/src/mixerctl.cc
  		    channels.insert(ct);
  		}
 diff -Naur old/src/uitext.cc new/src/uitext.cc
---- old/src/uitext.cc	2004-09-04 01:48:30.955457434 +0200
-+++ new/src/uitext.cc	2004-09-04 02:42:30.689719181 +0200
-@@ -577,14 +577,14 @@
+--- old/src/uitext.cc	2004-09-04 03:36:50.928930920 +0200
++++ new/src/uitext.cc	2004-09-04 03:45:23.183056456 +0200
+@@ -577,14 +577,16 @@
  			autosavepl = !autosavepl;
  			break;
  		    case 41:
 -			if(++((int) playmode) == PlayMode_size)
-+			if(((int) playmode + 1) == PlayMode_size)
++			playmode = (PlayMode) (playmode + 1);
++			if(playmode == PlayMode_size)
  			    playmode = Normal;
  			break;
  		    case 42:
@@ -26,11 +27,12 @@ diff -Naur old/src/uitext.cc new/src/uitext.cc
  			break;
  		    case 43:
 -			if(++((int) sortorder) == SortOrder_size)
-+			if(((int) sortorder + 1) == SortOrder_size)
++			sortorder = (SortOrder) (sortorder + 1);
++			if(sortorder == SortOrder_size)
  			    sortorder = byFileName;
  			break;
  		    case 44:
-@@ -719,7 +719,7 @@
+@@ -719,7 +721,7 @@
      while(!finished) {
  	m.clear();
  
diff --git a/media-sound/orpheus/orpheus-1.5.ebuild b/media-sound/orpheus/orpheus-1.5.ebuild
index 32392a33b0e3..514f474699a8 100644
--- a/media-sound/orpheus/orpheus-1.5.ebuild
+++ b/media-sound/orpheus/orpheus-1.5.ebuild
@@ -1,18 +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/media-sound/orpheus/orpheus-1.5.ebuild,v 1.1 2004/04/02 10:47:43 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/orpheus/orpheus-1.5.ebuild,v 1.1.1.1 2005/11/30 09:38:19 chriswhite Exp $
+
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Command line MP3 player."
 HOMEPAGE="http://konst.org.ua/en/orpheus"
 SRC_URI="http://konst.org.ua/download/${P}.tar.gz"
 
-SLOT="0"
-KEYWORDS="~x86 ~sparc"
 LICENSE="GPL-2"
-IUSE="oggvorbis"
+SLOT="0"
+KEYWORDS="alpha amd64 ~ppc sparc x86"
+IUSE="ogg"
 
 DEPEND=">=sys-libs/ncurses-5.2
-	oggvorbis? ( >=media-libs/libvorbis-1.0_beta1 )
+	ogg? ( >=media-libs/libvorbis-1.0_beta1 )
 	virtual/mpg123
 	media-sound/vorbis-tools
 	gnome-base/libghttp"
@@ -20,8 +22,11 @@ DEPEND=">=sys-libs/ncurses-5.2
 
 src_unpack() {
 	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PV}-gcc34.patch
 
-	#if [ "`use nas`" ]; then
+	#if use nas; then
 	#	cd src
 	#	sed -e "s:^INCLUDES =:INCLUDES = -I/usr/X11R6/include:" \
 	#		-e "s:^splay_LDADD =:splay_LDADD = \$(NAS_LIBS):" \
@@ -37,11 +42,12 @@ src_compile() {
 	#use nas || myconf="${myconf} --disable-nas"
 	myconf="${myconf}"
 
-	econf ${myconf} || die
-	make CC="gcc ${CFLAGS}" CXX="c++ ${CXXFLAGS}" || die
+	econf ${myconf} || die "configure failed"
+	make CC="$(tc-getCC) ${CFLAGS}" CXX="$(tc-getCXX) ${CXXFLAGS}" \
+		|| die "make failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog NEWS README TODO
 }
diff --git a/media-sound/pd-cyclone/ChangeLog b/media-sound/pd-cyclone/ChangeLog
index b42d6234a66d..c08a1ff03cce 100644
--- a/media-sound/pd-cyclone/ChangeLog
+++ b/media-sound/pd-cyclone/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/pd-cyclone
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pd-cyclone/ChangeLog,v 1.1 2005/04/18 16:33:52 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pd-cyclone/ChangeLog,v 1.1.1.1 2005/11/30 09:38:23 chriswhite Exp $
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> pd-cyclone-0.1_alpha54.ebuild:
+  Added to ~ppc.
 
 *pd-cyclone-0.1_alpha54 (18 Apr 2005)
 
diff --git a/media-sound/pd-cyclone/Manifest b/media-sound/pd-cyclone/Manifest
index 27aa80d0733e..8ca05df07cd5 100644
--- a/media-sound/pd-cyclone/Manifest
+++ b/media-sound/pd-cyclone/Manifest
@@ -1,3 +1,5 @@
-MD5 2c48fa13ea64580925564f7181c8f133 pd-cyclone-0.1_alpha54.ebuild 879
+MD5 722275017a756b00ebd5cc9ff1d3bd3a ChangeLog 598
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 642218962d130a23e773d99eb65b64a8 pd-cyclone-0.1_alpha54.ebuild 997
 MD5 71d33b7ecd8f7939281e25313e6a8f9e files/digest-pd-cyclone-0.1_alpha54 75
 MD5 858c3f5d3a131a247f63e3a7c648bc09 files/pd-cyclone-0.1_alpha54-fPIC.patch 886
diff --git a/media-sound/pd-cyclone/pd-cyclone-0.1_alpha54.ebuild b/media-sound/pd-cyclone/pd-cyclone-0.1_alpha54.ebuild
index 045742272b5c..4487894d506d 100644
--- a/media-sound/pd-cyclone/pd-cyclone-0.1_alpha54.ebuild
+++ b/media-sound/pd-cyclone/pd-cyclone-0.1_alpha54.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pd-cyclone/pd-cyclone-0.1_alpha54.ebuild,v 1.1 2005/04/18 16:33:52 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pd-cyclone/pd-cyclone-0.1_alpha54.ebuild,v 1.1.1.1 2005/11/30 09:38:23 chriswhite Exp $
 
 inherit eutils versionator
 
@@ -11,7 +11,7 @@ SRC_URI="http://suita.chopin.edu.pl/~czaja/miXed/externs/cyclone-${MY_PV}-src.ta
 
 LICENSE="|| ( BSD as-is )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 S=${WORKDIR}/cyclone
diff --git a/media-sound/pd/ChangeLog b/media-sound/pd/ChangeLog
index 5a34f494c3a1..05597e5a766c 100644
--- a/media-sound/pd/ChangeLog
+++ b/media-sound/pd/ChangeLog
@@ -1,6 +1,115 @@
 # ChangeLog for media-sound/pd
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pd/ChangeLog,v 1.1 2002/06/14 19:00:06 rphillips Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pd/ChangeLog,v 1.1.1.1 2005/11/30 09:38:02 chriswhite Exp $
+
+  11 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> pd-0.38.4.ebuild:
+  Stable on ppc.
+
+  02 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> pd-0.38.4.ebuild:
+  Stable on sparc
+
+  01 Nov 2005; MATSUU Takuto <matsuu@gentoo.org> -files/pd-0.37.1-exp.patch,
+  -pd-0.37.1.ebuild, pd-0.38.4.ebuild:
+  Stable on x86.
+  Removed old verisons.
+
+*pd-0.39_p1 (01 Nov 2005)
+
+  01 Nov 2005; MATSUU Takuto <matsuu@gentoo.org> +pd-0.39_p1.ebuild:
+  Version bumped. Bug 104752.
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> pd-0.37.4.ebuild:
+  Stable on ppc.
+
+*pd-0.38.4 (13 Apr 2005)
+
+  13 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> +pd-0.38.4.ebuild:
+  new upstream release, fixes #78435. added ~amd64 to KEYWORDS.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> pd-0.37.4.ebuild:
+  Stable sparc, x86.
+
+  23 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> pd-0.37.4.ebuild:
+  Added to ~sparc.
+
+*pd-0.37.4 (11 Nov 2004)
+
+  11 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/pd-0.35.0-r2.patch, -files/pd-0.37.0-jack-fix.patch,
+  pd-0.37.1.ebuild, +pd-0.37.4.ebuild:
+  Removing sed from global context.  Version bump.
+
+  10 May 2004; Jeremy Huddleston <eradicator@gentoo.org> pd-0.37.1.ebuild:
+  Fix ebuild to workaround --enable-alsa borkage. Thanks to Jan Jungmann
+  <jungmann@zlw-ima.rwth-aachen.de> in bug #50539.
+
+  23 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> pd-0.37.1.ebuild:
+  Stable x86.
+
+  14 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> pd-0.35.0-r2.ebuild,
+  pd-0.36.0.ebuild, pd-0.37.0.ebuild:
+  Removing broken versions.
+
+  08 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> pd-0.37.1.ebuild:
+  Fix compilation problem in bug #46914.
+
+  04 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> pd-0.37.1.ebuild:
+  Add manual where pd expects it for bug #45690.
+
+  03 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; pd-0.35.0-r2.ebuild,
+  pd-0.36.0.ebuild, pd-0.37.0.ebuild, pd-0.37.1.ebuild:
+  Change x11-base/xfree dependency to virtual/x11.
+
+  25 Mar 2004; David Holm <dholm@gentoo.org> pd-0.37.1.ebuild:
+  Added to ~ppc.
+
+  24 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> pd-0.37.1.ebuild:
+  DEPEND on sed
+
+*pd-0.37.1 (24 Mar 2004)
+
+  24 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> pd-0.35.0-r2.ebuild,
+  pd-0.37.0.ebuild, pd-0.37.1.ebuild, files/pd-0.37.1-exp.patch:
+  Version bump.
+
+  07 Feb 2004; Brian Harring <ferringb@gentoo.org> metadata.xml,
+  pd-0.37.0.ebuild, files/pd-0.37.0-jack-fix.patch:
+  Added a fix for when jack-audio-connection-kit is installed on the system.
+  Need to add a configure option to control enabling/disabling jack. closes
+  #39134
+
+*pd-0.37.0 (28 Oct 2003)
+
+  28 Oct 2003; Martin Holzer <mholzer@gentoo.org> pd-0.37.0.ebuild:
+  Version bumped.
+
+*pd-0.36.0 (16 Aug 2003)
+*pd-0.35.0-r2 (16 Aug 2003)
+
+  16 Aug 2003; jje <jje@gentoo.org> pd-0.35.0-r1.ebuild,
+  pd-0.35.0-r2.ebuild, pd-0.36.0.ebuild, pd-0.37_pre8.ebuild,
+  files/0.35.0-r1.patch:
+  Added latest version. Limited pre 0.37.0 versions to tk/tcl 8.3.
+
+  See #23178 for details.
+
+*pd-0.35.0-r1 (13 Feb 2003)
+ 
+  12 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
+*pd-0.30.0-r1 (25 Sep 2002)
+
+  25 Sep 2002; Nick Hadaway <raker@gentoo.org> pd-0.35.0-r1.ebuild,
+  files/digest-pd-0.35.0-r1, files/0.35.0-r1.patch :
+  New patch to fix compile and installation problems.
+
+*pd-0.35.0 (18 Aug 2002)
+
+  18 Aug 2002; Ryan Phillips <rphillips@gentoo.org> pd-0.35.0.ebuild
+  files/pd-0.35-0-gentoo.patch :
+
+  New version. Submitted by Artem Baguinski
 
 *pd-0.35_pre24 (14 June 2002)
 
diff --git a/media-sound/pd/Manifest b/media-sound/pd/Manifest
index e69de29bb2d1..3fa8e169c08b 100644
--- a/media-sound/pd/Manifest
+++ b/media-sound/pd/Manifest
@@ -0,0 +1,8 @@
+MD5 07affe1ef0205058009b0cea440e27ac ChangeLog 4221
+MD5 326134cce004edb4ae2b38882c2480f7 files/digest-pd-0.37.4 66
+MD5 37dace0bf73d7401e6b5f5cf08d76b37 files/digest-pd-0.38.4 66
+MD5 5b03cc433fca0bb4719d51988a2d1fff files/digest-pd-0.39_p1 66
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 6aa71afcbdcadc35846c7c41ddc707a6 pd-0.37.4.ebuild 1463
+MD5 ca4f6528af40b02ccca7e7f45a88a06b pd-0.38.4.ebuild 1658
+MD5 2e594d681d0bca3655d39ea850f2dd8e pd-0.39_p1.ebuild 1233
diff --git a/media-sound/pd/pd-0.37.4.ebuild b/media-sound/pd/pd-0.37.4.ebuild
index 34c6f3bf3b78..a4f210850d1b 100644
--- a/media-sound/pd/pd-0.37.4.ebuild
+++ b/media-sound/pd/pd-0.37.4.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/media-sound/pd/pd-0.37.4.ebuild,v 1.1 2004/11/11 08:53:07 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pd/pd-0.37.4.ebuild,v 1.1.1.1 2005/11/30 09:38:02 chriswhite Exp $
+
+IUSE="X alsa debug"
 
 inherit eutils versionator
 
@@ -15,8 +17,7 @@ SRC_URI="http://www-crca.ucsd.edu/~msp/Software/${MY_P}.src.tar.gz"
 
 LICENSE="|| ( BSD as-is )"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE="X alsa debug"
+KEYWORDS="ppc sparc x86"
 
 RDEPEND=">=dev-lang/tcl-8.3.3
 	>=dev-lang/tk-8.3.3
diff --git a/media-sound/pd/pd-0.38.4.ebuild b/media-sound/pd/pd-0.38.4.ebuild
index 5b6e8c3634ab..6c3091dae791 100644
--- a/media-sound/pd/pd-0.38.4.ebuild
+++ b/media-sound/pd/pd-0.38.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/media-sound/pd/pd-0.38.4.ebuild,v 1.1 2005/04/12 22:03:09 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pd/pd-0.38.4.ebuild,v 1.1.1.1 2005/11/30 09:38:02 chriswhite Exp $
 
 IUSE="X alsa debug jack"
 
@@ -17,7 +17,7 @@ SRC_URI="http://www-crca.ucsd.edu/~msp/Software/${MY_P}.src.tar.gz"
 
 LICENSE="|| ( BSD as-is )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ppc sparc x86"
 
 DEPEND=">=dev-lang/tcl-8.3.3
 	>=dev-lang/tk-8.3.3
diff --git a/media-sound/pd/pd-0.39_p1.ebuild b/media-sound/pd/pd-0.39_p1.ebuild
index 8bef1660597e..7938f2fca324 100644
--- a/media-sound/pd/pd-0.39_p1.ebuild
+++ b/media-sound/pd/pd-0.39_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/media-sound/pd/pd-0.39_p1.ebuild,v 1.1 2005/11/01 21:41:54 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pd/pd-0.39_p1.ebuild,v 1.1.1.1 2005/11/30 09:38:02 chriswhite Exp $
 
 IUSE="alsa debug jack"
 
diff --git a/media-sound/peercast/ChangeLog b/media-sound/peercast/ChangeLog
index 49f38b6666e9..950e32e64d80 100644
--- a/media-sound/peercast/ChangeLog
+++ b/media-sound/peercast/ChangeLog
@@ -1,6 +1,33 @@
 # ChangeLog for media-sound/peercast
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/peercast/ChangeLog,v 1.1 2004/10/07 10:04:49 trapni Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/peercast/ChangeLog,v 1.1.1.1 2005/11/30 09:38:24 chriswhite Exp $
+
+  20 Jun 2005; Tony Vroon <chainsaw@gentoo.org> peercast-0.1212.ebuild:
+  Change to Gentoo mirrors now that the distfile has propagated.
+
+*peercast-0.1212 (19 Jun 2005)
+
+  19 Jun 2005; Tony Vroon <chainsaw@gentoo.org> -peercast-0.1211.ebuild,
+  +peercast-0.1212.ebuild:
+  Security bump for format string vulnerability; see
+  http://www.peercast.org/forum/viewtopic.php?p=11596 for more information.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  peercast-0.1211.ebuild:
+  Stable amd64, x86
+
+  23 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  peercast-0.1211.ebuild:
+  Added to ~amd64.
+
+  08 Oct 2004; Sven Wegener <swegener@gentoo.org> :
+  Removed stray digest.
+
+*peercast-0.1211 (07 Oct 2004)
+
+  07 Oct 2004; Christian Parpart <trapni@gentoo.org>
+  -peercast-0.1210.ebuild, +peercast-0.1211.ebuild:
+  fixed *ugly* versioning scheme by peercast.org and though
 
   07 Oct 2004; Christian Parpart <trapni@gentoo.org> :
   Initial ebuild submitted and improved via BUG#45501 by
diff --git a/media-sound/peercast/Manifest b/media-sound/peercast/Manifest
index bf29f8bfce4e..563b25e52b01 100644
--- a/media-sound/peercast/Manifest
+++ b/media-sound/peercast/Manifest
@@ -1,5 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0dae886c1419164608685b1b6d7dc043 ChangeLog 1415
+MD5 9aa0a0713c5edcfc7e6a5dad02a2bb78 files/digest-peercast-0.1212 70
+MD5 46edc53a482f19af8574b644d6ba02ec files/peercast.init 890
 MD5 05ab4d4775083f0930841e415df18ad6 metadata.xml 160
-MD5 9447bc68b9262a007ffb0280576948da ChangeLog 428
-MD5 4ea3748abbf1a4cd6c64a965c0b259cd peercast-0.1210.ebuild 1381
-MD5 385839020dce8c1e5f957f348cd01661 files/peercast.init 789
-MD5 669b6d16bf9e97cdf6fe6608e7291791 files/digest-peercast-0.1210 63
+MD5 f4851d46b0cf2a245e80c1a617fe610a peercast-0.1212.ebuild 1454
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC0CBzI1lqEGTUzyQRAmphAKDHkZ8tJCUnUaQF8C3rV9s+d5LxtACgjkLX
+N0OCU44t44LK7i1mdvR79gw=
+=L7+P
+-----END PGP SIGNATURE-----
diff --git a/media-sound/peercast/files/peercast.init b/media-sound/peercast/files/peercast.init
index 005c706424ee..536184dda3e9 100644
--- a/media-sound/peercast/files/peercast.init
+++ b/media-sound/peercast/files/peercast.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/media-sound/peercast/files/peercast.init,v 1.1 2004/10/07 10:04:49 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/peercast/files/peercast.init,v 1.1.1.1 2005/11/30 09:38:24 chriswhite Exp $
 
 depend() {
 	need net
diff --git a/media-sound/peercast/peercast-0.1212.ebuild b/media-sound/peercast/peercast-0.1212.ebuild
index 34a6f3636acb..3d41b7f18fe1 100644
--- a/media-sound/peercast/peercast-0.1212.ebuild
+++ b/media-sound/peercast/peercast-0.1212.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/peercast/peercast-0.1212.ebuild,v 1.1 2005/06/19 17:34:11 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/peercast/peercast-0.1212.ebuild,v 1.1.1.1 2005/11/30 09:38:24 chriswhite Exp $
 
 IUSE=""
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.peercast.org"
 # as the official peercast download site does *NOT* provide
 # versioned URLs we must provide a seperated download URL where
 # we can download this (versioned).
-SRC_URI="http://dev.gentoo.org/~chainsaw/${PN}-linux-${PV}.tgz"
+SRC_URI="mirror://gentoo/${PN}-linux-${PV}.tgz"
 
 LICENSE="freedist"
 
@@ -25,7 +25,7 @@ RDEPEND="amd64? ( app-emulation/emul-linux-x86-baselibs )"
 src_compile() {
 	(
 		echo "#! /bin/sh"
-		echo ""
+		echo
 		if use amd64 &> /dev/null; then
 			echo "GCC_VERSION=\$(gcc-config -c)"
 			echo "export LD_LIBRARY_PATH=/lib32:/emul/linux/x86/usr/lib/gcc-lib/\${GCC_VERSION/gnu-/gnu/}"
diff --git a/media-sound/playmidi/ChangeLog b/media-sound/playmidi/ChangeLog
index 8eb441e52b9b..c88cb485cd44 100644
--- a/media-sound/playmidi/ChangeLog
+++ b/media-sound/playmidi/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for media-sound/playmidi
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/playmidi/ChangeLog,v 1.1 2004/01/25 09:40:40 eradicator Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/playmidi/ChangeLog,v 1.1.1.1 2005/11/30 09:38:09 chriswhite Exp $
+
+*playmidi-2.5-r1 (18 Jan 2005)
+
+  18 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/CAN-2005-0020.patch, +playmidi-2.5-r1.ebuild, -playmidi-2.5.ebuild:
+  Revbump for security bug #78429.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> playmidi-2.5.ebuild:
+  Stable amd64, sparc.
+
+  10 May 2004; Michael Sterrett <mr_bones_@gentoo.org> playmidi-2.5.ebuild:
+  fix bug #50517; use emake; fix use usage; tidy
+
+  08 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> playmidi-2.5.ebuild,
+  files/playmidi-2.5.patch:
+  Added missing patch to cvs.
+
+  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> playmidi-2.5.ebuild:
+  Stable x86.  Ebuild cleanup.
 
 *playmidi-2.5 (25 Jan 2004)
 
diff --git a/media-sound/playmidi/Manifest b/media-sound/playmidi/Manifest
index 52f1b94c9fd6..44e23d9a080f 100644
--- a/media-sound/playmidi/Manifest
+++ b/media-sound/playmidi/Manifest
@@ -1,3 +1,16 @@
-MD5 dc1c8929779829641022c43879989f5d ChangeLog 419
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c64b0834b26fbc1d202f5b8f2b44c101 ChangeLog 1087
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 eb412d111f9d91cd86f1037b39c60101 playmidi-2.5.ebuild 1326
+MD5 69721302e9f5b409666b228c2344dfe0 playmidi-2.5-r1.ebuild 1516
+MD5 ee0356dc56ad13119227d036ad8f409a files/playmidi-2.5.patch 773
+MD5 689e23daf8f2c4890c537153642c682d files/CAN-2005-0020.patch 2512
+MD5 503417b957f61f0cfcfade05c51cc8c5 files/digest-playmidi-2.5-r1 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFB7NJcArHZZzCEUG0RAno+AJ0U+vzN+sRK4zMxBLEJItTBzZpjpQCfQ9eF
+xwSQnZyjjZrrLiRZHOaQBxg=
+=Dhly
+-----END PGP SIGNATURE-----
diff --git a/media-sound/playmidi/playmidi-2.5-r1.ebuild b/media-sound/playmidi/playmidi-2.5-r1.ebuild
index 8bfc7184fb45..b4b7df54f7a9 100644
--- a/media-sound/playmidi/playmidi-2.5-r1.ebuild
+++ b/media-sound/playmidi/playmidi-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/media-sound/playmidi/playmidi-2.5-r1.ebuild,v 1.1 2005/01/18 09:09:19 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/playmidi/playmidi-2.5-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:09 chriswhite Exp $
 
 IUSE="svga X gtk"
 
diff --git a/media-sound/playspc_gtk/ChangeLog b/media-sound/playspc_gtk/ChangeLog
index 60813bda2085..deb2a2f83e16 100644
--- a/media-sound/playspc_gtk/ChangeLog
+++ b/media-sound/playspc_gtk/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for media-sound/playspc_gtk
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/playspc_gtk/ChangeLog,v 1.1 2003/07/19 03:53:01 jje Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/playspc_gtk/ChangeLog,v 1.1.1.1 2005/11/30 09:38:18 chriswhite Exp $
+
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  playspc_gtk-0.2.7.3.ebuild:
+  Don't install COPYING file.
+
+  12 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  playspc_gtk-0.2.7.3.ebuild:
+  -* for x86 assembly.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  playspc_gtk-0.2.7.3.ebuild:
+  Added IUSE.
+
+  08 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  playspc_gtk-0.2.7.3.ebuild:
+  nomirror and stable on x86.
 
 *playspc_gtk-0.2.7.3 (19 Jul 2003)
 
diff --git a/media-sound/playspc_gtk/Manifest b/media-sound/playspc_gtk/Manifest
index aedc17db9f76..440d89ea44ec 100644
--- a/media-sound/playspc_gtk/Manifest
+++ b/media-sound/playspc_gtk/Manifest
@@ -1,3 +1,14 @@
-MD5 d4d0b4a419704d0f8a7da0f954715486 playspc_gtk-0.2.7.3.ebuild 648
-MD5 a997251431d2661efa40876e0b516e2b ChangeLog 291
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b572dc8982cc013536cd6eb069d2968c ChangeLog 826
+MD5 d98dd831ab80044579eaad92aee85a25 playspc_gtk-0.2.7.3.ebuild 793
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 54cd9fad9da8d2241c19462667906387 files/digest-playspc_gtk-0.2.7.3 71
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGs13j5H05b2HAEkRAgnxAJ9mKYqNaBKzL5uFauW3mujJo9hSzACgo0mr
+o5Rf3uxPsBmgDvc2h9ks5gk=
+=V7H0
+-----END PGP SIGNATURE-----
diff --git a/media-sound/playspc_gtk/playspc_gtk-0.2.7.3.ebuild b/media-sound/playspc_gtk/playspc_gtk-0.2.7.3.ebuild
index 74d5cc53c540..7e69588eaa67 100644
--- a/media-sound/playspc_gtk/playspc_gtk-0.2.7.3.ebuild
+++ b/media-sound/playspc_gtk/playspc_gtk-0.2.7.3.ebuild
@@ -1,18 +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: 
+# $Header: /var/cvsroot/gentoo-x86/media-sound/playspc_gtk/playspc_gtk-0.2.7.3.ebuild,v 1.1.1.1 2005/11/30 09:38:18 chriswhite Exp $
+
+IUSE=""
 
 S=${WORKDIR}/${PN}
 DESCRIPTION="Playspc_gtk is a gtk program utilizing the SNeSe SPC core to play SPC files.  RAR support is well integrated."
 SRC_URI="mirror://sourceforge/playspc/${P}.tar.gz"
+RESTRICT="nomirror"
 HOMEPAGE="http://playspc.sourceforge.net"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+# -*: Contains x86 assembly
+KEYWORDS="-* x86"
 
-DEPEND="app-arch/rar
-	=x11-libs/gtk+-1.2*"
+DEPEND="=x11-libs/gtk+-1.2*"
 
 src_compile() {
 	cd ${S}
@@ -23,7 +26,7 @@ src_install() {
 	exeinto /usr/bin
 	dolib.so libopenspc/libopenspc.so
 	doexe playspc_gtk spccore
-	dodoc CHANGELOG COPYING TODO README
+	dodoc CHANGELOG TODO README
 }
 
 
diff --git a/media-sound/poc/ChangeLog b/media-sound/poc/ChangeLog
index 46748597ffcb..7f3b0c37214a 100644
--- a/media-sound/poc/ChangeLog
+++ b/media-sound/poc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/poc
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/poc/ChangeLog,v 1.1 2005/05/07 08:42:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/poc/ChangeLog,v 1.1.1.1 2005/11/30 09:38:38 chriswhite Exp $
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> poc-0.4.1.ebuild:
+  Added to ~ppc.
 
 *poc-0.4.1 (07 May 2005)
 
diff --git a/media-sound/poc/Manifest b/media-sound/poc/Manifest
index 805645da0842..2191e8ae285e 100644
--- a/media-sound/poc/Manifest
+++ b/media-sound/poc/Manifest
@@ -1,2 +1,6 @@
-MD5 41d97343a22f44321e8c7f062d0d4511 poc-0.4.1.ebuild 426
+MD5 5bf67e162160ed10696f6a7fbd9b967f ChangeLog 404
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 5b080febad9cc8359ac57d1cc3c20f11 poc-0.4.1.ebuild 831
 MD5 85c8e3877f2983937b9172a1d78a36aa files/digest-poc-0.4.1 61
+MD5 ee2d925c329ebaf40933bfb65b0fd4eb files/poc-0.4.1-fec-pkt-prototype.patch 214
+MD5 8a34db148f26bb79f24b9ed0d2253a4a files/poc-0.4.1-file-perms.patch 269
diff --git a/media-sound/poc/poc-0.4.1.ebuild b/media-sound/poc/poc-0.4.1.ebuild
index 91f08a2be78b..5f17ccc57a9c 100644
--- a/media-sound/poc/poc-0.4.1.ebuild
+++ b/media-sound/poc/poc-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/media-sound/poc/poc-0.4.1.ebuild,v 1.1 2005/05/07 08:42:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/poc/poc-0.4.1.ebuild,v 1.1.1.1 2005/11/30 09:38:38 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.bl0rg.net/software/poc/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="sys-devel/flex
@@ -25,6 +25,7 @@ src_unpack() {
 		-e '/^PREFIX/s:/local::' \
 		Makefile
 	epatch "${FILESDIR}"/${P}-fec-pkt-prototype.patch
+	epatch "${FILESDIR}"/${P}-file-perms.patch
 }
 
 src_install() {
diff --git a/media-sound/positron/ChangeLog b/media-sound/positron/ChangeLog
index b324afdf130a..86b50a22b32d 100644
--- a/media-sound/positron/ChangeLog
+++ b/media-sound/positron/ChangeLog
@@ -1,6 +1,52 @@
 # ChangeLog for media-sound/positron
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/positron/ChangeLog,v 1.1 2003/05/24 19:58:18 tberman Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/positron/ChangeLog,v 1.1.1.1 2005/11/30 09:37:53 chriswhite Exp $
+
+  28 May 2005; Jan Brinkmann <luckyduck@gentoo.org> -positron-1.0.ebuild,
+  positron-1.1.ebuild:
+  Dont make use of the deprecated oggvorbis useflag any longer, see #94254.
+
+  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> positron-1.1.ebuild:
+  Stable on ppc.
+
+  28 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  positron-1.1.ebuild:
+  Stable sparc and amd64.
+
+  13 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> positron-1.1.ebuild:
+  ~sparc ~amd64
+
+  06 May 2004; Jeremy Huddleston <eradicator@gentoo.org> positron-1.1.ebuild:
+  Stable x86.
+
+  17 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> positron-1.0.ebuild,
+  positron-1.1.ebuild:
+  IUSE=oggvorbis.
+
+*positron-1.1 (03 Apr 2004)
+
+  03 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> positron-1.1.ebuild:
+  Version bump.  Closes bug #46647.
+
+  20 Oct 2003; Heinrich Wendel <lanius@gentoo.org> positron-1.0.ebuild:
+  bug #31504
+
+  01 Aug 2003; Todd Berman <tberman@gentoo.org> positron-1.0.ebuild:
+  marking stable on ppc per upstream request.
+
+  30 Jul 2003; Todd Berman <tberman@gentoo.org> positron-1.0.ebuild,
+  positron-1.0_beta1.ebuild, positron-1.0_beta2.ebuild:
+  Removing the two beta ebuilds, marking the 1.0 ebuild stable on x86.
+
+*positron-1.0 (19 Jun 2003)
+
+  19 Jun 2003; Todd Berman <tberman@gentoo.org> positron-1.0.ebuild:
+  Version bump
+
+*positron-1.0_beta2 (28 May 2003)
+
+  28 May 2003; Todd Berman <tberman@gentoo.org> positron-1.0_beta2.ebuild:
+  Version bump.
 
 *positron-1.0_beta1 (24 May 2003)
 
diff --git a/media-sound/positron/Manifest b/media-sound/positron/Manifest
index aafdf1ba0017..d19b536b0817 100644
--- a/media-sound/positron/Manifest
+++ b/media-sound/positron/Manifest
@@ -1,2 +1,14 @@
-MD5 232f01980a2788a9786b8e995231737d positron-1.0_beta1.ebuild 629
-MD5 72627860f86fdde3f1f0256b69ab7cdf files/digest-positron-1.0_beta1 65
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d4ae425238ceb986fc78aa8b0cebf4d2 positron-1.1.ebuild 750
+MD5 e01d0317eca21726066c84b6fa7a5f78 ChangeLog 1812
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 1315d4b46ae24a385ab1f1c758fce709 files/digest-positron-1.1 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCmH0x06ebR+OMO78RAovmAJ9rbyHwPSh60ctVSDNRFTr9dlcF+ACeMZhl
+jfDZQW3rNbe119GYP6wJeak=
+=+Ud0
+-----END PGP SIGNATURE-----
diff --git a/media-sound/positron/positron-1.1.ebuild b/media-sound/positron/positron-1.1.ebuild
index 53928eb17174..c51350fe2d2b 100644
--- a/media-sound/positron/positron-1.1.ebuild
+++ b/media-sound/positron/positron-1.1.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/media-sound/positron/positron-1.1.ebuild,v 1.1 2004/04/03 10:41:20 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/positron/positron-1.1.ebuild,v 1.1.1.1 2005/11/30 09:37:53 chriswhite Exp $
 
 DESCRIPTION="Synchronization manager for the Neuros Audio Computer (www.neurosaudio.com) portable music player."
 HOMEPAGE="http://www.xiph.org/positron"
 SRC_URI="http://www.xiph.org/positron/files/source/${P}.tar.gz"
+
 LICENSE="xiph"
 SLOT="0"
+KEYWORDS="x86 ppc sparc amd64"
+IUSE="vorbis"
 
-KEYWORDS="~x86 ~ppc"
-IUSE=""
 DEPEND=">=dev-lang/python-2.2"
-
 RDEPEND="${DEPEND}
-	oggvorbis? ( dev-python/pyvorbis )"
+	 vorbis? ( dev-python/pyvorbis )"
 
 src_compile() {
 	einfo "No compilation required"
@@ -21,5 +21,5 @@ src_compile() {
 
 src_install() {
 	chmod +x setup.py
-	./setup.py install --root ${D} || die
+	./setup.py install --root ${D} || die "installation failed"
 }
diff --git a/media-sound/potamus/ChangeLog b/media-sound/potamus/ChangeLog
index d419627b8288..5556a81b3f41 100644
--- a/media-sound/potamus/ChangeLog
+++ b/media-sound/potamus/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/potamus
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/potamus/ChangeLog,v 1.1 2005/01/06 05:20:22 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/potamus/ChangeLog,v 1.1.1.1 2005/11/30 09:38:11 chriswhite Exp $
+
+  15 Jun 2005; <sekretarz@gentoo.org> potamus-20040414.ebuild:
+  Added to ~amd64, bug #96091
 
 *potamus-20040414 (06 Jan 2005)
 
diff --git a/media-sound/potamus/Manifest b/media-sound/potamus/Manifest
index 407b5f5e4e6d..bd372d54dec6 100644
--- a/media-sound/potamus/Manifest
+++ b/media-sound/potamus/Manifest
@@ -1,2 +1,15 @@
-MD5 7e22d3891ddfa6224f70eaf7ae701e5c potamus-20040414.ebuild 846
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ba27d1949e5085e9b92cb2e48b64b4ae potamus-20040414.ebuild 1046
+MD5 8cd63794cb854e19c7dedf955303efab ChangeLog 592
+MD5 4e5a50f7aee667b932576ab7fdcfc85f metadata.xml 219
 MD5 384c4c31d9fdeb5727b00cee662bb66f files/digest-potamus-20040414 72
+MD5 6a0ea475de529a2747659da0580a1477 files/potamus-Makefile.patch 734
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCsJzQZ/iYVBmujdURAqy8AKDXnkdgva2OhPp6Ofly3nq5o9X95wCfVsmt
+3RCz94/BNBHu9O1Kz9mrmog=
+=FIPQ
+-----END PGP SIGNATURE-----
diff --git a/media-sound/potamus/potamus-20040414.ebuild b/media-sound/potamus/potamus-20040414.ebuild
index 869b73558e3f..d0077c9feefa 100644
--- a/media-sound/potamus/potamus-20040414.ebuild
+++ b/media-sound/potamus/potamus-20040414.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/potamus/potamus-20040414.ebuild,v 1.1 2005/01/06 05:20:22 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/potamus/potamus-20040414.ebuild,v 1.1.1.1 2005/11/30 09:38:11 chriswhite Exp $
 
 inherit eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://offog.org/code/potamus.html"
 SRC_URI="http://offog.org/files/snapshots/potamus/${PN}-CVS-${PV}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE=""
 DEPEND=">=x11-libs/gtk+-2.0.0
diff --git a/media-sound/prokyon3/ChangeLog b/media-sound/prokyon3/ChangeLog
index d6be23235431..65eedff4a29f 100644
--- a/media-sound/prokyon3/ChangeLog
+++ b/media-sound/prokyon3/ChangeLog
@@ -1,6 +1,51 @@
 # ChangeLog for media-sound/prokyon3
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/prokyon3/ChangeLog,v 1.1 2003/03/14 17:14:03 rac Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/prokyon3/ChangeLog,v 1.1.1.1 2005/11/30 09:37:51 chriswhite Exp $
+
+*prokyon3-0.9.4 (16 Nov 2005)
+
+  16 Nov 2005; Gregorio Guidi <greg_g@gentoo.org> +prokyon3-0.9.4.ebuild:
+  New version, proving new options and supporting many external applications.
+
+  10 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> prokyon3-0.9.2.ebuild:
+  Don't install INSTALL file.
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> prokyon3-0.9.2.ebuild:
+  Added to ~ppc.
+
+  07 Jul 2005; Caleb Tennis <caleb@gentoo.org> prokyon3-0.9.2.ebuild:
+  Fix qt dep
+
+  28 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -prokyon3-0.9.1_p1.ebuild, prokyon3-0.9.2.ebuild:
+  Dont make use of the deprecated oggvorbis useflag any longer, see #94254.
+
+  03 Apr 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/prokyon3-0.9.2-configure.patch, prokyon3-0.9.2.ebuild:
+  Add patch to fix bug #80800.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  prokyon3-0.9.2.ebuild:
+  Stable amd64, sparc.
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  prokyon3-0.9.2.ebuild:
+  ~amd64 ~sparc
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  prokyon3-0.9.2.ebuild:
+  Stable x86.
+
+*prokyon3-0.9.2 (19 Mar 2004)
+
+  19 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  prokyon3-0.9.1_p1.ebuild, prokyon3-0.9.2.ebuild, prokyon3-0.9.2_rc2.ebuild:
+  Version bump.
+
+*prokyon3-0.9.2_rc2 (26 Sep 2003)
+
+  26 Sep 2003; jje <jje@gentoo.org> prokyon3-0.9.2_rc2.ebuild:
+  Version bump. Fixes gcc 3.3 issue. Closes #29454.
 
 *prokyon3-0.9.1_p1 (14 Mar 2003)
 
diff --git a/media-sound/prokyon3/Manifest b/media-sound/prokyon3/Manifest
index e69de29bb2d1..5b187affdbb7 100644
--- a/media-sound/prokyon3/Manifest
+++ b/media-sound/prokyon3/Manifest
@@ -0,0 +1,7 @@
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 bb0a6455b435756379a9cbb6a90936a4 ChangeLog 1819
+MD5 ac965ab80a04f0b33a8c4465e949882b prokyon3-0.9.2.ebuild 1240
+MD5 27abb0b14319ccdc87b1626d7f9f08b7 prokyon3-0.9.4.ebuild 2224
+MD5 36244c92298faae6859f3d5903662043 files/prokyon3-0.9.2-configure.patch 842
+MD5 f3d88c9c9bb8a1b5375a1f1be1ac0dba files/digest-prokyon3-0.9.2 66
+MD5 2d8d79e0a74178672f513a48353a9ec9 files/digest-prokyon3-0.9.4 67
diff --git a/media-sound/prokyon3/prokyon3-0.9.2.ebuild b/media-sound/prokyon3/prokyon3-0.9.2.ebuild
index 9d25f6b1f226..cad2a80604d8 100644
--- a/media-sound/prokyon3/prokyon3-0.9.2.ebuild
+++ b/media-sound/prokyon3/prokyon3-0.9.2.ebuild
@@ -1,26 +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/media-sound/prokyon3/prokyon3-0.9.2.ebuild,v 1.1 2004/03/20 00:11:52 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/prokyon3/prokyon3-0.9.2.ebuild,v 1.1.1.1 2005/11/30 09:37:51 chriswhite Exp $
 
-IUSE="oggvorbis"
+inherit eutils
 
-DESCRIPTION="Multithreaded MP3 manager and tag editor based on Qt and MySQL"
+DESCRIPTION="Multithreaded music manager and tag editor based on Qt and MySQL."
 HOMEPAGE="http://prokyon3.sourceforge.net"
 SRC_URI="mirror://sourceforge/prokyon3/${P}.tar.gz"
-RESTRICT="nomirror"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+SLOT="0"
+KEYWORDS="amd64 ~ppc sparc x86"
+IUSE="ogg"
 
-DEPEND=">=x11-libs/qt-3.0
+RESTRICT="primaryuri"
+
+DEPEND="=x11-libs/qt-3*
 	dev-db/mysql
 	>=media-libs/id3lib-3.8.2
-	oggvorbis? ( >=media-libs/libogg-1.0
+	ogg? ( >=media-libs/libogg-1.0
 		>=media-libs/libvorbis-1.0 )"
 
 pkg_setup() {
-	if [ ! -e ${QTDIR}/plugins/sqldrivers/libqsqlmysql.so ] ; then
+	if has_version x11-libs/qt && ! built_with_use x11-libs/qt mysql ; then
 		eerror "You have installed Qt without MySQL support."
 		eerror "Please make sure "mysql" is in your USE variable"
 		eerror "and reemerge Qt"
@@ -28,16 +30,23 @@ pkg_setup() {
 	fi
 }
 
-src_compile() {
-	local myconf
+src_unpack() {
+	unpack ${A}
+	cd ${S}
 
-	use oggvorbis || myconf="--without-ogg"
+	# do not assume that $x_libraries is not empty
+	epatch "${FILESDIR}/${P}-configure.patch"
+}
+
+src_compile() {
+	econf \
+		$(use_with ogg) \
+		|| die "configure failed"
 
-	econf ${myconf} || die
-	emake || die
+	emake || die "make failed"
 }
 
 src_install () {
-	einstall || die
-	dodoc ChangeLog COPYING INSTALL NEWS README
+	einstall || die "make install failed"
+	dodoc ChangeLog NEWS README
 }
diff --git a/media-sound/prokyon3/prokyon3-0.9.4.ebuild b/media-sound/prokyon3/prokyon3-0.9.4.ebuild
index 74f6da707281..b772bb35e70b 100644
--- a/media-sound/prokyon3/prokyon3-0.9.4.ebuild
+++ b/media-sound/prokyon3/prokyon3-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/media-sound/prokyon3/prokyon3-0.9.4.ebuild,v 1.1 2005/11/16 14:48:38 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/prokyon3/prokyon3-0.9.4.ebuild,v 1.1.1.1 2005/11/30 09:37:51 chriswhite Exp $
 
 inherit qt3 eutils
 
diff --git a/media-sound/protux/ChangeLog b/media-sound/protux/ChangeLog
index efb24f1eee7c..33128bf47a06 100644
--- a/media-sound/protux/ChangeLog
+++ b/media-sound/protux/ChangeLog
@@ -1,9 +1,78 @@
 # ChangeLog for media-sound/protux
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/protux/ChangeLog,v 1.1 2003/03/09 03:49:05 jje Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/protux/ChangeLog,v 1.1.1.1 2005/11/30 09:37:56 chriswhite Exp $
+
+  31 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> protux-0.20.1.ebuild,
+  protux-0.20.2.ebuild:
+  Cleanup of econf call, without assuming GNU ld.
+
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> protux-0.20.1.ebuild,
+  protux-0.20.2.ebuild:
+  Don't install COPYING file.
+
+  07 Jul 2005; Caleb Tennis <caleb@gentoo.org> protux-0.20.1.ebuild,
+  protux-0.20.2.ebuild:
+  Fix qt dep
+
+  20 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> protux-0.20.1.ebuild,
+  protux-0.20.2.ebuild:
+  added a patch to make compiling possible again. fixes bug #74436.
+
+  13 Jan 2005; Marc Hildebrand <zypher@gentoo.org> protux-0.20.2.ebuild:
+  stable on x86.
+
+  19 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -protux-0.16.0.ebuild, -protux-0.17.8.ebuild, -protux-0.20.0.ebuild:
+  Removing old versions.
+
+  31 Aug 2004; David Holm <dholm@gentoo.org> protux-0.20.2.ebuild:
+  Added to ~ppc.
+
+  12 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> protux-0.20.2.ebuild:
+  Added to ~amd64
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> protux-0.16.0.ebuild,
+  protux-0.17.8.ebuild:
+  Add die following econf for bug 48950
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> protux-0.16.0.ebuild,
+  protux-0.17.8.ebuild:
+  Added IUSE.
+
+  17 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> protux-0.20.1.ebuild:
+  Stable x86.
+
+*protux-0.20.1 (16 Mar 2004)
+
+  08 Apr 2004; Marc Hildebrand <zypher@gentoo.org> protux-0.20.1.ebuild:
+  Version bumped.
+
+  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> protux-0.16.0.ebuild,
+  protux-0.17.8.ebuild, protux-0.20.0.ebuild:
+  Removed explicit S=.  Stable on x86.
+
+  09 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> protux-0.16.0.ebuild,
+  protux-0.17.8.ebuild, protux-0.20.0.ebuild:
+  Fixing qt's moc detection (Bug #38966). Fixed DEPENDs to match libmustux
+  version.  Added automake/autoconf deps.
+
+*protux-0.20.0 (20 Dec 2003)
+
+  20 Dec 2003; Martin Holzer <mholzer@gentoo.org> protux-0.20.0.ebuild:
+  Version bumped.
+
+*protux-0.17.8 (22 Jun 2003)
+
+  22 Jun 2003; jje <jje@gentoo.org> protux-0.17.8.ebuild:
+  Version bump.
+  
+  Submitted by: Marc Hildebrand <marc.hildebrand@t-online.de>
 
 *protux-0.16.0 (09 Mar 2003)
 
+  10 Mar 2003; jje <jje@gentoo.org> protux-0.16.0.ebuild:
+  Updated HOMEPAGE url.
+
   09 Mar 2003; jje <jje@gentoo.org> protux-0.16.0.ebuild:
   Initial revision.
   
diff --git a/media-sound/protux/Manifest b/media-sound/protux/Manifest
index e69de29bb2d1..cc91a3c5fb55 100644
--- a/media-sound/protux/Manifest
+++ b/media-sound/protux/Manifest
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 630ba8b07f22b89b0247adc0191eca97 ChangeLog 2592
+MD5 2ef4161f2da38462aeb9b3ef66c67442 files/digest-protux-0.20.1 65
+MD5 c4d75b6d370a9e848f5dd0e5a87b2d02 files/digest-protux-0.20.2 65
+MD5 1cd68658f27d5467ba72e158eaf76083 files/protux-gentoo.patch 468
+MD5 d0d7ea03e238a808414b4426394c100f metadata.xml 221
+MD5 87e7c1ff4787e2c726be24d7552a3bfb protux-0.20.1.ebuild 842
+MD5 9d6032f3d9a16872b2eb0b850cfe4dc6 protux-0.20.2.ebuild 866
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDZfx0j5H05b2HAEkRAuLUAJ9wUeHtKAJStFMxDIJB6G4kbRzieACfdI1b
+dnkzxaG/O4jhgfFpikUIxeo=
+=ErJ2
+-----END PGP SIGNATURE-----
diff --git a/media-sound/protux/protux-0.20.1.ebuild b/media-sound/protux/protux-0.20.1.ebuild
index 78e099546b5b..3d4436ce7fd0 100644
--- a/media-sound/protux/protux-0.20.1.ebuild
+++ b/media-sound/protux/protux-0.20.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/media-sound/protux/protux-0.20.1.ebuild,v 1.1 2004/04/08 12:16:57 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/protux/protux-0.20.1.ebuild,v 1.1.1.1 2005/11/30 09:37:56 chriswhite Exp $
 
-inherit kde-functions
+inherit eutils kde-functions
 
 DESCRIPTION="Professional Audio Tools for GNU/Linux"
 HOMEPAGE="http://www.nongnu.org/protux"
@@ -11,24 +11,28 @@ SRC_URI="http://savannah.nongnu.org/download/protux/${P}.tar.gz"
 IUSE="static"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~amd64"
 
 DEPEND="virtual/x11
-	>=x11-libs/qt-3
-	=media-libs/libmustux-0.20*"
+	=x11-libs/qt-3*
+	>=media-libs/libmustux-0.20.1"
 
 set-qtdir 3
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PN}-gentoo.patch
+}
+
 src_compile() {
 	export QT_MOC=${QTDIR}/bin/moc
-	local myconf
-	myconf="--with-gnu-ld"
-	use static || myconf="${myconf} --enable-static=no"
-	econf ${myconf} || die "configure failed"
+	econf $(use_enable static) || die "configure failed"
 	emake || die
 }
 
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYRIGHT ChangeLog FAQ README TODO
+	dodoc AUTHORS ChangeLog README
 }
diff --git a/media-sound/protux/protux-0.20.2.ebuild b/media-sound/protux/protux-0.20.2.ebuild
index 8eb32bc93192..71b83849ec2a 100644
--- a/media-sound/protux/protux-0.20.2.ebuild
+++ b/media-sound/protux/protux-0.20.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/media-sound/protux/protux-0.20.2.ebuild,v 1.1 2004/06/29 14:30:58 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/protux/protux-0.20.2.ebuild,v 1.1.1.1 2005/11/30 09:37:56 chriswhite Exp $
 
-inherit kde-functions
+inherit eutils kde-functions
 
 DESCRIPTION="Professional Audio Tools for GNU/Linux"
 HOMEPAGE="http://www.nongnu.org/protux"
@@ -11,24 +11,28 @@ SRC_URI="http://vt.shuis.tudelft.nl/~remon/protux/stable/version-${PV}/${P}.tar.
 IUSE="static"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~amd64 ~ppc"
 
 DEPEND="virtual/x11
-	>=x11-libs/qt-3
+	=x11-libs/qt-3*
 	>=media-libs/libmustux-0.20.2"
 
 set-qtdir 3
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PN}-gentoo.patch
+}
+
 src_compile() {
 	export QT_MOC=${QTDIR}/bin/moc
-	local myconf
-	myconf="--with-gnu-ld"
-	use static || myconf="${myconf} --enable-static=no"
-	econf ${myconf} || die "configure failed"
+	econf $(use_enable static) || die "configure failed"
 	emake || die
 }
 
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYRIGHT ChangeLog FAQ README TODO
+	dodoc AUTHORS ChangeLog README
 }
diff --git a/media-sound/psindustrializer/ChangeLog b/media-sound/psindustrializer/ChangeLog
index 009bb71696e2..7027e7b6655b 100644
--- a/media-sound/psindustrializer/ChangeLog
+++ b/media-sound/psindustrializer/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for media-sound/psindustrializer
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/psindustrializer/ChangeLog,v 1.1 2003/05/25 08:27:13 jje Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/psindustrializer/ChangeLog,v 1.1.1.1 2005/11/30 09:38:19 chriswhite Exp $
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  psindustrializer-0.2.2.ebuild:
+  Stable amd64, sparc.
+
+  04 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  psindustrializer-0.2.2.ebuild:
+  Added to ~sparc
+
+  23 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  psindustrializer-0.2.2.ebuild:
+  Added to ~amd64.
+
+  19 Jul 2004; David Holm <dholm@gentoo.org> psindustrializer-0.2.2.ebuild:
+  Added to ~ppc.
 
 *psindustrializer-0.2.2 (25 May 2003)
 
diff --git a/media-sound/psindustrializer/Manifest b/media-sound/psindustrializer/Manifest
index 495b7856b745..6e7e7d7e3d4d 100644
--- a/media-sound/psindustrializer/Manifest
+++ b/media-sound/psindustrializer/Manifest
@@ -1,3 +1,14 @@
-MD5 67fe7622022fd0f45c143eb03c3f14ef psindustrializer-0.2.2.ebuild 670
-MD5 234db1e2a27c889e6359147c3f3de68d ChangeLog 298
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 dc1951f4a61d44c4259215db93c05b9b psindustrializer-0.2.2.ebuild 735
+MD5 3b15b9552bba51d246d925313476e038 ChangeLog 821
 MD5 3843e3a04144768082bf109e09cb6182 files/digest-psindustrializer-0.2.2 74
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBxRx6ArHZZzCEUG0RAlrYAJ9ITeNnYDa8NRP3rMVznrLMr3T/hQCfVTBY
+axP/MRXC7LF+YZnr7ZWN7FQ=
+=jMIo
+-----END PGP SIGNATURE-----
diff --git a/media-sound/psindustrializer/psindustrializer-0.2.2.ebuild b/media-sound/psindustrializer/psindustrializer-0.2.2.ebuild
index 191eb5d6e8f1..f70fe7d851ba 100644
--- a/media-sound/psindustrializer/psindustrializer-0.2.2.ebuild
+++ b/media-sound/psindustrializer/psindustrializer-0.2.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/media-sound/psindustrializer/psindustrializer-0.2.2.ebuild,v 1.1 2003/05/25 08:27:13 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/psindustrializer/psindustrializer-0.2.2.ebuild,v 1.1.1.1 2005/11/30 09:38:19 chriswhite Exp $
+
+IUSE=""
 
 DESCRIPTION="Percussion Sample Generator (Discrete Mass Physical Modelling"
 HOMEPAGE="http://uts.cc.utexas.edu/~foxx/industrializer/index.html"
@@ -8,21 +10,14 @@ SRC_URI="http://uts.cc.utexas.edu/~foxx/industrializer/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-
-IUSE=""
+KEYWORDS="amd64 ~ppc sparc x86"
 
-DEPEND="=x11-libs/gtk+-1.2.10* \
-	gnome-base/gnome-libs \
-	=x11-libs/gtkglarea-1.2.3* \
+DEPEND="=x11-libs/gtk+-1.2.10*
+	gnome-base/gnome-libs
+	=x11-libs/gtkglarea-1.2.3*
 	media-sound/esound"
 
-src_compile() {
-	econf || die
-	emake || die
-}
-
 src_install() {
-	make DESTDIR=${D} install || die
-	dodoc README COPYING INSTALL AUTHORS ABOUT-NLS NEWS TODO ChangeLog
+	make DESTDIR="${D}" install || die
+	dodoc README AUTHORS ABOUT-NLS NEWS TODO ChangeLog
 }
diff --git a/media-sound/psmix/ChangeLog b/media-sound/psmix/ChangeLog
index 4b71cb42df79..58bbbb65dd90 100644
--- a/media-sound/psmix/ChangeLog
+++ b/media-sound/psmix/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-sound/psmix
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/psmix/ChangeLog,v 1.1 2002/04/24 01:16:01 rphillips Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/psmix/ChangeLog,v 1.1.1.1 2005/11/30 09:37:53 chriswhite Exp $
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> psmix-2.ebuild:
+  Added to ~ppc.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> psmix-2.ebuild:
+  Stable amd64, sparc.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> psmix-2.ebuild:
+  Added IUSE.
 
 *psmix-2 (23 Apr 2002)
 
diff --git a/media-sound/psmix/Manifest b/media-sound/psmix/Manifest
index e69de29bb2d1..1d0735aa9285 100644
--- a/media-sound/psmix/Manifest
+++ b/media-sound/psmix/Manifest
@@ -0,0 +1,4 @@
+MD5 86d2ed216260ad855f13a07692df876a ChangeLog 936
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 42e32ec32c9b8e9111aab1e8f9f4cd82 psmix-2.ebuild 608
+MD5 d995e526ce68d310afe944877d1ef941 files/digest-psmix-2 54
diff --git a/media-sound/psmix/psmix-2.ebuild b/media-sound/psmix/psmix-2.ebuild
index 5e33f7feee2a..d314daba5da2 100644
--- a/media-sound/psmix/psmix-2.ebuild
+++ b/media-sound/psmix/psmix-2.ebuild
@@ -1,15 +1,20 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Cedric Meury <cedric.meury@mensa.ch>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/psmix/psmix-2.ebuild,v 1.1 2002/04/24 01:16:01 rphillips Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/psmix/psmix-2.ebuild,v 1.1.1.1 2005/11/30 09:37:53 chriswhite Exp $
 
-A="psmix2.tgz"
-S="${WORKDIR}/psmix2"
+IUSE=""
+
+MY_P=${P/-/}
+S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="A GTK audio mixer that can save state and window position."
-SRC_URI="http://www.geocities.com/pssoft7/${A}"
+SRC_URI="http://www.geocities.com/pssoft7/${MY_P}.tgz"
 HOMEPAGE="http://www.geocities.com/pssoft7/"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~ppc sparc x86"
+
 DEPEND="x11-libs/gtk+
 	sys-libs/gdbm"
 
diff --git a/media-sound/ptabtools/ChangeLog b/media-sound/ptabtools/ChangeLog
index 345ba92f028a..eabc81dd38f0 100644
--- a/media-sound/ptabtools/ChangeLog
+++ b/media-sound/ptabtools/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for media-sound/ptabtools
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ptabtools/ChangeLog,v 1.1 2004/09/12 23:25:45 pkdawson Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ptabtools/ChangeLog,v 1.1.1.1 2005/11/30 09:37:53 chriswhite Exp $
+
+*ptabtools-0.3.1-r1 (20 Feb 2005)
+
+  20 Feb 2005; Patrick Dawson <pkdawson@gentoo.org>
+  +files/ptabtools-0.3.1-fPIC.patch, +ptabtools-0.3.1-r1.ebuild:
+  Fixed a few problems, made library build with -fPIC.
+  Closes bug #81955. Thanks to Yaakov S.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ptabtools-0.3.1.ebuild:
+  Stable sparc, x86.
+
+  04 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ptabtools-0.3.1.ebuild:
+  Added to ~sparc.
+
+  17 Oct 2004; David Holm <dholm@gentoo.org> ptabtools-0.3.1.ebuild:
+  Added to ~ppc.
 
 *ptabtools-0.3.1 (12 Sep 2004)
 
diff --git a/media-sound/ptabtools/Manifest b/media-sound/ptabtools/Manifest
index 3899515d8802..dd5c74b8f9a6 100644
--- a/media-sound/ptabtools/Manifest
+++ b/media-sound/ptabtools/Manifest
@@ -1,2 +1,17 @@
-MD5 65bde1f1d9b7c8d86d5053ba8a7f2215 ptabtools-0.3.1.ebuild 643
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 778a7bacb2b422b592fa142d214ad181 ptabtools-0.3.1-r1.ebuild 1036
+MD5 e771ed0f3861a459b8284228765bf9ce ptabtools-0.3.1.ebuild 755
+MD5 daa14ba441e1063d35cad44d5dc4f380 ChangeLog 948
+MD5 83c2574543d0501303b57050254e3880 metadata.xml 222
+MD5 c2c473c8b1b1caabcadd86a480b1e098 files/ptabtools-0.3.1-fPIC.patch 586
 MD5 24b33a79baff0ec4ed867727fb49fc36 files/digest-ptabtools-0.3.1 66
+MD5 24b33a79baff0ec4ed867727fb49fc36 files/digest-ptabtools-0.3.1-r1 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCGOK445JRcz4sDuoRAjehAJ4i2ny62K+34u6PtEqYbrKFuKphMACfUIqz
+RJfpOd+ApXImZTxa3R3xrTo=
+=3fBe
+-----END PGP SIGNATURE-----
diff --git a/media-sound/ptabtools/ptabtools-0.3.1-r1.ebuild b/media-sound/ptabtools/ptabtools-0.3.1-r1.ebuild
index f57219ab9313..bc4fc1e33820 100644
--- a/media-sound/ptabtools/ptabtools-0.3.1-r1.ebuild
+++ b/media-sound/ptabtools/ptabtools-0.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/media-sound/ptabtools/ptabtools-0.3.1-r1.ebuild,v 1.1 2005/02/20 19:19:11 pkdawson Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ptabtools/ptabtools-0.3.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:53 chriswhite Exp $
 
 inherit eutils
 
diff --git a/media-sound/ptabtools/ptabtools-0.3.1.ebuild b/media-sound/ptabtools/ptabtools-0.3.1.ebuild
index e372799b6a61..c9904302f04f 100644
--- a/media-sound/ptabtools/ptabtools-0.3.1.ebuild
+++ b/media-sound/ptabtools/ptabtools-0.3.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/media-sound/ptabtools/ptabtools-0.3.1.ebuild,v 1.1 2004/09/12 23:25:45 pkdawson Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ptabtools/ptabtools-0.3.1.ebuild,v 1.1.1.1 2005/11/30 09:37:53 chriswhite Exp $
+
+IUSE=""
 
 MY_PV=${PV%.*}-${PV##*.}
 
@@ -10,8 +12,7 @@ SRC_URI="http://jelmer.vernstok.nl/releases/${PN}_${MY_PV}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
+KEYWORDS="~ppc sparc x86"
 DEPEND="dev-libs/popt
 	dev-libs/libxml2"
 
diff --git a/media-sound/pympd/ChangeLog b/media-sound/pympd/ChangeLog
index 88ac3fde37c1..f57a6f6681b7 100644
--- a/media-sound/pympd/ChangeLog
+++ b/media-sound/pympd/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for media-sound/pympd
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pympd/ChangeLog,v 1.1 2005/10/16 19:15:17 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pympd/ChangeLog,v 1.1.1.1 2005/11/30 09:38:22 chriswhite Exp $
+
+  19 Nov 2005; Luis Medinas <metalgod@gentoo.org> pympd-0.05.2.ebuild:
+  Added ~amd64 keyword. Closes bug #112877.
+
+*pympd-0.05.2 (18 Nov 2005)
+
+  18 Nov 2005; Andrej Kacian <ticho@gentoo.org> -pympd-0.04.ebuild,
+  +pympd-0.05.2.ebuild:
+  Version bump. Closes bug #112843, by Anton Romanov <theli at ukr.net>.
+	Removed 0.04.
+
+*pympd-0.05 (18 Oct 2005)
+
+  18 Oct 2005; Andrej Kacian <ticho@gentoo.org> +pympd-0.05.ebuild:
+  Version bump. Added a desktop entry. Closes bug #109700, by Anton Romanov
+  <theli at ukr.net>.
 
 *pympd-0.04 (16 Oct 2005)
 
diff --git a/media-sound/pympd/Manifest b/media-sound/pympd/Manifest
index 329858efde91..d9945e7454a0 100644
--- a/media-sound/pympd/Manifest
+++ b/media-sound/pympd/Manifest
@@ -1,4 +1,16 @@
-MD5 dd263a0f8e5116d700ff0127a7a8691a ChangeLog 306
-MD5 bcc5f47731716bc28439384e2b1a12f6 files/digest-pympd-0.04 61
-MD5 fe6aa815be21f1a151127654d70230dd metadata.xml 360
-MD5 46972b73996809655d13a4fe95194117 pympd-0.04.ebuild 861
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d20ef520eec86593b34b20419cc0c7b3 ChangeLog 917
+MD5 c0ef81c22b9be4fb4b946feccd8970f6 files/digest-pympd-0.05 61
+MD5 1ce7b397e7b1081761dfa5d64f55173b files/digest-pympd-0.05.2 63
+MD5 db53de635739e34187c013fc78a83604 metadata.xml 358
+MD5 13277ca0fb8625e9e7187f4181e7e570 pympd-0.05.2.ebuild 1037
+MD5 83d82c2f5b126ca1c1027f44978b5596 pympd-0.05.ebuild 1000
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDfnrxwUpWvClEHQoRAtbEAJsFzBlzLzX5Rtq0AVLv8t0euPGS5QCfTqVJ
+gbRJYHUEwPrcCxabiSOsVNU=
+=6lbs
+-----END PGP SIGNATURE-----
diff --git a/media-sound/pympd/metadata.xml b/media-sound/pympd/metadata.xml
index dcf00b99e3ed..86d42e666cec 100644
--- a/media-sound/pympd/metadata.xml
+++ b/media-sound/pympd/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>sound</herd>
 	<maintainer>
 		<email>ticho@gentoo.org</email>
 		<name>Andrej Kacian</name>
diff --git a/media-sound/pympd/pympd-0.05.2.ebuild b/media-sound/pympd/pympd-0.05.2.ebuild
index 1c3b0ac63898..0188ff2630cd 100644
--- a/media-sound/pympd/pympd-0.05.2.ebuild
+++ b/media-sound/pympd/pympd-0.05.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/media-sound/pympd/pympd-0.05.2.ebuild,v 1.1 2005/11/18 00:08:34 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pympd/pympd-0.05.2.ebuild,v 1.1.1.1 2005/11/30 09:38:22 chriswhite Exp $
 
 inherit eutils python
 
@@ -8,7 +8,7 @@ DESCRIPTION="a Rhythmbox-like PyGTK+ client for Music Player Daemon"
 HOMEPAGE="http://sourceforge.net/projects/pympd"
 SRC_URI="http://pympd.sourceforge.net/files/${P}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 SLOT="0"
 
 IUSE="gnome"
diff --git a/media-sound/pympd/pympd-0.05.ebuild b/media-sound/pympd/pympd-0.05.ebuild
index 2864f1f24cdd..faab0e8ea1c4 100644
--- a/media-sound/pympd/pympd-0.05.ebuild
+++ b/media-sound/pympd/pympd-0.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/media-sound/pympd/pympd-0.05.ebuild,v 1.1 2005/10/18 21:48:35 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pympd/pympd-0.05.ebuild,v 1.1.1.1 2005/11/30 09:38:22 chriswhite Exp $
 
 inherit distutils
 
diff --git a/media-sound/qjackconnect/ChangeLog b/media-sound/qjackconnect/ChangeLog
index 1ba4bfaa3122..2f37835fce7d 100644
--- a/media-sound/qjackconnect/ChangeLog
+++ b/media-sound/qjackconnect/ChangeLog
@@ -1,6 +1,59 @@
 # ChangeLog for media-sound/qjackconnect
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qjackconnect/ChangeLog,v 1.1 2003/01/16 01:45:05 raker Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qjackconnect/ChangeLog,v 1.1.1.1 2005/11/30 09:38:28 chriswhite Exp $
+
+  25 Jul 2005; Caleb Tennis <caleb@gentoo.org>
+  qjackconnect-0.0.3b-r1.ebuild:
+  Fix dep per bug #100235
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  qjackconnect-0.0.3b-r1.ebuild:
+  Stable sparc.
+
+  04 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  qjackconnect-0.0.3b-r1.ebuild:
+  Added to ~sparc
+
+  22 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  qjackconnect-0.0.3b-r1.ebuild:
+  Added alsa-lib as dependency.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  qjackconnect-0.0.3b-r1.ebuild:
+  Stable amd64.
+
+  03 Aug 2004; David Holm <dholm@gentoo.org> qjackconnect-0.0.3b-r1.ebuild:
+  Added to ~ppc.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  qjackconnect-0.0.3b-r1.ebuild:
+  virtual/glibc -> virtual/libc
+
+  13 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  qjackconnect-0.0.3b-r1.ebuild:
+  Getting rid of virtual/jack.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  qjackconnect-0.0.3b-r1.ebuild:
+  Removed explicit S=
+
+  15 Apr 2004; Danny van Dyk <kugelfang@gentoo.org> qjackconnect-0.0.3b-r1.ebuild:
+  marked ~amd64
+
+  28 Feb 2004; David Holm <dholm@gentoo.org> qjackconnect-0.0.3b-r1.ebuild:
+  Added to ~ppc.
+
+  12 Jun 2003; <msterret@gentoo.org> qjackconnect-0.0.3b-r1.ebuild:
+  fix Header
+
+  08 May 2003; jje <jje@gentoo.org> qjackconnect-0.0.3b.ebuild,
+  qjackconnect-0.0.3b.ebuild:
+  Removed pre-virtual/jack ebuild.
+
+*qjackconnect-0.0.3b-r1 (23 Mar 2003)
+
+  23 Mar 2003; jje <jje@gentoo.org> qjackconnect-0.0.3b-r1.ebuild:
+  Updated jack dep to virtual/jack.
 
 *qjackconnect-0.0.3b (15 Jan 2003)
 
diff --git a/media-sound/qjackconnect/Manifest b/media-sound/qjackconnect/Manifest
index d2a5ce64072f..b79429973d2d 100644
--- a/media-sound/qjackconnect/Manifest
+++ b/media-sound/qjackconnect/Manifest
@@ -1,3 +1,4 @@
-MD5 4a673d60b3193ffb21fe8bb262a27c9f ChangeLog 737
-MD5 e9fe6fd921893b23417f9eca13f4afce qjackconnect-0.0.3b-r1.ebuild 642
+MD5 50a141b7f36855345004d3764eb3db8d qjackconnect-0.0.3b-r1.ebuild 812
+MD5 fa9cf61e42b3d3353fda7a4bfc20f5c1 ChangeLog 2012
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 1f5f3cee4ab0107fff6c2b8b1002eafb files/digest-qjackconnect-0.0.3b-r1 71
diff --git a/media-sound/qjackconnect/qjackconnect-0.0.3b-r1.ebuild b/media-sound/qjackconnect/qjackconnect-0.0.3b-r1.ebuild
index 404dda4ef4d2..a278a58e7f9e 100644
--- a/media-sound/qjackconnect/qjackconnect-0.0.3b-r1.ebuild
+++ b/media-sound/qjackconnect/qjackconnect-0.0.3b-r1.ebuild
@@ -1,18 +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: 
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qjackconnect/qjackconnect-0.0.3b-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:28 chriswhite Exp $
+
+inherit qt3
+
+IUSE=""
 
 DESCRIPTION="A QT based patchbay for the JACK Audio Connection Kit"
 HOMEPAGE="http://www.suse.de/~mana/jack.html"
 SRC_URI="ftp://ftp.suse.com/pub/people/mana/${P}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-DEPEND="virtual/glibc
-	>=x11-libs/qt-3.0.5
-	virtual/jack"
-S=${WORKDIR}/${P}
+KEYWORDS="amd64 ~ppc sparc x86"
+
+DEPEND="virtual/libc
+	$(qt_min_version 3.1)
+	media-libs/alsa-lib
+	media-sound/jack-audio-connection-kit"
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-sound/qjackctl/ChangeLog b/media-sound/qjackctl/ChangeLog
index 5022e5843019..751779d38957 100644
--- a/media-sound/qjackctl/ChangeLog
+++ b/media-sound/qjackctl/ChangeLog
@@ -1,6 +1,110 @@
 # ChangeLog for media-sound/qjackctl
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qjackctl/ChangeLog,v 1.1 2003/09/21 02:59:18 jje Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qjackctl/ChangeLog,v 1.1.1.1 2005/11/30 09:38:44 chriswhite Exp $
+
+  28 Jul 2005; Caleb Tennis <caleb@gentoo.org> qjackctl-0.2.8.ebuild,
+  qjackctl-0.2.9.ebuild, qjackctl-0.2.11.ebuild, qjackctl-0.2.13.ebuild,
+  qjackctl-0.2.14.ebuild, qjackctl-0.2.15.ebuild, qjackctl-0.2.17.ebuild:
+  Fix qt dep per bug #100235
+
+*qjackctl-0.2.17 (11 Jul 2005)
+
+  11 Jul 2005; Frank van de Pol <fvdpol@gentoo.org> +qjackctl-0.2.17.ebuild:
+  Version bump. Closing #95967
+
+*qjackctl-0.2.15 (06 Feb 2005)
+
+  06 Feb 2005; Eric Shattow <jnc@gentoo.org> +qjackctl-0.2.15.ebuild:
+  Version bump, simpler workaround for build system.
+
+*qjackctl-0.2.14 (29 Jan 2005)
+
+  29 Jan 2005; Eric Shattow <jnc@gentoo.org> +qjackctl-0.2.14.ebuild:
+  version bump, cleanups.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  qjackctl-0.2.13.ebuild:
+  Stable amd64, sparc, x86.
+
+  04 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  qjackctl-0.2.13.ebuild:
+  Added to ~sparc.
+
+*qjackctl-0.2.13 (28 Nov 2004)
+
+  28 Nov 2004; Eldad Zack <eldad@gentoo.org> metadata.xml,
+  +qjackctl-0.2.13.ebuild:
+  Version bump, took maintainership
+
+  22 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  qjackctl-0.2.11.ebuild:
+  Added alsa-lib as dependency.
+
+*qjackctl-0.2.11 (12 Sep 2004)
+
+  12 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -qjackctl-0.0.8.ebuild, -qjackctl-0.0.9a.ebuild, -qjackctl-0.1.3.ebuild,
+  -qjackctl-0.2.1.ebuild, +qjackctl-0.2.11.ebuild:
+  Version bump.  Removing old ebuilds.
+
+  03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  qjackctl-0.2.9.ebuild:
+  Stable amd64, x86.
+
+  14 Aug 2004; Sven Wegener <swegener@gentoo.org> qjackctl-0.1.3.ebuild:
+  Trimmed trailing whitespace.
+
+  06 Jul 2004; David Holm <dholm@gentoo.org> qjackctl-0.2.9.ebuild:
+  Added to ~ppc.
+
+*qjackctl-0.2.9 (05 Jul 2004)
+
+  05 Jul 2004; Frank van de Pol <fvdpol@gentoo.org> +qjackctl-0.2.9.ebuild:
+  Update to new upstream release.
+
+  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  qjackctl-0.2.8.ebuild:
+  Stable x86 amd64.
+
+  13 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  qjackctl-0.1.3.ebuild, qjackctl-0.2.1.ebuild, qjackctl-0.2.3.ebuild,
+  qjackctl-0.2.8.ebuild:
+  Getting rid of virtual/jack.
+
+*qjackctl-0.2.8 (26 May 2004)
+
+  26 May 2004; Brian Harring <ferringb@gentoo.org> qjackctl-0.2.8.ebuild:
+  version bump to 0.2.8
+
+  15 Apr 2004; Danny van Dyk <kugelfang@gentoo.org> qjackctl-0.2.3.ebuild:
+  marked ~amd64
+
+  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  qjackctl-0.2.3.ebuild:
+  Stable on x86.
+
+  02 Feb 2004; Martin Holzer <mholzer@gentoo.org> qjackctl-0.2.1.ebuild:
+  fixing sandbox issue. closes 40132
+
+*qjackctl-0.2.3 (02 Feb 2004)
+
+  02 Feb 2004; Martin Holzer <mholzer@gentoo.org> qjackctl-0.2.3.ebuild:
+  Version bumped.
+
+*qjackctl-0.2.1 (15 Jan 2004)
+
+  15 Jan 2004; Wout Mertens <wmertens@gentoo.org> qjackctl-2.1.0.ebuild:
+  Version bump. Made x86, since no problems with it so far.
+
+*qjackctl-0.1.3 (18 Dec 2003)
+
+  18 Dec 2003; Martin Holzer <mholzer@gentoo.org> qjackctl-0.1.3.ebuild:
+  Version bumped. Closes 34490
+
+*qjackctl-0.0.9a (16 Oct 2003)
+
+  16 Oct 2003; Nick Hadaway <raker@gentoo.org> qjackctl-0.0.9a.ebuild:
+  Version bump.  Minor cosmetic ebuild adjustments.
 
   21 Sep 2003; jje <jje@gentoo.org> :
   Version bump (before first commit!)
diff --git a/media-sound/qjackctl/Manifest b/media-sound/qjackctl/Manifest
index b55358860373..5bbeaed12028 100644
--- a/media-sound/qjackctl/Manifest
+++ b/media-sound/qjackctl/Manifest
@@ -1,3 +1,16 @@
-MD5 206640e4638baa9f91c70fcbbb82035c ChangeLog 311
-MD5 27f5762547f0b00d86deea06f8919883 qjackctl-0.0.8.ebuild 491
-MD5 f5d50b9205aab08eb660ec99ebecd791 files/digest-qjackctl-0.0.8 65
+MD5 07ce8ae0b55e49504e49a60d47313188 qjackctl-0.2.11.ebuild 1157
+MD5 7781109af7a0962cdb1d368b2c32b7f2 qjackctl-0.2.8.ebuild 1116
+MD5 977c6e47ab995531fe0311e56f2d1797 qjackctl-0.2.13.ebuild 1161
+MD5 bd55e26724d667e8a4e7e03262174e9b qjackctl-0.2.15.ebuild 722
+MD5 9690416b9b0c9a6c7d2b6d5918a62e93 qjackctl-0.2.17.ebuild 674
+MD5 ed9db084578afd029b5f3fd2142e02e0 qjackctl-0.2.9.ebuild 1153
+MD5 ef737ebdaa0488a39fe1d99547b67e22 qjackctl-0.2.14.ebuild 1161
+MD5 7621156a7bf161f02e34fbaea1241c29 ChangeLog 3624
+MD5 958cdff6e2710ee30529dd9af63497de metadata.xml 257
+MD5 cef52c6870bf2937b679d196ad533f06 files/digest-qjackctl-0.2.8 66
+MD5 658e31cb9891082996e505b4eb3f608b files/digest-qjackctl-0.2.9 66
+MD5 0f2e564161d8153fb35077ef7e531178 files/digest-qjackctl-0.2.11 67
+MD5 f1bdcaff4be30dcbde7c6e3f155ef655 files/digest-qjackctl-0.2.13 67
+MD5 a53f04b5b8747df625edd12914a92f05 files/digest-qjackctl-0.2.14 67
+MD5 fab3cc8702f72a83b63eca12c0985a6b files/digest-qjackctl-0.2.15 67
+MD5 636cdea4ba2b5fd942970726e3d9a6b2 files/digest-qjackctl-0.2.17 67
diff --git a/media-sound/qjackctl/metadata.xml b/media-sound/qjackctl/metadata.xml
index ea12fab7b274..5ea9bf880470 100644
--- a/media-sound/qjackctl/metadata.xml
+++ b/media-sound/qjackctl/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 <herd>sound</herd>
 <maintainer>
-  <email>sound@gentoo.org</email>
-  </maintainer>
+        <email>eldad@gentoo.org</email>
+        <name>Eldad Zack</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/qjackctl/qjackctl-0.2.11.ebuild b/media-sound/qjackctl/qjackctl-0.2.11.ebuild
index 0d6c0e236885..410ac9b1c56e 100644
--- a/media-sound/qjackctl/qjackctl-0.2.11.ebuild
+++ b/media-sound/qjackctl/qjackctl-0.2.11.ebuild
@@ -1,20 +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/media-sound/qjackctl/qjackctl-0.2.11.ebuild,v 1.1 2004/09/13 05:00:35 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qjackctl/qjackctl-0.2.11.ebuild,v 1.1.1.1 2005/11/30 09:38:44 chriswhite Exp $
 
 IUSE=""
 
 DESCRIPTION="A Qt application to control the JACK Audio Connection Kit and ALSA sequencer connections."
 HOMEPAGE="http://qjackctl.sf.net/"
 SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
-RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 amd64 ~ppc"
+KEYWORDS="~x86 ~amd64 ~ppc"
 
 DEPEND="virtual/libc
-	>=x11-libs/qt-3.1.1
+	media-libs/alsa-lib
+	=x11-libs/qt-3*
 	media-sound/jack-audio-connection-kit"
 
 src_compile() {
diff --git a/media-sound/qjackctl/qjackctl-0.2.13.ebuild b/media-sound/qjackctl/qjackctl-0.2.13.ebuild
index ebff7c3255b2..04566c32dfc1 100644
--- a/media-sound/qjackctl/qjackctl-0.2.13.ebuild
+++ b/media-sound/qjackctl/qjackctl-0.2.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/media-sound/qjackctl/qjackctl-0.2.13.ebuild,v 1.1 2004/11/28 14:21:03 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qjackctl/qjackctl-0.2.13.ebuild,v 1.1.1.1 2005/11/30 09:38:44 chriswhite Exp $
 
 IUSE=""
 
@@ -10,11 +10,11 @@ SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="amd64 ~ppc sparc x86"
 
 DEPEND="virtual/libc
 	media-libs/alsa-lib
-	>=x11-libs/qt-3.1.1
+	=x11-libs/qt-3*
 	media-sound/jack-audio-connection-kit"
 
 src_compile() {
diff --git a/media-sound/qjackctl/qjackctl-0.2.14.ebuild b/media-sound/qjackctl/qjackctl-0.2.14.ebuild
index bb0e68e25bc0..03d9e9afe091 100644
--- a/media-sound/qjackctl/qjackctl-0.2.14.ebuild
+++ b/media-sound/qjackctl/qjackctl-0.2.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/media-sound/qjackctl/qjackctl-0.2.14.ebuild,v 1.1 2005/01/30 02:01:55 jnc Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qjackctl/qjackctl-0.2.14.ebuild,v 1.1.1.1 2005/11/30 09:38:44 chriswhite Exp $
 
 IUSE=""
 
@@ -14,7 +14,7 @@ KEYWORDS="amd64 ~ppc sparc x86"
 
 DEPEND="virtual/libc
 	media-libs/alsa-lib
-	>=x11-libs/qt-3.1.1
+	=x11-libs/qt-3*
 	media-sound/jack-audio-connection-kit"
 
 src_compile() {
diff --git a/media-sound/qjackctl/qjackctl-0.2.15.ebuild b/media-sound/qjackctl/qjackctl-0.2.15.ebuild
index 2c10058ddc37..e6cd76be427f 100644
--- a/media-sound/qjackctl/qjackctl-0.2.15.ebuild
+++ b/media-sound/qjackctl/qjackctl-0.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/media-sound/qjackctl/qjackctl-0.2.15.ebuild,v 1.1 2005/02/07 01:24:36 jnc Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qjackctl/qjackctl-0.2.15.ebuild,v 1.1.1.1 2005/11/30 09:38:44 chriswhite Exp $
 
 IUSE=""
 
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 DEPEND="virtual/libc
 	media-libs/alsa-lib
-	>=x11-libs/qt-3.1.1
+	=x11-libs/qt-3*
 	media-sound/jack-audio-connection-kit"
 
 src_install() {
diff --git a/media-sound/qjackctl/qjackctl-0.2.17.ebuild b/media-sound/qjackctl/qjackctl-0.2.17.ebuild
index ae45f008d3b8..cdbd68a32be8 100644
--- a/media-sound/qjackctl/qjackctl-0.2.17.ebuild
+++ b/media-sound/qjackctl/qjackctl-0.2.17.ebuild
@@ -1,13 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qjackctl/qjackctl-0.2.17.ebuild,v 1.1 2005/07/10 22:23:20 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qjackctl/qjackctl-0.2.17.ebuild,v 1.1.1.1 2005/11/30 09:38:44 chriswhite Exp $
 
 IUSE=""
 
 inherit eutils kde-functions
 
-need-qt 3
-
 DESCRIPTION="A Qt application to control the JACK Audio Connection Kit and ALSA sequencer connections."
 HOMEPAGE="http://qjackctl.sf.net/"
 SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
@@ -18,7 +16,7 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 DEPEND="virtual/libc
 	media-libs/alsa-lib
-	>=x11-libs/qt-3.1.1
+	=x11-libs/qt-3*
 	media-sound/jack-audio-connection-kit"
 
 src_install() {
diff --git a/media-sound/qjackctl/qjackctl-0.2.8.ebuild b/media-sound/qjackctl/qjackctl-0.2.8.ebuild
index 10315e3fbd06..8711e42a729e 100644
--- a/media-sound/qjackctl/qjackctl-0.2.8.ebuild
+++ b/media-sound/qjackctl/qjackctl-0.2.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/media-sound/qjackctl/qjackctl-0.2.8.ebuild,v 1.1 2004/05/26 23:06:15 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qjackctl/qjackctl-0.2.8.ebuild,v 1.1.1.1 2005/11/30 09:38:44 chriswhite Exp $
 
 IUSE=""
 
@@ -11,11 +11,11 @@ RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64"
 
-DEPEND="virtual/glibc
-	>=x11-libs/qt-3.1.1
-	virtual/jack"
+DEPEND="virtual/libc
+	=x11-libs/qt-3*
+	media-sound/jack-audio-connection-kit"
 
 src_compile() {
 	econf || die
diff --git a/media-sound/qjackctl/qjackctl-0.2.9.ebuild b/media-sound/qjackctl/qjackctl-0.2.9.ebuild
index d0f7803d95d7..53f68744d9a2 100644
--- a/media-sound/qjackctl/qjackctl-0.2.9.ebuild
+++ b/media-sound/qjackctl/qjackctl-0.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/media-sound/qjackctl/qjackctl-0.2.9.ebuild,v 1.1 2004/07/05 21:18:44 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qjackctl/qjackctl-0.2.9.ebuild,v 1.1.1.1 2005/11/30 09:38:44 chriswhite Exp $
 
 IUSE=""
 
@@ -11,10 +11,10 @@ RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64 ~ppc"
 
 DEPEND="virtual/libc
-	>=x11-libs/qt-3.1.1
+	=x11-libs/qt-3*
 	media-sound/jack-audio-connection-kit"
 
 src_compile() {
diff --git a/media-sound/qmbtagger/ChangeLog b/media-sound/qmbtagger/ChangeLog
index 93cfff053027..58ee050efafd 100644
--- a/media-sound/qmbtagger/ChangeLog
+++ b/media-sound/qmbtagger/ChangeLog
@@ -1,6 +1,52 @@
 # ChangeLog for media-sound/qmbtagger
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qmbtagger/ChangeLog,v 1.1 2004/02/11 20:56:13 anti Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmbtagger/ChangeLog,v 1.1.1.1 2005/11/30 09:38:00 chriswhite Exp $
+
+  07 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> qmbtagger-0.07.ebuild:
+  Don't install INSTALL files.
+
+  28 Jul 2005; Caleb Tennis <caleb@gentoo.org> qmbtagger-0.07.ebuild:
+  Fix qt per bug #100235
+
+  28 May 2005; Jan Brinkmann <luckyduck@gentoo.org> -qmbtagger-0.06.ebuild,
+  qmbtagger-0.07.ebuild:
+  Dont make use of the deprecated oggvorbis useflag any longer, see #94254.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  qmbtagger-0.07.ebuild:
+  Stable amd64, x86.
+
+  11 Oct 2004; Sven Wegener <swegener@gentoo.org> :
+  Removed stray digests.
+
+  10 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/qmbtagger-0.07-errno.patch, -qmbtagger-0.04.ebuild,
+  -qmbtagger-0.05.ebuild:
+  Fix compilation.  Added to ~amd64.  Removed old versions.
+
+*qmbtagger-0.07 (02 Jul 2004)
+
+  02 Jul 2004; Frank van de Pol <fvdpol@gentoo.org> +qmbtagger-0.07.ebuild:
+  Version bump to 0.07, closing bug #54414.
+
+  03 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  qmbtagger-0.04.ebuild, qmbtagger-0.05.ebuild, qmbtagger-0.06.ebuild:
+  Changing mad dep to madplay.
+
+*qmbtagger-0.06 (29 Apr 2004)
+
+  29 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  qmbtagger-0.06.ebuild:
+  Version bump closes bug #48089.
+
+  09 Apr 2004; David Holm <dholm@gentoo.org> qmbtagger-0.05.ebuild:
+  Added to ~ppc.
+
+*qmbtagger-0.05 (08 Apr 2004)
+
+  08 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  qmbtagger-0.05.ebuild:
+  Version bump.  Closes bug #47036.
 
 *qmbtagger-0.04 (11 Feb 2004)
 
diff --git a/media-sound/qmbtagger/Manifest b/media-sound/qmbtagger/Manifest
index fd8eec5a3f7f..d8bead95140e 100644
--- a/media-sound/qmbtagger/Manifest
+++ b/media-sound/qmbtagger/Manifest
@@ -1,4 +1,15 @@
-MD5 e25c84fd1a2a0c0e81cacb709f6cbbbe metadata.xml 260
-MD5 f8ff4f88839b4e6930522b7da19f6da1 qmbtagger-0.04.ebuild 738
-MD5 b1bb285e938b15b4c9e2d6786f9564a1 ChangeLog 344
-MD5 eac4679e8275237749f5f593a8a1185a files/digest-qmbtagger-0.04 66
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 cd804bcaec81ffa0c960e1a362d9ceb8 ChangeLog 1898
+MD5 df565fdedc570429d548a729dbe9746f files/digest-qmbtagger-0.07 67
+MD5 8201bc5ae9dc0b533146e1669029612b files/qmbtagger-0.07-errno.patch 841
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 1755d73928439444b3c1a4506f60f326 qmbtagger-0.07.ebuild 1078
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDb0LRj5H05b2HAEkRAsVxAJ9EHGX/NxbbW1lLx3kVkaKC9rDLMgCfZRWM
+ovktv0ereqUIBwqUOSTTiks=
+=/7WL
+-----END PGP SIGNATURE-----
diff --git a/media-sound/qmbtagger/metadata.xml b/media-sound/qmbtagger/metadata.xml
index 526dc592a6c0..e1774e3d9ad7 100644
--- a/media-sound/qmbtagger/metadata.xml
+++ b/media-sound/qmbtagger/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>anti@gentoo.org</email>
-		<name>Ray Russell Reese III</name>
-	</maintainer>
+<herd>sound</herd>
 </pkgmetadata>
diff --git a/media-sound/qmbtagger/qmbtagger-0.07.ebuild b/media-sound/qmbtagger/qmbtagger-0.07.ebuild
index 5c94ae83fd94..be1a388c4719 100644
--- a/media-sound/qmbtagger/qmbtagger-0.07.ebuild
+++ b/media-sound/qmbtagger/qmbtagger-0.07.ebuild
@@ -1,37 +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/media-sound/qmbtagger/qmbtagger-0.07.ebuild,v 1.1 2004/07/02 08:11:27 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmbtagger/qmbtagger-0.07.ebuild,v 1.1.1.1 2005/11/30 09:38:00 chriswhite Exp $
 
 inherit eutils
 
 DESCRIPTION="Qt based front-end for the MusicBrainz Client Library"
 HOMEPAGE="http://qmbtagger.sourceforge.net/"
 SRC_URI="mirror://sourceforge/qmbtagger/${P}.tar.bz2"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="ogg"
 
-DEPEND=">=x11-libs/qt-3.1.2
-	media-libs/musicbrainz
-	media-sound/madplay
+DEPEND="
+	=x11-libs/qt-3*
 	media-libs/flac
 	media-libs/id3lib
-	oggvorbis? ( media-sound/vorbis-tools )"
-
-IUSE="oggvorbis"
-SLOT="0"
-KEYWORDS="~x86"
+	media-libs/musicbrainz
+	media-sound/madplay
+	ogg? ( media-sound/vorbis-tools )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-errno.patch
+}
 
 src_compile() {
 	addwrite ${QTDIR}/etc/settings
 	make -f admin/Makefile.common cvs || die "code setup failed"
 	econf --enable-debug=full || die "configure failed"
-	emake || die
+
+	emake || die "make failed"
 }
 
 src_install () {
 	#Sandbox issues; bugs 54414 and 52497
 	addpredict ${QTDIR}/etc
 
-	make DESTDIR=${D} install || die
-	dodoc CHANGELOG COPYING INSTALL README || die "dodoc failed"
+	make DESTDIR=${D} install || die "make install failed"
+	dodoc CHANGELOG README || die "dodoc failed"
 }
diff --git a/media-sound/qmidiarp/ChangeLog b/media-sound/qmidiarp/ChangeLog
index f56fa9d4ecf7..c0c7271183e2 100644
--- a/media-sound/qmidiarp/ChangeLog
+++ b/media-sound/qmidiarp/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for media-sound/qmidiarp
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qmidiarp/ChangeLog,v 1.1 2004/10/03 04:39:59 chriswhite Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmidiarp/ChangeLog,v 1.1.1.1 2005/11/30 09:38:37 chriswhite Exp $
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> qmidiarp-0.0.2.ebuild:
+  Stable on ppc.
+
+  25 Jul 2005; Caleb Tennis <caleb@gentoo.org> qmidiarp-0.0.2.ebuild:
+  Change qt dep for bug #100235
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  qmidiarp-0.0.2.ebuild:
+  Stable amd64, sparc, x86.
+
+  04 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  qmidiarp-0.0.2.ebuild:
+  Added to ~sparc.
+
+  12 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  qmidiarp-0.0.2.ebuild:
+  Added to ~amd64.
+
+  17 Oct 2004; David Holm <dholm@gentoo.org> qmidiarp-0.0.2.ebuild:
+  Added to ~ppc.
 
 *qmidiarp-0.0.2 (03 Oct 2004)
 
diff --git a/media-sound/qmidiarp/Manifest b/media-sound/qmidiarp/Manifest
index 8e053dbf43cc..02be9859335f 100644
--- a/media-sound/qmidiarp/Manifest
+++ b/media-sound/qmidiarp/Manifest
@@ -1,3 +1,5 @@
-MD5 c48d065c92d7fe181527fbf6473b10a8 qmidiarp-0.0.2.ebuild 648
+MD5 4e5a50f7aee667b932576ab7fdcfc85f metadata.xml 219
+MD5 fd078cc5f3ca43750bb629ef117756ad ChangeLog 1106
+MD5 5b963c1350dff41215c576ca67733211 qmidiarp-0.0.2.ebuild 748
 MD5 19bf8edcb576fd4989a3dd037226cd72 files/digest-qmidiarp-0.0.2 66
 MD5 c12d23f0f4c6059ce7c29fc4c8ff2414 files/qmidiarp-0.0.2-fix_qtdir_in_makefile.patch 426
diff --git a/media-sound/qmidiarp/qmidiarp-0.0.2.ebuild b/media-sound/qmidiarp/qmidiarp-0.0.2.ebuild
index cd13e9d1b53c..68dbbdd19410 100644
--- a/media-sound/qmidiarp/qmidiarp-0.0.2.ebuild
+++ b/media-sound/qmidiarp/qmidiarp-0.0.2.ebuild
@@ -1,20 +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/media-sound/qmidiarp/qmidiarp-0.0.2.ebuild,v 1.1 2004/10/03 04:39:59 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmidiarp/qmidiarp-0.0.2.ebuild,v 1.1.1.1 2005/11/30 09:38:37 chriswhite Exp $
 
-inherit eutils
+IUSE=""
+
+inherit eutils qt3
 
 DESCRIPTION="MIDI Arpeggiator QMidiArp"
 HOMEPAGE="http://alsamodular.sourceforge.net/"
 SRC_URI="mirror://sourceforge/alsamodular/${P}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
+KEYWORDS="amd64 ppc sparc x86"
 
-DEPEND=">=x11-libs/qt-3.2.0
+DEPEND="$(qt_min_version 3.2)
 	>=media-libs/alsa-lib-0.9.0"
-RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
@@ -31,4 +32,3 @@ src_install() {
 	insinto /usr/share/${PN}
 	doins demo.qma demo_up_down.qma
 }
-
diff --git a/media-sound/qsampler/ChangeLog b/media-sound/qsampler/ChangeLog
index 93efc96be8dd..0cd2788b9fdf 100644
--- a/media-sound/qsampler/ChangeLog
+++ b/media-sound/qsampler/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for media-sound/qsampler
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qsampler/ChangeLog,v 1.1 2005/05/29 23:35:00 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qsampler/ChangeLog,v 1.1.1.1 2005/11/30 09:38:44 chriswhite Exp $
+
+  07 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> qsampler-0.1.0.ebuild,
+  qsampler-0.1.2.ebuild:
+  Don't install INSTALL files.
+
+  28 Jul 2005; Caleb Tennis <caleb@gentoo.org> qsampler-0.1.0.ebuild,
+  qsampler-0.1.2.ebuild:
+  Fix qt dep per bug #100235
+
+  13 Jul 2005; Frank van de Pol <fvdpol@gentoo.org> qsampler-0.1.2.ebuild:
+  Unmasked amd64
+
+  11 Jul 2005; Frank van de Pol <fvdpol@gentoo.org> qsampler-0.1.0.ebuild,
+  qsampler-0.1.2.ebuild:
+  masked amd64 architecture
+
+*qsampler-0.1.2 (10 Jul 2005)
+
+  10 Jul 2005; Frank van de Pol <fvdpol@gentoo.org> +qsampler-0.1.2.ebuild:
+  version bump
 
   30 May 2005; Frank van de Pol <fvdpol@gentoo.org> :
   New ebuild for qsampler, a graphical frontend to LinuxSampler
diff --git a/media-sound/qsampler/Manifest b/media-sound/qsampler/Manifest
index dab6b16aea0b..e7c4da74008d 100644
--- a/media-sound/qsampler/Manifest
+++ b/media-sound/qsampler/Manifest
@@ -1,3 +1,16 @@
-MD5 dbd599f3ec1ba060683ce48c4b2bb84e qsampler-0.1.0.ebuild 1184
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 45a5fd59fe2ff41ae0b878ea4e590547 ChangeLog 938
 MD5 6f68d6ba7868d9a1267c051b31ac3011 files/digest-qsampler-0.1.0 66
+MD5 5e7db067c4ed83e8e7db11b327a67d56 files/digest-qsampler-0.1.2 66
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 d387592c96f04d51237ba2e99b3c8406 qsampler-0.1.0.ebuild 1284
+MD5 00b6d9f0a1d86f3d0c99bab4b9d6b5ba qsampler-0.1.2.ebuild 1296
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDbz5zj5H05b2HAEkRAuP6AJ9Y9ssHOZekyhl1j601nRBwFIAVrACfWUiJ
+EdIzTiHZSGIlG+i+6E8Vqj4=
+=DyUc
+-----END PGP SIGNATURE-----
diff --git a/media-sound/qsampler/qsampler-0.1.0.ebuild b/media-sound/qsampler/qsampler-0.1.0.ebuild
index 7ffb8bd2d607..ba1d786cc162 100644
--- a/media-sound/qsampler/qsampler-0.1.0.ebuild
+++ b/media-sound/qsampler/qsampler-0.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 2005-2005 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qsampler/qsampler-0.1.0.ebuild,v 1.1 2005/05/29 23:35:00 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qsampler/qsampler-0.1.0.ebuild,v 1.1.1.1 2005/11/30 09:38:44 chriswhite Exp $
 
 inherit kde eutils
 
@@ -9,10 +9,10 @@ HOMEPAGE="http://www.linuxsampler.org/"
 SRC_URI="http://download.linuxsampler.org/packages/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="-amd64 ~x86"
 IUSE=""
 RDEPEND="virtual/libc
-	>=x11-libs/qt-3.1.1
+	=x11-libs/qt-3*
 	>=media-libs/liblscp-0.2.9
 	>=media-libs/libgig-2.0.0
 	media-libs/alsa-lib"
@@ -43,5 +43,5 @@ src_compile() {
 
 src_install() {
 	einstall || die "einstall failed"
-	dodoc AUTHORS ChangeLog INSTALL README
+	dodoc AUTHORS ChangeLog README
 }
diff --git a/media-sound/qsampler/qsampler-0.1.2.ebuild b/media-sound/qsampler/qsampler-0.1.2.ebuild
index 26fd039cd5c4..cfe819671a70 100644
--- a/media-sound/qsampler/qsampler-0.1.2.ebuild
+++ b/media-sound/qsampler/qsampler-0.1.2.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/media-sound/qsampler/qsampler-0.1.2.ebuild,v 1.1 2005/07/10 21:21:09 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qsampler/qsampler-0.1.2.ebuild,v 1.1.1.1 2005/11/30 09:38:44 chriswhite Exp $
 
 inherit kde eutils
 
-DESCRIPTION="QSampler is a graphical frontent to the LinuxSampler engine."
+DESCRIPTION="QSampler is a graphical frontend to the LinuxSampler engine."
 HOMEPAGE="http://www.linuxsampler.org/"
 SRC_URI="http://download.linuxsampler.org/packages/${P}.tar.gz"
 LICENSE="GPL-2"
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 RDEPEND="virtual/libc
-	>=x11-libs/qt-3.1.1
+	=x11-libs/qt-3*
 	>=media-libs/liblscp-0.3.0
 	>=media-libs/libgig-2.0.1
 	>=media-sound/linuxsampler-0.3.2
@@ -43,5 +43,5 @@ src_compile() {
 
 src_install() {
 	einstall || die "einstall failed"
-	dodoc AUTHORS ChangeLog INSTALL README
+	dodoc AUTHORS ChangeLog README
 }
diff --git a/media-sound/qsynth/ChangeLog b/media-sound/qsynth/ChangeLog
index a390e7e600d4..ffd5f025d837 100644
--- a/media-sound/qsynth/ChangeLog
+++ b/media-sound/qsynth/ChangeLog
@@ -1,6 +1,119 @@
-# ChangeLog for media-sound/qjackctl
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qsynth/ChangeLog,v 1.1 2004/01/15 01:57:17 wmertens Exp $
+# ChangeLog for media-sound/qsynth
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qsynth/ChangeLog,v 1.1.1.1 2005/11/30 09:38:21 chriswhite Exp $
+
+*qsynth-0.2.4 (06 Nov 2005)
+
+  06 Nov 2005; MATSUU Takuto <matsuu@gentoo.org> qsynth-0.2.3.ebuild,
+  +qsynth-0.2.4.ebuild:
+  Version bumped.
+  Marked 0.2.3 stable on x86. Bug 104730.
+
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> qsynth-0.1.0.ebuild,
+  qsynth-0.2.1.ebuild, qsynth-0.2.2.ebuild, qsynth-0.2.3.ebuild:
+  Don't install COPYING file.
+
+  28 Jul 2005; Caleb Tennis <caleb@gentoo.org> qsynth-0.1.0.ebuild,
+  qsynth-0.2.1.ebuild, qsynth-0.2.2.ebuild, qsynth-0.2.3.ebuild:
+  Fix qt dep per bug #100235
+
+*qsynth-0.2.3 (11 Jul 2005)
+
+  11 Jul 2005; Frank van de Pol <fvdpol@gentoo.org> +qsynth-0.2.3.ebuild:
+  Version bump
+
+*qsynth-0.2.2 (26 Nov 2004)
+
+  26 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +qsynth-0.2.2.ebuild:
+  Version bump and added to ~sparc.
+
+  03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> qsynth-0.2.1.ebuild:
+  Stable amd64, x86.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> qsynth-0.1.0.ebuild,
+  qsynth-0.2.1.ebuild:
+  virtual/glibc -> virtual/libc
+
+  23 Jun 2004; David Holm <dholm@gentoo.org> qsynth-0.2.1.ebuild:
+  Added to ~ppc.
+
+*qsynth-0.2.1 (20 Jun 2004)
+
+  20 Jun 2004; Frank van de Pol <fvdpol@gentoo.org> +qsynth-0.2.1.ebuild:
+  Updated to new upstream version of qsynth.
+  Changed since previous gentoo package according to qsynth changelog:
+  
+  0.2.1   2004-04-30  Important internal fixes.
+  
+  - Channels window reset when switching engines isn't destructive
+    anymore; also reverb and chorus activation were not being correctly
+    updated; these were quite annoying bugs, now fixed.
+  
+  - Corrected MIDI/Audio driver settings that were being obliterated from
+    the setup dialog option lists; this was causing the impossibility to
+    choose an appropriate driver on certain systems where "alsa_seq" or
+    "jack" may not be available by default (e.g. MacOSX, thanks to Ebrahim
+    Mayat).
+    
+  - The dash (-) is now a legal character for preset names.
+  
+  - Translation support for the default preset name "(default)".
+  
+  - Delete preset confirmation warning message.
+  
+  - Messages window pops up whenever a critical error message is issued.
+  
+  
+  0.2.0   2004-03-21  Multi-instance comes to town.
+  
+  - Multiple fluidsynth engines can now be maintained, with different
+    settings, MIDI and Audio drivers, and more interestingly distinct
+    soundfont stacks. The main user interface has been minimally
+    improved to accomodate this new paradigm, but whole application
+    internals have been massively rewritten.
+    
+  
+  0.1.3   2004-02-29  More work in progress.
+  
+  - Message window line limit is now a configurable option on setup.
+  
+  - ALSA sequencer client name may now be internally set; not of great use
+    for now, but it opens the ground for future workings.
+  
+  - JACK multiple output port mode may now be configured on setup.
+  
+  - Makefile.cvs makes its late entrance on the build toolset.
+  
+  
+  0.1.2   2004-02-16  Work in progress.
+  
+  - Messages and Channels pop-up windows are not hinted as dialogs anymore
+    and thus are not centered relative to parent main window which has become
+    a strict Qt dialog widget behaviour (as of Qt 3.3+).
+  
+  - Soundfont setup dialog changed to open and load multiple files at once.
+  
+  - New setup option on wether all child windows are kept on top of the main
+    window, or otherwise floating with probable taskbar entries of their own.
+  
+  - Setup changes that are only effective next time the program is run gets
+    an informational message box shown to the user.
+  
+  
+  0.1.1   2004-01-22  Yet more minor bugfixes.
+  
+  - Messages color retouching.
+  
+  - Popup menus memory leak fixed.
+
+  20 Jun 2004; Frank van de Pol <fvdpol@gentoo.org> metadata.xml,
+  qsynth-0.1.0.ebuild:
+  Fixed sandbox violations, closing bug #45289.
+  
+  (note: Package was marked stable x86; left it that way since this is only a
+  correction in the ebuild. Flagging it ~x86 might break people's systems who
+  managed to install it.)
 
 *qsynth-0.1.0 (15 Jan 2004)
 
diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index ad88055b6a05..ff6df0d2f814 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -1,4 +1,12 @@
-MD5 ebc43ae8a8366e487c7305f978f60368 ChangeLog 424
-MD5 57150578eeb020371c5e4dda3549427a qsynth-0.1.0.ebuild 571
-MD5 d0d7ea03e238a808414b4426394c100f metadata.xml 221
+MD5 22a68c0791672a2d694208e5f80b5207 ChangeLog 4400
 MD5 fde45970ba4d6681ef829f9fde4b7e72 files/digest-qsynth-0.1.0 63
+MD5 0ad37e882f8d5b9c5e58810f9e646468 files/digest-qsynth-0.2.1 63
+MD5 c8736c07a5030eb5fe6ffac7629d16de files/digest-qsynth-0.2.2 64
+MD5 e5168eb8696836b38d31c1bf6cf3d640 files/digest-qsynth-0.2.3 64
+MD5 6cc21c5de2034c4424db5292b02735c7 files/digest-qsynth-0.2.4 64
+MD5 bed98f5cc72fd626b638bfcae4593ce6 metadata.xml 647
+MD5 a3ba3f081208c5d9d84eca8c08e0efce qsynth-0.1.0.ebuild 655
+MD5 8d4f94b4ae3269e744b39cb0a6ede91f qsynth-0.2.1.ebuild 659
+MD5 853c6433459ef0e7fee63cf8902f7c0e qsynth-0.2.2.ebuild 668
+MD5 cbe7a2696a633c1e89dd94258048ae14 qsynth-0.2.3.ebuild 664
+MD5 e534e89bdfcd9e314da29d1b607b646e qsynth-0.2.4.ebuild 684
diff --git a/media-sound/qsynth/metadata.xml b/media-sound/qsynth/metadata.xml
index ea12fab7b274..e70dd2ba42f6 100644
--- a/media-sound/qsynth/metadata.xml
+++ b/media-sound/qsynth/metadata.xml
@@ -5,4 +5,12 @@
 <maintainer>
   <email>sound@gentoo.org</email>
   </maintainer>
+<longdescription>
+QSynth is a fluidsynth GUI front-end application written in C++ around the
+Qt3 toolkit using Qt Designer. Eventually it may evolve into a softsynth
+management application allowing the user to control and manage a variety of
+command line softsynth but for the moment it wraps the excellent FluidSynth.
+FluidSynth is a command line software synthesiser based on the Soundfont
+specification.
+</longdescription>
 </pkgmetadata>
diff --git a/media-sound/qsynth/qsynth-0.1.0.ebuild b/media-sound/qsynth/qsynth-0.1.0.ebuild
index 9e38c8a8ddb9..e946034bb6e4 100644
--- a/media-sound/qsynth/qsynth-0.1.0.ebuild
+++ b/media-sound/qsynth/qsynth-0.1.0.ebuild
@@ -1,22 +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/media-sound/qsynth/qsynth-0.1.0.ebuild,v 1.1 2004/01/15 01:57:17 wmertens Exp $ 
-
-IUSE=""
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qsynth/qsynth-0.1.0.ebuild,v 1.1.1.1 2005/11/30 09:38:21 chriswhite Exp $
 
 DESCRIPTION="A Qt application to control FluidSynth"
 HOMEPAGE="http://qsynth.sf.net/"
 SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
-RESTRICT="nomirror"
-
 LICENSE="GPL-2"
+
 SLOT="0"
-KEYWORDS="x86"
+IUSE=""
+KEYWORDS="x86 ~amd64"
 
-DEPEND="virtual/glibc
-	>=x11-libs/qt-3.1.1
+DEPEND="virtual/libc
+	=x11-libs/qt-3*
 	media-sound/fluidsynth"
 
+src_compile() {
+	addwrite ${QTDIR}/etc/settings
+	econf || die
+	emake || die
+}
+
 src_install () {
 	einstall || die "make install failed"
+	dodoc AUTHORS ChangeLog README TODO
 }
diff --git a/media-sound/qsynth/qsynth-0.2.1.ebuild b/media-sound/qsynth/qsynth-0.2.1.ebuild
index 0083f4b337d3..493c52ee5792 100644
--- a/media-sound/qsynth/qsynth-0.2.1.ebuild
+++ b/media-sound/qsynth/qsynth-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/media-sound/qsynth/qsynth-0.2.1.ebuild,v 1.1 2004/06/20 15:53:01 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qsynth/qsynth-0.2.1.ebuild,v 1.1.1.1 2005/11/30 09:38:21 chriswhite Exp $
 
 DESCRIPTION="A Qt application to control FluidSynth"
 HOMEPAGE="http://qsynth.sf.net/"
@@ -9,10 +9,10 @@ LICENSE="GPL-2"
 
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64 ~ppc"
 
-DEPEND="virtual/glibc
-	>=x11-libs/qt-3.1.1
+DEPEND="virtual/libc
+	=x11-libs/qt-3*
 	media-sound/fluidsynth"
 
 src_compile() {
@@ -23,5 +23,5 @@ src_compile() {
 
 src_install () {
 	einstall || die "make install failed"
-	dodoc AUTHORS COPYING ChangeLog README TODO
+	dodoc AUTHORS ChangeLog README TODO
 }
diff --git a/media-sound/qsynth/qsynth-0.2.2.ebuild b/media-sound/qsynth/qsynth-0.2.2.ebuild
index 7d3fa8b29c0c..622aa84c3250 100644
--- a/media-sound/qsynth/qsynth-0.2.2.ebuild
+++ b/media-sound/qsynth/qsynth-0.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/media-sound/qsynth/qsynth-0.2.2.ebuild,v 1.1 2004/11/26 19:33:59 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qsynth/qsynth-0.2.2.ebuild,v 1.1.1.1 2005/11/30 09:38:21 chriswhite Exp $
 
 DESCRIPTION="A Qt application to control FluidSynth"
 HOMEPAGE="http://qsynth.sf.net/"
@@ -12,7 +12,7 @@ IUSE=""
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 DEPEND="virtual/libc
-	>=x11-libs/qt-3.1.1
+	=x11-libs/qt-3*
 	media-sound/fluidsynth"
 
 src_compile() {
@@ -23,5 +23,5 @@ src_compile() {
 
 src_install () {
 	einstall || die "make install failed"
-	dodoc AUTHORS COPYING ChangeLog README TODO
+	dodoc AUTHORS ChangeLog README TODO
 }
diff --git a/media-sound/qsynth/qsynth-0.2.3.ebuild b/media-sound/qsynth/qsynth-0.2.3.ebuild
index bdc73e5bbd8a..c975f243f8d1 100644
--- a/media-sound/qsynth/qsynth-0.2.3.ebuild
+++ b/media-sound/qsynth/qsynth-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/media-sound/qsynth/qsynth-0.2.3.ebuild,v 1.1 2005/07/11 18:42:07 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qsynth/qsynth-0.2.3.ebuild,v 1.1.1.1 2005/11/30 09:38:21 chriswhite Exp $
 
 DESCRIPTION="A Qt application to control FluidSynth"
 HOMEPAGE="http://qsynth.sf.net/"
@@ -9,10 +9,10 @@ LICENSE="GPL-2"
 
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 
 DEPEND="virtual/libc
-	>=x11-libs/qt-3.1.1
+	=x11-libs/qt-3*
 	media-sound/fluidsynth"
 
 src_compile() {
@@ -23,5 +23,5 @@ src_compile() {
 
 src_install () {
 	einstall || die "make install failed"
-	dodoc AUTHORS COPYING ChangeLog README TODO
+	dodoc AUTHORS ChangeLog README TODO
 }
diff --git a/media-sound/qsynth/qsynth-0.2.4.ebuild b/media-sound/qsynth/qsynth-0.2.4.ebuild
index f95fa3171ea5..9e811f816849 100644
--- a/media-sound/qsynth/qsynth-0.2.4.ebuild
+++ b/media-sound/qsynth/qsynth-0.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/media-sound/qsynth/qsynth-0.2.4.ebuild,v 1.1 2005/11/06 06:42:04 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qsynth/qsynth-0.2.4.ebuild,v 1.1.1.1 2005/11/30 09:38:21 chriswhite Exp $
 
 DESCRIPTION="A Qt application to control FluidSynth"
 HOMEPAGE="http://qsynth.sf.net/"
diff --git a/media-sound/quark/ChangeLog b/media-sound/quark/ChangeLog
index e6fef46f96c9..df9b44e89ecb 100644
--- a/media-sound/quark/ChangeLog
+++ b/media-sound/quark/ChangeLog
@@ -1,9 +1,26 @@
 # ChangeLog for media-sound/quark
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/quark/ChangeLog,v 1.1 2003/10/10 02:31:09 tseng Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/quark/ChangeLog,v 1.1.1.1 2005/11/30 09:38:15 chriswhite Exp $
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> quark-3.21.ebuild:
+  Mark 3.21 stable on alpha
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> quark-3.21.ebuild:
+  Stable on ppc.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> quark-3.21.ebuild:
+  Stable amd64, sparc.
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> quark-3.21.ebuild:
+  Added to ~amd64
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> quark-3.21.ebuild:
+  Added DOCS.  Added to ~amd64.
+
+  19 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> quark-3.21.ebuild:
+  fixed dep.  bump to stable x86
 
 *quark-3.21 (09 Oct 2003)
 
-  09 Oct 2003; ,,, <brandon@gentoo.org> quark-3.21.ebuild:
+  09 Oct 2003; Brandon Hale <tseng@gentoo.org> quark-3.21.ebuild:
   Initial commit.
-
diff --git a/media-sound/quark/Manifest b/media-sound/quark/Manifest
index d8e158bd9317..4c9bc1c70da5 100644
--- a/media-sound/quark/Manifest
+++ b/media-sound/quark/Manifest
@@ -1,4 +1,4 @@
-MD5 0b0b15e1ff802b8f55c4642612c6028d quark-3.21.ebuild 648
 MD5 0df263a4967cf403af5ac1b936ad8212 metadata.xml 246
-MD5 58937299826c271c88359402e19ce0fd ChangeLog 231
+MD5 f9ce994ef9a1553564ec53d5d317c915 ChangeLog 924
+MD5 f26ea2d3500d9f6b34955eebd7e6c413 quark-3.21.ebuild 804
 MD5 1e33c8d5bb524f68369ad64a2c7e0933 files/digest-quark-3.21 62
diff --git a/media-sound/quark/quark-3.21.ebuild b/media-sound/quark/quark-3.21.ebuild
index a583f891c96d..6332803ff649 100644
--- a/media-sound/quark/quark-3.21.ebuild
+++ b/media-sound/quark/quark-3.21.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/media-sound/quark/quark-3.21.ebuild,v 1.1 2003/10/10 02:31:09 tseng Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/quark/quark-3.21.ebuild,v 1.1.1.1 2005/11/30 09:38:15 chriswhite Exp $
+
+IUSE=""
 
 inherit gnome2
 
@@ -8,16 +10,17 @@ DESCRIPTION="Quark is the Anti-GUI Music Player with a cool Docklet!"
 SRC_URI="http://quark.nerdnest.org/${P}.tar.gz"
 HOMEPAGE="http://quark.nerdnest.org/"
 SLOT="0"
-IUSE=""
 
-KEYWORDS="~x86 ~ppc ~alpha ~sparc"
+KEYWORDS="alpha amd64 ppc sparc x86"
 
 LICENSE="GPL-2"
 
-DEPEND=">=xine-lib-1_beta10
-		>=gtk+-2.2.1
-		>=gconf-2.2.0
-		>=gnome-vfs-2.0.4-r2"
+DEPEND=">=media-libs/xine-lib-1_beta10
+	>=x11-libs/gtk+-2.2.1
+	>=gnome-base/gconf-2.2.0
+	>=gnome-base/gnome-vfs-2.0.4-r2"
+
+DOCS="AUTHORS README"
 
 pkg_postinst () {
 	einfo Quark is an anti-gui music player.
diff --git a/media-sound/quodlibet/ChangeLog b/media-sound/quodlibet/ChangeLog
index 9308dfd6d353..5150b7e961b2 100644
--- a/media-sound/quodlibet/ChangeLog
+++ b/media-sound/quodlibet/ChangeLog
@@ -1,6 +1,46 @@
 # ChangeLog for media-sound/quodlibet
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/ChangeLog,v 1.1 2004/11/09 02:14:53 pkdawson Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/ChangeLog,v 1.1.1.1 2005/11/30 09:38:01 chriswhite Exp $
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> quodlibet-0.11-r1.ebuild:
+  Added to ~ppc.
+
+*quodlibet-0.11-r1 (04 Jun 2005)
+
+  04 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org> -quodlibet-0.11.ebuild,
+  +quodlibet-0.11-r1.ebuild:
+  Install files into correct prefix and generate extensions, fixes #92423.
+
+*quodlibet-0.11 (28 May 2005)
+
+  28 May 2005; Jan Brinkmann <luckyduck@gentoo.org> -quodlibet-0.3.ebuild,
+  -quodlibet-0.4.ebuild, quodlibet-0.8.1.ebuild, +quodlibet-0.11.ebuild:
+  Dont make use of the deprecated oggvorbis useflag any longer, see #94254.
+  Added new upstream release, fixes #88463. Updated HOMEPAGE.
+
+  14 May 2005; Jason Wever <weeve@gentoo.org> quodlibet-0.8.1.ebuild:
+  Added ~sparc keyword.
+
+  17 Feb 2005; Michael Sterrett <mr_bones_@gentoo.org> quodlibet-0.8.1.ebuild:
+  sparc needs deps first
+
+  12 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  quodlibet-0.8.1.ebuild:
+  Using virtualx eclass since make needs X for the PyGTK check.
+
+*quodlibet-0.8.1 (12 Feb 2005)
+
+  12 Feb 2005; Patrick Dawson <pkdawson@gentoo.org> +quodlibet-0.8.1.ebuild:
+  Version bump.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  quodlibet-0.4.ebuild:
+  Added to -amd64 and ~sparc.
+
+*quodlibet-0.4 (12 Nov 2004)
+
+  12 Nov 2004; Patrick Dawson <pkdawson@gentoo.org> +quodlibet-0.4.ebuild:
+  Version bump.
 
 *quodlibet-0.3 (08 Nov 2004)
 
diff --git a/media-sound/quodlibet/Manifest b/media-sound/quodlibet/Manifest
index 379e66a50b14..037e775994ea 100644
--- a/media-sound/quodlibet/Manifest
+++ b/media-sound/quodlibet/Manifest
@@ -1,2 +1,6 @@
-MD5 ad671a5c2cb682a102d7c7f24a425450 quodlibet-0.3.ebuild 620
-MD5 f78ed0c8cfe30c7bcda6902f1f0cbd33 files/digest-quodlibet-0.3 64
+MD5 224dd94c4157e17bfa3cd9f374900df8 ChangeLog 1669
+MD5 08aa57227627a54ee75b0fb5d484e67d metadata.xml 255
+MD5 b906c1d119f5c9880216246b5b9ae7a9 quodlibet-0.8.1.ebuild 801
+MD5 80b6e1e0c43599a4b17d8b92e18ca3a9 quodlibet-0.11-r1.ebuild 867
+MD5 12f4c8a30285076702d5b683fd400068 files/digest-quodlibet-0.8.1 67
+MD5 704b13a70e462cea62a9f57f66a7330e files/digest-quodlibet-0.11-r1 66
diff --git a/media-sound/quodlibet/quodlibet-0.11-r1.ebuild b/media-sound/quodlibet/quodlibet-0.11-r1.ebuild
index b4e99b4d7df8..0d9061343833 100644
--- a/media-sound/quodlibet/quodlibet-0.11-r1.ebuild
+++ b/media-sound/quodlibet/quodlibet-0.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/media-sound/quodlibet/quodlibet-0.11-r1.ebuild,v 1.1 2005/06/04 11:09:29 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/quodlibet-0.11-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:01 chriswhite Exp $
 
 inherit virtualx
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.sacredchao.net/~piman/software/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~sparc ~x86"
+KEYWORDS="~ppc ~sparc ~x86"
 IUSE="alsa mad vorbis"
 
 DEPEND=">=virtual/python-2.3
diff --git a/media-sound/quodlibet/quodlibet-0.8.1.ebuild b/media-sound/quodlibet/quodlibet-0.8.1.ebuild
index 3989b73a293c..65ce4ec7a3b4 100644
--- a/media-sound/quodlibet/quodlibet-0.8.1.ebuild
+++ b/media-sound/quodlibet/quodlibet-0.8.1.ebuild
@@ -1,25 +1,30 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/quodlibet-0.8.1.ebuild,v 1.1 2005/02/12 06:08:18 pkdawson Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/quodlibet-0.8.1.ebuild,v 1.1.1.1 2005/11/30 09:38:01 chriswhite Exp $
+
+inherit virtualx
 
 DESCRIPTION="Quod Libet is a new kind of audio player."
-HOMEPAGE="http://www.sacredchao.net/~piman/software/quodlibet.shtml"
+HOMEPAGE="http://www.sacredchao.net/quodlibet"
 SRC_URI="http://www.sacredchao.net/~piman/software/${P}.tar.gz"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
-# -amd64: Error on start: OverflowError: signed integer is greater than maximum
-KEYWORDS="-amd64 ~sparc ~x86"
-IUSE="mad oggvorbis alsa"
+KEYWORDS="~sparc ~x86"
+IUSE="alsa mad vorbis"
 
 DEPEND=">=virtual/python-2.3
 	>=dev-python/pygtk-2.4.1
-	oggvorbis? ( dev-python/pyvorbis )
+	alsa? ( dev-python/pyao )
 	mad? ( dev-python/pymad
 		dev-python/pyid3lib )
-	alsa? ( dev-python/pyao )"
+	vorbis? ( dev-python/pyvorbis )"
+
+src_compile() {
+	Xemake || die "make failed"
+}
 
 src_install() {
-	make DESTDIR=${D} install || die
+	Xmake DESTDIR=${D} install || die "make install failed"
 	dodoc TODO README NEWS
 }
diff --git a/media-sound/rat/ChangeLog b/media-sound/rat/ChangeLog
index 7c64bc3a6f17..df8d9ef393c9 100644
--- a/media-sound/rat/ChangeLog
+++ b/media-sound/rat/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-sound/rat
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rat/ChangeLog,v 1.1 2003/08/10 03:43:00 jje Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rat/ChangeLog,v 1.1.1.1 2005/11/30 09:38:09 chriswhite Exp $
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> rat-4.2.25.ebuild:
+  Added to ~ppc.
+
+*rat-4.2.25 (22 Nov 2004)
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> +rat-4.2.25.ebuild:
+  Version bump.  Added to ~sparc.
+
+  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> rat-4.2.23.ebuild:
+  Stable on x86.
 
 *rat-4.2.23 (10 Aug 2003)
 
diff --git a/media-sound/rat/Manifest b/media-sound/rat/Manifest
index 0b0add0efee1..80dc638559f2 100644
--- a/media-sound/rat/Manifest
+++ b/media-sound/rat/Manifest
@@ -1,2 +1,6 @@
-MD5 aa8255d1d255d493443dcf9495f6db07 rat-4.2.23.ebuild 688
+MD5 aaff8ecda4e915d87871c7cb82369217 ChangeLog 620
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 2013e1b8719e75a5ef29e369a874ff0f rat-4.2.23.ebuild 1100
+MD5 1a698340dc3dad8a95d3dd006497ebdf rat-4.2.25.ebuild 1192
 MD5 e4b7fa79338ba90af15ad97fb3fe07b3 files/digest-rat-4.2.23 63
+MD5 003664d231513f28367b0b56c1a1e1eb files/digest-rat-4.2.25 62
diff --git a/media-sound/rat/rat-4.2.23.ebuild b/media-sound/rat/rat-4.2.23.ebuild
index 93d4aa54959c..5737cdc7e920 100644
--- a/media-sound/rat/rat-4.2.23.ebuild
+++ b/media-sound/rat/rat-4.2.23.ebuild
@@ -1,17 +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/media-sound/rat/rat-4.2.23.ebuild,v 1.1 2003/08/10 03:43:00 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rat/rat-4.2.23.ebuild,v 1.1.1.1 2005/11/30 09:38:09 chriswhite Exp $
 
 DESCRIPTION="Robust Audio Tool for audio conferencing and streaming"
 HOMEPAGE="http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/"
 SRC_URI="http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/releases/${PV}/${P}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 DEPEND="=dev-lang/tcl-8.3*
 	=dev-lang/tk-8.3*"
-RDEPEND="sys-apps/gawk"
+
+RDEPEND="${DEPEND}
+	 sys-apps/gawk"
 
 src_compile() {
 	cd ${S}/common
@@ -31,7 +33,7 @@ src_install() {
 	dobin rat-4.2.23
 	dobin rat-4.2.23-ui
 	dobin rat-4.2.23-media
-	dodoc COPYRIGHT MODS README README.IXJ README.WB-ADPCM README.debug 
+	dodoc COPYRIGHT MODS README README.IXJ README.WB-ADPCM README.debug
 	dodoc README.devices README.files README.g728 README.gsm
 	dodoc README.mbus README.playout README.reporting-bugs
 	dodoc README.settings README.timestamps README.voxlet VERSION
diff --git a/media-sound/rat/rat-4.2.25.ebuild b/media-sound/rat/rat-4.2.25.ebuild
index 23073498ae04..5c00196b5256 100644
--- a/media-sound/rat/rat-4.2.25.ebuild
+++ b/media-sound/rat/rat-4.2.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/media-sound/rat/rat-4.2.25.ebuild,v 1.1 2004/11/23 04:39:57 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rat/rat-4.2.25.ebuild,v 1.1.1.1 2005/11/30 09:38:09 chriswhite Exp $
 
 IUSE=""
 
@@ -10,7 +10,7 @@ SRC_URI="http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/releases/${PV}/${P
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~sparc ~x86"
+KEYWORDS="~ppc ~sparc ~x86"
 
 DEPEND="=dev-lang/tcl-8.4*
 	=dev-lang/tk-8.4*"
diff --git a/media-sound/rawrec/ChangeLog b/media-sound/rawrec/ChangeLog
index 4f8584690873..8578bbd8dafa 100644
--- a/media-sound/rawrec/ChangeLog
+++ b/media-sound/rawrec/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for media-sound/rawrec
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rawrec/ChangeLog,v 1.1 2003/06/26 16:15:28 robh Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rawrec/ChangeLog,v 1.1.1.1 2005/11/30 09:38:24 chriswhite Exp $
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> rawrec-0.9.98.ebuild:
+  Mark 0.9.98 stable on alpha
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> rawrec-0.9.98.ebuild:
+  Stable amd64, sparc.
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> rawrec-0.9.98.ebuild:
+  Added to ~amd64
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> rawrec-0.9.98.ebuild:
+  virtual/glibc -> virtual/libc
+
+  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> rawrec-0.9.98.ebuild:
+  Changed SRC_URI to mirror.  Stable in x86.
 
 *rawrec-0.9.98 (26 Jun 2003)
 
diff --git a/media-sound/rawrec/Manifest b/media-sound/rawrec/Manifest
index 703a2ded9765..e56cb928be5d 100644
--- a/media-sound/rawrec/Manifest
+++ b/media-sound/rawrec/Manifest
@@ -1,2 +1,4 @@
-MD5 69625a6b8ce552f3e004cbf713d88347 rawrec-0.9.98.ebuild 570
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 e8a11a10a67eda714715d18bbba10ce5 ChangeLog 899
+MD5 7faf35c0f5122daead9cd0e1e1775e16 rawrec-0.9.98.ebuild 677
 MD5 9a9b3932bcd486757dbc1b613317e4e9 files/digest-rawrec-0.9.98 64
diff --git a/media-sound/rawrec/rawrec-0.9.98.ebuild b/media-sound/rawrec/rawrec-0.9.98.ebuild
index fc77faf94aad..e28f64d6cf48 100644
--- a/media-sound/rawrec/rawrec-0.9.98.ebuild
+++ b/media-sound/rawrec/rawrec-0.9.98.ebuild
@@ -1,27 +1,28 @@
-# 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/media-sound/rawrec/rawrec-0.9.98.ebuild,v 1.1 2003/06/26 16:15:28 robh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rawrec/rawrec-0.9.98.ebuild,v 1.1.1.1 2005/11/30 09:38:24 chriswhite Exp $
+
+IUSE=""
 
 DESCRIPTION="CLI program to play and record audiofiles."
 HOMEPAGE="http://rawrec.sourceforge.net/"
-SRC_URI="http://switch.dl.sourceforge.net/sourceforge/rawrec/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/rawrec/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-IUSE=""
-DEPEND="virtual/glibc"
-S=${WORKDIR}/${P}
+KEYWORDS="alpha amd64 ~ppc sparc x86"
+DEPEND="virtual/libc"
+
+S=${S}/src
 
 src_compile() {
-	cd src
 	make || die
 }
 
 src_install() {
-	cd src
 	make EXE_DIR=${D}/usr/bin \
 	MAN_DIR=${D}/usr/share/man/man1 install || die
-		
+
 	einfo "Removing SUID from binary.."
 	chmod u-s ${D}/usr/bin/rawrec
 }
diff --git a/media-sound/rcenter/ChangeLog b/media-sound/rcenter/ChangeLog
index 34e81ca4ee2d..6d53c86ddfa3 100644
--- a/media-sound/rcenter/ChangeLog
+++ b/media-sound/rcenter/ChangeLog
@@ -1,8 +1,37 @@
-# ChangeLog for media-sound/rcenter 
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rcenter/ChangeLog,v 1.1 2003/03/25 21:00:38 drobbins Exp $
+# ChangeLog for media-sound/rcenter
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rcenter/ChangeLog,v 1.1.1.1 2005/11/30 09:38:23 chriswhite Exp $
 
-# Written By Bowyakka (aka Greg Bowyer)
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  rcenter-0.6.2.ebuild:
+  -sparc.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> rcenter-0.6.2.ebuild:
+  Stable amd64.
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> rcenter-0.6.2.ebuild:
+  Added to ~amd64.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> rcenter-0.6.1.ebuild,
+  rcenter-0.6.2.ebuild:
+  virtual/glibc -> virtual/libc
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> rcenter-0.6.2.ebuild:
+  Added IUSE.
+
+  19 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> rcenter-0.6.1.ebuild,
+  rcenter-0.6.2.ebuild:
+  fixed dep.  bump to stable x86
+
+*rcenter-0.6.2 (10 Aug 2003)
+
+  10 Aug 2003; jje <jje@gentoo.org> :
+  Version bump.
+
+  Submitted by: Greg Bowyer <bowyakka@hotmail.com>
 
 *rcenter-0.6.1 (10 Nov 2002)
 
diff --git a/media-sound/rcenter/Manifest b/media-sound/rcenter/Manifest
index e69de29bb2d1..dc4901693b95 100644
--- a/media-sound/rcenter/Manifest
+++ b/media-sound/rcenter/Manifest
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d3e1ce28df92f4512f409b634fcaa56b ChangeLog 1308
+MD5 d91fc2f2a5b4f78918df0177073b3a67 files/digest-rcenter-0.6.1 61
+MD5 6790502f59c4408e720ca91ed8b44353 files/digest-rcenter-0.6.2 61
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 1932def153bad1f7712905a247a182f7 rcenter-0.6.1.ebuild 970
+MD5 84a3583d5caa5e264eb629d9a41bb8f0 rcenter-0.6.2.ebuild 1106
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCz/ugI1lqEGTUzyQRAtA1AKCOD1/MREeSVfXAs0yx1dXRCGM0RgCfc1Ol
+y3y6iTh0LaSeFuIspIxWai0=
+=FQuR
+-----END PGP SIGNATURE-----
diff --git a/media-sound/rcenter/rcenter-0.6.1.ebuild b/media-sound/rcenter/rcenter-0.6.1.ebuild
index 93888105e59c..512ac114bfff 100644
--- a/media-sound/rcenter/rcenter-0.6.1.ebuild
+++ b/media-sound/rcenter/rcenter-0.6.1.ebuild
@@ -1,18 +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/media-sound/rcenter/rcenter-0.6.1.ebuild,v 1.1 2003/03/25 21:00:38 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rcenter/rcenter-0.6.1.ebuild,v 1.1.1.1 2005/11/30 09:38:23 chriswhite Exp $
 
 DESCRIPTION="Rcenter - A program to control the EMU10K Remote Control"
 HOMEPAGE="http://rooster.stanford.edu/~ben/projects/rcenter.php"
 SRC_URI="http://rooster.stanford.edu/~ben/projects/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
-DEPEND=""
-# ONLY the emu10k1 drivers are tested . May work with alsa 
-RDEPEND="emu10k1"
-S=${WORKDIR}/${P}
+DEPEND="virtual/libc"
 
 src_compile() {
 	emake || die
@@ -23,13 +20,13 @@ src_install() {
 	dobin rcenter
 	dodir /usr/share/rcenter
 	cp -R config ${D}/usr/share/rcenter/
-	dodoc HISTORY LICENSE README 	
+	dodoc HISTORY LICENSE README
 }
 
 pkg_postinst() {
 	einfo "Rcenter Installed  - However You need to setup the scripts"
 	einfo "for making remote control commands actually work"
-	einfo " "
+	einfo
 	einfo "The Skel scripts can be copied from /usr/share/rcenter/config to <user>/.rcenter"
 	einfo "Where <user> is a person who will use rcenter"
 }
diff --git a/media-sound/rcenter/rcenter-0.6.2.ebuild b/media-sound/rcenter/rcenter-0.6.2.ebuild
index 270dba12c24d..b17806a8e344 100644
--- a/media-sound/rcenter/rcenter-0.6.2.ebuild
+++ b/media-sound/rcenter/rcenter-0.6.2.ebuild
@@ -1,18 +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/media-sound/rcenter/rcenter-0.6.2.ebuild,v 1.1 2003/08/10 03:56:29 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rcenter/rcenter-0.6.2.ebuild,v 1.1.1.1 2005/11/30 09:38:23 chriswhite Exp $
+
+IUSE=""
 
 DESCRIPTION="Rcenter - A program to control the EMU10K Remote Control"
 HOMEPAGE="http://rooster.stanford.edu/~ben/projects/rcenter.php"
 SRC_URI="http://rooster.stanford.edu/~ben/projects/${P}.tgz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-DEPEND=""
-# ONLY the emu10k1 drivers are tested . May work with alsa 
-RDEPEND="emu10k1"
-S=${WORKDIR}/${P}
+#-sparc: emu10k1 doesn't get recognized on sparc hardware
+KEYWORDS="amd64 -sparc x86"
+
+DEPEND="virtual/libc"
 
 src_compile() {
 	emake || die
@@ -23,13 +24,13 @@ src_install() {
 	dobin rcenter
 	dodir /usr/share/rcenter
 	cp -R config ${D}/usr/share/rcenter/
-	dodoc HISTORY LICENSE README 	
+	dodoc HISTORY LICENSE README
 }
 
 pkg_postinst() {
 	einfo "Rcenter Installed  - However You need to setup the scripts"
 	einfo "for making remote control commands actually work"
-	einfo " "
+	einfo
 	einfo "The Skel scripts can be copied from /usr/share/rcenter/config to <user>/.rcenter"
 	einfo "Where <user> is a person who will use rcenter"
 	einfo "Remeber to use emu-config -i to turn on the remote"
diff --git a/media-sound/rexima/ChangeLog b/media-sound/rexima/ChangeLog
index 6e31902f0c9f..cc5957971ae2 100644
--- a/media-sound/rexima/ChangeLog
+++ b/media-sound/rexima/ChangeLog
@@ -1,6 +1,30 @@
 # ChangeLog for media-sound/rexima
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rexima/ChangeLog,v 1.1 2003/07/19 04:06:16 jje Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rexima/ChangeLog,v 1.1.1.1 2005/11/30 09:38:46 chriswhite Exp $
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> rexima-1.4.ebuild:
+  Stable sparc.
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> rexima-1.4.ebuild:
+  Added to ~sparc.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> rexima-1.4.ebuild:
+  Stable amd64.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> rexima-1.4.ebuild:
+  virtual/glibc -> virtual/libc
+
+  28 May 2004; Danny van Dyk <kugelfang@gentoo.org> rexima-1.4.ebuild:
+  Marked ~amd64.
+
+  04 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> rexima-1.4.ebuild:
+  ${PN}-${PV} -> ${P}
+
+  04 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> rexima-1.4.ebuild:
+  removed incorrect S (bug #46788); use sed -i; IUSE; error messages; tidy
+
+  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> rexima-1.4.ebuild:
+  Removed explicot S=.  Stable x86.
 
 *rexima-1.4 (19 Jul 2003)
 
diff --git a/media-sound/rexima/Manifest b/media-sound/rexima/Manifest
index 92b29d5cdb8d..1528f592cc47 100644
--- a/media-sound/rexima/Manifest
+++ b/media-sound/rexima/Manifest
@@ -1,2 +1,14 @@
-MD5 a1a3b213f4280edd230a24629f7aacd6 rexima-1.4.ebuild 760
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9a80d0f4c8203605c13404f3a18439f3 ChangeLog 1217
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 4649b1cd0387b9a5bc54030d105a4929 rexima-1.4.ebuild 806
 MD5 3515b3d720d665d6e3df47ac7f173429 files/digest-rexima-1.4 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBxR6IArHZZzCEUG0RAmAgAKCAZ/z8iWQxw0Wmawug348HZ8uviACff1of
+ghsEx1XJn3VOFth4kg+tPuw=
+=zvg8
+-----END PGP SIGNATURE-----
diff --git a/media-sound/rexima/rexima-1.4.ebuild b/media-sound/rexima/rexima-1.4.ebuild
index 56511a35f105..c51fc7858dd1 100644
--- a/media-sound/rexima/rexima-1.4.ebuild
+++ b/media-sound/rexima/rexima-1.4.ebuild
@@ -1,36 +1,31 @@
-# 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/media-sound/rexima/rexima-1.4.ebuild,v 1.1 2003/07/19 04:06:16 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rexima/rexima-1.4.ebuild,v 1.1.1.1 2005/11/30 09:38:46 chriswhite Exp $
+
+IUSE=""
 
-S=${WORKDIR}/${PN}
 DESCRIPTION="A curses-based interactive mixer which can also be used from the command-line."
 HOMEPAGE="http://rus.members.beeb.net/rexima.html"
-SRC_URI="ftp://ftp.ibiblio.org/pub/Linux/apps/sound/mixers/${PN}-${PV}.tar.gz"
-
-DEPEND="virtual/glibc
-	sys-libs/ncurses"
+SRC_URI="ftp://ftp.ibiblio.org/pub/Linux/apps/sound/mixers/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+
+RDEPEND="sys-libs/ncurses"
 
-S="${WORKDIR}/${P}"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
 
 src_compile() {
-	cd ${S}
-	mv Makefile Makefile.orig
-	cat Makefile.orig | sed "s%/usr/local%/usr%" > Makefile
-	emake || die
+	emake CFLAGS="${CFLAGS}" || die "emake failed"
 }
 
 src_install () {
-	cd ${S}
-	
 	make \
-		PREFIX=${D}/usr \
-		BINDIR=${D}/usr/bin \
-		MANDIR=${D}/usr/share/man \
-		install || die
-
-	dodoc COPYING NEWS README
+		PREFIX="${D}/usr" \
+		BINDIR="${D}/usr/bin" \
+		MANDIR="${D}/usr/share/man" \
+		install || die "make install failed"
+	dodoc NEWS README
 }
diff --git a/media-sound/rezound/ChangeLog b/media-sound/rezound/ChangeLog
index 7f08858bf31d..df47f79c4dff 100644
--- a/media-sound/rezound/ChangeLog
+++ b/media-sound/rezound/ChangeLog
@@ -1,6 +1,118 @@
 # ChangeLog for media-sound/rezound
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rezound/ChangeLog,v 1.1 2003/03/15 07:53:02 jje Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rezound/ChangeLog,v 1.1.1.1 2005/11/30 09:38:35 chriswhite Exp $
+
+  09 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  rezound-0.12.0_beta.ebuild:
+  Don't install INSTALL and ABOUT-NLS files.
+
+  28 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -rezound-0.11.1_beta.ebuild:
+  Dont make use of the deprecated oggvorbis useflag any longer, see #94254.
+
+  27 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  rezound-0.12.0_beta.ebuild:
+  0.12.0 stable on amd64 and x86 wrt #87584. 0.11.1 had problems with newer
+  fox versions
+
+*rezound-0.12.0_beta (21 May 2005)
+
+  21 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -rezound-0.10.0_beta.ebuild, rezound-0.11.1_beta.ebuild,
+  +rezound-0.12.0_beta.ebuild:
+  new upstream version. 0.11.1_beta stable on amd64 and x86. some generall
+  cleanup. sampletype now controlled by a useflag, fixes #93405
+
+  23 Dec 2004; Michael Hanselmann <hansmi@gentoo.org>
+  +files/undefined-functions.patch, rezound-0.11.1_beta.ebuild:
+  Fixed bug #68268, a compilation error on ppc.
+
+*rezound-0.11.1_beta (16 Nov 2004)
+
+  16 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/rezound-0.9.0_beta-libfox1.2-code.patch.gz,
+  -files/rezound-0.9.0_beta-libfox1.2-makefiles.patch.gz,
+  rezound-0.10.0_beta.ebuild, +rezound-0.11.1_beta.ebuild,
+  -rezound-0.9.0_beta-r1.ebuild, -rezound-0.9.0_beta.ebuild:
+  0.10 stable x86.  Version bump now with alsa support.
+
+  19 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> :
+  Removing old versions.
+
+  22 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  rezound-0.10.0_beta.ebuild:
+  Added to ~amd64.
+
+*rezound-0.10.0_beta (15 Aug 2004)
+
+  15 Aug 2004; <frank@gentoo.org> +rezound-0.10.0_beta.ebuild:
+  Version bump to 0.10.0_beta thanks to Stefan Briesenick <sbriesen@gmx.de>.
+  Closes bug #59041.
+
+  23 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  rezound-0.9.0_beta-r1.ebuild:
+  Moving auto* out of RDEPEND.
+
+  29 Jun 2004; David Holm <dholm@gentoo.org> rezound-0.9.0_beta-r1.ebuild:
+  Added to ~ppc.
+
+*rezound-0.9.0_beta-r1 (28 Jun 2004)
+
+  28 Jun 2004; Frank van de Pol <fvdpol@gentoo.org>
+  +files/rezound-0.9.0_beta-libfox1.2-code.patch.gz,
+  +files/rezound-0.9.0_beta-libfox1.2-makefiles.patch.gz,
+  +rezound-0.9.0_beta-r1.ebuild:
+  Patched rezound 0.9beta to make it compatible with gcc3.3 and the new
+  libfox1.2 library. Closes bug #51857 and #54660.
+
+  13 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  rezound-0.8.3_beta-r2.ebuild, rezound-0.9.0_beta.ebuild:
+  Getting rid of virtual/jack.
+
+  25 Mar 2004; Martin Holzer <mholzer@gentoo.org> rezound-0.9.0_beta.ebuild:
+  fixing depend. see 45343
+
+  24 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  rezound-0.9.0_beta.ebuild:
+  ebuild cleanup for bug #45343.
+
+  16 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  rezound-0.7.0_beta.ebuild, rezound-0.8.3_beta-r2.ebuild,
+  rezound-0.9.0_beta.ebuild:
+  Removing old version which doesn't compile with gcc-3.3. Bumping newer
+  versions to stable x86.
+
+  27 Jan 2004; Nick Hadaway <raker@gentoo.org> rezound-*.ebuild:
+  Updated DEPEND to specify =dev-libs/fftw-2* as fftw3 breaks compiles.
+  See bug #39256
+
+*rezound-0.9.0_beta (19 Dec 2003)
+
+  19 Dec 2003; Martin Holzer <mholzer@gentoo.org> rezound-0.7.0_beta.ebuild,
+  rezound-0.8.3_beta-r2.ebuild, rezound-0.9.0_beta.ebuild:
+  Version bumped and added RESTRICT=nomirror
+
+*rezound-0.8.3_beta-r2 (29 Sep 2003)
+
+  29 Sep 2003; jje <jje@gentoo.org> rezound-0.8.3_beta-r1.ebuild,
+  rezound-0.8.3_beta-r2.ebuild, rezound-0.8.3_beta.ebuild:
+  Add flac-1.1.0 to DEPEND. Clean up of old ebuilds.
+
+*rezound-0.8.3_beta-r1 (16 Aug 2003)
+
+  16 Aug 2003; jje <jje@gentoo.org> rezound-0.8.3_beta-r1.ebuild:
+  Checking jack USE appropriately.
+
+  07 Aug 2003; Martin Holzer <mholzer@gentoo.org> rezound-0.7.0_beta.ebuild,
+  rezound-0.8.3_beta.ebuild:
+  Changed SRC_URI to use mirror://sf. Closes #26134.
+
+*rezound-0.8.3_beta (05 Aug 2003)
+
+  05 Aug 2003; jje <jje@gentoo.org> rezound-0.8.3_beta.ebuild:
+  Version bump.
+  
+  Submitted by: Janne Johansson <hanta@aktivist.fi>
 
 *rezound-0.7.0_beta (15 Mar 2003)
 
diff --git a/media-sound/rezound/Manifest b/media-sound/rezound/Manifest
index e69de29bb2d1..479f55e81bd6 100644
--- a/media-sound/rezound/Manifest
+++ b/media-sound/rezound/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 bdf9c2b6b2caa86db95c525b576af421 ChangeLog 4394
+MD5 44f0e2e19d5fba62154e7a685f8b8d8e rezound-0.12.0_beta.ebuild 2085
+MD5 d0d7ea03e238a808414b4426394c100f metadata.xml 221
+MD5 3bc1175bcfa6d88bbe86f84556db560c files/undefined-functions.patch 1084
+MD5 eaabd57938c6ccc9beb2a34516dd6da6 files/digest-rezound-0.12.0_beta 71
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDIYvkj5H05b2HAEkRAsmzAJ9CkFGdAJ3xr8AMU5Ju+KrvxOT9qwCfb0Yb
+ZQmHsu9AFQYlS7t5hCZ2pz8=
+=TgpK
+-----END PGP SIGNATURE-----
diff --git a/media-sound/rezound/rezound-0.12.0_beta.ebuild b/media-sound/rezound/rezound-0.12.0_beta.ebuild
index 1ab72f25d6cc..cd5dcb2b55ff 100644
--- a/media-sound/rezound/rezound-0.12.0_beta.ebuild
+++ b/media-sound/rezound/rezound-0.12.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/media-sound/rezound/rezound-0.12.0_beta.ebuild,v 1.1 2005/05/21 09:38:00 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rezound/rezound-0.12.0_beta.ebuild,v 1.1.1.1 2005/11/30 09:38:35 chriswhite Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="16bittmp alsa flac jack nls oss portaudio soundtouch vorbis"
 
 RDEPEND="virtual/x11
@@ -70,9 +70,7 @@ src_install() {
 
 	# remove wrong doc directory
 	rm -rf ${D}/usr/doc/${PN}
-	# install docs manually, but don't install
-	# COPYING, since this is obsolete ($LICENCE is enough)
-	dodoc ABOUT-NLS docs/{AUTHORS,*INSTALL,NEWS,README*}
+	dodoc docs/{AUTHORS,NEWS,README*}
 	dodoc docs/{TODO_FOR_USERS_TO_READ,*.txt}
 
 	docinto code
diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index 28c30d95987e..80bb756c8046 100644
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,7 +1,208 @@
 # ChangeLog for media-sound/rhythmbox
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.1 2002/06/01 16:30:35 spider Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.1.1.1 2005/11/30 09:38:45 chriswhite Exp $
 
-*rhythmbox-0.2.1 (1 Jun 2002)
-  1 Jun 2002; Spider <spider@gentoo.org> rhythmbox-0.2.1.ebuild ChangeLog: 
-  A media thingie that mimics iTunes for Gnome2 
+  26 Sep 2005; <dang@gentoo.org> +files/rhythmbox-0.8.8-empty-xlib.patch,
+  rhythmbox-0.8.8-r1.ebuild:
+  Fix empty xlibs. Bug #91707
+
+  27 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  rhythmbox-0.8.8-r1.ebuild:
+  Stable on sparc
+
+  29 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  rhythmbox-0.8.8-r1.ebuild:
+  To ~sparc
+
+  28 May 2005; Jan Brinkmann <luckyduck@gentoo.org> -rhythmbox-0.8.5.ebuild,
+  rhythmbox-0.8.8-r1.ebuild:
+  Dont make use of the deprecated oggvorbis useflag any longer, see #94254.
+
+  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  rhythmbox-0.8.8-r1.ebuild:
+  Stable on ppc.
+
+  30 Jan 2005; lanius@gentoo.org rhythmbox-0.8.8-r1.ebuild:
+  stable on amd64
+
+  14 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  rhythmbox-0.8.5.ebuild, rhythmbox-0.8.8-r1.ebuild:
+  Changed USE flag to aac.
+
+*rhythmbox-0.8.8-r1 (03 Nov 2004)
+
+  03 Nov 2004; foser <foser@gentoo.org> rhythmbox-0.8.8-r1.ebuild :
+  Add ipod crasher fix (#68651)
+
+*rhythmbox-0.8.8 (12 Oct 2004)
+
+  12 Oct 2004; foser <foser@gentoo.org> rhythmbox-0.8.8.ebuild :
+  New release
+  Add a little patch to provide shorten support (though this isn't available as plugin)
+
+*rhythmbox-0.8.7 (02 Oct 2004)
+
+  02 Oct 2004; Yi Qiang <khai@gentoo.org> rhythmbox-0.8.7.ebuild:
+  Forgot to reset keywords
+
+  30 Sep 2004; Yi Qiang <khai@gentoo.org> rhythmbox-0.8.0.ebuild:
+  New version (you can stop complaining now)
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  rhythmbox-0.8.5.ebuild:
+  Stable amd64.
+
+  14 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  rhythmbox-0.8.5.ebuild:
+  -sparc
+
+*rhythmbox-0.8.5 (12 Jul 2004)
+
+  12 Jul 2004; foser <foser@gentoo.org> rhythmbox-0.8.5.ebuild :
+  Add faad support (m4a), closes bug #51529
+
+*rhythmbox-0.8.3 (05 May 2004)
+
+  05 May 2004; foser <foser@gentoo.org> rhythmbox-0.8.3.ebuild :
+  New release (requested in #49664)
+
+*rhythmbox-0.8.1 (25 Apr 2004)
+
+  25 Apr 2004; foser <foser@gentoo.org> rhythmbox-0.8.1.ebuild :
+  New release
+  Drop xine backend support, because it is not maintained in gentoo
+  Add faad support
+
+  21 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  rhythmbox-0.6.8.ebuild:
+  Inherit eutils.
+
+*rhythmbox-0.8.0-r1 (20 Apr 2004)
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  rhythmbox-0.8.0-r1.ebuild, rhythmbox-0.8.0.ebuild:
+  Fixed DEPs. Other ebuild cleanup per foser's request. Bump due to
+  gst-plugins-ogg DEP being added.
+
+*rhythmbox-0.8.0 (16 Apr 2004)
+
+  16 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  rhythmbox-0.8.0.ebuild:
+  Version Bump.
+
+  15 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  rhythmbox-0.6.1-r1.ebuild, rhythmbox-0.6.8.ebuild:
+  Filter out -ffast-math.  Closes bug #47183.
+
+  03 Apr 2004; foser <foser@gentoo.org> rhythmbox-0.6.{1,8}.ebuild :
+  Fix gst deps
+
+  28 Mar 2004; <liquidx@gentoo.org> rhythmbox-0.6.8.ebuild:
+  install schemas manually (#45417)
+
+  18 Mar 2004; L. Boshell <leonardop@gentoo.org> rhythmbox-0.6.5.ebuild:
+  Inherit from eutils.
+
+  06 Mar 2004; foser <foser@gentoo.org> rhythmbox-0.6.8.ebuild :
+  Fixed flac switch, so it now actually works the way it should
+  Had to fix deps & configure switch usage accordingly
+
+*rhythmbox-0.6.8 (06 Mar 2004)
+
+  06 Mar 2004; Alastair Tse <liquidx@gentoo.org> rhythmbox-0.6.3.ebuild,
+  rhythmbox-0.6.4.ebuild, rhythmbox-0.6.5.ebuild, rhythmbox-0.6.7.ebuild:
+  this time we fix the amd64 patch as well.
+
+  06 Mar 2004; foser <foser@gentoo.org> rhythmbox-0.6.8.ebuild :
+  new release
+
+*rhythmbox-0.6.7 (06 Mar 2004)
+
+  06 Mar 2004; Alastair Tse <liquidx@gentoo.org> rhythmbox-0.6.7.ebuild:
+  version bump (#43158)
+
+  25 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> rhythmbox-0.6.5.ebuild:
+  Adding patch from upstream submitted by Benjamin Schindler <config@gmx.ch> in
+  #41509.
+
+  12 Feb 2004; L. Boshell <leonardop@gentoo.org> rhythmbox-0.6.5.ebuild,
+  files/rhythmbox-0.6.5-gcc2_fix.patch:
+  Added patch to make it compile with gcc-2.
+
+*rhythmbox-0.6.5 (22 Jan 2004)
+
+  22 Jan 2004; <spider@gentoo.org> rhythmbox-0.6.5.ebuild:
+  New release
+
+*rhythmbox-0.6.4 (12 Jan 2003)
+
+  12 Jan 2003; foser <foser@gentoo.org> rhythmbox-0.6.4.ebuild :
+  New release
+
+*rhythmbox-0.6.3 (23 Dec 2003)
+
+  23 Dec 2003; foser <foser@gentoo.org> rhythmbox-0.6.3.ebuild :
+  New release
+
+*rhythmbox-0.6.2 (20 Dec 2003)
+
+  20 Dec 2003; foser <foser@gentoo.org> rhythmbox-0.6.2.ebuild :
+  New release
+  up xine-lib dep to rc3 (http://mail.gnome.org/archives/rhythmbox-devel/2003-December/msg00132.html)
+
+*rhythmbox-0.6.1-r1 (25 Nov 2003)
+
+  25 Nov 2003; foser <foser@gentoo.org> rhythmbox-0.6.1-r1.ebuild :
+  Add mp4 support by faad USE flag and dependency
+
+*rhythmbox-0.6.1 (22 Nov 2003)
+
+  22 Nov 2003; <spider@gentoo.org> rhythmbox-0.6.1.ebuild:
+  Versionbump
+
+  20 Nov 2003; Luca Barbato <lu_zero@gentoo.org> rhythmbox-0.6.0.ebuild:
+  Marked ~ppc
+
+*rhythmbox-0.6.0 (15 Nov 2003)
+
+  15 Nov 2003; foser <foser@gentoo.org> rhythmbox-0.6.0.ebuild :
+  New release
+
+*rhythmbox-0.5.4 (30 Oct 2003)
+
+  30 Oct 2003; foser <foser@gentoo.org> rhythmbox-0.5.4.ebuild :
+  New version, minor deps cleanup
+  Limit buildjobs to 1 to avoid breakage
+
+*rhythmbox-0.5.3 (09 Sep 2003)
+
+  13 Oct 2003; foser <foser@gentoo.org> rhythmbox-0.5.3.ebuild :
+  add scrollkeeper dep (#30911)
+
+  06 Oct 2003; foser <foser@gentoo.org> rhythmbox-0.5.3.ebuild :
+  Added local USE flag for flac support
+
+  21 Sep 2003; foser <foser@gentoo.org> rhythmbox-0.5.3.ebuild :
+  Added ORBit2 fix as suggested by TGL <degrenier@easyconnect.fr> in (#28739)
+  Always regenerate orbit stubs
+
+  12 Sep 2003; foser <foser@gentoo.org> rhythmbox-0.5.3.ebuild :
+  Fix gst-plugins-* deps, they moved
+
+  09 Sep 2003; foser <foser@gentoo.org> rhythmbox-0.5.3.ebuild :
+  New version, adapted to new gst-plugins eclass
+  Added mad, oggvorbis and xine (local) USE 
+  Taken dep hint from 27688 and omf fix provided by Obz
+
+*rhythmbox-0.5.1 (19 Aug 2003)
+
+  19 Aug 2003; Nick Hadaway <raker@gentoo.org> rhythmbox-0.5.1.ebuild:
+  Version bump and added gstreamer support into the build along with a
+  big fat warning if gstreamer isn't in USE. :)
+
+*rhythmbox-0.5.0 (17 Aug 2003)
+
+  17 Aug 2003; Nick Hadaway <raker@gentoo.org> rhythmbox-0.5.0.ebuild:
+  New ebuild.  See bug #26789 for the plea.  gstreamer support will
+  be added in once gst-plugins-{vorbis,cdparanois} are unmasked and
+  the mad plugin is added to portage.
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index 6d8168ee1f26..d9042d2621c1 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,2 +1,17 @@
-MD5 da5e3b7db94edd274ab142d7a042f686 rhythmbox-0.5.0.ebuild 722
-MD5 ab865b430e07f028d861503a1669dc97 files/digest-rhythmbox-0.5.0 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ff60c2d320a8e0e8e55bfac395f77eb3 rhythmbox-0.8.8-r1.ebuild 2636
+MD5 2f257514868cffde4127ec0a91c6b8b8 ChangeLog 6557
+MD5 e854b7f54a4de6256186cbdcaabbc1ec metadata.xml 200
+MD5 a3ff016aec5eec7277e2598ad013b80a files/rhythmbox-0.8.8-empty-xlib.patch 496
+MD5 44a42f72ca8c0f3136fded12f1aa7172 files/digest-rhythmbox-0.8.8-r1 69
+MD5 7c49ce1b3d4a78dc9adba805fd3b82fb files/rhythmbox-0.8.7-gst_shn_support.patch 665
+MD5 9f5bc9bf255b78cc67342f9fc9423ef6 files/rhythmbox-0.8.8-ipod.patch 809
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDOBSyomPajV0RnrERAmn7AJwKgal4GSL17xedlAMOwkgSxra7/ACfaPzO
+ensEewP7qKviwi3waIPd4KA=
+=3E3A
+-----END PGP SIGNATURE-----
diff --git a/media-sound/rhythmbox/metadata.xml b/media-sound/rhythmbox/metadata.xml
index b016c18b5446..9f3d1e271607 100644
--- a/media-sound/rhythmbox/metadata.xml
+++ b/media-sound/rhythmbox/metadata.xml
@@ -3,4 +3,5 @@
 <pkgmetadata>
 <herd>gnome</herd>
 <herd>sound</herd>
+<herd>gstreamer</herd>
 </pkgmetadata>
diff --git a/media-sound/rhythmbox/rhythmbox-0.8.8-r1.ebuild b/media-sound/rhythmbox/rhythmbox-0.8.8-r1.ebuild
index 31393e2e77fe..ac6d984bb160 100644
--- a/media-sound/rhythmbox/rhythmbox-0.8.8-r1.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.8.8-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/media-sound/rhythmbox/rhythmbox-0.8.8-r1.ebuild,v 1.1 2004/11/03 14:42:20 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.8.8-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:45 chriswhite Exp $
 
 inherit gnome2 eutils
 
@@ -8,10 +8,9 @@ DESCRIPTION="Music management and playback software for GNOME"
 HOMEPAGE="http://www.rhythmbox.org/"
 LICENSE="GPL-2"
 
-#-sparc: 0.8.5: Fails with "Illegal Instruction" when you try playing a file.
-KEYWORDS="~x86 ~ppc ~amd64 -sparc"
-#IUSE="oggvorbis xine flac faad mad pda"
-IUSE="oggvorbis flac faad mad pda"
+KEYWORDS="x86 ppc amd64 sparc"
+#IUSE="vorbis xine flac aac mad pda"
+IUSE="vorbis flac aac mad pda"
 SLOT="0"
 
 RDEPEND=">=x11-libs/gtk+-2.2.2
@@ -21,23 +20,23 @@ RDEPEND=">=x11-libs/gtk+-2.2.2
 	>=gnome-base/libbonobo-2
 	>=media-libs/gst-plugins-0.8.2
 	>=media-plugins/gst-plugins-gnomevfs-0.8.2
-	oggvorbis? ( >=media-plugins/gst-plugins-vorbis-0.8.2
+	vorbis? ( >=media-plugins/gst-plugins-vorbis-0.8.2
 	             >=media-plugins/gst-plugins-ogg-0.8.2 )
 	mad? ( >=media-plugins/gst-plugins-mad-0.8.2 )
 	flac? ( >=media-plugins/gst-plugins-flac-0.8.2 )
-	faad? ( >=media-plugins/gst-plugins-faad-0.8.2 )"
+	aac? ( >=media-plugins/gst-plugins-faad-0.8.2 )"
 
 #	!xine? ( =media-libs/gst-plugins-0.8*
 #		=media-plugins/gst-plugins-gnomevfs-0.8*
-#		oggvorbis? ( =media-plugins/gst-plugins-vorbis-0.8*
+#		vorbis? ( =media-plugins/gst-plugins-vorbis-0.8*
 #		             =media-plugins/gst-plugins-ogg-0.8* )
 #		mad? ( =media-plugins/gst-plugins-mad-0.8* )
 #		flac? ( =media-plugins/gst-plugins-flac-0.8* ) 
-#		faad? ( =media-plugins/gst-plugins-faad-0.8* ) )
-#	xine? ( faad? ( >=media-libs/faad2-2.0_rc3 )
+#		aac? ( =media-plugins/gst-plugins-faad-0.8* ) )
+#	xine? ( aac? ( >=media-libs/faad2-2.0_rc3 )
 #		flac? ( >=media-libs/flac-1
 #			>=media-libs/libid3tag-0.15.0b )
-#		oggvorbis? ( >=media-libs/libvorbis-1 )
+#		vorbis? ( >=media-libs/libvorbis-1 )
 #		mad? ( >=media-libs/libid3tag-0.15.0b )
 #		>=media-libs/xine-lib-1_rc3 )"
 
@@ -55,10 +54,10 @@ MAKEOPTS="${MAKEOPTS} -j1"
 G2CONF="${G2CONF} --with-player=gstreamer --with-metadata=gstreamer"
 
 G2CONF="${G2CONF} \
-	$(use_enable oggvorbis vorbis) \
+	$(use_enable vorbis) \
 	$(use_enable flac) \
 	$(use_enable mad mp3) \
-	$(use_enable faad mp4) \
+	$(use_enable aac mp4) \
 	$(use_enable pda ipod) \
 	--enable-mmkeys \
 	--enable-audiocd \
@@ -82,5 +81,8 @@ src_unpack()
 	epatch ${FILESDIR}/${PN}-0.8.7-gst_shn_support.patch
 	# fix ipod crasher
 	epatch ${FILESDIR}/${P}-ipod.patch
+	# Fix empty X libs. Bug #91707
+	epatch ${FILESDIR}/${P}-empty-xlib.patch
 
+	autoconf || die "Autoconf failed"
 }
diff --git a/media-sound/rip-l/ChangeLog b/media-sound/rip-l/ChangeLog
index e44df72dc88d..12aff9ac6a5c 100644
--- a/media-sound/rip-l/ChangeLog
+++ b/media-sound/rip-l/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for media-sound/rip-l
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rip-l/ChangeLog,v 1.1 2005/01/15 11:19:09 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rip-l/ChangeLog,v 1.1.1.1 2005/11/30 09:38:29 chriswhite Exp $
 
 *rip-l-0.4 (15 Jan 2005)
 
diff --git a/media-sound/rip-l/Manifest b/media-sound/rip-l/Manifest
index 38f9c08e3906..a48e90548838 100644
--- a/media-sound/rip-l/Manifest
+++ b/media-sound/rip-l/Manifest
@@ -1,5 +1,5 @@
-MD5 d82fc2f8101c3e80346ae2c2508991c2 rip-l-0.4.ebuild 956
-MD5 200d24d0766f20bf1c762a1d401cf8e5 ChangeLog 336
+MD5 c2fc76ad41149c9ae83869d792564987 rip-l-0.4.ebuild 957
+MD5 210394ab24c063424f657f2501931e50 ChangeLog 427
 MD5 5b9146e2600347edb44e3340f23d0910 metadata.xml 494
 MD5 9f393150a87623cec80ef7915ffb9fbd files/0.4-gentoo.patch 755
 MD5 142db9df1f85553e78b499037022e8e0 files/digest-rip-l-0.4 60
diff --git a/media-sound/rip-l/rip-l-0.4.ebuild b/media-sound/rip-l/rip-l-0.4.ebuild
index 2bb2d4e4aa8e..22efc14220aa 100644
--- a/media-sound/rip-l/rip-l-0.4.ebuild
+++ b/media-sound/rip-l/rip-l-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/media-sound/rip-l/rip-l-0.4.ebuild,v 1.1 2005/01/15 11:19:09 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rip-l/rip-l-0.4.ebuild,v 1.1.1.1 2005/11/30 09:38:29 chriswhite Exp $
 
 inherit common-lisp eutils
 
diff --git a/media-sound/rip/ChangeLog b/media-sound/rip/ChangeLog
index 30faf0d7dc9c..a62a1d01d767 100644
--- a/media-sound/rip/ChangeLog
+++ b/media-sound/rip/ChangeLog
@@ -1,10 +1,65 @@
-# ChangeLog for dev-perl/CDDB_get
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rip/ChangeLog,v 1.1 2002/04/08 03:36:20 george Exp $
+# ChangeLog for media-sound/rip
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rip/ChangeLog,v 1.1.1.1 2005/11/30 09:37:50 chriswhite Exp $
+
+  28 May 2005; Diego Pettenò <flameeyes@gentoo.org> rip-1.07.ebuild:
+  Moved dependency to virtual/eject.
+
+  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> rip-1.07.ebuild:
+  Stable on ppc.
+
+  20 Dec 2004; Yuta SATOH <nigoro@gentoo.org> rip-1.07.ebuild:
+  added ~ppc64
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> rip-1.07.ebuild:
+  Stable sparc.
+
+  04 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> rip-1.07.ebuild:
+  Added to ~sparc.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> rip-1.01-r1.ebuild,
+  rip-1.07.ebuild:
+  Added IUSE.
+
+  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> rip-1.01-r1.ebuild,
+  rip-1.07.ebuild:
+  Removed explicit S=.
+
+  11 Mar 2004; Dylan Carlson <absinthe@gentoo.org> rip-1.07.ebuild:
+  Added amd64 to KEYWORDS.
+
+  01 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> rip-1.01-r1.ebuild,
+  rip-1.07.ebuild:
+  Version bump CDDB_get DEPEND to close bug #37172.
+
+  10 May 2003; George Shapovalov <george@gentoo.org> rip-1.07.ebuild :
+  added ~ppc to keywords since previous version had ppc there, 
+  as was requested by "minor" arch developers
+
+*rip-1.07 (08 May 2003)
+
+  08 May 2003; jje <jje@gentoo.org> rip-1.07.ebuild:
+  Version bump.
+
+  Submitted by: Frank Zschockelt <gentoo@freakysoft.de>
+
+*rip-1.01-r1 (11 Mar 2003)
+ 
+  12 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
 
 *rip-1.01 (7 Apr 2002)
 
+  04 Nov 2002; Seemant Kulleen <seemant@gentoo.org> rip-1.01-r1.ebuild :
+
+  Added sys-apps/eject to DEPEND, closing bug #10212 by h@haugland.gs (Helge
+  Haugland)
+
   7 Apr 2002; G. Shapovalov <george@gentoo.org> Changelog:
+  
+  28 Aug 2002; Calum Selkirk <cselkirk@gentoo.org> rip-1.01-r1 :
+
+  Added ppc to KEYWORDS.
 
   Initial release of this ebuild. Contains rip-1.01 and rip-1.01-r1
   rip-1.01.ebuild:
@@ -16,10 +71,3 @@
   	installs script only, necessary modules are installed separately and listed as RDEPEND
 
 
-  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.
diff --git a/media-sound/rip/Manifest b/media-sound/rip/Manifest
index 1b51aaa813a8..5c7bb75c0619 100644
--- a/media-sound/rip/Manifest
+++ b/media-sound/rip/Manifest
@@ -1,5 +1,16 @@
-MD5 9d381d69531b87f49eefc52e03ac7452 ChangeLog 962
-MD5 97487de343fcba6a653804abadcc12b7 rip-1.01-r1.ebuild 812
-MD5 792dec38015a3675f4a507a2d5280100 rip-1.07.ebuild 710
-MD5 6079edf2cba6cd4be440a12eca48f7ec files/digest-rip-1.07 60
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 70821429fed8c67bd41bec016fa32c90 ChangeLog 2341
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 69808ea2413caed8358b93544568f0f3 rip-1.01-r1.ebuild 794
+MD5 53cc9cf23a28436b28b3aaa09cfdb013 rip-1.07.ebuild 810
 MD5 5ff5f7a6e5370222da299fc32e4a0062 files/digest-rip-1.01-r1 60
+MD5 6079edf2cba6cd4be440a12eca48f7ec files/digest-rip-1.07 60
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCl8Wvj5H05b2HAEkRAjtcAKCh+GiedliSMCOGH7c8OK2HNN1OagCaAr2P
+XvSHGxOaP2u2cR0Aksj3nJY=
+=cTMw
+-----END PGP SIGNATURE-----
diff --git a/media-sound/rip/rip-1.01-r1.ebuild b/media-sound/rip/rip-1.01-r1.ebuild
index 90564f9ff3e0..d1d9ecb5a902 100644
--- a/media-sound/rip/rip-1.01-r1.ebuild
+++ b/media-sound/rip/rip-1.01-r1.ebuild
@@ -1,23 +1,25 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: George Shapovalov <georges@its.caltech.edu>
-# /space/gentoo/cvsroot/gentoo-x86/media-sound/rip/rip-1.01-r1.ebuild,v 1.4 2002/03/12 16:05:09 tod Exp
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rip/rip-1.01-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:51 chriswhite Exp $
 
+IUSE=""
 
-S="${WORKDIR}/${P}"
 DESCRIPTION="A command-line based audio CD ripper and mp3 encoder"
 SRC_URI="http://rip.sourceforge.net/download/${P}.tar.gz"
 HOMEPAGE="http://rip.sourceforge.net"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc"
+
 DEPEND=""
 
 RDEPEND="media-sound/cdparanoia
-	sys-devel/perl
-	>=dev-perl/CDDB_get-1.66
+	sys-apps/eject
+	dev-lang/perl
+	>=dev-perl/CDDB_get-2.10
 	>=dev-perl/MP3-Info-0.91"
 
-
-
 src_compile() {
 	#the thing itself is just a perl script
 	#so we need an empty method here
diff --git a/media-sound/rip/rip-1.07.ebuild b/media-sound/rip/rip-1.07.ebuild
index 62c355a1b917..5b2a1559b543 100644
--- a/media-sound/rip/rip-1.07.ebuild
+++ b/media-sound/rip/rip-1.07.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/media-sound/rip/rip-1.07.ebuild,v 1.1 2003/05/08 11:10:08 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rip/rip-1.07.ebuild,v 1.1.1.1 2005/11/30 09:37:50 chriswhite Exp $
+
+IUSE=""
 
-S="${WORKDIR}/${P}"
 DESCRIPTION="A command-line based audio CD ripper and mp3 encoder"
 SRC_URI="http://rip.sourceforge.net/download/${P}.tar.gz"
 HOMEPAGE="http://rip.sourceforge.net"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="amd64 ppc ~ppc64 sparc x86"
 
 DEPEND=""
 
 RDEPEND="media-sound/cdparanoia
-	sys-apps/eject
+	virtual/eject
 	dev-lang/perl
-	>=dev-perl/CDDB_get-1.66
+	>=dev-perl/CDDB_get-2.10
 	>=dev-perl/MP3-Info-0.91"
 
 src_compile() {
diff --git a/media-sound/ripperx/ChangeLog b/media-sound/ripperx/ChangeLog
index 8de2833c3f9c..dd5729a6eb35 100644
--- a/media-sound/ripperx/ChangeLog
+++ b/media-sound/ripperx/ChangeLog
@@ -1,6 +1,87 @@
 # ChangeLog for media-sound/ripperx
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ripperx/ChangeLog,v 1.1 2002/05/20 00:28:55 rphillips Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ripperx/ChangeLog,v 1.1.1.1 2005/11/30 09:38:37 chriswhite Exp $
+
+*ripperx-2.6.6 (19 Sep 2005)
+
+  19 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -files/ripperx-2.3-gcc34.patch, -ripperx-2.3.ebuild,
+  -ripperx-2.6.1.ebuild, +ripperx-2.6.6.ebuild:
+  Version bump for bug 95771. Thanks to Rossen Apostolov <rossen at protein
+  dot osaka-u dot ac dot jp>. Also, removing old ebuilds.
+
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> ripperx-2.3.ebuild,
+  ripperx-2.6.1.ebuild, ripperx-2.6.4.ebuild:
+  Don't install COPYING and INSTALL files.
+
+  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> ripperx-2.6.4.ebuild:
+  Stable on ppc.
+
+  21 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/ripperx-2.3-gcc34.patch, ripperx-2.3.ebuild:
+  added gcc3.4 patch for 2.3, fixes #74766
+
+*ripperx-2.6.4 (19 Jan 2005)
+
+  19 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/ripperx-2.6.4-wrapper, +ripperx-2.6.4.ebuild:
+  version bump. added wrapper script, thanks to: James Le Cuirot
+  <chewi@ffaura.com>. fixes bug #78440.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ripperx-2.6.1.ebuild:
+  Stable amd64, sparc.
+
+  04 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ripperx-2.6.1.ebuild:
+  Added to ~sparc.
+
+  15 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ripperx-2.6.1.ebuild, +files/ripperx-2.6.1-gcc34.patch:
+  Added patch to compile with gcc-3.4 from rigelf@postmark.net in bug #62578.
+  Added to ~amd64.
+
+  15 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -ripperx-2.4.ebuild, -ripperx-2.5.ebuild, -ripperx-2.6.0.ebuild:
+  Cleaning out old versions.
+
+  25 Aug 2004; Sven Wegener <swegener@gentoo.org> ripperx-2.3.ebuild:
+  Changed SRC_URI to use mirror:// syntax.
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> ripperx-2.3.ebuild,
+  ripperx-2.4.ebuild, ripperx-2.5.ebuild, ripperx-2.6.0.ebuild,
+  ripperx-2.6.1.ebuild:
+  Typo in DESCRIPTION: enconde -> encode. Bug 59717.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> ripperx-2.3.ebuild,
+  ripperx-2.4.ebuild, ripperx-2.5.ebuild, ripperx-2.6.0.ebuild,
+  ripperx-2.6.1.ebuild:
+  Added IUSE.
+
+  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> ripperx-2.6.1.ebuild:
+  nomirror.  Stable on x86.
+
+*ripperx-2.6.1 (21 Jan 2004)
+
+  21 Jan 2004; Nick Hadaway <raker@gentoo.org> ripperx-2.6.1.ebuild:
+  Version bump and included the flac plugin as noted by Thomas Johnson
+  on bug #38557.
+
+*ripperx-2.6.0 (08 Oct 2003)
+
+  08 Oct 2003; Fitzgerald <gregf@gentoo.org> ripperx-2.6.0.ebuild:
+  Version bump.
+
+*ripperx-2.5 (14 feb 2003)
+
+  14 Feb 2003; Spider <spider@gentoo.org> :
+  Version bump.
+
+    
+*ripperx-2.4 (29 Oct 2002)
+
+  29 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump.
 
 *ripperx-2.3 (19 May 2002)
 
diff --git a/media-sound/ripperx/Manifest b/media-sound/ripperx/Manifest
index e69de29bb2d1..e46623283170 100644
--- a/media-sound/ripperx/Manifest
+++ b/media-sound/ripperx/Manifest
@@ -0,0 +1,8 @@
+MD5 82ed07e65b0c7eaa143184f76e0c3d32 ripperx-2.6.4.ebuild 1115
+MD5 3de0ddce3897b8db628b7aae51cc2aa2 ripperx-2.6.6.ebuild 1055
+MD5 f6fa06dd075f9433263f318ade5a490d ChangeLog 3333
+MD5 05ab4d4775083f0930841e415df18ad6 metadata.xml 160
+MD5 4a749204e0efd8e974e60aa87fd1d86f files/digest-ripperx-2.6.4 65
+MD5 b91a8a2d33b39e47da7e77aba4b765b2 files/digest-ripperx-2.6.6 65
+MD5 89f653a43ad3b4ec7559ff31bcbe361e files/ripperx-2.6.1-gcc34.patch 1886
+MD5 b15842d5d282af9b7f9da313c9a6a1f4 files/ripperx-2.6.4-wrapper 515
diff --git a/media-sound/ripperx/ripperx-2.6.4.ebuild b/media-sound/ripperx/ripperx-2.6.4.ebuild
index 4af5bc3b1d59..9034d628b7ca 100644
--- a/media-sound/ripperx/ripperx-2.6.4.ebuild
+++ b/media-sound/ripperx/ripperx-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/media-sound/ripperx/ripperx-2.6.4.ebuild,v 1.1 2005/01/19 15:44:19 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ripperx/ripperx-2.6.4.ebuild,v 1.1.1.1 2005/11/30 09:38:37 chriswhite Exp $
 
 IUSE=""
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/ripperx/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc sparc x86"
+KEYWORDS="amd64 ppc sparc x86"
 
 DEPEND="=x11-libs/gtk+-1.2*
 	media-sound/lame
@@ -22,7 +22,7 @@ DEPEND="=x11-libs/gtk+-1.2*
 	media-libs/flac"
 
 src_install () {
-	dodoc CHANGES COPYING FAQ INSTALL README* TODO
+	dodoc CHANGES FAQ README* TODO
 
 	into /usr
 	dobin src/ripperX plugins/ripperX_plugin-8hz-mp3 \
diff --git a/media-sound/ripperx/ripperx-2.6.6.ebuild b/media-sound/ripperx/ripperx-2.6.6.ebuild
index de320ff2def0..e27842c3cc0a 100644
--- a/media-sound/ripperx/ripperx-2.6.6.ebuild
+++ b/media-sound/ripperx/ripperx-2.6.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/media-sound/ripperx/ripperx-2.6.6.ebuild,v 1.1 2005/09/19 03:32:52 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ripperx/ripperx-2.6.6.ebuild,v 1.1.1.1 2005/11/30 09:38:37 chriswhite Exp $
 
 MY_P="${P/x/X}"
 S="${WORKDIR}/${MY_P}"
diff --git a/media-sound/rosegarden/ChangeLog b/media-sound/rosegarden/ChangeLog
index 01fe1d424235..e95d0992ef8a 100644
--- a/media-sound/rosegarden/ChangeLog
+++ b/media-sound/rosegarden/ChangeLog
@@ -1,9 +1,149 @@
 # ChangeLog for media-sound/rosegarden
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/ChangeLog,v 1.1 2003/03/01 14:39:16 jje Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/ChangeLog,v 1.1.1.1 2005/11/30 09:37:56 chriswhite Exp $
 
+  07 Jul 2005; Herbie Hopkins <herbs@gentoo.org> rosegarden-4.1.0-r1.ebuild:
+  Stable on amd64 wrt bug #96462.
+
+  07 Jul 2005; Gregorio Guidi <greg_g@gentoo.org>
+  rosegarden-4.1.0-r1.ebuild:
+  Stable on x86.
+
+  07 Jul 2005; Caleb Tennis <caleb@gentoo.org> rosegarden-4.0.9.8.ebuild,
+  rosegarden-4.0.9.91_rc2.ebuild, rosegarden-4.0.9.91.ebuild,
+  rosegarden-4.1.0.ebuild:
+  Fix qt dep
+
+  24 Jun 2005; Joseph Jezak <josejx@gentoo.org> rosegarden-4.1.0-r1.ebuild:
+  Marked ppc stable for bug #96462.
+
+  05 Jun 2005; Joseph Jezak <josejx@gentoo.org> rosegarden-4.0.9.8.ebuild:
+  Marked ppc stable.
+
+*rosegarden-4.1.0-r1 (20 Mar 2005)
+
+  20 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +rosegarden-4.1.0-r1.ebuild:
+  new ebuild for rosegarden, contributed by Carsten Lohrke <carlo@gentoo.org>.
+  fixes #86047
+
+  09 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> +files/4.1.0-dssi.patch,
+  rosegarden-4.1.0.ebuild:
+  Added a patch to fix a dssi related problem, closes #83168. Filtered out a
+  cflag which causes trouble, closes #84260. Fixed useflag related problem,
+  closes #82936
+
+*rosegarden-4.1.0 (19 Feb 2005)
+
+  19 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> +rosegarden-4.1.0.ebuild:
+  version bump. fixes #82108
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> rosegarden-4.0.9.8.ebuild,
+  rosegarden-4.0.9.91.ebuild, rosegarden-4.0.9.91_rc2.ebuild:
+  Changed dep on kdebase to accept kdebase-meta, the split 'meta' package.
+  This dep will be narrowed down in the future to the precise split packages
+  required.
+
+*rosegarden-4.0.9.91 (11 Jan 2005)
+
+  11 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +rosegarden-4.0.9.91.ebuild:
+  Version bump closes bug #74773.
+
+  23 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  rosegarden-4.0.9.91_rc2.ebuild:
+  Added to ~sparc.
+
+*rosegarden-4.0.9.91_rc2 (21 Nov 2004)
+
+  21 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -rosegarden-4.0.9.9.ebuild, +rosegarden-4.0.9.91_rc2.ebuild:
+  Version bump.
+
+  19 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -rosegarden-4.0.9.6.ebuild, -rosegarden-4.0.9.7.ebuild,
+  -rosegarden-4.0.9.ebuild:
+  Removing old versions.
+
+  30 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  rosegarden-4.0.9.9.ebuild:
+  Removed kdemultimedia from DEPEND per bug #64276.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  rosegarden-4.0.9.8.ebuild, rosegarden-4.0.9.9.ebuild:
+  Stable amd64.
+
+*rosegarden-4.0.9.9 (06 Aug 2004)
+
+  06 Aug 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/rosegarden-4.0.9.9-gcc34.patch, +files/rosegarden-4.0.9.9-pic.patch,
+  +rosegarden-4.0.9.9.ebuild:
+  Initial ebuild for 4.0.9.9. Still has compilation problems with C++
+  exceptions... In package.mask
+
+  13 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  rosegarden-4.0.9.8.ebuild:
+  Stable x86.
+
+  13 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  rosegarden-4.0.9.6.ebuild, rosegarden-4.0.9.7.ebuild,
+  rosegarden-4.0.9.8.ebuild, rosegarden-4.0.9.ebuild:
+  Getting rid of virtual/jack.
+
+*rosegarden-4.0.9.8 (08 Jun 2004)
+
+  08 Jun 2004; Nick Hadaway <raker@gentoo.org>
+  rosegarden-4.0.9.8.ebuild:
+  Version bump.  No ebuild changes required.
+
+  29 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  rosegarden-4.0.9.7.ebuild:
+  Stable x86.
+
+  28 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  rosegarden-4.0.9.7.ebuild:
+  Fixed with_use line.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  rosegarden-4.0.9.6.ebuild, rosegarden-4.0.9.ebuild:
+  Added IUSE.
+
+  16 Apr 2004; Travis Tilley <lv@gentoo.org> rosegarden-4.0.9.7.ebuild:
+  added ~amd64 keyword
+
+  01 Apr 2004; David Holm <dholm@gentoo.org> rosegarden-4.0.9.7.ebuild:
+  Added to ~ppc.
+
+*rosegarden-4.0.9.7 (30 Mar 2004)
+
+  30 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  rosegarden-4.0.9.7.ebuild:
+  Version bump closes bug #45773.
+
+*rosegarden-4.0.9.6 (25 Feb 2004)
+
+  25 Feb 2004; Caleb Tennis <caleb@gentoo.org> rosegarden-4.0.9.6.ebuild:
+  addwrite QTDIR/etc/settings to fix sandbox error
+  Mark x86 stable.
+
+*rosegarder-4.0.9.6 (24 Jan 2004)
+
+  24 Jan 2004; Nick Hadaway <raker@gentoo.org> rosegarder-4.0.9.6.ebuild:
+  Version bump.  See bug #38385.  Things appear to work marvelously in 
+  this new version.
+
+*rosegarden-4.0.9 (13 May 2003)
+
+  13 May 2003; jje <jje@gentoo.org> rosegarden-4.0.9.ebuild:
+  Version bump. Updated depends. Fixed ${P}.
+  16 May 2003; Thomas Raschbacher <lordvan@gentoo.org> rosegarden-4.0.9.ebuild:
+  just added IUSE=""
+	
 *rosegarden-4.0.8.5 (01 Mar 2003)
 
+  26 Mar 2003; Graham Forest <vladimir@gentoo.org> rosegarden-4.0.8.5.ebuild:
+  Automated cleanup of LICENSE
+
   01 Mar 2003; jje <jje@gentoo.org> rosegarden-4.0.8.5.ebuild files/digest-rosegarden-4.0.8.5 :
   Initial revision, unable to fully test as i don't have the midi hardware.
   
diff --git a/media-sound/rosegarden/Manifest b/media-sound/rosegarden/Manifest
index 442371927728..60c30257210d 100644
--- a/media-sound/rosegarden/Manifest
+++ b/media-sound/rosegarden/Manifest
@@ -1,5 +1,15 @@
-MD5 8b66f3b437897b11e51eea8e98594719 rosegarden-4.0.8.5.ebuild 1188
-MD5 7bed7649f4ae27506b6b130e9f1e682c ChangeLog 738
-MD5 c9612ae1bdd25640187eacdde4a3b91a rosegarden-4.0.9.ebuild 953
-MD5 7580abfe584f7d2263b69b844af1c613 files/digest-rosegarden-4.0.8.5 71
-MD5 26a35e75e25c5a2d2e000cdf1675662c files/digest-rosegarden-4.0.9 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9571d59a6a60cebeb4a5759f9320f3a0 ChangeLog 5062
+MD5 a59eb89ba41ea479834ca5694b0f5192 files/4.1.0-dssi.patch 514
+MD5 3cc3d030f6a95056ab3ece40cd427077 files/digest-rosegarden-4.1.0-r1 70
+MD5 c88092184926549fd28a504c79731af2 metadata.xml 256
+MD5 e2e971028a8082859d444083115c160c rosegarden-4.1.0-r1.ebuild 1424
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC1RydI1lqEGTUzyQRAkiFAKCkaY2crrgWSmxdZ5ihabOqlcbcNwCfcGTy
+JwKMBngROFwKV5NJrBjWPv0=
+=Sl34
+-----END PGP SIGNATURE-----
diff --git a/media-sound/rosegarden/rosegarden-4.1.0-r1.ebuild b/media-sound/rosegarden/rosegarden-4.1.0-r1.ebuild
index faa1915291e9..c5e02186b105 100644
--- a/media-sound/rosegarden/rosegarden-4.1.0-r1.ebuild
+++ b/media-sound/rosegarden/rosegarden-4.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/media-sound/rosegarden/rosegarden-4.1.0-r1.ebuild,v 1.1 2005/03/20 21:54:00 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/rosegarden-4.1.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:57 chriswhite Exp $
 
 inherit kde eutils flag-o-matic
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/rosegarden/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 
 DEPEND="arts? ( || ( kde-base/kdemultimedia-arts kde-base/kdemultimedia ) )
 	!arts? ( media-libs/alsa-lib
@@ -27,17 +27,17 @@ DEPEND="arts? ( || ( kde-base/kdemultimedia-arts kde-base/kdemultimedia ) )
 need-kde 3
 
 pkg_setup() {
-	echo ""
+	echo
 	if use arts ; then
 		einfo "aRts support enabled"
 		ewarn "ALSA support disabled, USE=-arts enables ALSA"
-		built_with_use arts jack && einfo "aRts was built with Jack support" \
+		built_with_use kde-base/arts jack && einfo "aRts was built with Jack support" \
 					|| ewarn "aRts wasn't built with Jack support"
 	else
 		einfo "ALSA support enabled"
 		use jack && einfo "Jack support enabled" || ewarn "Jack support disabled"
 	fi
-	echo ""
+	echo
 }
 
 src_unpack() {
diff --git a/media-sound/rplay/ChangeLog b/media-sound/rplay/ChangeLog
index bbb7081a6255..887384aa6b45 100644
--- a/media-sound/rplay/ChangeLog
+++ b/media-sound/rplay/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for media-sound/rplay
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rplay/ChangeLog,v 1.1 2003/07/03 16:41:32 taviso Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rplay/ChangeLog,v 1.1.1.1 2005/11/30 09:37:48 chriswhite Exp $
+
+  31 Jul 2004; Tom Gall <tgall@gentoo.org> rplay-3.3.2.ebuild:
+  stable on ppc64, bug #57040
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> rplay-3.3.2.ebuild:
+  virtual/glibc -> virtual/libc
+
+  01 Feb 2004; Jon Portnoy <avenj@gentoo.org> rplay-3.3.2.ebuild :
+  AMD64 keywords.
+
+  26 Dec 2003; Jason Wever <weeve@gentoo.org> rplay-3.3.2.ebuild:
+  Marked stable on sparc to fix broken x11-wm/fvwm dependencies.
+
+  26 Dec 2003; Tavis Ormandy <taviso@gentoo.org> rplay-3.3.2.ebuild:
+  fixing #36527
+  minor cleanup
+
+  30 Jul 2003; Tavis Ormandy <taviso@gentoo.org> rplay-3.3.2.ebuild:
+  marking stable
 
 *rplay-3.3.2 (03 Jul 2003)
 
diff --git a/media-sound/rplay/Manifest b/media-sound/rplay/Manifest
index 395a15be78a1..701692f5f588 100644
--- a/media-sound/rplay/Manifest
+++ b/media-sound/rplay/Manifest
@@ -1,2 +1,14 @@
-MD5 3771130703ec663007be61fba7163dc2 rplay-3.3.2.ebuild 680
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5badaa9244ffce750b4c2a58d5a07645 ChangeLog 948
+MD5 c727b60bfe795ea299da0f851f0d1985 metadata.xml 579
+MD5 e1b860b2d336ae0c30c1d544739a3b30 rplay-3.3.2.ebuild 977
 MD5 3b52329416a18c3974362573d2c4241f files/digest-rplay-3.3.2 128
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBibrUHTu7gpaalycRAkHhAJ9iRr1JnFnDHCnCm2g6Vh9vD9Of7wCgwTeG
+55WdYRHS5fFvj9/AspSwBUg=
+=uH9k
+-----END PGP SIGNATURE-----
diff --git a/media-sound/rplay/rplay-3.3.2.ebuild b/media-sound/rplay/rplay-3.3.2.ebuild
index c9f9e4f8acbb..e6249cb75378 100644
--- a/media-sound/rplay/rplay-3.3.2.ebuild
+++ b/media-sound/rplay/rplay-3.3.2.ebuild
@@ -1,41 +1,39 @@
-# 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/media-sound/rplay/rplay-3.3.2.ebuild,v 1.1 2003/07/03 16:41:32 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rplay/rplay-3.3.2.ebuild,v 1.1.1.1 2005/11/30 09:37:48 chriswhite Exp $
+
+inherit flag-o-matic eutils
 
 DESCRIPTION="Play sounds on remote Unix systems, without sending audio data over the network."
 HOMEPAGE="http://rplay.doit.org/"
-SRC_URI="http://rplay.doit.org/dist/${P}.tar.gz
-	http://ftp.debian.org/debian/pool/main/r/rplay/rplay_3.3.2-8.diff.gz"
+SRC_URI="http://rplay.doit.org/dist/${P}.tar.gz mirror://debian/pool/main/r/rplay/rplay_3.3.2-8.diff.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~alpha"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86"
 IUSE=""
-DEPEND="virtual/glibc"
-RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${P}
+DEPEND="virtual/libc"
 
 pkg_setup() {
 		enewgroup "rplayd" ""
 		enewuser "rplayd" "" "" "" "rplayd"
-}				
-	
+}
+
 src_unpack() {
-	unpack ${P}.tar.gz
-	epatch ${DISTDIR}/rplay_3.3.2-8.diff.gz
+	unpack ${A}
+	epatch ${WORKDIR}/rplay_3.3.2-8.diff
 }
 
 src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc \
+	# fixing #36527
+	append-flags -include errno.h
+
+	econf \
 		--enable-rplayd-user="rplayd" \
-		--enable-rplayd-group="rplayd" || die "./configure failed"
-		
+		--enable-rplayd-group="rplayd" \
+		|| die "./configure failed"
+
 	emake || die
 }
 
diff --git a/media-sound/saydate/ChangeLog b/media-sound/saydate/ChangeLog
index c76d19bcf4d2..bed9cb53c976 100644
--- a/media-sound/saydate/ChangeLog
+++ b/media-sound/saydate/ChangeLog
@@ -1,9 +1,27 @@
 # ChangeLog for media-sound/saydate
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/saydate/ChangeLog,v 1.1.1.1 2005/11/30 09:38:01 chriswhite Exp $
+
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> saydate-0.3.0.ebuild:
+  Don't install COPYING file.
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> saydate-0.3.0.ebuild:
+  Added to ~ppc.
+
+  18 Oct 2004; Tom Gall <tgall@gentoo.org> saydate-0.3.0.ebuild:
+  stable on ppc64, bug #64532
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> saydate-0.3.0.ebuild:
+  Stable amd64, sparc.
+
+  13 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> saydate-0.3.0.ebuild:
+  Added ~sparc and ~amd64.
 
 *saydate-0.3.0 (4 Nov 2002)
-  
+
+  22 Apr 2003; Brandon Low <lostlogic@gentoo.org> saydate-0.3.0.ebuild:
+  Change supersed dependencies
+
   4 Nov 2002; Matt Keadle <mkeadle@gentoo.org> saydate-0.3.0.ebuild :
 
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/media-sound/saydate/Manifest b/media-sound/saydate/Manifest
index 8e9fb285252c..3bf0a1799c5a 100644
--- a/media-sound/saydate/Manifest
+++ b/media-sound/saydate/Manifest
@@ -1,3 +1,14 @@
-MD5 cb4930be6ff94c4e962af207ccdf8425 saydate-0.3.0.ebuild 975
-MD5 c0f3cb4c944ba3cd042177339a626aa0 ChangeLog 473
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 256e2ef6c0211acbd7b98bf5da491251 ChangeLog 1060
+MD5 d7b97cc999ea18e4ee3cde66ba689b5e saydate-0.3.0.ebuild 958
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 c4baaa6336b4a210aca4200e1a51afad files/digest-saydate-0.3.0 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGtTOj5H05b2HAEkRAp7MAJ969jbXlIy8QHvyq8q2uye4dyWVIwCgj4P0
+aH2jPBwfRAgpDsRqTfuG770=
+=tK7m
+-----END PGP SIGNATURE-----
diff --git a/media-sound/saydate/saydate-0.3.0.ebuild b/media-sound/saydate/saydate-0.3.0.ebuild
index 9419dc8b5a15..799c00f0d7cf 100644
--- a/media-sound/saydate/saydate-0.3.0.ebuild
+++ b/media-sound/saydate/saydate-0.3.0.ebuild
@@ -1,34 +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/media-sound/saydate/saydate-0.3.0.ebuild,v 1.1 2002/11/04 23:33:37 mkeadle Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/saydate/saydate-0.3.0.ebuild,v 1.1.1.1 2005/11/30 09:38:01 chriswhite Exp $
 
 S=${WORKDIR}/${PN}
 DESCRIPTION="A Linux shell program that talks the date and system uptime."
 HOMEPAGE="http://unihedron.com/projects/saydate/saydate.php"
 SRC_URI="http://unihedron.com/projects/saydate/${P}.tar.gz"
-LICENSE="GPL2"
+LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
 
-DEPEND="sys-apps/supersed"
+KEYWORDS="amd64 ~ppc ppc64 sparc x86"
+
+DEPEND="=sys-apps/sed-4*"
 IUSE=""
 
 src_compile() {
-   einfo 'Nothing to compile'
+	einfo 'Nothing to compile'
 }
 
 src_install () {
-   insinto /usr/share/man/man1
-   doins ${S}/man/saydate.1.gz ${S}/man/au2raw.1.gz
-
-   dodir /usr/share/saydate
-   insinto /usr/share/saydate
-   doins ${S}/data/*.raw 
+	insinto /usr/share/man/man1
+	doins ${S}/man/saydate.1.gz ${S}/man/au2raw.1.gz
 
-   ssed -i "s:/dev/audio:/dev/dsp:" ${S}/saydate
-   ssed -i "s:/dev/audio:/dev/dsp:" ${S}/au2raw
-   ssed -i "s:/dev/audio:/dev/dsp:" ${S}/DESIGN
-   dodoc README TODO HISTORY DESIGN COPYING
-   dobin saydate au2raw
+	dodir /usr/share/saydate
+	insinto /usr/share/saydate
+	doins ${S}/data/*.raw
 
+	sed -i "s:/dev/audio:/dev/dsp:" ${S}/saydate
+	sed -i "s:/dev/audio:/dev/dsp:" ${S}/au2raw
+	sed -i "s:/dev/audio:/dev/dsp:" ${S}/DESIGN
+	dodoc README TODO HISTORY DESIGN
+	dobin saydate au2raw
 }
diff --git a/media-sound/scret/ChangeLog b/media-sound/scret/ChangeLog
index 0f64f8ec3a35..6c76885343f8 100644
--- a/media-sound/scret/ChangeLog
+++ b/media-sound/scret/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for media-sound/scret
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/scret/ChangeLog,v 1.1 2004/03/20 16:05:37 centic Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/scret/ChangeLog,v 1.1.1.1 2005/11/30 09:38:11 chriswhite Exp $
+
+  17 Mar 2005; Gregorio Guidi <greg_g@gentoo.org> scret-0.1.3.ebuild:
+  Stable on x86.
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> scret-0.1.3.ebuild:
+  Added to ~amd64
+
+  29 Jun 2004; Carsten Lohrke <carlo@gentoo.org> scret-0.1.3.ebuild:
+  QA: inherit kde-base -> inherit kde
+
+  21 Mar 2004; David Holm <dholm@gentoo.org> scret-0.1.3.ebuild:
+  Added to ~ppc.
 
 *scret-0.1.3 (20 Mar 2004)
 
diff --git a/media-sound/scret/Manifest b/media-sound/scret/Manifest
index af21198aa724..e6287ac52291 100644
--- a/media-sound/scret/Manifest
+++ b/media-sound/scret/Manifest
@@ -1,3 +1,4 @@
-MD5 4863f3652ddd58f3eb6325a4d3e5c3a3 scret-0.1.3.ebuild 409
-MD5 c23c631f4bfbc223ac1e94aafebc7109 files/digest-scret-0.1.2 78
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 31e17c6bba231281a37746de376e9ea5 scret-0.1.3.ebuild 506
+MD5 7ba3ced34a51af2db6661cbd9011c0a8 ChangeLog 758
 MD5 a7efdc40ec26e44bf093131c918d0b17 files/digest-scret-0.1.3 78
diff --git a/media-sound/scret/metadata.xml b/media-sound/scret/metadata.xml
index b435a8440ccd..8d1e86a9cefb 100644
--- a/media-sound/scret/metadata.xml
+++ b/media-sound/scret/metadata.xml
@@ -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/media-sound/scret/scret-0.1.3.ebuild b/media-sound/scret/scret-0.1.3.ebuild
index 9eb22b3affab..e4b0e8caa890 100644
--- a/media-sound/scret/scret-0.1.3.ebuild
+++ b/media-sound/scret/scret-0.1.3.ebuild
@@ -1,26 +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/media-sound/scret/scret-0.1.3.ebuild,v 1.1 2004/03/20 16:05:37 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/scret/scret-0.1.3.ebuild,v 1.1.1.1 2005/11/30 09:38:11 chriswhite Exp $
 
-inherit kde-base
-need-kde 3.1
+inherit kde
+
+S=${WORKDIR}/ScoreReadingTrainer-${PV}
 
 DESCRIPTION="A musical score reading trainer"
-SRC_URI="mirror://sourceforge/scret/ScoreReadingTrainer-${PV}.tar.bz2"
 HOMEPAGE="http://scret.sourceforge.net"
+SRC_URI="mirror://sourceforge/scret/ScoreReadingTrainer-${PV}.tar.bz2"
 
-S=${WORKDIR}/ScoreReadingTrainer-${PV}
-
+SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
-
+KEYWORDS="x86 ~ppc ~amd64"
 IUSE=""
-SLOT="0"
 
-DEPEND=""
+need-kde 3.1
 
-src_install() {
-	einstall || die
-	dodoc AUTHORS ChangeLog COPYING INSTALL README TODO || die
-}
 
diff --git a/media-sound/seq24/ChangeLog b/media-sound/seq24/ChangeLog
index 5ace71fadd67..94f4f5828a34 100644
--- a/media-sound/seq24/ChangeLog
+++ b/media-sound/seq24/ChangeLog
@@ -1,6 +1,93 @@
 # ChangeLog for media-sound/seq24
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/seq24/ChangeLog,v 1.1 2003/05/19 11:55:58 jje Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/seq24/ChangeLog,v 1.1.1.1 2005/11/30 09:38:26 chriswhite Exp $
+
+*seq24-0.7.0 (06 Nov 2005)
+
+  06 Nov 2005; MATSUU Takuto <matsuu@gentoo.org> -seq24-0.5.1.ebuild,
+  -seq24-0.6.0_rc3.ebuild, -seq24-0.6.0_rc5.ebuild, -seq24-0.6.0.ebuild,
+  -seq24-0.6.1.ebuild, -seq24-0.6.2.ebuild, seq24-0.6.3.ebuild,
+  +seq24-0.7.0.ebuild:
+  Version bumped. Bug 108736.
+  Marked 0.6.3 stable on x86.
+  Removed old versions.
+
+*seq24-0.6.3 (26 Mar 2005)
+
+  26 Mar 2005; Chris White <chriswhite@gentoo.org> +seq24-0.6.3.ebuild:
+  Version bump to 0.6.3.
+
+*seq24-0.6.2 (15 Mar 2005)
+
+  15 Mar 2005; Eric Shattow <jnc@gentoo.org> +seq24-0.6.2.ebuild:
+  Stable x86, version bump. Fixes segfault. Closing #85228.
+
+*seq24-0.6.1 (26 Feb 2005)
+
+  26 Feb 2005; Eric Shattow <jnc@gentoo.org> +seq24-0.6.1.ebuild:
+  Version bump. Closing bug #83108.
+
+*seq24-0.6.0 (16 Jan 2005)
+
+  16 Jan 2005; Frank van de Pol <fvdpol@gentoo.org> +seq24-0.6.0.ebuild:
+  Version bump. Closing #78193.
+
+*seq24-0.6.0_rc5 (09 Jan 2005)
+
+  09 Jan 2005; Eric Shattow <jnc@gentoo.org> +seq24-0.6.0_rc5.ebuild:
+  version bump. fix typo, allows jack functionality.
+
+  07 Jan 2005; Tony Vroon <chainsaw@gentoo.org> seq24-0.6.0_rc3.ebuild:
+  DEPEND update, closes bug #77015.
+
+*seq24-0.6.0_rc3 (06 Jan 2005)
+
+  06 Jan 2005; Frank van de Pol <fvdpol@gentoo.org> +seq24-0.6.0_rc3.ebuild:
+  Version bump. Closing #76614
+
+  29 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -seq24-0.4.3.ebuild, -seq24-0.4.4.ebuild, -seq24-0.5.0.ebuild:
+  Version bump.  Removing old versions.  0.5.2 stable on amd64 and x86.
+
+*seq24-0.5.2 (06 Sep 2004)
+
+  06 Sep 2004; Frank van de Pol <fvdpol@gentoo.org> +seq24-0.5.2.ebuild:
+  Version bump to 0.5.2. Closing #62608
+
+  03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> seq24-0.5.1.ebuild:
+  Stable amd64, x86.
+
+*seq24-0.5.1 (12 Jul 2004)
+
+  12 Jul 2004; Frank van de Pol <fvdpol@gentoo.org> +seq24-0.5.1.ebuild:
+  Version bump to new upstream release 0.5.1.
+
+  08 Jun 2004; David Holm <dholm@gentoo.org> seq24-0.5.0.ebuild:
+  Added to ~ppc.
+
+*seq24-0.5.0 (07 Jun 2004)
+
+  07 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org> seq24-0.5.0.ebuild:
+  Version bump closes bug #52811.
+
+  15 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> seq24-0.4.3.ebuild,
+  seq24-0.4.4.ebuild:
+  fix install.  closes bug #47476.
+
+  19 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> seq24-0.4.2.ebuild,
+  seq24-0.4.3.ebuild, seq24-0.4.4.ebuild:
+  fixed dep.  bump to stable x86
+
+*seq24-0.4.4 (10 Mar 2004)
+
+  10 Mar 2004; <torbenh@gentoo.org> seq24-0.4.3.ebuild, seq24-0.4.4.ebuild:
+  Version bump.
+  bumped 0.4.3 to stable
+
+*seq24-0.4.3 (05 Aug 2003)
+
+  05 Aug 2003; jje <jje@gentoo.org> seq24-0.4.3.ebuild:
+  Version bump.
 
 *seq24-0.4.2 (19 May 2003)
 
diff --git a/media-sound/seq24/Manifest b/media-sound/seq24/Manifest
index b6fbc75dbdf5..ea4021e2eb93 100644
--- a/media-sound/seq24/Manifest
+++ b/media-sound/seq24/Manifest
@@ -1,3 +1,10 @@
-MD5 2026ade84b8471ba51e2353a9b8069a0 seq24-0.4.2.ebuild 483
-MD5 edbd6707d08ceee7c88de3b5b8117136 ChangeLog 242
-MD5 fedfecceee5f903dfb230b366826b858 files/digest-seq24-0.4.2 63
+MD5 bcfa8cc39a07ad1f53f72485a6d8f418 ChangeLog 2961
+MD5 64b991e2ae9b837dd324dd2b17116eaa files/digest-seq24-0.5.2 63
+MD5 11614b7fc35306845045ba3410e424ef files/digest-seq24-0.5.3 63
+MD5 3d70106fe6008aa4451846d0dc6f43fc files/digest-seq24-0.6.3 63
+MD5 56ae11eef4203b25598969514993384d files/digest-seq24-0.7.0 63
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 19410b102a0cbcbe37f0a25559bd55ea seq24-0.5.2.ebuild 612
+MD5 f67c1ee670798be6756f562d66e219b6 seq24-0.5.3.ebuild 616
+MD5 ee18e51e4b9b8743daeb304f284d2a55 seq24-0.6.3.ebuild 732
+MD5 aa90e1e7805b099684314797026598a5 seq24-0.7.0.ebuild 756
diff --git a/media-sound/seq24/seq24-0.5.2.ebuild b/media-sound/seq24/seq24-0.5.2.ebuild
index 6cc9fc63cfa1..e70b38e506f9 100644
--- a/media-sound/seq24/seq24-0.5.2.ebuild
+++ b/media-sound/seq24/seq24-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/media-sound/seq24/seq24-0.5.2.ebuild,v 1.1 2004/09/06 10:00:00 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/seq24/seq24-0.5.2.ebuild,v 1.1.1.1 2005/11/30 09:38:26 chriswhite Exp $
 
 IUSE=""
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.filter24.org/seq24/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="x86 amd64 ~ppc"
 
 DEPEND=">=media-libs/alsa-lib-0.9.0
 	=dev-cpp/gtkmm-1.2*"
diff --git a/media-sound/seq24/seq24-0.5.3.ebuild b/media-sound/seq24/seq24-0.5.3.ebuild
index a0efb8d6fa42..b800eab6d3b2 100644
--- a/media-sound/seq24/seq24-0.5.3.ebuild
+++ b/media-sound/seq24/seq24-0.5.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/media-sound/seq24/seq24-0.5.3.ebuild,v 1.1 2004/09/30 01:44:20 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/seq24/seq24-0.5.3.ebuild,v 1.1.1.1 2005/11/30 09:38:26 chriswhite Exp $
 
 IUSE=""
 
diff --git a/media-sound/seq24/seq24-0.6.3.ebuild b/media-sound/seq24/seq24-0.6.3.ebuild
index c482f6de53e7..6ce13fcc9bf0 100644
--- a/media-sound/seq24/seq24-0.6.3.ebuild
+++ b/media-sound/seq24/seq24-0.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/media-sound/seq24/seq24-0.6.3.ebuild,v 1.1 2005/03/26 14:08:27 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/seq24/seq24-0.6.3.ebuild,v 1.1.1.1 2005/11/30 09:38:26 chriswhite Exp $
 
 IUSE="jack"
 DESCRIPTION="Seq24 is a loop based MIDI sequencer with focus on live performances."
@@ -9,7 +9,7 @@ SRC_URI="http://www.filter24.org/seq24/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc x86"
 
 DEPEND=">=media-libs/alsa-lib-0.9.0
 	=dev-cpp/gtkmm-2.2*
diff --git a/media-sound/seq24/seq24-0.7.0.ebuild b/media-sound/seq24/seq24-0.7.0.ebuild
index 327b39370b6b..87d7ceaac6d3 100644
--- a/media-sound/seq24/seq24-0.7.0.ebuild
+++ b/media-sound/seq24/seq24-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/media-sound/seq24/seq24-0.7.0.ebuild,v 1.1 2005/11/06 03:59:56 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/seq24/seq24-0.7.0.ebuild,v 1.1.1.1 2005/11/30 09:38:26 chriswhite Exp $
 
 IUSE="jack"
 DESCRIPTION="Seq24 is a loop based MIDI sequencer with focus on live performances."
diff --git a/media-sound/setmixer/ChangeLog b/media-sound/setmixer/ChangeLog
index 84ac25add86d..8061620756a0 100644
--- a/media-sound/setmixer/ChangeLog
+++ b/media-sound/setmixer/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for media-sound/setmixer
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/setmixer/ChangeLog,v 1.1 2003/01/04 09:44:38 vapier Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/setmixer/ChangeLog,v 1.1.1.1 2005/11/30 09:38:00 chriswhite Exp $
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> setmixer-19941227_rc7.ebuild:
+  Added to ~ppc.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  setmixer-19941227_rc7.ebuild:
+  Stable amd64, sparc.
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> files/setmixer.rc:
+  Added depend() to init.d file.  Added to ~amd64
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  setmixer-19941227_rc7.ebuild:
+  virtual/glibc -> virtual/libc
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  setmixer-19941227_rc7.ebuild:
+  Added IUSE.
+
+  11 Apr 2004; Jason Wever <weeve@gentoo.org> setmixer-19941227_rc7.ebuild:
+  Added ~sparc keyword.
 
 *setmixer-19941227_rc7 (04 Jan 2003)
 
diff --git a/media-sound/setmixer/Manifest b/media-sound/setmixer/Manifest
index e69de29bb2d1..fc3930661948 100644
--- a/media-sound/setmixer/Manifest
+++ b/media-sound/setmixer/Manifest
@@ -0,0 +1,5 @@
+MD5 be9a4785a05ac106775a91bdb3f1519e ChangeLog 1031
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 c45635040e6a967dc8a91d576d7a35f3 setmixer-19941227_rc7.ebuild 1008
+MD5 557329c0c6a2f3d3baaa8a571dc47b4b files/digest-setmixer-19941227_rc7 140
+MD5 ce3d1fbbcfeae69e615276792f2ac615 files/setmixer.rc 565
diff --git a/media-sound/setmixer/files/setmixer.rc b/media-sound/setmixer/files/setmixer.rc
index b89d647cd082..0ab08e0b53b9 100644
--- a/media-sound/setmixer/files/setmixer.rc
+++ b/media-sound/setmixer/files/setmixer.rc
@@ -1,7 +1,12 @@
 #!/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/media-sound/setmixer/files/setmixer.rc,v 1.1 2003/01/04 09:44:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/setmixer/files/setmixer.rc,v 1.1.1.1 2005/11/30 09:38:00 chriswhite Exp $
+
+depend() {
+	need modules
+	use alsa
+}
 
 start() {
 	ebegin "Loading mixer settings"
diff --git a/media-sound/setmixer/setmixer-19941227_rc7.ebuild b/media-sound/setmixer/setmixer-19941227_rc7.ebuild
index 691715711bde..82810fa5df9e 100644
--- a/media-sound/setmixer/setmixer-19941227_rc7.ebuild
+++ b/media-sound/setmixer/setmixer-19941227_rc7.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/media-sound/setmixer/setmixer-19941227_rc7.ebuild,v 1.1 2003/01/04 09:44:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/setmixer/setmixer-19941227_rc7.ebuild,v 1.1.1.1 2005/11/30 09:38:00 chriswhite Exp $
+
+IUSE=""
 
 inherit eutils
 
@@ -13,9 +15,9 @@ SRC_URI="http://http.us.debian.org/debian/pool/main/s/setmixer/setmixer_${MY_PV}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 S=${WORKDIR}/${PN}-${MY_PV}.orig
 
diff --git a/media-sound/sexypsf/ChangeLog b/media-sound/sexypsf/ChangeLog
index dff5c8a2a329..11577da23ddb 100644
--- a/media-sound/sexypsf/ChangeLog
+++ b/media-sound/sexypsf/ChangeLog
@@ -1,6 +1,51 @@
 # ChangeLog for media-sound/sexypsf
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sexypsf/ChangeLog,v 1.1 2004/03/31 01:21:49 eradicator Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sexypsf/ChangeLog,v 1.1.1.1 2005/11/30 09:38:41 chriswhite Exp $
+
+  15 Nov 2005; Danny van Dyk <kugelfang@gentoo.org> sexypsf-0.4.7.ebuild:
+  This works on amd64 as of version 0.4.7, marked accordingly.
+
+  12 Nov 2005; Harald van Dijk <truedfx@gentoo.org>
+  files/sexypsf-0.4.7-misc.patch:
+  Even more potential 64-bit issues
+
+  06 Nov 2005; Harald van Dijk <truedfx@gentoo.org>
+  files/sexypsf-0.4.7-misc.patch, sexypsf-0.4.7.ebuild:
+  Add bmp support
+
+  02 Nov 2005; Harald van Dijk <truedfx@gentoo.org>
+  files/sexypsf-0.4.7-misc.patch:
+  Some more 64-bit problems
+
+*sexypsf-0.4.7 (26 Oct 2005)
+
+  26 Oct 2005; Harald van Dijk <truedfx@gentoo.org>
+  +files/sexypsf-0.4.7-misc.patch, metadata.xml, +sexypsf-0.4.7.ebuild:
+  Version bump plus gcc4 and 64bit fixes
+  And marking myself as maintainer
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> sexypsf-0.4.6.ebuild:
+  Stable on ppc.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  sexypsf-0.4.6.ebuild:
+  Stable x86.
+
+*sexypsf-0.4.6 (07 Oct 2004)
+
+  07 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/sexypsf-0.4.6-gentoo.patch, +files/sexypsf-0.4.6-xmms.patch,
+  +sexypsf-0.4.6.ebuild:
+  Version bump.
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> sexypsf-0.4.5.ebuild:
+  -sparc -amd64
+
+  29 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> sexypsf-0.4.5.ebuild:
+  Stable x86.
+
+  01 Apr 2004; David Holm <dholm@gentoo.org> sexypsf-0.4.5.ebuild:
+  Added to ~ppc.
 
 *sexypsf-0.4.5 (30 Mar 2004)
 
diff --git a/media-sound/sexypsf/Manifest b/media-sound/sexypsf/Manifest
index 3fab6b42f3cc..b3dcfd4a94c6 100644
--- a/media-sound/sexypsf/Manifest
+++ b/media-sound/sexypsf/Manifest
@@ -1,3 +1,22 @@
-MD5 e32531e51bdcd630aae0d8ddb9b4f63e sexypsf-0.4.5.ebuild 1044
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 45d75fa51d629fa3eb2fbf2401d26e08 ChangeLog 1831
 MD5 41f230a0e2debf8b51025a2d796c6e31 files/digest-sexypsf-0.4.5 61
-MD5 17935982afb8fa3aef44a43c5fb37fdc files/sexypsf-0.4.5-gentoo.patch 1465
+MD5 0ed9b80602e1c597dff882701ce72f64 files/digest-sexypsf-0.4.6 61
+MD5 606adf6de0a88f73cd8dd5c087a2d727 files/digest-sexypsf-0.4.7 65
+MD5 ec1912f27a7e4330699ef6addc03a8b0 files/sexypsf-0.4.5-gentoo.patch 1608
+MD5 ff39a6a980f10f48a571b23c330a8951 files/sexypsf-0.4.6-gentoo.patch 1519
+MD5 5e7f5501e9177b1f1c3d2cdc084ad6d1 files/sexypsf-0.4.6-xmms.patch 435
+MD5 54b96fe1f070f435fc279a00a9d00939 files/sexypsf-0.4.7-misc.patch 6241
+MD5 ffaa113215ddcecac79374633543e52d metadata.xml 248
+MD5 16e48240eb45b3d014770cf1a4977226 sexypsf-0.4.5.ebuild 1365
+MD5 718f9cbb34b957c7f1045b94c9225c7a sexypsf-0.4.6.ebuild 1402
+MD5 dc8ec92108f964cb33e3d09fb59bc142 sexypsf-0.4.7.ebuild 1557
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDek3J5mJXAu5GbtIRAjDyAJ4753Aog46uwqy7nh/LAcPdUDhJ+ACfV9WV
+hmZqiOrG6kv6WuoI8M/FdnE=
+=fRrj
+-----END PGP SIGNATURE-----
diff --git a/media-sound/sexypsf/files/sexypsf-0.4.7-misc.patch b/media-sound/sexypsf/files/sexypsf-0.4.7-misc.patch
index ec74766111d7..2387ad5691d2 100644
--- a/media-sound/sexypsf/files/sexypsf-0.4.7-misc.patch
+++ b/media-sound/sexypsf/files/sexypsf-0.4.7-misc.patch
@@ -38,7 +38,7 @@
  
 --- sexypsf/Makefile
 +++ sexypsf/Makefile
-@@ -12,8 +12,7 @@
+@@ -12,18 +12,14 @@
  RM = rm -f
  
  LIBS = -shared -lz
@@ -48,18 +48,19 @@
  
  OBJS =	PsxBios.o PsxCounters.o PsxDma.o Spu.o PsxHw.o PsxMem.o Misc.o	\
  	R3000A.o PsxInterpreter.o PsxHLE.o spu/spu.o
-@@ -21,10 +20,6 @@
- OBJS+=	xmms/xmms.o
- FLAGS+=	`gtk-config --cflags`
  
++XMMSCONF = xmms-config
+ OBJS+=	xmms/xmms.o
+-FLAGS+=	`gtk-config --cflags`
++FLAGS+=	`${XMMSCONF} --cflags`
+-
 -ifeq (${CPU}, ix86)
 -	OPTIMIZE += -fomit-frame-pointer -mcpu=i686 -fno-exceptions
 -endif
--
+ 
  ifeq (${CPU}, ppc)
  	FLAGS+=-DMSB_FIRST
- endif	
-@@ -33,10 +28,10 @@
+@@ -33,16 +30,16 @@
  	FLAGS+=-DMSB_FIRST
  endif
  
@@ -72,6 +73,13 @@
  
  install: sexypsf
  	mv libsexypsf.so ${HOME}/.xmms/Plugins
+ 
+ installglobal: sexypsf
+-	mv libsexypsf.so `xmms-config --input-plugin-dir`
++	mv libsexypsf.so `${XMMSCONF} --input-plugin-dir`
+ 
+ .PHONY: clean sexypsf
+ 
 --- sexypsf/PsxInterpreter.c
 +++ sexypsf/PsxInterpreter.c
 @@ -417,7 +417,7 @@
@@ -135,29 +143,57 @@
  	writeok=1;
  
 -	psxMemLUT = (u32*)malloc(0x10000 * 4);
--	memset(psxMemLUT, 0, 0x10000 * 4);
 +	psxMemLUT = malloc(0x10000 * sizeof *psxMemLUT);
+-	memset(psxMemLUT, 0, 0x10000 * 4);
 +	memset(psxMemLUT, 0, 0x10000 * sizeof *psxMemLUT);
  
  	psxM = (char*)malloc(0x00200000);
  	psxP = (char*)malloc(0x00010000);
-@@ -67,7 +67,7 @@
+@@ -67,16 +67,16 @@
  		printf("Error allocating memory"); return -1;
  	}
  
 -	for (i=0; i<0x80; i++) psxMemLUT[i + 0x0000] = (u32)&psxM[(i & 0x1f) << 16];
 +	for (i=0; i<0x80; i++) psxMemLUT[i + 0x0000] = &psxM[(i & 0x1f) << 16];
  
- 	memcpy(psxMemLUT + 0x8000, psxMemLUT, 0x80 * 4);
- 	memcpy(psxMemLUT + 0xa000, psxMemLUT, 0x80 * 4);
-@@ -222,7 +222,7 @@
+-	memcpy(psxMemLUT + 0x8000, psxMemLUT, 0x80 * 4);
++	memcpy(psxMemLUT + 0x8000, psxMemLUT, 0x80 * sizeof *psxMemLUT);
+-	memcpy(psxMemLUT + 0xa000, psxMemLUT, 0x80 * 4);
++	memcpy(psxMemLUT + 0xa000, psxMemLUT, 0x80 * sizeof *psxMemLUT);
+ 
+-	for (i=0; i<0x01; i++) psxMemLUT[i + 0x1f00] = (u32)&psxP[i << 16];
++	for (i=0; i<0x01; i++) psxMemLUT[i + 0x1f00] = &psxP[i << 16];
+ 
+-	for (i=0; i<0x01; i++) psxMemLUT[i + 0x1f80] = (u32)&psxH[i << 16];
++	for (i=0; i<0x01; i++) psxMemLUT[i + 0x1f80] = &psxH[i << 16];
+ 
+-	for (i=0; i<0x08; i++) psxMemLUT[i + 0xbfc0] = (u32)&psxR[i << 16];
++	for (i=0; i<0x08; i++) psxMemLUT[i + 0xbfc0] = &psxR[i << 16];
+ 
+ 	return 0;
+ }
+@@ -215,16 +215,16 @@
+ 					case 0x800: case 0x804:
+ 						if (writeok == 0) break;
+ 						writeok = 0;
+-						memset(psxMemLUT + 0x0000, 0, 0x80 * 4);
++						memset(psxMemLUT + 0x0000, 0, 0x80 * sizeof *psxMemLUT);
+-						memset(psxMemLUT + 0x8000, 0, 0x80 * 4);
++						memset(psxMemLUT + 0x8000, 0, 0x80 * sizeof *psxMemLUT);
+-						memset(psxMemLUT + 0xa000, 0, 0x80 * 4);
++						memset(psxMemLUT + 0xa000, 0, 0x80 * sizeof *psxMemLUT);
+ 						break;
  					case 0x1e988:
  						if (writeok == 1) break;
  						writeok = 1;
 -						for (i=0; i<0x80; i++) psxMemLUT[i + 0x0000] = (u32)&psxM[(i & 0x1f) << 16];
 +						for (i=0; i<0x80; i++) psxMemLUT[i + 0x0000] = &psxM[(i & 0x1f) << 16];
- 						memcpy(psxMemLUT + 0x8000, psxMemLUT, 0x80 * 4);
- 						memcpy(psxMemLUT + 0xa000, psxMemLUT, 0x80 * 4);
+-						memcpy(psxMemLUT + 0x8000, psxMemLUT, 0x80 * 4);
++						memcpy(psxMemLUT + 0x8000, psxMemLUT, 0x80 * sizeof *psxMemLUT);
+-						memcpy(psxMemLUT + 0xa000, psxMemLUT, 0x80 * 4);
++						memcpy(psxMemLUT + 0xa000, psxMemLUT, 0x80 * sizeof *psxMemLUT);
+ 						break;
+ 					default:
  						break;
 --- sexypsf/PsxMem.h
 +++ sexypsf/PsxMem.h
diff --git a/media-sound/sexypsf/metadata.xml b/media-sound/sexypsf/metadata.xml
index e1774e3d9ad7..4f1a1aa0c9f9 100644
--- a/media-sound/sexypsf/metadata.xml
+++ b/media-sound/sexypsf/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sound</herd>
+<maintainer>
+<email>truedfx@gentoo.org</email>
+<name>Harald van Dijk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/sexypsf/sexypsf-0.4.5.ebuild b/media-sound/sexypsf/sexypsf-0.4.5.ebuild
index 4851e0dccfd5..c1ae9b584a64 100644
--- a/media-sound/sexypsf/sexypsf-0.4.5.ebuild
+++ b/media-sound/sexypsf/sexypsf-0.4.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/media-sound/sexypsf/sexypsf-0.4.5.ebuild,v 1.1 2004/03/31 01:21:49 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sexypsf/sexypsf-0.4.5.ebuild,v 1.1.1.1 2005/11/30 09:38:41 chriswhite Exp $
 
 inherit eutils
 
@@ -12,7 +12,9 @@ SRC_URI="http://xodnizel.net/${PN}/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="xmms"
-KEYWORDS="~x86"
+#-amd64: 0.4.5: Segfault on playback using sexypsf.
+#-sparc: 0.4.5: Couldn't load minispf
+KEYWORDS="x86 ~ppc -amd64 -sparc"
 
 DEPEND="sys-libs/zlib
 	xmms? ( media-sound/xmms )"
diff --git a/media-sound/sexypsf/sexypsf-0.4.6.ebuild b/media-sound/sexypsf/sexypsf-0.4.6.ebuild
index 938b8186b770..2f95654c1bac 100644
--- a/media-sound/sexypsf/sexypsf-0.4.6.ebuild
+++ b/media-sound/sexypsf/sexypsf-0.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/media-sound/sexypsf/sexypsf-0.4.6.ebuild,v 1.1 2004/10/07 23:50:44 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sexypsf/sexypsf-0.4.6.ebuild,v 1.1.1.1 2005/11/30 09:38:41 chriswhite Exp $
 
 IUSE="xmms"
 
@@ -18,7 +18,7 @@ SLOT="0"
 
 #-amd64: 0.4.6: Segfault on playback using sexypsf.
 #-sparc: 0.4.5: Couldn't load minispf
-KEYWORDS="~x86 ~ppc -amd64 -sparc"
+KEYWORDS="-amd64 ppc -sparc x86"
 
 DEPEND="sys-libs/zlib
 	xmms? ( media-sound/xmms )"
diff --git a/media-sound/sexypsf/sexypsf-0.4.7.ebuild b/media-sound/sexypsf/sexypsf-0.4.7.ebuild
index d6eb0df420d6..117e3e6a9185 100644
--- a/media-sound/sexypsf/sexypsf-0.4.7.ebuild
+++ b/media-sound/sexypsf/sexypsf-0.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/media-sound/sexypsf/sexypsf-0.4.7.ebuild,v 1.1 2005/10/26 06:39:31 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sexypsf/sexypsf-0.4.7.ebuild,v 1.1.1.1 2005/11/30 09:38:41 chriswhite Exp $
 
 inherit eutils
 
@@ -11,12 +11,12 @@ SRC_URI="http://projects.raphnet.net/sexypsf/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 
-#-amd64: 0.4.6: Segfault on playback using sexypsf.
 #-sparc: 0.4.5: Couldn't load minispf
-KEYWORDS="-amd64 ~ppc -sparc ~x86"
-IUSE="xmms"
+KEYWORDS="~amd64 ~ppc -sparc ~x86"
+IUSE="bmp xmms"
 
 DEPEND="sys-libs/zlib
+	bmp? ( media-sound/beep-media-player )
 	xmms? ( media-sound/xmms )"
 
 S=${WORKDIR}/${PN}
@@ -36,16 +36,28 @@ src_compile() {
 
 	emake CPU="${CPU}" || die "emake failed"
 
-	if use xmms; then
+	if use bmp || use xmms; then
+		if ! use xmms; then
+			local XMMSCONF=beep-config
+		else
+			local XMMSCONF=xmms-config
+		fi
+
 		cd "${S}"
+		# don't generate separate xmms and bmp plugins; they're compatible
 		# do make clean to force rebuild with -fPIC
-		emake CPU="${CPU}" clean sexypsf || die "emake failed"
+		emake CPU="${CPU}" XMMSCONF="${XMMSCONF}" clean sexypsf || die "emake failed"
 	fi
 }
 
 src_install() {
 	dobin Linux/sexypsf
 
+	if use bmp; then
+		exeinto "$(beep-config --input-plugin-dir)"
+		doexe libsexypsf.so
+	fi
+
 	if use xmms; then
 		exeinto "$(xmms-config --input-plugin-dir)"
 		doexe libsexypsf.so
diff --git a/media-sound/sfc/ChangeLog b/media-sound/sfc/ChangeLog
index 4101b232b54a..d8f129aff628 100644
--- a/media-sound/sfc/ChangeLog
+++ b/media-sound/sfc/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for media-sound/sfc
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sfc/ChangeLog,v 1.1 2003/06/13 10:21:48 robh Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sfc/ChangeLog,v 1.1.1.1 2005/11/30 09:38:43 chriswhite Exp $
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> sfc-0.015.ebuild:
+  Stable amd64.
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> sfc-0.015.ebuild:
+  Added ~amd64
+
+  30 May 2004; Jeremy Huddleston <eradicator@gentoo.org> sfc-0.015.ebuild:
+  Stable x86.
+
+  17 Apr 2004; David Holm <dholm@gentoo.org> sfc-0.015.ebuild:
+  Added to ~ppc.
+
+*sfc-0.015 (17 Apr 2004)
+
+  17 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> sfc-0.015.ebuild:
+  Version bump.  Bug #36025.
+
+  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> sfc-0.012.ebuild:
+  Stable x86.  Removed explicit S=.
 
 *sfc-0.012 (13 Jun 2003)
 
diff --git a/media-sound/sfc/Manifest b/media-sound/sfc/Manifest
index 753956447608..51e29c518a4e 100644
--- a/media-sound/sfc/Manifest
+++ b/media-sound/sfc/Manifest
@@ -1,2 +1,6 @@
-MD5 4d02821ba3d861114e439609a79e0089 sfc-0.012.ebuild 724
+MD5 74ecadf26dc75ed0372c7c39fbb0aae8 ChangeLog 948
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 29bc854cb4047f04ecd5c17d41acc579 sfc-0.012.ebuild 785
+MD5 a8e685d20bce4d1f0985d0a9ca1a9ec1 sfc-0.015.ebuild 636
 MD5 bafe2f89e0699588f6933e51aa780616 files/digest-sfc-0.012 60
+MD5 09c7ca2c20a0106328969a6113b44b2b files/digest-sfc-0.015 61
diff --git a/media-sound/sfc/sfc-0.012.ebuild b/media-sound/sfc/sfc-0.012.ebuild
index bc92432322c7..bf18e75edaf9 100644
--- a/media-sound/sfc/sfc-0.012.ebuild
+++ b/media-sound/sfc/sfc-0.012.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/media-sound/sfc/sfc-0.012.ebuild,v 1.1 2003/06/13 10:21:48 robh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sfc/sfc-0.012.ebuild,v 1.1.1.1 2005/11/30 09:38:43 chriswhite Exp $
 
 
 DESCRIPTION="SoundFontCombi is a opensource software pseudo synthesizer."
@@ -9,30 +9,25 @@ SRC_URI="http://personal.telefonica.terra.es/web/soudfontcombi/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 IUSE=""
 
 DEPEND=">=x11-libs/fltk-1.1.2
 	virtual/alsa"
 
-S="${WORKDIR}/${P}"
-
 src_compile() {
-        emake || die "compile failed"
+	emake || die "compile failed"
 }
 
 src_install() {
-
-        cp Makefile Makefile~
-        sed -e "/^PREFIX/s:.*:PREFIX = /usr:
+	cp Makefile Makefile~
+	sed -e "/^PREFIX/s:.*:PREFIX = /usr:
 		/^DOC_DIR/s:.*:DOC_DIR = /usr/share/doc/${P}:" Makefile~ > Makefile
 
-        dodir /usr/bin
+	dodir /usr/bin
 
-        einstall DESTDIR=${D}
+	einstall DESTDIR=${D}
 
-        prepalldocs
+	prepalldocs
 }
-
-
diff --git a/media-sound/sfc/sfc-0.015.ebuild b/media-sound/sfc/sfc-0.015.ebuild
index bd9ba1a733e0..fb6eed398b24 100644
--- a/media-sound/sfc/sfc-0.015.ebuild
+++ b/media-sound/sfc/sfc-0.015.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/media-sound/sfc/sfc-0.015.ebuild,v 1.1 2004/04/17 07:47:15 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sfc/sfc-0.015.ebuild,v 1.1.1.1 2005/11/30 09:38:43 chriswhite Exp $
 
 DESCRIPTION="SoundFontCombi is a opensource software pseudo synthesizer."
 HOMEPAGE="http://personal.telefonica.terra.es/web/soudfontcombi/"
@@ -8,12 +8,12 @@ SRC_URI="http://personal.telefonica.terra.es/web/soudfontcombi/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc amd64"
 
 IUSE=""
 
 DEPEND=">=x11-libs/fltk-1.1.2
-	virtual/alsa"
+	media-libs/alsa-lib"
 
 src_install() {
 	make DESTDIR="${D}" install || die
diff --git a/media-sound/shntool/ChangeLog b/media-sound/shntool/ChangeLog
index 06e27155a947..89db64c90059 100644
--- a/media-sound/shntool/ChangeLog
+++ b/media-sound/shntool/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for media-sound/shntool
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/shntool/ChangeLog,v 1.1 2003/04/12 08:25:42 jje Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/shntool/ChangeLog,v 1.1.1.1 2005/11/30 09:38:26 chriswhite Exp $
+
+*shntool-2.0.3 (20 Nov 2004)
+
+  20 Nov 2004; Tony Vroon <chainsaw@gentoo.org> +shntool-2.0.3.ebuild:
+  Version bump as requested by Jussi Sainio <jusic@mbnet.fi> in bug #71663.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> shntool-1.2.3.ebuild:
+  Stable amd64, sparc.
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> shntool-1.2.3.ebuild:
+  ~amd64 ~sparc
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> shntool-1.2.3.ebuild:
+  Added IUSE.
+
+  01 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> shntool-1.2.3.ebuild:
+  Ebuild cleanup
+
+  15 Feb 2004; David Holm <dholm@gentoo.org> shntool-1.2.3.ebuild:
+  Added to ~ppc.
 
 *shntool-1.2.3 (12 Apr 2003)
 
diff --git a/media-sound/shntool/Manifest b/media-sound/shntool/Manifest
index 315a8dd8dc7f..76cb0c21eb2d 100644
--- a/media-sound/shntool/Manifest
+++ b/media-sound/shntool/Manifest
@@ -1,2 +1,6 @@
-MD5 3827bed1145e0d864fb9e4c05dc0ce57 shntool-1.2.3.ebuild 555
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 465dcbda58f1c8f681a70235c340682e shntool-1.2.3.ebuild 610
+MD5 e4c48d062a27b4223ca75853bcc415fb ChangeLog 987
+MD5 109195ac83c86cddb460e8baa14c9813 shntool-2.0.3.ebuild 664
+MD5 c7b1cd991ea8f09bde45eb11bf5b0d34 files/digest-shntool-2.0.3 65
 MD5 264cb1e20b963d4e1614cf5fa5d56c18 files/digest-shntool-1.2.3 65
diff --git a/media-sound/shntool/shntool-1.2.3.ebuild b/media-sound/shntool/shntool-1.2.3.ebuild
index 0b3567b53fb5..b14401b282d4 100644
--- a/media-sound/shntool/shntool-1.2.3.ebuild
+++ b/media-sound/shntool/shntool-1.2.3.ebuild
@@ -1,24 +1,19 @@
-# 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/media-sound/shntool/shntool-1.2.3.ebuild,v 1.1 2003/04/12 08:25:42 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/shntool/shntool-1.2.3.ebuild,v 1.1.1.1 2005/11/30 09:38:26 chriswhite Exp $
+
+IUSE=""
 
 DESCRIPTION="shntool is a multi-purpose WAVE data processing and reporting utility"
 HOMEPAGE="http://shnutils.freeshell.org/shntool/"
 SRC_URI="http://shnutils.freeshell.org/shntool/source/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc amd64 sparc"
 
-DEPEND=">=media-sound/shorten-3.5.1 
+DEPEND=">=media-sound/shorten-3.5.1
 	>=media-libs/flac-1.1.0 "
 
-S="${WORKDIR}/${P}"
-
-src_compile() {
-	econf || die
-	emake || die
-}
-
 src_install () {
 	einstall || die
 	dodoc doc/*
diff --git a/media-sound/shntool/shntool-2.0.3.ebuild b/media-sound/shntool/shntool-2.0.3.ebuild
index bed6c0a5a963..98211dd3466a 100644
--- a/media-sound/shntool/shntool-2.0.3.ebuild
+++ b/media-sound/shntool/shntool-2.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/media-sound/shntool/shntool-2.0.3.ebuild,v 1.1 2004/11/20 18:19:35 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/shntool/shntool-2.0.3.ebuild,v 1.1.1.1 2005/11/30 09:38:26 chriswhite Exp $
 
 IUSE="flac sox"
 
@@ -12,8 +12,8 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
 
 DEPEND=">=media-sound/shorten-3.5.1
-	flac? (>=media-libs/flac-1.1.0)
-	sox? (>=media-sound/sox-12.17.4) "
+	flac? ( >=media-libs/flac-1.1.0 )
+	sox? ( >=media-sound/sox-12.17.4 )"
 
 src_install () {
 	einstall || die
diff --git a/media-sound/shorten/ChangeLog b/media-sound/shorten/ChangeLog
index 438b8673f71d..5356c9e48a65 100644
--- a/media-sound/shorten/ChangeLog
+++ b/media-sound/shorten/ChangeLog
@@ -1,9 +1,52 @@
 # ChangeLog for media-sound/shorten
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/shorten/ChangeLog,v 1.1 2002/02/01 21:53:31 gbevin Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/shorten/ChangeLog,v 1.1.1.1 2005/11/30 09:38:18 chriswhite Exp $
+
+  19 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -shorten-3.3.ebuild, -shorten-3.5.0.ebuild, -shorten-3.5.1.ebuild:
+  Removing old versions.
+
+  18 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  shorten-3.6.0.ebuild:
+  Stable amd64, sparc, x86.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> shorten-3.5.1.ebuild:
+  Stable amd64, sparc.
+
+*shorten-3.6.0 (06 Sep 2004)
+
+  06 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +shorten-3.6.0.ebuild:
+  Version bump.  Closes bug #61846.
+
+  07 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> shorten-3.5.1.ebuild:
+  ~sparc
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> shorten-3.3.ebuild:
+  Add die following econf for bug 48950
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> shorten-3.3.ebuild,
+  shorten-3.5.0.ebuild, shorten-3.5.1.ebuild:
+  Added IUSE.
+
+  15 Feb 2004; David Holm <dholm@gentoo.org> shorten-3.5.1.ebuild:
+  Added to ~ppc.
+
+*shorten-3.5.1 (12 Apr 2003)
+ 
+  12 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
+*shorten-3.5.0 (05 Feb 2003)
+
+  05 Feb 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #12095.
 
 *shorten-3.3 (1 Feb 2002)
 
+  20 Sep 2002; Mike Frysinger <vapier@gentoo.org> :
+  Added HOMEPAGE variable and updated SRC_URI (original URI moved)
+
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/media-sound/shorten/Manifest b/media-sound/shorten/Manifest
index 3d3691211769..2b219e8c96c9 100644
--- a/media-sound/shorten/Manifest
+++ b/media-sound/shorten/Manifest
@@ -1,7 +1,14 @@
-MD5 ece5b046b9ef86a42070f2487c3cea9a ChangeLog 905
-MD5 0a06da1ae90f88aeaae34aaf37837edc shorten-3.3.ebuild 662
-MD5 b4c7cd61e0717a344cbde3f183f4cdf8 shorten-3.5.0.ebuild 659
-MD5 b4c7cd61e0717a344cbde3f183f4cdf8 shorten-3.5.1.ebuild 659
-MD5 6f93839fa5f8bb50e4c5f205d9bb595d files/digest-shorten-3.3 63
-MD5 92bf91f07a87a6738729b83027664e51 files/digest-shorten-3.5.0 65
-MD5 45c822c822806a11ae1aa654a51567ff files/digest-shorten-3.5.1 65
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0c3ce5c2112960a43078940d74702bac ChangeLog 1953
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 1a47b626990b164bbe6abac2b5220ea5 shorten-3.6.0.ebuild 577
+MD5 bb6f4b87402da3c6eed7b279fd081a7b files/digest-shorten-3.6.0 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBdftMArHZZzCEUG0RAkmxAJ9Krb7fGOclLDGTOLXg44XuLzVtygCeILnR
+y39kx/Xe+0W+mwhUd0zUNyo=
+=dPEW
+-----END PGP SIGNATURE-----
diff --git a/media-sound/shorten/shorten-3.6.0.ebuild b/media-sound/shorten/shorten-3.6.0.ebuild
index c05faad63d55..15a5bee85ce8 100644
--- a/media-sound/shorten/shorten-3.6.0.ebuild
+++ b/media-sound/shorten/shorten-3.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/media-sound/shorten/shorten-3.6.0.ebuild,v 1.1 2004/09/06 23:54:01 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/shorten/shorten-3.6.0.ebuild,v 1.1.1.1 2005/11/30 09:38:18 chriswhite Exp $
 
 IUSE=""
 
@@ -10,9 +10,9 @@ SRC_URI="http://etree.org/shnutils/shorten/source/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+KEYWORDS="amd64 ~ppc sparc x86"
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 	dodoc AUTHORS LICENSE ChangeLog NEWS README
 }
diff --git a/media-sound/shoutcast-server-bin/ChangeLog b/media-sound/shoutcast-server-bin/ChangeLog
index a92d01172b2f..414bbf05cd15 100644
--- a/media-sound/shoutcast-server-bin/ChangeLog
+++ b/media-sound/shoutcast-server-bin/ChangeLog
@@ -1,6 +1,54 @@
 # ChangeLog for media-sound/shoutcast-server-bin
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/shoutcast-server-bin/ChangeLog,v 1.1 2004/07/25 06:54:03 chriswhite Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/shoutcast-server-bin/ChangeLog,v 1.1.1.1 2005/11/30 09:38:44 chriswhite Exp $
+
+  28 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  shoutcast-server-bin-1.9.5.ebuild:
+  added pkg_nofetch to tell users where to download the shoutcast server.
+  fixes #75295
+
+  19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  Remove retired developer from metadata.xml.
+
+  29 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  shoutcast-server-bin-1.9.5.ebuild:
+  added message to pkg_postinst to tell users about the shoucast guide, fixes
+  bug #77316
+
+  04 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -shoutcast-server-bin-1.9.4-r1.ebuild, shoutcast-server-bin-1.9.5.ebuild:
+  Stable amd64 and removing insecure version.
+
+*shoutcast-server-bin-1.9.5 (04 Jan 2005)
+
+  04 Jan 2005; Chris White <chriswhite@gentoo.org>
+  +shoutcast-server-bin-1.9.5.ebuild:
+  Fixing bug #75482 with version bump.  x86 stable marked.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  shoutcast-server-bin-1.9.4-r1.ebuild:
+  Stable amd64.
+
+  30 Nov 2004; Sven Wegener <swegener@gentoo.org>
+  shoutcast-server-bin-1.9.4-r1.ebuild:
+  Fixed invalid atoms in *DEPEND.
+
+*shoutcast-server-bin-1.9.4-r1 (16 Sep 2004)
+
+  16 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +shoutcast-server-bin-1.9.4-r1.ebuild, -shoutcast-server-bin-1.9.4.ebuild:
+  Revision bump for security bug #63551.  Added ~amd64.
+
+  04 Sep 2004; Chris White <chriswhite@gentoo.org>
+  shoutcast-server-bin-1.9.4.ebuild:
+  Added / to the pre-set directory for content in the ebuild. Things break if it
+  isn't included.
+
+  03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> metadata.xml:
+  Stable amd64, x86.
+
+  14 Aug 2004; Sven Wegener <swegener@gentoo.org> files/shoutcast:
+  Fixed CVS Header.
 
 *shoutcast-server-bin-1.9.4 (25 Jul 2004)
 
diff --git a/media-sound/shoutcast-server-bin/Manifest b/media-sound/shoutcast-server-bin/Manifest
index 9ec76619fb95..d8b33caa6cac 100644
--- a/media-sound/shoutcast-server-bin/Manifest
+++ b/media-sound/shoutcast-server-bin/Manifest
@@ -1,3 +1,15 @@
-MD5 0039f2f8cefeb5b06fb8e687455050f9 shoutcast-server-bin-1.9.4.ebuild 2075
-MD5 43c98d47b51b1d029eef7c34f711aed9 files/shoutcast 740
-MD5 2b2d3020957f2bffc04141a0f2135693 files/digest-shoutcast-server-bin-1.9.4 80
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 66afc0e263b688b1478f54b6823ca5f5 shoutcast-server-bin-1.9.5.ebuild 2592
+MD5 132853fefa9fee6b0f12afea4ac5951b ChangeLog 2190
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 2f2025093cdbc0f677b2235e95172158 files/digest-shoutcast-server-bin-1.9.5 79
+MD5 572233fa66d4a99eea2c5e1e578fc357 files/shoutcast 853
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCmPW006ebR+OMO78RAuYFAJ9N5Jfz44IcDRKmi/rmUJ54VGF8lgCeLYQR
+MGNB1dDdsTcfzf4jtkLAPzs=
+=LuwC
+-----END PGP SIGNATURE-----
diff --git a/media-sound/shoutcast-server-bin/files/shoutcast b/media-sound/shoutcast-server-bin/files/shoutcast
index c11b83cbf9af..d4cd81a32d6e 100644
--- a/media-sound/shoutcast-server-bin/files/shoutcast
+++ b/media-sound/shoutcast-server-bin/files/shoutcast
@@ -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/media-sound/shoutcast-server-bin/files/shoutcast,v 1.1.1.1 2005/11/30 09:38:44 chriswhite Exp $
 
 depend() {
         need localmount
diff --git a/media-sound/shoutcast-server-bin/metadata.xml b/media-sound/shoutcast-server-bin/metadata.xml
index 3e0ec7ab1a02..e1774e3d9ad7 100644
--- a/media-sound/shoutcast-server-bin/metadata.xml
+++ b/media-sound/shoutcast-server-bin/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>media-sound</herd>
-<maintainer>
-  <email>chriswhite@gentoo.org</email>
-</maintainer>
+<herd>sound</herd>
 </pkgmetadata>
diff --git a/media-sound/shoutcast-server-bin/shoutcast-server-bin-1.9.5.ebuild b/media-sound/shoutcast-server-bin/shoutcast-server-bin-1.9.5.ebuild
index 1958d10a60d0..5072fca31e7e 100644
--- a/media-sound/shoutcast-server-bin/shoutcast-server-bin-1.9.5.ebuild
+++ b/media-sound/shoutcast-server-bin/shoutcast-server-bin-1.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/media-sound/shoutcast-server-bin/shoutcast-server-bin-1.9.5.ebuild,v 1.1 2005/01/03 20:57:42 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/shoutcast-server-bin/shoutcast-server-bin-1.9.5.ebuild,v 1.1.1.1 2005/11/30 09:38:44 chriswhite Exp $
 
 IUSE=""
 
@@ -13,11 +13,17 @@ HOMEPAGE="http://www.shoutcast.com/download/license.phtml"
 SRC_URI="shoutcast-${SVER}-linux-glibc6.tar.gz"
 LICENSE="shoutcast"
 SLOT="0"
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
 DEPEND="amd64? ( app-emulation/emul-linux-x86-glibc )"
 
 S="${WORKDIR}/shoutcast-${SVER}-linux-glibc6"
 
+pkg_nofetch() {
+	einfo "Please download ${A} from:"
+	einfo "${HOMEPAGE}"
+	einfo "and move it to ${DISTDIR}"
+}
+
 src_compile() {
 	einfo "Nothing to compile."
 }
@@ -61,10 +67,19 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo "To start shoutcast, use the init.d script by running /etc/init.d/shoutcast."
+	einfo
+	einfo "To start shoutcast, use the init.d script by running"
+	einfo "/etc/init.d/shoutcast."
 	einfo
 	einfo "On demand content should be stored in /opt/shoutcast/content"
-	einfo "See http://forums.winamp.com/showthread.php?threadid=75736 for more information on setting up on demand content"
+	einfo "See http://forums.winamp.com/showthread.php?threadid=75736 for"
+	einfo "more information on setting up on demand content"
+	einfo
+	einfo "FAQ's can be found at:"
+	einfo "http://forums.winamp.com/showthread.php?threadid=75736 "
+	einfo "and can help you with server setup."
+	einfo
+	einfo "An Gentoo Linux shoutcast guide can be found at "
+	einfo "http://www.gentoo.org/doc/en/shoutcast-config.xml"
 	einfo
-	einfo "FAQ's can be found at: http://forums.winamp.com/showthread.php?threadid=75736 and can help you with server setup."
 }
diff --git a/media-sound/shoutcast-trans-bin/ChangeLog b/media-sound/shoutcast-trans-bin/ChangeLog
index 2a0e80284d1e..ce438354d12f 100644
--- a/media-sound/shoutcast-trans-bin/ChangeLog
+++ b/media-sound/shoutcast-trans-bin/ChangeLog
@@ -1,6 +1,38 @@
 # ChangeLog for media-sound/shoutcast-trans-bin
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/shoutcast-trans-bin/ChangeLog,v 1.1 2004/08/31 23:57:00 chriswhite Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/shoutcast-trans-bin/ChangeLog,v 1.1.1.1 2005/11/30 09:38:21 chriswhite Exp $
+
+  19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  Remove retired developer from metadata.xml.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  shoutcast-trans-bin-0.4.0-r1.ebuild:
+  Stable amd64.
+
+  30 Nov 2004; Sven Wegener <swegener@gentoo.org>
+  shoutcast-trans-bin-0.4.0-r1.ebuild:
+  Fixed invalid atoms in *DEPEND.
+
+  24 Sep 2004; Sven Wegener <swegener@gentoo.org> files/shoutcast_trans:
+  Fixed CVS keyword replacement.
+
+*shoutcast-trans-bin-0.4.0-r1 (16 Sep 2004)
+
+  16 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +shoutcast-trans-bin-0.4.0-r1.ebuild, -shoutcast-trans-bin-0.4.0.ebuild:
+  Revision bump for security bug #63551.  Added ~amd64.
+
+  05 Sep 2004; Chris White <chriswhite@gentoo.org> files/shoutcast_trans:
+  Fixed the stop() function in shoutcast_trans init.d script.
+
+  05 Sep 2004; Chris White <chriswhite@gentoo.org> files/shoutcast_trans,
+  shoutcast-trans-bin-0.4.0.ebuild:
+  Made shoutcast_trans use pidfile in start-stop-daemon for upcomming shoutcast
+  doc. Marking x86 stable.
+
+  04 Sep 2004; Chris White <chriswhite@gentoo.org>
+  shoutcast-trans-bin-0.4.0.ebuild:
+  Used keepdir instead of mkdir.  Thanks to eradicator for pointing this out.
 
 *shoutcast-trans-bin-0.4.0 (01 Sep 2004)
 
diff --git a/media-sound/shoutcast-trans-bin/Manifest b/media-sound/shoutcast-trans-bin/Manifest
index 56463cd3b25f..bcd0792e010b 100644
--- a/media-sound/shoutcast-trans-bin/Manifest
+++ b/media-sound/shoutcast-trans-bin/Manifest
@@ -1,3 +1,15 @@
-MD5 5257dda857de5c4e44ce0e43efdced54 shoutcast-trans-bin-0.4.0.ebuild 1571
-MD5 9ccef27495f4b1f47acfefdb67ccffab files/digest-shoutcast-trans-bin-0.4.0 67
-MD5 e83544ebe3049fbf2eaeeaa8e2af3d66 files/shoutcast_trans 759
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 61c96e04ccab3b57cf018db8b7c7f85c ChangeLog 1724
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 d038cfec510bb0bdc8b594491732e473 shoutcast-trans-bin-0.4.0-r1.ebuild 2138
+MD5 444bda065732036d15241d5a349bbb82 files/shoutcast_trans 938
+MD5 9ccef27495f4b1f47acfefdb67ccffab files/digest-shoutcast-trans-bin-0.4.0-r1 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCZMEOKf2g/qXtneoRAl/xAKC9VdWwoknQRY7jZSiz6xNCJI2JBQCgqexv
+dRuB8scKY37mPLNYPg8G58c=
+=BFwv
+-----END PGP SIGNATURE-----
diff --git a/media-sound/shoutcast-trans-bin/files/shoutcast_trans b/media-sound/shoutcast-trans-bin/files/shoutcast_trans
index bcaa75dd8249..ab0696169af7 100644
--- a/media-sound/shoutcast-trans-bin/files/shoutcast_trans
+++ b/media-sound/shoutcast-trans-bin/files/shoutcast_trans
@@ -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/media-sound/shoutcast-trans-bin/files/shoutcast_trans,v 1.1.1.1 2005/11/30 09:38:21 chriswhite Exp $
 
 depend() {
         need localmount
@@ -21,12 +21,12 @@ start() {
         checkconfig || return 1
 
         ebegin "Starting Shoutcast Trans"
-        start-stop-daemon --start --quiet --exec /opt/shoutcast/sc_trans_linux /etc/shoutcast/sc_trans.conf > /dev/null &
+        start-stop-daemon --start --quiet -m --pidfile /var/run/shoutcast_trans.pid --exec /opt/shoutcast/sc_trans_linux /etc/shoutcast/sc_trans.conf > /dev/null &
         eend $?
 }
 
 stop() {
         ebegin "Stopping Shoutcast Trans"
-        start-stop-daemon --stop --quiet --exec /opt/shoutcast/sc_trans_linux
+	start-stop-daemon --stop --quiet --pidfile /var/run/shoutcast_trans.pid
         eend $?
 }
diff --git a/media-sound/shoutcast-trans-bin/metadata.xml b/media-sound/shoutcast-trans-bin/metadata.xml
index ec6a427b666f..e1774e3d9ad7 100644
--- a/media-sound/shoutcast-trans-bin/metadata.xml
+++ b/media-sound/shoutcast-trans-bin/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sound</herd>
-<maintainer>
-  <email>chriswhite@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/media-sound/shoutcast-trans-bin/shoutcast-trans-bin-0.4.0-r1.ebuild b/media-sound/shoutcast-trans-bin/shoutcast-trans-bin-0.4.0-r1.ebuild
index 4b29f5a0f9df..f44529188bd3 100644
--- a/media-sound/shoutcast-trans-bin/shoutcast-trans-bin-0.4.0-r1.ebuild
+++ b/media-sound/shoutcast-trans-bin/shoutcast-trans-bin-0.4.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/media-sound/shoutcast-trans-bin/shoutcast-trans-bin-0.4.0-r1.ebuild,v 1.1 2004/09/16 16:19:00 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/shoutcast-trans-bin/shoutcast-trans-bin-0.4.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:21 chriswhite Exp $
 
 IUSE=""
 
@@ -13,8 +13,8 @@ HOMEPAGE="http://www.shoutcast.com"
 SRC_URI="http://www.shoutcast.com/downloads/sc_trans_posix_${SVER}.tgz"
 LICENSE="shoutcast"
 SLOT="0"
-KEYWORDS="-* x86 ~amd64"
-DEPEND="amd64? ( emul-linux-x86-glibc )
+KEYWORDS="-* amd64 x86"
+DEPEND="amd64? ( app-emulation/emul-linux-x86-glibc )
 	media-sound/shoutcast-server-bin"
 S="${WORKDIR}/sc_trans_${SVER}"
 
diff --git a/media-sound/sidplay/ChangeLog b/media-sound/sidplay/ChangeLog
index 4bff6f5f7966..84f26f1358ac 100644
--- a/media-sound/sidplay/ChangeLog
+++ b/media-sound/sidplay/ChangeLog
@@ -1,6 +1,33 @@
 # ChangeLog for media-sound/sidplay
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sidplay/ChangeLog,v 1.1 2002/11/11 18:43:45 hanno Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sidplay/ChangeLog,v 1.1.1.1 2005/11/30 09:38:10 chriswhite Exp $
+
+  04 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  sidplay-2.0.9.ebuild:
+  Adding pkgconfig to DEPEND to close bug #66300.
+
+  03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> sidplay-2.0.9.ebuild:
+  Stable amd64, sparc, x86.
+
+*sidplay-2.0.9 (03 Jul 2004)
+
+  03 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> metadata.xml,
+  -sidplay-2.0.8.ebuild, +sidplay-2.0.9.ebuild:
+  Version bump.  Removing broken version.  Added ~amd64.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> sidplay-2.0.8.ebuild:
+  virtual/glibc -> virtual/libc
+
+  12 Apr 2004; Jason Wever <weeve@gentoo.org> sidplay-2.0.8.ebuild:
+  Added ~sparc keyword.
+
+  19 Mar 2004; David Holm <dholm@gentoo.org> sidplay-2.0.8.ebuild:
+  Added to ~ppc.
+
+*sidplay-2.0.8 (07 Oct 2003)
+
+  07 Oct 2003; Hanno Boeck <hanno@gentoo.org> sidplay-2.0.8.ebuild:
+  Add release version, mask out old cvs-version.
 
 *sidplay-2.0.8.20021111 (11 Nov 2002)
 
diff --git a/media-sound/sidplay/Manifest b/media-sound/sidplay/Manifest
index e69de29bb2d1..76ed294d597c 100644
--- a/media-sound/sidplay/Manifest
+++ b/media-sound/sidplay/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5e31568ed67b5213d105e489f3782245 ChangeLog 1321
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 979166c84f4da9fc84d38b759bb4f51d sidplay-2.0.9.ebuild 584
+MD5 103335dff88d28df38f031243320080a files/digest-sidplay-2.0.9 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBYawyArHZZzCEUG0RAk7mAJ94QPIchkFvu6TxLXOUfjYDKNdIhACfZ2K6
+TwWv6rCQBSHPn1Gp6Ij2mX8=
+=irS+
+-----END PGP SIGNATURE-----
diff --git a/media-sound/sidplay/metadata.xml b/media-sound/sidplay/metadata.xml
index efa54454de71..e1774e3d9ad7 100644
--- a/media-sound/sidplay/metadata.xml
+++ b/media-sound/sidplay/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>hanno@gentoo.org</email></maintainer>
+<herd>sound</herd>
 </pkgmetadata>
diff --git a/media-sound/sidplay/sidplay-2.0.9.ebuild b/media-sound/sidplay/sidplay-2.0.9.ebuild
index e07ef8c34134..47ccc98fe2a1 100644
--- a/media-sound/sidplay/sidplay-2.0.9.ebuild
+++ b/media-sound/sidplay/sidplay-2.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/media-sound/sidplay/sidplay-2.0.9.ebuild,v 1.1 2004/07/03 08:19:01 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sidplay/sidplay-2.0.9.ebuild,v 1.1.1.1 2005/11/30 09:38:10 chriswhite Exp $
 
 IUSE=""
 
@@ -12,9 +12,10 @@ RESTRICT="nomirror"
 SLOT="0"
 LICENSE="GPL-2"
 
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="x86 ~ppc sparc amd64"
 
-DEPEND=">=media-libs/libsidplay-2.1.0"
+DEPEND=">=media-libs/libsidplay-2.1.0
+	dev-util/pkgconfig"
 
 src_install () {
 	make DESTDIR=${D} install || die
diff --git a/media-sound/smixer/ChangeLog b/media-sound/smixer/ChangeLog
index 04e1f3ab7e44..24544ac0d436 100644
--- a/media-sound/smixer/ChangeLog
+++ b/media-sound/smixer/ChangeLog
@@ -1,8 +1,25 @@
 # ChangeLog for media-sound/smixer
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/smixer/ChangeLog,v 1.1 2002/02/01 21:53:31 gbevin Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/smixer/ChangeLog,v 1.1.1.1 2005/11/30 09:38:13 chriswhite Exp $
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> smixer-1.0.1.ebuild:
+  virtual/glibc -> virtual/libc
+
+  22 Jun 2004; Gustavo Zacarias <gustavoz@gentoo.org> smixer-1.0.1.ebuild:
+  Stable on sparc after some time...
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> smixer-1.0.1.ebuild:
+  Added IUSE.
+
+  11 Apr 2004; Jason Wever <weeve@gentoo.org> smixer-1.0.1.ebuild:
+  Added ~sparc keyword.
+
+  28 Jan 2004; Brad House <brad_mssw@gentoo.org> smixer-1.0.1.ebuild:
+  mark stable on amd64
 
 *smixer-1.0.1 (1 Feb 2002)
+  6 Sep 2002; Owen Stampflee <owen@gentoo.org> smixer-1.0.1.ebuild:
+  Added PPC to KEYWORDS.
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
diff --git a/media-sound/smixer/Manifest b/media-sound/smixer/Manifest
index e69de29bb2d1..ad5c90996325 100644
--- a/media-sound/smixer/Manifest
+++ b/media-sound/smixer/Manifest
@@ -0,0 +1,4 @@
+MD5 b92152d09caea931f32bb9801775dc93 ChangeLog 1269
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 ac43338f0f7e5dd099bf533f2991e55a smixer-1.0.1.ebuild 745
+MD5 953ff7226ef2416058053444c42e540f files/digest-smixer-1.0.1 59
diff --git a/media-sound/smixer/files/digest-smixer-1.0.1 b/media-sound/smixer/files/digest-smixer-1.0.1
index 48b111c95fac..526e560c17d0 100644
--- a/media-sound/smixer/files/digest-smixer-1.0.1
+++ b/media-sound/smixer/files/digest-smixer-1.0.1
@@ -1 +1 @@
-MD5 af3673fe064dd240891d96f784bb8efe smixer1.0.1.tgz 12288
+MD5 af3673fe064dd240891d96f784bb8efe smixer1.0.1.tgz 10769
diff --git a/media-sound/smixer/smixer-1.0.1.ebuild b/media-sound/smixer/smixer-1.0.1.ebuild
index eaa9ab261184..d9cc7dda07dc 100644
--- a/media-sound/smixer/smixer-1.0.1.ebuild
+++ b/media-sound/smixer/smixer-1.0.1.ebuild
@@ -1,31 +1,33 @@
-# 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/media-sound/smixer/smixer-1.0.1.ebuild,v 1.1 2001/12/19 03:12:48 hallski Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/smixer/smixer-1.0.1.ebuild,v 1.1.1.1 2005/11/30 09:38:13 chriswhite Exp $
 
-S=${WORKDIR}/${PN}
-DESCRIPTION="A command-line tool for setting and viewing mixer settings."
-SRC_URI="http://centerclick.org/programs/smixer/smixer1.0.1.tgz"
+IUSE=""
+
+DESCRIPTION="A command-line tool for setting and viewing mixer settings"
 HOMEPAGE="http://centerclick.org/programs/smixer/"
+SRC_URI="http://centerclick.org/programs/smixer/${PN}${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc hppa amd64 sparc"
+
+DEPEND="virtual/libc"
 
-RDEPEND="virtual/glibc"
+S=${WORKDIR}/${PN}
 
 src_compile() {
 	emake || die
 }
 
 src_install () {
-	dodir /usr/bin
-	dodir /etc
-	dodir /usr/share/man/man1
-	
-	make INS_BIN=${D}/usr/bin					\
-	     INS_ETC=${D}/etc						\
-	     INS_MAN=${D}/usr/share/man/man1				\
-	     install || die
-
-	dodoc COPYING README
-}
-
+	dodir /usr/bin /etc /usr/share/man/man1
 
+	make \
+		INS_BIN=${D}/usr/bin \
+		INS_ETC=${D}/etc \
+		INS_MAN=${D}/usr/share/man/man1 \
+		install || die
 
+	dodoc README
+}
diff --git a/media-sound/smurf/ChangeLog b/media-sound/smurf/ChangeLog
index e53ea01fee0c..cecc619d2fb5 100644
--- a/media-sound/smurf/ChangeLog
+++ b/media-sound/smurf/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for media-sound/smurf
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/smurf/ChangeLog,v 1.1 2003/06/25 09:40:10 torbenh Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/smurf/ChangeLog,v 1.1.1.1 2005/11/30 09:38:37 chriswhite Exp $
+
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> smurf-0.52.6.ebuild:
+  Don't install COPYING, INSTALL and ABOUT-NLS files.
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> smurf-0.52.6.ebuild:
+  Added to ~ppc.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> smurf-0.52.6.ebuild:
+  Stable amd64, sparc.
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> smurf-0.52.6.ebuild:
+  ~sparc and ~amd64
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> smurf-0.52.6.ebuild:
+  Removed explicit S=
+
+  01 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> smurf-0.52.6.ebuild:
+  Stable on x86.
 
 *smurf-0.52.6 (25 Jun 2003)
 
diff --git a/media-sound/smurf/Manifest b/media-sound/smurf/Manifest
index fd82f683922e..edb62a7d8d05 100644
--- a/media-sound/smurf/Manifest
+++ b/media-sound/smurf/Manifest
@@ -1,2 +1,14 @@
-MD5 5edf42adadf2a0cfb06ea9e0b77adf3e smurf-0.52.6.ebuild 1038
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6105b2ad5eef88868f090fddf0a05b60 ChangeLog 971
+MD5 101c65da92810a496366bff929238ded smurf-0.52.6.ebuild 1103
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 6527f6c7c5c59ff229c6b263702a136a files/digest-smurf-0.52.6 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGtKyj5H05b2HAEkRArveAJ0d1R/zo+hbkiauCh7I+HzijvQBWgCcDtDq
+rvN4EoySUYrwAgbDEF9+02o=
+=lfT0
+-----END PGP SIGNATURE-----
diff --git a/media-sound/smurf/smurf-0.52.6.ebuild b/media-sound/smurf/smurf-0.52.6.ebuild
index fd25f02a6ff7..0db56b81660b 100644
--- a/media-sound/smurf/smurf-0.52.6.ebuild
+++ b/media-sound/smurf/smurf-0.52.6.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/media-sound/smurf/smurf-0.52.6.ebuild,v 1.1 2003/06/25 09:40:10 torbenh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/smurf/smurf-0.52.6.ebuild,v 1.1.1.1 2005/11/30 09:38:37 chriswhite Exp $
 
 DESCRIPTION="The Smurf Sound Font Editor"
 HOMEPAGE="http://smurf.sourceforge.net/"
 SRC_URI="mirror://sourceforge/smurf/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 
 IUSE="nls debug alsa oss png"
 
@@ -19,8 +19,6 @@ DEPEND="=x11-libs/gtk+-1.2*
 
 #RDEPEND=""
 
-S=${WORKDIR}/${P}
-
 src_compile() {
 	local myconf="--with-audiofile"
 	use nls || myconf="${myconf} --disable-nls"
@@ -35,5 +33,5 @@ src_compile() {
 
 src_install() {
 	einstall || die
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README
+	dodoc AUTHORS ChangeLog HACKING NEWS README
 }
diff --git a/media-sound/snd/ChangeLog b/media-sound/snd/ChangeLog
index 60d1b741d102..056b1ea5b0de 100644
--- a/media-sound/snd/ChangeLog
+++ b/media-sound/snd/ChangeLog
@@ -1,6 +1,76 @@
-# ChangeLog for media-sound/snd-6
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# ChangeLog for media-sound/snd
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/snd/ChangeLog,v 1.1.1.1 2005/11/30 09:38:29 chriswhite Exp $
 
+*snd-7.15 (04 Oct 2005)
+
+  04 Oct 2005; MATSUU Takuto <matsuu@gentoo.org> +snd-7.15.ebuild:
+  Version bumped.
+  Add some USE flag. Bug 108024.
+
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> snd-7.1.ebuild,
+  snd-7.4.ebuild, snd-7.10.ebuild:
+  Don't install COPYING file.
+
+  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> snd-7.10.ebuild:
+  Stable on ppc.
+
+*snd-7.10 (13 Mar 2005)
+
+  13 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> +snd-7.10.ebuild:
+  new upstream release, fixes #81448
+
+  28 Dec 2004; Olivier Fisette <ribosome@gentoo.org> snd-7.4.ebuild:
+  Dependency update: dev-libs/gsl -> sci-libs/gsl.
+
+  28 Dec 2004; Olivier Fisette <ribosome@gentoo.org> snd-7.1.ebuild:
+  Dependency update: dev-libs/gsl -> sci-libs/gsl.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> snd-7.4.ebuild:
+  Stable sparc.
+
+  03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> snd-7.4.ebuild:
+  Added to ~sparc
+
+  24 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org> snd-7.4.ebuild:
+  Stable x86 amd64
+
+*snd-7.4 (21 May 2004)
+
+  21 May 2004; Jon Hood <squinky86@gentoo.org> -snd-6.7.ebuild,
+  -snd-7.0.ebuild, +snd-7.4.ebuild:
+  version bump and cleanup irt #48464
+
+  12 Apr 2004; Mamoru KOMACHI <usata@gentoo.org> snd-6.7.ebuild,
+  snd-7.0.ebuild, snd-7.1.ebuild:
+  virtual/ruby fix
+
+  01 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> snd-7.1.ebuild:
+  Stable x86.
+
+  23 Mar 2004; Dylan Carlson <absinthe@gentoo.org> snd-7.1.ebuild:
+  Added ~amd64 to KEYWORDS.
+
+*snd-7.1 (11 Jan 2004)
+
+  11 Jan 2004; Martin Holzer <mholzer@gentoo.org> snd-7.1.ebuild:
+  Version bumped
+
+*snd-7.0 (08 Jan 2004)
+
+  08 Jan 2004; Martin Holzer <mholzer@gentoo.org> snd-7.0.ebuild:
+  Version bumped. Closes 37046
+
+  21 Jun 2003; jje <jje@gentoo.org> snd-6.7.ebuild, snd-6.ebuild:
+  Remove snd-6 and move snd-6.7 to stable.
+
+  14 May 2003; robh <robh@gentoo.org> snd-6.7.ebuild:
+  Fixed S, packaing appears to have changed without version change.
+
+*snd-6.7 (09 Apr 2003)
+
+  09 Apr 2003; Martin Holzer <mholzer@gentoo.org> Manifest, snd-6.7.ebuild:
+  Now corrected. stable release. Closes #7626.
 
 *snd-6.ebuild (6 Aug 2002)
 
diff --git a/media-sound/snd/Manifest b/media-sound/snd/Manifest
index 779fc4876db1..b8d8f5ab73a3 100644
--- a/media-sound/snd/Manifest
+++ b/media-sound/snd/Manifest
@@ -1,5 +1,6 @@
-MD5 d2e8e0f746f0d0ff1335015a207f4916 ChangeLog 693
-MD5 4c1b640c42b9058a92ceb69d1f618b16 snd-6.ebuild 1691
-MD5 83fa92f3c98725a0e37650016c81c952 snd-6.7.ebuild 1664
-MD5 cfd80dce79511197bafc596a9125c832 files/digest-snd-6.7 60
-MD5 1ea5507c2a0014db967c8490f9d2becf files/digest-snd-6 58
+MD5 b216c69c2342a6801062a1e1f806275b snd-7.15.ebuild 1694
+MD5 0f65d306cdb9269f20d386413bd1e992 snd-7.10.ebuild 1677
+MD5 93fd3c6d4ec08f156404ab5a77e9fe47 ChangeLog 2778
+MD5 527dcfe3ce0f0b53c6b6aa8b82eb930c metadata.xml 252
+MD5 64e6271ddc8b655bf67b620f325dc01d files/digest-snd-7.10 61
+MD5 fd589e474be593bb2e56ca029a6ca4f3 files/digest-snd-7.15 61
diff --git a/media-sound/snd/snd-7.10.ebuild b/media-sound/snd/snd-7.10.ebuild
index 8ef4603ea9ff..9f2ee7c84104 100644
--- a/media-sound/snd/snd-7.10.ebuild
+++ b/media-sound/snd/snd-7.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/media-sound/snd/snd-7.10.ebuild,v 1.1 2005/03/13 22:00:32 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/snd/snd-7.10.ebuild,v 1.1.1.1 2005/11/30 09:38:29 chriswhite Exp $
 
 IUSE="esd motif guile X gtk ruby alsa"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://snd.sourceforge.net"
 
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="x86 amd64 ~ppc sparc"
+KEYWORDS="x86 amd64 ppc sparc"
 
 DEPEND="X? ( virtual/x11 )
 	sci-libs/gsl
@@ -66,7 +66,7 @@ src_compile() {
 src_install () {
 	dobin snd
 
-	dodoc COPYING *.Snd *.scm *.rb *.png *.html
+	dodoc *.Snd *.scm *.rb *.png *.html
 
 	cd tutorial
 	dohtml *
diff --git a/media-sound/snd/snd-7.15.ebuild b/media-sound/snd/snd-7.15.ebuild
index 32950e1fb49b..4ceb529d11f3 100644
--- a/media-sound/snd/snd-7.15.ebuild
+++ b/media-sound/snd/snd-7.15.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/snd/snd-7.15.ebuild,v 1.1 2005/10/04 13:49:09 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/snd/snd-7.15.ebuild,v 1.1.1.1 2005/11/30 09:38:29 chriswhite Exp $
 
 IUSE="X alsa esd fam fftw gsl gtk guile jack ladspa motif nls opengl ruby"
 
+inherit multilib
+
 S="${WORKDIR}/${P/\.*//}"
 DESCRIPTION="Snd is a sound editor"
 HOMEPAGE="http://ccrma.stanford.edu/software/snd/"
@@ -22,7 +24,7 @@ DEPEND="media-libs/audiofile
 	gsl? ( >=sci-libs/gsl-0.8 )
 	gtk? ( >=x11-libs/gtk+-2 )
 	guile? ( >=dev-util/guile-1.3.4 )
-	jack? ( media-sound/jack )
+	jack? ( media-sound/jack-audio-connection-kit )
 	ladspa? ( media-libs/ladspa-sdk )
 	motif? ( x11-libs/openmotif )
 	nls? ( sys-devel/gettext )
diff --git a/media-sound/solfege/ChangeLog b/media-sound/solfege/ChangeLog
index 350a863274d5..4e7110f28f0f 100644
--- a/media-sound/solfege/ChangeLog
+++ b/media-sound/solfege/ChangeLog
@@ -1,6 +1,54 @@
 # ChangeLog for media-sound/solfege
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/ChangeLog,v 1.1 2004/02/10 09:20:34 eradicator Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/ChangeLog,v 1.1.1.1 2005/11/30 09:38:38 chriswhite Exp $
+
+*solfege-3.0.2 (04 Oct 2005)
+
+  04 Oct 2005; MATSUU Takuto <matsuu@gentoo.org> +solfege-3.0.2.ebuild:
+  Version bumped.
+  Cleanup ebuild.
+
+  04 Sep 2005; Diego Petten嘆 <flameeyes@gentoo.org> solfege-2.0.5.ebuild,
+  solfege-2.0.6.ebuild:
+  Don't install COPYING and INSTALL files.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  solfege-2.0.6.ebuild:
+  Stable x86.
+
+*solfege-2.0.6 (19 Nov 2004)
+
+  19 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -solfege-2.0.4.ebuild, solfege-2.0.5.ebuild, +solfege-2.0.6.ebuild:
+  Moved to -amd64, -sparc as the package compiles but crashes at startup.
+
+*solfege-2.0.6 (19 Nov 2004)
+
+  19 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -solfege-2.0.4.ebuild, solfege-2.0.5.ebuild, +solfege-2.0.6.ebuild:
+  Version bump.
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  solfege-2.0.5.ebuild:
+  get_libdir fixes.
+
+  03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> solfege-2.0.5.ebuild:
+  Stable x86.
+
+*solfege-2.0.5 (30 Jul 2004)
+
+  30 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +solfege-2.0.5.ebuild:
+  Version bump closes bug #58535.
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> solfege-2.0.4.ebuild:
+  Added ~amd64
+
+  20 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> solfege-2.0.4.ebuild:
+  Forcing oss as it is required... see bug #43889.  Stable x86.
+
+  10 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> solfege-2.0.4.ebuild:
+  Added sed to DEPEND
 
 *solfege-2.0.4 (10 Feb 2004)
 
diff --git a/media-sound/solfege/Manifest b/media-sound/solfege/Manifest
index 17d6cdfab01c..5cd1df700ef4 100644
--- a/media-sound/solfege/Manifest
+++ b/media-sound/solfege/Manifest
@@ -1,2 +1,8 @@
-MD5 f7691fbc3697b7a86c060075a00c8163 solfege-2.0.4.ebuild 2217
-MD5 a935b63a600c678e02199cb3e642981f files/digest-solfege-2.0.4 65
+MD5 b273b265b3eb5a4e4af4365008a31d09 solfege-3.0.2.ebuild 1360
+MD5 05cdba68c029ca60166bf2def1c5dc39 solfege-2.0.6.ebuild 2320
+MD5 08d2e0d35e64e3a7fb048fa27e2b2431 solfege-2.0.5.ebuild 2313
+MD5 7a345673f3c52fbc881cc9541848fe97 ChangeLog 1965
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 4feeb666e6f701c7bb9f30077b9a75bd files/digest-solfege-2.0.5 65
+MD5 1f6fe78cd9b8f64575cfa82ebbb4820f files/digest-solfege-2.0.6 65
+MD5 15ad137884bdd1a7a08c9bd55c4301cb files/digest-solfege-3.0.2 65
diff --git a/media-sound/solfege/solfege-2.0.5.ebuild b/media-sound/solfege/solfege-2.0.5.ebuild
index b31c143ee868..440c25582a22 100644
--- a/media-sound/solfege/solfege-2.0.5.ebuild
+++ b/media-sound/solfege/solfege-2.0.5.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/media-sound/solfege/solfege-2.0.5.ebuild,v 1.1 2004/07/31 01:39:50 eradicator Exp $
-
-inherit python
+# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/solfege-2.0.5.ebuild,v 1.1.1.1 2005/11/30 09:38:38 chriswhite Exp $
 
 IUSE="gtkhtml gnome oss"
+
+inherit python eutils
+
 DESCRIPTION="GNU Solfege is a program written to help you practice ear training."
 HOMEPAGE="http://www.solfege.org"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="-amd64 x86"
 
 RDEPEND=">=dev-lang/python-2.3
 	>=x11-libs/gtk+-2.0
@@ -35,7 +36,7 @@ pkg_setup() {
 	#  which needs X11, and breaks in console)
 	use gtkhtml \
 		&& python_version \
-		&& [ ! -f ${ROOT}usr/lib/python${PYVER}/site-packages/gtk-2.0/gtkhtml2.so ] \
+		&& [ ! -f ${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/gtk-2.0/gtkhtml2.so ] \
 		&& eerror "Could not find the GTKHtml2 python module, whereas gtkhml is in your flags." \
 		&& eerror "Please re-emerge \"dev-python/gnome-python\" with \"gtkhtml\" USE flag on." \
 		&& die "You will have to re-emerge gnome-python."
@@ -70,6 +71,6 @@ src_install() {
 #	make DESTDIR=${D} install || die "Installation failed."
 	einstall || die "Installation failed."
 	rm -f ${D}usr/bin/${PN}${PV}
-	dodoc AUTHORS changelog COPYING FAQ INSTALL README TODO
+	dodoc AUTHORS changelog FAQ README TODO
 }
 
diff --git a/media-sound/solfege/solfege-2.0.6.ebuild b/media-sound/solfege/solfege-2.0.6.ebuild
index 2233d8b72f59..26394790a1c5 100644
--- a/media-sound/solfege/solfege-2.0.6.ebuild
+++ b/media-sound/solfege/solfege-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/media-sound/solfege/solfege-2.0.6.ebuild,v 1.1 2004/11/19 22:55:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/solfege-2.0.6.ebuild,v 1.1.1.1 2005/11/30 09:38:38 chriswhite Exp $
 
 IUSE="gtkhtml gnome oss"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-amd64 -sparc ~x86"
+KEYWORDS="-amd64 -sparc x86"
 
 RDEPEND=">=dev-lang/python-2.3
 	>=x11-libs/gtk+-2.0
@@ -71,6 +71,6 @@ src_install() {
 #	make DESTDIR=${D} install || die "Installation failed."
 	einstall || die "Installation failed."
 	rm -f ${D}usr/bin/${PN}${PV}
-	dodoc AUTHORS changelog COPYING FAQ INSTALL README TODO
+	dodoc AUTHORS changelog FAQ README TODO
 }
 
diff --git a/media-sound/solfege/solfege-3.0.2.ebuild b/media-sound/solfege/solfege-3.0.2.ebuild
index 166aa1ee4357..4e146558b14e 100644
--- a/media-sound/solfege/solfege-3.0.2.ebuild
+++ b/media-sound/solfege/solfege-3.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/media-sound/solfege/solfege-3.0.2.ebuild,v 1.1 2005/10/04 14:59:04 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/solfege-3.0.2.ebuild,v 1.1.1.1 2005/11/30 09:38:38 chriswhite Exp $
 
 IUSE="alsa oss"
 
diff --git a/media-sound/sonic-rainbow/ChangeLog b/media-sound/sonic-rainbow/ChangeLog
index 947f4ca3828f..66d6fb9d4ac2 100644
--- a/media-sound/sonic-rainbow/ChangeLog
+++ b/media-sound/sonic-rainbow/ChangeLog
@@ -1,6 +1,36 @@
 # ChangeLog for media-sound/sonic-rainbow
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sonic-rainbow/ChangeLog,v 1.1 2004/04/06 18:26:27 eradicator Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sonic-rainbow/ChangeLog,v 1.1.1.1 2005/11/30 09:38:31 chriswhite Exp $
+
+  10 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  sonic-rainbow-0.5.1.ebuild, sonic-rainbow-0.6.2.1.ebuild,
+  sonic-rainbow-0.6.2.2.ebuild:
+  Don't install INSTALL file.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  sonic-rainbow-0.6.2.2.ebuild:
+  Stable amd64, sparc, x86.
+
+  17 Jul 2004; David Holm <dholm@gentoo.org> sonic-rainbow-0.6.2.2.ebuild:
+  Added to ~ppc.
+
+*sonic-rainbow-0.6.2.2 (12 Jul 2004)
+
+  12 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +sonic-rainbow-0.6.2.2.ebuild:
+  Version bump closes bug #56591.
+
+  08 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/sonic-rainbow-0.5.1-Makefile.patch,
+  -files/sonic-rainbow-Makefile.patch:
+  Version bump.  ~sparc ~amd64.
+
+  06 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  sonic-rainbow-0.5.1.ebuild:
+  Stable x86.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> sonic-rainbow-0.5.1.ebuild:
+  Add inherit eutils
 
 *sonic-rainbow-0.5.1 (06 Apr 2004)
 
diff --git a/media-sound/sonic-rainbow/Manifest b/media-sound/sonic-rainbow/Manifest
index 8e9576549448..4f536cec6a50 100644
--- a/media-sound/sonic-rainbow/Manifest
+++ b/media-sound/sonic-rainbow/Manifest
@@ -1,2 +1,19 @@
-MD5 415818860f4b02dc84bac5c3ee5d5511 sonic-rainbow-0.5.1.ebuild 1020
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2f6c50008f60bd19306528637a95dd11 sonic-rainbow-0.6.2.1.ebuild 1046
+MD5 542f83e34737df2aca45ced5147fe2a0 ChangeLog 1393
+MD5 f399e72a43280b895126b41ccbe3b93e sonic-rainbow-0.6.2.2.ebuild 1048
+MD5 0ae097ab8e934aa11657572b9913df87 sonic-rainbow-0.5.1.ebuild 1023
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 fd1e90f4e252f2a39841cdaa684f0259 files/digest-sonic-rainbow-0.6.2.1 78
+MD5 6d1750dd1771dd596280da180b0fd848 files/sonic-rainbow-0.5.1-Makefile.patch 1658
+MD5 7334b845e08f1b8b3f624e9de521cb24 files/digest-sonic-rainbow-0.6.2.2 78
 MD5 da28b7b6f4f8d602c5918175b35600a7 files/digest-sonic-rainbow-0.5.1 76
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDIv+zj5H05b2HAEkRAhkfAJ91O5G3KA8YJ0lw2yS64mjwcKwORQCeMhfI
+JMbkMrl8tbQYqwGdvGvcxRw=
+=PSsR
+-----END PGP SIGNATURE-----
diff --git a/media-sound/sonic-rainbow/sonic-rainbow-0.5.1.ebuild b/media-sound/sonic-rainbow/sonic-rainbow-0.5.1.ebuild
index d073a12f1fd1..b3a09c030491 100644
--- a/media-sound/sonic-rainbow/sonic-rainbow-0.5.1.ebuild
+++ b/media-sound/sonic-rainbow/sonic-rainbow-0.5.1.ebuild
@@ -1,9 +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/media-sound/sonic-rainbow/sonic-rainbow-0.5.1.ebuild,v 1.1 2004/04/06 18:26:27 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sonic-rainbow/sonic-rainbow-0.5.1.ebuild,v 1.1.1.1 2005/11/30 09:38:32 chriswhite Exp $
 
 IUSE=""
 
+inherit eutils
+
 S=${WORKDIR}/${PN}
 DESCRIPTION="a Linux GUI multimedia player"
 HOMEPAGE="http://sonic-rainbow.sourceforge.net/"
@@ -24,18 +26,18 @@ DEPEND="app-cdr/cdrtools
 	>=x11-libs/gtk+-1.2"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~amd64 ~sparc"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	epatch ${FILESDIR}/${PN}-Makefile.patch
+	epatch ${FILESDIR}/${P}-Makefile.patch
 }
 
 src_install() {
 	make DESTDIR=${D} localedir=${D}/usr/share/locale install || die
 
-	dodoc AUTHORS INSTALL README
+	dodoc AUTHORS README
 	dohtml doc/Sonic-Rainbow.html
 }
diff --git a/media-sound/sonic-rainbow/sonic-rainbow-0.6.2.1.ebuild b/media-sound/sonic-rainbow/sonic-rainbow-0.6.2.1.ebuild
index 4dc3bd3207e0..fd6848c1d70d 100644
--- a/media-sound/sonic-rainbow/sonic-rainbow-0.6.2.1.ebuild
+++ b/media-sound/sonic-rainbow/sonic-rainbow-0.6.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/media-sound/sonic-rainbow/sonic-rainbow-0.6.2.1.ebuild,v 1.1 2004/07/08 23:26:09 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sonic-rainbow/sonic-rainbow-0.6.2.1.ebuild,v 1.1.1.1 2005/11/30 09:38:31 chriswhite Exp $
 
 inherit eutils
 
@@ -35,6 +35,6 @@ src_install() {
 	# Remove the docs they install
 	rm -rf ${D}/usr/share/Sonic-Rainbow/
 
-	dodoc AUTHORS INSTALL README
+	dodoc AUTHORS README
 	dohtml doc/Sonic-Rainbow.html
 }
diff --git a/media-sound/sonic-rainbow/sonic-rainbow-0.6.2.2.ebuild b/media-sound/sonic-rainbow/sonic-rainbow-0.6.2.2.ebuild
index 2a9e2f560980..a0776e08bcd0 100644
--- a/media-sound/sonic-rainbow/sonic-rainbow-0.6.2.2.ebuild
+++ b/media-sound/sonic-rainbow/sonic-rainbow-0.6.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/media-sound/sonic-rainbow/sonic-rainbow-0.6.2.2.ebuild,v 1.1 2004/07/13 02:46:37 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sonic-rainbow/sonic-rainbow-0.6.2.2.ebuild,v 1.1.1.1 2005/11/30 09:38:31 chriswhite Exp $
 
 inherit eutils
 
@@ -27,7 +27,7 @@ DEPEND="virtual/cdrtools
 	>=x11-libs/gtk+-1.2"
 
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~amd64"
+KEYWORDS="x86 sparc amd64 ~ppc"
 
 src_install() {
 	make DESTDIR=${D} localedir=${D}/usr/share/locale install || die
@@ -35,6 +35,6 @@ src_install() {
 	# Remove the docs they install
 	rm -rf ${D}/usr/share/Sonic-Rainbow/
 
-	dodoc AUTHORS INSTALL README
+	dodoc AUTHORS README
 	dohtml doc/Sonic-Rainbow.html
 }
diff --git a/media-sound/sooperlooper/ChangeLog b/media-sound/sooperlooper/ChangeLog
index a06b8fba83be..e7aabb7bea75 100644
--- a/media-sound/sooperlooper/ChangeLog
+++ b/media-sound/sooperlooper/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/sooperlooper
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sooperlooper/ChangeLog,v 1.1 2005/05/02 23:12:17 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sooperlooper/ChangeLog,v 1.1.1.1 2005/11/30 09:38:02 chriswhite Exp $
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> sooperlooper-1.0.3.ebuild:
+  Added to ~ppc.
 
 *sooperlooper-1.0.3 (03 May 2005)
 
diff --git a/media-sound/sooperlooper/Manifest b/media-sound/sooperlooper/Manifest
index 2550f754a1ad..122e6fdafc1a 100644
--- a/media-sound/sooperlooper/Manifest
+++ b/media-sound/sooperlooper/Manifest
@@ -1,4 +1,4 @@
-MD5 96db41e7a8919802a65f1a6058f415e8 sooperlooper-1.0.3.ebuild 705
+MD5 f500faba056275cfe16bd09f9bfdf3c7 ChangeLog 528
 MD5 ae2f0ce6b633cd6e8ea199bdabb85098 metadata.xml 227
-MD5 a6e079a75b77ae3d17cd2f204ceeda9a ChangeLog 343
+MD5 4b53b4a96d7ced2800b59a0c7742fd8f sooperlooper-1.0.3.ebuild 821
 MD5 4c1fc7d5dc09b84ab6f452c0ba4bdf76 files/digest-sooperlooper-1.0.3 70
diff --git a/media-sound/sooperlooper/sooperlooper-1.0.3.ebuild b/media-sound/sooperlooper/sooperlooper-1.0.3.ebuild
index eaae80c701fd..175fd5486df7 100644
--- a/media-sound/sooperlooper/sooperlooper-1.0.3.ebuild
+++ b/media-sound/sooperlooper/sooperlooper-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/media-sound/sooperlooper/sooperlooper-1.0.3.ebuild,v 1.1 2005/05/02 23:12:17 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sooperlooper/sooperlooper-1.0.3.ebuild,v 1.1.1.1 2005/11/30 09:38:02 chriswhite Exp $
 
 DESCRIPTION="SooperLooper is a live looping sampler capable of immediate loop recording, overdubbing, multiplying, reversing and more."
 HOMEPAGE="http://essej.net/sooperlooper/index.html"
@@ -9,7 +9,7 @@ RESTRICT=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND=">=media-sound/jack-audio-connection-kit-0.80.0
diff --git a/media-sound/sound-juicer/ChangeLog b/media-sound/sound-juicer/ChangeLog
index 4ef373e26670..b0bce576ff03 100644
--- a/media-sound/sound-juicer/ChangeLog
+++ b/media-sound/sound-juicer/ChangeLog
@@ -1,8 +1,269 @@
 # ChangeLog for media-sound/sound-juicer
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sound-juicer/ChangeLog,v 1.1 2003/04/19 11:48:34 foser Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sound-juicer/ChangeLog,v 1.1.1.1 2005/11/30 09:38:21 chriswhite Exp $
+
+*sound-juicer-2.12.2-r1 (14 Oct 2005)
+
+  14 Oct 2005; John N. Laliberte <allanonjl@gentoo.org>
+  +files/sound-juicer-2.12.2-file-chooser-3.patch,
+  +sound-juicer-2.12.2-r1.ebuild:
+  apply patch to fix when going to edit->preferences, fixes #108895
+
+*sound-juicer-2.12.2 (03 Oct 2005)
+
+  03 Oct 2005; Leonardo Boshell <leonardop@gentoo.org>
+  -sound-juicer-2.12.0.ebuild, +sound-juicer-2.12.2.ebuild:
+  New version.
+
+  19 Sep 2005; Saleem Abdulrasool <compnerd@gentoo.org>
+  sound-juicer-2.12.0.ebuild:
+  Adding dep on gnome-doc-utils; Resolves Bug#103322
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org>
+  sound-juicer-2.10.1.ebuild:
+  Mark 2.10.1 stable on alpha
+
+*sound-juicer-2.12.0 (11 Sep 2005)
+
+  11 Sep 2005; John N. Laliberte <allanonjl@gentoo.org>
+  -sound-juicer-2.11.92.ebuild, +sound-juicer-2.12.0.ebuild:
+  2.12 release vbump
+
+*sound-juicer-2.11.92 (29 Aug 2005)
+
+  29 Aug 2005; John N. Laliberte <allanonjl@gentoo.org>
+  -sound-juicer-2.11.91.ebuild, +sound-juicer-2.11.92.ebuild:
+  new version
+
+  24 Aug 2005; Aron Griffis <agriffis@gentoo.org>
+  sound-juicer-2.10.1.ebuild:
+  stable on ia64
+
+*sound-juicer-2.10.1-r1 (24 Aug 2005)
+
+  24 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/sound-juicer-2.10.1-fbsd.patch, +sound-juicer-2.10.1-r1.ebuild:
+  Added patch to let sound-juicer build on Gentoo/FreeBSD.
+
+*sound-juicer-2.11.91 (23 Aug 2005)
+
+  23 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
+  +sound-juicer-2.11.91.ebuild:
+  New version.
+
+  08 Aug 2005; Markus Rothe <corsair@gentoo.org> sound-juicer-2.10.1.ebuild:
+  Stable on ppc64
+
+  02 Aug 2005; Simon Stelling <blubb@gentoo.org> sound-juicer-2.10.1.ebuild:
+  stable on amd64
+
+  31 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  sound-juicer-2.10.1.ebuild:
+  ppc stable
+
+  27 Jul 2005; Guy Martin <gmsoft@gentoo.org> sound-juicer-2.10.1.ebuild:
+  Stable on hppa.
+
+  27 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  sound-juicer-2.10.1.ebuild:
+  Stable on sparc
+
+  26 Jul 2005; Leonardo Boshell <leonardop@gentoo.org>
+  sound-juicer-2.10.1.ebuild:
+  Stable on x86.
+
+*sound-juicer-2.10.1 (06 Jul 2005)
+
+  06 Jul 2005; Leonardo Boshell <leonardop@gentoo.org>
+  sound-juicer-2.10.1.ebuild:
+  New release.
+
+  02 Jul 2005; Nathaniel McCallum <npmccallum@gentoo.org>
+  sound-juicer-0.5.15.ebuild:
+  Updated hal dependencies (to avoid future conflicts).
+
+  02 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  sound-juicer-2.10.0.ebuild:
+  Stable on alpha.
+
+  25 Jun 2005; Guy Martin <gmsoft@gentoo.org> sound-juicer-2.10.0.ebuild:
+  Stable on hppa.
+
+  13 Jun 2005; Bryan Østergaard <kloeri@gentoo.org>
+  sound-juicer-2.10.0.ebuild:
+  Add ~alpha keyword.
+
+  12 Jun 2005; Olivier Crête <tester@gentoo.org>
+  sound-juicer-2.10.0.ebuild:
+  Stable on amd64
+
+  12 Jun 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  sound-juicer-2.10.0.ebuild:
+  Stable on ppc.
+
+  09 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  sound-juicer-2.10.0.ebuild:
+  Stable on sparc
+
+  09 Jun 2005; Markus Rothe <corsair@gentoo.org> sound-juicer-2.10.0.ebuild:
+  Stable on ppc64
+
+  28 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  sound-juicer-0.5.15.ebuild, sound-juicer-2.10.0.ebuild:
+  Dont make use of the deprecated oggvorbis useflag any longer, see #94254.
+  Marked 0.5.15 stable on amd64.
+
+  08 May 2005; Aron Griffis <agriffis@gentoo.org> sound-juicer-2.10.0.ebuild:
+  add ~ia64
+
+  06 May 2005; Markus Rothe <corsair@gentoo.org> sound-juicer-2.10.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  21 Mar 2005; foser <foser@gentoo.org> sound-juicer-2.10.0.ebuild :
+  Add gnome-media dep (#86097)
+
+*sound-juicer-2.10.0 (11 Mar 2005)
+
+  11 Mar 2005; foser <foser@gentoo.org> sound-juicer-2.10.0.ebuild :
+  Gnome 2.10 release, fixed deps
+  fixed USE flags to be more inline with default functionality
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  sound-juicer-0.5.15.ebuild:
+  Added to ~sparc.
+
+*sound-juicer-0.5.15 (13 Dec 2004)
+
+  13 Dec 2004; foser <foser@gentoo.org> sound-juicer-0.5.15.ebuild :
+  New release 
+
+*sound-juicer-0.5.14 (12 Oct 2004)
+
+  12 Oct 2004; foser <foser@gentoo.org> sound-juicer-0.5.14.ebuild :
+  New release, add hal USE & switch
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -sound-juicer-0.5.10.1.ebuild, -sound-juicer-0.5.11.ebuild,
+  -sound-juicer-0.5.12-r1.ebuild:
+  Stable amd64, x86.  Removing old ebuilds.
+
+*sound-juicer-0.5.12-r2 (01 Sep 2004)
+
+  01 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/sound-juicer-0.5.12-div0.patch, +sound-juicer-0.5.12-r2.ebuild:
+  Fix div0 bug #61681 thanks to James <James@superbug.demon.co.uk>.
+
+*sound-juicer-0.5.12-r1 (20 Jul 2004)
+
+  20 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +sound-juicer-0.5.12-r1.ebuild:
+  Revision bump for lame encoding support. Thanks to Marc Heerdink
+  <marc@koelkast.net>. Closes bug #57750.
+
+*sound-juicer-0.5.12 (09 Jul 2004)
+
+  09 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +sound-juicer-0.5.12.ebuild:
+  Version bump closes bug #56501.
+
+*sound-juicer-0.5.11 (24 Apr 2004)
+
+  24 Apr 2004; foser <foser@gentoo.org> sound-juicer-0.5.11.ebuild :
+  New release, update gstreamer deps to 0.8 only
+
+  03 Apr 2004; foser <foser@gentoo.org> sound-juicer-*.ebuild :
+  Fix gstreamer deps to 0.6
+
+  12 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  sound-juicer-0.5.9.ebuild:
+  Removing broken version.  See bug #41290.
+
+*sound-juicer-0.5.10.1 (06 Feb 2004)
+
+  06 Feb 2004; foser <foser@gentoo.org> sound-juicer-0.5.10.1.ebuild :
+  New release
+
+*sound-juicer-0.5.9 (27 Jan 2004)
+
+  27 jan 2004; foser <foser@gentoo.org> sound-juicer-0.5.9.ebuild :
+  New release
+
+*sound-juicer-0.5.8 (28 Nov 2003)
+
+  28 nov 2003; foser <foser@gentoo.org> sound-juicer-0.5.8.ebuild :
+  New release
+
+  20 Nov 2003; Luca Barbato <lu_zero@gentoo.org> sound-juicer-0.5.7.ebuild:
+  Marked ~ppc
+
+*sound-juicer-0.5.7 (15 Nov 2003)
+
+  15 Nov 2003; foser <foser@gentoo.org> sound-juicer-0.5.7.ebuild ;
+  New release, removed explicit gst-plugins dep
+
+*sound-juicer-0.5.6 (30 Oct 2003)
+
+  30 Oct 2003; foser <foser@gentoo.org> sound-juicer-0.5.6.ebuild :
+  New version
+
+*sound-juicer-0.5.5 (04 Oct 2003)
+
+  04 Oct 2003; foser <foser@gentoo.org> sound-juicer-0.5.5.ebuild :
+  New version
+  removed flac/lame deps, they're non-essential
+
+  23 Sep 2003; Brad Laue <brad@gentoo.org> sound-juicer-0.5.4.ebuild:
+  Add dependency on the newly imported lame/flac gstreamer plugins.
+
+*sound-juicer-0.5.4 (22 Sep 2003)
+
+  22 Sep 2003; <spider@gentoo.org> sound-juicer-0.5.4.ebuild:
+  Updated build to avoid some crashes
+
+*sound-juicer-0.5.2 (08 Sep 2003)
+
+  12 Sep 2003; foser <foser@gentoo.org> sound-juicer-0.5.2.ebuild :
+  Updated the moved gst-plugins-* deps
+
+  08 Sep 2003; foser <foser@gentoo.org> sound-juicer-0.5.2.ebuild :
+  New version, adapted to use the new gst-plugins layout 
+  Add mad and oggvorbis USE flags
+
+*sound-juicer-0.5.1 (16 Aug 2003)
+
+  16 Aug 2003; Nick Hadaway <raker@gentoo.org> sound-juicer-0.5.1.ebuild:
+  Version bump.  Thanks Jason Oliveira on bug #26704 for being quick on
+  the draw with the new release.
+
+*sound-juicer-0.4.1 (04 Jul 2003)
+
+  04 Jul 2003; Alastair Tse <liquidx@gentoo.org> sound-juicer-0.4.1.ebuild:
+  version bump
+
+*sound-juicer-0.3-r5 (17 Jun 2003)
+
+  17 Jun 2003; foser <foser@gentoo.org> sound-juicer-0.3-r5.ebuild :
+  bump, using experimental gst-plugins eclass stuff
+
+*sound-juicer-0.3 (28 May 2003)
+
+  28 May 2003; foser <foser@gentoo.org> sound-juicer-0.3.ebuild :
+  New version, added workaround for gst-inspect sandbox problems
+
+*sound-juicer-0.2.1 (30 Apr 2003)
+
+  30 Apr 2003; foser <foser@gentoo.org> sound-juicer-0.2.1.ebuild :
+  New version
+
+*sound-juicer-0.1-r1 (23 Apr 2003)
+
+  23 Apr 2003; foser <foser@gentoo.org> sound-juicer-0.1-r1.ebuild :
+  Added some patches
 
 *sound-juicer-0.1 (19 Apr 2003)
 
+  21 Apr 2003; foser <foser@gentoo.org> sound-juicer-0.1.ebuild :
+  Fix possible compile time problem with certain plugins not existing (#19717)
+
   19 Apr 2003; foser <foser@gentoo.org> ChangeLog, sound-juicer-0.1.ebuild :
   Initial commit, added patch to be 'slightly more' paranoid
diff --git a/media-sound/sound-juicer/Manifest b/media-sound/sound-juicer/Manifest
index bb7a7db017fb..a78f3719adbb 100644
--- a/media-sound/sound-juicer/Manifest
+++ b/media-sound/sound-juicer/Manifest
@@ -1,11 +1,12 @@
-MD5 11ab94cba4aae7b60b0baefb164302c1 sound-juicer-0.2.1.ebuild 795
-MD5 96523530748acee859880ecc1c05f7f2 sound-juicer-0.1-r1.ebuild 1227
-MD5 667fa2eaa537f811eaaa03ee397ba070 ChangeLog 791
-MD5 11ab94cba4aae7b60b0baefb164302c1 sound-juicer-0.3.ebuild 795
-MD5 4b4b5eaf1d207bd47e80205ae3c987b6 files/digest-sound-juicer-0.2.1 70
-MD5 efe7af84cebeb4a031076644ffde1240 files/digest-sound-juicer-0.3 68
-MD5 75969594c2832ac0b3113c8d6636594c files/digest-sound-juicer-0.1-r1 68
-MD5 556cf0e598558a2cfbe7cb4d77b94aa9 files/sound-juicer-0.1-nocrash_on_missing_plugins.patch 2793
-MD5 2148ce592267df4d3b7b660e5b946fdb files/sound-juicer-0.1-warn_plugins_missing.patch 971
-MD5 634d3f6a1a016b8593b34eef7745eb05 files/sound-juicer-0.1-paranoia-r1.patch 5068
-MD5 42399e09dddbd4172c9f328242c1e662 files/sound-juicer-0.1-avoid_illegal_filename.patch 1227
+MD5 17b3f276240cce1cb0209c78561daa49 sound-juicer-2.12.2.ebuild 1284
+MD5 6491268d5a5734fc3619db45c8efd20c sound-juicer-2.12.2-r1.ebuild 1437
+MD5 4706b8ba9d6a576d11ac9347f328e9cf ChangeLog 8273
+MD5 b263ff7675308d90b75a170acae3f5ff metadata.xml 177
+MD5 be48f49717ac43a92002c4bf5ed7d6ed sound-juicer-2.10.1.ebuild 1121
+MD5 31312b751ee9ef5a4bc58c2b120d19af sound-juicer-2.10.1-r1.ebuild 1218
+MD5 4a12b02268da91a70551d700de39f32a files/digest-sound-juicer-2.10.1 72
+MD5 4538566af04ec19705e775fb45b5dada files/digest-sound-juicer-2.12.2 72
+MD5 62ab878296db63b837c4fb06c0fc685d files/sound-juicer-2.10.1-fbsd.patch 1017
+MD5 cbfffb6cc091ffb81864b0d6c464ad92 files/sound-juicer-2.12.2-file-chooser-3.patch 802
+MD5 4a12b02268da91a70551d700de39f32a files/digest-sound-juicer-2.10.1-r1 72
+MD5 4538566af04ec19705e775fb45b5dada files/digest-sound-juicer-2.12.2-r1 72
diff --git a/media-sound/sound-juicer/metadata.xml b/media-sound/sound-juicer/metadata.xml
index da6fd63d0085..b016c18b5446 100644
--- a/media-sound/sound-juicer/metadata.xml
+++ b/media-sound/sound-juicer/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
+<herd>sound</herd>
 </pkgmetadata>
diff --git a/media-sound/sound-juicer/sound-juicer-2.10.1-r1.ebuild b/media-sound/sound-juicer/sound-juicer-2.10.1-r1.ebuild
index 36bd30f9f039..c71b5dfc9096 100644
--- a/media-sound/sound-juicer/sound-juicer-2.10.1-r1.ebuild
+++ b/media-sound/sound-juicer/sound-juicer-2.10.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/media-sound/sound-juicer/sound-juicer-2.10.1-r1.ebuild,v 1.1 2005/08/24 13:33:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sound-juicer/sound-juicer-2.10.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:21 chriswhite Exp $
 
 inherit gnome2 eutils
 
diff --git a/media-sound/sound-juicer/sound-juicer-2.10.1.ebuild b/media-sound/sound-juicer/sound-juicer-2.10.1.ebuild
index 3c15461c2a8e..6776f021ec63 100644
--- a/media-sound/sound-juicer/sound-juicer-2.10.1.ebuild
+++ b/media-sound/sound-juicer/sound-juicer-2.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/media-sound/sound-juicer/sound-juicer-2.10.1.ebuild,v 1.1 2005/07/07 04:33:43 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sound-juicer/sound-juicer-2.10.1.ebuild,v 1.1.1.1 2005/11/30 09:38:21 chriswhite Exp $
 
 inherit gnome2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.burtonini.com/blog/computers/sound-juicer/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="vorbis flac"
 
 RDEPEND=">=dev-libs/glib-2
diff --git a/media-sound/sound-juicer/sound-juicer-2.12.2-r1.ebuild b/media-sound/sound-juicer/sound-juicer-2.12.2-r1.ebuild
index 3cc6841f67f2..26e4017ad854 100644
--- a/media-sound/sound-juicer/sound-juicer-2.12.2-r1.ebuild
+++ b/media-sound/sound-juicer/sound-juicer-2.12.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/media-sound/sound-juicer/sound-juicer-2.12.2-r1.ebuild,v 1.1 2005/10/14 03:52:23 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sound-juicer/sound-juicer-2.12.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:21 chriswhite Exp $
 
 inherit gnome2 eutils
 
diff --git a/media-sound/sound-juicer/sound-juicer-2.12.2.ebuild b/media-sound/sound-juicer/sound-juicer-2.12.2.ebuild
index ad71ae46c977..8587fc9ae14b 100644
--- a/media-sound/sound-juicer/sound-juicer-2.12.2.ebuild
+++ b/media-sound/sound-juicer/sound-juicer-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/media-sound/sound-juicer/sound-juicer-2.12.2.ebuild,v 1.1 2005/10/03 03:32:34 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sound-juicer/sound-juicer-2.12.2.ebuild,v 1.1.1.1 2005/11/30 09:38:21 chriswhite Exp $
 
 inherit gnome2
 
diff --git a/media-sound/soundtracker/ChangeLog b/media-sound/soundtracker/ChangeLog
index 56dc2ef70834..e623eb3d3713 100644
--- a/media-sound/soundtracker/ChangeLog
+++ b/media-sound/soundtracker/ChangeLog
@@ -1,6 +1,65 @@
 # ChangeLog for media-sound/soundtracker
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/soundtracker/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/media-sound/soundtracker/ChangeLog,v 1.1.1.1 2005/11/30 09:38:18 chriswhite Exp $
+
+  07 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  soundtracker-0.6.6.ebuild, soundtracker-0.6.7.ebuild:
+  Don't install INSTALL or COPYING files.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  soundtracker-0.6.7.ebuild:
+  Stable sparc.
+
+  07 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  soundtracker-0.6.7.ebuild:
+  Added to ~sparc.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  soundtracker-0.6.7.ebuild:
+  Stable amd64.
+
+  21 Jun 2004; David Holm <dholm@gentoo.org> soundtracker-0.6.7.ebuild:
+  Added to ~ppc.
+
+  13 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  soundtracker-0.6.7.ebuild:
+  Getting rid of virtual/jack.
+
+  10 May 2004; Travis Tilley <lv@gentoo.org> soundtracker-0.6.7.ebuild:
+  added --disable-asm when not on x86 and added ~amd64 keyword
+
+  01 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  soundtracker-0.6.7.ebuild:
+  inherit flag-o-matic.
+
+  22 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  soundtracker-0.6.7.ebuild, soundtracker-0.6.7_pre5.ebuild:
+  -O3 to -O2 for bug #45252.  Marking stable.
+
+*soundtracker-0.6.7 (20 Feb 2004)
+
+  20 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> metadata.xml,
+  soundtracker-0.6.6.ebuild, soundtracker-0.6.7.ebuild,
+  soundtracker-0.6.7_pre5.ebuild:
+  Version bump closes bug #42251.  Header fix.  metadata.xml added.
+
+*soundtracker-0.6.7_pre5 (23 Jul 2003)
+
+  23 Jul 2003; Nick Hadaway <raker@gentoo.org> soundtracker-0.6.7_pre5.ebuild:
+  New pre-release.  Adds support for virtual/jack.  Other minor ebuild
+  updates.  May crash with Kernel 2.6 but seems to work great in 2.4
+
+*soundtracker-0.6.6 (01 Jul 2002)
+
+  01 Jul 2002; Bruce A. Locke <blocke@shivan.org> soundtracker-0.6.6.ebuild:
+
+  Version bump and gnome-core dep removal
+
+*soundtracker-0.6.4-r2 (27 Mar 2002)
+
+  27 Mar 2002; Seemant Kulleen <seemant@gentoo.org> soundtracker-0.6.4-r2.ebuild :
+
+  Ungzipped HTML documentation.
 
 *soundtracker-0.6.4-r1 (1 Feb 2002)
 
diff --git a/media-sound/soundtracker/Manifest b/media-sound/soundtracker/Manifest
index e69de29bb2d1..7e1968cbf3e0 100644
--- a/media-sound/soundtracker/Manifest
+++ b/media-sound/soundtracker/Manifest
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8af86c1d97467b614f4002ec751a890f ChangeLog 2614
+MD5 101f1904a2972826f42c6ba029667728 files/digest-soundtracker-0.6.6 70
+MD5 5cbb33544d36f65f595aa8b229e9b515 files/digest-soundtracker-0.6.7 70
+MD5 369a16c17d2850a6ed6d6fee6c9f72fc files/soundtracker-0.6.7-alsa1.patch 951
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 9ff7017b2aeee83392add568e09e7804 soundtracker-0.6.6.ebuild 1226
+MD5 407a53aa94a259a30dee5c0f429f0418 soundtracker-0.6.7.ebuild 1679
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDb0N7j5H05b2HAEkRApNdAKCU+dxjDORCC7uN+fMF5MwTPetMGwCeIVDU
+jD800KVhkLetLet1Hd/Imq4=
+=qhyu
+-----END PGP SIGNATURE-----
diff --git a/media-sound/soundtracker/soundtracker-0.6.6.ebuild b/media-sound/soundtracker/soundtracker-0.6.6.ebuild
index 38fdb98dec04..5376e4cc92fd 100644
--- a/media-sound/soundtracker/soundtracker-0.6.6.ebuild
+++ b/media-sound/soundtracker/soundtracker-0.6.6.ebuild
@@ -1,71 +1,56 @@
-# 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/media-sound/soundtracker/soundtracker-0.6.6.ebuild,v 1.1 2002/07/01 04:05:51 blocke Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/soundtracker/soundtracker-0.6.6.ebuild,v 1.1.1.1 2005/11/30 09:38:18 chriswhite Exp $
+
+IUSE="nls esd gnome oss alsa"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="SoundTracker is a music tracking tool for UNIX/X11 (MOD tracker)"
 SRC_URI="http://www.soundtracker.org/dl/v0.6/${P}.tar.gz"
 HOMEPAGE="http://www.soundtracker.org"
 
-DEPEND="=x11-libs/gtk+-1.2*
-	>=media-libs/audiofile-0.2.1 
-	alsa? ( media-libs/alsa-lib ) 
-	esd? ( media-sound/esound ) 
-	gnome? ( >=gnome-base/gnome-libs-1.4.1.7 )
-	sys-libs/zlib"
+DEPEND="sys-libs/zlib
+	=x11-libs/gtk+-1.2*
+	>=media-libs/audiofile-0.2.1
+	alsa? ( media-libs/alsa-lib )
+	esd? ( media-sound/esound )
+	gnome? ( >=gnome-base/gnome-libs-1.4.1.7 )"
+
 
-RDEPEND="$DEPEND sys-apps/bzip2 sys-apps/gzip app-arch/unzip"
+RDEPEND="$DEPEND app-arch/bzip2 app-arch/gzip app-arch/unzip"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
 src_compile() {
-	
-	local myconf
 
-	if [ -z "`use oss`" ] ; then
-		myconf="--disable-oss"
-    fi
+	local myconf
 
-	if [ -z "`use alsa`" ] ; then
-		myconf="${myconf} --disable-alsa"
-	fi
+	use oss || myconf="--disable-oss"
 
-	if [ -z "`use esd`" ] ; then
-		myconf="${myconf} --disable-esd"
-    fi
+	use esd || myconf="${myconf} --disable-esd"
 
-	if [ -z "`use gnome`" ] ; then
-		myconf="${myconf} --disable-gnome"
-	fi
+	use nls || myconf="${myconf} --disable-nls"
 
-	if [ -z "`use nls`" ] ; then
-		myconf="${myconf} --disable-nls"
-    fi
+	use alsa || myconf="${myconf} --disable-alsa"
 
-	./configure	\
-		--infodir=/usr/share/info	\
-		--mandir=/usr/share/man	\
-		--prefix=/usr	\
-		--host=${CHOST}	\
-		${myconf} || die
-		
+	use gnome || myconf="${myconf} --disable-gnome"
 
+	econf ${myconf} || die
 	emake || die
 
 }
 
 src_install () {
-	
-	make 	\
-		prefix=${D}/usr	\
-		install || die
+
+	einstall || die
 
 	# strip suid from binary
 	chmod -s ${D}/usr/bin/soundtracker
 
 	# documentation
-	dodoc AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README TODO
+	dodoc AUTHORS ChangeLog FAQ NEWS README TODO
 	dodoc doc/*.txt
 	dohtml -r doc
 
 }
-
diff --git a/media-sound/soundtracker/soundtracker-0.6.7.ebuild b/media-sound/soundtracker/soundtracker-0.6.7.ebuild
index f81f892ac54f..20cb0cdefa12 100644
--- a/media-sound/soundtracker/soundtracker-0.6.7.ebuild
+++ b/media-sound/soundtracker/soundtracker-0.6.7.ebuild
@@ -1,9 +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/media-sound/soundtracker/soundtracker-0.6.7.ebuild,v 1.1 2004/02/21 01:02:40 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/soundtracker/soundtracker-0.6.7.ebuild,v 1.1.1.1 2005/11/30 09:38:18 chriswhite Exp $
 
 IUSE="nls esd gnome oss alsa jack"
 
+inherit eutils flag-o-matic
+
 S=${WORKDIR}/${P/_/-}
 
 DESCRIPTION="SoundTracker is a music tracking tool for UNIX/X11 (MOD tracker)"
@@ -19,7 +21,7 @@ DEPEND="sys-libs/zlib
 	esd? ( media-sound/esound )
 	gnome? ( >=gnome-base/gnome-libs-1.4.1.7 )
 	nls? ( sys-devel/gettext )
-	jack? ( virtual/jack )"
+	jack? ( media-sound/jack-audio-connection-kit )"
 
 RDEPEND="${DEPEND}
 	app-arch/bzip2
@@ -28,7 +30,7 @@ RDEPEND="${DEPEND}
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 
 src_unpack() {
 	unpack ${A}
@@ -36,6 +38,8 @@ src_unpack() {
 }
 
 src_compile() {
+	replace-flags "-O3" "-O2"
+
 	local myconf
 
 	use oss || myconf="--disable-oss"
@@ -43,6 +47,7 @@ src_compile() {
 	use nls || myconf="${myconf} --disable-nls"
 	use alsa || myconf="${myconf} --disable-alsa"
 	use gnome || myconf="${myconf} --disable-gnome"
+	use x86 || myconf="${myconf} --disable-asm"
 
 	econf ${myconf} || die "configure failed"
 	emake || die "make failed"
@@ -56,7 +61,7 @@ src_install () {
 	chmod -s ${D}/usr/bin/soundtracker
 
 	# documentation
-	dodoc AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README TODO
+	dodoc AUTHORS ChangeLog FAQ NEWS README TODO
 	dodoc doc/*.txt
 	dohtml -r doc
 }
diff --git a/media-sound/sox/ChangeLog b/media-sound/sox/ChangeLog
index 53232ec45c92..556ed3839196 100644
--- a/media-sound/sox/ChangeLog
+++ b/media-sound/sox/ChangeLog
@@ -1,13 +1,191 @@
 # ChangeLog for media-sound/sox
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/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/media-sound/sox/ChangeLog,v 1.1.1.1 2005/11/30 09:38:36 chriswhite Exp $
 
-*sox-12.17.1 (1 Feb 2002)
+  27 Aug 2005; Markus Rothe <corsair@gentoo.org> sox-12.17.7-r1.ebuild:
+  Stable on ppc64
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+*sox-12.17.7-r2 (25 Aug 2005)
+
+  25 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/sox-12.17.7-largefile.patch, +sox-12.17.7-r2.ebuild:
+  Added largefile support as per bug #103578.
+
+  13 Jul 2005; Markus Rothe <corsair@gentoo.org> sox-12.17.7-r1.ebuild:
+  added ~ppc64
+
+  12 Jun 2005; Bryan Østergaard <kloeri@gentoo.org> sox-12.17.7-r1.ebuild:
+  Stable on alpha.
+
+  12 Jun 2005; Joseph Jezak <josejx@gentoo.org> sox-12.17.7-r1.ebuild:
+  Marked ppc stable.
+
+  30 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> sox-12.17.7-r1.ebuild:
+  Stable on sparc
+
+  28 May 2005; Jan Brinkmann <luckyduck@gentoo.org> -sox-12.17.3-r3.ebuild,
+  -sox-12.17.4-r2.ebuild, sox-12.17.5-r1.ebuild, sox-12.17.6.ebuild,
+  sox-12.17.6-r1.ebuild, -sox-12.17.7.ebuild, sox-12.17.7-r1.ebuild:
+  Dont make use of the deprecated oggvorbis useflag any longer, see #94254.
+  Marked 12.17.7-r1 stable on amd64 and x86.
+
+*sox-12.17.7-r1 (10 Mar 2005)
+
+  10 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> +sox-12.17.7-r1.ebuild:
+  applied cleanuppatch which was suggested by Diego Petten
+  <dgp85@users.sourceforge.net>
+
+*sox-12.17.7 (20 Feb 2005)
+
+  20 Feb 2005; Guy Martin <gmsoft@gentoo.org> sox-12.17.7.ebuild:
+  Added ~hppa to KEYWORDS.
+
+  18 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> :
+  version bump, fixes #81968
+
+  31 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  sox-12.17.6-r1.ebuild:
+  Still force oss on as alsa isn't 100% working.
+
+*sox-12.17.6-r1 (31 Dec 2004)
+
+  31 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/sox-12.17.6-destdir.patch, +sox-12.17.6-r1.ebuild:
+  Destdir patch added.  Alsa support added.  Closes bug #75778.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  10 Dec 2004; Joseph Jezak <josejx@gentoo.org> :
+  Tested and marked ppc stable.
+
+*sox-12.17.6 (20 Nov 2004)
+
+  20 Nov 2004; Tony Vroon <chainsaw@gentoo.org> +sox-12.17.6.ebuild:
+  Version bump. Upstream changelog mentions .wav segfault bug fixes, PPC users
+  please test this.
+
+  12 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> sox-12.17.5-r1.ebuild:
+  Stable on alpha.
+
+  18 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  sox-12.17.5-r1.ebuild:
+  Stable amd64, sparc, x86.
+
+  18 Oct 2004; Joseph Jezak <josejx@gentoo.org>
+  +files/sox-wav-segfault.patch, sox-12.17.4-r2.ebuild,
+  sox-12.17.5-r1.ebuild:
+  Added -fsigned-char to sox-12.17.4-r2 and sox-12.17.5-r1 to fix bug #35745.
+  Patch for wav segfaults in sox-12.17.5-r1, also bug #35745
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> :
+  Removing sox-12.17.5 as it installs exactly the same thing as -r1. -r1 should
+  NOT have been added to portage. If you already have sox-12.17.5 installed, you
+  will gain nothing by emerging sox-12.17.5-r1.
+
+*sox-12.17.5-r1 (11 Sep 2004)
+
+  11 Sep 2004; Doug Goldstein <cardoe@gentoo.org> +sox-12.17.5-r1.ebuild:
+  Disable ALSA support because it's broken in sox. See bug #63531.
+
+  11 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> sox-12.17.5.ebuild:
+  ALSA support is broken... using OSS by default.
+
+*sox-12.17.5 (09 Sep 2004)
+
+  09 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/sox-install.patch, +files/sox-soundcard.patch, +sox-12.17.5.ebuild:
+  Version bump closes bug #62854.
+
+  11 Aug 2004; Brian Harring <ferringb@gentoo.org> sox-12.17.4-r2.ebuild: 
+  Use flag operators -must- be wrapped in parenthesis, blah? node isn't valid.
+
+  30 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> sox-12.17.4-r2.ebuild:
+  Stable on alpha.
+
+  29 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -sox-12.17.4-r1.ebuild:
+  Removing insecure version.
+
+*sox-12.17.4-r2 (29 Jul 2004)
+
+  29 Jul 2004; Chris White <chriswhite@gentoo.org>
+  +files/sox-wave-overflow.patch, +sox-12.17.4-r2.ebuild:
+  Bumped to -r2 and added buffer overflow patch to address bug #57962.
+
+  07 Jul 2004; Hardave Riar <hardave@gentoo.org> sox-12.17.4-r1.ebuild:
+  Added ~mips KEYWORD and gnuconfig_update
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  sox-12.17.3-r3.ebuild, sox-12.17.4-r1.ebuild:
+  virtual/glibc -> virtual/libc
+
+  19 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  sox-12.17.4-r1.ebuild:
+  Added alsa-lib to DEPEND when USE=alsa.
+
+  03 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  sox-12.17.4-r1.ebuild:
+  Changing mad dep to madplay.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  sox-12.17.3-r3.ebuild:
+  Added IUSE.
+
+  11 Apr 2004; Jason Wever <weeve@gentoo.org> sox-12.17.4-r1.ebuild:
+  Stable on sparc.
+
+  01 Apr 2004; Jason Wever <weeve@gentoo.org> sox-12.17.4-r1.ebuild:
+  Added ~sparc keyword.
+
+  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  sox-12.17.3-r1.ebuild, sox-12.17.4-r1.ebuild, sox-12.17.4.ebuild:
+  Stable on x86.  Removing old ebuilds.
+
+*sox-12.17.4-r1 (28 Nov 2003)
+
+  28 Nov 2003; Brad House <brad_mssw@gentoo.org> sox-12.17.4-r1.ebuild:
+  mark stable on amd64
+
+  26 Sep 2003; jje <jje@gentoo.org> :
+  Addition of USE flags, oggvorbis, mad, encode, oss, alsa.
   
-  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.
+  Submitted by: Roman Valls <brainlinux@softhome.net>
+
+  12 Aug 2003; Jason Wever <weeve@gentoo.org> sox-12.17.3-r3.ebuild:
+  Changed ~sparc keyword to sparc.
+
+  04 Aug 2003; Patrick Kursawe <phosphan@gentoo.org> sox-12.17.3-r3.ebuild,
+  sox-12.17.4.ebuild:
+  Changed download URI to mirror://.... scheme as reported in bug 25652
+
+*sox-12.17.4 (31 Jul 2003)
+
+  31 Jul 2003; rob holland <tigger@gentoo.org> sox-12.17.4.ebuild:
+  Version bump. Fixes alsa issues from 12.17.3. Submitted by Andy Pyles
+  <a_pyles@yahoo.com>. Closes #19021
+
+*sox-12.17.3-r3 (21 Dec 2002)
+
+  21 Dec 2002; Arcady Genkin <agenkin@gentoo.org> :
+  The previous versions were not installing soxmix and play.1.
+  Closes #12286.
+
+*sox-12.17.3-r2 (16 Oct 2002)
+
+  16 Oct 2002; Aron Griffis <agriffis@gentoo.org> sox-12.17.3-r2.ebuild :
+  Fixed to build even when Alsa libraries are present on the system.
+
+*sox-12.17.3-r1 (12 Jul 2002)
+
+  14 Aug 2002; Pieter Van den Abeele <pvdabeel@gentoo.org> :
+  Added ppc keyword
+
+  12 Jul 2002; phoen][x <phoenix@gentoo.org> sox-12.7.3.ebuild :
+  Added a symlink from /usr/bin/rec to /usr/bin/play (Bug 4925)
+  Added KEYWORDS, LICENSE, SLOT.
+
+*sox-12.17.3 (1 Feb 2002)
+
+  11 May 2002; Arcady Genkin <agenkin@thpoon.com> sox-12.7.3.ebuild :
+  Updated to version 12.17.3.
diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest
index cba18d368bb9..5cbe8590f77a 100644
--- a/media-sound/sox/Manifest
+++ b/media-sound/sox/Manifest
@@ -1,5 +1,19 @@
-MD5 377ea4576b0624834e983e251f1eaac2 sox-12.17.3-r1.ebuild 906
-MD5 7057a908d81b99e9e34ceb76ed8da708 sox-12.17.3-r3.ebuild 1071
-MD5 fee25b54afc5cf5ded85d60a69360f46 ChangeLog 955
-MD5 a27f4560530e1dcd5ee4ff1bc4a6f921 files/digest-sox-12.17.3-r1 63
-MD5 a27f4560530e1dcd5ee4ff1bc4a6f921 files/digest-sox-12.17.3-r3 63
+MD5 3b143a2b33d0aefe3a0fdcaedb73ace0 ChangeLog 6597
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 8f0b4d1c78a6982a316874b6b3a0cca6 sox-12.17.5-r1.ebuild 2022
+MD5 33bdd939d4c9c9e11357c14f48ab72fb sox-12.17.6-r1.ebuild 1501
+MD5 6b0ba2acfa0396856c328217f286b00f sox-12.17.6.ebuild 1596
+MD5 f8ec3d3502188796332362bc6ca772c8 sox-12.17.7-r1.ebuild 1276
+MD5 5bf814ebb228201d44ec4e4283a15da8 sox-12.17.7-r2.ebuild 1400
+MD5 12cd6316db89eaf0efe7f5f33b5be707 files/digest-sox-12.17.5-r1 63
+MD5 d489ca9068a273a4a383094d2336edff files/digest-sox-12.17.6 63
+MD5 d489ca9068a273a4a383094d2336edff files/digest-sox-12.17.6-r1 63
+MD5 078b05843747731261bbb166597697f0 files/digest-sox-12.17.7-r1 63
+MD5 a4a1bf246929c73d663a66a97acfd5cc files/sox-12.17.6-destdir.patch 4327
+MD5 7911475898fe2541a80f439e938b1d0d files/sox-12.17.7-destdir.patch 4395
+MD5 484937b1ac7761dfb4d5bfb011e8cae7 files/sox-install.patch 2917
+MD5 55b945c4cad98947d37be88cf3c5ef7e files/sox-soundcard.patch 275
+MD5 923124d7fbe0a70712b4991ae52a968b files/sox-wav-segfault.patch 255
+MD5 8a1b39117b61aeb3d136106f13347185 files/sox-wave-overflow.patch 736
+MD5 078b05843747731261bbb166597697f0 files/digest-sox-12.17.7-r2 63
+MD5 42f6be2a6de49e8fe6324d947c34a347 files/sox-12.17.7-largefile.patch 297
diff --git a/media-sound/sox/sox-12.17.5-r1.ebuild b/media-sound/sox/sox-12.17.5-r1.ebuild
index 210d35049f98..93f54dc4bb92 100644
--- a/media-sound/sox/sox-12.17.5-r1.ebuild
+++ b/media-sound/sox/sox-12.17.5-r1.ebuild
@@ -1,23 +1,23 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-12.17.5-r1.ebuild,v 1.1 2004/09/11 17:17:32 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-12.17.5-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:36 chriswhite Exp $
 
-inherit gnuconfig eutils
+inherit gnuconfig eutils flag-o-matic
 
 DESCRIPTION="The swiss army knife of sound processing programs"
 HOMEPAGE="http://sox.sourceforge.net"
 SRC_URI="mirror://sourceforge/sox/${P}.tar.gz"
 
-IUSE="oggvorbis mad encode" # alsa oss
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~mips ~alpha"
 LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="x86 ~ppc sparc amd64 ~mips alpha"
+IUSE="ogg mad encode" # alsa oss
 
 DEPEND="virtual/libc
 	encode? ( media-sound/lame )
-	alsa? ( media-libs/alsa-lib )
-	oggvorbis? ( media-libs/libvorbis )
+	ogg? ( media-libs/libvorbis )
 	mad? ( media-sound/madplay )"
+#	alsa? ( media-libs/alsa-lib )
 
 src_compile () {
 	# Needed on mips and probablly others
@@ -30,7 +30,11 @@ src_compile () {
 	epatch ${FILESDIR}/${PN}-soundcard.patch
 	epatch ${FILESDIR}/${PN}-install.patch
 
-	myconf="${myconf} `use_enable oggvorbis ogg-vorbis`"
+	# Fixes wav segfaults. See Bug #35745.
+	append-flags -fsigned-char
+	use ppc && epatch ${FILESDIR}/${PN}-wav-segfault.patch
+
+	myconf="${myconf} `use_enable ogg ogg-vorbis`"
 	myconf="${myconf} `use_enable mad`"
 	myconf="${myconf} `use_enable encode lame`"
 	myconf="${myconf} --enable-oss-dsp"
diff --git a/media-sound/sox/sox-12.17.6-r1.ebuild b/media-sound/sox/sox-12.17.6-r1.ebuild
index 6a84792b72fc..3f777e891264 100644
--- a/media-sound/sox/sox-12.17.6-r1.ebuild
+++ b/media-sound/sox/sox-12.17.6-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/media-sound/sox/sox-12.17.6-r1.ebuild,v 1.1 2004/12/31 23:00:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-12.17.6-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:36 chriswhite Exp $
 
-IUSE="oggvorbis mad encode alsa oss"
+IUSE="ogg mad encode alsa"
 
 inherit gnuconfig flag-o-matic eutils
 
@@ -16,7 +16,7 @@ LICENSE="LGPL-2.1"
 
 DEPEND="virtual/libc
 	encode? ( media-sound/lame )
-	oggvorbis? ( media-libs/libvorbis )
+	ogg? ( media-libs/libvorbis )
 	mad? ( media-sound/madplay )
 	alsa? ( media-libs/alsa-lib )"
 
@@ -39,10 +39,11 @@ src_compile () {
 	# Fixes wav segfaults. See Bug #35745.
 	append-flags -fsigned-char
 
-	myconf="${myconf} `use_enable oggvorbis ogg-vorbis`"
+	myconf="${myconf} `use_enable ogg ogg-vorbis`"
 	myconf="${myconf} `use_enable mad`"
 	myconf="${myconf} `use_enable encode lame`"
-	myconf="${myconf} `use_enable oss oss-dsp`"
+#	myconf="${myconf} `use_enable oss oss-dsp`"
+	myconf="${myconf} --enable-oss-dsp"
 	myconf="${myconf} `use_enable alsa alsa-dsp`"
 
 	econf ${myconf} \
diff --git a/media-sound/sox/sox-12.17.6.ebuild b/media-sound/sox/sox-12.17.6.ebuild
index ac86c26587a4..521534f74692 100644
--- a/media-sound/sox/sox-12.17.6.ebuild
+++ b/media-sound/sox/sox-12.17.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/media-sound/sox/sox-12.17.6.ebuild,v 1.1 2004/11/20 18:46:42 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-12.17.6.ebuild,v 1.1.1.1 2005/11/30 09:38:36 chriswhite Exp $
 
 inherit gnuconfig flag-o-matic
 
@@ -8,14 +8,14 @@ DESCRIPTION="The swiss army knife of sound processing programs"
 HOMEPAGE="http://sox.sourceforge.net"
 SRC_URI="mirror://sourceforge/sox/${P}.tar.gz"
 
-IUSE="oggvorbis mad encode" # alsa oss
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~mips ~alpha"
 LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86 ppc ~sparc ~amd64 ~mips ~alpha"
+IUSE="ogg mad encode" # alsa oss
 
 DEPEND="virtual/libc
 	encode? ( media-sound/lame )
-	oggvorbis? ( media-libs/libvorbis )
+	ogg? ( media-libs/libvorbis )
 	mad? ( media-sound/madplay )"
 #	alsa? ( media-libs/alsa-lib )
 
@@ -23,31 +23,28 @@ src_compile () {
 	# Needed on mips and probablly others
 	gnuconfig_update
 
-	# from version 12.17.4 sox has mp3 encoding/decoding if you have madlibs 
-	# and lame using alsa by default
-	local myconf
-
 	# Fixes wav segfaults. See Bug #35745.
 	append-flags -fsigned-char
 
-	myconf="${myconf} `use_enable oggvorbis ogg-vorbis`"
-	myconf="${myconf} `use_enable mad`"
-	myconf="${myconf} `use_enable encode lame`"
-	myconf="${myconf} --enable-oss-dsp"
-#	myconf="${myconf} `use_enable oss oss-dsp`"
-#	myconf="${myconf} `use_enable alsa alsa-dsp`"
-
-#	SoX currently targets the ALSA kernel API and not alsa-lib. This is a problem because the interface changes.
-#	see bug #63531 for more details
-# 	The build will automatically disable ALSA support even if it's in USE
-	myconf="${myconf} --disable-alsa-dsp"
-	einfo "Notice.. ALSA support is currently broken in sox. ALSA support has been disabled."
-	einfo "sox will automatically use OSS, if you have ALSA then it'll work through the"
-	einfo "compatiblity layer."
-
-	econf ${myconf} \
+	# SoX currently targets the ALSA kernel API and not alsa-lib. This is
+	# a problem because the interface changes. see bug #63531 for more 
+	# details. The build will automatically disable ALSA support even if
+	# it's in USE
+	einfo "Notice.. ALSA support is currently broken in sox. ALSA support"
+	einfo "has been disabled. Sox will automatically use OSS, if you have"
+	einfo "ALSA then it'll work through the compatiblity layer."
+
+	econf \
+		$(use_enable encode lame) \
+		$(use_enable mad) \
+		$(use_enable ogg ogg-vorbis) \
+		${myconf} \
 		--enable-fast-ulaw \
-		--enable-fast-alaw || die "configure failed"
+		--enable-fast-alaw \
+		--enable-oss-dsp \
+		--disable-alsa-dsp \
+		|| die "configure failed"
+
 	emake || die "make failed"
 }
 
diff --git a/media-sound/sox/sox-12.17.7-r1.ebuild b/media-sound/sox/sox-12.17.7-r1.ebuild
index b6adb587b60e..74d263cc7718 100644
--- a/media-sound/sox/sox-12.17.7-r1.ebuild
+++ b/media-sound/sox/sox-12.17.7-r1.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/media-sound/sox/sox-12.17.7-r1.ebuild,v 1.1 2005/03/10 14:33:30 luckyduck Exp $
-
-IUSE="alsa encode mad oggvorbis"
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-12.17.7-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:36 chriswhite Exp $
 
 inherit gnuconfig flag-o-matic eutils
 
@@ -10,15 +8,16 @@ DESCRIPTION="The swiss army knife of sound processing programs"
 HOMEPAGE="http://sox.sourceforge.net"
 SRC_URI="mirror://sourceforge/sox/${P}.tar.gz"
 
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~hppa"
 LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 ~hppa ~mips ppc ppc64 sparc x86"
+IUSE="alsa encode mad ogg"
 
 DEPEND="virtual/libc
+	alsa? ( media-libs/alsa-lib )
 	encode? ( media-sound/lame )
-	oggvorbis? ( media-libs/libvorbis )
 	mad? ( media-libs/libmad )
-	alsa? ( media-libs/alsa-lib )"
+	ogg? ( media-libs/libvorbis )"
 
 src_unpack() {
 	unpack ${A}
@@ -36,18 +35,20 @@ src_compile () {
 	append-flags -fsigned-char
 
 	econf ${myconf} \
-		$(use_enable oggvorbis ogg-vorbis) \
-		$(use_enable mad) \
-		$(use_enable encode lame) \
 		$(use_enable alsa alsa-dsp) \
+		$(use_enable encode lame) \
+		$(use_enable mad) \
+		$(use_enable ogg ogg-vorbis) \
 		--enable-oss-dsp \
 		--enable-fast-ulaw \
-		--enable-fast-alaw || die "configure failed"
+		--enable-fast-alaw \
+		|| die "configure failed"
+
 	emake || die "make failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
+	make DESTDIR="${D}" install || die "make install failed"
 	prepallman
 
 	dodoc Changelog README TODO *.txt
diff --git a/media-sound/sox/sox-12.17.7-r2.ebuild b/media-sound/sox/sox-12.17.7-r2.ebuild
index c32cb8685eb5..634f52b23838 100644
--- a/media-sound/sox/sox-12.17.7-r2.ebuild
+++ b/media-sound/sox/sox-12.17.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/media-sound/sox/sox-12.17.7-r2.ebuild,v 1.1 2005/08/25 13:08:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-12.17.7-r2.ebuild,v 1.1.1.1 2005/11/30 09:38:36 chriswhite Exp $
 
 inherit gnuconfig flag-o-matic eutils
 
diff --git a/media-sound/specimen/ChangeLog b/media-sound/specimen/ChangeLog
index 2e5807b85890..ca40137cf8b7 100644
--- a/media-sound/specimen/ChangeLog
+++ b/media-sound/specimen/ChangeLog
@@ -1,6 +1,43 @@
 # ChangeLog for media-sound/specimen
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/specimen/ChangeLog,v 1.1 2004/06/29 20:15:08 fvdpol Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/specimen/ChangeLog,v 1.1.1.1 2005/11/30 09:38:29 chriswhite Exp $
+
+  07 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> specimen-0.4.1.ebuild:
+  Don't install INSTALL or COPYING files.
+
+  12 Jun 2005; Sven Wegener <swegener@gentoo.org> specimen-0.4.1.ebuild,
+  specimen-0.4.5.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  specimen-0.4.5.ebuild:
+  Stable sparc, x86.
+
+  04 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  specimen-0.4.5.ebuild:
+  Added to ~sparc.
+
+  16 Oct 2004; Michael Hanselmann <hansmi@gentoo.org> specimen-0.4.5.ebuild:
+  Added to ~ppc. See bug 67738.
+
+*specimen-0.4.5 (16 Oct 2004)
+
+  16 Oct 2004; Chris White <chriswhite@gentoo.org> +specimen-0.4.5.ebuild:
+  Bump to 4.5.0 to close bug #66883. ppc keyword removed as per bug #67738.
+  Thanks to mikael soderholm <gnarlie@ihku.org> for the initial submission.
+
+  03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  specimen-0.4.1.ebuild:
+  -amd64, stable x86.
+
+  09 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  specimen-0.4.1.ebuild:
+  Fixed jack dep to jack-audio-connection-kit.
+
+*specimen-0.4.1 (30 Jun 2004)
+
+  30 Jun 2004; David Holm <dholm@gentoo.org> specimen-0.4.1.ebuild:
+  Added to ~ppc.
 
   29 Jun 2004; Frank van de Pol <fvdpol@gentoo.org> :
   New ebuild donated by mikael soderholm <gnarlie@ihku.org>, closing bug #55340.
diff --git a/media-sound/specimen/Manifest b/media-sound/specimen/Manifest
index 5c0ebfb4cb69..785a0e69ff6c 100644
--- a/media-sound/specimen/Manifest
+++ b/media-sound/specimen/Manifest
@@ -1,4 +1,16 @@
-MD5 e4bfa7919e4d72c069943c43e6ada241 metadata.xml 426
-MD5 a59b507f717d978e2bb0b54be0b4df99 specimen-0.4.1.ebuild 791
-MD5 5cc166cfabb6e346f994dd33840ea7de ChangeLog 257
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 261519836215dc35adc13f973e5cc3df ChangeLog 1553
 MD5 c08efe833eb7bd80b58691720442ebf7 files/digest-specimen-0.4.1 66
+MD5 650cc21cc880262309b70e83d2c61c97 files/digest-specimen-0.4.5 66
+MD5 e4bfa7919e4d72c069943c43e6ada241 metadata.xml 426
+MD5 788e98504137275f8d35b7e3aeead0c5 specimen-0.4.1.ebuild 961
+MD5 0ea66b7529e4b816bc79a53c1ec41d05 specimen-0.4.5.ebuild 888
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDb0QMj5H05b2HAEkRAhr3AJ9R2jZIz6FW94PbLnGOkOHTH2fJDACcD4Xl
+whIi/qc1Oj+4aXW52xUD774=
+=+13s
+-----END PGP SIGNATURE-----
diff --git a/media-sound/specimen/specimen-0.4.1.ebuild b/media-sound/specimen/specimen-0.4.1.ebuild
index 56c8ffbe0b2c..0494286baa25 100644
--- a/media-sound/specimen/specimen-0.4.1.ebuild
+++ b/media-sound/specimen/specimen-0.4.1.ebuild
@@ -1,22 +1,23 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/specimen/specimen-0.4.1.ebuild,v 1.1 2004/06/29 20:15:08 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/specimen/specimen-0.4.1.ebuild,v 1.1.1.1 2005/11/30 09:38:29 chriswhite Exp $
 
 DESCRIPTION="A Midi Controllable Audio Sampler"
 HOMEPAGE="http://www.gazuga.net"
 SRC_URI="http://www.gazuga.net/files/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+#-amd64: 0.4.1: int/pointer casting
+KEYWORDS="x86 ~ppc -amd64"
 
 IUSE="ladcca debug"
 
-DEPEND="virtual/jack
+DEPEND="media-sound/jack-audio-connection-kit
 	virtual/alsa
 	media-libs/libsamplerate
 	media-libs/libsndfile
 	dev-libs/libxml2
-	>x11-libs/gtk+-2*
+	>x11-libs/gtk+-2
 	gnome-base/libgnomecanvas
 	ladcca? ( media-libs/ladcca )"
 
@@ -31,5 +32,5 @@ src_compile() {
 src_install() {
 	make DESTDIR=${D} install || die
 	#dobin src/specimen
-	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
+	dodoc AUTHORS ChangeLog NEWS README TODO
 }
diff --git a/media-sound/specimen/specimen-0.4.5.ebuild b/media-sound/specimen/specimen-0.4.5.ebuild
index a81ff3336fb3..60d5e6cae434 100644
--- a/media-sound/specimen/specimen-0.4.5.ebuild
+++ b/media-sound/specimen/specimen-0.4.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/media-sound/specimen/specimen-0.4.5.ebuild,v 1.1 2004/10/16 02:12:52 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/specimen/specimen-0.4.5.ebuild,v 1.1.1.1 2005/11/30 09:38:29 chriswhite Exp $
 
 DESCRIPTION="A Midi Controllable Audio Sampler"
 HOMEPAGE="http://www.gazuga.net"
@@ -8,10 +8,7 @@ SRC_URI="http://www.gazuga.net/files/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 #-amd64: 0.4.5: int/pointer casting
-#KEYWORDS="~x86 ~ppc -amd64" - ppc team, please uncomment this when you guys
-# get media-libs/phat marked stable - Chris
-KEYWORDS="~x86 -amd64"
-
+KEYWORDS="-amd64 ~ppc sparc x86"
 
 IUSE="ladcca debug"
 
@@ -21,7 +18,7 @@ DEPEND="media-sound/jack-audio-connection-kit
 	media-libs/libsndfile
 	media-libs/phat
 	dev-libs/libxml2
-	>x11-libs/gtk+-2*
+	>x11-libs/gtk+-2
 	gnome-base/libgnomecanvas
 	ladcca? ( media-libs/ladcca )"
 
diff --git a/media-sound/spiralmodular/ChangeLog b/media-sound/spiralmodular/ChangeLog
index 98cc5f0ae91b..83a20c9f63a2 100644
--- a/media-sound/spiralmodular/ChangeLog
+++ b/media-sound/spiralmodular/ChangeLog
@@ -1,6 +1,46 @@
 # ChangeLog for media-sound/spiralmodular
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/spiralmodular/ChangeLog,v 1.1 2003/03/09 12:53:53 jje Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/spiralmodular/ChangeLog,v 1.1.1.1 2005/11/30 09:38:39 chriswhite Exp $
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  spiralmodular-0.2.2a.ebuild:
+  Stable sparc.
+
+  19 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  spiralmodular-0.2.2a.ebuild:
+  Added to ~sparc.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  spiralmodular-0.2.2a.ebuild:
+  Stable amd64.
+
+  13 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  spiralmodular-0.2.1.ebuild, spiralmodular-0.2.2a.ebuild:
+  Getting rid of virtual/jack.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  spiralmodular-0.2.2a.ebuild:
+  Stable x86.
+
+  17 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  spiralmodular-0.2.1.ebuild:
+  removed jack from IUSE.
+
+  16 Apr 2004; Travis Tilley <lv@gentoo.org> spiralmodular-0.2.2a.ebuild:
+  added ~amd64 keyword
+
+  21 Mar 2004; David Holm <dholm@gentoo.org> spiralmodular-0.2.2a.ebuild:
+  Added to ~ppc.
+
+*spiralmodular-0.2.2a (20 Mar 2004)
+
+  20 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  spiralmodular-0.2.1.ebuild, spiralmodular-0.2.2a.ebuild:
+  Version bump.
+
+  28 Oct 2003; Martin Holzer <mholzer@gentoo.org> spiralmodular-0.2.1.ebuild,
+  files/spiralmodular-0.2.1-gentoo.patch:
+  Adding patch to compile. Closes #30480.
 
 *spiralmodular-0.2.1 (09 Mar 2003)
 
diff --git a/media-sound/spiralmodular/Manifest b/media-sound/spiralmodular/Manifest
index e69de29bb2d1..0ca3e24da423 100644
--- a/media-sound/spiralmodular/Manifest
+++ b/media-sound/spiralmodular/Manifest
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 52a18cf87dd48c07269e84272cf74024 ChangeLog 1586
+MD5 f4e4b9a9232b868cf049bf9ae2c36535 files/digest-spiralmodular-0.2.1 71
+MD5 591854fbf03f041310ebc2752dcc6c9f files/digest-spiralmodular-0.2.2a 73
+MD5 88633a86b03d3e371fe880f098abee3f files/spiralmodular-0.2.1-gentoo.patch 962
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 5f6156ca6c831241c162e6735c369254 spiralmodular-0.2.1.ebuild 1313
+MD5 5d329f1d81a439a24b62f58f1686c24b spiralmodular-0.2.2a.ebuild 1577
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC0CF+I1lqEGTUzyQRAuloAJ0TXC67e+nyNmZ/YOKij8xd6f5HGACgxpwN
+zrlOVwT+kBdMVoWPuEcy8oI=
+=uCD/
+-----END PGP SIGNATURE-----
diff --git a/media-sound/spiralmodular/spiralmodular-0.2.1.ebuild b/media-sound/spiralmodular/spiralmodular-0.2.1.ebuild
index 47f30747767d..f35b49450fc5 100644
--- a/media-sound/spiralmodular/spiralmodular-0.2.1.ebuild
+++ b/media-sound/spiralmodular/spiralmodular-0.2.1.ebuild
@@ -1,31 +1,38 @@
-# 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/media-sound/spiralmodular/spiralmodular-0.2.1.ebuild,v 1.1 2003/03/09 12:53:53 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/spiralmodular/spiralmodular-0.2.1.ebuild,v 1.1.1.1 2005/11/30 09:38:38 chriswhite Exp $
+
+inherit eutils
+
+IUSE=""
 
 DESCRIPTION="SSM is a object oriented modular softsynth/ sequencer/ sampler."
 HOMEPAGE="http://www.pawfal.org/Software/SSM/"
 SRC_URI="mirror://sourceforge/spiralmodular/${P}.tar.gz"
+RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-RDEPEND=">=x11-libs/fltk-1.1 \
-	media-libs/ladspa-sdk"
+KEYWORDS="x86"
 
-DEPEND=">=x11-libs/fltk-1.1 \
-	virtual/jack \
+DEPEND=">=x11-libs/fltk-1.1
+	media-sound/jack-audio-connection-kit
 	media-libs/ladspa-sdk"
 
-src_compile () {
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.patch || die
+}
+
+src_compile() {
 
-	for i in `find . -name Makefile.in` 
-	do 	cat $i|sed s/CXXFLAGS=\\t@CXXFLAGS@/CXXFLAGS=\\t@CXXFLAGS@\ @FLTK_CXXFLAGS@/ |sed s/CFLAGS\\t=\\t@CFLAGS@/CFLAGS\\t=\\t@CFLAGS@\ @FLTK_CFLAGS@/ > $i.new
-		mv $i $i.old
-		mv $i.new $i
-		rm $i.old
+	for file in `find . -name Makefile.in`; do
+		sed -i s/CXXFLAGS=\\t@CXXFLAGS@/CXXFLAGS=\\t@CXXFLAGS@\ @FLTK_CXXFLAGS@/ $file
+		sed -i s/CFLAGS\\t=\\t@CFLAGS@/CFLAGS\\t=\\t@CFLAGS@\ @FLTK_CFLAGS@/ $file
 	done
-        myconf="--enable-shared  --enable-jack"
-	econf ${myconf} || die "configure failed"
+
+	econf --enable-shared --enable-jack || die "configure failed"
 	emake || die
 }
 
@@ -36,9 +43,7 @@ src_install() {
 }
 
 pkg_postinst() {
-
-        einfo ""
-        einfo "Remember to remove any old ~/.sprialmodular files"
-        einfo ""
+	einfo
+	einfo "Remember to remove any old ~/.sprialmodular files"
+	einfo
 }
-
diff --git a/media-sound/spiralmodular/spiralmodular-0.2.2a.ebuild b/media-sound/spiralmodular/spiralmodular-0.2.2a.ebuild
index dcd239d0fdae..9fb3cb908aa3 100644
--- a/media-sound/spiralmodular/spiralmodular-0.2.2a.ebuild
+++ b/media-sound/spiralmodular/spiralmodular-0.2.2a.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/media-sound/spiralmodular/spiralmodular-0.2.2a.ebuild,v 1.1 2004/03/21 03:49:50 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/spiralmodular/spiralmodular-0.2.2a.ebuild,v 1.1.1.1 2005/11/30 09:38:38 chriswhite Exp $
 
 inherit eutils
 
@@ -9,17 +9,16 @@ IUSE="alsa jack"
 DESCRIPTION="SSM is a object oriented modular softsynth/ sequencer/ sampler."
 HOMEPAGE="http://www.pawfal.org/Software/SSM/"
 SRC_URI="mirror://sourceforge/spiralmodular/${P}.tar.bz2"
-RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 
 DEPEND=">=x11-libs/fltk-1.1
 	media-libs/libsndfile
 	media-libs/liblrdf
 	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )
+	jack? ( media-sound/jack-audio-connection-kit )
 	media-libs/ladspa-sdk"
 
 S=${WORKDIR}/${PN}-0.2.2
@@ -51,7 +50,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo ""
+	einfo
 	einfo "Remember to remove any old ~/.sprialmodular files"
-	einfo ""
+	einfo
 }
diff --git a/media-sound/splay/ChangeLog b/media-sound/splay/ChangeLog
index 4b467669ac1d..798d6c4eeb59 100644
--- a/media-sound/splay/ChangeLog
+++ b/media-sound/splay/ChangeLog
@@ -1,7 +1,30 @@
-# ChangeLog for media-sound/splay 
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/splay/ChangeLog,v 1.1 2002/12/04 03:58:40 drobbins Exp $
+# ChangeLog for media-sound/splay
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/splay/ChangeLog,v 1.1.1.1 2005/11/30 09:37:57 chriswhite Exp $
 
-* splay-0.9.5.2 (03 Dec 2002)
+  25 Jul 2005; David Holm <dholm@gentoo.org> splay-0.9.5.2.ebuild:
+  Added to ~ppc.
+
+  04 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/splay-0.9.5.2-external-id3lib.diff, splay-0.9.5.2.ebuild:
+  added patch to fix compilation problems if an id3lib is installed. 
+  fixes #87597
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> splay-0.9.5.2.ebuild:
+  Stable amd64.
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> splay-0.9.5.2.ebuild:
+  virtual/glibc -> virtual/libc
+
+  27 Apr 2004; Dylan Carlson <absinthe@gentoo.org> splay-0.9.5.2.ebuild:
+  Added ~amd64 to KEYWORDS.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> splay-0.9.5.2.ebuild:
+  Added IUSE.
+
+*splay-0.9.5.2 (03 Dec 2002)
 
   03 Dec 2002; Aron Griffis <agriffis@gentoo.org>: Initial ebuild.
diff --git a/media-sound/splay/Manifest b/media-sound/splay/Manifest
index e69de29bb2d1..8e7c3564f3ae 100644
--- a/media-sound/splay/Manifest
+++ b/media-sound/splay/Manifest
@@ -0,0 +1,5 @@
+MD5 e3c17fadb949d961927ea8c5a666b330 ChangeLog 1077
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 93d83ae0413939e74e38ee902f2e5ada splay-0.9.5.2.ebuild 955
+MD5 2dfdb702aadb0c285c3bbeb861a81810 files/digest-splay-0.9.5.2 65
+MD5 79fd2bcd5390d2bf54d6e7fabd2fc367 files/splay-0.9.5.2-external-id3lib.diff 618
diff --git a/media-sound/splay/splay-0.9.5.2.ebuild b/media-sound/splay/splay-0.9.5.2.ebuild
index 0c761d3455fc..fa5c0e782ec0 100644
--- a/media-sound/splay/splay-0.9.5.2.ebuild
+++ b/media-sound/splay/splay-0.9.5.2.ebuild
@@ -1,23 +1,31 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/splay/splay-0.9.5.2.ebuild,v 1.1 2002/12/03 13:46:50 agriffis Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/splay/splay-0.9.5.2.ebuild,v 1.1.1.1 2005/11/30 09:37:57 chriswhite Exp $
 
-DESCRIPTION="splay is an audio player, primarily for the console"
+inherit eutils
+
+IUSE=""
+
+DESCRIPTION="an audio player, primarily for the console"
 HOMEPAGE="http://splay.sourceforge.net/"
-# Note non-standard sourceforge distribution location, so we can't use
-# mirror://sourceforge/...
-SRC_URI="http://splay.sourceforge.net/tgz/splay-0.9.5.2.tar.gz"
+SRC_URI="http://splay.sourceforge.net/tgz/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
+KEYWORDS="amd64 ~ppc x86"
+
+DEPEND="virtual/libc"
 
-DEPEND="virtual/glibc"
+src_unpack() {
+	unpack ${A}
+	cd ${S}/apps
+	epatch ${FILESDIR}/${P}-external-id3lib.diff
+}
 
 src_compile() {
 	# Force compilation to omit X support according to BUG #5856
 	# even when qt is present on the system.
-	export ac_cv_lib_qt_main=no 
+	export ac_cv_lib_qt_main=no
 	econf || die "econf failed"
 	emake || die "emake failed"
 }
@@ -25,5 +33,5 @@ src_compile() {
 src_install() {
 	# Specify man-page to prevent xsplay.1 from being installed
 	einstall man_MANS=splay.1 || die "einstall failed"
-	dodoc AUTHORS COPYING COPYING.LIB ChangeLog README README.LIB NEWS
+	dodoc AUTHORS ChangeLog README README.LIB NEWS
 }
diff --git a/media-sound/squelch/ChangeLog b/media-sound/squelch/ChangeLog
index c2564c823a4a..7d9f46e57c73 100644
--- a/media-sound/squelch/ChangeLog
+++ b/media-sound/squelch/ChangeLog
@@ -1,9 +1,34 @@
 # ChangeLog for media-sound/squelch
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/squelch/ChangeLog,v 1.1 2002/12/19 19:08:28 danarmak Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squelch/ChangeLog,v 1.1.1.1 2005/11/30 09:38:11 chriswhite Exp $
+
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> squelch-1.0.1.ebuild:
+  Don't install COPYING and INSTALL files.
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> squelch-1.0.1.ebuild:
+  Added to ~ppc.
+
+  07 Jul 2005; Caleb Tennis <caleb@gentoo.org> squelch-1.0.1.ebuild:
+  Fix qt dep
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  squelch-1.0.1.ebuild:
+  Added to ~sparc.
+
+  26 Apr 2004; Caleb Tennis <caleb@gentoo.org> squelch-1.0.1.ebuild:
+  Readd need-qt as it sets addwrite on the Qt directory
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> squelch-1.0.1.ebuild:
+  Added IUSE.
+
+  03 Jan 2004; Caleb Tennis <caleb@gentoo.org> squelch-1.0.1.ebuild:
+  Change need-qt to direct dependency.  Remove inherit kde-functions
 
 *squelch-1.0.1 (19 Dec 2002)
 
+  22 Mar 2003; jje <jje@gentoo.org> squelch-1.0.1.ebuild:
+  Move to stable on x86
+
   19 Dec 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
 
   A qt-based Ogg player. Ebuild submitted by squelch's author, Rik Hemsley
diff --git a/media-sound/squelch/Manifest b/media-sound/squelch/Manifest
index e69de29bb2d1..24b4789f7aee 100644
--- a/media-sound/squelch/Manifest
+++ b/media-sound/squelch/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d6894fc25e8d4ddbaf742a4119ceafd7 ChangeLog 1227
+MD5 eecd77ee917af18a18a8e0cd9307dafd squelch-1.0.1.ebuild 646
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 ad11ab05091f114e366b916b64d69ffb files/digest-squelch-1.0.1 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGs36j5H05b2HAEkRAlWEAJsHxid+N5UBydtGfbm+FGZuK/89qACglKJ0
+SFwuN9eAAw1948UHxSJB2Ls=
+=qZsp
+-----END PGP SIGNATURE-----
diff --git a/media-sound/squelch/squelch-1.0.1.ebuild b/media-sound/squelch/squelch-1.0.1.ebuild
index 92b465fefc98..f0bb0ce4d7b1 100644
--- a/media-sound/squelch/squelch-1.0.1.ebuild
+++ b/media-sound/squelch/squelch-1.0.1.ebuild
@@ -1,20 +1,23 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/squelch/squelch-1.0.1.ebuild,v 1.1 2002/12/19 19:08:28 danarmak Exp $
-inherit kde-functions
-S=${WORKDIR}/${P}
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squelch/squelch-1.0.1.ebuild,v 1.1.1.1 2005/11/30 09:38:11 chriswhite Exp $
+
+inherit kde
+need-qt 3
+
+IUSE=""
+
 DESCRIPTION="qt-based Ogg Vorbis player"
-SRC_URI="http://rikkus.info/arch/${P}.tar.gz"
 HOMEPAGE="http://rikkus.info/squelch.html"
+SRC_URI="http://rikkus.info/arch/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~x86"
+SLOT="0"
+KEYWORDS="~ppc ~sparc x86"
 
 DEPEND="media-libs/libvorbis
-	media-libs/libao"
-
-need-qt 3
+	media-libs/libao
+	=x11-libs/qt-3*"
 
 src_compile() {
 	./configure --prefix=/usr
@@ -23,6 +26,5 @@ src_compile() {
 
 src_install() {
 	dobin src/squelch
-	dodoc AUTHORS COPYING INSTALL README THANKS
+	dodoc AUTHORS README THANKS
 }
-
diff --git a/media-sound/ssrc/ChangeLog b/media-sound/ssrc/ChangeLog
index 1650451c5fa5..3c16e2a4008a 100644
--- a/media-sound/ssrc/ChangeLog
+++ b/media-sound/ssrc/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for media-sound/ssrc
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ssrc/ChangeLog,v 1.1 2004/02/14 06:03:39 eradicator Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ssrc/ChangeLog,v 1.1.1.1 2005/11/30 09:38:22 chriswhite Exp $
+
+  02 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> ssrc-1.29.ebuild:
+  Added unzip DEP.
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> ssrc-1.29.ebuild:
+  -amd64 -sparc
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> ssrc-1.29.ebuild:
+  virtual/glibc -> virtual/libc
+
+  01 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> ssrc-1.29.ebuild:
+  inherit flag-o-matic.  Stable x86.
 
 *ssrc-1.29 (13 Feb 2004)
 
diff --git a/media-sound/ssrc/Manifest b/media-sound/ssrc/Manifest
index 40e3e3bfacc2..8666071d67ca 100644
--- a/media-sound/ssrc/Manifest
+++ b/media-sound/ssrc/Manifest
@@ -1,2 +1,14 @@
-MD5 a336f2e62f3a39a92a5b7a21eb2491e4 ssrc-1.29.ebuild 591
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5a7ded0ec83e5f209aad6580c7de25a9 ChangeLog 830
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 de51482e703879886cc86c9d6413d5e6 ssrc-1.29.ebuild 831
 MD5 17e1cd8c7c60f9ccc3038f85a1ac9e55 files/digest-ssrc-1.29 58
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBiH9NArHZZzCEUG0RAsfzAJ4zrbg5FJ+F+v2HvLv8auO8oAjoFACeIaW+
+i+xSR+75bE+RgpHiqas+yjU=
+=SP0a
+-----END PGP SIGNATURE-----
diff --git a/media-sound/ssrc/ssrc-1.29.ebuild b/media-sound/ssrc/ssrc-1.29.ebuild
index f723d1183579..90640e249827 100644
--- a/media-sound/ssrc/ssrc-1.29.ebuild
+++ b/media-sound/ssrc/ssrc-1.29.ebuild
@@ -1,24 +1,29 @@
-# 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/media-sound/ssrc/ssrc-1.29.ebuild,v 1.1 2004/02/14 06:03:39 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ssrc/ssrc-1.29.ebuild,v 1.1.1.1 2005/11/30 09:38:22 chriswhite Exp $
+
+inherit flag-o-matic
 
 S=${WORKDIR}
 DESCRIPTION="A fast and high quality sampling rate converter"
 HOMEPAGE="http://shibatch.sourceforge.net"
-SRC_URI="http://shibatch.sf.net/download/ssrc-1.29.zip"
+SRC_URI="http://shibatch.sf.net/download/${P}.zip"
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="~x86"
+#-amd64: 1.29: segfault on 44100 -> 11025 kde's pop.wav
+#-sparc: same test as amd64... "Error: Only PCM is supported."
+
+KEYWORDS="x86 -amd64 -sparc"
 IUSE=""
 
-DEPEND="virtual/glibc"
-RDEPEND="virtual/glibc"
+RDEPEND="virtual/libc"
+DEPEND="app-arch/unzip"
 
 src_compile() {
 	append-flags -lm
 	# Local CFLAGS should overwrite the ones in the Makefile
-	emake -e  || die
+	emake -e || die
 }
 
 src_install() {
diff --git a/media-sound/streamixer/ChangeLog b/media-sound/streamixer/ChangeLog
index df3449b1ae6c..410aa99fe71c 100644
--- a/media-sound/streamixer/ChangeLog
+++ b/media-sound/streamixer/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for media-sound/streamixer
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/streamixer/ChangeLog,v 1.1 2004/03/18 15:45:12 eradicator Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/streamixer/ChangeLog,v 1.1.1.1 2005/11/30 09:38:44 chriswhite Exp $
+
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  streamixer-1.19.0.ebuild:
+  Don't install COPYING file.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  streamixer-1.19.0.ebuild:
+  Stable amd64.
+
+  12 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  streamixer-1.19.0.ebuild:
+  -sparc
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  streamixer-1.19.0.ebuild:
+  virtual/glibc -> virtual/libc
+
+  17 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  streamixer-1.19.0.ebuild:
+  IUSE.  Stable x86.
 
 *streamixer-1.19.0 (18 Mar 2004)
 
diff --git a/media-sound/streamixer/Manifest b/media-sound/streamixer/Manifest
index 9a2369fbcb31..5f81a07109d7 100644
--- a/media-sound/streamixer/Manifest
+++ b/media-sound/streamixer/Manifest
@@ -1,2 +1,14 @@
-MD5 66f916583185c045025ec82742392b46 streamixer-1.19.0.ebuild 1087
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f4fa1a3461baed0385c386bf1cc41343 ChangeLog 957
+MD5 37f6b519b5138f12317f1326069641f4 streamixer-1.19.0.ebuild 1232
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 d074d9bf4ef86e891802802072ebdefa files/digest-streamixer-1.19.0 69
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGtI7j5H05b2HAEkRAs+cAJ0Sjsah4wKDQYWDDA73fMHKeHSzpwCfVSyo
+FM+8wAZwOu24p3JRSXZCtK4=
+=9J8C
+-----END PGP SIGNATURE-----
diff --git a/media-sound/streamixer/streamixer-1.19.0.ebuild b/media-sound/streamixer/streamixer-1.19.0.ebuild
index de3c0ff55e82..acd7568c12dd 100644
--- a/media-sound/streamixer/streamixer-1.19.0.ebuild
+++ b/media-sound/streamixer/streamixer-1.19.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/media-sound/streamixer/streamixer-1.19.0.ebuild,v 1.1 2004/03/18 15:45:12 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/streamixer/streamixer-1.19.0.ebuild,v 1.1.1.1 2005/11/30 09:38:44 chriswhite Exp $
+
+IUSE=""
 
 DESCRIPTION="Various audio stream handling tools (non-interactive)"
 HOMEPAGE="http://bisqwit.iki.fi/source/streamixer.html"
 SRC_URI="http://bisqwit.iki.fi/src/arch/${P}.tar.bz2"
 
-KEYWORDS="~x86"
+#-sparc: 1.19.0: bad assembly
+KEYWORDS="x86 amd64 -sparc"
 LICENSE="GPL-2"
 SLOT="0"
 
-RDEPEND="virtual/glibc"
+RDEPEND="virtual/libc"
 DEPEND="sys-apps/sed"
 
 INSTALLPROGS="resample mixer mixwrite mixeridle ecat hum mixerscript"
@@ -42,6 +45,6 @@ src_compile() {
 src_install() {
 	dobin ${INSTALLPROGS}
 	dohard /usr/bin/mixwrite /usr/bin/mixmon
-	dodoc README COPYING
+	dodoc README
 	dohtml README.html
 }
diff --git a/media-sound/streamripper/ChangeLog b/media-sound/streamripper/ChangeLog
index 8d6de6faeda8..2ba9f93be086 100644
--- a/media-sound/streamripper/ChangeLog
+++ b/media-sound/streamripper/ChangeLog
@@ -1,6 +1,125 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/streamripper/ChangeLog,v 1.1 2002/07/23 18:39:19 aliz Exp $
+# ChangeLog for media-sound/streamripper
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/streamripper/ChangeLog,v 1.1.1.1 2005/11/30 09:37:58 chriswhite Exp $
+
+*streamripper-1.61.11 (21 Aug 2005)
+
+  21 Aug 2005; Tony Vroon <chainsaw@gentoo.org>
+  +streamripper-1.61.11.ebuild:
+  Version bump, closes bug #103136.
+
+  02 Aug 2005; Fabian Groffen <grobian@gentoo.org>
+  streamripper-1.61.8.ebuild:
+  Marking ~ppc-macos.  Dropped >=sys-devel/automake-1.8 dependency as is isn't
+  required (checked with vapier).  Made install-sh executable, so it can
+  install on OSX (which apparently needs it.
+
+  05 May 2005; Michael Hanselmann <hansmi@gentoo.org>
+  streamripper-1.61.8.ebuild:
+  Added to ~hppa.
+
+*streamripper-1.61.8 (27 Apr 2005)
+
+  27 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +streamripper-1.61.8.ebuild:
+  new upstream version
+
+*streamripper-1.61.7 (18 Apr 2005)
+
+  18 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  streamripper-1.60.10.ebuild, -streamripper-1.60.8.ebuild,
+  -streamripper-1.60.ebuild, -streamripper-1.61.5.ebuild,
+  +streamripper-1.61.7.ebuild:
+  new upstream version, fixes #89440
+
+*streamripper-1.61.5 (04 Apr 2005)
+
+  04 Apr 2005; Brandon Low <lostlogic@gentoo.org>
+  -streamripper-1.61.1.ebuild, +streamripper-1.61.5.ebuild:
+  Improve the ebuild and fix mistakes (including getting the wrong version)
+  from the previous ebuild
+
+*streamripper-1.61.1 (04 Apr 2005)
+
+  04 Apr 2005; Brandon Low <lostlogic@gentoo.org>
+  +streamripper-1.61.1.ebuild:
+  Bump
+
+  26 Mar 2005; Michael Hanselmann <hansmi@gentoo.org>
+  streamripper-1.60.10.ebuild:
+  Stable on ppc.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  streamripper-1.60.10.ebuild:
+  Stable amd64, sparc, x86.
+
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org> streamripper-1.60.10.ebuild:
+  Stable on ppc64
+
+  12 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  streamripper-1.60.10.ebuild, streamripper-1.60.8.ebuild:
+  Added call to libtoolize.
+
+*streamripper-1.60.10 (01 Nov 2004)
+
+  01 Nov 2004; Markus Rothe <corsair@gentoo.org>
+
+  streamripper-1.60.10.ebuild:
+  Marked ~ppc64; bug #64637
+
+  19 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> :
+  Removed old versions.  Readded ~sparc and ~ppc which were mistakenly removed.
+
+  05 Oct 2004; Jared Hudson <jhhudso@gentoo.org> : Version bump.
+  Marked unstable for amd64 & x86.
+	
+  03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/1.32-http-auth.patch, -streamripper-1.32-r2.ebuild:
+  Stable amd64, sparc, x86.
+
+  19 Aug 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/1.32-http-auth.patch, -streamripper-1.32-r2.ebuild:
+  Removed old version.
+
+*streamripper-1.60.8 (30 Jul 2004)
+
+  30 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/streamripper-1.60.8-syslibmad.patch, +streamripper-1.60.8.ebuild:
+  Version bump to close bug #58927.
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  streamripper-1.60.5.ebuild:
+  Stable x86, amd64, sparc.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  streamripper-1.32-r2.ebuild:
+  virtual/glibc -> virtual/libc
+
+*streamripper-1.60.5 (15 Jun 2004)
+
+  15 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/streamripper-1.60.5-interface.patch,
+  +files/streamripper-1.60.5-syslibmad.patch, +streamripper-1.60.5.ebuild:
+  Version bump.  Added ~sparc.
+
+*streamripper-1.60 (13 May 2004)
+
+  13 May 2004; Mike Frysinger <vapier@gentoo.org> +streamripper-1.60.ebuild:
+  Version bump #48271 by stephan
+
+  01 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  streamripper-1.32-r1.ebuild, streamripper-1.32-r2.ebuild:
+  Stable x86.
+
+*streamripper-1.32-r2 (02 Feb 2004)
+
+  02 Feb 2004; Mike Frysinger <vapier@gentoo.org> :
+  Add patch to support HTTP auth #40028 by Jay Tamboli.
+
+*streamripper-1.32-r1 (28 Aug 2003)
+
+  28 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Add a custom home-brewed patch to allow the user to select the local interface.
 
 *streamripper-1.32 (23 Jul 2002)
 
diff --git a/media-sound/streamripper/Manifest b/media-sound/streamripper/Manifest
index e69de29bb2d1..46fab61e4444 100644
--- a/media-sound/streamripper/Manifest
+++ b/media-sound/streamripper/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 79ee16d155953314a3c63f7107e1229a streamripper-1.61.11.ebuild 899
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 662a285cd27eb85bd437b5b9a49ac07f ChangeLog 4164
+MD5 8d984a459c35c18f619e631c1594f30d streamripper-1.61.8.ebuild 897
+MD5 712d4e62e8e83fe82f41575c0d5b68fb streamripper-1.61.7.ebuild 845
+MD5 cd20a63d6a48d5d9a4efd23f69fa1cb6 streamripper-1.60.10.ebuild 995
+MD5 f1ca63bdc20bab75b36a6877a3dd5a3f files/digest-streamripper-1.61.7 72
+MD5 d9ccc9cd26549470b4fbb3f2a30a3362 files/digest-streamripper-1.60.10 72
+MD5 3232a9e9e35ff8917e02fc8f68142ec7 files/digest-streamripper-1.61.11 73
+MD5 e7f48c69571878c1462918c755772c49 files/streamripper-1.60.5-interface.patch 14184
+MD5 541244ccd6075be3d6b8faea14a3171d files/streamripper-1.60.5-syslibmad.patch 2290
+MD5 ce7341258fb36c53c8df88b01e10c696 files/digest-streamripper-1.61.8 72
+MD5 f14a8f3e07e34e02752ffc14533b357d files/streamripper-1.60.8-syslibmad.patch 2661
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDCK/ep5vW4rUFj5oRAoWgAJ9sMpoCxsFHrOzy+Bs2XoL6Iu9biwCeIULZ
+NH15Z1/MqiP609T+7xTZwWs=
+=N2Cg
+-----END PGP SIGNATURE-----
diff --git a/media-sound/streamripper/streamripper-1.60.10.ebuild b/media-sound/streamripper/streamripper-1.60.10.ebuild
index 041e00512837..2d3522c40ed0 100644
--- a/media-sound/streamripper/streamripper-1.60.10.ebuild
+++ b/media-sound/streamripper/streamripper-1.60.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/media-sound/streamripper/streamripper-1.60.10.ebuild,v 1.1 2004/10/05 08:06:04 jhhudso Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/streamripper/streamripper-1.60.10.ebuild,v 1.1.1.1 2005/11/30 09:37:58 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://streamripper.sourceforge.net/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="media-libs/libmad"
@@ -26,12 +26,16 @@ src_unpack() {
 	# Force package to use system libmad
 	rm -rf libmad-0.15.1b
 
-	WANT_AUTOMAKE=1.8 aclocal >& /dev/null
-	WANT_AUTOMAKE=1.8 automake
-	WANT_AUTOCONF=2.5 autoconf
+	export WANT_AUTOMAKE=1.8
+	export WANT_AUTOCONF=2.5
+
+	libtoolize --copy --force
+	aclocal
+	automake -a -f -c
+	autoconf
 }
 
 src_install() {
-	make install DESTDIR=${D} || die
+	make DESTDIR="${D}" install || die "make install failed"
 	dodoc TODO README THANKS readme_xfade.txt
 }
diff --git a/media-sound/streamripper/streamripper-1.61.11.ebuild b/media-sound/streamripper/streamripper-1.61.11.ebuild
index 21018a8cd300..ee5f6852d3b7 100644
--- a/media-sound/streamripper/streamripper-1.61.11.ebuild
+++ b/media-sound/streamripper/streamripper-1.61.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/media-sound/streamripper/streamripper-1.61.11.ebuild,v 1.1 2005/08/21 16:45:57 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/streamripper/streamripper-1.61.11.ebuild,v 1.1.1.1 2005/11/30 09:37:58 chriswhite Exp $
 
 inherit eutils
 
diff --git a/media-sound/streamripper/streamripper-1.61.7.ebuild b/media-sound/streamripper/streamripper-1.61.7.ebuild
index 18e226927037..b4464588e33e 100644
--- a/media-sound/streamripper/streamripper-1.61.7.ebuild
+++ b/media-sound/streamripper/streamripper-1.61.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/media-sound/streamripper/streamripper-1.61.7.ebuild,v 1.1 2005/04/18 16:45:48 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/streamripper/streamripper-1.61.7.ebuild,v 1.1.1.1 2005/11/30 09:37:58 chriswhite Exp $
 
 
 inherit eutils
diff --git a/media-sound/streamripper/streamripper-1.61.8.ebuild b/media-sound/streamripper/streamripper-1.61.8.ebuild
index cfc02e7cae00..d3351a4eccfd 100644
--- a/media-sound/streamripper/streamripper-1.61.8.ebuild
+++ b/media-sound/streamripper/streamripper-1.61.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/media-sound/streamripper/streamripper-1.61.8.ebuild,v 1.1 2005/04/27 19:41:55 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/streamripper/streamripper-1.61.8.ebuild,v 1.1.1.1 2005/11/30 09:37:58 chriswhite Exp $
 
 inherit eutils
 
@@ -10,12 +10,10 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
 IUSE=""
 
-RDEPEND="media-libs/libmad"
-DEPEND="${RDEPEND}
-	>=sys-devel/automake-1.8"
+DEPEND="media-libs/libmad"
 
 src_unpack() {
 	unpack ${A}
@@ -24,6 +22,9 @@ src_unpack() {
 	# Force package to use system libmad
 	rm -rf libmad*
 	sed -i -e 's/libmad//' Makefile.in || die
+
+	# for some reason the install-sh file is not executable on OSX...
+	chmod a+x install-sh
 }
 
 src_install() {
diff --git a/media-sound/streamtranscoder/ChangeLog b/media-sound/streamtranscoder/ChangeLog
index 50315f0e55d3..28321bf82533 100644
--- a/media-sound/streamtranscoder/ChangeLog
+++ b/media-sound/streamtranscoder/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for media-sound/streamtranscoder
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/streamtranscoder/ChangeLog,v 1.1 2004/09/22 08:59:36 eradicator Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/streamtranscoder/ChangeLog,v 1.1.1.1 2005/11/30 09:38:40 chriswhite Exp $
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  streamtranscoder-1.2.4.ebuild:
+  Stable on ppc.
+
+  04 May 2005; David Holm <dholm@gentoo.org> streamtranscoder-1.2.8.ebuild:
+  Readded to ~ppc. Please don't remove it without filing a proper bug report.
+
+  20 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> :
+  new upstream release with major bugfixes. fixes bug #78322.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  streamtranscoder-1.2.4.ebuild:
+  Stable amd64, sparc, x86.
+
+  18 Oct 2004; David Holm <dholm@gentoo.org> streamtranscoder-1.2.4.ebuild:
+  Added to ~ppc.
 
 *streamtranscoder-1.2.4 (22 Sep 2004)
 
diff --git a/media-sound/streamtranscoder/Manifest b/media-sound/streamtranscoder/Manifest
index 3832d643e00e..ff5fa40b119f 100644
--- a/media-sound/streamtranscoder/Manifest
+++ b/media-sound/streamtranscoder/Manifest
@@ -1,2 +1,6 @@
-MD5 3787850570fb5d0e8cbce796d46f5b6d streamtranscoder-1.2.4.ebuild 701
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 79c48efceca7ecb851c31f7482cfb5b8 streamtranscoder-1.2.8.ebuild 726
+MD5 e66013b61c4eb0fb27fb78c5a5ea4641 ChangeLog 1094
+MD5 0e053bb11ad54c2ce6115c6d8d6e03ac streamtranscoder-1.2.4.ebuild 730
 MD5 4b27cbe42d2e621e2e6cd7463cdbc893 files/digest-streamtranscoder-1.2.4 74
+MD5 c1ffbe331a371c687777fb9691286f3b files/digest-streamtranscoder-1.2.8 74
diff --git a/media-sound/streamtranscoder/streamtranscoder-1.2.4.ebuild b/media-sound/streamtranscoder/streamtranscoder-1.2.4.ebuild
index b3432cd5b06f..5250818ea7a6 100644
--- a/media-sound/streamtranscoder/streamtranscoder-1.2.4.ebuild
+++ b/media-sound/streamtranscoder/streamtranscoder-1.2.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/media-sound/streamtranscoder/streamtranscoder-1.2.4.ebuild,v 1.1 2004/09/22 08:59:36 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/streamtranscoder/streamtranscoder-1.2.4.ebuild,v 1.1.1.1 2005/11/30 09:38:40 chriswhite Exp $
 
 IUSE=""
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.oddsock.org"
 SRC_URI="http://www.oddsock.org/tools/streamTranscoder/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
 
 DEPEND=">=media-libs/libogg-1.1
 	>=media-libs/libvorbis-1.0.1-r2
diff --git a/media-sound/streamtranscoder/streamtranscoder-1.2.8.ebuild b/media-sound/streamtranscoder/streamtranscoder-1.2.8.ebuild
index 969ac0151294..04a873bfb153 100644
--- a/media-sound/streamtranscoder/streamtranscoder-1.2.8.ebuild
+++ b/media-sound/streamtranscoder/streamtranscoder-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/media-sound/streamtranscoder/streamtranscoder-1.2.8.ebuild,v 1.1 2005/01/20 16:41:04 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/streamtranscoder/streamtranscoder-1.2.8.ebuild,v 1.1.1.1 2005/11/30 09:38:40 chriswhite Exp $
 
 IUSE=""
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.oddsock.org"
 SRC_URI="http://www.oddsock.org/tools/streamTranscoder/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~ppc"
 
 DEPEND=">=media-libs/libogg-1.1
 	>=media-libs/libvorbis-1.0.1-r2
diff --git a/media-sound/sulu/ChangeLog b/media-sound/sulu/ChangeLog
index 4cfe20efe3d8..69b93b91d188 100644
--- a/media-sound/sulu/ChangeLog
+++ b/media-sound/sulu/ChangeLog
@@ -1,6 +1,28 @@
 # ChangeLog for media-sound/sulu
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sulu/ChangeLog,v 1.1 2003/03/02 05:13:43 alron Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sulu/ChangeLog,v 1.1.1.1 2005/11/30 09:38:41 chriswhite Exp $
+
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> sulu-0.15.ebuild:
+  Don't install COPYING file.
+
+  23 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> sulu-0.15.ebuild:
+  Don't use cp -a.
+
+  28 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> sulu-0.15.ebuild:
+  Stable sparc and amd64.
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> sulu-0.15.ebuild:
+  ~sparc ~amd64
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> sulu-0.15.ebuild:
+  Added IUSE.
+
+  01 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> sulu-0.15.ebuild:
+  Removed explicit S=
+
+  23 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> metadata.xml,
+  sulu-0.15.ebuild:
+  mpg123 dep changed to virtual
 
 *sulu-0.15 (01 Mar 2003)
 
diff --git a/media-sound/sulu/Manifest b/media-sound/sulu/Manifest
index e69de29bb2d1..d0e37af76fbd 100644
--- a/media-sound/sulu/Manifest
+++ b/media-sound/sulu/Manifest
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 25ea223a5d357c019681011be70cf9f3 ChangeLog 1026
+MD5 66aafa09d29019060513ed4f6cdfb18b sulu-0.15.ebuild 1047
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 99cbf17175441e086c66a38f0d48e4df files/uproar 120
+MD5 97b575f4dede79a805133e1e3bbdf132 files/uproar.usermap 604
+MD5 fbb9264abbe9f1c59fd0f265805e66c7 files/digest-sulu-0.15 57
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGtNsj5H05b2HAEkRAhqNAKCVYX2yZnOQcwU/6VuFYoHM9FDSGgCfTejQ
+8HfNmYHhAJOn0APHz5rGlDY=
+=URZv
+-----END PGP SIGNATURE-----
diff --git a/media-sound/sulu/sulu-0.15.ebuild b/media-sound/sulu/sulu-0.15.ebuild
index a4e81861cb32..fe2b98909afc 100644
--- a/media-sound/sulu/sulu-0.15.ebuild
+++ b/media-sound/sulu/sulu-0.15.ebuild
@@ -1,35 +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/media-sound/sulu/sulu-0.15.ebuild,v 1.1 2003/03/02 05:13:43 alron Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sulu/sulu-0.15.ebuild,v 1.1.1.1 2005/11/30 09:38:41 chriswhite Exp $
+
+IUSE=""
 
 DESCRIPTION="Samsung Uproar Linux Utility (sulu)"
 HOMEPAGE="http://www.cs.toronto.edu/~kal/sulu/index.html"
 SRC_URI="http://www.cs.toronto.edu/~kal/sulu/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
 
-DEPEND=">=dev-libs/libusb-0.1.7
-		>=media-sound/lame-3.93.1
-		>=media-sound/mpg123-0.59
-		=x11-libs/gtk+-1.2*
-		>=sys-apps/hotplug-20020826"
+KEYWORDS="x86 ~ppc sparc amd64"
 
-S=${WORKDIR}/${P}
+DEPEND=">=dev-libs/libusb-0.1.7
+	>=media-sound/lame-3.93.1
+	virtual/mpg123
+	=x11-libs/gtk+-1.2*
+	>=sys-apps/hotplug-20020826"
 
 src_compile() {
 	make || die
 }
 
 src_install() {
-		dodoc COPYING README changelog todo
+		dodoc README changelog todo
 		docinto notes
-		cp -a notes/* ${D}/usr/share/doc/${PF}/notes
+		cp -pPR notes/* ${D}/usr/share/doc/${PF}/notes
 		prepalldocs
 		exeinto /usr/bin
 		doexe sulu
 		exeinto /etc/hotplug/usb
 		doexe ${FILESDIR}/uproar
-		insinto /etc/hotplug
-		doins ${FILESDIR}/usb.usermap
+		insinto /etc/hotplug/usb
+		doins ${FILESDIR}/uproar.usermap
+}
+pkg_postinst() {
+		einfo "Remember to enable hotplug in your kernel and in"
+		einfo "your default runlevel to use sulu as a user instead"
+		einfo "of as root."
 }
diff --git a/media-sound/supercollider/ChangeLog b/media-sound/supercollider/ChangeLog
index 90d9427a5473..03e36ef694eb 100644
--- a/media-sound/supercollider/ChangeLog
+++ b/media-sound/supercollider/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for media-sound/supercollider
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/supercollider/ChangeLog,v 1.1 2004/10/04 03:43:59 eradicator Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/supercollider/ChangeLog,v 1.1.1.1 2005/11/30 09:38:14 chriswhite Exp $
+
+  08 Sep 2005; Simon Stelling <blubb@gentoo.org>
+  supercollider-20040903.ebuild:
+  remove amd64 keyword; bug 94802
+
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  supercollider-20040903.ebuild:
+  Don't install COPYING file.
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  supercollider-20040903.ebuild:
+  Stable on ppc.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  supercollider-20040903.ebuild:
+  Stable amd64, x86.
+
+  18 Oct 2004; David Holm <dholm@gentoo.org> supercollider-20040903.ebuild:
+  Added to ~ppc.
 
 *supercollider-20040903 (02 Oct 2004)
 
diff --git a/media-sound/supercollider/Manifest b/media-sound/supercollider/Manifest
index f4a42fd364bf..04df12a438ab 100644
--- a/media-sound/supercollider/Manifest
+++ b/media-sound/supercollider/Manifest
@@ -1,3 +1,5 @@
-MD5 ee9d69930bc8f3a38a976e54a3846b36 supercollider-20040903.ebuild 2897
+MD5 c05f88a3a90311bb78bdc16214262da7 ChangeLog 1030
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 5daa80aaab6e106e55ce8a95ec5db554 supercollider-20040903.ebuild 2934
 MD5 e0d010a09ea7addae1972ed480078139 files/README-gentoo.txt 3246
 MD5 deeb275f5394571af029926b052791a1 files/digest-supercollider-20040903 72
diff --git a/media-sound/supercollider/supercollider-20040903.ebuild b/media-sound/supercollider/supercollider-20040903.ebuild
index 31ebf12f57c3..cbfb24463975 100644
--- a/media-sound/supercollider/supercollider-20040903.ebuild
+++ b/media-sound/supercollider/supercollider-20040903.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/media-sound/supercollider/supercollider-20040903.ebuild,v 1.1 2004/10/04 03:43:59 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/supercollider/supercollider-20040903.ebuild,v 1.1.1.1 2005/11/30 09:38:14 chriswhite Exp $
 
 IUSE="emacs"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="ppc x86"
 
 RDEPEND="media-sound/jack-audio-connection-kit
 	 media-libs/alsa-lib
@@ -73,7 +73,7 @@ src_install() {
 	# Documentation
 	mv linux/README linux/README-linux
 	mv linux/scel/README linux/scel/README-scel
-	dodoc COPYING linux/README-linux linux/scel/README-scel
+	dodoc linux/README-linux linux/scel/README-scel
 
 	# Our documentation
 	sed -e "s:@DOCBASE@:/usr/share/doc/${PF}:" < ${FILESDIR}/README-gentoo.txt | gzip > ${D}/usr/share/doc/${PF}/README-gentoo.txt.gz
diff --git a/media-sound/swami/ChangeLog b/media-sound/swami/ChangeLog
index fa661040430b..c4235e7046ab 100644
--- a/media-sound/swami/ChangeLog
+++ b/media-sound/swami/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/swami
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/swami/ChangeLog,v 1.1 2005/07/18 19:55:35 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/swami/ChangeLog,v 1.1.1.1 2005/11/30 09:38:05 chriswhite Exp $
+
+  05 Oct 2005; MATSUU Takuto <matsuu@gentoo.org> swami-0.9.2.ebuild:
+  Added src_install. Bug 64997.
+  Cleanup ebuild.
 
 *swami-0.9.2 (18 Jul 2005)
 
diff --git a/media-sound/swami/Manifest b/media-sound/swami/Manifest
index aac7ba0413e2..e1d531c0c39c 100644
--- a/media-sound/swami/Manifest
+++ b/media-sound/swami/Manifest
@@ -1,4 +1,4 @@
-MD5 72ed9f5b52cde0c1230e9807cfe04ebc swami-0.9.2.ebuild 654
-MD5 3c8c5f1537109e23185d317c5471ac72 ChangeLog 280
+MD5 1692b4420c10ce1257ccfbdcdd0ca578 swami-0.9.2.ebuild 833
+MD5 744e2eb3e436ebe5e102b05bda8de131 ChangeLog 489
 MD5 d0d7ea03e238a808414b4426394c100f metadata.xml 221
 MD5 9aed3352256edff71cfdd997f50d2ebe files/digest-swami-0.9.2 64
diff --git a/media-sound/swami/swami-0.9.2.ebuild b/media-sound/swami/swami-0.9.2.ebuild
index c347174b40ac..efcb722c6c89 100644
--- a/media-sound/swami/swami-0.9.2.ebuild
+++ b/media-sound/swami/swami-0.9.2.ebuild
@@ -1,24 +1,35 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/swami/swami-0.9.2.ebuild,v 1.1 2005/07/18 19:55:35 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/swami/swami-0.9.2.ebuild,v 1.1.1.1 2005/11/30 09:38:05 chriswhite Exp $
 
-IUSE=""
 inherit eutils
 
-DESCRIPTION="Sampled Waveforms And Musical Instruments - an advanced instrument editor for Soundfont/DLSMIDI music composition and a sampler frontend"
+DESCRIPTION="A GPL sound font editor"
 HOMEPAGE="http://swami.sourceforge.net/"
 SRC_URI="mirror://sourceforge/swami/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="audiofile debug nls"
 
-RDEPEND="virtual/libc
-	media-libs/alsa-lib
-	>=x11-libs/gtk+-1.2.0
+DEPEND="media-libs/alsa-lib
+	=x11-libs/gtk+-1.2*
 	>=media-sound/fluidsynth-1.0.4
-	>=media-libs/audiofile-0.2.0
+	audiofile? ( >=media-libs/audiofile-0.2.0 )
 	>=media-libs/libsndfile-1.0.0
-	dev-util/pkgconfig
-	virtual/x11"
-DEPEND="${RDEPEND}"
+	dev-util/pkgconfig"
+
+src_compile() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable debug) \
+		$(use_enable audiofile) || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+
+	dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/media-sound/sweep/ChangeLog b/media-sound/sweep/ChangeLog
index 097dcd8cb760..8fdea3cfc51f 100644
--- a/media-sound/sweep/ChangeLog
+++ b/media-sound/sweep/ChangeLog
@@ -1,6 +1,69 @@
 # ChangeLog for media-sound/sweep
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sweep/ChangeLog,v 1.1 2003/03/15 08:34:58 jje Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sweep/ChangeLog,v 1.1.1.1 2005/11/30 09:37:59 chriswhite Exp $
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> sweep-0.8.3.ebuild:
+  Mark 0.8.3 stable on alpha
+
+  26 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> sweep-0.8.3.ebuild:
+  Stable on sparc
+
+  04 Jun 2005; Tobias Scherbaum <dertobi123@gentoo.org> sweep-0.8.3.ebuild:
+  Stable on ppc.
+
+  28 May 2005; Jan Brinkmann <luckyduck@gentoo.org> sweep-0.8.2-r1.ebuild,
+  sweep-0.8.3.ebuild:
+  Dont make use of the deprecated oggvorbis useflag any longer, see #94254.
+  Marked 0.8.3 stable on amd64 and x86.
+
+  05 May 2005; Sven Wegener <swegener@gentoo.org> sweep-0.8.2-r1.ebuild,
+  sweep-0.8.3.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> sweep-0.8.2-r1.ebuild:
+  Stable on ppc.
+
+*sweep-0.8.3 (21 Nov 2004)
+
+  21 Nov 2004; Frank van de Pol <fvdpol@gentoo.org>
+  +files/sweep-0.8.3-alsa.patch, +sweep-0.8.3.ebuild:
+  Version bump.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  sweep-0.8.2-r1.ebuild:
+  Stable amd64, sparc.
+
+  03 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  sweep-0.8.2-r1.ebuild:
+  Changing mad dep to madplay.
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> sweep-0.8.2-r1.ebuild:
+  Add die following econf for bug 48950
+
+  24 Apr 2004; Danny van Dyk <kugelfang@gentoo.org> sweep-0.8.2-r1.ebuild:
+  marked ~amd64.
+
+  01 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  sweep-0.8.2-r1.ebuild:
+  inherit eutils.
+
+  03 Jan 2004; Martin Holzer <mholzer@gentoo.org> sweep-0.8.2-r1.ebuild,
+  files/sweep-0.8.2-alsa.patch:
+  adding alsa patch. Closes 36550
+
+  19 Jul 2003; Nick Hadaway <raker@gentoo.org> sweep-0.8.2-r1.ebuild:
+  Reverted mad changes and kept cleanups. :)
+
+*sweep-0.8.2-r1 (17 Jul 2003)
+
+  17 Jul 2003; Nick Hadaway <raker@gentoo.org> sweep-0.8.2-r1.ebuild:
+  Cleaned up the ebuild.  Changed from media-sound/mad to
+  media-libs/{libmad,libid3tag}
+
+*sweep-0.8.2 (09 May 2003)
+
+  09 May 2003; Bartosch Pixa <darkspecter@gentoo.org> sweep-0.8.2.ebuild:
+  version bump and some ebuild modifications
 
 *sweep-0.8.1 (15 Mar 2003)
 
diff --git a/media-sound/sweep/Manifest b/media-sound/sweep/Manifest
index e69de29bb2d1..7006a620db02 100644
--- a/media-sound/sweep/Manifest
+++ b/media-sound/sweep/Manifest
@@ -0,0 +1,8 @@
+MD5 527dcfe3ce0f0b53c6b6aa8b82eb930c metadata.xml 252
+MD5 e57300a4fbbdd04c401fb4cb37fc1ab0 sweep-0.8.2-r1.ebuild 1314
+MD5 162ae709ece8ea68c0615c807b337d0a ChangeLog 2463
+MD5 9b0d43e08b9aae733d9abe77e3f1bea7 sweep-0.8.3.ebuild 1183
+MD5 b161c4813423e2a3c7a1b76b1a59527f files/sweep-0.8.2-alsa.patch 383
+MD5 fa303e73e349b9c125d053c768fccf74 files/digest-sweep-0.8.2-r1 63
+MD5 3eebc576fe853140f8aaf1ca03443223 files/digest-sweep-0.8.3 64
+MD5 b161c4813423e2a3c7a1b76b1a59527f files/sweep-0.8.3-alsa.patch 383
diff --git a/media-sound/sweep/sweep-0.8.2-r1.ebuild b/media-sound/sweep/sweep-0.8.2-r1.ebuild
index 9e7ab8cbf878..ced4287f7a34 100644
--- a/media-sound/sweep/sweep-0.8.2-r1.ebuild
+++ b/media-sound/sweep/sweep-0.8.2-r1.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/media-sound/sweep/sweep-0.8.2-r1.ebuild,v 1.1 2003/07/17 21:57:15 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sweep/sweep-0.8.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:59 chriswhite Exp $
 
-IUSE="oggvorbis alsa nls"
+inherit eutils
 
-DESCRIPTION="Sweep is an audio editor and live playback tool"
+DESCRIPTION="audio editor and live playback tool"
 HOMEPAGE="http://www.metadecks.org/software/sweep/"
 SRC_URI="http://www.metadecks.org/software/sweep/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~hppa ~mips ~alpha"
+KEYWORDS="x86 ppc sparc ~alpha amd64"
+IUSE="vorbis alsa nls"
 
-DEPEND=">=media-libs/libsndfile-1.0*
-		>=x11-libs/gtk+-1.2*
+DEPEND=">=media-libs/libsndfile-1.0
+		>=x11-libs/gtk+-1.2
+		>=media-sound/madplay-0.14.2b
 		dev-libs/tdb
 		media-libs/libsamplerate
-		media-libs/libmad
-		media-libs/libid3tag
 		media-libs/speex
-		oggvorbis? ( media-libs/libogg media-libs/libvorbis )
+		vorbis? ( media-libs/libogg media-libs/libvorbis )
 		alsa? ( media-libs/alsa-lib )
 		nls? ( sys-devel/gettext )"
-RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${P}"
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-alsa.patch
+}
 
 src_compile() {
 	local myconf
@@ -32,11 +35,11 @@ src_compile() {
 
 	# --enable-experimental       Add to myconf if you want this stuff 
 
-	use oggvorbis || myconf="${myconf} --disable-oggvorbis"
+	use vorbis || myconf="${myconf} --disable-oggvorbis"
 	use alsa && myconf="${myconf} --enable-alsa"
 	use nls  || myconf="${myconf} --disable-nls"
 
-	econf ${myconf}
+	econf ${myconf} || die "econf failed"
 	emake
 }
 
@@ -45,8 +48,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo ""
+	einfo
 	einfo "Sweep can use ladspa plugins,"
 	einfo "emerge ladspa-sdk and ladspa-cmt if you want them."
-	einfo ""
+	einfo
 }
diff --git a/media-sound/sweep/sweep-0.8.3.ebuild b/media-sound/sweep/sweep-0.8.3.ebuild
index 9becf6c8f76c..2b21b57d52fb 100644
--- a/media-sound/sweep/sweep-0.8.3.ebuild
+++ b/media-sound/sweep/sweep-0.8.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/media-sound/sweep/sweep-0.8.3.ebuild,v 1.1 2004/11/21 18:12:11 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sweep/sweep-0.8.3.ebuild,v 1.1.1.1 2005/11/30 09:37:59 chriswhite Exp $
 
 inherit eutils
 
@@ -10,18 +10,18 @@ SRC_URI="http://www.metadecks.org/software/sweep/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
-IUSE="oggvorbis alsa nls"
-
-DEPEND=">=media-libs/libsndfile-1.0*
-		>=x11-libs/gtk+-1.2*
-		>=media-sound/madplay-0.14.2b
-		dev-libs/tdb
-		media-libs/libsamplerate
-		media-libs/speex
-		oggvorbis? ( media-libs/libogg media-libs/libvorbis )
-		alsa? ( media-libs/alsa-lib )
-		nls? ( sys-devel/gettext )"
+KEYWORDS="alpha amd64 ppc sparc x86"
+IUSE="alsa nls vorbis"
+
+DEPEND="dev-libs/tdb
+	media-libs/libsamplerate
+	>=media-libs/libsndfile-1.0
+	media-libs/speex
+	>=media-sound/madplay-0.14.2b
+	>=x11-libs/gtk+-1.2
+	alsa? ( media-libs/alsa-lib )
+	nls? ( sys-devel/gettext )
+	vorbis? ( media-libs/libogg media-libs/libvorbis )"
 
 src_unpack() {
 	unpack ${A}
@@ -30,26 +30,22 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf
-	myconf=""
+	econf \
+		$(use_enable alsa) \
+		$(use_enable nls) \
+		$(use_enable vorbis oggvorbis) \
+		|| die "econf failed"
 
-	# --enable-experimental       Add to myconf if you want this stuff 
-
-	use oggvorbis || myconf="${myconf} --disable-oggvorbis"
-	use alsa && myconf="${myconf} --enable-alsa"
-	use nls  || myconf="${myconf} --disable-nls"
-
-	econf ${myconf} || die "econf failed"
-	emake
+	emake || die "make failed"
 }
 
 src_install() {
-	einstall
+	einstall || die "make install failed"
 }
 
 pkg_postinst() {
-	einfo ""
+	einfo
 	einfo "Sweep can use ladspa plugins,"
 	einfo "emerge ladspa-sdk and ladspa-cmt if you want them."
-	einfo ""
+	einfo
 }
diff --git a/media-sound/synaesthesia/ChangeLog b/media-sound/synaesthesia/ChangeLog
index 4a20d538eee4..dfb7331705e3 100644
--- a/media-sound/synaesthesia/ChangeLog
+++ b/media-sound/synaesthesia/ChangeLog
@@ -1,6 +1,35 @@
 # ChangeLog for media-sound/synaesthesia
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/synaesthesia/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/media-sound/synaesthesia/ChangeLog,v 1.1.1.1 2005/11/30 09:38:46 chriswhite Exp $
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> synaesthesia-2.3.ebuild:
+  Added to ~ppc.
+
+*synaesthesia-2.3 (07 May 2005)
+
+  07 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +synaesthesia-2.3.ebuild:
+  new upstream version, gcc3.4 patch was accepted upstream, some other changes
+  to the sound code were made.
+
+  29 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/synaesthesia-2.2-gcc3.4.patch, -synaesthesia-2.1.ebuild,
+  synaesthesia-2.2.ebuild:
+  added patch to fix compilation with the gcc3.4.x. thanks to Alex Rostovtsev
+  <tetromino@gmail.com> for the contribution. fixes #90561. also added ~amd64
+  to KEYWORDS and did some cleanup.
+
+  27 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  synaesthesia-2.1.ebuild, synaesthesia-2.2.ebuild:
+  Fixed HOMEPAGE and SRC_URI for bug #90433.
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> synaesthesia-2.2.ebuild:
+  Typo in DESCRIPTION: accompanyment -> accompaniment. Bug 59717.
+
+*synaesthesia-2.2 (14 Jan 2004)
+
+  14 Jan 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bump + clean up.
 
 *synaesthesia-2.1 (1 Feb 2002)
 
diff --git a/media-sound/synaesthesia/Manifest b/media-sound/synaesthesia/Manifest
index e69de29bb2d1..c33e37362139 100644
--- a/media-sound/synaesthesia/Manifest
+++ b/media-sound/synaesthesia/Manifest
@@ -0,0 +1,7 @@
+MD5 0a9c8d5534edae03a2438701f2cb0464 ChangeLog 1741
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 47ddf715218b721c43e875f0b6b22485 synaesthesia-2.2.ebuild 913
+MD5 0bbaa7eb2e3e404b1323099124b1ed20 synaesthesia-2.3.ebuild 869
+MD5 8406064a7b709f1db47d6ae809de7820 files/digest-synaesthesia-2.2 68
+MD5 022bf47ca583065960cdf36ef20e94b3 files/synaesthesia-2.2-gcc3.4.patch 900
+MD5 2ebf65f844c9da7e9a44add79ca0dd46 files/digest-synaesthesia-2.3 68
diff --git a/media-sound/synaesthesia/synaesthesia-2.2.ebuild b/media-sound/synaesthesia/synaesthesia-2.2.ebuild
index a30be2827523..6f20acd6b7af 100644
--- a/media-sound/synaesthesia/synaesthesia-2.2.ebuild
+++ b/media-sound/synaesthesia/synaesthesia-2.2.ebuild
@@ -1,14 +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/media-sound/synaesthesia/synaesthesia-2.2.ebuild,v 1.1 2004/01/14 05:47:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/synaesthesia/synaesthesia-2.2.ebuild,v 1.1.1.1 2005/11/30 09:38:46 chriswhite Exp $
 
-DESCRIPTION="a nice graphical accompanyment to music"
-HOMEPAGE="http://yoyo.cc.monash.edu.au/~pfh/synaesthesia.html"
-SRC_URI="http://www.logarithmic.net/pfh/Synaesthesia/${P}.tar.gz"
+inherit eutils
+
+DESCRIPTION="a nice graphical accompaniment to music"
+HOMEPAGE="http://www.logarithmic.net/pfh/synaesthesia"
+SRC_URI="http://www.logarithmic.net/pfh-files/synaesthesia/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ~amd64"
 IUSE="sdl svga esd"
 
 DEPEND="virtual/x11
@@ -19,11 +21,14 @@ DEPEND="virtual/x11
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+
 	sed -i \
 		-e "/CFLAGS=/s:-O4:${CFLAGS}:" \
 		-e "/CXXFLAGS=/s:-O4:${CXXFLAGS}:" \
 		configure
 	sed -i 's:void inline:inline void:' syna.h
+
+	epatch ${FILESDIR}/${P}-gcc3.4.patch
 }
 
 src_install() {
diff --git a/media-sound/synaesthesia/synaesthesia-2.3.ebuild b/media-sound/synaesthesia/synaesthesia-2.3.ebuild
index 29e8424d08d3..bdccb7601609 100644
--- a/media-sound/synaesthesia/synaesthesia-2.3.ebuild
+++ b/media-sound/synaesthesia/synaesthesia-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/media-sound/synaesthesia/synaesthesia-2.3.ebuild,v 1.1 2005/05/07 13:46:14 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/synaesthesia/synaesthesia-2.3.ebuild,v 1.1.1.1 2005/11/30 09:38:46 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.logarithmic.net/pfh-files/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="sdl svga esd"
 
 DEPEND="virtual/x11
diff --git a/media-sound/tagtool/ChangeLog b/media-sound/tagtool/ChangeLog
index 924eb564dcf8..3801ae808310 100644
--- a/media-sound/tagtool/ChangeLog
+++ b/media-sound/tagtool/ChangeLog
@@ -1,6 +1,67 @@
 # ChangeLog for media-sound/tagtool
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tagtool/ChangeLog,v 1.1 2004/08/19 21:38:25 chriswhite Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tagtool/ChangeLog,v 1.1.1.1 2005/11/30 09:38:15 chriswhite Exp $
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> tagtool-0.11.1.ebuild:
+  Stable on ppc.
+
+*tagtool-0.12.2 (21 Jun 2005)
+
+  21 Jun 2005; John N. Laliberte <allanonjl@gentoo.org>
+  +files/tagtool-gmodule.patch, tagtool-0.11.1.ebuild,
+  +tagtool-0.12.2.ebuild:
+  apply patch to stable version to fix #93907, and version bump to new version
+  that already has the fix.
+
+*tagtool-0.12.1 (15 Apr 2005)
+
+  15 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> metadata.xml,
+  -tagtool-0.10.ebuild, tagtool-0.11.1.ebuild, +tagtool-0.12.1.ebuild:
+  new upstream version, fixes #68864. updated metadata.xml, chriswhite is
+  retired. changed oggvorbis useflag to vorbis, oggvorbis is deprecated. also
+  did some cleanup.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  tagtool-0.11.1.ebuild:
+  Stable amd64, x86.
+
+*tagtool-0.11.1 (16 Nov 2004)
+
+  16 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +tagtool-0.11.1.ebuild:
+  Version bump.
+
+  18 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  tagtool-0.10.ebuild:
+  Stable amd64, x86.
+
+  07 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  tagtool-0.10.ebuild:
+  -sparc.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> -tagtool-0.9.ebuild:
+  Removed old version.
+
+*tagtool-0.10 (12 Sep 2004)
+
+  12 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> +tagtool-0.10.ebuild:
+  Version bump.  Added ~amd64.
+
+  03 Sep 2004; David Holm <dholm@gentoo.org> tagtool-0.9.ebuild:
+  Added to ~ppc.
+
+*tagtool-0.10 (12 Sep 2004)
+
+  12 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> +tagtool-0.10.ebuild:
+  Version bump.  Added ~amd64.
+
+  20 Aug 2004; Chris White <chriswhite@gentoo.org> tagtool-0.9.ebuild:
+  Removed uneeded src_unpack from the ebuild.
+
+*tagtool-0.9 (20 Aug 2004)
+
+  20 Aug 2004; Chris White <chriswhite@gentoo.org> tagtool-0.9.ebuild:
+  Fixed RDEPEND v. DEPEND logic.
 
   20 Aug 2004; Chris White <chriswhite@gentoo.org> +metadata.xml:
   Initial import into the tree. Thanks to Justin <yoosty69@netzero.net> for
diff --git a/media-sound/tagtool/Manifest b/media-sound/tagtool/Manifest
index eb21d194d654..e847c8866838 100644
--- a/media-sound/tagtool/Manifest
+++ b/media-sound/tagtool/Manifest
@@ -1,2 +1,9 @@
-MD5 d9172fbafaa6a7a357f02b563b39c4cd tagtool-0.9.ebuild 1321
-MD5 35a84c84089c22bafe01a69838d49679 files/digest-tagtool-0.9 141
+MD5 77128531a37c146868c7d56e2435897e tagtool-0.12.1.ebuild 1368
+MD5 8aa405050e6220bf32df81bdf5df905f tagtool-0.11.1.ebuild 1513
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 a44850e45fc3b365412bbb42863dce0b ChangeLog 2243
+MD5 81a78f3e2ff1a7b28a5cddf5903dd9de tagtool-0.12.2.ebuild 1368
+MD5 be7189cf1f4ede0b8b600f4071c3b65e files/digest-tagtool-0.12.2 66
+MD5 0afbe723cd47379541f8742a5483764f files/digest-tagtool-0.12.1 66
+MD5 f3f316e9052ef60df0e98fb6d3732677 files/tagtool-gmodule.patch 467
+MD5 283cdf9cb08cc4d819adacde98f27dda files/digest-tagtool-0.11.1 66
diff --git a/media-sound/tagtool/metadata.xml b/media-sound/tagtool/metadata.xml
index ec6a427b666f..e1774e3d9ad7 100644
--- a/media-sound/tagtool/metadata.xml
+++ b/media-sound/tagtool/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sound</herd>
-<maintainer>
-  <email>chriswhite@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/media-sound/tagtool/tagtool-0.11.1.ebuild b/media-sound/tagtool/tagtool-0.11.1.ebuild
index ab056a5949e7..2c91de87cfe2 100644
--- a/media-sound/tagtool/tagtool-0.11.1.ebuild
+++ b/media-sound/tagtool/tagtool-0.11.1.ebuild
@@ -1,33 +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/media-sound/tagtool/tagtool-0.11.1.ebuild,v 1.1 2004/11/17 05:45:23 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tagtool/tagtool-0.11.1.ebuild,v 1.1.1.1 2005/11/30 09:38:15 chriswhite Exp $
 
-IUSE="oggvorbis mp3"
+inherit eutils
 
 DESCRIPTION="Audio Tag Tool Ogg/Mp3 Tagger"
 HOMEPAGE="http://pwp.netcabo.pt/paol/tagtool/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 
 #-sparc: 0.10 doesn't browse files properly
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
+IUSE="vorbis mp3"
 
 DEPEND=">=x11-libs/gtk+-2.4.0-r1
 	>=gnome-base/libglade-2.4.0
 	mp3? ( >=media-libs/id3lib-3.8.3-r3 )
-	oggvorbis? ( >=media-libs/libvorbis-1.0.1 )"
+	vorbis? ( >=media-libs/libvorbis-1.0.1 )"
 
-src_compile() {
+src_unpack() {
+	unpack ${A}
 	cd ${S}
 
+	# fix for #93907
+	epatch ${FILESDIR}/tagtool-gmodule.patch
+	autoconf || die "autoconf failed"
+}
+
+src_compile() {
 	local myconf
 	myconf=""
 
 	# Stupid configure thinks --enable-{mp3,vorbis} disables it.
 	# add some configure logic to prevent a dying ebuild
-	if use !mp3 && use !oggvorbis
+	if use !mp3 && use !vorbis
 	then
 		ewarn "Vorbis or mp3 must be selected."
 		ewarn "Defaulting to mp3, please cancel this emerge"
@@ -35,11 +43,11 @@ src_compile() {
 		myconf="--disable-vorbis"
 	else
 		use mp3 || myconf="${myconf} --disable-mp3"
-		use oggvorbis || myconf="${myconf} --disable-vorbis"
+		use vorbis || myconf="${myconf} --disable-vorbis"
 	fi
 
 	econf ${myconf} || die "econf failed"
-	emake || die
+	emake || die "make failed"
 }
 
 src_install() {
@@ -47,7 +55,7 @@ src_install() {
 		DESTDIR=${D} \
 		sysdir=${D}/usr/share/applets/Multimedia \
 		GNOME_SYSCONFDIR=${D}/etc \
-		|| die
+		|| die "make install failed"
 
 	dodoc ChangeLog NEWS README TODO THANKS
 }
diff --git a/media-sound/tagtool/tagtool-0.12.1.ebuild b/media-sound/tagtool/tagtool-0.12.1.ebuild
index 3b4e554022a7..bbdbe8f32b81 100644
--- a/media-sound/tagtool/tagtool-0.12.1.ebuild
+++ b/media-sound/tagtool/tagtool-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/media-sound/tagtool/tagtool-0.12.1.ebuild,v 1.1 2005/04/15 20:23:09 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tagtool/tagtool-0.12.1.ebuild,v 1.1.1.1 2005/11/30 09:38:16 chriswhite Exp $
 
 
 DESCRIPTION="Audio Tag Tool Ogg/Mp3 Tagger"
diff --git a/media-sound/tagtool/tagtool-0.12.2.ebuild b/media-sound/tagtool/tagtool-0.12.2.ebuild
index 2196a03fccd1..dc4263a5df84 100644
--- a/media-sound/tagtool/tagtool-0.12.2.ebuild
+++ b/media-sound/tagtool/tagtool-0.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/media-sound/tagtool/tagtool-0.12.2.ebuild,v 1.1 2005/06/21 01:08:18 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tagtool/tagtool-0.12.2.ebuild,v 1.1.1.1 2005/11/30 09:38:15 chriswhite Exp $
 
 
 DESCRIPTION="Audio Tag Tool Ogg/Mp3 Tagger"
diff --git a/media-sound/takcd/ChangeLog b/media-sound/takcd/ChangeLog
index be8f4c9541fe..84df9e014684 100644
--- a/media-sound/takcd/ChangeLog
+++ b/media-sound/takcd/ChangeLog
@@ -1,9 +1,39 @@
 # ChangeLog for media-sound/takcd
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/takcd/ChangeLog,v 1.1 2003/02/08 01:36:54 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/takcd/ChangeLog,v 1.1.1.1 2005/11/30 09:37:48 chriswhite Exp $
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> takcd-0.10.ebuild:
+  Mark 0.10 stable on alpha
+
+  18 Jul 2005; Seemant Kulleen <seemant@gentoo.org> takcd-0.10.ebuild:
+  fix the autoconf version to be more up to date, thanks to: Jeff Spencer
+  <jeff@alkcc.com> in bug #98699
+
+  09 May 2005; Aron Griffis <agriffis@gentoo.org> takcd-0.10.ebuild:
+  stable on ia64
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> takcd-0.10.ebuild:
+  Stable amd64, sparc.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> takcd-0.10.ebuild:
+  virtual/glibc -> virtual/libc
+
+  01 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> takcd-0.08.ebuild,
+  takcd-0.10.ebuild:
+  Stable on x86.  Fixed DEPEND.
+
+*takcd-0.10 (20 Oct 2003)
+
+  20 Oct 2003; Seemant Kulleen <seemant@gentoo.org> takcd-0.10.ebuild:
+  Matt Kennedy made a patch which got accepted upstream, to allow for a config
+  file (and allows you to specify which your cdrom device is, if it is not
+  /dev/cdrom)
 
 *takcd-0.08 (07 Feb 2003)
 
+  12 Apr 2003; Graham Forest <vladimir@gentoo.org> takcd-0.08.ebuild:
+  set ~ppc in keywords
+
   07 Feb 2003; Seemant Kulleen <seemant@gentoo.org> takcd-0.08.ebuild
   ChangeLog files/digest-takcd-0.08 :
 
diff --git a/media-sound/takcd/Manifest b/media-sound/takcd/Manifest
index 59672768ec39..c60a37ffd1ba 100644
--- a/media-sound/takcd/Manifest
+++ b/media-sound/takcd/Manifest
@@ -1,3 +1,4 @@
-MD5 392c2be8e32df0eb01dad696ba196c0e ChangeLog 516
-MD5 460318763d21792ab0e7b2b43810495c takcd-0.08.ebuild 580
-MD5 a3080599817fc56ecab6ea2f7f8ef718 files/digest-takcd-0.08 61
+MD5 aa0bfeeaf772ac88a10eaadfcec3936f metadata.xml 250
+MD5 6f599e06e4b50469b82ec751bd8616e6 ChangeLog 1478
+MD5 d7056476210dcefcdd36e94f50ecaaae takcd-0.10.ebuild 690
+MD5 4ed64a024c0ed185031f62585ddc799c files/digest-takcd-0.10 61
diff --git a/media-sound/takcd/takcd-0.10.ebuild b/media-sound/takcd/takcd-0.10.ebuild
index 9d9c2af95f47..9ef1f3bb59b4 100644
--- a/media-sound/takcd/takcd-0.10.ebuild
+++ b/media-sound/takcd/takcd-0.10.ebuild
@@ -1,21 +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/media-sound/takcd/takcd-0.10.ebuild,v 1.1 2003/10/20 08:34:11 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/takcd/takcd-0.10.ebuild,v 1.1.1.1 2005/11/30 09:37:49 chriswhite Exp $
 
 IUSE=""
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Command line CD player"
 HOMEPAGE="http://bard.sytes.net/takcd/"
 SRC_URI="http://bard.sytes.net/takcd/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~arm ~ia64 ~amd64"
+KEYWORDS="alpha amd64 ~hppa ia64 ~mips ~ppc sparc x86"
 
-DEPEND="virtual/glibc"
+RDEPEND="virtual/libc"
+
+DEPEND="sys-devel/autoconf
+	sys-devel/automake"
 
 src_compile() {
+	export WANT_AUTOMAKE=1.4
+	export WANT_AUTOCONF=2.5
 	./autogen.sh
 	emake || die
 }
diff --git a/media-sound/tap-reverbed/ChangeLog b/media-sound/tap-reverbed/ChangeLog
index 4edcb46b707a..8f0fd6fe3695 100644
--- a/media-sound/tap-reverbed/ChangeLog
+++ b/media-sound/tap-reverbed/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/tap-reverbed
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tap-reverbed/ChangeLog,v 1.1 2005/07/18 18:42:10 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tap-reverbed/ChangeLog,v 1.1.1.1 2005/11/30 09:38:35 chriswhite Exp $
+
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> tap-reverbed-0.ebuild:
+  Don't install COPYING and INSTALL files.
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> tap-reverbed-0.ebuild:
+  Added to ~ppc.
 
 *tap-reverbed-0 (18 Jul 2005)
 
diff --git a/media-sound/tap-reverbed/Manifest b/media-sound/tap-reverbed/Manifest
index 63acbbf7d4e8..ef0721ff2c89 100644
--- a/media-sound/tap-reverbed/Manifest
+++ b/media-sound/tap-reverbed/Manifest
@@ -1,3 +1,14 @@
-MD5 2da598e9395cd4cf4b21118fd3ae628b tap-reverbed-0.ebuild 1137
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c8c7455ec541dac6555c63a8c886d379 ChangeLog 661
+MD5 44ea0f080c53247d222a09eb81e00f32 tap-reverbed-0.ebuild 1237
 MD5 d0d7ea03e238a808414b4426394c100f metadata.xml 221
 MD5 4ea2e1624e5bb8b7a5ca946164c4e2ef files/digest-tap-reverbed-0 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGs2gj5H05b2HAEkRAoUeAJsEDdgUOTw4bZvd7W0hcctYacLl+QCfY28I
+U1brb5FdP3B8IfExWtDvRFI=
+=TezO
+-----END PGP SIGNATURE-----
diff --git a/media-sound/tap-reverbed/tap-reverbed-0.ebuild b/media-sound/tap-reverbed/tap-reverbed-0.ebuild
index 63b5a63389e0..144dd3059035 100644
--- a/media-sound/tap-reverbed/tap-reverbed-0.ebuild
+++ b/media-sound/tap-reverbed/tap-reverbed-0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tap-reverbed/tap-reverbed-0.ebuild,v 1.1 2005/07/18 18:42:10 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tap-reverbed/tap-reverbed-0.ebuild,v 1.1.1.1 2005/11/30 09:38:35 chriswhite Exp $
 
 IUSE=""
 
@@ -12,7 +12,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 DEPEND="media-libs/ladspa-sdk
 	media-plugins/tap-plugins
@@ -30,7 +30,7 @@ src_install() {
 	einfo ${D}
 	einstall
 
-	dodoc COPYING README AUTHORS INSTALL
+	dodoc README AUTHORS
 	insinto /usr/share/tap-reverbed
 	insopts -m0666
 	doins src/\.reverbed
diff --git a/media-sound/tapiir/ChangeLog b/media-sound/tapiir/ChangeLog
index 00f984971cca..a9a95d9dcc56 100644
--- a/media-sound/tapiir/ChangeLog
+++ b/media-sound/tapiir/ChangeLog
@@ -1,9 +1,14 @@
 # ChangeLog for media-sound/tapiir
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tapiir/ChangeLog,v 1.1 2003/05/09 13:13:36 jje Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tapiir/ChangeLog,v 1.1.1.1 2005/11/30 09:38:19 chriswhite Exp $
 
-*tapiir-0.7.1 (09 May 2003)
+  25 Jul 2005; David Holm <dholm@gentoo.org> tapiir-0.7.1.ebuild:
+  Added to ~ppc.
 
-  09 May 2003; jje <jje@gentoo.org> tapiir-0.7.1.ebuild:
-  Initial revision.
+  19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  Remove retired developer from metadata.xml.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  tapiir-0.7.1.ebuild:
+  Added to ~sparc.
 
diff --git a/media-sound/tapiir/Manifest b/media-sound/tapiir/Manifest
index 38897c3e605e..cab0659ddd92 100644
--- a/media-sound/tapiir/Manifest
+++ b/media-sound/tapiir/Manifest
@@ -1,3 +1,5 @@
-MD5 54f15b6e5cca8d6f225ba5ad1694fe9b tapiir-0.7.1.ebuild 737
-MD5 fb45ef7d2a41805d0f4b2a8d0b004835 ChangeLog 234
+MD5 25d7c647b0e7ec03c1f5508294eb8999 ChangeLog 507
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 a3934d9819ad95cb16f6132eef741675 tapiir-0.7.1.ebuild 1072
 MD5 129400b384f4804d81050abef03da3e8 files/digest-tapiir-0.7.1 64
+MD5 e9418ac273accb63dde90b8282224b25 files/tapiir-0.7.1-gcc3.patch 4632
diff --git a/media-sound/tapiir/metadata.xml b/media-sound/tapiir/metadata.xml
index d4ce46c038ab..e1774e3d9ad7 100644
--- a/media-sound/tapiir/metadata.xml
+++ b/media-sound/tapiir/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sound</herd>
-<maintainer>
-  <email>torbenh@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/media-sound/tapiir/tapiir-0.7.1.ebuild b/media-sound/tapiir/tapiir-0.7.1.ebuild
index a34f2d0ca6f2..4e2dfce029d7 100644
--- a/media-sound/tapiir/tapiir-0.7.1.ebuild
+++ b/media-sound/tapiir/tapiir-0.7.1.ebuild
@@ -1,28 +1,40 @@
-# 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/media-sound/tapiir/tapiir-0.7.1.ebuild,v 1.1 2003/05/09 13:13:36 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tapiir/tapiir-0.7.1.ebuild,v 1.1.1.1 2005/11/30 09:38:19 chriswhite Exp $
+
+inherit eutils
+
+IUSE=""
 
 DESCRIPTION=" Tapiir is a simple and flexible audio effects processor, inspired on the classical magnetic tape delay systems"
 HOMEPAGE="http://www.iua.upf.es/~mdeboer/projects/tapiir/"
-SRC_URI="ftp://www.iua.upf.es/pub/mdeboer/projects/tapiir/${P}.tar.gz"
+SRC_URI="ftp://www.iua.upf.es/pub/mdeboer/projects/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 
-DEPEND="virtual/jack
-	>=media-sound/alsa-driver-0.9
+DEPEND="media-sound/jack-audio-connection-kit
+	>=media-libs/alsa-lib-0.9
 	x11-libs/fltk"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-gcc3.patch
+	sed -i "/#include <alsa\\/asoundlib.h>/i\\#define ALSA_PCM_OLD_HW_PARAMS_API 1\\" src/alsaio.cxx
+}
+
 src_compile() {
 	local myconf
-	myconf="--with-fltk-prefix=/usr/lib/fltk-1.1 \
+	myconf="--with-fltk-prefix=/usr/$(get_libdir)/fltk-1.1 \
 		--with-fltk-inc-prefix=/usr/include/fltk-1.1"
-	./configure ${myconf} || die
+	econf ${myconf} || die
 	emake || die
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 	dodoc AUTHORS
 }
diff --git a/media-sound/teamspeak2-client-bin/ChangeLog b/media-sound/teamspeak2-client-bin/ChangeLog
index efa43274986e..8953d7bf8947 100644
--- a/media-sound/teamspeak2-client-bin/ChangeLog
+++ b/media-sound/teamspeak2-client-bin/ChangeLog
@@ -1,6 +1,79 @@
 # ChangeLog for media-sound/teamspeak2-client-bin
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak2-client-bin/ChangeLog,v 1.1 2003/07/19 13:37:14 jje Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak2-client-bin/ChangeLog,v 1.1.1.1 2005/11/30 09:37:48 chriswhite Exp $
+
+  29 Jan 2005; Gregorio Guidi <greg_g@gentoo.org>
+  teamspeak2-client-bin-2.0.32.60-r3.ebuild:
+  Make sure to not install anything in /usr/kde* (related to #41576).
+
+  07 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  teamspeak2-client-bin-2.0.32.60-r3.ebuild:
+  updated homepage. fixes #76964.
+
+  10 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  teamspeak2-client-bin-2.0.32.60-r3.ebuild:
+  Fixed amd64 RDEPEND.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  teamspeak2-client-bin-2.0.32.60-r3.ebuild:
+  Stable amd64.
+
+  24 Aug 2004; Danny van Dyk <kugelfang@gentoo.org>
+  teamspeak2-client-bin-2.0.32.60-r3.ebuild:
+  Precised emulation library dependencies on amd64. See BUG #55893.
+
+  07 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  teamspeak2-client-bin-2.0.32.60-r3.ebuild:
+  -* as it's a binary package.
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org>
+  teamspeak2-client-bin-2.0.32.60-r3.ebuild:
+  Fix use invocation
+
+*teamspeak2-client-bin-2.0.32.60-r3 (24 Apr 2004)
+
+  24 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  teamspeak2-client-bin-2.0.32.60-r1.ebuild,
+  teamspeak2-client-bin-2.0.32.60-r2.ebuild,
+  teamspeak2-client-bin-2.0.32.60-r3.ebuild:
+  Fixed symlink to documentation and eninfo. bugs #48855 and #48901. Removed old
+  ebuilds.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  teamspeak2-client-bin-2.0.32.60-r1.ebuild:
+  Added IUSE.
+
+  17 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  teamspeak2-client-bin-2.0.32.60-r2.ebuild:
+  Added imagemagick to IUSE.
+
+  01 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  teamspeak2-client-bin-2.0.32.60-r2.ebuild:
+  Stable x86.
+
+  30 Mar 2004; Daniel Ahlberg <aliz@gentoo.org>
+  teamspeak2-client-bin-2.0.32.60-r2.ebuild:
+  Adding amd64 keyword. Closing #45654.
+
+  04 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  teamspeak2-client-bin-2.0.32.60-r2.ebuild:
+  ebuild cleanup
+
+*teamspeak2-client-bin-2.0.32.60-r2 (03 Mar 2004)
+
+  03 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  teamspeak2-client-bin-2.0.32.60-r2.ebuild:
+  Bugfixed ebuild provided in bug #34863 by Peter Kirk <pwk.linuxfan@gmx.de>.
+
+*teamspeak2-client-bin-2.0.32.60-r1 (10 Dec 2003)
+
+  10 Dec 2003; Mike Frysinger <vapier@gentoo.org> :
+  Install into the proper locations.
+
+*teamspeak2-client-bin-2.0.32.60 (20 Sep 2003)
+
+  20 Sep 2003; jje <jje@gentoo.org> teamspeak2-client-bin-2.0.32.60.ebuild:
+  Version bump.
 
 *teamspeak2-client-bin-2.0.29_rc2 (19 Jul 2003)
 
diff --git a/media-sound/teamspeak2-client-bin/Manifest b/media-sound/teamspeak2-client-bin/Manifest
index e57c8bc74047..03d2963e275e 100644
--- a/media-sound/teamspeak2-client-bin/Manifest
+++ b/media-sound/teamspeak2-client-bin/Manifest
@@ -1,4 +1,6 @@
-MD5 3a350140016b9b77c57b32d8d1d6421c teamspeak2-client-bin-2.0.29_rc2.ebuild 1609
-MD5 6e8ec4d4f45e45285c86ac4ee60e0d90 files/digest-ts2-client-2.0.29_rc2 73
-MD5 6e8ec4d4f45e45285c86ac4ee60e0d90 files/digest-teamspeak2-client-2.0.29_rc2 73
-MD5 6e8ec4d4f45e45285c86ac4ee60e0d90 files/digest-teamspeak2-client-bin-2.0.29_rc2 73
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 85fb81d7ff2ea2a27dc7622899808f4f ChangeLog 2869
+MD5 b677eda36ab18dd63dc3b0bf5bad39ac teamspeak2-client-bin-2.0.32.60-r3.ebuild 2663
+MD5 a913652aee03ba33bf2daf0273d0f574 files/TeamSpeak 102
+MD5 b48712e5232569498000c8cb3dd943ef files/teamspeak.protocol 149
+MD5 7d8bc1b4187d9a6e2e08d18a8a11e1a9 files/digest-teamspeak2-client-bin-2.0.32.60-r3 73
diff --git a/media-sound/teamspeak2-client-bin/teamspeak2-client-bin-2.0.32.60-r3.ebuild b/media-sound/teamspeak2-client-bin/teamspeak2-client-bin-2.0.32.60-r3.ebuild
index 679cc38845d0..aeb9dc0b35f1 100644
--- a/media-sound/teamspeak2-client-bin/teamspeak2-client-bin-2.0.32.60-r3.ebuild
+++ b/media-sound/teamspeak2-client-bin/teamspeak2-client-bin-2.0.32.60-r3.ebuild
@@ -1,25 +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/media-sound/teamspeak2-client-bin/teamspeak2-client-bin-2.0.32.60-r3.ebuild,v 1.1 2004/04/25 00:07:44 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak2-client-bin/teamspeak2-client-bin-2.0.32.60-r3.ebuild,v 1.1.1.1 2005/11/30 09:37:48 chriswhite Exp $
 
 MY_PV=rc2_2032
 DESCRIPTION="The TeamSpeak voice communication tool"
-HOMEPAGE="http://www.teamspeak.org"
+HOMEPAGE="http://www.goteamspeak.com"
 SRC_URI="ftp://teamspeak.krawall.de/releases/ts2_client_${MY_PV}.tar.bz2"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86 ~amd64"
+KEYWORDS="-* x86 amd64"
 
 IUSE="kde imagemagick"
 
-RDEPEND="virtual/x11"
+DEPEND=""
 
-DEPEND="${DEPEND}
+RDEPEND="${DEPEND}
+	virtual/x11
 	kde? ( >=kde-base/kdelibs-3.1.0 )
 	imagemagick? ( media-gfx/imagemagick )
-	amd64? ( app-emulation/emul-linux-x86-baselibs
-		app-emulation/emul-linux-x86-xlibs )"
+	amd64? ( >=app-emulation/emul-linux-x86-baselibs-1.0
+	         >=app-emulation/emul-linux-x86-xlibs-1.0 )"
 
 S="${WORKDIR}/ts2_client_${MY_PV}/setup.data/image"
 
@@ -58,10 +59,10 @@ src_install() {
 	fi
 	newins icon.xpm teamspeak.xpm
 
-	if [ `use kde` ] ; then
+	if use kde ; then
 		# Install a teamspeak.protocol file for kde/konqueror to accept
 		# teamspeak:// links
-		insinto $(kde-config --prefix)/share/services/
+		insinto /usr/share/services/
 		doins ${FILESDIR}/teamspeak.protocol
 	fi
 
diff --git a/media-sound/teamspeak2-server-bin/ChangeLog b/media-sound/teamspeak2-server-bin/ChangeLog
index 22b701e4be98..a9a9150e9d19 100644
--- a/media-sound/teamspeak2-server-bin/ChangeLog
+++ b/media-sound/teamspeak2-server-bin/ChangeLog
@@ -1,6 +1,67 @@
 # ChangeLog for media-sound/teamspeak2-server-bin
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak2-server-bin/ChangeLog,v 1.1 2003/09/27 11:27:47 jje Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak2-server-bin/ChangeLog,v 1.1.1.1 2005/11/30 09:38:43 chriswhite Exp $
+
+*teamspeak2-server-bin-2.0.20.1-r1 (31 Jan 2005)
+
+  31 Jan 2005; Christian Parpart <trapni@gentoo.org>
+  +files/2.0.20.1-r1/teamspeak2-server.rc6,
+  +teamspeak2-server-bin-2.0.20.1-r1.ebuild:
+  According to bug 73847, added to init script and changed config file
+  location from /var/lib/teamspeak-server/ to /etc/teamspeak-server/;
+  also adding a sleep to svc restart() as it really takes some time
+  sometimes (bug 73941).
+
+  11 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  teamspeak2-server-bin-2.0.20.1.ebuild:
+  emul-linux-x86 fixes.  Closes bug #73084.
+
+  07 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  teamspeak2-server-bin-2.0.19.40.ebuild,
+  teamspeak2-server-bin-2.0.20.1.ebuild:
+  updated homepage. fixes #76964.
+
+  07 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> :
+  Added sqlite_sql symlink to fix bug #66639.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  teamspeak2-server-bin-2.0.20.1.ebuild:
+  Stable amd64.
+
+  09 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  teamspeak2-server-bin-2.0.20.1.ebuild:
+  ~amd64 added
+
+  07 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  teamspeak2-server-bin-2.0.20.1.ebuild:
+  -* for non x86 archs
+
+  30 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  teamspeak2-server-bin-2.0.20.1.ebuild:
+  Stable x86.
+
+  28 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  teamspeak2-server-bin-2.0.20.1.ebuild:
+  Removed second IUSE line.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  teamspeak2-server-bin-2.0.19.40.ebuild,
+  teamspeak2-server-bin-2.0.20.1.ebuild:
+  QA fix.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  teamspeak2-server-bin-2.0.20.1.ebuild:
+  Fixed init script source filename.
+
+*teamspeak2-server-bin-2.0.20.1 (20 Apr 2004)
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  teamspeak2-server-bin-2.0.20.1.ebuild, files/teamspeak2-server.rc6:
+  Version bump.  Closes bug #47758.  Thanks Dustin Parr <parr@cs.utk.edu>.
+
+  01 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  teamspeak2-server-bin-2.0.19.40.ebuild:
+  Stable on x86.
 
 *teamspeak2-server-bin-2.0.19.40 (27 Sep 2003)
 
diff --git a/media-sound/teamspeak2-server-bin/Manifest b/media-sound/teamspeak2-server-bin/Manifest
index cda1e0d8ec02..00ed41d77e63 100644
--- a/media-sound/teamspeak2-server-bin/Manifest
+++ b/media-sound/teamspeak2-server-bin/Manifest
@@ -1,4 +1,20 @@
-MD5 d2ee9845408280fa68ec1ae709568196 teamspeak2-server-bin-2.0.19.40.ebuild 1374
-MD5 5b4bd1e8143232e8986b91ed4a263e8b ChangeLog 427
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 252bfa086bffb4785b68806165e870bf ChangeLog 2616
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 3174551d87cb5495819d5f77767bbe5c teamspeak2-server-bin-2.0.19.40.ebuild 1428
+MD5 86b336cc42d62c92588a0e2d38f3fea2 teamspeak2-server-bin-2.0.20.1.ebuild 2504
+MD5 b41ece858f923f36dcda25adac9de972 teamspeak2-server-bin-2.0.20.1-r1.ebuild 2628
 MD5 9ea73cb7d7ab9d82d18ed112ba6e5435 files/digest-teamspeak2-server-bin-2.0.19.40 74
-MD5 1f7ef62f888afcdc799b925bf5e2bfb8 files/teamspeak2-server.rc6 807
+MD5 19ea411494a0103d83bf56f318f06d04 files/teamspeak2-server.rc6 925
+MD5 5b1551eea3ebab04fd4494431f4ca03c files/digest-teamspeak2-server-bin-2.0.20.1 74
+MD5 5b1551eea3ebab04fd4494431f4ca03c files/digest-teamspeak2-server-bin-2.0.20.1-r1 74
+MD5 19d949737c7a69c8d03b4054a06be23e files/2.0.20.1-r1/teamspeak2-server.rc6 1006
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFCTZ3O5mJXAu5GbtIRAju3AJ9oAYYTaGkN3kScDwpDtfxh64tJxQCeLJ/C
+MNFjtIZ/0rC5jjzhaITIoUU=
+=Em8k
+-----END PGP SIGNATURE-----
diff --git a/media-sound/teamspeak2-server-bin/files/2.0.20.1-r1/teamspeak2-server.rc6 b/media-sound/teamspeak2-server-bin/files/2.0.20.1-r1/teamspeak2-server.rc6
index 9e4c7e09a5ac..0d4a5c1ec09b 100644
--- a/media-sound/teamspeak2-server-bin/files/2.0.20.1-r1/teamspeak2-server.rc6
+++ b/media-sound/teamspeak2-server-bin/files/2.0.20.1-r1/teamspeak2-server.rc6
@@ -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/media-sound/teamspeak2-server-bin/files/2.0.20.1-r1/teamspeak2-server.rc6,v 1.1 2005/01/31 09:51:24 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak2-server-bin/files/2.0.20.1-r1/teamspeak2-server.rc6,v 1.1.1.1 2005/11/30 09:38:43 chriswhite Exp $
 
 depend() {
 	need net
@@ -31,6 +31,6 @@ stop() {
 
 restart() {
 	svc_stop
-	sleep 2
+	sleep 3
 	svc_start
 }
diff --git a/media-sound/teamspeak2-server-bin/files/teamspeak2-server.rc6 b/media-sound/teamspeak2-server-bin/files/teamspeak2-server.rc6
index 2b384edf4559..52d9ab351fb7 100644
--- a/media-sound/teamspeak2-server-bin/files/teamspeak2-server.rc6
+++ b/media-sound/teamspeak2-server-bin/files/teamspeak2-server.rc6
@@ -1,14 +1,14 @@
 #!/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/media-sound/teamspeak2-server-bin/files/teamspeak2-server.rc6,v 1.1 2003/09/27 11:27:47 jje Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak2-server-bin/files/teamspeak2-server.rc6,v 1.1.1.1 2005/11/30 09:38:43 chriswhite Exp $
 
 depend() {
-        need net
+	need net
 }
 
 start() {
-        ebegin "Starting TeamSpeak Server"
+	ebegin "Starting TeamSpeak Server"
 	start-stop-daemon --start --quiet --chuid teamspeak2 \
 		--exec /opt/teamspeak2-server/server_linux -- \
 		-db=/var/lib/teamspeak2-server/server.dbs \
@@ -16,14 +16,14 @@ start() {
 		-log=/var/log/teamspeak2-server/server.log \
 		-pid=/var/run/teamspeak2-server/server.pid \
 		-sql=/opt/teamspeak2-server/sql/ \
+		-tcpquerydocs=/opt/teamspeak2-server/tcpquerydocs \
 		-httpdocs=/opt/teamspeak2-server/http/ &>/dev/null
-        eend $?
+	eend $?
 }
 
 stop() {
-        ebegin "Stopping TeamSpeak Server"
-        start-stop-daemon --stop --quiet \
+	ebegin "Stopping TeamSpeak Server"
+	start-stop-daemon --stop --quiet \
 		--pidfile /var/run/teamspeak2-server/server.pid
-        eend $?
+	eend $?
 }
-
diff --git a/media-sound/teamspeak2-server-bin/teamspeak2-server-bin-2.0.19.40.ebuild b/media-sound/teamspeak2-server-bin/teamspeak2-server-bin-2.0.19.40.ebuild
index 99796a554a22..7b1995979d87 100644
--- a/media-sound/teamspeak2-server-bin/teamspeak2-server-bin-2.0.19.40.ebuild
+++ b/media-sound/teamspeak2-server-bin/teamspeak2-server-bin-2.0.19.40.ebuild
@@ -1,24 +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/media-sound/teamspeak2-server-bin/teamspeak2-server-bin-2.0.19.40.ebuild,v 1.1 2003/09/27 11:27:47 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak2-server-bin/teamspeak2-server-bin-2.0.19.40.ebuild,v 1.1.1.1 2005/11/30 09:38:43 chriswhite Exp $
 
-DESCRIPTION="The Teamspeak Voice Communication Server."
-HOMEPAGE="http://www.teamspeak.org/"
+inherit eutils
+
+IUSE=""
+
+DESCRIPTION="The Teamspeak Voice Communication Server"
+HOMEPAGE="http://www.goteamspeak.com/"
 SRC_URI="ftp://webpost.teamspeak.org/releases/ts2_server_rc2_${PV//./}.tar.bz2"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
-S="${WORKDIR}/tss2_rc2"
+S=${WORKDIR}/tss2_rc2
 
-src_install() {
+pkg_setup() {
 	enewuser teamspeak2
+}
 
+src_install() {
 	exeinto /opt/teamspeak2-server
 	doexe server_linux sqlite.so
 
-	touch "${D}/opt/teamspeak2-server/bad_names.txt"
+	touch ${D}/opt/teamspeak2-server/bad_names.txt
 	fowners teamspeak2 /opt/teamspeak2-server/bad_names.txt
 
 	insinto /opt/teamspeak2-server/sql
@@ -31,7 +37,7 @@ src_install() {
 	dodoc changelog.txt readme.txt slicense.txt
 
 	exeinto /etc/init.d
-	newexe "${FILESDIR}/teamspeak2-server.rc6" teamspeak2-server
+	newexe ${FILESDIR}/teamspeak2-server.rc6 teamspeak2-server
 
 	keepdir /var/{lib,log,run}/teamspeak2-server
 	fowners teamspeak2 /var/{lib,log,run}/teamspeak2-server
@@ -39,18 +45,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	# rebuild init deps
-	/etc/init.d/depscan.sh
-
 	einfo
 	einfo "The Teamspeak Server generates the admin and superadmin"
 	einfo "passwords on the fly.  To get them, please look in:"
 	einfo "/var/log/teamspeak2-server/server.log"
 	einfo
 }
-
-pkg_postrm() {
-	# rebuild init deps
-	/etc/init.d/depscan.sh
-}
-
diff --git a/media-sound/teamspeak2-server-bin/teamspeak2-server-bin-2.0.20.1-r1.ebuild b/media-sound/teamspeak2-server-bin/teamspeak2-server-bin-2.0.20.1-r1.ebuild
index 3fcc9b25afc6..dc30a01966ce 100644
--- a/media-sound/teamspeak2-server-bin/teamspeak2-server-bin-2.0.20.1-r1.ebuild
+++ b/media-sound/teamspeak2-server-bin/teamspeak2-server-bin-2.0.20.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/media-sound/teamspeak2-server-bin/teamspeak2-server-bin-2.0.20.1-r1.ebuild,v 1.1 2005/01/31 09:51:24 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak2-server-bin/teamspeak2-server-bin-2.0.20.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:43 chriswhite Exp $
 
 inherit eutils
 
@@ -11,11 +11,11 @@ SRC_URI="ftp://webpost.teamspeak.org/releases/ts2_server_rc2_${PV//./}.tar.bz2"
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="-* ~x86 ~amd64"
-IUSE="mysql emul-linux-x86"
+IUSE="mysql"
 
 S="${WORKDIR}/tss2_rc2"
 
-RDEPEND="emul-linux-x86? ( =app-emulation/emul-linux-x86-baselibs-1.0 )"
+RDEPEND="amd64? ( >=sys-libs/glibc-2.3.4.20041102 )"
 DEPEND=""
 
 pkg_setup() {
diff --git a/media-sound/teamspeak2-server-bin/teamspeak2-server-bin-2.0.20.1.ebuild b/media-sound/teamspeak2-server-bin/teamspeak2-server-bin-2.0.20.1.ebuild
index 964078a141cc..06fb5bb8b3c7 100644
--- a/media-sound/teamspeak2-server-bin/teamspeak2-server-bin-2.0.20.1.ebuild
+++ b/media-sound/teamspeak2-server-bin/teamspeak2-server-bin-2.0.20.1.ebuild
@@ -1,18 +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/media-sound/teamspeak2-server-bin/teamspeak2-server-bin-2.0.20.1.ebuild,v 1.1.1.1 2005/11/30 09:38:43 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="The Teamspeak Voice Communication Server"
-HOMEPAGE="http://www.teamspeak.org/"
+HOMEPAGE="http://www.goteamspeak.com/"
 SRC_URI="ftp://webpost.teamspeak.org/releases/ts2_server_rc2_${PV//./}.tar.bz2"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="-* x86 amd64"
 IUSE="mysql"
 
 S=${WORKDIR}/tss2_rc2
 
+RDEPEND="amd64? ( >=sys-libs/glibc-2.3.4.20041102 )"
+DEPEND=""
+
 pkg_setup() {
 	enewuser teamspeak2
 }
@@ -28,7 +33,7 @@ src_install() {
 
 	insinto /opt/teamspeak2-server/sql
 	doins sqlite_sql/*.sql
-	if [ `use mysql` ] ; then
+	if use mysql; then
 		insinto /opt/teamspeak2-server/mysql_sql
 		doins mysql_sql/*.sql
 	fi
@@ -50,11 +55,14 @@ src_install() {
 	fi
 
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/teamspeak2-server.rc7 teamspeak2-server
+	newexe ${FILESDIR}/teamspeak2-server.rc6 teamspeak2-server
 
 	keepdir /var/{lib,log,run}/teamspeak2-server
 	fowners teamspeak2 /var/{lib,log,run}/teamspeak2-server
 	fperms 700 /var/{lib,log,run}/teamspeak2-server
+
+	# Fix bug #66639
+	dosym sql /opt/teamspeak2-server/sqlite_sql
 }
 
 pkg_postinst() {
diff --git a/media-sound/tempest_for_eliza/ChangeLog b/media-sound/tempest_for_eliza/ChangeLog
index f44db2d2e64e..0882d919a383 100644
--- a/media-sound/tempest_for_eliza/ChangeLog
+++ b/media-sound/tempest_for_eliza/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for media-sound/tempest_for_eliza
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tempest_for_eliza/ChangeLog,v 1.1 2003/07/11 20:15:48 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tempest_for_eliza/ChangeLog,v 1.1.1.1 2005/11/30 09:38:00 chriswhite Exp $
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> tempest_for_eliza-1.0.5.ebuild:
+  Added to ~ppc.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  tempest_for_eliza-1.0.5.ebuild:
+  Stable amd64, sparc.
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  tempest_for_eliza-1.0.5.ebuild:
+  ~amd64 ~sparc
+
+  01 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  tempest_for_eliza-1.0.5.ebuild:
+  Stable on x86.
 
 *tempest_for_eliza-1.0.5 (11 Jul 2003)
 
diff --git a/media-sound/tempest_for_eliza/Manifest b/media-sound/tempest_for_eliza/Manifest
index 690ea3ea3e34..4d8f52173a0f 100644
--- a/media-sound/tempest_for_eliza/Manifest
+++ b/media-sound/tempest_for_eliza/Manifest
@@ -1,3 +1,4 @@
+MD5 7350df2982892ac32a641d5eabc31d18 ChangeLog 792
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 f72ff8228842f4446625c8eff125059e tempest_for_eliza-1.0.5.ebuild 661
 MD5 264134b313be124050515ae40a5d36ae files/digest-tempest_for_eliza-1.0.5 74
-MD5 ba51e8466d49eeb8cf7e5fd9e5c79828 tempest_for_eliza-1.0.5.ebuild 592
-MD5 3efd093b3a8de7c91475bd0646768906 ChangeLog 375
diff --git a/media-sound/tempest_for_eliza/tempest_for_eliza-1.0.5.ebuild b/media-sound/tempest_for_eliza/tempest_for_eliza-1.0.5.ebuild
index 288a02fa54c3..728a9af43157 100644
--- a/media-sound/tempest_for_eliza/tempest_for_eliza-1.0.5.ebuild
+++ b/media-sound/tempest_for_eliza/tempest_for_eliza-1.0.5.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/media-sound/tempest_for_eliza/tempest_for_eliza-1.0.5.ebuild,v 1.1 2003/07/11 20:15:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tempest_for_eliza/tempest_for_eliza-1.0.5.ebuild,v 1.1.1.1 2005/11/30 09:38:00 chriswhite Exp $
 
-DESCRIPTION=""
+DESCRIPTION="listen to music on the radio generated by images on your screen"
 HOMEPAGE="http://www.erikyyy.de/tempest/"
 SRC_URI="http://www.erikyyy.de/tempest/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl"
diff --git a/media-sound/terminatorx/ChangeLog b/media-sound/terminatorx/ChangeLog
index 36de19649396..10b7bc4c1868 100644
--- a/media-sound/terminatorx/ChangeLog
+++ b/media-sound/terminatorx/ChangeLog
@@ -1,6 +1,62 @@
 # ChangeLog for media-sound/terminatorx
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/terminatorx/ChangeLog,v 1.1 2003/07/08 07:26:21 torbenh Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/terminatorx/ChangeLog,v 1.1.1.1 2005/11/30 09:37:50 chriswhite Exp $
+
+  28 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -files/terminatorx-3.80.GNOMEpresent.patch,
+  -files/terminatorx-3.80.fixGnomeMakefile.patch, terminatorx-3.81.ebuild,
+  terminatorx-3.82.ebuild:
+  Dont make use of the deprecated oggvorbis useflag any longer, see #94254.
+  Marked 3.82 stable on amd64 and x86. Removed unnecessary patches.
+
+*terminatorx-3.82 (20 Feb 2005)
+
+  20 Feb 2005; Tony Vroon <chainsaw@gentoo.org> +terminatorx-3.82.ebuild:
+  Version bump, closes bug #82666. Ebuild cleaned up and oss USE-flag dropped.
+  Package pretends to support disabling of OSS but doesn't.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  terminatorx-3.81.ebuild:
+  Stable amd64, sparc.
+
+  14 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  terminatorx-3.81.ebuild:
+  ~sparc
+
+  03 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  terminatorx-3.81.ebuild:
+  Changing mad dep to madplay.
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> terminatorx-3.81.ebuild:
+  Add die following econf for bug 48950
+
+  24 Apr 2004; Danny van Dyk <kugelfang@gentoo.org> terminatorx-3.81.ebuild:
+  marked ~amd64
+
+  03 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  terminatorx-3.81.ebuild:
+  Change x11-base/xfree dependency to virtual/x11.
+
+  01 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  terminatorx-3.81.ebuild:
+  Stable on x86.
+
+  28 Oct 2003; Martin Holzer <mholzer@gentoo.org> terminatorx-3.81.ebuild:
+  adding sox config option. Closes #30464.
+
+*terminatorx-3.81 (20 Sep 2003)
+
+  20 Sep 2003; jje <jje@gentoo.org> terminatorx-3.80.ebuild,
+  terminatorx-3.81.ebuild:
+  Version bump. Fixes 26781 and 27431.
+
+  19 Jul 2003; Nick Hadaway <raker@gentoo.org>:
+  Reverted mad changes
+
+*terminatorx-3.80-r1 (17 Jul 2003)
+
+  17 Jul 2003; Nick Hadaway <raker@gentoo.org> terminatorx-3.80.ebuild:
+  Changed media-sound/mad depend to media-libs/{libmad,libid3tag}
 
 *terminatorx-3.80 (08 Jul 2003)
 
diff --git a/media-sound/terminatorx/Manifest b/media-sound/terminatorx/Manifest
index f0ba18793ea4..9d6c9a032388 100644
--- a/media-sound/terminatorx/Manifest
+++ b/media-sound/terminatorx/Manifest
@@ -1,5 +1,16 @@
-MD5 86b35221dcf518a5a4ae22718c3014be ChangeLog 448
-MD5 f2897d71e6e7d2e0a50b630ec4c5d707 terminatorx-3.80.ebuild 2505
-MD5 eb49735880ebb0f863fe1ca9e83a8ff9 files/digest-terminatorx-3.80 68
-MD5 8c382c7214153dabd8dacd6d75f2ad01 files/terminatorx-3.80.GNOMEpresent.patch 25091
-MD5 a2074d5d27b3b2d3006703af2a500c3f files/terminatorx-3.80.fixGnomeMakefile.patch 1032
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 53d803e2d14d44442ef2b5eccbde3688 terminatorx-3.82.ebuild 1378
+MD5 58f2f97c503d3f49f2a03465a06e1123 terminatorx-3.81.ebuild 2193
+MD5 e6cb2a454e0d2ad9f3d6d39dfc348892 ChangeLog 2415
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 ed6038ad12972f0534133cb65dff99a0 files/digest-terminatorx-3.81 68
+MD5 94137a13ec8a5f0c45a221fe3804a5f4 files/digest-terminatorx-3.82 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCmKWi06ebR+OMO78RAlR2AJ9042X0IdmpFWLcfXbCeJHy0sit9ACfQYE5
+WSRKwFEsoGwDPOH0BQGQV20=
+=1F6j
+-----END PGP SIGNATURE-----
diff --git a/media-sound/terminatorx/terminatorx-3.81.ebuild b/media-sound/terminatorx/terminatorx-3.81.ebuild
index 16ae3a1dbd57..05650e77782b 100644
--- a/media-sound/terminatorx/terminatorx-3.81.ebuild
+++ b/media-sound/terminatorx/terminatorx-3.81.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/media-sound/terminatorx/terminatorx-3.81.ebuild,v 1.1 2003/09/20 06:55:55 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/terminatorx/terminatorx-3.81.ebuild,v 1.1.1.1 2005/11/30 09:37:50 chriswhite Exp $
 
 inherit gnome2
 
 MY_P=${P/terminatorx/terminatorX}
 S=${WORKDIR}/${MY_P}
-DESCRIPTION='terminatorX is a realtime audio synthesizer that allows you to "scratch" on digitally sampled audio data'
+DESCRIPTION='realtime audio synthesizer that allows you to "scratch" on digitally sampled audio data'
 HOMEPAGE="http://www.terminatorx.cx/"
 SRC_URI="http://www.terminatorx.cx/dist/${MY_P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE="3dnow alsa mpeg oggvorbis oss sox"
+KEYWORDS="x86 amd64 sparc"
+IUSE="3dnow alsa mpeg vorbis oss sox"
 
 DEPEND="alsa? ( >=media-libs/alsa-lib-0.9 )
-	mpeg? ( media-sound/mad )
-	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )
+	mpeg? ( media-sound/madplay )
+	vorbis? ( >=media-libs/libvorbis-1.0_beta4 )
 	sox? ( media-sound/sox )
 	>=x11-libs/gtk+-2.2.0
 	>=dev-libs/glib-2.2.0
-	>=x11-base/xfree-4.2.0-r11
+	virtual/x11
 	dev-libs/libxml
 	media-libs/audiofile
 	media-libs/ladspa-sdk
@@ -50,7 +51,7 @@ src_compile() {
 		&& myconf="${myconf} --enable-mad" \
 		|| myconf="${myconf} --disable-mad" \
 		|| myconf="${myconf} --disable-mpg123"
-	use oggvorbis \
+	use vorbis \
 		&& myconf="${myconf} --enable-vorbis" \
 		|| myconf="${myconf} --disable-vorbis" \
 		|| myconf="${myconf} --disable-ogg123"
@@ -58,9 +59,10 @@ src_compile() {
 		&& myconf="${myconf} --enable-oss" \
 		#|| myconf="${myconf} --disable-oss" # Doesn't work
 	use sox \
-		&& myconf="${myconf} --enable-sox"
+		&& myconf="${myconf} --enable-sox" \
+		|| myconf="${myconf} --disable-sox"
 
-	econf ${myconf}
+	econf ${myconf} || die "econf failed"
 
 	emake || die
 }
@@ -77,4 +79,3 @@ pkg_postinst() {
 	ewarn "Please read http://www.terminatorx.cx/faq.html#11"
 	ewarn "for details and potential security risks."
 }
-
diff --git a/media-sound/terminatorx/terminatorx-3.82.ebuild b/media-sound/terminatorx/terminatorx-3.82.ebuild
index d6a9b80c5019..5f8c6e0516d8 100644
--- a/media-sound/terminatorx/terminatorx-3.82.ebuild
+++ b/media-sound/terminatorx/terminatorx-3.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/media-sound/terminatorx/terminatorx-3.82.ebuild,v 1.1 2005/02/20 15:35:53 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/terminatorx/terminatorx-3.82.ebuild,v 1.1.1.1 2005/11/30 09:37:50 chriswhite Exp $
 
 inherit gnome2
 
@@ -12,12 +12,12 @@ SRC_URI="http://www.terminatorx.cx/dist/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~sparc"
-IUSE="3dnow alsa mad oggvorbis sox"
+KEYWORDS="x86 amd64 ~sparc"
+IUSE="3dnow alsa mad vorbis sox"
 
 DEPEND="alsa? ( >=media-libs/alsa-lib-0.9 )
 	mad? ( media-sound/madplay )
-	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )
+	vorbis? ( >=media-libs/libvorbis-1.0_beta4 )
 	sox? ( media-sound/sox )
 	>=x11-libs/gtk+-2.2.0
 	>=dev-libs/glib-2.2.0
@@ -40,15 +40,16 @@ src_unpack() {
 
 src_compile() {
 	econf \
-		`use_enable 3dnow` \
-		`use_enable alsa` \
-		`use_enable mad` \
-		`use_enable vorbis` \
-		`use_enable sox` \
+		$(use_enable 3dnow) \
+		$(use_enable alsa) \
+		$(use_enable mad) \
+		$(use_enable vorbis) \
+		$(use_enable sox) \
 		|| die "econf failed"
-	emake || die
+
+	emake || die "make failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install
+	make DESTDIR=${D} install || die "make install failed"
 }
diff --git a/media-sound/timemachine/ChangeLog b/media-sound/timemachine/ChangeLog
index 6c30397a4e50..e211ae1255ca 100644
--- a/media-sound/timemachine/ChangeLog
+++ b/media-sound/timemachine/ChangeLog
@@ -1,6 +1,33 @@
 # ChangeLog for media-sound/timemachine
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timemachine/ChangeLog,v 1.1 2004/06/18 22:17:33 fvdpol Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timemachine/ChangeLog,v 1.1.1.1 2005/11/30 09:38:08 chriswhite Exp $
+
+  07 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  timemachine-0.2.4.ebuild:
+  Don't install INSTALL or COPYING files.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  timemachine-0.3.0.ebuild:
+  Added to ~sparc.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  timemachine-0.3.0.ebuild:
+  Stable amd64, x86.
+
+*timemachine-0.3.0 (03 Nov 2004)
+
+  03 Nov 2004; Frank van de Pol <fvdpol@gentoo.org> +timemachine-0.3.0.ebuild:
+  Version bump.
+
+  03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  timemachine-0.2.4.ebuild:
+  Stable amd64, x86.
+
+  19 Jun 2004; David Holm <dholm@gentoo.org> timemachine-0.2.4.ebuild:
+  Added to ~ppc.
+
+  19 Jun 2004; Frank van de Pol <fvdpol@gentoo.org> timemachine-0.2.4.ebuild:
+  Fixed src_install; now also includes 'COPYING' and 'ChangeLog'.
 
 *timemachine-0.2.4 (19 Jun 2004)
 
diff --git a/media-sound/timemachine/Manifest b/media-sound/timemachine/Manifest
index 00596e07ad89..4b08b1cf318e 100644
--- a/media-sound/timemachine/Manifest
+++ b/media-sound/timemachine/Manifest
@@ -1,5 +1,17 @@
-MD5 790d0bacfc13bada10afc416b044ee88 timemachine-0.2.4.ebuild 797
-MD5 2ea3a55dc8476a027082a9ae209a0d0d metadata.xml 361
-MD5 3b13999b3e9d58cdc138fceb450f07b0 ChangeLog 548
-MD5 d36266bdc7ee0e2f641a99ea0c9747dd files/timemachine-0.2.4-ladcca-compile.patch 478
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 46717314e90b575c7de2ec6153d4e9ad ChangeLog 1445
 MD5 6411861e6d8dc62ff415049f9020aa72 files/digest-timemachine-0.2.4 69
+MD5 3612c32ded070a8dffc0296faa9ffebe files/digest-timemachine-0.3.0 69
+MD5 d36266bdc7ee0e2f641a99ea0c9747dd files/timemachine-0.2.4-ladcca-compile.patch 478
+MD5 2ea3a55dc8476a027082a9ae209a0d0d metadata.xml 361
+MD5 9e022edd9c740c306dd2b9755492e173 timemachine-0.2.4.ebuild 905
+MD5 3ecf28e51e3b503d5511c77401b6243c timemachine-0.3.0.ebuild 830
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDb0SJj5H05b2HAEkRAvJsAKCJ4p/MZw4M7+YuYfinaT5PGNPecwCgkmgs
+w+5ESv0GYPNnEtET5T9S/5c=
+=oAg9
+-----END PGP SIGNATURE-----
diff --git a/media-sound/timemachine/timemachine-0.2.4.ebuild b/media-sound/timemachine/timemachine-0.2.4.ebuild
index 24aee8e4c058..ddd03587a692 100644
--- a/media-sound/timemachine/timemachine-0.2.4.ebuild
+++ b/media-sound/timemachine/timemachine-0.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/media-sound/timemachine/timemachine-0.2.4.ebuild,v 1.1 2004/06/18 22:17:33 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timemachine/timemachine-0.2.4.ebuild,v 1.1.1.1 2005/11/30 09:38:08 chriswhite Exp $
 
 inherit flag-o-matic eutils
 DESCRIPTION="JACK client record button remembering the last 10 seconds when pressed."
@@ -8,7 +8,7 @@ HOMEPAGE="http://plugin.org.uk/timemachine/"
 SRC_URI="http://plugin.org.uk/timemachine/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64 ~ppc"
 
 IUSE="ladcca"
 
@@ -31,5 +31,5 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} install || die
-	einstall || die
+	dodoc ChangeLog
 }
diff --git a/media-sound/timemachine/timemachine-0.3.0.ebuild b/media-sound/timemachine/timemachine-0.3.0.ebuild
index 63d95840b372..4b6e23434178 100644
--- a/media-sound/timemachine/timemachine-0.3.0.ebuild
+++ b/media-sound/timemachine/timemachine-0.3.0.ebuild
@@ -1,16 +1,18 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timemachine/timemachine-0.3.0.ebuild,v 1.1 2004/11/03 22:23:20 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timemachine/timemachine-0.3.0.ebuild,v 1.1.1.1 2005/11/30 09:38:08 chriswhite Exp $
+
+IUSE="ladcca"
 
 inherit flag-o-matic eutils
+
 DESCRIPTION="JACK client record button remembering the last 10 seconds when pressed."
 HOMEPAGE="http://plugin.org.uk/timemachine/"
 SRC_URI="http://plugin.org.uk/timemachine/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
-
-IUSE="ladcca"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 
 DEPEND=">=media-sound/jack-audio-connection-kit-0.80.0
 	>=x11-libs/gtk+-2.2.4-r1
@@ -23,6 +25,6 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
-	dodoc COPYING ChangeLog
+	make DESTDIR="${D}" install || die
+	dodoc ChangeLog
 }
diff --git a/media-sound/timidity++/ChangeLog b/media-sound/timidity++/ChangeLog
index 115a1e5dc4cb..3f4a3dd8a89f 100644
--- a/media-sound/timidity++/ChangeLog
+++ b/media-sound/timidity++/ChangeLog
@@ -1,6 +1,240 @@
 # ChangeLog for media-sound/timidity++
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/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/media-sound/timidity++/ChangeLog,v 1.1.1.1 2005/11/30 09:38:04 chriswhite Exp $
+
+  10 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  timidity++-2.13.2.ebuild, timidity++-2.13.2-r2.ebuild:
+  Don't install INSTALL file.
+
+  09 Sep 2005; Brent Baude <ranger@gentoo.org> timidity++-2.13.2-r2.ebuild:
+  Marking timidity++-2.13.2-r2 ~ppc in support of bug 104254
+
+  30 Aug 2005; Brent Baude <ranger@gentoo.org> timidity++-2.13.2-r2.ebuild:
+  Marking timidity++-2.13.2-r2.ebuild ~ppc64 for bug 104254
+
+  26 Jun 2005; Mark Loeser <halcy0n@gentoo.org>
+  +files/timidity++-2.13.2-gcc4.patch, timidity++-2.13.2-r2.ebuild:
+  GCC4 patch, thanks to <sunmoon1997@gmail.com> for the patch; bug #89933
+
+  28 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  timidity++-2.13.2.ebuild, timidity++-2.13.2-r2.ebuild:
+  Dont make use of the deprecated oggvorbis useflag any longer, see #94254.
+
+*timidity++-2.13.2-r2 (05 Apr 2005)
+
+  05 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/timidity++-2.13.2-exiterror.patch, -timidity++-2.13.2-r1.ebuild,
+  +timidity++-2.13.2-r2.ebuild:
+  Have timidity exit with an error code if it fails to start so the initscript
+  will detect it. Also, use cubic splines instead of linear. Closes bug #76364
+  thanks to Stian Skjelstad <stian@nixia.no>.
+
+  31 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  timidity++-2.13.2.ebuild, timidity++-2.13.2-r1.ebuild:
+  motif dep to virtual.
+
+  28 Mar 2005; Guy Martin <gmsoft@gentoo.org> timidity++-2.13.2.ebuild:
+  Stable on hppa.
+
+  25 Mar 2005; Heinrich Wendel <lanius@gentoo.org>
+  timidity++-2.13.2-r1.ebuild:
+  fix openmotif dep
+
+*timidity++-2.13.2-r1 (21 Mar 2005)
+
+  21 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +timidity++-2.13.2-r1.ebuild:
+  Revbump to fix a handful of bugs including 76361, 76654, 77286, 83018, and
+  84752. Thanks Flameeyes for the ebuild.
+
+  28 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/long-64bit.patch, -files/timidity++-2.12.0-alsalib-fix.patch,
+  -files/timidity.cfg, -timidity++-2.12.0-r3.ebuild,
+  -timidity++-2.13.0-r1.ebuild, -timidity++-2.13.0-r2.ebuild:
+  Cleaned out old versions.
+
+  23 Feb 2005; Chris White <chriswhite@gentoo.org>
+  timidity++-2.13.0-r1.ebuild, timidity++-2.13.0-r2.ebuild,
+  timidity++-2.13.2.ebuild:
+  Fixed ppc portaudio logic and /lib hardcoding (not using get_libdir...)
+
+  22 Dec 2004; Joseph Jezak <josejx@gentoo.org> timidity++-2.13.2.ebuild:
+  Marked ppc stable.
+
+  21 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/timidity++-2.13.2-gtk26.patch, timidity++-2.13.2.ebuild:
+  Added patch for gtk-2.6 from bug #75208.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  timidity++-2.13.2.ebuild:
+  Don't pull in tk unless we want X also.
+
+  23 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  timidity++-2.13.2.ebuild:
+  Stable amd64, sparc, x86.
+
+*timidity++-2.13.2 (07 Oct 2004)
+
+  07 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -timidity++-2.13.0.ebuild, -timidity++-2.13.0_rc2.ebuild,
+  +timidity++-2.13.2.ebuild:
+  Version bump and cleanup.
+
+*timidity++-2.13.0-r2 (23 Sep 2004)
+
+  23 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/timidity-update, +files/timidity.cfg-r1,
+  +timidity++-2.13.0-r2.ebuild:
+  Revision bump to make use of the timidity-update script provided by ohn
+  Richard Moser <nigelenki@comcast.net>.
+
+  22 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  timidity++-2.13.0-r1.ebuild:
+  Removed sparc conditional around jack.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  files/init.d.timidity:
+  Changed init script to after instead of use for bug #59635.
+
+  06 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  timidity++-2.13.0-r1.ebuild:
+  Fix typo (bug #56213); remove nomirror
+
+  04 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  timidity++-2.13.0-r1.ebuild:
+  Stable x86, sparc, amd64. Fixed note to mention /etc/timidity.cfg
+
+  05 Jul 2004; Frank van de Pol <fvdpol@gentoo.org>
+  timidity++-2.12.0-r3.ebuild, timidity++-2.13.0-r1.ebuild,
+  timidity++-2.13.0.ebuild, timidity++-2.13.0_rc2.ebuild:
+  Fixed typo, closes bug #56049
+
+  02 Jul 2004; Jon Hood <squinky86@gentoo.org> timidity++-2.13.0-r1.ebuild:
+  change kde USE flag to arts, fix #48761, thanks to Lengyel Sándor
+  <hunnia@hu.inter.net> for the update
+
+  15 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  files/init.d.timidity:
+  Fixed need alsasound to use alsasound.
+
+*timidity++-2.13.0-r1 (15 Jun 2004)
+
+  15 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +timidity++-2.13.0-r1.ebuild:
+  Revbump to have the ebuild install the default config in /etc
+
+  15 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  timidity++-2.12.0-r3.ebuild:
+  Stable amd64.
+
+  13 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  timidity++-2.13.0.ebuild, timidity++-2.13.0_rc2.ebuild:
+  Getting rid of virtual/jack.
+
+  12 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  timidity++-2.13.0.ebuild:
+  Fix bug #50107.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> timidity++-2.12.0-r3.ebuild:
+  Add inherit eutils
+
+*timidity++-2.13.0 (22 Apr 2004)
+
+  22 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  timidity++-2.13.0.ebuild:
+  Version bump closes bug #48701.
+
+  16 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  timidity++-2.13.0_rc1.ebuild, timidity++-2.13.0_rc2.ebuild:
+  Removing rc1.  Fixed RDEPEND
+
+  06 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  timidity++-2.13.0_rc2.ebuild:
+  Fixed tk dep to RDEPEND. Added emacs use support to handle make install's
+  dumping timiditly.el in / if youu don't have emacs installed.
+
+  03 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  timidity++-2.12.0-r3.ebuild, timidity++-2.13.0_rc1.ebuild,
+  timidity++-2.13.0_rc2.ebuild:
+  Change x11-base/xfree dependency to virtual/x11.
+
+  30 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  timidity++-2.13.0_rc2.ebuild:
+  amd64 now uses portaudio.
+
+  29 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> timidity++-2.13.0_rc2.ebuild:
+  Remove amd64 stuff, not needed anymore. Closing #44460.
+
+  24 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  timidity++-2.13.0_rc2.ebuild:
+  ~sparc does portaudio now...
+
+  19 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  timidity++-2.13.0_rc2.ebuild:
+  Forgot && in portaudio line.
+
+*timidity++-2.13.0_rc2 (19 Mar 2004)
+
+  19 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  timidity++-2.13.0_rc2.ebuild, files/conf.d.timidity, files/init.d.timidity:
+  Added TIMIDITY_PCM_NAME option to conf.d file. Closes bug #44863. Version
+  bump.
+
+*timidity++-2.13.0_rc1 (21 Feb 2004)
+
+  21 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  timidity++-2.12.0-r3.ebuild, timidity++-2.12.0.ebuild,
+  timidity++-2.13.0_rc1.ebuild:
+  Version bump closes bug #42379. Move autoconf out of RDEPEND. Bumping
+  2.12.0-r3 to stable on ppc and removing old 2.12.0 ebuild.
+
+  10 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  timidity++-2.12.0-r3.ebuild, timidity++-2.12.0.ebuild,
+  files/conf.d.timidity, files/init.d.timidity:
+  Added timidity init script for alsa virtual sequencer to close bug #21258.
+  Bump -r3 into stable for x86.
+
+  01 Feb 2004; Brian Harring <ferringb@gentoo.org>
+  timidity++-2.12.0-r3.ebuild, timidity++-2.12.0.ebuild,
+  files/timidity++-2.12.0-alsalib-fix.patch:
+  Alsalib-1.0 compilation fix (35457)
+
+  26 Dec 2003; Jason Wever <weeve@gentoo.org> timidity++-2.12.0-r3.ebuild:
+  Added ~sparc keyword.
+
+  12 Dec 2003; Daniel Ahlberg <aliz@gentoo.org> timidity++-2.12.0-r3.ebuild:
+  Add amd64 keyword. Patch contributed by Michael Gorse <mgorse@alum.wpi.edu> in #33641.
+
+  26 Sep 2003; jje <jje@gentoo.org> timidity++-2.12.0-r3.ebuild:
+  Added oss to IUSE.
+
+*timidity++-2.12.0-r3 (21 Jul 2003)
+
+  21 Jul 2003; jje <jje@gentoo.org> timidity++-2.12.0-r1.ebuild,
+  timidity++-2.12.0-r2.ebuild, timidity++-2.12.0-r3.ebuild,
+  files/timidity.cfg:
+  Install a sample config file. Closes #24331.
+
+*timidity++-2.12.0-r2 (19 Jul 2003)
+
+  19 Jul 2003; jje <jje@gentoo.org> timidity++-2.12.0-r2.ebuild:
+  Wrapped audios="oss" in use oss.
+
+*timidity++-2.12.0-r1 (08 May 2003)
+
+  08 May 2003; jje <jje@gentoo.org> timidity++-2.12.0-r1.ebuild:
+  Updated to support USE="-X".
+
+  05 Jul 2002; Nick Hadaway <raker@gentoo.org> timidity++-2.12.0.ebuild
+
+  updated to latest beta to resolve alsa9 compile problems.  Changed some
+  configure options as well.
+
+*timidity++-2.11.1-r2 (28 Mar 2002)
+
+  28 Mar 2002; Seemant Kulleen <seemant@gentoo.org> timidity++-2.11.1-r1.ebuild:
+
+  ogg and vorbis USE flags are now just oggvorbis USE flag.
 
 *timidity++-2.11.1-r1 (1 Feb 2002)
 
diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
index 56bd284a6576..470135fabdab 100644
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -1,5 +1,24 @@
-MD5 1dc1edfe4e1ed813d03a9afe8eb4e0bd ChangeLog 1219
-MD5 a8dde2f198a5abb59182523d33b63d86 timidity++-2.12.0.ebuild 1939
-MD5 c7b095bbb97bb13d38967463dc99dfb3 timidity++-2.12.0-r1.ebuild 1890
-MD5 435c2037a224bf9b5a8da7e4d87b48e0 files/digest-timidity++-2.12.0 75
-MD5 435c2037a224bf9b5a8da7e4d87b48e0 files/digest-timidity++-2.12.0-r1 75
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a2b226de8022eccf954f82b8f04852cd ChangeLog 9165
+MD5 7c405e4bf0d556e8beab56529e784c52 timidity++-2.13.2-r2.ebuild 4105
+MD5 a8034be95425c8a2aa062f2e95529c85 timidity++-2.13.2.ebuild 3832
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 0868926c5290817cacb9a1849bc043c2 files/timidity++-2.13.2-gcc4.patch 1325
+MD5 31bdaea612f18e2c3d45a8a73ab44c81 files/timidity++-2.13.2-exiterror.patch 21406
+MD5 67ee26f08d8de1243029a0a8849cd022 files/gnuconfig_update.patch 477
+MD5 80fb82d4216373cbf4efafd7719628e0 files/timidity.cfg-r1 669
+MD5 2762e58e610bb861189b3d6b424312fc files/digest-timidity++-2.13.2 71
+MD5 dbfc5d45b6177ffaf7dd74d4971a520a files/conf.d.timidity 912
+MD5 15fce5a2d3dfc834b4de65428105e63b files/timidity-update 2513
+MD5 16a4adec164836d4390dc6b0f9a69ce9 files/timidity++-2.13.2-gtk26.patch 588
+MD5 2762e58e610bb861189b3d6b424312fc files/digest-timidity++-2.13.2-r2 71
+MD5 dbc4910aa5c6a5681dd4f121b5db63e8 files/init.d.timidity 457
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDIv+7j5H05b2HAEkRAjmmAJkBiZ5fTshA36mcsQWWlOn9QlyigQCeOU8+
+7UmjoO9vJ1I7ot5h7Mi5ElA=
+=VfzG
+-----END PGP SIGNATURE-----
diff --git a/media-sound/timidity++/files/conf.d.timidity b/media-sound/timidity++/files/conf.d.timidity
index 4d1d82eff795..8e2ecf9643a0 100644
--- a/media-sound/timidity++/files/conf.d.timidity
+++ b/media-sound/timidity++/files/conf.d.timidity
@@ -16,3 +16,9 @@
 
 TIMIDITY_OPTS="-B2,8 -Os -EFreverb=0"
 
+# TIMIDITY_PCM_NAME
+# This option can be used to choose an alternate ALSA pcm device.  This will
+# be most useful for users of the dmix alsa plugin or those with multiple
+# cards.  If you don't know what this is, chances are you want the default.
+
+#TIMIDITY_PCM_NAME="default"
diff --git a/media-sound/timidity++/files/init.d.timidity b/media-sound/timidity++/files/init.d.timidity
index 7482f5ffbc5c..7d5e191d9b74 100644
--- a/media-sound/timidity++/files/init.d.timidity
+++ b/media-sound/timidity++/files/init.d.timidity
@@ -1,12 +1,12 @@
 #!/sbin/runscript
  
 depend() {
-	need alsasound
-	use esound
+	after alsasound esound
 }
  
 start() {
 	ebegin "Starting Timidity Virtual Midi Sequencer"
+	test -n "$TIMIDITY_PCM_NAME" && export TIMIDITY_PCM_NAME
 	start-stop-daemon --start --quiet --background \
 		--make-pidfile --pidfile /var/run/timidity.pid \
 		--exec /usr/bin/timidity -- -iA ${TIMIDITY_OPTS}
@@ -16,4 +16,5 @@ start() {
 stop() {
 	ebegin "Stopping Timidity"
 	start-stop-daemon --stop --quiet --pidfile /var/run/timidity.pid
+	eend $?
 }
diff --git a/media-sound/timidity++/timidity++-2.13.2-r2.ebuild b/media-sound/timidity++/timidity++-2.13.2-r2.ebuild
index 2fa6af186721..0ee88b9656f8 100644
--- a/media-sound/timidity++/timidity++-2.13.2-r2.ebuild
+++ b/media-sound/timidity++/timidity++-2.13.2-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/media-sound/timidity++/timidity++-2.13.2-r2.ebuild,v 1.1 2005/04/05 01:47:33 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.2-r2.ebuild,v 1.1.1.1 2005/11/30 09:38:04 chriswhite Exp $
 
-IUSE="oss nas esd motif X gtk gtk2 oggvorbis tcltk slang alsa arts jack portaudio emacs ao speex flac ncurses"
+IUSE="oss nas esd motif X gtk gtk2 vorbis tcltk slang alsa arts jack portaudio emacs ao speex flac ncurses"
 
 inherit gnuconfig eutils
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/timidity/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="ncurses? ( >=sys-libs/ncurses-5.0 )
 	gtk? ( 	gtk2? ( >=x11-libs/gtk+-2.0 )
@@ -30,7 +30,7 @@ RDEPEND="ncurses? ( >=sys-libs/ncurses-5.0 )
 	arts? ( kde-base/arts )
 	jack? ( media-sound/jack-audio-connection-kit )
 	portaudio? ( !ppc? ( media-libs/portaudio ) )
-	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )
+	vorbis? ( >=media-libs/libvorbis-1.0_beta4 )
 	flac? ( >=media-libs/flac-1.1.0 )
 	speex? ( >=media-libs/speex-1.1.5 )
 	ao? ( >=media-libs/libao-0.8.5 )"
@@ -46,6 +46,7 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${P}-gtk26.patch
 	epatch ${FILESDIR}/${P}-exiterror.patch
+	epatch ${FILESDIR}/${P}-gcc4.patch
 
 	# fix header location of speex
 	sed -i -e "s:#include <speex:#include <speex/speex:g" configure* timidity/speex_a.c
@@ -57,7 +58,7 @@ src_compile() {
 
 	use flac && audios="${audios},flac"
 	use speex && audios="${audios},speex"
-	use oggvorbis && audios="${audios},vorbis"
+	use vorbis && audios="${audios},vorbis"
 
 	use oss && audios="${audios},oss"
 	use esd && audios="${audios},esd"
@@ -104,7 +105,7 @@ src_compile() {
 src_install() {
 	make DESTDIR="${D}" install || die
 
-	dodoc AUTHORS ChangeLog* INSTALL*
+	dodoc AUTHORS ChangeLog*
 	dodoc NEWS README* ${FILESDIR}/timidity.cfg
 
 	newconfd ${FILESDIR}/conf.d.timidity timidity
@@ -126,14 +127,14 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo ""
+	einfo
 	einfo "A timidity config file has been installed in /etc/timidity.cfg."
-	einfo ""
+	einfo
 	einfo "Do not edit this file as it will interfere with the timidity-update tool."
 	einfo "You will need to emerge timidity-eawpatches or timidity-shompatches."
-	einfo ""
+	einfo
 	einfo "The tool 'timidity-update' can be used to switch between installed patchsets."
-	einfo ""
+	einfo
 	einfo "An init script for the alsa timidity sequencer has been installed."
 	einfo "If you wish to use the timidity virtual sequencer, edit /etc/conf.d/timidity"
 	einfo "and run 'rc-update add timidity <runlevel> && /etc/init.d/timidity start'"
diff --git a/media-sound/timidity++/timidity++-2.13.2.ebuild b/media-sound/timidity++/timidity++-2.13.2.ebuild
index fd208d52ec9e..f6616e2548fc 100644
--- a/media-sound/timidity++/timidity++-2.13.2.ebuild
+++ b/media-sound/timidity++/timidity++-2.13.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/media-sound/timidity++/timidity++-2.13.2.ebuild,v 1.1 2004/10/08 04:35:52 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.2.ebuild,v 1.1.1.1 2005/11/30 09:38:04 chriswhite Exp $
 
-IUSE="oss nas esd motif X gtk oggvorbis tcltk slang alsa arts jack portaudio emacs"
+IUSE="oss nas esd motif X gtk vorbis tcltk slang alsa arts jack portaudio emacs"
 
-inherit gnuconfig
+inherit gnuconfig eutils
 
 MY_PV=${PV/_/-}
 MY_P=TiMidity++-${MY_PV}
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/timidity/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+KEYWORDS="amd64 ppc sparc x86 hppa"
 
 RDEPEND=">=sys-libs/ncurses-5.0
 	X? ( virtual/x11 )
@@ -24,20 +24,26 @@ RDEPEND=">=sys-libs/ncurses-5.0
 	gtk? ( =x11-libs/gtk+-1.2* )
 	nas? ( >=media-libs/nas-1.4 )
 	alsa? ( media-libs/alsa-lib )
-	motif? ( >=x11-libs/openmotif-2.1 )
+	motif? ( virtual/motif )
 	slang? ( >=sys-libs/slang-1.4 )
 	arts? ( kde-base/arts )
 	jack? ( media-sound/jack-audio-connection-kit )
 	portaudio? ( !ppc? ( media-libs/portaudio ) )
-	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
+	vorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
 
 DEPEND="${RDEPEND}
 	sys-devel/autoconf"
 
 RDEPEND="${RDEPEND}
-	tcltk? ( >=dev-lang/tk-8.1 )
+	X? ( tcltk? ( >=dev-lang/tk-8.1 ) )
 	emacs? ( virtual/emacs )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gtk26.patch
+}
+
 src_compile() {
 	local myconf
 	local audios
@@ -59,11 +65,11 @@ src_compile() {
 
 	use oss && audios="${audios},oss"
 	use esd && audios="${audios},esd"
-	use oggvorbis && audios="${audios},vorbis"
-	use nas && { audios="${audios},nas"; myconf="${myconf} --with-nas-library=/usr/X11R6/lib/libaudio.so"; }
+	use vorbis && audios="${audios},vorbis"
+	use nas && { audios="${audios},nas"; myconf="${myconf} --with-nas-library=/usr/X11R6/$(get_libdir)/libaudio.so"; }
 	use arts && audios="${audios},arts"
 	use jack && audios="${audios},jack"
-	use portaudio && audios="${audios},portaudio"
+	use portaudio && use !ppc && audios="${audios},portaudio"
 
 	use alsa \
 		&& audios="${audios},alsa" \
@@ -85,7 +91,7 @@ src_compile() {
 src_install() {
 	make DESTDIR=${D} install || die
 
-	dodoc AUTHORS ChangeLog* INSTALL*
+	dodoc AUTHORS ChangeLog*
 	dodoc NEWS README* ${FILESDIR}/timidity.cfg
 
 	insinto /etc/conf.d
@@ -111,14 +117,14 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo ""
+	einfo
 	einfo "A timidity config file has been installed in /etc/timidity.cfg."
-	einfo ""
+	einfo
 	einfo "Do not edit this file as it will interfere with the timidity-update tool."
 	einfo "You will need to emerge timidity-eawpatches or timidity-shompatches."
-	einfo ""
+	einfo
 	einfo "The tool 'timidity-update' can be used to switch between installed patchsets."
-	einfo ""
+	einfo
 	einfo "An init script for the alsa timidity sequencer has been installed."
 	einfo "If you wish to use the timidity virtual sequencer, edit /etc/conf.d/timidity"
 	einfo "and run 'rc-update add timidity <runlevel> && /etc/init.d/timidity start'"
diff --git a/media-sound/timidity-eawpatches/ChangeLog b/media-sound/timidity-eawpatches/ChangeLog
index d8cff24e8f88..ff468bb4a5ab 100644
--- a/media-sound/timidity-eawpatches/ChangeLog
+++ b/media-sound/timidity-eawpatches/ChangeLog
@@ -1,6 +1,81 @@
 # ChangeLog for media-sound/timidity-eawpatches
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity-eawpatches/ChangeLog,v 1.1 2002/05/19 19:36:48 agriffis Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity-eawpatches/ChangeLog,v 1.1.1.1 2005/11/30 09:38:45 chriswhite Exp $
+
+  28 Mar 2005; Guy Martin <gmsoft@gentoo.org>
+  timidity-eawpatches-12-r4.ebuild:
+  Stable on hppa.
+
+  28 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/timidity-eawpatches-12-gentoo.diff,
+  -timidity-eawpatches-12-r2.ebuild, -timidity-eawpatches-12-r3.ebuild:
+  Cleaned out old versions.
+
+  22 Dec 2004; Joseph Jezak <josejx@gentoo.org>
+  timidity-eawpatches-12-r4.ebuild:
+  Marked ppc stable.
+
+  23 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  timidity-eawpatches-12-r4.ebuild:
+  Stable amd64, sparc, x86.
+
+*timidity-eawpatches-12-r4 (23 Sep 2004)
+
+  23 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +timidity-eawpatches-12-r4.ebuild:
+  Revision bump to make use of the timidity-update script provided by ohn
+  Richard Moser <nigelenki@comcast.net>.
+
+  03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  timidity-eawpatches-12-r3.ebuild:
+  Stable sparc
+
+  04 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  timidity-eawpatches-12-r3.ebuild:
+  Added ~sparc.  Stable x86, amd64.
+
+*timidity-eawpatches-12-r3 (15 Jun 2004)
+
+  15 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -timidity-eawpatches-12-r1.ebuild, +timidity-eawpatches-12-r3.ebuild,
+  -timidity-eawpatches-12.ebuild:
+  Revbump to have the ebuild install the default config in /etc
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  timidity-eawpatches-12-r1.ebuild, timidity-eawpatches-12-r2.ebuild,
+  timidity-eawpatches-12.ebuild:
+  Added IUSE.
+
+  01 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  timidity-eawpatches-12-r1.ebuild, timidity-eawpatches-12-r2.ebuild:
+  Stable on x86.
+
+  30 Mar 2004; Daniel Ahlberg <aliz@gentoo.org>
+  timidity-eawpatches-12-r2.ebuild:
+  Adding amd64 keyword. Closing #45757.
+
+  08 Dec 2003; <spider@gentoo.org> timidity-eawpatches-12.ebuild:
+  QA drive, bug #35127
+
+  31 Oct 2003; David Holm <dholm@gentoo.org> timidity-eawpatches-12-r2.ebuild:
+  Added to ~ppc.
+
+  12 Jun 2003; <msterret@gentoo.org> timidity-eawpatches-12-r2.ebuild:
+  fix Header
+
+*timidity-eawpatches-12-r2 (22 Mar 2003)
+
+  22 Mar 2003; jje <jje@gentoo.org> timidity-eawpatches-12-r2.ebuild:
+  Updated ebuild that removes dep on rar and simplifies config.
+  
+  Submitted by: Jordan <lx_xero@zapo.net>
+
+*timidity-eawpatches-12-r1 (03 Dec 2002)
+
+	03 Dec 2002; Aron Griffis <agriffis@gentoo.org> timidity-eawpatches-12-r1:
+
+	Fix some installation issues with hints from Chris Moeller
+	<kode54@earthlink.net>.  Fixes BUG #8753
 
 *timidity-eawpatches-12 (19 May 2002)
 
diff --git a/media-sound/timidity-eawpatches/Manifest b/media-sound/timidity-eawpatches/Manifest
index e69de29bb2d1..3b904655cd1e 100644
--- a/media-sound/timidity-eawpatches/Manifest
+++ b/media-sound/timidity-eawpatches/Manifest
@@ -0,0 +1,4 @@
+MD5 767fc97df1fca48871494d42a1e6291d ChangeLog 2844
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 71fa8dab44740cd394fe628788d09bc1 timidity-eawpatches-12-r4.ebuild 1413
+MD5 0fc3bf4990261c76091fa637ad44583a files/digest-timidity-eawpatches-12-r4 68
diff --git a/media-sound/timidity-eawpatches/timidity-eawpatches-12-r4.ebuild b/media-sound/timidity-eawpatches/timidity-eawpatches-12-r4.ebuild
index ac462c43d3de..31539240a499 100644
--- a/media-sound/timidity-eawpatches/timidity-eawpatches-12-r4.ebuild
+++ b/media-sound/timidity-eawpatches/timidity-eawpatches-12-r4.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/media-sound/timidity-eawpatches/timidity-eawpatches-12-r4.ebuild,v 1.1 2004/09/23 21:19:07 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity-eawpatches/timidity-eawpatches-12-r4.ebuild,v 1.1.1.1 2005/11/30 09:38:45 chriswhite Exp $
 
 IUSE=""
 
+S=${WORKDIR}/eawpats
+
 DESCRIPTION="Eric Welsh's GUS patches for TiMidity"
 HOMEPAGE="http://www.stardate.bc.ca/eawpatches/html/default.htm"
 SRC_URI="http://5hdumat.samizdat.net/music/eawpats${PV}_full.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+KEYWORDS="amd64 ppc sparc x86 hppa"
 
 DEPEND=">=media-sound/timidity++-2.13.0-r2"
 
-S=${WORKDIR}/eawpats
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}/linuxconfig
@@ -50,4 +50,3 @@ pkg_postinst() {
 	einfo "You must run 'timidity-update -g -s eawpatches' to set this"
 	einfo "patchset as the default system patchset."
 }
-
diff --git a/media-sound/timidity-shompatches/ChangeLog b/media-sound/timidity-shompatches/ChangeLog
index 9e8f31f86b55..3bcf41572310 100644
--- a/media-sound/timidity-shompatches/ChangeLog
+++ b/media-sound/timidity-shompatches/ChangeLog
@@ -1,6 +1,47 @@
 # ChangeLog for media-sound/timidity-shompatches
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity-shompatches/ChangeLog,v 1.1 2004/07/21 09:11:39 eradicator Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity-shompatches/ChangeLog,v 1.1.1.1 2005/11/30 09:38:20 chriswhite Exp $
+
+  28 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -timidity-shompatches-19960409.ebuild:
+  Cleaned out old versions.
+
+  22 Dec 2004; Joseph Jezak <josejx@gentoo.org>
+  timidity-shompatches-19960409-r3.ebuild:
+  Marked ppc stable.
+
+  23 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  timidity-shompatches-19960409-r3.ebuild:
+  Stable amd64, sparc, x86.
+
+*timidity-shompatches-19960409-r3 (26 Sep 2004)
+
+  26 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -timidity-shompatches-19960409-r2.ebuild,
+  +timidity-shompatches-19960409-r3.ebuild:
+  Fixed another install typo which needed a revbump.
+
+*timidity-shompatches-19960409-r2 (24 Sep 2004)
+
+  24 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -timidity-shompatches-19960409-r1.ebuild,
+  +timidity-shompatches-19960409-r2.ebuild:
+  Revision bump to fix typo which caused bad installation.  Closes bug #65234.
+
+*timidity-shompatches-19960409-r1 (23 Sep 2004)
+
+  23 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +timidity-shompatches-19960409-r1.ebuild:
+  Revision bump to make use of the timidity-update script provided by ohn
+  Richard Moser <nigelenki@comcast.net>.
+
+  03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  timidity-shompatches-19960409.ebuild:
+  Stable amd64, sparc, x86.
+
+  19 Aug 2004; David Holm <dholm@gentoo.org>
+  timidity-shompatches-19960409.ebuild:
+  Added to ~ppc.
 
 *timidity-shompatches-19960409 (21 Jul 2004)
 
diff --git a/media-sound/timidity-shompatches/Manifest b/media-sound/timidity-shompatches/Manifest
index 08d65b6146f9..a794168a97e8 100644
--- a/media-sound/timidity-shompatches/Manifest
+++ b/media-sound/timidity-shompatches/Manifest
@@ -1,2 +1,14 @@
-MD5 4d099bfee92638b2fe5d7a4bd2d56353 timidity-shompatches-19960409.ebuild 1469
-MD5 16eda58a2ef3c11d782c330dcef86759 files/digest-timidity-shompatches-19960409 63
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b9e901f17f3048973fe2751e2573aed1 ChangeLog 1912
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 cf89b113b33fd2a1d5ac36abc92fb1bc timidity-shompatches-19960409-r3.ebuild 1342
+MD5 16eda58a2ef3c11d782c330dcef86759 files/digest-timidity-shompatches-19960409-r3 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCIvQ5ArHZZzCEUG0RApCcAJ9yblbfZGacDMJSQ900S6aU0lzG6ACfdrWn
+0JOfi+o93p98tFJYpgfaWRs=
+=Ffrf
+-----END PGP SIGNATURE-----
diff --git a/media-sound/timidity-shompatches/timidity-shompatches-19960409-r3.ebuild b/media-sound/timidity-shompatches/timidity-shompatches-19960409-r3.ebuild
index 030a50475a06..66c558690959 100644
--- a/media-sound/timidity-shompatches/timidity-shompatches-19960409-r3.ebuild
+++ b/media-sound/timidity-shompatches/timidity-shompatches-19960409-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/media-sound/timidity-shompatches/timidity-shompatches-19960409-r3.ebuild,v 1.1 2004/09/26 22:10:10 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity-shompatches/timidity-shompatches-19960409-r3.ebuild,v 1.1.1.1 2005/11/30 09:38:20 chriswhite Exp $
 
 IUSE=""
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.i.h.kyoto-u.ac.jp/~shom/timidity/shominst/shominst-0409.zip"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+KEYWORDS="amd64 ppc sparc x86"
 
 RDEPEND=">=media-sound/timidity++-2.13.0-r2"
 
diff --git a/media-sound/tk707/ChangeLog b/media-sound/tk707/ChangeLog
index bb5f5f3ba53d..633863a0d002 100644
--- a/media-sound/tk707/ChangeLog
+++ b/media-sound/tk707/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for media-sound/tk707
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tk707/ChangeLog,v 1.1 2005/02/04 03:49:43 jnc Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tk707/ChangeLog,v 1.1.1.1 2005/11/30 09:38:11 chriswhite Exp $
+
+  07 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> tk707-0.8.ebuild:
+  Fix the same for 0.8 version.
+
+  03 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> tk707-0.8-r1.ebuild:
+  Fix DEPEND/RDEPEND that got reversed. Use autotools eclass insetad of
+  autoreconf.
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> tk707-0.8-r1.ebuild:
+  Added to ~ppc.
+
+  05 Feb 2005; Eric Shattow <jnc@gentoo.org> tk707-0.8-r1.ebuild:
+  Remove unused dependencies.
+
+*tk707-0.8-r1 (05 Feb 2005)
+
+  05 Feb 2005; Eric Shattow <jnc@gentoo.org> +tk707-0.8-r1.ebuild:
+  Ebuild fixes, no more installing twice (oops).
 
 *tk707-0.8 (03 Feb 2005)
 
diff --git a/media-sound/tk707/Manifest b/media-sound/tk707/Manifest
index a3099f485c81..20c462981b05 100644
--- a/media-sound/tk707/Manifest
+++ b/media-sound/tk707/Manifest
@@ -1,2 +1,16 @@
-MD5 484dac43e500394ad3f68abab366f32f tk707-0.8.ebuild 1014
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2673285e9ce3e0b77070a72b314d407b ChangeLog 963
 MD5 42dacaa900c60ec26b05238847efeb97 files/digest-tk707-0.8 136
+MD5 42dacaa900c60ec26b05238847efeb97 files/digest-tk707-0.8-r1 136
+MD5 17b8be591e3852dfe1ad2052410e7b22 metadata.xml 217
+MD5 a9d92abc4186098387ea633495938c3f tk707-0.8-r1.ebuild 903
+MD5 746cd6611f2ccf34c8716eae7f590b4a tk707-0.8.ebuild 1109
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDb0Wzj5H05b2HAEkRAstTAJ4rI+VXQFNotYiz3aIPIoguezgw2QCghdVo
+3RKpfsPXPyi6ws1xZikQH50=
+=DZ0n
+-----END PGP SIGNATURE-----
diff --git a/media-sound/tk707/tk707-0.8-r1.ebuild b/media-sound/tk707/tk707-0.8-r1.ebuild
index 6acecde4d136..6fd4c364971c 100644
--- a/media-sound/tk707/tk707-0.8-r1.ebuild
+++ b/media-sound/tk707/tk707-0.8-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/media-sound/tk707/tk707-0.8-r1.ebuild,v 1.1 2005/02/05 07:42:38 jnc Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tk707/tk707-0.8-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:11 chriswhite Exp $
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION=" An \"7x7\" type midi drum sequencer for Linux"
 HOMEPAGE="http://www-lmc.imag.fr/lmc-edp/Pierre.Saramito/tk707"
@@ -10,30 +10,30 @@ SRC_URI="${P}.tar.gz ${P}-updated_tcl2c.patch.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 
-IUSE="timidity lame"
+IUSE=""
 
-DEPEND=">=media-libs/alsa-lib-0.9.0
+RDEPEND=">=media-libs/alsa-lib-0.9.0
 		>=dev-lang/tcl-8.4
-		>=dev-lang/tk-8.4
-		timidity? ( media-sound/timidity++ )
-		lame? ( media-sound/lame )"
-RDEPEND="${DEPEND}
-	>=sys-devel/automake-1.7
-	>=sys-devel/autoconf-2.5"
+		>=dev-lang/tk-8.4"
+DEPEND="${RDEPEND}
+		>=sys-devel/automake-1.7
+		>=sys-devel/autoconf-2.5"
 
 src_unpack() {
 	unpack ${A}
 	EPATCH_SOURCE=${S} epatch ${P}-*.patch
+
+	cd "${S}"
+	eautoreconf
 }
 
 src_compile() {
-	autoreconf || die "autoreconf failed"
-	econf || die "econf failed"
+	econf $(use_enable timdity) $(use_enable lame) || die "econf failed"
 	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 }
diff --git a/media-sound/tk707/tk707-0.8.ebuild b/media-sound/tk707/tk707-0.8.ebuild
index b8e55e853d59..c148819c22f2 100644
--- a/media-sound/tk707/tk707-0.8.ebuild
+++ b/media-sound/tk707/tk707-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/media-sound/tk707/tk707-0.8.ebuild,v 1.1 2005/02/04 03:49:43 jnc Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tk707/tk707-0.8.ebuild,v 1.1.1.1 2005/11/30 09:38:11 chriswhite Exp $
 
 inherit eutils
 
@@ -16,12 +16,12 @@ KEYWORDS="~x86"
 #IUSE="timidity lame"
 IUSE=""
 
-DEPEND=">=media-libs/alsa-lib-0.9.0
+RDEPEND=">=media-libs/alsa-lib-0.9.0
 		>=dev-lang/tcl-8.4
 		>=dev-lang/tk-8.4"
 #		timidity? ( media-sound/timidity++ )
 #		lame? ( media-sound/lame )"
-RDEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 		>=sys-devel/automake-1.7
 		>=sys-devel/autoconf-2.5"
 
diff --git a/media-sound/toolame/ChangeLog b/media-sound/toolame/ChangeLog
index 8798ccfdc95c..bbfa740d366a 100644
--- a/media-sound/toolame/ChangeLog
+++ b/media-sound/toolame/ChangeLog
@@ -1,6 +1,48 @@
 # ChangeLog for media-sound/toolame
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/toolame/ChangeLog,v 1.1 2003/05/02 19:21:28 avenj Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/toolame/ChangeLog,v 1.1.1.1 2005/11/30 09:38:39 chriswhite Exp $
+
+*toolame-02l-r2 (25 Aug 2005)
+
+  25 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> +toolame-02l-r2.ebuild:
+  Add largefile support for glibc/uclibc. Fix ${CC} handling for cross-compile
+  sake.
+
+  24 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> toolame-02l.ebuild,
+  toolame-02l-r1.ebuild:
+  epatch does not need die.
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> toolame-02l.ebuild:
+  Stable on ppc.
+
+*toolame-02l-r1 (19 Jun 2005)
+
+  19 Jun 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/toolame-02l-uint.patch, +toolame-02l-r1.ebuild:
+  Revbump to fix signed/unsigned issue which caused segfault on 64bit archs.
+  Pusing into stable amd64. Closes bug #89751 thanks to Scott Smith
+  <scott-gentoo@gelatinous.com>
+
+  14 Feb 2005; David Holm <dholm@gentoo.org> toolame-02l.ebuild:
+  Added to ~ppc.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> toolame-02l.ebuild:
+  Added to ~sparc.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> toolame-02l.ebuild:
+  Stable amd64.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> toolame-02l.ebuild:
+  virtual/glibc -> virtual/libc
+
+  26 May 2004; Danny van Dyk <kugelfang@gentoo.org> toolame-02l.ebuild:
+  Marked ~amd64.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> toolame-02l.ebuild:
+  Added IUSE.
+
+  01 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> toolame-02l.ebuild:
+  inherit eutils.
 
 *toolame-02l (02 May 2003)
 
diff --git a/media-sound/toolame/Manifest b/media-sound/toolame/Manifest
index f3b5bd323634..e3f640bbef10 100644
--- a/media-sound/toolame/Manifest
+++ b/media-sound/toolame/Manifest
@@ -1,3 +1,20 @@
-MD5 21bc4ad704547678f15b766c51f1cfc2 toolame-02l.ebuild 532
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 03d87115353b6e3b11240a5ad2dff0fd ChangeLog 1815
+MD5 e53f02956bc1bd05fbbf3afd336781cf toolame-02l.ebuild 660
+MD5 ef52f6b4eb180f3e8fb264b04dc2e3ca toolame-02l-r2.ebuild 934
+MD5 c6d157b936d85a2218795dcb6bf6e653 toolame-02l-r1.ebuild 700
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 4b1a1622289b050b59a5243fae23d193 files/toolame-02l-uint.patch 950
+MD5 5cc792797a252d3d4d12b9857d393ee8 files/digest-toolame-02l-r2 60
 MD5 03d22f398bef3ac46ba7c7a7910d2d80 files/toolame-02l-gentoo.diff 2153
 MD5 5cc792797a252d3d4d12b9857d393ee8 files/digest-toolame-02l 60
+MD5 5cc792797a252d3d4d12b9857d393ee8 files/digest-toolame-02l-r1 60
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDDbgAj5H05b2HAEkRApWYAJ9kKou2C0lnSZbA+/BMWA+rYC9RBwCfaAw9
+HY1wpFg1Lers/miLsEWDCrc=
+=U8ql
+-----END PGP SIGNATURE-----
diff --git a/media-sound/toolame/toolame-02l-r1.ebuild b/media-sound/toolame/toolame-02l-r1.ebuild
index 9918a1b05852..3f4983e1f451 100644
--- a/media-sound/toolame/toolame-02l-r1.ebuild
+++ b/media-sound/toolame/toolame-02l-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/media-sound/toolame/toolame-02l-r1.ebuild,v 1.1 2005/06/19 20:47:23 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/toolame/toolame-02l-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:39 chriswhite Exp $
 
 IUSE=""
 
@@ -18,8 +18,8 @@ DEPEND="virtual/libc
 	sys-devel/gcc"
 
 src_compile() {
-	epatch ${FILESDIR}/${P}-gentoo.diff || die
-	epatch ${FILESDIR}/${P}-uint.patch || die
+	epatch ${FILESDIR}/${P}-gentoo.diff
+	epatch ${FILESDIR}/${P}-uint.patch
 	emake || die
 }
 
diff --git a/media-sound/toolame/toolame-02l-r2.ebuild b/media-sound/toolame/toolame-02l-r2.ebuild
index 2d37a0f749f6..1a4ed547dd0b 100644
--- a/media-sound/toolame/toolame-02l-r2.ebuild
+++ b/media-sound/toolame/toolame-02l-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/media-sound/toolame/toolame-02l-r2.ebuild,v 1.1 2005/08/25 12:21:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/toolame/toolame-02l-r2.ebuild,v 1.1.1.1 2005/11/30 09:38:39 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
diff --git a/media-sound/toolame/toolame-02l.ebuild b/media-sound/toolame/toolame-02l.ebuild
index bc052a41c7be..93a790e9c619 100644
--- a/media-sound/toolame/toolame-02l.ebuild
+++ b/media-sound/toolame/toolame-02l.ebuild
@@ -1,6 +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/media-sound/toolame/toolame-02l.ebuild,v 1.1 2003/05/02 19:21:29 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/toolame/toolame-02l.ebuild,v 1.1.1.1 2005/11/30 09:38:39 chriswhite Exp $
+
+IUSE=""
+
+inherit eutils
 
 DESCRIPTION="tooLAME - an optimized mpeg 1/2 layer 2 audio encoder"
 HOMEPAGE="http://www.planckenergy.com"
@@ -8,19 +12,19 @@ SRC_URI="mirror://sourceforge/toolame/${P}.tgz"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	sys-devel/gcc"
 
 src_compile() {
-	epatch ${FILESDIR}/${P}-gentoo.diff || die
+	epatch ${FILESDIR}/${P}-gentoo.diff
 	emake || die
 }
 
 src_install() {
 	dobin toolame || die
-	dodoc README HISTORY FUTURE html/* text/* 
+	dodoc README HISTORY FUTURE html/* text/*
 }
 
 
diff --git a/media-sound/trm/ChangeLog b/media-sound/trm/ChangeLog
index 5f818f9f3611..a52113b109ed 100644
--- a/media-sound/trm/ChangeLog
+++ b/media-sound/trm/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for media-sound/trm
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/trm/ChangeLog,v 1.1 2004/05/27 22:48:20 caleb Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/trm/ChangeLog,v 1.1.1.1 2005/11/30 09:38:26 chriswhite Exp $
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> trm-0.2.1.ebuild:
+  Added to ~ppc.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> trm-0.2.1.ebuild:
+  Stable amd64.
+
+  12 Aug 2004; <frank@gentoo.org> trm-0.2.1.ebuild:
+  Added dependency to media-libs/id3lib. Closes bug #59261.
+
+  11 Aug 2004; Caleb Tennis <caleb@gentoo.org> trm-0.2.1.ebuild:
+  Block tunepimp as it is a replacement for this package
+
+  26 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org> trm-0.2.1.ebuild:
+  Stable x86.  Added ~amd64.
+
+  30 May 2004; Jeremy Huddleston <eradicator@gentoo.org> trm-0.2.1.ebuild:
+  Added explicit IUSE.
 
 *trm-0.2.1 (27 May 2004)
 
diff --git a/media-sound/trm/Manifest b/media-sound/trm/Manifest
index d86be170df7e..881a1c822411 100644
--- a/media-sound/trm/Manifest
+++ b/media-sound/trm/Manifest
@@ -1,2 +1,4 @@
-MD5 ab0a5ed2c17dfe139db028a7ebd4ef92 trm-0.2.1.ebuild 509
+MD5 b7365fb83a5f514a3ea4f7c55618bc7f ChangeLog 955
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 0648e4e79ed8ceac0d7bf0a0598ca354 trm-0.2.1.ebuild 654
 MD5 134021c37ab8804742d249ef61c11701 files/digest-trm-0.2.1 61
diff --git a/media-sound/trm/trm-0.2.1.ebuild b/media-sound/trm/trm-0.2.1.ebuild
index b0ad5495237e..3da7a15b5468 100644
--- a/media-sound/trm/trm-0.2.1.ebuild
+++ b/media-sound/trm/trm-0.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/media-sound/trm/trm-0.2.1.ebuild,v 1.1 2004/05/27 22:48:20 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/trm/trm-0.2.1.ebuild,v 1.1.1.1 2005/11/30 09:38:26 chriswhite Exp $
+
+IUSE=""
 
 LICENSE="GPL-2"
 
@@ -8,13 +10,15 @@ DESCRIPTION="Generates Relatable TRM acoustic fingerprints"
 SRC_URI="ftp://ftp.musicbrainz.org/pub/musicbrainz/${P}.tar.gz"
 HOMEPAGE="http://www.musicbrainz.org/products/trmgen/download.html"
 
-KEYWORDS="~x86"
+KEYWORDS="amd64 ~ppc x86"
 SLOT="0"
 
 DEPEND=">=media-libs/musicbrainz-2.0.1
+	media-libs/id3lib
 	media-libs/libmad
 	media-libs/libvorbis
-	media-libs/libogg"
+	media-libs/libogg
+	!media-libs/tunepimp"
 
 src_install() {
 	dodoc README
diff --git a/media-sound/trommler/ChangeLog b/media-sound/trommler/ChangeLog
index 2f6243660087..871b68be7146 100644
--- a/media-sound/trommler/ChangeLog
+++ b/media-sound/trommler/ChangeLog
@@ -1,7 +1,27 @@
 # ChangeLog for media-sound/trommler
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/trommler/ChangeLog,v 1.1 2002/10/23 18:11:06 vapier Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/trommler/ChangeLog,v 1.1.1.1 2005/11/30 09:38:46 chriswhite Exp $
 
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> trommler-3.3.ebuild:
+  Mark 3.3 stable on alpha
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> trommler-3.3.ebuild:
+  Stable on ppc.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> trommler-3.3.ebuild:
+  Stable amd64, sparc.
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> trommler-3.3.ebuild:
+  Added to ~amd64
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> trommler-3.3.ebuild:
+  Added IUSE.
+
+  16 Oct 2003; Martin Holzer <mholzer@gentoo.org> trommler-3.3.ebuild:
+  Adding gcc3.3 fix. Closes #30458.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *trommler-3.3 (23 Oct 2002)
 
   23 Oct 2002; Mike Frysinger <vapier@gentoo.org> :
diff --git a/media-sound/trommler/Manifest b/media-sound/trommler/Manifest
index e69de29bb2d1..58813dd982de 100644
--- a/media-sound/trommler/Manifest
+++ b/media-sound/trommler/Manifest
@@ -0,0 +1,4 @@
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 8fbc23b51396803064eaf6cda64dfd9f ChangeLog 1054
+MD5 d47fd683f99250d1a6e1db47bb5eda60 trommler-3.3.ebuild 811
+MD5 6969d9f656aa7d719e2595970fb20ff7 files/digest-trommler-3.3 64
diff --git a/media-sound/trommler/trommler-3.3.ebuild b/media-sound/trommler/trommler-3.3.ebuild
index d18a3784e8d9..7f9847b36caa 100644
--- a/media-sound/trommler/trommler-3.3.ebuild
+++ b/media-sound/trommler/trommler-3.3.ebuild
@@ -1,25 +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/media-sound/trommler/trommler-3.3.ebuild,v 1.1 2002/10/23 18:11:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/trommler/trommler-3.3.ebuild,v 1.1.1.1 2005/11/30 09:38:46 chriswhite Exp $
 
-S="${WORKDIR}/Trommler"
-DESCRIPTION="This is a gtk+ based drum machine"
+IUSE=""
+
+DESCRIPTION="gtk+ based drum machine"
 HOMEPAGE="http://muth.org/Robert/Trommler/"
 SRC_URI="http://muth.org/Robert/Trommler/${P/-/.}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~sparc64 ~alpha"
-IUSE=""
+KEYWORDS="alpha amd64 ppc sparc x86"
 
 DEPEND=">=x11-libs/gtk+-2.0.6-r1"
 
+S="${WORKDIR}/Trommler"
+
 src_compile() {
+	sed -i 's:CFLAGS = -Wall -Werror -O9:CFLAGS = -Wall -O9:' Makefile || die
 	emake || die
 }
 
 src_install() {
-	dobin trommler wav2smp playsample 
+	dobin trommler wav2smp playsample
 	dodoc README CHANGES
 	dohtml index.html style.css
 	insinto /usr/share/trommler/Drums
diff --git a/media-sound/tunesbrowser/ChangeLog b/media-sound/tunesbrowser/ChangeLog
index 1eb8c5732384..655a35418066 100644
--- a/media-sound/tunesbrowser/ChangeLog
+++ b/media-sound/tunesbrowser/ChangeLog
@@ -1,6 +1,31 @@
 # ChangeLog for media-sound/tunesbrowser
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tunesbrowser/ChangeLog,v 1.1 2004/09/04 19:53:31 squinky86 Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tunesbrowser/ChangeLog,v 1.1.1.1 2005/11/30 09:38:32 chriswhite Exp $
+
+*tunesbrowser-0.3.0 (29 Sep 2005)
+
+  29 Sep 2005; Daniel Drake <dsd@gentoo.org> +tunesbrowser-0.3.0.ebuild:
+  Version bump thanks to Andrew D and Joshua Jackson in bug #103301
+
+  02 Mar 2005; Tony Vroon <chainsaw@gentoo.org> tunesbrowser-0.1.6.ebuild,
+  tunesbrowser-0.2.0.ebuild:
+  Dependency update, closes bug #83616.
+
+*tunesbrowser-0.2.0 (22 Jan 2005)
+
+  22 Jan 2005; Daniel Drake <dsd@gentoo.org> +tunesbrowser-0.2.0.ebuild:
+  Version bump thanks to Matt Wolfzorn <mwolfzorn@gmail.com> in bug 79045
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  tunesbrowser-0.1.6.ebuild:
+  Stable amd64.
+
+  05 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  tunesbrowser-0.1.6.ebuild:
+  Stable x86.  Added to ~amd64.
+
+  05 Sep 2004; Seemant Kulleen <seemant@gentoo.org> tunesbrowser-0.1.6.ebuild:
+  change musi to music
 
 *tunesbrowser-0.1.6 (04 Sep 2004)
 
diff --git a/media-sound/tunesbrowser/Manifest b/media-sound/tunesbrowser/Manifest
index 804afce48f31..11d0edd2e4f4 100644
--- a/media-sound/tunesbrowser/Manifest
+++ b/media-sound/tunesbrowser/Manifest
@@ -1,2 +1,18 @@
-MD5 685b7cb7e5539b87c43af8ef4815ed13 tunesbrowser-0.1.6.ebuild 849
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f273bc1cbdf7673a530b0ef38812c350 tunesbrowser-0.3.0.ebuild 790
+MD5 3cfe4e130bfb154242fe486e6fc6c8bf tunesbrowser-0.1.6.ebuild 946
+MD5 593780707bae0b6bf11365e98e370ee3 ChangeLog 1287
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 27560465929798140aec916cd0737558 tunesbrowser-0.2.0.ebuild 797
 MD5 40961a85818c93baa73f232b7a30d15c files/digest-tunesbrowser-0.1.6 139
+MD5 d6e647231714403799d0074f7e3ab246 files/digest-tunesbrowser-0.2.0 71
+MD5 6b61910e583b6361cd44196644da96ed files/digest-tunesbrowser-0.3.0 71
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDO/QkTOXg++0VvJQRAvzuAJ0XX7VrjZIxG/ggDSnha2/FAE0pEACbB3eM
+mj6Tnt1sPNTymx23JUc9m5k=
+=pc7C
+-----END PGP SIGNATURE-----
diff --git a/media-sound/tunesbrowser/metadata.xml b/media-sound/tunesbrowser/metadata.xml
index 599b56abbdda..e1774e3d9ad7 100644
--- a/media-sound/tunesbrowser/metadata.xml
+++ b/media-sound/tunesbrowser/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sound</herd>
-<maintainer>
-	<email>squinky86@gentoo.org</email>
-	<name>Jon Hood</name>
-</maintainer>
 </pkgmetadata>
diff --git a/media-sound/tunesbrowser/tunesbrowser-0.1.6.ebuild b/media-sound/tunesbrowser/tunesbrowser-0.1.6.ebuild
index 5edd3cc15db5..d796852f4c4a 100644
--- a/media-sound/tunesbrowser/tunesbrowser-0.1.6.ebuild
+++ b/media-sound/tunesbrowser/tunesbrowser-0.1.6.ebuild
@@ -1,22 +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/media-sound/tunesbrowser/tunesbrowser-0.1.6.ebuild,v 1.1 2004/09/04 19:53:31 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tunesbrowser/tunesbrowser-0.1.6.ebuild,v 1.1.1.1 2005/11/30 09:38:32 chriswhite Exp $
+
+IUSE=""
 
 inherit eutils
 
-SLOT="0"
-LICENSE="crazney"
-KEYWORDS="~x86"
-DESCRIPTION="TunesBrowser is a simple musi player, capable of playing music found in iTunes(R) shares"
+DESCRIPTION="TunesBrowser is a simple music player, capable of playing music found in iTunes(R) shares"
+HOMEPAGE="http://crazney.net/programs/itunes/tunesbrowser.html"
 SRC_URI="http://crazney.net/programs/itunes/files/${P}.tar.bz2
 	http://dev.gentoo.org/~squinky86/files/${PV}-gstreamer.patch.bz2"
-HOMEPAGE="http://crazney.net/programs/itunes/tunesbrowser.html"
-IUSE=""
+
+SLOT="0"
+LICENSE="crazney"
+KEYWORDS="amd64 ppc x86"
 
 DEPEND=">=media-libs/gstreamer-0.8
 	>=media-plugins/gst-plugins-mad-0.8
 	>=media-plugins/gst-plugins-oss-0.8
-	media-libs/libopendaap"
+	media-libs/libopendaap
+	>=gnome-base/libglade-2.0"
 
 src_unpack() {
 	unpack ${A}
@@ -24,12 +27,7 @@ src_unpack() {
 	epatch ${DISTDIR}/${PV}-gstreamer.patch.bz2
 }
 
-src_compile() {
-	econf || die
-	emake || die
-}
-
 src_install() {
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
-	einstall || die
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog
 }
diff --git a/media-sound/tunesbrowser/tunesbrowser-0.2.0.ebuild b/media-sound/tunesbrowser/tunesbrowser-0.2.0.ebuild
index ab2af6431eaf..e16dea637661 100644
--- a/media-sound/tunesbrowser/tunesbrowser-0.2.0.ebuild
+++ b/media-sound/tunesbrowser/tunesbrowser-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/media-sound/tunesbrowser/tunesbrowser-0.2.0.ebuild,v 1.1 2005/01/22 16:01:34 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tunesbrowser/tunesbrowser-0.2.0.ebuild,v 1.1.1.1 2005/11/30 09:38:32 chriswhite Exp $
 
 IUSE=""
 
@@ -16,7 +16,8 @@ KEYWORDS="~amd64 ~ppc ~x86"
 DEPEND=">=media-libs/gstreamer-0.8
 	>=media-plugins/gst-plugins-mad-0.8
 	>=media-plugins/gst-plugins-oss-0.8
-	>=media-libs/libopendaap-0.3.0"
+	>=media-libs/libopendaap-0.3.0
+	>=gnome-base/libglade-2.0"
 
 src_install() {
 	make DESTDIR="${D}" install || die
diff --git a/media-sound/tunesbrowser/tunesbrowser-0.3.0.ebuild b/media-sound/tunesbrowser/tunesbrowser-0.3.0.ebuild
index 1d35e80c8645..f491bd526f23 100644
--- a/media-sound/tunesbrowser/tunesbrowser-0.3.0.ebuild
+++ b/media-sound/tunesbrowser/tunesbrowser-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/media-sound/tunesbrowser/tunesbrowser-0.3.0.ebuild,v 1.1 2005/09/29 14:02:51 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tunesbrowser/tunesbrowser-0.3.0.ebuild,v 1.1.1.1 2005/11/30 09:38:32 chriswhite Exp $
 
 IUSE=""
 
diff --git a/media-sound/umix/ChangeLog b/media-sound/umix/ChangeLog
index 9fc73945f8ba..9c6cba664c8c 100644
--- a/media-sound/umix/ChangeLog
+++ b/media-sound/umix/ChangeLog
@@ -1,8 +1,60 @@
-# ChangeLog for app-games/ytin
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/umix/ChangeLog,v 1.1 2002/07/14 10:31:26 phoenix Exp $
+# ChangeLog for media-sound/umix
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/umix/ChangeLog,v 1.1.1.1 2005/11/30 09:38:10 chriswhite Exp $
 
-*ytin-1.83.5.ebuild (14 July 2002)
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> umix-1.0.2.ebuild:
+  Mark 1.0.2 stable on alpha
+
+  26 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> umix-1.0.2.ebuild:
+  Stable on ppc.
+
+  19 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> -umix-0.9.1.ebuild:
+  Removing old versions.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> umix-1.0.2.ebuild:
+  Stable amd64.
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> umix-1.0.2.ebuild:
+  Stable sparc.  Added ~amd64.
+
+  30 May 2004; Jeremy Huddleston <eradicator@gentoo.org> umix-1.0.2.ebuild:
+  Stable x86.
+
+*umix-1.0.2 (08 Apr 2004)
+
+  08 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> umix-0.9.1-r1.ebuild,
+  umix-0.9.1.ebuild, umix-1.0.2.ebuild, umix-1.0.ebuild:
+  Version bump.  Removed explicit S=.  RESTRICT="nomirror"
+
+  07 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> umix-1.0.ebuild:
+  ~sparc'd
+
+  28 Mar 2003; Patrick Kursawe <phosphan@gentoo.org> umix-1.0.ebuild :
+  marked as stable
+
+*umix-1.0 (17 Mar 2003)
+
+  17 Mar 2003; Patrick Kursawe <phosphan@gentoo.org> umix-1.0.ebuild
+  files/digest-umix-1.0 :
+  New version
+
+*umix-0.9.1-r1 (13 Feb 2003)
+ 
+  12 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
+*umix-1.83.5-r1.ebuild (16 Aug 2002)
+
+  01 Feb 2003; Jason Shoemaker <kutsuya@gentoo.org> umix-0.9.1* : Website 
+  moved, so new homepage and package location added.
+
+  16 Aug 2002; <?> : Corrected build to include libuincurses as it was 
+  incorrectly specifying use flags for user.
+
+*umix-1.83.5.ebuild (14 July 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> ChangeLog:
+  Changelog cleanup.
 
   14 Jul 2002; phoen][x <phoenix@gentoo.org> ChangeLog, umix-0.9.1.ebuild,
   files/digest-umix-0.9.1 :
@@ -12,7 +64,7 @@
 
   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.
+  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/media-sound/umix/Manifest b/media-sound/umix/Manifest
index e69de29bb2d1..cc82cbeae492 100644
--- a/media-sound/umix/Manifest
+++ b/media-sound/umix/Manifest
@@ -0,0 +1,6 @@
+MD5 a3a3b8a6906d8ba4dc4b18ab538513ee umix-1.0.2.ebuild 730
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 5b506857c271fbc7b5bdd7e65a60c872 ChangeLog 2437
+MD5 4bb8f0a77c57661ef83167ddb42676a9 umix-0.9.1-r1.ebuild 848
+MD5 059cebee0c10a6b8e95afdbd5842a5cf files/digest-umix-0.9.1-r1 62
+MD5 6a29455aae519841f1c9c4a9682a94e6 files/digest-umix-1.0.2 62
diff --git a/media-sound/umix/umix-0.9.1-r1.ebuild b/media-sound/umix/umix-0.9.1-r1.ebuild
index 524b1a5420b8..f2a41445262f 100644
--- a/media-sound/umix/umix-0.9.1-r1.ebuild
+++ b/media-sound/umix/umix-0.9.1-r1.ebuild
@@ -1,14 +1,16 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/umix/umix-0.9.1-r1.ebuild,v 1.1 2002/08/17 05:48:29 trance Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/umix/umix-0.9.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:10 chriswhite Exp $
+
+IUSE="ncurses gtk"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Program for adjusting soundcard volumes"
-SRC_URI="http://www.ionstream.fi/sakari/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.ionstream.fi/sakari/umix/"
+HOMEPAGE="http://umix.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+RESTRICT="nomirror"
 
 SLOT="0"
-KEYWORDS="x86 ppc"
+KEYWORDS="x86 ppc ~alpha"
 LICENSE="GPL-2"
 
 DEPEND="ncurses? ( >=sys-libs/ncurses-5.2 )
diff --git a/media-sound/umix/umix-1.0.2.ebuild b/media-sound/umix/umix-1.0.2.ebuild
index 67bf7ac3f2ae..4bdde2a73fe6 100644
--- a/media-sound/umix/umix-1.0.2.ebuild
+++ b/media-sound/umix/umix-1.0.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/media-sound/umix/umix-1.0.2.ebuild,v 1.1 2004/04/08 09:40:50 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/umix/umix-1.0.2.ebuild,v 1.1.1.1 2005/11/30 09:38:10 chriswhite Exp $
+
+IUSE="ncurses oss"
 
 DESCRIPTION="Program for adjusting soundcard volumes"
 HOMEPAGE="http://umix.sf.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-RESTRICT="nomirror"
 
 SLOT="0"
-KEYWORDS="~x86 ~sparc"
 LICENSE="GPL-2"
-IUSE="ncurses oss"
+KEYWORDS="alpha amd64 ppc sparc x86"
 
 DEPEND="ncurses? ( >=sys-libs/ncurses-5.2 )"
 
@@ -23,6 +23,6 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install
+	make DESTDIR="${D}" install
 	dodoc AUTHORS ChangeLog NEWS README TODO
 }
diff --git a/media-sound/usbmidi/ChangeLog b/media-sound/usbmidi/ChangeLog
index 96dcc43f1a17..40cd397e501e 100644
--- a/media-sound/usbmidi/ChangeLog
+++ b/media-sound/usbmidi/ChangeLog
@@ -1,10 +1,19 @@
 # ChangeLog for media-sound/usbmidi
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/usbmidi/ChangeLog,v 1.1 2003/05/22 11:30:15 jje Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/usbmidi/ChangeLog,v 1.1.1.1 2005/11/30 09:38:06 chriswhite Exp $
+
+  03 Nov 2005; Eldad Zack <eldad@gentoo.org> usbmidi-1.0.ebuild:
+  Bug #111242 : updated HOMEPAGE and SRC_URI. Thanks to Arvid
+  <anmaster@tele2.se> for reporting.
+
+  24 May 2003; jje <jje@gentoo.org> usbmidi-1.0.ebuild:
+  Fixed install.
+  
+  For details see: http://bugs.gentoo.org/show_bug.cgi?id=21561
 
 *usbmidi-1.0 (22 May 2003)
 
-  22 May 2003; root <root@gentoo.org> usbmidi-1.0.ebuild, files/ezusbmidi,
+  22 May 2003; jje <jje@gentoo.org> usbmidi-1.0.ebuild, files/ezusbmidi,
   files/ezusbmidi.usermap:
   Initial revision.
   
diff --git a/media-sound/usbmidi/Manifest b/media-sound/usbmidi/Manifest
index 042631723ca2..d2ee9d768d92 100644
--- a/media-sound/usbmidi/Manifest
+++ b/media-sound/usbmidi/Manifest
@@ -1,5 +1,16 @@
-MD5 8e7507ed5ced15b925f1bb8fe13f01ec usbmidi-1.0.ebuild 1010
-MD5 6af8f97c561b1b3a6824ef03960bae0b ChangeLog 313
-MD5 b6b08b082cdd69678d1034f0d6b9b129 files/digest-usbmidi-1.0 67
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 699dd377d6fb007626da44758133044d ChangeLog 699
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 a0405a6c03066b11d20481d91f77cde2 usbmidi-1.0.ebuild 1146
 MD5 7708d9c50a42ddfbf40aed3e6d480b60 files/ezusbmidi 947
+MD5 b6b08b082cdd69678d1034f0d6b9b129 files/digest-usbmidi-1.0 67
 MD5 007cb1fe02b3ca041259d819d8958608 files/ezusbmidi.usermap 174
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDao+qT+MN7JbqCpMRAqwiAKCTfmosL4Y1yOB+XfKLonR1ZoMRhwCcD9I+
+JIX51DZHMGERW/skTk+4L7s=
+=aQBT
+-----END PGP SIGNATURE-----
diff --git a/media-sound/usbmidi/usbmidi-1.0.ebuild b/media-sound/usbmidi/usbmidi-1.0.ebuild
index 8ae7b2f0dd05..daabd019e212 100644
--- a/media-sound/usbmidi/usbmidi-1.0.ebuild
+++ b/media-sound/usbmidi/usbmidi-1.0.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/media-sound/usbmidi/usbmidi-1.0.ebuild,v 1.1 2003/05/22 11:30:15 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/usbmidi/usbmidi-1.0.ebuild,v 1.1.1.1 2005/11/30 09:38:06 chriswhite Exp $
 
 DESCRIPTION="Sets up hotplugging support for MidiMan midisport 1x1/2x2 usb devices"
-HOMEPAGE="http:///"
-SRC_URI="http://member.nifty.ne.jp/Breeze/softwares/unix/bin/usbmidi-20030126.tar.gz"
+HOMEPAGE="http://homepage3.nifty.com/StudioBreeze/software/usbmidi-e.html"
+SRC_URI="http://homepage3.nifty.com/StudioBreeze/software/bin/usbmidi-20030126.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 DEPEND=""
 
@@ -18,7 +18,7 @@ RDEPEND="sys-apps/hotplug
 
 S="${WORKDIR}/usbmidi-20030126"
 src_install() {
-	insinto ${D}/usr/share/usb/ezusbmidi
+	insinto /usr/share/usb/ezusbmidi
 	doins ${S}/testing/MidiSport/ezusbmidi*.ihx
 
 	insinto /etc/hotplug/usb
@@ -29,11 +29,11 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo ""
+	einfo
 	einfo "Now the firmware is installed and hotplug has been setup."
 	einfo "Please unplug the midisport, then plug it back in."
 	einfo "The light should start to glow, if that happens its worked."
 	einfo "The midisport ports will appear as 'normal' midi ports under /dev"
-	einfo ""
+	einfo
 }
 
diff --git a/media-sound/vb2rip/ChangeLog b/media-sound/vb2rip/ChangeLog
index dc06bc90d5d9..32609fb45cf1 100644
--- a/media-sound/vb2rip/ChangeLog
+++ b/media-sound/vb2rip/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/vb2rip
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/vb2rip/ChangeLog,v 1.1 2005/03/01 21:33:14 pkdawson Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vb2rip/ChangeLog,v 1.1.1.1 2005/11/30 09:38:22 chriswhite Exp $
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> vb2rip-1.4.ebuild:
+  Added to ~ppc.
 
 *vb2rip-1.4 (01 Mar 2005)
 
diff --git a/media-sound/vb2rip/Manifest b/media-sound/vb2rip/Manifest
index 512a49e3365d..a30e617fb392 100644
--- a/media-sound/vb2rip/Manifest
+++ b/media-sound/vb2rip/Manifest
@@ -1,3 +1,4 @@
-MD5 03c6efdf2b3fb25bccfc49371082004c vb2rip-1.4.ebuild 553
+MD5 7d52057d4411b2bba0bcbde895b8d6fb ChangeLog 444
 MD5 08aa57227627a54ee75b0fb5d484e67d metadata.xml 255
+MD5 46a505e92602c518372d18fe1695f535 vb2rip-1.4.ebuild 655
 MD5 ae5b0d95c00fd3f5d1e3b07390abcd47 files/digest-vb2rip-1.4 56
diff --git a/media-sound/vb2rip/vb2rip-1.4.ebuild b/media-sound/vb2rip/vb2rip-1.4.ebuild
index 565a3578aaf2..ded9ae52b9cd 100644
--- a/media-sound/vb2rip/vb2rip-1.4.ebuild
+++ b/media-sound/vb2rip/vb2rip-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/media-sound/vb2rip/vb2rip-1.4.ebuild,v 1.1 2005/03/01 21:33:14 pkdawson Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vb2rip/vb2rip-1.4.ebuild,v 1.1.1.1 2005/11/30 09:38:22 chriswhite Exp $
 
 inherit versionator
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.neillcorlett.com/vb2rip/${PN}${MY_PV}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/media-sound/ventrilo-server-bin/ChangeLog b/media-sound/ventrilo-server-bin/ChangeLog
index 1c8a281dfe5f..af7ffa0fa690 100644
--- a/media-sound/ventrilo-server-bin/ChangeLog
+++ b/media-sound/ventrilo-server-bin/ChangeLog
@@ -1,6 +1,42 @@
 # ChangeLog for media-sound/ventrilo-server-bin
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ventrilo-server-bin/ChangeLog,v 1.1 2003/12/28 19:48:45 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ventrilo-server-bin/ChangeLog,v 1.1.1.1 2005/11/30 09:38:39 chriswhite Exp $
+
+*ventrilo-server-bin-2.3.1 (19 Nov 2005)
+
+  19 Nov 2005; <chainsaw@gentoo.org> +ventrilo-server-bin-2.3.1.ebuild:
+  Security version bump with stable keywords for denial of service
+  vulnerability, closes bug #111955.
+
+  30 Nov 2004; Sven Wegener <swegener@gentoo.org>
+  ventrilo-server-bin-2.2.0-r1.ebuild, ventrilo-server-bin-2.2.0.ebuild:
+  Fixed invalid atoms in *DEPEND.
+
+  03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ventrilo-server-bin-2.2.0-r1.ebuild:
+  Stable amd64, x86.
+
+*ventrilo-server-bin-2.2.0-r1 (21 Jul 2004)
+
+  21 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/conf.d.ventrilo, +files/init.d.ventrilo,
+  +ventrilo-server-bin-2.2.0-r1.ebuild:
+  Added init script to close bug #52421. Thanks to Donald R. Gray Jr
+  <donaldgray@dslextreme.com> for the initial script.
+
+*ventrilo-server-bin-2.2.0 (09 Jul 2004)
+
+  09 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +ventrilo-server-bin-2.2.0.ebuild:
+  Version bump closes bug #55141.  Added to ~amd64.  Added -*
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ventrilo-server-bin-2.1.2.ebuild:
+  Added IUSE.
+
+  01 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ventrilo-server-bin-2.1.2.ebuild:
+  Stable on x86.
 
 *ventrilo-server-bin-2.1.2 (28 Dec 2003)
 
diff --git a/media-sound/ventrilo-server-bin/Manifest b/media-sound/ventrilo-server-bin/Manifest
index c631308c1350..8be61bf0f388 100644
--- a/media-sound/ventrilo-server-bin/Manifest
+++ b/media-sound/ventrilo-server-bin/Manifest
@@ -1,3 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b7a69142b4e8426cc4dc07924d910b36 ChangeLog 1643
+MD5 5fcc2c24b7e7ab0520b78f61f6534934 files/conf.d.ventrilo 82
 MD5 65abedc9626a604d070d71f3b2da7124 files/digest-ventrilo-server-bin-2.1.2 81
-MD5 88d0949bd385161bc6c3ee94059c15aa ChangeLog 420
-MD5 7eb8d50620d4b71df105aca6817810dd ventrilo-server-bin-2.1.2.ebuild 669
+MD5 96b88d3c1c59db4a79c58a874ec039dc files/digest-ventrilo-server-bin-2.2.0 81
+MD5 96b88d3c1c59db4a79c58a874ec039dc files/digest-ventrilo-server-bin-2.2.0-r1 81
+MD5 3bb21a4353b386866d1fe913e9f6c29f files/digest-ventrilo-server-bin-2.3.1 81
+MD5 75e3ee40d2009f5b7709e6263323d485 files/init.d.ventrilo 600
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 db860e563e934efb51cead14168e90b3 ventrilo-server-bin-2.1.2.ebuild 811
+MD5 a7852bcd7ec855e228025310a05e69b1 ventrilo-server-bin-2.2.0-r1.ebuild 1010
+MD5 6d4ab872c0ae149eecd39051d0e092c4 ventrilo-server-bin-2.2.0.ebuild 873
+MD5 8eaff85f7d67157994d0cf3b0a505995 ventrilo-server-bin-2.3.1.ebuild 1007
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDf21Jp5vW4rUFj5oRAoxmAJ9rmj8oaA+YHVCy7JPIxxvcUeyIiQCfaZTy
+VSESoy3Yyg56kSCZkRYIODg=
+=ehCu
+-----END PGP SIGNATURE-----
diff --git a/media-sound/ventrilo-server-bin/ventrilo-server-bin-2.1.2.ebuild b/media-sound/ventrilo-server-bin/ventrilo-server-bin-2.1.2.ebuild
index c1e4bcb1b40e..4c877b99b6ec 100644
--- a/media-sound/ventrilo-server-bin/ventrilo-server-bin-2.1.2.ebuild
+++ b/media-sound/ventrilo-server-bin/ventrilo-server-bin-2.1.2.ebuild
@@ -1,13 +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/media-sound/ventrilo-server-bin/ventrilo-server-bin-2.1.2.ebuild,v 1.1.1.1 2005/11/30 09:38:39 chriswhite Exp $
 
+IUSE=""
 DESCRIPTION="The Ventrilo Voice Communication Server"
 HOMEPAGE="http://www.ventrilo.com/"
 SRC_URI="ventrilo_srv-2.1.2-Linux-i386.tar.gz"
 
 LICENSE="ventrilo"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 RESTRICT="fetch"
 
 S=${WORKDIR}
diff --git a/media-sound/ventrilo-server-bin/ventrilo-server-bin-2.2.0-r1.ebuild b/media-sound/ventrilo-server-bin/ventrilo-server-bin-2.2.0-r1.ebuild
index 72b45ed4acf9..cb8f38019986 100644
--- a/media-sound/ventrilo-server-bin/ventrilo-server-bin-2.2.0-r1.ebuild
+++ b/media-sound/ventrilo-server-bin/ventrilo-server-bin-2.2.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/media-sound/ventrilo-server-bin/ventrilo-server-bin-2.2.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:39 chriswhite Exp $
 
 IUSE=""
 DESCRIPTION="The Ventrilo Voice Communication Server"
@@ -9,12 +9,12 @@ SRC_URI="ventrilo_srv-${PV}-Linux-i386.tar.gz"
 
 LICENSE="ventrilo"
 SLOT="0"
-KEYWORDS="-* ~x86 ~amd64"
+KEYWORDS="-* x86 amd64"
 RESTRICT="fetch"
 
 S=${WORKDIR}
 
-DEPEND="amd64? ( emul-linux-x86-baselibs )"
+DEPEND="amd64? ( app-emulation/emul-linux-x86-baselibs )"
 
 pkg_nofetch() {
 	einfo "Please visit http://www.ventrilo.com/download.php"
diff --git a/media-sound/ventrilo-server-bin/ventrilo-server-bin-2.2.0.ebuild b/media-sound/ventrilo-server-bin/ventrilo-server-bin-2.2.0.ebuild
index 47d5dd05d711..9a5208e4b9f4 100644
--- a/media-sound/ventrilo-server-bin/ventrilo-server-bin-2.2.0.ebuild
+++ b/media-sound/ventrilo-server-bin/ventrilo-server-bin-2.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/media-sound/ventrilo-server-bin/ventrilo-server-bin-2.2.0.ebuild,v 1.1.1.1 2005/11/30 09:38:39 chriswhite Exp $
 
 IUSE=""
 DESCRIPTION="The Ventrilo Voice Communication Server"
@@ -14,7 +14,7 @@ RESTRICT="fetch"
 
 S=${WORKDIR}
 
-DEPEND="amd64? ( emul-linux-x86-baselibs )"
+DEPEND="amd64? ( app-emulation/emul-linux-x86-baselibs )"
 
 pkg_nofetch() {
 	einfo "Please visit http://www.ventrilo.com/download.php"
diff --git a/media-sound/ventrilo-server-bin/ventrilo-server-bin-2.3.1.ebuild b/media-sound/ventrilo-server-bin/ventrilo-server-bin-2.3.1.ebuild
index 0352fc891f97..72cb79473bf6 100644
--- a/media-sound/ventrilo-server-bin/ventrilo-server-bin-2.3.1.ebuild
+++ b/media-sound/ventrilo-server-bin/ventrilo-server-bin-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/media-sound/ventrilo-server-bin/ventrilo-server-bin-2.3.1.ebuild,v 1.1 2005/11/19 18:20:08 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ventrilo-server-bin/ventrilo-server-bin-2.3.1.ebuild,v 1.1.1.1 2005/11/30 09:38:39 chriswhite Exp $
 
 IUSE=""
 DESCRIPTION="The Ventrilo Voice Communication Server"
diff --git a/media-sound/vkeybd/ChangeLog b/media-sound/vkeybd/ChangeLog
index afa1362a8d39..f2f9aa9a05ce 100644
--- a/media-sound/vkeybd/ChangeLog
+++ b/media-sound/vkeybd/ChangeLog
@@ -1,8 +1,76 @@
 # ChangeLog for media-sound/vkeybd
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/vkeybd/ChangeLog,v 1.1 2002/12/21 05:17:05 agenkin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vkeybd/ChangeLog,v 1.1.1.1 2005/11/30 09:38:19 chriswhite Exp $
+
+  17 Aug 2005; Frank van de Pol <fvdpol@gentoo.org> vkeybd-0.1.15-r1.ebuild:
+  fixed faulty behaviour for USE="-ladcca". Closes bug 101633.
+
+*vkeybd-0.1.15-r1 (18 Jul 2005)
+
+  18 Jul 2005; Frank van de Pol <fvdpol@gentoo.org> +vkeybd-0.1.15-r1.ebuild:
+  Fixed compilation problem when use=ladcca. Closes bug #99445, #85914.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  vkeybd-0.1.15.ebuild:
+  Added to ~sparc.
+
+  08 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/vkeybd-0.1.12-Makefile.destdir.patch,
+  -files/vkeybd-0.1.12-Makefile.passvariables.patch,
+  -files/vkeybd-0.1.13-Makefile.passvariables.patch,
+  -files/vkeybd-0.1.13-alsa-fix.patch,
+  -files/vkeybd-0.1.13-vkb.c-ladcca.patch, -vkeybd-0.1.12.ebuild,
+  -vkeybd-0.1.13-r1.ebuild:
+  Removing old versions.  Fixed tclsh in global context.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> vkeybd-0.1.15.ebuild:
+  Stable amd64.
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org> vkeybd-0.1.12.ebuild:
+  Fix use invocation
+
+  24 Apr 2004; Danny van Dyk <kugelfang@gentoo.org> vkeybd-0.1.15.ebuild:
+  marked ~amd64.
+
+  01 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  vkeybd-0.1.13-r1.ebuild, vkeybd-0.1.15.ebuild:
+  inherit eutils.  Stable on x86.
+
+  01 Feb 2004; Brian Harring <ferringb@gentoo.org> vkeybd-0.1.12.ebuild,
+  vkeybd-0.1.13-r1.ebuild, vkeybd-0.1.15.ebuild, 
+  files/vkeybd-0.1.13-alsa-fix.patch:
+  Closing bugs 23468 and 39119.  Adjusted copyright headers to 2004.
+
+*vkeybd-0.1.15 (20 Dec 2003)
+
+  20 Dec 2003; Martin Holzer <mholzer@gentoo.org> vkeybd-0.1.15.ebuild:
+  Version bumped. Closes 35923
+
+*vkeybd-0.1.13-r1 (18 May 2003)
+ 
+  12 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
+  18 May 2003; Torben Hohn <torbenh@gentoo.org> vkeybd-0.1.13.ebuild,
+  vkeybd-0.1.13.ebuild:
+  media-libs/ladcca-0.1 is gone. build against >=media-libs/ladcca-0.3.1
+  and therefor apply the patch.
+  files/vkeybd-0.1.13-vkb.c-ladcca.patch: fixes the new cca_init signature.
+
+*vkeybd-0.1.13 (22 Apr 2003)
+
+  24 Apr 2003; Stanislav Brabec <utx@gentoo.org> vkeybd-0.1.13.ebuild:
+  Limit ladcca support to media-libs/ladcca-0.1. Simplified ebuild.
+
+  22 Apr 2003; Stanislav Brabec <utx@gentoo.org> vkeybd-0.1.13.ebuild,
+  files/vkeybd-0.1.13-Makefile.passvariables.patch:
+  Updated to version 0.1.13, fixed bug #19557.
 
 *vkeybd-0.1.12 (20 Dec 2002)
 
+  25 Dec 2002; Arcady Genkin <agenkin@gentoo.org> :
+  Ebuild improvements from Rene Wagner <reenoo@gmx.de>.  Now really
+  closes #12217 ;^).
+
   20 Dec 2002; Arcady Genkin <agenkin@gentoo.org> :
-  Initial version by Rene Wagner <reenoo@gmx.de>.  Closes #12198.
+  Initial version by Rene Wagner <reenoo@gmx.de>.  Closes #12217.
diff --git a/media-sound/vkeybd/Manifest b/media-sound/vkeybd/Manifest
index b419bbfb176a..0e541adac48b 100644
--- a/media-sound/vkeybd/Manifest
+++ b/media-sound/vkeybd/Manifest
@@ -1,9 +1,16 @@
-MD5 2161d0543c6a65f1a39d7c701d88d0e9 ChangeLog 1122
-MD5 2e111e8e55609771e18924e28931c2e5 vkeybd-0.1.12.ebuild 1298
-MD5 c7adaa8fe3b3e023b15bdc57a2ede171 vkeybd-0.1.13-r1.ebuild 1366
-MD5 ff865aa6f311fa78914478083e85fb4b files/digest-vkeybd-0.1.12 64
-MD5 50662097f6756de017137af3c19d182b files/vkeybd-0.1.12-Makefile.destdir.patch 1020
-MD5 2c8d3d650a7f17d0365b3aca73cc0d16 files/vkeybd-0.1.12-Makefile.passvariables.patch 588
-MD5 eca9134ac4275c528a1a0f6bebb539d1 files/vkeybd-0.1.13-Makefile.passvariables.patch 736
-MD5 e39e9a9305c2368d63fac498f1414030 files/vkeybd-0.1.13-vkb.c-ladcca.patch 377
-MD5 76ce852aa4d8139f0c0ea297ba4df6f1 files/digest-vkeybd-0.1.13-r1 64
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 bd983b4dfe092d38445188d998fb3255 vkeybd-0.1.15-r1.ebuild 1414
+MD5 d5784df308267ee90950c4530b5d2831 ChangeLog 2850
+MD5 d0d7ea03e238a808414b4426394c100f metadata.xml 221
+MD5 9ff8681f2ec234423ce5982faeef3e52 vkeybd-0.1.15.ebuild 1298
+MD5 630f53e424226727789b4d73f97fa165 files/digest-vkeybd-0.1.15 64
+MD5 630f53e424226727789b4d73f97fa165 files/digest-vkeybd-0.1.15-r1 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDA7FXvpz1081QvMkRArDhAJ9MKhb793r2tlUmT7f7MvUlIbqMGgCeIuxo
+ua8TnNpcr3lZd3v8eL5SYZw=
+=A/BH
+-----END PGP SIGNATURE-----
diff --git a/media-sound/vkeybd/vkeybd-0.1.15-r1.ebuild b/media-sound/vkeybd/vkeybd-0.1.15-r1.ebuild
index 85518eea014e..5ede00d69993 100644
--- a/media-sound/vkeybd/vkeybd-0.1.15-r1.ebuild
+++ b/media-sound/vkeybd/vkeybd-0.1.15-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/media-sound/vkeybd/vkeybd-0.1.15-r1.ebuild,v 1.1 2005/07/18 17:58:19 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vkeybd/vkeybd-0.1.15-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:19 chriswhite Exp $
 
 IUSE="alsa oss ladcca"
 
@@ -32,10 +32,12 @@ src_compile() {
 	else
 		myconf="${myconf} USE_ALSA=0 USE_AWE=1 USE_MIDI=1"
 	fi
-	use ladcca && myconf="${myconf} USE_LADCCA=1"
 
-	use ladcca && sed -i "s/USE_LADCCA *=.*$/USE_LADCCA = 1/" ${S}/Makefile || \
-		die "Error altering Makefile"
+	if use ladcca ; then
+		myconf="${myconf} USE_LADCCA=1"
+		sed -i "s/USE_LADCCA *=.*$/USE_LADCCA = 1/" ${S}/Makefile || \
+			die "Error altering Makefile"
+	fi
 
 	make ${myconf} TCL_VERSION=$TCL_VERSION || die "Make failed."
 }
diff --git a/media-sound/vkeybd/vkeybd-0.1.15.ebuild b/media-sound/vkeybd/vkeybd-0.1.15.ebuild
index 100b14e69d0b..26bbf7ea3c78 100644
--- a/media-sound/vkeybd/vkeybd-0.1.15.ebuild
+++ b/media-sound/vkeybd/vkeybd-0.1.15.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/media-sound/vkeybd/vkeybd-0.1.15.ebuild,v 1.1 2003/12/20 17:42:57 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vkeybd/vkeybd-0.1.15.ebuild,v 1.1.1.1 2005/11/30 09:38:19 chriswhite Exp $
+
+IUSE="alsa oss ladcca"
 
 DESCRIPTION="A virtual MIDI keyboard for X"
 HOMEPAGE="http://www.alsa-project.org/~iwai/alsa.html"
@@ -8,8 +10,7 @@ SRC_URI="http://www.alsa-project.org/~iwai/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE="alsa oss ladcca"
+KEYWORDS="amd64 ~sparc x86"
 
 DEPEND="alsa? ( >=media-libs/alsa-lib-0.5.0 )
 	>=dev-lang/tk-8.3
@@ -18,9 +19,10 @@ DEPEND="alsa? ( >=media-libs/alsa-lib-0.5.0 )
 	ladcca? ( >=media-libs/ladcca-0.3.1 )"
 
 S=${WORKDIR}/${PN}
-TCL_VERSION=`awk -F\' '/TCL_VERSION/ {print $2}' /usr/lib/tclConfig.sh`
 
 src_compile() {
+	TCL_VERSION=`echo 'puts [info tclversion]' | tclsh`
+
 	local myconf="PREFIX=/usr"
 
 	#vkeybd requires at least one of its USE_ variable to be set
@@ -36,8 +38,9 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} PREFIX=/usr install || die "Installation Failed"
-	make DESTDIR=${D} PREFIX=/usr install-man || die \
-					    "Man-Page Installation Failed"
+	make DESTDIR=${D} TCL_VERSION=$TCL_VERSION PREFIX=/usr install || \
+		die "Installation Failed"
+	make DESTDIR=${D} TCL_VERSION=$TCL_VERSION PREFIX=/usr install-man || \
+		die "Man-Page Installation Failed"
 	dodoc README
 }
diff --git a/media-sound/vlevel/ChangeLog b/media-sound/vlevel/ChangeLog
index 6d92cfafae6a..460bc6c3db09 100644
--- a/media-sound/vlevel/ChangeLog
+++ b/media-sound/vlevel/ChangeLog
@@ -1,5 +1,21 @@
 # ChangeLog for media-sound/vlevel
-# Copyright 2004 Gentoo Technologies, Inc.; Distributed under the GPL
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vlevel/ChangeLog,v 1.1.1.1 2005/11/30 09:38:25 chriswhite Exp $
+
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> vlevel-0.5.ebuild:
+  Don't install COPYING and INSTALL files.
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> vlevel-0.5.ebuild:
+  Added to ~ppc.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> vlevel-0.5.ebuild:
+  Added to ~sparc.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> vlevel-0.5.ebuild:
+  Stable amd64, x86.
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> vlevel-0.5.ebuild:
+  get_libdir fixes.  Added to ~amd64.
 
 *vlevel-0.5 (06 Oct 2004)
 
diff --git a/media-sound/vlevel/Manifest b/media-sound/vlevel/Manifest
index 868521a8093f..c1557b2a50be 100644
--- a/media-sound/vlevel/Manifest
+++ b/media-sound/vlevel/Manifest
@@ -1,2 +1,14 @@
-MD5 59648900b450955e3400226249482677 vlevel-0.5.ebuild 944
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0bfc7733343dc6cc88a8d5bb281981ea ChangeLog 922
+MD5 d129080b4cb228e19687018a6ca62dcc vlevel-0.5.ebuild 1164
+MD5 ae2f0ce6b633cd6e8ea199bdabb85098 metadata.xml 227
 MD5 2ec3b61ac0b50069246194e8cb3254c3 files/digest-vlevel-0.5 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGs7cj5H05b2HAEkRAk9TAJ9CNUOBWVPi9LIRgdN2EF32/GKbxwCdGCsI
+K2aEJ1RO9OKW8Cpc5c2R/VU=
+=ZM67
+-----END PGP SIGNATURE-----
diff --git a/media-sound/vlevel/vlevel-0.5.ebuild b/media-sound/vlevel/vlevel-0.5.ebuild
index cd2bb9888e84..2042ea2e5de5 100644
--- a/media-sound/vlevel/vlevel-0.5.ebuild
+++ b/media-sound/vlevel/vlevel-0.5.ebuild
@@ -1,6 +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/media-sound/vlevel/vlevel-0.5.ebuild,v 1.1 2004/10/06 14:38:38 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vlevel/vlevel-0.5.ebuild,v 1.1.1.1 2005/11/30 09:38:25 chriswhite Exp $
+
+IUSE=""
+
+inherit eutils
 
 DESCRIPTION="VLevel is a dynamic compressor which amplifies the quiet parts of music. It's currently a LADSPA plugin and a command-line filter."
 HOMEPAGE="http://vlevel.sourceforge.net/"
@@ -9,10 +13,11 @@ SRC_URI="mirror://sourceforge/vlevel/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~x86"
-IUSE=""
+KEYWORDS="amd64 ~ppc ~sparc x86"
 
-DEPEND="media-libs/ladspa-sdk"
+RDEPEND="media-libs/ladspa-sdk"
+DEPEND="${RDEPEND}
+	app-arch/gzip"
 
 src_compile() {
 	emake CXXFLAGS="$CXXFLAGS -fPIC -DPIC" || die "emake failed"
@@ -20,11 +25,18 @@ src_compile() {
 
 src_install() {
 	dodir "/usr/bin" || die
-	einstall PREFIX="${D}/usr/bin/" LADSPA_PREFIX="${D}/usr/lib/ladspa/" || die
-	dodoc COPYING INSTALL README TODO docs/notes.txt docs/technical.txt || die
+
+	einstall PREFIX="${D}/usr/bin/" LADSPA_PREFIX="${D}/usr/$(get_libdir)/ladspa/" || die
+
+	dodoc README TODO docs/notes.txt docs/technical.txt || die
+
 	dodir "/usr/share/doc/${P}/examples" || die
 	cp utils/* "${D}/usr/share/doc/${P}/examples/" || die
-	chmod 644 "${D}/usr/share/doc/${P}/examples/"* || die
+
+	for file in levelplay raw2wav vlevel-dir README; do
+		fperms 644 /usr/share/doc/${P}/examples/${file} || die
+	done
+
 	gzip -9 "${D}/usr/share/doc/${P}/examples/README" || die
 }
 
diff --git a/media-sound/vlorb/ChangeLog b/media-sound/vlorb/ChangeLog
index c0ded677ea71..ecbfcc19ec2b 100644
--- a/media-sound/vlorb/ChangeLog
+++ b/media-sound/vlorb/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for media-sound/vlorb
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/vlorb/ChangeLog,v 1.1 2004/09/22 08:50:25 eradicator Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vlorb/ChangeLog,v 1.1.1.1 2005/11/30 09:37:49 chriswhite Exp $
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> vlorb-1.2.ebuild:
+  Stable on ppc.
+
+  28 May 2005; Jan Brinkmann <luckyduck@gentoo.org> vlorb-1.2.ebuild:
+  Dont make use of the deprecated oggvorbis useflag any longer, see #94254.
+  Marked stable on amd64.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> vlorb-1.2.ebuild:
+  Stable amd64, sparc, x86.
+
+  18 Oct 2004; David Holm <dholm@gentoo.org> vlorb-1.2.ebuild:
+  Added to ~ppc.
 
 *vlorb-1.2 (22 Sep 2004)
 
diff --git a/media-sound/vlorb/Manifest b/media-sound/vlorb/Manifest
index 216ca7cc5722..c5869cebe4b2 100644
--- a/media-sound/vlorb/Manifest
+++ b/media-sound/vlorb/Manifest
@@ -1,3 +1,4 @@
-MD5 1e3c9e80dac15667e3fe67849022b558 vlorb-1.2.ebuild 530
-MD5 74e9a52733a076924a9024a53e8ccdfe README 121
+MD5 3dc0553e5b50dc9a3cb3df3dbd288f3c vlorb-1.2.ebuild 682
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 8ab4f29b3e97152a52627b33d6628510 ChangeLog 906
 MD5 95f864aa97c049e9c6f8e66a8ba32272 files/digest-vlorb-1.2 60
diff --git a/media-sound/vlorb/vlorb-1.2.ebuild b/media-sound/vlorb/vlorb-1.2.ebuild
index 41d342e68062..d990eb7051bb 100644
--- a/media-sound/vlorb/vlorb-1.2.ebuild
+++ b/media-sound/vlorb/vlorb-1.2.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/vlorb/vlorb-1.2.ebuild,v 1.1 2004/09/22 08:50:25 eradicator Exp $
-
-IUSE="oggvorbis"
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vlorb/vlorb-1.2.ebuild,v 1.1.1.1 2005/11/30 09:37:49 chriswhite Exp $
 
 DESCRIPTION="a high quality Audio CD to audio file encoder"
 HOMEPAGE="http://jk.yazzy.org/projects/vlorb/"
 SRC_URI="http://jk.yazzy.org/projects/vlorb/releases/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~amd64"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE="ogg"
 
 DEPEND=">=media-sound/cdparanoia-3.9.8
 	>=dev-perl/CDDB-1.12
-	oggvorbis? ( >=media-sound/vorbis-tools-1.0.1 )"
+	ogg? ( >=media-sound/vorbis-tools-1.0.1 )"
 
 src_compile() {
 	einfo "Nothing to compile"
diff --git a/media-sound/vorbis-tools/ChangeLog b/media-sound/vorbis-tools/ChangeLog
index a7d8a13ac502..5ef26f2ed35d 100644
--- a/media-sound/vorbis-tools/ChangeLog
+++ b/media-sound/vorbis-tools/ChangeLog
@@ -1,6 +1,129 @@
 # ChangeLog for media-sound/vorbis-tools
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/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/media-sound/vorbis-tools/ChangeLog,v 1.1.1.1 2005/11/30 09:38:16 chriswhite Exp $
+
+*vorbis-tools-1.1.1-r1 (07 Oct 2005)
+
+  07 Oct 2005; MATSUU Takuto <matsuu@gentoo.org>
+  +vorbis-tools-1.1.1-r1.ebuild:
+  Fixed speex problem. Bug 97316.
+  Cleanup ebuild.
+
+  06 Oct 2005; MATSUU Takuto <matsuu@gentoo.org> vorbis-tools-1.0-r2.ebuild,
+  vorbis-tools-1.0.1.ebuild, vorbis-tools-1.0.1-r1.ebuild,
+  vorbis-tools-1.1.1.ebuild:
+  Fixed HOMEPAGE. Bug 108274.
+
+*vorbis-tools-1.1.1 (16 Sep 2005)
+
+  16 Sep 2005; Brandon Low <lostlogic@gentoo.org>
+  +vorbis-tools-1.1.1.ebuild:
+  Bump up to the latest release, new SRC_URI, drop a patch that doesn't appear
+  to be relevant any more (LARGEFILE) is that needed?
+
+*vorbis-tools-1.0.1-r1 (25 Aug 2005)
+
+  25 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/vorbis-tools-1.0.1-largefile.patch, +vorbis-tools-1.0.1-r1.ebuild:
+  Added patch to enable largefile support. Cleanup of econf call, dropped mips
+  keyword until speex is sorted.
+
+  15 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  vorbis-tools-1.0.1.ebuild:
+  Moved to use toolchain-functs eclass.
+
+  07 Apr 2005; Aron Griffis <agriffis@gentoo.org> vorbis-tools-1.0.1.ebuild:
+  stable on ia64
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  12 Nov 2004; Kito <kito@gentoo.org> vorbis-tools-1.0.1.ebuild:
+  added ~ppc-macos. closes bug #58713
+
+  22 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> vorbis-tools-1.0.1.ebuild:
+  Stable on alpha.
+
+  29 Jul 2004; Tom Gall <tgall@gentoo.org> vorbis-tools-1.0.1.ebuild:
+  stable on ppc64, bug #55339
+
+  22 Jun 2004; <malc@gentoo.org> vorbis-tools-1.0.1.ebuild:
+  Mark stable on amd64
+
+  14 May 2004; Stephen P. Becker <geoman@gentoo.org>
+  vorbis-tools-1.0.1.ebuild:
+  Stable on mips.
+
+  03 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  vorbis-tools-1.0.1.ebuild:
+  --with-flac is not supported. It is assumed by default, and doing --with-flac
+  causes --without-flac to be assumed. See bug #49763
+
+  29 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  vorbis-tools-1.0.1.ebuild:
+  USE=speex support.  Closes bug #48949.
+
+  16 Apr 2004; Guy Martin <gmsoft@gentoo.org> vorbis-tools-1.0.1.ebuild:
+  Marked stable on hppa.
+
+  01 Apr 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  vorbis-tools-1.0.1.ebuild:
+  stable on sparc
+
+  01 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  vorbis-tools-1.0.1.ebuild:
+  Stable on x86.
+
+  15 Mar 2004; Stephen P. Becker <geoman@gentoo.org>
+  vorbis-tools-1.0.1.ebuild:
+  Added ~mips keyword.
+
+  21 Jan 2004; Nick Hadaway <raker@gentoo.org> vorbis-tools-1.0.1.ebuild:
+  Added the flac use variable.  This addresses bug #37802.
+
+*vorbis-tools-1.0.1 (22 Nov 2003)
+
+  22 Nov 2003; Brandon Low <lostlogic@gentoo.org> vorbis-tools-1.0.1.ebuild:
+  Bump
+
+*vorbis-tools-1.0-r2 (17 Nov 2003)
+
+  17 Nov 2003; <spider@gentoo.org> vorbis-tools-1.0-r2.ebuild:
+  Fixed broken DEPEND/RDEPEND behaviour
+
+  14 Nov 2003; Aron Griffis <agriffis@gentoo.org> vorbis-tools-1.0-r1.ebuild:
+  Stable on ia64
+
+  15 Jul 2003; Todd Sunderlin <todd@gentoo.org> vorbis-tools-1.0-r1.ebuild:
+  Marked stable for sparc
+
+  03 Feb 2003 Aron Griffis <agriffis@gentoo.org> vorbis-tools-1.0-r1.ebuild :
+  stable on alpha
+
+  07 Dec 2002 Spider <spider@gentoo.org> vorbis-tools-1.0-r1.ebuild :
+  added an explicit depend on libogg, since users who remove it, keep libvorbis then claim that vorbis-tools are broken because they dont depend on libogg.
+
+  
+  17 Dec 2002; Aron Griffis <agriffis@gentoo.org> vorbis-tools-1.0-r1.ebuild :
+  Added ~alpha to KEYWORDS
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*vorbis-tools-1.0-r1 (19 Jul 2002)
+
+  04 Jul 2003; Guy Martin <gmsoft@gentoo.org> vorbis-tools-1.0-r1.ebuild :
+  Added hppa to KEYWORDS.
+
+  19 JUl 2002; Seemant Kulleen <seemant@gentoo.org>
+  vorbis-tools-1.0-r1.ebuild files/digest-vorbis-tools-1.0-r1 :
+
+  NLS bloat reduction.
+
+*vorbis-tools-1.0 (19 Jul 2002)
+
+  19 Jul 2002; Brandon Low <lostlogic@gentoo.org> vorbis-tools-1.0.ebuild :
+
+  Repoman fixes, 1.0, and clean up old versions.
 
 *vorbis-tools-1.0_rc3 (1 Feb 2002)
 
diff --git a/media-sound/vorbis-tools/Manifest b/media-sound/vorbis-tools/Manifest
index e69de29bb2d1..94999b247b12 100644
--- a/media-sound/vorbis-tools/Manifest
+++ b/media-sound/vorbis-tools/Manifest
@@ -0,0 +1,13 @@
+MD5 1d1e99776588d7a4c2d006ded8dec7d4 vorbis-tools-1.1.1.ebuild 1347
+MD5 a73db00f1c3bc8ab60df4554fd605bfa vorbis-tools-1.0-r2.ebuild 871
+MD5 b6ec8c81a83937fa8b02b1faf9295fec vorbis-tools-1.0.1-r1.ebuild 1390
+MD5 fc4dd983169635156724e2383d3dfc1d vorbis-tools-1.1.1-r1.ebuild 1304
+MD5 a35ae258cf35c9e2362031ceb36def90 ChangeLog 4708
+MD5 08f7faecc3e956ee8567026b16977ce3 vorbis-tools-1.0.1.ebuild 1300
+MD5 527dcfe3ce0f0b53c6b6aa8b82eb930c metadata.xml 252
+MD5 fe964c53d3bcfcd7ddece26fa6ea9a3e files/digest-vorbis-tools-1.0.1 70
+MD5 c6c7f9c0dab0b7b1372a866773587178 files/digest-vorbis-tools-1.1.1 70
+MD5 bc135048b370b69a479ec79194774283 files/vorbis-tools-1.0.1-largefile.patch 458
+MD5 59ac94a6db4621c0ebd90d8b8fe8d9c0 files/digest-vorbis-tools-1.0-r2 68
+MD5 fe964c53d3bcfcd7ddece26fa6ea9a3e files/digest-vorbis-tools-1.0.1-r1 70
+MD5 c6c7f9c0dab0b7b1372a866773587178 files/digest-vorbis-tools-1.1.1-r1 70
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.0-r2.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.0-r2.ebuild
index 2ad2108afaac..93f2d2af2e4b 100644
--- a/media-sound/vorbis-tools/vorbis-tools-1.0-r2.ebuild
+++ b/media-sound/vorbis-tools/vorbis-tools-1.0-r2.ebuild
@@ -1,32 +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/media-sound/vorbis-tools/vorbis-tools-1.0-r2.ebuild,v 1.1 2003/11/17 00:20:08 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/vorbis-tools-1.0-r2.ebuild,v 1.1.1.1 2005/11/30 09:38:16 chriswhite Exp $
 
-IUSE="nls"
-
-S=${WORKDIR}/${P}
 DESCRIPTION="tools for using the Ogg Vorbis sound file format"
+HOMEPAGE="http://www.vorbis.com/"
 SRC_URI="http://fatpipe.vorbis.com/files/1.0/unix/vorbis-tools-1.0.tar.gz"
-HOMEPAGE="http://www.xiph.org/ogg/vorbis/index.html"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc sparc x86"
+IUSE="nls"
 
 RDEPEND=">=media-libs/libvorbis-${PV}
 	>=media-libs/libogg-${PV}
 	>=media-libs/libao-0.8.2
-	>=net-ftp/curl-7.9"
-
+	>=net-misc/curl-7.9"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64"
-LICENSE="as-is"
-
 src_compile() {
-
-	local myconf
-	use nls || myconf="${myconf} --disable-nls"
-
-	econf ${myconf} || die
+	econf `use_enable nls` || die
 	emake || die
 }
 
@@ -34,8 +27,7 @@ src_install () {
 	make DESTDIR=${D} install || die
 
 	rm -rf ${D}/usr/share/doc
-	dodoc AUTHORS COPYING README
+	dodoc AUTHORS README
 	docinto ogg123
 	dodoc ogg123/ogg123rc-example
 }
-
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.0.1-r1.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.0.1-r1.ebuild
index 44f00e7b56e3..61eacfbf2bf6 100644
--- a/media-sound/vorbis-tools/vorbis-tools-1.0.1-r1.ebuild
+++ b/media-sound/vorbis-tools/vorbis-tools-1.0.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/media-sound/vorbis-tools/vorbis-tools-1.0.1-r1.ebuild,v 1.1 2005/08/25 14:05:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/vorbis-tools-1.0.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:16 chriswhite Exp $
 
 IUSE="nls flac speex"
 
 inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="tools for using the Ogg Vorbis sound file format"
-HOMEPAGE="http://www.xiph.org/ogg/vorbis/index.html"
+HOMEPAGE="http://www.vorbis.com/"
 SRC_URI="http://www.vorbis.com/files/${PV}/unix/${P}.tar.gz"
 
 LICENSE="as-is"
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.0.1.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.0.1.ebuild
index 4c4ffe9dd8d2..0f52d693b23b 100644
--- a/media-sound/vorbis-tools/vorbis-tools-1.0.1.ebuild
+++ b/media-sound/vorbis-tools/vorbis-tools-1.0.1.ebuild
@@ -1,40 +1,49 @@
-# 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/media-sound/vorbis-tools/vorbis-tools-1.0.1.ebuild,v 1.1 2003/11/22 19:13:41 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/vorbis-tools-1.0.1.ebuild,v 1.1.1.1 2005/11/30 09:38:17 chriswhite Exp $
 
-IUSE="nls"
+IUSE="nls flac speex"
+
+inherit toolchain-funcs flag-o-matic
 
-S=${WORKDIR}/${P}
 DESCRIPTION="tools for using the Ogg Vorbis sound file format"
+HOMEPAGE="http://www.vorbis.com/"
 SRC_URI="http://www.vorbis.com/files/${PV}/unix/${P}.tar.gz"
-HOMEPAGE="http://www.xiph.org/ogg/vorbis/index.html"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ~ppc-macos ppc64 sparc x86"
 
 RDEPEND=">=media-libs/libvorbis-1.0
 	>=media-libs/libao-0.8.2
-	>=net-ftp/curl-7.9"
+	>=net-misc/curl-7.9
+	!mips? ( speex? ( media-libs/speex ) )
+	flac? ( media-libs/flac )"
 
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
-LICENSE="as-is"
-
 src_compile() {
-
+	use hppa && [ "`gcc-fullversion`" == "3.3.2" ] && replace-flags -march=2.0 -march=1.0
+	use ppc-macos && use speex && append-flags -I/usr/include/speex
 	local myconf
-	use nls || myconf="${myconf} --disable-nls"
 
-	econf ${myconf} || die
+	# --with-flac is not supported.  See bug #49763
+	use flac || myconf="${myconf} --without-flac"
+
+	econf \
+		`if ! use mips; then use_with speex; fi` \
+		`use_enable nls` \
+		${myconf} \
+		|| die
 	emake || die
 }
 
-src_install () {
-	make DESTDIR=${D} install || die
+src_install() {
+	make DESTDIR="${D}" install || die
 
 	rm -rf ${D}/usr/share/doc
-	dodoc AUTHORS COPYING README
+	dodoc AUTHORS README
 	docinto ogg123
 	dodoc ogg123/ogg123rc-example
 }
-
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.1.1-r1.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.1.1-r1.ebuild
index ca96ee5a54ba..f864e654b9e3 100644
--- a/media-sound/vorbis-tools/vorbis-tools-1.1.1-r1.ebuild
+++ b/media-sound/vorbis-tools/vorbis-tools-1.1.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/media-sound/vorbis-tools/vorbis-tools-1.1.1-r1.ebuild,v 1.1 2005/10/07 22:47:16 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/vorbis-tools-1.1.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:16 chriswhite Exp $
 
 IUSE="nls flac speex"
 
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.1.1.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.1.1.ebuild
index 339aee39959f..7f398478b363 100644
--- a/media-sound/vorbis-tools/vorbis-tools-1.1.1.ebuild
+++ b/media-sound/vorbis-tools/vorbis-tools-1.1.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/media-sound/vorbis-tools/vorbis-tools-1.1.1.ebuild,v 1.1 2005/09/16 01:30:12 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/vorbis-tools-1.1.1.ebuild,v 1.1.1.1 2005/11/30 09:38:16 chriswhite Exp $
 
 IUSE="nls flac speex"
 
 inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="tools for using the Ogg Vorbis sound file format"
-HOMEPAGE="http://www.xiph.org/ogg/vorbis/index.html"
+HOMEPAGE="http://www.vorbis.com/"
 SRC_URI="http://downloads.xiph.org/releases/vorbis/$P.tar.gz"
 
 LICENSE="as-is"
diff --git a/media-sound/vorbisgain/ChangeLog b/media-sound/vorbisgain/ChangeLog
index 1d549b650e46..b39a81511689 100644
--- a/media-sound/vorbisgain/ChangeLog
+++ b/media-sound/vorbisgain/ChangeLog
@@ -1,6 +1,75 @@
 # ChangeLog for media-sound/vorbisgain
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbisgain/ChangeLog,v 1.1 2003/03/02 07:05:28 jje Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbisgain/ChangeLog,v 1.1.1.1 2005/11/30 09:38:29 chriswhite Exp $
+
+  03 Sep 2005; Markus Rothe <corsair@gentoo.org> vorbisgain-0.36.ebuild:
+  Stable on ppc64
+
+  28 Aug 2005; Simon Stelling <blubb@gentoo.org> vorbisgain-0.36.ebuild:
+  stable on amd64
+
+  24 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  vorbisgain-0.36.ebuild:
+  Stable on sparc
+
+  23 Aug 2005; Tony Vroon <chainsaw@gentoo.org> vorbisgain-0.36.ebuild:
+  0.36 stable on x86.
+
+*vorbisgain-0.36 (21 May 2005)
+
+  21 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -files/vorbisgain-0.32-48k.patch, -vorbisgain-0.32.ebuild,
+  -vorbisgain-0.32-r1.ebuild, vorbisgain-0.34-r1.ebuild,
+  +vorbisgain-0.36.ebuild:
+  new upstream version. corrected HOMEPAGE, fixes #93347
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  vorbisgain-0.34-r1.ebuild:
+  Stable sparc.
+
+  17 Aug 2004; Tom Gall <tgall@gentoo.org> vorbisgain-0.32-r1.ebuild:
+  stable on ppc64, bug #58314
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> vorbisgain-0.32-r1.ebuild,
+  vorbisgain-0.32.ebuild, vorbisgain-0.34-r1.ebuild:
+  Typo in DESCRIPTION: percieved -> perceived. Bug 59717.
+
+  10 May 2004; David Holm <dholm@gentoo.org> vorbisgain-0.34-r1.ebuild:
+  Added to ~ppc.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> vorbisgain-0.32-r1.ebuild:
+  Add inherit eutils
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  vorbisgain-0.32-r1.ebuild, vorbisgain-0.32.ebuild,
+  vorbisgain-0.34-r1.ebuild:
+  Added IUSE.
+
+  29 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  vorbisgain-0.34-r1.ebuild:
+  keyworded ~sparc
+
+  18 Mar 2004; Dylan Carlson <absinthe@gentoo.org> vorbisgain-0.34-r1.ebuild:
+  Added amd64 to KEYWORDS.
+
+*vorbisgain-0.34-r1 (15 Feb 2004)
+
+  15 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  vorbisgain-0.34-r1.ebuild, vorbisgain-0.34.ebuild:
+  Adding --enable recursive to close bug #34494.  Bumping to stable.
+
+*vorbisgain-0.34 (29 Sep 2003)
+
+  29 Sep 2003; jje <jje@gentoo.org> vorbisgain-0.34.ebuild:
+  Version bump.
+
+*vorbisgain-0.32-r1 (20 Sep 2003)
+
+  20 Sep 2003; jje <jje@gentoo.org> vorbisgain-0.32-r1.ebuild,
+  files/vorbisgain-0.32-48k.patch:
+  Added patch to fix 48khz files.
+  
+  Submitted by: Sebastian Dröge <sebastian.droege@gmx.de>
 
 *vorbisgain-0.32 (02 Mar 2003)
 
diff --git a/media-sound/vorbisgain/Manifest b/media-sound/vorbisgain/Manifest
index e69de29bb2d1..3b30946a08b2 100644
--- a/media-sound/vorbisgain/Manifest
+++ b/media-sound/vorbisgain/Manifest
@@ -0,0 +1,6 @@
+MD5 4e0f503ed6df1b475bd6abe66829e76c ChangeLog 2529
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 c781e743204f5f20eb21ffc2132dd1f1 vorbisgain-0.34-r1.ebuild 818
+MD5 61f6409f93765e1aed390650f3503c05 vorbisgain-0.36.ebuild 831
+MD5 829a3a46bcfb3d31d37facb4e49c9899 files/digest-vorbisgain-0.34-r1 64
+MD5 1a3afeb25a4d18587b0a28b420030801 files/digest-vorbisgain-0.36 64
diff --git a/media-sound/vorbisgain/vorbisgain-0.34-r1.ebuild b/media-sound/vorbisgain/vorbisgain-0.34-r1.ebuild
index 2fe9c69f111d..13a07e1d2ed2 100644
--- a/media-sound/vorbisgain/vorbisgain-0.34-r1.ebuild
+++ b/media-sound/vorbisgain/vorbisgain-0.34-r1.ebuild
@@ -1,26 +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/media-sound/vorbisgain/vorbisgain-0.34-r1.ebuild,v 1.1 2004/02/15 12:16:17 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbisgain/vorbisgain-0.34-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:29 chriswhite Exp $
 
-DESCRIPTION="vorbisgain calculates a percieved sound level of an Ogg Vorbis file using the ReplayGain algorithm and stores it in the file header"
-HOMEPAGE="http://users.pandora.be/sjeng/vorbisgain.html"
+DESCRIPTION="vorbisgain calculates a perceived sound level of an Ogg Vorbis file using the ReplayGain algorithm and stores it in the file header"
+HOMEPAGE="http://sjeng.org/vorbisgain.html"
 SRC_URI="http://sjeng.org/ftp/vorbis/${P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86 amd64 sparc ~ppc ppc64"
+IUSE=""
 
-KEYWORDS="x86"
-
-DEPEND=">=media-libs/libvorbis-1.0
+RDEPEND=">=media-libs/libvorbis-1.0_beta4"
+DEPEND="${RDEPEND}
 	app-arch/unzip"
 
 src_compile() {
 	chmod +x configure
-	econf --enable-recursive || die
-	emake || die
+	econf --enable-recursive || die "configure failed"
+	emake || die "make failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR=${D} install || die "make install failed"
 }
-
diff --git a/media-sound/vorbisgain/vorbisgain-0.36.ebuild b/media-sound/vorbisgain/vorbisgain-0.36.ebuild
index c021d92a38d9..c375491038b3 100644
--- a/media-sound/vorbisgain/vorbisgain-0.36.ebuild
+++ b/media-sound/vorbisgain/vorbisgain-0.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/media-sound/vorbisgain/vorbisgain-0.36.ebuild,v 1.1 2005/05/21 08:45:30 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbisgain/vorbisgain-0.36.ebuild,v 1.1.1.1 2005/11/30 09:38:29 chriswhite Exp $
 
 DESCRIPTION="Vorbisgain calculates a perceived sound level of an Ogg Vorbis file using the ReplayGain algorithm and stores it in the file header"
 HOMEPAGE="http://sjeng.org/vorbisgain.html"
@@ -8,7 +8,7 @@ SRC_URI="http://sjeng.org/ftp/vorbis/${P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~ppc64"
+KEYWORDS="amd64 ~ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libvorbis-1.0_beta4
diff --git a/media-sound/vsound/ChangeLog b/media-sound/vsound/ChangeLog
index 6d3f9d5614f6..d15f9259ec82 100644
--- a/media-sound/vsound/ChangeLog
+++ b/media-sound/vsound/ChangeLog
@@ -1,9 +1,40 @@
 # ChangeLog for media-sound/vsound
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/vsound/ChangeLog,v 1.1 2002/08/13 18:11:01 agenkin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vsound/ChangeLog,v 1.1.1.1 2005/11/30 09:37:52 chriswhite Exp $
+
+  07 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> vsound-0.5.ebuild,
+  vsound-0.6.ebuild:
+  Don't install INSTALL or COPYING files.
+
+  08 Apr 2005; Joseph Jezak <josejx@gentoo.org> vsound-0.6.ebuild:
+  Marked ~ppc for bug #88231.
+
+  03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> vsound-0.6.ebuild:
+  Stable amd64, sparc, x86.
+
+*vsound-0.6 (25 Jul 2004)
+
+  25 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> +vsound-0.6.ebuild:
+  Version bump.  Closes bug #57873.
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> vsound-0.5.ebuild:
+  Added to ~amd64 and ~sparc
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> vsound-0.5.ebuild:
+  Added IUSE.
+
+  12 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> vsound-0.5.ebuild:
+  Fixed mirror:/// to mirror:// in SRC_URI to fix bug #47490.
+
+  01 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> vsound-0.5.ebuild:
+  nomirror.  Removed explicit S=
+
+  26 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> metadata.xml,
+  vsound-0.5.ebuild:
+  Removing realplayer from DEPEND.  Closes bug #41387.
 
 *vsound-0.5 (13 Aug 2002)
 
   13 Aug 2002; Arcady Genkin <agenkin@thpoon.com> vsound-0.5.ebuild :
 
-  Initial version, submitted by Chris Arndt <arndtc@mailandnews.com>.
\ No newline at end of file
+  Initial version, submitted by Chris Arndt <arndtc@mailandnews.com>.
diff --git a/media-sound/vsound/Manifest b/media-sound/vsound/Manifest
index e69de29bb2d1..abb20a180e43 100644
--- a/media-sound/vsound/Manifest
+++ b/media-sound/vsound/Manifest
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 218a809826efd65f9126df837b09e737 ChangeLog 1455
+MD5 5ab76944bbc4f62d30389f422f4f1e86 files/digest-vsound-0.5 132
+MD5 cb48ac89663bbbbf521d96dce30a832f files/digest-vsound-0.6 62
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 e4419938ed7c77b35540ec7174d54f93 vsound-0.5.ebuild 959
+MD5 4809c438920ce4080968eed2463ccae1 vsound-0.6.ebuild 974
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDb0VRj5H05b2HAEkRAtwoAJ9QRrn6vhTYqoTKTmi91VvMEaP2dgCaAs58
+sQesz7vlBiv7ib/ceksYoJs=
+=MaJv
+-----END PGP SIGNATURE-----
diff --git a/media-sound/vsound/vsound-0.5.ebuild b/media-sound/vsound/vsound-0.5.ebuild
index d79bce0b3447..e440ecf375fa 100644
--- a/media-sound/vsound/vsound-0.5.ebuild
+++ b/media-sound/vsound/vsound-0.5.ebuild
@@ -1,17 +1,20 @@
-# Copyright 2000-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/vsound/vsound-0.5.ebuild,v 1.1 2002/08/13 18:11:01 agenkin Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vsound/vsound-0.5.ebuild,v 1.1.1.1 2005/11/30 09:37:52 chriswhite Exp $
 
-DESCRIPTION="Sort a virtual audio loopback cable for RealAudio to wave convertions."
+IUSE=""
+
+DESCRIPTION="A virtual audio loopback cable"
 HOMEPAGE="http://www.zip.com.au/~erikd/vsound/"
 LICENSE="GPL-2"
-DEPEND=">=media-sound/sox-12.17.1
-	>=media-video/realplayer-8-r1"
+DEPEND=">=media-sound/sox-12.17.1"
 
-SRC_URI="http://ftp.br.debian.org/debian/pool/main/v/vsound/${P/-/_}.orig.tar.gz
-	http://ftp.br.debian.org/debian/pool/main/v/vsound/${P/-/_}-3.diff.gz"
-S=${WORKDIR}/${P}
+KEYWORDS="x86 ~amd64 ~sparc"
+SLOT="0"
+SRC_URI="mirror://debian/pool/main/v/vsound/${P/-/_}.orig.tar.gz
+	mirror://debian/pool/main/v/vsound/${P/-/_}-3.diff.gz"
 
+RESTRICT="nomirror"
 
 src_unpack() {
 	cd ${WORKDIR}
@@ -29,8 +32,7 @@ src_compile() {
 	emake || die
 }
 
-
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYING Changelog INSTALL NEWS README README.original
+	dodoc AUTHORS Changelog NEWS README README.original
 }
diff --git a/media-sound/vsound/vsound-0.6.ebuild b/media-sound/vsound/vsound-0.6.ebuild
index 556260adc1ff..cb0cdc227973 100644
--- a/media-sound/vsound/vsound-0.6.ebuild
+++ b/media-sound/vsound/vsound-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/media-sound/vsound/vsound-0.6.ebuild,v 1.1 2004/07/26 05:21:24 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vsound/vsound-0.6.ebuild,v 1.1.1.1 2005/11/30 09:37:52 chriswhite Exp $
 
 IUSE=""
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.zorg.org/${PN}/"
 LICENSE="GPL-2"
 DEPEND=">=media-sound/sox-12.17.1"
 
-KEYWORDS="~x86 ~amd64 ~sparc"
+KEYWORDS="x86 amd64 sparc ~ppc"
 SLOT="0"
 SRC_URI="http://www.zorg.org/${PN}/${P}.tar.gz"
 
@@ -23,7 +23,7 @@ src_unpack() {
 
 src_install() {
 	make DESTDIR="${D}" install || die
-	dodoc AUTHORS COPYING Changelog INSTALL NEWS README
+	dodoc AUTHORS Changelog NEWS README
 }
 
 pkg_postinst() {
diff --git a/media-sound/waif/ChangeLog b/media-sound/waif/ChangeLog
index 14db715eaaef..dcf330efadef 100644
--- a/media-sound/waif/ChangeLog
+++ b/media-sound/waif/ChangeLog
@@ -1,9 +1,85 @@
 # ChangeLog for media-sound/waif
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/waif/ChangeLog,v 1.1 2003/02/08 02:34:12 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/waif/ChangeLog,v 1.1.1.1 2005/11/30 09:37:48 chriswhite Exp $
+
+  28 May 2005; Jan Brinkmann <luckyduck@gentoo.org> -files/LICENSE,
+  -waif-0.59.6.ebuild, waif-0.59.7.ebuild:
+  Dont make use of the deprecated oggvorbis useflag any longer, see #94254.
+
+  09 Jan 2005; Sven Wegener <swegener@gentoo.org> waif-0.59.6.ebuild,
+  waif-0.59.7.ebuild:
+  Added missing parentheses in SRC_URI/*DEPEND/LICENSE.
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> waif-0.59.7.ebuild:
+  get_libdir fixes.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> waif-0.59.7.ebuild:
+  Stable amd64, sparc.
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> waif-0.59.7.ebuild:
+  ~sparc ~amd64
+
+  17 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> waif-0.59.7.ebuild:
+  X and gnome removed from IUSE.
+
+  23 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> waif-0.59.6.ebuild,
+  waif-0.59.7.ebuild:
+  mpg123 dep changed to virtual
+
+  11 Jun 2003; Seemant Kulleen <seemant@gentoo.org> waif-0.59.6.ebuild,
+  waif-0.59.7.ebuild:
+  added mpg123 to RDEPEND
+
+  11 Jun 2003; Daniel Robbins <drobbins@gentoo.org>; all ebuilds: adding
+  missing oggvorbis and xmms IUSE.
+
+*waif-0.59.7 (16 Mar 2003)
+
+  12 Apr 2003; Graham Forest <vladimir@gentoo.org> waif-0.59.7.ebuild:
+  Set ~ppc, fixed missing dep
+
+  16 Mar 2003; Seemant Kulleen <seemant@gentoo.org> waif-0.59.5.ebuild,
+  waif-0.59.5.ebuild, waif-0.59.7.ebuild:
+  version bump -- contains support for id3v2
+
+*waif-0.59.6 (05 Mar 2003)
+
+  05 Mar 2003; Seemant Kulleen <seemant@gentoo.org> waif-0.59.6.ebuild:
+  version bump, thanks to Matthew Levine via e-mail.  This release contains
+  more bugfixes: improved reshuffling and justified display on the waifsh
+  show command.  Feed it a playlist of 100's to see what this means :P.
+
+*waif-0.59.5 (24 Feb 2003)
+
+  24 Feb 2003; Seemant Kulleen <seemant@gentoo.org> waif-0.59.5.ebuild files/digest-waif-0.59.5 :
+  version bump thanks to Matthew Levine via e-mail. New release contains bugfixes
+  and allows for trplayer to play rtsp:// streams.
+
+*waif-0.59.4 (08 Feb 2003)
+  
+  09 Feb 2003; Seemant Kulleen <seemant@gentoo.org> waif-0.59.4.ebuild :
+
+  The upstream tarball now has a version in it.  Regenerated the digest as
+  well.
+
+  08 Feb 2003; Seemant Kulleen <seemant@gentoo.org> waif-0.59.4.ebuild
+  files/digest-waif-0.59.4 :
+
+  Version bump -- a bugfix release which fixes the commands in the
+  interactive shell.
 
 *waif-0.59.3 (07 Feb 2003)
 
+  08 Feb 2003; Seemant Kulleen <seemant@gentoo.org> waif-0.59.3.ebuild :
+
+  Added id3ed as a dependency to make waifsh show the id3 instead of
+  filename.  Thanks to tseng in oftc.net #gentoo.
+
+  08 Feb 2003; Seemant Kulleen <seemant@gentoo.org> files/LICENSE
+
+  Added license -- quote from an e-mail that Matthew Levine (the author of
+  waif and wfxmms) sent me.
+
   07 Feb 2003; Seemant Kulleen <seemant@gentoo.org> waif-0.59.3.ebuild
   ChangeLog files/digest-waif-0.59.3 :
 
diff --git a/media-sound/waif/Manifest b/media-sound/waif/Manifest
index 9bd287258a24..4c5683f779a7 100644
--- a/media-sound/waif/Manifest
+++ b/media-sound/waif/Manifest
@@ -1,6 +1,14 @@
-MD5 fa48e445a74d2755758248a3f277be30 ChangeLog 2488
-MD5 17c70a8bfab8190e7ff3722662973618 waif-0.59.7.ebuild 1338
-MD5 f4271cf851995b3526148e78f1cd6947 waif-0.59.6.ebuild 1293
-MD5 3b3e0a6ef4724b594fc78b9b0dfd9c5e files/LICENSE 146
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 74201d44bc392f165d27d2df0bc9595c waif-0.59.7.ebuild 1362
+MD5 af834cc258ae24354e7ecb715e8b874e ChangeLog 3584
+MD5 aa0bfeeaf772ac88a10eaadfcec3936f metadata.xml 250
 MD5 b672105be7c357165e12fd4963e9a54d files/digest-waif-0.59.7 119
-MD5 fbdc57553cb2209c0b024afb096509c1 files/digest-waif-0.59.6 119
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCmKxt06ebR+OMO78RAoB5AJ0WvQ9CMRW31JcgK59IUPMEMjLcIgCfSdX1
+d7Uni0P6yimpV19Ywl48Xx8=
+=tEJn
+-----END PGP SIGNATURE-----
diff --git a/media-sound/waif/waif-0.59.7.ebuild b/media-sound/waif/waif-0.59.7.ebuild
index fb5a573e6fb0..49414c9f9c4b 100644
--- a/media-sound/waif/waif-0.59.7.ebuild
+++ b/media-sound/waif/waif-0.59.7.ebuild
@@ -1,31 +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/media-sound/waif/waif-0.59.7.ebuild,v 1.1 2003/03/16 20:00:38 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/waif/waif-0.59.7.ebuild,v 1.1.1.1 2005/11/30 09:37:48 chriswhite Exp $
 
-IUSE="X gnome"
+inherit eutils
 
 S=${WORKDIR}/${PN}
 S2=${WORKDIR}/wfxmms
+
 DESCRIPTION="Why Another Infernal Frontend -- console front end for various media-players"
-HOMEPAGE="http://eds.org/~straycat"
+HOMEPAGE="http://eds.org/~straycat/waif.html"
 SRC_URI="http://www.eds.org/~straycat/${P}.tar.gz
-	xmms? http://www.eds.org/~straycat/wfxmms-0.6.tgz"
+	xmms? ( http://www.eds.org/~straycat/wfxmms-0.6.tgz )"
 
-SLOT="0"
 LICENSE="as-is"
-KEYWORDS="~x86"
+SLOT="0"
+KEYWORDS="~ppc x86 sparc amd64"
+IUSE="xmms ogg"
 
 DEPEND="dev-lang/tcl
 	dev-tcltk/expect"
-
 RDEPEND="dev-tcltk/expect
+	virtual/mpg123
 	media-sound/takcd
 	media-sound/aumix
 	media-libs/id3lib
 	media-sound/id3v2
+	media-sound/id3ed
 	xmms? ( media-sound/xmms )
-	oggvorbis? ( media-sound/vorbis-tools )"
-
+	ogg? ( media-sound/vorbis-tools )"
 
 src_compile() {
 	cd Waif
@@ -39,20 +41,18 @@ src_compile() {
 }
 
 src_install() {
-
 	local tclv
 	tclv=$(grep TCL_VER /usr/include/tcl.h | sed 's:^.*"\(.*\)".*:\1:')
 
 	cd ${S}
-	insinto /usr/lib/tcl${tclv}/Waif
+	insinto /usr/$(get_libdir)/tcl${tclv}/Waif
 	doins Waif/*
 
 	into /usr
 	dobin waif-helper waifsh
 	doman waifsh.1
-	
+
 	dodoc CHANGES FAQ INSTALL README* TODO WHATSNEW
-	dodoc ${FILESDIR}/LICENSE
 	docinto Documentation
 	dodoc Documentation/*
 
diff --git a/media-sound/wavbreaker/ChangeLog b/media-sound/wavbreaker/ChangeLog
index 739ed3e2e6fc..433274e45479 100644
--- a/media-sound/wavbreaker/ChangeLog
+++ b/media-sound/wavbreaker/ChangeLog
@@ -1,6 +1,52 @@
 # ChangeLog for media-sound/wavbreaker
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/wavbreaker/ChangeLog,v 1.1 2003/07/09 21:22:37 torbenh Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/wavbreaker/ChangeLog,v 1.1.1.1 2005/11/30 09:38:23 chriswhite Exp $
+
+  09 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> wavbreaker-0.5.ebuild,
+  wavbreaker-0.6.1.ebuild:
+  Don't install INSTALL and COPYING files.
+
+  08 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org> wavbreaker-0.6.1.ebuild:
+  readded -sparc keyword, see #95036 for details.
+
+*wavbreaker-0.6.1 (05 Jun 2005)
+
+  05 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -files/wavbreaker-0.4-gcc2_fix.patch, -wavbreaker-0.3.ebuild,
+  -wavbreaker-0.4.ebuild, +wavbreaker-0.6.1.ebuild:
+  New upstream release, fixes #95036. Added ~amd64 back to KEYWORDS.
+
+*wavbreaker-0.5 (20 Jul 2004)
+
+  20 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +wavbreaker-0.5.ebuild:
+  Version bump closes bug #56810.
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  wavbreaker-0.4.ebuild:
+  -sparc -amd64
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  wavbreaker-0.3.ebuild, wavbreaker-0.4.ebuild:
+  virtual/glibc -> virtual/libc
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  wavbreaker-0.3.ebuild, wavbreaker-0.4.ebuild:
+  Added IUSE.
+
+  01 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  wavbreaker-0.4.ebuild:
+  Stable on x86.  inherit eutils.
+
+  03 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  wavbreaker-0.4.ebuild, files/wavbreaker-0.4-gcc2_fix.patch:
+  Added patch to fix non-ANSI C provided by Tristan Henderson
+  <T.Henderson@cs.ucl.ac.uk> in bug #39365
+
+*wavbreaker-0.4 (19 Dec 2003)
+
+  19 Dec 2003; Martin Holzer <mholzer@gentoo.org> wavbreaker-0.4.ebuild:
+  Version bumped. Closes 32110.
 
 *wavbreaker-0.3 (09 Jul 2003)
 
diff --git a/media-sound/wavbreaker/Manifest b/media-sound/wavbreaker/Manifest
index fda31fb3d40c..aea074cc0a1b 100644
--- a/media-sound/wavbreaker/Manifest
+++ b/media-sound/wavbreaker/Manifest
@@ -1,2 +1,16 @@
-MD5 dfa3d45318ff239dad53a85a09771e4c wavbreaker-0.3.ebuild 427
-MD5 427c6fb9c5898014eb905e13c4ecfe16 files/digest-wavbreaker-0.3 65
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 fa28f4443943d36b60a39a2da98774b6 ChangeLog 1943
+MD5 f88c3726b15dbc09ac8c717926f8088d wavbreaker-0.5.ebuild 729
+MD5 653b74b757742b5896c54eec3ab7432d wavbreaker-0.6.1.ebuild 640
+MD5 d0d7ea03e238a808414b4426394c100f metadata.xml 221
+MD5 380ba426e2f4b94a3bfd979a0d5f464f files/digest-wavbreaker-0.5 65
+MD5 0f7681a3b39a9d551e83a1a758a0d0cb files/digest-wavbreaker-0.6.1 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDIYs0j5H05b2HAEkRAjwBAJwKUPjd04DqZli33NbKlUYp7VNLQACgnGaQ
+ExgTY/lQrQZisxo00X2zCBw=
+=QkAc
+-----END PGP SIGNATURE-----
diff --git a/media-sound/wavbreaker/wavbreaker-0.5.ebuild b/media-sound/wavbreaker/wavbreaker-0.5.ebuild
index 2c50f702a2b6..6f1c87e7604d 100644
--- a/media-sound/wavbreaker/wavbreaker-0.5.ebuild
+++ b/media-sound/wavbreaker/wavbreaker-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/media-sound/wavbreaker/wavbreaker-0.5.ebuild,v 1.1 2004/07/21 00:55:23 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/wavbreaker/wavbreaker-0.5.ebuild,v 1.1.1.1 2005/11/30 09:38:23 chriswhite Exp $
 
 IUSE=""
 
@@ -18,7 +18,7 @@ DEPEND="dev-libs/libxml2
 	>=x11-libs/gtk+-2.0
 	virtual/libc"
 
-DOCS="ChangeLog COPYING INSTALL README NEWS"
+DOCS="ChangeLog README NEWS"
 
 src_install() {
 	make DESTDIR=${D} install
diff --git a/media-sound/wavbreaker/wavbreaker-0.6.1.ebuild b/media-sound/wavbreaker/wavbreaker-0.6.1.ebuild
index 97a22632967c..f0ea5ddb0216 100644
--- a/media-sound/wavbreaker/wavbreaker-0.6.1.ebuild
+++ b/media-sound/wavbreaker/wavbreaker-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/media-sound/wavbreaker/wavbreaker-0.6.1.ebuild,v 1.1 2005/06/05 20:10:01 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/wavbreaker/wavbreaker-0.6.1.ebuild,v 1.1.1.1 2005/11/30 09:38:24 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://huli.org/wavbreaker/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86 ~amd64 -sparc"
 IUSE=""
 
 DEPEND="dev-libs/libxml2
@@ -19,5 +19,5 @@ DEPEND="dev-libs/libxml2
 
 src_install() {
 	make DESTDIR=${D} install || die "make install failed"
-	dodoc ChangeLog INSTALL README NEWS
+	dodoc ChangeLog README NEWS
 }
diff --git a/media-sound/wavesurfer/ChangeLog b/media-sound/wavesurfer/ChangeLog
index 1a63549c087e..ba7dff1e79e0 100644
--- a/media-sound/wavesurfer/ChangeLog
+++ b/media-sound/wavesurfer/ChangeLog
@@ -1,6 +1,74 @@
 # ChangeLog for media-sound/wavesurfer
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/wavesurfer/ChangeLog,v 1.1 2003/09/28 12:58:37 jje Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/wavesurfer/ChangeLog,v 1.1.1.1 2005/11/30 09:38:38 chriswhite Exp $
+
+  18 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  wavesurfer-1.8.1.ebuild:
+  Stable on sparc
+
+*wavesurfer-1.8.4 (15 Oct 2005)
+
+  15 Oct 2005; MATSUU Takuto <matsuu@gentoo.org> wavesurfer-1.8.1.ebuild,
+  +wavesurfer-1.8.4.ebuild:
+  Version bumped. Bug 107170.
+
+*wavesurfer-1.8.1 (27 Mar 2005)
+
+  27 Mar 2005; MATSUU Takuto <matsuu@gentoo.org> +wavesurfer-1.8.1.ebuild:
+  Version bumped.
+
+  05 Mar 2005; Markus Rothe <corsair@gentoo.org> wavesurfer-1.7.ebuild:
+  Stable on ppc64
+
+  01 Jan 2005; Markus Rothe <corsair@gentoo.org> wavesurfer-1.7.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+*wavesurfer-1.7.5 (01 Jan 2005)
+
+  01 Jan 2005; MATSUU Takuto <matsuu@gentoo.org> -wavesurfer-1.6.3.ebuild,
+  -wavesurfer-1.6.5.ebuild, +wavesurfer-1.7.5.ebuild:
+  Version bumped.
+  Remove old versions.
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  wavesurfer-1.7.ebuild:
+  get_libdir fixes.
+
+  03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  wavesurfer-1.7.ebuild:
+  Stable amd64, sparc, x86.
+
+*wavesurfer-1.6.5 (08 Aug 2004)
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> wavesurfer-1.6.3.ebuild,
+  wavesurfer-1.6.5.ebuild, wavesurfer-1.7.ebuild:
+  Typo in DESCRIPTION: labling -> labeling. Bug 59717.
+
+*wavesurfer-1.7 (02 Jul 2004)
+
+  02 Jul 2004; <matsuu@gentoo.org> +wavesurfer-1.7.ebuild:
+  Version bumped.
+
+  16 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  wavesurfer-1.6.3.ebuild:
+  Stable amd64.  Added to ~sparc.
+
+  25 Apr 2004; Danny van Dyk <kugelfang@gentoo.org> wavesurfer-1.6.3.ebuild:
+  marked ~amd64.
+
+  25 Apr 2004; David Holm <dholm@gentoo.org> wavesurfer-1.6.3.ebuild:
+  Added to ~ppc.
+
+*wavesurfer-1.6.3 (24 Apr 2004)
+
+  24 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  wavesurfer-1.6.3.ebuild:
+  Version bump from bug #41207.  Thanks to matsuu@gentoo.org.
+
+*wavesurfer-1.5.7 (18 Dec 2003)
+
+  18 Dec 2003; Martin Holzer <mholzer@gentoo.org> wavesurfer-1.5.7.ebuild:
+  Version bumped. Closes 34461
 
 *wavesurfer-1.5.3 (28 Sep 2003)
 
diff --git a/media-sound/wavesurfer/Manifest b/media-sound/wavesurfer/Manifest
index d361c12ce9f7..e8de3959533a 100644
--- a/media-sound/wavesurfer/Manifest
+++ b/media-sound/wavesurfer/Manifest
@@ -1,4 +1,20 @@
-MD5 b9a11b95334b37abc66883bb3d1eb448 wavesurfer-1.5.2.ebuild 679
-MD5 67136cd1c99d7645ad43e7c8f44336a5 wavesurfer-1.5.3.ebuild 744
-MD5 9a900dfc3e5cd26bbf6d36587dbcea23 files/digest-wavesurfer-1.5.2 68
-MD5 062c69c8a32234220a9a72a65bc73622 files/digest-wavesurfer-1.5.3 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ddb5abc628437c31ac92692ebc87c828 ChangeLog 2381
+MD5 f9ea75ad7d39ed14938ee7189e4517e5 files/digest-wavesurfer-1.7 66
+MD5 d368528d29144cd88ad94513794f4bcf files/digest-wavesurfer-1.7.5 68
+MD5 ecba4e35af54210917d46707ab8dcc21 files/digest-wavesurfer-1.8.1 68
+MD5 a3ebafcaaf4849557c7f26e1965aeef2 files/digest-wavesurfer-1.8.4 68
+MD5 d0d7ea03e238a808414b4426394c100f metadata.xml 221
+MD5 edd56d06a578a315862b159c434b4210 wavesurfer-1.7.5.ebuild 1032
+MD5 3100f2628065e9c367602fcd9964bb96 wavesurfer-1.7.ebuild 1018
+MD5 b72fe33dacc9be005ccccd9fd550f239 wavesurfer-1.8.1.ebuild 1041
+MD5 476549f89f94b269de8144d5e92ed739 wavesurfer-1.8.4.ebuild 1042
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDVQAmKRy60XGEcJIRAru7AJ9VMEgXxk7tBywurMhemG89zxkNigCfZsXz
+YmtsGTrbmXeIIOZ5ixACMTI=
+=RHqM
+-----END PGP SIGNATURE-----
diff --git a/media-sound/wavesurfer/wavesurfer-1.7.5.ebuild b/media-sound/wavesurfer/wavesurfer-1.7.5.ebuild
index 59f46c8afadd..ee157086c765 100644
--- a/media-sound/wavesurfer/wavesurfer-1.7.5.ebuild
+++ b/media-sound/wavesurfer/wavesurfer-1.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/media-sound/wavesurfer/wavesurfer-1.7.5.ebuild,v 1.1 2005/01/01 05:26:03 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/wavesurfer/wavesurfer-1.7.5.ebuild,v 1.1.1.1 2005/11/30 09:38:38 chriswhite Exp $
 
 inherit eutils
 
diff --git a/media-sound/wavesurfer/wavesurfer-1.7.ebuild b/media-sound/wavesurfer/wavesurfer-1.7.ebuild
index fe8e006191a2..bbdc74da7d2a 100644
--- a/media-sound/wavesurfer/wavesurfer-1.7.ebuild
+++ b/media-sound/wavesurfer/wavesurfer-1.7.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/wavesurfer/wavesurfer-1.7.ebuild,v 1.1 2004/07/01 22:34:00 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/wavesurfer/wavesurfer-1.7.ebuild,v 1.1.1.1 2005/11/30 09:38:38 chriswhite Exp $
 
-DESCRIPTION="tool for recording, playing, editing, viewing and labling of audio"
+DESCRIPTION="tool for recording, playing, editing, viewing and labeling of audio"
 HOMEPAGE="http://www.speech.kth.se/wavesurfer/"
 SRC_URI="http://www.speech.kth.se/wavesurfer/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+KEYWORDS="x86 ~ppc amd64 sparc ppc64"
 IUSE=""
 
 RDEPEND=">=dev-tcltk/snack-2.2.4"
@@ -24,12 +24,12 @@ src_install() {
 	local mydir="wsurf${PV}"
 
 	newbin wavesurfer.tcl wavesurfer
-	dodir /usr/lib/${mydir}
-	cp -r ${mydir} ${D}/usr/lib/
+	dodir /usr/$(get_libdir)/${mydir}
+	cp -r ${mydir} ${D}/usr/$(get_libdir)/
 
-	insinto /usr/lib/${mydir}/plugins
+	insinto /usr/$(get_libdir)/${mydir}/plugins
 	doins plugins/*.plug
-	insinto /usr/lib/${mydir}/icons
+	insinto /usr/$(get_libdir)/${mydir}/icons
 	doins icons/*
 
 	dodoc README.txt
diff --git a/media-sound/wavesurfer/wavesurfer-1.8.1.ebuild b/media-sound/wavesurfer/wavesurfer-1.8.1.ebuild
index 054941875639..8ce86ec39b5e 100644
--- a/media-sound/wavesurfer/wavesurfer-1.8.1.ebuild
+++ b/media-sound/wavesurfer/wavesurfer-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/media-sound/wavesurfer/wavesurfer-1.8.1.ebuild,v 1.1 2005/03/27 14:21:17 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/wavesurfer/wavesurfer-1.8.1.ebuild,v 1.1.1.1 2005/11/30 09:38:38 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.speech.kth.se/wavesurfer/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc ~ppc64"
+KEYWORDS="amd64 ~ppc ~ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-tcltk/snack-2.2.4"
diff --git a/media-sound/wavesurfer/wavesurfer-1.8.4.ebuild b/media-sound/wavesurfer/wavesurfer-1.8.4.ebuild
index a0cdf2c4eaf2..d1411d5e7e84 100644
--- a/media-sound/wavesurfer/wavesurfer-1.8.4.ebuild
+++ b/media-sound/wavesurfer/wavesurfer-1.8.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/media-sound/wavesurfer/wavesurfer-1.8.4.ebuild,v 1.1 2005/10/15 11:21:42 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/wavesurfer/wavesurfer-1.8.4.ebuild,v 1.1.1.1 2005/11/30 09:38:38 chriswhite Exp $
 
 inherit eutils
 
diff --git a/media-sound/wavpack/ChangeLog b/media-sound/wavpack/ChangeLog
index 49a6a75e8c8c..be9743366ef2 100644
--- a/media-sound/wavpack/ChangeLog
+++ b/media-sound/wavpack/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for media-sound/wavpack
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/wavpack/ChangeLog,v 1.1 2004/08/20 19:22:23 pkdawson Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/wavpack/ChangeLog,v 1.1.1.1 2005/11/30 09:38:09 chriswhite Exp $
+
+*wavpack-4.2 (29 Apr 2005)
+
+  29 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> -wavpack-4.0.ebuild,
+  +wavpack-4.2.ebuild:
+  new upstream version, fixes #90838. also did some cleanup.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> wavpack-4.1.ebuild:
+  Stable amd64, sparc, x86.
+
+  28 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> wavpack-4.0.ebuild,
+  wavpack-4.1.ebuild:
+  Removed autoconf from RDEPEND.  Added to ~sparc and ~amd64.
+
+  23 Sep 2004; Patrick Dawson <pkdawson@gentoo.org> +wavpack-4.1.ebuild:
+  version bump
+
+  03 Sep 2004; David Holm <dholm@gentoo.org> wavpack-4.0.ebuild:
+  Added to ~ppc.
 
 *wavpack-4.0 (20 Aug 2004)
 
diff --git a/media-sound/wavpack/Manifest b/media-sound/wavpack/Manifest
index 5a5b196d9685..393f4e8cf231 100644
--- a/media-sound/wavpack/Manifest
+++ b/media-sound/wavpack/Manifest
@@ -1,4 +1,16 @@
-MD5 12a3e433e896df03e4aa0a2d57e5c581 wavpack-4.0.ebuild 467
-MD5 4a05c23df4296ccbfa3fb4e79d1bb6d3 ChangeLog 297
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 11a7abb32b65c8e8a7dcc40c1f1ad543 wavpack-4.1.ebuild 634
+MD5 844f05b90bbd6e838efce4e38a0a13d7 ChangeLog 1017
 MD5 83c2574543d0501303b57050254e3880 metadata.xml 222
-MD5 647f67953fe2e93a709b8e8c8e1e45ea files/digest-wavpack-4.0 63
+MD5 4e72a729a481fd53f91715d959048988 wavpack-4.2.ebuild 688
+MD5 17333ced2ae7a4e6e6e8b0aa6f395558 files/digest-wavpack-4.1 63
+MD5 402a10f74927787724d561e68810c779 files/digest-wavpack-4.2 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCclkd06ebR+OMO78RAv9oAJ9GB4DvS29F4ec2jDAbiB7T8835cgCdGeeJ
+0gVGLX0aTq+RNxskZjXprMI=
+=7ue/
+-----END PGP SIGNATURE-----
diff --git a/media-sound/wavpack/wavpack-4.1.ebuild b/media-sound/wavpack/wavpack-4.1.ebuild
index 4af32cb2dad2..24cde7989249 100644
--- a/media-sound/wavpack/wavpack-4.1.ebuild
+++ b/media-sound/wavpack/wavpack-4.1.ebuild
@@ -1,20 +1,23 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/wavpack/wavpack-4.1.ebuild,v 1.1 2004/09/24 02:48:01 pkdawson Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/wavpack/wavpack-4.1.ebuild,v 1.1.1.1 2005/11/30 09:38:08 chriswhite Exp $
+
+IUSE=""
 
 DESCRIPTION="WavPack audio compression tools"
 HOMEPAGE="http://www.wavpack.com/"
 SRC_URI="http://www.wavpack.com/${P}.tar.bz2"
-LICENSE="BSD"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
+LICENSE="BSD"
+KEYWORDS="amd64 ~ppc sparc x86"
 
-DEPEND="sys-libs/ncurses
+RDEPEND="sys-libs/ncurses"
+DEPEND="${RDEPEND}
 	sys-devel/automake"
 
 src_compile() {
+	export WANT_AUTOMAKE=1.7
 	./autogen.sh || die
 	econf || die
 	emake || die
diff --git a/media-sound/wavpack/wavpack-4.2.ebuild b/media-sound/wavpack/wavpack-4.2.ebuild
index 2889ce7851f9..afc1008b79f7 100644
--- a/media-sound/wavpack/wavpack-4.2.ebuild
+++ b/media-sound/wavpack/wavpack-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/media-sound/wavpack/wavpack-4.2.ebuild,v 1.1 2005/04/29 15:55:54 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/wavpack/wavpack-4.2.ebuild,v 1.1.1.1 2005/11/30 09:38:09 chriswhite Exp $
 
 DESCRIPTION="WavPack audio compression tools"
 HOMEPAGE="http://www.wavpack.com/"
diff --git a/media-sound/wavplay/ChangeLog b/media-sound/wavplay/ChangeLog
index 66a4f7e161da..74dead34542a 100644
--- a/media-sound/wavplay/ChangeLog
+++ b/media-sound/wavplay/ChangeLog
@@ -1,6 +1,28 @@
 # ChangeLog for media-sound/wavplay
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/wavplay/ChangeLog,v 1.1 2003/04/02 15:35:08 phosphan Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/wavplay/ChangeLog,v 1.1.1.1 2005/11/30 09:38:45 chriswhite Exp $
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> wavplay-1.4.ebuild:
+  -amd64, -sparc.
+
+  06 Sep 2004; Karol Wojtaszek <sekretarz@gentoo.org>
+  +files/wavplay-1.4-gcc34.patch, wavplay-1.4.ebuild:
+  Fixed gcc-34 compile issues. Bug #61958
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> wavplay-1.4.ebuild:
+  virtual/glibc -> virtual/libc
+
+  27 Apr 2004; Dylan Carlson <absinthe@gentoo.org> wavplay-1.4.ebuild:
+  Added ~amd64 to KEYWORDS.
+
+  24 Apr 2003; Patrick Kursawe <phosphan@gentoo.org> wavplay-1.4.ebuild :
+  Considered stable for x86
+
+  04 Apr 2003; Patrick Kursawe <phosphan@gentoo.org> wavplay-1.4.ebuild :
+  Trivial change for tracking a repoman problem
+
+  03 Apr 2003; Patrick Kursawe <phosphan@gentoo.org> wavplay-1.4.ebuild :
+  Corrected the copyright line
 
 *wavplay-1.4 (02 Apr 2003)
 
diff --git a/media-sound/wavplay/Manifest b/media-sound/wavplay/Manifest
index d634cfb508d1..9a5722bd931b 100644
--- a/media-sound/wavplay/Manifest
+++ b/media-sound/wavplay/Manifest
@@ -1,4 +1,16 @@
-MD5 a85b58c876b4e4d2822b6820cdbae84a wavplay-1.4.ebuild 821
-MD5 2be2c1f5c40998a4393678773831b748 ChangeLog 796
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 10e1f1997aa6f6b66c6863b3de11193f ChangeLog 1247
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 5ff396adc1eef3c683fc942d400d203a wavplay-1.4.ebuild 869
+MD5 6a522fc93d39d266dc8af0bb866e3ad5 files/digest-wavplay-1.4 62
 MD5 44fc5510eb5718683fe5336af9c22acd files/wavplay-1.4.patch 25215
-MD5 de9d704fb11fcaddc2740316d58fa875 files/digest-wavplay-1.4 191
+MD5 2bcfce9c0864454c212a84f15453b5f8 files/wavplay-1.4-gcc34.patch 706
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBxTL9ArHZZzCEUG0RAuj3AJ4gYZwvPolZ2JWPlCaMyySUiu+AxQCeOjRQ
+sZ2RexMvxCaI8AvQxIii3bU=
+=JfFd
+-----END PGP SIGNATURE-----
diff --git a/media-sound/wavplay/wavplay-1.4.ebuild b/media-sound/wavplay/wavplay-1.4.ebuild
index 9729e0b05546..f0cbbdbd7c12 100644
--- a/media-sound/wavplay/wavplay-1.4.ebuild
+++ b/media-sound/wavplay/wavplay-1.4.ebuild
@@ -1,22 +1,25 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/wavplay/wavplay-1.4.ebuild,v 1.1 2003/04/02 15:35:08 phosphan Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/wavplay/wavplay-1.4.ebuild,v 1.1.1.1 2005/11/30 09:38:45 chriswhite Exp $
+
+IUSE=""
 
 inherit eutils
 
 DESCRIPTION="A command line player/recorder for wav files"
 SRC_URI="http://ibiblio.org/pub/linux/apps/sound/players/${P}.tar.gz"
 HOMEPAGE="http://orphan//"
+
 LICENSE="GPL-2"
-DEPEND="virtual/glibc"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="-amd64 -sparc x86"
 
-IUSE=""
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/${P}.patch
+	epatch ${FILESDIR}/${P}-gcc34.patch
 }
 
 src_compile() {
@@ -25,7 +28,7 @@ src_compile() {
 
 src_install () {
 	dodir /usr/bin
-	emake INSTDIR=${D}usr/bin install_no_x || die
+	emake INSTDIR="${D}usr/bin" install_no_x || die
 	# the motif frontend crashes and there are nicer player
 	# for X anyway
 	# no suid root install for old packages which use strcpy
diff --git a/media-sound/wavsplit/ChangeLog b/media-sound/wavsplit/ChangeLog
index 7b8f8d5972a3..30579e863531 100644
--- a/media-sound/wavsplit/ChangeLog
+++ b/media-sound/wavsplit/ChangeLog
@@ -1,6 +1,31 @@
 # ChangeLog for media-sound/wavsplit
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/wavsplit/ChangeLog,v 1.1 2003/09/21 08:55:00 jje Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/wavsplit/ChangeLog,v 1.1.1.1 2005/11/30 09:38:32 chriswhite Exp $
+
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> wavsplit-1.0.ebuild,
+  wavsplit-1.1.0.ebuild, wavsplit-1.2.1.ebuild:
+  Don't install COPYING file. Fixed HOMEPAGE.
+
+*wavsplit-1.2.1 (18 Jan 2005)
+
+  18 Jan 2005; Dominik Stadler <centic@gentoo.org>
+  +files/wavsplit-1.2.1-large-files.patch, +wavsplit-1.2.1.ebuild:
+  Add Version 1.2.1 and include patch to enable using wav files larger than 2G
+
+  03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  wavsplit-1.1.0.ebuild:
+  Stable amd64, x86.
+
+*wavsplit-1.1.0 (02 Aug 2004)
+
+  02 Aug 2004; Dominik Stadler <centic@gentoo.org> +wavsplit-1.1.0.ebuild:
+  Add new version 1.1.0
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> wavsplit-1.0.ebuild:
+  -sparc -amd64
+
+  01 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> wavsplit-1.0.ebuild:
+  Stable on x86. nomirror
 
 *wavsplit-1.0 (21 Sep 2003)
 
diff --git a/media-sound/wavsplit/Manifest b/media-sound/wavsplit/Manifest
index 2dfbba6a3db7..373e8fb158da 100644
--- a/media-sound/wavsplit/Manifest
+++ b/media-sound/wavsplit/Manifest
@@ -1,2 +1,19 @@
-MD5 90ebc45cf40eb9a66ba75d1697eba9ff wavsplit-1.0.ebuild 546
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1c33ef68829f20e3f7493e1aadbcf74d wavsplit-1.1.0.ebuild 696
+MD5 d1d81b851a2875bac6a3573959d9b05c ChangeLog 1224
+MD5 e36b9d196a2baa560e92352c44b65d18 wavsplit-1.2.1.ebuild 791
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 b402735415dce0755a2413b300310c4a wavsplit-1.0.ebuild 676
+MD5 db9e42a4c6a9b5af5fafcd4ad40de35b files/digest-wavsplit-1.1.0 65
+MD5 ff908f77353445c3684934789f83b42f files/wavsplit-1.2.1-large-files.patch 6730
+MD5 5ff77e4d417fcb0c21cfb902cac670b4 files/digest-wavsplit-1.2.1 65
 MD5 614dc021dbcc9eeff1f7f30e81c6070d files/digest-wavsplit-1.0 60
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGs9tj5H05b2HAEkRAn5pAJ9txyIIyE9/L3CE+cUbQ+5gVh7dYwCfShX3
+/+fjEbuHr1l2ENx/76Ca7JU=
+=H3f1
+-----END PGP SIGNATURE-----
diff --git a/media-sound/wavsplit/wavsplit-1.0.ebuild b/media-sound/wavsplit/wavsplit-1.0.ebuild
index 04755b2a3fe6..aeee31ec064f 100644
--- a/media-sound/wavsplit/wavsplit-1.0.ebuild
+++ b/media-sound/wavsplit/wavsplit-1.0.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/media-sound/wavsplit/wavsplit-1.0.ebuild,v 1.1 2003/09/21 08:55:00 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/wavsplit/wavsplit-1.0.ebuild,v 1.1.1.1 2005/11/30 09:38:32 chriswhite Exp $
+
+IUSE=""
 
 DESCRIPTION="WavSplit is a simple command line tool to split WAV files"
-HOMEPAGE="http://sourceforge.net/projects/${PN}/"
+HOMEPAGE="http://sourceforge.net/projects/wavsplit/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
+#-sparc, -amd64: 1.0: "Only supports PCM wave format"
+KEYWORDS="x86 -sparc -amd64"
 DEPEND=""
-#RDEPEND=""
-S=${WORKDIR}/${P}
 
 src_compile() {
 	emake || die
@@ -21,6 +21,5 @@ src_compile() {
 src_install() {
 	dobin wavsplit wavren
 	doman wavsplit.1 wavren.1
-	dodoc BUGS CHANGES COPYING CREDITS README README.wavren
+	dodoc BUGS CHANGES CREDITS README README.wavren
 }
-
diff --git a/media-sound/wavsplit/wavsplit-1.1.0.ebuild b/media-sound/wavsplit/wavsplit-1.1.0.ebuild
index b0402736c923..08226a279776 100644
--- a/media-sound/wavsplit/wavsplit-1.1.0.ebuild
+++ b/media-sound/wavsplit/wavsplit-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/media-sound/wavsplit/wavsplit-1.1.0.ebuild,v 1.1 2004/08/02 20:44:33 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/wavsplit/wavsplit-1.1.0.ebuild,v 1.1.1.1 2005/11/30 09:38:33 chriswhite Exp $
 
 DESCRIPTION="WavSplit is a simple command line tool to split WAV files"
 HOMEPAGE="http://sourceforge.net/projects/wavsplit/"
@@ -8,8 +8,8 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-#-sparc, -amd64: 1.0: "Only supports PCM wave format"
-KEYWORDS="~x86 -sparc -amd64"
+#-sparc, -amd64: 1.0: "Only supports PCM wave format" error message.
+KEYWORDS="x86 -sparc -amd64"
 IUSE=""
 DEPEND=""
 
@@ -20,6 +20,6 @@ src_compile() {
 src_install() {
 	dobin wavsplit wavren
 	doman wavsplit.1 wavren.1
-	dodoc BUGS CHANGES COPYING CREDITS README README.wavren
+	dodoc BUGS CHANGES CREDITS README README.wavren
 }
 
diff --git a/media-sound/wavsplit/wavsplit-1.2.1.ebuild b/media-sound/wavsplit/wavsplit-1.2.1.ebuild
index 756e69335526..43fcaafa50d5 100644
--- a/media-sound/wavsplit/wavsplit-1.2.1.ebuild
+++ b/media-sound/wavsplit/wavsplit-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/media-sound/wavsplit/wavsplit-1.2.1.ebuild,v 1.1 2005/01/18 20:26:39 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/wavsplit/wavsplit-1.2.1.ebuild,v 1.1.1.1 2005/11/30 09:38:32 chriswhite Exp $
 
 inherit eutils
 
@@ -28,6 +28,6 @@ src_unpack() {
 src_install() {
 	dobin wavsplit wavren
 	doman wavsplit.1 wavren.1
-	dodoc BUGS CHANGES COPYING CREDITS README README.wavren
+	dodoc BUGS CHANGES CREDITS README README.wavren
 }
 
diff --git a/media-sound/wmsound-data/ChangeLog b/media-sound/wmsound-data/ChangeLog
index 3ce922da6178..d24a98368fc2 100644
--- a/media-sound/wmsound-data/ChangeLog
+++ b/media-sound/wmsound-data/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for media-sound/wmsound-data
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/wmsound-data/ChangeLog,v 1.1 2004/07/22 00:23:34 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/wmsound-data/ChangeLog,v 1.1.1.1 2005/11/30 09:38:42 chriswhite Exp $
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  wmsound-data-1.0.0.ebuild:
+  Stable amd64, sparc.
+
+  03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  wmsound-data-1.0.0.ebuild:
+  Added ~amd64, ~sparc.  Stable x86.
+
+  14 Aug 2004; Sven Wegener <swegener@gentoo.org> metadata.xml:
+  Corrected metadata.xml to match DTD.
+
+  22 Jul 2004; David Holm <dholm@gentoo.org> wmsound-data-1.0.0.ebuild:
+  Added to ~ppc.
 
 *wmsound-data-1.0.0 (22 Jul 2004)
 
diff --git a/media-sound/wmsound-data/Manifest b/media-sound/wmsound-data/Manifest
index bbf2b1875ce4..038e030780c8 100644
--- a/media-sound/wmsound-data/Manifest
+++ b/media-sound/wmsound-data/Manifest
@@ -1,6 +1,6 @@
-MD5 1ef5f5255d86aa3c6e6704767fcf78f7 wmsound-data-1.0.0.ebuild 926
-MD5 5171de8693807e5401c1ab48fc8aeb71 ChangeLog 378
-MD5 c699f693ce8c8d7acecf19bb077d203e metadata.xml 252
+MD5 dce64df06de625619af4da4f7f9a1bff ChangeLog 906
+MD5 05e0de5fb286479de6e21e109736e715 metadata.xml 252
+MD5 eb54145d493aeadfb7a8252997f30402 wmsound-data-1.0.0.ebuild 1101
+MD5 6ebb686993e5389ff62acef3947a5a34 files/WMSound 548
 MD5 dfd99abbbed5fb6043f205b03b5a5710 files/digest-wmsound-data-1.0.0 126
 MD5 3ab0a2dfe0b3d5a2b1b3182968a19ed3 files/wmsound-soundset 312
-MD5 6ebb686993e5389ff62acef3947a5a34 files/WMSound 548
diff --git a/media-sound/wmsound-data/metadata.xml b/media-sound/wmsound-data/metadata.xml
index ac9106a2cbad..4cfaa5d73da6 100644
--- a/media-sound/wmsound-data/metadata.xml
+++ b/media-sound/wmsound-data/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>sound</herd>
 <maintainer>
-  <name>Michele Noberasco</name>
   <email>s4t4n@gentoo.org</email>
+  <name>Michele Noberasco</name>
 </maintainer>
 </pkgmetadata>
diff --git a/media-sound/wmsound-data/wmsound-data-1.0.0.ebuild b/media-sound/wmsound-data/wmsound-data-1.0.0.ebuild
index 84d6d9b5141a..6a2a6eac639c 100644
--- a/media-sound/wmsound-data/wmsound-data-1.0.0.ebuild
+++ b/media-sound/wmsound-data/wmsound-data-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/media-sound/wmsound-data/wmsound-data-1.0.0.ebuild,v 1.1 2004/07/22 00:23:34 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/wmsound-data/wmsound-data-1.0.0.ebuild,v 1.1.1.1 2005/11/30 09:38:42 chriswhite Exp $
 
 IUSE=""
 
@@ -13,13 +13,16 @@ DEPEND=">=x11-wm/windowmaker-0.80.2-r2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc amd64 sparc"
 
 S1=${WORKDIR}/Sounds
 S2=${WORKDIR}/SoundSets
 
-src_install()
-{
+src_compile() {
+	einfo "Nothing to compile"
+}
+
+src_install() {
 	insinto /usr/share/WindowMaker/Defaults
 	doins ${FILESDIR}/WMSound
 
diff --git a/media-sound/workman/ChangeLog b/media-sound/workman/ChangeLog
index d51436bb0b58..29873a209831 100644
--- a/media-sound/workman/ChangeLog
+++ b/media-sound/workman/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for media-sound/workman
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/workman/ChangeLog,v 1.1 2004/10/07 09:22:44 trapni Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/workman/ChangeLog,v 1.1.1.1 2005/11/30 09:38:44 chriswhite Exp $
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> workman-1.3.4.ebuild:
+  Added to ~ppc.
+
+  07 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  workman-1.3.4.ebuild:
+  ~sparc -amd64.
+
+  07 Oct 2004; Christian Parpart <trapni@gentoo.org> :
+  * upgraded topatchset 17
+  * use mirror in URI
+  * minor typo fixes
 
   07 Oct 2004; Christian Parpart <trapni@gentoo.org> :
   Original ebuild submitted by Matija Suklje <matija.suklje@rutka.net>
diff --git a/media-sound/workman/Manifest b/media-sound/workman/Manifest
index ab67beb78c95..cb5ae5bc42cc 100644
--- a/media-sound/workman/Manifest
+++ b/media-sound/workman/Manifest
@@ -1,2 +1,4 @@
-MD5 0a80ed16923a4caf95e3a6629255ed53 workman-1.3.4.ebuild 1466
-MD5 912887e45cc8cede9ddc9d47e68f7bc6 files/digest-workman-1.3.4 138
+MD5 865666a461c5714d57b172b557a8769d ChangeLog 682
+MD5 05ab4d4775083f0930841e415df18ad6 metadata.xml 160
+MD5 227aeb6c6b8420d618a15a20420a33be workman-1.3.4.ebuild 1271
+MD5 3c168de039634f9f132518cd40c49ccc files/digest-workman-1.3.4 138
diff --git a/media-sound/workman/files/digest-workman-1.3.4 b/media-sound/workman/files/digest-workman-1.3.4
index 2c92e30d2430..8d71750ad467 100644
--- a/media-sound/workman/files/digest-workman-1.3.4
+++ b/media-sound/workman/files/digest-workman-1.3.4
@@ -1,2 +1,2 @@
 MD5 061cd5ea7c27068f29e5793255c7e01b workman_1.3.4.orig.tar.gz 209019
-MD5 5ee5a1d771947c7d97e19c3eb887d19f workman_1.3.4-16.diff.gz 26933
+MD5 b599070388c43bf1e71e0596801d41f8 workman_1.3.4-17.diff.gz 27323
diff --git a/media-sound/workman/workman-1.3.4.ebuild b/media-sound/workman/workman-1.3.4.ebuild
index 480954506f4e..ef7a1d6dfe82 100644
--- a/media-sound/workman/workman-1.3.4.ebuild
+++ b/media-sound/workman/workman-1.3.4.ebuild
@@ -1,43 +1,31 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/workman/workman-1.3.4.ebuild,v 1.1 2004/10/07 09:22:44 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/workman/workman-1.3.4.ebuild,v 1.1.1.1 2005/11/30 09:38:44 chriswhite Exp $
 
-inherit eutils
-
-DESCRIPTION="Graphical tool for playing audio CDs on a CD-ROM drive"
+IUSE=""
 
-# I've crawled the web for a homepage of workman, I found alot users using it
-# on solaris/debian/etc, however, no (official) homepage available.
-# instead, I'll just point $HOMEPAGE to the mainpage of the author. (trapni)
-#HOMEPAGE="http://www.midwinter.com/WorkMan"
-#HOMEPAGE="http://www.midwinter.com/~workman/index.html"
-HOMEPAGE="http://www.midwinter.com/"
+inherit eutils
 
-# This is our compound patch derived from debian. We use it because:
-#  * No more updates come from midwinter.com, no more workman seems to be on their site
-#  * It does little harm, only some defaults are changed which we can redefine anyway
-SRC_PATCH="${P/-/_}-16.diff"
+SRC_PATCH="${P/-/_}-17.diff"
 
-# We use the xview tarball available from debian because the original ftp is dead
-# original source: ftp://ftp.midwinter.com/WorkMan/workman-1.3.4.tar.gz
-SRC_URI="http://ftp.debian.org/pool/main/w/workman/${PN}_${PV}.orig.tar.gz
-		 http://ftp.debian.org/pool/main/w/workman/${SRC_PATCH}.gz"
+DESCRIPTION="Graphical tool for playing audio CDs on a CD-ROM drive"
+HOMEPAGE="http://packages.qa.debian.org/w/workman.html"
+SRC_URI="mirror://debian/pool/main/w/workman/${PN}_${PV}.orig.tar.gz
+	 mirror://debian/pool/main/w/workman/${SRC_PATCH}.gz"
 
 LICENSE="GPL-2"
-
 SLOT="0"
-IUSE=""
+#-amd64: 1.3.4: nothing displayed - eradicator
+KEYWORDS="-amd64 ~ppc ~sparc ~x86"
 
-DEPEND="
-	>=x11-libs/xview-3.2
-	sys-apps/groff
-"
-
-KEYWORDS="-* ~x86"
+DEPEND=">=x11-libs/xview-3.2
+	sys-apps/groff"
 
 src_unpack() {
 	unpack ${A}
-	epatch ${SRC_PATCH}
+
+	cd ${S}
+	epatch ${WORKDIR}/${SRC_PATCH}
 }
 
 src_compile() {
@@ -62,6 +50,6 @@ src_install() {
 
 pkg_postinst() {
 	einfo
-	einfo "You need to have created /dev/cdrom with read/executable permissions"
+	einfo "Please ensure the existence of /dev/cdrom with proper read permissions."
 	einfo
 }
diff --git a/media-sound/xmcd/ChangeLog b/media-sound/xmcd/ChangeLog
index 0058c1e4647f..582e7e707551 100644
--- a/media-sound/xmcd/ChangeLog
+++ b/media-sound/xmcd/ChangeLog
@@ -1,6 +1,51 @@
 # ChangeLog for media-sound/xmcd
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmcd/ChangeLog,v 1.1 2004/03/06 12:35:05 eradicator Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmcd/ChangeLog,v 1.1.1.1 2005/11/30 09:37:57 chriswhite Exp $
+
+  24 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> xmcd-3.3.2.ebuild:
+  Little cleanups.
+
+  24 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> xmcd-3.3.2.ebuild:
+  Don't call chown with root:root.
+
+  28 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -files/xmcd-3.2.1-gentoo.patch, -xmcd-3.2.1-r1.ebuild, xmcd-3.3.2.ebuild:
+  Dont make use of the deprecated oggvorbis useflag any longer, see #94254.
+
+  29 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> xmcd-3.3.2.ebuild:
+  Fixed patch to be correct version... see bug #65787.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> xmcd-3.3.2.ebuild:
+  get_libdir updates.  Fix bug #60734.  Stable amd64.
+
+  18 Jun 2004; Jason Wever <weeve@gentoo.org> xmcd-3.3.2.ebuild:
+  Stable on sparc.
+
+  01 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org> xmcd-3.3.2.ebuild:
+  Stable x86.
+
+  10 May 2004; Daniel Ahlberg <aliz@gentoo.org> xmcd-3.3.2.ebuild:
+  Added amd64 keyword, closing #49718.
+
+  02 May 2004; Jeremy Huddleston <eradicator@gentoo.org> xmcd-3.3.2.ebuild:
+  Added to ~sparc.
+
+*xmcd-3.3.2 (02 May 2004)
+
+  02 May 2004; Jeremy Huddleston <eradicator@gentoo.org> xmcd-3.3.2.ebuild:
+  Version bump.  Closes bug #43939.
+
+*xmcd-3.2.1-r1 (20 Apr 2004)
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> xmcd-3.2.1-r1.ebuild,
+  xmcd-3.2.1.ebuild:
+  Fixed gracenote->x86 use statent on install.  QA fixes.
+
+  08 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> xmcd-3.2.1.ebuild:
+  Stable x86.
+
+  07 Mar 2004; David Holm <dholm@gentoo.org> xmcd-3.2.1.ebuild:
+  Added to ~ppc.
 
 *xmcd-3.2.1 (04 Mar 2004)
 
diff --git a/media-sound/xmcd/Manifest b/media-sound/xmcd/Manifest
index 0d27f27fbdf1..05df67ce4868 100644
--- a/media-sound/xmcd/Manifest
+++ b/media-sound/xmcd/Manifest
@@ -1,3 +1,15 @@
-MD5 282cb8aa929021ba08441d826428a4d1 xmcd-3.2.1.ebuild 3523
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7675c1656fbd88cee7a7f521d6368920 ChangeLog 2017
+MD5 173e805a0231804696522712724e436b xmcd-3.3.2.ebuild 3866
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 fc905fdc8e827efddb8da8e4973914d2 files/digest-xmcd-3.2.1 126
+MD5 b54e3803073e1e4f961bb0e66d322647 files/digest-xmcd-3.3.2 127
+MD5 b6909e49017277bdc8ed33c65f9d282c files/xmcd-3.3.2-gentoo.patch 8407
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDDJ3xj5H05b2HAEkRAvRfAJ4xtwXfVHyj32cxlJWB3C93HIGKIgCeMuMb
+KSA+aFXaxNGJ02Vgpyuu4JI=
+=Ya5R
+-----END PGP SIGNATURE-----
diff --git a/media-sound/xmcd/xmcd-3.3.2.ebuild b/media-sound/xmcd/xmcd-3.3.2.ebuild
index 2cbc59700ffb..af99e0c68037 100644
--- a/media-sound/xmcd/xmcd-3.3.2.ebuild
+++ b/media-sound/xmcd/xmcd-3.3.2.ebuild
@@ -1,42 +1,37 @@
-# 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/media-sound/xmcd/xmcd-3.3.2.ebuild,v 1.1 2004/05/02 19:34:31 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmcd/xmcd-3.3.2.ebuild,v 1.1.1.1 2005/11/30 09:37:57 chriswhite Exp $
 
 inherit eutils
 
-IUSE="alsa encode oggvorbis"
+IUSE="alsa encode vorbis"
 
 SUPPLIB="cddb2supplib"
 DESCRIPTION="Xmcd is a full-featured CD Player and Ripper software package."
 HOMEPAGE="http://www.ibiblio.org/tkan/xmcd/"
 SRC_URI="http://www.ibiblio.org/tkan/download/${PN}/${PV}/src/${P}.tar.gz
-	 http://www.ibiblio.org/tkan/download/cddb2supp/${PV}/lib/linux-x86-libc6/${SUPPLIB}.tar.gz"
+	 x86? (
+	 	http://www.ibiblio.org/tkan/download/cddb2supp/${PV}/lib/linux-x86-libc6/${SUPPLIB}.tar.gz
+	 )"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc sparc amd64"
 
+# block media-libs/libcddb for now, see bug #90945
 DEPEND="virtual/x11
 	x11-libs/openmotif
+	media-libs/flac
+	!media-libs/libcddb
 	alsa? ( media-libs/alsa-lib )
 	encode? ( >=media-sound/lame-3.93.1 )
-	oggvorbis? ( >=media-libs/libvorbis-1.0 )"
+	vorbis? ( >=media-libs/libvorbis-1.0 )"
 
 src_unpack() {
-
-	ebegin "Unpacking ${P} source tarball"
-		unpack ${P}.tar.gz > /dev/null
-	eend 0
-
-	if use x86
-	then
-		ebegin "Unpacking Gracenote CDDB� support package"
-			unpack ${SUPPLIB}.tar.gz > /dev/null
-		eend 0
-	fi
+	unpack ${A}
 
 	cd ${S}
-	epatch ${FILESDIR}/${PN}-3.2.1-gentoo.patch || die
+	epatch ${FILESDIR}/${P}-gentoo.patch
 }
 
 src_compile() {
@@ -52,29 +47,29 @@ src_install() {
 	# shamelessly culled from SuSE .spec file...
 	ebegin "Running install script"
 		BATCH_BINDIR=${D}/usr/X11R6/bin \
-		BATCH_LIBDIR=${D}/usr/X11R6/lib/X11 \
-		BATCH_XMCDLIB=${D}/usr/X11R6/lib/X11/xmcd \
+		BATCH_LIBDIR=${D}/usr/X11R6/$(get_libdir)/X11 \
+		BATCH_XMCDLIB=${D}/usr/X11R6/$(get_libdir)/X11/xmcd \
 		BATCH_MANDIR=${D}/usr/X11R6/man/man1 \
 		BATCH_CDDBDIR=${D}/var/lib/xmcd/cddb \
 		BATCH_DISCOGDIR=${D}/var/lib/xmcd/discog \
-		sh install.sh -n -b
+		sh install.sh -n -b || die
 	eend 0
 
-	dodir /usr/lib
 	for lib in libcddb.so.1 libcddb.a libcddbkey1.a libcddbkey2.a; do
-		cp ${S}/cddb_d/${lib} ${D}/usr/lib
+		dolib cddb_d/${lib}
 	done
-	dosym libcddbkey2.a /usr/lib/libcddbkey.a
-	dosym libcddb.so.1 /usr/lib/libcddb.so
+
+	dosym libcddbkey2.a /usr/$(get_libdir)/libcddbkey.a
+	dosym libcddb.so.1 /usr/$(get_libdir)/libcddb.so
 
 	# a small fixup...
-	rm -rf ${D}/usr/X11R6/lib/X11/xmcd/docs
+	rm -rf ${D}/usr/X11R6/$(get_libdir)/X11/xmcd/docs
 	dodir etc
-	dosym ../usr/X11R6/lib/X11/xmcd/config /etc/xmcd
+	dosym ../usr/X11R6/$(get_libdir)/X11/xmcd/config /etc/xmcd
 
 	# move binaries to correct place
 	ebegin "Moving binaries to target location"
-		(cd ${D}/usr/X11R6/lib/X11/xmcd/bin-*;
+		(cd ${D}/usr/X11R6/$(get_libdir)/X11/xmcd/bin-*;
 		 sed -e "s@${D}@@g" \
 		 < ${D}/usr/X11R6/bin/.xmcd_start > start
 		 cp start ${D}/usr/X11R6/bin/.xmcd_start
@@ -84,24 +79,24 @@ src_install() {
 		(cd ${D}/usr/X11R6/bin; \
 		 ln -s ../lib/X11/xmcd/bin-*/start xmcd; \
 		 ln -s ../lib/X11/xmcd/bin-*/start cda)
-		cp ${D}/usr/X11R6/lib/X11/xmcd/config/common.cfg \
-		   ${D}/usr/X11R6/lib/X11/xmcd/config/cdrom
+		cp ${D}/usr/X11R6/$(get_libdir)/X11/xmcd/config/common.cfg \
+		   ${D}/usr/X11R6/$(get_libdir)/X11/xmcd/config/cdrom
 		for i in config/config.sh scripts/genidx ; do
 		 sed -e "s@${D}@@g" \
-		 < ${D}/usr/X11R6/lib/X11/xmcd/$i \
-		 > ${D}/usr/X11R6/lib/X11/xmcd/$i.tmp
-		 mv ${D}/usr/X11R6/lib/X11/xmcd/$i.tmp \
-		    ${D}/usr/X11R6/lib/X11/xmcd/$i
+		 < ${D}/usr/X11R6/$(get_libdir)/X11/xmcd/$i \
+		 > ${D}/usr/X11R6/$(get_libdir)/X11/xmcd/$i.tmp
+		 mv ${D}/usr/X11R6/$(get_libdir)/X11/xmcd/$i.tmp \
+		    ${D}/usr/X11R6/$(get_libdir)/X11/xmcd/$i
 		done
 	eend 0
 
 	ebegin "Fixing ownership and permissions"
 		# fix ownership
-		chown -R root:root ${D}
+		chown -R root:0 ${D}
 		# remove setuid bit
-		chmod 0755 ${D}/usr/X11R6/lib/X11/xmcd/bin-*/{cda,xmcd,start,gobrowser}
-		chmod 0755 ${D}/usr/X11R6/lib/X11/xmcd/config/config.sh
-		chmod 0755 ${D}/usr/X11R6/lib/X11/xmcd/scripts/genidx
+		chmod 0755 ${D}/usr/X11R6/$(get_libdir)/X11/xmcd/bin-*/{cda,xmcd,start,gobrowser}
+		chmod 0755 ${D}/usr/X11R6/$(get_libdir)/X11/xmcd/config/config.sh
+		chmod 0755 ${D}/usr/X11R6/$(get_libdir)/X11/xmcd/scripts/genidx
 		# change perms
 		chmod 0644 ${D}/var/lib/xmcd/discog/index.html
 		chmod 0644 ${D}/var/lib/xmcd/discog/*/*/index.html
@@ -109,32 +104,32 @@ src_install() {
 
 	if use x86
 	then
-		ebegin "Adding Gracenote CDDB� support"
-			exeinto /usr/X11R6/lib/X11/xmcd/lib-Linux-i686
+		ebegin "Adding Gracenote CDDB² support"
+			exeinto /usr/X11R6/$(get_libdir)/X11/xmcd/lib-Linux-i686
 			doexe ${WORKDIR}/${P}/cddb_d/libcddb.so.1
-			dosym libcddb.so.1 /usr/X11R6/lib/X11/xmcd/lib-Linux-i686/libcddb.so
+			dosym libcddb.so.1 /usr/X11R6/$(get_libdir)/X11/xmcd/lib-Linux-i686/libcddb.so
 		eend 0
 	fi
 
 	# install documentation
 	dodoc docs_d/*
-	dosym ../../../../../usr/share/doc/${P} /usr/X11R6/lib/X11/xmcd/docs
+	dosym ../../../../../usr/share/doc/${P} /usr/X11R6/$(get_libdir)/X11/xmcd/docs
 }
 
 pkg_postinst() {
 
-	einfo ""
+	einfo
 	einfo "Don't forget to run ${ROOT}etc/xmcd/config.sh"
 	einfo "as root to configure your CD devices!"
-	einfo ""
+	einfo
 
 }
 
 pkg_postrm() {
 
-	einfo ""
+	einfo
 	einfo "Old discographies found in ${ROOT}var/lib/xmcd can safely be deleted."
 	einfo "Old CD configurations in ${ROOT}etc/xmcd can safely be deleted."
-	einfo ""
+	einfo
 
 }
diff --git a/media-sound/xmms/ChangeLog b/media-sound/xmms/ChangeLog
index 94754e6fd236..da1fee9a59af 100644
--- a/media-sound/xmms/ChangeLog
+++ b/media-sound/xmms/ChangeLog
@@ -1,13 +1,857 @@
 # ChangeLog for media-sound/xmms
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/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/media-sound/xmms/ChangeLog,v 1.1.1.1 2005/11/30 09:38:31 chriswhite Exp $
 
-*xmms-1.2.6-r1 (1 Feb 2002)
+  06 Nov 2005; Luis Medinas <metalgod@gentoo.org> files/xmms.desktop:
+  Fixing xmms.desktop file in order to use it on gnome 2.12.
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  18 Oct 2005; Luis Medinas <metalgod@gentoo.org> metadata.xml:
+  Added myself as new maintainer.
+
+  02 Oct 2005; Hardave Riar <hardave@gentoo.org> xmms-1.2.10-r15.ebuild:
+  Stable on mips.
+
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> xmms-1.2.10-r15.ebuild:
+  Mark 1.2.10-r15 stable on alpha
+
+  24 Aug 2005; Aron Griffis <agriffis@gentoo.org> xmms-1.2.10-r15.ebuild:
+  stable on ia64
+
+  13 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  xmms-1.2.10-r15.ebuild:
+  Stable on ppc.
+
+  08 Aug 2005; Markus Rothe <corsair@gentoo.org> xmms-1.2.10-r15.ebuild:
+  Stable on ppc64
+
+  01 Aug 2005; Guy Martin <gmsoft@gentoo.org> xmms-1.2.10-r15.ebuild:
+  Stable on hppa.
+
+  24 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org> files/xmms.desktop:
+  Fixed .desktop file to work as expected with gnome-2.10.
+
+  24 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -xmms-1.2.8-r4.ebuild, -xmms-1.2.10-r13.ebuild, xmms-1.2.10-r15.ebuild:
+  Stable amd64, sparc, and x86. Using automake-1.9 to address bug #94821.
+  Removing old versions.
+
+  12 Jul 2005; Stephen P. Becker <geoman@gentoo.org> xmms-1.2.10-r14.ebuild:
+  stable on mips
+
+  12 Jun 2005; Bryan Østergaard <kloeri@gentoo.org> xmms-1.2.10-r14.ebuild:
+  Stable on alpha.
+
+  06 Jun 2005; Markus Rothe <corsair@gentoo.org> xmms-1.2.10-r14.ebuild:
+  Stable on ppc64
+
+  31 May 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-1.2.8-r4.ebuild, xmms-1.2.10-r13.ebuild, xmms-1.2.10-r14.ebuild,
+  xmms-1.2.10-r15.ebuild:
+  Switch to vorbis USE flag instead of deprecated oggvorbis one.
+
+  27 May 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-1.2.10-r15.ebuild:
+  Looks good, so moving to ~arch.
+
+*xmms-1.2.10-r15 (27 May 2005)
+
+  27 May 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-1.2.10-r13.ebuild, xmms-1.2.10-r14.ebuild, +xmms-1.2.10-r15.ebuild:
+  Version bump updates xmms with various bugfixes in upstream cvs. Also
+  pulling in xmms-mpg123 even when we have USE=mad because it's just better...
+
+  22 May 2005; Guy Martin <gmsoft@gentoo.org> :
+  Stable on hppa.
+
+  12 May 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  xmms-1.2.10-r14.ebuild:
+  Stable on ppc.
+
+  09 May 2005; Aron Griffis <agriffis@gentoo.org> xmms-1.2.10-r14.ebuild:
+  stable on ia64
+
+  03 May 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-1.2.10-r14.ebuild:
+  Fixed compilation with gcc2. Closes bug #86469 thanks to Matt Taylor
+  <liverbugg@juno.com>.  Stable amd64, sparc, x86.
+
+*xmms-1.2.10-r14 (16 Apr 2005)
+
+  16 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +xmms-1.2.10-r14.ebuild:
+  Randomize selection and bugfix for playcd function.
+
+  12 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-1.2.8-r4.ebuild, -xmms-1.2.10-r5.ebuild:
+  Remove old versions.  Leaving 1.2.8 version for mips only.
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org> xmms-1.2.10-r13.ebuild:
+  Stable on ppc64
+
+  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  xmms-1.2.10-r13.ebuild:
+  Stable on ppc.
+
+  19 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> xmms-1.2.10-r13.ebuild:
+  Stable on alpha.
+
+  13 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-1.2.10-r13.ebuild:
+  Stable sparc, x86. Included more .m4s so it can work with older gettext
+  versions properly.
+
+  28 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-1.2.10-r13.ebuild, -xmms-1.2.10-r12.ebuild:
+  Stable amd64.  Removing old version.
+
+  21 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-1.2.10-r13.ebuild:
+  Added check for gettext version to satisfy bug #82412.
+
+  14 Feb 2005; Aron Griffis <agriffis@gentoo.org> xmms-1.2.10-r12.ebuild,
+  xmms-1.2.10-r13.ebuild:
+  Add ~alpha back into ebuilds to satisfy xmms-mpg123 dep
+
+*xmms-1.2.10-r13 (11 Feb 2005)
+
+  11 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +xmms-1.2.10-r13.ebuild:
+  This version is identical to 1.2.10-r12, but now all the plugins are
+  provided by external packages.
+
+  04 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-1.2.10-r12.ebuild:
+  Setting required gettext version to close bug #80664.
+
+*xmms-1.2.10-r12 (04 Feb 2005)
+
+  04 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -xmms-1.2.10-r11.ebuild, +xmms-1.2.10-r12.ebuild:
+  Fixed skinbrowser bug, added wheelscroll patch and cdplay patches.
+
+*xmms-1.2.10-r11 (03 Feb 2005)
+
+  03 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -xmms-1.2.10-r10.ebuild, +xmms-1.2.10-r11.ebuild:
+  Added patch for https:// streaming in mpg123 and vorbis. Added missing
+  autoconf function to m4. Closes bug #80372.
+
+  31 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-1.2.10-r10.ebuild:
+  Cleanup autotools stuff.
+
+*xmms-1.2.10-r10 (22 Jan 2005)
+
+  22 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/po-update.pl, +xmms-1.2.10-r10.ebuild:
+  Revbump to latest upstream cvs. Added a skin dir browser and numberic keypad
+  controls. This should fix bug #71262.
+
+  04 Jan 2005; Markus Rothe <corsair@gentoo.org> xmms-1.2.10-r5.ebuild,
+  xmms-1.2.10-r9.ebuild:
+  Optimazion >-O1 won't work on ppc64
+
+  12 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-1.2.10-r5.ebuild:
+  Added call to libtoolize.
+
+  09 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-1.2.10-r9.ebuild:
+  xmms-mad versioned DEP to fix bugs on popping and skipped starts.
+
+  08 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-1.2.10-r9.ebuild:
+  Fix gcc-2.95 compilation. Closes bug #70076. Thanks go to Matt Taylor
+  <liverbugg@juno.com> for keeping us honest.
+
+  31 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-1.2.10-r9.ebuild:
+  Removing .desktop from applnk.  Removed postinst ewarning.  Added check
+  for /dev/sound for bug #20647.
+
+*xmms-1.2.10-r9 (30 Oct 2004)
+
+  30 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -xmms-1.2.10-r7.ebuild, -xmms-1.2.10-r8.ebuild, +xmms-1.2.10-r9.ebuild:
+  Revision bump and removing from package.mask.  Added gcc-4 patch.
+
+  24 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-1.2.10-r8.ebuild:
+  Fixed a hang and a crash related to id3v2 tag support.
+
+  23 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-1.2.10-r8.ebuild:
+  Added id3v2 editor and cleaned up code a bit.
+
+  18 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-1.2.10-r8.ebuild:
+  Added ISO-8859-1 encoding patch.  Added sort by track length.
+
+  14 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-1.2.10-r8.ebuild:
+  Using old xmms icon for desktop menu entries. Fixed gettext being in RDEPEND
+  instead of DEPEND. General cleanup.
+
+*xmms-1.2.10-r8 (13 Oct 2004)
+
+  13 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +xmms-1.2.10-r8.ebuild:
+  Updated to latest cvs upstream and dropped many gentoo patches that were
+  incorporated upstream from the patchset and recreated others to apply
+  against the new version. This release is currently missing cjk support, and
+  will be in package.mask atleast until cjk support is readded. Simplified
+  patching to use the epatch directory support. Added README.patches to
+  replace comments in ebuild.
+
+*xmms-1.2.10-r7 (08 Oct 2004)
+
+  08 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -xmms-1.2.10-r6.ebuild, +xmms-1.2.10-r7.ebuild:
+  Fix hanging in mpg123 input when id3tag is corrupt.  See bug #66596.
+
+  03 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-1.2.10-r6.ebuild:
+  We don't need to run auto* since we're not using dtd any more. Back to using
+  elibtoolize. 
+
+  03 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> :
+  Display streamcast titles by default.  Closes bug #62568.
+
+*xmms-1.2.10-r6 (30 Sep 2004)
+
+  30 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +xmms-1.2.10-r6.ebuild:
+  Now using unicode patch instead of recode patch as it has been accepted
+  upstream. Added a patch to hide xmms on the task bar if xmms-status-plugin
+  is enabled. Added --show-jump-box command line arg. Added patch to fix
+  libjoy related crash. Closes bugs #55398, #57755, #59863, #63168, #64367.
+
+  05 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-1.2.10-r5.ebuild, xmms-1.2.8-r4.ebuild:
+  Added inherit gnuconfig to close bug #62744.
+
+  23 Aug 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -xmms-1.2.10-r1.ebuild:
+  Removing old version.
+
+  18 Aug 2004; Aron Griffis <agriffis@gentoo.org> xmms-1.2.10-r5.ebuild:
+  stable on alpha and ia64
+
+  28 Jul 2004; Tom Gall <tgall@gentoo.org> xmms-1.2.10-r5.ebuild:
+  stable on ppc64, bug #55076
+
+  08 Jul 2004; Hardave Riar <hardave@gentoo.org> xmms-1.2.10-r5.ebuild:
+  Added ~mips KEYWORD
+
+  05 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -xmms-1.2.10-r3.ebuild, -xmms-1.2.10-r4.ebuild, -xmms-1.2.9-r2.ebuild:
+  Cleaning up version clutter.
+
+  05 Jul 2004; Lars Weiler <pylon@gentoo.org> xmms-1.2.10-r5.ebuild:
+  Stable on ppc.
+
+  30 Jun 2004; Guy Martin <gmsoft@gentoo.org> xmms-1.2.10-r5.ebuild:
+  Marked stable on hppa.
+
+  22 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-1.2.10-r5.ebuild:
+  Moving bugfixes into stable 86, amd64, and sparc.
+
+*xmms-1.2.10-r5 (18 Jun 2004)
+
+  18 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +xmms-1.2.10-r5.ebuild:
+  Allow NULL titles to be passed to xmms_charset_recode_id3(). Closes bug
+  #49273.
+
+*xmms-1.2.10-r4 (15 Jun 2004)
+
+  15 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +xmms-1.2.10-r4.ebuild:
+  Fixed gcc3.4/C++ problem in xmmsctrl.h. See bug #53125.
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org> xmms-1.2.8-r4.ebuild,
+  xmms-1.2.9-r2.ebuild:
+  Fix use invocation
+
+*xmms-1.2.10-r3 (31 May 2004)
+
+  31 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-1.2.10-r2.ebuild, xmms-1.2.10-r3.ebuild:
+  Fixes bugs #46900, #47761, #48891, and hopefully #51080.
+
+  14 May 2004; Stephen P. Becker <geoman@gentoo.org> xmms-1.2.8-r4.ebuild:
+  Stable on mips.
+
+  22 Apr 2004; Travis Tilley <lv@gentoo.org> xmms-1.2.10-r1.ebuild:
+  stable on amd64
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> xmms-1.2.8-r4.ebuild:
+  QA fixes.
+
+  12 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-1.2.10-r1.ebuild, xmms-1.2.10-r2.ebuild, xmms-1.2.8-r4.ebuild,
+  xmms-1.2.9-r2.ebuild:
+  Fix automake problem in bug #40341 by adding sys-devel/gettext DEP.
+
+  08 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-1.2.10-r1.ebuild, xmms-1.2.10-r2.ebuild, xmms-1.2.8-r4.ebuild,
+  xmms-1.2.9-r2.ebuild:
+  Removing block on removed alsa plugin package.
+
+  06 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-1.2.10-r2.ebuild:
+  oss USE flag for making the oss output plugin.
+
+  06 Apr 2004; Gustavo Zacarias <gustavoz@gentoo.org> xmms-1.2.10-r1.ebuild:
+  Stable on sparc
+
+*xmms-1.2.10-r2 (04 Apr 2004)
+
+  04 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-1.2.10-r2.ebuild:
+  elibtoolize. fix bug #45720.  update to latest recode patch.
+
+  04 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-1.2.7-r23.ebuild, xmms-1.2.7-r25.ebuild:
+  Removing old ebuilds.
+
+  03 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-1.2.10-r1.ebuild:
+  Stable on x86.
+
+  03 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-1.2.10-r1.ebuild:
+  Stable on x86.
+
+  31 Mar 2004; Chris Aniszczyk <zx@gentoo.org> xmms-1.2.10-r1.ebuild:
+  Stable on hppa.
+
+  20 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> xmms-1.2.10.ebuild,
+  xmms-1.2.8-r3.ebuild, xmms-1.2.9-r1.ebuild:
+  Removing old ebuilds.
+
+  15 Mar 2004; Stephen P. Becker <geoman@gentoo.org> xmms-1.2.9-r2.ebuild:
+  Added ~mips keyword.
+
+  11 Mar 2004; Lars Weiler <pylon@gentoo.org> xmms-1.2.10-r1.ebuild:
+  stable on ppc
+
+*xmms-1.2.10-r1 (29 Feb 2004)
+
+  29 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-1.2.10-r1.ebuild, files/xmms.desktop:
+  Fixed .desktop menu items. Updated dtd patch to support multiple file
+  selection.
+
+  26 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> xmms-1.2.10.ebuild:
+  Fix off-by-one error re-introduced by dtd
+
+  26 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> xmms-1.2.10.ebuild:
+  Updated verbosity during aclocal/automake
+
+*xmms-1.2.10 (25 Feb 2004)
+
+  25 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> xmms-1.2.10.ebuild:
+  Version bump (Bug #42731).
+  Dtd now uses balanced tree.  This should clear up bug #31804.
+
+  25 Feb 2004; Sven Blumenstein <bazik@gentoo.org> xmms-1.2.8-r4.ebuild:
+  Stable on sparc.
+
+  24 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> xmms-1.2.8-r3.ebuild,
+  xmms-1.2.8-r4.ebuild, xmms-1.2.9-r1.ebuild, xmms-1.2.9-r2.ebuild:
+  Added blocker !media-plugins/xmms-alsa
+
+  24 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> xmms-1.2.8-r3.ebuild,
+  xmms-1.2.8-r4.ebuild, xmms-1.2.9-r1.ebuild, xmms-1.2.9-r2.ebuild:
+  Added alsa-lib to DEPEND
+
+  06 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> xmms-1.2.8-r4.ebuild:
+  Marking stable on x86
+
+  06 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> xmms-1.2.9-r1.ebuild,
+  xmms-1.2.9-r2.ebuild:
+  shading patch removed as a fix is in mainline 1.2.9
+
+  04 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> xmms-1.2.9-r2.ebuild:
+  Added patch to fix compilation in gcc2 provided in bug #40370 by Tristan
+  Henderson <T.Henderson@cs.ucl.ac.uk>.
+
+*xmms-1.2.9-r2 (03 Feb 2004)
+
+  03 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> xmms-1.2.7-r23.ebuild,
+  xmms-1.2.7-r25.ebuild, xmms-1.2.8-r3.ebuild, xmms-1.2.8-r4.ebuild,
+  xmms-1.2.9-r1.ebuild, xmms-1.2.9-r2.ebuild:
+  Updated ebuilds to request correct automake versions. Closes bug #40348.
+  Updated russian patch (now called recode patch) in 1.2.9-r2 to version csa27.
+  See bug #40103. Added patch from http://bugs.xmms.org/show_bug.cgi?id=1583 to
+  close bug #39456.
+
+  03 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-1.2.7-r23.ebuild, xmms-1.2.7-r25.ebuild, xmms-1.2.8-r3.ebuild,
+  xmms-1.2.8-r4.ebuild, xmms-1.2.9-r1.ebuild:
+  Moved intltool out of RDEPEND (into DEPEND). Updated 1.2.9-r1 to run aclocal
+  before automake to close bug #40341.
+
+  03 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-1.2.7-r23.ebuild, xmms-1.2.7-r25.ebuild, xmms-1.2.8-r3.ebuild,
+  xmms-1.2.8-r4.ebuild:
+  adding !gtk2? check on gnome-panel dep as discussed to close bug #35060.
+
+  02 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> xmms-1.2.9-r1.ebuild:
+  Cleanup to remove some gnome cruft and now using make DESTDIR=${D} install
+  instead of einstall
+
+  02 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> xmms-1.2.9-r1.ebuild:
+  Removing gnome-panel dep since xmms no longer includes a gnome1 panel applet.
+
+*xmms-1.2.9-r1 (31 Jan 2004)
+
+  31 Jan 2004; Jeremy Huddleston <eradicator@gentoo.org> xmms-1.2.9-r1.ebuild,
+  xmms-1.2.9.ebuild, xmms-1.2.9_pre1.ebuild:
+  Fixed off-by-one bug that crept in with dtd/1.2.9 conflicting changes (closes
+  bug #40019). Updated random patch to fix compilation in gcc2.x (closes bug
+  #39877). Added id3v2 tag editor to mpg123 plugin (closes bug #39437). Removing
+  broken ebuilds.
+
+*xmms-1.2.8-r4 (30 Jan 2004)
+
+  30 Jan 2004; Jeremy Huddleston <eradicator@gentoo.org> xmms-1.2.8-r4.ebuild:
+  Updated dtd patch to fix multi-select segfault. Removed alsa debug messages to
+  close bug #29794
+
+  29 Jan 2004; Jeremy Huddleston <eradicator@gentoo.org> xmms-1.2.9.ebuild:
+  removed id3v2 patch and unmasked. The id3v2 patch causes an off-by-one error
+  when getting file info from the playlist... the patch provided at
+  http://bugs.xmms.org/show_bug.cgi?id=335 applied cleanly after the dtd patch,
+  so I'll have to look into it in more detail later.
+
+  29 Jan 2004; Jeremy Huddleston <eradicator@gentoo.org> xmms-1.2.9.ebuild:
+  masking because of bug in patchset.
+
+*xmms-1.2.9 (29 Jan 2004)
+
+  29 Jan 2004; Jeremy Huddleston <eradicator@gentoo.org> xmms-1.2.9.ebuild:
+  Version bump closes bug #39706. Added id3v2 patch to patchset closing bug
+  #39437.
+
+  28 Jan 2004; Aron Griffis <agriffis@gentoo.org> xmms-1.2.7-r23.ebuild,
+  xmms-1.2.7-r25.ebuild, xmms-1.2.8-r3.ebuild, xmms-1.2.9_pre1.ebuild:
+  ia64 keywords changes
+
+  25 Jan 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-1.2.9_pre1.ebuild:
+  Added patch to fix compilation using gcc2. Patch submitted to us in bug #39364
+  by Tristan Henderson <T.Henderson@cs.ucl.ac.uk>
+
+*xmms-1.2.9_pre1 (24 Jan 2004)
+
+  24 Jan 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-1.2.7-r20.ebuild, xmms-1.2.9_pre1.ebuild:
+  Removing crusty ebuild 1.2.7-r20 to close bug #31928. Bumping to latest xmms
+  version.
+
+  17 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> xmms-1.2.8-r3.ebuild:
+  manifest fix
+
+  16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> xmms-1.2.8-r3.ebuild:
+  set ppc in keywords
+
+  14 Jan 2004; Aron Griffis <agriffis@gentoo.org> xmms-1.2.7-r23.ebuild,
+  xmms-1.2.7-r25.ebuild:
+  Mark -r25 stable on alpha to fix bug 38116
+
+  05 Jan 2004; Jason Wever <weeve@gentoo.org> xmms-1.2.7-r23.ebuild:
+  Marked stable on sparc.
+
+  29 Dec 2003; Seemant Kulleen <seemant@gentoo.org> xmms-1.2.7-r23.ebuild:
+  move -r23 to stable x86 as there have not been any complaints about it.
+  Should close all the gettext related bugs about it, notably bug #36332 by
+  Craig Goodrich <craigg@hiwaay.net>
+
+  18 Dec 2003; Martin Holzer <mholzer@gentoo.org> xmms-1.2.7-r20.ebuild,
+  xmms-1.2.7-r23.ebuild:
+  adding 3dnow to download patch. closes 31842
+
+  01 Dec 2003; Seemant Kulleen <seemant@gentoo.org> xmms-1.2.7-r20.ebuild,
+  xmms-1.2.7-r23.ebuild, xmms-1.2.7-r25.ebuild,
+  files/xmms-1.2.7-mpg123j.patch, files/xmms-diskwriter-audio.patch,
+  files/xmms-fhs-skinsdir.patch, files/xmms-gettext-fix.patch,
+  files/xmms-ipv6-20020408-mmx.patch, files/xmms-ipv6-20020408-nommx.patch,
+  files/xmms-jump.patch, files/xmms-nptl.patch,
+  files/xmms-russian-charset.patch, files/xmms-sigterm.patch:
+  moved patches for 1.2.7 versions into tarball as well
+
+  01 Dec 2003; Seemant Kulleen <seemant@gentoo.org> xmms-1.2.8-r1.ebuild,
+  xmms-1.2.8-r2.ebuild, xmms-1.2.8-r3.ebuild, xmms-1.2.8.ebuild,
+  files/xmms-1.2.8-dtd.patch, files/xmms-1.2.8-jump.patch,
+  files/xmms-1.2.8-mpg123j.patch, files/xmms-1.2.8-random.patch,
+  files/xmms-1.2.8-russian-charset-csa20.patch,
+  files/xmms-1.2.8-russian-charset.patch, files/xmms-1.2.8-shadow.patch,
+  files/xmms-1.2.8-sid-songpos.patch, files/xmms-1.2.8-sigterm.patch:
+  removed older 1.2.8 ebuilds and moved the patches into a patch tarball on the
+  mirrors instead of bloating up files/
+
+  21 Nov 2003; Martin Holzer <mholzer@gentoo.org> xmms-1.2.8-r3.ebuild,
+  files/xmms-1.2.8-shadow.patch:
+  Closing #30420.
+
+  11 Nov 2003; Daniel Ahlberg <aliz@gentoo.org> xmms-1.2.8-r3.ebuild :
+  Disable simd on amd64.
+
+  26 Oct 2003; Sergey Kuleshov <svyatogor@gentoo.org>
+  files/xmms-1.2.8-russian-charset-csa20.patch:
+  Fixed bug 31984 - xmms-1.2.8-r3 Assertion `xmms_autocharset_changed>=0' failed.
+
+  25 Oct 2003; Sergey Kuleshov <svyatogor@gentoo.org>
+  files/xmms-1.2.8-russian-charset-csa20.patch:
+  Fixed a bug in russian-charset patch, which caused XMMS to crash when openning
+  files with names in UTF encoding.
+
+*xmms-1.2.8-r3 (24 Oct 2003)
+
+  24 Oct 2003; Sergey Kuleshov <svyatogor@gentoo.org> xmms-1.2.8-r3.ebuild,
+  files/xmms-1.2.8-russian-charset-csa20.patch:
+  Added new version of xmms-russian-charset patch, which solves many bugs (most
+  importantly the UTF ones) and has improved algorithms of encoding detection.
+  So bumped -r to -r3.
+
+  20 Sep 2003; jje <jje@gentoo.org> files/xmms-1.2.8-dtd.patch:
+  Removed chunk from the dtd patch that overrides the config. Closes #29029.
+
+  15 Sep 2003; Seemant Kulleen <seemant@gentoo.org>
+  files/xmms-1.2.8-mpg123j.patch:
+  the cjk patch was fixed, so now xmms will compile with cjk support turned on.
+  This is hopefully the last we'll see of issues with -r2. Thanks to: Michael
+  Dillon <gsvalore@lordlegacy.com> in the same bug report #28768
+
+  15 Sep 2003; Seemant Kulleen <seemant@gentoo.org>
+  files/xmms-1.2.8-dtd.patch:
+  Adjusted the dtd patch to not be dependent on the changes made by the russian
+  charset patch. Closes bug #28768 by IPGlider <ipglider@ipglider.org>
+
+  15 Sep 2003; Seemant Kulleen <seemant@gentoo.org> xmms-1.2.8-r2.ebuild,
+  files/xmms-1.2.8-sid-songpos.patch:
+  the songpos patch is beneficial to users of xmms-sid, in that this allows
+  playing of sub-songs. The patch comes courtesy of: Christoph Richter
+  <toph@abi2ooo.org> in bug #21067
+
+*xmms-1.2.8-r2 (14 Sep 2003)
+
+  14 Sep 2003; Seemant Kulleen <seemant@gentoo.org> xmms-1.2.8-r2.ebuild:
+  added the superior randomising patch. Bret Towe (magnade in #gentoo-dev)
+  <btowe@gbis.com> adapted this patch for us from the xmms bugzilla. All the
+  info is in bug #24137 by Lesley van Zijl <zyl@xs4all.nl>
+
+*xmms-1.2.8-r1 (12 Sep 2003)
+
+  12 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Added Dynamic Taste Detection #27967 and removed some of the elibtoolize
+  and autotools crud.
+
+*xmms-1.2.8 (12 Sep 2003)
+
+  12 Sep 2003; Seemant Kulleen <seemant@gentoo.org> xmms-1.2.8.ebuild,
+  files/xmms-1.2.8-mpg123j.patch:
+  version bump.  Note that this now comes with a sexy gentoo ice skin made
+  by: Jamie McDonald <jamie@firenet.uk.com>.  He releases this to us, for
+  Gentoo's exclusive use under the Artistic license.  Note to any other
+  distros, please get his permission before distributing the skin yourself.
+
+*xmms-1.2.7-r25 (16 Aug 2003)
+
+  18 Aug 2003; Joshua Kinard <kumba@gentoo.org> xmms-1.2.7-r25.ebuild:
+  Added use flag check for mips; If true, runs gnuconfig_update
+
+  18 Aug 2003; Joshua Kinard <kumba@gentoo.org> xmms-1.2.7-r25.ebuild:
+  Added ~mips to KEYWORDS
+
+  16 Aug 2003; jje <jje@gentoo.org> xmms-1.2.7-r25.ebuild,
+  files/xmms-nptl.patch:
+  Added nptl patch. See bug #26172.
+
+  10 Aug 2003; jje <jje@gentoo.org> xmms-1.2.7-r24.ebuild:
+  Fixed typo in SRC_URI fix. Moral? Don't change anything after you've tested...
+
+  09 Aug 2003; jje <jje@gentoo.org> xmms-1.2.7-r24.ebuild:
+  Fix SRC_URI to handle USE="3dnow -mmx". See #25255.
   
-  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.
+  Submitted by: Ricardo Cordeiro <Ricardo.Cordeiro@iscte.pt>
+
+*xmms-1.2.7-r24 (28 Jul 2003)
+
+  28 Jul 2003; Nick Hadaway <raker@gentoo.org> xmms-1.2.7-r24.ebuild,
+  files/xmms-diskwriter-audio.patch:
+  Adds a patch for running audio through output effect plugins
+  before recording to disk with the diskwriter plugin.  See bug #25380.
+
+  18 Jul 2003; Seemant Kulleen <seemant@gentoo.org> xmms-1.2.7-r23.ebuild:
+  gettext patch only applied if gettext-0.12 or greater is installed
+
+*xmms-1.2.7-r23 (18 Jul 2003)
+
+  22 Jul 2003; Guy Martin <gmsoft@gentoo.org> xmms-1.2.7-r23.ebuild :
+  Added hppa to KEYWORDS.
+
+  18 Jul 2003; Seemant Kulleen <seemant@gentoo.org> xmms-1.2.7-r23.ebuild,
+  files/xmms-fhs-skinsdir.patch, files/xmms-gettext-fix.patch:
+  fix for gettext-0.12 and nls in USE, closing bug #24472 by: Lisa Marie
+  <lisa@gentoo.org>. Note that the fix for that was provided by Paul
+  DeVrieze <pauldv@gentoo.org> based on the work by Alvari Figueroa
+  <fede2@fuerzag.ulatina.ac.cr>  Also, added /usr/local/share/xmms/Skins to the
+  search path for skins -- local sysadmins should create that directory and
+  add systemwide skins to there 
+
+*xmms-1.2.7-r22 (27 Jun 2003)
+ 
+  12 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
+  04 Jul 2003; jje <jje@gentoo.org> xmms-1.2.7-r20.ebuild:
+  Make the russian and japanese patches exclusive.
+
+  27 Jun 2003; robh <robh@gentoo.org> xmms-1.2.7-r22.ebuild:
+  Fixed russian cjk patch overlap. Fixes bug #23535. Thanks to jje :)
+
+  26 June 2003; <robh@gentoo.org> xmms-1.2.7-r22.ebuild:
+  Added support for Russian Charset. Thanks to Sergey Kuleshov. Closes #22194
+
+  26 May 2003; jje <jje@gentoo.org> xmms-1.2.7-r21.ebuild:
+  Removing previous revision, patch needs more work - it breaks things.
+
+  17 May 2003; jje <jje@gentoo.org> xmms-1.2.7-r21.ebuild,
+  files/xmms-1.2.7-songpos.patch:
+  Added song position patch for sid files.
+  
+  Submitted by: Christoph Richter <toph@abi2ooo.org>
+
+*xmms-1.2.7-r21 (17 May 2003)
+
+  17 Jun 2003; Guy Martin <gmsoft@gentoo.org> xmms-1.2.7-r21.ebuild :
+  Readded xmms-1.2.7-r21 from xmms-1.2.7-r20 but with ipv6 support for
+  non x86 arch. Fix #21830.
+
+  17 May 2003; jje <jje@gentoo.org> xmms-1.2.7-r21.ebuild:
+  Fix for people booting with gentoo=nodevfs - conditional setup defaults.
+  
+  Submitted by: Jacob <waif@kefka.org>
+
+*xmms-1.2.7-r20 (18 Apr 2003)
+
+  17 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
+  Rework ebuild to use `use_enable` and `use_with` instead of older styles.
+  Add filter-flags for large src files since xmms includes fts.h.
+
+  18 Apr 2003; Seemant Kulleen <seemant@gentoo.org> Manifest,
+  xmms-1.2.7-r20.ebuild:
+  made this more devfs friendly -- works even without devfsd running.
+  Thanks to a fix by: Tero Pelander <tpeland@tkukoulu.fi> in bug #19461
+
+  13 Mar 2003; Olivier Reisch <doctomoe@gentoo.org> xmms-1.2.7-r19.ebuild:
+  Mark stable on ppc
+
+  19 Jan 2003; Martin Schlemmer <azarah@gentoo.org> xmms-1.2.7-r18.ebuild :
+  Add patch to save playlist, etc on SIGTERM and SIGINT, bug #13604.
+
+*xmms-1.2.7-r19 (04 March 2003)
+
+  19 Mar 2003; Masatomo Nakano <nakano@gentoo.org> xmms-1.2.7-r19.ebuild,
+  files/xmms-1.2.7-mpg123j.patch:
+  Added Japanese support.
+
+  09 Mar 2003; Aron Griffis <agriffis@gentoo.org> xmms-1.2.7-r19.ebuild:
+  Mark stable on alpha
+
+  04 March 2003; Spider <spider@gentoo.org> xmms-1.2.7-r19.ebuild :
+  okay, I got a headache here, seems that einstall changed to include 
+  "libdir=${D}/usr/lib" in here, this caused xmms to install files into
+  the wrong dirs so no plugins were found. I hacked the ebuild around that 
+  and bumped the revision for those who had built it like me in the old sense
+
+
+*xmms-1.2.7-r18 (27 Dec 2002)
+
+  27 Dec 2002; Nick Hadaway <raker@gentoo.org> xmms-1.2.7-r18.ebuild,
+  files/digest-xmms-1.2.7-r18, files/xmms-ipv6-20020408-nommx.patch,
+  files/xmms-ipv6-20020408-mmx.patch :
+  Updated ebuild with the ipv6 patch split for the cases of mmx and
+  -mmx.  Thank azarah for bringing this to my attention. :)
+
+  27 Dec 2002; Martin Schlemmer <azarah@gentoo.org> xmms-1.2.7-r17.ebuild :
+  Remove the xmms-1.2.7-link-libstdc++.patch on request from XMMS developer
+  Olle Hällnäs <olle@xmms.org>.  Sorry about taking so long, but I forgot.
+
+*xmms-1.2.7-r17 (26 Dec 2002)
+
+  26 Dec 2002; Nick Hadaway <raker@gentoo.org> xmms-1.2.7-r17.ebuild,
+  files/digest-xmms-1.2.7-r17, files/xmms-ipv6-20020408.patch :
+  New ebuild with ipv6 support.  Now using epatch for all patches.
+
+  19 Dev 2002; Dean Bailey <alron@gentoo.org> : removed sparc64 keyword
+
+*xmms-1.2.7-r16 (15 Dec 2002)
+
+  15 Dec 2002; Seemant Kulleen <seemant@gentoo.org> xmms-1.2.7-r16.ebuild
+  files/xmms-jump.patch files/digest-xmms-1.2.7-r16 :
+
+  Added a patch to allow external programmes to pop up the "jump to file"
+  dialog box via xmmsctrl.h Many thanks to: novas007@gmx.net (Mike Lundy) in
+  bug #10821 for this.
+
+*xmms-1.2.7-r15 (14 Nov 2002)
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  14 Nov 2002; Mike Frysinger <vapier@gentoo.org> :
+  Made src_install delete ${D}/usr/lib/xmms/Input/libidcin.so.
+  It causes ppc users to crash and the xmms developers have removed
+  it from the distribution anyways.
+
+*xmms-1.2.7-r14 (17 Oct 2002)
+
+  17 Oct 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Add back the patch to link xmms against libstdc++, as some plugins
+  need it.
+
+*xmms-1.2.7-r13 (23 Aug 2002)
+
+  12 Oct 2002; Seemant Kulleen <seemant@gentoo.org> xmms-1.2.7-r13.ebuild :
+  Added directfb to IUSE.  XMMS doesn't need it, but will link to it if
+  present, so it needs to be recompiled if DirectFB is updated.
+
+  16 Sep 2002; Maarten Thibaut <murphy@gentoo.org> xmms-1.2.7-r13.ebuild :
+  Added sparc/sparc64 keywords. Revamped ChangeLog layout.
+
+  23 Aug 2002; Seemant Kulleen <seemant@gentoo.org> xmms-1.2.7-r13.ebuild
+  files/digest-xmms-1.2.7-r13 : Removed all avi stuff from xmms ebuild,
+  since the xmms folks have updated the avi-xmms plugin to be statically
+  compiled against avifile.
+
+  30 Aug 2002; Bart Verwilst <verwilst@gentoo.org>: Filtered out -fforce-addr
+  out of xmms, segfaults when trying to play a song otherwise
+
+*xmms-1.2.7-r12 (18 Jul 2002)
+
+  16 Sep 2002; Maarten Thibaut <murphy@gentoo.org> xmms-1.2.7-r12.ebuild : Added
+  sparc/sparc64 keywords.
+
+  31 Jul 2002; Martin Schlemmer <azarah@gentoo.org> xmms-1.2.7-r12.ebuild :
+  Minor form fixes.
+
+  20 Jul 2002; Spider <spider@gentoo.org> xmms-1.2.7-r12.ebuild : Minor dep
+  change to kill bug #4317.
+
+  19 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> xmms-1.2.7-r12.ebuild : Closes
+  #5208.
+
+  18 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> xmms-1.2.7-r12.ebuild : Cleaned
+  up ebuild. Made mikmod optional through USE setting.
+
+*xmms-1.2.7-r11 (30 Jun 2002)
+
+  30 Jun 2002; Martin Schlemmer <azarah@gentoo.org> : This revision tries to fix
+  all the automake/autoconf warning, etc.
+  I have tested it with gcc-2.95.3 and gcc-3.1, so hopefully it will
+  be the last revision for some time.
+
+*xmms-1.2.7-r10 (28 Jun 2002)
+
+  28 Jun 2002; Spider <spider@gentoo.org> xmms-1.2.7-r9.ebuild : Removed
+  gnome-core dep in favour of gnome-panel-1.4.1 
+ 
+*xmms-1.2.7-r9 (06 June 2002)
+
+  06 June 2002; Brandon Low <lostlogic@gentoo.org> xmms-1.2.7-r9.ebuild,
+  files/xmms-1.2.7-gentoo.patch: New revision with a generated patch to fix a
+  bunch of error output which was happening at compile time, also hopefully
+  closes 3431, but waiting on confirmation of that.
+
+  06 June 2002; Bruce A. Locke <blocke@shivan.org> xmms-1.2.7-r9.ebuild,
+  files/xmms-1.2.7-gentoo.patch: Removed due to automake/autoconf issues.
+
+*xmms-1.2.7-r8 (02 June 2002)
+
+  02 June 2002; Gabriele Giorgetti <stroke@gentoo.org> xmms-1.2.7-r8.ebuild:
+  digest-xmms-1.2.7-r8 added. fixes bug #3325
+
+  02 June 2002; Olivier Reisch <doctomoe@gentoo.org> xmms-1.2.7-r8.ebuild:
+  xmms-1.2.7 r6 and r7 are broken on PPC. The src_unpack function fails on the
+  3dnow/mmx patch inclusion check. Included an arch check to exclude the code
+  from being executed on PPC.
+
+*xmms-1.2.7-r7 (30 May 2002)
+
+  30 May 2002; Seemant Kulleen <seemant@gentoo.org> xmms-1.2.7-r7.ebuild
+  files/digest-xmms-1.2.7-r7 : Added a patch to optimise for 3dnow and mmx. 
+  Thanks to aliz@telia.com (Daniel Ahlberg) in bug #2630.  Fixed use avi && patch
+  syntax per Daniel Sabo in bug #3086
+
+*xmms-1.2.7-r6 (19 May 2002)
+
+  26 May 2002; Martin Schlemmer <azarah@gentoo.org> xmms-1.2.7-r6.ebuild :
+  Change it to depend on latest avifile, and drop the suffix patch
+  for avifile-config.
+
+*xmms-1.2.7-r5 (19 May 2002)
+
+  19 May 2002; Martin Schlemmer <azarah@gentoo.org> xmms-1.2.7-r5.ebuild :
+  Fix things to actually compile the plugin when "avi" is in USE, and made
+  it compadible with the latest avifile (0.7.4) which use an suffix ( this
+  having /usr/bin/avifile-config0.7 and not /usr/bin/avifile-config).
+  I am not too sure with this suffix thing .. we need to decide if we are
+  going to keep it, or just fix the broken stuff .. personally I think we
+  should rather fix broken build, and drop the suffix from avifile.
+
+*xmms-1.2.7-r4 (11 Apr 2002)
+
+  11 Apr 2002; Seemant Kulleen <seemant@gentoo.org> xmms-1.2.7-r4.ebuild :
+  Svend Sorensen (SCube on #gentoo) pointed out that libxml is only an optional
+  dependency to retrieve cd track info from an alternate source, so that has
+  been made USE dependent.
+
+*xmms-1.2.7-r{3,4} (28 Mar 2002)
+
+  28 Mar 2002; Seemant Kulleen <seemant@gentoo.org> xmms-1.2.7-r{3,4}.ebuild :
+  ogg and vorbis USE flags have been combined to form the oggvorbis flag.
+  Kinda like Voltron.
+
+*xmms-1.2.7-r4 (28 Mar 2002)
+
+  28 Mar 2002; Seemant Kulleen <seemant@gentoo.org> xmms-1.2.7-r4.ebuild :
+  Ha ha, wishful thinking on my part.  This revision gets rid of the "built-in"
+  avi hack.  We still make use of the avi USE flag, because there are certain
+  libraries we need to link against for the new avi plugin, called avi4xmms.
+
+*xmms-1.2.7-r3 (27 Mar 2002)
+
+  27 Mar 2002; Seemant Kulleen <seemant@gentoo.org> xmms-1.2.7-r3.ebuild :
+  Well, I do hope that this is the last update on this in a while.  Finally,
+  though, thanks to Matthew Kennedy, we can `man xmms` and actually see a
+  man page.  This also makes us slightly more LFH compliant.
+
+*xmms-1.2.7-r2 (21 Mar 2002)
+
+  21 Mar 2002; Seemant Kulleen <seemant@gentoo.org> xmms-1.2.7-r2.ebuild :
+  Now, avi is in the USE flags, which means the bloaty avi hack is an option
+  that I think only few will take to anyway.
+
+*xmms-1.2.7-r1 (19 Mar 2002)
+
+  19 Mar 2002; Seemant Kulleen <seemant@gentoo.org> : added a patch to make
+  xmms use avifile-0.6, which removes the necessity of having a separate
+  avi-xmms module until that module can support avifile-0.6
+
+*xmms-1.2.7 (05 Mar 2002)
+
+  05 Mar 2002; Daniel Robbins <drobbins@gentoo.org> : new much-requested
+  version bump.  Just copied ebuild over.
+
+*xmms-1.2.6-r2 (28 Feb 2002)
+
+  22 Feb 2002; Bruce A. Locke <blocke@shivan.org> xmms-1.2.6-r2.ebuild :
+  spider.gentoo@darkmere.wanfear.com (Spider) contributed additional
+  USE keyword checks
diff --git a/media-sound/xmms/Manifest b/media-sound/xmms/Manifest
index db748d5044fa..970eef456c46 100644
--- a/media-sound/xmms/Manifest
+++ b/media-sound/xmms/Manifest
@@ -1,11 +1,18 @@
-MD5 5128a705f0c4e04a23d14ef9aaabe585 xmms-1.2.7-r20.ebuild 5169
-MD5 d86369c2a2a862613302b5dbfd219318 ChangeLog 8424
-MD5 e7e0c91780b115aaad1a1ed534bf7ae8 files/xmms-ipv6-20020408-mmx.patch 9210
-MD5 0556bca4519b8afae6b3225d099a866b files/xmms-1.2.7-enable-avifile-plugins.patch 460
-MD5 3268d7f38e954fd7ab541fa9e6f385ca files/digest-xmms-1.2.7-r19 130
-MD5 3268d7f38e954fd7ab541fa9e6f385ca files/digest-xmms-1.2.7-r20 130
-MD5 6361ee5e5b5402155308b62a1d1fde9a files/xmms-sigterm.patch 1002
-MD5 2b20eda67dba56621f05441eaa0ffab8 files/xmms-jump.patch 3013
-MD5 a03fa7e2151194a6db4850897d16d128 files/xmms-1.2.7-mpg123j.patch 9333
-MD5 5239eeecd56f7e464ebc43937cfa56bc files/xmms-1.2.7-link-libstdc++.patch 450
-MD5 3137a462e1b8c82c5c2a8d7c4d983ee9 files/xmms-ipv6-20020408-nommx.patch 9214
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1cbaca9fbda49c1678a98a6a74e2d22d ChangeLog 33245
+MD5 b9dc01a8f53d43e1a63281b71376fcff files/digest-xmms-1.2.10-r14 354
+MD5 46c1f42d9a05a0484dbf8ed6935055be files/digest-xmms-1.2.10-r15 354
+MD5 4190322696afc5e46dac14804b8aef70 files/po-update.pl 10510
+MD5 8ce5020c0970ade2b273c9d61e994ef3 files/xmms.desktop 751
+MD5 b5ec923fb779815c06a598dddfa82083 metadata.xml 252
+MD5 ece73e30760d7904ebbdb9a02140fb8d xmms-1.2.10-r14.ebuild 4954
+MD5 9d526a14c1c9bf4285cf9e10326c5724 xmms-1.2.10-r15.ebuild 4955
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDbXX+wUpWvClEHQoRAsiqAJ429epWQuwoFfCuw3FDvXlGYXHsiwCeLdST
+mjpVMMXo2qGhFZNafeJT0pA=
+=gE4Z
+-----END PGP SIGNATURE-----
diff --git a/media-sound/xmms/files/digest-xmms-1.2.10-r14 b/media-sound/xmms/files/digest-xmms-1.2.10-r14
index cfc9ce780164..f88f4ab1841a 100644
--- a/media-sound/xmms/files/digest-xmms-1.2.10-r14
+++ b/media-sound/xmms/files/digest-xmms-1.2.10-r14
@@ -1,5 +1,5 @@
 MD5 03a85cfc5e1877a2e1f7be4fa1d3f63c xmms-1.2.10.tar.bz2 2418265
 MD5 41eababfa8bad11e9e34e467cdfb86be gentoo_ice-xmms-0.2.tar.bz2 51839
 MD5 28314147dec40dbeaf4665bf1a9854b9 xmms-1.2.10-gentoo-m4-1.1.tar.bz2 26978
-MD5 38b9f3af140181d79132b0fb303d3ff5 xmms-1.2.10-gentoo-patches-2.2.3.tar.bz2 545765
+MD5 f56d7aec6ba74329215f0cc02feadc02 xmms-1.2.10-gentoo-patches-2.2.5.tar.bz2 546248
 MD5 fe54f2ec779bc995176e63e3e77cca11 gnomexmms.xpm 7979
diff --git a/media-sound/xmms/files/xmms.desktop b/media-sound/xmms/files/xmms.desktop
index 7c153aa74631..20216d3366a4 100644
--- a/media-sound/xmms/files/xmms.desktop
+++ b/media-sound/xmms/files/xmms.desktop
@@ -13,9 +13,10 @@ comment[ro]=X MultiMedia Sistem
 comment[th]=�к���ŵ�����º� X
 comment[tr]=X Multimedya Sistem
 comment[zh_TW]=X �h�C��t��
-Encoding=Legacy-Mixed
+Encoding=UTF-8
 Exec=/usr/bin/xmms
-Icon=mini/xmms_mini.xpm
+Icon=/usr/share/pixmaps/mini/xmms_mini.xpm
 MimeType=audio/x-scpls;audio/x-mpegurl;audio/mpegurl;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/x-wav;application/x-ogg
 Terminal=0
-Type=Application;AudioVideo
+Type=Application
+Categories=Application;Multimedia;AudioVideo;Player;
diff --git a/media-sound/xmms/metadata.xml b/media-sound/xmms/metadata.xml
index e1774e3d9ad7..cb2324b4fda2 100644
--- a/media-sound/xmms/metadata.xml
+++ b/media-sound/xmms/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sound</herd>
+<maintainer>
+  <email>metalgod@gentoo.org</email>
+    <name>Luis Medinas</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-sound/xmms/xmms-1.2.10-r14.ebuild b/media-sound/xmms/xmms-1.2.10-r14.ebuild
index 3cf7c1f7f3a2..fc263cf70c1a 100644
--- a/media-sound/xmms/xmms-1.2.10-r14.ebuild
+++ b/media-sound/xmms/xmms-1.2.10-r14.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/media-sound/xmms/xmms-1.2.10-r14.ebuild,v 1.1 2005/04/16 00:44:55 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.10-r14.ebuild,v 1.1.1.1 2005/11/30 09:38:31 chriswhite Exp $
 
 inherit flag-o-matic eutils libtool gnuconfig
 
-PATCH_VER="2.2.3"
+PATCH_VER="2.2.5"
 M4_VER="1.1"
 
 PATCHDIR="${WORKDIR}/patches"
@@ -19,8 +19,8 @@ SRC_URI="http://www.xmms.org/files/1.2.x/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="nls esd mmx oggvorbis 3dnow mikmod directfb alsa oss arts jack sndfile lirc flac mad mp3"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
+IUSE="nls esd mmx vorbis 3dnow mikmod directfb alsa oss arts jack sndfile lirc flac mad mp3"
 
 DEPEND="=x11-libs/gtk+-1.2*"
 
@@ -43,8 +43,8 @@ PDEPEND="lirc? ( media-plugins/xmms-lirc )
 	 flac? ( media-libs/flac )
 	 mikmod? ( media-plugins/xmms-mikmod )
 	 mp3? ( mad? ( >=media-plugins/xmms-mad-0.7 )
-	        !mad? ( >=media-plugins/xmms-mpg123-1.2.10-r1 ) )
-	 oggvorbis? ( >=media-plugins/xmms-vorbis-1.2.10-r1 )
+	        >=media-plugins/xmms-mpg123-1.2.10-r1 )
+	 vorbis? ( >=media-plugins/xmms-vorbis-1.2.10-r1 )
 	 sndfile? ( media-plugins/xmms-sndfile )
 
 	 alsa? ( media-plugins/xmms-alsa )
@@ -129,7 +129,7 @@ src_install() {
 	doins xmms/xmms_mini.xpm
 
 	insinto /etc/X11/wmconfig
-	donewins xmms/xmms.wmconfig xmms
+	newins xmms/xmms.wmconfig xmms
 
 	insinto /usr/share/applications
 	doins ${FILESDIR}/xmms.desktop
diff --git a/media-sound/xmms/xmms-1.2.10-r15.ebuild b/media-sound/xmms/xmms-1.2.10-r15.ebuild
index 26faa6f04590..aea9a019806f 100644
--- a/media-sound/xmms/xmms-1.2.10-r15.ebuild
+++ b/media-sound/xmms/xmms-1.2.10-r15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.10-r15.ebuild,v 1.1 2005/05/27 02:26:02 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.10-r15.ebuild,v 1.1.1.1 2005/11/30 09:38:31 chriswhite Exp $
 
 inherit flag-o-matic eutils libtool gnuconfig
 
@@ -19,10 +19,8 @@ SRC_URI="http://www.xmms.org/files/1.2.x/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-# Testing still
-KEYWORDS="-*"
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="nls esd mmx oggvorbis 3dnow mikmod directfb alsa oss arts jack sndfile lirc flac mad mp3"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
+IUSE="nls esd mmx vorbis 3dnow mikmod directfb alsa oss arts jack sndfile lirc flac mad mp3"
 
 DEPEND="=x11-libs/gtk+-1.2*"
 
@@ -32,7 +30,7 @@ RDEPEND="${DEPEND}
 
 #We want these things in DEPEND only
 DEPEND="${DEPEND}
-	>=sys-devel/automake-1.7
+	>=sys-devel/automake-1.9
 	>=sys-devel/autoconf-2.5
 	sys-devel/libtool
 	nls? ( dev-util/intltool
@@ -46,7 +44,7 @@ PDEPEND="lirc? ( media-plugins/xmms-lirc )
 	 mikmod? ( media-plugins/xmms-mikmod )
 	 mp3? ( mad? ( >=media-plugins/xmms-mad-0.7 )
 	        >=media-plugins/xmms-mpg123-1.2.10-r1 )
-	 oggvorbis? ( >=media-plugins/xmms-vorbis-1.2.10-r1 )
+	 vorbis? ( >=media-plugins/xmms-vorbis-1.2.10-r1 )
 	 sndfile? ( media-plugins/xmms-sndfile )
 
 	 alsa? ( media-plugins/xmms-alsa )
@@ -68,7 +66,7 @@ src_unpack() {
 	EPATCH_SUFFIX="patch"
 	epatch ${PATCHDIR}
 
-	export WANT_AUTOMAKE=1.7
+	export WANT_AUTOMAKE=1.9
 	export WANT_AUTOCONF=2.5
 
 	sed -i 's:Output Input Effect General Visualization::' Makefile.am
@@ -131,7 +129,7 @@ src_install() {
 	doins xmms/xmms_mini.xpm
 
 	insinto /etc/X11/wmconfig
-	donewins xmms/xmms.wmconfig xmms
+	newins xmms/xmms.wmconfig xmms
 
 	insinto /usr/share/applications
 	doins ${FILESDIR}/xmms.desktop
diff --git a/media-sound/xmmsctrl/ChangeLog b/media-sound/xmmsctrl/ChangeLog
index fd96298b765f..9b16c2e488ac 100644
--- a/media-sound/xmmsctrl/ChangeLog
+++ b/media-sound/xmmsctrl/ChangeLog
@@ -1,6 +1,70 @@
 # ChangeLog for media-sound/xmmsctrl
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmmsctrl/ChangeLog,v 1.1 2002/12/15 21:52:19 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmmsctrl/ChangeLog,v 1.1.1.1 2005/11/30 09:37:59 chriswhite Exp $
+
+*xmmsctrl-1.9 (16 Oct 2005)
+
+  16 Oct 2005; Luis Medinas <metalgod@gentoo.org> +xmmsctrl-1.9.ebuild:
+  Version bump. Update Homepage and SRC_URI.
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> xmmsctrl-1.8.ebuild:
+  Mark 1.8 stable on alpha
+
+  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> xmmsctrl-1.8.ebuild:
+  Stable on ppc.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmmsctrl-1.8.ebuild:
+  Stable amd64, sparc, x86.
+
+*xmmsctrl-1.8 (04 Nov 2004)
+
+  04 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/xmmsctrl-1.8-jump.patch, +files/xmmsctrl.bash-completion,
+  -xmmsctrl-1.6-r1.ebuild, -xmmsctrl-1.6.ebuild, +xmmsctrl-1.8.ebuild:
+  Version bump and added ka0ttic's bash completion code... closes bugs #69814
+  and #70058.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> xmmsctrl-1.7.ebuild:
+  Stable sparc.
+
+  26 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmmsctrl-1.6-r1.ebuild, xmmsctrl-1.7.ebuild:
+  Removed USE= typo to close bug #55251.  1.7 is stable amd64.
+
+  05 May 2004; Danny van Dyk <kugelfang@gentoo.org> xmmsctrl-1.7.ebuild:
+  Marked ~amd64.
+
+  25 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> xmmsctrl-1.7.ebuild:
+  Stable x86.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmmsctrl-1.6-r1.ebuild, xmmsctrl-1.7.ebuild:
+  Added IUSE.
+
+*xmmsctrl-1.7 (26 Mar 2004)
+
+  26 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> xmmsctrl-1.7.ebuild:
+  Version bump.
+
+  26 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmmsctrl-1.6-r1.ebuild, xmmsctrl-1.6.ebuild:
+  Cleaned up ebuilds.
+
+  29 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> metadata.xml,
+  xmmsctrl-1.6-r1.ebuild, xmmsctrl-1.6.ebuild:
+  Removing ~mips as it can't satisfy DEPEND.
+
+*xmmsctrl-1.6-r1 (11 Jul 2003)
+
+  11 Jul 2003; Seemant Kulleen <seemant@gentoo.org> xmmsctrl-1.6-r1.ebuild:
+  fixed permissions on sample scripts. thanks to Weeve for discovering.
+
+  10 Jul 2003; Seemant Kulleen <seemant@gentoo.org> xmmsctrl-1.6.ebuild:
+  moved to stable on x86 and added other arches to testing
+
+  28 Apr 2003; Lars Weiler <pylon@gentoo.org> xmmsctrl-1.6.ebuild:
+  Works also on ppc, so keyworded ~ppc
 
 *xmmsctrl-1.6 (15 Dec 2002)
 
diff --git a/media-sound/xmmsctrl/Manifest b/media-sound/xmmsctrl/Manifest
index 6f48a16f3848..a4fce7915cdf 100644
--- a/media-sound/xmmsctrl/Manifest
+++ b/media-sound/xmmsctrl/Manifest
@@ -1,4 +1,21 @@
-MD5 78ecc7d0106b4fde56edebcd30c1414c ChangeLog 667
-MD5 2f753e0f0602b8fa3a355fe8720756a7 xmmsctrl-1.6.ebuild 746
-MD5 8a895c8a1f15679dd525bd79ce8516f0 files/digest-xmmsctrl-1.6 62
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a20eda334732066f58d43dc85d8b8a1a ChangeLog 2721
+MD5 c7c656137800fdd34067cd2e40c9775e files/digest-xmmsctrl-1.7 62
+MD5 820f89eab5c374f7690d5e6ad325876e files/digest-xmmsctrl-1.8 63
+MD5 b147c2e141f7146c49c38d7cbd6d0582 files/digest-xmmsctrl-1.9 63
+MD5 a88964c9149258a942cd42e4f39bf448 files/xmmsctrl-1.8-jump.patch 457
 MD5 81df994f3cc643315bc3ce5f0b83e848 files/xmmsctrl-jump.patch 374
+MD5 8355a79044d2fc38f92aa608a643e650 files/xmmsctrl.bash-completion 1055
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 0993fde26d7701ec1043d6478bffa33b xmmsctrl-1.7.ebuild 792
+MD5 62a10da77f35823a39055f8d7cb8530a xmmsctrl-1.8.ebuild 799
+MD5 4579391fe4e39327567ce8e194185953 xmmsctrl-1.9.ebuild 808
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDUtPtwUpWvClEHQoRAtUeAJ9kNxwaa/xaMRzyvTFNCeuUdwnFkACbBZoD
+En96bgE8ldqJCebLSg7Cd1w=
+=jqCV
+-----END PGP SIGNATURE-----
diff --git a/media-sound/xmmsctrl/files/xmmsctrl.bash-completion b/media-sound/xmmsctrl/files/xmmsctrl.bash-completion
index 1568d3ca5e1f..b20537b1158e 100644
--- a/media-sound/xmmsctrl/files/xmmsctrl.bash-completion
+++ b/media-sound/xmmsctrl/files/xmmsctrl.bash-completion
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmmsctrl/files/xmmsctrl.bash-completion,v 1.1 2004/11/04 23:22:33 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmmsctrl/files/xmmsctrl.bash-completion,v 1.1.1.1 2005/11/30 09:37:59 chriswhite Exp $
 # xmmsctrl completion
 
 _xmmsctrl()
diff --git a/media-sound/xmmsctrl/xmmsctrl-1.7.ebuild b/media-sound/xmmsctrl/xmmsctrl-1.7.ebuild
index dde2b1ec7c14..00f7b7b05868 100644
--- a/media-sound/xmmsctrl/xmmsctrl-1.7.ebuild
+++ b/media-sound/xmmsctrl/xmmsctrl-1.7.ebuild
@@ -1,6 +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/media-sound/xmmsctrl/xmmsctrl-1.7.ebuild,v 1.1 2004/03/27 03:47:02 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmmsctrl/xmmsctrl-1.7.ebuild,v 1.1.1.1 2005/11/30 09:37:59 chriswhite Exp $
+
+IUSE=""
 
 inherit eutils
 
@@ -10,9 +12,7 @@ HOMEPAGE="http://user.it.uu.se/~adavid/utils/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa"
-
-USE=""
+KEYWORDS="x86 ppc sparc ~alpha ~hppa amd64"
 
 RDEPEND=">=media-sound/xmms-1.2.7-r16"
 
diff --git a/media-sound/xmmsctrl/xmmsctrl-1.8.ebuild b/media-sound/xmmsctrl/xmmsctrl-1.8.ebuild
index 9cbd9545202c..f181bfa3c56d 100644
--- a/media-sound/xmmsctrl/xmmsctrl-1.8.ebuild
+++ b/media-sound/xmmsctrl/xmmsctrl-1.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/media-sound/xmmsctrl/xmmsctrl-1.8.ebuild,v 1.1 2004/11/04 23:22:33 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmmsctrl/xmmsctrl-1.8.ebuild,v 1.1.1.1 2005/11/30 09:37:59 chriswhite Exp $
 
 IUSE=""
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://user.it.uu.se/~adavid/utils/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 ~hppa ppc sparc x86"
 
 DEPEND="media-sound/xmms"
 
diff --git a/media-sound/xmmsctrl/xmmsctrl-1.9.ebuild b/media-sound/xmmsctrl/xmmsctrl-1.9.ebuild
index 353ee42af353..4d6deda57c07 100644
--- a/media-sound/xmmsctrl/xmmsctrl-1.9.ebuild
+++ b/media-sound/xmmsctrl/xmmsctrl-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/media-sound/xmmsctrl/xmmsctrl-1.9.ebuild,v 1.1 2005/10/16 21:28:13 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmmsctrl/xmmsctrl-1.9.ebuild,v 1.1.1.1 2005/11/30 09:37:59 chriswhite Exp $
 
 IUSE=""
 
diff --git a/media-sound/xmp/ChangeLog b/media-sound/xmp/ChangeLog
index 8f6a9c2aeba6..a8a5c1b0918e 100644
--- a/media-sound/xmp/ChangeLog
+++ b/media-sound/xmp/ChangeLog
@@ -1,9 +1,37 @@
 # ChangeLog for media-sound/xmp
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmp/ChangeLog,v 1.1 2002/06/17 13:56:30 karltk Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmp/ChangeLog,v 1.1.1.1 2005/11/30 09:38:43 chriswhite Exp $
+
+  10 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  xmp-2.0.5_pre3-r1.ebuild:
+  Don't install INSTALL file.
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmp-2.0.5_pre3-r1.ebuild:
+  -sparc -amd64
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmp-2.0.5_pre3-r1.ebuild:
+  inherit eutils.
+
+  17 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmp-2.0.5_pre3-r1.ebuild:
+  Removed alsa from IUSE.
+
+  20 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmp-2.0.5_pre3-r1.ebuild, xmp-2.0.5_pre3.ebuild:
+  Bumping to stable for gcc3.3 fix. --disable-alsa since it needs 0.5. Closes
+  bug #38996.
+
+*xmp-2.0.5_pre3-r1 (11 Mar 2004)
+
+  11 Mar 2004; Karl Trygve Kalleberg <karltk@gentoo.org> xmp-2.0.5_pre3-r1.ebuild:
+  Fixes gcc 3.3 compilation errors.
 
 *xmp-2.0.5_pre3 (17 Jun 2002)
 
-  17 Jun 2002; Karl Trygve Kalleberg <karltk@gentoo.org> xmp-2.0.5_pre3.ebuild files/digest-xmp-2.0.5_pre3 :
+  11 Sep 2002; Karl Trygve Kalleberg <karltk@gentoo.org> xmp-2.0.5_pre3.ebuild :
+  It does not work with the 0.9.x ALSA series, so 0.5.x is required.
 
+  17 Jun 2002; Karl Trygve Kalleberg <karltk@gentoo.org> xmp-2.0.5_pre3.ebuild files/digest-xmp-2.0.5_pre3 :
   Initial import.
diff --git a/media-sound/xmp/Manifest b/media-sound/xmp/Manifest
index e69de29bb2d1..feebcdb53fef 100644
--- a/media-sound/xmp/Manifest
+++ b/media-sound/xmp/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 404d3adfbd49de2f45eda347f7aadaeb ChangeLog 1301
+MD5 ba5be41d678d80118fe08636814478e0 xmp-2.0.5_pre3-r1.ebuild 1675
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 b7454b9cfe32ed0950a6eb72dcac8b33 files/digest-xmp-2.0.5_pre3-r1 66
+MD5 1e1fab05a4835611a5e25aa1e6a4898a files/xmp-2.0.5_pre3-gcc3.3.diff 2658
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDIwDmj5H05b2HAEkRAvFAAJ9i60q0Zf1Kary6ml875GYzGg1rawCeOzqJ
+KYcI7HfSbknJQBgZztKv7o0=
+=MSSF
+-----END PGP SIGNATURE-----
diff --git a/media-sound/xmp/xmp-2.0.5_pre3-r1.ebuild b/media-sound/xmp/xmp-2.0.5_pre3-r1.ebuild
index a2b5f2d1d246..42c91348f0cf 100644
--- a/media-sound/xmp/xmp-2.0.5_pre3-r1.ebuild
+++ b/media-sound/xmp/xmp-2.0.5_pre3-r1.ebuild
@@ -1,36 +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/media-sound/xmp/xmp-2.0.5_pre3-r1.ebuild,v 1.1 2004/03/11 12:13:27 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmp/xmp-2.0.5_pre3-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:43 chriswhite Exp $
 
-IUSE="xmms arts esd nas X oss alsa"
+IUSE="xmms arts esd nas X oss"
+
+inherit eutils
 
 S="${WORKDIR}/${PN}-2.0.5-pre3"
+
 DESCRIPTION="Extended Module Player"
-SRC_URI="mirror://sourceforge/xmp/${PN}-2.0.5pre3.tar.bz2"
 HOMEPAGE="http://xmp.sf.net"
+SRC_URI="mirror://sourceforge/xmp/${PN}-2.0.5pre3.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+#-amd64: 2.0.5_pre3-r1 - compilation nightmare
+#-sparc: Segfaults
+KEYWORDS="-amd64 x86 -sparc"
 
 DEPEND="X? ( virtual/x11 )
 	esd? ( media-sound/esound )
 	nas? ( media-libs/nas )
-	alsa? ( =media-libs/alsa-lib-0.5* )
 	arts? ( kde-base/arts )
 	xmms? ( media-sound/xmms )"
 
+#	Nobody uses alsa5, but if they do, they can hand edit this...
+#	alsa? ( =media-libs/alsa-lib-0.5* )
+
+
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/${P}-gcc3.3.diff
 }
 
 src_compile() {
-	local myconf
+	local myconf="--disable-alsa"
 
-	use alsa \
-		&& myconf="${myconf} --enable-alsa" \
-		|| myconf="${myconf} --disable-alsa"
+#	use alsa \
+#		&& myconf="${myconf} --enable-alsa" \
+#		|| myconf="${myconf} --disable-alsa"
 
 	use arts \
 		&& myconf="${myconf} --enable-arts" \
@@ -63,5 +71,5 @@ src_compile() {
 
 src_install () {
 	make DEST_DIR=${D} MAN_DIR=${D}/usr/share/man/man1 install || die
-	dodoc INSTALL README
+	dodoc README
 }
diff --git a/media-sound/yammi/ChangeLog b/media-sound/yammi/ChangeLog
index 9a7e3ca5be5d..98408a9f18c0 100644
--- a/media-sound/yammi/ChangeLog
+++ b/media-sound/yammi/ChangeLog
@@ -1,6 +1,114 @@
 # ChangeLog for media-sound/yammi
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/ChangeLog,v 1.1 2003/03/15 07:04:16 jje Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/ChangeLog,v 1.1.1.1 2005/11/30 09:38:41 chriswhite Exp $
+
+  28 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> yammi-1.2.ebuild:
+  Stable on sparc
+
+  28 May 2005; Jan Brinkmann <luckyduck@gentoo.org> yammi-1.0-r1.ebuild,
+  yammi-1.2.ebuild:
+  Dont make use of the deprecated oggvorbis useflag any longer, see #94254.
+
+  15 May 2005; Gregorio Guidi <greg_g@gentoo.org> yammi-1.2.ebuild:
+  Stable on x86.
+
+  20 Mar 2005; Gregorio Guidi <greg_g@gentoo.org> yammi-1.2.ebuild:
+  Force the arts flag being enabled.
+
+*yammi-1.2 (15 Mar 2005)
+
+  15 Mar 2005; Gregorio Guidi <greg_g@gentoo.org> metadata.xml,
+  -files/yammi-0.8.2-qt.patch, -yammi-0.8.2.ebuild, -yammi-1.0.ebuild,
+  +yammi-1.2.ebuild:
+  New version. Big ebuild restructuring, reflecting the fact that yammi is now a
+  KDE application.
+
+  29 Jan 2005; Gregorio Guidi <greg_g@gentoo.org> yammi-0.8.2.ebuild,
+  yammi-1.0-r1.ebuild, yammi-1.0.ebuild:
+  Proper usage of kde eclasses, to make sure KDEDIR is defined (#33079).
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> yammi-0.8.2.ebuild,
+  yammi-1.0-r1.ebuild, yammi-1.0.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.
+
+  03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> yammi-1.0-r1.ebuild:
+  Stable amd64, sparc, x86.
+
+  17 Jul 2004; David Holm <dholm@gentoo.org> yammi-1.0-r1.ebuild:
+  Added to ~ppc.
+
+*yammi-1.0-r1 (07 Jul 2004)
+
+  07 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/yammi-1.0-traverse.patch, +yammi-1.0-r1.ebuild:
+  Revbump to include patch in bug #54089 provided by Joseph Turian
+  <turian@gmail.com>. Added to ~sparc.
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org> yammi-0.8.2.ebuild,
+  yammi-1.0.ebuild:
+  Fix use invocation
+
+  10 May 2004; Travis Tilley <lv@gentoo.org> yammi-0.8.2.ebuild,
+  yammi-1.0.ebuild:
+  added ~amd64 keyword
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> yammi-0.8.2.ebuild:
+  Add inherit eutils
+
+  16 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> yammi-0.8.2.ebuild,
+  yammi-1.0.ebuild:
+  addpredict ${QTDIR}/etc/settings/ added for bug #47967
+
+  01 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> yammi-1.0.ebuild:
+  Inherit eutils.
+
+  19 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> yammi-0.8.2.ebuild,
+  yammi-1.0.ebuild:
+  fixed dep.  bump to stable x86
+
+  23 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> yammi-0.8.2.ebuild,
+  yammi-1.0.ebuild:
+  mpg123 dep changed to virtual
+
+*yammi-1.0 (19 Dec 2003)
+
+  19 Dec 2003; Martin Holzer <mholzer@gentoo.org> yammi-1.0.ebuild,
+  files/yammi-1.0-qt.patch:
+  Version bumped. ebuild submitted by Felix Eckhofer <felix@tribut.de> in 32055
+
+  18 Dec 2003; Martin Holzer <mholzer@gentoo.org> yammi-0.8.2.ebuild:
+  RESTRICT=nomirror
+
+  24 Oct 2003; brandy <brandy@gentoo.org> yammi-0.8.2.ebuild,
+  files/yammi-0.8.2-qt.patch:
+  Added patch to enable yammi to compile on machines without KDE. Closes bug
+  #30366
+
+  30 Jul 2003; <caleb@gentoo.org> yammi-0.8.2.ebuild:
+  Fix dependency from kde-base/kde to kde-base/kdebase.  The first is a meta
+  ebuild that compiles all kde packages, and the 2nd just makes sure we have
+  the base kde installation.
+
+  12 Jun 2003; <msterret@gentoo.org> yammi-0.8.2.ebuild:
+  fix Header
+
+*yammi-0.8.2 (20 May 2003)
+
+  20 May 2003; jje <jje@gentoo.org> yammi-0.7.ebuild, yammi-0.7.ebuild,
+  yammi-0.8.1.ebuild, yammi-0.8.1.ebuild, yammi-0.8.2.ebuild:
+  Version bump. Clean out old versions.
+  
+  Submitted by: Arno Ekkes <arno.ekkes@xs4all.nl>
+
+*yammi-0.8.1 (14 May 2003)
+
+  14 May 2003; jje <jje@gentoo.org> yammi-0.8.1.ebuild:
+  Version bump.
+
+  Submitted by: Arno Ekkes
 
 *yammi-0.7 (15 Mar 2003)
 
diff --git a/media-sound/yammi/Manifest b/media-sound/yammi/Manifest
index 23e5a41461fd..4415ba182ae3 100644
--- a/media-sound/yammi/Manifest
+++ b/media-sound/yammi/Manifest
@@ -1,5 +1,4 @@
-MD5 26e30a3921c214ab0f1a041c30372cce yammi-0.7.ebuild 976
-MD5 d9cb05bd57abdfd07017b14b66fcb337 ChangeLog 652
-MD5 8107430aebee6e6967795a59e9d976c8 yammi-0.8.1.ebuild 2018
-MD5 c4e8f80feb349d7c080e877e0d2feb55 files/digest-yammi-0.7 61
-MD5 76178822025ac4a204c15642ed7894cd files/digest-yammi-0.8.1 63
+MD5 1637953277a812ec316da84a5d6b3f41 metadata.xml 175
+MD5 6a65856f34941843840c32926ed22955 ChangeLog 4278
+MD5 9534763de613d9ebf7c7bf7aa19ef899 yammi-1.2.ebuild 1725
+MD5 3b3a8303b5885223b0416428f9d07009 files/digest-yammi-1.2 62
diff --git a/media-sound/yammi/metadata.xml b/media-sound/yammi/metadata.xml
index e1774e3d9ad7..e737e3a436d2 100644
--- a/media-sound/yammi/metadata.xml
+++ b/media-sound/yammi/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sound</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/media-sound/yammi/yammi-1.2.ebuild b/media-sound/yammi/yammi-1.2.ebuild
index 8126839793b0..c18f4a0b1f9c 100644
--- a/media-sound/yammi/yammi-1.2.ebuild
+++ b/media-sound/yammi/yammi-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/media-sound/yammi/yammi-1.2.ebuild,v 1.1 2005/03/15 21:12:48 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/yammi-1.2.ebuild,v 1.1.1.1 2005/11/30 09:38:41 chriswhite Exp $
 
 inherit kde
 
@@ -10,8 +10,8 @@ SRC_URI="mirror://sourceforge/yammi/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc"
-IUSE="cdr encode kde oggvorbis xmms"
+KEYWORDS="x86 amd64 sparc ~ppc"
+IUSE="cdr encode kde ogg xmms"
 
 DEPEND=">=media-libs/taglib-1.3
 	xmms? ( media-sound/xmms )"
@@ -20,7 +20,7 @@ RDEPEND="${DEPEND}
 	kde? ( || ( kde-base/noatun kde-base/kdemultimedia ) )
 	media-sound/sox
 	virtual/mpg123
-	oggvorbis? ( media-sound/vorbis-tools )
+	ogg? ( media-sound/vorbis-tools )
 	encode? ( media-sound/cdparanoia
 		  media-sound/lame )"
 
@@ -32,14 +32,11 @@ RDEPEND="${DEPEND}
 need-kde 3
 
 pkg_setup() {
-	if ! use arts && ! use xmms; then
-		eerror "Yammi needs either aRts or Xmms to work,"
-		eerror "please try again with USE=\"arts\" or USE=\"xmms\"".
+	if ! use arts; then
+		eerror "${PN} can only be built with USE=\"arts\","
+		eerror "and with kde-base/kdelibs compiled with USE=\"arts\"."
 		die
 	fi
-
-	# check whether kdelibs was compiled with arts support
-	kde_pkg_setup
 }
 
 src_unpack() {
diff --git a/media-sound/yconsole/ChangeLog b/media-sound/yconsole/ChangeLog
index 7cbc3b1ccb77..1971980d2c64 100644
--- a/media-sound/yconsole/ChangeLog
+++ b/media-sound/yconsole/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for media-sound/yconsole
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/yconsole/ChangeLog,v 1.1 2003/08/17 19:03:06 vapier Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/yconsole/ChangeLog,v 1.1.1.1 2005/11/30 09:38:32 chriswhite Exp $
+
+*yconsole-3.0.8 (19 Apr 2005)
+
+  19 Apr 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/yconsole-3.0.8-gcc33.patch, metadata.xml, +yconsole-3.0.8.ebuild:
+  Version bump.
+
+  12 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  yconsole-3.0.5.ebuild:
+  Added ~sparc ~amd64
+
+  30 Jun 2004; David Holm <dholm@gentoo.org> yconsole-3.0.5.ebuild:
+  Added to ~ppc.
+
+*yconsole-3.0.5 (22 Feb 2004)
+
+  22 Feb 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #42386 by daniel webert.
 
 *yconsole-3.0.1 (17 Aug 2003)
 
diff --git a/media-sound/yconsole/Manifest b/media-sound/yconsole/Manifest
index 7b07c165a8e6..1d74c4f76695 100644
--- a/media-sound/yconsole/Manifest
+++ b/media-sound/yconsole/Manifest
@@ -1,5 +1,9 @@
-MD5 22555a9b3a74e883646b4b63a8303d83 yconsole-3.0.1.ebuild 747
-MD5 50a0e5ffe2cb35284ce34ffa12e6a320 files/digest-yconsole-3.0.1 63
+MD5 d62d3160b3636e2e9c7d25b68ad80593 ChangeLog 827
+MD5 e341a446a33b3cce8c5793bc9630b7ba metadata.xml 541
+MD5 8744fe9c5f0c4ee8ecc57f2e2ad8184b yconsole-3.0.8.ebuild 812
+MD5 bc6f2000136cfa447de05c3682a75e99 yconsole-3.0.5.ebuild 763
 MD5 ea7949504c3791cd699a231f82feef7e files/3.0.1-makefile-cflags.patch 306
-MD5 71695ac17f14f2dedbc6df453d072d13 ChangeLog 348
-MD5 ec09b9a6676d5d1a73e9da083b6c51b7 metadata.xml 633
+MD5 bb05cfe13c96156605b68899849040d5 files/digest-yconsole-3.0.5 67
+MD5 ea7949504c3791cd699a231f82feef7e files/3.0.5-makefile-cflags.patch 306
+MD5 3d42123d681a6e1f5b5b68bdaf51f194 files/digest-yconsole-3.0.8 67
+MD5 a4365a6d385c83b622eba2ea65a6a436 files/yconsole-3.0.8-gcc33.patch 893
diff --git a/media-sound/yconsole/files/digest-yconsole-3.0.5 b/media-sound/yconsole/files/digest-yconsole-3.0.5
index 73cb3d6d2ea9..6b5edd34a53e 100644
--- a/media-sound/yconsole/files/digest-yconsole-3.0.5
+++ b/media-sound/yconsole/files/digest-yconsole-3.0.5
@@ -1 +1 @@
-MD5 4984b3cface1c495e550768c6b537fed yconsole-3.0.5.tgz 632069
+MD5 d7af9c42c59d5c841468cddf0bc32d19 yconsole-3.0.5.tar.bz2 498018
diff --git a/media-sound/yconsole/metadata.xml b/media-sound/yconsole/metadata.xml
index 6a359b042300..cb49de1ecbcc 100644
--- a/media-sound/yconsole/metadata.xml
+++ b/media-sound/yconsole/metadata.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
- <email>vapier@gentoo.org</email>
- <name>Mike Frysinger</name>
-</maintainer>
+<herd>sound</herd>
  <longdescription>
 YConsole allows you to monitor and control 
 the Y server in a GUI environment, using the GTK+ toolkit. 
diff --git a/media-sound/yconsole/yconsole-3.0.5.ebuild b/media-sound/yconsole/yconsole-3.0.5.ebuild
index 66bc0a76d0ab..d502933795a0 100644
--- a/media-sound/yconsole/yconsole-3.0.5.ebuild
+++ b/media-sound/yconsole/yconsole-3.0.5.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/media-sound/yconsole/yconsole-3.0.5.ebuild,v 1.1 2004/02/22 09:18:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/yconsole/yconsole-3.0.5.ebuild,v 1.1.1.1 2005/11/30 09:38:32 chriswhite Exp $
 
 inherit eutils
 
 DESCRIPTION="monitor and control the Y server"
 HOMEPAGE="http://wolfpack.twu.net/YIFF/"
-SRC_URI="ftp://wolfpack.twu.net/users/wolfpack/${P}.tgz"
+SRC_URI="ftp://wolfpack.twu.net/users/wolfpack/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc sparc amd64"
+IUSE=""
 
 DEPEND="=x11-libs/gtk+-1*
 	media-libs/imlib
diff --git a/media-sound/yconsole/yconsole-3.0.8.ebuild b/media-sound/yconsole/yconsole-3.0.8.ebuild
index de4d6955d9e3..0ede2ba7830c 100644
--- a/media-sound/yconsole/yconsole-3.0.8.ebuild
+++ b/media-sound/yconsole/yconsole-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/media-sound/yconsole/yconsole-3.0.8.ebuild,v 1.1 2005/04/19 00:23:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/yconsole/yconsole-3.0.8.ebuild,v 1.1.1.1 2005/11/30 09:38:32 chriswhite Exp $
 
 inherit eutils
 
diff --git a/media-sound/zinf/ChangeLog b/media-sound/zinf/ChangeLog
index cc117afd00bd..2fbfb5d66c6c 100644
--- a/media-sound/zinf/ChangeLog
+++ b/media-sound/zinf/ChangeLog
@@ -1,9 +1,152 @@
 # ChangeLog for media-sound/zinf
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/zinf/ChangeLog,v 1.1 2002/07/10 20:25:32 rphillips Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zinf/ChangeLog,v 1.1.1.1 2005/11/30 09:37:53 chriswhite Exp $
+
+*zinf-2.2.5-r3 (22 Oct 2005)
+
+  22 Oct 2005; MATSUU Takuto <matsuu@gentoo.org> +zinf-2.2.5-r3.ebuild:
+  Fixed xosd dependency. Bug 94143.
+  Replace gnome USE flag to corba.
+
+  08 Oct 2005; Marcelo Goes <vanquirius@gentoo.org> zinf-2.2.5-r2.ebuild:
+  Mark 2.2.5-r2 x86 stable.
+
+*zinf-2.2.5-r2 (31 Jul 2005)
+
+  31 Jul 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -files/zinf-2.2.3-id3.patch.bz2, -files/zinf-2.2.4-pref.patch,
+  +files/zinf-2.2.5-rtp.patch, +zinf-2.2.5-r2.ebuild:
+  Attempting to fix UI plugin bug in bug 97674 and Invalid URL bug in bug
+  69311. Thanks to samx <gentoo@die-genossen.de>, Markus <bugs@rennings.net>
+  and others.
+
+  27 May 2005; Jan Brinkmann <luckyduck@gentoo.org> zinf-2.2.5-r1.ebuild:
+  added libtoolize call, fixes #94149. also introduced support for the xosd
+  useflag, fixes #94143. cleaned up the ebuild generally
+
+  19 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> -zinf-2.2.3.ebuild,
+  -zinf-2.2.4.ebuild:
+  Removing old versions.
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  zinf-2.2.5-r1.ebuild:
+  get_libdir fixes.
+
+  15 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/zinf-2.2.5-configure.patch:
+  Fixups for configure to handle --disable-corba to close bug #56569.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> zinf-2.2.5-r1.ebuild:
+  Stable amd64.
+
+  14 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org> zinf-2.2.5-r1.ebuild:
+  Added sys-libs/gdbm dependency to fix bug #53842.
+
+*zinf-2.2.5-r1 (16 Apr 2004)
+
+  16 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> zinf-2.2.5-r1.ebuild,
+  zinf-2.2.5.ebuild, files/zinf-2.2.5-cdplay.patch:
+  Bump to include cdplaying bugfix reported by Anatoly <aanatoly@users.sf.net>
+  in bug #47808.
+
+  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> zinf-2.2.5.ebuild:
+  Stable x86.
+
+  26 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> zinf-2.2.3.ebuild,
+  zinf-2.2.4.ebuild, zinf-2.2.5.ebuild:
+  Fixed DEPs, and stuff caught by aliz's QA script.
+
+  24 Feb 2004; Sven Blumenstein <bazik@gentoo.org> zinf-2.2.5.ebuild:
+  Masked on sparc. Segfault on playing mp3 :(
+
+  22 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> zinf-2.2.5.ebuild:
+  Amd64 compilation fix by hendrik <hvisage@envisage.co.za> in #35809.
+
+  18 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> :
+  Yet another new tarball of the same name from zinf... new digest...
+
+  16 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> zinf-2.2.5.ebuild,
+  zinf-2.2.5_beta1.ebuild:
+  Removing beta ebuild due to filename conflict with final version.
+  RESTRICT=nomirror since we're grabbing from sf.net
+
+*zinf-2.2.5 (15 Feb 2004)
+
+  15 Feb 2004; Aron Griffis <agriffis@gentoo.org> zinf-2.2.5.ebuild:
+  version bump
+
+  08 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> zinf-2.2.4.ebuild,
+  zinf-2.2.5_beta1.ebuild:
+  Putting einfo's in 2.2.4 to mention --disable-alsa. Added boost dep to 2.2.5
+  to close bug #40792.
+
+*zinf-2.2.5_beta1 (07 Feb 2004)
+
+  07 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> metadata.xml,
+  zinf-2.2.0.ebuild, zinf-2.2.3.ebuild, zinf-2.2.4.ebuild,
+  zinf-2.2.5_beta1.ebuild:
+  Removing broken ebuild (2.2.0). Version Bump (2.2.5_beta1). 2.2.3 now in
+  stable x86. Added support for more USE flags. Cleaned up DEPEND/RDEPEND.
+  Remove -Werror so it compiles with gcc 3.3.  Closes bugs #29875, #33085,
+  and #38556.
+
+*zinf-2.2.3 (19 Jan 2004)
+
+  19 Jan 2004; Martin Holzer <mholzer@gentoo.org> zinf-2.2.3.ebuild,
+  files/zinf-2.2.3-id3.patch.bz2:
+  Readding
+
+  04 Sep 2003; Aron Griffis <agriffis@gentoo.org> zinf-2.2.4.ebuild:
+  add ~alpha to KEYWORDS
+
+*zinf-2.2.4 (16 Aug 2003)
+
+  16 Aug 2003; jje <jje@gentoo.org> zinf-2.2.1.ebuild, zinf-2.2.3.ebuild,
+  zinf-2.2.4.ebuild, files/zinf-2.2.4-pref.patch:
+  Clean up of old versions.
+
+*zinf-2.2.4 (16 Aug 2003)
+
+  16 Aug 2003; jje <jje@gentoo.org> zinf-2.2.4.ebuild:
+  Version bump. This looks like it's going to need work to get stable.
+  
+  Submitted by: Robert Davis <rdavis@uniformcompany.com>
+
+  16 May 2003; Dan Armak <danarmak@gentoo.org> zinf-2.2.3.ebuild:
+  Enable command line interface.
+
+  14 Feb 2003; Dan Armak <danarmak@gentoo.org> zinf-2.2.3.ebuild:
+
+  Enable arts output support with the makefile fixes needed for it.
+  This resolves bug #9675.
+
+*zinf-2.2.3 (07 Feb 2003)
+
+  09 Feb 2003; Martin Holzer <mholzer@gentoo.org zinf-2.2.3.ebuild :
+  Added media-libs/id3lib to DEPEND cause it fails without. Closes #15322.
+
+  07 Feb 2003; Ryan Phillips <rphillips@gentoo.org> ChangeLog:
+  new version.
+
+*zinf-2.2.1 (06 Dec 2002)
+
+  08 Mar 2003; root <jje@gentoo.org> zinf-2.2.1.ebuild:
+  Fixed nested die.
+
+  06 Dec 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  A new version. See bug #9675. I have disabled arts support (which seems
+  broken) and alsa support (which is only for alsa 0.5.x).
+
+  13 Jul 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  compile fix for arts
 
 *zinf-2.2.0 (10 Jul 2002)
 
+  11 Sep 2002; Mark Guertin <gerk@gentoo.org> :
+  set nasm as x86 only dependancy
+
   10 Jul 2002; Ryan Phillips <rphillips@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/media-sound/zinf/Manifest b/media-sound/zinf/Manifest
index 74bad42b2f98..f6f934ee8bd8 100644
--- a/media-sound/zinf/Manifest
+++ b/media-sound/zinf/Manifest
@@ -1,7 +1,11 @@
-MD5 957cd50ea17cc37def749d71bac843dc zinf-2.2.3.ebuild 2472
-MD5 da5b67e30ba29139e281cf81d67e3a05 zinf-2.2.0.ebuild 2080
-MD5 6f3aeae4cfeb55efb447727060dc21e0 ChangeLog 1566
-MD5 70cf4fc72eddded5278310073bc09434 zinf-2.2.1.ebuild 2142
-MD5 65ed1ba37e686b30fd8151d8f1f2f018 files/digest-zinf-2.2.0 63
-MD5 15188ad254b461d0987d06e89a93cc73 files/digest-zinf-2.2.1 63
-MD5 789bfd8c9959727ea1bd1176b15f8104 files/digest-zinf-2.2.3 63
+MD5 f70ce7442417fa0d2b36c6f4a655b77e zinf-2.2.5-r2.ebuild 2098
+MD5 15c4260b39deda579a3563c58aae5f36 zinf-2.2.5-r1.ebuild 2301
+MD5 6e5af064601d3afcb6e756114693c66d zinf-2.2.5-r3.ebuild 2288
+MD5 c801fcb98208b0de5738d2e7e026328b ChangeLog 5636
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 5f73b5d7a0fb9346d25c7f59e71509b8 files/zinf-2.2.5-cdplay.patch 1042
+MD5 e4ec1ffc5f5099848c9d55df07d85d5a files/digest-zinf-2.2.5-r1 63
+MD5 e4ec1ffc5f5099848c9d55df07d85d5a files/digest-zinf-2.2.5-r2 63
+MD5 e4ec1ffc5f5099848c9d55df07d85d5a files/digest-zinf-2.2.5-r3 63
+MD5 f759a0b5765809ee26d70a83f6c6185b files/zinf-2.2.5-rtp.patch 582
+MD5 ab18405737d54fde371a5e1ceb8dc3e7 files/zinf-2.2.5-configure.patch 3782
diff --git a/media-sound/zinf/files/zinf-2.2.5-configure.patch b/media-sound/zinf/files/zinf-2.2.5-configure.patch
index 83485a3c10a2..27d7609b6c27 100644
--- a/media-sound/zinf/files/zinf-2.2.5-configure.patch
+++ b/media-sound/zinf/files/zinf-2.2.5-configure.patch
@@ -1,6 +1,6 @@
 diff -Naur zinf-2.2.5.orig/configure.ac zinf-2.2.5/configure.ac
 --- zinf-2.2.5.orig/configure.ac	2004-02-17 14:09:01.000000000 -0800
-+++ zinf-2.2.5/configure.ac	2004-07-15 01:16:18.803000641 -0700
++++ zinf-2.2.5/configure.ac	2004-02-17 14:09:01.000000000 -0800
 @@ -260,7 +260,11 @@
  AC_ARG_ENABLE(x86opts, 
  	      AC_HELP_STRING([--disable-x86opts], 
@@ -118,37 +118,3 @@ diff -Naur zinf-2.2.5.orig/configure.ac zinf-2.2.5/configure.ac
  
  AC_SUBST(UI_PLUGINS)
  
-diff -Naur zinf-2.2.5.orig/m4/libxosd.m4 zinf-2.2.5/m4/libxosd.m4
---- zinf-2.2.5.orig/m4/libxosd.m4	1969-12-31 16:00:00.000000000 -0800
-+++ zinf-2.2.5/m4/libxosd.m4	2004-07-15 01:16:41.275272219 -0700
-@@ -0,0 +1,30 @@
-+# Oron Peled (Sun Jun 30 2002)
-+# Taken from libglade.m4
-+
-+# a macro to get the libs/cflags for libxosd
-+
-+dnl AM_PATH_LIBXOSD([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-+dnl Test to see if libxosd is installed, and define LIBXOSD_CFLAGS, LIBXOSDLIBS
-+dnl
-+AC_DEFUN(AM_PATH_LIBXOSD,
-+[dnl
-+dnl Get the cflags and libraries from the xosd-config script
-+dnl
-+AC_ARG_WITH(xosd-config,
-+AC_HELP_STRING([--with-xosd-config=LIBXOSD_CONFIG],[Location of xosd-config]),
-+LIBXOSD_CONFIG="$withval")
-+
-+AC_PATH_PROG(LIBXOSD_CONFIG, xosd-config, no)
-+AC_MSG_CHECKING(for libxosd)
-+if test "$LIBXOSD_CONFIG" = "no"; then
-+  AC_MSG_RESULT(no)
-+  ifelse([$2], , :, [$2])
-+else
-+  LIBXOSD_CFLAGS=`$LIBXOSD_CONFIG --cflags`
-+  LIBXOSD_LIBS=`$LIBXOSD_CONFIG --libs`
-+  AC_MSG_RESULT(yes)
-+  ifelse([$1], , :, [$1])
-+fi
-+AC_SUBST(LIBXOSD_CFLAGS)
-+AC_SUBST(LIBXOSD_LIBS)
-+])
diff --git a/media-sound/zinf/zinf-2.2.5-r1.ebuild b/media-sound/zinf/zinf-2.2.5-r1.ebuild
index ec8f529c99cc..66861851238c 100644
--- a/media-sound/zinf/zinf-2.2.5-r1.ebuild
+++ b/media-sound/zinf/zinf-2.2.5-r1.ebuild
@@ -1,57 +1,73 @@
-# 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/media-sound/zinf/zinf-2.2.5-r1.ebuild,v 1.1 2004/04/16 10:00:34 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zinf/zinf-2.2.5-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:53 chriswhite Exp $
 
 inherit kde-functions eutils flag-o-matic
 
 DESCRIPTION="An extremely full-featured mp3/vorbis/cd player with ALSA support, previously called FreeAmp"
 HOMEPAGE="http://www.zinf.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-RESTRICT="nomirror"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~amd64 -sparc"
-IUSE="debug esd X gtk oggvorbis gnome arts alsa nls ipv6"
+KEYWORDS="amd64 x86 -sparc"
+IUSE="alsa arts debug esd gnome gtk ipv6 nls vorbis xosd X"
+
+RESTRICT="primaryuri"
 
 RDEPEND=">=dev-libs/glib-2.0.0
+	sys-libs/gdbm
 	sys-libs/zlib
 	>=sys-libs/ncurses-5.2
 	>=media-libs/musicbrainz-1.0.1
-	X? ( virtual/x11 )
+	alsa? ( >=media-libs/alsa-lib-0.9.8 )
+	arts? ( kde-base/arts )
 	esd? ( media-sound/esound )
+	gnome? ( =gnome-base/orbit-0* )
 	gtk? ( >=x11-libs/gtk+-2.0.0 )
-	gnome? ( >=gnome-base/ORBit-0.5.0 )
-	oggvorbis? ( media-libs/libvorbis )
-	alsa? ( >=media-libs/alsa-lib-0.9.8 )
-	arts? ( kde-base/arts )"
+	vorbis? ( media-libs/libvorbis )
+	xosd? ( x11-libs/xosd )
+	X? ( virtual/x11 )"
 
 # When updating next, check boost to see if the newer versions fix compilation
 DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )
-	nls? ( sys-devel/gettext )
-	>=media-libs/id3lib-3.8.0
-	dev-libs/boost
 	dev-db/metakit
-	dev-lang/perl"
+	dev-lang/perl
+	dev-libs/boost
+	>=media-libs/id3lib-3.8.0
+	>=sys-devel/automake-1.7
+	nls? ( sys-devel/gettext )
+	x86? ( dev-lang/nasm )"
 
 src_unpack() {
 	unpack ${A}
 
 	cd ${S}
 	epatch ${FILESDIR}/${P}-cdplay.patch
-}
+	epatch ${FILESDIR}/${P}-configure.patch
 
-src_compile() {
-	local myconf="--enable-cmdline"
+	export WANT_AUTOMAKE=1.7
+	export WANT_AUTOCONF=2.5
+
+	#ebegin "Running aclocal (${WANT_AUTOMAKE})"
+	#aclocal -I m4
+	#eend $?
+	touch aclocal.m4
 
-	myconf="${myconf} `use_enable debug`"
-	myconf="${myconf} `use_enable esd`"
-	myconf="${myconf} `use_enable arts`"
-	myconf="${myconf} `use_enable alsa`"
-	myconf="${myconf} `use_enable gnome corba`"
-	myconf="${myconf} `use_enable ipv6`"
+	ebegin "Running automake (${WANT_AUTOMAKE})"
+	automake
+	eend $?
 
-	if [ $ARCH == "amd64" ]; then
+	ebegin "Running autoconf (${WANT_AUTOCONF})"
+	autoconf
+	eend $?
+
+	# fix #94149
+	libtoolize --copy --force
+}
+
+src_compile() {
+	if use amd64; then
 		replace-flags -O? -O
 		append-flags -frerun-cse-after-loop
 	fi
@@ -61,15 +77,24 @@ src_compile() {
 		export ARTSCCONFIG="$KDEDIR/bin/artsc-config"
 	fi
 
-	econf ${myconf} || die
-	make || die
+	econf \
+		$(use_enable alsa) \
+		$(use_enable arts) \
+		$(use_enable debug) \
+		$(use_enable esd) \
+		$(use_enable ipv6) \
+		$(use_enable gnome corba) \
+		$(use_enable x86 x86opts) \
+		$(use_enable xosd) \
+		--enable-cmdline || die "configure failed"
+	make || die "make failed"
 }
 
 src_install() {
 	into /usr
 	dobin base/zinf
 
-	exeinto /usr/lib/zinf/plugins
+	exeinto /usr/$(get_libdir)/zinf/plugins
 	doexe plugins/*
 
 	insinto /usr/share/zinf/themes
diff --git a/media-sound/zinf/zinf-2.2.5-r2.ebuild b/media-sound/zinf/zinf-2.2.5-r2.ebuild
index d7f334346f5b..db45a1cd42c2 100644
--- a/media-sound/zinf/zinf-2.2.5-r2.ebuild
+++ b/media-sound/zinf/zinf-2.2.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/media-sound/zinf/zinf-2.2.5-r2.ebuild,v 1.1 2005/07/31 20:17:22 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zinf/zinf-2.2.5-r2.ebuild,v 1.1.1.1 2005/11/30 09:37:53 chriswhite Exp $
 
 inherit kde-functions eutils flag-o-matic libtool
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 -sparc"
+KEYWORDS="~amd64 x86 -sparc"
 IUSE="alsa arts debug esd gnome gtk ipv6 nls vorbis xosd X"
 
 RESTRICT="primaryuri"
@@ -40,11 +40,11 @@ DEPEND="${RDEPEND}
 	x86? ( dev-lang/nasm )"
 
 src_unpack() {
-	unpack ${A}; cd ${S}
+	unpack ${A}; cd "${S}"
 
-	epatch ${FILESDIR}/${P}-cdplay.patch
-	epatch ${FILESDIR}/${P}-configure.patch
-	epatch ${FILESDIR}/${P}-rtp.patch
+	epatch "${FILESDIR}"/${P}-cdplay.patch
+	epatch "${FILESDIR}"/${P}-configure.patch
+	epatch "${FILESDIR}"/${P}-rtp.patch
 
 	export WANT_AUTOMAKE=1.7
 	export WANT_AUTOCONF=2.5
@@ -88,5 +88,5 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 }
diff --git a/media-sound/zinf/zinf-2.2.5-r3.ebuild b/media-sound/zinf/zinf-2.2.5-r3.ebuild
index 8b72a8895241..83b2db726cfa 100644
--- a/media-sound/zinf/zinf-2.2.5-r3.ebuild
+++ b/media-sound/zinf/zinf-2.2.5-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/media-sound/zinf/zinf-2.2.5-r3.ebuild,v 1.1 2005/10/22 13:09:32 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zinf/zinf-2.2.5-r3.ebuild,v 1.1.1.1 2005/11/30 09:37:53 chriswhite Exp $
 
 inherit kde-functions eutils flag-o-matic libtool
 
diff --git a/media-sound/zynaddsubfx/ChangeLog b/media-sound/zynaddsubfx/ChangeLog
index 6ec8452f2128..23b9df6fa43a 100644
--- a/media-sound/zynaddsubfx/ChangeLog
+++ b/media-sound/zynaddsubfx/ChangeLog
@@ -1,6 +1,115 @@
 # ChangeLog for media-sound/zynaddsubfx
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/ChangeLog,v 1.1 2003/03/23 06:21:38 jje Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/ChangeLog,v 1.1.1.1 2005/11/30 09:38:01 chriswhite Exp $
+
+  30 Jun 2005; Joseph Jezak <josejx@gentoo.org> zynaddsubfx-2.2.1-r2.ebuild:
+  Marked ~ppc.
+
+*zynaddsubfx-2.2.1-r2 (18 May 2005)
+
+  18 May 2005; Eric Shattow <jnc@gentoo.org> +zynaddsubfx-2.2.1-r2.ebuild:
+  Quick update.
+
+*zynaddsubfx-2.2.1-r1 (17 May 2005)
+
+  17 May 2005; Eric Shattow <jnc@gentoo.org> +zynaddsubfx-2.2.1-r1.ebuild:
+  Requires version of mini-xml-2.2*
+
+  19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  Remove retired developer from metadata.xml.
+
+*zynaddsubfx-2.2.1 (03 May 2005)
+
+  03 May 2005; Eric Shattow <jnc@gentoo.org> +zynaddsubfx-2.2.1.ebuild:
+  Version Bump. Cleanups / purge old versions.
+
+*zynaddsubfx-2.2.0 (17 Apr 2005)
+
+  17 Apr 2005; Eric Shattow <jnc@gentoo.org> +zynaddsubfx-2.2.0.ebuild:
+  Version Bump. Works without applying patches.
+
+*zynaddsubfx-2.1.1-r1 (08 Jan 2005)
+
+  08 Jan 2005; Eric Shattow <jnc@gentoo.org> +zynaddsubfx-2.1.1-r1.ebuild:
+  typo fftw-2* to be fftw-3* per bug #70285.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  zynaddsubfx-2.1.1.ebuild:
+  Stable amd64, x86.
+
+  21 Oct 2004; Chris White <chriswhite@gentoo.org>
+  -files/zynaddsubfx-2.1.1-gcc34_mem_hack.patch,
+  +files/zynaddsubfx-2.1.1-gcc34_no_sse.patch:
+  Added Eric Shattow <shadow@serverart.org>'s modified no sse patch for gcc 3.4
+  per bug #68334.
+
+  19 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -zynaddsubfx-2.0.0.ebuild:
+  Removing old versions.
+
+*zynaddsubfx-2.1.1 (18 Oct 2004)
+
+  18 Oct 2004; Chris White <chriswhite@gentoo.org>
+  +files/zynaddsubfx-2.1.1-fltk_flags.patch,
+  +files/zynaddsubfx-2.1.1-fltk_version.patch,
+  +files/zynaddsubfx-2.1.1-gcc34_mem_hack.patch,
+  +files/zynaddsubfx-2.1.1-gcc_subscript_warning.patch,
+  +files/zynaddsubfx-2.1.1-sanitize_makefile.patch, +zynaddsubfx-2.1.1.ebuild:
+  Bumped to version 2.1.1 as per Bug #67164. Thanks to Eric Shattow for working
+  on the ebuild and pathches. Fixes some nice little stability issues.
+
+*zynaddsubfx-2.0.0 (29 Sep 2004)
+
+  29 Sep 2004; Frank van de Pol <fvdpol@gentoo.org>
+  +files/zynaddsubfx-2.0.0.patch, +zynaddsubfx-2.0.0.ebuild:
+  Version bump to 2.0.0 submitted by Eric Shattow <shadow@serverart.org>. Closes
+  bug #57801.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  zynaddsubfx-1.4.3.ebuild:
+  Stable amd64.
+
+  14 Aug 2004; Sven Wegener <swegener@gentoo.org> zynaddsubfx-1.4.3.ebuild:
+  Trimmed trailing whitespace.
+
+  13 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  zynaddsubfx-1.4.3.ebuild:
+  Getting rid of virtual/jack.
+
+  16 Apr 2004; Travis Tilley <lv@gentoo.org> zynaddsubfx-1.4.3.ebuild:
+  added ~amd64 keyword
+
+  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  zynaddsubfx-1.4.3.ebuild:
+  inherit eutils
+
+  21 Jan 2004; <torbenh@gentoo.org> zynaddsubfx-1.4.0.ebuild,
+  zynaddsubfx-1.4.2.ebuild, zynaddsubfx-1.4.3.ebuild:
+  bumped 1.4.3 to stable.
+
+*zynaddsubfx-1.4.3 (20 Sep 2003)
+
+  20 Sep 2003; jje <jje@gentoo.org> zynaddsubfx-1.4.2.ebuild,
+  zynaddsubfx-1.4.3.ebuild, files/zynaddsubfx-1.4.3.patch:
+  Version bump.
+
+  20 Sep 2003; jje <jje@gentoo.org> zynaddsubfx-1.4.2.ebuild:
+  Fixed fftw depend, requires 2.x, does not compile with 3.x.
+
+*zynaddsubfx-1.4.2 (17 Jul 2003)
+
+  17 Jul 2003; torbenh <torbenh@gentoo.org> Manifest zynaddsubfx-1.4.2.ebuild files/zynaddsubfx-1.4.2.patch :
+  Version Bump
+  And install examples to /usr/share/zynaddsubfx
+
+*zynaddsubfx-1.4.0 (08 May 2003)
+
+  08 May 2003; jje <jje@gentoo.org> zynaddsubfx-1.2.0.ebuild,
+  zynaddsubfx-1.2.0.ebuild, zynaddsubfx-1.4.0.ebuild,
+  files/zynaddsubfx-1.2.0.patch, files/zynaddsubfx-1.4.0.patch:
+  Version bump.
+  
+  Clean up patch and install docs.
 
 *zynaddsubfx-1.2.0 (23 Mar 2003)
 
diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
index deee52c7dedf..1e9e7e880670 100644
--- a/media-sound/zynaddsubfx/Manifest
+++ b/media-sound/zynaddsubfx/Manifest
@@ -1,4 +1,10 @@
-MD5 1b7b9b7ab39e675bc768448d1cbf3c3f zynaddsubfx-1.4.0.ebuild 1004
-MD5 6f36dab0e1341152b51f87fbb3abd521 ChangeLog 767
-MD5 d2ebc854a07d7648a0f5d3d8bc1e767f files/digest-zynaddsubfx-1.4.0 69
-MD5 2820dd087232ba392d957abc60e4b8bf files/zynaddsubfx-1.4.0.patch 2050
+MD5 834ab1b3e993caa18ecabfdb64996507 ChangeLog 4109
+MD5 0960f560e5bc4503d4b052d6206bde8e zynaddsubfx-2.2.1.ebuild 2037
+MD5 52ad4686a993e8f9310bbcea723338b3 zynaddsubfx-2.2.1-r2.ebuild 2016
+MD5 b8e8840d85a9f1bb2aa2f6a7b51b58da metadata.xml 245
+MD5 e91a88f7fe305098901835415243087a zynaddsubfx-2.2.1-r1.ebuild 2006
+MD5 f50c5197d6350225030c0aa076821245 zynaddsubfx-2.2.0.ebuild 2037
+MD5 29b8e0c987fa509a0fc56badd44de8a0 files/digest-zynaddsubfx-2.2.0 70
+MD5 b7937486c8ddf39c8bd6bf206b97a663 files/digest-zynaddsubfx-2.2.1-r1 70
+MD5 b7937486c8ddf39c8bd6bf206b97a663 files/digest-zynaddsubfx-2.2.1 70
+MD5 b7937486c8ddf39c8bd6bf206b97a663 files/digest-zynaddsubfx-2.2.1-r2 70
diff --git a/media-sound/zynaddsubfx/metadata.xml b/media-sound/zynaddsubfx/metadata.xml
index d4ce46c038ab..693d184899ef 100644
--- a/media-sound/zynaddsubfx/metadata.xml
+++ b/media-sound/zynaddsubfx/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 <herd>sound</herd>
 <maintainer>
-  <email>torbenh@gentoo.org</email>
+  <email>jnc@gentoo.org</email>
+  <name>Eric Shattow</name>
 </maintainer>
 </pkgmetadata>
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-2.2.0.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-2.2.0.ebuild
index 940de00c341c..5a912b1bdd70 100644
--- a/media-sound/zynaddsubfx/zynaddsubfx-2.2.0.ebuild
+++ b/media-sound/zynaddsubfx/zynaddsubfx-2.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/media-sound/zynaddsubfx/zynaddsubfx-2.2.0.ebuild,v 1.1 2005/04/17 03:20:23 jnc Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/zynaddsubfx-2.2.0.ebuild,v 1.1.1.1 2005/11/30 09:38:01 chriswhite Exp $
 
 inherit eutils
 
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r1.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r1.ebuild
index 3feb3a6de3d2..0af81759b9e2 100644
--- a/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r1.ebuild
+++ b/media-sound/zynaddsubfx/zynaddsubfx-2.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/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r1.ebuild,v 1.1 2005/05/17 22:53:22 jnc Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:01 chriswhite Exp $
 
 inherit eutils
 
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r2.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r2.ebuild
index 8bed08048810..aa57eaeebb16 100644
--- a/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r2.ebuild
+++ b/media-sound/zynaddsubfx/zynaddsubfx-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/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r2.ebuild,v 1.1 2005/05/18 15:22:03 jnc Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r2.ebuild,v 1.1.1.1 2005/11/30 09:38:01 chriswhite Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/zynaddsubfx/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc x86"
 
 #IUSE="oss alsa jack mmx"
 IUSE="oss alsa jack"
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-2.2.1.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-2.2.1.ebuild
index ed12b47fecd5..88e8f457a01a 100644
--- a/media-sound/zynaddsubfx/zynaddsubfx-2.2.1.ebuild
+++ b/media-sound/zynaddsubfx/zynaddsubfx-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/media-sound/zynaddsubfx/zynaddsubfx-2.2.1.ebuild,v 1.1 2005/05/03 23:09:41 jnc Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/zynaddsubfx-2.2.1.ebuild,v 1.1.1.1 2005/11/30 09:38:01 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-ftp/atftp/ChangeLog b/net-ftp/atftp/ChangeLog
index 194427d2d551..84f720b9493a 100644
--- a/net-ftp/atftp/ChangeLog
+++ b/net-ftp/atftp/ChangeLog
@@ -1,6 +1,85 @@
-# ChangeLog for net-misc/atftp
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/atftp/ChangeLog,v 1.1 2002/10/15 11:32:42 aliz Exp $
+# ChangeLog for net-ftp/atftp
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/atftp/ChangeLog,v 1.1.1.1 2005/11/30 09:36:25 chriswhite Exp $
+
+  21 Jul 2005; Markus Rothe <corsair@gentoo.org> atftp-0.7.ebuild:
+  Stable on ppc64
+
+  14 Jun 2005; Markus Rothe <corsair@gentoo.org> atftp-0.7.ebuild:
+  added ~ppc64
+
+  21 Feb 2005; Simon Stelling <blubb@gentoo.org> :
+  added ~amd64
+
+  07 Feb 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/atftp-0.7-gcc.patch, atftp-0.7.ebuild:
+  Added patch to fix building #71090.
+
+  07 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> atftp-0.6.2.ebuild:
+  added ~amd64 to 0.6.2, fixes #81083
+
+  31 Jul 2004; <malc@gentoo.org> atftp-0.7.ebuild:
+  ~amd64 - closes bug #57702
+
+  22 Apr 2004; Chuck Short <zul@gentoo.org> atftp-0.6.2.ebuild:
+  Fixes typo. Closes #48660.
+
+  22 Mar 2004; David Holm <dholm@gentoo.org> atftp-0.7.ebuild:
+  Added to ~ppc.
+
+*atftp-0.7 (22 Mar 2004)
+
+  22 Mar 2004; Chuck Short <zul@gentoo.org> atftp-0.6.2.ebuild,
+  atftp-0.7.ebuild:
+  Version bump, closes #45210.
+
+  22 Mar 2004; Chuck Short <zul@gentoo.org> atftp-0.6.2.ebuild:
+  Marked stable for x86.
+
+  26 Jan 2004; Chuck Short <zul@gentoo.org> atftp-0.6-r3.ebuild,
+  atftp-0.6.2.ebuild:
+  Fix typo in ebuild. closes #38946.
+
+  30 Dec 2003; Chuck Short <zul@gentoo.org> atftp-0.6.2.ebuild,
+  files/atftp.confd, files/atftp.init:
+  Added init scripts. Closes #36051.
+
+  14 Dec 2003; Joshua Kinard <kumba@gentoo.org> atftp-0.6.2.ebuild:
+  forgot to mark keywords as unstable
+
+*atftp-0.6.2 (14 Dec 2003)
+
+  14 Dec 2003; Joshua Kinard <kumba@gentoo.org> atftp-0.6.2.ebuild:
+  Version bump
+
+*atftp-0.6-r3 (31 Oct 2003)
+
+  31 Oct 2003; Heinrich Wendel <lanius@gentoo.org> atftp-0.6-r2.ebuild,
+  atftp-0.6-r3.ebuild:
+  stable, it's just a virtual ;D
+
+  30 Oct 2003; Heinrich Wendel <lanius@gentoo.org> atftp-0.6-r1.ebuild,
+  atftp-0.6.ebuild:
+  added virtual/tftp
+
+*atftp-0.6-r1 (29 Aug 2003)
+
+  29 Aug 2003; Martin Holzer <mholzer@gentoo.org> atftp-0.6-r1.ebuild,
+  atftp-0.6-r2.ebuild, atftp-0.6.ebuild, files/atftp-0.6-security.patch:
+  move net-ftp/atftp net-misc
+
+  18 Jun 2003; Daniel Ahlberg <aliz@gentoo.org> files/atftp-0.6-security.patch :
+  Updated patch to a more proper one.
+
+*atftp-0.6-r2 (08 Jun 2003)
+
+  08 Jun 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Security update.
+
+*atftp-0.6-r1 (29 Oct 2002)
+
+  29 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> :
+  Updated ebuild with tcpd support. Ebuild contributed by Cory Visi <cory@visi.name> in #9797.
 
 *atftp-0.6 (16 Aug 2002)
 
diff --git a/net-ftp/atftp/Manifest b/net-ftp/atftp/Manifest
index e69de29bb2d1..2dd26bfbc230 100644
--- a/net-ftp/atftp/Manifest
+++ b/net-ftp/atftp/Manifest
@@ -0,0 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4cd5fb4b7755c4d8f992f3c56a615141 atftp-0.7.ebuild 963
+MD5 6f53cf043ccea8c37c9bba4d68703c16 atftp-0.6.2.ebuild 1039
+MD5 a483bfda64ff5f38d280ac88fa3206d8 ChangeLog 2702
+MD5 e14c6bca387e9af7d2734fb9f08a67ee files/digest-atftp-0.6.2 63
+MD5 f3d1e03f8ce70ea8ed775de7407304f3 files/atftp.init 437
+MD5 939f5bfbb9b7a728330cc124175c39e3 files/atftp.confd 105
+MD5 0adc9648a64aa6a05a55bf822eec7265 files/atftp-0.7-gcc.patch 540
+MD5 ef1244d13cccdfbe2dff44442e0c3d1f files/atftp-0.6-security.patch 1019
+MD5 401c2182f70ea502b2b13567dee9daf9 files/digest-atftp-0.7 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDLdM+gIKl8Uu19MoRAksJAJ9vTPce+baVdD17oTOVVQ82qBRaxACfRTVV
+WNiYRplQCiBa5ARtPz0aE5w=
+=HSU4
+-----END PGP SIGNATURE-----
diff --git a/net-ftp/atftp/atftp-0.6.2.ebuild b/net-ftp/atftp/atftp-0.6.2.ebuild
index f022dbe42d2f..b9f8c82699f1 100644
--- a/net-ftp/atftp/atftp-0.6.2.ebuild
+++ b/net-ftp/atftp/atftp-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-ftp/atftp/atftp-0.6.2.ebuild,v 1.1 2005/04/23 04:44:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/atftp/atftp-0.6.2.ebuild,v 1.1.1.1 2005/11/30 09:36:25 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-ftp/atftp/atftp-0.7.ebuild b/net-ftp/atftp/atftp-0.7.ebuild
index ee7e3ed9d8d6..c6690351cfd0 100644
--- a/net-ftp/atftp/atftp-0.7.ebuild
+++ b/net-ftp/atftp/atftp-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-ftp/atftp/atftp-0.7.ebuild,v 1.1 2005/04/23 04:44:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/atftp/atftp-0.7.ebuild,v 1.1.1.1 2005/11/30 09:36:25 chriswhite Exp $
 
 inherit eutils
 
@@ -10,17 +10,18 @@ SRC_URI="ftp://ftp.mamalinux.com/pub/atftp/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 arm ~ppc ~sparc ~x86"
-IUSE="tcpd"
+KEYWORDS="~amd64 arm ~ppc ppc64 ~sparc x86"
+IUSE="selinux tcpd"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )
+	selinux? ( sec-policy/selinux-tftpd )
 	!virtual/tftp"
 PROVIDE="virtual/tftp"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gcc.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc.patch
 }
 
 src_compile() {
@@ -30,6 +31,6 @@ src_compile() {
 
 src_install() {
 	make install DESTDIR="${D}" || die "Installation failed"
-	newinitd ${FILESDIR}/atftp.init atftp
-	newconfd ${FILESDIR}/atftp.confd atftp
+	newinitd "${FILESDIR}"/atftp.init atftp
+	newconfd "${FILESDIR}"/atftp.confd atftp
 }
diff --git a/net-ftp/atftp/files/atftp-0.6-security.patch b/net-ftp/atftp/files/atftp-0.6-security.patch
index 1646018ca9d3..5bf58699c74c 100644
--- a/net-ftp/atftp/files/atftp-0.6-security.patch
+++ b/net-ftp/atftp/files/atftp-0.6-security.patch
@@ -1,12 +1,23 @@
---- tftpd_file.c	Tue Mar 12 05:26:18 2002
-+++ tftpd_file_diff.c	Thu Jun  5 20:31:06 2003
-@@ -357,7 +357,8 @@
-      else
-      {
-           strcpy(filename, directory);
--          strncat(filename, data->tftp_options[OPT_FILENAME].value, VAL_SIZE);
-+          strncat(filename, data->tftp_options[OPT_FILENAME].value, 
-+		VAL_SIZE - strlen( directory ) - 1 );
-      }
- 
-      /* If the filename contain /../ sequences, we forbid the access */
+--- tftp.c	2003-06-17 00:13:52.000000000 +0200
++++ tftp.patch.c	2003-06-17 00:09:50.000000000 +0200
+@@ -827,17 +827,17 @@ int tftp_cmd_line_options(int argc, char
+                process_cmd(ac, av);            
+                break;
+           case 'T':
+-               sprintf(string, "timeout %s", optarg);
++               snprintf(string, sizeof(string), "timeout %s", optarg);
+                make_arg(string, &ac, &av);
+                process_cmd(ac, av);
+                break;
+           case 't':
+-               sprintf(string, "option timeout %s", optarg);
++               snprintf(string, sizeof(string), "option timeout %s", optarg);
+                make_arg(string, &ac, &av);
+                process_cmd(ac, av);
+                break;
+           case 'b':
+-               sprintf(string, "option blksize %s", optarg);
++               snprintf(string, sizeof(string), "option blksize %s", optarg);
+                make_arg(string, &ac, &av);
+                process_cmd(ac, av);
+                break;
diff --git a/net-ftp/axyftp/ChangeLog b/net-ftp/axyftp/ChangeLog
index 682b77188c0a..8d04bbe332bf 100644
--- a/net-ftp/axyftp/ChangeLog
+++ b/net-ftp/axyftp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-ftp/axyftp
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/axyftp/ChangeLog,v 1.1 2004/01/27 19:47:04 mholzer Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/axyftp/ChangeLog,v 1.1.1.1 2005/11/30 09:36:25 chriswhite Exp $
+
+  03 Feb 2005; <avatar@gentoo.org> axyftp-0.5.1.ebuild:
+  Added to ~ppc.
+
+  27 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org> axyftp-0.5.1.ebuild:
+  add SLOT and IUSE
 
 *axyftp-0.5.1 (27 Jan 2004)
 
diff --git a/net-ftp/axyftp/Manifest b/net-ftp/axyftp/Manifest
index 06e2ab4ccbc6..d44cc8ad87e3 100644
--- a/net-ftp/axyftp/Manifest
+++ b/net-ftp/axyftp/Manifest
@@ -1,2 +1,3 @@
-MD5 36c1265256c6f4394b08c04e9dd4a7e0 axyftp-0.5.1.ebuild 468
+MD5 7afc78c0241a348b8ae57002533bfcab ChangeLog 548
+MD5 a4294e3cb151946fb8f3f0b4aa6b7e0a axyftp-0.5.1.ebuild 614
 MD5 09c283969cefad7b50be218fb1782532 files/digest-axyftp-0.5.1 64
diff --git a/net-ftp/axyftp/axyftp-0.5.1.ebuild b/net-ftp/axyftp/axyftp-0.5.1.ebuild
index b073f7b8b06c..6595b4a498b5 100644
--- a/net-ftp/axyftp/axyftp-0.5.1.ebuild
+++ b/net-ftp/axyftp/axyftp-0.5.1.ebuild
@@ -1,13 +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-ftp/axyftp/axyftp-0.5.1.ebuild,v 1.1 2004/01/27 19:47:04 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/axyftp/axyftp-0.5.1.ebuild,v 1.1.1.1 2005/11/30 09:36:25 chriswhite Exp $
 
 DESCRIPTION="GUI FTP client for X Window System (former WXftp)"
 SRC_URI="http://www.wxftp.seul.org/download/${P}.tar.gz"
 HOMEPAGE="http://www.wxftp.seul.org"
 
 LICENSE="Artistic LGPL-2.1"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86 ~amd64 ~ppc"
+SLOT="0"
+IUSE=""
 
 DEPEND=">=x11-libs/gtk+-1.2"
 
diff --git a/net-ftp/deadftp/ChangeLog b/net-ftp/deadftp/ChangeLog
index 60abfed8fbe0..0225b9b8d629 100644
--- a/net-ftp/deadftp/ChangeLog
+++ b/net-ftp/deadftp/ChangeLog
@@ -1,9 +1,23 @@
 # ChangeLog for net-ftp/deadftp
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/deadftp/ChangeLog,v 1.1 2002/07/09 10:10:34 stroke Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/deadftp/ChangeLog,v 1.1.1.1 2005/11/30 09:36:18 chriswhite Exp $
 
+  27 Dec 2004; Seemant Kulleen <seemant@gentoo.org> deadftp-0.1.3.ebuild:
+  add libxml to DEPEND, thanks to: Daniel Karlsson <boogah@t-gul.rsn.bth.se>
+  in bug #69540
+
+  20 Aug 2004; Danny van Dyk <kugelfang@gentoo.org> deadftp-0.1.3.ebuild:
+  Marked ~amd64.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *deadftp-0.1.3 (09 Jul 2002)
 
+  04 Sep 2002; Seemant Kulleen <seemant@gentoo.org> deadftp-0.1.3.ebuild :
+
+  make install -> einstall == no more sandbox violations.  Closes bug #7419
+  by dogson@home.se (Rickard Nordbrandt)
+
   09 Jul 2002; Gabriele Giorgetti <stroke@gentoo.org> deadftp-0.1.3.ebuild:
 
   New package added. DeadFTP is a GNOME based ftp client.
diff --git a/net-ftp/deadftp/Manifest b/net-ftp/deadftp/Manifest
index e69de29bb2d1..31f918f0e003 100644
--- a/net-ftp/deadftp/Manifest
+++ b/net-ftp/deadftp/Manifest
@@ -0,0 +1,3 @@
+MD5 056b1be2c47231d76aa9da6468420313 deadftp-0.1.3.ebuild 874
+MD5 797a192ab30eb9c2a7bba33936bd8930 ChangeLog 905
+MD5 66b452368c73d4c2cd02fb216b6054b9 files/digest-deadftp-0.1.3 66
diff --git a/net-ftp/deadftp/deadftp-0.1.3.ebuild b/net-ftp/deadftp/deadftp-0.1.3.ebuild
index 32b6649189fd..9c42dd912836 100644
--- a/net-ftp/deadftp/deadftp-0.1.3.ebuild
+++ b/net-ftp/deadftp/deadftp-0.1.3.ebuild
@@ -1,44 +1,39 @@
-# 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-ftp/deadftp/deadftp-0.1.3.ebuild,v 1.1 2002/07/09 10:10:34 stroke Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/deadftp/deadftp-0.1.3.ebuild,v 1.1.1.1 2005/11/30 09:36:18 chriswhite Exp $
+
+IUSE="nls"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Gnome based FTP Client"
-SRC_URI="http://unc.dl.sourceforge.net/sourceforge/deadftp/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/deadftp/${P}.tar.bz2"
 HOMEPAGE="http://deadftp.sourceforge.net"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="*"
+KEYWORDS="x86 ppc sparc ~amd64"
 
 DEPEND="=dev-libs/glib-1.2*
 	=x11-libs/gtk+-1.2*
-	( >=gnome-base/libglade-0.17
-	 <gnome-base/libglade-2.0.0 )
+	dev-libs/libxml
+	=gnome-base/libglade-0.17*
 	>=media-libs/gdk-pixbuf-0.18.0
-	>=gnome-base/ORBit-0.5.16
+	=gnome-base/orbit-0*
 	>=gnome-base/gnome-libs-1.4.1.7"
 
-RDEPEND="${DEPEND}
-	nls? ( >=sys-devel/gettext-0.10.40 >=dev-util/intltool-0.11 )"
+RDEPEND="nls? ( >=sys-devel/gettext-0.10.40
+	>=dev-util/intltool-0.11 )"
 
 
 src_compile() {
 	local myconf
-	if [ -z "`use nls`" ] ; then
-		myconf="--disable-nls"
-	fi
-
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man ${myconf} || die
+	use nls || myconf="--disable-nls"
 
+	econf ${myconf} || die
 	emake || die
 }
 
 src_install() {
-	make prefix=${D}/usr mandir=${D}/usr/share/man install || die
+	einstall || die
 
 	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
 }
diff --git a/net-ftp/easyftp/ChangeLog b/net-ftp/easyftp/ChangeLog
index 5fb6c15e1351..dcf0c60325d2 100644
--- a/net-ftp/easyftp/ChangeLog
+++ b/net-ftp/easyftp/ChangeLog
@@ -1,11 +1,21 @@
 # ChangeLog for net-ftp/easyftp
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/easyftp/ChangeLog,v 1.1 2002/05/27 00:58:52 rphillips Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/easyftp/ChangeLog,v 1.1.1.1 2005/11/30 09:36:28 chriswhite Exp $
 
+  26 Jul 2005; David Holm <dholm@gentoo.org> easyftp-6_beta.ebuild:
+  Added to ~ppc.
+
+  10 May 2004; Daniel Ahlberg <aliz@gentoo.org> easyftp-6_beta.ebuild:
+  Added amd64 keyword, changed patch to epatch. Closing #50537.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *easyftp-6_beta (26 May 2002)
 
-  26 May 2002; Ryan Phillips <rphillips@gentoo.org> ChangeLog :
+  12 Oct 2002; Mike Frysinger <vapier@gentoo.org> easyftp-gcc3.2.diff :
+  Added a tiny patch to make it work in gcc3.2 #9037
 
+  26 May 2002; Ryan Phillips <rphillips@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-ftp/easyftp/Manifest b/net-ftp/easyftp/Manifest
index e69de29bb2d1..593c68f56725 100644
--- a/net-ftp/easyftp/Manifest
+++ b/net-ftp/easyftp/Manifest
@@ -0,0 +1,4 @@
+MD5 b3a04ac6733029fbbf5b032d9d5ff3d6 ChangeLog 1101
+MD5 023f39c836c9d25ad2139b11ca98f504 easyftp-6_beta.ebuild 677
+MD5 ceb6f45ab904c753c0ac40b32f7075e6 files/digest-easyftp-6_beta 58
+MD5 6fbb747ed93e97da3a33409e947ff045 files/easyftp-gcc3.2.diff 489
diff --git a/net-ftp/easyftp/easyftp-6_beta.ebuild b/net-ftp/easyftp/easyftp-6_beta.ebuild
index 7ac9b18a2ca1..1baae2f99087 100644
--- a/net-ftp/easyftp/easyftp-6_beta.ebuild
+++ b/net-ftp/easyftp/easyftp-6_beta.ebuild
@@ -1,23 +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/net-ftp/easyftp/easyftp-6_beta.ebuild,v 1.1 2002/05/27 00:58:52 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/easyftp/easyftp-6_beta.ebuild,v 1.1.1.1 2005/11/30 09:36:28 chriswhite Exp $
 
+inherit eutils
+
+S=${WORKDIR}
 DESCRIPTION="An EASY GUI FTP Client (QT based)"
 HOMEPAGE="http://freshmeat.net/projects/easyftp/"
-LICENSE="GPL"
-DEPEND="=x11-libs/qt-3*"
 SRC_URI="http://backen.dyndns.org/files/easyFTPb6.tar"
 
-S=${WORKDIR}
+DEPEND="=x11-libs/qt-3*"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc sparc x86"
+IUSE=""
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+
+	epatch ${FILESDIR}/easyftp-gcc3.2.diff
+}
 
 src_compile() {
 	emake || die
 }
 
-src_install () {
-	mkdir ${D}/usr/
-	mkdir ${D}/usr/bin/
-	cp ./easyFTP ${D}/usr/bin/
+src_install() {
+	exeinto /usr/bin/
+	doexe easyFTP
 	dodoc README
 }
-
diff --git a/net-ftp/frox/ChangeLog b/net-ftp/frox/ChangeLog
index 89a27197088e..f97ced2b5c46 100644
--- a/net-ftp/frox/ChangeLog
+++ b/net-ftp/frox/ChangeLog
@@ -1,6 +1,43 @@
 # ChangeLog for net-ftp/frox
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/frox/ChangeLog,v 1.1 2005/01/24 14:05:34 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/frox/ChangeLog,v 1.1.1.1 2005/11/30 09:36:21 chriswhite Exp $
+
+*frox-0.7.18-r2 (17 Sep 2005)
+
+  17 Sep 2005; Daniel Black <dragonheart@gentoo.org>  frox-0.7.18-r2.ebuild files/digest-frox-0.7.18-r2
+  Forgot ! when checking for missing config file in initscript. Bug #106267 thanks to M9841
+
+*frox-0.7.18-r1 (07 Sep 2005)
+
+  07 Sep 2005; Daniel Black <dragonheart@gentoo.org> files/frox.rc,
+  +frox-0.7.18-r1.ebuild:
+  fixed initscript - thanks ian@g.o bug #105121. revision bump to install 
+  fixed initscript. also stops installing COPYING information. QA fixes too
+
+  23 Aug 2005; Daniel Black <dragonheart@gentoo.org> frox-0.7.18.ebuild:
+  removing /bin/false from enewuser - bug #103421
+
+  26 Jul 2005; David Holm <dholm@gentoo.org> frox-0.7.18.ebuild:
+  Added to ~ppc.
+
+  12 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> frox-0.7.18.ebuild:
+  Stable on sparc
+
+  16 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org> frox-0.7.18.ebuild:
+  Keyworded ~sparc wrt #81046
+
+  07 Feb 2005; Daniel Black <dragonheart@gentoo.org> -frox-0.7.17.ebuild:
+  Remove vulnerable version - Thanks to Sebastian Mueller <dakjo@mpsna.de> for
+  the bug report.
+
+  07 Feb 2005; Simon Stelling <blubb@gentoo.org> frox-0.7.18.ebuild:
+  stable on amd64; bug #81035
+
+*frox-0.7.18 (07 Feb 2005)
+
+  07 Feb 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/config-0.7.18.patch, files/frox.rc, +frox-0.7.18.ebuild:
+  Version bump for secuity bug #81035
 
 *frox-0.7.17 (24 Jan 2005)
 
diff --git a/net-ftp/frox/Manifest b/net-ftp/frox/Manifest
index 32cc918d1683..a8430073c16b 100644
--- a/net-ftp/frox/Manifest
+++ b/net-ftp/frox/Manifest
@@ -1,3 +1,18 @@
-MD5 a9f5116375f30e3e9783784a0d0664eb frox-0.7.17.ebuild 1542
-MD5 53684947196c2ab2f628954624eb710a files/frox.rc 862
-MD5 b7ee81e7aac314baf746d17c3560ef04 files/digest-frox-0.7.17 64
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6d796b061ed1c1337ef157a5f74dab35 metadata.xml 403
+MD5 8f14cdbe16532380c2411b386ba5bdcf ChangeLog 1800
+MD5 4ed8b45b788394d07de8ee0d6d4ec015 frox-0.7.18-r1.ebuild 1821
+MD5 3dd0a6b913a28b30847dd560654f0e6d frox-0.7.18-r2.ebuild 1821
+MD5 8b112b625077001f33ae23eb28602115 files/frox.rc 1078
+MD5 e80a76dccec13cd8104fe980f63395fd files/config-0.7.18.patch 1953
+MD5 4fc077cd1a556548e43d1bbc6176c1fb files/digest-frox-0.7.18-r1 64
+MD5 4fc077cd1a556548e43d1bbc6176c1fb files/digest-frox-0.7.18-r2 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDLB4AmdTrptrqvGERAgmlAKCdjc6di/ZhnzSEBPemLLhb+7f75wCgiQDu
+FM758KCFYOUkhqPf1cCkWtg=
+=//36
+-----END PGP SIGNATURE-----
diff --git a/net-ftp/frox/files/frox.rc b/net-ftp/frox/files/frox.rc
index 949d0e58a251..62a803c5dccc 100644
--- a/net-ftp/frox/files/frox.rc
+++ b/net-ftp/frox/files/frox.rc
@@ -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/net-ftp/frox/files/frox.rc,v 1.1 2005/01/24 14:05:34 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/frox/files/frox.rc,v 1.1.1.1 2005/11/30 09:36:21 chriswhite Exp $
 
 PROGNAME=`basename $1`
 
@@ -12,8 +12,8 @@ depend() {
 }
 
 checkconfig() {
-	if [ -f /etc/frox.config ] ; then
-		eerror "missing /etc/frox.config"
+	if [ ! -f /etc/frox.conf ] ; then
+		eerror "missing /etc/frox.conf"
 		return 1
 	fi
 
diff --git a/net-ftp/frox/frox-0.7.18-r1.ebuild b/net-ftp/frox/frox-0.7.18-r1.ebuild
index 7b2b6290ba1c..02ed5a5fd4ab 100644
--- a/net-ftp/frox/frox-0.7.18-r1.ebuild
+++ b/net-ftp/frox/frox-0.7.18-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-ftp/frox/frox-0.7.18-r1.ebuild,v 1.1 2005/09/07 09:40:08 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/frox/frox-0.7.18-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:21 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-ftp/frox/frox-0.7.18-r2.ebuild b/net-ftp/frox/frox-0.7.18-r2.ebuild
index 06ab54780bcd..01f6c79205ad 100644
--- a/net-ftp/frox/frox-0.7.18-r2.ebuild
+++ b/net-ftp/frox/frox-0.7.18-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-ftp/frox/frox-0.7.18-r2.ebuild,v 1.1 2005/09/17 13:45:12 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/frox/frox-0.7.18-r2.ebuild,v 1.1.1.1 2005/11/30 09:36:21 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-ftp/ftp/ChangeLog b/net-ftp/ftp/ChangeLog
index 5283af9dc466..c93b4ac99f8b 100644
--- a/net-ftp/ftp/ChangeLog
+++ b/net-ftp/ftp/ChangeLog
@@ -1,6 +1,88 @@
 # ChangeLog for net-ftp/ftp
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftp/ChangeLog,v 1.1 2002/02/01 21:53:32 gbevin Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftp/ChangeLog,v 1.1.1.1 2005/11/30 09:36:25 chriswhite Exp $
+
+*ftp-0.17-r6 (14 Oct 2005)
+
+  14 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/netkit-ftp-0.17-dont-strcpy-overlapping.patch,
+  files/netkit-ftp-0.17-ipv6.patch, +files/netkit-ftp-0.17-segv.patch,
+  +ftp-0.17-r6.ebuild:
+  Grab segv patch from Fedora, make sure we fixup the ssl port code since ipv6
+  changes it, and fix a segfault when using strcpy() on the same areas of
+  memory #104311.
+
+  03 Aug 2005; Mike Frysinger <vapier@gentoo.org> ftp-0.17-r5.ebuild:
+  Make sure we build with LFS #101038 by Maik Musall.
+
+*ftp-0.17-r5 (30 Jul 2005)
+
+  30 Jul 2005; Mike Frysinger <vapier@gentoo.org> +ftp-0.17-r5.ebuild:
+  Add some user-input buffer len checks #100423 by Amir Sadoughi.
+
+  27 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org> ftp-0.17-r4.ebuild:
+  Use the correct toolchain compiler.
+
+*ftp-0.17-r4 (11 Feb 2005)
+
+  11 Feb 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/netkit-ftp-0.17-acct.patch,
+  +files/netkit-ftp-0.17-custom-cflags.patch,
+  +files/netkit-ftp-0.17-ipv6.patch, +files/netkit-ftp-0.17-locale.patch,
+  +files/netkit-ftp-0.17-runique_mget.patch,
+  +files/netkit-ftp-0.17-security.patch,
+  +files/netkit-ftp-0.17-ssl-0.2.patch, +ftp-0.17-r4.ebuild:
+  Add a bunch of misc patches from Fedora.  Add a tweaked ipv6 patch #47507 by
+  Jasmin Buchert.  Touchup the ssl patch and include -z option fix by Andreas
+  Kling #81586.
+
+  20 Feb 2004; Aron Griffis <agriffis@gentoo.org> ftp-0.17-r3.ebuild:
+  stable on alpha
+
+  18 Sep 2003; Jon Portnoy <avenj@gentoo.org> ftp-0.17-r3.ebuild :
+  ia64 keywords.
+
+  15 Jul 2003; Christian Birchinger <joker@gentoo.org> ftp-0.17-r3.ebuild:
+  Added sparc stable keyword
+
+*ftp-0.17-r3 (13 Jun 2003)
+
+  08 Aug 2003; Jan Seidel <tuxus@gentoo.org> ftp-0.17-r3.ebuild :
+  Marked stable on mips
+
+  25 Jul 2003; Guy Martin <gmsoft@gentoo.org> ftp-0.17-r3.ebuild :
+  Marked stable on hppa.
+
+  13 Jun 2003; Seemant Kulleen <seemant@gentoo.org> ftp-0.17-r3.ebuild,
+  files/netkit-ftp-0.17+ssl-0.2+auth.diff:
+  patch to establish a secure (ssl/tls) connection to an ftp server; submitted
+  by: Norberto Bensa <nbensa@yahoo.com> and ebuild by: Tobias Sager
+  <moixa@gmx.ch>
+
+*ftp-0.17-r2 (12 Nov 2002)
+  
+  15 Feb 2003; Jan Seidel <tuxus@gentoo.org> ftp-0.17-r2.ebuild :
+  Added mips to keywords
+
+  09 Feb 2003; Seemant Kulleen <seemant@gentoo.org> *.ebuild :
+
+  Sed expression delimiters from / to :, closing bug #15006 by Blu3
+  <david+gentoo.org@blue-labs.org> and also changed to use epatch.
+
+  09 Feb 2003; Guy Martin <gmsoft@gentoo.org> ftp-0.17-r2.ebuild :
+  Added hppa to keywords.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  05 Dec 2002; Nick Hadaway <raker@gentoo.org> ftp-0.17-r2.ebuild :
+  Marked stable.
+
+  23 Nov 2002; Nick Hadaway <raker@gentoo.org> ftp-0.17-r2.ebuild,
+  files/digest-ftp-0.17-r2, files/netkit-ftp-0.17+ssl-0.2.diff :
+  Fixed a typo, marked unstable, and added to portage.
+
+  12 Nov 2002; T.Sager <moixa@gmx.ch> ChangeLog :
+  Added patch for SSL support.
 
 *ftp-0.17-r1 (1 Feb 2002)
 
diff --git a/net-ftp/ftp/Manifest b/net-ftp/ftp/Manifest
index e69de29bb2d1..58b4723cdee3 100644
--- a/net-ftp/ftp/Manifest
+++ b/net-ftp/ftp/Manifest
@@ -0,0 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 bfa2f8566ce2a75364c9aea8087b0270 ChangeLog 3642
+MD5 036b2200a177f3266c5cbb3f4d5e4ed5 files/digest-ftp-0.17-r3 66
+MD5 036b2200a177f3266c5cbb3f4d5e4ed5 files/digest-ftp-0.17-r5 66
+MD5 036b2200a177f3266c5cbb3f4d5e4ed5 files/digest-ftp-0.17-r6 66
+MD5 10adb0b3b66639bdb39e7c976667eb68 files/netkit-ftp-0.17+ssl-0.2+auth.diff 424
+MD5 93f2e2f560f76d5ca833c2172fc2b501 files/netkit-ftp-0.17+ssl-0.2.diff 45616
+MD5 ac6ceef9cbe7bce5e89b97acaba3934f files/netkit-ftp-0.17-acct.patch 419
+MD5 4396c484fc1661431ba229441923c274 files/netkit-ftp-0.17-custom-cflags.patch 587
+MD5 7ea1e6f6fc38c7ec06eeb9317c5b72a5 files/netkit-ftp-0.17-dont-strcpy-overlapping.patch 1375
+MD5 fff08fac8daf71e3580efe0b71b25349 files/netkit-ftp-0.17-ipv6.patch 22850
+MD5 047c2f1c4217615294c3905fa97df40e files/netkit-ftp-0.17-locale.patch 577
+MD5 21b1d9279bb3b48cba7a72be936890d4 files/netkit-ftp-0.17-runique_mget.patch 488
+MD5 a2ce6225bb6a68ca98d6ddec516237b9 files/netkit-ftp-0.17-security.patch 509
+MD5 d632888a47c713e0ee59c4677338ca57 files/netkit-ftp-0.17-segv.patch 2009
+MD5 c6d25ab53501677130cabad19092b0a5 files/netkit-ftp-0.17-ssl-0.2.patch 29528
+MD5 80ca646c7ebf7d86e937294242836ea6 ftp-0.17-r3.ebuild 1034
+MD5 45fd632e8f4c81f73a7ab97dac005132 ftp-0.17-r5.ebuild 1413
+MD5 90898fc0ff864056911813bc370afb3b ftp-0.17-r6.ebuild 1551
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDaESIgIKl8Uu19MoRAhfUAJ9zNm26CBWy1sr28JFV3v/OTuz+UgCfVRcR
+TnV8fv+4YyGLyJ3DzvDbLAk=
+=ae1u
+-----END PGP SIGNATURE-----
diff --git a/net-ftp/ftp/files/netkit-ftp-0.17+ssl-0.2.diff b/net-ftp/ftp/files/netkit-ftp-0.17+ssl-0.2.diff
index 86c15833a90c..833f59491e90 100644
--- a/net-ftp/ftp/files/netkit-ftp-0.17+ssl-0.2.diff
+++ b/net-ftp/ftp/files/netkit-ftp-0.17+ssl-0.2.diff
@@ -161,7 +161,7 @@ diff -u -r -N netkit-ftp-0.17/ftp/ftp.c netkit-ftp-0.17+ssl-0.2/ftp/ftp.c
  	int r;
  	void (*oldintr)(int);
 +#ifdef USE_SSL
-+        char outputbuf[2048];        /* allow for a 2k command string */
++        char outputbuf[8192];
 +#endif /* USE_SSL */
  
  	abrtflag = 0;
@@ -172,7 +172,7 @@ diff -u -r -N netkit-ftp-0.17/ftp/ftp.c netkit-ftp-0.17+ssl-0.2/ftp/ftp.c
  	va_start(ap, fmt);
 +#ifdef USE_SSL
 +        /* assemble the output into a buffer */
-+	vsprintf(outputbuf,fmt,ap);
++	vsnprintf(outputbuf,sizeof(outputbuf),fmt,ap);
 +	strcat(outputbuf,"\r\n");
 +	if (ssl_active_flag) {
 +	    SSL_write(ssl_con,outputbuf,strlen(outputbuf));
@@ -866,7 +866,7 @@ diff -u -r -N netkit-ftp-0.17/ftp/main.c.~1~ netkit-ftp-0.17+ssl-0.2/ftp/main.c.
 + * from: @(#)main.c	5.18 (Berkeley) 3/1/91
 + */
 +char main_rcsid[] = 
-+  "$Id: netkit-ftp-0.17+ssl-0.2.diff,v 1.1 2002/11/23 07:31:44 raker Exp $";
++  "$Id: netkit-ftp-0.17+ssl-0.2.diff,v 1.1.1.1 2005/11/30 09:36:27 chriswhite Exp $";
 +
 +
 +/*
diff --git a/net-ftp/ftp/files/netkit-ftp-0.17-ipv6.patch b/net-ftp/ftp/files/netkit-ftp-0.17-ipv6.patch
index defc6d1db049..8d6279d1fbbe 100644
--- a/net-ftp/ftp/files/netkit-ftp-0.17-ipv6.patch
+++ b/net-ftp/ftp/files/netkit-ftp-0.17-ipv6.patch
@@ -105,6 +105,26 @@ http://bugs.gentoo.org/show_bug.cgi?id=47507
  	if (argc > 2) {
  #ifdef USE_SSL
                  /* not really an SSL enhancement but something that
+@@ -222,7 +222,7 @@
+ 		     * the default (unofficial) port number
+ 		     */
+ 		    if ((strcmp(argv[2],"ssl-ftp")==0) && (destsp==NULL))
+-		        port = 150;
++		        port = "150";
+ 		    else {
+ 			if (destsp == NULL ) {
+ 			    printf("%s: bad port name-- %s\n",argv[1],argv[2]);
+@@ -230,7 +230,9 @@
+ 			    code = -1;
+ 			    return;
+ 			} else {
+-			    port = ntohs(destsp->s_port);
++			    static char portbuf[10];
++			    snprintf(portbuf, sizeof(portbuf), "%i", ntohs(destsp->s_port));
++			    port = portbuf;
+ 			}
+ 		    }
+ 		} else 
 @@ -233,20 +235,15 @@
  		    }
  		} else 
diff --git a/net-ftp/ftp/files/netkit-ftp-0.17-locale.patch b/net-ftp/ftp/files/netkit-ftp-0.17-locale.patch
index 57a10d85e353..e17402b327da 100644
--- a/net-ftp/ftp/files/netkit-ftp-0.17-locale.patch
+++ b/net-ftp/ftp/files/netkit-ftp-0.17-locale.patch
@@ -1,8 +1,12 @@
-ripped from Fedora
+Ripped from Fedora
+
+* Wed Dec 15 2004 Tim Waugh <twaugh@redhat.com>
+- Call setlocale() so that readline works correctly (bug #142265).
+
 https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=142265
 
---- netkit-ftp-0.17/ftp/main.c.locale	2004-12-15 16:52:14.504193752 +0000
-+++ netkit-ftp-0.17/ftp/main.c	2004-12-15 16:52:51.719133655 +0000
+--- netkit-ftp-0.17/ftp/main.c
++++ netkit-ftp-0.17/ftp/main.c
 @@ -51,6 +51,7 @@
  
  /* #include <arpa/ftp.h>	<--- unused? */
diff --git a/net-ftp/ftp/files/netkit-ftp-0.17-ssl-0.2.patch b/net-ftp/ftp/files/netkit-ftp-0.17-ssl-0.2.patch
index 9ba6f5291a71..7f5558182188 100644
--- a/net-ftp/ftp/files/netkit-ftp-0.17-ssl-0.2.patch
+++ b/net-ftp/ftp/files/netkit-ftp-0.17-ssl-0.2.patch
@@ -182,7 +182,7 @@
  	int r;
  	void (*oldintr)(int);
 +#ifdef USE_SSL
-+        char outputbuf[2048];        /* allow for a 2k command string */
++        char outputbuf[8192];
 +#endif /* USE_SSL */
  
  	abrtflag = 0;
@@ -193,7 +193,7 @@
  	va_start(ap, fmt);
 +#ifdef USE_SSL
 +        /* assemble the output into a buffer */
-+	vsprintf(outputbuf,fmt,ap);
++	vsnprintf(outputbuf,sizeof(outputbuf),fmt,ap);
 +	strcat(outputbuf,"\r\n");
 +	if (ssl_active_flag) {
 +	    SSL_write(ssl_con,outputbuf,strlen(outputbuf));
diff --git a/net-ftp/ftp/ftp-0.17-r3.ebuild b/net-ftp/ftp/ftp-0.17-r3.ebuild
index e9de034440b4..941dbba2a251 100644
--- a/net-ftp/ftp/ftp-0.17-r3.ebuild
+++ b/net-ftp/ftp/ftp-0.17-r3.ebuild
@@ -1,46 +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/net-ftp/ftp/ftp-0.17-r3.ebuild,v 1.1 2003/06/13 13:24:03 seemant Exp $
-
-IUSE="ssl"
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftp/ftp-0.17-r3.ebuild,v 1.1.1.1 2005/11/30 09:36:26 chriswhite Exp $
 
 inherit eutils
 
 MY_P=netkit-${P}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="Standard Linux FTP client with optional SSL support"
-SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${MY_P}.tar.gz"
 HOMEPAGE="http://www.hcs.harvard.edu/~dholland/computers/netkit.html"
+SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${MY_P}.tar.gz"
 
-SLOT="0"
 LICENSE="as-is"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~arm"
+SLOT="0"
+KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64"
+IUSE="ssl"
 
 RDEPEND=">=sys-libs/ncurses-5.2
 	ssl? ( dev-libs/openssl )"
-
-DEPEND=">=sys-apps/sed-4
-	${RDEPEND}"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	
-	if [ "`use ssl`" ]; then
-		epatch ${FILESDIR}/${MY_P}+ssl-0.2.diff
-		epatch ${FILESDIR}/${MY_P}+ssl-0.2+auth.diff
-	fi
+
+	use ssl \
+		&& epatch ${FILESDIR}/${MY_P}+ssl-0.2.diff \
+		&& epatch ${FILESDIR}/${MY_P}+ssl-0.2+auth.diff
 }
 
-src_compile() {			  
+src_compile() {
 	./configure --prefix=/usr || die
 	sed -i "s:-pipe -O2:${CFLAGS}:" MCONFIG
 	emake || die
 }
 
-src_install() {							   
-	into /usr
-	dobin ftp/ftp
+src_install() {
+	dobin ftp/ftp || die
 	doman ftp/ftp.1 ftp/netrc.5
 	dodoc ChangeLog README BUGS
 }
diff --git a/net-ftp/ftp/ftp-0.17-r5.ebuild b/net-ftp/ftp/ftp-0.17-r5.ebuild
index a448e375b9f3..9db3c340c8c8 100644
--- a/net-ftp/ftp/ftp-0.17-r5.ebuild
+++ b/net-ftp/ftp/ftp-0.17-r5.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-ftp/ftp/ftp-0.17-r5.ebuild,v 1.1 2005/07/30 06:20:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftp/ftp-0.17-r5.ebuild,v 1.1.1.1 2005/11/30 09:36:26 chriswhite Exp $
 
-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs flag-o-matic
 
 MY_P=netkit-${P}
 S=${WORKDIR}/${MY_P}
@@ -22,14 +22,15 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${MY_P}-ssl-0.2.patch
-	epatch ${FILESDIR}/${MY_P}-ipv6.patch #47507
-	epatch ${FILESDIR}/${MY_P}-acct.patch #fedora
-	epatch ${FILESDIR}/${MY_P}-locale.patch #fedora
-	epatch ${FILESDIR}/${MY_P}-runique_mget.patch #fedora
-	epatch ${FILESDIR}/${MY_P}-security.patch #fedora
-	epatch ${FILESDIR}/${MY_P}-custom-cflags.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${MY_P}-ssl-0.2.patch
+	epatch "${FILESDIR}"/${MY_P}-ipv6.patch #47507
+	epatch "${FILESDIR}"/${MY_P}-acct.patch #fedora
+	epatch "${FILESDIR}"/${MY_P}-locale.patch #fedora
+	epatch "${FILESDIR}"/${MY_P}-runique_mget.patch #fedora
+	epatch "${FILESDIR}"/${MY_P}-security.patch #fedora
+	epatch "${FILESDIR}"/${MY_P}-custom-cflags.patch
+	append-lfs-flags #101038
 }
 
 src_compile() {
diff --git a/net-ftp/ftp/ftp-0.17-r6.ebuild b/net-ftp/ftp/ftp-0.17-r6.ebuild
index dda4bbbbf80a..4ddf4bd65cbc 100644
--- a/net-ftp/ftp/ftp-0.17-r6.ebuild
+++ b/net-ftp/ftp/ftp-0.17-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-ftp/ftp/ftp-0.17-r6.ebuild,v 1.1 2005/10/14 05:44:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftp/ftp-0.17-r6.ebuild,v 1.1.1.1 2005/11/30 09:36:25 chriswhite Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${MY_P}.tar.gz"
 
 LICENSE="as-is"
 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 ipv6"
 
 RDEPEND=">=sys-libs/ncurses-5.2
diff --git a/net-ftp/ftpbase/ChangeLog b/net-ftp/ftpbase/ChangeLog
index 418ccf3400c3..33550b2e94ba 100644
--- a/net-ftp/ftpbase/ChangeLog
+++ b/net-ftp/ftpbase/ChangeLog
@@ -1,6 +1,35 @@
 # ChangeLog for net-ftp/ftpbase
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpbase/ChangeLog,v 1.1 2005/06/28 14:52:26 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpbase/ChangeLog,v 1.1.1.1 2005/11/30 09:36:24 chriswhite Exp $
+
+  05 Oct 2005; Roy Marples <uberlord@gentoo.org> ftpbase-0.00.ebuild:
+  Use "egethome ftp" instead of greping and cuting /etc/passwd.
+  This allows us to work on other platforms with a minimum of fuss.
+
+  02 Oct 2005; MATSUU Takuto <matsuu@gentoo.org> ftpbase-0.00.ebuild:
+  Stable on sh.
+
+  23 Aug 2005; Roy Marples <uberlord@gentoo.org> ftpbase-0.00.ebuild:
+  Changed default shell from /bin/false to -1 so enewuser can pick the
+  correct nologin shell based on userland wrt bug #103421
+
+  31 Jul 2005; Fernando J. Pereda <ferdy@gentoo.org> ftpbase-0.00.ebuild:
+  stable on alpha
+
+  30 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org> ftpbase-0.00.ebuild:
+  Stable on hppa. bug #100364
+
+  29 Jul 2005; Markus Rothe <corsair@gentoo.org> ftpbase-0.00.ebuild:
+  Stable on ppc64 (bug #100364)
+
+  29 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org> ftpbase-0.00.ebuild:
+  ppc stable, #100364
+
+  28 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> ftpbase-0.00.ebuild:
+  Stable on sparc
+
+  27 Jul 2005; Roy Marples <uberlord@gentoo.org> ftpbase-0.00.ebuild:
+  Stable on amd64 and x86.
 
 *ftpbase-0.00 (28 Jun 2005)
 
diff --git a/net-ftp/ftpbase/Manifest b/net-ftp/ftpbase/Manifest
index 430e91bf5207..70807389c761 100644
--- a/net-ftp/ftpbase/Manifest
+++ b/net-ftp/ftpbase/Manifest
@@ -1,6 +1,7 @@
-MD5 43a528db1a05d9c7851bced09e09733d ftpbase-0.00.ebuild 2459
+MD5 f0a3353a62fd60ef2a14f9aa6c0b15ac ChangeLog 1705
+MD5 1e5344b37b02008f08173928774ca16b ftpbase-0.00.ebuild 2416
 MD5 f545d2bcdb5641a7863b64be435382e2 metadata.xml 285
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ftpbase-0.00 0
-MD5 8c22475496892f4825aa5cc70c53d5d9 files/ftp-pamd 713
-MD5 586c6fcf7c8876dfec3d51209be7382c files/ftp-pamd-include 645
-MD5 4a06897598c9343a62a4af84d75c049f files/ftpusers 313
+MD5 7be20c7c1b62bb7e65994bd7a686695e files/ftp-pamd 807
+MD5 9e7d64873559cebdc60ee1d0d7845ce7 files/ftp-pamd-include 747
+MD5 bd59faca8d7138ac67e99d94507b04f9 files/ftpusers 407
diff --git a/net-ftp/ftpbase/files/ftp-pamd b/net-ftp/ftpbase/files/ftp-pamd
index 0b152322ac30..df5410acf751 100644
--- a/net-ftp/ftpbase/files/ftp-pamd
+++ b/net-ftp/ftpbase/files/ftp-pamd
@@ -1,6 +1,6 @@
 # Provided by ftpbase (dont remove this line!)
 # Standard pam.d file for ftp service packages.
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpbase/files/ftp-pamd,v 1.1 2005/06/28 14:52:26 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpbase/files/ftp-pamd,v 1.1.1.1 2005/11/30 09:36:24 chriswhite Exp $
 
 auth     required   pam_listfile.so item=user sense=deny file=/etc/ftpusers onerr=succeed
 auth     required   pam_stack.so service=system-auth
diff --git a/net-ftp/ftpbase/files/ftp-pamd-include b/net-ftp/ftpbase/files/ftp-pamd-include
index 540844bad5ff..480c0f521d9a 100644
--- a/net-ftp/ftpbase/files/ftp-pamd-include
+++ b/net-ftp/ftpbase/files/ftp-pamd-include
@@ -1,6 +1,6 @@
 # Provided by ftpbase (dont remove this line!)
 # Standard pam.d file for ftp service packages.
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpbase/files/ftp-pamd-include,v 1.1 2005/06/28 14:52:26 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpbase/files/ftp-pamd-include,v 1.1.1.1 2005/11/30 09:36:24 chriswhite Exp $
 
 auth     required  pam_listfile.so item=user sense=deny file=/etc/ftpusers onerr=succeed
 auth     include   system-auth
diff --git a/net-ftp/ftpbase/files/ftpusers b/net-ftp/ftpbase/files/ftpusers
index 4bc8872dc0af..36b246ae5f6c 100644
--- a/net-ftp/ftpbase/files/ftpusers
+++ b/net-ftp/ftpbase/files/ftpusers
@@ -1,6 +1,6 @@
 # Provided by ftpbase (dont remove this line!)
 # /etc/ftpusers: list of users disallowed FTP access
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpbase/files/ftpusers,v 1.1 2005/06/28 14:52:26 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpbase/files/ftpusers,v 1.1.1.1 2005/11/30 09:36:24 chriswhite Exp $
 
 halt
 operator
diff --git a/net-ftp/ftpbase/ftpbase-0.00.ebuild b/net-ftp/ftpbase/ftpbase-0.00.ebuild
index dff3bb07a108..55951a1a1dbe 100644
--- a/net-ftp/ftpbase/ftpbase-0.00.ebuild
+++ b/net-ftp/ftpbase/ftpbase-0.00.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-ftp/ftpbase/ftpbase-0.00.ebuild,v 1.1 2005/06/28 14:52:26 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpbase/ftpbase-0.00.ebuild,v 1.1.1.1 2005/11/30 09:36:24 chriswhite Exp $
 
 inherit eutils pam
 
 DESCRIPTION="FTP layout package"
-SRC_URI=""
 HOMEPAGE="http://www.gentoo.org/"
+SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="pam"
 
 DEPEND="pam? ( || ( virtual/pam sys-libs/pam ) )
@@ -18,7 +18,7 @@ DEPEND="pam? ( || ( virtual/pam sys-libs/pam ) )
 	!<net-ftp/pure-ftpd-1.0.20-r2
 	!<net-ftp/vsftpd-2.0.3-r1"
 
-S="${WORKDIR}"
+S=${WORKDIR}
 
 check_collision() {
 	[[ ! -e ${1} ]] && return 0
@@ -53,13 +53,13 @@ pkg_setup() {
 	fi
 
 	eend 0
-}
 
-src_install() {
 	# Add our default ftp user
 	enewgroup ftp 21
-	enewuser ftp 21 /bin/false /home/ftp ftp
+	enewuser ftp 21 -1 /home/ftp ftp
+}
 
+src_install() {
 	# The ftpusers file is a list of people who are NOT allowed
 	# to use the ftp service.
 	insinto /etc
@@ -83,11 +83,11 @@ pkg_postinst() {
 	# Install manually using install -d until bug #9849 is solved.
 	# This means that the home directory will not be removed when we uninstall
 	# if it's empty.
-	local homedir="${ROOT}$( egetent passwd ftp | cut -d: -f6 )"
+	local homedir=$( egethome ftp )
 	if [[ ! -d ${homedir} ]]; then
 		einfo "Creating home directory for ftp user"
 		einfo "   ${homedir}"
 		install -d "${homedir}" \
-	    || ewarn "  can't create ${homedir}"
+	    	|| ewarn "  can't create ${homedir}"
 	fi
 }
diff --git a/net-ftp/ftpcube/ChangeLog b/net-ftp/ftpcube/ChangeLog
index f9dd3b1193fe..92069aeeedca 100644
--- a/net-ftp/ftpcube/ChangeLog
+++ b/net-ftp/ftpcube/ChangeLog
@@ -1,8 +1,105 @@
 # ChangeLog for net-ftp/ftpcube
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# Author: Jos� Alberto Su�rez L�pez <bass@gentoo.org>
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpcube/ChangeLog,v 1.1.1.1 2005/11/30 09:36:24 chriswhite Exp $
 
+  26 Jul 2005; David Holm <dholm@gentoo.org> ftpcube-0.4.3-r1.ebuild:
+  Added to ~ppc.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  14 Dec 2004; Rob Cakebread <pythonhead@gentoo.org> ftpcube-0.4.0.ebuild,
+  ftpcube-0.4.1.ebuild, ftpcube-0.4.2.ebuild, ftpcube-0.4.3-r1.ebuild,
+  ftpcube-0.4.3.ebuild:
+  Changed DEPENDS to <wxpython2.5.1.3
+
+  30 Oct 2004; Tom Martin <slarti@gentoo.org> ftpcube-0.4.3-r1.ebuild:
+  Marked ~amd64 for bug 69552.
+
+  03 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> ftpcube-0.4.0.ebuild,
+  ftpcube-0.4.1.ebuild, ftpcube-0.4.2.ebuild, ftpcube-0.4.3-r1.ebuild,
+  ftpcube-0.4.3.ebuild:
+  Change wxPython to wxpython.
+
+  19 Jun 2004; Jason Wever <weeve@gentoo.org> ftpcube-0.4.3-r1.ebuild:
+  Stable on sparc.
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> ftpcube-0.4.0.ebuild:
+  Add missing IUSE.
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> ftpcube-0.4.0.ebuild,
+  ftpcube-0.4.1.ebuild, ftpcube-0.4.2.ebuild, ftpcube-0.4.3-r1.ebuild,
+  ftpcube-0.4.3.ebuild:
+  Remove default S.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> ftpcube-0.4.1.ebuild,
+  ftpcube-0.4.2.ebuild, ftpcube-0.4.3-r1.ebuild, ftpcube-0.4.3.ebuild:
+  Add inherit eutils
+
+*ftpcube-0.4.3-r1 (12 Jan 2004)
+
+  12 Jan 2004; Rob Cakebread <pythonhead@gentoo.org> ftpcube-0.4.3-r1.ebuild:
+  Fixes crash on connect dialog. bug# 36320
+
+  05 May 2003; Alastair Tse <liquidx@gentoo.org> ftpcube-0.4.3.ebuild:
+  added virtualx support to prevent failing when merging without X
+
+  05 May 2003; Alastair Tse <liquidx@gentoo.org> ftpcube-0.4.1.ebuild,
+  ftpcube-0.4.2.ebuild, ftpcube-0.4.3.ebuild:
+  bumps to stable x86
+
+*ftpcube-0.4.3 (30 Apr 2003)
+
+  30 Apr 2003; Alastair Tse <liquidx@gentoo.org> ftpcube-0.4.3.ebuild,
+  files/ftpcube-0.4.3-gentoo.patch:
+  version bump. this version fixes handling >2GB files
+
+*ftpcube-0.4.2 (02 Apr 2003)
+
+  02 Apr 2003; Alastair Tse <liquidx@gentoo.org> ftpcube-0.4.2.ebuild,
+  files/ftpcube-0.4.2-gentoo.patch:
+  version bump. thanks to zul <chuck_short@rogers.com>. fixes #18624.
+
+*ftpcube-0.4.1 (31 Mar 2003)
+
+  31 Mar 2003; Alastair Tse <liquidx@gentoo.org> ftpcube-0.3.2-r2.ebuild,
+  ftpcube-0.3.2-r2.ebuild, ftpcube-0.3.3.ebuild, ftpcube-0.3.3.ebuild,
+  ftpcube-0.4.1.ebuild, files/ftpcube-0.4.1-gentoo.patch,
+  files/setup.cfg.patch:
+  version bump and clean up to use distutils
+
+*ftpcube-0.4.4 (22 Dic 2002)
+
+  22 Dic 2022; J.Alberto Suarez L. <bass@gentoo.org> ftpcube-0.4.0.ebuild:
+  New version.
+  A few changes in the ebuild, now use WxPython.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*ftpcube-0.4.0 (13 Feb 2003)
+ 
+  13 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
+*ftpcube-0.3.3 (20 Aug 2002)
+
+  16 Oct 2002; foser <foser@gentoo.org> ftpcube-0.3.3.ebuild :
+  Small dep fix.
+
+  20 Aug 2002; J.Alberto S.L. <bass@gentoo.org> ftpcube-0.3.3.ebuild:
+  new version
+ 
 *ftpcube-0.3.2 (13 Jun 2002)
+  21 Jun 2002; Spider <spider@gentoo.org> ftpcube-0.3.2-r2.ebuild :
+        Tweaked the depenendencies so it doesn't break with pygtk-1.99.x series. incompatible with the new gnome bindings.
+
+
+  17 Jun 2002; J.Alberto S.L. <bass@gentoo.org> ftpcube-0.3.2-r1.ebuild:
+  	fixed a problem with icons.
+
+  17 Jun 2002; J.Alberto S.L. <bass@gentoo.org> ftpcube-0.3.2-r1.ebuild:
+  	This only use an alternative installation mode for who have
+	problems with the distutils of python
 
   13 Jun 2002; J.Alberto S.L. <bass@gentoo.org> ftpcube-0.3.2.ebuild:
   	new version
diff --git a/net-ftp/ftpcube/Manifest b/net-ftp/ftpcube/Manifest
index c63c6f338a9a..658cd545028d 100644
--- a/net-ftp/ftpcube/Manifest
+++ b/net-ftp/ftpcube/Manifest
@@ -1,12 +1,15 @@
-MD5 79de823163fff85bda8e2377d51c9b21 ChangeLog 2158
-MD5 68666a34fd059a6eab732c5013bd9b5c ftpcube-0.4.2.ebuild 619
-MD5 19e654082f0b2afe97de0e7b8b2aefa5 ftpcube-0.4.3.ebuild 619
-MD5 b270e455be656571d477733646d703bc ftpcube-0.4.0.ebuild 1227
-MD5 2bd36c3f0ad43b324556da5d69a7a5d7 ftpcube-0.4.1.ebuild 603
-MD5 9313a79ec3125eb37447dbd470da91a3 files/ftpcube-0.4.2-gentoo.patch 671
-MD5 41e13b5796ec14b4fe4e0ccd5e673cbb files/digest-ftpcube-0.4.2 64
+MD5 75ddfd4a53c860730d3bf4eeb09b530a ChangeLog 3947
+MD5 647640bbea4756ee2409ef44a6fdb245 ftpcube-0.4.0.ebuild 1219
+MD5 5efff06c129a42702e18ac3c7eb8b409 ftpcube-0.4.1.ebuild 582
+MD5 3f9294e8d9242e606f5768bb224f4c50 ftpcube-0.4.2.ebuild 598
+MD5 1a9582eb2777d762a0c5e75f58dd6209 ftpcube-0.4.3-r1.ebuild 874
+MD5 91d594b53c715ca666c180497c7277be ftpcube-0.4.3.ebuild 750
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 MD5 7079a631b21e0062dd4165700c576faa files/digest-ftpcube-0.4.0 65
-MD5 eb463bd12dd2c50034c479c3402840e1 files/ftpcube-0.4.1-gentoo.patch 908
 MD5 ebef9679bd2ec43a5346896f94a63695 files/digest-ftpcube-0.4.1 64
-MD5 bb053817ff0a370e66b8f7ea8d45a65c files/ftpcube-0.4.3-gentoo.patch 671
+MD5 41e13b5796ec14b4fe4e0ccd5e673cbb files/digest-ftpcube-0.4.2 64
 MD5 89da900faac5676e15f13882dfb5693d files/digest-ftpcube-0.4.3 64
+MD5 89da900faac5676e15f13882dfb5693d files/digest-ftpcube-0.4.3-r1 64
+MD5 eb463bd12dd2c50034c479c3402840e1 files/ftpcube-0.4.1-gentoo.patch 908
+MD5 9313a79ec3125eb37447dbd470da91a3 files/ftpcube-0.4.2-gentoo.patch 671
+MD5 bb053817ff0a370e66b8f7ea8d45a65c files/ftpcube-0.4.3-gentoo.patch 671
diff --git a/net-ftp/ftpcube/ftpcube-0.4.0.ebuild b/net-ftp/ftpcube/ftpcube-0.4.0.ebuild
index 086b9fdf180e..fdf74d5b52dc 100644
--- a/net-ftp/ftpcube/ftpcube-0.4.0.ebuild
+++ b/net-ftp/ftpcube/ftpcube-0.4.0.ebuild
@@ -1,16 +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-ftp/ftpcube/ftpcube-0.4.0.ebuild,v 1.1 2002/12/22 13:45:34 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpcube/ftpcube-0.4.0.ebuild,v 1.1.1.1 2005/11/30 09:36:25 chriswhite Exp $
 
-S="${WORKDIR}/${P}"
 DESCRIPTION="Graphic ftp client written in python and gtk"
 SRC_URI="mirror://sourceforge/ftpcube/${P}.tar.gz"
 HOMEPAGE="http://ftpcube.sourceforge.net/"
-DEPEND="dev-python/wxPython"
+DEPEND="<dev-python/wxpython-2.5.1.3"
 
 SLOT="0"
 LICENSE="Artistic"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 ~sparc"
+IUSE=""
 
 src_compile() {
 	python setup.py clean || die "clean fails"
diff --git a/net-ftp/ftpcube/ftpcube-0.4.1.ebuild b/net-ftp/ftpcube/ftpcube-0.4.1.ebuild
index f3fd7df24fba..1049b308f499 100644
--- a/net-ftp/ftpcube/ftpcube-0.4.1.ebuild
+++ b/net-ftp/ftpcube/ftpcube-0.4.1.ebuild
@@ -1,20 +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-ftp/ftpcube/ftpcube-0.4.1.ebuild,v 1.1 2003/03/31 02:12:48 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpcube/ftpcube-0.4.1.ebuild,v 1.1.1.1 2005/11/30 09:36:24 chriswhite Exp $
 
 IUSE=""
 
-inherit distutils
+inherit distutils eutils
 
-S="${WORKDIR}/${P}"
 DESCRIPTION="Graphical FTP client using wxPython"
 SRC_URI="mirror://sourceforge/ftpcube/${P}.tar.gz"
 HOMEPAGE="http://ftpcube.sourceforge.net/"
-DEPEND=">=dev-python/wxPython-2.4.0.2"
+DEPEND="<dev-python/wxpython-2.5.1.3"
 
 SLOT="0"
 LICENSE="Artistic"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 ~sparc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/net-ftp/ftpcube/ftpcube-0.4.2.ebuild b/net-ftp/ftpcube/ftpcube-0.4.2.ebuild
index e5f2155eca97..2e45325758ad 100644
--- a/net-ftp/ftpcube/ftpcube-0.4.2.ebuild
+++ b/net-ftp/ftpcube/ftpcube-0.4.2.ebuild
@@ -1,21 +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/net-ftp/ftpcube/ftpcube-0.4.2.ebuild,v 1.1 2003/04/02 21:36:11 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpcube/ftpcube-0.4.2.ebuild,v 1.1.1.1 2005/11/30 09:36:25 chriswhite Exp $
 
 IUSE=""
 
-inherit distutils
+inherit distutils eutils
 
-S="${WORKDIR}/${P}"
 DESCRIPTION="Graphical FTP client using wxPython"
 SRC_URI="mirror://sourceforge/ftpcube/${P}.tar.gz"
 HOMEPAGE="http://ftpcube.sourceforge.net/"
 DEPEND="virtual/python
-	>=dev-python/wxPython-2.4.0.2"
+	<dev-python/wxpython-2.5.1.3"
 
 SLOT="0"
 LICENSE="Artistic"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 ~sparc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/net-ftp/ftpcube/ftpcube-0.4.3-r1.ebuild b/net-ftp/ftpcube/ftpcube-0.4.3-r1.ebuild
index fc41830ab7c0..a26a52a7f706 100644
--- a/net-ftp/ftpcube/ftpcube-0.4.3-r1.ebuild
+++ b/net-ftp/ftpcube/ftpcube-0.4.3-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/net-ftp/ftpcube/ftpcube-0.4.3-r1.ebuild,v 1.1 2004/01/12 20:53:26 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpcube/ftpcube-0.4.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:24 chriswhite Exp $
 
 IUSE=""
 
-inherit distutils virtualx
+inherit distutils virtualx eutils
 
-S="${WORKDIR}/${P}"
 DESCRIPTION="Graphical FTP client using wxPython"
 SRC_URI="mirror://sourceforge/ftpcube/${P}.tar.gz"
 HOMEPAGE="http://ftpcube.sourceforge.net/"
 DEPEND="virtual/python
-	>=dev-python/wxPython-2.4.0.2"
+	<dev-python/wxpython-2.5.1.3"
 
 SLOT="0"
 LICENSE="Artistic"
-KEYWORDS="x86 ~sparc"
+KEYWORDS="~amd64 ~ppc sparc x86"
 
 src_unpack() {
 	unpack ${A}
diff --git a/net-ftp/ftpcube/ftpcube-0.4.3.ebuild b/net-ftp/ftpcube/ftpcube-0.4.3.ebuild
index b5b57cf2c4bc..1f02a78df828 100644
--- a/net-ftp/ftpcube/ftpcube-0.4.3.ebuild
+++ b/net-ftp/ftpcube/ftpcube-0.4.3.ebuild
@@ -1,23 +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/net-ftp/ftpcube/ftpcube-0.4.3.ebuild,v 1.1 2003/04/30 12:13:52 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpcube/ftpcube-0.4.3.ebuild,v 1.1.1.1 2005/11/30 09:36:24 chriswhite Exp $
 
 IUSE=""
 
-inherit distutils
+inherit distutils virtualx eutils
 
-S="${WORKDIR}/${P}"
 DESCRIPTION="Graphical FTP client using wxPython"
 SRC_URI="mirror://sourceforge/ftpcube/${P}.tar.gz"
 HOMEPAGE="http://ftpcube.sourceforge.net/"
 DEPEND="virtual/python
-	>=dev-python/wxPython-2.4.0.2"
+	<dev-python/wxpython-2.5.1.3"
 
 SLOT="0"
 LICENSE="Artistic"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 ~sparc"
 
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/${P}-gentoo.patch || die "patch failed"
 }
+
+src_compile() {
+	export maketype=distutils_src_compile
+	virtualmake
+}
+
+src_install() {
+	export maketype=distutils_src_install
+	virtualmake
+}
diff --git a/net-ftp/ftpd/ChangeLog b/net-ftp/ftpd/ChangeLog
index 0bde5d2b431d..177e01ae5622 100644
--- a/net-ftp/ftpd/ChangeLog
+++ b/net-ftp/ftpd/ChangeLog
@@ -1,9 +1,82 @@
 # ChangeLog for net-ftp/ftpd
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpd/ChangeLog,v 1.1 2002/11/25 20:40:14 raker Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpd/ChangeLog,v 1.1.1.1 2005/11/30 09:36:25 chriswhite Exp $
+
+  11 Nov 2005; Simon Stelling <blubb@gentoo.org> ftpd-0.17-r3.ebuild:
+  stable on amd64 wrt bug 111573
+
+  10 Nov 2005; Jose Luis Rivero <yoswink@gentoo.org> ftpd-0.17-r3.ebuild:
+  Stable on alpha wrt security bug #111573
+
+  10 Nov 2005; Jason Wever <weeve@gentoo.org> ftpd-0.17-r3.ebuild:
+  Stable on SPARC wrt bug #111573.
+
+  10 Nov 2005; Mark Loeser <halcy0n@gentoo.org> ftpd-0.17-r3.ebuild:
+  Stable on x86; bug #111573
+
+*ftpd-0.17-r3 (09 Nov 2005)
+
+  09 Nov 2005; Daniel Black <dragonheart@gentoo.org>
+  +ftpd-0.17-r3.ebuild:
+  bumped with a better patch from solar
+
+*ftpd-0.17-r2 (06 Nov 2005)
+
+  06 Nov 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/ftpd-0.17+ssl-0.3-overflowpatch.diff, +ftpd-0.17-r2.ebuild:
+  fix remote hole in linux-ftpd-ssl - security bug #111573 - patch thanks to
+  James Longstreet, bug thanks to Wernfried Haas
+
+  26 Jul 2005; David Holm <dholm@gentoo.org> ftpd-0.17-r1.ebuild:
+  Added to ~ppc.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> ftpd-0.17-r1.ebuild:
+  Stable on amd64.
+
+  14 Aug 2004; Sven Wegener <swegener@gentoo.org> files/ftp.xinetd:
+  Fixed CVS Header.
+
+  19 Jun 2004; Jason Wever <weeve@gentoo.org> ftpd-0.17-r1.ebuild:
+  Stable on sparc.
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> ftpd-0.17-r1.ebuild,
+  ftpd-0.17.ebuild:
+  Fix use invocation
+
+  13 Aug 2003; Aron Griffis <agriffis@gentoo.org> ftpd-0.17-r1.ebuild:
+  Mark stable on alpha for LiveCD
+
+  08 Jun 2003; Seemant Kulleen <seemant@gentoo.org> ftpd-0.17-r1.ebuild:
+  shadow fix patch is not ssl specific, moved out of ssl USE check. Thanks again
+  to: Frank Straetz
+
+*ftpd-0.17-r1 (07 Jun 2003)
+
+  07 Jun 2003; Seemant Kulleen <seemant@gentoo.org> ftpd-0.17-r1.ebuild,
+  files/ftpd-0.17-shadowfix.patch:
+  fix for shadow passwords, to close bug #12353 opened by Adam Bolte
+  <adam@vivid.net.au>. Fix provided by Frank Straetz <Frank@KTHXBYE.de>
 
 *ftpd-0.17 (25 Nov 2002)
 
+  29 Apr 2003; Jason Wever <weeve@gentoo.org> ftpd-0.17.ebuild:
+  Added ~sparc to keywords.
+
+  19 Apr 2003; Martin Holzer <mholzer@gentoo.org> ftpd-0.17.ebuild:
+  Changed to virtual/inetd depend.
+
+  09 Feb 2003; Seemant Kulleen <seemant@gentoo.org> ftpd-0.17.ebuild :
+
+  Sed expression delimiter from / to :, closing bug #15006 by Blu3
+  <david+gentoo.org@blue-labs.org>
+
+  15 Jan 2003; Nick Hadaway <raker@gentoo.org> ftpd-0.17.ebuild :
+  Fixed a typo in postinst and added xinetd as an RDEPEND and now
+  installing an /etc/xinetd.d/ftp.  Also changed to epatch.
+
+  05 Dec 2002; Nick Hadaway <raker@gentoo.org> ftpd-0.17.ebuild :
+  Marked stable.
+
   25 Nov 2002; Nick Hadaway <raker@gentoo.org> ftpd-0.17.ebuild,
   files/digest-ftpd-0.17.ebuild, files/ssl.diff.gz :
   New ebuild.  Your basic netkit linux-ftpd patched for ssl support.
diff --git a/net-ftp/ftpd/Manifest b/net-ftp/ftpd/Manifest
index b3b8dd0afb3a..4dafda0c0563 100644
--- a/net-ftp/ftpd/Manifest
+++ b/net-ftp/ftpd/Manifest
@@ -1,5 +1,13 @@
-MD5 c988d71961f933bb3de7801eea82d97d ChangeLog 975
-MD5 c6cc295a7cd16c7a5408f2701ea7cafb ftpd-0.17.ebuild 1460
+MD5 9275ac95cf3ee1ee2309390ab0d299cc ChangeLog 2933
+MD5 753fb4b95ec8ae858ff343a599376b18 ftpd-0.17-r1.ebuild 1461
+MD5 a49ca8164b73a5b126e5d4403ec0e6ef ftpd-0.17.ebuild 1410
+MD5 7bfd62aa7556709bd5f5192594ac3230 ftpd-0.17-r2.ebuild 1523
+MD5 6f1b18b5fd24237140fc3864f7df7157 ftpd-0.17-r3.ebuild 1405
 MD5 1185c6db5ae646d809d0c757f02d8e35 files/digest-ftpd-0.17 66
-MD5 e9e77d723b87be9b3f8b6bff9deb87c3 files/ftp.xinetd 219
+MD5 1185c6db5ae646d809d0c757f02d8e35 files/digest-ftpd-0.17-r1 66
+MD5 c77f5bcf2f56d61c7e8845d94df88164 files/ftp.xinetd 313
+MD5 7e1217f2de231dda2c8e842a7d7dfb7b files/ftpd-0.17-shadowfix.patch 895
 MD5 0630d5a4a420220cc8b912bdad705f6c files/ssl.diff.gz 10444
+MD5 1185c6db5ae646d809d0c757f02d8e35 files/digest-ftpd-0.17-r2 66
+MD5 fb54312525ec906691ee16975f1658be files/ftpd-0.17+ssl-0.3-overflowpatch.diff 532
+MD5 d6140676fe7acab811160aa574573e83 files/digest-ftpd-0.17-r3 135
diff --git a/net-ftp/ftpd/files/ftp.xinetd b/net-ftp/ftpd/files/ftp.xinetd
index 858c718d80e2..48fb113b98b6 100644
--- a/net-ftp/ftpd/files/ftp.xinetd
+++ b/net-ftp/ftpd/files/ftp.xinetd
@@ -1,5 +1,5 @@
 # default: off
-# $Header: 
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpd/files/ftp.xinetd,v 1.1.1.1 2005/11/30 09:36:25 chriswhite Exp $
 # description: The netkit ftp daemon with optional SSL support.
 
 service ftp
diff --git a/net-ftp/ftpd/ftpd-0.17-r1.ebuild b/net-ftp/ftpd/ftpd-0.17-r1.ebuild
index 51abe27aab5d..749255a367ec 100644
--- a/net-ftp/ftpd/ftpd-0.17-r1.ebuild
+++ b/net-ftp/ftpd/ftpd-0.17-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-ftp/ftpd/ftpd-0.17-r1.ebuild,v 1.1 2003/06/07 08:16:47 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpd/ftpd-0.17-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:25 chriswhite Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/linux-${P}.tar.gz"
 
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="alpha amd64 ~ppc sparc x86"
 
 DEPEND="ssl? ( dev-libs/openssl )"
 
@@ -23,15 +23,15 @@ RDEPEND="${DEPEND}
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	if [ "`use ssl`" ]; then
+	if use ssl; then
 		epatch ${FILESDIR}/ssl.diff.gz
-		epatch ${FILESDIR}/${P}-shadowfix.patch
 	fi
+	epatch ${FILESDIR}/${P}-shadowfix.patch
 }
 
 src_compile() {
 	./configure --prefix=/usr || die "configure failed"
-	cp MCONFIG MCONFIG.orig                                                 
+	cp MCONFIG MCONFIG.orig
 	sed -e "s:-pipe -O2:${CFLAGS}:" MCONFIG.orig > MCONFIG
 	emake || die "parallel make failed"
 }
diff --git a/net-ftp/ftpd/ftpd-0.17-r2.ebuild b/net-ftp/ftpd/ftpd-0.17-r2.ebuild
index edc461904a3d..737e32d8f9d8 100644
--- a/net-ftp/ftpd/ftpd-0.17-r2.ebuild
+++ b/net-ftp/ftpd/ftpd-0.17-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-ftp/ftpd/ftpd-0.17-r2.ebuild,v 1.1 2005/11/06 12:30:48 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpd/ftpd-0.17-r2.ebuild,v 1.1.1.1 2005/11/30 09:36:25 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-ftp/ftpd/ftpd-0.17-r3.ebuild b/net-ftp/ftpd/ftpd-0.17-r3.ebuild
index d0296843cc3d..fb54b98e0e94 100644
--- a/net-ftp/ftpd/ftpd-0.17-r3.ebuild
+++ b/net-ftp/ftpd/ftpd-0.17-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-ftp/ftpd/ftpd-0.17-r3.ebuild,v 1.1 2005/11/09 21:33:02 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpd/ftpd-0.17-r3.ebuild,v 1.1.1.1 2005/11/30 09:36:25 chriswhite Exp $
 
 inherit eutils ssl-cert
 
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/linux-${P}.tar.gz
 
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 ~ppc sparc x86"
 
 DEPEND="ssl? ( dev-libs/openssl )"
 
diff --git a/net-ftp/ftpd/ftpd-0.17.ebuild b/net-ftp/ftpd/ftpd-0.17.ebuild
index 25ca9b2cf618..3fc46a57cb0c 100644
--- a/net-ftp/ftpd/ftpd-0.17.ebuild
+++ b/net-ftp/ftpd/ftpd-0.17.ebuild
@@ -1,63 +1,56 @@
-# 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-ftp/ftpd/ftpd-0.17.ebuild,v 1.1 2002/11/25 20:40:14 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpd/ftpd-0.17.ebuild,v 1.1.1.1 2005/11/30 09:36:25 chriswhite Exp $
 
+inherit eutils
+
+IUSE="ssl"
+
+S=${WORKDIR}/linux-${P}
 DESCRIPTION="The netkit FTP server with optional SSL support"
 HOMEPAGE="http://www.hcs.harvard.edu/~dholland/computers/netkit.html"
 SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/linux-${P}.tar.gz"
 
-LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86"
+LICENSE="as-is"
+KEYWORDS="x86 ~sparc amd64"
 
-IUSE="ssl"
+DEPEND="ssl? ( dev-libs/openssl )"
 
-DEPEND="virtual/glibc
-	ssl? ( dev-libs/openssl )"
-
-S=${WORKDIR}/linux-${P}
+RDEPEND="${DEPEND}
+	virtual/inetd"
 
 src_unpack() {
-
 	unpack ${A}
 	cd ${S}
-
-	if [ "`use ssl`" ]; then
-		zcat ${FILESDIR}/ssl.diff.gz | patch -p1 \
-			|| die "ssl patch failed"
+	if use ssl; then
+		epatch ${FILESDIR}/ssl.diff.gz
 	fi
-
 }
 
 src_compile() {
-
 	./configure --prefix=/usr || die "configure failed"
-
-	cp MCONFIG MCONFIG.orig                                                 
-        sed -e "s/-pipe -O2/${CFLAGS}/" MCONFIG.orig > MCONFIG
-
+	cp MCONFIG MCONFIG.orig
+	sed -e "s:-pipe -O2:${CFLAGS}:" MCONFIG.orig > MCONFIG
 	emake || die "parallel make failed"
-
 }
 
 src_install() {
-
 	dobin ftpd/ftpd
 	doman ftpd/ftpd.8
 	dodoc README ChangeLog
-
+	insinto /etc/xinetd.d
+	newins ${FILESDIR}/ftp.xinetd ftp
 }
 
 pkg_postinst() {
-
 	einfo "In order to start the server with SSL support"
 	einfo "You need to create a certificate and place it"
 	einfo "in SSLCERTDIR..."
 	einfo "<=openssl-0.9.6g - SSLCERTDIR=/usr/lib/ssl/certs"
-	einfo ">=openssl-0.9.6-r1 - SSLCERTDIR=/etc/ssl/certs"
+	einfo ">=openssl-0.9.6g-r1 - SSLCERTDIR=/etc/ssl/certs"
 	einfo ""
 	einfo "cd SSLCERTDIR"
 	einfo "openssl req -new -x509 -nodes -out ftpd.pem -keyout ftpd.pem"
 	einfo ""
-
 }
diff --git a/net-ftp/gftp/ChangeLog b/net-ftp/gftp/ChangeLog
index 67919878555e..65c42e555d0c 100644
--- a/net-ftp/gftp/ChangeLog
+++ b/net-ftp/gftp/ChangeLog
@@ -1,6 +1,180 @@
 # ChangeLog for net-ftp/gftp
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/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-ftp/gftp/ChangeLog,v 1.1.1.1 2005/11/30 09:36:20 chriswhite Exp $
+
+*gftp-2.0.18-r3 (06 Nov 2005)
+
+  06 Nov 2005; Mike Gardiner <obz@gentoo.org>
+  +files/gftp-2.0.18-ssh2-read.patch, +gftp-2.0.18-r3.ebuild:
+  Added revision -r3 with a fix for downloading files over ssh2 that are
+  read-only (non-writable). See bug #91269 and the upstream link.
+
+*gftp-2.0.18-r2 (14 Oct 2005)
+
+  14 Oct 2005; John N. Laliberte <allanonjl@gentoo.org> -gftp-2.0.14.ebuild,
+  -gftp-2.0.15.ebuild, -gftp-2.0.16-r1.ebuild, -gftp-2.0.17.ebuild,
+  +gftp-2.0.18-r2.ebuild:
+  get rid of gtk2 useflag, clean up old ebuilds, fixes #108555
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> gftp-2.0.18-r1.ebuild:
+  Mark 2.0.18-r1 stable on alpha
+
+  07 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> gftp-2.0.18-r1.ebuild:
+  ~alpha keyword, bug 87365.
+
+  19 Feb 2005; Joseph Jezak <josejx@gentoo.org> gftp-2.0.18-r1.ebuild:
+  Marked ppc stable for bug #81994.
+
+  14 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org> gftp-2.0.18-r1.ebuild:
+  Stable on sparc wrt #81994
+
+  14 Feb 2005; Markus Rothe <corsair@gentoo.org> gftp-2.0.18-r1.ebuild:
+  Stable on ppc64; bug #81994
+
+  14 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> gftp-2.0.18-r1.ebuild:
+  stable on amd64, see #81994
+
+*gftp-2.0.18-r1 (14 Feb 2005)
+
+  14 Feb 2005; foser <foser@gentoo.org> gftp-2.0.18-r1.ebuild :
+  Add patch to fix buildtime issue (#80845)
+
+  14 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> gftp-2.0.18.ebuild:
+  stable on amd64. see #81994
+
+  04 Feb 2005; Simon Stelling <blubb@gentoo.org> gftp-2.0.18.ebuild:
+  testing on amd64
+
+*gftp-2.0.18 (04 Feb 2005)
+
+  04 Feb 2005; Joe McCann <joem@gentoo.org> +gftp-2.0.18.ebuild:
+  new version with several bug fixes that should solve some amd64 issues.
+  Closes bug 80753
+
+  02 Nov 2004; Markus Rothe <corsair@gentoo.org> gftp-2.0.17.ebuild:
+  Stable on ppc64
+
+  04 Aug 2004; Travis Tilley <lv@gentoo.org> gftp-2.0.15.ebuild,
+  gftp-2.0.16-r1.ebuild, gftp-2.0.17.ebuild:
+  gftp 2.0.16 and up dont work on amd64 yet, marking -amd64
+
+  23 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> gftp-2.0.17.ebuild:
+  Stable amd64.
+
+  12 Jul 2004; Tom Gall <tgall@gentoo.org> gftp-2.0.17.ebuild:
+  add ~ppc64 bug #55069
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> gftp-2.0.14.ebuild,
+  gftp-2.0.15.ebuild, gftp-2.0.16-r1.ebuild, gftp-2.0.17.ebuild:
+  Fix use invocation
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> gftp-2.0.15.ebuild,
+  gftp-2.0.16-r1.ebuild:
+  Add inherit eutils
+
+*gftp-2.0.17 (01 Apr 2004)
+
+  01 Apr 2004; Travis Tilley <lv@gentoo.org> :
+  version bumped and ~amd64 keyword added due to recent 64 bit cleanups upstream
+
+  25 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> gftp-2.0.15.ebuild,
+  gftp-2.0.16-r1.ebuild:
+  don't use deprecated ? : use syntax
+
+  25 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> gftp-2.0.15.ebuild:
+  Adding patch from Ryan C. Gordon <ryan@epicgames.com> to fix segfaults on
+  amd64. Closing #34440.
+
+  06 Feb 2004; <gustavoz@gentoo.org> gftp-2.0.16-r1.ebuild:
+  stable on sparc
+
+  04 Feb 2004; Alastair Tse <liquidx@gentoo.org> gftp-2.0.16-r1.ebuild:
+  stable bump, should solve (#39289)
+
+  07 Jan 2004; Jason Wever <weeve@gentoo.org> gftp-2.0.15.ebuild:
+  Marked stable on sparc.
+
+*gftp-2.0.16-r1 (27 Nov 2003)
+
+  27 Nov 2003; foser <foser@gentoo.org> gftp-2.0.16-r1.ebuild :
+  Added patch fixing issues with ipv4/ipv6 servers
+  reported in #34475 by Mats Huttunen <sumc@bredband.net>
+
+*gftp-2.0.16 (09 Nov 2003)
+
+  10 Nov 2003; foser <foser@gentoo.org> gftp-2.0.{15,16}.ebuild :
+  Fixed !gtk -> !gtk?
+
+  09 Nov 2003; Alastair Tse <liquidx@gentoo.org> gftp-2.0.13.ebuild,
+  gftp-2.0.14_rc1.ebuild, gftp-2.0.16.ebuild, files/gftp-2.0.13-gtk2.2.patch:
+  version bump and cleanup
+
+*gftp-2.0.15 (22 Aug 2003)
+
+  22 Aug 2003; <spider@gentoo.org> gftp-2.0.15.ebuild :
+  Versionbump. Revamped the dependencies completely. USE="ssl" support
+  USE="-gtk" dependencies added. Now handles gtk and gtk2 dependencies in a
+  nested fashion, disablig gtk gives text frontend Fixed up the deps for
+  textmode. (readline,ncurses and glib-1.2)
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*gftp-2.0.14 (06 Dec 2002)
+
+  04 Apr 2003; Jason Wever <weeve@gentoo.org> gftp-2.0.14.ebuild:
+  Changed ~sparc keyword to sparc.
+
+  23 Mar 2003; Graham Forest <vladimir@gentoo.org> gftp-2.0.14.ebuild:
+  set ppc in keywords
+
+  06 Dec 2002; foser <foser@gentoo.org> gftp-2.0.14.ebuild :
+  New version
+
+*gftp-2.0.14_rc1 (29 Nov 2002)
+
+  29 Nov 2002; foser <foser@gentoo.org> gftp-2.0.14_rc1.ebuild :
+  New version
+
+*gftp-2.0.13 (23 Jul 2002)
+
+  13 Apr 2003; Alastair Tse <liquidx@gentoo.org> gftp-2.0.13.ebuild,
+  files/gftp-2.0.13-gtk2.2.patch:
+  fix compile problems with gtk2.2
+
+  20 Aug 2002; Mark Guertin <gerk@gentoo.org> gftp-2.0.13.ebuild :
+  Added ppc to keywords
+
+  23 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> gftp-2.0.13.ebuild :
+
+  Version bump.
+
+*gftp-2.0.12-r3 (18 Jul 2002)
+
+  18 Jul 2002; Seemant Kulleen <seemant@gentoo.org> gftp-2.0.12-r3.ebuild
+  files/digest-gftp-2.0.12-r3 :
+
+  Sandbox violation fixed. Closes bug # 5217 by yariv@vipe.technion.ac.il
+  (Yariv Ido)
+
+*gftp-2.0.12-r2 (06 Jul 2002)
+  06 Jul 2002; Spider <spider@gentoo.org> gftp-2.0.12-r2.ebuild :
+  using the gtk2 USE flag and fixed it up to pass lintool checks
+
+*gftp-2.0.12-r1 (27 May 2002)
+  27 May 2002; Spider <spider@gentoo.org> gftp-2.0.12-r1.ebuild :
+  Updating the ebuild with a check for gtk+-2.0 and enabling that if
+  found, also changed the dependencies on gtk+ and glib
+
+*gftp-2.0.12 (24 May 2002)
+
+  24 May 2002; Ryan Phillips <rphillips@gentoo.org> gftp-2.0.12.ebuild :
+
+  Updated version
+
+  
+  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
+
 
 *gftp-2.0.11 (1 Feb 2002)
 
diff --git a/net-ftp/gftp/Manifest b/net-ftp/gftp/Manifest
index a855b64b690e..b13f1e20ae10 100644
--- a/net-ftp/gftp/Manifest
+++ b/net-ftp/gftp/Manifest
@@ -1,8 +1,12 @@
-MD5 9470bf52f8a653dd4a26f1a71a604292 ChangeLog 2386
-MD5 799ae8f467b0fc4c5086c7b09fedeb8b gftp-2.0.13.ebuild 1032
-MD5 cb97912c4eeeabec9fe34baf6fc5fdfa gftp-2.0.14.ebuild 997
-MD5 80be8d608e0679dd6a92c30e3c7369f7 gftp-2.0.14_rc1.ebuild 1022
-MD5 8e7b5678687f0a6685df59ecfc697c86 files/digest-gftp-2.0.13 63
-MD5 4a567cc97f7b5318979193135b98eafd files/digest-gftp-2.0.14 64
-MD5 35ad6821c6e09d90227714f8b087f565 files/digest-gftp-2.0.14_rc1 67
-MD5 ad3e717963c174555b2afb27f7c2a61e files/gftp-2.0.13-gtk2.2.patch 1013
+MD5 3dc5b204d92c6517b6de1856b330b040 ChangeLog 6383
+MD5 429ea419b557eb768b0be6daa3c8b7e7 files/digest-gftp-2.0.18-r1 65
+MD5 429ea419b557eb768b0be6daa3c8b7e7 files/digest-gftp-2.0.18-r2 65
+MD5 429ea419b557eb768b0be6daa3c8b7e7 files/digest-gftp-2.0.18-r3 65
+MD5 ce3187f3e4f80bfb35cf8bef798eb40d files/gftp-2.0.15-64bit_fixes.patch 16360
+MD5 23e7696a3f6f2c368d11ca9aaadb7797 files/gftp-2.0.16-ipv6_fix.patch 3279
+MD5 81d77310a3638462af932e435590ab5d files/gftp-2.0.18-fix_gtk1.patch 1095
+MD5 327a4df792013f011340fe5f90dbb6c1 files/gftp-2.0.18-ssh2-read.patch 326
+MD5 3a75b54355e3e9dab04a8612c5044c27 gftp-2.0.18-r1.ebuild 1468
+MD5 54961e8083c43a825eeb545ad2b43d4c gftp-2.0.18-r2.ebuild 1137
+MD5 324a95e081b2b7b1cd591fde3cf6b11c gftp-2.0.18-r3.ebuild 1272
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
diff --git a/net-ftp/gftp/gftp-2.0.18-r1.ebuild b/net-ftp/gftp/gftp-2.0.18-r1.ebuild
index 9e21d36415ec..842a693ada5e 100644
--- a/net-ftp/gftp/gftp-2.0.18-r1.ebuild
+++ b/net-ftp/gftp/gftp-2.0.18-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-ftp/gftp/gftp-2.0.18-r1.ebuild,v 1.1 2005/02/14 16:05:42 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/gftp-2.0.18-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:20 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.gftp.org"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~ppc64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE="nls gtk gtk2 ssl"
 
 DEPEND="virtual/x11
diff --git a/net-ftp/gftp/gftp-2.0.18-r2.ebuild b/net-ftp/gftp/gftp-2.0.18-r2.ebuild
index 5bed3b0991e9..a8ec8deb19b2 100644
--- a/net-ftp/gftp/gftp-2.0.18-r2.ebuild
+++ b/net-ftp/gftp/gftp-2.0.18-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-ftp/gftp/gftp-2.0.18-r2.ebuild,v 1.1 2005/10/14 23:05:57 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/gftp-2.0.18-r2.ebuild,v 1.1.1.1 2005/11/30 09:36:20 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-ftp/gftp/gftp-2.0.18-r3.ebuild b/net-ftp/gftp/gftp-2.0.18-r3.ebuild
index f141e6704f6c..7cbf423fed66 100644
--- a/net-ftp/gftp/gftp-2.0.18-r3.ebuild
+++ b/net-ftp/gftp/gftp-2.0.18-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-ftp/gftp/gftp-2.0.18-r3.ebuild,v 1.1 2005/11/06 05:57:10 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/gftp-2.0.18-r3.ebuild,v 1.1.1.1 2005/11/30 09:36:20 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-ftp/glftpd/ChangeLog b/net-ftp/glftpd/ChangeLog
index f03f730bcd5b..9240fd2abbea 100644
--- a/net-ftp/glftpd/ChangeLog
+++ b/net-ftp/glftpd/ChangeLog
@@ -1,8 +1,45 @@
 # ChangeLog for net-ftp/glftpd
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/glftpd/ChangeLog,v 1.1 2002/10/23 15:51:43 vapier Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/glftpd/ChangeLog,v 1.1.1.1 2005/11/30 09:36:29 chriswhite Exp $
 
-*net-ftp/glftpd-1.27 (23 Oct 2002)
+*glftpd-2.00 (19 Feb 2005)
+
+  19 Feb 2005; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #79532 by Peter. Include patch to fix information disclosure
+  bug #82544.
+
+*glftpd-1.32-r2 (07 Oct 2004)
+
+  07 Oct 2004; Mike Frysinger <vapier@gentoo.org>
+  files/1.32-stack-overflow.patch, -glftpd-1.32-r1.ebuild,
+  +glftpd-1.32-r2.ebuild:
+  More stack overflow fixes #66495.
+
+*glftpd-1.32-r1 (20 Sep 2004)
+
+  20 Sep 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/1.32-stack-overflow.patch, +glftpd-1.32-r1.ebuild:
+  Version bump to fix stack overflow #64809.
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> glftpd-1.32.ebuild:
+  Fix use invocation, trusting SpanKY to clean up yesno ;-)
+
+*glftpd-1.32 (03 Dec 2003)
+
+  03 Dec 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump + TLS merge + major cleanup.
+
+*glftpd-1.30 (29 Apr 2003)
+
+  29 Apr 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump.
+
+*glftpd-1.28 (12 Jan 2003)
+
+  12 Jan 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump.
+
+*glftpd-1.27 (23 Oct 2002)
 
   23 Oct 2002; Mike Frysinger <vapier@gentoo.org> :
   Initial import. Ebuild submitted by me.
diff --git a/net-ftp/glftpd/Manifest b/net-ftp/glftpd/Manifest
index e69de29bb2d1..9ded2fe25631 100644
--- a/net-ftp/glftpd/Manifest
+++ b/net-ftp/glftpd/Manifest
@@ -0,0 +1,12 @@
+MD5 7752d3a2578390f4c936ee9a78ef4c84 ChangeLog 1335
+MD5 9765afee47eb196dd38c07bf2c28fef0 glftpd-2.00.ebuild 2852
+MD5 fb8d5f6b8fac69dbe80b089824d8d257 glftpd-1.32-r2.ebuild 2815
+MD5 2158fefa6b8983f5dd6bfe2c2b401558 files/digest-glftpd-2.00 65
+MD5 24b620c9e2a0384f8aa0570e9c6e8a87 files/glftpd.env.d 44
+MD5 6399dbb185314c6017b02b3df2cdf5ea files/glftpd.xinetd.d 384
+MD5 4acdfa97d781bcecd8107b66a882ada8 files/1.32-install.patch 1432
+MD5 7bbb37fa6e8e057a09e8bf721abc5d28 files/glftpd-2.00-install.patch 2944
+MD5 421ebf4ff7a3d7618578fa291d8bef23 files/digest-glftpd-1.32-r2 65
+MD5 e1aa846be11f6d73087d098f16a834b5 files/glftpd-2.00-gcc.patch 230
+MD5 16562ebfbe49bca89d32784bca1126f2 files/1.32-stack-overflow.patch 1818
+MD5 3857787e3748c769f2920eebfedafb8b files/glftpd-2.00-script-path-checks.patch 830
diff --git a/net-ftp/glftpd/files/1.32-stack-overflow.patch b/net-ftp/glftpd/files/1.32-stack-overflow.patch
index d10182606760..b6ffed04d991 100644
--- a/net-ftp/glftpd/files/1.32-stack-overflow.patch
+++ b/net-ftp/glftpd/files/1.32-stack-overflow.patch
@@ -10,3 +10,45 @@
    if((fp = fopen(dupefile, "r")) == NULL)
      return 0;
  
+--- bin/sources/dirlogclean.c.orig	2002-11-24 08:52:14.000000000 -0500
++++ bin/sources/dirlogclean.c	2004-10-06 20:49:02.357541216 -0400
+@@ -99,14 +99,16 @@
+     if (argv[x][0] != '-') { } else {
+       switch ( argv[x][1] ) {
+         case 'r':
+-	        strcpy(config_file, argv[x+1]);
++	        strncpy(config_file, argv[x+1], sizeof(config_file) - 1);
++		config_file[ sizeof(config_file) - 1 ] = '\0';
+ 	        break;
+       }
+     }
+     x++;
+    }
+   
+-   strcpy(cleanname, argv[argc-1]);
++   strncpy(cleanname, argv[argc-1], sizeof(cleanname) - 1);
++   cleanname[ sizeof(cleanname) - 1 ] = '\0';
+    printf("CLEANING: %s\n", cleanname);
+ 
+    read_conf_datapath(datapath, config_file);
+--- bin/sources/formateduser.c.orig	2002-11-24 08:52:14.000000000 -0500
++++ bin/sources/formateduser.c	2004-10-06 20:51:35.995184744 -0400
+@@ -238,7 +238,8 @@
+     if (argv[x][0] != '-') { } else {
+       switch ( argv[x][1] ) {
+         case 'r':
+-	        strcpy(config_file, argv[x+1]);
++	        strncpy(config_file, argv[x+1], sizeof(config_file) - 1);
++		config_file[ sizeof(config_file) - 1 ] = '\0';
+ 	        break;
+       }
+     }
+@@ -246,7 +247,7 @@
+    }
+    
+    read_conf_datapath(datapath, config_file);
+-   sprintf(userfile, "%s/users/%s", datapath, argv[argc-1]);
++   snprintf(userfile, sizeof(userfile), "%s/users/%s", datapath, argv[argc-1]);
+    
+ 
+    if((fp = fopen(userfile, "r")) == NULL)
diff --git a/net-ftp/glftpd/files/glftpd-2.00-install.patch b/net-ftp/glftpd/files/glftpd-2.00-install.patch
index 32ee8ef0b138..a372a044eb51 100644
--- a/net-ftp/glftpd/files/glftpd-2.00-install.patch
+++ b/net-ftp/glftpd/files/glftpd-2.00-install.patch
@@ -37,7 +37,7 @@
 +    servicename=glftpd
 @@ -617 +616 @@
 -            read keystroke
-+            echo "SHOULD NOT HAVE BEEN HERE 6" ; exit 1
++            keystroke=y
 @@ -639 +638 @@
 -    read keystroke
 +    echo "SHOULD NOT HAVE BEEN HERE 6.2" ; exit 1
diff --git a/net-ftp/glftpd/files/glftpd.env.d b/net-ftp/glftpd/files/glftpd.env.d
index ee9835847746..df90b64f721f 100644
--- a/net-ftp/glftpd/files/glftpd.env.d
+++ b/net-ftp/glftpd/files/glftpd.env.d
@@ -1 +1 @@
-CONFIG_PROTECT="/opt/glftpd/etc"
+CONFIG_PROTECT="GLROOT/etc GLROOT/ftp-data"
diff --git a/net-ftp/glftpd/files/glftpd.xinetd.d b/net-ftp/glftpd/files/glftpd.xinetd.d
index 9094c26cefe6..35073d967e1e 100644
--- a/net-ftp/glftpd/files/glftpd.xinetd.d
+++ b/net-ftp/glftpd/files/glftpd.xinetd.d
@@ -1,12 +1,12 @@
 service glftpd
 {
-    disable         = no
+    disable         = yes
     flags           = REUSE NAMEINARGS
     socket_type     = stream
     protocol        = tcp
     wait            = no
     user            = root
     server          = /usr/sbin/tcpd
-    server_args     = /opt/glftpd/bin/glftpd -l -i -o -r /opt/glftpd/glftpd.conf -s/opt/glftpd/bin/glstrings.bin 
+    server_args     = GLROOT/bin/glftpd -l -i -z cert=/etc/glftpd-dsa.pem -o -r GLROOT/glftpd.conf -sGLROOT/bin/glstrings.bin
     only_from       = 0.0.0.0
 }
diff --git a/net-ftp/glftpd/glftpd-1.32-r2.ebuild b/net-ftp/glftpd/glftpd-1.32-r2.ebuild
index bbd768c14a97..5f0ecb946fc8 100644
--- a/net-ftp/glftpd/glftpd-1.32-r2.ebuild
+++ b/net-ftp/glftpd/glftpd-1.32-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-ftp/glftpd/glftpd-1.32-r2.ebuild,v 1.1 2004/10/07 04:52:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/glftpd/glftpd-1.32-r2.ebuild,v 1.1.1.1 2005/11/30 09:36:29 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-ftp/glftpd/glftpd-2.00.ebuild b/net-ftp/glftpd/glftpd-2.00.ebuild
index 4e6cea603fdf..3b6200ae19a6 100644
--- a/net-ftp/glftpd/glftpd-2.00.ebuild
+++ b/net-ftp/glftpd/glftpd-2.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/net-ftp/glftpd/glftpd-2.00.ebuild,v 1.1 2005/02/19 22:53:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/glftpd/glftpd-2.00.ebuild,v 1.1.1.1 2005/11/30 09:36:29 chriswhite Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.glftpd.com/files/${MY_P}.tgz"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="-* ~x86"
+KEYWORDS="-* x86"
 IUSE=""
 
 DEPEND="dev-libs/openssl"
@@ -45,7 +45,7 @@ src_install() {
 	# custom options
 	export USETCPD=$(yesno useq tcpd)
 	export JAIL=y
-	export MAKETLS=$(yesno [ ! -e /etc/glftpd-dsa.pem ])
+	export MAKETLS=$(yesno [[ ! -e ${ROOT}/etc/glftpd-dsa.pem ]])
 	export WHICHNETD=x
 	"${S}"/installgl.sh || die "installgl.sh failed"
 
@@ -56,10 +56,10 @@ src_install() {
 
 	mv ${GLROOT}/glftpd.conf ${D}/etc/
 	ln -s /etc/glftpd.conf ${GLROOT}/glftpd.conf
-	if [ -e /etc/glftpd-dsa.pem ] ; then
-		cp /etc/glftpd-dsa.pem ${D}/etc/
+	if [[ -e ${ROOT}/etc/glftpd-dsa.pem ]] ; then
+		cp "${ROOT}"/etc/glftpd-dsa.pem "${D}"/etc/
 	else
-		cp ftpd-dsa.pem ${D}/etc/glftpd-dsa.pem
+		cp ftpd-dsa.pem "${D}"/etc/glftpd-dsa.pem
 	fi
 	ln -s /etc/glftpd-dsa.pem ${GLROOT}/etc/glftpd-dsa.pem
 	fperms o-r /etc/glftpd-dsa.pem
@@ -92,6 +92,12 @@ pkg_postinst() {
 }
 
 pkg_config() {
+	einfo "Updating /etc/services"
+	{ grep -v ^glftpd /etc/services;
+	echo "glftpd   21/tcp"
+	} > /etc/services.new
+	mv -f /etc/services.new /etc/services
+
 	einfo "Updating crontab"
 	{ crontab -l | grep -v "bin/reset"
 	echo "0  0 * * *      ${CUSTOMGLROOT}/bin/reset -r ${CUSTOMGLROOT}/glftpd.conf"
diff --git a/net-ftp/gproftpd/ChangeLog b/net-ftp/gproftpd/ChangeLog
index 77a3d2d38ae1..8af0d732fcfa 100644
--- a/net-ftp/gproftpd/ChangeLog
+++ b/net-ftp/gproftpd/ChangeLog
@@ -1,6 +1,49 @@
 # ChangeLog for net-ftp/gproftpd
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/gproftpd/ChangeLog,v 1.1 2003/11/06 04:55:38 blkdeath Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/gproftpd/ChangeLog,v 1.1.1.1 2005/11/30 09:36:24 chriswhite Exp $
+
+  27 Jun 2005; Simon Stelling <blubb@gentoo.org> gproftpd-8.2.2.ebuild:
+  added ~amd64 keyword
+
+*gproftpd-8.2.2 (26 Jun 2005)
+
+  26 Jun 2005; Daniel Black <dragonheart@gentoo.org> +gproftpd-8.2.2.ebuild:
+  Version bump as requested in bug #88903
+
+*gproftpd-8.1.9 (16 Feb 2005)
+
+  16 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org> gproftpd-8.1.9.ebuild:
+  Stable on sparc wrt #81894
+
+  16 Feb 2005; Tavis Ormandy,,, <taviso@gentoo.org> :
+  security bump #81894 (c12/c13).
+
+  26 Jan 2005; Jason Wever <weeve@gentoo.org> gproftpd-8.1.4.ebuild:
+  Stable on sparc.
+
+  10 Jun 2004; Aron Griffis <agriffis@gentoo.org> gproftpd-8.1.4.ebuild:
+  Fix use invocation
+
+  09 Jun 2004; David Holm <dholm@gentoo.org> gproftpd-8.1.6.ebuild:
+  Added to ~ppc.
+
+*gproftpd-8.1.6 (09 Jun 2004)
+
+  09 Jun 2004; Daniel Black <dragonheart@gentoo.org> +metadata.xml,
+  gproftpd-8.1.4.ebuild, +gproftpd-8.1.6.ebuild:
+  x86 stable 8.1.4. Fixes to 8.1.4 and version bump thanks to
+  scootersmk@chartertn.net in bug 33798
+
+  04 Jun 2004; Jason Wever <weeve@gentoo.org> gproftpd-8.1.4.ebuild:
+  Added ~sparc keyword to resolve bug #53022.
+
+  02 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> gproftpd-8.1.0.ebuild:
+  clean out older ebuild
+
+*gproftpd-8.1.4 (14 Jan 2004)
+
+  14 Jan 2004; Stewart <stewart@gentoo.org> gproftpd-8.1.4.ebuild:
+  Version bump.
 
 *gproftpd-8.1.0 (05 Nov 2003)
 
diff --git a/net-ftp/gproftpd/Manifest b/net-ftp/gproftpd/Manifest
index 2cccaae0ade7..8a1515ded17d 100644
--- a/net-ftp/gproftpd/Manifest
+++ b/net-ftp/gproftpd/Manifest
@@ -1,4 +1,10 @@
-MD5 99db2c7c83390f7b5f0d54c19f2cff2f ChangeLog 341
-MD5 63bd6e87942a25d48bd5365edd8246c0 metadata.xml 268
-MD5 472b24d42d8b270adc44922b0f19b724 gproftpd-8.1.0.ebuild 1146
-MD5 77e0372123e9769426d564ed4c20a044 files/digest-gproftpd-8.1.0 66
+MD5 842e3703c40461ec47e04373c2e689cf ChangeLog 1660
+MD5 16cb285989db5c2a46991dd4a7bc1488 gproftpd-8.1.4.ebuild 1301
+MD5 d553e20adeb35f71bc2dcc9240ae5076 gproftpd-8.1.6.ebuild 1619
+MD5 cda8029e4176b93c44e245bc209c9cd2 gproftpd-8.1.9.ebuild 1564
+MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
+MD5 2a0216f1c436f53b28f615ee1f2c3b4b gproftpd-8.2.2.ebuild 1609
+MD5 100294a5871bb7bc1ddde12efb4c6190 files/digest-gproftpd-8.1.4 66
+MD5 24fb97610de7a1146a7a63c4f72a0093 files/digest-gproftpd-8.1.6 66
+MD5 1111a5c33cf3a392a245c39b96bed61d files/digest-gproftpd-8.1.9 66
+MD5 34245681b0a51ce3e24fe6edbb860754 files/digest-gproftpd-8.2.2 66
diff --git a/net-ftp/gproftpd/gproftpd-8.1.4.ebuild b/net-ftp/gproftpd/gproftpd-8.1.4.ebuild
index b17f15666902..631ff4bbab01 100644
--- a/net-ftp/gproftpd/gproftpd-8.1.4.ebuild
+++ b/net-ftp/gproftpd/gproftpd-8.1.4.ebuild
@@ -1,18 +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-ftp/gproftpd/gproftpd-8.1.4.ebuild,v 1.1 2004/01/14 20:13:03 blkdeath Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/gproftpd/gproftpd-8.1.4.ebuild,v 1.1.1.1 2005/11/30 09:36:24 chriswhite Exp $
 
-S="${WORKDIR}/${P}"
 DESCRIPTION="GTK frontend to proftpd"
 HOMEPAGE="http://mange.dynup.net/linux.html"
 SRC_URI="http://mange.dynup.net/linux/gproftpd/${P}.tar.gz"
 LICENSE="GPL-2"
 
-KEYWORDS="~x86"
+KEYWORDS="x86 sparc"
 
 SLOT="0"
 
-IUSE="X gtk"
+IUSE="gnome"
 
 # Requiring ProFTPD 1.2.9 due to security fixes
 DEPEND=">=net-ftp/proftpd-1.2.9
@@ -25,9 +24,7 @@ DEPEND=">=net-ftp/proftpd-1.2.9
 #	>=x11-libs/xft-2.0  //this is blocked by xfree4.3.99
 
 src_compile() {
-	econf --sysconfdir=/etc || die "./configure failed"
-	# --sysconfdir=/path/to/proftpd/conf/file
-	# or you can remove the --sysconfdir line and specify when starting the app proftpd -c /etc/proftpd.conf
+	econf --sysconfdir=/etc/proftpd || die "./configure failed"
 	emake || die "Build failure"
 }
 
@@ -35,10 +32,17 @@ src_install () {
 	einstall || die "Installation failure"
 
 #         Add the Gnome menu entry
-	if [ `use gnome` ] ; then
+	if use gnome ; then
 		insinto /usr/share/gnome/apps/Internet/
 		doins ${FILESDIR}/gproftpd.desktop
 	fi
 
 	dodoc AUTHORS ChangeLog COPYING INSTALL NEWS README
 }
+
+pkg_postinst() {
+	einfo "gproftpd looks for your proftpd.conf file in /etc/proftpd"
+	einfo "run gproftpd with the option -c to specify an alternate location"
+	einfo "ex: gproftpd -c /etc/proftpd.conf"
+	ewarn "Do NOT edit /etc/conf.d/proftpd with this program"
+}
diff --git a/net-ftp/gproftpd/gproftpd-8.1.6.ebuild b/net-ftp/gproftpd/gproftpd-8.1.6.ebuild
index fd4eac3023ec..04b456405134 100644
--- a/net-ftp/gproftpd/gproftpd-8.1.6.ebuild
+++ b/net-ftp/gproftpd/gproftpd-8.1.6.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-ftp/gproftpd/gproftpd-8.1.6.ebuild,v 1.1 2004/06/08 22:25:45 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/gproftpd/gproftpd-8.1.6.ebuild,v 1.1.1.1 2005/11/30 09:36:24 chriswhite Exp $
 
 
 DESCRIPTION="GTK frontend to proftpd"
 HOMEPAGE="http://mange.dynup.net/linux.html"
 SRC_URI="http://mange.dynup.net/linux/gproftpd/${P}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="~x86 ~sparc ~ppc"
 SLOT="0"
 
-IUSE="X gtk ssl gnome"
+IUSE="gnome ssl"
 
 # Requiring ProFTPD 1.2.9 due to security fixes
 DEPEND=">=net-ftp/proftpd-1.2.9
diff --git a/net-ftp/gproftpd/gproftpd-8.1.9.ebuild b/net-ftp/gproftpd/gproftpd-8.1.9.ebuild
index fcfcfa2533f4..045819e4896f 100644
--- a/net-ftp/gproftpd/gproftpd-8.1.9.ebuild
+++ b/net-ftp/gproftpd/gproftpd-8.1.9.ebuild
@@ -1,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-ftp/gproftpd/gproftpd-8.1.9.ebuild,v 1.1 2005/02/16 11:52:04 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/gproftpd/gproftpd-8.1.9.ebuild,v 1.1.1.1 2005/11/30 09:36:24 chriswhite Exp $
 
 
 DESCRIPTION="GTK frontend to proftpd"
 HOMEPAGE="http://mange.dynup.net/linux.html"
 SRC_URI="http://mange.dynup.net/linux/gproftpd/${P}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~sparc ~ppc"
+KEYWORDS="x86 sparc ~ppc"
 SLOT="0"
 
 IUSE="gnome ssl"
diff --git a/net-ftp/gproftpd/gproftpd-8.2.2.ebuild b/net-ftp/gproftpd/gproftpd-8.2.2.ebuild
index 7fd7262380b5..96657d743ea0 100644
--- a/net-ftp/gproftpd/gproftpd-8.2.2.ebuild
+++ b/net-ftp/gproftpd/gproftpd-8.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-ftp/gproftpd/gproftpd-8.2.2.ebuild,v 1.1 2005/06/26 11:18:18 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/gproftpd/gproftpd-8.2.2.ebuild,v 1.1.1.1 2005/11/30 09:36:24 chriswhite Exp $
 
 
 DESCRIPTION="GTK frontend to proftpd"
 HOMEPAGE="http://mange.dynup.net/linux.html"
 SRC_URI="http://mange.dynup.net/linux/gproftpd/${P}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 SLOT="0"
 
 IUSE="gnome ssl"
diff --git a/net-ftp/gproftpd/metadata.xml b/net-ftp/gproftpd/metadata.xml
index 8c2d9d6d7f2c..d8b96be3c5cd 100644
--- a/net-ftp/gproftpd/metadata.xml
+++ b/net-ftp/gproftpd/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>no-herd</herd>
-  <maintainer>
-    <email>blkdeath@gentoo.org</email>
-    <name>Stewart Honsberger</name>
-  </maintainer>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>bug-wranglers@gentoo.org</email>
+		<description>This package lacks a primary herd or maintainer.</description>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-ftp/jftpgw/ChangeLog b/net-ftp/jftpgw/ChangeLog
index ebf88c8af9e0..a4a7591b4e63 100644
--- a/net-ftp/jftpgw/ChangeLog
+++ b/net-ftp/jftpgw/ChangeLog
@@ -1,6 +1,29 @@
 # ChangeLog for net-ftp/jftpgw
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/jftpgw/ChangeLog,v 1.1 2002/12/12 17:13:10 phoenix Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/jftpgw/ChangeLog,v 1.1.1.1 2005/11/30 09:36:25 chriswhite Exp $
+
+  23 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  jftpgw-0.13.4-r1.ebuild:
+  Use -1 instead of /bin/false on enewuser call.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  jftpgw-0.13.4-r1.ebuild:
+  virtual/glibc -> virtual/libc
+
+  02 May 2004; David Holm <dholm@gentoo.org> jftpgw-0.13.4-r1.ebuild:
+  Added to ~ppc.
+
+*jftpgw-0.13.4-r1 (25 Jun 2003)
+
+  25 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
+  Added USE support for xinetd,crypt,tcpd and an init.d file #23463.
+
+*jftpgw-0.13.4 (06 Apr 2002)
+
+  06 Apr 2002; phoen][x <phoenix@gentoo.org> ChangeLog, jftpgw-0.13.4.ebuild, 
+  files/digest-jftpgw-0.13.4 :
+  Version bump. Thanks to zul <chuck_short@rogers.com> for the contribution.
+  This closes bug #18669.
 
 *jftpgw-0.13.1 (12 Dec 2002)
 
diff --git a/net-ftp/jftpgw/Manifest b/net-ftp/jftpgw/Manifest
index e69de29bb2d1..a6c4ee62e04f 100644
--- a/net-ftp/jftpgw/Manifest
+++ b/net-ftp/jftpgw/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 474e8335938d099ab8b123c581b3688d ChangeLog 1171
+MD5 92e8f02e2ad776899905e90f4bdce4f4 jftpgw-0.13.4-r1.ebuild 1119
+MD5 7c34a4c782110ac0cf496f066dda0b6a files/jftpgw.rc 409
+MD5 5b8929834163de8835af5442df0500ff files/digest-jftpgw-0.13.4-r1 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDCyAhj5H05b2HAEkRAmbWAJ42h0nghzh1bw4dI/7OdArsxiMBFwCfVAym
+yOgdMrYTneOXF1qnnhkwbg8=
+=Uk0Y
+-----END PGP SIGNATURE-----
diff --git a/net-ftp/jftpgw/files/jftpgw.rc b/net-ftp/jftpgw/files/jftpgw.rc
index e5a61cd060b4..d51eba158874 100644
--- a/net-ftp/jftpgw/files/jftpgw.rc
+++ b/net-ftp/jftpgw/files/jftpgw.rc
@@ -1,10 +1,10 @@
 #!/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-ftp/jftpgw/files/jftpgw.rc,v 1.1 2003/06/26 00:32:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/jftpgw/files/jftpgw.rc,v 1.1.1.1 2005/11/30 09:36:25 chriswhite Exp $
 
 depend() {
-	need net
+	use net
 }
 
 start() {
@@ -16,5 +16,6 @@ start() {
 stop() {
 	ebegin "Stopping jftpgw"
 	kill `</var/run/jftpgw.pid`
+	rm /var/run/jftpgw.pid
 	eend $?
 }
diff --git a/net-ftp/jftpgw/jftpgw-0.13.4-r1.ebuild b/net-ftp/jftpgw/jftpgw-0.13.4-r1.ebuild
index 6a853d7e9767..84c89db71196 100644
--- a/net-ftp/jftpgw/jftpgw-0.13.4-r1.ebuild
+++ b/net-ftp/jftpgw/jftpgw-0.13.4-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-ftp/jftpgw/jftpgw-0.13.4-r1.ebuild,v 1.1 2003/06/26 00:32:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/jftpgw/jftpgw-0.13.4-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:25 chriswhite Exp $
 
 inherit eutils
 
@@ -10,13 +10,11 @@ SRC_URI="http://www.mcknight.de/jftpgw/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE="crypt tcpd xinetd"
+KEYWORDS="x86 ~ppc"
+IUSE="crypt tcpd"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	tcpd? ( sys-apps/tcp-wrappers )"
-RDEPEND="${DEPEND}
-	xinetd? ( sys-apps/xinetd )"
 
 src_compile() {
 	econf \
@@ -37,11 +35,11 @@ src_install() {
 
 	exeinto /etc/init.d ; newexe ${FILESDIR}/jftpgw.rc jftpgw
 
-	if [ `use xinetd` ] ; then
+	if has_version sys-apps/xinetd ; then
 		insinto /etc/xinetd.d
 		newins support/jftpgw.xinetd jftpgw
 		dosed "s:nobody:${PN}:" /etc/xinetd.d/jftpgw
 	fi
 
-	enewuser ${PN} -1 /bin/false /dev/null nobody
+	enewuser ${PN} -1 -1 /dev/null nobody
 }
diff --git a/net-ftp/kasablanca/ChangeLog b/net-ftp/kasablanca/ChangeLog
index 57a78b8f7d2b..6112bd345934 100644
--- a/net-ftp/kasablanca/ChangeLog
+++ b/net-ftp/kasablanca/ChangeLog
@@ -1,6 +1,58 @@
-# ChangeLog for net-fs/kasablanca
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/kasablanca/ChangeLog,v 1.1 2004/04/30 00:05:43 dragonheart Exp $
+# ChangeLog for net-ftp/kasablanca
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/kasablanca/ChangeLog,v 1.1.1.1 2005/11/30 09:36:23 chriswhite Exp $
+
+  21 Oct 2005; Jose Luis Rivero <yoswink@gentoo.org> Manifest:
+  Manifest fixed due to a power failure during the commit
+
+  21 Oct 2005; Jose Luis Rivero <yoswink@gentoo.org>
+  kasablanca-0.4.0.2.ebuild:
+  Marked ~alpha wrt bug #109886
+
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  28 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kasablanca-0.4.0.2.ebuild:
+  Stable on amd64.
+
+  28 Jul 2005; Caleb Tennis <caleb@gentoo.org> kasablanca-0.4.0.1.ebuild:
+  Fix qt dep per bug #100235
+
+  15 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> kasablanca-0.4.0.2.ebuild:
+  Stable on x86.
+
+  24 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> kasablanca-0.4.0.1.ebuild:
+  stable on amd64, fixes #85102
+
+*kasablanca-0.4.0.2 (08 Mar 2005)
+
+  08 Mar 2005; Gregorio Guidi <greg_g@gentoo.org> metadata.xml,
+  +files/kasablanca-0.4.0.2-64bit.patch, -kasablanca-0.3.1.ebuild,
+  +kasablanca-0.4.0.2.ebuild:
+  New version (#84462), and cleanup.
+
+  15 Sep 2004; Danny van Dyk <kugelfang@gentoo.org>
+  files/kasablanca-0.4.0.1-64bit.patch:
+  Fixed BUG #64016.
+
+  12 Sep 2004; Daniel Black <dragonheart@gentoo.org>
+  kasablanca-0.4.0.1.ebuild:
+  x86 keyword and added inherit eutils
+
+  30 Aug 2004; Danny van Dyk <kugelfang@gentoo.org> kasablanca-0.4.0.1.ebuild:
+  Marked ~amd64 after adding 64bit patch. Fixed BUG #58911.
+
+*kasablanca-0.4.0.1 (19 Aug 2004)
+
+  19 Aug 2004; Konstantin Arkhipov <voxus@gentoo.org> +kasablanca-0.4.0.1.ebuild,
+  -kasablanca-0.4:
+  Version bump, closing bug #60856.
+
+*kasablanca-0.4 (22 Jul 2004)
+
+  22 Jul 2004; Daniel Black <dragonheart@gentoo.org> +kasablanca-0.4.ebuild:
+  Version bump as per bug #57882. Thanks to Erik Östlund <erik_ostlund@yahoo.se>
 
   30 Apr 2004; Daniel Black <dragonheart@gentoo.org> +metadata.xml,
   +kasablanca-0.3.1.ebuild:
diff --git a/net-ftp/kasablanca/Manifest b/net-ftp/kasablanca/Manifest
index a29558f7631d..8a6b0cde21c6 100644
--- a/net-ftp/kasablanca/Manifest
+++ b/net-ftp/kasablanca/Manifest
@@ -1,4 +1,18 @@
-MD5 f2b69c0d9052496262b5c8840efec980 kasablanca-0.3.1.ebuild 1354
-MD5 6d796b061ed1c1337ef157a5f74dab35 metadata.xml 403
-MD5 3489c7de802a8b6e9a2f8c230c81d255 ChangeLog 845
-MD5 44f5f7533a333b518b78afdf777382eb files/digest-kasablanca-0.3.1 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e0fac43400bd894a9783543aa3108cd8 kasablanca-0.4.0.1.ebuild 1423
+MD5 7b4e2f4b9b36c17a4e8c4906d8a8c289 kasablanca-0.4.0.2.ebuild 657
+MD5 ddb1bccef1def7602111da26f319ebbb ChangeLog 2718
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 386f5c1b7f72dccddc10e6fbd86018d7 files/kasablanca-0.4.0.2-64bit.patch 583
+MD5 9ebcacc290d963ccd9b9b8c44e531cb0 files/digest-kasablanca-0.4.0.1 70
+MD5 4effac21d296e66943284c5d8a8478f7 files/digest-kasablanca-0.4.0.2 70
+MD5 5f8e1cd88abe579e22770b96f5cc706d files/kasablanca-0.4.0.1-64bit.patch 517
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDWWOe3og80iZgVQgRAnBTAJ9lKbrxMjKVNRCnCA7KZtt54/oYLgCgglpL
+LWhVbkepdg9u4Iq1+PAhmFI=
+=e+C1
+-----END PGP SIGNATURE-----
diff --git a/net-ftp/kasablanca/files/kasablanca-0.4.0.1-64bit.patch b/net-ftp/kasablanca/files/kasablanca-0.4.0.1-64bit.patch
index e89b81290207..0c7314c36bfd 100644
--- a/net-ftp/kasablanca/files/kasablanca-0.4.0.1-64bit.patch
+++ b/net-ftp/kasablanca/files/kasablanca-0.4.0.1-64bit.patch
@@ -1,5 +1,5 @@
 --- kasablanca-0.4-orig/src/ftpthread.cpp	2004-07-13 21:32:32.000000000 +0100
-+++ kasablanca-0.4/src/ftpthread.cpp	2004-07-30 17:34:06.035555832 +0100
++++ kasablanca-0.4.0.1/src/ftpthread.cpp	2004-07-30 17:34:06.035555832 +0100
 @@ -1123,13 +1123,13 @@
  		for (i = 1; i < 13; i++)
  		{
diff --git a/net-ftp/kasablanca/kasablanca-0.4.0.1.ebuild b/net-ftp/kasablanca/kasablanca-0.4.0.1.ebuild
index 0bd4ac404a1b..a6155e02fbba 100644
--- a/net-ftp/kasablanca/kasablanca-0.4.0.1.ebuild
+++ b/net-ftp/kasablanca/kasablanca-0.4.0.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/net-ftp/kasablanca/kasablanca-0.4.0.1.ebuild,v 1.1 2004/08/19 11:18:32 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/kasablanca/kasablanca-0.4.0.1.ebuild,v 1.1.1.1 2005/11/30 09:36:24 chriswhite Exp $
 
-inherit kde
+inherit kde eutils
 
 DESCRIPTION="a graphical ftp client for kde. among its features are support for ssl/tls encryption (both commands and data using auth tls, not sftp), fxp (direct ftp to ftp transfer) bookmarks, and queues."
 HOMEPAGE="http://kasablanca.berlios.de/"
@@ -10,7 +10,7 @@ SRC_URI="http://download.berlios.de/kasablanca/kasablanca-${PV}.tar.gz"
 LICENSE="GPL-2"
 RESTRICT="nomirror"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc amd64"
 IUSE=""
 
 # commondpends based on (ldd /usr/bin/kasablanca ; ldd /usr/bin/kbftp ) |\
@@ -28,7 +28,7 @@ COMMONDEPENDS="dev-libs/expat
 	sys-libs/glibc
 	sys-libs/zlib
 	virtual/x11
-	x11-libs/qt"
+	=x11-libs/qt-3*"
 
 DEPEND="${DEPEND}
 	sys-apps/gawk
@@ -47,6 +47,10 @@ RDEPEND="${RDEPEND}
 
 need-kde 3.1
 
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-64bit.patch
+}
 
 src_install() {
 	kde_src_install all
diff --git a/net-ftp/kasablanca/kasablanca-0.4.0.2.ebuild b/net-ftp/kasablanca/kasablanca-0.4.0.2.ebuild
index 0f59c4904f17..5a100e833bd0 100644
--- a/net-ftp/kasablanca/kasablanca-0.4.0.2.ebuild
+++ b/net-ftp/kasablanca/kasablanca-0.4.0.2.ebuild
@@ -1,23 +1,22 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/kasablanca/kasablanca-0.4.0.2.ebuild,v 1.1 2005/03/08 11:13:26 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/kasablanca/kasablanca-0.4.0.2.ebuild,v 1.1.1.1 2005/11/30 09:36:24 chriswhite Exp $
 
 inherit kde eutils
 
-DESCRIPTION="A graphical ftp client for KDE. It supports ssl/tls encryption, fxp, bookmarks, and queues."
+DESCRIPTION="A graphical ftp client for KDE. It supports ssl/tls encryption, fxp, bookmarks, and queues"
 HOMEPAGE="http://kasablanca.berlios.de/"
 SRC_URI="http://download.berlios.de/kasablanca/${P}.tar.gz"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~alpha amd64 ~ppc x86"
 IUSE=""
 
 need-kde 3.1
 
 src_unpack() {
 	kde_src_unpack
-
-	# Fix for 64-bit archs
-	epatch ${FILESDIR}/${P}-64bit.patch
+	# Fix for 64-bit archs. Patch applied upstream.
+	epatch "${FILESDIR}"/${P}-64bit.patch
 }
diff --git a/net-ftp/kasablanca/metadata.xml b/net-ftp/kasablanca/metadata.xml
index b9fc2b9c6f11..8d1e86a9cefb 100644
--- a/net-ftp/kasablanca/metadata.xml
+++ b/net-ftp/kasablanca/metadata.xml
@@ -1,12 +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>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>kde</herd>
 </pkgmetadata>
diff --git a/net-ftp/kbear/ChangeLog b/net-ftp/kbear/ChangeLog
index a3281d3b36ae..34cc150986a2 100644
--- a/net-ftp/kbear/ChangeLog
+++ b/net-ftp/kbear/ChangeLog
@@ -1,9 +1,96 @@
-# ChangeLog for net-ftp/lftp
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/kbear/ChangeLog,v 1.1 2002/03/15 15:32:22 danarmak Exp $
+# ChangeLog for net-ftp/kbear
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/kbear/ChangeLog,v 1.1.1.1 2005/11/30 09:36:22 chriswhite Exp $
+
+  28 Jun 2005; Aron Griffis <agriffis@gentoo.org> kbear-2.1.1-r1.ebuild:
+  Fix use invocation
+
+  30 May 2005; Marcus D. Hanwell <marcus@gentoo.org> kbear-2.1.1-r1.ebuild:
+  Stable on amd64.
+
+*kbear-2.1.1-r1 (28 Mar 2005)
+
+  28 Mar 2005; Dominik Stadler <centic@gentoo.org> +kbear-2.1.1-r1.ebuild:
+  bump ebuild to support gnome, proposed in Bug 38502
+
+  02 Nov 2004; Simone Gotti <motaboy@gentoo.org>
+  +files/kbear-2.1.1-configure.patch, kbear-2.1.1.ebuild:
+  Added a patch to the configure script to honor the arts USE flag. Fixes bug
+  #69790.
+
+  04 Oct 2004; Dominik Stadler <centic@gentoo.org> kbear-2.1.1.ebuild:
+  Add gnome-menus, fixes Bug 38502
+
+  14 Jul 2004; Travis Tilley <lv@gentoo.org> +files/kbear-2.1.1-gcc-3.4.patch,
+  kbear-2.1.1.ebuild:
+  added gcc 3.4 fix, -fPIC fix, and ~amd64 keyword
+
+  16 May 2004; Dominik Stadler <centic@gentoo.org> kbear-2.1.1.ebuild,
+  kbear-2.1.ebuild:
+  Add IUSE
+
+  09 Jan 2004; Jason Wever <weeve@gentoo.org> kbear-2.1.1.ebuild:
+  Marked stable on sparc.
+
+*kbear-2.1.1 (06 Jan 2004)
+
+  06 Jan 2004; Caleb Tennis <caleb@gentoo.org> kbear-2.1.1.ebuild,
+  kbear-2.1.ebuild, metadata.xml:
+  Version bump
+
+  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.
+
+*kbear-2.1 (03 Jan 2003)
+
+  19 Mar 2003; Jason Wever <weeve@gentoo.org> kbear-2.1.ebuild:
+  Added sparc to keywords.
+
+  26 Jan 2003; Jon Nall <nall@gentoo.org> kbear-2.1.ebuild: :
+  added ~ppc
+
+  03 Jan 2003; Hannes Mehnert <hannes@gentoo.org> kbear-2.1.ebuild:
+  version bump, thanks to sysop@heinospage.de (Heinrich Wendel) (bug #12779)
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*kbear-2.0 (16 Okt 2002) Bart Verwilst <verwilst@gentoo.org>:
+
+  Removed the kdesdk dep, since it compiled here just fine without it..
+  Lemme know if it b0rks because of that.
+
+  29 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Add mising dep on kdesdk (for xml2pot). Closes #6927.
+
+*kbear-2.0_beta2 (23 Aug 2002)
+
+  23 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  New upstream version.
+
+*kbear-2.0_beta1 (03 Aug 2002)
+
+  03 Aug 2002; Nicholas Jones <carpaski@gentoo.org> :
+	
+	Touched up ebuild to work with the beta release.
+	Builds on 3.1 systems now.
+
+*kbear-2.0_alpha1 (18 Jun 2002)
+
+  28 Jul 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Correct SLOTs ('2' for kde2 version, '3' for kde3 version).
+
+  18 Jun 2002; Thilo Bangert <bangert@gentoo.org> kbear-2.0_alpha1.ebuild:
+
+  Added KDE3 port of kbear - alpha software!
 
 *-kbear-1.2.1-r2 (15 Mar 2002)
 
   15 Mar 2002; Dan Armak <danarmak@gentoo.org> ChangeLog :
   
-  Added patch that makes kbear build; unmasking. This closes bug #961.
\ No newline at end of file
+  Added patch that makes kbear build; unmasking. This closes bug #961.
diff --git a/net-ftp/kbear/Manifest b/net-ftp/kbear/Manifest
index e69de29bb2d1..3c1ca6524f58 100644
--- a/net-ftp/kbear/Manifest
+++ b/net-ftp/kbear/Manifest
@@ -0,0 +1,6 @@
+MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
+MD5 9806646d6cbaa1dc8e6b4ef3c7c243b9 ChangeLog 3073
+MD5 353631f97c6b9a4c5fbfe6630afc42ef kbear-2.1.1-r1.ebuild 1279
+MD5 1ba81f001901f16e706f51509efa1795 files/kbear-2.1.1-configure.patch 3567
+MD5 443afedd3087f5872adc90384c861095 files/digest-kbear-2.1.1-r1 71
+MD5 67ad0828ae3ed0456eb1df602e387fd3 files/kbear-2.1.1-gcc-3.4.patch 11736
diff --git a/net-ftp/kbear/kbear-2.1.1-r1.ebuild b/net-ftp/kbear/kbear-2.1.1-r1.ebuild
index e75b670218fb..84604906cbb0 100644
--- a/net-ftp/kbear/kbear-2.1.1-r1.ebuild
+++ b/net-ftp/kbear/kbear-2.1.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-ftp/kbear/kbear-2.1.1-r1.ebuild,v 1.1 2005/03/28 18:20:24 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/kbear/kbear-2.1.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:22 chriswhite Exp $
 
 inherit kde flag-o-matic eutils
 
@@ -12,7 +12,7 @@ SLOT="0"
 IUSE="gnome"
 
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc sparc ~amd64"
+KEYWORDS="amd64 ~ppc sparc x86"
 S=${WORKDIR}/kbear-2.1
 
 need-kde 3
@@ -33,8 +33,7 @@ src_install()
 
 	# Kbear's Makefile already installs icons for KDE, so we just need install it for Gnome
 
-	if [ -n "`use gnome`" ]
-	then
+	if use gnome; then
 		einfo "Installing menu entry and icons for Gnome"
 		dodir ${GNOME_ICONS_DIR} ${GNOME_LINKS_DIR}
 		cp ${S}/pics/hi48_app_kbear.png ${D}/${GNOME_ICONS_DIR}/kbear.png
diff --git a/net-ftp/kbear/metadata.xml b/net-ftp/kbear/metadata.xml
index ec42e9fd586b..3399d0876645 100644
--- a/net-ftp/kbear/metadata.xml
+++ b/net-ftp/kbear/metadata.xml
@@ -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-ftp/kcmpureftpd/ChangeLog b/net-ftp/kcmpureftpd/ChangeLog
index df699cb2e7ea..300462cb89f7 100644
--- a/net-ftp/kcmpureftpd/ChangeLog
+++ b/net-ftp/kcmpureftpd/ChangeLog
@@ -1,6 +1,6 @@
-# ChangeLog for net-misc/kcmpureftpd
+# ChangeLog for net-ftp/kcmpureftpd
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/kcmpureftpd/ChangeLog,v 1.1 2005/04/23 04:44:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/kcmpureftpd/ChangeLog,v 1.1.1.1 2005/11/30 09:36:20 chriswhite Exp $
 
   03 Jul 2004; Dominik Stadler <centic@gentoo.org> kcmpureftpd-0.8.ebuild,
   kcmpureftpd-0.9.1.ebuild:
diff --git a/net-ftp/kcmpureftpd/Manifest b/net-ftp/kcmpureftpd/Manifest
index 28eca7bb173d..c1b9d9a21845 100644
--- a/net-ftp/kcmpureftpd/Manifest
+++ b/net-ftp/kcmpureftpd/Manifest
@@ -1,6 +1,16 @@
-MD5 10c11e6a936dff05a28cd50cfbc097ce kcmpureftpd-0.8.ebuild 480
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 371559ffad5671c0ef18bbcdd2423314 kcmpureftpd-0.9.1.ebuild 479
+MD5 56005750e8490b5e8abdd9722175eaf4 kcmpureftpd-0.8.ebuild 479
+MD5 35db255292c230221be03dd7db6b09d1 ChangeLog 1484
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-MD5 36ee414b4bf501c218bae48b967c18fe ChangeLog 1485
-MD5 4e0b13aba8cc0af524eb154a4b58cc09 kcmpureftpd-0.9.1.ebuild 480
 MD5 3a4d4d1bc445c06e127661d4897a2be8 files/digest-kcmpureftpd-0.9.1 70
 MD5 ad07f828fb26ccdbf5bbb460f86dfe4a files/digest-kcmpureftpd-0.8 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCakcqI1lqEGTUzyQRAnfnAKCcNQb/rPen/sFnz1i69Xp/BOYg9wCfZxja
+CUbU/s02dWO0nhcyEqbNEP8=
+=BCY0
+-----END PGP SIGNATURE-----
diff --git a/net-ftp/kcmpureftpd/kcmpureftpd-0.8.ebuild b/net-ftp/kcmpureftpd/kcmpureftpd-0.8.ebuild
index 4dfbaa45a0e6..41430b66fe67 100644
--- a/net-ftp/kcmpureftpd/kcmpureftpd-0.8.ebuild
+++ b/net-ftp/kcmpureftpd/kcmpureftpd-0.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/net-ftp/kcmpureftpd/kcmpureftpd-0.8.ebuild,v 1.1 2005/04/23 04:44:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/kcmpureftpd/kcmpureftpd-0.8.ebuild,v 1.1.1.1 2005/11/30 09:36:20 chriswhite Exp $
 
 inherit kde
 need-kde 3.1
diff --git a/net-ftp/kcmpureftpd/kcmpureftpd-0.9.1.ebuild b/net-ftp/kcmpureftpd/kcmpureftpd-0.9.1.ebuild
index 5a8518e99b44..fd44ab7a089f 100644
--- a/net-ftp/kcmpureftpd/kcmpureftpd-0.9.1.ebuild
+++ b/net-ftp/kcmpureftpd/kcmpureftpd-0.9.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-ftp/kcmpureftpd/kcmpureftpd-0.9.1.ebuild,v 1.1 2005/04/23 04:44:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/kcmpureftpd/kcmpureftpd-0.9.1.ebuild,v 1.1.1.1 2005/11/30 09:36:20 chriswhite Exp $
 
 inherit kde
 need-kde 3.1
diff --git a/net-ftp/kftpgrabber/ChangeLog b/net-ftp/kftpgrabber/ChangeLog
index 922dedfac609..bb238ab598b6 100644
--- a/net-ftp/kftpgrabber/ChangeLog
+++ b/net-ftp/kftpgrabber/ChangeLog
@@ -1,6 +1,32 @@
 # ChangeLog for net-ftp/kftpgrabber
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/kftpgrabber/ChangeLog,v 1.1 2004/12/30 09:30:11 centic Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/kftpgrabber/ChangeLog,v 1.1.1.1 2005/11/30 09:36:22 chriswhite Exp $
+
+  11 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kftpgrabber-0.6.0-gcc4.patch, +files/kftpgrabber-0.6.0-uic.patch,
+  kftpgrabber-0.6.0.ebuild:
+  Added patches to compile using Qt 3.3.5 (stricter uic) and GCC4 (stricter
+  compiler).
+
+  28 Jul 2005; Caleb Tennis <caleb@gentoo.org> -kftpgrabber-0.5.0.ebuild:
+  Remove old build
+
+  26 Jul 2005; David Holm <dholm@gentoo.org> kftpgrabber-0.6.0.ebuild:
+  Added to ~ppc.
+
+  15 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> kftpgrabber-0.6.0.ebuild:
+  Stable on x86.
+
+*kftpgrabber-0.6.0 (27 May 2005)
+
+  27 May 2005; Gregorio Guidi <greg_g@gentoo.org> +kftpgrabber-0.6.0.ebuild:
+  New version (#93686).
+
+  27 Feb 2005; Jason Wever <weeve@gentoo.org> kftpgrabber-0.5.0.ebuild:
+  Added ~sparc keyword.
+
+  04 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> kftpgrabber-0.5.0.ebuild:
+  added ~amd64 to KEYWORDS. fixes #80178
 
 *kftpgrabber-0.5.0 (30 Dec 2004)
 
diff --git a/net-ftp/kftpgrabber/Manifest b/net-ftp/kftpgrabber/Manifest
index 8204ff78b8dd..0e54bdb74045 100644
--- a/net-ftp/kftpgrabber/Manifest
+++ b/net-ftp/kftpgrabber/Manifest
@@ -1,4 +1,16 @@
-MD5 2bc6335aaeea5e4df6159dafa4ca8d92 ChangeLog 303
-MD5 83a22833a88079eb2b676760d1779dd1 kftpgrabber-0.5.0.ebuild 443
-MD5 96a4184e1e3325923219a5f96a5511a5 metadata.xml 163
-MD5 d2e8234d1adaaff2d909091eb0ce16fe files/digest-kftpgrabber-0.5.0 71
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 70d2ec6d51ac5cd293c55f85678bfde5 ChangeLog 1273
+MD5 655b1b8780d7db4a2af5b6ce1ce0cfd8 files/digest-kftpgrabber-0.6.0 71
+MD5 288e8f880999088f99c5d33c19b875f3 files/kftpgrabber-0.6.0-gcc4.patch 2222
+MD5 225f4b81821c40c533b31665a32de321 files/kftpgrabber-0.6.0-uic.patch 1049
+MD5 6063a712f85738f73e99c5e5a691b229 kftpgrabber-0.6.0.ebuild 663
+MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDdKcKAiZjviIA2XgRArETAKDkSKBB5CYK9LmWC2Kc5cTTa5YALwCfdRBf
+5EU4Lb5+7TvwR0VSvGUBtXc=
+=LXjJ
+-----END PGP SIGNATURE-----
diff --git a/net-ftp/kftpgrabber/kftpgrabber-0.6.0.ebuild b/net-ftp/kftpgrabber/kftpgrabber-0.6.0.ebuild
index 4161c892fc5e..f4f3ac46845f 100644
--- a/net-ftp/kftpgrabber/kftpgrabber-0.6.0.ebuild
+++ b/net-ftp/kftpgrabber/kftpgrabber-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-ftp/kftpgrabber/kftpgrabber-0.6.0.ebuild,v 1.1 2005/05/27 14:13:20 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/kftpgrabber/kftpgrabber-0.6.0.ebuild,v 1.1.1.1 2005/11/30 09:36:22 chriswhite Exp $
 
-inherit kde
+inherit kde eutils
 
 DESCRIPTION="A graphical FTP client for KDE."
 HOMEPAGE="http://kftpgrabber.sourceforge.net/"
@@ -10,7 +10,7 @@ SRC_URI="http://kftpgrabber.sourceforge.net/releases/${P}.tar.bz2"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~sparc"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 IUSE=""
 
 DEPEND="dev-libs/openssl"
@@ -18,3 +18,10 @@ DEPEND="dev-libs/openssl"
 # TODO: support for dev-libs/qsa
 
 need-kde 3.3
+
+src_unpack() {
+	kde_src_unpack
+
+	epatch "${FILESDIR}/${P}-uic.patch"
+	epatch "${FILESDIR}/${P}-gcc4.patch"
+}
diff --git a/net-ftp/kftpgrabber/metadata.xml b/net-ftp/kftpgrabber/metadata.xml
index ec42e9fd586b..3399d0876645 100644
--- a/net-ftp/kftpgrabber/metadata.xml
+++ b/net-ftp/kftpgrabber/metadata.xml
@@ -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-ftp/lftp/ChangeLog b/net-ftp/lftp/ChangeLog
index 1454bdee0101..8d1d1c7db216 100644
--- a/net-ftp/lftp/ChangeLog
+++ b/net-ftp/lftp/ChangeLog
@@ -1,6 +1,384 @@
 # ChangeLog for net-ftp/lftp
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/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-ftp/lftp/ChangeLog,v 1.1.1.1 2005/11/30 09:36:21 chriswhite Exp $
+
+*lftp-3.3.4 (19 Nov 2005)
+
+  19 Nov 2005; Daniel Black <dragonheart@gentoo.org> +lftp-3.3.4.ebuild:
+  version bump
+
+*lftp-3.3.3 (13 Nov 2005)
+
+  13 Nov 2005; Daniel Black <dragonheart@gentoo.org> -lftp-3.1.3.ebuild,
+  -lftp-3.1.4.ebuild, -lftp-3.2.1.ebuild, +lftp-3.3.3.ebuild:
+  version bump as per bug #110957. Thanks to Philip Lafleur
+
+*lftp-3.3.0 (26 Sep 2005)
+
+  26 Sep 2005; Daniel Black <dragonheart@gentoo.org> +lftp-3.3.0.ebuild:
+  version bump - bug #107232 - thanks to Philip Lafleur
+
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  10 Jul 2005; Lina Pezzella <j4rg0n@gentoo.org> lftp-3.2.1.ebuild:
+  Testing ppc-macos. Bug #96691. Submitted on behalf of Fabian Groffen.
+
+  21 Jun 2005; Daniel Black <dragonheart@gentoo.org> lftp-3.2.1.ebuild:
+  {R}DEPEND typo as per bug #96668 thanks to Dirk Dierckx
+
+*lftp-3.2.1 (19 Jun 2005)
+
+  19 Jun 2005; Daniel Black <dragonheart@gentoo.org> +lftp-3.2.1.ebuild:
+  Version bump (bug 94081) thanks to Jeffrey Litvin
+
+*lftp-3.1.4 (13 Jun 2005)
+
+  13 Jun 2005; Daniel Black <dragonheart@gentoo.org> +lftp-3.1.4.ebuild:
+  version bump
+
+  22 Apr 2005; Alin Nastac <mrness@gentoo.org> lftp-3.0.9.ebuild,
+  lftp-3.0.12-r1.ebuild, lftp-3.0.13.ebuild, lftp-3.1.3.ebuild:
+  net-misc/dante -> net-proxy/dante
+
+*lftp-3.1.3 (21 Apr 2005)
+
+  21 Apr 2005; Daniel Black <dragonheart@gentoo.org> -lftp-3.0.6.ebuild,
+  -lftp-3.1.0.ebuild, -lftp-3.1.1.ebuild, +lftp-3.1.3.ebuild:
+  Version bug inspired by bug #85827. Removed 3.1.[01] because of described
+  memory leak. Removed old version too. Thanks to BigBug
+  <BigBug@mafiN0_SPAMa.lv>
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org> lftp-3.0.13.ebuild:
+  Stable on ppc64
+
+  07 Apr 2005; Simon Stelling <blubb@gentoo.org> lftp-3.0.13.ebuild:
+  stable on amd64
+
+  28 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> lftp-3.0.13.ebuild:
+  Stable on ppc.
+
+*lftp-3.1.1 (25 Mar 2005)
+
+  25 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> +lftp-3.1.1.ebuild:
+  Version bump on behalf of dragonheart.
+
+  12 Mar 2005; Aron Griffis <agriffis@gentoo.org> lftp-3.0.13.ebuild:
+  Stable on alpha
+
+  04 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> lftp-3.0.13.ebuild:
+  Stable on sparc
+
+*lftp-3.1.0 (02 Mar 2005)
+
+  02 Mar 2005; Daniel Black <dragonheart@gentoo.org> lftp-3.0.13.ebuild,
+  +lftp-3.1.0.ebuild:
+  version bump to 3.1.0 as per bug #83682. x86 keyword for lftp-3.0.13. Bug
+  thanks to Jeffrey Litvin <litvin.j@neu.edu>
+
+  22 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> lftp-3.0.12-r1.ebuild:
+  Stable on alpha, bug 78620.
+
+  27 Dec 2004; Guy Martin <gmsoft@gentoo.org> lftp-3.0.12-r1.ebuild:
+  Stable on hppa.
+
+  22 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org> lftp-3.0.12-r1.ebuild:
+  Stable on sparc
+
+*lftp-3.0.13 (22 Dec 2004)
+
+  22 Dec 2004; Daniel Black <dragonheart@gentoo.org> -lftp-2.6.10.ebuild,
+  -lftp-3.0.10.ebuild, lftp-3.0.12-r1.ebuild, +lftp-3.0.13.ebuild:
+  version bump as per bug #75179. Cleanout of older versions. Added x86 
+  and ppc keywords to 3.0.12-r1. Version bump bug courtesy of Jeffrey 
+  Litvin <litvin.j@neu.edu>
+
+*lftp-3.0.12-r1 (19 Dec 2004)
+
+  19 Dec 2004; Daniel Black <dragonheart@gentoo.org> +lftp-3.0.12-r1.ebuild,
+  +files/lftp-3.0.12.patch, -lftp-3.0.12.ebuild:
+  Patch added to prevent segfault. Thanks to Jeffrey Litvin <litvin.j@neu.edu>
+  for the patch reference and Thomas Jäger <tjjr@tj.no> for Bug #74815
+
+*lftp-3.0.12 (07 Dec 2004)
+
+  07 Dec 2004; Daniel Black <dragonheart@gentoo.org> +lftp-3.0.12.ebuild,
+  -lftp-3.0.8.ebuild, lftp-3.0.9.ebuild:
+  version bump as per bug #73582 by rockoo. Removed one old version. added ppc
+  keyword to 3.0.9
+
+  01 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> lftp-3.0.9.ebuild:
+  Stable on alpha.
+
+  29 Oct 2004; Jason Wever <weeve@gentoo.org> lftp-3.0.9.ebuild:
+  Stable on sparc.
+
+  29 Oct 2004; Daniel Black <dragonheart@gentoo.org> lftp-3.0.9.ebuild:
+  version bump as per bug #69261. Thanks to Daniel Webert
+  <rockoo@rockoo.homelinux.org>
+
+  28 Oct 2004; Simon Stelling <blubb@gentoo.org> lftp-3.0.9.ebuild:
+  stable on amd64
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> lftp-3.0.8.ebuild:
+  Stable on amd64.
+
+  11 Oct 2004; Kito <kito@gentoo.org> lftp-3.0.9.ebuild:
+  added ~ppc-macos keyword
+
+  02 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> lftp-3.0.8.ebuild,
+  lftp-3.0.9.ebuild:
+  Added to ~ppc-macos; bug #61349.
+
+*lftp-3.0.9 (27 Sep 2004)
+
+  27 Sep 2004; Daniel Black <dragonheart@gentoo.org>
+  -files/lftp-3.0.7-memleak.patch, -lftp-2.6.11.ebuild, -lftp-3.0.7-r1.ebuild,
+  lftp-3.0.8.ebuild, +lftp-3.0.9.ebuild:
+  version bump and old version cleanout
+
+*lftp-3.0.8 (16 Sep 2004)
+
+  16 Sep 2004; Daniel Black <dragonheart@gentoo.org> +lftp-3.0.8.ebuild:
+  Version bumped. Memory leak fixed and bug submitted by the fabulous Luke
+  Macken <lewk@gentoo.org>. Bug #64203
+
+  13 Sep 2004; Guy Martin <gmsoft@gentoo.org> lftp-3.0.7-r1.ebuild:
+  Stable on hppa.
+
+  13 Sep 2004; Daniel Black <dragonheart@gentoo.org> lftp-3.0.7-r1.ebuild,
+  -lftp-3.0.7.ebuild, -lftp-3.0.3.ebuild, -lftp-3.0.2.ebuild:
+  x86 stable - removed memory leaking and excess versions
+
+  11 Sep 2004; Tom Martin <slarti@gentoo.org> lftp-3.0.6.ebuild:
+  Stable on amd64.
+
+  05 Sep 2004; Guy Martin <gmsoft@gentoo.org> lftp-3.0.6.ebuild:
+  Stable on hppa.
+
+*lftp-3.0.7-r1 (27 Aug 2004)
+
+  27 Aug 2004; <dragonheart@gentoo.org> +files/lftp-3.0.7-memleak.patch,
+  +lftp-3.0.7-r1.ebuild:
+  Memory leak fixed - thanks to Luke Macken in bug #61335. OSX fix thanks to
+  Miguel Sousa Filipe in bug #61349
+
+  22 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> lftp-3.0.6.ebuild:
+  Stable on alpha.
+
+  18 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> lftp-3.0.7.ebuild:
+  Stable on sparc wrt #60252
+
+  15 Aug 2004; Jason Wever <weeve@gentoo.org> lftp-3.0.6.ebuild:
+  Stable on sparc.
+
+*lftp-3.0.7 (14 Aug 2004)
+
+  14 Aug 2004; Daniel Black <dragonheart@gentoo.org> metadata.xml,
+  -lftp-3.0.1.ebuild, -lftp-3.0.5.ebuild, lftp-3.0.6.ebuild,
+  +lftp-3.0.7.ebuild:
+  Old version clean up. Version bump thanks to Daniel Webert
+  <rockoo@rockoo.homelinux.org> in bug #60252. x86 stable on 3.0.6
+
+  17 Jul 2004; Tom Gall <tgall@gentoo.org> lftp-3.0.6.ebuild:
+  stable on ppc64, bug #55682
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> lftp-3.0.5.ebuild,
+  lftp-3.0.6.ebuild:
+  virtual/glibc -> virtual/libc
+
+  14 Jun 2004; Daniel Black <dragonheart@gentoo.org> lftp-3.0.5.ebuild,
+  lftp-3.0.6.ebuild:
+  sys-libs/pam depend is only if socks5 use flag present. Fixes bug #53791
+
+*lftp-3.0.6 (13 Jun 2004)
+
+  13 Jun 2004; Daniel Black <dragonheart@gentoo.org> +lftp-3.0.6.ebuild:
+  Version bump thanks to #gentoo.pl Team - sekretarz <sekretarz@dukato.net> in
+  bug #53720
+
+  05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> lftp-3.0.3.ebuild:
+  Stable on alpha.
+
+*lftp-3.0.5 (04 Jun 2004)
+
+  04 Jun 2004; Daniel Black <dragonheart@gentoo.org> +lftp-3.0.5.ebuild:
+  version bump thanks to #gentoo.pl Team - sekretarz <sekretarz@dukato.net> in
+  bug #52021
+
+*lftp-3.0.3 (13 May 2004)
+
+  13 May 2004; Daniel Black <dragonheart@gentoo.org> +lftp-3.0.3.ebuild:
+  version bump in bug #49983
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> lftp-2.6.10.ebuild,
+  lftp-2.6.11.ebuild, lftp-3.0.1.ebuild, lftp-3.0.2.ebuild:
+  Add die following econf for bug 48950
+
+*lftp-3.0.2 (19 Apr 2004)
+
+  19 Apr 2004; <khai@gentoo.org> +lftp-3.0.2.ebuild:
+  Version bump.
+
+*lftp-3.0.1 (11 Apr 2004)
+
+  11 Apr 2004; Chris Aniszczyk <zx@gentoo.org> lftp-3.0.1.ebuild:
+  Version bump. Closes #46598
+
+  30 Mar 2004; Chris Aniszczyk <zx@gentoo.org> lftp-2.6.10.ebuild,
+  metadata.xml:
+  Added metadata.xml, fixed some QA issues.
+
+  30 Mar 2004; Chris Aniszczyk <zx@gentoo.org> lftp-2.6.11.ebuild:
+  Marking stable on hppa.
+
+  11 Jan 2004; Sven Blumenstein <bazik@gentoo.org> lftp-2.6.11.ebuild:
+  Stable on sparc.
+
+*lftp-2.6.11 (26 Dec 2003)
+
+  26 Dec 2003; <pyrania@gentoo.org> lftp-2.6.11.ebuild:
+  Version bump
+
+  15 Dec 2003; Aron Griffis <agriffis@gentoo.org> lftp-2.6.10.ebuild:
+  stable on alpha and ia64
+
+*lftp-2.6.10 (15 Dec 2003)
+
+  15 Dec 2003; <spider@gentoo.org> lftp-2.6.10.ebuild:
+  Update, security advisory #35866
+
+*lftp-2.6.8 (17 Oct 2003)
+
+  17 Oct 2003; Daniel Ahlberg <aliz@gentoo.org> lftp-2.6.8.ebuild:
+  Version bump
+
+  21 Sep 2003; Tavis Ormandy <taviso@gentoo.org> lftp-2.6.7.ebuild:
+  sed to remove duplicate libraries on alpha no longer required, appears
+  to be fixed in this version.
+
+*lftp-2.6.7 (19 Sep 2003)
+
+  19 Sep 2003; <iggy@gentoo.org> lftp-2.6.7.ebuild:
+  version bump thanks to hillster
+
+*lftp-2.6.6 (25 Jul 2003)
+
+  25 Jul 2003; Nick Hadaway <raker@gentoo.org> lftp-2.6.6.ebuild:
+  Version bump.  Upstream bug fixes.
+
+  14 Jul 2003; Jason Wever <weeve@gentoo.org> lftp-2.6.5.ebuild:
+  Changed -sparc keyword to sparc to fix bug #24477
+
+  28 Jun 2003; Tavis Ormandy <taviso@gentoo.org> lftp-2.6.5.ebuild:
+  2.6.5 stable on alpha.
+
+  06 May 2003; Tavis Ormandy <taviso@gentoo.org> lftp-2.6.5.ebuild:
+  Adding extra check while linking if on Alpha, should fix compilation 
+  on Alpha (adds perl and sed dependency).
+
+*lftp-2.6.5 (26 Mar 2003)
+
+  03 Aug 2003; Guy Martin <gmsoft@gentoo.org> lftp-2.6.5.ebuild :
+  Marked stable on hppa. 
+
+  11 Apr 2003; Graham Forest <vladimir@gentoo.org> lftp-2.5.4-r1.ebuild,
+  lftp-2.6.2.ebuild, lftp-2.6.3.ebuild, lftp-2.6.4.ebuild, lftp-2.6.5.ebuild:
+  -ppc'd until >=sys-devel/binutils-2.13.90.0.20 is ok on ppc
+
+  26 Mar 2003; Graham Forest <vladimir@gentoo.org> lftp-2.6.5.ebuild:
+  Version bump
+
+  06 March 2003; Jon Portnoy <avenj@gentoo.org> lftp-2.6.4.ebuild :
+  Fixed SRC_URI.
+
+*lftp-2.6.4 (13 Feb 2003)
+
+  13 Mar 2003; Guy Martin <gmsoft@gentoo.org> lftp-2.6.4.ebuild :
+  Added hppa to keywords.
+
+  13 Feb 2003; Nick Hadaway <raker@gentoo.org> lftp-2.6.4.ebuild,
+  files/digest-lftp-2.6.4 :
+  Version bump.  Added to portage as stable for x86.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*lftp-2.6.3 (02 Dec 2002)
+
+  08 Dec 2002; Nick Hadaway <raker@gentoo.org> lftp-2.6.3.ebuild :
+  Changed to econf.  Removed unneeded compile flags setting.
+  
+  02 Dec 2002; Spider <spider@gentoo.org> lftp-2.6.3.ebuild :
+  in my quest to get my suddenly broken ftp-ssl to work I'm updating this 
+  ebuild to the latest version avaiable. KEWORDS set to ~ where not -
+
+*lftp-2.6.2 (11 Sep 2002)
+
+  17 Sep 2002; Nick Hadaway <raker@gentoo.org> lftp-2.6.2.ebuild :
+  Updated socks5 related configure options.  Thanks to Tom Prado on bug
+  #8013.
+
+  11 Sep 2002; Nick Hadaway <raker@gentoo.org> lftp-2.6.2.ebuild,
+  files/digest-lftp-2.6.2 :
+  Version bump.  readline history is now stored in a file. 
+  handle full-disk condition as fatal if the file is removed. 
+  recursive deletion (rm -r) fixed. It used DELE instead of RMD. 
+  fixed a rare core dump, usually happening on completion. 
+  fixed compilation with modules. nls use variable appears to work
+  with this version as well.  Undoing temporary forcing of nls.
+  Patched configure so adding ssl support doesn't add the dreaded
+  -I/usr/include flag.  gcc3 is much happier now. :)
+
+*lftp-2.6.1 (13 Aug 2002)
+
+  25 Aug 2002; Nick Hadaway <raker@gentoo.org> lftp-2.6.1.ebuild :
+  Added sys-devel/gettext to DEPEND instead of just RDEPEND as
+  it is required to set all LC variables for compile-time.
+
+  15 Aug 2002; Nick Hadaway <raker@gentoo.org> lftp-2.6.1.ebuild :
+  Forcing nls temporarily until I can figure out how to fix compile
+  problems while it is disabled.
+
+  15 Aug 2002; Nick Hadaway <raker@gentoo.org> lftp-2.6.1.ebuild :
+  Added socks5 support and updated nls configure options.
+
+  14 Aug 2002; Nick Hadaway <raker@gentoo.org> lftp-2.6.1.ebuild :
+  Changed emake to make.
+
+  13 Aug 2002; Nick Hadaway <raker@gentoo.org>
+  lftp-2.6.1.ebuild, files/digest-lftp-2.6.1 :
+  Version bump.
+
+*lftp-2.6.0 (10 Aug 2002)
+
+  13 Aug 2002; Nick Hadaway <raker@gentoo.org> lftp-2.6.0.ebuild :
+  Fixed a small typo.
+
+  10 Aug 2002; Nick Hadaway <raker@gentoo.org>
+  lftp-2.6.0.ebuild, files/digest-lftp-2.6.0 :
+  Version bump.
+
+*lftp-2.5.4-r1 (05 Jul 2002)
+
+  23 Mar 2003; Jason Wever <weeve@gentoo.org> lftp-2.5.4-r1.ebuild:
+  Marked all lftp ebuilds as -sparc as compilation fails. Needs to be futher
+  investigated.
+
+  04 Aug 2002; Calum Selkirk <cselkirk@gentoo.org> lftp-2.5.4-r1.ebuild : 
+
+  Added ppc to KEYWORDS.
+
+  05 Jul 2002; Gabriele Giorgetti <stroke@gentoo.org> lftp-2.5.4-r1.ebuild :
+
+  Removed metalab mirror from SRC_URI. Fixes bug #4555  
+  Removed stale ebuilds.
+
+*lftp-2.5.4 (05 Jul 2002)
+
+  05 Jul 2002; Gabriele Giorgetti <stroke@gentoo.org> lftp-2.5.4.ebuild :
+
+  new version.
+
 
 *lftp-2.4.9 (1 Feb 2002)
 
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index 2f1582ab1a3a..9712785669d9 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -1,12 +1,20 @@
-MD5 3470de2101a750245e5f5a6fcf80f1ef ChangeLog 4083
-MD5 ef5a1bde05cd2a74983aa8c7e9cbed7a lftp-2.5.4-r1.ebuild 1237
-MD5 c1d515d7e93351a1081f865c13127b5a lftp-2.6.2.ebuild 1607
-MD5 bfdf1a776e72914ba414594dd6df7bed lftp-2.6.3.ebuild 1430
-MD5 f727572af305b17b0063c5c69add2d48 lftp-2.6.4.ebuild 1410
-MD5 7e1b745821b46df844427d791542fe22 lftp-2.6.5.ebuild 1380
-MD5 096d8792a2b0989e03d9a39f8f5a2495 files/configure-lftp-2.6.2.diff 717
-MD5 b39ba922d0d3b3f4a352d25f38d88364 files/digest-lftp-2.5.4-r1 64
-MD5 f2a4efd6f8acc770b7e2603e9340d0e9 files/digest-lftp-2.6.2 64
-MD5 8b81a0f62c811ee076868ffe990c51dd files/digest-lftp-2.6.3 64
-MD5 5a0098bbc377a0d744684127772987a4 files/digest-lftp-2.6.4 64
-MD5 7c99535ecd134bbecb83e29188da7edc files/digest-lftp-2.6.5 64
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ef1d50acba03f1729433dd97abab9528 ChangeLog 13233
+MD5 8e29dd236e9977e83aee442106844d7e files/digest-lftp-3.0.13 65
+MD5 0401db3592b8f8ee8b750f12b84cfde3 files/digest-lftp-3.3.0 63
+MD5 500f6bc400867598be6e6ef4ee5274a5 files/digest-lftp-3.3.3 63
+MD5 16ab74adb63da682a17a18f1d7885b91 files/digest-lftp-3.3.4 63
+MD5 929ba0e30bdea8ef09f54152b9aa0c8f lftp-3.0.13.ebuild 1804
+MD5 2e06b00d03a53136c81d8d8e18c6c13f lftp-3.3.0.ebuild 1777
+MD5 c77bd1b11f4e4a6a066d37118b14196f lftp-3.3.3.ebuild 1777
+MD5 ce888787f27f2cc48623293b4616c99c lftp-3.3.4.ebuild 1777
+MD5 bd30469259dd912781df916084edcacd metadata.xml 430
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDf7fJmdTrptrqvGERAgdGAJ9alDOkoMaYYIJX9KJiqFvzLn/OlACcDYkm
+pOm9/qPb5GqB1aoVLrcKhPo=
+=k5Sh
+-----END PGP SIGNATURE-----
diff --git a/net-ftp/lftp/lftp-3.0.13.ebuild b/net-ftp/lftp/lftp-3.0.13.ebuild
index ee851aec4ce7..fc35db9579ab 100644
--- a/net-ftp/lftp/lftp-3.0.13.ebuild
+++ b/net-ftp/lftp/lftp-3.0.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/net-ftp/lftp/lftp-3.0.13.ebuild,v 1.1 2004/12/22 10:55:58 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.0.13.ebuild,v 1.1.1.1 2005/11/30 09:36:22 chriswhite Exp $
 
 inherit eutils
 
@@ -13,18 +13,20 @@ SRC_URI="http://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~s390 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="ssl socks5 nls"
 
 DEPEND=">=sys-libs/ncurses-5.1
 	ssl? ( >=dev-libs/openssl-0.9.6 )
-	socks5? ( >=net-misc/dante-1.1.12 )
+	!ppc-macos? (
+		socks5? ( >=net-proxy/dante-1.1.12
+			sys-libs/pam )
+	)
 	nls? ( sys-devel/gettext )
 	alpha? ( dev-lang/perl )
 	alpha? ( >=sys-apps/sed-4 )
 	virtual/libc
 	sys-libs/readline
-	socks5? ( sys-libs/pam )
 	sys-apps/gawk
 	sys-devel/bison
 	sys-devel/libtool"
@@ -34,8 +36,7 @@ RDEPEND="nls? ( sys-devel/gettext )
 	ssl? ( >=dev-libs/openssl-0.9.6 )
 	virtual/libc
 	sys-libs/readline
-	socks5? ( sys-libs/pam )
-	socks5? ( >=net-misc/dante-1.1.12 )"
+	!ppc-macos? ( socks5? ( sys-libs/pam >=net-proxy/dante-1.1.12 ) )"
 
 src_compile() {
 	local myconf="`use_enable nls`"
diff --git a/net-ftp/lftp/lftp-3.3.0.ebuild b/net-ftp/lftp/lftp-3.3.0.ebuild
index 704eebd3bd36..6e86b3cee049 100644
--- a/net-ftp/lftp/lftp-3.3.0.ebuild
+++ b/net-ftp/lftp/lftp-3.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-ftp/lftp/lftp-3.3.0.ebuild,v 1.1 2005/09/26 11:01:46 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.3.0.ebuild,v 1.1.1.1 2005/11/30 09:36:22 chriswhite Exp $
 
 DESCRIPTION="A sophisticated ftp/http client, file transfer program"
 HOMEPAGE="http://ftp.yars.free.net/projects/lftp/"
diff --git a/net-ftp/lftp/lftp-3.3.3.ebuild b/net-ftp/lftp/lftp-3.3.3.ebuild
index e196e09acef4..fea7b93fe3e1 100644
--- a/net-ftp/lftp/lftp-3.3.3.ebuild
+++ b/net-ftp/lftp/lftp-3.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-ftp/lftp/lftp-3.3.3.ebuild,v 1.1 2005/11/13 12:35:48 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.3.3.ebuild,v 1.1.1.1 2005/11/30 09:36:21 chriswhite Exp $
 
 DESCRIPTION="A sophisticated ftp/http client, file transfer program"
 HOMEPAGE="http://ftp.yars.free.net/projects/lftp/"
diff --git a/net-ftp/lftp/lftp-3.3.4.ebuild b/net-ftp/lftp/lftp-3.3.4.ebuild
index e86ef61c4553..10a24d922498 100644
--- a/net-ftp/lftp/lftp-3.3.4.ebuild
+++ b/net-ftp/lftp/lftp-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/net-ftp/lftp/lftp-3.3.4.ebuild,v 1.1 2005/11/19 23:39:40 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.3.4.ebuild,v 1.1.1.1 2005/11/30 09:36:22 chriswhite Exp $
 
 DESCRIPTION="A sophisticated ftp/http client, file transfer program"
 HOMEPAGE="http://ftp.yars.free.net/projects/lftp/"
diff --git a/net-ftp/lftp/metadata.xml b/net-ftp/lftp/metadata.xml
index 20ce219711a2..86301ee540ce 100644
--- a/net-ftp/lftp/metadata.xml
+++ b/net-ftp/lftp/metadata.xml
@@ -2,4 +2,11 @@
 <!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>I seem to have inherited this one through consistant maintaince. I you want 
+to version bump it go ahead.</description>
+</maintainer>
+<longdescription></longdescription>
 </pkgmetadata>
diff --git a/net-ftp/linksys-tftp/ChangeLog b/net-ftp/linksys-tftp/ChangeLog
index 996a028b1e78..0202f258c45e 100644
--- a/net-ftp/linksys-tftp/ChangeLog
+++ b/net-ftp/linksys-tftp/ChangeLog
@@ -1,6 +1,6 @@
-# ChangeLog for net-misc/linksys-tftp
+# ChangeLog for net-ftp/linksys-tftp
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/linksys-tftp/ChangeLog,v 1.1 2005/04/23 04:44:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/linksys-tftp/ChangeLog,v 1.1.1.1 2005/11/30 09:36:24 chriswhite Exp $
 
   05 Nov 2004; Travis Tilley <lv@gentoo.org> linksys-tftp-1.2.1.ebuild:
   added ~amd64 keyword
diff --git a/net-ftp/linksys-tftp/Manifest b/net-ftp/linksys-tftp/Manifest
index 28e290c5c767..ef76018496c3 100644
--- a/net-ftp/linksys-tftp/Manifest
+++ b/net-ftp/linksys-tftp/Manifest
@@ -1,4 +1,14 @@
-MD5 9da0e22b0f17ae9fad57aac2692997e2 ChangeLog 823
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 efdb940eb0630520176af1f43f377b35 linksys-tftp-1.2.1.ebuild 641
+MD5 e4bbce2bb3ee6a7a58b2381dbee1ba29 ChangeLog 827
 MD5 875b4dd2e90e3ff68dd540ef7bf05eca metadata.xml 307
-MD5 7b078c91ad5d049f03d573dba41fcf50 linksys-tftp-1.2.1.ebuild 636
 MD5 2490b93e9a9ee969dff7103ffb8960bf files/digest-linksys-tftp-1.2.1 70
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCakf1I1lqEGTUzyQRAiXhAJ9anw0qmQUvFbNelD9EkVqhhAGyFwCfeQqD
+mwmV54YfHvTeXQx07zkVC4w=
+=pYyp
+-----END PGP SIGNATURE-----
diff --git a/net-ftp/linksys-tftp/linksys-tftp-1.2.1.ebuild b/net-ftp/linksys-tftp/linksys-tftp-1.2.1.ebuild
index ab1ecaeeb506..669f5b11efb5 100644
--- a/net-ftp/linksys-tftp/linksys-tftp-1.2.1.ebuild
+++ b/net-ftp/linksys-tftp/linksys-tftp-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/net-ftp/linksys-tftp/linksys-tftp-1.2.1.ebuild,v 1.1 2005/04/23 04:44:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/linksys-tftp/linksys-tftp-1.2.1.ebuild,v 1.1.1.1 2005/11/30 09:36:24 chriswhite Exp $
 
 IUSE=""
 DESCRIPTION="TFTP client suitable for uploading to the Linksys WRT54G Wireless Router"
diff --git a/net-ftp/metadata.xml b/net-ftp/metadata.xml
index 59f964743662..c9d7a656ef67 100644
--- a/net-ftp/metadata.xml
+++ b/net-ftp/metadata.xml
@@ -4,5 +4,32 @@
 	<longdescription lang="en">
 		The net-ftp contains FTP (File Transfer Protocol) software.
 	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie net-ftp enthült Software für das File Transfer Protocol (FTP).
+	</longdescription>
+	<longdescription lang="es">
+		La categoría net-ftp contiene programas relacionados con FTP, el
+		protocolo de transferencia de ficheros.
+	</longdescription>
+	<longdescription lang="ja">
+		net-ftpカテゴリーにはファイル・トランスファー・プロトコルの
+		ソフトウェアが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De net-ftp categorie bevat software voor gebruik van FTP (File Transfer Protocol).
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria net-ftp contem programas relacionados com FTP (File Transfer
+		Protocol).
+	</longdescription>
+	<longdescription lang="sk">
+		Kategória net-ftp obsahuje aplikácie vzťahujúce sa k FTP (File Transfer Protocol).
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm net-ftp chứa các phần mềm FTP (File Transfer Protocol).
+	</longdescription>
+	<longdescription lang="it">
+		La categoria net-ftp contiene programmi per l'FTP (File Transfer Protocol).
+	</longdescription>
 </catmetadata>
 
diff --git a/net-ftp/ncftp/ChangeLog b/net-ftp/ncftp/ChangeLog
index ed783baf9f67..bd9f19b5c65e 100644
--- a/net-ftp/ncftp/ChangeLog
+++ b/net-ftp/ncftp/ChangeLog
@@ -1,6 +1,152 @@
 # ChangeLog for net-ftp/ncftp
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/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-ftp/ncftp/ChangeLog,v 1.1.1.1 2005/11/30 09:36:20 chriswhite Exp $
+
+  11 Sep 2005; Fabian Groffen <grobian@gentoo.org>
+  +files/ncftp-3.1.8-macos.patch, ncftp-3.1.8-r1.ebuild:
+  Adding a patch which fixes a typo and allows for compilation on OSX Tiger
+  (10.4).  This fixes bug #91689.
+
+  11 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> ncftp-3.1.8-r1.ebuild:
+  Stable on mips.
+
+*ncftp-3.1.9 (17 Jul 2005)
+
+  17 Jul 2005; Mike Frysinger <vapier@gentoo.org> +ncftp-3.1.9.ebuild:
+  Version bump.
+
+*ncftp-3.1.8-r2 (17 Jul 2005)
+
+  17 Jul 2005; Mike Frysinger <vapier@gentoo.org> -ncftp-3.1.8.ebuild,
+  +ncftp-3.1.8-r2.ebuild:
+  Update the ipv6 patch #51756.
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org> ncftp-3.1.8-r1.ebuild:
+  Stable on ppc64
+
+  07 Apr 2005; Simon Stelling <blubb@gentoo.org> ncftp-3.1.8-r1.ebuild:
+  stable on amd64
+
+  28 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> ncftp-3.1.8-r1.ebuild:
+  Stable on ppc.
+
+  17 Mar 2005; Lina Pezzella <j4rg0n@gentoo.org> ncftp-3.1.8-r1.ebuild:
+  Stable ppc-macos
+
+  14 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> ncftp-3.1.8-r1.ebuild:
+  Stable on sparc
+
+  12 Mar 2005; Aron Griffis <agriffis@gentoo.org> ncftp-3.1.8-r1.ebuild:
+  Stable on alpha, ia64, x86
+
+*ncftp-3.1.8-r1 (07 Jan 2005)
+
+  07 Jan 2005; Mike Frysinger <vapier@gentoo.org> +ncftp-3.1.8-r1.ebuild:
+  Add third party patch to make editing remote files easy #77026 by Alessandro
+  Lepore.
+
+*ncftp-3.1.8 (24 Aug 2004)
+
+  24 Aug 2004; Mike Frysinger <vapier@gentoo.org> -ncftp-3.1.5-r1.ebuild,
+  +ncftp-3.1.8.ebuild:
+  Version bump #61507 by Anthony Giorgio.
+
+  11 Aug 2004; Hasan Khalil <gongloo@gentoo.org> ncftp-3.1.7.ebuild:
+  Stable on macos.
+
+  15 Jul 2004; Tom Gall <tgall@gentoo.org> ncftp-3.1.7.ebuild:
+  stable on ppc64, bug #55564
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> ncftp-3.1.5-r1.ebuild:
+  Add inherit eutils
+
+  25 Apr 2004; Michael McCabe <randy@gentoo.org> ncftp-3.1.7.ebuild:
+  added s390 keywords
+
+  13 Apr 2004; Chris Gianelloni <wolf31o2@gentoo.org> ncftp-3.1.7.ebuild:
+  Added inherit eutils.
+
+  26 Feb 2004; Aron Griffis <agriffis@gentoo.org> ncftp-3.1.7.ebuild:
+  stable on alpha and ia64
+
+  12 Jan 2004; <augustus@gentoo.org> ncftp-3.1.7.ebuild:
+  Added ~amd64 keyword.  Bug 37571.  Works for me and others.
+
+*ncftp-3.1.7 (07 Jan 2004)
+
+  11 Jan 2004; Guy Martin <gmsoft@gentoo.org> ncftp-3.1.7.ebuild :
+ Marked stable on hppa.
+
+  07 Jan 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bumpage.
+
+*ncftp-3.1.6 (16 Oct 2003)
+
+  07 Jan 2004; Mike Frysinger <vapier@gentoo.org> :
+  The ipv6 patch has been updated, add back in.  Also move to stable because
+  of security issue (sorry other arches).
+
+  17 Oct 2003; Nick Hadaway <raker@gentoo.org> ncftp-3.1.6.ebuild:
+  The ipv6 patch has not been updated yet.  Removing for now.
+
+  16 Oct 2003; Masatomo Nakano <nakano@gentoo.org> ncftp-3.1.6.ebuild:
+  Removed CJK patch because the patch is already included in 
+  the original tar ball.
+ 
+  16 Oct 2003; Nick Hadaway <raker@gentoo.org> ncftp-3.1.6.ebuild:
+  Version bump.  This updates the previous exploit fix for better
+  compatibility with serv-u and wsftpd servers.  Other bug fixes as
+  well.
+
+*ncftp-3.1.5-r1 (17 Jun 2003)
+
+  17 Jun 2003; Guy Martin <gmsoft@gentoo.org> ncftp-3.1.5-r1.ebuild :
+  Added ipv6 support to this version. Thanks to Tero Pelander
+  <tpeland@tkukoulu.fi>. Fix 21334.
+
+  01 Jun 2003; Martin Holzer <mholzer@gentoo.org> ncftp-3.1.5.ebuild:
+  Fixing doc issue. Closes #22051.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*ncftp-3.1.5 (20 Oct 2002)
+
+  14 Feb 2003; Guy Martin <gmsoft@gentoo.org> ncftp-3.1.5.ebuild :
+  Added hppa to keywords.
+
+  04 May 2003; Jungmin Seo <seo@gentoo.org> ncftp-3.1.5.ebuild,
+  files/ncftp-3.1.5-cjk.patch:
+  added a cjk patch, in order to write 2-byte characters.
+  This patch is temporary.
+
+  09 Mar 2003; Aron Griffis <agriffis@gentoo.org> ncftp-3.1.5.ebuild:
+  Mark stable on alpha
+
+  06 Mar 2003; Jason Wever <weeve@gentoo.org> ncftp-3.1.5.ebuild:
+  Changed ~sparc keyword to sparc.
+
+  15 Dec 2002; Bjoern Brauel <bjb@gentoo.org> ncftp-3.1.5.ebuild :
+  Add ~alpha to KEYWORDS
+
+  20 Oct 2002; Seemant Kulleen <seemant@gentoo.org> ncftp-3.1.5.ebuild
+  files/digest-ncftp-3.1.5 :
+
+  Version bump, thanks to: rigo@home.nl (Rigo Ketelings) in bug #9341.
+
+*ncftp-3.1.4 (07 Jul 2002)
+
+  15 Dec 2002; Bjoern Brauel <bjb@gentoo.org> ncftp-3.1.4.ebuild :
+  Add alpha to KEYWORDS
+
+  07 Jul 2002; Gabriele Giorgetti <stroke@gentoo.org> ncftp-3.1.4.ebuild :
+  
+  new version
+
+*ncftp-3.1.3 (19 Jun 2002)
+
+  19 Jun 2002; Thilo Bangert <bangert@gentoo.org> ncftp-3.1.3.ebuild :
+  
+  version bump - added LICENSE
 
 *ncftp-3.0.4 (1 Feb 2002)
 
diff --git a/net-ftp/ncftp/Manifest b/net-ftp/ncftp/Manifest
index e69de29bb2d1..043b2255c130 100644
--- a/net-ftp/ncftp/Manifest
+++ b/net-ftp/ncftp/Manifest
@@ -0,0 +1,9 @@
+MD5 9a2092216ddb5b43181d2289cb5b176a ncftp-3.1.8-r2.ebuild 959
+MD5 181b99f496aa0b96ab08ed4a6ddb76d0 ChangeLog 5256
+MD5 2f4035e2a68bf680d7e936f9f4676b0c metadata.xml 715
+MD5 a62deae6d1d449896170afc338726591 ncftp-3.1.8-r1.ebuild 986
+MD5 e8c178be4f47f4e67f1d3b37bfe41c4f ncftp-3.1.9.ebuild 967
+MD5 3da92593217392b2d7744f7ff55a52a1 files/ncftp-3.1.8-macos.patch 574
+MD5 3dd28625eb7fc17b027c7e64b3d9098d files/digest-ncftp-3.1.9 136
+MD5 227dd25b59511575f40096932da897f1 files/digest-ncftp-3.1.8-r1 210
+MD5 8b830a0b00ba44486f82bcd625c4ffa5 files/digest-ncftp-3.1.8-r2 210
diff --git a/net-ftp/ncftp/files/digest-ncftp-3.1.9 b/net-ftp/ncftp/files/digest-ncftp-3.1.9
index 9abf5bac08f3..ad7398891d21 100644
--- a/net-ftp/ncftp/files/digest-ncftp-3.1.9
+++ b/net-ftp/ncftp/files/digest-ncftp-3.1.9
@@ -1,3 +1,2 @@
 MD5 66cf8dacec848eb11a70632fe9f21807 ncftp-3.1.9-src.tar.bz2 409722
 MD5 4aa685aa30528a100aa1e38d497ce0de ncftp-3.1.9_editcmd.patch 9594
-MD5 ade187726693f5c6c6415e41832f514d ncftp-3181-v6-20040826.diff.gz 35950
diff --git a/net-ftp/ncftp/ncftp-3.1.8-r1.ebuild b/net-ftp/ncftp/ncftp-3.1.8-r1.ebuild
index 9ac145527403..7e68cb662f2b 100644
--- a/net-ftp/ncftp/ncftp-3.1.8-r1.ebuild
+++ b/net-ftp/ncftp/ncftp-3.1.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-ftp/ncftp/ncftp-3.1.8-r1.ebuild,v 1.1 2005/01/08 02:27:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ncftp-3.1.8-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:20 chriswhite Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.ncftp.com/ncftp/${P}-src.tar.bz2
 
 LICENSE="Clarified-Artistic"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~s390 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc-macos ppc64 s390 sparc x86"
 IUSE="ipv6"
 
 DEPEND=">=sys-libs/ncurses-5.2"
@@ -23,6 +23,7 @@ src_unpack() {
 	cd ${S}
 	use ipv6 && epatch ${DISTDIR}/${IPV6_P}.diff.gz
 	epatch ${DISTDIR}/ncftp-${PV}_editcmd.patch
+	epatch ${FILESDIR}/${P}-macos.patch
 }
 
 src_install() {
diff --git a/net-ftp/ncftp/ncftp-3.1.8-r2.ebuild b/net-ftp/ncftp/ncftp-3.1.8-r2.ebuild
index ce275ad57491..0c7abbbde137 100644
--- a/net-ftp/ncftp/ncftp-3.1.8-r2.ebuild
+++ b/net-ftp/ncftp/ncftp-3.1.8-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-ftp/ncftp/ncftp-3.1.8-r2.ebuild,v 1.1 2005/07/17 10:59:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ncftp-3.1.8-r2.ebuild,v 1.1.1.1 2005/11/30 09:36:20 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-ftp/ncftp/ncftp-3.1.9.ebuild b/net-ftp/ncftp/ncftp-3.1.9.ebuild
index 019b821cc894..f8088fbb39a0 100644
--- a/net-ftp/ncftp/ncftp-3.1.9.ebuild
+++ b/net-ftp/ncftp/ncftp-3.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/net-ftp/ncftp/ncftp-3.1.9.ebuild,v 1.1 2005/07/17 11:03:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ncftp-3.1.9.ebuild,v 1.1.1.1 2005/11/30 09:36:20 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-ftp/netkit-tftp/ChangeLog b/net-ftp/netkit-tftp/ChangeLog
index 7a566a9246dc..fd1d5a6d503d 100644
--- a/net-ftp/netkit-tftp/ChangeLog
+++ b/net-ftp/netkit-tftp/ChangeLog
@@ -1,6 +1,6 @@
-# ChangeLog for net-misc/netkit-tftp
+# ChangeLog for net-ftp/netkit-tftp
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/netkit-tftp/ChangeLog,v 1.1 2005/04/23 04:44:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/netkit-tftp/ChangeLog,v 1.1.1.1 2005/11/30 09:36:18 chriswhite Exp $
 
   21 Sep 2004; Tom Gall <tgall@gentoo.org> netkit-tftp-0.17-r2.ebuild:
   stable on ppc64
diff --git a/net-ftp/netkit-tftp/Manifest b/net-ftp/netkit-tftp/Manifest
index 0afa6992fb2f..14c6d183c9d6 100644
--- a/net-ftp/netkit-tftp/Manifest
+++ b/net-ftp/netkit-tftp/Manifest
@@ -1,3 +1,13 @@
-MD5 b921618a6015f58a52508ef72e8b34b6 ChangeLog 1489
-MD5 938c2e7ebe811840a1c58100ad793a98 netkit-tftp-0.17-r2.ebuild 727
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 dcdee01698eb20e9cebe0bfa887217df netkit-tftp-0.17-r2.ebuild 727
+MD5 d7157beea10d5dbcfe26d7e67a6c3af3 ChangeLog 1489
 MD5 eca25f90f0875639d8b73f7f3cb4fc57 files/digest-netkit-tftp-0.17-r2 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCakfwI1lqEGTUzyQRAsGGAKCVnXd+qbTujOaS022TXBUKGjYftACgisDY
+74gCrVZKffyQH28xb6+XU1Y=
+=x9EI
+-----END PGP SIGNATURE-----
diff --git a/net-ftp/netkit-tftp/netkit-tftp-0.17-r2.ebuild b/net-ftp/netkit-tftp/netkit-tftp-0.17-r2.ebuild
index 507518516524..4b4036c3f595 100644
--- a/net-ftp/netkit-tftp/netkit-tftp-0.17-r2.ebuild
+++ b/net-ftp/netkit-tftp/netkit-tftp-0.17-r2.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-ftp/netkit-tftp/netkit-tftp-0.17-r2.ebuild,v 1.1 2005/04/23 04:44:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/netkit-tftp/netkit-tftp-0.17-r2.ebuild,v 1.1.1.1 2005/11/30 09:36:18 chriswhite Exp $
 
 DESCRIPTION="the tftp server included in netkit"
 SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-tftp-0.17.tar.gz"
diff --git a/net-ftp/nvemftp/ChangeLog b/net-ftp/nvemftp/ChangeLog
index b16e296d3081..0bb6c6d82994 100644
--- a/net-ftp/nvemftp/ChangeLog
+++ b/net-ftp/nvemftp/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-ftp/nvemftp
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/nvemftp/ChangeLog,v 1.1 2004/03/20 14:41:04 centic Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/nvemftp/ChangeLog,v 1.1.1.1 2005/11/30 09:36:23 chriswhite Exp $
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  18 Nov 2004; Simone Gotti <motaboy@gentoo.org> nvemftp-0.1.3.ebuild:
+  Moved "inherit kde" at the ebuild start and removed unneed qt depend as
+  already provided by "need-qt 3". Fixes bug #71473.
+
+  02 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> nvemftp-0.1.3.ebuild:
+  Fix src_uri + samdbox violation, bug 50260.
 
 *nvemftp-0.1.3 (19 Mar 2004)
 
diff --git a/net-ftp/nvemftp/Manifest b/net-ftp/nvemftp/Manifest
index 9befa68bd04e..3669fb19e474 100644
--- a/net-ftp/nvemftp/Manifest
+++ b/net-ftp/nvemftp/Manifest
@@ -1,2 +1,4 @@
-MD5 1078abf015ce95daaea159f70a7dae7c nvemftp-0.1.3.ebuild 541
+MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
+MD5 52169cd76fd6ecfbadb76593cbb50df0 nvemftp-0.1.3.ebuild 603
+MD5 c1777c5051dbac707cb58e47b41e012a ChangeLog 807
 MD5 9f2773f5e4dfcff1cd940ca4b464534e files/digest-nvemftp-0.1.3 65
diff --git a/net-ftp/nvemftp/metadata.xml b/net-ftp/nvemftp/metadata.xml
index ec42e9fd586b..3399d0876645 100644
--- a/net-ftp/nvemftp/metadata.xml
+++ b/net-ftp/nvemftp/metadata.xml
@@ -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-ftp/nvemftp/nvemftp-0.1.3.ebuild b/net-ftp/nvemftp/nvemftp-0.1.3.ebuild
index 5e93fc5f65c8..acedd03174f9 100644
--- a/net-ftp/nvemftp/nvemftp-0.1.3.ebuild
+++ b/net-ftp/nvemftp/nvemftp-0.1.3.ebuild
@@ -1,18 +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-ftp/nvemftp/nvemftp-0.1.3.ebuild,v 1.1 2004/03/20 14:41:04 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/nvemftp/nvemftp-0.1.3.ebuild,v 1.1.1.1 2005/11/30 09:36:23 chriswhite Exp $
+
+inherit kde
 
 DESCRIPTION="An EASY GUI FTP Client (QT based)"
 HOMEPAGE="http://nvemftp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ftpcube/nvemftp/${P}.tar.gz"
-
-DEPEND="=x11-libs/qt-3*"
+SRC_URI="mirror://sourceforge/nvemftp/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~sparc"
 IUSE=""
 
+need-qt 3
+
 src_compile() {
 	emake || die
 }
diff --git a/net-ftp/oftpd/ChangeLog b/net-ftp/oftpd/ChangeLog
index acd440bd6bbf..287b67cc3024 100644
--- a/net-ftp/oftpd/ChangeLog
+++ b/net-ftp/oftpd/ChangeLog
@@ -1,6 +1,55 @@
 # ChangeLog for net-ftp/oftpd
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/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-ftp/oftpd/ChangeLog,v 1.1.1.1 2005/11/30 09:36:29 chriswhite Exp $
+
+*oftpd-0.3.7-r2 (02 Jul 2005)
+
+  02 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/conf.d.oftpd-r1, files/init.d.oftpd, +files/init.d.oftpd-r1,
+  +oftpd-0.3.7-r2.ebuild:
+  Added support to change tcp port to the init script.  Closes bug #97183.
+
+  15 May 2005; Konstantin Arkhipov <voxus@gentoo.org> oftpd-0.3.7-r1.ebuild:
+  Added ~amd64 keyword wrt bug #92567. Header fixed.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  oftpd-0.3.7-r1.ebuild:
+  virtual/glibc -> virtual/libc
+
+  28 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  oftpd-0.3.7-r1.ebuild:
+  Added IUSE.
+
+*oftpd-0.3.7-r1 (31 Mar 2004)
+
+  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  oftpd-0.3.6-r7.ebuild, oftpd-0.3.7-r1.ebuild, oftpd-0.3.7.ebuild:
+  Someone mucked up the configure line when they were marking this stable (bug
+  #46348), so I am revbumping it.
+
+  27 Mar 2004; Luca Barbato <lu_zero@gentoo.org> oftpd-0.3.7.ebuild:
+  Marked ppc for securty issue with the previous version see  #45738
+
+  25 Mar 2004; Jason Wever <weeve@gentoo.org> oftpd-0.3.7.ebuild:
+  Marked stable on sparc wrt bug #45738.
+
+  25 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> metadata.xml,
+  oftpd-0.3.6-r7.ebuild, oftpd-0.3.7.ebuild, files/conf.d.oftpd,
+  files/init.d.oftpd, files/oftpd.rc6:
+  Fixed up init/conf scripts.  bumping security fix to stable x86.
+
+*oftpd-0.3.7 (25 Mar 2004)
+
+  25 Mar 2004; <solar@gentoo.org> oftpd-0.3.6-r7.ebuild, oftpd-0.3.7.ebuild:
+  Version bump. oftpd DoS vulnerability. bug #45738
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*oftpd-0.3.6-r7 (3 May 2002)
+  
+  3 May 2002; Donny Davies <woodchip@gentoo.org> :
+  
+  Added LICENSE, SLOT.
 
 *oftpd-0.3.6-r6 (1 Feb 2002)
 
diff --git a/net-ftp/oftpd/Manifest b/net-ftp/oftpd/Manifest
index e69de29bb2d1..9dd7eb3fb5ba 100644
--- a/net-ftp/oftpd/Manifest
+++ b/net-ftp/oftpd/Manifest
@@ -0,0 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9b3d5cec9ba56085c010b1c149b00b0c ChangeLog 2378
+MD5 0f7a846dd3f2197538502db078109b71 metadata.xml 351
+MD5 741cbc4b00b06c6579b17b8acffca400 oftpd-0.3.7-r1.ebuild 832
+MD5 dd52078d730ad43aef6777c07969fc57 oftpd-0.3.7-r2.ebuild 839
+MD5 b0ba4d96ae0eb98abce711409607eda4 files/conf.d.oftpd 469
+MD5 14eb385d2dee30be94c941c01703ab40 files/digest-oftpd-0.3.7-r1 62
+MD5 42f3108677c4a53b623f3646d6db5fe2 files/init.d.oftpd 676
+MD5 dd7b994af55686281ddf1f73b8cba663 files/conf.d.oftpd-r1 578
+MD5 72d1cf62ed5467e49076dcdb4e932d9d files/init.d.oftpd-r1 703
+MD5 14eb385d2dee30be94c941c01703ab40 files/digest-oftpd-0.3.7-r2 62
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCxyAHArHZZzCEUG0RAtFKAJ0YrnkvrBeV2MF6zlbbHNXlDlHgIwCfbaIh
+LeGhOEdI0OCj2rMy2Ic433A=
+=BUGq
+-----END PGP SIGNATURE-----
diff --git a/net-ftp/oftpd/files/init.d.oftpd b/net-ftp/oftpd/files/init.d.oftpd
index 37190cec40b7..f6f7836c1c60 100644
--- a/net-ftp/oftpd/files/init.d.oftpd
+++ b/net-ftp/oftpd/files/init.d.oftpd
@@ -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-ftp/oftpd/files/init.d.oftpd,v 1.1 2004/03/26 03:02:51 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/files/init.d.oftpd,v 1.1.1.1 2005/11/30 09:36:29 chriswhite Exp $
 
 depend() {
 	need net
diff --git a/net-ftp/oftpd/files/init.d.oftpd-r1 b/net-ftp/oftpd/files/init.d.oftpd-r1
index 057b1146cadf..e197aee4e502 100644
--- a/net-ftp/oftpd/files/init.d.oftpd-r1
+++ b/net-ftp/oftpd/files/init.d.oftpd-r1
@@ -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-ftp/oftpd/files/init.d.oftpd-r1,v 1.1 2005/07/02 23:15:07 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/files/init.d.oftpd-r1,v 1.1.1.1 2005/11/30 09:36:29 chriswhite Exp $
 
 depend() {
 	need net
diff --git a/net-ftp/oftpd/oftpd-0.3.7-r1.ebuild b/net-ftp/oftpd/oftpd-0.3.7-r1.ebuild
index f0998ae57c8c..bc68ee383441 100644
--- a/net-ftp/oftpd/oftpd-0.3.7-r1.ebuild
+++ b/net-ftp/oftpd/oftpd-0.3.7-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-ftp/oftpd/oftpd-0.3.7-r1.ebuild,v 1.1 2004/03/31 19:29:05 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/oftpd-0.3.7-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:29 chriswhite Exp $
 
 DESCRIPTION="Secure, small, anonymous only ftpd"
-SRC_URI="http://www.time-travellers.org/oftpd/${P}.tar.gz"
 HOMEPAGE="http://www.time-travellers.org/oftpd"
+SRC_URI="http://www.time-travellers.org/oftpd/${P}.tar.gz"
 
-DEPEND="virtual/glibc"
-
-SLOT="0"
 LICENSE="as-is"
-KEYWORDS="x86 sparc ~ppc ~ppc64"
+SLOT="0"
+KEYWORDS="~amd64 arm ~ppc ~ppc64 sparc x86"
+IUSE=""
+
+DEPEND=""
 
 src_compile() {
 	# local myconf
@@ -21,11 +22,9 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 	dodoc AUTHORS BUGS FAQ NEWS README TODO
 	keepdir /home/ftp
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/init.d.oftpd oftpd
-	insinto /etc/conf.d
-	newins ${FILESDIR}/conf.d.oftpd oftpd
+	newinitd ${FILESDIR}/init.d.oftpd oftpd
+	newconfd ${FILESDIR}/conf.d.oftpd oftpd
 }
diff --git a/net-ftp/oftpd/oftpd-0.3.7-r2.ebuild b/net-ftp/oftpd/oftpd-0.3.7-r2.ebuild
index 17c8834cf83b..4f318fdf6af7 100644
--- a/net-ftp/oftpd/oftpd-0.3.7-r2.ebuild
+++ b/net-ftp/oftpd/oftpd-0.3.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/net-ftp/oftpd/oftpd-0.3.7-r2.ebuild,v 1.1 2005/07/02 23:15:07 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/oftpd-0.3.7-r2.ebuild,v 1.1.1.1 2005/11/30 09:36:29 chriswhite Exp $
 
 DESCRIPTION="Secure, small, anonymous only ftpd"
 HOMEPAGE="http://www.time-travellers.org/oftpd"
diff --git a/net-ftp/pftpfxp/ChangeLog b/net-ftp/pftpfxp/ChangeLog
index 91051dd70b76..7aa026a7fd73 100644
--- a/net-ftp/pftpfxp/ChangeLog
+++ b/net-ftp/pftpfxp/ChangeLog
@@ -1,11 +1,30 @@
 # ChangeLog for net-ftp/pftpfxp
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pftpfxp/ChangeLog,v 1.1 2004/11/26 08:37:54 dragonheart Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pftpfxp/ChangeLog,v 1.1.1.1 2005/11/30 09:36:23 chriswhite Exp $
+
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  08 Aug 2005; Luis Medinas <metalgod@gentoo.org>
+  pftpfxp-0.11.4.6-r1.ebuild:
+  Added ~amd64 keywords. Closes bug #101747 .
+
+  26 Jul 2005; David Holm <dholm@gentoo.org> pftpfxp-0.11.4.6-r1.ebuild:
+  Added to ~ppc.
+
+*pftpfxp-0.11.4.6-r1 (01 Feb 2005)
+
+  01 Feb 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/pftpfxp-v0.11.4mew6-pret.patch, +pftpfxp-0.11.4.6-r1.ebuild:
+  PRET patch as per bug #77756. Thanks to Peter <pstlpete@gmail.com>
+
+  26 Nov 2004; Daniel Black <dragonheart@gentoo.org> pftpfxp-0.11.4.6.ebuild:
+  Replaced $DOCDESTTREE with /usr/share/doc/${PF}
 
 *pftpfxp-0.11.4.6 (26 Nov 2004)
 
   26 Nov 2004; Daniel Black <dragonheart@gentoo.org> +metadata.xml,
   +files/0.11.4.6-gcc3.4.fix, +pftpfxp-0.11.4.6.ebuild:
-  initial import as per bug #62491. Thanks to H�kan Wikstr�m <hakan@wikstrom.st>
+  initial import as per bug #62491. Thanks to Håkan Wikström <hakan@wikstrom.st>
   for the ebuild
 
diff --git a/net-ftp/pftpfxp/Manifest b/net-ftp/pftpfxp/Manifest
index d6dadfbebfa2..7def3af2323c 100644
--- a/net-ftp/pftpfxp/Manifest
+++ b/net-ftp/pftpfxp/Manifest
@@ -1,2 +1,18 @@
-MD5 aa7b837e97ba5ef197a7cdd220b9edea pftpfxp-0.11.4.6.ebuild 795
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 52b127a14e34629b36992f743e5c5897 pftpfxp-0.11.4.6-r1.ebuild 1368
+MD5 f6cd2d33dcdbc01eb11a9ca67baed0be pftpfxp-0.11.4.6.ebuild 1260
+MD5 6d796b061ed1c1337ef157a5f74dab35 metadata.xml 403
+MD5 1f3bb0534df61dd65c79f56d401bca39 ChangeLog 1148
+MD5 e5a814afb2d03338d5f2e0c69fb75f69 files/0.11.4.6-gcc3.4.fix 505
 MD5 5c7f9305285e6c7efdbc232f737d533e files/digest-pftpfxp-0.11.4.6 68
+MD5 5c7f9305285e6c7efdbc232f737d533e files/digest-pftpfxp-0.11.4.6-r1 68
+MD5 fd3271b459d87ed5fce0e0fd47f72cff files/pftpfxp-v0.11.4mew6-pret.patch 3559
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDK1PQLLFUmVNQ7rkRAvtVAJ9bcnJUDSW2n66cZswdRsqQtPTpPwCg1Nzn
+wOjOwOlB1jWZ2pogXVJUoYA=
+=ziPe
+-----END PGP SIGNATURE-----
diff --git a/net-ftp/pftpfxp/pftpfxp-0.11.4.6-r1.ebuild b/net-ftp/pftpfxp/pftpfxp-0.11.4.6-r1.ebuild
index 3f43519bb47c..1a7867c17ba9 100644
--- a/net-ftp/pftpfxp/pftpfxp-0.11.4.6-r1.ebuild
+++ b/net-ftp/pftpfxp/pftpfxp-0.11.4.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-ftp/pftpfxp/pftpfxp-0.11.4.6-r1.ebuild,v 1.1 2005/02/01 07:49:25 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pftpfxp/pftpfxp-0.11.4.6-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:23 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://pftpmew.tanesha.net"
 SRC_URI="http://tanesha.net/bigmess/pftpfxp-v0.11.4mew6.tgz"
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="crypt"
 DEPEND="ssl? ( >=dev-libs/openssl-0.9.6c )"
 S=${WORKDIR}/pftpfxp-mew
diff --git a/net-ftp/pftpfxp/pftpfxp-0.11.4.6.ebuild b/net-ftp/pftpfxp/pftpfxp-0.11.4.6.ebuild
index 702383940994..6f078b3efb6b 100644
--- a/net-ftp/pftpfxp/pftpfxp-0.11.4.6.ebuild
+++ b/net-ftp/pftpfxp/pftpfxp-0.11.4.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-ftp/pftpfxp/pftpfxp-0.11.4.6.ebuild,v 1.1 2004/11/26 08:37:54 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pftpfxp/pftpfxp-0.11.4.6.ebuild,v 1.1.1.1 2005/11/30 09:36:23 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
@@ -34,12 +34,12 @@ src_install() {
 	dobin pftp
 	dodoc .pftp/config .pftp/keymap README.MEW old/*
 	cd ${WORKDIR}
-	mv irssi  mIRC-mew  pftpfxp-autoconnect ${DOCDESTTREE}
+	mv irssi  mIRC-mew  pftpfxp-autoconnect ${D}/usr/share/doc/${PF}
 }
 
 pkg_postinst() {
 	einfo "In order to use pftp-mew you need to create these files:"
 	einfo "    ~/.pftp/config"
 	einfo "    ~/.pftp/keymap"
-	einfo "Refer to the examples in ${DOCDESTTREE} for more information."
+	einfo "Refer to the examples in /usr/share/doc/${PF} for more information."
 }
diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index 26f5d1427822..e4a6c834d7b6 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,10 +1,438 @@
 # ChangeLog for net-ftp/proftpd
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/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-ftp/proftpd/ChangeLog,v 1.1.1.1 2005/11/30 09:36:19 chriswhite Exp $
 
-*proftpd-1.2.4-r6 (1 Feb 2002)
+  31 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  proftpd-1.2.10-r7.ebuild:
+  Stable on sparc wrt #100364
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  31 Jul 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  proftpd-1.2.10-r7.ebuild:
+  stable on alpha wrt bug #100364
+
+  30 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  proftpd-1.2.10-r7.ebuild:
+  Stable on hppa. bug #100364
+
+  29 Jul 2005; Markus Rothe <corsair@gentoo.org> proftpd-1.2.10-r7.ebuild:
+  Stable on ppc64 (bug #100364)
+
+  29 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  proftpd-1.2.10-r7.ebuild:
+  ppc stable, #100364
+
+*proftpd-1.2.10-r7 (29 Jul 2005)
+
+  29 Jul 2005; Roy Marples <uberlord@gentoo.org>
+  +files/proftpd-ftpshut.patch, +files/proftpd-sqlshowinfo.patch,
+  +proftpd-1.2.10-r7.ebuild:
+  Fix ftpshut and SqlShowInfo, bug #100364
+  Stable on amd64 and x86
+
+  09 Jul 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  proftpd-1.2.10-r6.ebuild:
+  Cosmetic.
+
+*proftpd-1.2.10-r6 (08 Jul 2005)
+
+  08 Jul 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  +proftpd-1.2.10-r6.ebuild:
+  New revision that uses the new net-ftp/ftpbase. Nice work there UberLord.
+
+  07 Jul 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  proftpd-1.2.9-r2.ebuild, proftpd-1.2.10.ebuild, proftpd-1.2.10-r1.ebuild,
+  proftpd-1.2.10-r2.ebuild, proftpd-1.2.10-r3.ebuild,
+  proftpd-1.2.10-r5.ebuild:
+  Added addpredict /etc/krb5.conf to solve bug #98281. Thanks Jakub.
+
+*proftpd-1.2.10-r5 (08 Jun 2005)
+
+  08 Jun 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  -proftpd-1.2.10-r4.ebuild, +proftpd-1.2.10-r5.ebuild:
+  Fixed problem with noauthunix flag. Thanks uberloard.
+
+  06 Jun 2005; Markus Rothe <corsair@gentoo.org> proftpd-1.2.10-r3.ebuild:
+  Stable on ppc64; bug #93484
+
+  06 Jun 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  proftpd-1.2.10-r4.ebuild:
+  Changed useflag to noauthunix as authunix is needed in linux (dont know
+  about bsd, but bsd users can use useflag).
+
+  04 Jun 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  proftpd-1.2.10-r4.ebuild:
+  Small QA issues
+
+*proftpd-1.2.10-r4 (04 Jun 2005)
+
+  04 Jun 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  +files/ftp.pamd-include, +proftpd-1.2.10-r4.ebuild:
+  Thanks to flameeyes in #93163 we now build and install in g/bsd.
+
+  07 Mar 2005; Markus Rothe <corsair@gentoo.org> proftpd-1.2.10-r2.ebuild:
+  Stable on ppc64
+
+*proftpd-1.2.10-r3 (02 Mar 2005)
+
+  02 Mar 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  +proftpd-1.2.10-r3.ebuild:
+  As seen on bug #75072 and others mod_delay is causing lots of problems, and
+  seems impossible to backport it to 1.2.10 as it is being developed for the cvs
+  version. Also am fixing small issue with softquota as reported in #80002 by
+  Michael Cramer. Also fixing bug #83312 and #63196 pam related credits Roy
+  Marples <uberlord@gentoo.org>. As a bonus a fix for a small bug in dodoc
+  reported by Thilo Bangert in #65320.
+
+  21 Jan 2005; Markus Rothe <corsair@gentoo.org> proftpd-1.2.10-r2.ebuild:
+  Added ~ppc64 to KEYWORDS; bug #78927
+
+  09 Jan 2005; Sven Wegener <swegener@gentoo.org> proftpd-1.2.10-r1.ebuild,
+  proftpd-1.2.10-r2.ebuild:
+  Added missing parentheses in SRC_URI/*DEPEND/LICENSE.
+
+*proftpd-1.2.10-r2 (06 Dec 2004)
+
+  06 Dec 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  +proftpd-1.2.10-r2.ebuild, -proftpd-1.2.7.ebuild, -proftpd-1.2.8.ebuild:
+  Removed older versions and added a new release that uses the sendfile()
+  function. Use with care.
+
+  30 Nov 2004; Guy Martin <gmsoft@gentoo.org> proftpd-1.2.10-r1.ebuild:
+  Stable on hppa.
+
+  30 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
+  proftpd-1.2.10-r1.ebuild:
+  Stable on alpha, bug 67648.
+
+  29 Nov 2004; Simon Stelling <blubb@gentoo.org> proftpd-1.2.10-r1.ebuild:
+  stable on amd64, see bug #67648
+
+  29 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  proftpd-1.2.10-r1.ebuild:
+  Stable on sparc wrt #67648
+
+  28 Nov 2004; Joseph Jezak <josejx@gentoo.org> proftpd-1.2.10-r1.ebuild:
+  Marked ppc stable for bug #67648.
+
+  27 Nov 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  proftpd-1.2.10-r1.ebuild:
+  Stable on x86
+
+*proftpd-1.2.10-r1 (26 Nov 2004)
+
+  26 Nov 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  +proftpd-1.2.10-r1.ebuild:
+  Adding version 1.2.10-r1 with fix for time attack bug
+  #http://bugs.gentoo.org/show_bug.cgi?id=67648
+
+  23 Nov 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed digest.
+
+  01 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> proftpd-1.2.10.ebuild:
+  Stable on alpha.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> proftpd-1.2.10.ebuild,
+  proftpd-1.2.8.ebuild:
+  Stable on amd64.
+
+  11 Oct 2004; Guy Martin <gmsoft@gentoo.org> proftpd-1.2.10.ebuild:
+  Marked stable on hppa.
+
+  18 Sep 2004; Jason Wever <weeve@gentoo.org> proftpd-1.2.10.ebuild:
+  Stable on sparc.
+
+  16 Sep 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  proftpd-1.2.10.ebuild:
+  Mod shaper causes problems again :( . Marking stable as the rest is rock solid.
+
+*proftpd-1.2.10 (07 Sep 2004)
+
+  07 Sep 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  +proftpd-1.2.10.ebuild, -proftpd-1.2.10_rc3-r1.ebuild:
+  Adding version 1.2.10, mod_shaper is back and also adding selinux flag and
+  dep, thanks to petre rodan on bug 62905 for this one
+
+*proftpd-1.2.10_rc3-r1 (06 Sep 2004)
+
+  06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org>
+  proftpd-1.2.10_rc3-r1.ebuild, proftpd-1.2.9-r2.ebuild:
+  Switch to use epause and ebeep, bug #62950
+
+  29 Jul 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  -proftpd-1.2.10_rc1-r1.ebuild:
+  Removing the shaper module because it causes strange problems.
+
+*proftpd-1.2.10_rc3 (14 Jul 2004)
+
+  14 Jul 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  proftpd-1.2.10_rc1-r1.ebuild, +proftpd-1.2.10_rc3.ebuild:
+  Adding rc3. Please report back (by mail) sucess stories
+
+  14 Jul 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  proftpd-1.2.10_rc1-r1.ebuild:
+  Added softquota flag to rc1-r1 and removed the old rc1 ebuild. 1.2.10_rc2 came
+  out today but has a bug and will not build, I have contacted upstream and rc3
+  will come out soon.
+
+*proftpd-1.2.10_rc1-r1 (08 Jul 2004)
+
+  08 Jul 2004; Gustavo Felisberto <humpback@gentoo.org>; metadata.xml,
+  +proftpd-1.2.10_rc1-r1.ebuild:
+  Adding suport fpr mod_shaper a trafic-shaper for all the server. Also
+  rager@g seems to be missing so I will maintain this in the meantime.
+
+*proftpd-1.2.10_rc1 (08 Jun 2004)
+
+  08 Jun 2004; Nick Hadaway <raker@gentoo.org> proftpd-1.2.10_rc1.ebuild :
+  Important security fixes.  From proftpd.org:  Additionally a flaw in 
+  the CIDRACL code has been discovered which can lead to an escalation in 
+  access rights within the ftp site. This flaw affects all versions up to 
+  and including 1.2.9, it has been fixed in cvs and 1.2.10rc1. To avoid 
+  the flaw do not use CIDR based ACLs on vulnerable versions or use 
+  mod_wrap and /etc/hosts.allow|deny.
+
+  05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> proftpd-1.2.9-r2.ebuild:
+  Stable on alpha.
+
+  12 May 2004; Alexander Gabert <pappy@gentoo.org> proftpd-1.2.9-r2.ebuild:
+  removed hardened-gcc logic, changed to use flag logic for capability bugfix
+
+  06 May 2004; David Holm <dholm@gentoo.org> proftpd-1.2.9-r2.ebuild:
+  Stable on ppc.
+
+  05 May 2004; Jon Portnoy <avenj@gentoo.org> proftpd-1.2.9-r2.ebuild :
+  Stable on x86.
+
+  05 May 2004; Jason Wever <weeve@gentoo.org> proftpd-1.2.9-r2.ebuild:
+  Stable on sparc wrt bug #49496.
+
+  04 May 2004; Brandon Hale <tseng@gentoo.org> proftpd-1.2.9-r2.ebuild:
+  Carry over stable flags on amd64 and hppa to -r2, I nuked their latest stable.
+
+*proftpd-1.2.9-r2 (04 May 2004)
+
+  04 May 2004; Brandon Hale <tseng@gentoo.org> -proftpd-1.2.9-r1.ebuild,
+  +proftpd-1.2.9-r2.ebuild, -proftpd-1.2.9.ebuild:
+  Add patch to close privelage escalation bug, see bug #49496. Removing affected
+  versions.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> proftpd-1.2.9-r1.ebuild:
+  Add inherit eutils
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  proftpd-1.2.9-r1.ebuild, proftpd-1.2.9.ebuild:
+  is-flag -fPIC -> has_pic to work with new gcc builds and USE=hardened.
+
+  09 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> proftpd-1.2.9-r1.ebuild:
+  Adding amd64 keyword. Closing #44105.
+
+  12 Feb 2004; Stewart Honsberger <blkdeath@gentoo.org>
+  proftpd-1.2.9-r1.ebuild, proftpd-1.2.9.ebuild:
+  Re: Bug #40260; add warning to ebuild if both USE=postgres and mysql are set
+
+*proftpd-1.2.9-r1 (12 Feb 2004)
+
+  12 Feb 2004; Stewart Honsberger <blkdeath@gentoo.org>
+  proftpd-1.2.9-r1.ebuild, files/proftpd-1.2.9-makefile.patch:
+  Re: Bug #39678; apply patch to correct race condition for paralell build.
+
+  31 Jan 2004; Christian Birchinger <joker@gentoo.org> proftpd-1.2.9.ebuild:
+  Added sparc stable keyword
+
+  29 Jan 2004; <tuxus@gentoo.org> proftpd-1.2.9.ebuild:
+  Added ~mips to KEYWORDS.
+
+  24 Jan 2004; Stewart Honsberger <blkdeath@gentoo.org> files/proftpd.rc6:
+  Re: Bug #28345 added "--retry 20" to start-stop-daemon line in init script
+  to account for stray processes.
+
+  23 Jan 2004; Nick Hadaway <raker@gentoo.org> proftpd-1.2.9.ebuild:
+  Removed libpcap dependancy.  See bug #36291.  Also removed unneeded
+  src_unpack() section.
+
+  23 Jan 2004; Stewart Honsberger <blkdeath@gentoo.org> files/proftpd.xinetd:
+  Re: Bug #37457, fix proftpd.xinetd
+
+  23 Jan 2004; Stewart Honsberger <blkdeath@gentoo.org> proftpd-1.2.9.ebuild:
+  Marked stable on x86.
+
+*proftpd-1.2.9 (05 Nov 2003)
+
+  22 Jan 2004; Guy Martin <gmsoft@gentoo.org> proftpd-1.2.9.ebuild:
+  Marked stable on hppa.
+
+  05 Nov 2003; Stewart Honsberger <blkdeath@gentoo.org> proftpd-1.2.9.ebuild:
+  Version bump. Security fixes, some memory leaks, IPv4 / IPv6 fixes.
+
+  20 Oct 2003; Nick Hadaway <raker@gentoo.org> proftpd-1.2.9_rc3.ebuild:
+  Added files/1.2.9_rc3-reversedns.diff which was taken from the 
+  upstream cvs repository.  Gentoo bug #31465 and proftpd bug #2204.
+
+*proftpd-1.2.9_rc3 (16 Oct 2003)
+
+  16 Oct 2003; Nick Hadaway <raker@gentoo.org> proftpd-1.2.9_rc3.ebuild:
+  Addresses bug #29639 and #30004.  Also includes a remote exploit fix.
+  Version bump.  1.2.9 release is coming soon. :)
+
+*proftpd-1.2.9_rc2-r1 (13 Oct 2003)
+
+  13 Oct 2003; <solar@gentoo.org> proftpd-1.2.9_rc2-r1.ebuild,
+  files/proftpd-1.2.9_rc2-dirtree-r118.patch:
+  Adding TJ Saunders directive lookup code patch from Comment #10
+  http://bugs.proftpd.org/show_bug.cgi?id=2183 for src/dirtree.c This should
+  close Gentoo Bug #29639
+
+  05 Oct 2003; <solar@gentoo.org> proftpd-1.2.9_rc2.ebuild:
+  reversed yet_exec workaround, changing solution to make proftpd compile for
+  users when -fPIC is found in C[XX]FLAGS or using hgcc.. see bug #30359
+
+  05 Oct 2003; Alexander Gabert <pappy@gentoo.org> proftpd-1.2.9_rc2.ebuild:
+  added yet_exec flags for configure run, otherwise build failure due to broken
+  assembler syscall in cap module building
+
+  02 Oct 2003; Brad House <brad_mssw@gentoo.org> proftpd-1.2.8.ebuild:
+  add ~amd64 flag
+
+  30 Sep 2003; Christian Birchinger <joker@gentoo.org>
+  proftpd-1.2.9_rc2.ebuild:
+  Added sparc stable keyword
+
+  29 Sep 2003; <solar@gentoo.org> proftpd-1.2.9_rc2.ebuild:
+  marked stable on x86
+
+*proftpd-1.2.9_rc2 (23 Sep 2003)
+
+  23 Sep 2003; Daniel Ahlberg <aliz@gentoo.org> proftpd-1.2.9_rc2.ebuild:
+  Security update
+
+  22 Jun 2003; root <root@gentoo.org> proftpd-1.2.9_rc1.ebuild:
+  Changed install stanza so files install in the proper location
+
+  17 Jun 2003; Nick Hadaway <raker@gentoo.org> proftpd-1.2.9_rc1.ebuild,
+  proftpd-1.2.8.ebuild:
+  Address bug #22963 which fixes compiling with the mysql module
+
+*proftpd-1.2.9_rc1 (16 Jun 2003)
+
+  16 Jun 2003; Nick Hadaway <raker@gentoo.org> proftpd-1.2.9_rc1.ebuild,
+  files/digest-proftpd-1.2.9_rc1:
+  Version bump.  einstall doesn't work in this version.  Added some
+  commented code for the new mod_{radius,ifsession,rewrite} modules.
+  A couple "New & Enhanced" configuration directives as well...
+  AnonRejectPasswords, RootRevoke, SocketOptions, and ListOptions.
+  Increased postgres depend to >=7.3 (bug #19675)
+
+*proftpd-1.2.8 (02 June 2003)
+
+  03 Jun 2003; Christian Birchinger <joker@gentoo.org> proftpd-1.2.8.ebuild:
+  Added sparc stable keyword
+
+  02 June 2003; Brad Laue <brad@gentoo.org> proftpd-1.2.8.ebuild:
+  Marking stable, it's well tested.
+
+*proftpd-1.2.8 (17 Mar 2003)
+
+  17 Apr 2003; Martin Holzer <mholzer@gentoo.org> Manifest,
+  proftpd-1.2.7.ebuild, proftpd-1.2.8.ebuild:
+  Adding info about config file
+
+  17 Mar 2003; Martin Holzer <mholzer@gentoo.org> proftpd-1.2.8.ebuild:
+  Version bumped. Ebuild submitted in #17666 by bugsubmit@snerk.org
+
+*proftpd-1.2.7 (15 Dec 2002)
+
+  23 Mar 2003; Graham Forest <vladimir@gentoo.org> proftpd-1.2.7.ebuild:
+  set ppc in keywords
+
+  17 Jan 2003; Daniel Ahlberg <aliz@gentoo.org> files/proftpd.conf :
+  Closes #13734.
+
+  15 Dec 2002; Daniel Ahlberg <aliz@gentoo.org> proftpd-1.2.7.ebuild :
+  Marked as stable.
+
+  05 Mar 2003; Will Woods <wwoods@gentoo.org> proftpd-1.2.7.ebuild:
+  Added alpha to KEYWORDS
+
+  25 Feb 2003; Guy Martin <gmsoft@gentoo.org> proftpd-1.2.7.ebuild :
+  Added hppa to keywords.
+
+  15 Dec 2002; Daniel Ahlberg <aliz@gentoo.org> proftpd-1.2.7.ebuild :
+  Version bump.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  23 Nov 2002; Maik Schreiber <blizzy@gentoo.org> proftpd-1.2.7_rc3.ebuild:
+  Changed KEYWORDS to "~x86 ~ppc ~sparc ~sparc64", as proftpd-1.2.7_rc2.ebuild
+  has. Also fixed ChangeLog.
+
+  19 Nov 2002; L. Boshell <leonardop@gentoo.org> proftpd-1.2.7_rc3.ebuild:
+  Modified tcp-wrappers dep, so default-1.0 users don't have problems with it.
+  See bug #10930.
+
+*proftpd-1.2.7_rc3 (17 Nov 2002)
+  
+  17 Nov 2002; Bruce A. Locke <blocke@shivan.org> proftpd-1.2.7_rc3.ebuild:
+  Version bump, ebuild cleanups, and:
+
+  - mod_ldap TLS enable suggested by psi-jack@myrealbox.com (Eric Renfro)
+  - mod_tls added (suggestion from stian@barmen.nu (Stian B. Barmen))
+  - mod_wrap for TCP wrappers support
+  - sample config file location in rc6 message changed
+
+  09 Nov 2002; Ryan Phillips <rphillips@gentoo.org> : set emake to make.  Fixes #10267
+
+*proftpd-1.2.7_rc2 (02 Nov 2002)
+
+  02 Nov 2002; Maik Schreiber <blizzy@gentoo.org> : New version. Also we use
+  user/group "proftpd" from now on instead of nobody/nogroup.
+
+  07 Sep 2002; Seemant Kulleen <seemant@gentoo.org> proftpd-1.2.5-r1.ebuild,
+  proftpd-1.2.6_rc1-r1.ebuild: Removed redundant glibc dependency and replaced
+  it with the libpcap. Thanks to: saragon@home.se (Daniel) in bug #7614.
+
+*proftpd-1.2.6_rc1-r1 (03 Aug 2002)
+
+  03 Aug 2002; Bruce A. Locke <blocke@shivan.org> proftpd-1.2.6_rc1-r1.ebuild,
+  files/digest-proftpd-1.2.6_rc1-r1:
+  Added xinetd file contributed by alextxm@tin.it (Alessandro Pisani) and
+  fixed minor directory and documentation buglets
+  
+*proftpd-1.2.6_rc1 (19 Jul 2002)
+
+  19 Jul 2002; Kyle Manna <nitro@gentoo.org> proftpd-1.2.6_rc1.ebuild:
+  Added masked release candidate.  Please test.
+
+  28 Jun 2002; J.Alberto Suárez L. <bass@gentoo.org> proftpd-1.2.5-r1.ebuild:
+
+  Fix bug #3791 In mod_sql_postgres.c line 38: #inlcude <pgsql/libpq-fe.h>
+  is patched to: #include <postgresql/libpq-fe.h>.
+
+*proftpd-1.2.5-r1 (20 Jun 2002)
+
+  20 Jun 2002; Kyle Manna <nitro@gentoo.org> proftpd-1.2.5-r1.ebuild :
+  Now we copy pam ftp file if we 'use pam'
+
+*proftpd-1.2.5 (09 Jun 2002)
+
+  09 Jun 2002; Kyle Manna <nitro@gentoo.org> proftpd-1.2.5.ebuild :
+
+  Version bump, added SLOT="0" and LICENSE="GPL-2"
+
+  2 Apr 2002; Tod Neidt <tod@gentoo.org> proftpd-1.2.4-r7.ebuild :
+
+  Specified rundir in make install, needed to avoid sandbox violation of
+  'mkdir /var/run/proftp' on initial install.
+
+*proftpd-1.2.4-r7 (18 Mar 2002)
+  
+  18 Mar 2002; Donny Davies <woodchip@gentoo.org> proftpd-1.2.4-r7.ebuild :
+
+  Fix compilation with USE ldap.  Closes #722, thanks goto rectrix@rectrix.cx (Tim Hobbs)
+  for report and suggested resolution.
+
+*proftpd-1.2.4-r6 (01 Feb 2002)
+
+  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
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 79e1232e590c..83bb9d7eda27 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,11 +1,39 @@
-MD5 2952a475e66fadd626130746310830e5 ChangeLog 4125
-MD5 d5cf67873286bdee0ce6f388674f35a9 proftpd-1.2.5-r1.ebuild 2522
-MD5 7e9ce0517a79e0e976b61cc5c094436f proftpd-1.2.8.ebuild 2692
-MD5 c0a0df406e80c0552c02362cca923cb0 proftpd-1.2.7.ebuild 3675
-MD5 6236a589ef01778d118911281b20be51 files/digest-proftpd-1.2.5-r1 66
-MD5 c1dc1d9278d5b77f53ea44ee848dafc6 files/digest-proftpd-1.2.7 211
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b47207aedd0149443faa2152950714ed metadata.xml 401
+MD5 47c7909cf9d623eaa77933d997bdb7c1 proftpd-1.2.10-r1.ebuild 4422
+MD5 49ff4274614a4ecc736e8674b47b9d2b proftpd-1.2.10-r2.ebuild 4505
+MD5 ccd3b0639bb673d4f542f42b1a9824b2 proftpd-1.2.10-r3.ebuild 4356
+MD5 9cd5b3f274033c4ed06ac8c36b143353 proftpd-1.2.10-r5.ebuild 4393
+MD5 a8c4e478e33928ef12d4786d72dbe3d0 proftpd-1.2.10-r6.ebuild 4444
+MD5 bba4a57fb848beed9e0bf5101efbbcce proftpd-1.2.10-r7.ebuild 4574
+MD5 0215c43fd279ba334fe05f9761ec8293 proftpd-1.2.10.ebuild 4166
+MD5 032f9750ce490f668ca047a660bd099b proftpd-1.2.9-r2.ebuild 3466
+MD5 34d075d4c65945b68ebf4fbde28690f7 ChangeLog 16420
+MD5 e558f099037d359da5f855285542246e files/1.2.9_rc3-reversedns.diff 1974
+MD5 fa041c7b343099eef454338152a04ea7 files/digest-proftpd-1.2.10 67
+MD5 52697b758d9c85e63c881592c5a8bb02 files/digest-proftpd-1.2.10-r1 213
+MD5 52697b758d9c85e63c881592c5a8bb02 files/digest-proftpd-1.2.10-r2 213
+MD5 81e05e840c023b1f6bfb46dc24cb165f files/digest-proftpd-1.2.10-r3 142
+MD5 81e05e840c023b1f6bfb46dc24cb165f files/digest-proftpd-1.2.10-r5 142
+MD5 81e05e840c023b1f6bfb46dc24cb165f files/digest-proftpd-1.2.10-r6 142
+MD5 81e05e840c023b1f6bfb46dc24cb165f files/digest-proftpd-1.2.10-r7 142
+MD5 6c1a92fc601780a49fdfc01aaf483b69 files/digest-proftpd-1.2.9-r2 66
+MD5 cfe47c0d5f8fece1d36ca8d56d0f2b99 files/ftp.pamd 701
+MD5 3f7725dfa4ff0f5b632ddf41104ba44b files/ftp.pamd-include 592
 MD5 0cf02f8c82f22e714b8299e7b7907d8f files/mod_sql_postgres.c.patch 275
+MD5 b00999f820f1e46a501ce4fcaeb5fe23 files/proftpd-1.2.9-makefile.patch 434
+MD5 50955f0d375360841d50a82b9589e435 files/proftpd-1.2.9-privescal-fix.patch 588
+MD5 f739a48054eabaf69f819f6e31bad069 files/proftpd-ftpshut.patch 897
+MD5 098337e85fc8b71a16e91114ff54ece1 files/proftpd-sqlshowinfo.patch 1191
 MD5 b338504ed873219e368abab7df6c276d files/proftpd.conf 1704
-MD5 305b9ec34f3caa3722cf5a7dc1a59880 files/proftpd.rc6 743
-MD5 313cde04e0ea4cd747e6b905e6c982b4 files/proftpd.xinetd 302
-MD5 cb6cd6133728449d0da092b1d6147b9d files/digest-proftpd-1.2.8 66
+MD5 55ca24c9ee61b9ed94968c664baaeace files/proftpd.rc6 731
+MD5 4d676b70c97bc6daabd8c2ba8d52d27a files/proftpd.xinetd 295
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDLAdPKf2g/qXtneoRAv/lAKCLBjNUpxcIMfroi2RsJqSZs+muKQCfX0s1
+BvSXwaBRt4x4qAuctFkVD4c=
+=Wi6k
+-----END PGP SIGNATURE-----
diff --git a/net-ftp/proftpd/files/digest-proftpd-1.2.10 b/net-ftp/proftpd/files/digest-proftpd-1.2.10
index a568ff684da7..2fa34a67357e 100644
--- a/net-ftp/proftpd/files/digest-proftpd-1.2.10
+++ b/net-ftp/proftpd/files/digest-proftpd-1.2.10
@@ -1,2 +1 @@
 MD5 5feb4a7348e12faefc25e34fd92efdd6 proftpd-1.2.10.tar.bz2 920337
-MD5 cde6b8da69aa3bd0ff77850082d0b773 proftpd-mod-shaper-0.5.3.tar.gz 17424
diff --git a/net-ftp/proftpd/files/proftpd.conf b/net-ftp/proftpd/files/proftpd.conf
index b201a1b94df2..44f78406e225 100644
--- a/net-ftp/proftpd/files/proftpd.conf
+++ b/net-ftp/proftpd/files/proftpd.conf
@@ -3,13 +3,15 @@
 # and a single anonymous login.  It assumes that you have a user/group
 # "nobody" and "ftp" for normal operation and anon.
 
-ServerName			"ProFTPD Default Installation"
-ServerType			inetd
-DefaultServer			on
-AuthPAM				off
-AuthPAMConfig			ftp
+ServerName          "ProFTPD Default Installation"
+ServerType          standalone
+DefaultServer       on
+RequireValidShell   off
+AuthPAM             off
+AuthPAMConfig       ftp
 # Port 21 is the standard FTP port.
 Port				21
+
 # Umask 022 is a good standard umask to prevent new dirs and files
 # from being group and world writable.
 Umask				022
@@ -17,17 +19,17 @@ Umask				022
 # To prevent DoS attacks, set the maximum number of child processes
 # to 30.  If you need to allow more than 30 concurrent connections
 # at once, simply increase this value.  Note that this ONLY works
-# in inetd mode, in inetd mode you should use an inetd server
+# in standalone mode, in inetd mode you should use an inetd server
 # that allows you to limit maximum number of processes per service
-# (such as xinetd)
+# (such as xinetd).
 MaxInstances			30
 
-# Set the user and group that the server normally runs at.
-User				nobody
-Group				nogroup
+# Set the user and group under which the server will run.
+User				proftpd
+Group				proftpd
 
 # Normally, we want files to be overwriteable.
-<Directory /*>
+<Directory />
   AllowOverwrite		on
 </Directory>
 
@@ -35,6 +37,7 @@ Group				nogroup
 <Anonymous ~ftp>
   User				ftp
   Group				ftp
+
   # We want clients to be able to login with "anonymous" as well as "ftp"
   UserAlias			anonymous ftp
 
@@ -52,4 +55,3 @@ Group				nogroup
   </Limit>
 
 </Anonymous>
-
diff --git a/net-ftp/proftpd/files/proftpd.rc6 b/net-ftp/proftpd/files/proftpd.rc6
index d6c1e5cf3855..df956eb77b84 100644
--- a/net-ftp/proftpd/files/proftpd.rc6
+++ b/net-ftp/proftpd/files/proftpd.rc6
@@ -1,22 +1,29 @@
 #!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/files/proftpd.rc6,v 1.1.1.1 2005/11/30 09:36:19 chriswhite Exp $
+
+depend() {
+	need net
+}
 
 checkconfig() {
-    if [ ! -e /etc/proftpd/proftpd.conf ] ; then
-	eerror "You need an /etc/proftpd/proftpd.conf file first"
-	eerror "There is a sample file in /usr/share/doc/proftpd"
-	return 1
-    fi
+	if [ ! -e /etc/proftpd/proftpd.conf ] ; then
+		eerror "You need an /etc/proftpd/proftpd.conf file first"
+		eerror "There is a sample file in /etc/proftpd"
+		return 1
+	fi
 }
 
 start() {
-    checkconfig || return 1
-    ebegin "Starting proftpd"
-    start-stop-daemon --start --quiet --exec /usr/sbin/proftpd -- -d -p /var/run/proftpd.pid
-    eend $?
+	checkconfig || return 1
+	ebegin "Starting proftpd"
+	start-stop-daemon --start --quiet --exec /usr/sbin/proftpd -- /var/run/proftpd.pid
+	eend $?
 }
 
 stop() {
-    ebegin "Stopping proftpd"
-    start-stop-daemon --stop --quiet --pidfile /var/run/proftpd.pid
-    eend $?
+	ebegin "Stopping proftpd"
+	start-stop-daemon --stop --retry 20 --quiet --pidfile /var/run/proftpd.pid
+	eend $?
 }
diff --git a/net-ftp/proftpd/files/proftpd.xinetd b/net-ftp/proftpd/files/proftpd.xinetd
index 282400d75d30..ad75aefddb6c 100644
--- a/net-ftp/proftpd/files/proftpd.xinetd
+++ b/net-ftp/proftpd/files/proftpd.xinetd
@@ -10,6 +10,6 @@ service ftp
        user		= root
        server		= /usr/sbin/proftpd
        log_on_success	= HOST PID
-       log_on_failure	= HOST RECORD
+       log_on_failure	= HOST
        disable		= yes
 }
diff --git a/net-ftp/proftpd/metadata.xml b/net-ftp/proftpd/metadata.xml
index b27218d48158..c3b3522666ec 100644
--- a/net-ftp/proftpd/metadata.xml
+++ b/net-ftp/proftpd/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>no-herd</herd>
-  <maintainer>
-    <email>raker@gentoo.org</email>
-    <name>Nick Hadaway</name>
-  </maintainer>
+
+<herd>no-herd</herd>
+<maintainer>
+  <email>humpback@gentoo.org</email>
+</maintainer>
+<longdescription>ProFTPD grew out of the desire to have a secure and 
+configurable FTP server, and out of a significant admiration of the Apache web 
+server.</longdescription>
 </pkgmetadata>
diff --git a/net-ftp/proftpd/proftpd-1.2.10-r1.ebuild b/net-ftp/proftpd/proftpd-1.2.10-r1.ebuild
index a58ee03ea6b9..a036c3158303 100644
--- a/net-ftp/proftpd/proftpd-1.2.10-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.2.10-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-ftp/proftpd/proftpd-1.2.10-r1.ebuild,v 1.1 2004/11/26 15:34:56 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.10-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:18 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
@@ -13,13 +13,13 @@ S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="An advanced and very configurable FTP server"
 SRC_URI="ftp://ftp.proftpd.org/distrib/source/${MY_P}.tar.bz2
-		shaper? http://www.castaglia.org/${PN}/modules/${PN}-mod-shaper-0.5.5.tar.gz
+		shaper? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-shaper-0.5.5.tar.gz )
 		http://www.castaglia.org/${PN}/modules/${PN}-mod-delay-0.4.tar.gz"
 HOMEPAGE="http://www.proftpd.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~hppa ~alpha ~ppc ~mips ~amd64"
+KEYWORDS="x86 sparc hppa alpha ppc ~mips amd64"
 
 DEPEND="pam? ( >=sys-libs/pam-0.75 )
 	mysql? ( >=dev-db/mysql-3.23.26 )
@@ -42,6 +42,7 @@ src_unpack() {
 }
 
 src_compile() {
+	addpredict /etc/krb5.conf
 	local modules myconf
 
 	modules="mod_ratio:mod_readme:mod_delay"
diff --git a/net-ftp/proftpd/proftpd-1.2.10-r2.ebuild b/net-ftp/proftpd/proftpd-1.2.10-r2.ebuild
index efe2e9202260..7da0d8bafb71 100644
--- a/net-ftp/proftpd/proftpd-1.2.10-r2.ebuild
+++ b/net-ftp/proftpd/proftpd-1.2.10-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-ftp/proftpd/proftpd-1.2.10-r2.ebuild,v 1.1 2004/12/06 19:29:06 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.10-r2.ebuild,v 1.1.1.1 2005/11/30 09:36:19 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
@@ -13,13 +13,13 @@ S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="An advanced and very configurable FTP server"
 SRC_URI="ftp://ftp.proftpd.org/distrib/source/${MY_P}.tar.bz2
-		shaper? http://www.castaglia.org/${PN}/modules/${PN}-mod-shaper-0.5.5.tar.gz
+		shaper? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-shaper-0.5.5.tar.gz )
 		http://www.castaglia.org/${PN}/modules/${PN}-mod-delay-0.4.tar.gz"
 HOMEPAGE="http://www.proftpd.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~hppa ~alpha ~ppc ~mips ~amd64"
+KEYWORDS="~x86 ~sparc ~hppa ~alpha ~ppc ~mips ~amd64 ppc64"
 
 DEPEND="pam? ( >=sys-libs/pam-0.75 )
 	mysql? ( >=dev-db/mysql-3.23.26 )
@@ -42,6 +42,7 @@ src_unpack() {
 }
 
 src_compile() {
+	addpredict /etc/krb5.conf
 	local modules myconf
 
 	modules="mod_ratio:mod_readme:mod_delay"
diff --git a/net-ftp/proftpd/proftpd-1.2.10-r3.ebuild b/net-ftp/proftpd/proftpd-1.2.10-r3.ebuild
index 3fb5ddbca31e..5544c7417a3f 100644
--- a/net-ftp/proftpd/proftpd-1.2.10-r3.ebuild
+++ b/net-ftp/proftpd/proftpd-1.2.10-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-ftp/proftpd/proftpd-1.2.10-r3.ebuild,v 1.1 2005/03/02 23:19:46 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.10-r3.ebuild,v 1.1.1.1 2005/11/30 09:36:19 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
@@ -18,7 +18,7 @@ HOMEPAGE="http://www.proftpd.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~hppa ~alpha ~ppc ~mips ~amd64 ~ppc64"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ppc64 ~sparc ~x86"
 
 DEPEND="pam? ( >=sys-libs/pam-0.75 )
 	mysql? ( >=dev-db/mysql-3.23.26 )
@@ -39,6 +39,7 @@ src_unpack() {
 }
 
 src_compile() {
+	addpredict /etc/krb5.conf
 	local modules myconf
 
 	modules="mod_ratio:mod_readme"
@@ -125,7 +126,7 @@ src_install() {
 	keepdir /home/ftp
 	keepdir /var/run/proftpd
 
-	dodoc contrib/README.mod_sql ${FILESDIR}/proftpd.conf \
+	dodoc contrib/UPGRADE.mod_sql ${FILESDIR}/proftpd.conf \
 		COPYING CREDITS ChangeLog NEWS README* \
 		doc/{license.txt,GetConf}
 	dohtml doc/*.html
diff --git a/net-ftp/proftpd/proftpd-1.2.10-r5.ebuild b/net-ftp/proftpd/proftpd-1.2.10-r5.ebuild
index 8ca088e7ecea..bbcfc25e0dd7 100644
--- a/net-ftp/proftpd/proftpd-1.2.10-r5.ebuild
+++ b/net-ftp/proftpd/proftpd-1.2.10-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-ftp/proftpd/proftpd-1.2.10-r5.ebuild,v 1.1 2005/06/07 23:10:19 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.10-r5.ebuild,v 1.1.1.1 2005/11/30 09:36:19 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
@@ -40,6 +40,7 @@ src_unpack() {
 }
 
 src_compile() {
+	addpredict /etc/krb5.conf
 	local modules myconf
 
 	modules="mod_ratio:mod_readme"
diff --git a/net-ftp/proftpd/proftpd-1.2.10-r6.ebuild b/net-ftp/proftpd/proftpd-1.2.10-r6.ebuild
index 070617ebfd17..605293589908 100644
--- a/net-ftp/proftpd/proftpd-1.2.10-r6.ebuild
+++ b/net-ftp/proftpd/proftpd-1.2.10-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-ftp/proftpd/proftpd-1.2.10-r6.ebuild,v 1.1 2005/07/08 16:02:20 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.10-r6.ebuild,v 1.1.1.1 2005/11/30 09:36:19 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
@@ -19,7 +19,7 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~sparc ~hppa ~alpha ~ppc ~mips ~amd64 ~ppc64"
 
-DEPEND="pam? ( || ( virtual/pam sys-libs/pam) )
+DEPEND="pam? ( || ( virtual/pam sys-libs/pam ) )
 	mysql? ( >=dev-db/mysql-3.23.26 )
 	ldap? ( >=net-nds/openldap-1.2.11 )
 	postgres? ( >=dev-db/postgresql-7.3 )
@@ -132,7 +132,6 @@ src_install() {
 	# on initial install. See Make.rules
 	make DESTDIR=${D} install || die
 
-	keepdir /home/ftp
 	keepdir /var/run/proftpd
 
 	dodoc contrib/UPGRADE.mod_sql ${FILESDIR}/proftpd.conf \
diff --git a/net-ftp/proftpd/proftpd-1.2.10-r7.ebuild b/net-ftp/proftpd/proftpd-1.2.10-r7.ebuild
index 38871eef3b8f..f12965a23b80 100644
--- a/net-ftp/proftpd/proftpd-1.2.10-r7.ebuild
+++ b/net-ftp/proftpd/proftpd-1.2.10-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-ftp/proftpd/proftpd-1.2.10-r7.ebuild,v 1.1 2005/07/29 15:48:15 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.10-r7.ebuild,v 1.1.1.1 2005/11/30 09:36:19 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://www.proftpd.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~hppa ~alpha ~ppc ~mips ~amd64 ~ppc64"
+KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
 
 DEPEND="pam? ( || ( virtual/pam sys-libs/pam ) )
 	mysql? ( >=dev-db/mysql-3.23.26 )
diff --git a/net-ftp/proftpd/proftpd-1.2.10.ebuild b/net-ftp/proftpd/proftpd-1.2.10.ebuild
index a400c9d3f096..d324efd9a03c 100644
--- a/net-ftp/proftpd/proftpd-1.2.10.ebuild
+++ b/net-ftp/proftpd/proftpd-1.2.10.ebuild
@@ -1,22 +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/net-ftp/proftpd/proftpd-1.2.10.ebuild,v 1.1 2004/09/07 18:09:56 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.10.ebuild,v 1.1.1.1 2005/11/30 09:36:19 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
-IUSE="hardened ipv6 ldap mysql pam postgres shaper softquota ssl tcpd selinux"
+#Mod shaper is giving problems on some machines
+#IUSE="hardened ipv6 ldap mysql pam postgres shaper softquota ssl tcpd selinux"
+IUSE="hardened ipv6 ldap mysql pam postgres softquota ssl tcpd selinux"
 
 MY_P=${P/_/}
 S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="An advanced and very configurable FTP server"
-SRC_URI="ftp://ftp.proftpd.org/distrib/source/${MY_P}.tar.bz2
-		shaper? http://www.castaglia.org/${PN}/modules/${PN}-mod-shaper-0.5.3.tar.gz"
+SRC_URI="ftp://ftp.proftpd.org/distrib/source/${MY_P}.tar.bz2"
+#		shaper? http://www.castaglia.org/${PN}/modules/${PN}-mod-shaper-0.5.3.tar.gz"
 HOMEPAGE="http://www.proftpd.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~hppa ~alpha ~ppc ~mips ~amd64"
+KEYWORDS="x86 sparc hppa alpha ppc ~mips amd64"
 
 DEPEND="pam? ( >=sys-libs/pam-0.75 )
 	mysql? ( >=dev-db/mysql-3.23.26 )
@@ -30,19 +32,20 @@ RDEPEND="selinux? ( sec-policy/selinux-ftpd )"
 src_unpack() {
 	unpack ${MY_P}.tar.bz2
 	cd ${S}
-	if use shaper; then
-		unpack ${PN}-mod-shaper-0.5.3.tar.gz
-		mv mod_shaper/mod_shaper.c contrib/
-	fi
+#	if use shaper; then
+#		unpack ${PN}-mod-shaper-0.5.3.tar.gz
+#		mv mod_shaper/mod_shaper.c contrib/
+#	fi
 }
 
 src_compile() {
+	addpredict /etc/krb5.conf
 	local modules myconf
 
 	modules="mod_ratio:mod_readme"
 	use pam && modules="${modules}:mod_auth_pam"
 	use tcpd && modules="${modules}:mod_wrap"
-	use shaper && modules="${modules}:mod_shaper"
+#	use shaper && modules="${modules}:mod_shaper"
 
 	if use ldap; then
 		einfo ldap
@@ -123,7 +126,7 @@ src_install() {
 		COPYING CREDITS ChangeLog NEWS README* \
 		doc/{license.txt,GetConf}
 	dohtml doc/*.html
-	use shaper && dohtml mod_shaper/mod_shaper.html
+	#use shaper && dohtml mod_shaper/mod_shaper.html
 	docinto rfc
 	dodoc doc/rfc/*.txt
 
diff --git a/net-ftp/proftpd/proftpd-1.2.9-r2.ebuild b/net-ftp/proftpd/proftpd-1.2.9-r2.ebuild
index b6e871426b46..2441d34c9f87 100644
--- a/net-ftp/proftpd/proftpd-1.2.9-r2.ebuild
+++ b/net-ftp/proftpd/proftpd-1.2.9-r2.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-ftp/proftpd/proftpd-1.2.9-r2.ebuild,v 1.1 2004/05/04 16:23:04 tseng Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.9-r2.ebuild,v 1.1.1.1 2005/11/30 09:36:19 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
-IUSE="ldap pam postgres mysql ssl tcpd ipv6"
+IUSE="hardened ipv6 ldap mysql pam postgres ssl tcpd"
 
 MY_P=${P/_/}
 S=${WORKDIR}/${MY_P}
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.proftpd.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~hppa ~alpha ~ppc ~mips ~amd64"
+KEYWORDS="x86 sparc hppa alpha ppc ~mips amd64"
 
 DEPEND="pam? ( >=sys-libs/pam-0.75 )
 	mysql? ( >=dev-db/mysql-3.23.26 )
@@ -32,6 +32,7 @@ src_unpack() {
 }
 
 src_compile() {
+	addpredict /etc/krb5.conf
 	local modules myconf
 
 	modules="mod_ratio:mod_readme"
@@ -56,7 +57,7 @@ src_compile() {
 		ewarn "Presently this ebuild defaults to mysql. If you would like to"
 		ewarn "change the default behaviour, merge ProFTPD with;"
 		ewarn "USE=\"-mysql postgres\" emerge proftpd"
-		sleep 5
+		epause 5
 	fi
 
 	if use mysql; then
@@ -77,7 +78,7 @@ src_compile() {
 	# modules="${modules}:mod_rewrite"
 
 	# bug #30359
-	has_version sys-devel/hardened-gcc && echo > lib/libcap/cap_sys.c
+	use hardened && echo > lib/libcap/cap_sys.c
 	has_pic && echo > lib/libcap/cap_sys.c
 
 	econf \
diff --git a/net-ftp/profxp/ChangeLog b/net-ftp/profxp/ChangeLog
index 8349114ead77..f395dd0f4944 100644
--- a/net-ftp/profxp/ChangeLog
+++ b/net-ftp/profxp/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-ftp/profxp
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/profxp/ChangeLog,v 1.1 2003/12/08 08:11:18 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/profxp/ChangeLog,v 1.1.1.1 2005/11/30 09:36:22 chriswhite Exp $
+
+  26 Jul 2005; David Holm <dholm@gentoo.org> profxp-3_pre2.ebuild:
+  Added to ~ppc.
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> profxp-3_pre2.ebuild:
+  dev-perl/Time-HiRes => perl-core/Time-HiRes migration
+
+  25 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> profxp-3_pre2.ebuild:
+  added ~amd64 to KEYWORDS.
 
 *profxp-3_pre2 (08 Dec 2003)
 
diff --git a/net-ftp/profxp/Manifest b/net-ftp/profxp/Manifest
index 3d7730716f01..51d1ba7e9352 100644
--- a/net-ftp/profxp/Manifest
+++ b/net-ftp/profxp/Manifest
@@ -1,3 +1,3 @@
+MD5 bb3ac318f2af233d7cc197ce120e76a5 ChangeLog 647
+MD5 5e94afdf1d7a549d7edc21d9950c33fc profxp-3_pre2.ebuild 1011
 MD5 227e64da69bc22bd4bf75ff7e5775bc4 files/digest-profxp-3_pre2 121
-MD5 b9785d5d05c9abafcece87065d153b28 ChangeLog 335
-MD5 85ba96a6214c7f76f9eb21a41deee8bf profxp-3_pre2.ebuild 973
diff --git a/net-ftp/profxp/profxp-3_pre2.ebuild b/net-ftp/profxp/profxp-3_pre2.ebuild
index 223e56a3e205..531cc42b40a9 100644
--- a/net-ftp/profxp/profxp-3_pre2.ebuild
+++ b/net-ftp/profxp/profxp-3_pre2.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-ftp/profxp/profxp-3_pre2.ebuild,v 1.1 2003/12/08 08:11:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/profxp/profxp-3_pre2.ebuild,v 1.1.1.1 2005/11/30 09:36:22 chriswhite Exp $
 
 inherit perl-module
 
@@ -9,13 +9,15 @@ HOMEPAGE="http://duncanthrax.net/profxp/"
 SRC_URI="http://duncanthrax.net/profxp/profxp-v${PV/_/-}-src.tar.gz
 	http://search.cpan.org/src/CLINTDW/SOCKS-0.03/lib/Net/SOCKS.pm"
 
-LICENSE="as-is"
+LICENSE="BSD"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE=""
 
 DEPEND="dev-lang/perl
-	dev-perl/Time-HiRes
-	dev-perl/TermReadKey"
+	perl-core/Time-HiRes
+	dev-perl/TermReadKey
+	dev-perl/Term-ReadLine-Perl"
 
 S=${WORKDIR}/${PN}
 
diff --git a/net-ftp/pure-ftpd/ChangeLog b/net-ftp/pure-ftpd/ChangeLog
index 1e0f1122ec82..964b166577f1 100644
--- a/net-ftp/pure-ftpd/ChangeLog
+++ b/net-ftp/pure-ftpd/ChangeLog
@@ -1,10 +1,223 @@
 # ChangeLog for net-ftp/pure-ftpd
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/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-ftp/pure-ftpd/ChangeLog,v 1.1.1.1 2005/11/30 09:36:22 chriswhite Exp $
 
-*pure-ftpd-1.0.8 (1 Feb 2002)
+  19 Sep 2005; Roy Marples <uberlord@gentoo.org> pure-ftpd-1.0.20-r1.ebuild,
+  pure-ftpd-1.0.20-r2.ebuild:
+  New USE flag selinux now depends on the selinux-ftpd policy, wrt #106355.
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+*pure-ftpd-1.0.20-r2 (31 Aug 2005)
+
+  31 Aug 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  +files/pure-ftpd-1.0.20-pam.patch, +pure-ftpd-1.0.20-r2.ebuild:
+  Added ftpbase compatible version that helps close bug #102479
+
+  21 Aug 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  files/pure-ftpd.conf_d:
+  Changed coment in conf.d file. Credit to David in bug #103195 .
+
+  06 May 2005; Sven Wegener <swegener@gentoo.org>
+  pure-ftpd-1.0.20-r1.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  04 May 2005; Herbie Hopkins <herbs@gentoo.org> pure-ftpd-1.0.20-r1.ebuild:
+  Stable on amd64.
+
+  02 Mar 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  -files/pure-ftpd-1.0.18-fcntl.patch, files/pure-ftpd.conf_d,
+  -files/pure-ftpd.rc6, -pure-ftpd-1.0.16b.ebuild, -pure-ftpd-1.0.16c.ebuild,
+  -pure-ftpd-1.0.17a.ebuild, -pure-ftpd-1.0.18-r1.ebuild,
+  -pure-ftpd-1.0.18.ebuild, -pure-ftpd-1.0.20.ebuild:
+  Removing older versions and files. Also closing bug #75026.
+
+  04 Feb 2005; Michael Hanselmann <hansmi@gentoo.org>
+  pure-ftpd-1.0.20-r1.ebuild:
+  Stable on ppc.
+
+  04 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
+  pure-ftpd-1.0.20-r1.ebuild:
+  Stable on alpha, bug 80458.
+
+  03 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  pure-ftpd-1.0.20-r1.ebuild:
+  Stable on sparc wrt #80458
+
+  02 Feb 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  pure-ftpd-1.0.20-r1.ebuild:
+  Stable on x86
+
+  02 Feb 2005; Markus Rothe <corsair@gentoo.org> pure-ftpd-1.0.20-r1.ebuild:
+  Stable on ppc64
+
+*pure-ftpd-1.0.20-r1 (02 Feb 2005)
+
+  02 Feb 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  files/pure-ftpd.conf_d, +pure-ftpd-1.0.20-r1.ebuild:
+  Adding version to solve sec bug #80458 and a warning to the conf file about
+  bug #75861.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  18 Sep 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  pure-ftpd-1.0.20.ebuild:
+  Added privilege separation option to configure.
+
+  01 Sep 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  pure-ftpd-1.0.20.ebuild:
+  Updated username lenght limit from 32 to 127, see bug #62472 for details.
+
+*pure-ftpd-1.0.20 (09 Aug 2004)
+
+  09 Aug 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  pure-ftpd-1.0.20.ebuild:
+  Added caps flag. Closes bug #59458. thanks to erkan kaplan
+
+  09 Aug 2004; Gustavo Felisberto <humpback@gentoo.org>; :
+  Version bump tp 1.0.20, closes bug #59355.
+
+  15 Jul 2004; Tom Gall <tgall@gentoo.org> pure-ftpd-1.0.18-r1.ebuild:
+  stable on ppc64, bug #55407
+
+  10 Jul 2004; Gustavo Felisberto <humpback@gentoo.org>; metadata.xml:
+  Taking maintainership of this package due to raker's retire. Will update this
+  to the new version ASAP
+
+  04 Jul 2004; Michael Hanselmann <hansmi@gentoo.org>
+  pure-ftpd-1.0.18-r1.ebuild:
+  Stable on ppc.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  pure-ftpd-1.0.16b.ebuild, pure-ftpd-1.0.16c.ebuild,
+  pure-ftpd-1.0.17a.ebuild, pure-ftpd-1.0.18-r1.ebuild,
+  pure-ftpd-1.0.18.ebuild:
+  virtual/glibc -> virtual/libc
+
+  24 Jun 2004; Aron Griffis <agriffis@gentoo.org> pure-ftpd-1.0.18-r1.ebuild:
+  stable on ia64 #54590
+
+  23 Jun 2004; Jason Wever <weeve@gentoo.org> pure-ftpd-1.0.18-r1.ebuild:
+  Marked stable on sparc wrt bug #54590.
+
+  23 Jun 2004; Bryan Østergaard <kloeri@gentoo.org>
+  pure-ftpd-1.0.18-r1.ebuild:
+  Stable on alpha, see bug #54590.
+
+*pure-ftpd-1.0.18-r1 (22 Jun 2004)
+
+  22 Jun 2004; <solar@gentoo.org> pure-ftpd-1.0.18-r1.ebuild,
+  files/pure-ftpd-1.0.18-fcntl.patch:
+  fix DoS when max connections is reached. secuirty bug #54590
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> pure-ftpd-1.0.16b.ebuild,
+  pure-ftpd-1.0.16c.ebuild, pure-ftpd-1.0.17a.ebuild, pure-ftpd-1.0.18.ebuild:
+  Fix use invocation
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> pure-ftpd-1.0.16b.ebuild,
+  pure-ftpd-1.0.16c.ebuild, pure-ftpd-1.0.17a.ebuild, pure-ftpd-1.0.18.ebuild:
+  Add die following econf for bug 48950
+
+  13 Apr 2004; <agriffis@gentoo.org> pure-ftpd-1.0.18.ebuild:
+  Stable on alpha and ia64
+
+*pure-ftpd-1.0.18 (06 Apr 2004)
+
+  06 Apr 2004; Nick Hadaway <raker@gentoo.org> pure-ftpd-1.0.18.ebuild:
+  Version bump.  Adjusted pam-related stuff.  Added support for files
+  larger than 2GB.  Thanks to cvo on bug #45796 for noticing this 
+  missing option.
+
+  01 Feb 2004; Jon Portnoy <avenj@gentoo.org> pure-ftpd-1.0.17a.ebuild :
+  AMD64 keywords.
+
+*pure-ftpd-1.0.17a (22 Jan 2004)
+
+  22 Jan 2004; Nick Hadaway <raker@gentoo.org> pure-ftpd-1.0.17a.ebuild:
+  Version bump.  Upstream fixes include better SSL error responses and
+  other minor changes.  Nothing earth-shattering AFAICT.
+
+*pure-ftpd-1.0.16c (29 Oct 2003)
+
+  29 Oct 2003; Nick Hadaway <raker@gentoo.org> pure-ftpd-1.0.16c.ebuild:
+  Version bump.  A fix for PAM authentication and some other minor 
+  changes.
+
+  20 Oct 2003; Nick Hadaway <raker@gentoo.org> pure-ftpd-1.0.16b.ebuild:
+  Marking stable for all arches based on the suggestion of the upstream
+  authors.
+
+*pure-ftpd-1.0.16b (19 Oct 2003)
+
+  19 Oct 2003; Nick Hadaway <raker@gentoo.org> pure-ftpd-1.0.16b.ebuild:
+  Version bump.  Important bugfixes.
+
+  17 Oct 2003; Nick Hadaway <raker@gentoo.org> pure-ftpd-1.0.16a.ebuild:
+  Marked stable for x86.
+
+*pure-ftpd-1.0.16a (13 Aug 2003)
+
+  13 Aug 2003; Nick Hadaway <raker@gentoo.org> pure-ftpd-1.0.16a.ebuild:
+  Version bump.  Fixes for the ldap and pam portion of the install.
+  Added ssl to IUSE.  Other minor build cleanups.
+
+*pure-ftpd-1.0.15 (21 Jun 2003)
+
+  29 Jul 2003; Guy Martin <gmsoft@gentoo.org> pure-ftpd-1.0.15.ebuild :
+  Added hppa to KEYWORDS.
+
+  21 Jun 2003; Nick Hadaway <raker@gentoo.org> pure-ftpd-1.0.15.ebuild:
+  Bug fixes. :)  Just a bump is all that's needed.
+
+*pure-ftpd-1.0.14 (09 Feb 2003)
+
+  09 Jun 2003; Nick Hadaway <raker@gentoo.org> pure-ftpd-1.0.14.ebuild:
+  Changed license to BSD.
+
+  09 Feb 2003; Nick Hadaway <raker@gentoo.org> pure-ftpd-1.0.14.ebuild,
+  files/digest-pure-ftpd-1.0.14 :
+  Version bump.  Added some logic to complete ldap support as suggested
+  in bug #15367 by claer@unixlover.com
+
+*pure-ftpd-1.0.13a (28 Jan 2003)
+
+  29 Jan 2003; Nick Hadaway <raker@gentoo.org> pure-ftpd-1.0.13a.ebuild :
+  Removed the --with-largefile option per bug #11215
+
+  28 Jan 2003; Nick Hadaway <raker@gentoo.org> pure-ftpd-1.0.13a.ebuld,
+  files/digest-pure-ftpd-1.0.13a, files/pureftpd.rc6-r1 :
+  Version bump.  And changed the init script so start-stop-daemon
+  is utilized.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*pure-ftpd-1.0.12-r1 (25 Nov 2002)
+
+  25 Nov 2002; Mike Frysinger <vapier@gentoo.org> :
+  Added support for lfs #11215
+
+*pure-ftpd-1.0.12 (12 Oct 2002)
+
+  12 Oct 2002; Maik Schreiber <blizzy@gentoo.org> : New version, closes
+  bug #6000.
+
+*pure-ftpd-1.0.11-r1 (19 Apr 2002)
+
+  19 Apr 2002; Bart Verwilst <verwilst@gentoo.org> : Added fix, conf.d
+  file wasn't copied... this new revision (r1) should fix the problem.
+
+*pure-ftpd-1.0.11 (14 Apr 2002)
+
+  14 Apr 2002; Bart Verwilst <verwilst@gentoo.org> : Upgraded version,
+  removed old one.. New ebuild (1.0.11) includes pam fixes as well..
+
+*pure-ftpd-1.0.8-r1 (13 Feb 2003)
+ 
+  13 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
+*pure-ftpd-1.0.8 (01 Feb 2002)
+
+  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
diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
index e69de29bb2d1..cd634dc8e54c 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -0,0 +1,11 @@
+MD5 ea30ef6fd7422d10aa2ebf3e643f13d3 ChangeLog 8081
+MD5 67d38509ecd6a60f600f15bd875bf8cc metadata.xml 446
+MD5 f864c9b0a924eab2443c67ad734a2135 pure-ftpd-1.0.20-r1.ebuild 2764
+MD5 f8fe6ca5c41f7b54eee2c8b8beab8ee8 pure-ftpd-1.0.20-r2.ebuild 2793
+MD5 458b5d7567f55f4257ea1a6bfe3ff150 files/ftpusers 177
+MD5 88b77efaa5f85e19f351960a5617026d files/pure-ftpd.conf_d 2826
+MD5 db2ba34b2491a9fb5042f78c029f6386 files/pure-ftpd.rc6-r1 741
+MD5 86b7638f0ed01530fff30204ba6b5ce7 files/pure-ftpd.xinetd 238
+MD5 0c2b784d8fe62db6dae7e77e6ac5a602 files/digest-pure-ftpd-1.0.20-r1 69
+MD5 0c2b784d8fe62db6dae7e77e6ac5a602 files/digest-pure-ftpd-1.0.20-r2 69
+MD5 03fa7e601db23e23915f153f2fecf8a3 files/pure-ftpd-1.0.20-pam.patch 586
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.conf_d b/net-ftp/pure-ftpd/files/pure-ftpd.conf_d
index 996191a71ce7..7b4b76161f65 100644
--- a/net-ftp/pure-ftpd/files/pure-ftpd.conf_d
+++ b/net-ftp/pure-ftpd/files/pure-ftpd.conf_d
@@ -5,7 +5,15 @@
 #IS_CONFIGURED="yes"
 
 ## FTP Server,Port (separated by comma) ##
-PORT="-S 192.168.0.1,21"
+## If you prefer host names over IP addresses, it's your choice :
+## SERVER="-S ftp.rtchat.com,21"
+## IPv6 addresses are supported.
+## !!! WARNING !!!
+## Using an invalid IP will result in server not starting and reporting
+## a good start. Work is being done to solve that in:
+## http://bugs.gentoo.org/show_bug.cgi?id=75861
+#SERVER="-S 192.168.0.1,21"
+SERVER="-S 21"
 
 ## Number of simultaneous connections in total, and per ip ##
 MAX_CONN="-c 30"
@@ -15,16 +23,48 @@ MAX_CONN_IP="-C 10"
 DAEMON="-B"
 
 ## Don't allow uploads if the partition is more full then this var ##
-DISK_FULL="-k 95%"
+DISK_FULL="-k 90%"
 
 ## If your FTP server is behind a NAT box, uncomment this ##
 #USE_NAT="-N"
 
-## Authentication ##
+## Authentication (others are 'pam', ...)##
+## Further infos in the README file.
 AUTH="-l unix"
 
+## Change the maximum idle time. (in minutes. default 15)
+#TIMEOUT="-I <timeout>'"
 
+## Use that facility for syslog logging. It defaults to 'ftp'
+## Logging can be disabled with '-f none' .
+#LOG="-f facility"
 
 ## Misc. Others ##
-MISC_OTHER="-A -x"
+MISC_OTHER="-A -x -j -R -B"
 
+#
+# Use these inside $MISC_OTHER
+# More can be found on "http://pureftpd.sourceforge.net/README"
+#
+# -A [ chroot() everyone, but root ]
+# -e [ Only allow anonymous users ]
+# -E [ Only allow authenticated users. Anonymous logins are prohibited. ]
+# -i [ Disallow upload for anonymous users, whatever directory perms are ]
+# -j [ If the home directory of a user doesn't exist, auto-create it ]
+# -M [ Allow anonymous users to create directories. ]
+# -R [ Disallow users (even non-anonymous ones) usage of the CHMOD command ]
+# -x [ In  normal  operation mode, authenticated users can read/write
+#	files beginning with a dot ('.'). Anonymous users can't, for security reasons
+#	(like changing banners or a forgotten .rhosts). When '-x' is used, authenticated
+#	users can download dot-files, but not overwrite/create  them,  even  if they own
+#	them. ]
+# -X [ This  flag  is  identical  to  the  previous one (writing
+#       dot-files is prohibited), but in addition, users can't even *read* files and
+#       directories beginning with a dot (like "cd .ssh"). ]
+# -D [ List files beginning with a dot ('.') even when the client doesn't
+#      append the '-a' option to the list command. A workaround for badly
+#      configured FTP clients. ]
+# -G [ Disallow renaming. ]
+# -d [ Send various debugging messages to the syslog. ONLY for DEBUG ]
+# -F <fortune file> [ Display a fortune cookie on login. Check the README file ]
+# -H [ By default, fully-qualified host names are logged. The '-H' flag avoids host names resolution. ]
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.rc6-r1 b/net-ftp/pure-ftpd/files/pure-ftpd.rc6-r1
index 6e381cafa93e..dd6ed1fd1856 100644
--- a/net-ftp/pure-ftpd/files/pure-ftpd.rc6-r1
+++ b/net-ftp/pure-ftpd/files/pure-ftpd.rc6-r1
@@ -1,17 +1,17 @@
 #!/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-ftp/pure-ftpd/files/pure-ftpd.rc6-r1,v 1.1 2003/01/29 00:39:16 raker Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/files/pure-ftpd.rc6-r1,v 1.1.1.1 2005/11/30 09:36:23 chriswhite Exp $
 
 depend() {
 	need net
 }
 
 checkconfig() {
-        if [ -z "$IS_CONFIGURED" ] ; then
-                eerror "You need to setup /etc/conf.d/pure-ftpd first"
-                return 1
-        fi
+	if [ -z "$IS_CONFIGURED" ] ; then
+		eerror "You need to setup /etc/conf.d/pure-ftpd first"
+		return 1
+	fi
 }
 
 start() {
diff --git a/net-ftp/pure-ftpd/metadata.xml b/net-ftp/pure-ftpd/metadata.xml
index 033a4005ef9c..a1eaf9bde655 100644
--- a/net-ftp/pure-ftpd/metadata.xml
+++ b/net-ftp/pure-ftpd/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-  <email>raker@gentoo.org</email>
-  <name>Nick Hadaway</name>
+  <email>humpback@gentoo.org</email>
 </maintainer>
+<longdescription>Free (BSD), secure, production-quality and standard-conformant FTP server based upon Troll-FTPd. It doesn't provide useless bells and whistles, but focuses on efficiency and ease of use.</longdescription>
 </pkgmetadata>
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.20-r1.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.20-r1.ebuild
index 73b3cdcb8e33..f0e2d45c6cfe 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.20-r1.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.20-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-ftp/pure-ftpd/pure-ftpd-1.0.20-r1.ebuild,v 1.1 2005/02/02 19:01:54 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.20-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:22 chriswhite Exp $
 
 inherit eutils
 
@@ -10,16 +10,19 @@ SRC_URI="ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="pam mysql postgres ldap ssl caps vchroot"
 
 DEPEND="virtual/libc
 	pam? ( >=sys-libs/pam-0.75 )
-	mysql? ( >=dev-db/mysql-3* )
+	mysql? ( >=dev-db/mysql-3 )
 	postgres? ( >=dev-db/postgresql-7.2.2 )
 	ldap? ( >=net-nds/openldap-2.0.25 )
 	ssl? ( >=dev-libs/openssl-0.9.6g )"
 
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-ftpd )"
+
 src_compile() {
 	local myconf="--with-privsep"
 
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.20-r2.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.20-r2.ebuild
index 1bb9e7b6688b..6e08a1adc46c 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.20-r2.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.20-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-ftp/pure-ftpd/pure-ftpd-1.0.20-r2.ebuild,v 1.1 2005/08/31 12:59:21 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.20-r2.ebuild,v 1.1.1.1 2005/11/30 09:36:22 chriswhite Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="pam mysql postgres ldap ssl caps vchroot"
+IUSE="pam mysql postgres ldap ssl caps vchroot selinux"
 
 DEPEND="virtual/libc
 	net-ftp/ftpbase
@@ -22,7 +22,8 @@ DEPEND="virtual/libc
 	ssl? ( >=dev-libs/openssl-0.9.6g )"
 
 RDEPEND="${DEPEND}
-	net-ftp/ftpbase"
+	net-ftp/ftpbase
+	selinux? ( sec-policy/selinux-ftpd )"
 
 src_unpack() {
 
diff --git a/net-ftp/pureadmin/ChangeLog b/net-ftp/pureadmin/ChangeLog
index dc8f25a66098..c55fbed4f684 100644
--- a/net-ftp/pureadmin/ChangeLog
+++ b/net-ftp/pureadmin/ChangeLog
@@ -1,6 +1,32 @@
 # ChangeLog for net-ftp/pureadmin
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pureadmin/ChangeLog,v 1.1 2004/06/08 02:31:38 raker Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pureadmin/ChangeLog,v 1.1.1.1 2005/11/30 09:36:23 chriswhite Exp $
+
+*pureadmin-0.2.2 (06 Sep 2005)
+
+  06 Sep 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  +pureadmin-0.2.2.ebuild:
+  Bump and small cosmetic. Closes 2 or 3 bugs in portage.
+
+*pureadmin-0.1.11 (18 Sep 2004)
+
+  18 Sep 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  +pureadmin-0.1.11.ebuild:
+  Version update for 0.1.11, mostly a bump with some minor cosmetics
+
+*pureadmin-0.1.10-r1 18 Sep 2004
+
+  18 Sep 2004;  <> 
+  # INSERT ENTRY HERE
+
+  10 Jul 2004; Gustavo Felisberto <humpback@gentoo.org>; metadata.xml:
+  Taking maintainership of this package due to raker's retire.
+
+  10 Jun 2004; Aron Griffis <agriffis@gentoo.org> pureadmin-0.1.10.ebuild:
+  Fix use invocation
+
+  08 Jun 2004; David Holm <dholm@gentoo.org> pureadmin-0.1.10.ebuild:
+  Added to ~ppc.
 
 *pureadmin-0.1.10 (07 Jun 2004)
 
diff --git a/net-ftp/pureadmin/Manifest b/net-ftp/pureadmin/Manifest
index 04ca692a0bf2..2b07ae3e831e 100644
--- a/net-ftp/pureadmin/Manifest
+++ b/net-ftp/pureadmin/Manifest
@@ -1,2 +1,18 @@
-MD5 37c89b0fa9c873695fdeab39710ab7ff pureadmin-0.1.10.ebuild 974
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 410e8cbf35e8ba297ff5c4cad56e37ed pureadmin-0.1.11.ebuild 1452
+MD5 d64cf70fae92ac76c443557cd0a12df2 pureadmin-0.2.2.ebuild 1310
+MD5 02aff17b9bd325da310c2f92772bd940 pureadmin-0.1.10.ebuild 1447
+MD5 8017ac261df42c9f8c850ee4ca584136 ChangeLog 1162
+MD5 0c3c3bfe13b2bc8bbd31bb3754f330b1 metadata.xml 331
 MD5 be1c1c77d4ffc790654176a4eabe1e8d files/digest-pureadmin-0.1.10 68
+MD5 eb252f7f2582e68e667dc969c5bfe5d8 files/digest-pureadmin-0.1.11 68
+MD5 d2555c260ca574d57c4d14dbbf4f29d4 files/digest-pureadmin-0.2.2 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDHiyK8zY1VwezZiERAkaKAJ98EEUTXX8A72Z+geaChl0Lcv7Y8ACfdaCK
+yRO4PaFnQjZ7guSI8Xt8yGw=
+=6cvN
+-----END PGP SIGNATURE-----
diff --git a/net-ftp/pureadmin/metadata.xml b/net-ftp/pureadmin/metadata.xml
index 194b369637e4..7511914c29f9 100644
--- a/net-ftp/pureadmin/metadata.xml
+++ b/net-ftp/pureadmin/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-  <email>raker@gentoo.org</email>
+  <email>humpback@gentoo.org</email>
 </maintainer>
+<longdescription>Graphical tool used to make the management of PureFTPd a little easier.</longdescription>
 </pkgmetadata>
diff --git a/net-ftp/pureadmin/pureadmin-0.1.10.ebuild b/net-ftp/pureadmin/pureadmin-0.1.10.ebuild
index 3fc69b8aa7ab..6140d27a8964 100644
--- a/net-ftp/pureadmin/pureadmin-0.1.10.ebuild
+++ b/net-ftp/pureadmin/pureadmin-0.1.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-ftp/pureadmin/pureadmin-0.1.10.ebuild,v 1.1 2004/06/08 02:31:38 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pureadmin/pureadmin-0.1.10.ebuild,v 1.1.1.1 2005/11/30 09:36:23 chriswhite Exp $
 
 IUSE="debug gnome"
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/purify/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 
 DEPEND="sys-libs/glibc
 	sys-libs/zlib
@@ -36,7 +36,7 @@ src_install() {
 	rm -rf ${D}usr/share/doc/pureadmin
 
 	# Add a desktop entry for gnome if requested
-	if [ `use gnome` ]; then
+	if use gnome; then
 		rm ${D}/usr/share/applications
 		dodir /usr/share/applications
 		insinto /usr/share/applications
diff --git a/net-ftp/pureadmin/pureadmin-0.1.11.ebuild b/net-ftp/pureadmin/pureadmin-0.1.11.ebuild
index f0083b3b93b9..6e8934887d3c 100644
--- a/net-ftp/pureadmin/pureadmin-0.1.11.ebuild
+++ b/net-ftp/pureadmin/pureadmin-0.1.11.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-ftp/pureadmin/pureadmin-0.1.11.ebuild,v 1.1 2004/09/17 23:12:48 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pureadmin/pureadmin-0.1.11.ebuild,v 1.1.1.1 2005/11/30 09:36:23 chriswhite Exp $
 
 IUSE="debug gnome doc"
 
diff --git a/net-ftp/pureadmin/pureadmin-0.2.2.ebuild b/net-ftp/pureadmin/pureadmin-0.2.2.ebuild
index 678f733cb8b3..e4469d1aeccd 100644
--- a/net-ftp/pureadmin/pureadmin-0.2.2.ebuild
+++ b/net-ftp/pureadmin/pureadmin-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/net-ftp/pureadmin/pureadmin-0.2.2.ebuild,v 1.1 2005/09/06 22:39:09 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pureadmin/pureadmin-0.2.2.ebuild,v 1.1.1.1 2005/11/30 09:36:23 chriswhite Exp $
 
 inherit eutils
 IUSE="debug gnome doc"
diff --git a/net-ftp/tftp-hpa/ChangeLog b/net-ftp/tftp-hpa/ChangeLog
index 9246e21af3a5..ffce95fc0026 100644
--- a/net-ftp/tftp-hpa/ChangeLog
+++ b/net-ftp/tftp-hpa/ChangeLog
@@ -1,6 +1,48 @@
-# ChangeLog for net-misc/tftp-hpa
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/ChangeLog,v 1.1 2004/12/09 20:56:37 squinky86 Exp $
+# ChangeLog for net-ftp/tftp-hpa
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/ChangeLog,v 1.1.1.1 2005/11/30 09:36:23 chriswhite Exp $
+
+  10 Nov 2005; Brent Baude <ranger@gentoo.org> tftp-hpa-0.40.1.ebuild:
+  Marking tftp-hpa-0.40.1 ~ppc64 for bug 112068
+
+*tftp-hpa-0.40.1 (01 Oct 2005)
+
+  01 Oct 2005; Daniel Black <dragonheart@gentoo.org>
+  +tftp-hpa-0.40.1.ebuild:
+  version bump
+
+  18 Sep 2005; Mike Frysinger <vapier@gentoo.org> tftp-hpa-0.40-r1.ebuild:
+  Add support for USE=selinux #106354 by petre rodan and USE=tcpd/readline
+  #102867 by Francisco Javier.
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> tftp-hpa-0.40-r1.ebuild:
+  Mark 0.40-r1 stable on alpha
+
+  13 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  tftp-hpa-0.40-r1.ebuild:
+  Stable on ppc.
+
+  02 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  tftp-hpa-0.40-r1.ebuild:
+  Stable on sparc
+
+  30 Jul 2005; Mike Frysinger <vapier@gentoo.org> files/in.tftpd.confd,
+  files/in.tftpd.rc6, tftp-hpa-0.40-r1.ebuild:
+  Clean up init scripts and stabilize for #90784 by Daniel Webert.
+
+  29 Jul 2005; Marcelo Goes <vanquirius@gentoo.org> -tftp-hpa-0.33.ebuild,
+  -tftp-hpa-0.40.ebuild, tftp-hpa-0.40-r1.ebuild:
+  Really fix bug 83325. Thanks to Dan Eisenhut <daniel.eisenhut@med.ge.com>.
+
+*tftp-hpa-0.40-r1 (27 Feb 2005)
+
+  27 Feb 2005; Jon Hood <squinky86@gentoo.org> +metadata.xml,
+  +tftp-hpa-0.40-r1.ebuild:
+  Add sys-apps/tcp-wrappers to RDEPEND, #83325. Thanks Dan Eisenhut
+  <daniel.eisenhut@med.ge.com>.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
 
 *tftp-hpa-0.40 (09 Dec 2004)
 
@@ -21,7 +63,7 @@
   15 Jun 2004; Danny van Dyk <kugelfang@gentoo.org> tftp-hpa-0.34-r1.ebuild:
   Marked stable on amd64.
 
-  08 Jun 2004; Bryan �stergaard <kloeri@gentoo.org> tftp-hpa-0.34-r1.ebuild:
+  08 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> tftp-hpa-0.34-r1.ebuild:
   Stable on alpha.
 
   15 Apr 2004; Michael McCabe <randy@gentoo.org> tftp-hpa-0.34-r1.ebuild:
diff --git a/net-ftp/tftp-hpa/Manifest b/net-ftp/tftp-hpa/Manifest
index d4b14e6cd3aa..ceac31666232 100644
--- a/net-ftp/tftp-hpa/Manifest
+++ b/net-ftp/tftp-hpa/Manifest
@@ -1,19 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 10a3d480ef4dd44796f2729c44096788 tftp-hpa-0.40.ebuild 773
-MD5 9d2d35786e820ee9283b1e08f65fb398 tftp-hpa-0.34-r1.ebuild 765
-MD5 8b7adc004c259d2ef2413b5d08f9634c ChangeLog 2631
-MD5 c9bbe1f9a85f48a9f0db6d3a96243f49 tftp-hpa-0.33.ebuild 735
-MD5 910c847f2cd2866188b458fcf06172d0 files/in.tftpd.rc6 515
-MD5 2518048af53fc9da3ae6e3be5a244e8b files/digest-tftp-hpa-0.33 65
-MD5 64b89cea2b9b468a4c4068b0ec5382a4 files/digest-tftp-hpa-0.40 65
-MD5 4cf3b73c8361f35562a6933865d78e5f files/in.tftpd.confd 138
-MD5 2f7c453cd0fde112ffac93387966fad3 files/digest-tftp-hpa-0.34-r1 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBuLqdcAgAdbxYsnERAg4oAKCXwG4r7+czkLI050gkPTbkUS6ELgCcDICJ
-92xTD+wjTJPHO3NwY/b/p3M=
-=hnaE
------END PGP SIGNATURE-----
+MD5 5b4eaa90076a753abeee54d79030ee6b ChangeLog 4332
+MD5 0b942a8eed3507099acec26ffd91bd07 tftp-hpa-0.40-r1.ebuild 1019
+MD5 bddac557d39860e8f9a58edc258a63b0 tftp-hpa-0.40.1.ebuild 1025
+MD5 64b89cea2b9b468a4c4068b0ec5382a4 files/digest-tftp-hpa-0.40-r1 65
+MD5 ce9766cf2b5c3fcf0deab319ac68ad38 files/digest-tftp-hpa-0.40.1 67
+MD5 9e0867241bab97104a2d82fb8035725b files/in.tftpd.confd 145
+MD5 0deba94161c48e49f0e2ee02afde4940 files/in.tftpd.rc6 443
diff --git a/net-ftp/tftp-hpa/files/in.tftpd.confd b/net-ftp/tftp-hpa/files/in.tftpd.confd
index a755e418d7a3..99cb21cbb6c3 100644
--- a/net-ftp/tftp-hpa/files/in.tftpd.confd
+++ b/net-ftp/tftp-hpa/files/in.tftpd.confd
@@ -1,5 +1,7 @@
-# Config file for /etc/init.d/in.tftpd
-# Remove the -l if you use [x]inetd
+# /etc/init.d/in.tftpd
 
+# Path to server files from
 INTFTPD_PATH="/tftproot"
-INTFTPD_OPTS="-l -s ${INTFTPD_PATH}"
+
+# For more options, see tftpd(8)
+INTFTPD_OPTS="-s ${INTFTPD_PATH}"
diff --git a/net-ftp/tftp-hpa/files/in.tftpd.rc6 b/net-ftp/tftp-hpa/files/in.tftpd.rc6
index 58d27a638360..9e038624cd8c 100644
--- a/net-ftp/tftp-hpa/files/in.tftpd.rc6
+++ b/net-ftp/tftp-hpa/files/in.tftpd.rc6
@@ -1,21 +1,20 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/files/in.tftpd.rc6,v 1.1 2004/12/09 20:56:37 squinky86 Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/files/in.tftpd.rc6,v 1.1.1.1 2005/11/30 09:36:23 chriswhite Exp $
 
 depend() {
 	need net
 }
 
 start() {
-	ebegin "Starting in.tftpd"
-	start-stop-daemon --start --quiet \
-		--exec /usr/sbin/in.tftpd -- ${INTFTPD_OPTS}
+	ebegin "Starting tftpd"
+	/usr/sbin/in.tftpd -l ${INTFTPD_OPTS}
 	eend $?
 }
 
 stop() {
-	ebegin "Stopping in.tftpd"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/in.tftpd
+	ebegin "Stopping tftpd"
+	start-stop-daemon --stop --exec /usr/sbin/in.tftpd
 	eend $?
 }
diff --git a/net-ftp/tftp-hpa/tftp-hpa-0.40-r1.ebuild b/net-ftp/tftp-hpa/tftp-hpa-0.40-r1.ebuild
index bbfe89e6c2bf..8b278b07a0cd 100644
--- a/net-ftp/tftp-hpa/tftp-hpa-0.40-r1.ebuild
+++ b/net-ftp/tftp-hpa/tftp-hpa-0.40-r1.ebuild
@@ -1,26 +1,37 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/tftp-hpa-0.40-r1.ebuild,v 1.1 2005/02/27 22:31:41 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/tftp-hpa-0.40-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:23 chriswhite Exp $
 
 DESCRIPTION="port of the OpenBSD TFTP server"
-SRC_URI="mirror://kernel/software/network/tftp/${P}.tar.bz2"
 HOMEPAGE="http://www.kernel.org/pub/software/network/tftp/"
+SRC_URI="mirror://kernel/software/network/tftp/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~s390"
-IUSE=""
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc s390 sparc x86"
+IUSE="readline selinux tcpd"
 
-DEPEND="virtual/libc
+DEPEND="readline? ( sys-libs/readline )
+	tcpd? ( sys-apps/tcp-wrappers )
+	selinux? ( sec-policy/selinux-tftpd )
 	!virtual/tftp"
 PROVIDE="virtual/tftp"
 
+src_compile() {
+	econf \
+		$(use_with tcpd tcpwrappers) \
+		$(use_with readline) \
+		|| die
+	emake || die
+}
+
 src_install() {
-	make INSTALLROOT=${D} install || die
+	make INSTALLROOT="${D}" install || die
 	dodoc README* CHANGES INSTALL*
 
-	insinto /etc/conf.d
-	newins ${FILESDIR}/in.tftpd.confd in.tftpd
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/in.tftpd.rc6 in.tftpd
+	# iputils installs this
+	rm -f "${D}"/usr/share/man/man8/tftpd.8
+
+	newconfd "${FILESDIR}"/in.tftpd.confd in.tftpd
+	newinitd "${FILESDIR}"/in.tftpd.rc6 in.tftpd
 }
diff --git a/net-ftp/tftp-hpa/tftp-hpa-0.40.1.ebuild b/net-ftp/tftp-hpa/tftp-hpa-0.40.1.ebuild
index 93c744416ddb..2b9efd8296cb 100644
--- a/net-ftp/tftp-hpa/tftp-hpa-0.40.1.ebuild
+++ b/net-ftp/tftp-hpa/tftp-hpa-0.40.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/tftp-hpa-0.40.1.ebuild,v 1.1 2005/10/01 07:45:49 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/tftp-hpa-0.40.1.ebuild,v 1.1.1.1 2005/11/30 09:36:23 chriswhite Exp $
 
 DESCRIPTION="port of the OpenBSD TFTP server"
 HOMEPAGE="http://www.kernel.org/pub/software/network/tftp/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://kernel/software/network/tftp/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="readline selinux tcpd"
 
 DEPEND="readline? ( sys-libs/readline )
@@ -27,7 +27,7 @@ src_compile() {
 
 src_install() {
 	make INSTALLROOT="${D}" install || die
-	dodoc README* CHANGES 
+	dodoc README* CHANGES
 
 	# iputils installs this
 	rm -f "${D}"/usr/share/man/man8/tftpd.8
diff --git a/net-ftp/tnftp/ChangeLog b/net-ftp/tnftp/ChangeLog
index 1441119cea8c..ed1142d6183e 100644
--- a/net-ftp/tnftp/ChangeLog
+++ b/net-ftp/tnftp/ChangeLog
@@ -1,6 +1,58 @@
 # ChangeLog for net-ftp/tnftp
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/tnftp/ChangeLog,v 1.1 2003/09/04 21:58:35 g2boojum Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tnftp/ChangeLog,v 1.1.1.1 2005/11/30 09:36:23 chriswhite Exp $
+
+  25 Sep 2005; Sven Wegener <swegener@gentoo.org> -tnftp-20050103.ebuild,
+  -tnftp-20050610.ebuild:
+  Removed old ebuilds.
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> tnftp-20050625.ebuild:
+  Mark 20050625 stable on alpha
+
+  01 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org> tnftp-20050625.ebuild:
+  Stable on sparc
+
+*tnftp-20050625 (03 Jul 2005)
+
+  03 Jul 2005; Sven Wegener <swegener@gentoo.org> +tnftp-20050625.ebuild:
+  Version bump.
+
+*tnftp-20050610 (21 Jun 2005)
+
+  21 Jun 2005; Sven Wegener <swegener@gentoo.org> +tnftp-20050610.ebuild:
+  Version bump.
+
+  21 Mar 2005; Sven Wegener <swegener@gentoo.org> metadata.xml,
+  tnftp-20050103.ebuild:
+  Added ${ROOT} support. Taking over maintainership.
+
+  11 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> tnftp-20050103.ebuild:
+  Stable on alpha, bug 74704.
+
+  09 Jan 2005; Jason Wever <weeve@gentoo.org> tnftp-20050103.ebuild:
+  Marked stable on sparc wrt security bug #74704.
+
+*tnftp-20050103 (08 Jan 2005)
+
+  08 Jan 2005; Grant Goodyear <g2boojum@gentoo.org> -tnftp-20030825.ebuild,
+  +tnftp-20050103.ebuild:
+  Version bump to fix 74704.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  tnftp-20030825.ebuild:
+  virtual/glibc -> virtual/libc
+
+  05 Jan 2004; Jon Portnoy <avenj@gentoo.org> tnftp-20030825.ebuild :
+  AMD64 keywords.
+
+  05 Dec 2003; Grant Goodyear <g2boojum@gentoo.org> tnftp-20030825.ebuild:
+  Whoops, not yet tested on ppc.
+
+  05 Dec 2003; Grant Goodyear <g2boojum@gentoo.org> tnftp-20030825.ebuild:
+  Marking stable on all listed archs
+
+  20 Oct 2003; Jason Wever <weeve@gentoo.org> tnftp-20030825.ebuild:
+  Added sparc keyword to help resolve bug #31076.
 
 *tnftp-20030825 (04 Sep 2003)
 
diff --git a/net-ftp/tnftp/Manifest b/net-ftp/tnftp/Manifest
index 046e820f8f43..68b0bebf95d0 100644
--- a/net-ftp/tnftp/Manifest
+++ b/net-ftp/tnftp/Manifest
@@ -1,3 +1,14 @@
-MD5 c7c9e3f69da0cd5b8831073940ed5896 tnftp-20030825.ebuild 1600
-MD5 8c0a3b55cce63fa2765ef8e628e73653 .tnftp-20030825.ebuild.swp 12288
-MD5 4ee30a080db3ba7e966759ff580b6ca1 files/digest-tnftp-20030825 66
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ddaeba3603f3df1236af97303ffafd4d ChangeLog 1992
+MD5 204495ee0ac464ba5ccdb31491961e8b files/digest-tnftp-20050625 66
+MD5 1f7353efef0082c74884b4a97c1191ba metadata.xml 298
+MD5 ebe8995ccc09a6e868514b1321400116 tnftp-20050625.ebuild 1012
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDNqTAI1lqEGTUzyQRAo75AKDGy+HeZ2WPtZ1DG5lU0G3vXmdvqQCffPxW
+HwEJICHAdjQ6FzBk8I8sH2A=
+=0+wc
+-----END PGP SIGNATURE-----
diff --git a/net-ftp/tnftp/metadata.xml b/net-ftp/tnftp/metadata.xml
index 20ce219711a2..287a13679b72 100644
--- a/net-ftp/tnftp/metadata.xml
+++ b/net-ftp/tnftp/metadata.xml
@@ -2,4 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>no-herd</herd>
+<maintainer>
+	<email>swegener@gentoo.org</email>
+	<name>Sven Wegenery</name>
+	<description>Primary Maintainer</description>
+</maintainer>
 </pkgmetadata>
diff --git a/net-ftp/tnftp/tnftp-20050625.ebuild b/net-ftp/tnftp/tnftp-20050625.ebuild
index 4dae761ca246..c29ea78d063f 100644
--- a/net-ftp/tnftp/tnftp-20050625.ebuild
+++ b/net-ftp/tnftp/tnftp-20050625.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/tnftp/tnftp-20050625.ebuild,v 1.1 2005/07/03 10:52:57 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tnftp/tnftp-20050625.ebuild,v 1.1.1.1 2005/11/30 09:36:23 chriswhite Exp $
 
 DESCRIPTION="NetBSD FTP client with several advanced features"
 SRC_URI="ftp://ftp.netbsd.org/pub/NetBSD/misc/${PN}/${P}.tar.gz
@@ -9,7 +9,7 @@ HOMEPAGE="ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/"
 
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="~x86 ~sparc ~ppc ~alpha ~amd64"
+KEYWORDS="alpha ~amd64 ~ppc sparc x86"
 IUSE="ipv6"
 
 DEPEND=">=sys-libs/ncurses-5.1"
diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog
index 831b3496f9ac..756104374e5f 100644
--- a/net-ftp/vsftpd/ChangeLog
+++ b/net-ftp/vsftpd/ChangeLog
@@ -1,13 +1,251 @@
 # ChangeLog for net-ftp/vsftpd
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/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-ftp/vsftpd/ChangeLog,v 1.1.1.1 2005/11/30 09:36:28 chriswhite Exp $
 
-*vsftpd-1.0.1 (1 Feb 2002)
+*vsftpd-2.0.3-r2 (20 Oct 2005)
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  20 Oct 2005; Roy Marples <uberlord@gentoo.org>
+  +files/vsftpd-2.0.3-gentoo.patch, +files/vsftpd.init, -files/vsftpd.pam,
+  -files/vsftpd.pam-include, +vsftpd-2.0.3-r2.ebuild:
+  New init script which allows for running multiple vsftpd daemons with
+  different config files - works like net.ethx scripts, #97140
+
+  Punted unused pam files.
+
+  Patch now updates the default vsftpd.conf for using /etc/vsftpd instead
+  of maintaining our own config.
+
+  02 Oct 2005; MATSUU Takuto <matsuu@gentoo.org> vsftpd-2.0.3-r1.ebuild:
+  Stable on sh
+
+  19 Sep 2005; Roy Marples <uberlord@gentoo.org> -vsftpd-1.2.2.ebuild,
+  vsftpd-2.0.3-r1.ebuild:
+  New USE flag selinux now depends on the selinux-ftpd policy, wrt #106355.
+  
+  Punted the old 1.2.2 ebuild - 2.0.3-r1 stable on all arches :)
+
+  17 Sep 2005; Aron Griffis <agriffis@gentoo.org> vsftpd-2.0.3-r1.ebuild:
+  Mark 2.0.3-r1 stable on alpha
+
+  14 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  vsftpd-2.0.3-r1.ebuild:
+  Stable on ppc.
+
+  08 Aug 2005; Markus Rothe <corsair@gentoo.org> vsftpd-2.0.3-r1.ebuild:
+  Stable on ppc64
+
+  03 Aug 2005; Roy Marples <uberlord@gentoo.org> files/vsftpd.conf:
+  Fixed vsftpd.conf example wrt bug #101137
+
+  28 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  vsftpd-2.0.3-r1.ebuild:
+  Stable on sparc
+
+  27 Jul 2005; Roy Marples <uberlord@gentoo.org>
+  -files/vsftpd-2.0.1-gentoo.diff, -vsftpd-2.0.2.ebuild,
+  -vsftpd-2.0.3.ebuild, vsftpd-2.0.3-r1.ebuild:
+  Stable on amd64 and x86.
+
+*vsftpd-2.0.3-r1 (28 Jun 2005)
+
+  28 Jun 2005; Roy Marples <uberlord@gentoo.org>
+  +files/vsftpd-2.0.3-gentoo.diff, +vsftpd-2.0.3-r1.ebuild,
+  files/vsftpd.conf:
+  Added dependency on ftpbase - fixes #96258
+  
+  Changed default options of /etc/vsftpd/vsftpd.something
+  to /etc/vsftpd/something - exception is /etc/vsftpd/vsftpd.conf
+  This makes is more consistent with the default vsftpd installation.
   
-  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.
+  Default log file is now /var/log/vsftpd.log - which is the package default
+  
+  Default PAM service name is now ftp again
+
+  07 Jun 2005; Roy Marples <uberlord@gentoo.org>
+  -files/vsftpd-1.0.1-gentoo.diff, -files/vsftpd-1.2.0-gentoo.diff.bz2,
+  metadata.xml, -vsftpd-1.0.1-r1.ebuild, -vsftpd-1.2.0-r1.ebuild,
+  -vsftpd-1.2.1.ebuild, -vsftpd-2.0.1.ebuild, vsftpd-2.0.3.ebuild:
+  punted old versions
+  ipv6 flag dropped for 2.0.3 - I'm sure xinetd users can add the ipv6
+  flag to the /etc/xinetd.d/vsftpd themselves if needed - fixes #75609
+  added background=YES and listen=YES to the default config - fixes #78347
+  tweaked DEPEND to work with sys-libs/pam and virtual/pam
+
+*vsftpd-2.0.3 (07 Jun 2005)
+
+  07 Jun 2005; Roy Marples <uberlord@gentoo.org> files/vsftpd.init.d,
+  +files/vsftpd.pam-include, files/vsftpd.xinetd, files/vsftpd.xinetd.ipv6,
+  metadata.xml, +vsftpd-2.0.3.ebuild:
+  init.d script now checks for listen=YES or listen_ipv6=YES - fixes #54228
+  xinetd USE flag added to make support of it optional - fixes #75892
+  USERID removed from xinetd files - fixes #78764
+  init.d script now does a "killall vsftpd" when stopping - fixes #81819
+  cleaner ebuild - fixes #84733 thanks to Diego Pettenò <flameeyes@gentoo.org>
+
+*vsftpd-2.0.2 (13 Mar 2005)
+
+  13 Mar 2005; <solar@gentoo.org> +vsftpd-2.0.2.ebuild:
+  - version bump. fixes an issue with SSL secured data connections dropping out
+
+  09 Feb 2005; <solar@gentoo.org> vsftpd-2.0.1.ebuild:
+  - remove fPIC filtering on vsftpd-2.0.1 (no longer needed) bug #74519
+
+  09 Feb 2005; Jeffrey Forman <jforman@gentoo.org> vsftpd-2.0.1.ebuild:
+  didnt compile, fixed the ebuild per bug 79202, thanks Rob!
+
+  22 Jan 2005; <solar@gentoo.org> vsftpd-1.2.2.ebuild:
+  - remove fPIC filtering on vsftpd-1.2.2. (no longer needed) bug #74519
+
+  17 Jan 2005; Jeffrey Forman <jforman@gentoo.org> vsftpd-2.0.1.ebuild:
+  Add support to build vsftpd without pam, bug 65981, thanks Rob!
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  30 Sep 2004; Jeffrey Forman <jforman@gentoo.org> files/vsftpd.init.d:
+  updated init.d/vsftpd to remove source cmd per bug #51908
+
+  28 Sep 2004; Tom Gall <tgall@gentoo.org> vsftpd-1.2.2.ebuild, 
+  +vsftpd-1.2.2-ppc64.diff:
+  fix bug #64175 for ppc64
+
+  25 Sep 2004; Tom Martin <slarti@gentoo.org> vsftpd-2.0.1.ebuild:
+  Fixed the epatch line in the ebuild to not include `.bz2' (see jforman's
+  comment below).
+
+  24 Sep 2004; Jeffrey Forman <jforman@gentoo.org> vsftpd-2.0.1.ebuild:
+  added patch for gentoo-friendly file locations, wrt bug #65116
+
+*vsftpd-2.0.1 (23 Sep 2004)
+
+  23 Sep 2004; Jeffrey Forman <jforman@gentoo.org> vsftpd-2.0.1.ebuild:
+  ~ on all arch's for testing
+
+  23 Sep 2004; Jeffrey Forman <jforman@gentoo.org> :
+  New ebuild, vsftp-2.0.1, -$arch on all. Adds SSL/TLS support
+
+  13 Jul 2004; Tom Gall <tgall@gentoo.org> vsftpd-1.2.2.ebuild:
+  stable on ppc64, bug #53116
+
+  15 Jun 2004; Brandon Hale <tseng@gentoo.org> vsftpd-1.2.2.ebuild:
+  Stable on x86, bug #53116
+
+  15 Jun 2004; Jason Wever <weeve@gentoo.org> vsftpd-1.2.2.ebuild:
+  Marked stable on sparc wrt bug #53116.
+
+  15 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> vsftpd-1.2.2.ebuild:
+  Stable on alpha, bug 53116.
+
+*vsftpd-1.2.2 (15 Jun 2004)
+
+  15 Jun 2004; <solar@gentoo.org> vsftpd-1.2.2.ebuild:
+  security version bump bug #53116
+
+  10 Jun 2004; Aron Griffis <agriffis@gentoo.org> vsftpd-1.2.0-r1.ebuild,
+  vsftpd-1.2.1.ebuild:
+  Fix use invocation
+
+  05 Jun 2004; Michael Hanselmann <hansmi@gentoo.org> vsftpd-1.2.1.ebuild:
+  Added ~ppc to KEYWORDS.
+
+  03 Jun 2004; Tom Gall <tgall@gentoo.org> vsftpd-1.2.1.ebuild:
+  stable on ppc64, bug #52907
+
+  30 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> vsftpd-1.2.0-r1.ebuild,
+  vsftpd-1.2.1.ebuild:
+  move filter-flags into src_unpack()
+
+  29 Mar 2004; <randy@gentoo.org> vsftpd-1.2.1.ebuild:
+  adding s390 keywords
+
+  14 Mar 2004; Jason Wever <weeve@gentoo.org> vsftpd-1.2.1.ebuild:
+  Stable on sparc.
+
+  02 Mar 2004; Jason Wever <weeve@gentoo.org> vsftpd-1.2.1.ebuild:
+  Added the super spiffy ~sparc keyword :)
+
+  27 Feb 2004; Rajiv Aaron Manglani <rajiv@gentoo.org> vsftpd-1.2.1.ebuild:
+  marked stable on x86.
+
+  26 Feb 2004; Aron Griffis <agriffis@gentoo.org> vsftpd-1.2.1.ebuild:
+  stable on alpha and ia64
+
+  01 Feb 2004; Jon Portnoy <avenj@gentoo.org> vsftpd-1.2.1.ebuild :
+  AMD64 keywords.
+
+  07 Jan 2004; Jason Wever <weeve@gentoo.org> vsftpd-1.2.0-r1.ebuild:
+  Marked stable on sparc.
+
+*vsftpd-1.2.1 (10 Dec 2003)
+
+  10 Dec 2003; Rajiv Aaron Manglani <rajiv@gentoo.org> vsftpd-1.2.1.ebuild,
+  files/vsftpd-1.2.1-gentoo.diff.bz2:
+  version bump. thanks to matt taylor for a new patch file.
+  fixes bug #33648.
+
+  10 Dec 2003; Rajiv Aaron Manglani <rajiv@gentoo.org> vsftpd-1.1.2.ebuild,
+  vsftpd-1.1.3-r1.ebuild, vsftpd-1.1.3.ebuild, vsftpd-1.2.0.ebuild,
+  files/vsftpd-1.1.2-gentoo.diff, files/vsftpd-1.1.3-gentoo.diff,
+  files/vsftpd-1.1.3-ipv6.patch:
+  removed old ebuild files.
+
+  10 Dec 2003; Rajiv Aaron Manglani <rajiv@gentoo.org> files/vsftpd.init.d:
+  check for 'listen' in conf file. bug #33648.
+
+  08 Dec 2003; <spider@gentoo.org> vsftpd-1.1.3-r1.ebuild,
+  vsftpd-1.1.3.ebuild, vsftpd-1.2.0-r1.ebuild, vsftpd-1.2.0.ebuild:
+  QA drive, fixing bug 35127
+
+  09 Sep 2003; Rajiv Aaron Manglani <rajiv@gentoo.org> vsftpd-1.2.0-r1.ebuild:
+  bumped vsftpd-1.2.0-r1.ebuild to x86 stable.
+
+*vsftpd-1.2.0-r1 (02 Sep 2003)
+
+  02 Sep 2003; Rajiv Aaron Manglani <rajiv@gentoo.org> vsftpd-1.2.0-r1.ebuild,
+  files/vsftpd.conf.d, files/vsftpd.init.d:
+  added init.d and conf.d files for running vsftpd standalone.
+
+  31 Jul 2003; Tavis Ormandy <taviso@gentoo.org> vsftpd-1.2.0.ebuild:
+  reported broken on alpha.
+
+*vsftpd-1.2.0 (09 Jun 2003)
+
+  09 Jun 2003; Nick Hadaway <raker@gentoo.org> vsftpd-1.2.0.ebuild.
+  files/vsftpd-1.2.0-gentoo.diff.bz2:
+  Version bump.  Fixed ipv6 logic for xinetd.  Now ipv6 support is 
+  included in the source so no patch is needed.  Updated the gentoo 
+  patch for this version.
+
+*vsftpd-1.1.3-r1 (06 Apr 2003)
+
+  05 Jun 2003; Donny Davies <woodchip@gentoo.org> vsftpd-1.1.3-r1.ebuild:
+  Fix #21079.
+
+  06 Feb 2003; Guy Martin <gmsoft@gentoo.org> vsftpd-1.1.3-r1.ebuild, files/digest-vsftpd-1.1.3-r1,
+  files/vsftpd-1.1.3-ipv6.patch, files/vsftpd.xinetd.ipv6 :
+  Added ipv6 support. Added ~hppa to KEYWORDS.
+
+  24 Feb 2003; Donny Davies <woodchip@gentoo.org> : Fix my ebuild.
+
+*vsftpd-1.1.3 (15 Feb 2003)
+
+  18 Feb 2003;  <seemant@gentoo.org> vsftpd-1.1.3.ebuild :
+  filter -fPIC.
+
+  15 Feb 2003; Donny Davies <woodchip@gentoo.org> : Chase latest release.
+  #12435; optional pam and tcpd support.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*vsftpd-1.1.2 (19 Oct 2002)
+
+  19 Oct 2002; Donny Davies <woodchip@gentoo.org> :
+  Chase latest release.  Tidy up patch.  Make vsftpd.pam pam_stack aware.
+
+*vsftpd-1.0.1-r1 (3 May 2002)
+
+  20 Sep 2002; Mike Frysinger <vapier@gentoo.org> :
+  Added HOMEPAGE variable and set SRC_URI to the homepage download location.
+
+  3 May 2002; Donny Davies <woodchip@gentoo.org> :
+  Added LICENSE, SLOT.
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index e69de29bb2d1..c723b282a5fa 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -0,0 +1,13 @@
+MD5 3b54910d381bac92f7784c3843d986e1 ChangeLog 9214
+MD5 c3af0a9f9ed1ea8eb162da439b88bf78 files/digest-vsftpd-2.0.3-r1 64
+MD5 c3af0a9f9ed1ea8eb162da439b88bf78 files/digest-vsftpd-2.0.3-r2 64
+MD5 10727329a1de642694a73e3655774015 files/vsftpd-2.0.3-gentoo.diff 5598
+MD5 2008f701278d9e59c755433c8e987606 files/vsftpd-2.0.3-gentoo.patch 7128
+MD5 d0f6c4bc146ade78fdcc3ecc94ffece2 files/vsftpd.conf 3842
+MD5 a61f83e896d2058a22f9fb3d2b2b1b25 files/vsftpd.conf.d 294
+MD5 8df8f4a0d1fac0ddf21aab9f9c11fa1c files/vsftpd.init 1628
+MD5 b0551ddc57103f1dcca71524691540a0 files/vsftpd.init.d 1038
+MD5 8578d5c3f50e7b090ba023dfa626ec89 files/vsftpd.xinetd 432
+MD5 0451b23327c004752edf415e25931d07 metadata.xml 344
+MD5 dc7c446f859492b83b73eb59ee07e560 vsftpd-2.0.3-r1.ebuild 2032
+MD5 5a4c26e8f75ee0f92d48815bb9fb14e4 vsftpd-2.0.3-r2.ebuild 2409
diff --git a/net-ftp/vsftpd/files/vsftpd.conf b/net-ftp/vsftpd/files/vsftpd.conf
index f7334e984824..0bdac320f7ba 100644
--- a/net-ftp/vsftpd/files/vsftpd.conf
+++ b/net-ftp/vsftpd/files/vsftpd.conf
@@ -3,6 +3,12 @@
 #
 # See man 5 vsftpd.conf for more information.
 #
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.conf,v 1.1.1.1 2005/11/30 09:36:29 chriswhite Exp $
+
+# Enable vsftpd to run as a standalone daemon
+# Comment these two out to run under inetd or xinetd
+background=YES
+listen=YES
 
 # Allow anonymous FTP?
 anonymous_enable=YES
@@ -45,9 +51,8 @@ xferlog_enable=YES
 # If you want, you can have your log file in standard ftpd xferlog format
 #xferlog_std_format=YES
 
-# You may override where the log file goes if you like. The default is shown
-# below.
-xferlog_file=/var/log/vsftpd/vsftpd.log
+# You may override where the log file goes if you like.
+xferlog_file=/var/log/vsftpd.log
 
 # You may change the default value for timing out an idle session.
 #idle_session_timeout=600
@@ -84,14 +89,14 @@ nopriv_user=nobody
 # useful for combatting certain DoS attacks.
 #deny_email_enable=YES
 # (default follows)
-#banned_email_file=/etc/vsftpd/vsftpd.banned_emails
+#banned_email_file=/etc/vsftpd/banned_emails
 
 # You may specify an explicit list of local users to chroot() to their home
 # directory. If chroot_local_user is YES, then this list becomes a list of
 # users to NOT chroot().
 #chroot_list_enable=YES
 # (default follows)
-#chroot_list_file=/etc/vsftpd/vsftpd.chroot_list
+#chroot_list_file=/etc/vsftpd/chroot_list
 
 # You may activate the "-R" option to the builtin ls. This is disabled by
 # default to avoid remote users being able to cause excessive I/O on large
diff --git a/net-ftp/vsftpd/files/vsftpd.conf.d b/net-ftp/vsftpd/files/vsftpd.conf.d
index 5ef596e7e5b7..761c1ec06d11 100644
--- a/net-ftp/vsftpd/files/vsftpd.conf.d
+++ b/net-ftp/vsftpd/files/vsftpd.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-ftp/vsftpd/files/vsftpd.conf.d,v 1.1 2003/09/03 01:41:05 rajiv Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.conf.d,v 1.1.1.1 2005/11/30 09:36:29 chriswhite Exp $
 
 # Config file for /etc/init.d/vsftpd
 
diff --git a/net-ftp/vsftpd/files/vsftpd.init b/net-ftp/vsftpd/files/vsftpd.init
index ba20ef50fcff..e6f0e22026cc 100644
--- a/net-ftp/vsftpd/files/vsftpd.init
+++ b/net-ftp/vsftpd/files/vsftpd.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 2003-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.init,v 1.1 2005/10/20 09:50:44 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.init,v 1.1.1.1 2005/11/30 09:36:29 chriswhite Exp $
 
 VSFTPD_CONF="${VSFTPD_CONF:-/etc/vsftpd/vsftpd.conf}"
 VSFTPD_NAME="${myservice##*.}"
diff --git a/net-ftp/vsftpd/files/vsftpd.init.d b/net-ftp/vsftpd/files/vsftpd.init.d
index 77d20d5c357f..46f1eb3db0bb 100644
--- a/net-ftp/vsftpd/files/vsftpd.init.d
+++ b/net-ftp/vsftpd/files/vsftpd.init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# 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-ftp/vsftpd/files/vsftpd.init.d,v 1.1 2003/09/03 01:41:05 rajiv Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.init.d,v 1.1.1.1 2005/11/30 09:36:29 chriswhite Exp $
 
 depend() {
 	need net
@@ -9,29 +9,33 @@ depend() {
 }
 
 checkconfig() {
-	if [ ! -e ${VSFTPD_CONF} ] ; then
+	if [[ ! -e ${VSFTPD_CONF} ]] ; then
 		eerror "Please setup ${VSFTPD_CONF} before starting vsftpd"
 		eerror "There are sample configurations in /usr/share/doc/vsftpd"
 		return 1
-	else
-		source ${VSFTPD_CONF}
-		if [ "${background}" != "YES" ] ; then
-			eerror "${VSFTPD_CONF} must contain background=YES in order to start vsftpd from /etc/init.d/vsftpd"
-			return 2
-		fi
 	fi
+
+	if grep -q "^background=YES" ${VSFTPD_CONF} ; then
+		local c=$( grep -c "^\(listen\|listen_ipv6\)=YES" "${VSFTPD_CONF}" )
+		[[ ${c} == "1" ]] && return 0
+	fi
+		
+	eerror "${VSFTPD_CONF} must contain background=YES and either"
+	eerror "listen=YES or listen_ipv6=YES (but not both)"
+	eerror "in order to start vsftpd from /etc/init.d/vsftpd"
+	return 1
 }
 
 start() {
 	checkconfig || return 1
 	ebegin "Starting vsftpd"
-	start-stop-daemon --start --quiet \
-		--exec /usr/sbin/vsftpd ${VSFTPD_CONF}
+	start-stop-daemon --start \
+		--exec /usr/sbin/vsftpd -- ${VSFTPD_CONF}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping vsftpd"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/vsftpd
+	killall vsftpd
 	eend $?
 }
diff --git a/net-ftp/vsftpd/files/vsftpd.xinetd b/net-ftp/vsftpd/files/vsftpd.xinetd
index d77213fa5ca3..8f1a879313bb 100644
--- a/net-ftp/vsftpd/files/vsftpd.xinetd
+++ b/net-ftp/vsftpd/files/vsftpd.xinetd
@@ -1,5 +1,6 @@
 # default: off
 # description: Vsftpd is an FTP server, designed to be secure.
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.xinetd,v 1.1.1.1 2005/11/30 09:36:29 chriswhite Exp $
 
 service ftp
 {
@@ -8,8 +9,7 @@ service ftp
 	user            = root
 	server          = /usr/sbin/vsftpd
 	server_args     = /etc/vsftpd/vsftpd.conf
-	log_on_success  += DURATION USERID
-	log_on_failure  += USERID
+	log_on_success  += DURATION 
 	nice            = 10
 	disable         = yes
 }
diff --git a/net-ftp/vsftpd/metadata.xml b/net-ftp/vsftpd/metadata.xml
index fe80010c2d52..37e30d80015b 100644
--- a/net-ftp/vsftpd/metadata.xml
+++ b/net-ftp/vsftpd/metadata.xml
@@ -1,9 +1,12 @@
-<?xml version="1.0" encoding="UTF-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>rajiv@gentoo.org</email>
-  <name>Rajiv Manglani</name>
-</maintainer>
+	<maintainer>
+		<email>uberlord@gentoo.org</email>
+		<name>Roy Marples</name>
+	</maintainer>
+	<longdescription>
+		Very Secure FTP Daemon written with speed, size and security
+		in mind
+	</longdescription>
 </pkgmetadata>
diff --git a/net-ftp/vsftpd/vsftpd-2.0.3-r1.ebuild b/net-ftp/vsftpd/vsftpd-2.0.3-r1.ebuild
index 0d7c415bfb14..63cfc63b1b21 100644
--- a/net-ftp/vsftpd/vsftpd-2.0.3-r1.ebuild
+++ b/net-ftp/vsftpd/vsftpd-2.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-ftp/vsftpd/vsftpd-2.0.3-r1.ebuild,v 1.1 2005/06/28 14:53:40 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.0.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:28 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
@@ -10,14 +10,15 @@ SRC_URI="ftp://vsftpd.beasts.org/users/cevans/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="pam tcpd ssl xinetd"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 s390 sh sparc x86"
+IUSE="pam tcpd ssl selinux xinetd"
 
 DEPEND="pam? ( || ( virtual/pam sys-libs/pam ) )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 	ssl? ( >=dev-libs/openssl-0.9.7d )"
 RDEPEND="${DEPEND}
 	net-ftp/ftpbase
+	selinux? ( sec-policy/selinux-ftpd )
 	xinetd? ( sys-apps/xinetd )"
 
 src_unpack() {
@@ -70,6 +71,6 @@ pkg_preinst() {
 	# so that our default config works under xinetd - fixes #78347
 	if use xinetd ; then
 		sed -i '/\(background=YES\|listen=YES\)/s/^/#/g' \
-			${IMAGE}/etc/vsftpd/vsftpd.conf.sample
+			${IMAGE}/etc/vsftpd/vsftpd.conf.example
 	fi
 }
diff --git a/net-ftp/vsftpd/vsftpd-2.0.3-r2.ebuild b/net-ftp/vsftpd/vsftpd-2.0.3-r2.ebuild
index 72e7a337aae8..6bcad55a9126 100644
--- a/net-ftp/vsftpd/vsftpd-2.0.3-r2.ebuild
+++ b/net-ftp/vsftpd/vsftpd-2.0.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-ftp/vsftpd/vsftpd-2.0.3-r2.ebuild,v 1.1 2005/10/20 09:50:44 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.0.3-r2.ebuild,v 1.1.1.1 2005/11/30 09:36:28 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
diff --git a/net-ftp/weex/ChangeLog b/net-ftp/weex/ChangeLog
index 03c4461fc610..30f6a7bf2ef2 100644
--- a/net-ftp/weex/ChangeLog
+++ b/net-ftp/weex/ChangeLog
@@ -1,6 +1,44 @@
 # ChangeLog for net-ftp/weex
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/weex/ChangeLog,v 1.1 2003/05/08 11:34:38 phosphan Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/weex/ChangeLog,v 1.1.1.1 2005/11/30 09:36:23 chriswhite Exp $
+
+*weex-2.6.1.5-r1 (04 Oct 2005)
+
+  04 Oct 2005; Patrick Kursawe <phosphan@gentoo.org>
+  +files/formatstring.patch, -weex-2.6.1.5.ebuild, +weex-2.6.1.5-r1.ebuild:
+  Security fix, see bug #107849
+
+  26 Jul 2005; David Holm <dholm@gentoo.org> weex-2.6.1.5.ebuild:
+  Added to ~ppc.
+
+  17 Nov 2004; Michael Sterrett <mr_bones_@gentoo.org> weex-2.6.1.5.ebuild:
+  fix inherit for bug #71472; tidy
+
+  25 Sep 2004; Tom Martin <slarti@gentoo.org> weex-2.6.1.5.ebuild:
+  Stable on amd64.
+
+  18 Aug 2004; Patrick Kursawe <phosphan@gentoo.org> weex-2.6.1.5.ebuild:
+  Applying patch unconditionally now.
+
+  09 Aug 2004; Tom Martin <slarti@gentoo.org> weex-2.6.1.5.ebuild:
+  Added va_list patch to allow compilation on amd64, patch courtesy of Kugelfang
+  <kugelfang@gentoo.org>. Marked ~amd64.
+
+*weex-2.6.1.5 (22 Mar 2004)
+
+  22 Mar 2004; Patrick Kursawe <phosphan@gentoo.org> weex-2.6.1.5.ebuild,
+  weex-3.0.0_pre20030508.ebuild:
+  Latest stable version from sourceforge.
+
+  22 Mar 2004; Patrick Kursawe <phosphan@gentoo.org>
+  weex-3.0.0_pre20030508.ebuild:
+  The sourceforge weex project finally released some files, and a developer
+  asked to use 2.6.1.5 instead of the old 3.x snapshot which is known to have
+  problems.
+
+  24 Jun 2003; Patrick Kursawe <phosphan@gentoo.org>
+  weex-3.0.0_pre20030508.ebuild:
+  stable for x86
 
 *weex-3.0.0_pre20030508 (08 May 2003)
 
diff --git a/net-ftp/weex/Manifest b/net-ftp/weex/Manifest
index 2a8341bc7903..7f0682c3198d 100644
--- a/net-ftp/weex/Manifest
+++ b/net-ftp/weex/Manifest
@@ -1,3 +1,6 @@
-MD5 c26c15dad849006c462d92bb9b598b16 weex-3.0.0_pre20030508.ebuild 466
-MD5 a3fd6aba2bddbb27eefb691ca2212e38 ChangeLog 336
-MD5 295ac1573d3a5af7bb4d1ed2b006e405 files/digest-weex-3.0.0_pre20030508 75
+MD5 1d017917e19c8180a2790700ef7c168a weex-2.6.1.5-r1.ebuild 813
+MD5 f166f47c2cee77bb586e82010ca6dcc6 ChangeLog 1731
+MD5 b742040acaeddc3798a21739bd59e8aa metadata.xml 224
+MD5 522552e03b82ab5669fd21c558290691 files/weex-2.6.1.5-va_list.patch 559
+MD5 5c1d3c1f5b7e5fa31f80aab64f178b94 files/formatstring.patch 291
+MD5 f1f9ddbb28fceadc880ed47de9560c6c files/digest-weex-2.6.1.5-r1 64
diff --git a/net-ftp/weex/weex-2.6.1.5-r1.ebuild b/net-ftp/weex/weex-2.6.1.5-r1.ebuild
index 67814a9fc473..33634d640a60 100644
--- a/net-ftp/weex/weex-2.6.1.5-r1.ebuild
+++ b/net-ftp/weex/weex-2.6.1.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-ftp/weex/weex-2.6.1.5-r1.ebuild,v 1.1 2005/10/04 09:32:49 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/weex/weex-2.6.1.5-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:23 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-ftp/yafc/ChangeLog b/net-ftp/yafc/ChangeLog
index 87fd45ffbffd..3629e292582f 100644
--- a/net-ftp/yafc/ChangeLog
+++ b/net-ftp/yafc/ChangeLog
@@ -1,6 +1,55 @@
 # ChangeLog for net-ftp/yafc
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/yafc/ChangeLog,v 1.1 2002/05/27 01:24:18 rphillips Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/yafc/ChangeLog,v 1.1.1.1 2005/11/30 09:36:24 chriswhite Exp $
+
+  11 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> yafc-1.1.ebuild:
+  Stable on ppc.
+
+  02 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> yafc-1.1.ebuild:
+  Stable on sparc
+
+  01 Nov 2005; Krzysiek Pawlik <nelchael@gentoo.org> yafc-1.1.ebuild:
+  Stable on x86. Bug 111171.
+
+*yafc-1.1.1 (09 Oct 2005)
+
+  09 Oct 2005; Daniel Black <dragonheart@gentoo.org> +yafc-1.1.1.ebuild:
+  version bump
+
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  04 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> yafc-1.1.ebuild:
+  stable on amd64
+
+  19 Jun 2004; Jason Wever <weeve@gentoo.org> yafc-1.1.ebuild:
+  Marked ~arch for everyone since this was initially imported as stable for x86,
+  ppc and sparc.
+
+*yafc-1.1 (19 Jun 2004)
+
+  19 Jun 2004; Mike Frysinger <vapier@gentoo.org> +yafc-1.1.ebuild:
+  Version bump #53168 by Mikael Wärlander.
+
+  05 Jan 2004; Jon Portnoy <avenj@gentoo.org> :
+  AMD64 keywords.
+
+*yafc-1.0 (20 Jun 2003)
+
+  20 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bumpage.
+ 
+*yafc-0.7.10 (10 Oct 2002)
+
+  03 Feb 2003; Jon Nall <nall@gentoo.org>) yafc-0.7.10.ebuild :
+  added ~ppc
+
+  10 Oct 2002; Jack Morgan <jmorgan@gentoo.org> :
+  Updated version number to fix an issue with sparc64
+
+*yafc-0.7.9 (6 Jun 2002)
+  6 Jun 2002; Donny Davies <woodchip@gentoo.org> :
+  Add docs + ssh RDEPEND + $P; close #859.
 
 *yafc-0.7.2-r1 (26 May 2002)
 
diff --git a/net-ftp/yafc/Manifest b/net-ftp/yafc/Manifest
index e69de29bb2d1..3ceb770cce75 100644
--- a/net-ftp/yafc/Manifest
+++ b/net-ftp/yafc/Manifest
@@ -0,0 +1,7 @@
+MD5 a0306090e7761730f36ff10993de40b1 ChangeLog 2057
+MD5 fc53f7d8ad4e855bf0cfa4139baae246 files/digest-yafc-1.0 61
+MD5 17a81b5b4a16ec89dfe5963c885f96ab files/digest-yafc-1.1 61
+MD5 ef6247904f7210ae0c5c607a8db1e828 files/digest-yafc-1.1.1 63
+MD5 44011aac929360f02f786a44321d861a yafc-1.0.ebuild 801
+MD5 8dadb30fcf4ac7e7eae9aaf999ccb59e yafc-1.1.1.ebuild 1324
+MD5 e3d6437c17339f807c5e49e94d9b7324 yafc-1.1.ebuild 761
diff --git a/net-ftp/yafc/yafc-1.0.ebuild b/net-ftp/yafc/yafc-1.0.ebuild
index 2a1d58906bc4..1af70ce2f7b6 100644
--- a/net-ftp/yafc/yafc-1.0.ebuild
+++ b/net-ftp/yafc/yafc-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/net-ftp/yafc/yafc-1.0.ebuild,v 1.1 2003/06/21 07:27:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/yafc/yafc-1.0.ebuild,v 1.1.1.1 2005/11/30 09:36:24 chriswhite Exp $
 
 inherit flag-o-matic
 
@@ -13,7 +13,7 @@ RDEPEND=">=net-misc/openssh-3.0"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc"
+KEYWORDS="x86 ppc sparc ~amd64"
 IUSE="readline"
 
 src_compile() {
diff --git a/net-ftp/yafc/yafc-1.1.1.ebuild b/net-ftp/yafc/yafc-1.1.1.ebuild
index c5c5fe5898e0..627e830274f1 100644
--- a/net-ftp/yafc/yafc-1.1.1.ebuild
+++ b/net-ftp/yafc/yafc-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-ftp/yafc/yafc-1.1.1.ebuild,v 1.1 2005/10/09 08:45:53 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/yafc/yafc-1.1.1.ebuild,v 1.1.1.1 2005/11/30 09:36:24 chriswhite Exp $
 
 inherit flag-o-matic
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/yafc/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="readline krb4 kerberos sock5"
+IUSE="readline krb4 kerberos socks5"
 
 DEPEND="readline? ( >=sys-libs/readline-4.1-r4 )
 	kerberos? ( virtual/krb5 )
@@ -21,7 +21,7 @@ RDEPEND=">=net-misc/openssh-3.0
 	${DEPEND}"
 
 src_compile() {
-	local myconf
+	local myconf=""
 	use krb4 && myconf="${myconf} --with-krb4=/usr/athena" \
 		|| myconf="${myconf} --with-krb4=no"
 	use kerberos && myconf="${myconf} --with-krb5=/usr/ --with-gssapi=/usr" \
@@ -31,7 +31,6 @@ src_compile() {
 	use readline && myconf="${myconf} --with-readline=/usr" \
 		|| myconf="${myconf} --with-readline=no"
 
-	
 	econf $(use_with readline) ${myconf} || die "./configure failed"
 	emake || die "emake failed"
 }
diff --git a/net-ftp/yafc/yafc-1.1.ebuild b/net-ftp/yafc/yafc-1.1.ebuild
index 66f630992cd4..40d6aa659ebe 100644
--- a/net-ftp/yafc/yafc-1.1.ebuild
+++ b/net-ftp/yafc/yafc-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-ftp/yafc/yafc-1.1.ebuild,v 1.1 2004/06/19 04:37:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/yafc/yafc-1.1.ebuild,v 1.1.1.1 2005/11/30 09:36:24 chriswhite Exp $
 
 inherit flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/yafc/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc ~amd64"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE="readline"
 
 DEPEND="readline? ( >=sys-libs/readline-4.1-r4 )"
diff --git a/net-nds/adtool/ChangeLog b/net-nds/adtool/ChangeLog
index d6b3c7497583..07e2d537c72a 100644
--- a/net-nds/adtool/ChangeLog
+++ b/net-nds/adtool/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-nds/adtool
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/adtool/ChangeLog,v 1.1 2004/06/21 10:24:29 satya Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/adtool/ChangeLog,v 1.1.1.1 2005/11/30 09:36:45 chriswhite Exp $
+
+*adtool-1.2-r1 (08 Nov 2005)
+
+  08 Nov 2005; Christian Andreetta <satya@gentoo.org> +adtool-1.2-r1.ebuild,
+  +adtool-1.3.ebuild:
+  version bump (bug #101425), ssl IUSE flag
+
+  23 Jun 2004; David Holm <dholm@gentoo.org> adtool-1.2.ebuild:
+  Added to ~ppc.
 
 *adtool-1.2 (21 Jun 2004)
 
diff --git a/net-nds/adtool/Manifest b/net-nds/adtool/Manifest
index d760b1454fc1..7cba07b838f1 100644
--- a/net-nds/adtool/Manifest
+++ b/net-nds/adtool/Manifest
@@ -1,3 +1,8 @@
-MD5 9c6871fcd28004ef7d3e749c2fdb5b5d adtool-1.2.ebuild 521
+MD5 390aa4318d2c632b1fded90270ef015d adtool-1.2.ebuild 595
+MD5 e1b17fc4799bf0ffeca219ab4f2ce07c adtool-1.2-r1.ebuild 610
+MD5 e896e43e0876b95889b9cab1e2f3d2dd ChangeLog 624
 MD5 f1ffc07fe76ee2294f41a8c244f64c68 metadata.xml 402
+MD5 20bf8fddb5dfd3b1454e8c9918e8b0d6 adtool-1.3.ebuild 560
+MD5 99a512d2198375c9199f7a91e7c990f1 files/digest-adtool-1.2-r1 62
 MD5 99a512d2198375c9199f7a91e7c990f1 files/digest-adtool-1.2 62
+MD5 f815e939043f42f84ced5d4f700e531e files/digest-adtool-1.3 62
diff --git a/net-nds/adtool/adtool-1.2-r1.ebuild b/net-nds/adtool/adtool-1.2-r1.ebuild
index da508c085cc6..8e681508a820 100644
--- a/net-nds/adtool/adtool-1.2-r1.ebuild
+++ b/net-nds/adtool/adtool-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-nds/adtool/adtool-1.2-r1.ebuild,v 1.1 2005/11/08 11:58:11 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/adtool/adtool-1.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:46 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-nds/adtool/adtool-1.2.ebuild b/net-nds/adtool/adtool-1.2.ebuild
index 8442f04b7c5d..3b5496c95c58 100644
--- a/net-nds/adtool/adtool-1.2.ebuild
+++ b/net-nds/adtool/adtool-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/net-nds/adtool/adtool-1.2.ebuild,v 1.1 2004/06/21 10:24:29 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/adtool/adtool-1.2.ebuild,v 1.1.1.1 2005/11/30 09:36:46 chriswhite Exp $
 
 inherit eutils
 
@@ -8,7 +8,7 @@ DESCRIPTION="adtool is a Unix command line utility for Active Directory administ
 SRC_URI="http://c128.org/adtool/${P}.tar.gz"
 HOMEPAGE="http://c128.org/adtool/"
 
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
@@ -17,8 +17,6 @@ DEPEND="net-nds/openldap
 	dev-libs/openssl"
 RDEPEND=""
 
-S=${WORKDIR}/${P}
-
 src_compile() {
 	econf || die
 	emake || die
diff --git a/net-nds/adtool/adtool-1.3.ebuild b/net-nds/adtool/adtool-1.3.ebuild
index 543141af3f37..5cd49867c0a1 100644
--- a/net-nds/adtool/adtool-1.3.ebuild
+++ b/net-nds/adtool/adtool-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-nds/adtool/adtool-1.3.ebuild,v 1.1 2005/11/08 11:58:11 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/adtool/adtool-1.3.ebuild,v 1.1.1.1 2005/11/30 09:36:46 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-nds/directoryadministrator/ChangeLog b/net-nds/directoryadministrator/ChangeLog
index 69e73a471c97..21e2d7a4cfef 100644
--- a/net-nds/directoryadministrator/ChangeLog
+++ b/net-nds/directoryadministrator/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-nds/directoryadministrator
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/directoryadministrator/ChangeLog,v 1.1 2003/05/31 14:04:44 g2boojum Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/directoryadministrator/ChangeLog,v 1.1.1.1 2005/11/30 09:36:53 chriswhite Exp $
+
+  07 Jun 2004; Nick Hadaway <raker@gentoo.org>
+  directoryadministrator-1.5.1.ebuild:
+  Added a postinst warning for all the openldap-2.1.x people.
+
+  30 Apr 2004; David Holm <dholm@gentoo.org>
+  directoryadministrator-1.5.1.ebuild:
+  Added to ~ppc.
+
+*directoryadministrator-1.5.1 (30 Jun 2003)
+
+  30 Jun 2003; Daniel Ahlberg <aliz@gentoo.org> directoryadministrator-1.5.1.ebuild :
+  Version bump.
 
 *directoryadministrator-1.4 (31 May 2003)
 
diff --git a/net-nds/directoryadministrator/Manifest b/net-nds/directoryadministrator/Manifest
index 9b097ed8b7db..72f8205ba6e6 100644
--- a/net-nds/directoryadministrator/Manifest
+++ b/net-nds/directoryadministrator/Manifest
@@ -1,3 +1,6 @@
-MD5 53d51231dafb1cc043a6ff95d9e7197e .directoryadministrator-1.4.ebuild.swp 12288
-MD5 76d86e1eec0aa971603b8a9eda86da45 directoryadministrator-1.4.ebuild 695
+MD5 9d587c29549ccff4b49a7312eab5b13f directoryadministrator-1.5.1.ebuild 1101
+MD5 eca45190a4cb8914dd074a925176fd1b directoryadministrator-1.4.ebuild 839
+MD5 db2dea681d94727c0b9cf1d7e5bbcd1c ChangeLog 882
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
 MD5 b181545c2aaa4559ad835ffc8290829d files/digest-directoryadministrator-1.4 79
+MD5 d70312f66114bbafbcaa90436727fdd1 files/digest-directoryadministrator-1.5.1 81
diff --git a/net-nds/directoryadministrator/directoryadministrator-1.4.ebuild b/net-nds/directoryadministrator/directoryadministrator-1.4.ebuild
index 1fb9ef1cf90b..2cb0a8e1e5c7 100644
--- a/net-nds/directoryadministrator/directoryadministrator-1.4.ebuild
+++ b/net-nds/directoryadministrator/directoryadministrator-1.4.ebuild
@@ -1,6 +1,6 @@
-# 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-nds/directoryadministrator/directoryadministrator-1.4.ebuild,v 1.1 2003/05/31 14:04:44 g2boojum Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/directoryadministrator/directoryadministrator-1.4.ebuild,v 1.1.1.1 2005/11/30 09:36:53 chriswhite Exp $
 
 MY_PN="directory_administrator"
 S="${WORKDIR}/${MY_PN}-${PV}"
@@ -10,7 +10,7 @@ HOMEPAGE="http://diradmin.open-it.org"
 LICENSE="GPL-2"
 DEPEND=">=gnome-base/gnome-libs-1.2.0
 	>=net-nds/openldap-2"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 SLOT="0"
 IUSE=""
 
diff --git a/net-nds/directoryadministrator/directoryadministrator-1.5.1.ebuild b/net-nds/directoryadministrator/directoryadministrator-1.5.1.ebuild
index 667690c7b1a6..139db2b16c5f 100644
--- a/net-nds/directoryadministrator/directoryadministrator-1.5.1.ebuild
+++ b/net-nds/directoryadministrator/directoryadministrator-1.5.1.ebuild
@@ -1,6 +1,6 @@
-# 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-nds/directoryadministrator/directoryadministrator-1.5.1.ebuild,v 1.1 2003/06/30 23:14:03 aliz Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/directoryadministrator/directoryadministrator-1.5.1.ebuild,v 1.1.1.1 2005/11/30 09:36:53 chriswhite Exp $
 
 MY_PN="directory_administrator"
 S="${WORKDIR}/${MY_PN}-${PV}"
@@ -10,7 +10,7 @@ HOMEPAGE="http://diradmin.open-it.org"
 LICENSE="GPL-2"
 DEPEND=">=gnome-base/gnome-libs-1.2.0
 	>=net-nds/openldap-2"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 SLOT="0"
 IUSE=""
 
@@ -29,3 +29,12 @@ src_install () {
 	docinto pam.d
 	dodoc doc/pam.d/*
 }
+
+pkg_postinst() {
+	ewarn "NOTE: You need to enable LDAPv2 support for directory_administrator"
+	ewarn "to work properly.  If you are running openldap-2.1.x,"
+	ewarn "add this line to /etc/openldap/slapd.conf"
+	einfo ""
+	einfo "allow	bind_v2"
+	einfo ""
+}
diff --git a/net-nds/directoryadministrator/metadata.xml b/net-nds/directoryadministrator/metadata.xml
index 194b369637e4..20ce219711a2 100644
--- a/net-nds/directoryadministrator/metadata.xml
+++ b/net-nds/directoryadministrator/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>no-herd</herd>
-<maintainer>
-  <email>raker@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/net-nds/gq/ChangeLog b/net-nds/gq/ChangeLog
index 47dacf372384..ad6f8ff8f52f 100644
--- a/net-nds/gq/ChangeLog
+++ b/net-nds/gq/ChangeLog
@@ -1,8 +1,63 @@
 # ChangeLog for net-nds/gq
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/gq/ChangeLog,v 1.1 2002/12/07 09:13:07 leonardop Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/gq/ChangeLog,v 1.1.1.1 2005/11/30 09:36:45 chriswhite Exp $
+
+*gq-1.0_beta1-r1 (18 Sep 2005)
+
+  18 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> +files/util.c.diff,
+  +gq-1.0_beta1-r1.ebuild:
+  Fixed bug 62368.
+
+  26 Jan 2005; Daniel Black <dragonheart@gentoo.org> -gq-0.7.0_beta2.ebuild:
+  Betas will be betas - removed gq-0.7.0_beta2.ebuild as per bug #76057. Known
+  problems with gq-1.0_beta1 (same bug). Thanks to Jan Van Uytven
+  <wyvern@crm3.com>
+
+  04 Dec 2004; Daniel Black <dragonheart@gentoo.org> gq-0.6.0.ebuild,
+  gq-0.7.0_beta2.ebuild, gq-1.0_beta1.ebuild:
+  Fixed broken install routine as per bug #73178. Thanks  EJ Finneran
+  <ej.finneran@gmail.com> for the bug report.
+
+  26 Nov 2004; Daniel Black <dragonheart@gentoo.org> gq-0.6.0.ebuild,
+  gq-0.7.0_beta2.ebuild, gq-1.0_beta1.ebuild:
+  Fixed collision on /usr/share/locale/locale.alias with sys-libs/glibc (bug
+  #72386). Changed einstall -> emake DESTDIR=${D}. Thankyou to Bruce Guenter
+  <bruceg@em.ca> for the bug report.
+
+  26 Oct 2004; Tom Martin <slarti@gentoo.org> gq-1.0_beta1.ebuild:
+  Resolved bug 68605 by regenerating config.sub and config.guess. Thanks to
+  Daniel Lawson <daniel@meta.net.nz> for reporting and also for the fix.
+  Added ~amd64 keyword.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> gq-1.0_beta1.ebuild:
+  virtual/glibc -> virtual/libc
+
+  13 May 2004; David Holm <dholm@gentoo.org> gq-1.0_beta1.ebuild:
+  Added to ~ppc.
+
+*gq-1.0_beta1 (13 May 2004)
+
+  13 May 2004; Daniel Black <dragonheart@gentoo.org> +metadata.xml,
+  +gq-1.0_beta1.ebuild:
+  version bumped in bug #38101 thanks to scott.claridge@bigfoot.com. This isn't
+  stable yet and crashes on selecting the schema tab. Commiting for testing
+  purposes
+
+  11 May 2004; Jason Wever <weeve@gentoo.org> gq-0.6.0.ebuild:
+  Stable on sparc.
+
+  02 Sep 2003; Donny Davies <woodchip@gentoo.org> gq-0.7.0_beta2.ebuild:
+  Close #27358.
+
+*gq-0.7.0_beta2 (16 Jun 2003)
+
+  16 Jun 2003; Donny Davies <woodchip@gentoo.org> gq-0.7.0_beta2.ebuild:
+  Adding this beta release because it has nice new features.
 
 *gq-0.6.0 (07 Dec 2002)
 
+  02 Apr 2003; Jason Wever <weeve@gentoo.org> gq-0.6.0.ebuild:
+  Added ~sparc to keywords.
+
   07 Dec 2002; L. Boshell <leonardop@gentoo.org> ChangeLog,
   gq-0.6.0.ebuild : Initial import.
diff --git a/net-nds/gq/Manifest b/net-nds/gq/Manifest
index cc6206debcf4..5b588e2cea5d 100644
--- a/net-nds/gq/Manifest
+++ b/net-nds/gq/Manifest
@@ -1,5 +1,9 @@
-MD5 fa894dcd10463786c261c6081812206b ChangeLog 414
-MD5 2c1b860c98867275d8031955a7713239 gq-0.6.0.ebuild 1037
-MD5 35b4e84fb58a6220c5e257f3dd063a83 gq-0.7.0_beta2.ebuild 1039
+MD5 dc1f3fd56f02bb245049adbcf091bc3f gq-0.6.0.ebuild 1056
+MD5 14ee5046db25579f378f060ece0024e5 gq-1.0_beta1-r1.ebuild 1730
+MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
+MD5 2d084546cd8d169c25f52798a899f7d1 ChangeLog 2408
+MD5 06f4ff7e265f68b0a3c5b8da14704f0e gq-1.0_beta1.ebuild 1539
 MD5 828702cac79a6948709d36296923765d files/digest-gq-0.6.0 60
-MD5 2f8e4cb0c6e455c499981e4b9151fc08 files/digest-gq-0.7.0_beta2 65
+MD5 1c71ab6ac87b29de15f92040e36d9ada files/digest-gq-1.0_beta1-r1 63
+MD5 81dbbd824fa9092d9854f7f54b0c7050 files/util.c.diff 569
+MD5 1c71ab6ac87b29de15f92040e36d9ada files/digest-gq-1.0_beta1 63
diff --git a/net-nds/gq/gq-0.6.0.ebuild b/net-nds/gq/gq-0.6.0.ebuild
index a34e2d385da1..b145a2047173 100644
--- a/net-nds/gq/gq-0.6.0.ebuild
+++ b/net-nds/gq/gq-0.6.0.ebuild
@@ -1,8 +1,7 @@
-# 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-nds/gq/gq-0.6.0.ebuild,v 1.1 2002/12/07 09:13:07 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/gq/gq-0.6.0.ebuild,v 1.1.1.1 2005/11/30 09:36:45 chriswhite Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="GTK-based LDAP client"
 SRC_URI="mirror://sourceforge/gqclient/${P}.tar.gz"
 HOMEPAGE="http://www.biot.com/gq/"
@@ -10,11 +9,11 @@ IUSE="kerberos jpeg nls ssl"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 sparc"
 
 DEPEND="=x11-libs/gtk+-1.2*
 	>=net-nds/openldap-2
-	kerberos? ( app-crypt/krb5 )
+	kerberos? ( app-crypt/mit-krb5 )
 	jpeg? ( media-libs/gdk-pixbuf )
 	ssl? ( dev-libs/openssl )"
 
@@ -26,14 +25,15 @@ src_compile() {
 		|| myconf="${myconf} --disable-nls"
 
 	use kerberos && myconf="${myconf} --with-kerberos-prefix=/usr"
-	
-    econf $myconf || die "./configure failed"
-	
-    emake || die "Compilation failed"
+
+	econf $myconf || die "./configure failed"
+
+	emake || die "Compilation failed"
 }
 
 src_install() {
-    einstall || die "Installation failed"
-	
-    dodoc ABOUT-NLS AUTHORS ChangeLog COPYING NEWS README* TODO
+	emake DESTDIR=${D} install || die "Installation failed"
+
+	rm -f ${D}/usr/share/locale/locale.alias
+	dodoc ABOUT-NLS AUTHORS ChangeLog COPYING NEWS README* TODO
 }
diff --git a/net-nds/gq/gq-1.0_beta1-r1.ebuild b/net-nds/gq/gq-1.0_beta1-r1.ebuild
index a826dc1dc741..4dac50408c50 100644
--- a/net-nds/gq/gq-1.0_beta1-r1.ebuild
+++ b/net-nds/gq/gq-1.0_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/net-nds/gq/gq-1.0_beta1-r1.ebuild,v 1.1 2005/09/18 11:45:50 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/gq/gq-1.0_beta1-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:45 chriswhite Exp $
 
 inherit eutils
 
@@ -40,7 +40,7 @@ src_unpack() {
 
 	# This patch, written by Luca Scamoni, is from
 	# http://sourceforge.net/tracker/index.php?func=detail&aid=1122365&group_id=3805&atid=103805
-	epatch "${FILESDIR}/utils.c.diff"
+	epatch "${FILESDIR}/util.c.diff"
 
 	# Fix timestamp skews
 	touch aclocal.m4 configure `find . -name Makefile.in`
diff --git a/net-nds/gq/gq-1.0_beta1.ebuild b/net-nds/gq/gq-1.0_beta1.ebuild
index b108ea415f92..481b0ceaaa66 100644
--- a/net-nds/gq/gq-1.0_beta1.ebuild
+++ b/net-nds/gq/gq-1.0_beta1.ebuild
@@ -1,18 +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-nds/gq/gq-1.0_beta1.ebuild,v 1.1 2004/05/13 04:00:49 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/gq/gq-1.0_beta1.ebuild,v 1.1.1.1 2005/11/30 09:36:45 chriswhite Exp $
 
 S=${WORKDIR}/${PN}-${PV/_/}
 DESCRIPTION="GTK-based LDAP client"
 
 SRC_URI="mirror://sourceforge/gqclient/${PN}-${PV/_/}.tar.gz"
-RESTRICT="nomirror"
 HOMEPAGE="http://www.biot.com/gq/"
 IUSE="kerberos jpeg nls ssl"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="~x86 ~sparc ~ppc ~amd64"
 
 RDEPEND=">=x11-libs/gtk+-2
 	>=net-nds/openldap-2
@@ -25,7 +24,7 @@ RDEPEND=">=x11-libs/gtk+-2
 	=dev-libs/atk-1*
 	x11-libs/pango
 	dev-libs/cyrus-sasl
-	virtual/glibc"
+	virtual/libc"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -38,6 +37,11 @@ src_unpack() {
 	cd ${S}  || die
 	# Fix timestamp skews
 	touch aclocal.m4 configure `find . -name Makefile.in`
+
+	if use amd64 ; then
+		rm config.sub config.guess
+		automake --add-missing --copy
+	fi
 }
 
 src_compile() {
@@ -55,7 +59,7 @@ src_compile() {
 }
 
 src_install() {
-	einstall || die "Installation failed"
-
+	emake DESTDIR=${D} install || die "Installation failed"
+	rm -f ${D}/usr/share/locale/locale.alias
 	dodoc ABOUT-NLS AUTHORS ChangeLog COPYING NEWS README* TODO
 }
diff --git a/net-nds/jxplorer/ChangeLog b/net-nds/jxplorer/ChangeLog
index 943d9c135e95..d999d1d6dcba 100644
--- a/net-nds/jxplorer/ChangeLog
+++ b/net-nds/jxplorer/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for net-nds/jxplorer
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/jxplorer/ChangeLog,v 1.1 2004/05/22 15:23:11 zx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/jxplorer/ChangeLog,v 1.1.1.1 2005/11/30 09:36:45 chriswhite Exp $
+
+*jxplorer-3.1 (04 May 2005)
+
+  04 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -jxplorer-3.1_beta1.ebuild, jxplorer-3.1_rc4.ebuild, +jxplorer-3.1.ebuild:
+  new upstream version, marked rc4 stable on amd64 and x86. did some cleanup
+
+*jxplorer-3.1_rc4 (22 Jan 2005)
+
+  22 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/jxplorer-gentoo.patch, +files/jxplorer-log4j.patch,
+  +files/jxplorer.sh, +jxplorer-3.1_rc4.ebuild:
+  version bump. now we build jxplorer from source and we also dont make use of
+  packed jars any longer. fixes bug #63243.
+
+  10 Sep 2004; <blubb@gentoo.org> jxplorer-3.1_beta1.ebuild:
+  added ~amd64 keyword
+
+  30 Aug 2004; Chris Aniszczyk <zx@gentoo.org> jxplorer-3.1_beta1.ebuild:
+  Marking x86
 
 *jxplorer-3.1_beta1 (22 May 2004)
 
diff --git a/net-nds/jxplorer/Manifest b/net-nds/jxplorer/Manifest
index d1cb601da3fd..d73cd46f0e0d 100644
--- a/net-nds/jxplorer/Manifest
+++ b/net-nds/jxplorer/Manifest
@@ -1,3 +1,20 @@
-MD5 a2ee6aa7e897841e1e4828edbbb521f5 jxplorer-3.1_beta1.ebuild 588
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a5a295f030b955f9f89313c263855d81 jxplorer-3.1_rc4.ebuild 1504
+MD5 7a6c6c87e866803cfbf69262c3818be5 jxplorer-3.1.ebuild 1516
+MD5 da8a921f138d67ab1719efe675bef081 ChangeLog 1155
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 f2edd981dbec6678640f94950ab48032 files/digest-jxplorer-3.1_beta1 68
+MD5 02193c618856347b1d7ec23ec21e4475 files/jxplorer-log4j.patch 613
+MD5 6fe4c04ebf5a63fa526bb37c47dd6089 files/digest-jxplorer-3.1 128
+MD5 c2de8cca5efcd98939e5baf3728a3692 files/jxplorer-gentoo.patch 2578
+MD5 b04073e642024032d31552ae958c3149 files/digest-jxplorer-3.1_rc4 134
+MD5 19c309ed0cfd34dc531818b1607a2a47 files/build.xml 1871
+MD5 c71a48763e3bab86565e7c87fd7034b1 files/jxplorer.sh 888
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC3Cv1/rLF9B432nYRAp4hAJ4qEXC8FkFHV9Nyzxr1VHzdZdbwSgCgyDmm
+hAAX6RPda1+3EXwi2PkMglU=
+=9Os+
+-----END PGP SIGNATURE-----
diff --git a/net-nds/jxplorer/jxplorer-3.1.ebuild b/net-nds/jxplorer/jxplorer-3.1.ebuild
index c0688da16100..f8d01aa6ce6d 100644
--- a/net-nds/jxplorer/jxplorer-3.1.ebuild
+++ b/net-nds/jxplorer/jxplorer-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-nds/jxplorer/jxplorer-3.1.ebuild,v 1.1 2005/05/04 22:24:03 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/jxplorer/jxplorer-3.1.ebuild,v 1.1.1.1 2005/11/30 09:36:45 chriswhite Exp $
 
 inherit eutils java-pkg
 
@@ -10,9 +10,8 @@ SRC_URI="mirror://sourceforge/${PN}/JXv${PV}src.tar.bz2
 	mirror://sourceforge/${PN}/JXv${PV}deploy.tar.bz2"
 LICENSE="CAOSL"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 x86"
 IUSE="doc"
-DEPEND=">=virtual/jdk-1.4"
 RDEPEND=">=virtual/jre-1.4
 	>=dev-java/commons-discovery-0.2
 	>=dev-java/commons-logging-1.0.4
@@ -23,7 +22,9 @@ RDEPEND=">=virtual/jre-1.4
 	>=dev-java/sun-jaf-bin-1.0.2
 	>=dev-java/sun-javamail-bin-1.3.1
 	>=www-servers/axis-1.1"
-RESTRICT="nomirror"
+DEPEND=">=virtual/jdk-1.4
+	dev-java/ant-core
+	${RDEPEND}"
 
 S=${WORKDIR}/${PN}
 
@@ -51,8 +52,7 @@ src_install() {
 	java-pkg_dojar dist/${PN}.jar jars/help.jar
 
 	dodir /usr/share/${PN}
-	for i in "icons images htmldocs language templates security connections.txt
-log4j.xml"
+	for i in "icons images htmldocs language templates security connections.txt log4j.xml"
 	do
 		cp -r ${i} ${D}/usr/share/${PN}
 	done
diff --git a/net-nds/jxplorer/jxplorer-3.1_rc4.ebuild b/net-nds/jxplorer/jxplorer-3.1_rc4.ebuild
index b0b23074702a..c713b43ed8ab 100644
--- a/net-nds/jxplorer/jxplorer-3.1_rc4.ebuild
+++ b/net-nds/jxplorer/jxplorer-3.1_rc4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/jxplorer/jxplorer-3.1_rc4.ebuild,v 1.1 2005/01/22 15:35:20 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/jxplorer/jxplorer-3.1_rc4.ebuild,v 1.1.1.1 2005/11/30 09:36:45 chriswhite Exp $
 
 inherit eutils java-pkg
 
@@ -10,9 +10,8 @@ SRC_URI="mirror://sourceforge/${PN}/JXv${PV/_/}src.tar.bz2
 	mirror://sourceforge/${PN}/JXv${PV/_/}deploy.tar.bz2"
 LICENSE="CAOSL"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 x86"
 IUSE="doc"
-DEPEND=">=virtual/jdk-1.4"
 RDEPEND=">=virtual/jre-1.4
 	>=dev-java/commons-discovery-0.2
 	>=dev-java/commons-logging-1.0.4
@@ -22,8 +21,9 @@ RDEPEND=">=virtual/jre-1.4
 	>=dev-java/sun-dsml-bin-2.1.2_pre1
 	>=dev-java/sun-jaf-bin-1.0.2
 	>=dev-java/sun-javamail-bin-1.3.1
-	>=www-servers/axis-1.1"
-RESTRICT="nomirror"
+	=www-servers/axis-1*"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}"
 
 S=${WORKDIR}/${PN}
 
@@ -51,8 +51,7 @@ src_install() {
 	java-pkg_dojar dist/${PN}.jar jars/help.jar
 
 	dodir /usr/share/${PN}
-	for i in "icons images htmldocs language templates security connections.txt
-log4j.xml"
+	for i in "icons images htmldocs language templates security connections.txt log4j.xml"
 	do
 		cp -r ${i} ${D}/usr/share/${PN}
 	done
diff --git a/net-nds/ldapvi/ChangeLog b/net-nds/ldapvi/ChangeLog
index f3f1812612af..3457999582c1 100644
--- a/net-nds/ldapvi/ChangeLog
+++ b/net-nds/ldapvi/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-nds/ldapvi
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/ldapvi/ChangeLog,v 1.1 2005/09/19 10:36:31 lcars Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/ldapvi/ChangeLog,v 1.1.1.1 2005/11/30 09:36:53 chriswhite Exp $
+
+*ldapvi-1.4 (19 Nov 2005)
+
+  19 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> +ldapvi-1.4.ebuild:
+  New version and added to ~hppa.
+
+  19 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> ldapvi-1.1.ebuild:
+  Added to ~ppc.
 
   19 Sep 2005; Andrea Barisani <lcars@gentoo.org> ChangeLog:
   Added initial ChangeLog.
diff --git a/net-nds/ldapvi/Manifest b/net-nds/ldapvi/Manifest
index 2110095e94ad..9e737d611421 100644
--- a/net-nds/ldapvi/Manifest
+++ b/net-nds/ldapvi/Manifest
@@ -1,4 +1,6 @@
-MD5 ee50b6f18cc6447053d6c220e94cdec4 ldapvi-1.1.ebuild 503
-MD5 ded28f3618875f1ee411e3e426e401c0 metadata.xml 384
-MD5 5ff0d08a31ae8f1c8b66ce8640259a0b ChangeLog 203
+MD5 d47c3cf11894bd45c283d59388d1d50c ChangeLog 516
 MD5 e577d54f3c894252ec4dd6067242d695 files/digest-ldapvi-1.1 61
+MD5 6af0273595639c82ad70f109d1782a59 files/digest-ldapvi-1.4 61
+MD5 14842cc764820395adce165f458cb4aa ldapvi-1.1.ebuild 602
+MD5 38d0ad3f735040aafcacd93954d4ad01 ldapvi-1.4.ebuild 614
+MD5 ded28f3618875f1ee411e3e426e401c0 metadata.xml 384
diff --git a/net-nds/ldapvi/ldapvi-1.1.ebuild b/net-nds/ldapvi/ldapvi-1.1.ebuild
index 39f4531b1eca..cf4e055b1272 100644
--- a/net-nds/ldapvi/ldapvi-1.1.ebuild
+++ b/net-nds/ldapvi/ldapvi-1.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-nds/ldapvi/ldapvi-1.1.ebuild,v 1.1 2005/09/19 10:36:31 lcars Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/ldapvi/ldapvi-1.1.ebuild,v 1.1.1.1 2005/11/30 09:36:53 chriswhite Exp $
 
 DESCRIPTION="Manage LDAP entries with a text editor"
 HOMEPAGE="http://www.lichteblau.com/src.html"
 SRC_URI="http://www.lichteblau.com/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 DEPEND="sys-libs/ncurses
 		net-nds/openldap
diff --git a/net-nds/ldapvi/ldapvi-1.4.ebuild b/net-nds/ldapvi/ldapvi-1.4.ebuild
index 909409b380cf..18d6e7da78fe 100644
--- a/net-nds/ldapvi/ldapvi-1.4.ebuild
+++ b/net-nds/ldapvi/ldapvi-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-nds/ldapvi/ldapvi-1.4.ebuild,v 1.1 2005/11/19 19:40:56 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/ldapvi/ldapvi-1.4.ebuild,v 1.1.1.1 2005/11/30 09:36:53 chriswhite Exp $
 
 DESCRIPTION="Manage LDAP entries with a text editor"
 HOMEPAGE="http://www.lichteblau.com/src.html"
diff --git a/net-nds/led/ChangeLog b/net-nds/led/ChangeLog
index 0a6a887cca65..cb13ea8bbeb8 100644
--- a/net-nds/led/ChangeLog
+++ b/net-nds/led/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-nds/led
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/led/ChangeLog,v 1.1 2004/12/08 11:28:06 robbat2 Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/led/ChangeLog,v 1.1.1.1 2005/11/30 09:36:45 chriswhite Exp $
+
+  18 Oct 2005; Karol Wojtaszek <sekretarz@gentoo.org> led-1.79.4.ebuild:
+  ~amd64 keyworded
+
+  24 May 2005; Michael Cummings <mcummings@gentoo.org> led-1.79.4.ebuild:
+  dev-perl/Digest-MD5 => perl-core/Digest-MD5
 
 *led-1.79.4 (08 Dec 2004)
 
diff --git a/net-nds/led/Manifest b/net-nds/led/Manifest
index e2fc8a882591..47b113aacbe1 100644
--- a/net-nds/led/Manifest
+++ b/net-nds/led/Manifest
@@ -1,4 +1,14 @@
-MD5 a73c113dfbf3f77aa19d43a16f20d72a led-1.79.4.ebuild 754
-MD5 829f4a9edb5d620d3df5cc87f7b29da2 ChangeLog 322
-MD5 b0d485ea1a51fb83c70daedef2599272 metadata.xml 279
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9c5389604f2ab478945e76ba434820e2 ChangeLog 622
 MD5 ac56805f330fe3bd6c178a858074bd2d files/digest-led-1.79.4 62
+MD5 a466ddeb07f55ef519a97fc808f8c25f led-1.79.4.ebuild 856
+MD5 b0d485ea1a51fb83c70daedef2599272 metadata.xml 279
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDVUBGZ/iYVBmujdURAo0VAJ9crVncqMHFAIw3Tady9UJexdEKzgCg55g+
+lFIdIcEqO+wyt1srR6HYCK0=
+=nfIm
+-----END PGP SIGNATURE-----
diff --git a/net-nds/led/led-1.79.4.ebuild b/net-nds/led/led-1.79.4.ebuild
index 1ac90dcdcf06..0de08619d40a 100644
--- a/net-nds/led/led-1.79.4.ebuild
+++ b/net-nds/led/led-1.79.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-nds/led/led-1.79.4.ebuild,v 1.1 2004/12/08 11:28:06 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/led/led-1.79.4.ebuild,v 1.1.1.1 2005/11/30 09:36:45 chriswhite Exp $
 
 inherit eutils
 DESCRIPTION="led is a general purpose LDAP editor"
@@ -8,13 +8,13 @@ HOMEPAGE="http://led.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 IUSE=""
 
 DEPEND=">=dev-lang/perl-5.6.1
 	dev-perl/perl-ldap
 	dev-perl/URI
-	dev-perl/Digest-MD5
+	perl-core/Digest-MD5
 	dev-perl/Authen-SASL"
 
 src_compile() {
diff --git a/net-nds/luma/ChangeLog b/net-nds/luma/ChangeLog
index 3750ffd6c5a1..636e0a1e4ce2 100644
--- a/net-nds/luma/ChangeLog
+++ b/net-nds/luma/ChangeLog
@@ -1,6 +1,98 @@
 # ChangeLog for net-nds/luma
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/luma/ChangeLog,v 1.1 2004/07/17 13:43:17 carlo Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/luma/ChangeLog,v 1.1.1.1 2005/11/30 09:36:46 chriswhite Exp $
+
+  18 Oct 2005; Karol Wojtaszek <sekretarz@gentoo.org> luma-2.2.1.ebuild:
+  ~amd64 keyworded
+
+*luma-2.2.1 (30 Sep 2005)
+
+  30 Sep 2005; Carsten Lohrke <carlo@gentoo.org> +luma-2.2.1.ebuild:
+  version bump
+
+  25 Jul 2005; Caleb Tennis <caleb@gentoo.org> luma-2.1.3.ebuild:
+  Change qt dep per bug #100235
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> luma-2.1.3.ebuild:
+  Stable on ppc.
+
+  14 Jun 2005; Carsten Lohrke <carlo@gentoo.org> luma-2.1.3.ebuild:
+  stable on x86
+
+  22 May 2005; Jason Wever <weeve@gentoo.org> luma-2.1.3.ebuild:
+  Added ~sparc keyword.
+
+  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> luma-1.6.ebuild:
+  Stable on ppc.
+
+*luma-2.1.3 (16 Mar 2005)
+
+  16 Mar 2005; Carsten Lohrke <carlo@gentoo.org> -luma-2.0.1.ebuild,
+  -luma-2.0.2.ebuild, -luma-2.1.2.ebuild, +luma-2.1.3.ebuild,
+  -luma-2.1.ebuild:
+  version bump and clean up
+
+*luma-2.1.2 (15 Mar 2005)
+
+  15 Mar 2005; Carsten Lohrke <carlo@gentoo.org> +luma-2.1.2.ebuild:
+  version bump
+
+*luma-2.1 (02 Mar 2005)
+
+  02 Mar 2005; Carsten Lohrke <carlo@gentoo.org> +luma-2.1.ebuild:
+  version bump
+
+*luma-2.0.3 (14 Feb 2005)
+
+  14 Feb 2005; Carsten Lohrke <carlo@gentoo.org> +luma-2.0.3.ebuild:
+  version bump
+
+*luma-2.0.2 (04 Feb 2005)
+
+  04 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> +luma-2.0.2.ebuild:
+  Version bump, bug 79778.
+
+*luma-2.0.1 (29 Jan 2005)
+
+  29 Jan 2005; Carsten Lohrke <carlo@gentoo.org> -luma-1.3.ebuild,
+  -luma-1.5.ebuild, +luma-2.0.1.ebuild, -luma-2.0.ebuild:
+  version bump, clean up
+
+*luma-2.0 (24 Jan 2005)
+
+  24 Jan 2005; Carsten Lohrke <carlo@gentoo.org> +luma-2.0.ebuild:
+  version bump
+
+  21 Jan 2005; Carsten Lohrke <carlo@gentoo.org> luma-1.6.ebuild:
+  stable on x86
+
+  14 Dec 2004; Carsten Lohrke <carlo@gentoo.org> luma-1.5.ebuild:
+  stable on x86
+
+*luma-1.6 (13 Dec 2004)
+
+  13 Dec 2004; Carsten Lohrke <carlo@gentoo.org> +luma-1.6.ebuild:
+  version bump
+
+*luma-1.5 (08 Nov 2004)
+
+  08 Nov 2004; Carsten Lohrke <carlo@gentoo.org> +luma-1.5.ebuild:
+  version bump
+
+  03 Nov 2004; <SeJo@gentoo.org> luma-1.4.ebuild:
+  stable on ppc
+
+  29 Oct 2004; Carsten Lohrke <carlo@gentoo.org> +files/winpopup-error.patch,
+  luma-1.4.ebuild:
+  small patch, #66453
+
+*luma-1.4 (20 Aug 2004)
+
+  20 Aug 2004; Carsten Lohrke <carlo@gentoo.org> +luma-1.4.ebuild:
+  version bump
+
+  18 Jul 2004; David Holm <dholm@gentoo.org> luma-1.3.ebuild:
+  Added to ~ppc.
 
 *luma-1.3 (17 Jul 2004)
 
diff --git a/net-nds/luma/Manifest b/net-nds/luma/Manifest
index d03df61ffb6b..000c96280ef4 100644
--- a/net-nds/luma/Manifest
+++ b/net-nds/luma/Manifest
@@ -1,4 +1,16 @@
-MD5 44dc43895479e67901b22f6d82724921 ChangeLog 269
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 726d21ec90b2fe1cea673a7c5f75f5ed ChangeLog 2726
+MD5 8763c1a3870083e63c2003b20eb84298 files/digest-luma-2.1.3 63
+MD5 98b841563f5d9dc42bd6eac0bf82f434 files/digest-luma-2.2.1 63
+MD5 40e42f291627d87fef600818135a1978 luma-2.1.3.ebuild 1278
+MD5 ed3ebe6e6f992050db0e0b1ffce7e33e luma-2.2.1.ebuild 1128
 MD5 811c07ba7510a315382249fc3adb44fc metadata.xml 175
-MD5 0dbdfa1d65481823cb5e7881d64d6683 luma-1.3.ebuild 749
-MD5 383f321b77b335c6f3aba204164c8061 files/digest-luma-1.3 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDVTO+Z/iYVBmujdURAg8bAKDqJD/g6G1UMOiEZBwoqNJW8kl0HgCeK0f3
+MVPHyEuapIIZEX6GwvtBILM=
+=fwGU
+-----END PGP SIGNATURE-----
diff --git a/net-nds/luma/luma-2.1.3.ebuild b/net-nds/luma/luma-2.1.3.ebuild
index d19db2fe012e..56ee94817f28 100644
--- a/net-nds/luma/luma-2.1.3.ebuild
+++ b/net-nds/luma/luma-2.1.3.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-nds/luma/luma-2.1.3.ebuild,v 1.1 2005/03/16 17:12:50 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/luma/luma-2.1.3.ebuild,v 1.1.1.1 2005/11/30 09:36:46 chriswhite Exp $
 
-inherit eutils
+inherit eutils qt3
 
 DESCRIPTION="Luma is a graphical utility for accessing and managing data stored on LDAP servers."
 HOMEPAGE="http://luma.sourceforge.net/"
@@ -10,15 +10,15 @@ SRC_URI="mirror://sourceforge/luma/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="ppc ~sparc x86"
 IUSE="samba"
 
-RDEPEND=">=x11-libs/qt-3.2
+RDEPEND="$(qt_min_version 3.2)
 	>=dev-lang/python-2.3
 	>=dev-python/PyQt-3.10
 	>=dev-python/python-ldap-2.0.1
 	samba? ( >=dev-python/py-smbpasswd-1.0 )"
-DEPEND=">=x11-libs/qt-3.2
+DEPEND="$(qt_min_version 3.2)
 	>=dev-lang/python-2.3
 	>=dev-python/PyQt-3.10
 	>=dev-python/python-ldap-2.0.1
diff --git a/net-nds/luma/luma-2.2.1.ebuild b/net-nds/luma/luma-2.2.1.ebuild
index f585c8bb57dd..1895b6fc050e 100644
--- a/net-nds/luma/luma-2.2.1.ebuild
+++ b/net-nds/luma/luma-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-nds/luma/luma-2.2.1.ebuild,v 1.1 2005/09/30 23:52:24 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/luma/luma-2.2.1.ebuild,v 1.1.1.1 2005/11/30 09:36:46 chriswhite Exp $
 
 inherit eutils qt3
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/luma/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc ~sparc ~x86"
+KEYWORDS="~ppc ~sparc ~x86 ~amd64"
 IUSE="samba"
 
 RDEPEND="$(qt_min_version 3.2)
diff --git a/net-nds/metadata.xml b/net-nds/metadata.xml
index fb7048de9435..ae188598bdb5 100644
--- a/net-nds/metadata.xml
+++ b/net-nds/metadata.xml
@@ -4,5 +4,26 @@
 	<longdescription lang="en">
 		The net-nds category contains NDS (NetWare Directory Services) software.
 	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie net-nds enthält Software für die NetWare Directory Services (NDS).
+	</longdescription>
+	<longdescription lang="es">
+		La categoría net-nds contiene programas NDS (NetWare Directory
+		Services).
+	</longdescription>
+	<longdescription lang="ja">
+		net-ndsカテゴリーにはNetWare・ディレクトリ・サービスの
+		ソフトウェアが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De net-nds categorie bevat applicaties voor NDS (NetWare Directory Service).
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm net-nds chứa phần mềm NDS (NetWare Directory Services).
+	</longdescription>
+	<longdescription lang="it">
+		La categoria net-nds contiene programmi NDS (NetWare Directory
+		Services).
+	</longdescription>
 </catmetadata>
 
diff --git a/net-nds/migrationtools/ChangeLog b/net-nds/migrationtools/ChangeLog
index 9fffb9ddd0b4..8ec15e323f22 100644
--- a/net-nds/migrationtools/ChangeLog
+++ b/net-nds/migrationtools/ChangeLog
@@ -1,6 +1,56 @@
-# ChangeLog for net-ndsmigrationtoolsChangeLog/
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-nds/migrationtools/ChangeLog,v 1.1 2002/09/22 18:09:26 g2boojum Exp $
+# ChangeLog for net-nds/migrationtools
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/migrationtools/ChangeLog,v 1.1.1.1 2005/11/30 09:36:44 chriswhite Exp $
+
+  29 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  migrationtools-46.ebuild:
+  stable on amd64, fixes #90195
+
+  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  migrationtools-46.ebuild:
+  Stable on ppc.
+
+  12 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  migrationtools-46.ebuild:
+  Stable on sparc
+
+  12 Jan 2005; Guy Martin <gmsoft@gentoo.org> migrationtools-46.ebuild:
+  Stable on hppa.
+
+  07 Jan 2005; Robin H. Johnson <robbat2@gentoo.org>
+  migrationtools-46.ebuild:
+  v46 in x86 stable.
+
+*migrationtools-44-r2 (07 Jan 2005)
+*migrationtools-45-r1 (07 Jan 2005)
+
+  07 Jan 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +files/skip-account-objectclass.patch, +migrationtools-44-r2.ebuild,
+  +migrationtools-45-r1.ebuild:
+  Bug #52052, objectclass account fixing.
+
+*migrationtools-46 (31 Oct 2004)
+
+  31 Oct 2004; Robin H. Johnson <robbat2@gentoo.org>
+  +migrationtools-46.ebuild:
+  new version.
+
+*migrationtools-45 (06 Jun 2004)
+
+  06 Jun 2004; Guy Martin <gmsoft@gentoo.org> migrationtools-45.ebuild:
+  Marked stable on hppa.
+
+  24 May 2004; Grant Goodyear <g2boojum@gentoo.org> :
+  Version bump (thanks to Davide Rebeccani, bug 45880)
+
+  30 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> migrationtools-44-r1.ebuild:
+  Adding amd64 keyword. Closing #43585.
+
+  12 Dec 2003; Jason Wever <weeve@gentoo.org> migrationtools-44-r1.ebuild:
+  Marked stable on sparc.
+
+  05 Dec 2003; Jason Wever <weeve@gentoo.org> migrationtools-44-r1.ebuild:
+  Added ~sparc keyword.
 
 *migrationtools-44-r1 (21 Sep 2002)
 
diff --git a/net-nds/migrationtools/Manifest b/net-nds/migrationtools/Manifest
index a46a0aeb7e82..c84c393d3ff0 100644
--- a/net-nds/migrationtools/Manifest
+++ b/net-nds/migrationtools/Manifest
@@ -1,3 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c8031747896cb06b29c2eba906a23230 migrationtools-45-r1.ebuild 840
+MD5 5b5d013c6012e3757fafa2d6abf541d2 migrationtools-46.ebuild 1417
+MD5 7f4883ab87dbcb5d1f601ae3bd6377de migrationtools-44-r1.ebuild 665
+MD5 d14c26e42dc3ee7581adda04eb38fcc1 migrationtools-45.ebuild 783
+MD5 dbabb04453f95450a0d065fb16594064 ChangeLog 1956
+MD5 e0e5990445daa201b90143d6d8c0a8ec metadata.xml 393
+MD5 3e6903d808c86fcf295dffb8391d5eca migrationtools-44-r2.ebuild 755
+MD5 39681f3ee6973d71a47138580a700791 files/skip-account-objectclass.patch 404
 MD5 be251920a61a40bb429028a3e9f8b77d files/digest-migrationtools-44-r1 68
-MD5 8cc4ea37852851da46de938f2022d21b migrationtools-44-r1.ebuild 651
-MD5 ccc2dec27f23340e82e968c2c04e1204 ChangeLog 487
+MD5 be251920a61a40bb429028a3e9f8b77d files/digest-migrationtools-44-r2 68
+MD5 7f95cbec231a441eeb6638da670e49ad files/digest-migrationtools-45-r1 68
+MD5 7f95cbec231a441eeb6638da670e49ad files/digest-migrationtools-45 68
+MD5 f5023a2d2ae00e24e441191d96200baa files/digest-migrationtools-46 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCckis06ebR+OMO78RArhfAJ9QQHmYNyP1dy3IdcTLLr4zrW9xbgCfSMqe
+p3zMY6uMQoVqHflqd44+bQ4=
+=GepU
+-----END PGP SIGNATURE-----
diff --git a/net-nds/migrationtools/migrationtools-44-r1.ebuild b/net-nds/migrationtools/migrationtools-44-r1.ebuild
index 2f7653ccc258..44e91643070a 100644
--- a/net-nds/migrationtools/migrationtools-44-r1.ebuild
+++ b/net-nds/migrationtools/migrationtools-44-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-nds/migrationtools/migrationtools-44-r1.ebuild,v 1.1 2002/09/22 03:44:52 g2boojum Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/migrationtools/migrationtools-44-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:44 chriswhite Exp $
 
 PN0=MigrationTools
 S=${WORKDIR}/${PN0}-${PV}
@@ -9,17 +9,14 @@ SRC_URI="ftp://ftp.padl.com/pub/${PN0}-${PV}.tar.gz"
 HOMEPAGE="http://www.padl.com/OSS/MigrationTools.html"
 
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 sparc ~amd64"
+IUSE=""
 LICENSE="as-is"
 
 DEPEND=""
 
 RDEPEND="net-nds/openldap"
 
-src_compile() {
-	echo "nothing to compile"
-}
-
 src_install() {
 	dodoc README
 	dodir /usr/share/migrationtools
diff --git a/net-nds/migrationtools/migrationtools-44-r2.ebuild b/net-nds/migrationtools/migrationtools-44-r2.ebuild
index e2d2fd61e92f..232cb0ad3035 100644
--- a/net-nds/migrationtools/migrationtools-44-r2.ebuild
+++ b/net-nds/migrationtools/migrationtools-44-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-nds/migrationtools/migrationtools-44-r2.ebuild,v 1.1 2005/01/07 12:24:23 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/migrationtools/migrationtools-44-r2.ebuild,v 1.1.1.1 2005/11/30 09:36:44 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-nds/migrationtools/migrationtools-45-r1.ebuild b/net-nds/migrationtools/migrationtools-45-r1.ebuild
index 4995ebbfc5fa..f53708219c59 100644
--- a/net-nds/migrationtools/migrationtools-45-r1.ebuild
+++ b/net-nds/migrationtools/migrationtools-45-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-nds/migrationtools/migrationtools-45-r1.ebuild,v 1.1 2005/01/07 12:24:23 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/migrationtools/migrationtools-45-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:44 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-nds/migrationtools/migrationtools-45.ebuild b/net-nds/migrationtools/migrationtools-45.ebuild
index e61923e224b1..0c741fa27afd 100644
--- a/net-nds/migrationtools/migrationtools-45.ebuild
+++ b/net-nds/migrationtools/migrationtools-45.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-nds/migrationtools/migrationtools-45.ebuild,v 1.1 2004/05/25 01:49:08 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/migrationtools/migrationtools-45.ebuild,v 1.1.1.1 2005/11/30 09:36:45 chriswhite Exp $
 
 PN0=MigrationTools
 S=${WORKDIR}/${PN0}-${PV}
@@ -9,7 +9,7 @@ SRC_URI="http://www.padl.com/download/${PN0}-${PV}.tar.gz"
 HOMEPAGE="http://www.padl.com/OSS/MigrationTools.html"
 
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~amd64"
+KEYWORDS="~x86 ~sparc ~amd64 hppa ppc"
 LICENSE="as-is"
 IUSE=""
 
diff --git a/net-nds/migrationtools/migrationtools-46.ebuild b/net-nds/migrationtools/migrationtools-46.ebuild
index 7e3654edbcee..e6122e23de12 100644
--- a/net-nds/migrationtools/migrationtools-46.ebuild
+++ b/net-nds/migrationtools/migrationtools-46.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-nds/migrationtools/migrationtools-46.ebuild,v 1.1 2004/11/01 01:44:11 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/migrationtools/migrationtools-46.ebuild,v 1.1.1.1 2005/11/30 09:36:45 chriswhite Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.padl.com/download/${PN0}-${PV}.tar.gz"
 HOMEPAGE="http://www.padl.com/OSS/MigrationTools.html"
 
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~amd64 ~hppa ~ppc"
+KEYWORDS="x86 sparc amd64 hppa ppc"
 LICENSE="as-is"
 IUSE=""
 
@@ -33,7 +33,7 @@ src_install() {
 	for x in ${S}/migrate_*; do
 		[ -f ${x} ] && doexe ${x}
 	done
-						
+
 	diropts -m0750
 	dodir /usr/share/migrationtools/ads
 	exeinto /usr/share/migrationtools/ads
@@ -52,4 +52,3 @@ pkg_postinst() {
 	einfo "to start."
 	draw_line "                                                           "
 }
-
diff --git a/net-nds/nis-utils/ChangeLog b/net-nds/nis-utils/ChangeLog
index c0c769f2ad60..4518b3775dfc 100644
--- a/net-nds/nis-utils/ChangeLog
+++ b/net-nds/nis-utils/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-nds/nis-utils
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/nis-utils/ChangeLog,v 1.1 2004/05/02 19:43:25 vapier Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/nis-utils/ChangeLog,v 1.1.1.1 2005/11/30 09:36:53 chriswhite Exp $
+
+*nis-utils-1.4.1-r1 (21 Jun 2004)
+
+  21 Jun 2004; Mike Frysinger <vapier@gentoo.org> +files/keyserv.rc,
+  +nis-utils-1.4.1-r1.ebuild:
+  Add keyserv init.d script #53492 by Mario Liehr.
+
+  03 May 2004; David Holm <dholm@gentoo.org> nis-utils-1.4.1.ebuild:
+  Added to ~ppc.
 
 *nis-utils-1.4.1 (02 May 2004)
 
diff --git a/net-nds/nis-utils/Manifest b/net-nds/nis-utils/Manifest
index ecf3b8d2b893..4fba695f37f9 100644
--- a/net-nds/nis-utils/Manifest
+++ b/net-nds/nis-utils/Manifest
@@ -1,3 +1,4 @@
-MD5 93f9a0d1b967514d38052529dcf071ad files/digest-nis-utils-1.4.1 68
-MD5 9b8405e96856719d2064ce1ebd61ac74 nis-utils-1.4.1.ebuild 701
-MD5 188005eb0dcf31bac71e28fa84718dbe ChangeLog 439
+MD5 0791c17e9a25686742f56db61dae9aba ChangeLog 619
+MD5 76512c9e2eb9252d2ff217c29b5f15be nis-utils-1.4.1-r1.ebuild 746
+MD5 93f9a0d1b967514d38052529dcf071ad files/digest-nis-utils-1.4.1-r1 68
+MD5 70c6536deab96c324497ded5385e6b75 files/keyserv.rc 472
diff --git a/net-nds/nis-utils/files/keyserv.rc b/net-nds/nis-utils/files/keyserv.rc
index f12d76b9c2fe..50fad3d8edcc 100644
--- a/net-nds/nis-utils/files/keyserv.rc
+++ b/net-nds/nis-utils/files/keyserv.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-nds/nis-utils/files/keyserv.rc,v 1.1 2004/06/22 03:37:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/nis-utils/files/keyserv.rc,v 1.1.1.1 2005/11/30 09:36:53 chriswhite Exp $
 
 depend() {
 	use logger
diff --git a/net-nds/nis-utils/nis-utils-1.4.1-r1.ebuild b/net-nds/nis-utils/nis-utils-1.4.1-r1.ebuild
index c06e0c9918f8..99eaf3123386 100644
--- a/net-nds/nis-utils/nis-utils-1.4.1-r1.ebuild
+++ b/net-nds/nis-utils/nis-utils-1.4.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/net-nds/nis-utils/nis-utils-1.4.1-r1.ebuild,v 1.1 2004/06/22 03:37:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/nis-utils/nis-utils-1.4.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:53 chriswhite Exp $
 
 inherit eutils
 
@@ -10,19 +10,19 @@ SRC_URI="mirror://kernel/linux/utils/net/NIS+/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~ppc ~x86"
 IUSE="nls"
 
 DEPEND="dev-libs/gmp"
 
 src_compile() {
-	econf `use_enable nls` || die "Configure failed"
+	econf $(use_enable nls) || die "Configure failed"
 	emake || die "Make Failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "Install Failed"
-	mv ${D}/usr/etc ${D}/
+	make DESTDIR="${D}" install || die "Install Failed"
+	mv "${D}"/usr/etc "${D}"/
 	dodoc AUTHORS ChangeLog INSTALL NEWS README THANKS TODO
-	exeinto /etc/init.d ; newexe ${FILESDIR}/keyserv.rc keyserv
+	newinitd "${FILESDIR}"/keyserv.rc keyserv
 }
diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index b27e2bbb542b..f601fe53c675 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,11 +1,692 @@
 # ChangeLog for net-nds/openldap
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.1 2002/02/01 21:53:36 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.1.1.1 2005/11/30 09:36:49 chriswhite Exp $
+
+  16 Oct 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  openldap-2.2.28.ebuild:
+  Stable on hppa.
+
+  03 Oct 2005; Michael Hanselmann <hansmi@gentoo.org>
+  openldap-2.2.28-r1.ebuild:
+  Added to ~mips.
+
+  02 Oct 2005; MATSUU Takuto <matsuu@gentoo.org> openldap-2.2.28.ebuild:
+  Stable on sh.
+
+  22 Sep 2005; Robin H. Johnson <robbat2@gentoo.org> openldap-2.1.26.ebuild,
+  openldap-2.1.27.ebuild, openldap-2.1.27-r1.ebuild, openldap-2.1.30.ebuild,
+  openldap-2.1.30-r1.ebuild, openldap-2.1.30-r2.ebuild,
+  openldap-2.1.30-r3.ebuild, openldap-2.1.30-r4.ebuild,
+  openldap-2.1.30-r5.ebuild, openldap-2.2.14.ebuild, openldap-2.2.19.ebuild,
+  openldap-2.2.23.ebuild, openldap-2.2.23-r1.ebuild, openldap-2.2.24.ebuild,
+  openldap-2.2.26.ebuild, openldap-2.2.26-r1.ebuild,
+  openldap-2.2.26-r2.ebuild, openldap-2.2.27.ebuild,
+  openldap-2.2.27-r1.ebuild, openldap-2.2.28.ebuild,
+  openldap-2.2.28-r1.ebuild:
+  Bug #103421, use -1 instead of /bin/false for enewuser to allow working on
+  freebsd.
+
+  17 Sep 2005; Robin H. Johnson <robbat2@gentoo.org> openldap-2.2.26.ebuild,
+  openldap-2.2.26-r1.ebuild, openldap-2.2.26-r2.ebuild,
+  openldap-2.2.27.ebuild, openldap-2.2.27-r1.ebuild, openldap-2.2.28.ebuild,
+  openldap-2.2.28-r1.ebuild:
+  Bug #106242, typo in the upgrade detection code.
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> openldap-2.2.28.ebuild:
+  Mark 2.2.28 stable on alpha
+
+  14 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  openldap-2.2.28.ebuild:
+  Stable on sparc
+
+  12 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
+  openldap-2.2.28.ebuild:
+  Stable on ppc.
+
+  08 Sep 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +files/openldap-2.2.6-ntlm.patch, openldap-2.2.28-r1.ebuild:
+  Bug #105209, slightly different NTLM patch, ported by upstream this time,
+  should fix things for other people better :-).
+
+  08 Sep 2005; Aron Griffis <agriffis@gentoo.org> openldap-2.2.28.ebuild:
+  Mark 2.2.28 stable on ia64
+
+*openldap-2.2.28-r1 (07 Sep 2005)
+
+  07 Sep 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +files/openldap-2.2.28-ximian_connector.patch, +openldap-2.2.28-r1.ebuild:
+  Bug #105144, patch for NTLM support, candidate for quick move to stable.
+
+  07 Sep 2005; Robin H. Johnson <robbat2@gentoo.org> openldap-2.2.28.ebuild:
+  Force upgrade to die.
+
+  06 Sep 2005; Markus Rothe <corsair@gentoo.org> openldap-2.2.28.ebuild:
+  Stable on ppc64
+
+  06 Sep 2005; Robin H. Johnson <robbat2@gentoo.org> openldap-2.2.28.ebuild:
+  Get rid of message complaining that /etc/openldap/slapd.conf might not exist.
+
+  05 Sep 2005; Robin H. Johnson <robbat2@gentoo.org> openldap-2.2.28.ebuild:
+  Move to stable x86 now, after much testing. Pay attension to the upgrade
+  fail-out if you run an LDAP server!
+
+  25 Aug 2005; Aron Griffis <agriffis@gentoo.org> openldap-2.1.30-r5.ebuild:
+  stable on ia64
+
+*openldap-2.2.28 (24 Aug 2005)
+
+  24 Aug 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +openldap-2.2.28.ebuild:
+  Version bump.
+
+  03 Aug 2005; Robin H. Johnson <robbat2@gentoo.org>
+  openldap-2.1.30-r5.ebuild, openldap-2.2.27-r1.ebuild:
+  Bug #100579, USE=minimal Perl is bad for the perl backend.
+
+  27 Jul 2005; Robin H. Johnson <robbat2@gentoo.org>
+  openldap-2.2.27-r1.ebuild:
+  Depend on newer libtool to avoid bug with CC variable being empty still.
+
+  13 Jul 2005; Rob Holland <tigger@gentoo.org> openldap-2.1.30-r5.ebuild:
+  stable x86. fix sec bug #96767
+
+  13 Jul 2005; Michael Hanselmann <hansmi@gentoo.org>
+  openldap-2.1.30-r5.ebuild:
+  Stable on hppa.
+
+  11 Jul 2005; Simon Stelling <blubb@gentoo.org> openldap-2.1.30-r5.ebuild:
+  stable on amd64 wrt bug 96767
+
+  07 Jul 2005; Markus Rothe <corsair@gentoo.org> openldap-2.1.30-r5.ebuild:
+  Stable on ppc64; bug #96767
+
+  06 Jul 2005; Michael Hanselmann <hansmi@gentoo.org>
+  openldap-2.1.30-r5.ebuild:
+  Stable on ppc.
+
+  05 Jul 2005; Sven Wegener <swegener@gentoo.org> openldap-2.2.23-r1.ebuild:
+  QA: Added kerberos to IUSE.
+
+  04 Jul 2005; Jason Wever <weeve@gentoo.org> openldap-2.1.30-r5.ebuild:
+  Stable on SPARC wrt security bug #96767.
+
+*openldap-2.2.27-r1 (03 Jul 2005)
+*openldap-2.1.30-r5 (03 Jul 2005)
+
+  03 Jul 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +files/openldap-2.2.26-tls-fix-connection-test.patch,
+  +openldap-2.1.30-r5.ebuild, +openldap-2.2.27-r1.ebuild:
+  Security Bug #96767, ssl not being used always. Note that both 2.1.30-r5 and
+  2.2.27-r1 have the patch.
+
+*openldap-2.2.27 (03 Jul 2005)
+
+  03 Jul 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +files/gencert.sh-2.2.27, +openldap-2.2.27.ebuild:
+  Fixed bugs #93074, #97782, #87591. This means that the nasty double-build
+  problem is now solved! New gencert.sh thanks to xmerlin. USE=minimal support
+  to skip building the servers. This is a strong candidate for going stable
+  after the 30 day period.
+
+  06 Jun 2005; Markus Rothe <corsair@gentoo.org> openldap-2.1.30-r4.ebuild:
+  Stable on ppc64
+
+  30 May 2005; Robin H. Johnson <robbat2@gentoo.org>
+  openldap-2.2.26-r2.ebuild:
+  Fix bug #94415, -fPIC needed for correct kerberos build stuff.
+
+  26 May 2005; Herbie Hopkins <herbs@gentoo.org> openldap-2.2.26-r2.ebuild:
+  more multilib fixes..
+
+  21 May 2005; Simon Stelling <blubb@gentoo.org> openldap-2.2.26-r2.ebuild:
+  fixed multilib-strict issues
+
+*openldap-2.2.26-r2 (21 May 2005)
+
+  21 May 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +openldap-2.2.26-r2.ebuild:
+  More lib compatibility stuff, and instructions about revdep-rebuild.
+
+*openldap-2.2.26-r1 (19 May 2005)
+
+  19 May 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +openldap-2.2.26-r1.ebuild:
+  Add 2.2.26 version that builds a liblber from openldap-2.1.
+
+  18 May 2005; Robin H. Johnson <robbat2@gentoo.org> openldap-2.2.14.ebuild,
+  openldap-2.2.19.ebuild, openldap-2.2.23.ebuild, openldap-2.2.23-r1.ebuild,
+  openldap-2.2.24.ebuild, openldap-2.2.26.ebuild:
+  Fix keywords for other arches on 2.2 series.
+
+  19 May 2005; Robin H. Johnson <robbat2@gentoo.org> openldap-2.2.26.ebuild:
+  Add reminder about revdep-rebuild.
+
+  16 May 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  openldap-2.1.30-r4.ebuild:
+  stable on hppa
+
+  30 Apr 2005; Robin H. Johnson <robbat2@gentoo.org> openldap-2.2.26.ebuild:
+  Fix up detection.
+
+*openldap-2.2.26 (30 Apr 2005)
+
+  30 Apr 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +openldap-2.2.26.ebuild:
+  Version bump, fix for bug #90959.
+
+  25 Apr 2005; Bryan Østergaard <kloeri@gentoo.org>
+  openldap-2.1.30-r4.ebuild:
+  Stable on alpha.
+
+  20 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  openldap-2.1.30-r4.ebuild:
+  Stable on ppc.
+
+  20 Apr 2005; Herbie Hopkins <herbs@gentoo.org> openldap-2.1.30-r4.ebuild:
+  Stable on amd64, wrt bug #89012
+
+  15 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  openldap-2.1.30-r4.ebuild:
+  Stable on sparc
+
+  13 Apr 2005; Robin H. Johnson <robbat2@gentoo.org>
+  openldap-2.1.30-r4.ebuild:
+  2.1.30-r4 stable on x86.
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org> openldap-2.1.30-r2.ebuild:
+  Stable on ppc64
+
+*openldap-2.2.24 (20 Mar 2005)
+
+  20 Mar 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +openldap-2.2.24.ebuild:
+  New upstream version. Fixed Bugs #82584, #85974. Ebuild now checks properly
+  for upgrading.
+
+  28 Feb 2005; Aron Griffis <agriffis@gentoo.org> openldap-2.1.30-r2.ebuild,
+  openldap-2.1.30-r3.ebuild, openldap-2.1.30-r4.ebuild,
+  openldap-2.2.14.ebuild, openldap-2.2.19.ebuild, openldap-2.2.23-r1.ebuild,
+  openldap-2.2.23.ebuild:
+  add ia64 keywords
+
+  17 Feb 2005; Robin H. Johnson <robbat2@gentoo.org>
+  openldap-2.1.30-r4.ebuild, openldap-2.2.23-r1.ebuild:
+  Bug #72186: ensure proper building.
+
+*openldap-2.2.23-r1 (14 Feb 2005)
+
+  14 Feb 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +openldap-2.2.23-r1.ebuild:
+  Special version for seemant ;-). Makes some of the extra stuff as modules,
+  and builds some of contrib.
+
+*openldap-2.2.23 (14 Feb 2005)
+
+  14 Feb 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +openldap-2.2.23.ebuild:
+  Add in 2.2.23 for testing. Still hardmasked.
+
+  23 Jan 2005; Robin H. Johnson <robbat2@gentoo.org> openldap-2.1.26.ebuild,
+  openldap-2.1.27-r1.ebuild, openldap-2.1.27.ebuild,
+  openldap-2.1.30-r1.ebuild, openldap-2.1.30-r2.ebuild,
+  openldap-2.1.30-r3.ebuild, openldap-2.1.30-r4.ebuild,
+  openldap-2.1.30.ebuild, openldap-2.2.14.ebuild, openldap-2.2.19.ebuild:
+  Fix bug #79216.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  06 Dec 2004; Robin H. Johnson <robbat2@gentoo.org>
+  openldap-2.1.30-r3.ebuild, openldap-2.1.30-r4.ebuild,
+  openldap-2.2.14.ebuild, openldap-2.2.19.ebuild:
+  More docs for 2.2 upgrade, fix slight glitch in slapd.conf.
+
+*openldap-2.1.30-r4 (01 Dec 2004)
+
+  01 Dec 2004; Robin H. Johnson <robbat2@gentoo.org>
+  +files/openldap-2.1.30-tls-activedirectory-hang-fix.patch,
+  files/2.0/slapd, +openldap-2.1.30-r4.ebuild:
+  Fix bugs #67080 (2.1.30-r4) and #71268 (init-script).
+
+*openldap-2.2.19 (01 Dec 2004)
+
+  01 Dec 2004; Robin H. Johnson <robbat2@gentoo.org>
+  +openldap-2.2.19.ebuild:
+  Latest 2.2 ebuild, for testing only. See ebuild for upgrade notes.
+
+  07 Nov 2004; Joshua Kinard <kumba@gentoo.org> openldap-2.1.30-r2.ebuild:
+  Marked stable on mips.
+
+  05 Oct 2004; Guy Martin <gmsoft@gentoo.org> openldap-2.1.30-r2.ebuild:
+  Stable on hppa.
+
+  03 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> openldap-2.1.30-r2.ebuild:
+  Stable on alpha.
+
+*openldap-2.1.30-r2 (25 Sep 2004)
+
+  25 Sep 2004; Jason Wever <weeve@gentoo.org> openldap-2.1.30-r2.ebuild:
+  Stable on sparc.
+
+  22 Aug 2004; Jason Wever <weeve@gentoo.org> openldap-2.1.30-r1.ebuild:
+  Stable on sparc.
+
+*openldap-2.1.30-r3 (22 Aug 2004)
+
+  22 Aug 2004; Robin H. Johnson <robbat2@gentoo.org>
+  +openldap-2.1.30-r3.ebuild:
+  Bug #55706, add BDB checkpoints to config.
+
+  22 Aug 2004; Joshua Kinard <kumba@gentoo.org> openldap-2.1.30-r1.ebuild:
+  Marked stable on mips.
+
+  18 Aug 2004; Aron Griffis <agriffis@gentoo.org> openldap-2.1.30-r1.ebuild:
+  stable on alpha
+
+  05 Aug 2004; Alastair Tse <liquidx@gentoo.org>
+  +files/openldap-2.1.30-ximian_connector.patch:
+  adding ximian connector patches to expose more of the ldap api (#58320)
+
+  18 Jul 2004; Robin H. Johnson <robbat2@gentoo.org> openldap-2.1.26.ebuild,
+  openldap-2.1.27-r1.ebuild, openldap-2.1.27.ebuild,
+  openldap-2.1.30-r1.ebuild, openldap-2.1.30.ebuild:
+  stable 2.1.30-r1 on x86, fixup ebuilds to mirror://.
+
+*openldap-2.2.14 (09 Jul 2004)
+
+  09 Jul 2004; Robin H. Johnson <robbat2@gentoo.org> openldap-2.2.14.ebuild:
+  initial 2.2 ebuild, not for public consumption yet.
+
+  24 Jun 2004; Aron Griffis <agriffis@gentoo.org> openldap-2.1.26.ebuild,
+  openldap-2.1.27-r1.ebuild, openldap-2.1.27.ebuild,
+  openldap-2.1.30-r1.ebuild, openldap-2.1.30.ebuild:
+  QA - fix use invocation
+
+*openldap-2.1.30-r1 (20 Jun 2004)
+
+  20 Jun 2004; Robin H. Johnson <robbat2@gentoo.org>
+  openldap-2.1.30-r1.ebuild, files/openldap-2.2.14-db40.patch,
+  files/openldap-2.2.14-perlthreadsfix.patch:
+  move make test to src_test.
+
+  12 Jun 2004; Tom Gall <tgall@gentoo.org> openldap-2.1.30.ebuild:
+  stable on ppc64 bug 53766
+
+  06 Jun 2004; Guy Martin <gmsoft@gentoo.org> openldap-2.1.30.ebuild:
+  Marked stable on hppa.
+
+  21 May 2004; Robin H. Johnson <robbat2@gentoo.org> files/2.0/slapd,
+  files/2.0/slurpd:
+  fix bug #51594, no version bump for now.
+
+  12 May 2004; Michael McCabe <randy@gentoo.org> openldap-2.1.30.ebuild:
+  Added s390 keywords
+
+*openldap-2.1.30 (28 Apr 2004)
+
+  28 Apr 2004; Robin H. Johnson <robbat2@gentoo.org> openldap-2.1.30.ebuild,
+  files/openldap-2.1.30-db40.patch:
+  new version with changes from bug #42427. direct kerberos is deprecated
+  upstream.
+
+  24 Apr 2004; Robin H. Johnson <robbat2@gentoo.org>
+  openldap-2.0.25-r1.ebuild, openldap-2.0.25-r2.ebuild,
+  openldap-2.0.25-r3.ebuild, openldap-2.0.27-r4.ebuild,
+  openldap-2.0.27-r5.ebuild, openldap-2.0.27.ebuild, openldap-2.1.21.ebuild,
+  openldap-2.1.22-r1.ebuild, openldap-2.1.22.ebuild, openldap-2.1.23.ebuild,
+  files/kerberos-2.0.diff.bz2, files/kerberos-2.1.diff.bz2,
+  files/openldap-2.0.27-db3-gentoo.patch,
+  files/openldap-2.1.22-perlsedfoo.patch, files/rfc2252-bork.patch,
+  files/slapd-2.1-r1.rc6, files/slapd-2.1.conf, files/slapd-2.1.rc6,
+  files/slapd.rc6, files/slurpd-2.1.rc6, files/slurpd.rc6:
+  remove old versions incl old 2.0 series.
+
+  30 Mar 2004; Lars Weiler <pylon@gentoo.org> openldap-2.1.27-r1.ebuild:
+  stable on ppc, as requested in bug #26728
+
+*openldap-2.1.27-r1 (28 Mar 2004)
+
+  28 Mar 2004; Robin H. Johnson <robbat2@gentoo.org>
+  openldap-2.1.27-r1.ebuild, files/openldap-2.1.27-db40.patch:
+  add in more db40 fixes, new revision as it may change where your openldap is
+  linked against.
+
+  24 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  openldap-2.1.22-r1.ebuild, openldap-2.1.23.ebuild, openldap-2.1.26.ebuild,
+  openldap-2.1.27.ebuild:
+  don't use deprecated ? : use syntax
+
+  23 Mar 2004; Joshua Kinard <kumba@gentoo.org> openldap-2.1.27.ebuild:
+  Marked stable on mips.
+
+  10 Mar 2004; Jason Wever <weeve@gentoo.org> openldap-2.1.26.ebuild:
+  Stable on sparc.
+
+  09 Mar 2004; <agriffis@gentoo.org> openldap-2.1.26.ebuild:
+  stable on alpha and ia64
+
+  08 Mar 2004; Robin H. Johnson <robbat2@gentoo.org> openldap-2.1.23.ebuild,
+  openldap-2.1.26.ebuild, openldap-2.1.27.ebuild:
+  ppc64 keywords removed pending deps: app-crypt/mit-krb5, app-crypt/heimdal,
+  dev-libs/cyrus-sasl, dev-db/unixODBC
+
+*openldap-2.1.27 (08 Mar 2004)
+
+  08 Mar 2004; Robin H. Johnson <robbat2@gentoo.org> openldap-2.1.27.ebuild,
+  files/openldap-2.1.27-perlthreadsfix.patch:
+  fix bug #43021, change kerberos deps to virtual instead of app-crypt/mit-krb5
+  (which breaks heimdal). fix bug #42966, version bump. newer, more portable fix
+  for bug #31202 (also fixes a weird problem case).
+
+  27 Feb 2004; Joshua Kinard <kumba@gentoo.org> openldap-2.1.26.ebuild:
+  Added ~mips to KEYWORDS to satisfy repoman deps.
+
+  15 Feb 2004; Robin H. Johnson <robbat2@gentoo.org> openldap-2.1.26.ebuild:
+  add more notes on  bug #41297 fix, from bug #41039.
+
+  11 Feb 2004; Robin H. Johnson <robbat2@gentoo.org> openldap-2.1.26.ebuild:
+  fix bug #41297. fix bug #31202.
+
+  08 Feb 2004; Robin H. Johnson <robbat2@gentoo.org> openldap-2.1.26.ebuild:
+  bug #26728, security bump, held up for a long time by DB4.1
+
+  04 Feb 2004; Robin H. Johnson <robbat2@gentoo.org> openldap-2.1.26.ebuild:
+  fix bug #40417
+
+*openldap-2.1.26 (27 Jan 2004)
+*openldap-2.0.27-r5 (27 Jan 2004)
+
+  27 Jan 2004; Robin H. Johnson <robbat2@gentoo.org>
+  openldap-2.0.27-r5.ebuild, openldap-2.1.26.ebuild:
+  fix bug #33718, and version bump to new openldap
+
+  06 Jan 2004; <agriffis@gentoo.org> openldap-2.0.27-r4.ebuild:
+  Stable on alpha and ia64
+
+  22 Dec 2003; Robin H. Johnson <robbat2@gentoo.org>
+  openldap-2.1.22-r1.ebuild, openldap-2.1.22.ebuild, openldap-2.1.23.ebuild:
+  Fix IUSE in 2.1.2[23] as per bug #34769.
+
+  13 Dec 2003; Jason Wever <weeve@gentoo.org> openldap-2.0.27-r4.ebuild:
+  Marked stable on sparc.
+
+  05 Dec 2003; Robin H. Johnson <robbat2@gentoo.org> openldap-2.1.23.ebuild:
+  change the version depend on berkdb to 4.1.25_p1-r3 and fix a nasty bug with
+  DEPEND
+
+  06 Nov 2003; Robin H. Johnson <robbat2@gentoo.org>
+  openldap-2.0.25-r3.ebuild, openldap-2.0.27-r4.ebuild,
+  openldap-2.1.21.ebuild, openldap-2.1.22-r1.ebuild, openldap-2.1.22.ebuild,
+  openldap-2.1.23.ebuild, files/gencert.sh:
+  : instead of . for chown
+
+  28 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> metadata.xml:
+  add metadata.xml
+
+*openldap-2.1.23 (28 Oct 2003)
+
+  28 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> openldap-2.1.23.ebuild:
+  version bump
+
+  28 Oct 2003; Robin H. Johnson <robbat2@gentoo.org>
+  openldap-2.1.22-r1.ebuild:
+  fix bug #31037
+
+*openldap-2.1.22-r1 (12 Oct 2003)
+
+  12 Oct 2003; Robin H. Johnson <robbat2@gentoo.org>
+  openldap-2.1.22-r1.ebuild, files/openldap-2.1.22-perlsedfoo.patch:
+  add new patch for openldap-2.1 to compile properly again, and cleanup ebuild
+
+  26 Jul 2003; Nick Hadaway <raker@gentoo.org> openldap-2.0.25-r3.ebuild:
+  Backporting features from the 2.0.27-r4 ebuild so 1.0 profiles are
+  caught up.
+
+  23 Jul 2003; Nick Hadaway <raker@gentoo.org> openldap-2.0.27-r4.ebuild,
+  rfc2252-bork.patch:
+  Added a comment in postinst re: upgrading from ldap builds which ran
+  as root.  Also included a patch suggested by Jean Jordaan on bug
+  #24271 which fixes a b0rked rfc2252.
+
+  13 Jul 2003; Nick Hadaway <raker@gentoo.org> openldap-2.0.27-r4.ebuild,
+  openldap-2.1.22.ebuild:
+  Added chown ldap:ldap /var/lib/openldap-{data,ldbm,slurp} to 
+  pkg_postinst.  closes bug #24407
+
+  12 Jul 2003; Nick Hadaway <raker@gentoo.org> openldap-2.0.27-r4.ebuild:
+  Adding support for linking to SASLv1.  (SASL1=yes)  Not putting this
+  behind a use variable as people are expecting to link against SASLv2
+  normally.
+
+  10 Jul 2003; Robin H. Johnson <robbat2@gentoo.org> openldap-2.1.22.ebuild:
+  AF_UNIX and process title support.
+
+  09 Jul 2003; Nick Hadaway <raker@gentoo.org> openldap-2.1.22.ebuild:
+  Version bump.  Added ebuild changes made to 2.0.27-r4 to 2.1.22.
+  Still waiting for db4 to become a reality in gentoo.
+
+  09 Jul 2003; Nick Hadaway <raker@gentoo.org> openldap-2.0.27-r4.ebuild,
+  files/2.0/slapd, files/2.0/slapd.conf:
+  Updated example to include ldapi.  Added eval to the slapd init.d
+  so the %2f is parsed properly.  Changed the location of the slapd.args
+  in the default config and installed config.  Thanks to robbat2 for
+  working this solution out.  Marking stable for x86.
+
+  08 Jul 2003; Nick Hadaway <raker@gentoo.org> openldap-2.0.27-r4:
+  Fixed the conf.d slapd filename and added some code to pkg_postinst
+  so correct permissions are passed to directories/files affected by the 
+  upgrade from running as root to running as user/group ldap.
+
+*openldap-2.1.22 (10 Jul 2003)
+ 
+  13 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
+*openldap-2.0.25-r2 (22 Jun 2003)
+
+  22 Jun 2003; Alastair Tse <liquidx@gentoo.org> openldap-2.0.25-r1.ebuild,
+  openldap-2.0.25-r2.ebuild:
+  add openldap-2.0.25 back because it will break 1.0 profiles
+
+*openldap-2.1.21 (14 Jun 2003)
+
+  14 Jun 2003; Nick Hadaway <raker@gentoo.org> openldap-2.1.21.ebuild,
+  files/digest-openldap-2.1.21, files/2.0/slapd, files/2.0/slapd.conf:
+  Bug fixes as noted in bug #22657.  Version bump.
+
+*openldap-2.0.27-r4 (28 May 2003)
+
+  28 May 2003; Grant Goodyear <g2boojum@gentoo.org> openldap-2.0.27-r4.ebuild:
+  Added MDK password fix, changed behavior wrt gdbm/berkdb USE variables to be
+  more sensible.  Also now generate self-signed ssl cert.
+
+  28 May 2003; Grant Goodyear <g2boojum@gentoo.org> openldap-2.1.12.ebuild,
+  openldap-2.1.19.ebuild, openldap-2.1.20.ebuild:
+  Changed goofy "-x86" masks to "~x86", but added >=net-nds/openldap-2.1
+  to package.mask.  That way package.unmask will work properly.
+
+*openldap-2.1.20 (27 May 2003)
+
+  27 May 2003; Grant Goodyear <g2boojum@gentoo.org> openldap-2.1.20.ebuild,
+  files/gencert.sh:
+  New version w/ a number of changes:
+    * self-signed ssl cert created at install time
+    * order of linking changed so that passwd + ldap works properly
+    # if "berkdb" and "gdbm" in USE then berkdb used in the ebuild.
+
+  12 May 2003; Jason Wever <weeve@gentoo.org> openldap-2.0.27-r3.ebuild:
+  Added ~sparc to keywords.
+
+*openldap-2.1.19 (11 May 2003)
+
+  11 May 2003; Alastair Tse <liquidx@gentoo.org> openldap-2.1.19.ebuild:
+  wholesale changes to how this ebuild is installed. fixes :
+   - wrong pid file directory in both config and init.d (#13057)
+   - debugging enabled for syslogging (#16131)
+   - version bumped 2.1 series and omit redundant kerberos patch (#16341)
+   - fixed /var/tmp paths in *.la (#12084)
+
+*openldap-2.0.27-r3 (11 May 2003)
+
+  11 May 2003; Alastair Tse <liquidx@gentoo.org> openldap-2.0.27-r3.ebuild,
+  files/2.0/slapd, files/2.0/slapd.conf, files/2.0/slurpd:
+
+  wholesale changes to how this ebuild is installed. fixes :
+   - wrong pid file directory in both config and init.d (#13057)
+   - debugging enabled for syslogging (#16131)
+   - fixed /var/tmp paths in *.la (#12084)
+
+  14 Apr 2003; Will Woods <wwoods@gentoo.org> openldap-2.0.27-r1.ebuild,
+  openldap-2.0.27-r2.ebuild, openldap-2.0.27.ebuild:
+  added alpha to KEYWORDS as appropriate
+
+  23 Feb 2003; Nick Hadaway <raker@gentoo.org> openldap-2.0.27*.ebuild :
+  Changed --disable-sasl to --without-cyrus-sasl as noted by Matt
+  on bug #16144
+
+*openldap-2.1.12 (04 Feb 2003)
+
+  04 Feb 2003; Nick Hadaway <raker@gentoo.org> openldap-2.1.12.ebuild,
+  files/digest-openldap-2.1.12, files/kerberos-2.1.diff.bz2 :
+  Fixed typos like in 2.0.27-r2 and added the kainz kerberos diff for 2.1
+  2.1.12 is now considered stable so when db4 moves, so will openldap.
+
+*openldap-2.0.27-r2 (29 Jan 2003)
+
+  17 Apr 2003; Aron Griffis <agriffis@gentoo.org> openldap-2.0.27-r2.ebuild:
+  Add ~alpha to KEYWORDS
+
+  04 Feb 2003; Nick Hadaway <raker@gentoo.org> openldap-2.0.27-r2.ebuild,
+  files/kerberos-2.0.diff.bz2 :
+  Added a kerberos configure change as suggested by kainz.
+
+  29 Jan 2003; Nick Hadaway <raker@gentoo.org> openldap-2.0.27-r2.ebuild,
+  files/digest-openldap-2.0.27-r2 files/slapd-2.1-r1.rc6,
+  files/slapd-2.1.conf :
+  Fixes some typos in -r1 and adds a slapd.conf based on suggestions
+  by claer@unixlover.com on bug #8780
+
+*openldap-2.0.27-r1 (01 Jan 2002)
+*openldap-2.1.10 (01 Jan 2002)
+
+  03 Jan 2002; Nick Hadaway <raker@gentoo.org> openldap-2.1.10.ebuild :
+  Added dependancy on net-libs/openslp.
+
+  02 Jan 2002; Nick Hadaway <raker@gentoo.org> openldap-2.0.27-r1.ebuild,
+  openldap-2.1.10.ebuild. files/slapd-2.1.rc6 :
+  Added --enable-ldap to openldap-2.1.10 and changed the ldap data dir
+  from /var/state/openldap/openldap-ldbm to /var/lib/openldap-data.
+  Both of these fixes/updates come from Eric Renfro.  Many thanks!
+
+  01 Jan 2002; Nick Hadaway <raker@gentoo.org> openldap-2.0.27-r1.ebuild,
+  openldap-2.1.10.ebuild, files/digest-openldap-2.0.27-r1,
+  files/digest-openldap-2.1.10, files/slapd-2.1.rc6,
+  files/slurpd-2.1.rc6 :
+  Version bump in the 2.1 series.  These latest ebuilds are now setup
+  so that ldap services drop root privileges on startup.  Please
+  comment on bug #8780.
+
+*openldap-2.1.9 (18 Dec 2002)
+
+  18 Dec 2002; Nick Hadaway <raker@gentoo.org> openldap-2.1.9.ebuild,
+  files/digest-openldap-2.1.9 :
+  Version bump.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+
+  03 Dec 2002; Will Woods <wwoods@gentoo.org> openldap-1.2.13-r6.ebuild:
+  Added ~alpha keyword and src_unpack() with gnuconfig_update.
+
+*openldap-2.0.27 (25 Nov 2002)
+
+  21 Dec 2002; Nick Hadaway <raker@gentoo.org> openldap-2.0.27.ebuild :
+  db4 is not required for this version.  Also fixed readline
+  dependancy as to not squash the 1.0 profile.
+
+  27 Nov 2002; Nick Hadaway <raker@gentoo.org> openldap-2.0.27.ebuild,
+  files/digest-openldap-2.0.27 :
+  Updated stable series of openldap.
+
+*openldap-2.1.8 (25 Nov 2002)
+
+  25 Nov 2002; Nick Hadaway <raker@gentoo.org> openldap-2.1.8.ebuilod,
+  files/digest-openldap-2.1.8 :
+  New ebuild of openldap.  Lots of configure updates.  Needs lots of
+  testing.  The ebuild depends on db4 so all arches are marked - until
+  db4 is marked unstable for testing.
+
+*openldap-2.0.25-r3 (21 Sept 2002)
+
+  11 Oct 2002; Nick Hadaway <raker@gentoo.org> openldap-2.0.25-r3.ebuild :
+  Removed sasl support as saslv2 support is not complete in this and
+  causes a circular dependancy with cyrus-sasl.  cyrus-sasl still has
+  ldap support built in.
+
+  21 Sept 2002; Grant Goodyear <g2boojum@gentoo.org> openldap-2.0.25-r3.ebuild
+  Replaced entire make install section w/ "make DESTDIR=${D} install".
+  The previous version was putting ${D} in the /etc/openldap files, and
+  the simple fix seems to have solved the problem.   I also checked, and
+  sysconfdir seems to be working correctly, so I don't think I've broken
+  Seemant's fix.
+
+*openldap-2.0.25-r2 (15 Aug 2002)
+
+  16 Sep 2002; Seemant Kulleen <seemant@gentoo.org> openldap-2.0.25-r2.ebuild
+  Fixed sysconfdir to /etc so that config files go into the /etc/openldap
+  directory instead of /etc/openldap/openldap.  Thanks to:
+  gdjohn@egregious.org.uk (Gareth John) in bug #7986
+
+  07 Sep 2002; Seemant Kulleen <seemant@gentoo.org>
+  openldap-2.0.25-r2.ebuild :
+  Fixed the use flags so that they are not prefixed with "ldap-"  as
+  discovered by jap1@ionet.net (Jacob Perkins) and kevin@aptbasilicata.it
+  (j2ee) in bug #7597
+
+  15 Aug 2002; Nick Hadaway <raker@gentoo.org>
+  openldap-2.0.25-r2.ebuild, files/digest-openldap-2.0.25-r2 :
+  Updated ebuild based on suggestions by Eric Renfro via bug report
+  #6488
+
+*openldap-2.0.25-r1 (29 Jul 2002)
+
+  12 Aug 2002; Mark Guertin <gerk@gentoo.org> :
+  Added ppc to keywords
+
+  29 Jul 2002; Nick Hadaway <raker@gentoo.org>
+  openldap-2.0.25-r1, files/slapd.rc6, files/digest-openldap-2.0.25-r1 :
+  Updated ebuild for proper USE flag to configure option generation.  Fixed
+  a typo in slapd.rc6.  Bumping to -r1 due to the many changes in the ebuild
+  since the first 2.0.25 release.
+
+*openldap-2.0.25 (17 Jul 2002)
+
+  26 Jul 2002; Nick Hadaway <raker@gentoo.org> files/slapd.rc6 :
+  Added --pidfile /var/state/openldap/slapd.pid to files/slapd.rc6 to supress
+  error messages when shutting doesn slapd.
+
+  26 Jul 2002; Nick Hadaway <raker@gentoo.org>
+  re-modified ebuild so localstatedir=/var/state/openldap to match with the
+  default slapd config file.  /var/state/openldap/openldap-ldbm and
+  /var/state/openldap/openldap-slurp are also created correctly.
+  Bug #5557 re-visited.
+
+  26 Jul 2002; Nick Hadaway <raker@gentoo.org>
+  modified ebuild to create a /var/state/openldap to conicide with default
+  configuration of where databases are stored.  Closes bug #5557.
+
+  17 Jul 2002; Nick Hadaway <raker@gentoo.org>
+  openldap-2.0.25.ebuild, file/digest-openldap-2.0.25 :
+  Version bump to latest stable vesion.  Also added support for SASL by
+  request on bug #5104.
+
+*openldap-2.0.23 (20 Apr 2002)
+
+  20 Apr 2002; Ryan Phillips <rphillips@gentoo.org> openldap-2.0.23 :
+  Updated package
 
 *openldap-2.0.21 (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-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 03824f15567e..a4c03c53faea 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -1,24 +1,59 @@
-MD5 86a13849ab636d3bc22ebd718ec3a95a ChangeLog 7334
-MD5 66c478b68fe23e7beb49a11175a89c40 openldap-2.0.27-r3.ebuild 3956
-MD5 56353b208cd2f1c14f17700e5a4d74af openldap-2.1.19.ebuild 4266
-MD5 7e223bf5e395fd7b935ed34f7833724a openldap-2.0.25-r1.ebuild 2420
-MD5 fff1c376523766e56dcb20916ee25919 openldap-2.0.27-r2.ebuild 3025
-MD5 a4010ca341fd815df8a6875a8fe289ef openldap-2.0.27.ebuild 2306
-MD5 293bb36ba16124176601d1d57beb92da openldap-2.1.12.ebuild 3335
-MD5 bc676758f2d1726b75e1d04fd936d029 files/digest-openldap-2.0.27-r3 65
-MD5 cc41a12a9b455803861b9919a0b86d55 files/digest-openldap-2.1.19 65
-MD5 bc676758f2d1726b75e1d04fd936d029 files/digest-openldap-2.0.27 65
-MD5 bc676758f2d1726b75e1d04fd936d029 files/digest-openldap-2.0.27-r2 65
-MD5 bd86dfd482d437884ca6305acc3aa2a1 files/digest-openldap-2.1.12 65
-MD5 8a8a025bf2de63f76d33f244624c3851 files/kerberos-2.0.diff.bz2 385
-MD5 1de3e9592a8549c165bd43ba11b887f4 files/kerberos-2.1.diff.bz2 402
-MD5 b6dfea76b039b194c4f403d9e7cebde0 files/slapd-2.1-r1.rc6 709
-MD5 44c7dbcfe29bc1df9e576e5010c4674f files/slapd-2.1.conf 251
-MD5 460d3869f98a805e246ce497ac7f5dc5 files/slapd-2.1.rc6 614
-MD5 b7f252f92c11c2041e7bc864c344ecf1 files/slapd.rc6 591
-MD5 a10c9fd548df5774f91a6a10ed604041 files/slurpd-2.1.rc6 508
-MD5 427c91c528ea2cc1719df18d5339706f files/slurpd.rc6 504
-MD5 32822e9d47a48af3b1da7e5a3c5c6229 files/digest-openldap-2.0.25-r1 65
-MD5 0ca38c285b94f57088a73fedcecb9e34 files/2.0/slapd 615
-MD5 44c7dbcfe29bc1df9e576e5010c4674f files/2.0/slapd.conf 251
-MD5 80adb9dc3133bd47fbc1168fd29788ee files/2.0/slurpd 505
+MD5 8900883d56705e11559b60fdb15b4fce ChangeLog 26571
+MD5 b0d485ea1a51fb83c70daedef2599272 metadata.xml 279
+MD5 2e5ce39205e9dc1feeab9ff802236317 openldap-2.1.26.ebuild 7088
+MD5 ef0fa55269a7ae32b56ca1095148995a openldap-2.1.27-r1.ebuild 7444
+MD5 cfaff772158053886baf083d75fca2ff openldap-2.1.27.ebuild 7051
+MD5 22eb1df7c644a2778e5f985bd78330cd openldap-2.1.30-r1.ebuild 7375
+MD5 943899d61dff15e7eb2ff62409814b49 openldap-2.1.30-r2.ebuild 7483
+MD5 992888650b5b09f265a46469585bcba8 openldap-2.1.30-r3.ebuild 7208
+MD5 2d4e17747e16fdd75a17a66c5537184c openldap-2.1.30-r4.ebuild 7308
+MD5 2950a8442733483861d191c433359f59 openldap-2.1.30-r5.ebuild 7628
+MD5 aebb509ea0634689f1e3a4549d4d343d openldap-2.1.30.ebuild 7361
+MD5 917840881094150cd91192866ec4e1c6 openldap-2.2.14.ebuild 7247
+MD5 7ddeb08466499dbe3c49b850b336744f openldap-2.2.19.ebuild 7955
+MD5 67e977f2927e78c29f4020adba7f6b5b openldap-2.2.23-r1.ebuild 8793
+MD5 4c922f830e79b6306a820b382393bd94 openldap-2.2.23.ebuild 7812
+MD5 a2a59d1ab489b0df339f525ccd8c77fa openldap-2.2.24.ebuild 9508
+MD5 e3ce48b75e86dcaee9ad7a0db70580e5 openldap-2.2.26-r1.ebuild 10630
+MD5 3b13f5c41a246a66f7d8c108fcbf4dd6 openldap-2.2.26-r2.ebuild 11630
+MD5 8140ef7b57df1b8240aefc6721c89135 openldap-2.2.26.ebuild 9732
+MD5 b33aca9604940f55ec0992f486d64605 openldap-2.2.27-r1.ebuild 12774
+MD5 44d54b94ad9be3c6a595e530ffde8e24 openldap-2.2.27.ebuild 12424
+MD5 d0b2e396543e06107bd1b2f492c246f2 openldap-2.2.28-r1.ebuild 13109
+MD5 72bade434d8afe3c9c9f665518a6d786 openldap-2.2.28.ebuild 12908
+MD5 30ef1dc504563809f990b72ffe2be6c0 files/digest-openldap-2.1.26 65
+MD5 f829d2ebaab2e3e020a6b25522734331 files/digest-openldap-2.1.27 65
+MD5 f829d2ebaab2e3e020a6b25522734331 files/digest-openldap-2.1.27-r1 65
+MD5 6da89687536a5ec9a422938e997a8a04 files/digest-openldap-2.1.30 65
+MD5 6da89687536a5ec9a422938e997a8a04 files/digest-openldap-2.1.30-r1 65
+MD5 6da89687536a5ec9a422938e997a8a04 files/digest-openldap-2.1.30-r2 65
+MD5 6da89687536a5ec9a422938e997a8a04 files/digest-openldap-2.1.30-r3 65
+MD5 6da89687536a5ec9a422938e997a8a04 files/digest-openldap-2.1.30-r4 65
+MD5 6da89687536a5ec9a422938e997a8a04 files/digest-openldap-2.1.30-r5 65
+MD5 27d2ee25b32bf4a429ae80149508ff34 files/digest-openldap-2.2.14 65
+MD5 d1db1a9bf4afc66b26e33beef17f07f4 files/digest-openldap-2.2.19 65
+MD5 fa0a0dfbb9f3984fb2907c020e02ec73 files/digest-openldap-2.2.23 65
+MD5 fa0a0dfbb9f3984fb2907c020e02ec73 files/digest-openldap-2.2.23-r1 65
+MD5 f5d06782a157396faab1a04efa2c9305 files/digest-openldap-2.2.24 65
+MD5 66eae9c51565619904da420475ec9ae6 files/digest-openldap-2.2.26 65
+MD5 f1e72154e299a0b90a1157c7ed171daf files/digest-openldap-2.2.26-r1 130
+MD5 f1e72154e299a0b90a1157c7ed171daf files/digest-openldap-2.2.26-r2 130
+MD5 919632051f7ddeeed29b011f163d17f0 files/digest-openldap-2.2.27 130
+MD5 919632051f7ddeeed29b011f163d17f0 files/digest-openldap-2.2.27-r1 130
+MD5 a8e7c88a9f6b88fb9b88d4e66fae5d92 files/digest-openldap-2.2.28 130
+MD5 a8e7c88a9f6b88fb9b88d4e66fae5d92 files/digest-openldap-2.2.28-r1 130
+MD5 c8d6f4ebeb92ef1085b1bb77d7b4db5f files/gencert.sh 3505
+MD5 c16eada85fafe1c17bf0089d0ef90ae3 files/gencert.sh-2.2.27 2939
+MD5 b10517f0e7be829d47bb8096d86fb519 files/openldap-2.1.27-db40.patch 718
+MD5 ca2c43219df88502aafeab9db9eda4d5 files/openldap-2.1.27-perlthreadsfix.patch 967
+MD5 c58db81c8d7084a9abf48747134da0a8 files/openldap-2.1.30-db40.patch 718
+MD5 1afdae6ce6fa709abed41ce45f41f5e8 files/openldap-2.1.30-tls-activedirectory-hang-fix.patch 1122
+MD5 2e6d3f7cf49a1d85468befdff2bfc1d8 files/openldap-2.1.30-ximian_connector.patch 6435
+MD5 4c6ef684996786b3a7cc2dc15c4ae7a4 files/openldap-2.2.14-db40.patch 773
+MD5 95a998755d69f0f30cb64b9cb8eeab15 files/openldap-2.2.14-perlthreadsfix.patch 614
+MD5 4591bdcf0bd459c6fdbcabc93f5b6b55 files/openldap-2.2.26-tls-fix-connection-test.patch 663
+MD5 f940f4e9ac544ed0a0f28b87df5cd2c8 files/openldap-2.2.28-ximian_connector.patch 5669
+MD5 7d80c3708d5940a3b7a428740af863d0 files/openldap-2.2.6-ntlm.patch 5011
+MD5 50257f7d6b63c8e9778b6407c7d2dddb files/2.0/slapd.conf 277
+MD5 1a7084c17a74e59db33578c0833e4099 files/2.0/slapd 584
+MD5 d68ba97d9f54b8455c1e2d93c352d24a files/2.0/slurpd 495
diff --git a/net-nds/openldap/files/2.0/slapd b/net-nds/openldap/files/2.0/slapd
index ed67f9daf983..b8c5004616dc 100644
--- a/net-nds/openldap/files/2.0/slapd
+++ b/net-nds/openldap/files/2.0/slapd
@@ -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-nds/openldap/files/2.0/slapd,v 1.1 2003/05/11 19:18:21 liquidx Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/files/2.0/slapd,v 1.1.1.1 2005/11/30 09:36:53 chriswhite Exp $
 
 depend() {
 	need net
@@ -9,12 +9,12 @@ depend() {
 
 start() {
 	ebegin "Starting ldap-server"
-	start-stop-daemon --start --quiet --pidfile /var/run/openldap/slapd.pid --exec /usr/lib/openldap/slapd -- -u ldap -g ldap ${OPTS}
+	eval start-stop-daemon --start --quiet --pidfile /var/run/openldap/slapd.pid --exec /usr/lib/openldap/slapd -- -u ldap -g ldap "${OPTS}"
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping ldap-server"
-	start-stop-daemon --stop --quiet --pidfile /var/run/openldap/slapd.pid --exec /usr/lib/openldap/slapd
+	start-stop-daemon --stop --signal 2 --quiet --pidfile /var/run/openldap/slapd.pid 
 	eend $?
 }
diff --git a/net-nds/openldap/files/2.0/slapd.conf b/net-nds/openldap/files/2.0/slapd.conf
index 9a82209503ea..f12f2f67b059 100644
--- a/net-nds/openldap/files/2.0/slapd.conf
+++ b/net-nds/openldap/files/2.0/slapd.conf
@@ -4,5 +4,4 @@
 # one uncomment this line or set any other server starting options
 # you may desire.
 #
-# OPTS="-h \'ldaps://0.0.0.0/ ldap://0.0.0.0/\'"
-
+# OPTS="-h 'ldaps:// ldap:// ldapi://%2fvar%2frun%2fopenldap%2fslapd.sock'"
diff --git a/net-nds/openldap/files/2.0/slurpd b/net-nds/openldap/files/2.0/slurpd
index 425c2e9b5747..3d6da55f8b86 100644
--- a/net-nds/openldap/files/2.0/slurpd
+++ b/net-nds/openldap/files/2.0/slurpd
@@ -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-nds/openldap/files/2.0/slurpd,v 1.1 2003/05/11 19:18:21 liquidx Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/files/2.0/slurpd,v 1.1.1.1 2005/11/30 09:36:53 chriswhite Exp $
 
 depend() {
 	need net
@@ -9,12 +9,14 @@ depend() {
 
 start() {
 	ebegin "Starting slurpd"
-	start-stop-daemon --start --quiet --exec /usr/lib/openldap/slurpd
+	start-stop-daemon --start --quiet \
+	--exec /usr/lib/openldap/slurpd 
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping slurpd"
-	start-stop-daemon --stop --quiet --exec /usr/lib/openldap/slurpd
+	start-stop-daemon --stop --quiet \
+	--exec /usr/lib/openldap/slurpd 
 	eend $?
 }
diff --git a/net-nds/openldap/files/gencert.sh b/net-nds/openldap/files/gencert.sh
index 5282ac464550..66c61d1edd57 100644
--- a/net-nds/openldap/files/gencert.sh
+++ b/net-nds/openldap/files/gencert.sh
@@ -132,7 +132,7 @@ chmod 400 /tmp/tmpssl-$$/*
 
 echo "Certificate creation done!"
 cp /tmp/tmpssl-$$/ldap.* .
-chown ldap.ldap ldap.*
+chown ldap:ldap ldap.*
 
 rm -rf /tmp/tmpssl-$$
 
diff --git a/net-nds/openldap/metadata.xml b/net-nds/openldap/metadata.xml
index 7f328242ec7e..02e945c7cb52 100644
--- a/net-nds/openldap/metadata.xml
+++ b/net-nds/openldap/metadata.xml
@@ -6,8 +6,4 @@
         <email>robbat2@gentoo.org</email>
         <name>Robin H. Johnson</name>
     </maintainer>
-    <maintainer>
-        <email>raker@gentoo.org</email>
-        <name>Nick Hadaway</name>
-    </maintainer>
 </pkgmetadata>
diff --git a/net-nds/openldap/openldap-2.1.26.ebuild b/net-nds/openldap/openldap-2.1.26.ebuild
index 4ae07c26443f..1f903f422d23 100644
--- a/net-nds/openldap/openldap-2.1.26.ebuild
+++ b/net-nds/openldap/openldap-2.1.26.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-nds/openldap/openldap-2.1.26.ebuild,v 1.1 2004/01/28 04:38:47 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.1.26.ebuild,v 1.1.1.1 2005/11/30 09:36:52 chriswhite Exp $
 
 inherit eutils
 
 DESCRIPTION="LDAP suite of application and development tools"
 HOMEPAGE="http://www.OpenLDAP.org/"
-SRC_URI="ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/${P}.tgz"
+SRC_URI="mirror://openldap/openldap-release/${P}.tgz"
 
 LICENSE="OPENLDAP"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha amd64 ppc64"
+KEYWORDS="x86 ppc sparc alpha amd64 ~mips ia64"
 IUSE="berkdb crypt debug gdbm ipv6 kerberos odbc perl readline samba sasl slp ssl tcpd"
 
 DEPEND=">=sys-libs/ncurses-5.1
@@ -32,11 +32,15 @@ DEPEND=">=sys-libs/ncurses-5.1
 # else
 #	pull in sys-libs/db
 DEPEND="${DEPEND}
-	berkdb? ( >=sys-libs/db-4.1.25_p1-r3 ) : ( gdbm? ( >=sys-libs/gdbm-1.8.0 ) : ( >=sys-libs/db-4.1.25_p1-r3 ) )"
+	berkdb? ( >=sys-libs/db-4.1.25_p1-r3 )
+	!berkdb? (
+		gdbm? ( >=sys-libs/gdbm-1.8.0 )
+		!gdbm? ( >=sys-libs/db-4.1.25_p1-r3 )
+	)"
 
 pkg_preinst() {
 	enewgroup ldap 439
-	enewuser ldap 439 /dev/null /usr/lib/openldap ldap
+	enewuser ldap 439 -1 /usr/lib/openldap ldap
 }
 
 src_unpack() {
@@ -53,6 +57,10 @@ src_unpack() {
 	# (the net result is that "passwd" can be used to change ldap passwords w/
 	#  proper pam support)
 	sed -ie 's/$(SECURITY_LIBS) $(LDIF_LIBS) $(LUTIL_LIBS)/$(LUTIL_LIBS) $(SECURITY_LIBS) $(LDIF_LIBS)/' ${S}/servers/slapd/Makefile.in
+
+	#cd ${S}
+	#epatch ${FILESDIR}/${PN}-2.1.26-perlfix.patch
+	sed -ie '49 a#include <XSUB.h>' ${S}/servers/slapd/back-perl/perl_back.h
 }
 
 src_compile() {
@@ -157,20 +165,25 @@ src_install() {
 	newins ${FILESDIR}/2.0/slapd.conf slapd
 
 	# install MDK's ssl cert script
-	dodir /etc/openldap/ssl
-	exeinto /etc/openldap/ssl
-	doexe ${FILESDIR}/gencert.sh
-
+	if use ssl || use samba; then
+		dodir /etc/openldap/ssl
+		exeinto /etc/openldap/ssl
+		doexe ${FILESDIR}/gencert.sh
+	fi
 }
 
 pkg_postinst() {
-	# make a self-signed ssl cert (if there isn't one there already)
-	if [ ! -e /etc/openldap/ssl/ldap.pem ]
-	then
-		cd /etc/openldap/ssl
-		yes "" | sh gencert.sh
-		chmod 640 ldap.pem
-		chown root:ldap ldap.pem
+	if use ssl; then
+		# make a self-signed ssl cert (if there isn't one there already)
+		if [ ! -e /etc/openldap/ssl/ldap.pem ]
+		then
+			cd /etc/openldap/ssl
+			yes "" | sh gencert.sh
+			chmod 640 ldap.pem
+			chown root:ldap ldap.pem
+		else
+			einfo "An LDAP cert already appears to exist, not creating"
+		fi
 	fi
 
 	# Since moving to running openldap as user ldap there are some
@@ -183,4 +196,17 @@ pkg_postinst() {
 	chown root:ldap /etc/openldap/slapd.conf.default
 	chmod 0640 /etc/openldap/slapd.conf.default
 	chown ldap:ldap /var/lib/openldap-{data,ldbm,slurp}
+
+	# notes from bug #41297, bug #41039
+	ewarn "If you are upgrading from OpenLDAP 2.0, major changes have occured:"
+	ewarn "- bind_anon_dn is now disabled by default for security"
+	ewarn "  add 'allow bind_anon_dn' to your config for the old behavior."
+	ewarn "- Default schemas have changed, you should slapcat your entire DB to"
+	ewarn "  a file, delete your DB, and then slapadd it again. Alternatively"
+	ewarn "  you can try slapindex which should work in almost all cases. Be"
+	ewarn "  sure to check the permissions on the database files afterwards!"
+	if use ssl; then
+		ewarn "- Self-signed SSL certificates are treated harshly by OpenLDAP 2.1"
+		ewarn "  add 'TLS_REQCERT never' if you want to use them."
+	fi
 }
diff --git a/net-nds/openldap/openldap-2.1.27-r1.ebuild b/net-nds/openldap/openldap-2.1.27-r1.ebuild
index e94a02d6556d..a53c901466c0 100644
--- a/net-nds/openldap/openldap-2.1.27-r1.ebuild
+++ b/net-nds/openldap/openldap-2.1.27-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/net-nds/openldap/openldap-2.1.27-r1.ebuild,v 1.1 2004/03/29 05:11:39 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.1.27-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:48 chriswhite Exp $
 
 inherit eutils
 
 DESCRIPTION="LDAP suite of application and development tools"
 HOMEPAGE="http://www.OpenLDAP.org/"
-SRC_URI="ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/${P}.tgz"
+SRC_URI="mirror://openldap/openldap-release/${P}.tgz"
 
 LICENSE="OPENLDAP"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~mips"
+KEYWORDS="~x86 ppc ~sparc ~alpha ~amd64 ~mips"
 IUSE="berkdb crypt debug gdbm ipv6 kerberos odbc perl readline samba sasl slp ssl tcpd"
 
 DEPEND=">=sys-libs/ncurses-5.1
@@ -45,7 +45,7 @@ DEPEND="${DEPEND}
 
 pkg_preinst() {
 	enewgroup ldap 439
-	enewuser ldap 439 /dev/null /usr/lib/openldap ldap
+	enewuser ldap 439 -1 /usr/lib/openldap ldap
 }
 
 src_unpack() {
@@ -180,7 +180,7 @@ src_install() {
 	newins ${FILESDIR}/2.0/slapd.conf slapd
 
 	# install MDK's ssl cert script
-	if [ "`use ssl`" -o "`use samba`" ]; then
+	if use ssl || use samba; then
 		dodir /etc/openldap/ssl
 		exeinto /etc/openldap/ssl
 		doexe ${FILESDIR}/gencert.sh
diff --git a/net-nds/openldap/openldap-2.1.27.ebuild b/net-nds/openldap/openldap-2.1.27.ebuild
index 9544d5740677..567c65e92002 100644
--- a/net-nds/openldap/openldap-2.1.27.ebuild
+++ b/net-nds/openldap/openldap-2.1.27.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-nds/openldap/openldap-2.1.27.ebuild,v 1.1 2004/03/09 01:25:53 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.1.27.ebuild,v 1.1.1.1 2005/11/30 09:36:50 chriswhite Exp $
 
 inherit eutils
 
 DESCRIPTION="LDAP suite of application and development tools"
 HOMEPAGE="http://www.OpenLDAP.org/"
-SRC_URI="ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/${P}.tgz"
+SRC_URI="mirror://openldap/openldap-release/${P}.tgz"
 
 LICENSE="OPENLDAP"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ppc64 ~mips"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 mips"
 IUSE="berkdb crypt debug gdbm ipv6 kerberos odbc perl readline samba sasl slp ssl tcpd"
 
 DEPEND=">=sys-libs/ncurses-5.1
@@ -37,11 +37,15 @@ DEPEND=">=sys-libs/ncurses-5.1
 # else
 #	pull in sys-libs/db
 DEPEND="${DEPEND}
-	berkdb? ( >=sys-libs/db-4.1.25_p1-r3 ) : ( gdbm? ( >=sys-libs/gdbm-1.8.0 ) : ( >=sys-libs/db-4.1.25_p1-r3 ) )"
+	berkdb? ( >=sys-libs/db-4.1.25_p1-r3 )
+	!berkdb? (
+		gdbm? ( >=sys-libs/gdbm-1.8.0 )
+		!gdbm? ( >=sys-libs/db-4.1.25_p1-r3 )
+	)"
 
 pkg_preinst() {
 	enewgroup ldap 439
-	enewuser ldap 439 /dev/null /usr/lib/openldap ldap
+	enewuser ldap 439 -1 /usr/lib/openldap ldap
 }
 
 src_unpack() {
@@ -161,7 +165,7 @@ src_install() {
 	newins ${FILESDIR}/2.0/slapd.conf slapd
 
 	# install MDK's ssl cert script
-	if [ "`use ssl`" -o "`use samba`" ]; then
+	if use ssl || use samba; then
 		dodir /etc/openldap/ssl
 		exeinto /etc/openldap/ssl
 		doexe ${FILESDIR}/gencert.sh
diff --git a/net-nds/openldap/openldap-2.1.30-r1.ebuild b/net-nds/openldap/openldap-2.1.30-r1.ebuild
index ebba08191558..34b1e64b38d4 100644
--- a/net-nds/openldap/openldap-2.1.30-r1.ebuild
+++ b/net-nds/openldap/openldap-2.1.30-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-nds/openldap/openldap-2.1.30-r1.ebuild,v 1.1 2004/06/21 03:30:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.1.30-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:52 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://openldap/openldap-release/${P}.tgz"
 
 LICENSE="OPENLDAP"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha arm ~amd64 s390 hppa ppc64"
+KEYWORDS="x86 ppc sparc mips alpha arm ~amd64 s390 hppa ppc64"
 IUSE="berkdb crypt debug gdbm ipv6 odbc perl readline samba sasl slp ssl tcpd"
 
 DEPEND=">=sys-libs/ncurses-5.1
@@ -44,7 +44,7 @@ DEPEND="${DEPEND}
 
 pkg_preinst() {
 	enewgroup ldap 439
-	enewuser ldap 439 /dev/null /usr/lib/openldap ldap
+	enewuser ldap 439 -1 /usr/lib/openldap ldap
 }
 
 src_unpack() {
@@ -181,7 +181,7 @@ src_install() {
 	newins ${FILESDIR}/2.0/slapd.conf slapd
 
 	# install MDK's ssl cert script
-	if [ "`use ssl`" -o "`use samba`" ]; then
+	if use ssl || use samba; then
 		dodir /etc/openldap/ssl
 		exeinto /etc/openldap/ssl
 		doexe ${FILESDIR}/gencert.sh
diff --git a/net-nds/openldap/openldap-2.1.30-r2.ebuild b/net-nds/openldap/openldap-2.1.30-r2.ebuild
index 540397b17bd8..e4b5cb9f9685 100644
--- a/net-nds/openldap/openldap-2.1.30-r2.ebuild
+++ b/net-nds/openldap/openldap-2.1.30-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-nds/openldap/openldap-2.1.30-r2.ebuild,v 1.1 2004/08/06 02:48:16 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.1.30-r2.ebuild,v 1.1.1.1 2005/11/30 09:36:52 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://openldap/openldap-release/${P}.tgz"
 
 LICENSE="OPENLDAP"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~amd64 ~s390 ~hppa ~ppc64"
+KEYWORDS="x86 ppc sparc mips alpha arm ~amd64 s390 hppa ppc64 ia64"
 IUSE="berkdb crypt debug gdbm ipv6 odbc perl readline samba sasl slp ssl tcpd"
 
 DEPEND=">=sys-libs/ncurses-5.1
@@ -44,7 +44,7 @@ DEPEND="${DEPEND}
 
 pkg_preinst() {
 	enewgroup ldap 439
-	enewuser ldap 439 /dev/null /usr/lib/openldap ldap
+	enewuser ldap 439 -1 /usr/lib/openldap ldap
 }
 
 src_unpack() {
diff --git a/net-nds/openldap/openldap-2.1.30-r3.ebuild b/net-nds/openldap/openldap-2.1.30-r3.ebuild
index a948aeef4b6c..8a0e131bc235 100644
--- a/net-nds/openldap/openldap-2.1.30-r3.ebuild
+++ b/net-nds/openldap/openldap-2.1.30-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-nds/openldap/openldap-2.1.30-r3.ebuild,v 1.1 2004/08/22 20:23:49 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.1.30-r3.ebuild,v 1.1.1.1 2005/11/30 09:36:50 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://openldap/openldap-release/${P}.tgz"
 
 LICENSE="OPENLDAP"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~amd64 ~s390 ~hppa ~ppc64"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~amd64 ~s390 ~hppa ~ppc64 ~ia64"
 IUSE="berkdb crypt debug gdbm ipv6 odbc perl readline samba sasl slp ssl tcpd"
 
 DEPEND=">=sys-libs/ncurses-5.1
@@ -44,7 +44,7 @@ DEPEND="${DEPEND}
 
 pkg_preinst() {
 	enewgroup ldap 439
-	enewuser ldap 439 /dev/null /usr/lib/openldap ldap
+	enewuser ldap 439 -1 /usr/lib/openldap ldap
 }
 
 src_unpack() {
@@ -138,10 +138,10 @@ src_compile() {
 
 	make depend || die "make depend failed"
 	make || die "make failed"
-
 }
 
 src_test() {
+	einfo "Doing tests"
 	cd tests ; make tests || die "make tests failed"
 }
 
diff --git a/net-nds/openldap/openldap-2.1.30-r4.ebuild b/net-nds/openldap/openldap-2.1.30-r4.ebuild
index 1a62b292adf4..d2a3bdefc890 100644
--- a/net-nds/openldap/openldap-2.1.30-r4.ebuild
+++ b/net-nds/openldap/openldap-2.1.30-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-nds/openldap/openldap-2.1.30-r4.ebuild,v 1.1 2004/12/02 04:54:33 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.1.30-r4.ebuild,v 1.1.1.1 2005/11/30 09:36:49 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://openldap/openldap-release/${P}.tgz"
 
 LICENSE="OPENLDAP"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~amd64 ~s390 ~hppa ~ppc64"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="berkdb crypt debug gdbm ipv6 odbc perl readline samba sasl slp ssl tcpd"
 
 DEPEND=">=sys-libs/ncurses-5.1
@@ -44,7 +44,7 @@ DEPEND="${DEPEND}
 
 pkg_preinst() {
 	enewgroup ldap 439
-	enewuser ldap 439 /dev/null /usr/lib/openldap ldap
+	enewuser ldap 439 -1 /usr/lib/openldap ldap
 }
 
 src_unpack() {
@@ -134,6 +134,8 @@ src_compile() {
 	# --enable-dnsserv --with-dnsserv-module=dynamic
 
 	econf \
+		--enable-static \
+		--enable-shared \
 		--libexecdir=/usr/lib/openldap \
 		${myconf} || die "configure failed"
 
@@ -143,6 +145,7 @@ src_compile() {
 }
 
 src_test() {
+	einfo "Doing tests"
 	cd tests ; make tests || die "make tests failed"
 }
 
diff --git a/net-nds/openldap/openldap-2.1.30-r5.ebuild b/net-nds/openldap/openldap-2.1.30-r5.ebuild
index c85b0aec5fd4..d50a6792f170 100644
--- a/net-nds/openldap/openldap-2.1.30-r5.ebuild
+++ b/net-nds/openldap/openldap-2.1.30-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-nds/openldap/openldap-2.1.30-r5.ebuild,v 1.1 2005/07/03 19:14:50 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.1.30-r5.ebuild,v 1.1.1.1 2005/11/30 09:36:49 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://openldap/openldap-release/${P}.tgz"
 
 LICENSE="OPENLDAP"
 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 crypt debug gdbm ipv6 odbc perl readline samba sasl slp ssl tcpd"
 
 DEPEND=">=sys-libs/ncurses-5.1
@@ -44,7 +44,13 @@ DEPEND="${DEPEND}
 
 pkg_preinst() {
 	enewgroup ldap 439
-	enewuser ldap 439 /bin/false /usr/lib/openldap ldap
+	enewuser ldap 439 -1 /usr/lib/openldap ldap
+}
+
+pkg_setup() {
+	if built_with_use dev-lang/perl minimal ; then
+		die "You must have a complete (USE='-minimal') Perl install to use the perl backend!"
+	fi
 }
 
 src_unpack() {
diff --git a/net-nds/openldap/openldap-2.1.30.ebuild b/net-nds/openldap/openldap-2.1.30.ebuild
index e97a40110a59..38a1bf56ac1b 100644
--- a/net-nds/openldap/openldap-2.1.30.ebuild
+++ b/net-nds/openldap/openldap-2.1.30.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-nds/openldap/openldap-2.1.30.ebuild,v 1.1 2004/04/28 22:15:39 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.1.30.ebuild,v 1.1.1.1 2005/11/30 09:36:47 chriswhite Exp $
 
 inherit eutils
 
 DESCRIPTION="LDAP suite of application and development tools"
 HOMEPAGE="http://www.OpenLDAP.org/"
-SRC_URI="ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/${P}.tgz"
+SRC_URI="mirror://openldap/openldap-release/${P}.tgz"
 
 LICENSE="OPENLDAP"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~mips"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha arm ~amd64 s390 hppa ppc64"
 IUSE="berkdb crypt debug gdbm ipv6 odbc perl readline samba sasl slp ssl tcpd"
 
 DEPEND=">=sys-libs/ncurses-5.1
@@ -44,7 +44,7 @@ DEPEND="${DEPEND}
 
 pkg_preinst() {
 	enewgroup ldap 439
-	enewuser ldap 439 /dev/null /usr/lib/openldap ldap
+	enewuser ldap 439 -1 /usr/lib/openldap ldap
 }
 
 src_unpack() {
@@ -178,7 +178,7 @@ src_install() {
 	newins ${FILESDIR}/2.0/slapd.conf slapd
 
 	# install MDK's ssl cert script
-	if [ "`use ssl`" -o "`use samba`" ]; then
+	if use ssl || use samba; then
 		dodir /etc/openldap/ssl
 		exeinto /etc/openldap/ssl
 		doexe ${FILESDIR}/gencert.sh
diff --git a/net-nds/openldap/openldap-2.2.14.ebuild b/net-nds/openldap/openldap-2.2.14.ebuild
index e7c86351cd27..a77cb98fe377 100644
--- a/net-nds/openldap/openldap-2.2.14.ebuild
+++ b/net-nds/openldap/openldap-2.2.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/net-nds/openldap/openldap-2.2.14.ebuild,v 1.1 2004/07/09 16:55:06 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.2.14.ebuild,v 1.1.1.1 2005/11/30 09:36:51 chriswhite Exp $
 
 inherit eutils
 
@@ -11,9 +11,8 @@ SRC_URI="mirror://openldap/openldap-release/${P}.tgz"
 LICENSE="OPENLDAP"
 SLOT="0"
 IUSE="berkdb crypt debug gdbm ipv6 odbc perl readline samba sasl slp ssl tcpd"
-KEYWORDS="-*"
 #In portage for testing only
-#KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha arm ~amd64 s390 hppa ppc64"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 DEPEND=">=sys-libs/ncurses-5.1
 	>=sys-apps/sed-4
@@ -48,7 +47,7 @@ DEPEND="${DEPEND}
 
 pkg_preinst() {
 	enewgroup ldap 439
-	enewuser ldap 439 /dev/null /usr/lib/openldap ldap
+	enewuser ldap 439 -1 /usr/lib/openldap ldap
 }
 
 src_unpack() {
@@ -145,6 +144,7 @@ src_compile() {
 }
 
 src_test() {
+	einfo "Doing tests"
 	cd tests ; make tests || die "make tests failed"
 }
 
@@ -171,14 +171,12 @@ src_install() {
 	keepdir /var/run/openldap
 	fowners ldap:ldap /var/run/openldap
 	fperms 0755 /var/run/openldap
-	sed -i -e "s:/var/lib/slapd.pid:/var/run/openldap/slapd.pid:" ${D}/etc/openldap/slapd.conf
-	sed -i -e "s:/var/lib/slapd.pid:/var/run/openldap/slapd.pid:" ${D}/etc/openldap/slapd.conf.default
-	sed -i -e "s:/var/lib/slapd.args:/var/run/openldap/slapd.args:" ${D}/etc/openldap/slapd.conf
-	sed -i -e "s:/var/lib/slapd.args:/var/run/openldap/slapd.args:" ${D}/etc/openldap/slapd.conf.default
-	fowners root:ldap /etc/openldap/slapd.conf
-	fperms 0640 /etc/openldap/slapd.conf
-	fowners root:ldap /etc/openldap/slapd.conf.default
-	fperms 0640 /etc/openldap/slapd.conf.default
+	for f in /etc/openldap/slapd.conf /etc/openldap/slapd.conf.default; do
+		sed -e "s:/var/lib/run/slapd.:/var/run/openldap/slapd.:" -i ${D}/${f}
+		sed -e "/database\tbdb$/acheckpoint	32	30 # <kbyte> <min>" -i ${D}/${f}
+		fowners root:ldap ${f}
+		fperms 0640 ${f}
+	done
 
 	# install our own init scripts
 	exeinto /etc/init.d
@@ -214,10 +212,8 @@ pkg_postinst() {
 	# Let's make sure these permissions are correct.
 	chown ldap:ldap /var/run/openldap
 	chmod 0755 /var/run/openldap
-	chown root:ldap /etc/openldap/slapd.conf
-	chmod 0640 /etc/openldap/slapd.conf
-	chown root:ldap /etc/openldap/slapd.conf.default
-	chmod 0640 /etc/openldap/slapd.conf.default
+	chown root:ldap /etc/openldap/slapd.conf{,.default}
+	chmod 0640 /etc/openldap/slapd.conf{,.default}
 	chown ldap:ldap /var/lib/openldap-{data,ldbm,slurp}
 
 	# notes from bug #41297, bug #41039
diff --git a/net-nds/openldap/openldap-2.2.19.ebuild b/net-nds/openldap/openldap-2.2.19.ebuild
index f15bd416f0c1..20b4bce85873 100644
--- a/net-nds/openldap/openldap-2.2.19.ebuild
+++ b/net-nds/openldap/openldap-2.2.19.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-nds/openldap/openldap-2.2.19.ebuild,v 1.1 2004/12/02 04:39:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.2.19.ebuild,v 1.1.1.1 2005/11/30 09:36:50 chriswhite Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ LICENSE="OPENLDAP"
 SLOT="0"
 IUSE="berkdb crypt debug gdbm ipv6 odbc perl readline samba sasl slp ssl tcpd"
 #In portage for testing only, hardmasked in package.mask
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha arm ~amd64 ~s390 ~hppa ppc64"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 DEPEND=">=sys-libs/ncurses-5.1
 	>=sys-apps/sed-4
@@ -28,12 +28,13 @@ DEPEND=">=sys-libs/ncurses-5.1
 # We do NOT support major version upgrades yet
 # required process is:
 # 1. stop slapd/slurpd
-# 2. slapcat -l file
+# 2. slapcat -l file ## THIS WILL NOT WORK AFTER THE EMERGE, YOU MUST DO IT WITH THE OLD VERSION
 # 3. egrep -v '^entryCSN:' file >file.new ## are any other changes required?
-# 4. unmerge openldap-2.1
-# 5. emerge openldap-2.2
-# 6. etc-update # !!!IMPORTANT!!! new config file stuff that we need to write for users (I haven't done it yet)
+# 4. emerge unmerge '<=net-nds/openldap-2.1*'
+# 5. emerge '>=net-nds/openldap-2.2'
+# 6. etc-update ## !!!IMPORTANT!!! new config file stuff that we need to write for users (I haven't done it yet)
 # 7. slapadd -l file.new
+# 8. chown ldap:ldap /var/lib/openldap-data/*
 # 8. start slapd again, set up new replication system maybe
 DEPEND="${DEPEND} !<net-nds/openldap-2.2"
 
@@ -59,7 +60,7 @@ DEPEND="${DEPEND}
 
 pkg_preinst() {
 	enewgroup ldap 439
-	enewuser ldap 439 /dev/null /usr/lib/openldap ldap
+	enewuser ldap 439 -1 /usr/lib/openldap ldap
 }
 
 src_unpack() {
@@ -155,6 +156,7 @@ src_compile() {
 }
 
 src_test() {
+	einfo "Doing tests"
 	cd tests ; make tests || die "make tests failed"
 }
 
@@ -182,7 +184,7 @@ src_install() {
 	fowners ldap:ldap /var/run/openldap
 	fperms 0755 /var/run/openldap
 	for f in /etc/openldap/slapd.conf /etc/openldap/slapd.conf.default; do
-		sed -e "s:/var/lib/slapd.:/var/run/openldap/slapd.:" -i ${D}/${f}
+		sed -e "s:/var/lib/run/slapd.:/var/run/openldap/slapd.:" -i ${D}/${f}
 		sed -e "/database\tbdb$/acheckpoint	32	30 # <kbyte> <min>" -i ${D}/${f}
 		fowners root:ldap ${f}
 		fperms 0640 ${f}
diff --git a/net-nds/openldap/openldap-2.2.23-r1.ebuild b/net-nds/openldap/openldap-2.2.23-r1.ebuild
index 6b1fc6a7a649..4feab459000e 100644
--- a/net-nds/openldap/openldap-2.2.23-r1.ebuild
+++ b/net-nds/openldap/openldap-2.2.23-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-nds/openldap/openldap-2.2.23-r1.ebuild,v 1.1 2005/02/14 13:32:30 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.2.23-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:50 chriswhite Exp $
 
 inherit toolchain-funcs eutils
 
@@ -10,9 +10,9 @@ SRC_URI="mirror://openldap/openldap-release/${P}.tgz"
 
 LICENSE="OPENLDAP"
 SLOT="0"
-IUSE="berkdb crypt debug gdbm ipv6 odbc perl readline samba sasl slp ssl tcpd"
+IUSE="berkdb crypt debug gdbm ipv6 odbc perl readline samba sasl slp ssl tcpd kerberos"
 #In portage for testing only, hardmasked in package.mask
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~amd64 ~s390 ~hppa ~ppc64"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 DEPEND=">=sys-libs/ncurses-5.1
 	>=sys-apps/sed-4
@@ -82,7 +82,7 @@ pkg_setup() {
 
 pkg_preinst() {
 	enewgroup ldap 439
-	enewuser ldap 439 /bin/false /usr/lib/openldap ldap
+	enewuser ldap 439 -1 /usr/lib/openldap ldap
 }
 
 src_unpack() {
@@ -136,7 +136,7 @@ src_compile() {
 	# enable slapd/slurpd servers
 	myconf="${myconf} --enable-ldap"
 	myconf="${myconf} --enable-slapd --enable-slurpd"
-	# basic stuff	
+	# basic stuff
 	myconf="${myconf} --enable-syslog"
 	use debug && myconf="${myconf} --enable-debug" # there is no disable-debug
 	# extra functionality
@@ -152,10 +152,10 @@ src_compile() {
 	myconf="${myconf} --enable-cleartext --enable-slapi"
 
 	# disabled options:
-	# --with-bdb-module=dynamic 
+	# --with-bdb-module=dynamic
 	# alas, for BSD only:
 	# --with-fetch
-	
+
 	for i in crypt ipv6 slp readline; do
 		myconf="${myconf} `use_enable ${i}`"
 	done
@@ -170,6 +170,8 @@ src_compile() {
 	myconf="${myconf} `use_with ssl tls` `use_with samba lmpasswd`"
 
 	econf \
+		--enable-static \
+		--enable-shared \
 		--libexecdir=/usr/lib/openldap \
 		${myconf} || die "configure failed"
 
diff --git a/net-nds/openldap/openldap-2.2.23.ebuild b/net-nds/openldap/openldap-2.2.23.ebuild
index 81d2e29d7472..52250b885fa1 100644
--- a/net-nds/openldap/openldap-2.2.23.ebuild
+++ b/net-nds/openldap/openldap-2.2.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/net-nds/openldap/openldap-2.2.23.ebuild,v 1.1 2005/02/14 12:09:53 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.2.23.ebuild,v 1.1.1.1 2005/11/30 09:36:51 chriswhite Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ LICENSE="OPENLDAP"
 SLOT="0"
 IUSE="berkdb crypt debug gdbm ipv6 odbc perl readline samba sasl slp ssl tcpd"
 #In portage for testing only, hardmasked in package.mask
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~amd64 ~s390 ~hppa ~ppc64"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 DEPEND=">=sys-libs/ncurses-5.1
 	>=sys-apps/sed-4
@@ -77,7 +77,7 @@ pkg_setup() {
 
 pkg_preinst() {
 	enewgroup ldap 439
-	enewuser ldap 439 /bin/false /usr/lib/openldap ldap
+	enewuser ldap 439 -1 /usr/lib/openldap ldap
 }
 
 src_unpack() {
diff --git a/net-nds/openldap/openldap-2.2.24.ebuild b/net-nds/openldap/openldap-2.2.24.ebuild
index db539cae20b0..cce4246bf317 100644
--- a/net-nds/openldap/openldap-2.2.24.ebuild
+++ b/net-nds/openldap/openldap-2.2.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/net-nds/openldap/openldap-2.2.24.ebuild,v 1.1 2005/03/21 01:04:19 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.2.24.ebuild,v 1.1.1.1 2005/11/30 09:36:50 chriswhite Exp $
 
 inherit toolchain-funcs eutils
 
@@ -12,7 +12,7 @@ LICENSE="OPENLDAP"
 SLOT="0"
 IUSE="berkdb crypt debug gdbm ipv6 kerberos odbc perl readline samba sasl slp ssl tcpd"
 #In portage for testing only, hardmasked in package.mask
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~amd64 ~s390 ~hppa ~ppc64 ~ia64"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 DEPEND=">=sys-libs/ncurses-5.1
 	>=sys-apps/sed-4
@@ -53,7 +53,7 @@ OPENLDAP_VERSIONTAG="/var/lib/openldap-data/.version-tag"
 #DEPEND="${DEPEND} !<net-nds/openldap-2.2"
 
 openldap_upgrade_warning() {
-	ewarn "If you are upgrading from OpenLDAP-2.1, and run slapd on this" 
+	ewarn "If you are upgrading from OpenLDAP-2.1, and run slapd on this"
 	ewarn "machine please see the ebuild for upgrade instructions, otherwise"
 	ewarn "you may corrupt your database!"
 	echo
@@ -102,7 +102,7 @@ pkg_setup() {
 pkg_preinst() {
 	openldap_upgrade_warning
 	enewgroup ldap 439
-	enewuser ldap 439 /bin/false /usr/lib/openldap ldap
+	enewuser ldap 439 -1 /usr/lib/openldap ldap
 }
 
 src_unpack() {
diff --git a/net-nds/openldap/openldap-2.2.26-r1.ebuild b/net-nds/openldap/openldap-2.2.26-r1.ebuild
index f484c7990679..0080cd201df6 100644
--- a/net-nds/openldap/openldap-2.2.26-r1.ebuild
+++ b/net-nds/openldap/openldap-2.2.26-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-nds/openldap/openldap-2.2.26-r1.ebuild,v 1.1 2005/05/19 20:13:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.2.26-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:51 chriswhite Exp $
 
 inherit toolchain-funcs eutils
 
@@ -70,7 +70,7 @@ pkg_setup() {
 	openldap_datadirs="$(awk '{if($1 == "directory") print $2 }' /etc/openldap/slapd.conf)"
 	datafiles=""
 	for d in $openldap_datadirs; do
-		datafiles="${datafiles} $(ls $d/*db*} 2>/dev/null)"
+		datafiles="${datafiles} $(ls $d/*db* 2>/dev/null)"
 	done
 	# remove extra spaces
 	datafiles="$(echo ${datafiles// })"
@@ -106,7 +106,7 @@ pkg_setup() {
 pkg_preinst() {
 	openldap_upgrade_warning
 	enewgroup ldap 439
-	enewuser ldap 439 /bin/false /usr/lib/openldap ldap
+	enewuser ldap 439 -1 /usr/lib/openldap ldap
 }
 
 src_unpack() {
diff --git a/net-nds/openldap/openldap-2.2.26-r2.ebuild b/net-nds/openldap/openldap-2.2.26-r2.ebuild
index fac0e2b878f1..116d998d9cb8 100644
--- a/net-nds/openldap/openldap-2.2.26-r2.ebuild
+++ b/net-nds/openldap/openldap-2.2.26-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/net-nds/openldap/openldap-2.2.26-r2.ebuild,v 1.1 2005/05/21 04:49:26 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.2.26-r2.ebuild,v 1.1.1.1 2005/11/30 09:36:48 chriswhite Exp $
 
-inherit toolchain-funcs eutils
+inherit flag-o-matic toolchain-funcs eutils multilib
 
 OLD_PV="2.1.30"
 OLD_P="${PN}-${OLD_PV}"
@@ -63,7 +63,7 @@ openldap_upgrade_warning() {
 	echo
 	ewarn "Part of the configuration file syntax has changed:"
 	ewarn "'access to attribute=' is now 'access to attrs='"
-	echo 
+	echo
 	ewarn "You must also run revdep-rebuild after upgrading from 2.1 to 2.2:"
 	ewarn "# revdep-rebuild --soname liblber.so.2"
 	ewarn "# revdep-rebuild --soname libldap.so.2"
@@ -75,7 +75,7 @@ pkg_setup() {
 	openldap_datadirs="$(awk '{if($1 == "directory") print $2 }' /etc/openldap/slapd.conf)"
 	datafiles=""
 	for d in $openldap_datadirs; do
-		datafiles="${datafiles} $(ls $d/*db*} 2>/dev/null)"
+		datafiles="${datafiles} $(ls $d/*db* 2>/dev/null)"
 	done
 	# remove extra spaces
 	datafiles="$(echo ${datafiles// })"
@@ -111,7 +111,7 @@ pkg_setup() {
 pkg_preinst() {
 	openldap_upgrade_warning
 	enewgroup ldap 439
-	enewuser ldap 439 /bin/false /usr/lib/openldap ldap
+	enewuser ldap 439 -1 /usr/$(get_libdir)/openldap ldap
 }
 
 src_unpack() {
@@ -203,19 +203,24 @@ src_compile() {
 	myconf="${myconf} `use_enable tcpd wrappers`"
 	myconf="${myconf} `use_with ssl tls` `use_with samba lmpasswd`"
 
+	if [ $(get_libdir) != "lib" ] ; then
+		append-ldflags -L/usr/$(get_libdir)
+	fi
+
 	econf \
 		--enable-static \
 		--enable-shared \
-		--libexecdir=/usr/lib/openldap \
+		--libexecdir=/usr/$(get_libdir)/openldap \
 		${myconf} || die "configure failed"
 
 	make depend || die "make depend failed"
 	make || die "make failed"
 
+	# special kerberos stuff
 	tc-export CC
 	if useq kerberos ; then
 		cd ${S}/contrib/slapd-modules/passwd/ && \
-		${CC} -shared -I../../../include ${CFLAGS} \
+		${CC} -shared -I../../../include ${CFLAGS} -fPIC \
 		-DHAVE_KRB5 -o pw-kerberos.so kerberos.c || \
 		die "failed to compile kerberos module"
 	fi
@@ -224,7 +229,7 @@ src_compile() {
 	cd ${OLD_S} && \
 	econf \
 		--enable-static --enable-shared \
-		--libexecdir=/usr/lib/openldap \
+		--libexecdir=/usr/$(get_libdir)/openldap \
 		--disable-slapd --disable-aci --disable-cleartext --disable-crypt \
 		--disable-lmpasswd --disable-spasswd --enable-modules \
 		--disable-phonetic --disable-rewrite --disable-rlookups --disable-slp \
@@ -251,7 +256,7 @@ src_install() {
 
 	# openldap modules go here
 	# TODO: write some code to populate slapd.conf with moduleload statements
-	keepdir /usr/lib/openldap/openldap/
+	keepdir /usr/$(get_libdir)/openldap/openldap/
 
 	# make state directories
 	for x in data slurp ldbm; do
@@ -266,7 +271,7 @@ src_install() {
 
 	# manually remove /var/tmp references in .la
 	# because it is packaged with an ancient libtool
-	for x in ${D}/usr/lib/lib*.la; do
+	for x in ${D}/usr/$(get_libdir)/lib*.la; do
 		sed -i -e "s:-L${S}[/]*libraries::" ${x}
 	done
 
@@ -285,6 +290,9 @@ src_install() {
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/2.0/slapd slapd
 	newexe ${FILESDIR}/2.0/slurpd slurpd
+	if [ $(get_libdir) != lib ]; then
+		sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i ${D}/etc/init.d/{slapd,slurpd}
+	fi
 	insinto /etc/conf.d
 	newins ${FILESDIR}/2.0/slapd.conf slapd
 
@@ -296,7 +304,7 @@ src_install() {
 	fi
 
 	if useq kerberos ; then
-		insinto /usr/lib/openldap/openldap
+		insinto /usr/$(get_libdir)/openldap/openldap
 		doins ${S}/contrib/slapd-modules/passwd/pw-kerberos.so || \
 		die "failed to install kerberos passwd module"
 	fi
diff --git a/net-nds/openldap/openldap-2.2.26.ebuild b/net-nds/openldap/openldap-2.2.26.ebuild
index 04307ceaaa4b..02019f782c2e 100644
--- a/net-nds/openldap/openldap-2.2.26.ebuild
+++ b/net-nds/openldap/openldap-2.2.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/net-nds/openldap/openldap-2.2.26.ebuild,v 1.1 2005/04/30 23:13:45 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.2.26.ebuild,v 1.1.1.1 2005/11/30 09:36:51 chriswhite Exp $
 
 inherit toolchain-funcs eutils
 
@@ -12,7 +12,7 @@ LICENSE="OPENLDAP"
 SLOT="0"
 IUSE="berkdb crypt debug gdbm ipv6 kerberos odbc perl readline samba sasl slp ssl tcpd"
 #In portage for testing only, hardmasked in package.mask
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~amd64 ~s390 ~hppa ~ppc64 ~ia64"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 DEPEND=">=sys-libs/ncurses-5.1
 	>=sys-apps/sed-4
@@ -26,7 +26,6 @@ DEPEND=">=sys-libs/ncurses-5.1
 	samba? ( >=dev-libs/openssl-0.9.6 )
 	kerberos? ( virtual/krb5 )"
 
-
 # note that the 'samba' USE flag pulling in OpenSSL is NOT an error.  OpenLDAP
 # uses OpenSSL for LanMan/NTLM hashing (which is used in some enviroments, like
 # mine at work)!
@@ -59,6 +58,8 @@ openldap_upgrade_warning() {
 	echo
 	ewarn "Part of the configuration file syntax has changed:"
 	ewarn "'access to attribute=' is now 'access to attrs='"
+	echo
+	ewarn "You must also run revdep-rebuild after upgrading from 2.1 to 2.2."
 }
 
 pkg_setup() {
@@ -66,7 +67,7 @@ pkg_setup() {
 	openldap_datadirs="$(awk '{if($1 == "directory") print $2 }' /etc/openldap/slapd.conf)"
 	datafiles=""
 	for d in $openldap_datadirs; do
-		datafiles="${datafiles} $(ls $d/*{bdb,gdbm} 2>/dev/null)"
+		datafiles="${datafiles} $(ls $d/*db* 2>/dev/null)"
 	done
 	# remove extra spaces
 	datafiles="$(echo ${datafiles// })"
@@ -102,7 +103,7 @@ pkg_setup() {
 pkg_preinst() {
 	openldap_upgrade_warning
 	enewgroup ldap 439
-	enewuser ldap 439 /bin/false /usr/lib/openldap ldap
+	enewuser ldap 439 -1 /usr/lib/openldap ldap
 }
 
 src_unpack() {
diff --git a/net-nds/openldap/openldap-2.2.27-r1.ebuild b/net-nds/openldap/openldap-2.2.27-r1.ebuild
index 3e9d413325a8..705ce2e62b24 100644
--- a/net-nds/openldap/openldap-2.2.27-r1.ebuild
+++ b/net-nds/openldap/openldap-2.2.27-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-nds/openldap/openldap-2.2.27-r1.ebuild,v 1.1 2005/07/03 19:14:50 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.2.27-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:51 chriswhite Exp $
 
 inherit flag-o-matic toolchain-funcs eutils multilib
 
@@ -50,7 +50,7 @@ RDEPEND="${RDEPEND}
 	)"
 
 DEPEND="${RDEPEND}
-		sys-devel/libtool
+		>=sys-devel/libtool-1.5.18-r1
 		>=sys-apps/sed-4"
 
 # for tracking versions
@@ -77,7 +77,7 @@ pkg_setup() {
 	openldap_datadirs="$(awk '{if($1 == "directory") print $2 }' /etc/openldap/slapd.conf)"
 	datafiles=""
 	for d in $openldap_datadirs; do
-		datafiles="${datafiles} $(ls $d/*db*} 2>/dev/null)"
+		datafiles="${datafiles} $(ls $d/*db* 2>/dev/null)"
 	done
 	# remove extra spaces
 	datafiles="$(echo ${datafiles// })"
@@ -108,12 +108,15 @@ pkg_setup() {
 		exit 1
 	fi
 	openldap_upgrade_warning
+	if built_with_use dev-lang/perl minimal ; then
+		die "You must have a complete (USE='-minimal') Perl install to use the perl backend!"
+	fi
 }
 
 pkg_preinst() {
 	openldap_upgrade_warning
 	enewgroup ldap 439
-	enewuser ldap 439 /bin/false /usr/$(get_libdir)/openldap ldap
+	enewuser ldap 439 -1 /usr/$(get_libdir)/openldap ldap
 }
 
 src_unpack() {
@@ -247,7 +250,7 @@ src_compile() {
 	# now build old compat lib
 	cd ${OLD_S} && \
 	econf \
-		--enable-static --enable-shared \
+		--disable-static --enable-shared \
 		--libexecdir=/usr/$(get_libdir)/openldap \
 		--disable-slapd --disable-aci --disable-cleartext --disable-crypt \
 		--disable-lmpasswd --disable-spasswd --enable-modules \
@@ -327,7 +330,8 @@ src_install() {
 	if use ssl || use samba; then
 		dodir /etc/openldap/ssl
 		exeinto /etc/openldap/ssl
-		newexe ${FILESDIR}/gencert.sh-2.2.27 gencert.sh
+		#newexe ${FILESDIR}/gencert.sh-2.2.27 gencert.sh
+		doexe ${FILESDIR}/gencert.sh
 	fi
 
 	dolib.so ${OLD_S}/libraries/liblber/.libs/liblber.so.2.0.130 || \
diff --git a/net-nds/openldap/openldap-2.2.27.ebuild b/net-nds/openldap/openldap-2.2.27.ebuild
index c29b07d6ba7e..5885a79fefb0 100644
--- a/net-nds/openldap/openldap-2.2.27.ebuild
+++ b/net-nds/openldap/openldap-2.2.27.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.2.27.ebuild,v 1.1 2005/07/03 18:00:00 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.2.27.ebuild,v 1.1.1.1 2005/11/30 09:36:47 chriswhite Exp $
 
 inherit flag-o-matic toolchain-funcs eutils multilib
 
@@ -77,7 +77,7 @@ pkg_setup() {
 	openldap_datadirs="$(awk '{if($1 == "directory") print $2 }' /etc/openldap/slapd.conf)"
 	datafiles=""
 	for d in $openldap_datadirs; do
-		datafiles="${datafiles} $(ls $d/*db*} 2>/dev/null)"
+		datafiles="${datafiles} $(ls $d/*db* 2>/dev/null)"
 	done
 	# remove extra spaces
 	datafiles="$(echo ${datafiles// })"
@@ -113,7 +113,7 @@ pkg_setup() {
 pkg_preinst() {
 	openldap_upgrade_warning
 	enewgroup ldap 439
-	enewuser ldap 439 /bin/false /usr/$(get_libdir)/openldap ldap
+	enewuser ldap 439 -1 /usr/$(get_libdir)/openldap ldap
 }
 
 src_unpack() {
diff --git a/net-nds/openldap/openldap-2.2.28-r1.ebuild b/net-nds/openldap/openldap-2.2.28-r1.ebuild
index 67dbc6f9c8b2..e57ccb891897 100644
--- a/net-nds/openldap/openldap-2.2.28-r1.ebuild
+++ b/net-nds/openldap/openldap-2.2.28-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-nds/openldap/openldap-2.2.28-r1.ebuild,v 1.1 2005/09/08 01:11:01 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.2.28-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:48 chriswhite Exp $
 
 inherit flag-o-matic toolchain-funcs eutils multilib
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://openldap/openldap-release/${P}.tgz
 LICENSE="OPENLDAP"
 SLOT="0"
 IUSE="berkdb crypt debug gdbm ipv6 kerberos minimal odbc perl readline samba sasl slp ssl tcpd"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND=">=sys-libs/ncurses-5.1
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
@@ -80,7 +80,7 @@ pkg_setup() {
 	fi
 	datafiles=""
 	for d in $openldap_datadirs; do
-		datafiles="${datafiles} $(ls $d/*db*} 2>/dev/null)"
+		datafiles="${datafiles} $(ls $d/*db* 2>/dev/null)"
 	done
 	# remove extra spaces
 	datafiles="$(echo ${datafiles// })"
@@ -120,7 +120,7 @@ pkg_setup() {
 pkg_preinst() {
 	openldap_upgrade_warning
 	enewgroup ldap 439
-	enewuser ldap 439 /bin/false /usr/$(get_libdir)/openldap ldap
+	enewuser ldap 439 -1 /usr/$(get_libdir)/openldap ldap
 }
 
 src_unpack() {
@@ -153,7 +153,8 @@ src_unpack() {
 	#sed -i -e 's,^AC_CONFIG_HEADER,AM_CONFIG_HEADER,' ${S}/configure.in
 
 	# ximian connector 1.4.7 ntlm patch
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-2.2.28-ximian_connector.patch
+	#EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-2.2.28-ximian_connector.patch
+	EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/${PN}-2.2.6-ntlm.patch
 
 	# fix up stuff for newer autoconf that simulates autoconf-2.13, but doesn't
 	# do it perfectly.
diff --git a/net-nds/openldap/openldap-2.2.28.ebuild b/net-nds/openldap/openldap-2.2.28.ebuild
index 5091fd9e9ba8..524f8b241fad 100644
--- a/net-nds/openldap/openldap-2.2.28.ebuild
+++ b/net-nds/openldap/openldap-2.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-nds/openldap/openldap-2.2.28.ebuild,v 1.1 2005/08/24 08:33:10 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.2.28.ebuild,v 1.1.1.1 2005/11/30 09:36:48 chriswhite Exp $
 
 inherit flag-o-matic toolchain-funcs eutils multilib
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://openldap/openldap-release/${P}.tgz
 LICENSE="OPENLDAP"
 SLOT="0"
 IUSE="berkdb crypt debug gdbm ipv6 kerberos minimal odbc perl readline samba sasl slp ssl tcpd"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha ~amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 
 RDEPEND=">=sys-libs/ncurses-5.1
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
@@ -74,10 +74,13 @@ openldap_upgrade_warning() {
 
 pkg_setup() {
 	# grab lines
-	openldap_datadirs="$(awk '{if($1 == "directory") print $2 }' /etc/openldap/slapd.conf)"
+	openldap_datadirs=""
+	if [ -f ${ROOT}/etc/openldap/slapd.conf ]; then
+		openldap_datadirs="$(awk '{if($1 == "directory") print $2 }' ${ROOT}/etc/openldap/slapd.conf)"
+	fi
 	datafiles=""
 	for d in $openldap_datadirs; do
-		datafiles="${datafiles} $(ls $d/*db*} 2>/dev/null)"
+		datafiles="${datafiles} $(ls $d/*db* 2>/dev/null)"
 	done
 	# remove extra spaces
 	datafiles="$(echo ${datafiles// })"
@@ -105,7 +108,8 @@ pkg_setup() {
 		eerror ""
 		eerror "This install will not proceed until your old data directory"
 		eerror "is at least moved out of the way."
-		exit 1
+		#exit 1
+		die "Warning direct upgrade unsafe!"
 	fi
 	openldap_upgrade_warning
 	if built_with_use dev-lang/perl minimal ; then
@@ -116,7 +120,7 @@ pkg_setup() {
 pkg_preinst() {
 	openldap_upgrade_warning
 	enewgroup ldap 439
-	enewuser ldap 439 /bin/false /usr/$(get_libdir)/openldap ldap
+	enewuser ldap 439 -1 /usr/$(get_libdir)/openldap ldap
 }
 
 src_unpack() {
diff --git a/net-nds/phpldapadmin/ChangeLog b/net-nds/phpldapadmin/ChangeLog
index 340bbff2ea3f..029df837f584 100644
--- a/net-nds/phpldapadmin/ChangeLog
+++ b/net-nds/phpldapadmin/ChangeLog
@@ -1,6 +1,115 @@
 # ChangeLog for net-nds/phpldapadmin
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/ChangeLog,v 1.1 2003/11/13 21:05:34 rizzo Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/ChangeLog,v 1.1.1.1 2005/11/30 09:36:46 chriswhite Exp $
+
+*phpldapadmin-0.9.7.1 (02 Nov 2005)
+
+  02 Nov 2005; Martin Holzer <mholzer@gentoo.org>
+  +files/postinstall2-en.txt, +phpldapadmin-0.9.7.1.ebuild:
+  Version bumped.
+
+*phpldapadmin-0.9.7 (27 Sep 2005)
+
+  27 Sep 2005; Martin Holzer <mholzer@gentoo.org>
+  +phpldapadmin-0.9.7.ebuild:
+  Version bumped.
+
+*phpldapadmin-0.9.7_rc3 (20 Sep 2005)
+
+  20 Sep 2005; Benjamin Smee <strerror@gentoo.org>
+  +phpldapadmin-0.9.7_rc3.ebuild:
+  Version bump
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org>
+  phpldapadmin-0.9.7_alpha6.ebuild:
+  Mark 0.9.7_alpha6 stable on alpha
+
+  10 Sep 2005; Julien Allanos <dju@gentoo.org>
+  phpldapadmin-0.9.7_rc1.ebuild:
+  Fixed ~x86 keyword.
+
+*phpldapadmin-0.9.7_rc1 (10 Sep 2005)
+
+  10 Sep 2005; Julien Allanos <dju@gentoo.org>
+  +phpldapadmin-0.9.7_rc1.ebuild:
+  Version bumped.
+
+  31 Aug 2005; Renat Lumpau <rl03@gentoo.org> -phpldapadmin-0.9.5.ebuild,
+  -phpldapadmin-0.9.6.ebuild, -phpldapadmin-0.9.6c.ebuild,
+  -phpldapadmin-0.9.7_alpha4.ebuild:
+  Removing vulnerable versions
+
+  31 Aug 2005; Renat Lumpau <rl03@gentoo.org>
+  phpldapadmin-0.9.7_alpha6.ebuild:
+  Stable on x86
+
+*phpldapadmin-0.9.7_alpha6 (31 Aug 2005)
+
+  31 Aug 2005; Renat Lumpau <rl03@gentoo.org> +files/welcome.php.patch,
+  +phpldapadmin-0.9.7_alpha6.ebuild:
+  Version bump wrt security bug #104293
+
+*phpldapadmin-0.9.7_alpha4 (21 Aug 2005)
+
+  21 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  +phpldapadmin-0.9.7_alpha4.ebuild:
+  Version bump
+
+  07 Jul 2005; Renat Lumpau <rl03@gentoo.org> phpldapadmin-0.9.5.ebuild:
+  Stable on x86 wrt
+
+*phpldapadmin-0.9.6c (29 Apr 2005)
+
+  29 Apr 2005; Martin Holzer <mholzer@gentoo.org>
+  +phpldapadmin-0.9.6c.ebuild:
+  Version bumped. Also fixing 88336.
+
+*phpldapadmin-0.9.6 (06 Apr 2005)
+
+  06 Apr 2005; Martin Holzer <mholzer@gentoo.org>
+  +phpldapadmin-0.9.6.ebuild:
+  Version bumped.
+
+*phpldapadmin-0.9.5 (23 Feb 2005)
+
+  23 Feb 2005; Martin Holzer <mholzer@gentoo.org>
+  +phpldapadmin-0.9.5.ebuild:
+  Version bumped. Closes 80549.
+
+  03 Feb 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  phpldapadmin-0.9.4b.ebuild:
+  Marked ~amd64.
+
+*phpldapadmin-0.9.4b (04 Aug 2004)
+
+  04 Aug 2004; Martin Holzer <mholzer@gentoo.org> phpldapadmin-0.9.4b.ebuild:
+  version bumped. closes 50764
+
+*phpldapadmin-0.9.3-r1 (04 Aug 2004)
+
+  04 Aug 2004; Martin Holzer <mholzer@gentoo.org>
+  phpldapadmin-0.9.3-r1.ebuild, files/postinstall-en.txt:
+  adding webapp.eclass based.
+
+  20 Apr 2004; Don Seiler <rizzo@gentoo.org>; phpldapadmin-0.9.3.ebuild:
+  Moved webapp-detect to pkg_setup() function to fix Bug #48359
+
+  19 Apr 2004; Don Seiler <rizzo@gentoo.org>; -phpldapadmin-0.9.1.ebuild,
+  -phpldapadmin-0.9.2.ebuild:
+  Pruning obsolete versions
+
+*phpldapadmin-0.9.3 (19 Dec 2003)
+
+  19 Dec 2003; Don Seiler <rizzo@gentoo.org>; phpldapadmin-0.9.3.ebuild:
+  Version bump
+
+  08 Dec 2003; Don Seiler <rizzo@gentoo.org>; phpldapadmin-0.9.2.ebuild:
+  Changing chown usage to use colon
+
+*phpldapadmin-0.9.2 (17 Nov 2003)
+
+  17 Nov 2003; Don Seiler <rizzo@gentoo.org>; phpldapadmin-0.9.2.ebuild:
+  Version bump
 
 *phpldapadmin-0.9.1 (13 Nov 2003)
 
diff --git a/net-nds/phpldapadmin/Manifest b/net-nds/phpldapadmin/Manifest
index bbf10904c426..f6fa769659cd 100644
--- a/net-nds/phpldapadmin/Manifest
+++ b/net-nds/phpldapadmin/Manifest
@@ -1,3 +1,15 @@
-MD5 efcebb8370fec207a2a0d01f91a0a2a2 ChangeLog 378
-MD5 71ad722560b794fcde4fcf64846b62d2 metadata.xml 432
-MD5 6de073e60652dc7a1fbd9eb2595ff01a phpldapadmin-0.9.1.ebuild 1354
+MD5 595acb61a9c7cf5d2bc20c662c1f9079 phpldapadmin-0.9.7.ebuild 926
+MD5 2b9f3758019e1a5695a4e4d3e3152383 metadata.xml 275
+MD5 36599f1410c25af4d99018212940851e ChangeLog 3420
+MD5 c5200090167e9f1607361765e78b0216 phpldapadmin-0.9.7_alpha6.ebuild 937
+MD5 d55331f61ac1b9170e9c0e84e618a052 phpldapadmin-0.9.7_rc1.ebuild 926
+MD5 6cccc5d24079054bc1adee53a30c8a3e phpldapadmin-0.9.7_rc3.ebuild 931
+MD5 a386e1f47ca9469f8a277a97c98a0216 phpldapadmin-0.9.7.1.ebuild 886
+MD5 1d6220f156b7733fc0579d4a35719837 files/digest-phpldapadmin-0.9.7 70
+MD5 e85a808069c28b9286faae1a04dc2389 files/digest-phpldapadmin-0.9.7_alpha6 77
+MD5 b798e91898b186ba4354f10a38bc47b2 files/welcome.php.patch 170
+MD5 306450e12d7022d610333cf736164286 files/postinstall-en.txt 124
+MD5 447f0b97c430c87e30d406becb470446 files/digest-phpldapadmin-0.9.7_rc1 74
+MD5 2c175e57faef32f4b2b038631f048d59 files/digest-phpldapadmin-0.9.7_rc3 74
+MD5 a591c198278154127311518eb178fe06 files/digest-phpldapadmin-0.9.7.1 72
+MD5 d1ff22c7d7576d337ecf17671a2e9672 files/postinstall2-en.txt 131
diff --git a/net-nds/phpldapadmin/files/postinstall-en.txt b/net-nds/phpldapadmin/files/postinstall-en.txt
index 501f0b354f5c..13d0f6062e87 100644
--- a/net-nds/phpldapadmin/files/postinstall-en.txt
+++ b/net-nds/phpldapadmin/files/postinstall-en.txt
@@ -1,6 +1,4 @@
 phpLDAPadmin is installed.  You will need to
-configure it by creating/editing the config.php at
+configure it by creating/editing the config file:
 
-${HTTPD_ROOT}/phpldapadmin/config.php
-
-There is a config.php.example for your reference.
+${MY_INSTALLDIR}/config.php
diff --git a/net-nds/phpldapadmin/metadata.xml b/net-nds/phpldapadmin/metadata.xml
index d10970202775..6fd21a97b097 100644
--- a/net-nds/phpldapadmin/metadata.xml
+++ b/net-nds/phpldapadmin/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>rizzo@gentoo.org</email>
-  <name>Don Seiler</name>
-<!--  <description>Description of the maintainership</description> -->
-</maintainer>
+<herd>web-apps</herd>
 <longdescription>phpLDAPadmin is a web-based tool for managing all aspects of your LDAP server.</longdescription>
 </pkgmetadata>
diff --git a/net-nds/phpldapadmin/phpldapadmin-0.9.7.1.ebuild b/net-nds/phpldapadmin/phpldapadmin-0.9.7.1.ebuild
index bdfb7fd52c41..4a4b2561e316 100644
--- a/net-nds/phpldapadmin/phpldapadmin-0.9.7.1.ebuild
+++ b/net-nds/phpldapadmin/phpldapadmin-0.9.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/net-nds/phpldapadmin/phpldapadmin-0.9.7.1.ebuild,v 1.1 2005/11/02 23:44:50 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/phpldapadmin-0.9.7.1.ebuild,v 1.1.1.1 2005/11/30 09:36:46 chriswhite Exp $
 
 inherit webapp
 
diff --git a/net-nds/phpldapadmin/phpldapadmin-0.9.7.ebuild b/net-nds/phpldapadmin/phpldapadmin-0.9.7.ebuild
index 47548fa1849b..4c096e31d6a7 100644
--- a/net-nds/phpldapadmin/phpldapadmin-0.9.7.ebuild
+++ b/net-nds/phpldapadmin/phpldapadmin-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-nds/phpldapadmin/phpldapadmin-0.9.7.ebuild,v 1.1 2005/09/27 20:28:48 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/phpldapadmin-0.9.7.ebuild,v 1.1.1.1 2005/11/30 09:36:46 chriswhite Exp $
 
 inherit webapp versionator
 
diff --git a/net-nds/phpldapadmin/phpldapadmin-0.9.7_alpha6.ebuild b/net-nds/phpldapadmin/phpldapadmin-0.9.7_alpha6.ebuild
index 1a201e8e76e1..a487a9d14eeb 100644
--- a/net-nds/phpldapadmin/phpldapadmin-0.9.7_alpha6.ebuild
+++ b/net-nds/phpldapadmin/phpldapadmin-0.9.7_alpha6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/phpldapadmin-0.9.7_alpha6.ebuild,v 1.1 2005/08/31 16:28:39 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/phpldapadmin-0.9.7_alpha6.ebuild,v 1.1.1.1 2005/11/30 09:36:46 chriswhite Exp $
 
 inherit eutils webapp
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://phpldapadmin.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+KEYWORDS="alpha ~amd64 ~ppc ~sparc x86"
 IUSE=""
 S=${WORKDIR}/${MY_P}
 
diff --git a/net-nds/phpldapadmin/phpldapadmin-0.9.7_rc1.ebuild b/net-nds/phpldapadmin/phpldapadmin-0.9.7_rc1.ebuild
index bc9f0aa711dc..05aa3de66872 100644
--- a/net-nds/phpldapadmin/phpldapadmin-0.9.7_rc1.ebuild
+++ b/net-nds/phpldapadmin/phpldapadmin-0.9.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-nds/phpldapadmin/phpldapadmin-0.9.7_rc1.ebuild,v 1.1 2005/09/10 00:13:15 dju Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/phpldapadmin-0.9.7_rc1.ebuild,v 1.1.1.1 2005/11/30 09:36:46 chriswhite Exp $
 
 inherit webapp versionator
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://phpldapadmin.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc ~alpha ~amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
 IUSE=""
 S=${WORKDIR}/${MY_P}
 
diff --git a/net-nds/phpldapadmin/phpldapadmin-0.9.7_rc3.ebuild b/net-nds/phpldapadmin/phpldapadmin-0.9.7_rc3.ebuild
index 60cefeb7d221..5ab88a9afcfd 100644
--- a/net-nds/phpldapadmin/phpldapadmin-0.9.7_rc3.ebuild
+++ b/net-nds/phpldapadmin/phpldapadmin-0.9.7_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-nds/phpldapadmin/phpldapadmin-0.9.7_rc3.ebuild,v 1.1 2005/09/20 23:03:52 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/phpldapadmin-0.9.7_rc3.ebuild,v 1.1.1.1 2005/11/30 09:36:46 chriswhite Exp $
 
 inherit webapp versionator
 
diff --git a/net-nds/portmap/ChangeLog b/net-nds/portmap/ChangeLog
index f01735b9a159..f116a49ff5a5 100644
--- a/net-nds/portmap/ChangeLog
+++ b/net-nds/portmap/ChangeLog
@@ -1,7 +1,112 @@
 # ChangeLog for net-nds/portmap
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/ChangeLog,v 1.1 2002/02/01 21:53:36 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/ChangeLog,v 1.1.1.1 2005/11/30 09:36:46 chriswhite Exp $
 
+  23 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> portmap-5b-r9.ebuild:
+  Use -1 instead of /bin/false on enewuser call.
+
+  22 Feb 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/portmap-5b-no-SYS.patch, portmap-5b-r9.ebuild:
+  Add patch to delete the $(SYS) variable which isnt used at all #83000 by
+  Mihai Limbasan.
+
+  07 Feb 2005; Markus Rothe <corsair@gentoo.org> -portmap-5b-r8.ebuild,
+  portmap-5b-r9.ebuild:
+  Stable on ppc64; -r8 no longer needed -> removed
+
+  23 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> portmap-5b-r9.ebuild:
+  Stable on alpha.
+
+  19 Jan 2005; Joshua Kinard <kumba@gentoo.org> portmap-5b-r9.ebuild:
+  Marked stable on mips.
+
+  10 Dec 2004; Joseph Jezak <josejx@gentoo.org> portmap-5b-r9.ebuild:
+  Marked ppc stable.
+
+  06 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org> portmap-5b-r9.ebuild:
+  Stable on sparc
+
+  31 Oct 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/portmap-5b-loopback-only.patch,
+  +files/portmap-5b-optional-tcpd.patch, +files/portmap.confd,
+  files/portmap.rc6, portmap-5b-r8.ebuild, portmap-5b-r9.ebuild:
+  Clean up ebuilds and add support for loopback-only #65199 by Elros Cyriatan.
+
+  02 Aug 2004; Aron Griffis <agriffis@gentoo.org> portmap-5b-r8.ebuild,
+  portmap-5b-r9.ebuild:
+  Add enewuser/enewgroup for rpc #41759
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> portmap-5b-r7.ebuild,
+  portmap-5b-r8.ebuild, portmap-5b-r9.ebuild:
+  virtual/glibc -> virtual/libc
+
+  11 May 2004; Michael McCabe <randy@gentoo.org> portmap-5b-r8.ebuild:
+  added s390 keywords
+
+*portmap-5b-r9 (24 Apr 2004)
+
+  24 Apr 2004; Robin H. Johnson <robbat2@gentoo.org> portmap-5b-r9.ebuild:
+  add new version supporting leaving out tcp-wrappers via USE flag.
+
+  06 Apr 2004; Joshua Brindle <method@gentoo.org> portmap-5b-r8.ebuild:
+  added selinux policy to rdepend
+
+  09 Mar 2004; <agriffis@gentoo.org> portmap-5b-r8.ebuild:
+  stable on alpha and ia64
+
+  07 Mar 2004; Joshua Kinard <kumba@gentoo.org> portmap-5b-r6.ebuild,
+  portmap-5b-r7.ebuild, portmap-5b-r8.ebuild:
+  Marked stable on mips, copyright header fixes.
+
+  16 Feb 2004; Gustavo Zacarias <gustavoz@gentoo.org> portmap-5b-r8.ebuild:
+  Stable on hppa
+
+  09 Feb 2004; <gustavoz@gentoo.org> portmap-5b-r8.ebuild:
+  stable on sparc
+
+  08 Feb 2004; Martin Schlemmer <azarah@gentoo.org> portmap-5b-r8.ebuild:
+  Bump to stable for x86.
+
+  28 Dec 2003; Martin Schlemmer <azarah@gentoo.org> portmap-5b-r8.ebuild:
+  Make last fix more dynamic.
+
+*portmap-5b-r8 (27 Dec 2003)
+
+  27 Dec 2003; Martin Schlemmer <azarah@gentoo.org> portmap-5b-r8.ebuild,
+  files/portmap-4.0-cleanup.patch, files/portmap-4.0-malloc.patch,
+  files/portmap-4.0-rpc_user.patch, files/portmap-4.0-sigpipe.patch:
+  Cleanup ebuild a bit. Add some RH patches. Fix to work with
+  >=sys-apps/tcp-wrappers-7.6-r7 that moved libwrap.a to /lib.
+
+*portmap-5b-r7 (31 Dec 2002)
+
+  05 May 2003; Martin Holzer <mholzer@gentoo.org> files/portmap.rc5,
+  files/portmap.rc6:
+  Portmap starts now before inetd and xinetd in runlevels. Closes #18189.
+
+  28 Mar 2003; Guy Martin <gmsoft@gentoo.org> portmap-5b-r7.ebuild :
+  Added hppa to KEYWORDS.
+
+  13 Mar 2003; Zach Welch <zwelch@gentoo.org> portmap-5b-r7.ebuild:
+  add arm keyword
+
+  09 Mar 2003; Aron Griffis <agriffis@gentoo.org> portmap-5b-r7.ebuild:
+  Mark stable on alpha
+
+  16 Feb 2003; Jan Seidel <tuxus@gentoo.org> portmap-5b-r7.ebuild :
+  Added mips to keywords
+
+  09 Feb 2003; Seemant Kulleen <seemant@gentoo.org> *.ebuild :
+  Sed expression delimiter from / to :, closing bug #15006 by Blu3
+  <david+gentoo.org@blue-labs.org>; also use epatch in the r6 ebuild.
+
+  31 Dec 2002; Martin Schlemmer <azarah@gentoo.org> portmap-5b-r7.ebuild :
+  Should include errno.h, and not define as external.  Fix
+  relocation error and build problem with glibc-2.3.2 cvs ...
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> :
+  Changed sparc ~sparc keywords.
+ 
 *portmap-5b-r6 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
diff --git a/net-nds/portmap/Manifest b/net-nds/portmap/Manifest
index 6f27dcb666e5..124f7e4584b1 100644
--- a/net-nds/portmap/Manifest
+++ b/net-nds/portmap/Manifest
@@ -1,8 +1,25 @@
-MD5 63f379c6993d00e52e7e693638776995 ChangeLog 1559
-MD5 d1d243a09b6ef999ea45e98ceb6e0514 portmap-5b-r6.ebuild 1079
-MD5 45f92501eec9e421275587b60a81efec portmap-5b-r7.ebuild 1369
-MD5 44dae63001c0ad007604a7ba55403838 files/digest-portmap-5b-r6 64
-MD5 44dae63001c0ad007604a7ba55403838 files/digest-portmap-5b-r7 64
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 def1cd0cee829a8caa56efd6a51d937c metadata.xml 184
+MD5 5ce90742848c7ff2e36dfc7ab72daa8a portmap-5b-r9.ebuild 1993
+MD5 f328e9265f2f5610d9d8d0c3b1b7a513 ChangeLog 4535
+MD5 7667fe1c5070f9f57c1beb25015bb7be files/portmap-4.0-malloc.patch 9067
+MD5 d0820fd449ae88e56f2a3e78b96bb9d1 files/portmap-4.0-sigpipe.patch 353
+MD5 44dae63001c0ad007604a7ba55403838 files/digest-portmap-5b-r9 64
+MD5 14b082c837898bb8901a41a43306d0f2 files/portmap-5b-no-SYS.patch 541
+MD5 c4cab1b374730a709460d95211200852 files/portmap-4.0-cleanup.patch 2193
+MD5 b806d1f955acd4cdb322e74159cc17f5 files/portmap.confd 275
+MD5 5bef50780d3ffa439bc12d3e238f2e14 files/portmap-5b-loopback-only.patch 2007
+MD5 417c9dc094234061ad301e5b5413b120 files/portmap.rc6 1132
+MD5 49ef87c468b07ca837a1282faca5647b files/portmap-4.0-rpc_user.patch 1779
 MD5 887940376974bf01ecf94fd032f224eb files/portmap-5b-include-errno_h.patch 403
-MD5 59c73272d68daf7906987ccd921db768 files/portmap.rc6 1082
 MD5 0ec47652f96bfda762a2ffc72a78f002 files/portmap_5beta.dif 8871
+MD5 8b7fc4f54e294754bbd464ec3b6f919b files/portmap-5b-optional-tcpd.patch 1066
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDC7c8gIKl8Uu19MoRAtQ/AJ9BmitlUyasW7bMmUqAUR5wMobftACfTMsx
+1G4KAjBJ5lt72I83qC9gpZA=
+=cj6A
+-----END PGP SIGNATURE-----
diff --git a/net-nds/portmap/files/portmap-5b-loopback-only.patch b/net-nds/portmap/files/portmap-5b-loopback-only.patch
index 4684319ce574..e34623f6cc35 100644
--- a/net-nds/portmap/files/portmap-5b-loopback-only.patch
+++ b/net-nds/portmap/files/portmap-5b-loopback-only.patch
@@ -41,7 +41,8 @@ diff -u portmap_5beta/portmap.c portmap_5beta_elros/portmap.c
 +			break;
 +
  		default:
- 			(void) fprintf(stderr, "usage: %s [-dv]\n", argv[0]);
+-			(void) fprintf(stderr, "usage: %s [-dv]\n", argv[0]);
++			(void) fprintf(stderr, "usage: %s [-dvl]\n", argv[0]);
  			(void) fprintf(stderr, "-d: debugging mode\n");
  			(void) fprintf(stderr, "-v: verbose logging\n");
 +			(void) fprintf(stderr, "-l: listen only on loopback address (not on external address)\n");
diff --git a/net-nds/portmap/files/portmap.confd b/net-nds/portmap/files/portmap.confd
index 3f909c4d233e..87b377382e0c 100644
--- a/net-nds/portmap/files/portmap.confd
+++ b/net-nds/portmap/files/portmap.confd
@@ -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-nds/portmap/files/portmap.confd,v 1.1 2004/10/31 05:58:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/files/portmap.confd,v 1.1.1.1 2005/11/30 09:36:47 chriswhite Exp $
 
 # Listen on localhost only by default
 #PORTMAP_OPTS="-l"
diff --git a/net-nds/portmap/files/portmap.rc6 b/net-nds/portmap/files/portmap.rc6
index 047051271ddb..4c563d80f33c 100644
--- a/net-nds/portmap/files/portmap.rc6
+++ b/net-nds/portmap/files/portmap.rc6
@@ -1,15 +1,23 @@
 #!/sbin/runscript
-
-opts="start stop restart"
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/files/portmap.rc6,v 1.1.1.1 2005/11/30 09:36:46 chriswhite Exp $
 
 depend() {
-	need net
+	use net
+	before inetd
+	before xinetd
 }
 
 start() {
 	ebegin "Starting portmap"
-	start-stop-daemon --start --quiet --exec /sbin/portmap
-	eend $?
+	start-stop-daemon --start --quiet --exec /sbin/portmap -- ${PORTMAP_OPTS}
+	local ret=$?
+	eend ${ret}
+	# without, if a service depending on portmap is started too fast,
+	# connecting to portmap will fail -- azarah
+	sleep 1
+	return ${ret}
 }
 
 stop() {
@@ -26,8 +34,9 @@ restart() {
 	eend $? "Error saving portmap table."
 
 	# Stop and restart portmapper
-	stop
-	start
+	svc_stop
+	sleep 1
+	svc_start
 
 	# Reload the portmapper's table
 	if [ -n "$tmpfile" ]; then
diff --git a/net-nds/portmap/files/portmap_5beta.dif b/net-nds/portmap/files/portmap_5beta.dif
index 23ce5f14560f..edec9827cb22 100644
--- a/net-nds/portmap/files/portmap_5beta.dif
+++ b/net-nds/portmap/files/portmap_5beta.dif
@@ -153,7 +153,7 @@
 +.\" SUCH DAMAGE.
 +.\"
 +.\"     from: @(#)portmap.8	5.3 (Berkeley) 3/16/91
-+.\"	$Id: portmap_5beta.dif,v 1.1 2000/08/09 23:55:48 achim Exp $
++.\"	$Id: portmap_5beta.dif,v 1.1.1.1 2005/11/30 09:36:47 chriswhite Exp $
 +.\"
 +.Dd March 16, 1991
 +.Dt PORTMAP 8
diff --git a/net-nds/portmap/portmap-5b-r9.ebuild b/net-nds/portmap/portmap-5b-r9.ebuild
index 531a7e626d04..ae8baabec46e 100644
--- a/net-nds/portmap/portmap-5b-r9.ebuild
+++ b/net-nds/portmap/portmap-5b-r9.ebuild
@@ -1,90 +1,78 @@
-# 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-nds/portmap/portmap-5b-r9.ebuild,v 1.1 2004/04/24 18:45:55 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/portmap-5b-r9.ebuild,v 1.1.1.1 2005/11/30 09:36:46 chriswhite Exp $
 
-inherit eutils
+inherit eutils flag-o-matic toolchain-funcs
 
 MY_P="${PN}_${PV}eta"
 S="${WORKDIR}/${MY_P}"
 DESCRIPTION="Netkit - portmapper"
-SRC_URI="ftp://ftp.porcupine.org/pub/security/${MY_P}.tar.gz"
 HOMEPAGE="ftp://ftp.porcupine.org/pub/security/index.html"
+SRC_URI="ftp://ftp.porcupine.org/pub/security/${MY_P}.tar.gz"
 
-SLOT="0"
 LICENSE="as-is"
-KEYWORDS="-*"
-#KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64 ~ia64 ~ppc64"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
+IUSE="selinux tcpd"
 
-DEPEND="virtual/glibc
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r7 )"
+DEPEND="virtual/libc
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r7 )
+	>=sys-apps/portage-2.0.51"
 RDEPEND="selinux? ( sec-policy/selinux-portmap )"
-IUSE="tcpd selinux"
+
+pkg_setup() {
+	enewgroup rpc 111
+	enewuser rpc 111 -1 /dev/null rpc
+}
 
 src_unpack() {
 	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}_5beta.dif
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}_5beta.dif
 
 	# Redhat patches
-	epatch ${FILESDIR}/${PN}-4.0-malloc.patch
-	epatch ${FILESDIR}/${PN}-4.0-cleanup.patch
-	epatch ${FILESDIR}/${PN}-4.0-rpc_user.patch
-	epatch ${FILESDIR}/${PN}-4.0-sigpipe.patch
+	epatch "${FILESDIR}"/${PN}-4.0-malloc.patch
+	epatch "${FILESDIR}"/${PN}-4.0-cleanup.patch
+	epatch "${FILESDIR}"/${PN}-4.0-rpc_user.patch
+	epatch "${FILESDIR}"/${PN}-4.0-sigpipe.patch
 
 	# Should include errno.h, and not define as external.  Fix
 	# relocation error and build problem with glibc-2.3.2 cvs ...
 	# <azarah@gentoo.org> (31 Dec 2002).
-	epatch ${FILESDIR}/${P}-include-errno_h.patch
+	epatch "${FILESDIR}"/${P}-include-errno_h.patch
+
+	# Patch to listen on loopback only #65199
+	epatch "${FILESDIR}"/${P}-loopback-only.patch
 
-	# Get portmap to use our CFLAGS ...
-	sed -e "s:-O2:${CFLAGS}:" -i Makefile || die
+	# Make tcp wrapper checks easier
+	epatch "${FILESDIR}"/${P}-optional-tcpd.patch
+
+	# Remove useless make variable #83000
+	epatch "${FILESDIR}"/${P}-no-SYS.patch
 }
 
 src_compile() {
-	local LIBS
-	local WRAP_DIR
-	local HOSTS_ACCESS
-	# libutil static as per -r8
-	#LIBS="-Wl,-Bstatic -lutil -Wl,-Bdynamic -lnsl"
-	# libutil dynamic
-	LIBS="-Wl,-Bdynamic -lutil -Wl,-Bdynamic -lnsl"
-	WRAP_DIR=""
-	HOSTS_ACCESS=""
-	if use tcpd; then
-	        WRAP_DIR="${ROOT}/usr/lib"
-	        [ -f "${ROOT}/lib/libwrap.a" ] && WRAP_DIR="${ROOT}/lib"
-			# static libwrap as per -r8
-	        #LIBS="-Wl,-Bstatic -lwrap ${LIBS}"
-			# libwrap dynamic
-	        LIBS="-Wl,-Bdynamic -lwrap ${LIBS}"
-	        HOSTS_ACCESS="-DHOSTS_ACCESS"
-	else
-	        sed -i -e "s:^WRAP_LIB:\#WRAP_LIB:" \
-	        -e "s:^HOSTS_ACCESS:\#HOSTS_ACCESS:" \
-	        -e 's:$(WRAP_DIR)/libwrap.a::g' \
-	        Makefile
-	fi
-
-	make FACILITY=LOG_AUTH \
-		ZOMBIES='-DIGNORE_SIGCHLD' \
-		HOSTS_ACCESS="${HOSTS_ACCESS}" \
-		WRAP_DIR="${WRAP_DIR}" \
-		LIBS="${LIBS}" \
-		AUX= || die
+	local tcpd=""
+	use tcpd \
+		&& tcpd="-lwrap" \
+		&& append-flags -DHOSTS_ACCESS
+
+	emake \
+		CC="$(tc-getCC)" \
+		O="${CFLAGS}" \
+		WRAP_LIB="${tcpd}" \
+		|| die
 }
 
 src_install() {
-	into / ; dosbin portmap
-	into /usr ; dosbin pmap_dump pmap_set
-	doman portmap.8 pmap_dump.8 pmap_set.8
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/portmap.rc6 portmap
-
-	# Is this really the sort of thing we wanna be doing? :)
-	# ln -s ../../init.d/portmap ${D}/etc/runlevels/default/portmap
+	into /
+	dosbin portmap || die "portmap"
+	into /usr
+	dosbin pmap_dump pmap_set || die "pmap"
 
+	doman portmap.8 pmap_dump.8 pmap_set.8
 	dodoc BLURB CHANGES README
-}
 
+	newinitd ${FILESDIR}/portmap.rc6 portmap
+	newconfd ${FILESDIR}/portmap.confd portmap
+}
diff --git a/net-nds/smbldap-tools/ChangeLog b/net-nds/smbldap-tools/ChangeLog
index d72b7f840da1..eef10c7f00e7 100644
--- a/net-nds/smbldap-tools/ChangeLog
+++ b/net-nds/smbldap-tools/ChangeLog
@@ -1,6 +1,31 @@
 # ChangeLog for net-nds/smbldap-tools
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/smbldap-tools/ChangeLog,v 1.1 2005/03/17 11:27:40 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/smbldap-tools/ChangeLog,v 1.1.1.1 2005/11/30 09:36:53 chriswhite Exp $
+
+  18 Aug 2005; Christian Andreetta <satya@gentoo.org>
+  smbldap-tools-0.9.1-r1.ebuild:
+  examples and docs can be installed again now
+
+*smbldap-tools-0.9.1-r1 (18 Jul 2005)
+
+  18 Jul 2005; Seemant Kulleen <seemant@gentoo.org>
+  -smbldap-tools-0.8.6.ebuild, -smbldap-tools-0.8.7.ebuild,
+  -smbldap-tools-0.8.8.ebuild, -smbldap-tools-0.9.1.ebuild,
+  +smbldap-tools-0.9.1-r1.ebuild:
+  revision bump to now have sane paths for install and configuration
+
+*smbldap-tools-0.9.1 (17 Jun 2005)
+
+  17 Jun 2005; Christian Andreetta <satya@gentoo.org>
+  +smbldap-tools-0.9.1.ebuild:
+  version bump, better adherence to Samba-3 Guide
+
+*smbldap-tools-0.8.8 (30 Apr 2005)
+
+  30 Apr 2005; Christian Andreetta <satya@gentoo.org>
+  smbldap-tools-0.8.6.ebuild, smbldap-tools-0.8.7.ebuild,
+  +smbldap-tools-0.8.8.ebuild:
+  cosmetic ebuild fixes for *BSD parsing. Version bump
 
   17 Mar 2005; Christian Andreetta <satya@gentoo.org> :
   new ebuild: split from samba-3.0.11 ebuild. Addresses bugs #77482, #83196,
diff --git a/net-nds/smbldap-tools/Manifest b/net-nds/smbldap-tools/Manifest
index 946fc6bf57ef..2ac937f50d1b 100644
--- a/net-nds/smbldap-tools/Manifest
+++ b/net-nds/smbldap-tools/Manifest
@@ -1,5 +1,4 @@
-MD5 4d977c8d0e4c74bdf3805379a1d3ba32 smbldap-tools-0.8.7.ebuild 2560
+MD5 f99d6934fa2e73dfb65e27369a678e91 ChangeLog 1214
 MD5 ec0194fe323a6bea2905c0b4ed98b1ce metadata.xml 372
-MD5 4d977c8d0e4c74bdf3805379a1d3ba32 smbldap-tools-0.8.6.ebuild 2560
-MD5 1bc5bcf921de35c1f98ad557642fa53f files/digest-smbldap-tools-0.8.6 68
-MD5 03035f043a4eb25331508a7a6aa60d72 files/digest-smbldap-tools-0.8.7 68
+MD5 73353159579a6b10c59e1bd4e2c7546f smbldap-tools-0.9.1-r1.ebuild 1880
+MD5 6be50c0c2eaa12133da7b8b284ed1946 files/digest-smbldap-tools-0.9.1-r1 68
diff --git a/net-nds/smbldap-tools/smbldap-tools-0.9.1-r1.ebuild b/net-nds/smbldap-tools/smbldap-tools-0.9.1-r1.ebuild
index adde365191b5..a56c1899b439 100644
--- a/net-nds/smbldap-tools/smbldap-tools-0.9.1-r1.ebuild
+++ b/net-nds/smbldap-tools/smbldap-tools-0.9.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-nds/smbldap-tools/smbldap-tools-0.9.1-r1.ebuild,v 1.1 2005/07/18 15:26:55 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/smbldap-tools/smbldap-tools-0.9.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:53 chriswhite Exp $
 
 
 inherit eutils
@@ -52,12 +52,12 @@ src_install() {
 #	for script in ${script_list}; do
 #		dosym ${sbin_dir}/${script} ${sbin_ln_dir}/${script}
 #	done
-#	#docs
-#	dodoc CONTRIBUTORS COPYING ChangeLog FILES INFRA INSTALL README TODO
-#	if use doc; then
-#		insinto /usr/share/doc/${PF}/doc;      doins ${S}/doc/*
-#		insinto /usr/share/doc/${PF}/doc/html; doins ${S}/doc/html/*
-#	fi
+	#docs
+	dodoc CONTRIBUTORS COPYING ChangeLog FILES INFRA INSTALL README TODO
+	if use doc; then
+		insinto /usr/share/doc/${PF}/doc;      doins ${S}/doc/*
+		insinto /usr/share/doc/${PF}/doc/html; doins ${S}/doc/html/*
+	fi
 }
 
 pkg_postinst() {
diff --git a/net-nds/yp-tools/ChangeLog b/net-nds/yp-tools/ChangeLog
index 5e936c98ce0a..5b9b1de6a3ac 100644
--- a/net-nds/yp-tools/ChangeLog
+++ b/net-nds/yp-tools/ChangeLog
@@ -1,6 +1,100 @@
 # ChangeLog for net-nds/yp-tools
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-nds/yp-tools/ChangeLog,v 1.1 2002/02/01 21:53:36 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/yp-tools/ChangeLog,v 1.1.1.1 2005/11/30 09:36:45 chriswhite Exp $
+
+*yp-tools-2.9 (11 Aug 2005)
+
+  11 Aug 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  yp-tools-2.8.ebuild, yp-tools-2.8-r1.ebuild, +yp-tools-2.9.ebuild:
+  Version bump.
+
+*yp-tools-2.8-r1 (03 May 2005)
+
+  03 May 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/yp-tools-2.8-bsd.patch, -yp-tools-2.7-r1.ebuild,
+  +yp-tools-2.8-r1.ebuild:
+  Add support for BSD rpc.yppasswd thanks to Torsten Krah
+  <tkrah@fachschaft.imn.htwk-leipzig.de>. Closes bug #84851.
+
+  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> yp-tools-2.8.ebuild:
+  stable on ia64
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -yp-tools-2.7.ebuild, yp-tools-2.8.ebuild:
+  Cleanup old versions.
+
+  23 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> yp-tools-2.8.ebuild:
+  Stable x86, amd64, sparc.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  yp-tools-2.7-r1.ebuild, yp-tools-2.7.ebuild, yp-tools-2.8.ebuild:
+  virtual/glibc -> virtual/libc
+
+  08 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> yp-tools-2.8.ebuild:
+  Stable on alpha.
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> yp-tools-2.7-r1.ebuild,
+  yp-tools-2.8.ebuild:
+  Add die following econf for bug 48950
+
+  04 Apr 2004; Aron Griffis <agriffis@gentoo.org> yp-tools-2.7-r1.ebuild,
+  yp-tools-2.8.ebuild:
+  Add ia64 keywords to support ypbind for bug 46557
+
+  31 Mar 2004; Tom Gall <tgall@gentoo.org> yp-tools-2.8.ebuild:
+  mark stable for ppc64
+
+  25 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> yp-tools-2.8.ebuild:
+  Adding amd64 keyword. Closing #42615.
+
+*yp-tools-2.8 (10 Jul 2003)
+
+  10 Jul 2003; Donny Davies <woodchip@gentoo.org> yp-tools-2.8.ebuild:
+  Updates from N. Owen Gunden" <ogunden@phauna.org>.
+
+  25 May 2003; Martin Holzer <mholzer@gentoo.org> yp-tools-2.7-r1.ebuild,
+  yp-tools-2.7.ebuild:
+  now uses mirror://kernel
+
+  06 May 2003; Will Woods <wwoods@gentoo.org> yp-tools-2.7-r1.ebuild,
+  yp-tools-2.7.ebuild:
+  Added alpha to KEYWORDS
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*yp-tools-2.7-r1 (18 Jul 2002)
+
+  15 Feb 2003; Mark Guertin <gerk@gentoo.org> yp-tools-2.7-r1.ebuild yp-tools-2.7.ebuild :
+  set ~ppc in keywords
+
+  18 Jul 2002; Seemant Kulleen <seemant@gentoo.orG> yp-tools-2.7-r1.ebuild
+  files/digest-yp-tools-2.7-r1 :
+
+  NLS fixes.
+
+*yp-tools-2.7 (27 May 2002)
+
+  27 May 2002; Aron Griffis <agriffis@gentoo.org> yp-tools-2.7.ebuild:
+
+  updated to version 2.7
+
+*yp-tools-2.6 (27 Apr 2002)
+
+  27 Apr 2002; Seemant Kulleen <seemant@gentoo.org> yp-tools-2.6.ebuild
+  files/digest-yp-tools-2.6 :
+
+  stefan@mdy.univie.ac.at (Stefan Boresch) submitted an update notification
+  in bug #1144 for this.
+
+*yp-tools-2.4-r3 (27 Apr 2002)
+
+  27 Apr 2002; Seemant Kulleen <seemant@gentoo.org> yp-tools-2.4-r3.ebuild
+  files/digest-yp-tools-2.4-r3 :
+
+  USE dependent nls support, and ebuild modernisation.
 
 *yp-tools-2.4-r2 (1 Feb 2002)
 
diff --git a/net-nds/yp-tools/Manifest b/net-nds/yp-tools/Manifest
index aa140c180c40..36019e7630ae 100644
--- a/net-nds/yp-tools/Manifest
+++ b/net-nds/yp-tools/Manifest
@@ -1,5 +1,19 @@
-MD5 e25556569e8450b564e07da3141af06c ChangeLog 1707
-MD5 ecd83c5649dcb24774fc245e72c42787 yp-tools-2.7-r1.ebuild 1090
-MD5 74d48340161b1e02e2f3a650eaa0d7bc yp-tools-2.7.ebuild 864
-MD5 8a4aadbeac31db4a5bf80b9506607d41 files/digest-yp-tools-2.7 65
-MD5 8a4aadbeac31db4a5bf80b9506607d41 files/digest-yp-tools-2.7-r1 65
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 baf865387d7f3904004b9e5e7c5714b4 ChangeLog 3614
+MD5 ab59365f7f92becce9ea574af606ca09 metadata.xml 270
+MD5 f214fe37166c2604510b090d8d9a2b4b yp-tools-2.9.ebuild 1233
+MD5 3e446e851fbeff94083ad904a5d58c58 yp-tools-2.8.ebuild 1135
+MD5 1f0bec60d1c160be989724b21a3529d3 yp-tools-2.8-r1.ebuild 1235
+MD5 93170676c0bf84aab49b3c165d603ed8 files/digest-yp-tools-2.9 65
+MD5 2b599af2b4904c58b39a22d7043d4de0 files/digest-yp-tools-2.8 65
+MD5 dc93b4cab3c4ad02f965961251138248 files/yp-tools-2.8-bsd.patch 2245
+MD5 2b599af2b4904c58b39a22d7043d4de0 files/digest-yp-tools-2.8-r1 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFC+5h6ArHZZzCEUG0RApNNAJwKKLYppzbS0fVELiI90rLhLTlH4wCgh/Ee
+NB1ou/XD0iurGQtwJNZhRJQ=
+=Nlc0
+-----END PGP SIGNATURE-----
diff --git a/net-nds/yp-tools/yp-tools-2.8-r1.ebuild b/net-nds/yp-tools/yp-tools-2.8-r1.ebuild
index 9eda05d4fbe9..803d6e56e141 100644
--- a/net-nds/yp-tools/yp-tools-2.8-r1.ebuild
+++ b/net-nds/yp-tools/yp-tools-2.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-nds/yp-tools/yp-tools-2.8-r1.ebuild,v 1.1 2005/05/03 20:47:14 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/yp-tools/yp-tools-2.8-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:45 chriswhite Exp $
 
 IUSE="nls"
 
@@ -8,7 +8,7 @@ inherit eutils
 
 DESCRIPTION="Network Information Service tools"
 HOMEPAGE="http://www.linux-nis.org/nis/"
-SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/net/NIS/${P}.tar.bz2"
+SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/net/NIS/OLD/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-nds/yp-tools/yp-tools-2.8.ebuild b/net-nds/yp-tools/yp-tools-2.8.ebuild
index 8146fb392f6d..ed080bb7bddf 100644
--- a/net-nds/yp-tools/yp-tools-2.8.ebuild
+++ b/net-nds/yp-tools/yp-tools-2.8.ebuild
@@ -1,21 +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/net-nds/yp-tools/yp-tools-2.8.ebuild,v 1.1.1.1 2005/11/30 09:36:45 chriswhite Exp $
 
 IUSE="nls"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Network Information Service tools"
-SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/net/NIS/${P}.tar.bz2"
-HOMEPAGE="http://www.linux-nis.org/nis"
+HOMEPAGE="http://www.linux-nis.org/nis/"
+SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/net/NIS/OLD/${P}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~alpha ~ppc"
-DEPEND="virtual/glibc"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
+
+DEPEND="virtual/libc"
 
 src_compile() {
 	local myconf="--sysconfdir=/etc/yp"
-	if [ -z "`use nls`" ]
+	if ! use nls
 	then
 		myconf="${myconf} --disable-nls"
 		mkdir intl
@@ -29,13 +30,13 @@ src_compile() {
 				${i}.orig > ${i}
 		done
 	fi
-	econf ${myconf}
+	econf ${myconf} || die "econf failed"
 	make || die
 }
 
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog COPYING NEWS README THANKS TODO
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
 	insinto /etc/yp ; doins etc/nicknames
 	# This messes up boot so we remove it
 	rm -d ${D}/bin/ypdomainname
diff --git a/net-nds/yp-tools/yp-tools-2.9.ebuild b/net-nds/yp-tools/yp-tools-2.9.ebuild
index d8b932f16fb3..b8e307e54b81 100644
--- a/net-nds/yp-tools/yp-tools-2.9.ebuild
+++ b/net-nds/yp-tools/yp-tools-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-nds/yp-tools/yp-tools-2.9.ebuild,v 1.1 2005/08/11 18:26:19 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/yp-tools/yp-tools-2.9.ebuild,v 1.1.1.1 2005/11/30 09:36:45 chriswhite Exp $
 
 IUSE="nls"
 
diff --git a/net-nds/ypbind/ChangeLog b/net-nds/ypbind/ChangeLog
index 780fe12d1ec0..fab6457fa7fc 100644
--- a/net-nds/ypbind/ChangeLog
+++ b/net-nds/ypbind/ChangeLog
@@ -1,6 +1,113 @@
 # ChangeLog for net-nds/ypbind
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-nds/ypbind/ChangeLog,v 1.1 2002/02/01 21:53:36 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/ypbind/ChangeLog,v 1.1.1.1 2005/11/30 09:36:45 chriswhite Exp $
+
+*ypbind-1.19.1 (11 Aug 2005)
+
+  11 Aug 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  ypbind-1.17.2-r1.ebuild, +ypbind-1.19.1.ebuild:
+  Version bump.  Bug #102136.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/ypbind.confd, -files/ypbind.rc5, -files/ypbind.rc6,
+  -ypbind-1.11-r1.ebuild, -ypbind-1.12.ebuild, -ypbind-1.17.2.ebuild:
+  Cleaning up old versions.
+
+  22 Nov 2004; Markus Rothe <corsair@gentoo.org> ypbind-1.17.2-r1.ebuild:
+  Stable on ppc64; bug #66786
+
+  08 Oct 2004; Michael Hanselmann <hansmi@gentoo.org> ypbind-1.17.2-r1.ebuild:
+  Marked stable on ppc. See bug #66786.
+
+  08 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ypbind-1.17.2-r1.ebuild:
+  Fixed DEPENDs
+
+  04 Sep 2004; Bryan Østergaard <kloeri@gentoo.org> ypbind-1.17.2-r1.ebuild:
+  Stable on alpha.
+
+  24 Aug 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ypbind-1.11-r1.ebuild, ypbind-1.12.ebuild, ypbind-1.17.2-r1.ebuild,
+  ypbind-1.17.2.ebuild:
+  1.17.2-r1 stable on x86, sparc, and amd64.  Added slp USE flag support.
+
+  23 Aug 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ypbind-1.11-r1.ebuild, ypbind-1.12.ebuild, ypbind-1.17.2-r1.ebuild,
+  ypbind-1.17.2.ebuild:
+  Adding missing DEPEND on openslp to fix bug #60239.
+
+*ypbind-1.17.2-r1 (23 Jul 2004)
+
+  23 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/ypbind.confd-r1, +files/ypbind.initd, +ypbind-1.17.2-r1.ebuild:
+  Revision bump to fix init scripts. Now depending on domainname to set
+  ypdomainname. Stable x86, sparc, amd64.
+
+  16 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> ypbind-1.17.2.ebuild:
+  use emake; use use_enable; don't install COPYING; tidy
+
+  08 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> ypbind-1.17.2.ebuild:
+  Stable on alpha.
+
+  09 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> files/ypbind.rc5,
+  files/ypbind.rc6:
+  Added eends to the init script.
+
+  04 Apr 2004; Aron Griffis <agriffis@gentoo.org> ypbind-1.11-r1.ebuild:
+  Stable on ia64 for bug 46557
+
+  25 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> ypbind-1.17.2.ebuild:
+  Adding amd64 keyword. Closing #42619.
+
+*ypbind-1.17.2 (24 Feb 2004)
+
+  24 Feb 2004; <tester@gentoo.org> ypbind-1.11-r1.ebuild, ypbind-1.12.ebuild,
+  ypbind-1.17.2.ebuild:
+  Version bump, and added comment on proper use with dhcpcd per bug #10728
+
+  24 Feb 2004; <tester@gentoo.org> ypbind-1.11-r1.ebuild, ypbind-1.12.ebuild:
+  Fix src_uri
+
+*ypbind-1.12 (10 Jul 2003)
+
+  10 Jul 2003; Donny Davies <woodchip@gentoo.org> ypbind-1.12.ebuild,
+  files/ypbind.confd:
+  Updates from N. Owen Gunden" <ogunden@phauna.org>.
+
+  25 May 2003; Martin Holzer <mholzer@gentoo.org> ypbind-1.11-r1.ebuild:
+  now uses mirror://kernel
+
+  06 May 2003; Will Woods <wwoods@gentoo.org> ypbind-1.11-r1.ebuild:
+  Added alpha to KEYWORDS
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*ypbind-1.11-r1 (4 Jun 2002)
+
+  4 Jun 2002; Seemant Kulleen <seemant@gentoo.org> ypbind-1.11-r1.ebuild
+  files/digest-ypbind-1.11-r1 :
+
+  fix in the /etc/init.d script from lars.pechan@paradise.net.nz (Lars
+  Pechan) in bug #3103
+
+*ypbind-1.11 (27 May 2002)
+
+  27 May 2002; Aron Griffis <agriffis@gentoo.org> ypbind-1.11.ebuild :
+
+  Updated to version 1.11.  Also added "depend() { use ypserv }" so that
+  ypserv will start prior to ypbind (in case the localhost is the server).
+  Thanks to Scott Friedman for the bug report.
+
+*ypbind-1.10 (27 Apr 2002)
+
+  27 Apr 2002; Seemant Kulleen <seemant@gentoo.org> ypbind-1.10.ebuild
+  files/digest-ypbind-1.10 :
+
+  Version bump, including USE dependent NLS support. Thanks to bug #1146 by
+  stefan@mdy.univie.ac.at (Stefan Boresch)
 
 *ypbind-1.7-r6 (1 Feb 2002)
 
diff --git a/net-nds/ypbind/Manifest b/net-nds/ypbind/Manifest
index 80982d82fc71..9cf2ff116a75 100644
--- a/net-nds/ypbind/Manifest
+++ b/net-nds/ypbind/Manifest
@@ -1,6 +1,18 @@
-MD5 99ed7f321fdbea2c40a71ef01a933793 ChangeLog 1725
-MD5 936970a2f1b2eeb3798a703facb2d2d2 ypbind-1.11-r1.ebuild 934
-MD5 07fdb01e99c0cb8ab5b3e770d83d7449 files/digest-ypbind-1.11-r1 67
-MD5 ece2b93be85a1bf6872c0b7abfe591c2 files/ypbind.confd 113
-MD5 872185d0cbdbf410af0eade7b3f0c1ba files/ypbind.rc5 1020
-MD5 c8726c0ffa5932440f33ba1b51191005 files/ypbind.rc6 963
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e4f6342539c17ff5191b86adb79d726c ChangeLog 4396
+MD5 ab59365f7f92becce9ea574af606ca09 metadata.xml 270
+MD5 c790f529fb5b830124b4acb432a42847 ypbind-1.17.2-r1.ebuild 1256
+MD5 b826fd6315b096d55b70ca0fa18bb77a ypbind-1.19.1.ebuild 1256
+MD5 abf5b898fdb40aee7909eb21402b8b16 files/digest-ypbind-1.17.2-r1 69
+MD5 c5aee6bd628cd668314e4879a2cad696 files/ypbind.confd-r1 112
+MD5 4a8f16abe013d049df327a1495db254c files/ypbind.initd 887
+MD5 7454d3d1218b8d4ca8dc5e06a6925f7f files/digest-ypbind-1.19.1 69
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFC+5eJArHZZzCEUG0RAvWYAJ4oglrH+5HiclHokPzy0/iF/5G2/QCfedw1
+NZgfSq6qvs8H9xYWF3j2xZ4=
+=UKf5
+-----END PGP SIGNATURE-----
diff --git a/net-nds/ypbind/files/ypbind.initd b/net-nds/ypbind/files/ypbind.initd
index 4e5c245c07db..008aec2cb04d 100644
--- a/net-nds/ypbind/files/ypbind.initd
+++ b/net-nds/ypbind/files/ypbind.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-nds/ypbind/files/ypbind.initd,v 1.1 2004/07/24 06:37:23 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/ypbind/files/ypbind.initd,v 1.1.1.1 2005/11/30 09:36:45 chriswhite Exp $
 
 depend() {
 	need net portmap domainname
@@ -32,6 +32,7 @@ start() {
 stop() {
 	ebegin "Stopping ypbind"
 	start-stop-daemon --stop --quiet --exec /usr/sbin/ypbind
+	eend $?
 	# Remove binding files, if ypbind "forgets" it
 	rm -f /var/yp/binding/*
 }
diff --git a/net-nds/ypbind/ypbind-1.17.2-r1.ebuild b/net-nds/ypbind/ypbind-1.17.2-r1.ebuild
index c2ddf2e8d3c2..adacea2b88a2 100644
--- a/net-nds/ypbind/ypbind-1.17.2-r1.ebuild
+++ b/net-nds/ypbind/ypbind-1.17.2-r1.ebuild
@@ -1,25 +1,31 @@
-# Copyright 1999-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-nds/ypbind/ypbind-1.17.2-r1.ebuild,v 1.1 2004/07/24 06:37:23 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/ypbind/ypbind-1.17.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:45 chriswhite Exp $
 
 MY_P=${PN}-mt-${PV}
+S="${WORKDIR}/${MY_P}"
+
 DESCRIPTION="Multithreaded NIS bind service (ypbind-mt)"
 HOMEPAGE="http://www.linux-nis.org/nis/ypbind-mt/index.html"
-SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/net/NIS/${MY_P}.tar.bz2"
+SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/net/NIS/OLD/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~alpha ~ppc ~amd64 ~ia64 ~ppc64"
-IUSE="nls"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
+IUSE="nls slp"
 
-DEPEND="net-nds/yp-tools
+RDEPEND="slp? ( net-libs/openslp )
+	net-nds/yp-tools
 	net-nds/portmap"
-RDEPEND="nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${MY_P}"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	>=sys-apps/portage-2.0.51"
 
 src_compile() {
-	econf $(use_enable nls) || die
+	econf \
+		$(use_enable nls) \
+		$(use_enable slp) \
+		|| die
 	emake || die "emake failed"
 }
 
@@ -27,8 +33,8 @@ src_install() {
 	einstall || die
 	dodoc AUTHORS ChangeLog README THANKS TODO
 	insinto /etc ; doins etc/yp.conf
-	insinto /etc/conf.d ; newins ${FILESDIR}/ypbind.confd-r1 ypbind
-	exeinto /etc/init.d ; newexe ${FILESDIR}/ypbind.initd ypbind
+	newconfd ${FILESDIR}/ypbind.confd-r1 ypbind
+	newinitd ${FILESDIR}/ypbind.initd ypbind
 }
 
 pkg_postinst() {
diff --git a/net-nds/ypbind/ypbind-1.19.1.ebuild b/net-nds/ypbind/ypbind-1.19.1.ebuild
index 029e0f901684..5e81b85a05ea 100644
--- a/net-nds/ypbind/ypbind-1.19.1.ebuild
+++ b/net-nds/ypbind/ypbind-1.19.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/ypbind/ypbind-1.19.1.ebuild,v 1.1 2005/08/11 18:22:34 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/ypbind/ypbind-1.19.1.ebuild,v 1.1.1.1 2005/11/30 09:36:45 chriswhite Exp $
 
 MY_P=${PN}-mt-${PV}
 S="${WORKDIR}/${MY_P}"
diff --git a/net-nds/ypserv/ChangeLog b/net-nds/ypserv/ChangeLog
index 2cc5ac3ec11f..1fc8c114137f 100644
--- a/net-nds/ypserv/ChangeLog
+++ b/net-nds/ypserv/ChangeLog
@@ -1,6 +1,108 @@
 # ChangeLog for net-nds/ypserv
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-nds/ypserv/ChangeLog,v 1.1 2002/02/01 21:53:36 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/ypserv/ChangeLog,v 1.1.1.1 2005/11/30 09:36:44 chriswhite Exp $
+
+*ypserv-2.18 (11 Aug 2005)
+
+  11 Aug 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  ypserv-2.13-r1.ebuild, +ypserv-2.18.ebuild:
+  Version bump.  Bug #102137.
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> -files/defs.sed,
+  -files/rpc.yppasswdd, -files/ypserv-confd, -files/ypserv-initd,
+  -files/1.3.12/volatile-fix-gcc-3.2.diff, -ypserv-1.3.12.ebuild,
+  -ypserv-2.13.ebuild, -ypserv-2.8.ebuild:
+  Cleanup old versions.
+
+  22 Nov 2004; Markus Rothe <corsair@gentoo.org> ypserv-2.13-r1.ebuild:
+  Stable on ppc64; bug #66786
+
+  08 Oct 2004; Michael Hanselmann <hansmi@gentoo.org> ypserv-2.13-r1.ebuild:
+  Marked stable on ppc. See bug #66786.
+
+  16 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> ypserv-1.3.12.ebuild,
+  ypserv-2.13-r1.ebuild, ypserv-2.13.ebuild, ypserv-2.8.ebuild:
+  Added slp USE flag support.
+
+  14 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> ypserv-2.13-r1.ebuild:
+  Stable on sparc
+
+  23 Aug 2004; Jeremy Huddleston <eradicator@gentoo.org> ypserv-1.3.12.ebuild,
+  ypserv-2.13-r1.ebuild, ypserv-2.13.ebuild, ypserv-2.8.ebuild:
+  Adding missing DEPEND on openslp to fix bug #60239.
+
+  23 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  files/rpc.yppasswdd-r1, files/rpc.ypxfrd, +files/rpc.ypxfrd.confd,
+  +files/ypserv, files/ypserv.confd, -files/ypserv.rc, -ypserv-2.5.ebuild:
+  Add conf.d options to set command line options (bug #38219). init script
+  depends on domainname rather than having it set in two places. Marking latest
+  ebuild stable on amd64 and x86. Removing old ebuilds.
+
+  11 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  files/rpc.yppasswdd-r1, ypserv-2.13-r1.ebuild:
+  Added ~amd64.  Fixed duplicate line in init file.
+
+*ypserv-2.13-r1 (08 Jun 2004)
+
+  08 Jun 2004; Nick Hadaway <raker@gentoo.org> ypserv-2.13.ebuild,
+  files/rpc.yppasswdd.confd, rpc.yppasswdd :
+  Changes made to the init scripts as suggested by users on bug #40048.
+  This allows for an easy reference to some common options for rpc.yppasswdd
+
+  29 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> ypserv-2.13.ebuild,
+  ypserv-2.8.ebuild, files/rpc.ypxfrd:
+  Added rpc.ypxfrd init script.
+
+*ypserv-2.13 (28 Apr 2004)
+
+  28 Apr 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bump since older versions have disappeared upstream.
+
+  11 Jul 2003; Donny Davies <woodchip@gentoo.org> ypserv-2.8.ebuild:
+  Close #24284 and #24281.
+
+  11 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> ypserv-2.8.ebuild :
+  Unmasked, security update.
+
+*ypserv-2.8 (10 Jul 2003)
+
+  10 Jul 2003; Donny Davies <woodchip@gentoo.org> ypserv-2.8.ebuild,
+  files/rpc.yppasswdd, files/ypserv.confd, files/ypserv.rc:
+  Updates from N. Owen Gunden" <ogunden@phauna.org>.
+
+  17 Jun 2003; Donny Davies <woodchip@gentoo.org> ypserv-1.3.12.ebuild,
+  ypserv-2.5-r1.ebuild, ypserv-2.5.ebuild, files/ypserv-confd,
+  files/ypserv-initd, files/ypserv.rc5, files/ypserv.rc6:
+  Close #20767; added new rc-scripts.  Thanks to
+  Jeremy Huddleston <jeremyhu@cory.eecs.berkeley.edu>.
+
+  25 May 2003; Martin Holzer <mholzer@gentoo.org> ypserv-1.3.12.ebuild,
+  ypserv-2.5-r1.ebuild, ypserv-2.5.ebuild:
+  now uses mirror://kernel
+
+*ypserv-2.5-r1 (28 Jan 2003)
+
+  28 Jan 2003; Nick Hadaway <raker@gentoo.org> ypserv-2.5-r1.ebuild,
+  files/digest-ypserv-2.5-r1 :
+  Put in some logic so /var/yp/Makefile doesn't get overwritten on
+  upgrades.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*ypserv-2.5 (28 Oct 2002)
+
+  28 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> :
+  Security update.
+
+*ypserv-1.3.12 (13 Apr 2002)
+
+  29 Aug 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ypserv-1.3.12.ebuild files/1.3.12/volatile-fix-gcc-3.2.diff :
+  Added patch to make it compile with gcc 3.2.
+
+  13 Apr 2002; Seemant Kulleen <seemant@gentoo.org> ypserv-1.3.12.ebuild :
+
+  Version bump, and sandbox violation fix as reported in bug #1648 by
+  terjekv@math.uio.no (Terje Kvernes)
 
 *ypserv-1.3.9-r6 (1 Feb 2002)
 
diff --git a/net-nds/ypserv/Manifest b/net-nds/ypserv/Manifest
index b032cd0481ea..4c9ff55885cb 100644
--- a/net-nds/ypserv/Manifest
+++ b/net-nds/ypserv/Manifest
@@ -1,11 +1,22 @@
-MD5 d29e6782b22f66c57a00e56856e7f3b7 ChangeLog 1443
-MD5 4b1cac212a21be9e6748ea8c05f053e3 ypserv-1.3.12.ebuild 1609
-MD5 f69ef108d083921b0e00c1950c9d6df1 ypserv-2.5-r1.ebuild 1455
-MD5 46e801e2dc142c33bc8f11fa9917cb5e ypserv-2.5.ebuild 989
-MD5 d65fdf73994b1d6d96d9820cbcae02ef files/defs.sed 856
-MD5 d8a2530491cec60a01a03e74b63b37c7 files/digest-ypserv-1.3.12 65
-MD5 9c20be3742d94aee43877c12df611b05 files/digest-ypserv-2.5 62
-MD5 9c20be3742d94aee43877c12df611b05 files/digest-ypserv-2.5-r1 62
-MD5 17ac388deb54a1630badcf5754897318 files/ypserv.rc5 525
-MD5 95e1d4cd2f9fc1968bf1fb08117290f1 files/ypserv.rc6 494
-MD5 5950ee3a17fa970f3c76bc615b024b6c files/1.3.12/volatile-fix-gcc-3.2.diff 385
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9a11b06196a65e27572e42c310fb192d ChangeLog 4568
+MD5 ab59365f7f92becce9ea574af606ca09 metadata.xml 270
+MD5 f3097d238760317174f7813f089f06d2 ypserv-2.13-r1.ebuild 1900
+MD5 29efa22c0fc40c014ee9091e5df3bdc6 ypserv-2.18.ebuild 1892
+MD5 45967caf49de0b5bc203268a007e97fa files/digest-ypserv-2.13-r1 64
+MD5 694f6f542233227781bd04bba4b915da files/rpc.yppasswdd-r1 609
+MD5 f38a0f43a932ff1e4f39d8694cdb0846 files/rpc.yppasswdd.confd 260
+MD5 b2693c779a268938115d9eee775c9dc8 files/rpc.ypxfrd 586
+MD5 7dc8e37a39eb21d796894f89ffd53262 files/rpc.ypxfrd.confd 122
+MD5 3f3f1488115fa4837c7963811e876db7 files/ypserv 577
+MD5 e5bb4de1f10631c93c5920f87059229a files/ypserv.confd 95
+MD5 d92cf218d3682ced6bbb86dd3d364406 files/digest-ypserv-2.18 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFC+5XhArHZZzCEUG0RAjYSAJoD2CJ7dA55y/XkhTdyq67F0aHB+gCfcCyW
+vDz1kjsP2Z8dT+1HASd7I2g=
+=bki1
+-----END PGP SIGNATURE-----
diff --git a/net-nds/ypserv/files/rpc.yppasswdd-r1 b/net-nds/ypserv/files/rpc.yppasswdd-r1
index 596c6130a0d6..2458162f0093 100644
--- a/net-nds/ypserv/files/rpc.yppasswdd-r1
+++ b/net-nds/ypserv/files/rpc.yppasswdd-r1
@@ -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-nds/ypserv/files/rpc.yppasswdd-r1,v 1.1 2004/06/08 05:28:54 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/ypserv/files/rpc.yppasswdd-r1,v 1.1.1.1 2005/11/30 09:36:44 chriswhite Exp $
 
 depend() {
 	need net portmap ypserv
@@ -9,9 +9,8 @@ depend() {
 
 start() {
 	ebegin "Starting rpc.yppasswdd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/rpc.yppasswdd
 	YOPTS=""
-	if [ -n "${YPPASSWDD_OPTS}" ]; then YOPTS="-- $YPPASSWDD_OPTS"; fi
+	if [ -n "${YPPASSWDD_OPTS}" ]; then YOPTS="-- ${YPPASSWDD_OPTS}"; fi
 	start-stop-daemon --start --quiet --exec /usr/sbin/rpc.yppasswdd ${YOPTS}
 	eend $?
 }
diff --git a/net-nds/ypserv/files/rpc.ypxfrd b/net-nds/ypserv/files/rpc.ypxfrd
index 9fa23ed48a70..e965a632f9af 100644
--- a/net-nds/ypserv/files/rpc.ypxfrd
+++ b/net-nds/ypserv/files/rpc.ypxfrd
@@ -1,20 +1,22 @@
 #!/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-nds/ypserv/files/rpc.ypxfrd,v 1.1 2004/04/29 08:47:42 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/ypserv/files/rpc.ypxfrd,v 1.1.1.1 2005/11/30 09:36:44 chriswhite Exp $
 
 depend() {
 	need net portmap ypserv
 }
 
 start() {
-	ebegin "Starting rpc.yppasswdd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/rpc.ypxfrd
+	ebegin "Starting rpc.ypxfrd"
+	YOPTS=""
+	if [ -n "${YPXFRD_OPTS}" ]; then YOPTS="-- ${YPXFRD_OPTS}"; fi
+ 	start-stop-daemon --start --quiet --exec /usr/sbin/rpc.ypxfrd ${YOPTS}
 	eend $?
 }
 
 stop() {
-	ebegin "Stopping rpc.yppasswdd"
+	ebegin "Stopping rpc.ypxfrd"
 	start-stop-daemon --stop --quiet --exec /usr/sbin/rpc.ypxfrd
 	eend $?
 }
diff --git a/net-nds/ypserv/files/ypserv b/net-nds/ypserv/files/ypserv
index d7c54817245a..100474948871 100755
--- a/net-nds/ypserv/files/ypserv
+++ b/net-nds/ypserv/files/ypserv
@@ -1,30 +1,22 @@
-#!/bin/sh
-#RCUPDATE:2 3 4:75:This line is required for script management
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/ypserv/files/ypserv,v 1.1.1.1 2005/11/30 09:36:44 chriswhite Exp $
 
-. /etc/rc.d/config/functions
-
-SERVICE="NIS Server"
-opts="start stop restart"
-
-EXE=/usr/sbin/ypserv
+depend() {
+	need net portmap domainname
+}
 
 start() {
-		ebegin "Starting $SERVICE..."
-     		start-stop-daemon --start --quiet --exec $EXE 
-		eend $? "Started $SERVICE." "Error Starting $SERVICE."
+	ebegin "Starting NIS Server"
+	YOPTS=""
+	if [ -n "${YPSERV_OPTS}" ]; then YOPTS="-- ${YPSERV_OPTS}"; fi
+	start-stop-daemon --start --quiet --exec /usr/sbin/ypserv ${YOPTS}
+	eend $?
 }
 
 stop() {
-		ebegin "Stopping $SERVICE..."
-		start-stop-daemon --stop --quiet --exec $EXE
-		eend $? "Stopped $SERVICE." "Error Stopping $SERVICE."
-}
-
-restart() {
-		stop
-		start
+	ebegin "Stopping NIS Server"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/ypserv
+	eend $?
 }
-
-doservice ${@}
-
-
diff --git a/net-nds/ypserv/files/ypserv.confd b/net-nds/ypserv/files/ypserv.confd
index 7f2e74440a24..0ae9756dc81b 100644
--- a/net-nds/ypserv/files/ypserv.confd
+++ b/net-nds/ypserv/files/ypserv.confd
@@ -1,4 +1,4 @@
 # Config file for /etc/init.d/ypserv
 
-# NIS domain (not necessarily the same as DNS domain)
-#YP_DOMAIN=my.nis.domain
+# Command line options to pass to ypserv:
+YPSERV_OPTS=""
diff --git a/net-nds/ypserv/ypserv-2.13-r1.ebuild b/net-nds/ypserv/ypserv-2.13-r1.ebuild
index 57c052326a11..1d5ebe15c838 100644
--- a/net-nds/ypserv/ypserv-2.13-r1.ebuild
+++ b/net-nds/ypserv/ypserv-2.13-r1.ebuild
@@ -1,36 +1,42 @@
-# 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-nds/ypserv/ypserv-2.13-r1.ebuild,v 1.1 2004/06/08 05:28:54 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/ypserv/ypserv-2.13-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:44 chriswhite Exp $
 
 DESCRIPTION="Network Information Service server"
 HOMEPAGE="http://www.linux-nis.org/nis/"
-SRC_URI="mirror://kernel/linux/utils/net/NIS/${P}.tar.bz2"
+SRC_URI="mirror://kernel/linux/utils/net/NIS/OLD/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~ppc64"
-IUSE=""
+KEYWORDS="amd64 ia64 ppc ppc64 sparc x86"
+IUSE="slp"
 
-DEPEND=">=sys-libs/gdbm-1.8.0"
+RDEPEND=">=sys-libs/gdbm-1.8.0
+	slp? ( net-libs/openslp )"
+DEPEND="${RDEPEND}
+	>=sys-apps/portage-2.0.51"
+
+src_compile() {
+	econf $(use_enable slp) || die
+	emake || die
+}
 
 src_install() {
-	make DESTDIR=${D} install
+	make DESTDIR=${D} install || die
 	dodoc AUTHORS ChangeLog INSTALL NEWS README THANKS TODO
 
 	insinto /etc
 	doins etc/ypserv.conf etc/netgroup etc/netmasks
-
 	insinto /var/yp
 	newins etc/securenets securenets.default
 
-	insinto /etc/conf.d
-	newins ${FILESDIR}/ypserv.confd ypserv
-	newins ${FILESDIR}/rpc.yppasswdd.confd rpc.yppasswdd
+	newconfd ${FILESDIR}/ypserv.confd ypserv
+	newconfd ${FILESDIR}/rpc.yppasswdd.confd rpc.yppasswdd
+	newconfd ${FILESDIR}/rpc.ypxfrd.confd rpc.ypxfrd
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/ypserv.rc ypserv
-	newexe ${FILESDIR}/rpc.yppasswdd-r1 rpc.yppasswdd
-	newexe ${FILESDIR}/rpc.ypxfrd rpc.ypxfrd
+	newinitd ${FILESDIR}/ypserv ypserv
+	newinitd ${FILESDIR}/rpc.yppasswdd-r1 rpc.yppasswdd
+	newinitd ${FILESDIR}/rpc.ypxfrd rpc.ypxfrd
 
 	# Save the old config into the new package as CONFIG_PROTECT
 	# doesn't work for this package.
diff --git a/net-nds/ypserv/ypserv-2.18.ebuild b/net-nds/ypserv/ypserv-2.18.ebuild
index 3f81c5b146f0..3e1d63f04447 100644
--- a/net-nds/ypserv/ypserv-2.18.ebuild
+++ b/net-nds/ypserv/ypserv-2.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/net-nds/ypserv/ypserv-2.18.ebuild,v 1.1 2005/08/11 18:11:56 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/ypserv/ypserv-2.18.ebuild,v 1.1.1.1 2005/11/30 09:36:44 chriswhite Exp $
 
 DESCRIPTION="Network Information Service server"
 HOMEPAGE="http://www.linux-nis.org/nis/"
diff --git a/skel.ChangeLog b/skel.ChangeLog
index 34bc154393ae..8b65f19023db 100644
--- a/skel.ChangeLog
+++ b/skel.ChangeLog
@@ -1,25 +1,67 @@
 # ChangeLog for <CATEGORY>/<PACKAGE_NAME>
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-*<PACKAGE_NAME>-<PACKAGE_VERSION>-<PACKAGE_RELEASE> (<DATE>)
+*<PACKAGE_NAME>-<PACKAGE_VERSION>-<PACKAGE_RELEASE> (DD MMM YYYY)
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> skel.ChangeLog :
-  
-  This changelog is targetted to users. This means that the comments should well
-  explained and written in clean English. 
-  
-  Every new version or revision of the package has to be marked by a '*'
-  seperator line as above. Changements since the last revision have to be
-  added to the top of the file, underneath the initial comments, in exactly the
-  same format as this comment.
+  DD MMM YYYY; YOUR_NAME <YOUR_EMAIL> changed_file1, changed_file2 :
+  Initial import.  Ebuild submitted by submitter_name <submitter_email>.
+  Note that the "changed_file" listing is optional if you are simply bumping
+  the rev of the ebuild and are only making changes to the .ebuild file
+  itself.  Also note that we now have a single unified paragraph rather than
+  having the first line separated from the rest by a newline.  Everything
+  should be in one block like this. (note by drobbins, 16 Jul 2002)
+
+  DD MMM YYYY; YOUR_NAME <YOUR_EMAIL> changed_file1, changed_file2: this is
+  an earlier ChangeLog entry.
+ 
+-- Explanation of ChangeLog format:
+
+  ***************************************************************************
+  THIS IS IMPORTANT: The ChangeLog format is a *chronological* account of all
+  changes made to a set of ebuilds. That means that the most recent ChangeLog
+  entry *always* goes at the top of the file. More explanation below.
+  ***************************************************************************
+
+  ***************************************************************************
+  ANOTHER IMPORTANT NOTE: There are some ChangeLogs that don't follow this
+  format and organize all changes under the "correct" "*" entry. This is not
+  correct. However, rather than making a concerted effort to fix these
+  ChangeLogs, we should spend our energy defining a comprehensive and strict
+  XML-based ChangeLog format which we then migrate to. But for any entries to
+  any ChangeLog that *you* make, please make sure to always add entries to the
+  top of the file like a good boy/girl. Even do this if it's clear that you're
+  adding an entry to a b0rked ChangeLog.
+  ***************************************************************************
   
-  This means that you start with header line that has the following format :
+  This changelog is targeted to users. This means that the comments should be
+  well explained and written in clean English.
+ 
+  Every new version or revision of the package should be marked by a '*'
+  separator line as above to indicate where in the chronology it was first
+  added to our CVS tree. Any changes since the last revision, really _any
+  changes at all_ have to be added to the top of the file, underneath the
+  initial copyright and cvs header comments, in exactly the same format as this
+  comment. If you are modifying older ebuilds, simply note them as changed
+  files and add your entry to the top of the ChangeLog. Resist the temptation
+  to "organize" your ChangeLog entries by placing them under the "correct" "*"
+  entries -- this isn't the purpose of the "*" entries.
   
-      date; your_name <your_email> changed_file1, changed_file2 :
-	  
-  Below that line your explanation should follow. It has to be indented,
-  paragraphed and wrapped at a linewidth of 80 characters.
+  This means that you start with header line that has the following format,
+  indented two spaces:
   
-  Any details about what exactly changed in the code should be added as a
-  message when the changes are committed to cvs, not in this file.
+  DD MMM YYYY; your_name <your_email> changed_file1, changed_file2: Your
+  explanation should follow. It should be indented and wrapped at a line width
+  of 80 characters.  The changed_files can be omitted if they are obvious; for
+  example, if you are only modifying the .ebuild file and committing a new rev
+  of a package.  Any details about what exactly changed in the code should be
+  added as a message when the changes are committed to cvs, not in this file.
+
+-- A word regarding credit:
+
+  Please add credit information ("ebuild submitted by ...", "patch submitted
+  by ...") to the ChangeLog. Do not add this information to the ebuilds
+  themselves.
+
+  And remember: Give credit where credit is due. We're all doing this for
+  free, so the best we can hope (and expect!) to receive is credit.
diff --git a/skel.ebuild b/skel.ebuild
index 537cf0f429da..a9d82a2c48d4 100644
--- a/skel.ebuild
+++ b/skel.ebuild
@@ -1,28 +1,155 @@
-# 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$
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
 
-#P=
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION=""
-SRC_URI="ftp://"
-HOMEPAGE="http://"
+# NOTE: The comments in this file are for instruction and documentation.  
+# They're not meant to appear with your final, production ebuild.  Please
+# remember to remove them before submitting or committing your ebuild.  That
+# doesn't mean you can't add your own comments though.
 
+# The 'Header' on the third line should just be left alone.  When your ebuild
+# will be committed to cvs, the details on that line will be automatically
+# generated to contain the correct data.
 
-src_compile() {
+# inherit lists eclasses to inherit functions from. Almost all ebuilds should
+# inherit eutils, as a large amount of important functionality has been
+# moved there. For example, the $(get_libdir) mentioned below wont work
+# without the following line:
+inherit eutils
+# A well-used example of an eclass function that needs eutils is epatch. If
+# your source needs patches applied, it's suggested to put your patch in the
+# 'files' directory and use:
+#
+#   epatch ${FILESDIR}/patch-name-here
+#
+# eclasses tend to list descriptions of how to use their functions properly.
+# take a look at /usr/portage/eclasses/ for more examples.
 
-    cd ${S}
-    try ./configure --prefix=/usr --host=${CHOST}
-    try make
+# Short one-line description of this package.
+DESCRIPTION="This is a sample skeleton ebuild file"
 
-}
+# Homepage, not used by Portage directly but handy for developer reference
+HOMEPAGE="http://foo.bar.com/"
+
+# Point to any required sources; these will be automatically downloaded by
+# Portage.
+SRC_URI="ftp://foo.bar.com/${P}.tar.gz"
+
+# License of the package.  This must match the name of file(s) in
+# /usr/portage/licenses/.  For complex license combination see the developer
+# docs on gentoo.org for details.
+LICENSE=""
+
+# The SLOT variable is used to tell Portage if it's OK to keep multiple
+# versions of the same package installed at the same time.  For example,
+# if we have a libfoo-1.2.2 and libfoo-1.3.2 (which is not compatible
+# with 1.2.2), it would be optimal to instruct Portage to not remove
+# libfoo-1.2.2 if we decide to upgrade to libfoo-1.3.2.  To do this,
+# we specify SLOT="1.2" in libfoo-1.2.2 and SLOT="1.3" in libfoo-1.3.2.
+# emerge clean understands SLOTs, and will keep the most recent version
+# of each SLOT and remove everything else.
+# Note that normal applications should use SLOT="0" if possible, since
+# there should only be exactly one version installed at a time.
+# DO NOT USE SLOT=""! This tells Portage to disable SLOTs for this package.
+SLOT="0"
+
+# Using KEYWORDS, we can record masking information *inside* an ebuild
+# instead of relying on an external package.mask file.  Right now, you
+# should set the KEYWORDS variable for every ebuild so that it contains
+# the names of all the architectures with which the ebuild works.  All of
+# the official architectures can be found in the keywords.desc file which 
+# is in /usr/portage/profiles/.  Usually you should just set this to "~x86".  
+# The ~ in front of the architecture indicates that the package is new and 
+# should be considered unstable until testing proves its stability.  Once 
+# packages go stable the ~ prefix is removed.  So, if you've confirmed that 
+# your ebuild works on x86 and ppc, you'd specify: KEYWORDS="~x86 ~ppc"
+# For binary packages, use -* and then list the archs the bin package
+# exists for.  If the package was for an x86 binary package, then
+# KEYWORDS would be set like this: KEYWORDS="-* x86"
+# DO NOT USE KEYWORDS="*".  This is deprecated and only for backward
+# compatibility reasons.
+KEYWORDS="~x86"
+
+# Comprehensive list of any and all USE flags leveraged in the ebuild,
+# with the exception of any ARCH specific flags, i.e. "ppc", "sparc",
+# "x86" and "alpha".  This is a required variable.  If the ebuild doesn't 
+# use any USE flags, set to "".
+IUSE="X gnome"
 
-src_install () {
+# A space delimited list of portage features to restrict. man 5 ebuild
+# for details.  Usually not needed.
+#RESTRICT="nostrip"
 
-    cd ${S}
-    try make DESTDIR=${D} install
+# Build-time dependencies, such as
+#    ssl? ( >=dev-libs/openssl-0.9.6b )
+#    >=dev-lang/perl-5.6.1-r1
+# It is advisable to use the >= syntax show above, to reflect what you
+# had installed on your system when you tested the package.  Then
+# other users hopefully won't be caught without the right version of
+# a dependency.
+DEPEND=""
 
+# Run-time dependencies, same as DEPEND if RDEPEND isn't defined:
+#RDEPEND=""
+
+# Source directory; the dir where the sources can be found (automatically
+# unpacked) inside ${WORKDIR}.  The default value for S is ${WORKDIR}/${P}
+# If you don't need to change it, leave the S= line out of the ebuild
+# to keep it tidy.
+S=${WORKDIR}/${P}
+
+src_compile() {
+	# Most open-source packages use GNU autoconf for configuration.
+	# The quickest (and preferred) way of running configure is:
+	econf || die "econf failed"
+	#
+	# You could use something similar to the following lines to
+	# configure your package before compilation.  The "|| die" portion
+	# at the end will stop the build process if the command fails.
+	# You should use this at the end of critical commands in the build
+	# process.  (Hint: Most commands are critical, that is, the build
+	# process should abort if they aren't successful.)
+	#./configure \
+	#	--host=${CHOST} \
+	#	--prefix=/usr \
+	#	--infodir=/usr/share/info \
+	#	--mandir=/usr/share/man || die "./configure failed"
+	# Note the use of --infodir and --mandir, above. This is to make
+	# this package FHS 2.2-compliant.  For more information, see
+	#   http://www.pathname.com/fhs/
+
+	# emake (previously known as pmake) is a script that calls the
+	# standard GNU make with parallel building options for speedier
+	# builds (especially on SMP systems).  Try emake first.  It might
+	# not work for some packages, because some makefiles have bugs
+	# related to parallelism, in these cases, use emake -j1 to limit
+	# make to a single process.  The -j1 is a visual clue to others
+	# that the makefiles have bugs that have been worked around.
+	emake || die "emake failed"
 }
 
+src_install() {
+	# You must *personally verify* that this trick doesn't install
+	# anything outside of DESTDIR; do this by reading and
+	# understanding the install part of the Makefiles.
+	# This is the preferred way to install.
+	make DESTDIR=${D} install || die
+
+	# For Makefiles that don't make proper use of DESTDIR, setting
+	# prefix is often an alternative.  However if you do this, then
+	# you also need to specify mandir and infodir, since they were
+	# passed to ./configure as absolute paths (overriding the prefix
+	# setting).
+	#make \
+	#	prefix=${D}/usr \
+	#	mandir=${D}/usr/share/man \
+	#	infodir=${D}/usr/share/info \
+	#	libdir=${D}/usr/$(get_libdir) \
+	#	install || die
+	# Again, verify the Makefiles!  We don't want anything falling
+	# outside of ${D}.
+
+	# The portage shortcut to the above command is simply:
+	#
+	#einstall || die
+}
diff --git a/skel.metadata.xml b/skel.metadata.xml
index 1c65abc4a44c..9b148cad4968 100644
--- a/skel.metadata.xml
+++ b/skel.metadata.xml
@@ -8,7 +8,7 @@ number of subelements are allowed: herd, maintainer, and
 longdescription. herd is a required subelement.
 
 For a full description look at:
-http://www.gentoo.org/proj/en/metastructure/herds
+http://www.gentoo.org/proj/en/metastructure/herds/
 
 
 Before committing, please remove the comments from this file. They are 
@@ -18,7 +18,6 @@ not relevant for general metadata.xml files.
 <herd>no-herd</herd>
 <maintainer>
   <email>@gentoo.org</email>
-<!--  <name>Full name</name> -->
 <!--  <description>Description of the maintainership</description> -->
 </maintainer>
 <!-- <longdescription>Long description of the package</longdescription> -->
diff --git a/sys-libs/com_err/ChangeLog b/sys-libs/com_err/ChangeLog
index d2d93098ad9c..2c422ec932ba 100644
--- a/sys-libs/com_err/ChangeLog
+++ b/sys-libs/com_err/ChangeLog
@@ -1,6 +1,70 @@
 # ChangeLog for sys-libs/com_err
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/com_err/ChangeLog,v 1.1 2005/03/24 03:55:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/com_err/ChangeLog,v 1.1.1.1 2005/11/30 09:39:10 chriswhite Exp $
+
+  10 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> com_err-1.38.ebuild:
+  Move exporting of vars in src_compile() and src_install() to work around
+  portage env bug, similar to sys-fs/e2fsprogs-1.38.
+
+  08 Sep 2005; Aaron Walker <ka0ttic@gentoo.org> com_err-1.38.ebuild:
+  Stable on mips.
+
+  11 Aug 2005; Mike Frysinger <vapier@gentoo.org>
+  files/com_err-1.37-makefile.patch:
+  Clean up cross-compile support.
+
+  03 Aug 2005; Mike Frysinger <vapier@gentoo.org> com_err-1.38.ebuild:
+  Use bsd-shlibs on Darwin but elf-shlibs on all other systems #99728 by Kito.
+
+  25 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org> com_err-1.38.ebuild:
+  Stable on hppa.
+
+  20 Jul 2005; Markus Rothe <corsair@gentoo.org> com_err-1.38.ebuild:
+  Stable on ppc64
+
+  19 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> com_err-1.38.ebuild:
+  Stable on alpha.
+
+  15 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> com_err-1.38.ebuild:
+  Stable on sparc
+
+  14 Jul 2005; Seemant Kulleen <seemant@gentoo.org> com_err-1.38.ebuild:
+  bumping to stable, fixes bug #98303 by WGi <wgi@muenster.de>
+
+*com_err-1.38 (09 Jul 2005)
+
+  09 Jul 2005; Mike Frysinger <vapier@gentoo.org> +com_err-1.38.ebuild:
+  Version bump #98331 by Joshua.
+
+  29 Jun 2005; Joshua Kinard <kumba@gentoo.org> com_err-1.37.ebuild:
+  Marked stable on mips.
+
+  28 Jun 2005; Bryan Østergaard <kloeri@gentoo.org> com_err-1.37.ebuild:
+  Stable on alpha.
+
+  27 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> com_err-1.37.ebuild:
+  Stable on hppa.
+
+  27 Jun 2005; Seemant Kulleen <seemant@gentoo.org> com_err-1.37.ebuild:
+  stable x86 and amd64 because of bug 96727
+
+  26 Jun 2005; Markus Rothe <corsair@gentoo.org> com_err-1.37.ebuild:
+  Stable on ppc64 (bug #96156)
+
+  24 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> com_err-1.37.ebuild:
+  Stable on sparc wrt #96727
+
+  24 Jun 2005; Seemant Kulleen <seemant@gentoo.org> com_err-1.37.ebuild:
+  add postinst message about revdep-rebuild
+
+  22 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> com_err-1.37.ebuild:
+  Stable on ppc (#96727).
+
+  28 Apr 2005; Seemant Kulleen <seemant@gentoo.org> com_err-1.37.ebuild:
+  undo that
+
+  28 Apr 2005; Seemant Kulleen <seemant@gentoo.org> com_err-1.37.ebuild:
+  mask for all but fbsd on x86
 
 *com_err-1.37 (23 Mar 2005)
 
diff --git a/sys-libs/com_err/Manifest b/sys-libs/com_err/Manifest
index 8867fe3f183b..3282f84c299e 100644
--- a/sys-libs/com_err/Manifest
+++ b/sys-libs/com_err/Manifest
@@ -1,2 +1,18 @@
-MD5 e2d0bc25eb73e34e4b263fc928b949c8 com_err-1.37.ebuild 1581
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 eb1addf912efdc8c662b016fecee2cec ChangeLog 2583
+MD5 4aa5c4716912fb5fbf142b581f071b6a com_err-1.37.ebuild 1960
+MD5 3f4351e371467df0092e18827e289339 com_err-1.38.ebuild 2056
+MD5 7f1f3f4827354d52879671fc615fba03 files/com_err-1.37-makefile.patch 1318
+MD5 4a7d54ccac4002d10462c40660712a72 files/com_err-1.37-sed-locale.patch 2142
 MD5 65689a8be4c1b58f8e64f22165313292 files/digest-com_err-1.37 67
+MD5 0911aedd4968aa4053139791a961e2a2 files/digest-com_err-1.38 67
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDc7oUAiZjviIA2XgRAt97AJ9T1LupU2A+qbXW5PcsPIh90Ub5FwCffhwR
+VwD3PyaCLqZcGiLAVNuiwGQ=
+=MsG1
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/com_err/com_err-1.37.ebuild b/sys-libs/com_err/com_err-1.37.ebuild
index ee95e64731c2..ebe07239681a 100644
--- a/sys-libs/com_err/com_err-1.37.ebuild
+++ b/sys-libs/com_err/com_err-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/sys-libs/com_err/com_err-1.37.ebuild,v 1.1 2005/03/24 03:55:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/com_err/com_err-1.37.ebuild,v 1.1.1.1 2005/11/30 09:39:10 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -10,8 +10,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/e2fsprogs-${PV}.tar.gz"
 
 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="nls"
 
 RDEPEND=""
@@ -59,3 +58,15 @@ src_install() {
 	dolib.a lib/libcom_err.a || die "dolib.a"
 	gen_usr_ldscript libcom_err.so
 }
+
+pkg_postinst() {
+	echo
+	einfo "PLEASE PLEASE take note of this"
+	einfo "Please make *sure* to run revdep-rebuild now"
+	einfo "Certain things on your system may have linked against a"
+	einfo "different version of com_err -- those things need to be"
+	einfo "recompiled.  Sorry for the inconvenience"
+	echo
+	epause 10
+	ebeep
+}
diff --git a/sys-libs/com_err/com_err-1.38.ebuild b/sys-libs/com_err/com_err-1.38.ebuild
index 63a7679bf462..c6b74f781063 100644
--- a/sys-libs/com_err/com_err-1.38.ebuild
+++ b/sys-libs/com_err/com_err-1.38.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/com_err/com_err-1.38.ebuild,v 1.1 2005/07/09 22:37:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/com_err/com_err-1.38.ebuild,v 1.1.1.1 2005/11/30 09:39:10 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/e2fsprogs-${PV}.tar.gz"
 
 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="nls"
 
 RDEPEND=""
@@ -21,18 +21,22 @@ S=${WORKDIR}/e2fsprogs-${PV}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	# Clean up makefile to suck less
 	epatch "${FILESDIR}"/${PN}-1.37-makefile.patch
+}
 
-	# Keep the package from doing silly things
+src_compile() {
 	export LDCONFIG=/bin/true
 	export CC=$(tc-getCC)
 	export STRIP=/bin/true
-}
 
-src_compile() {
+	local libtype
+	case ${USERLAND} in
+		Darwin) libtype=bsd;;
+		*)      libtype=elf;;
+	esac
+	mkdir -p lib/{blkid,e2p,et,ext2fs,ss,uuid}/{checker,elfshared,pic,profiled} #102412
 	econf \
-		--enable-elf-shlibs \
+		--enable-${libtype}-shlibs \
 		--with-ldopts="${LDFLAGS}" \
 		$(use_enable nls) \
 		|| die
@@ -44,16 +48,22 @@ src_test() {
 }
 
 src_install() {
+	export LDCONFIG=/bin/true
+	export CC=$(tc-getCC)
+	export STRIP=/bin/true
+
 	make -C lib/et DESTDIR="${D}" install || die
 	dosed '/^ET_DIR=/s:=.*:=/usr/share/et:' /usr/bin/compile_et
 	dosym et/com_err.h /usr/include/com_err.h
 
-	# Move shared libraries to /lib/, install static libraries to /usr/lib/,
-	# and install linker scripts to /usr/lib/.
-	dodir /$(get_libdir)
-	mv "${D}"/usr/$(get_libdir)/*.so* "${D}"/$(get_libdir)/
 	dolib.a lib/libcom_err.a || die "dolib.a"
-	gen_usr_ldscript libcom_err.so
+	if [[ ${USERLAND} == "Darwin" ]] ; then
+		dosym /usr/$(get_libdir)/libcom_err.*.dylib /usr/$(get_libdir)/libcom_err.dylib || die
+	else
+		dodir /$(get_libdir)
+		mv "${D}"/usr/$(get_libdir)/*$(get_libname)* "${D}"/$(get_libdir)/ || die "move .so"
+		gen_usr_ldscript libcom_err.so
+	fi
 }
 
 pkg_postinst() {
diff --git a/sys-libs/com_err/files/com_err-1.37-makefile.patch b/sys-libs/com_err/files/com_err-1.37-makefile.patch
index f6322fea403d..b60ea5a37677 100644
--- a/sys-libs/com_err/files/com_err-1.37-makefile.patch
+++ b/sys-libs/com_err/files/com_err-1.37-makefile.patch
@@ -1,9 +1,47 @@
 Fix the symlinks that submakefiles create so that they don't suck at life.
 
---- e2fsprogs-1.37/lib/Makefile.elf-lib
-+++ e2fsprogs-1.37/lib/Makefile.elf-lib
+Don't use target LDFLAGS/CFLAGS when compiling native apps.
+
+--- lib/Makefile.elf-lib
++++ lib/Makefile.elf-lib
 @@ -49,3 +49,3 @@
  	@echo "	SYMLINK $(libdir)/$(ELF_IMAGE).so"
 -	@$(LN_S) -f $(ELF_INSTALL_DIR)/$(ELF_SONAME) \
 +	@$(LN_S) -f $(ELF_SONAME) \
  		$(DESTDIR)$(libdir)/$(ELF_IMAGE).so
+--- util/Makefile.in
++++ util/Makefile.in
+@@ -15,7 +15,7 @@
+ 
+ .c.o:
+ 	@echo "	CC $<"
+-	@$(BUILD_CC) -c $(ALL_CFLAGS) $< -o $@
++	@$(BUILD_CC) -c $(DEFS) $< -o $@
+ 
+ PROGS=		subst
+ 
+@@ -23,11 +23,11 @@
+ 
+ subst: subst.o
+ 	@echo "	LD $@"
+-	@$(BUILD_CC) $(ALL_LDFLAGS) -o subst subst.o
++	@$(BUILD_CC) -o subst subst.o
+ 
+ copy_sparse: copy_sparse.o
+ 	@echo "	LD $@"
+-	@$(BUILD_CC) $(ALL_LDFLAGS) -o copy_sparse copy_sparse.o
++	@$(BUILD_CC) -o copy_sparse copy_sparse.o
+ 
+ gen-tarball: $(srcdir)/gen-tarball.in $(top_builddir)/config.status
+ 	@echo "	CONFIG.STATUS $@"
+--- lib/Makefile.elf-lib
++++ lib/Makefile.elf-lib
+@@ -26,7 +26,7 @@
+ 
+ $(ELF_LIB): $(OBJS)
+ 	@echo "	GEN_ELF_SOLIB $(ELF_LIB)"
+-	@(cd elfshared; $(CC) --shared -o $(ELF_LIB) \
++	@(cd elfshared; $(CC) --shared -o $(ELF_LIB) $(LDFLAGS) \
+ 		-Wl,-soname,$(ELF_SONAME) $(OBJS) $(ELF_OTHER_LIBS))
+ 	@$(MV) elfshared/$(ELF_LIB) .
+ 	@$(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME)
diff --git a/sys-libs/cracklib/ChangeLog b/sys-libs/cracklib/ChangeLog
index f80093160ca7..db488976a2ea 100644
--- a/sys-libs/cracklib/ChangeLog
+++ b/sys-libs/cracklib/ChangeLog
@@ -1,11 +1,289 @@
 # ChangeLog for sys-libs/cracklib
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.1 2002/02/01 21:53:38 gbevin Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.1.1.1 2005/11/30 09:39:06 chriswhite Exp $
+
+*cracklib-2.8.5 (06 Oct 2005)
+
+  06 Oct 2005; Mike Frysinger <vapier@gentoo.org> +cracklib-2.8.5.ebuild:
+  Version bump.
+
+  09 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> cracklib-2.8.3-r1.ebuild:
+  Stable on mips.
+
+  19 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  cracklib-2.8.3-r1.ebuild:
+  Stable on alpha.
+
+  09 Jul 2005; Joseph Jezak <josejx@gentoo.org> cracklib-2.8.3-r1.ebuild:
+  Marked ppc stable.
+
+  08 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  cracklib-2.8.3-r1.ebuild:
+  Stable on hppa.
+
+  08 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  cracklib-2.8.3-r1.ebuild:
+  Stable on sparc
+
+  07 Jul 2005; Markus Rothe <corsair@gentoo.org> cracklib-2.8.3-r1.ebuild:
+  Stable on ppc64
+
+  06 Jul 2005; Danny van Dyk <kugelfang@gentoo.org>
+  cracklib-2.8.3-r1.ebuild:
+  Marked stable on amd64.
+
+*cracklib-2.8.3-r1 (16 Apr 2005)
+
+  16 Apr 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/cracklib-2.8.3-packer-defines.patch, +cracklib-2.8.3-r1.ebuild:
+  Grab update from upstream to fix building mod_php #85698.
+
+*cracklib-2.8.3 (12 Apr 2005)
+
+  12 Apr 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/cracklib-2.8.3-dictname.patch, +cracklib-2.8.3.ebuild:
+  Version bump to fix packer.h issues #85698.
+
+*cracklib-2.8.2 (18 Mar 2005)
+
+  18 Mar 2005; Mike Frysinger <vapier@gentoo.org> +cracklib-2.8.2.ebuild:
+  Version bump to fix security bug #85650.
+
+*cracklib-2.8.1 (16 Mar 2005)
+
+  16 Mar 2005; Mike Frysinger <vapier@gentoo.org>
+  -cracklib-2.8_pre1-r2.ebuild, +cracklib-2.8.1.ebuild:
+  Version bump.
+
+*cracklib-2.8_pre1-r2 (15 Mar 2005)
+
+  15 Mar 2005; Mike Frysinger <vapier@gentoo.org>
+  -cracklib-2.8_pre1-r1.ebuild, +cracklib-2.8_pre1-r2.ebuild:
+  Make sure we install packer.h #85289.
+
+*cracklib-2.8_pre1-r1 (01 Mar 2005)
+
+  01 Mar 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/cracklib-2.8_pre1-dictname.patch, +cracklib-2.8_pre1-r1.ebuild:
+  Make sure the cracklib dicts are generated.
+
+*cracklib-2.8_pre1 (11 Feb 2005)
+
+  11 Feb 2005; Mike Frysinger <vapier@gentoo.org> +cracklib-2.8_pre1.ebuild:
+  Version bump.
+
+  15 Dec 2004; Mike Frysinger <vapier@gentoo.org>
+  files/cracklib-2.7-libdir.patch, cracklib-2.7-r10.ebuild:
+  Make sure the dict files respect $(get_libdir) #74553.
+
+  07 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/cracklib-2.7-parallel-make.patch, cracklib-2.7-r10.ebuild:
+  make it so parallel make works; tidy
+
+  07 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  -cracklib-2.7-r7.ebuild, -cracklib-2.7-r8.ebuild, -cracklib-2.7-r9.ebuild:
+  clean older ebuilds
+
+  09 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
+  cracklib-2.7-r10.ebuild:
+  Stable on alpha.
+
+  08 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> cracklib-2.7-r10.ebuild:
+  Stable on sparc
+
+  08 Nov 2004; Robin H. Johnson <robbat2@gentoo.org> cracklib-2.7-r10.ebuild:
+  r10 stable on x86 for bug #69761.
+
+  01 Nov 2004; Joshua Kinard <kumba@gentoo.org> cracklib-2.7-r10.ebuild:
+  Marked stable on mips.
+
+  12 Oct 2004; Gustavo Zacarias <gustavoz@gentoo.org> cracklib-2.7-r9.ebuild:
+  Stable on sparc
+
+  30 Sep 2004; Simon Stelling <blubb@gentoo.org> cracklib-2.7-r9.ebuild:
+  get_libdir-ized
+
+  01 Sep 2004; Travis Tilley <lv@gentoo.org> +files/cracklib-2.7-libdir.patch,
+  cracklib-2.7-r10.ebuild:
+  added a patch that makes cracklib lib64/lib32 aware. marked stable on amd64
+
+  24 Aug 2004; Sven Wegener <swegener@gentoo.org> cracklib-2.7-r7.ebuild,
+  cracklib-2.7-r8.ebuild:
+  Added missing IUSE=""
+
+*cracklib-2.7-r10 (12 Aug 2004)
+
+  12 Aug 2004; Robin H. Johnson <robbat2@gentoo.org> +cracklib-2.7-r10.ebuild:
+  Fix bug #57984.
+
+  21 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> cracklib-2.7-r9.ebuild:
+  use emake - works fine; error check sed; tidy
+
+  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> cracklib-2.7-r9.ebuild:
+  stable on alpha and ia64
+
+  28 Jun 2004; Brandon Hale <tseng@gentoo.org> :
+  Stable on x86.
+
+  22 Jun 2004; <solar@gentoo.org> cracklib-2.7-r9.ebuild,
+  files/cracklib-2.7-gzip.patch:
+  Added pam & uclibc to IUSE. Removed executable bit from libcrack.a, if pam is
+  in not in USE we remove libcrack.a all together. Fixed long what appears to be
+  long standing bug with libcrack that nobody noticed (it was looking for the
+  words file at /usr/dict/words vs /usr/share/dict/words) If uclibc is set in
+  IUSE we use the compressed dict provided by miscfiles.
+
+  02 Jun 2004; Travis Tilley <lv@gentoo.org> cracklib-2.7-r9.ebuild:
+  stable on amd64
+
+  12 May 2004; Alexander Gabert <pappy@gentoo.org> cracklib-2.7-r7.ebuild,
+  cracklib-2.7-r8.ebuild:
+  cracklib apparently works with new SSP, removing hardened-gcc logic and
+  filter-flags fstackprot
+
+  26 Apr 2004; Michael McCabe <randy@gentoo.org> cracklib-2.7-r9.ebuild:
+  Stable on s390
+
+*cracklib-2.7-r9 (23 Apr 2004)
+
+  23 Apr 2004; Robin H. Johnson <robbat2@gentoo.org> cracklib-2.7-r9.ebuild:
+  bug #47482, libcrack.so should be in /lib as other stuff in the root fs is
+  linked against it.
+
+  09 Mar 2004; <agriffis@gentoo.org> cracklib-2.7-r8.ebuild:
+  stable on alpha and ia64
+
+  07 Mar 2004; Joshua Kinard <kumba@gentoo.org> cracklib-2.7-r8.ebuild:
+  Marked stable on mips.
+
+  09 Feb 2004; <gustavoz@gentoo.org> cracklib-2.7-r8.ebuild:
+  stable on sparc
+
+  09 Feb 2004; Guy Martin <gmsoft@gentoo.org> cracklib-2.7-r8.ebuild:
+  Marked stable on hppa.
+
+  06 Feb 2004; Martin Schlemmer <azarah@gentoo.org> cracklib-2.7-r8.ebuild:
+  Bump to stable for x86 (needed by pam).
+
+  03 Feb 2004; Bartosch Pixa <darkspecter@gentoo.org> cracklib-2.7-r8.ebuild:
+  set ppc in keywords
+
+  28 Dec 2003; Joshua Kinard <kumba@gentoo.org> cracklib-2.7-r7.ebuild:
+  Move to mips stable (~mips -> mips)
+
+  21 Dec 2003; Brad House <brad_mssw@gentoo.org> cracklib-2.7-r8.ebuild:
+  mark stable on amd64
+
+*cracklib-2.7-r8 (10 Nov 2003)
+
+  10 Nov 2003; Martin Schlemmer <azarah@gentoo.org> cracklib-2.7-r8.ebuild,
+  files/cracklib-2.7-static-lib.patch:
+  Add support to build static lib, needed for new version of pam.
+
+  26 Sep 2003; Robin H. Johnson <robbat2@gentoo.org> cracklib-2.7-r7.ebuild:
+  inherit eutil for older portages
+
+  17 Sep 2003; Jon Portnoy <avenj@gentoo.org> cracklib-2.7-r7.ebuild :
+  ia64 keywords.
+
+  08 Sep 2003; Alexander Gabert <pappy@gentoo.org> cracklib-2.7-r7.ebuild:
+  bug 28132 take out libgcc_s.so for gcc2.95
+
+  09 Aug 2003; Alexander Gabert <pappy@gentoo.org> cracklib-2.7-r7.ebuild:
+  adding propolice bugfix dependency only for gcc
+
+  09 Aug 2003; Alexander Gabert <pappy@gentoo.org> cracklib-2.7-r7.ebuild:
+  removed filterflags for propolice, added libgcc for proper propolice symbol
+  __guard to be linked in by ld
+
+  24 Jun 2003; Aron Griffis <agriffis@gentoo.org> cracklib-2.7-r7.ebuild:
+  Mark stable on alpha
+
+  09 Jun 2003; Luca Barbato <joker@gentoo.org> cracklib-2.7-r7.ebuild:
+  Added ppc stable keyword
+
+  08 Jun 2003; Christian Birchinger <joker@gentoo.org> cracklib-2.7-r7.ebuild:
+  Added sparc stable keyword
+
+*cracklib-2.7-r7 (12 May 2003)
+
+  14 Jum 2003; Guy Martin <gmsoft@gentoo.org> cracklib-2.7-r7.ebuild :
+  Added hppa to KEYWORDS.
+
+  05 June 2003; Robin Johnson <robbat@gentoo.org> cracklib-2.7-r7.ebuild:
+  No complaints heard about ~x86. Moving to stable x86.
+  
+  24 May 2003; Tavis Ormandy <taviso@gentoo.org> cracklib-2.7-r6.ebuild,
+  cracklib-2.7-r7.ebuild, files/cracklib-2.7-dec-alpha-compiler.diff:
+  dont use -g with ccc, use -g3
+ 
+  22 May 2003; Robin Johnson <robbat@gentoo.org> cracklib-2.7-r7.ebuild:
+  Moved to ~x86. Ensure gcc-config in DEPEND.
+
+  14 May 2003; Robin Johnson <robbat@gentoo.org> 
+  files/cracklib-2.7-gentoo-new.diff:
+  Modified patch to put in '$(CC)' instead of 'cc' to ensure correct compile.
+
+  12 May 2003; Robin Johnson <robbat@gentoo.org> cracklib-2.7-r7.ebuild:
+  Version bump to get the original packer.h bug (#12441) gaurenteed to be
+  resolved for the rollout of the new PHP eclass. I also noticed that packer.h
+  is installed with incorrect permissions in some cases with sandboxes, so I
+  use fperms 644 on it.  In unstable only presently waiting for QA approval.
+
+*cracklib-2.7-r6 (25 Oct 2002)
+
+  05 Apr 2003; Matthew Rickard <frogger@gentoo.org> cracklib-2.7-r6.ebuild:
+  Filter the -fstack-protector flag since this causes build failure.
+
+  29 Mar 2003; Seemant Kulleen <seemant@gentoo.org> cracklib-2.7-r6.ebuild:
+  HOMEPAGE fix by Frantz Dhin <tragedy_rm@hotmail.com> in bug #18299
+
+  20 Feb 2003; Zach Welch <zwelch@gentoo.org> cracklib-2.7-r6.ebuild :
+  Added arm to keywords.
+
+  10 Feb 2003; Seemant Kulleen <seemant@gentoo.org> :
+
+  removed old ebuilds, removed the no-longer-used precompiled dicts,
+  removed an unused patch; using epatch from eutils instead.
+
+  09 Feb 2003; Guy Martin <gmsoft@gentoo.org> cracklib-2.7-r6.ebuild :
+  Added hppa to keywords.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : 
+  changed sparc ~sparc keywords
+ 
+  31 Jan 2003; Ryan Phillips <rphillips@gentoo.org> :
+  Install packer.h into /usr/include
+  
+  18 Jan 2003; Jan Seidel <tuxus@gentoo.org>
+  Added mips to keywords
+
+  25 Oct 2002; Nick Hadaway <raker@gentoo.org> cracklib-2.7-r6.ebuild,
+  files/digest-cracklib-2.7-r6 :
+  Added missing symlink  from libcrack.so.2 -> /usr/lib/libcrack.so.2.7
+  See bug #9611.
+
+*cracklib-2.7-r5 (03 May 2002)
+
+  15 Jul 2002; Mark Guertin <gerk@gentoo.org>
+  Added ppc to keywords
+
+  03 May 2002; pvdabeel <pvdabeel@gentoo.org> :
+  stop using precompiled dict files, use DEPEND=miscfiles instead
+
+*cracklib-2.7-r4 (20 Apr 2002)
+
+  20 Apr 2002; M.Thibaut <murphy@gentoo.org> :
+  Add /usr/lib/cracklib_dict.* for sparc platforms.
+
+*cracklib-2.7-r3 (18 Mar 2002)
+
+  18 Mar 2002; M.Schlemmer <azarah@gentoo.org> :
+  Add /usr/lib/cracklib_dict.* for pam/shadow cracklib support.
 
 *cracklib-2.7-r2 (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/sys-libs/cracklib/Manifest b/sys-libs/cracklib/Manifest
index 813d4d428a87..ac0a9e42535f 100644
--- a/sys-libs/cracklib/Manifest
+++ b/sys-libs/cracklib/Manifest
@@ -1,7 +1,29 @@
-MD5 a45e0b68e759c8746c53c39e583e6db2 cracklib-2.7-r7.ebuild 1185
-MD5 6146a4de3649142fb03902194c0b6776 cracklib-2.7-r6.ebuild 1178
-MD5 1dc8ab5cae61da4c661134bc188a5c32 ChangeLog 2588
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 230af206aef44d7a3e40e7ba7a34c812 ChangeLog 10300
+MD5 f396f31efaeff34334e13c893b633c5b cracklib-2.7-r11.ebuild 2865
+MD5 6bb9f556ff62935bc596599f9a9b6802 cracklib-2.8.3-r1.ebuild 1538
+MD5 a5e5fdd35c8a1cbd13724a755b0a3da1 cracklib-2.8.5.ebuild 1451
+MD5 8a109d0d79bed1fb528d2f7c2e0bdbc0 files/cracklib-2.7-buffer-packer.patch 602
+MD5 efb1b540d35f2929768dcb3dcf723fee files/cracklib-2.7-cross-compile.patch 492
+MD5 85783b83e5bfa51190033895cfaf803e files/cracklib-2.7-dec-alpha-compiler.diff 333
+MD5 57ed4f94412bd475a0774c8e0db99712 files/cracklib-2.7-gentoo-new.diff 4235
+MD5 336ab4f8ce8e3a3955ec8722d32076b4 files/cracklib-2.7-gzip.patch 521
+MD5 ee8b4f377188b6bb5001fc6e8b81e614 files/cracklib-2.7-libdir.patch 1211
+MD5 e9edfa4c3852810514a42e43e4f66b4e files/cracklib-2.7-parallel-make.patch 1066
 MD5 954e8e0d53c6f878366e472a90917356 files/cracklib-2.7-redhat.patch 1224
-MD5 a5ad08dab289908e24f7657e31a69733 files/cracklib-2.7-gentoo-new.diff 4229
-MD5 f27fad03a3939b6e405193b419b645a4 files/digest-cracklib-2.7-r6 63
-MD5 f27fad03a3939b6e405193b419b645a4 files/digest-cracklib-2.7-r7 63
+MD5 69aa6844bbf39d86cde364729ca9f9dd files/cracklib-2.7-static-lib.patch 1328
+MD5 f078a8fa2074250986d685cac2b0b271 files/cracklib-2.8.3-dictname.patch 528
+MD5 6b7b4e9536a1420eed242b648d5a7aa7 files/cracklib-2.8.3-packer-defines.patch 891
+MD5 f27fad03a3939b6e405193b419b645a4 files/digest-cracklib-2.7-r11 63
+MD5 e00f36f63e3879e2da10580921e484b6 files/digest-cracklib-2.8.3-r1 66
+MD5 44e1c89acbadcbd16e795bb6b7cce486 files/digest-cracklib-2.8.5 66
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDTvfSgIKl8Uu19MoRAo7wAJ4xajuEQRDZNr8SKX6dZ+DDago/ygCePfPP
+AIb/oOhpQ1BO1jknigFGnQY=
+=9cH6
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/cracklib/cracklib-2.7-r11.ebuild b/sys-libs/cracklib/cracklib-2.7-r11.ebuild
index 723af21ae52a..be225eb297d2 100644
--- a/sys-libs/cracklib/cracklib-2.7-r11.ebuild
+++ b/sys-libs/cracklib/cracklib-2.7-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/sys-libs/cracklib/cracklib-2.7-r11.ebuild,v 1.1 2005/03/18 00:08:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.7-r11.ebuild,v 1.1.1.1 2005/11/30 09:39:06 chriswhite Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.crypticide.org/users/alecm/security/${MY_P}.tar.gz"
 
 LICENSE="CRACKLIB"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE="pam minimal"
 
 RDEPEND="sys-apps/miscfiles"
diff --git a/sys-libs/cracklib/cracklib-2.8.3-r1.ebuild b/sys-libs/cracklib/cracklib-2.8.3-r1.ebuild
index c3ba24a651e9..392bfad7821c 100644
--- a/sys-libs/cracklib/cracklib-2.8.3-r1.ebuild
+++ b/sys-libs/cracklib/cracklib-2.8.3-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/sys-libs/cracklib/cracklib-2.8.3-r1.ebuild,v 1.1 2005/04/16 05:41:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.8.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:39:06 chriswhite Exp $
 
-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs multilib
 
 MY_P=${P/_}
 DESCRIPTION="Password Checking Library"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/cracklib/${MY_P}.tar.gz"
 
 LICENSE="CRACKLIB"
 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=""
@@ -23,6 +23,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/cracklib-2.8.3-dictname.patch
 	epatch "${FILESDIR}"/cracklib-2.8.3-packer-defines.patch
+	epunt_cxx
 }
 
 src_compile() {
@@ -42,6 +43,7 @@ src_install() {
 	mv "${D}"/usr/$(get_libdir)/*.so* "${D}"/$(get_libdir)/ || die "could not move shared"
 	gen_usr_ldscript libcrack.so
 
+	echo -n "Generating cracklib dicts ... "
 	insinto /usr/share/dict
 	doins dicts/cracklib-small || die "word dict"
 	tc-is-cross-compiler \
diff --git a/sys-libs/cracklib/cracklib-2.8.5.ebuild b/sys-libs/cracklib/cracklib-2.8.5.ebuild
index 30056b676556..7011a8a34b18 100644
--- a/sys-libs/cracklib/cracklib-2.8.5.ebuild
+++ b/sys-libs/cracklib/cracklib-2.8.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/sys-libs/cracklib/cracklib-2.8.5.ebuild,v 1.1 2005/10/06 22:53:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.8.5.ebuild,v 1.1.1.1 2005/11/30 09:39:07 chriswhite Exp $
 
 inherit eutils toolchain-funcs multilib
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/cracklib/${MY_P}.tar.gz"
 LICENSE="CRACKLIB"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="python"
+IUSE="nls python"
 
 DEPEND=""
 
@@ -26,7 +26,10 @@ src_unpack() {
 }
 
 src_compile() {
-	econf $(use_with python) || die
+	econf \
+		$(use_enable nls) \
+		$(use_with python) \
+		|| die
 	emake || die
 }
 
@@ -34,9 +37,6 @@ src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 	rm -r "${D}"/usr/share/cracklib
 
-	insinto /usr/include
-	doins lib/packer.h || die "doins packer.h"
-
 	# move shared libs to /
 	dodir /$(get_libdir)
 	mv "${D}"/usr/$(get_libdir)/*.so* "${D}"/$(get_libdir)/ || die "could not move shared"
diff --git a/sys-libs/cracklib/files/cracklib-2.7-cross-compile.patch b/sys-libs/cracklib/files/cracklib-2.7-cross-compile.patch
index 86af22dbaf71..bfea0a5affba 100644
--- a/sys-libs/cracklib/files/cracklib-2.7-cross-compile.patch
+++ b/sys-libs/cracklib/files/cracklib-2.7-cross-compile.patch
@@ -5,5 +5,5 @@
  	$(MAKE) -C util install
  	@echo 'if "sort" dies from lack of space, see "util/mkdict"'
 -	util/mkdict $(SRCDICTS) | LD_LIBRARY_PATH=cracklib util/packer $(DESTDIR)$(DICTPATH)
-+	PATH="${PATH}:./util" mkdict $(SRCDICTS) | LD_LIBRARY_PATH=cracklib packer $(DESTDIR)$(DICTPATH)
++	PATH="${PATH}:./util" mkdict $(SRCDICTS) | PATH="${PATH}:./util" LD_LIBRARY_PATH=cracklib packer $(DESTDIR)$(DICTPATH)
  	touch installed
diff --git a/sys-libs/cracklib/files/cracklib-2.7-gentoo-new.diff b/sys-libs/cracklib/files/cracklib-2.7-gentoo-new.diff
index faff0ce990e3..b296b5ce48fa 100644
--- a/sys-libs/cracklib/files/cracklib-2.7-gentoo-new.diff
+++ b/sys-libs/cracklib/files/cracklib-2.7-gentoo-new.diff
@@ -39,7 +39,7 @@ diff -N -r -U3 cracklib,2.7.orig/Makefile cracklib,2.7/Makefile
 diff -N -r -U3 cracklib,2.7.orig/cracklib/Makefile cracklib,2.7/cracklib/Makefile
 --- cracklib,2.7.orig/cracklib/Makefile	Sun Dec 14 23:49:21 1997
 +++ cracklib,2.7/cracklib/Makefile	Tue Feb 27 16:03:39 2001
-@@ -6,13 +6,21 @@
+@@ -6,13 +6,20 @@
  # and upwards.
  ###
  
@@ -49,7 +49,6 @@ diff -N -r -U3 cracklib,2.7.orig/cracklib/Makefile cracklib,2.7/cracklib/Makefil
 +LIB	= libcrack.so
 +OBJ	= fascist.o packlib.o rules.o stringlib.o
 +CFLAGS += -g -I../cracklib -DIN_CRACKLIB -fPIC
-+LD	= ld
  
 -$(LIB):	$(OBJ)
 -	ar rv $(LIB) $?
@@ -86,23 +85,23 @@ diff -N -r -U3 cracklib,2.7.orig/util/Makefile cracklib,2.7/util/Makefile
  
  packer: packer.o $(LIBS)
 -	cc $(CFLAGS) -o $@ $@.o $(LIBS)
-+	cc $(CFLAGS) -o $@ $@.o $(LDFLAGS)
++	$(CC) $(CFLAGS) -o $@ $@.o $(LDFLAGS)
  
  unpacker: unpacker.o $(LIBS)
 -	cc $(CFLAGS) -o $@ $@.o $(LIBS)
-+	cc $(CFLAGS) -o $@ $@.o $(LDFLAGS)
++	$(CC) $(CFLAGS) -o $@ $@.o $(LDFLAGS)
  
  testnum: testnum.o $(LIBS)
 -	cc $(CFLAGS) -o $@ $@.o $(LIBS)
-+	cc $(CFLAGS) -o $@ $@.o $(LDFLAGS)
++	$(CC) $(CFLAGS) -o $@ $@.o $(LDFLAGS)
  
  teststr: teststr.o $(LIBS)
 -	cc $(CFLAGS) -o $@ $@.o $(LIBS)
-+	cc $(CFLAGS) -o $@ $@.o $(LDFLAGS)
++	$(CC) $(CFLAGS) -o $@ $@.o $(LDFLAGS)
  
  testlib: testlib.o $(LIBS)
 -	cc $(CFLAGS) -o $@ $@.o $(LIBS)
-+	cc $(CFLAGS) -o $@ $@.o $(LDFLAGS)
++	$(CC) $(CFLAGS) -o $@ $@.o $(LDFLAGS)
  
  clean:
  	-rm *.o *~ all
diff --git a/sys-libs/cracklib/files/cracklib-2.7-libdir.patch b/sys-libs/cracklib/files/cracklib-2.7-libdir.patch
index d0b80365692c..4cd47449a111 100644
--- a/sys-libs/cracklib/files/cracklib-2.7-libdir.patch
+++ b/sys-libs/cracklib/files/cracklib-2.7-libdir.patch
@@ -13,3 +13,20 @@ diff -Nru cracklib,2.7.old/cracklib/Makefile cracklib,2.7/cracklib/Makefile
 +	ln -sf $(LIB).so.$(VERSION) $(DESTDIR)/$(LIBDIR)/$(LIB).so
 +	install -m 755 $(LIB).a $(DESTDIR)/$(LIBDIR)
  	install -m 644 crack.h $(DESTDIR)/usr/include
+--- cracklib,2.7.old/Makefile	2004-12-15 21:06:24.890087088 -0500
++++ cracklib,2.7/Makefile	2004-12-15 21:07:21.674454552 -0500
+@@ -14,9 +14,13 @@
+ export MAJOR MINOR VERSION
+ 
++###
++# Where do we stick libraries
++LIBDIR=/usr/lib
++
+ ###
+ # set this to the absolute path (less extn) of compressed dict.
+ 
+-DICTPATH="/usr/lib/cracklib_dict"
++DICTPATH="$(LIBDIR)/cracklib_dict"
+ 
+ ###
+ # Set this to the path of one or more files continaing wordlists.
diff --git a/sys-libs/cracklib/files/cracklib-2.7-redhat.patch b/sys-libs/cracklib/files/cracklib-2.7-redhat.patch
index 7720c485dc91..415df9d16ae5 100644
--- a/sys-libs/cracklib/files/cracklib-2.7-redhat.patch
+++ b/sys-libs/cracklib/files/cracklib-2.7-redhat.patch
@@ -26,37 +26,6 @@
  
      for (i = 0; r_destructors[i]; i++)
      {
---- cracklib,2.7/cracklib/Makefile.rh	Sun Dec 14 17:49:21 1997
-+++ cracklib,2.7/cracklib/Makefile	Tue Mar 10 18:54:11 1998
-@@ -6,13 +6,21 @@
- # and upwards.
- ###
- 
--LIB=	libcrack.a
--OBJ=	fascist.o packlib.o rules.o stringlib.o
--CFLAGS= -O -I../cracklib -DIN_CRACKLIB
-+LIB	= libcrack.so
-+OBJ	= fascist.o packlib.o rules.o stringlib.o
-+CFLAGS	= $(RPM_OPT_FLAGS) -g -I../cracklib -DIN_CRACKLIB -fPIC
-+LD	= ld
- 
--$(LIB):	$(OBJ)
--	ar rv $(LIB) $?
--	-ranlib $(LIB)
-+$(LIB):	$(OBJ) Makefile
-+	$(LD) -shared -soname $(LIB).$(MAJOR) -o $(LIB).$(VERSION) $(OBJ) -lc
-+	rm -f $(LIB).$(MAJOR) $(LIB)
-+	ln -s $(LIB).$(VERSION) $(LIB).$(MAJOR)
-+	ln -s $(LIB).$(MAJOR) $(LIB)
- 
- clean:
--	-rm -f $(OBJ) $(LIB) *~
-+	-rm -f $(OBJ) $(LIB) $(LIB).$(VERSION) *~
-+
-+install: $(LIB) crack.h
-+	install -m 755 $(LIB).$(VERSION) $(ROOT)/usr/lib
-+	ln -sf $(LIB).$(VERSION) $(ROOT)/usr/lib/$(LIB)
-+	install -m 644 crack.h $(ROOT)/usr/include
 --- cracklib,2.7/cracklib/crack.h.rh	Tue Mar 10 18:17:43 1998
 +++ cracklib,2.7/cracklib/crack.h	Tue Mar 10 18:17:43 1998
 @@ -0,0 +1,15 @@
@@ -75,99 +44,3 @@
 +extern char *FascistCheck(char *pw, char *dictpath);
 +
 +#endif
---- cracklib,2.7/util/Makefile.rh	Sun Dec 14 17:49:34 1997
-+++ cracklib,2.7/util/Makefile	Tue Mar 10 18:17:43 1998
-@@ -14,27 +14,31 @@
- #SunOS users (and others?) should consider static linking of their passwd binary
- #CFLAGS= -O -I../cracklib '-DCRACKLIB_DICTPATH="$(DICTPATH)"' -Bstatic
- 
--CFLAGS= -O -I../cracklib '-DCRACKLIB_DICTPATH="$(DICTPATH)"'
--LIBS=	../cracklib/libcrack.a
-+CFLAGS	= $(RPM_OPT_FLAGS) -I../cracklib '-DCRACKLIB_DICTPATH="$(DICTPATH)"'
-+LDFLAGS	= -L../cracklib -lcrack
-+LIBS	= ../cracklib/libcrack.so
- 
- all:	packer unpacker testnum teststr testlib
- 	touch all
- 
- packer: packer.o $(LIBS)
--	cc $(CFLAGS) -o $@ $@.o $(LIBS)
-+	cc $(CFLAGS) -o $@ $@.o $(LDFLAGS)
- 
- unpacker: unpacker.o $(LIBS)
--	cc $(CFLAGS) -o $@ $@.o $(LIBS)
-+	cc $(CFLAGS) -o $@ $@.o $(LDFLAGS)
- 
- testnum: testnum.o $(LIBS)
--	cc $(CFLAGS) -o $@ $@.o $(LIBS)
-+	cc $(CFLAGS) -o $@ $@.o $(LDFLAGS)
- 
- teststr: teststr.o $(LIBS)
--	cc $(CFLAGS) -o $@ $@.o $(LIBS)
-+	cc $(CFLAGS) -o $@ $@.o $(LDFLAGS)
- 
- testlib: testlib.o $(LIBS)
--	cc $(CFLAGS) -o $@ $@.o $(LIBS)
-+	cc $(CFLAGS) -o $@ $@.o $(LDFLAGS)
- 
- clean:
- 	-rm *.o *~ all
- 	-rm teststr testnum testlib packer unpacker
-+
-+install: all create-cracklib-dict
-+	install -m 755 mkdict packer create-cracklib-dict $(ROOT)/usr/sbin
---- cracklib,2.7/util/create-cracklib-dict.rh	Tue Mar 10 18:17:43 1998
-+++ cracklib,2.7/util/create-cracklib-dict	Tue Mar 10 18:17:43 1998
-@@ -0,0 +1,15 @@
-+#!/bin/sh
-+if [ -z "$*" ]; then
-+    echo "Usage:"
-+    echo "  /usr/sbin/create-cracklib-dict wordlist ..."
-+    echo
-+    echo "This script takes one or more word list files as arguments"
-+    echo "and converts them into cracklib dictionaries for use"
-+    echo "by password checking programs. The results are placed in"
-+    echo "/usr/lib/cracklib_dict.*"
-+    echo
-+    echo "Example:"
-+    echo "/usr/sbin/create-cracklib-dict /usr/dict/words"
-+else
-+    /usr/sbin/mkdict $* | /usr/sbin/packer /usr/lib/cracklib_dict
-+fi
---- cracklib,2.7/Makefile.rh	Wed Dec 31 05:33:53 1997
-+++ cracklib,2.7/Makefile	Tue Mar 10 18:52:47 1998
-@@ -7,14 +7,21 @@
- ###
- 
- ###
-+# cracklib version
-+MAJOR=2
-+MINOR=7
-+VERSION=$(MAJOR).$(MINOR)
-+export MAJOR MINOR VERSION
-+
-+###
- # set this to the absolute path (less extn) of compressed dict.
- 
--DICTPATH="/usr/local/lib/pw_dict"
-+DICTPATH="/usr/lib/cracklib_dict"
- 
- ###
- # Set this to the path of one or more files continaing wordlists.
- 
--SRCDICTS=/usr/dict/words
-+SRCDICTS=/usr/dict/words /usr/dict/extra.words
- 
- ###
- # If you have installed the cracklib-dicts directory, use this
-@@ -36,7 +43,9 @@
- 	-rm -f all installed Part* *.BAK *.bak *~
- 
- install: all
-+	( cd cracklib && make install && exit $$? )
-+	( cd util && make install && exit $$? )
- 	@echo 'if "sort" dies from lack of space, see "util/mkdict"'
--	util/mkdict $(SRCDICTS) | util/packer $(DICTPATH)
-+	util/mkdict $(SRCDICTS) | LD_LIBRARY_PATH=cracklib util/packer $(ROOT)$(DICTPATH)
- 	touch installed
- ###	@echo 'now go install passwd/passwd where you want it'
diff --git a/sys-libs/cracklib/files/cracklib-2.7-static-lib.patch b/sys-libs/cracklib/files/cracklib-2.7-static-lib.patch
index 6ee6a7677167..d693029154e9 100644
--- a/sys-libs/cracklib/files/cracklib-2.7-static-lib.patch
+++ b/sys-libs/cracklib/files/cracklib-2.7-static-lib.patch
@@ -1,6 +1,6 @@
 --- cracklib-2.7/cracklib/Makefile	2003-11-09 23:01:29.405532640 +0200
 +++ cracklib-2.7.static/cracklib/Makefile	2003-11-09 23:17:57.983245984 +0200
-@@ -6,21 +6,28 @@
+@@ -6,20 +6,26 @@
  # and upwards.
  ###
  
@@ -8,8 +8,6 @@
 +LIB	= libcrack
  OBJ	= fascist.o packlib.o rules.o stringlib.o
  CFLAGS += -g -I../cracklib -DIN_CRACKLIB -fPIC
- LD	= ld
-+AR	= ar
  
 -$(LIB):	$(OBJ) Makefile
 -	$(LD) -shared -soname $(LIB).$(MAJOR) -o $(LIB).$(VERSION) $(OBJ) -lc
diff --git a/sys-libs/cracklib/metadata.xml b/sys-libs/cracklib/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-libs/cracklib/metadata.xml
+++ b/sys-libs/cracklib/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/sys-libs/csu/ChangeLog b/sys-libs/csu/ChangeLog
index e7b2d39d54ea..29525aa0e921 100644
--- a/sys-libs/csu/ChangeLog
+++ b/sys-libs/csu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/csu
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/csu/ChangeLog,v 1.1 2004/11/15 06:39:41 kito Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/csu/ChangeLog,v 1.1.1.1 2005/11/30 09:39:04 chriswhite Exp $
+
+*csu-57 (19 May 2005)
+
+  19 May 2005; Kito <kito@gentoo.org> +csu-57.ebuild:
+  version bump. Go ferral tabbey!
 
 *csu-46 (15 Nov 2004)
 
diff --git a/sys-libs/csu/Manifest b/sys-libs/csu/Manifest
index de9e8652a099..86a330946fa6 100644
--- a/sys-libs/csu/Manifest
+++ b/sys-libs/csu/Manifest
@@ -1,2 +1,6 @@
-MD5 6f010c8c52f099c520dd8fc358d67724 csu-46.ebuild 554
+MD5 7a108a7607cacf7f72759e512162a356 ChangeLog 420
+MD5 ae361f55c8b2cb0a361d4169b2272b09 csu-46.ebuild 655
+MD5 a009a44b222eeb4ee429e8275859d89d csu-57.ebuild 655
+MD5 e526e84277cb8eb1bcf73840117ff45a metadata.xml 220
 MD5 0ef879ca4c02ec64054ce84a4e45c872 files/digest-csu-46 57
+MD5 032d5ceef77264cdf63d0f952ececa4b files/digest-csu-57 57
diff --git a/sys-libs/csu/csu-46.ebuild b/sys-libs/csu/csu-46.ebuild
index 383a49a4a37d..fa074a6f6483 100644
--- a/sys-libs/csu/csu-46.ebuild
+++ b/sys-libs/csu/csu-46.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/sys-libs/csu/csu-46.ebuild,v 1.1 2004/11/15 06:39:41 kito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/csu/csu-46.ebuild,v 1.1.1.1 2005/11/30 09:39:04 chriswhite Exp $
 
 DESCRIPTION="Darwin Csu"
 HOMEPAGE="http://darwinsource.opendarwin.org/"
diff --git a/sys-libs/csu/csu-57.ebuild b/sys-libs/csu/csu-57.ebuild
index 8a8ee5a765d7..7e2579eb8707 100644
--- a/sys-libs/csu/csu-57.ebuild
+++ b/sys-libs/csu/csu-57.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/csu/csu-57.ebuild,v 1.1 2005/05/19 21:20:36 kito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/csu/csu-57.ebuild,v 1.1.1.1 2005/11/30 09:39:04 chriswhite Exp $
 
 DESCRIPTION="Darwin Csu"
 HOMEPAGE="http://darwinsource.opendarwin.org/"
diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 36a9805797ef..219844b6dea6 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,568 @@
 # ChangeLog for sys-libs/db
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.1 2002/02/01 21:53:38 gbevin Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.1.1.1 2005/11/30 09:39:14 chriswhite Exp $
+
+*db-1.85-r3 (08 Nov 2005)
+
+  08 Nov 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/db-1.85-gentoo-paths.patch, +db-1.85-r3.ebuild:
+  Further cleanup the patch from Redhat, add a SONAME fix for alpha #48616,
+  and tweak how we build/install.
+
+  23 Aug 2005; Aron Griffis <agriffis@gentoo.org> db-4.2.52_p2.ebuild:
+  stable on ia64
+
+  07 Aug 2005; Kito <kito@gentoo.org> db-4.2.52_p2.ebuild:
+  ~ppc-macos
+
+  03 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> db-1.85-r2.ebuild,
+  db-4.0.14-r3.ebuild:
+  Stable on sparc
+
+  03 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> db-3.2.9-r10.ebuild:
+  Stable on sparc #86985
+
+  19 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> db-4.2.52_p2.ebuild:
+  Stable on alpha.
+
+  17 Jul 2005; Hardave Riar <hardave@gentoo.org> db-4.2.52_p2.ebuild:
+  Keyworded ~mips
+
+  10 Jul 2005; Sven Wegener <swegener@gentoo.org> db-4.0.14-r2.ebuild,
+  db-4.0.14-r3.ebuild, db-4.1.25_p1-r3.ebuild, db-4.1.25_p1-r4.ebuild,
+  db-4.2.52_p1.ebuild, db-4.2.52_p2.ebuild, db-4.3.27.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.
+
+  02 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> db-4.2.52_p2.ebuild:
+  Add ~alpha keyword.
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> db-4.2.52_p2.ebuild:
+  Stable on ppc.
+
+  15 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> db-4.2.52_p2.ebuild:
+  Stable on sparc
+
+  06 Jun 2005; Marcus D. Hanwell <marcus@gentoo.org> db-4.2.52_p2.ebuild:
+  Stable on amd64.
+
+  06 Jun 2005; Markus Rothe <corsair@gentoo.org> db-4.2.52_p2.ebuild:
+  Stable on ppc64
+
+  04 Jun 2005; Guy Martin <gmsoft@gentoo.org> db-4.2.52_p2.ebuild:
+  Stable on hppa.
+
+  02 Jun 2005; <pauldv@gentoo.org> db-4.2.52_p2.ebuild, db-4.3.27.ebuild:
+  Fix bug #94692, that is caused by use of gcc --version together with a 
+  crappy version detection script. Use a sed script to change the use of 
+  gcc --version to gcc -dumpversion
+
+  29 May 2005; Paul de Vrieze <pauldv@gentoo.org> db-4.2.52_p2.ebuild:
+  Mark 4.2 stable.
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org> db-4.1.25_p1-r4.ebuild:
+  Stable on ppc64
+
+  29 Mar 2005; Markus Rothe <corsair@gentoo.org> db-4.2.52_p2.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+*db-4.3.27 (29 Mar 2005)
+
+  29 Mar 2005; <pauldv@gentoo.org> +files/db-4.3-jarlocation.patch,
+  +files/db-4.3-libtool.patch, +files/db-4.3.27-fix-dep-link.patch,
+  db-3.2.9-r10.ebuild, +db-4.3.27.ebuild:
+  Fix silly cd error
+
+  28 Mar 2005; Jason Wever <weeve@gentoo.org> db-3.2.9-r10.ebuild:
+  Marked as ~sparc because this ebuild is brand new, improperly marked stable,
+  and the patch is broken. :(
+
+  27 Mar 2005; Paul de Vrieze <pauldv@gentoo.org>
+  +files/db-3.2.9-java15.patch, db-3.2.9-r10.ebuild:
+  Add a java 1.5 patch from bug #84770. Also bump all architectures that were 
+  not stable on this ebuild. It has not changed much since months and the 
+  instable keywords were added a very long time ago.
+
+  19 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> db-1.85-r2.ebuild:
+  Stable on alpha.
+
+  19 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> db-4.1.25_p1-r4.ebuild:
+  Stable on alpha.
+
+*db-4.3.27 (02 Feb 2005)
+
+  02 Feb 2005; <pauldv@gentoo.org> +files/db-4.3-jarlocation.patch,
+  +files/db-4.3-libtool.patch, +files/db-4.3.27-fix-dep-link.patch,
+  +db-4.3.27.ebuild:
+  A new upstream version. The patches are updated to apply again.
+
+  30 Jan 2005; Paul de Vrieze <pauldv@gentoo.org> db-1.85-r1.ebuild,
+  db-1.85-r2.ebuild, db-3.2.9-r10.ebuild, db-3.2.9-r7.ebuild,
+  db-4.0.14-r2.ebuild, db-4.0.14-r3.ebuild, db-4.1.25_p1-r3.ebuild,
+  db-4.1.25_p1-r4.ebuild, db-4.2.52_p1.ebuild, db-4.2.52_p2.ebuild:
+  The upstream download location changed. Fixed it.
+
+  19 Jan 2005; Joshua Kinard <kumba@gentoo.org> db-4.1.25_p1-r4.ebuild:
+  Marked stable on mips.
+
+  13 Jan 2005; Mike Frysinger <vapier@gentoo.org> db-4.1.25_p1-r4.ebuild,
+  db-4.2.52_p2.ebuild:
+  Clean up USE=uclibc and USE=nocxx usage.
+
+  16 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> db-1.85-r1.ebuild,
+  db-1.85-r2.ebuild, db-3.2.9-r10.ebuild, db-3.2.9-r7.ebuild,
+  db-4.0.14-r2.ebuild, db-4.0.14-r3.ebuild, db-4.1.25_p1-r3.ebuild,
+  db-4.1.25_p1-r4.ebuild, db-4.2.52_p1.ebuild, db-4.2.52_p2.ebuild:
+  get_libdir support for multilib archs.
+
+  14 Dec 2004; Dylan Carlson <absinthe@gentoo.org> db-4.1.25_p1-r4.ebuild:
+  Stable on amd64.
+
+  13 Dec 2004; Mike Frysinger <vapier@gentoo.org> db-1.85-r2.ebuild:
+  Update patch to be cross-compile friendly.
+
+  08 Dec 2004; Simon Stelling <blubb@gentoo.org>
+  +files/db-4.2-libtool.patch, db-4.2.52_p2.ebuild:
+  added Andy Lutomirski's patch and marked ~amd64, see bug #57654
+
+  01 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org> db-4.1.25_p1-r4.ebuild:
+  Stable on sparc
+
+  30 Nov 2004; Paul de Vrieze <pauldv@gentoo.org>
+  +files/db-4.1.25-java.patch, db-4.0.14-r2.ebuild, db-4.0.14-r3.ebuild,
+  db-4.1.25_p1-r3.ebuild, db-4.1.25_p1-r4.ebuild:
+  Fix compilation with 1.5 jdk's by renaming some enum local variable
+
+  30 Nov 2004; Paul de Vrieze <pauldv@gentoo.org> db-4.1.25_p1-r4.ebuild:
+  Stabilize on x86
+
+  01 Oct 2004; Simon Stelling <blubb@gentoo.org> db-4.1.25_p1-r3.ebuild,
+  db-4.1.25_p1-r4.ebuild, db-4.2.52_p2.ebuild:
+  get_libdir-ized
+
+  27 Sep 2004; <pauldv@gentoo.org> db-3.2.9-r10.ebuild, db-3.2.9-r7.ebuild:
+  Fix bug #65291 and mark the -r10 release testing on amd64.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  db-3.2.9-r10.ebuild, db-4.0.14-r2.ebuild:
+  Masked db-4.0.14-r2.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  db-3.2.9-r10.ebuild:
+  Masked db-3.2.9-r10.ebuild stable for ppc
+
+  03 Sep 2004; Caleb Tennis <caleb@gentoo.org> -db-3.3.11.ebuild:
+  Removing package.masked version
+
+  02 Sep 2004; Robin H. Johnson <robbat2@gentoo.org> :
+  fix missing digest bug #62562.
+
+*db-1.85-r2 (01 Sep 2004)
+
+  01 Sep 2004; Robin H. Johnson <robbat2@gentoo.org> +db-1.85-r2.ebuild:
+  Clean up old db-1.8.5 build to not for omit-frame-pointer, and grab it's patch
+  from DISTDIR.
+
+  01 Sep 2004; Robin H. Johnson <robbat2@gentoo.org> db-4.1.25_p1-r3.ebuild,
+  db-4.1.25_p1-r4.ebuild, db-4.2.52_p1.ebuild, db-4.2.52_p2.ebuild:
+  Ebuild cleanup to use epatch and not abuse sed.
+
+  23 Aug 2004; <pauldv@gentoo.org> db-3.3.11.ebuild:
+  Add IUSE
+
+  23 Aug 2004; <pauldv@gentoo.org> db-3.2.9-r10.ebuild, -db-3.2.9-r9.ebuild:
+  Clean out the -r9 release
+
+  11 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org> db-3.2.9-r10.ebuild:
+  gnuconfig_update in src_unpack
+
+  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> db-1.85-r1.ebuild,
+  db-3.2.9-r10.ebuild, db-3.2.9-r7.ebuild, db-3.2.9-r9.ebuild,
+  db-3.3.11.ebuild:
+  virtual/glibc -> virtual/libc
+
+  25 Jun 2004; <solar@gentoo.org> db-4.1.25_p1-r4.ebuild:
+  uclibc update
+
+*db-4.1.25_p1-r4 (19 Jun 2004)
+
+  19 Jun 2004; <solar@gentoo.org> db-4.1.25_p1-r4.ebuild,
+  files/db-4.1.25-uclibc.patch:
+  added IUSE=uclibc support for building portage with uclibc support
+
+  06 May 2004; Ferris McCormick <fmccor@gentoo.org> db-4.2.52_p2.ebuild:
+  Add ~sparc keyword at user request (bug 50272)
+
+  26 Apr 2004; Jason Wever <weeve@gentoo.org> db-4.1.25_p1-r3.ebuild:
+  Fixed sparc keyword problem, sorry folks :(
+
+  24 Apr 2004; Tom Gall <tgall@gentoo.org> db-3.2.9-r10.ebuild, 
+  db-4.2.52_p2.ebuild:
+  fix to update config for ppc64 in db-3.2.9-r10.ebuild and
+  db-4.2.52_p2.ebuild marked stable for ppc64
+
+  22 Apr 2004; Travis Tilley <lv@gentoo.org> db-4.1.25_p1-r3.ebuild:
+  added fix for bug #48558
+
+*db-4.2.52_p2 (15 Apr 2004)
+
+  15 Apr 2004; Paul de Vrieze <pauldv@gentoo.org> db-4.2.52_p2.ebuild:
+  New patch version
+
+  21 Mar 2004; Joshua Kinard <kumba@gentoo.org> db-4.1.25_p1-r3.ebuild:
+  Tweak to make gnuconfig work again for mips (the 'dist' dir got moved from
+  'build_unix' to one level up)
+
+  07 Mar 2004; Joshua Kinard <kumba@gentoo.org> db-4.1.25_p1-r3.ebuild:
+  Marked stable on mips.
+
+  18 Feb 2004; David Holm <dholm@gentoo.org> db-4.2.52_p1.ebuild:
+  Added to ~ppc.
+
+  09 Feb 2004; <gustavoz@gentoo.org> db-4.1.25_p1-r3.ebuild:
+  stable on sparc
+
+  06 Feb 2004; Martin Schlemmer <azarah@gentoo.org> db-4.1.25_p1-r3.ebuild:
+  Bump to stable for x86 (needed by pam-0.77).
+
+  10 Feb 2004; Paul de Vrieze <pauldv@gentoo.org> db-4.0.14-r3.ebuild,
+  db-4.1.25_p1-r3.ebuild, db-4.2.52_p1.ebuild:
+  Change the runtime dependency to a java runtime environment only
+
+  22 Jan 2004; Luca Barbato <lu_zero@gentoo.org> db-4.0.14-r3.ebuild:
+  Marked ppc
+
+  19 Jan 2004; Guy Martin <gmsoft@gentoo.org> db-4.0.14-r2.ebuild,
+  db-4.1.25_p1-r3.ebuild:
+  Marked stable on hppa.
+
+  16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> db-4.1.25_p1-r3.ebuild:
+  set ppc in keywords
+
+  28 Dec 2003; Joshua Kinard <kumba@gentoo.org> db-4.0.14-r2.ebuild:
+  Move to mips stable (~mips -> mips)
+
+*db-4.2.52_p1 (22 Dec 2003)
+
+  22 Dec 2003; <paul@gentoo.org> db-4.2.52_p1.ebuild,
+  files/db-4.2-jarlocation.patch:
+  New upstream version. It is for now still masked for testing. There should be
+  no problems though.
+
+  21 Dec 2003; Brad House <brad_mssw@gentoo.org> db-4.1.25_p1-r3.ebuild:
+  mark stable on amd64
+
+  20 Dec 2003; <paul@gentoo.org> db-3.2.9-r2.ebuild, db-3.2.9-r6.ebuild,
+  db-3.2.9-r8.ebuild, db-4.0.14-r1.ebuild, db-4.0.14.ebuild, db-4.1.25.ebuild,
+  db-4.1.25_p1-r1.ebuild, db-4.1.25_p1-r2.ebuild, db-4.1.25_p1.ebuild:
+  Remove old versions. Clean things up
+
+  20 Dec 2003; <paul@gentoo.org> db-4.1.25_p1-r3.ebuild:
+  A gnuconfig update for mips. The patch comes from kumba@gentoo.org
+
+  15 Dec 2003; Joshua Kinard <kumba@gentoo.org> db-4.1.25_p1-r3.ebuild:
+  Added ~mips to keywords
+
+*db-4.1.25_p1-r3 (14 Dec 2003)
+
+  20 Dec 2003; Guy Martin <gmsoft@gentoo.org> db-4.1.25_p1-r3.ebuild :
+  Added ~hppa to KEYWORDS.
+
+  14 Dec 2003; Jason Wever <weeve@gentoo.org> db-4.1.25_p1-r3.ebuild:
+  Added sparc64 fix and and ~sparc keyword.
+
+  06 Nov 2003; Paul de Vrieze <pauldv@gentoo.org> db-4.0.14-r3.ebuild:
+  Add the fix for the ibm jdk
+
+  02 Nov 2003; <paul@gentoo.org> :
+  Include the fix from db-4.0.14-r1 for the pthread library.
+
+  31 Oct 2003; Luca Barbato <lu_zero@gentoo.org> db-4.1.25_p1-r2.ebuild:
+  Marked ~ppc
+
+  26 Oct 2003; Brad House <brad_mssw@gentoo.org> db-4.1.25_p1-r2.ebuild:
+  add amd64 flag
+
+  23 Oct 2003; Paul de Vrieze <pauldv@gentoo.org> db-4.0.14.ebuild,
+  db-4.1.25_p1-r2.ebuild:
+  Fix sandbox problems related to ibm jdk wanting to write to /proc/self/maps
+
+*db-4.1.25_p1-r2 (18 Oct 2003)
+*db-4.0.14-r3 (18 Oct 2003)
+*db-3.2.9-r10 (18 Oct 2003)
+
+  18 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> db-3.2.9-r10.ebuild,
+  db-4.0.14-r3.ebuild, db-4.1.25_p1-r2.ebuild,
+  files/db-3.2.9-jarlocation.patch, files/db-4.0.14-jarlocation.patch,
+  files/db-4.1.25_p1-jarlocation.patch:
+  new revision of db-3 and db-4.[01] packages adding patch to avoid db.jar
+  overwriting, adds java support to db-3.2.9-r10, and rpc support in db-4.[01]
+
+  15 Oct 2003; Brad House <brad_mssw@gentoo.org> db-1.85-r1.ebuild,
+  db-3.2.9-r7.ebuild:
+  add amd64 flags to db-1.85-r1, and move db-3.2.9-r7 to stable
+
+  14 Oct 2003; Aron Griffis <agriffis@gentoo.org> db-4.1.25_p1-r1.ebuild:
+  Add ~alpha
+
+  12 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> db-4.1.25_p1-r1.ebuild:
+  bump to ~x86
+
+  10 Oct 2003; Alexander Gabert <pappy@gentoo.org> db-3.2.9-r7.ebuild,
+  db-3.2.9-r9.ebuild, db-4.0.14-r2.ebuild:
+  removed hardened-gcc comment fields
+
+  09 Oct 2003; Alexander Gabert <pappy@gentoo.org> db-4.0.14-r2.ebuild:
+  commented out hardened-gcc flags
+
+  04 Oct 2003; Brad House <brad_mssw@gentoo.org> db-4.0.14-r2.ebuild,
+  db-4.1.25.ebuild, db-4.1.25_p1-r1.ebuild, db-4.1.25_p1.ebuild:
+  db-4.1.25 is not very palatable for many apps, and at this point causes many
+  problems. Not sure why amd64 was set to stable with this. The only other
+  platform that was also is ia64. Remove the stable flag, don't even turn on the
+  ~amd64 flag as it causes too many problems. Make 4.0.14-r2 the stable
+  4.0 series.
+
+  02 Oct 2003; Brad House <brad_mssw@gentoo.org> db-3.2.9-r7.ebuild:
+  add ~amd64 flag
+
+  01 Oct 2003; Jason Wever <weeve@gentoo.org> db-4.0.14-r2.ebuild:
+  Added sparc keyword, fixed bug #28328.
+
+  01 Oct 2003; Aron Griffis <agriffis@gentoo.org> db-4.0.14-r2.ebuild:
+  Stable on alpha
+
+  01 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> db-3.2.9-r9.ebuild:
+  bump db-3.2.9-r9 to stable on x86
+
+*db-3.2.9-r6 (23 Sep 2003)
+
+  23 Sep 2003; Bartosch Pixa <darkspecter@gentoo.org> db-3.2.9-r6.ebuild:
+  set ppc in keywords
+
+  20 Sep 2003; Alexander Gabert <pappy@gentoo.org> db-4.0.14-r2.ebuild:
+  added configure logic for hardened-gcc
+
+  13 Sep 2003; Robin H. Johnson <robbat2@gentoo.org> db-4.0.14-r2.ebuild:
+  added Kumba's changes for mips
+
+  08 Sep 2003; Alexander Gabert <pappy@gentoo.org> db-3.2.9-r7.ebuild,
+  db-3.2.9-r9.ebuild, db-4.0.14-r2.ebuild:
+  changed hardened-gcc, db works now with etdyn
+
+  08 Sep 2003; Robin H. Johnson <robbat2@gentoo.org> db-4.0.14-r2.ebuild:
+  mark db-4.0 as stable on x86, and put it into testing on all other arches
+
+  07 Sep 2003; Alexander Gabert <pappy@gentoo.org> db-3.2.9-r7.ebuild,
+  db-3.2.9-r9.ebuild, db-4.0.14-r2.ebuild:
+  added hardened-gcc changes to CC
+
+*db-3.2.9-r9 (02 Sep 2003)
+
+  02 Sep 2003; Robin H. Johnson <robbat2@gentoo.org> db-3.2.9-r9.ebuild:
+  add some more symlink stuff to db_fix_so in the eclass, and remove the old
+  broken leftover parts from ebuild
+
+*db-4.1.25_p1-r1 (21 Aug 2003)
+*db-4.0.14-r2 (21 Aug 2003)
+
+  21 Aug 2003; Robin H. Johnson <robbat2@gentoo.org> db-3.2.9-r8.ebuild,
+  db-4.0.14-r2.ebuild, db-4.1.25_p1-r1.ebuild:
+  crucial fix to all ebuilds db-3 or newer for bad symlinks in /usr/lib and
+  /usr/include, code is now in db.eclass
+
+*db-3.2.9-r7 (17 Aug 2003)
+
+  17 Aug 2003; Paul de Vrieze <pauldv@gentoo.org> db-3.2.3h-r4.ebuild,
+  db-3.2.9-r1.ebuild, db-3.2.9-r5.ebuild, db-3.2.9-r7.ebuild, db-3.2.9.ebuild:
+  New stable version with support for db-4 and that actually installs the static
+  libraries
+
+*db-4.0.14-r1 (16 Aug 2003)
+
+  16 Aug 2003; Martin Schlemmer <azarah@gentoo.org> db-4.0.14-r1.ebuild,
+  files/db-4.0.14-fix-dep-link.patch:
+  Get db to link libdb* to correct dependencies ... for example if we use
+  NPTL or NGPT, db detects usable mutexes, and should link against
+  libpthread, but does not do so ...
+
+*db-4.1.25_p1 (05 Aug 2003)
+
+  05 Aug 2003; Paul de Vrieze <pauldv@gentoo.org> db-4.1.25_p1.ebuild:
+  Make a version that applies the upstream patches
+
+  01 Aug 2003; Paul de Vrieze <pauldv@gentoo.org> db-4.0.14.ebuild,
+  db-4.1.24.ebuild, db-4.1.25.ebuild:
+  Make sure that db-4.1 is in a different slot as db-4, and that there are no
+  duplicates. db-4 is still masked though
+
+  01 Aug 2003; Paul de Vrieze <pauldv@gentoo.org> db-4.0.14.ebuild:
+  Mark db-4.0.14 as testing. There probably still will be some minor problems,
+  but these can be better handled when the package is testing. Some of the
+  dependent packages do not really like versioned symbols. We do need to use
+  them though to be able to run multiple versions in parallel and so providing
+  an update path
+
+  03 Jul 2003; Paul de Vrieze <pauldv@gentoo.org> db-4.1.25.ebuild:
+  Allow db-4.0 and db-4.1 to be both installed, by putting db-4.1 in a different
+  slot and by renaming the binaries to db41_??? instead of db4_???
+
+  01 Jul 2003; Todd Sunderlin <todd@gentoo.org> db-3.2.9-r5.ebuild:
+  set stable on sparc
+
+  26 Jun 2003; Paul de Vrieze <pauldv@gentoo.org> db-4.0.14.ebuild,
+  db-4.1.24.ebuild, db-4.1.25.ebuild:
+  Make sure that latest db.h gets linked to /usr/include/db.h. Also add
+  db_185.h link to /usr/include
+
+  22 Jun 2003; Paul de Vrieze <pauldv@gentoo.org> db-3.2.9-r5.ebuild,
+  db-4.0.14.ebuild, db-4.1.24.ebuild, db-4.1.25.ebuild:
+  Fix java compilation problem
+
+  19 Jun 2003; Paul de Vrieze <pauldv@gentoo.org> db-3.2.9-r5.ebuild:
+  Make db-3.2.9-r5 respect CFLAGS, by hacking the configure script (#22415)
+
+  07 Jun 2003; Paul de Vrieze <pauldv@gentoo.org> db-3.2.9-r5.ebuild,
+  db-4.0.14.ebuild, db-4.1.24.ebuild, db-4.1.25.ebuild:
+  Fix the autosymlinking script to work in a cross environment. Courtessy of
+  Alastair Tse <liquidx@gentoo.org>, bug #22393.
+
+*db-4.1.25 (30 May 2003)
+
+  30 May 2003; Paul de Vrieze <pauldv@gentoo.org> db-4.1.25.ebuild:
+  Add new upstream version db-4.1.25.
+
+  28 May 2003; Grant Goodyear <g2boojum@gentoo.org> db-4.0.14.ebuild:
+  Changed goofy "-x86" mask to "~x86" masks, since the package
+  is still hard-masked in package.mask.  (This way those of us
+  trying to test this package can use package.unmask!)
+
+  28 May 2003; Paul de Vrieze <pauldv@gentoo.org> db-3.2.9-r5.ebuild:
+  Masking db-3.2.9-r5 as testing. This should be stable. The only changes are
+  the renaming of all tools from db_<bla> to db3_<bla>
+
+  25 May 2003; Paul de Vrieze <pauldv@gentoo.org> db-3.2.9-r5.ebuild,
+  db-4.0.14.ebuild, db-4.1.24.ebuild:
+  Fix a problem with the auto header linking script. It is not necessary toe
+  locally, but in that case you need to do ln -s db4/db.h /usr/include/db.h
+
+  25 May 2003; Paul de Vrieze <pauldv@gentoo.org> db-4.0.14.ebuild,
+  db-4.1.24.ebuild:
+  Make java work with db-4{0,1}
+
+*db-3.2.9-r5 (24 May 2003)
+
+  24 May 2003; Paul de Vrieze <pauldv@gentoo.org> db-3.2.9-r5.ebuild,
+  db-4.0.14.ebuild, db-4.1.24.ebuild:
+  The db4 ebuilds have now been changed to live alongside the db3 ebuilds. Also
+  the db-3.2.9-r5 ebuild is created to go along with the db-4 ebuilds. This
+  ebuild is more gentle to the db4 ebuild, but upgrading this is not that
+  necessary.
+
+  19 May 2003; Zach Welch <zwelch@gentoo.org> db-3.2.9-r2.ebuild:
+  Mark all platforms stable in 3.2.9-r2 KEYWORDS
+
+  06 May 2003; Paul de Vrieze <pauldv@gentoo.org> db-4.0.14.ebuild,
+  db-4.1.24.ebuild:
+  Change db-4.* ebuilds to build with versioned (unique) symbols, to allow for
+  parallel db versions to be installed and used
+
+*db-3.2.9-r2 (23 Feb 2003)
+
+  11 Mar 2003; Zach Welch <zwelch@gentoo.org> db-3.2.9-r2.ebuild:
+  mark stable on arm
+
+  01 Mar 2003; Brandon Low <lostlogic@gentoo.org> db-3.2.9-r1.ebuild,
+  db-3.2.9-r2.ebuild, db-4.1.24.ebuild:
+  Fix for userpriv and make -> emake changes
+
+  24 Feb 2003; Brandon Low <lostlogic@gentoo.org> db-3.2.9-r2.ebuild :
+  Fix for userpriv mode
+
+  23 Feb 2003; Martin Schlemmer <azarah@gentoo.org> :
+  Fix build to link libdb*.so to dependency libs .. for instance when building
+  with NPTL we need to link to libpthread.
+  Fix the db185 stuff to not have to hack the build to pieces to build.
+  We should compile shared and static libs in two diff build dirs ...
+
+  20 Feb 2003; Zach Welch <zwelch@gentoo.org> db-1.85-r1.ebuild , db-3.2.9-r1.ebuild :
+  Added arm to keywords.
+
+  07 Feb 2003; Guy Martin <gmsoft@gentoo.org> db-1.85-r1.ebuild , db-3.2.9-r1.ebuild :
+  Added hppa to keywords.
+
+*db-1.85-r1.ebuild , db-3.2.9-r1.ebuild (13 Dec 2002)
+
+  13 Dec 2002; Jan Seidel <tuxus@gentoo.org> db-1.85-r1.ebuild , db-3.2.9-r1.ebuild :
+  Added mips to keywords.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*db-3.3.11 (16 Nov 2002)
+
+  16 Nov 2002; Seemant Kulleen <seemant@gentoo.org> db-3.3.11.ebuild :
+
+  Made this install similar to db-3.2.9 which should make this version more
+  usable. Still masked. Closes bug #9900 by l_calamandrei@neri-group.com
+  (Lapo Calamandrei)
+
+*db-4.1.24 (08 Oct 2002)
+
+  14 Nov 2002; Seemant Kulleen <seemant@gentoo.org> db-4.1.24.ebuild :
+
+  Removed posixmutexes option as it is rarely needed on linux systems and it
+  kills the config.  Closes bug #10678 by jani@iv.ro
+
+  23 Oct 2002; Mark Guertin <gerk@gentoo.org> db-4.1.24.ebuild :
+  set -ppc in keywords, not working on ppc, investigating further.
+  (some pthreads problems it seems)
+
+  21 Oct 2002; Seemant Kulleen <seemant@gentoo.org> db-4.1.24.ebuild :
+
+  changed configure statement to add a few features (like db-1.8.5
+  compatibility).
+
+  08 Oct 2002; Ryan Phillips <rphillips@gentoo.org> :
+
+  version bump.. has new crypto support
+
+*db-3.2.9-r1 (28 Jul 2002)
+
+  22 Oct 2002; Seemant Kulleen <seemant@gentoo.org> : db-3.2.9-r1.ebuild :
+
+  Update SRC_URI.  Thanks to: zinzarin@ameritech.net (Rob Riemersma) in bug
+  #9493.
+
+  28 Jul 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Update to get it working with gcc-3.2 (remove config.guess), as well
+  as cleanups.
+
+*db-3.2.9 (25 Jul 2002)
+  25 Jul 2002; Spider <spider@gentoo.org> :
+  Add a fix to remove -fno-exceptions in CXXFLAGS as it doesnt build then
+  
+*db-4.0.14 (30 Jan 2002)
+
+*db-1.85-r2 (8 May 2002)
+
+  15 Jul 2002; Mark Guertin <gerk@gentoo.org>
+  Added ppc to keywords
+
+  1 Feb 2002; José Alberto Suárez López <bass@gentoo.org> Changelog db-1.85-r1.ebuild :
+
+  Fixed an error with the source url.
+
+*db-3.2.3h-r4 (21 Mar 2002)
+
+  15 Jul 2002; Mark Guertin <gerk@gentoo.org>
+  Added ppc to keywords
+
+  21 Mar 2002; Seemant Kulleen <seemant@gentoo.org> db-3.2.3h-r4.ebuild :
+
+  HTML documentation will no longer get gzipped -- but too small a change
+  to warrant having the users remerge this.  Thanks so stefan@mdy.univie.ac.at 
+  for the bug.
 
 *db-3.2.3h-r4 (1 Feb 2002)
 
@@ -11,3 +573,5 @@
   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.
+
+*db-1.85-r1 (07 Feb 2001)
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 026c9d2fb112..04cd9db22b93 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -1,21 +1,53 @@
-MD5 30b06b5a91133bc0e62848e79fdb286f ChangeLog 3967
-MD5 4e148693b2d6fe0b1e66a8724cbfc20c db-1.85-r1.ebuild 1411
-MD5 744542679cd64194e3ac9e84e5f7056e db-3.2.3h-r4.ebuild 2455
-MD5 4be311009c1216a911e76dcf33bb568d db-3.2.9-r1.ebuild 2587
-MD5 af7ea3ee5a3a001d516413c0b9bc52e5 db-3.2.9.ebuild 2464
-MD5 2dd3cac46936c5510bf2133977ff5a48 db-3.3.11.ebuild 2408
-MD5 eb2e29920f412e5c5ba2b0a53bcd4c74 db-4.0.14.ebuild 1146
-MD5 fc15a052b6467edb14fad676ccc96c0b db-4.1.24.ebuild 1122
-MD5 1b3b0c7a504feb36454486dea504bdaa db-3.2.9-r2.ebuild 3221
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1a523236426073bc2819265261173ea8 ChangeLog 21618
+MD5 15e26e1303761aa1b814d1d46f930d74 db-1.85-r1.ebuild 1435
+MD5 a0435de0fd1dacc747f315502eda91bc db-1.85-r2.ebuild 1467
+MD5 acf165d206ae3e99d4a903ab7f3f5086 db-1.85-r3.ebuild 1209
+MD5 73ccb0c04661223f8a54651fa23d1a5c db-3.2.9-r10.ebuild 4299
+MD5 3095611cc9de038f5dab190381574a17 db-3.2.9-r7.ebuild 4416
+MD5 6f9b8f054235426e239efa7ad5269ab3 db-4.0.14-r2.ebuild 2227
+MD5 b3cb97191214b2260603ee79ee1cc8e0 db-4.0.14-r3.ebuild 2480
+MD5 08193a44b9ff7ab8193fd7874bca288e db-4.1.25_p1-r3.ebuild 2550
+MD5 2b53b92447c5f06991103d07b2443168 db-4.1.25_p1-r4.ebuild 2706
+MD5 3316d306f09820f7daaeed2a6b179eef db-4.2.52_p1.ebuild 2836
+MD5 fa0e2188b8f14d47bc85775d74115c76 db-4.2.52_p2.ebuild 2958
+MD5 74f280853789512d578b7cb488c28733 db-4.3.27.ebuild 2917
+MD5 86aca9a49a082dc56e4103ec8112f344 files/db-1.85-gentoo-paths.patch 684
+MD5 194200b3295b95b46b4564980af27f1f files/db-3.2.9-fix-dep-link.patch 1005
+MD5 6eb8be5f7803acaa5bcfd4ed5ffabf83 files/db-3.2.9-jarlocation.patch 492
+MD5 fa494e61698001c02f2b6a192acfaf99 files/db-3.2.9-java15.patch 598
+MD5 eb9b0f2c1d8440c6c49fc1d916c2dc0e files/db-4.0.14-fix-dep-link.patch 1119
+MD5 0101200dac8a9299fc1578081ac72b71 files/db-4.0.14-jarlocation.patch 565
+MD5 395933484399c22681916b0e86db3258 files/db-4.1.25-java.patch 721
+MD5 75ba5de97737693cfdfe85908b5adfbd files/db-4.1.25-uclibc.patch 731
+MD5 2bb2a5dbe8d16f858d177e1193639b70 files/db-4.1.25_p1-jarlocation.patch 626
+MD5 3c47ce6ed92e948fbde232c1e3571f16 files/db-4.2-jarlocation.patch 599
+MD5 4f68188f3bc051f50a85c5b72bab85c7 files/db-4.2-libtool.patch 665
+MD5 b1df069d8d9a974fe864e681dc165cfc files/db-4.3-jarlocation.patch 599
+MD5 fee87f3b3eb96ac9a15f44aa5ff1c08c files/db-4.3-libtool.patch 2161
+MD5 72688c24d0217c7e214b816417d8ef97 files/db-4.3.27-fix-dep-link.patch 1179
 MD5 ecd81fa9868ec49c61306444144d44a9 files/db.1.85.patch 55584
 MD5 3057fcc117c33a02bd4c092586a58e49 files/digest-db-1.85-r1 59
-MD5 355b01acef6125096cee653bdf4c32fc files/digest-db-3.2.3h-r4 62
-MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9 61
-MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r1 61
-MD5 214b855f6996d3dca754f6606beff672 files/digest-db-3.3.11 62
-MD5 068fc523df1ee6f36b5de8516ab7739f files/digest-db-4.0.14 62
-MD5 c42106477e8a2d626da71270d1e56609 files/digest-db-4.1.24 62
+MD5 69bde9765bf0a2d6c55a253eb0e53190 files/digest-db-1.85-r2 120
+MD5 964290ad12dc08fdbaa640a38faff81e files/digest-db-1.85-r3 123
+MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r10 61
+MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r7 61
+MD5 068fc523df1ee6f36b5de8516ab7739f files/digest-db-4.0.14-r2 62
+MD5 068fc523df1ee6f36b5de8516ab7739f files/digest-db-4.0.14-r3 62
+MD5 f029f70f531ca67c16b62573d61de49e files/digest-db-4.1.25_p1-r3 118
+MD5 f029f70f531ca67c16b62573d61de49e files/digest-db-4.1.25_p1-r4 118
+MD5 35fa694f3db327e4fb015728aca6a082 files/digest-db-4.2.52_p1 118
+MD5 68a677d9846ad3fc623f173581ff9aa5 files/digest-db-4.2.52_p2 175
+MD5 e54996f4a19633179add94a051ebf900 files/digest-db-4.3.27 62
 MD5 9cf113248f29b1e319ae73b266df4986 files/patch.3.2.9.1 2139
 MD5 f8edd1cf6535cd62f9b8ff81e0474273 files/patch.3.2.9.2 495
-MD5 194200b3295b95b46b4564980af27f1f files/db-3.2.9-fix-dep-link.patch 1005
-MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r2 61
+MD5 e1753ef0eb3e9614fadff321ecd1b082 metadata.xml 1460
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDcBBggIKl8Uu19MoRAiFZAJ4plc6jekKP36UbesB3r/32kKuFaQCfWTf0
+o9qPQ+JZ8J2euXg9icDwujg=
+=ElhW
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/db/db-1.85-r1.ebuild b/sys-libs/db/db-1.85-r1.ebuild
index 4fc53a238017..0752bbb52638 100644
--- a/sys-libs/db/db-1.85-r1.ebuild
+++ b/sys-libs/db/db-1.85-r1.ebuild
@@ -1,53 +1,52 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-1.85-r1.ebuild,v 1.1 2001/02/07 16:10:52 achim Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-1.85-r1.ebuild,v 1.1.1.1 2005/11/30 09:39:14 chriswhite Exp $
+
+inherit eutils
 
-A=db.${PV}.tar.gz
-S=${WORKDIR}/db.${PV}
 DESCRIPTION="db 1.85 -- required for RPM 4.0 to compile; that's about it."
-SRC_URI="http://www.sleepycat.com/update/${PV}/${A}"
-HOMEPAGE="http://www.sleepycat.com"
-DEPEND="virtual/glibc"
-RDEPEND=$DEPEND
+HOMEPAGE="http://www.sleepycat.com/"
+SRC_URI="ftp://ftp.sleepycat.com/releases/db.${PV}.tar.gz"
 
-src_unpack() {
+LICENSE="DB"
+SLOT="1"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+
+DEPEND="virtual/libc"
 
+S=${WORKDIR}/db.${PV}
+
+src_unpack() {
 	unpack ${A}
 	cd ${S}
-	patch -p1 < ${FILESDIR}/db.${PV}.patch
-
+	epatch ${FILESDIR}/db.${PV}.patch
 }
 
 src_compile() {
-
-    cd ${S}/PORT/linux
-    try make ${MAKEOPTS} OORG=\"${CFLAGS} -fomit-frame-pointer\" prefix=/usr
-
+	cd ${S}/PORT/linux
+	make ${MAKEOPTS} OORG="${CFLAGS} -fomit-frame-pointer" prefix=/usr || die
 }
 
 src_install () {
-
 	cd ${S}/PORT/linux
 
-	cp libdb.a libdb1.a
-	dolib.a libdb1.a
-	cp libdb.so.2 libdb1.so.2
-	dolib.so libdb1.so.2
-	dosym libdb1.so.2 /usr/lib/libdb1.so
-	dosym libdb1.so.2 /usr/lib/libdb.so.2
-	dosym libdb1.so.2 /usr/lib/libndbm.so
-	dosym libdb1.a /usr/lib/libndbm.a
+	newlib.a libdb.a libdb1.a || die "newlib.a failed"
+	newlib.so libdb.so.2 libdb1.so.2 || die "newlib.so failed"
+	dosym libdb1.so.2 /usr/$(get_libdir)/libdb1.so
+	dosym libdb1.so.2 /usr/$(get_libdir)/libdb.so.2
+	dosym libdb1.so.2 /usr/$(get_libdir)/libndbm.so
+	dosym libdb1.a /usr/$(get_libdir)/libndbm.a
 
 	dodir /usr/include/db1
 	insinto /usr/include/db1
 	doins include/db.h include/mpool.h
-        insinto /usr/include
-        doins include/ndbm.h
-	dosed "s:<db.h>:<db1/db.h>:" /usr/include/ndbm.h
 
-	cp db_dump185 db1_dump185
-	dobin db1_dump185
+	insinto /usr/include/db1
+	doins include/ndbm.h
+	dosed "s:<db.h>:<db1/db.h>:" /usr/include/db1/ndbm.h
+	dosym db1/ndbm.h /usr/include/ndbm.h
+	newbin db_dump185 db1_dump185
 
 	cd ${S}
 	dodoc changelog README
@@ -55,7 +54,4 @@ src_install () {
 	dodoc docs/*.ps
 	docinto hash
 	dodoc hash/README
-
 }
-
-
diff --git a/sys-libs/db/db-1.85-r2.ebuild b/sys-libs/db/db-1.85-r2.ebuild
index 4a8252700f97..00cbd6fd103b 100644
--- a/sys-libs/db/db-1.85-r2.ebuild
+++ b/sys-libs/db/db-1.85-r2.ebuild
@@ -1,53 +1,54 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-1.85-r2.ebuild,v 1.1 2002/05/08 19:25:23 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-1.85-r2.ebuild,v 1.1.1.1 2005/11/30 09:39:13 chriswhite Exp $
+
+inherit eutils toolchain-funcs
 
-S=${WORKDIR}/db.${PV}
 DESCRIPTION="db 1.85 -- required for RPM 4.0 to compile; that's about it."
-SRC_URI="http://www.sleepycat.com/update/snapshot/db.${PV}.tar.gz"
-HOMEPAGE="http://www.sleepycat.com"
-DEPEND="virtual/glibc"
-RDEPEND=$DEPEND
+HOMEPAGE="http://www.sleepycat.com/"
+SRC_URI="ftp://ftp.sleepycat.com/releases/db.${PV}.tar.gz
+	mirror://gentoo/${P}.patch.bz2"
+
+LICENSE="DB"
 SLOT="1"
-src_unpack() {
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86"
+IUSE=""
 
-	unpack db.${PV}.tar.gz
-	cd ${S}
-	patch -p1 < ${FILESDIR}/db.${PV}.patch
+DEPEND=""
+
+S=${WORKDIR}/db.${PV}
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${WORKDIR}/${P}.patch
 }
 
 src_compile() {
-
-    cd ${S}/PORT/linux
-    make ${MAKEOPTS} OORG="${CFLAGS} -fomit-frame-pointer" prefix=/usr || die
-
+	cd ${S}/PORT/linux
+	tc-export CC AR RANLIB
+	emake OORG="${CFLAGS}" prefix=/usr || die
 }
 
-src_install () {
-
+src_install() {
 	cd ${S}/PORT/linux
 
-	cp libdb.a libdb1.a
-	dolib.a libdb1.a
-	cp libdb.so.2 libdb1.so.2
-	dolib.so libdb1.so.2
-	dosym libdb1.so.2 /usr/lib/libdb1.so
-	dosym libdb1.so.2 /usr/lib/libdb.so.2
-	dosym libdb1.so.2 /usr/lib/libndbm.so
-	dosym libdb1.a /usr/lib/libndbm.a
+	newlib.a libdb.a libdb1.a || die "newlib.a failed"
+	newlib.so libdb.so.2 libdb1.so.2 || die "newlib.so failed"
+	dosym libdb1.so.2 /usr/$(get_libdir)/libdb1.so
+	dosym libdb1.so.2 /usr/$(get_libdir)/libdb.so.2
+	dosym libdb1.so.2 /usr/$(get_libdir)/libndbm.so
+	dosym libdb1.a /usr/$(get_libdir)/libndbm.a
 
 	dodir /usr/include/db1
 	insinto /usr/include/db1
 	doins include/db.h include/mpool.h
 
 	insinto /usr/include/db1
-        doins include/ndbm.h
+	doins include/ndbm.h
 	dosed "s:<db.h>:<db1/db.h>:" /usr/include/db1/ndbm.h
-        dosym db1/ndbm.h /usr/include/ndbm.h
-	cp db_dump185 db1_dump185
-	dobin db1_dump185
+	dosym db1/ndbm.h /usr/include/ndbm.h
+	newbin db_dump185 db1_dump185
 
 	cd ${S}
 	dodoc changelog README
@@ -55,7 +56,4 @@ src_install () {
 	dodoc docs/*.ps
 	docinto hash
 	dodoc hash/README
-
 }
-
-
diff --git a/sys-libs/db/db-1.85-r3.ebuild b/sys-libs/db/db-1.85-r3.ebuild
index c523954b9f24..f85e12b62254 100644
--- a/sys-libs/db/db-1.85-r3.ebuild
+++ b/sys-libs/db/db-1.85-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/sys-libs/db/db-1.85-r3.ebuild,v 1.1 2005/11/08 02:40:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-1.85-r3.ebuild,v 1.1.1.1 2005/11/30 09:39:14 chriswhite Exp $
 
 inherit eutils toolchain-funcs multilib
 
diff --git a/sys-libs/db/db-3.2.9-r10.ebuild b/sys-libs/db/db-3.2.9-r10.ebuild
index 6d03f10b168c..0ec3ff1748c8 100644
--- a/sys-libs/db/db-3.2.9-r10.ebuild
+++ b/sys-libs/db/db-3.2.9-r10.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/sys-libs/db/db-3.2.9-r10.ebuild,v 1.1 2003/10/18 10:29:17 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-3.2.9-r10.ebuild,v 1.1.1.1 2005/11/30 09:39:15 chriswhite Exp $
 
-IUSE="doc java"
-
-inherit libtool
-inherit eutils
-inherit db
+inherit gnuconfig libtool eutils db
 
-S="${WORKDIR}/${P}"
 DESCRIPTION="Berkeley DB for transaction support in MySQL"
-SRC_URI="http://www.sleepycat.com/update/snapshot/${P}.tar.gz"
 HOMEPAGE="http://www.sleepycat.com/"
+SRC_URI="ftp://ftp.sleepycat.com/releases/${P}.tar.gz"
 
-SLOT="3"
 LICENSE="DB"
+SLOT="3"
 # This ebuild is to be the compatibility ebuild for when db4 is put
 # in the tree.
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm ia64"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sparc x86"
+IUSE="doc java"
 
-RDEPEND="virtual/glibc"
+RDEPEND="virtual/libc"
 DEPEND="${RDEPEND}
 	=sys-libs/db-1.85*
 	sys-devel/libtool
@@ -59,7 +55,10 @@ src_unpack() {
 	rm -f config.guess
 	sed -i "s,\(-D_GNU_SOURCE\),\1 ${CFLAGS}," configure
 
+	cd ${S}
 	epatch ${FILESDIR}/${P}-jarlocation.patch
+	epatch ${FILESDIR}/db-3.2.9-java15.patch
+	gnuconfig_update
 }
 
 src_compile() {
@@ -95,12 +94,14 @@ src_compile() {
 	mkdir -p ${S}/build-static
 	cd ${S}/build-static
 	../dist/configure ${conf} ${conf_static} \
+		--libdir=/usr/$(get_libdir) \
 		--enable-static || die
 
 	einfo "Configuring ${P} (shared)..."
 	mkdir -p ${S}/build-shared
 	cd ${S}/build-shared
 	../dist/configure ${conf} ${conf_shared} \
+		--libdir=/usr/$(get_libdir) \
 		--enable-shared || die
 
 	# Parallel make does not work
@@ -118,6 +119,7 @@ src_install () {
 	make libdb=libdb-3.2.a \
 		libcxx=libcxx_3.2.a \
 		prefix=${D}/usr \
+		libdir=${D}/usr/$(get_libdir) \
 		install || die
 
 	cd ${S}/build-static
@@ -133,7 +135,7 @@ src_install () {
 	# For some reason, db.so's are *not* readable by group or others,
 	# resulting in no one but root being able to use them!!!
 	# This fixes it -- DR 15 Jun 2001
-	cd ${D}/usr/lib
+	cd ${D}/usr/$(get_libdir)
 	chmod go+rx *.so
 	# The .la's aren't readable either
 	chmod go+r *.la
diff --git a/sys-libs/db/db-3.2.9-r7.ebuild b/sys-libs/db/db-3.2.9-r7.ebuild
index cd44a22dfeb2..8e14479a2b13 100644
--- a/sys-libs/db/db-3.2.9-r7.ebuild
+++ b/sys-libs/db/db-3.2.9-r7.ebuild
@@ -1,26 +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/sys-libs/db/db-3.2.9-r7.ebuild,v 1.1 2003/08/17 08:09:17 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-3.2.9-r7.ebuild,v 1.1.1.1 2005/11/30 09:39:14 chriswhite Exp $
 
-IUSE=""
-
-inherit libtool
-inherit eutils
+inherit libtool eutils
 
-S="${WORKDIR}/${P}"
 DESCRIPTION="Berkeley DB for transaction support in MySQL"
-SRC_URI="http://www.sleepycat.com/update/snapshot/${P}.tar.gz"
+SRC_URI="ftp://ftp.sleepycat.com/releases/${P}.tar.gz"
 HOMEPAGE="http://www.sleepycat.com/"
 
+IUSE=""
 SLOT="3"
 LICENSE="DB"
 # This ebuild is to be the compatibility ebuild for when db4 is put
 # in the tree.
-KEYWORDS="x86 ppc sparc alpha mips hppa arm"
+KEYWORDS="x86 ppc sparc alpha mips hppa amd64"
 
-RDEPEND="virtual/glibc"
+RDEPEND="virtual/libc"
 DEPEND="${RDEPEND}
-	=sys-libs/db-1.85-r1
+	=sys-libs/db-1.85*
 	sys-devel/libtool
 	sys-devel/m4"
 # We need m4 too else build fails without config.guess
@@ -30,7 +27,7 @@ export CXXFLAGS="${CXXFLAGS/-fno-exceptions/-fexceptions}"
 
 src_unpack() {
 	unpack ${A}
-	
+
 	chmod -R ug+w *
 
 	cd ${WORKDIR}/${P}
@@ -53,6 +50,7 @@ src_unpack() {
 	# Fix invalid .la files
 	cd ${WORKDIR}/${P}/dist
 	rm -f ltversion.sh
+
 	# remove config.guess else we have problems with gcc-3.2
 	rm -f config.guess
 	sed -i "s,\(-D_GNU_SOURCE\),\1 ${CFLAGS}," configure
@@ -66,10 +64,11 @@ src_compile() {
 		--enable-cxx \
 		--enable-compat185 \
 		--enable-dump185 \
+		--libdir=/usr/$(get_libdir) \
 		--prefix=/usr"
 	# --enable-rpc aparently does not work .. should verify this
 	# at some stage ...
-	
+
 	# NOTE: we should not build both shared and static versions
 	#       of the libraries in the same build root!
 
@@ -84,7 +83,7 @@ src_compile() {
 	cd ${S}/build-shared
 	../dist/configure ${conf} \
 		--enable-shared || die
-		
+
 	# Parallel make does not work
 	MAKEOPTS="${MAKEOPTS} -j1"
 	einfo "Building ${P} (static)..."
@@ -100,8 +99,9 @@ src_install () {
 	make libdb=libdb-3.2.a \
 		libcxx=libcxx_3.2.a \
 		prefix=${D}/usr \
+		libdir=${D}/usr/$(get_libdir) \
 		install || die
-	
+
 	cd ${S}/build-static
 	cp libdb.a libdb-3.2.a
 	cp libdb_cxx.a libdb_cxx-3.2.a
@@ -111,18 +111,18 @@ src_install () {
 	cd ${D}/usr/include
 	mv *.h db3
 	ln db3/db.h db.h
-	
-	cd ${D}/usr/lib
+
+	cd ${D}/usr/$(get_libdir)
 	ln -s libdb-3.2.so libdb.so.3
 
 	# For some reason, db.so's are *not* readable by group or others,
 	# resulting in no one but root being able to use them!!!
 	# This fixes it -- DR 15 Jun 2001
-	cd ${D}/usr/lib
+	cd ${D}/usr/$(get_libdir)
 	chmod go+rx *.so
 	# The .la's aren't readable either
 	chmod go+r *.la
-	
+
 	cd ${S}
 	dodoc README LICENSE
 
@@ -139,7 +139,7 @@ src_install () {
 }
 
 fix_so () {
-	cd ${ROOT}/usr/lib
+	cd ${ROOT}/usr/$(get_libdir)
 	target=`find -type f -maxdepth 1 -name "libdb-*.so" |sort |tail -n 1`
 	[ -n "${target}" ] && ln -sf ${target//.\//} libdb.so
 	target=`find -type f -maxdepth 1 -name "libdb_cxx*.so" |sort |tail -n 1`
@@ -162,4 +162,3 @@ pkg_postinst () {
 pkg_postrm () {
 	fix_so
 }
-
diff --git a/sys-libs/db/db-4.0.14-r2.ebuild b/sys-libs/db/db-4.0.14-r2.ebuild
index 379263f88515..7a16f853ba68 100644
--- a/sys-libs/db/db-4.0.14-r2.ebuild
+++ b/sys-libs/db/db-4.0.14-r2.ebuild
@@ -1,35 +1,44 @@
-# 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/sys-libs/db/db-4.0.14-r2.ebuild,v 1.1 2003/08/21 11:08:36 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.0.14-r2.ebuild,v 1.1.1.1 2005/11/30 09:39:13 chriswhite Exp $
 
-IUSE="tcltk java doc"
-
-inherit eutils
-inherit db
+inherit eutils gnuconfig db
 
 S="${WORKDIR}/${P}/build_unix"
 DESCRIPTION="Berkeley DB"
-SRC_URI="http://www.sleepycat.com/update/snapshot/${P}.tar.gz"
+SRC_URI="ftp://ftp.sleepycat.com/releases/${P}.tar.gz"
 HOMEPAGE="http://www.sleepycat.com"
+IUSE="tcltk java doc"
 SLOT="4"
 LICENSE="DB"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc sparc alpha mips hppa amd64 ia64"
 
 DEPEND="tcltk? ( dev-lang/tcl )
 	java? ( virtual/jdk )"
 
 src_unpack() {
 	unpack ${A}
-	
+
 	# Get db to link libdb* to correct dependencies ... for example if we use
 	# NPTL or NGPT, db detects usable mutexes, and should link against
 	# libpthread, but does not do so ...
 	# <azarah@gentoo.org> (23 Feb 2003)
 	cd ${WORKDIR}/${P}; epatch ${FILESDIR}/${P}-fix-dep-link.patch
+	epatch ${FILESDIR}/${PN}-4.1.25-java.patch
 }
 
 src_compile() {
 
+	# gnuconfig doesn't work if ${S} points to build_unix, so we
+	# change it temporarily
+	if use mips; then
+		einfo "Updating config.{guess,sub} for mips"
+		local OLDS="${S}"
+		S="${WORKDIR}/${P}/dist"
+		gnuconfig_update
+		S="${OLDS}"
+	fi
+
 	local myconf=
 
 	use java \
@@ -37,14 +46,14 @@ src_compile() {
 		|| myconf="${myconf} --disable-java"
 
 	use tcltk \
-		&& myconf="${myconf} --enable-tcl --with-tcl=/usr/lib" \
+		&& myconf="${myconf} --enable-tcl --with-tcl=/usr/$(get_libdir)" \
 		|| myconf="${myconf} --disable-tcl"
-	
+
 	if use java && [ -n "${JAVAC}" ]; then
 		export PATH=`dirname ${JAVAC}`:${PATH}
 		export JAVAC=`basename ${JAVAC}`
 	fi
-	
+
 	../dist/configure \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
@@ -52,6 +61,7 @@ src_compile() {
 		--datadir=/usr/share \
 		--sysconfdir=/etc \
 		--localstatedir=/var/lib \
+		--libdir=/usr/$(get_libdir) \
 		--enable-compat185 \
 		--enable-cxx \
 		--with-uniquename \
@@ -62,19 +72,19 @@ src_compile() {
 #
 #		--enable-posixmutexes \
 
-	emake || make || die
+	emake -j1 || die
 }
 
 src_install () {
 
-	einstall || die
+	einstall libdir="${D}/usr/$(get_libdir)" || die
 
 	db_src_install_usrbinslot
 
 	db_src_install_headerslot
 
 	db_src_install_doc
-	
+
 	db_src_install_usrlibcleanup
 }
 
diff --git a/sys-libs/db/db-4.0.14-r3.ebuild b/sys-libs/db/db-4.0.14-r3.ebuild
index bb8fc6c190f9..473c41ac0958 100644
--- a/sys-libs/db/db-4.0.14-r3.ebuild
+++ b/sys-libs/db/db-4.0.14-r3.ebuild
@@ -1,22 +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/sys-libs/db/db-4.0.14-r3.ebuild,v 1.1 2003/10/18 10:29:17 robbat2 Exp $
-
-IUSE="tcltk java doc"
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.0.14-r3.ebuild,v 1.1.1.1 2005/11/30 09:39:14 chriswhite Exp $
 
 inherit eutils gnuconfig db
 
 S="${WORKDIR}/${P}/build_unix"
 DESCRIPTION="Berkeley DB"
-SRC_URI="http://www.sleepycat.com/update/snapshot/${P}.tar.gz"
+SRC_URI="ftp://ftp.sleepycat.com/releases/${P}.tar.gz"
 HOMEPAGE="http://www.sleepycat.com"
+IUSE="tcltk java doc"
 SLOT="4"
 LICENSE="DB"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm amd64 ia64"
+KEYWORDS="alpha amd64 ~hppa ia64 m68k ~mips ppc ppc64 sparc x86"
 
 DEPEND="tcltk? ( dev-lang/tcl )
 	java? ( virtual/jdk )"
 
+RDEPEND="tcltk? ( dev-lang/tcl )
+	java? ( virtual/jre )"
+
 src_unpack() {
 	unpack ${A}
 
@@ -25,12 +27,13 @@ src_unpack() {
 	# libpthread, but does not do so ...
 	# <azarah@gentoo.org> (23 Feb 2003)
 	cd ${WORKDIR}/${P}; epatch ${FILESDIR}/${P}-fix-dep-link.patch
+	epatch ${FILESDIR}/${PN}-4.1.25-java.patch
 
 	cd ${WORKDIR} ; epatch ${FILESDIR}/${P}-jarlocation.patch
 }
 
 src_compile() {
-
+	addwrite /proc/self/maps
 	# gnuconfig doesn't work if ${S} points to build_unix, so we
 	# change it temporarily
 	if use mips; then
@@ -48,7 +51,7 @@ src_compile() {
 		|| myconf="${myconf} --disable-java"
 
 	use tcltk \
-		&& myconf="${myconf} --enable-tcl --with-tcl=/usr/lib" \
+		&& myconf="${myconf} --enable-tcl --with-tcl=/usr/$(get_libdir)" \
 		|| myconf="${myconf} --disable-tcl"
 
 	if use java && [ -n "${JAVAC}" ]; then
@@ -63,6 +66,7 @@ src_compile() {
 		--datadir=/usr/share \
 		--sysconfdir=/etc \
 		--localstatedir=/var/lib \
+		--libdir=/usr/$(get_libdir) \
 		--enable-compat185 \
 		--enable-cxx \
 		--with-uniquename \
@@ -73,12 +77,12 @@ src_compile() {
 #
 #		--enable-posixmutexes \
 
-	emake || make || die
+	emake -j1 || die
 }
 
 src_install () {
 
-	einstall || die
+	einstall libdir="${D}/usr/$(get_libdir)" || die
 
 	db_src_install_usrbinslot
 
diff --git a/sys-libs/db/db-4.1.25_p1-r3.ebuild b/sys-libs/db/db-4.1.25_p1-r3.ebuild
index 3f48784beafd..22bf0a9c4b8f 100644
--- a/sys-libs/db/db-4.1.25_p1-r3.ebuild
+++ b/sys-libs/db/db-4.1.25_p1-r3.ebuild
@@ -1,14 +1,12 @@
-# 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/sys-libs/db/db-4.1.25_p1-r3.ebuild,v 1.1 2003/11/02 12:21:01 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.1.25_p1-r3.ebuild,v 1.1.1.1 2005/11/30 09:39:13 chriswhite Exp $
 
-IUSE="tcltk java doc"
-
-inherit eutils
-inherit db
+inherit eutils gnuconfig db
 
 #Number of official patches
-PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
+#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
+PATCHNO=${PV/*.*.*_p}
 if [ "${PATCHNO}" == "${PV}" ]; then
 	MY_PV=${PV}
 	MY_P=${P}
@@ -20,44 +18,52 @@ fi
 
 S=${WORKDIR}/${MY_P}/build_unix
 DESCRIPTION="Berkeley DB"
-SRC_URI="http://www.sleepycat.com/update/snapshot/${MY_P}.tar.gz"
-
+HOMEPAGE="http://www.sleepycat.com"
+SRC_URI="ftp://ftp.sleepycat.com/releases/${MY_P}.tar.gz"
 for (( i=1 ; i<=$PATCHNO ; i++ ))
 do
 	export SRC_URI="${SRC_URI} http://www.sleepycat.com/update/${MY_PV}/patch.${MY_PV}.${i}"
 done
 
-HOMEPAGE="http://www.sleepycat.com"
-SLOT="4.1"
 LICENSE="DB"
-KEYWORDS="ia64 ~x86 ~ppc ~alpha ~amd64"
+SLOT="4.1"
+KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390 sh"
+IUSE="tcltk java doc"
 
 DEPEND="tcltk? ( dev-lang/tcl )
 	java? ( virtual/jdk )"
 
+RDEPEND="tcltk? ( dev-lang/tcl )
+	java? ( virtual/jre )"
+
 src_unpack() {
 	unpack ${MY_P}.tar.gz
 	cd ${WORKDIR}/${MY_P}
 	for (( i=1 ; i<=$PATCHNO ; i++ ))
 	do
-		patch -p0 <${DISTDIR}/patch.${MY_PV}.${i}
+		epatch ${DISTDIR}/patch.${MY_PV}.${i}
 	done
 	epatch ${FILESDIR}/${P}-jarlocation.patch
 
 	epatch ${FILESDIR}/${PN}-4.0.14-fix-dep-link.patch
-
+	epatch ${FILESDIR}/${PN}-4.1.25-uclibc.patch
+	epatch ${FILESDIR}/${PN}-4.1.25-java.patch
+	gnuconfig_update "${S}/../dist"
 }
 
 src_compile() {
+	addwrite /proc/self/maps
 
 	local myconf="--enable-rpc"
 
+	use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly"
+
 	use java \
 		&& myconf="${myconf} --enable-java" \
 		|| myconf="${myconf} --disable-java"
 
 	use tcltk \
-		&& myconf="${myconf} --enable-tcl --with-tcl=/usr/lib" \
+		&& myconf="${myconf} --enable-tcl --with-tcl=/usr/$(get_libdir)" \
 		|| myconf="${myconf} --disable-tcl"
 
 	if use java && [ -n "${JAVAC}" ]; then
@@ -65,6 +71,8 @@ src_compile() {
 		export JAVAC=`basename ${JAVAC}`
 	fi
 
+	[ -n "${CBUILD}" ] && myconf="${myconf} --build=${CBUILD}"
+
 	../dist/configure \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
@@ -72,17 +80,19 @@ src_compile() {
 		--datadir=/usr/share \
 		--sysconfdir=/etc \
 		--localstatedir=/var/lib \
+		--libdir=/usr/$(get_libdir) \
 		--enable-compat185 \
 		--enable-cxx \
 		--with-uniquename \
+		--host=${CHOST} \
 		${myconf} || die
 
-	emake || make || die
+	emake -j1 || die
 }
 
 src_install () {
 
-	einstall || die
+	einstall libdir="${D}/usr/$(get_libdir)" || die
 
 	db_src_install_usrbinslot
 
diff --git a/sys-libs/db/db-4.1.25_p1-r4.ebuild b/sys-libs/db/db-4.1.25_p1-r4.ebuild
index d74bd14d78ea..ba24bffbf175 100644
--- a/sys-libs/db/db-4.1.25_p1-r4.ebuild
+++ b/sys-libs/db/db-4.1.25_p1-r4.ebuild
@@ -1,11 +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/sys-libs/db/db-4.1.25_p1-r4.ebuild,v 1.1 2004/06/20 02:56:56 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.1.25_p1-r4.ebuild,v 1.1.1.1 2005/11/30 09:39:13 chriswhite Exp $
 
 inherit eutils gnuconfig db
 
 #Number of official patches
-PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
+#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
+PATCHNO=${PV/*.*.*_p}
 if [ "${PATCHNO}" == "${PV}" ]; then
 	MY_PV=${PV}
 	MY_P=${P}
@@ -17,21 +18,19 @@ fi
 
 S=${WORKDIR}/${MY_P}/build_unix
 DESCRIPTION="Berkeley DB"
-HOMEPAGE="http://www.sleepycat.com"
-SRC_URI="http://www.sleepycat.com/update/snapshot/${MY_P}.tar.gz"
-for (( i=1 ; i<=$PATCHNO ; i++ ))
-do
+HOMEPAGE="http://www.sleepycat.com/"
+SRC_URI="ftp://ftp.sleepycat.com/releases/${MY_P}.tar.gz"
+for (( i=1 ; i<=$PATCHNO ; i++ )) ; do
 	export SRC_URI="${SRC_URI} http://www.sleepycat.com/update/${MY_PV}/patch.${MY_PV}.${i}"
 done
 
 LICENSE="DB"
 SLOT="4.1"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
-IUSE="tcltk java doc uclibc"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ~ppc ppc64 s390 sh sparc x86"
+IUSE="bootstrap doc java nocxx tcltk uclibc"
 
 DEPEND="tcltk? ( dev-lang/tcl )
 	java? ( virtual/jdk )"
-
 RDEPEND="tcltk? ( dev-lang/tcl )
 	java? ( virtual/jre )"
 
@@ -40,46 +39,39 @@ src_unpack() {
 	cd ${WORKDIR}/${MY_P}
 	for (( i=1 ; i<=$PATCHNO ; i++ ))
 	do
-		patch -p0 <${DISTDIR}/patch.${MY_PV}.${i}
+		epatch ${DISTDIR}/patch.${MY_PV}.${i}
 	done
 	epatch ${FILESDIR}/${P}-jarlocation.patch
 
 	epatch ${FILESDIR}/${PN}-4.0.14-fix-dep-link.patch
 	epatch ${FILESDIR}/${PN}-4.1.25-uclibc.patch
+	epatch ${FILESDIR}/${PN}-4.1.25-java.patch
+
+	gnuconfig_update "${S}/../dist"
 }
 
 src_compile() {
 	addwrite /proc/self/maps
 
-	# Mips needs a gnuconfig update so obscure things like mips64 are known
-	# db-4.1.25_p1 extracts to ${WORKDIR}/db-4.1.25, so we need to strip the _p1
-	if ( use mips || uclibc ) ; then
-		einfo "Updating config.{guess,sub} for mips"
-		local OLDS="${S}"
-		S="${S}/../dist"
-		gnuconfig_update
-		S="${OLDS}"
-	fi
-
-
-	use uclibc && local myconf="--disable-rpc" || local myconf="--enable-rpc"
+	local myconf=""
 
-	use amd64 &&  myconf="${myconf} --with-mutex=x86/gcc-assembly"
+	use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly"
 
-	use java \
-		&& myconf="${myconf} --enable-java" \
-		|| myconf="${myconf} --disable-java"
+	use bootstrap \
+		&& myconf="${myconf} --disable-cxx" \
+		|| myconf="${myconf} $(use_enable !nocxx cxx)"
 
 	use tcltk \
-		&& myconf="${myconf} --enable-tcl --with-tcl=/usr/lib" \
+		&& myconf="${myconf} --enable-tcl --with-tcl=/usr/$(get_libdir)" \
 		|| myconf="${myconf} --disable-tcl"
 
-	if use java && [ -n "${JAVAC}" ]; then
+	myconf="${myconf} $(use_enable java)"
+	if use java && [[ -n ${JAVAC} ]] ; then
 		export PATH=`dirname ${JAVAC}`:${PATH}
 		export JAVAC=`basename ${JAVAC}`
 	fi
 
-	[ -n "${CBUILD}" ] && myconf="${myconf} --build=${CBUILD}"
+	[[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
 
 	../dist/configure \
 		--prefix=/usr \
@@ -88,18 +80,19 @@ src_compile() {
 		--datadir=/usr/share \
 		--sysconfdir=/etc \
 		--localstatedir=/var/lib \
+		--libdir=/usr/$(get_libdir) \
 		--enable-compat185 \
-		--enable-cxx \
 		--with-uniquename \
+		--enable-rpc \
 		--host=${CHOST} \
-		${myconf} || die
+		${myconf} || die "configure failed"
 
-	emake || make || die
+	emake -j1 || die "make failed"
 }
 
-src_install () {
+src_install() {
 
-	einstall || die
+	einstall libdir="${D}/usr/$(get_libdir)" || die
 
 	db_src_install_usrbinslot
 
@@ -111,6 +104,8 @@ src_install () {
 
 	dodir /usr/sbin
 	mv ${D}/usr/bin/berkeley_db_svc ${D}/usr/sbin/berkeley_db41_svc
+
+	use uclibc && rm -f ${D}/usr/include/db*/*cxx*
 }
 
 pkg_postinst () {
diff --git a/sys-libs/db/db-4.2.52_p1.ebuild b/sys-libs/db/db-4.2.52_p1.ebuild
index 1f8ad571bc27..9558fcb468da 100644
--- a/sys-libs/db/db-4.2.52_p1.ebuild
+++ b/sys-libs/db/db-4.2.52_p1.ebuild
@@ -1,14 +1,12 @@
-# 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/sys-libs/db/db-4.2.52_p1.ebuild,v 1.1 2003/12/22 11:20:31 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.2.52_p1.ebuild,v 1.1.1.1 2005/11/30 09:39:14 chriswhite Exp $
 
-IUSE="tcltk java doc"
-
-inherit eutils gnuconfig
-inherit db
+inherit eutils gnuconfig db
 
 #Number of official patches
-PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
+#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
+PATCHNO=${PV/*.*.*_p}
 if [ "${PATCHNO}" == "${PV}" ]; then
 	MY_PV=${PV}
 	MY_P=${P}
@@ -18,9 +16,10 @@ else
 	MY_P=${PN}-${MY_PV}
 fi
 
+IUSE="tcltk java doc"
 S=${WORKDIR}/${MY_P}/build_unix
 DESCRIPTION="Berkeley DB"
-SRC_URI="http://www.sleepycat.com/update/snapshot/${MY_P}.tar.gz"
+SRC_URI="ftp://ftp.sleepycat.com/releases/${MY_P}.tar.gz"
 
 for (( i=1 ; i<=$PATCHNO ; i++ ))
 do
@@ -30,17 +29,20 @@ done
 HOMEPAGE="http://www.sleepycat.com"
 SLOT="4.2"
 LICENSE="DB"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc ~alpha ~ia64"
 
 DEPEND="tcltk? ( >=dev-lang/tcl-8.4 )
 	java? ( virtual/jdk )"
 
+RDEPEND="tcltk? ( dev-lang/tcl )
+	java? ( virtual/jre )"
+
 src_unpack() {
 	unpack ${MY_P}.tar.gz
 	cd ${WORKDIR}/${MY_P}
 	for (( i=1 ; i<=$PATCHNO ; i++ ))
 	do
-		patch -p0 <${DISTDIR}/patch.${MY_PV}.${i}
+		epatch ${DISTDIR}/patch.${MY_PV}.${i}
 	done
 	epatch ${FILESDIR}/${PN}-${SLOT}-jarlocation.patch
 
@@ -69,7 +71,7 @@ src_compile() {
 		|| myconf="${myconf} --disable-java"
 
 	use tcltk \
-		&& myconf="${myconf} --enable-tcl --with-tcl=/usr/lib" \
+		&& myconf="${myconf} --enable-tcl --with-tcl=/usr/$(get_libdir)" \
 		|| myconf="${myconf} --disable-tcl"
 
 	if use java && [ -n "${JAVAC}" ]; then
@@ -88,17 +90,18 @@ src_compile() {
 		--datadir=/usr/share \
 		--sysconfdir=/etc \
 		--localstatedir=/var/lib \
+		--libdir=/usr/$(get_libdir) \
 		--enable-compat185 \
 		--enable-cxx \
 		--with-uniquename \
 		${myconf} || die
 
-	emake || make || die
+	emake -j1 || die
 }
 
 src_install () {
 
-	einstall || die
+	einstall libdir="${D}/usr/$(get_libdir)" || die
 
 	db_src_install_usrbinslot
 
diff --git a/sys-libs/db/db-4.2.52_p2.ebuild b/sys-libs/db/db-4.2.52_p2.ebuild
index 051a3711886b..0475f7088d4c 100644
--- a/sys-libs/db/db-4.2.52_p2.ebuild
+++ b/sys-libs/db/db-4.2.52_p2.ebuild
@@ -1,14 +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/sys-libs/db/db-4.2.52_p2.ebuild,v 1.1 2004/04/15 20:40:15 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.2.52_p2.ebuild,v 1.1.1.1 2005/11/30 09:39:14 chriswhite Exp $
 
-IUSE="tcltk java doc"
-
-inherit eutils gnuconfig
-inherit db
+inherit eutils gnuconfig db
 
 #Number of official patches
-PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
+#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
+PATCHNO=${PV/*.*.*_p}
 if [ "${PATCHNO}" == "${PV}" ]; then
 	MY_PV=${PV}
 	MY_P=${P}
@@ -20,21 +18,19 @@ fi
 
 S=${WORKDIR}/${MY_P}/build_unix
 DESCRIPTION="Berkeley DB"
-SRC_URI="http://www.sleepycat.com/update/snapshot/${MY_P}.tar.gz"
-
-for (( i=1 ; i<=$PATCHNO ; i++ ))
-do
+HOMEPAGE="http://www.sleepycat.com/"
+SRC_URI="ftp://ftp.sleepycat.com/releases/${MY_P}.tar.gz"
+for (( i=1 ; i<=$PATCHNO ; i++ )) ; do
 	export SRC_URI="${SRC_URI} http://www.sleepycat.com/update/${MY_PV}/patch.${MY_PV}.${i}"
 done
 
-HOMEPAGE="http://www.sleepycat.com"
-SLOT="4.2"
 LICENSE="DB"
-KEYWORDS="~x86"
+SLOT="4.2"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ~ppc-macos ppc64 s390 sh sparc x86"
+IUSE="tcltk java doc nocxx bootstrap"
 
 DEPEND="tcltk? ( >=dev-lang/tcl-8.4 )
 	java? ( virtual/jdk )"
-
 RDEPEND="tcltk? ( dev-lang/tcl )
 	java? ( virtual/jre )"
 
@@ -43,46 +39,40 @@ src_unpack() {
 	cd ${WORKDIR}/${MY_P}
 	for (( i=1 ; i<=$PATCHNO ; i++ ))
 	do
-		patch -p0 <${DISTDIR}/patch.${MY_PV}.${i}
+		epatch ${DISTDIR}/patch.${MY_PV}.${i}
 	done
 	epatch ${FILESDIR}/${PN}-${SLOT}-jarlocation.patch
+	epatch ${FILESDIR}/${PN}-${SLOT}-libtool.patch
 
 	epatch ${FILESDIR}/${PN}-4.0.14-fix-dep-link.patch
 
+	gnuconfig_update "${S}/../dist"
+
+	sed -i -e "s,\(ac_compiler\|\${MAKEFILE_CC}\|\${MAKEFILE_CXX}\|\$CC\)\( *--version\),\1 -dumpversion,g" ${S}/../dist/configure
 }
 
 src_compile() {
 	addwrite /proc/self/maps
 
-	# Mips needs a gnuconfig update so obscure things like mips64 are known
-	# db-4.1.25_p1 extracts to ${WORKDIR}/db-4.1.25, so we need to strip the _p1
-	if use mips; then
-		einfo "Updating config.{guess,sub} for mips"
-		local OLDS="${S}"
-		S="${S}/dist"
-		gnuconfig_update
-		S="${OLDS}"
-	fi
-
+	local myconf=""
 
-	local myconf="--enable-rpc"
+	use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly"
 
-	use java \
-		&& myconf="${myconf} --enable-java" \
-		|| myconf="${myconf} --disable-java"
+	use bootstrap \
+		&& myconf="${myconf} --disable-cxx" \
+		|| myconf="${myconf} $(use_enable !nocxx cxx)"
 
 	use tcltk \
-		&& myconf="${myconf} --enable-tcl --with-tcl=/usr/lib" \
+		&& myconf="${myconf} --enable-tcl --with-tcl=/usr/$(get_libdir)" \
 		|| myconf="${myconf} --disable-tcl"
 
-	if use java && [ -n "${JAVAC}" ]; then
+	myconf="${myconf} $(use_enable java)"
+	if use java && [[ -n ${JAVAC} ]] ; then
 		export PATH=`dirname ${JAVAC}`:${PATH}
 		export JAVAC=`basename ${JAVAC}`
 	fi
 
-	if [ "${PROFILE_ARCH}" = "sparc64" ]; then
-		myconf="${myconf} --host=${CHOST}"
-	fi
+	[[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
 
 	../dist/configure \
 		--prefix=/usr \
@@ -91,17 +81,19 @@ src_compile() {
 		--datadir=/usr/share \
 		--sysconfdir=/etc \
 		--localstatedir=/var/lib \
+		--libdir=/usr/$(get_libdir) \
 		--enable-compat185 \
-		--enable-cxx \
 		--with-uniquename \
-		${myconf} || die
+		--enable-rpc \
+		--host=${CHOST} \
+		${myconf} || die "configure failed"
 
-	emake || make || die
+	emake -j1 || die "make failed"
 }
 
-src_install () {
+src_install() {
 
-	einstall || die
+	einstall libdir="${D}/usr/$(get_libdir)" || die
 
 	db_src_install_usrbinslot
 
diff --git a/sys-libs/db/db-4.3.27.ebuild b/sys-libs/db/db-4.3.27.ebuild
index 72643f512c33..7e2cb2ea24a7 100644
--- a/sys-libs/db/db-4.3.27.ebuild
+++ b/sys-libs/db/db-4.3.27.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.3.27.ebuild,v 1.1 2005/03/29 12:50:19 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.3.27.ebuild,v 1.1.1.1 2005/11/30 09:39:14 chriswhite Exp $
 
 inherit eutils gnuconfig db
 
@@ -26,7 +26,7 @@ done
 
 LICENSE="DB"
 SLOT="4.3"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ia64 ~m68k ~ppc ~sparc ~x86"
 IUSE="tcltk java doc nocxx bootstrap"
 
 DEPEND="tcltk? ( >=dev-lang/tcl-8.4 )
@@ -47,6 +47,8 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-4.3.27-fix-dep-link.patch
 
 	gnuconfig_update "${S}/../dist"
+
+	sed -i -e "s,\(ac_compiler\|\${MAKEFILE_CC}\|\${MAKEFILE_CXX}\|\$CC\)\( *--version\),\1 -dumpversion,g" ${S}/../dist/configure
 }
 
 src_compile() {
@@ -86,7 +88,7 @@ src_compile() {
 		--host=${CHOST} \
 		${myconf} || die "configure failed"
 
-	emake || make || die "make failed"
+	emake -j1 || die "make failed"
 }
 
 src_install() {
diff --git a/sys-libs/db/files/digest-db-1.85-r1 b/sys-libs/db/files/digest-db-1.85-r1
index f77fd46ea895..61ec3a1f9af0 100644
--- a/sys-libs/db/files/digest-db-1.85-r1
+++ b/sys-libs/db/files/digest-db-1.85-r1
@@ -1 +1 @@
-MD5 42cc6c1e1e25818bd3e3f91328edb0f1 db.1.85.tar.gz
+MD5 42cc6c1e1e25818bd3e3f91328edb0f1 db.1.85.tar.gz 270953
diff --git a/sys-libs/db/files/digest-db-1.85-r2 b/sys-libs/db/files/digest-db-1.85-r2
index 61ec3a1f9af0..617fd6a1bee9 100644
--- a/sys-libs/db/files/digest-db-1.85-r2
+++ b/sys-libs/db/files/digest-db-1.85-r2
@@ -1 +1,2 @@
 MD5 42cc6c1e1e25818bd3e3f91328edb0f1 db.1.85.tar.gz 270953
+MD5 8fb6e2d39bc77fc8521401522ceeebaf db-1.85.patch.bz2 15277
diff --git a/sys-libs/db/metadata.xml b/sys-libs/db/metadata.xml
index 713dc2314d31..7b8605845847 100644
--- a/sys-libs/db/metadata.xml
+++ b/sys-libs/db/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>sys-libs</herd>
+<herd>base-system</herd>
 <maintainer restrict=">=sys-libs/db-3.2.9-r5">
   <!-- I'm currently working on making db 4 work with gentoo, but am not
         maintaining general db -->
diff --git a/sys-libs/detect/ChangeLog b/sys-libs/detect/ChangeLog
index 0c901f646ec0..611917fec8db 100644
--- a/sys-libs/detect/ChangeLog
+++ b/sys-libs/detect/ChangeLog
@@ -1,7 +1,15 @@
-# ChangeLog for sys-libs/readline
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/detect/ChangeLog,v 1.1 2002/09/15 15:37:45 verwilst Exp $
+# ChangeLog for sys-libs/detect
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/detect/ChangeLog,v 1.1.1.1 2005/11/30 09:39:02 chriswhite Exp $
 
-*detect-0.7.42 (15 Sept 2002) Bart Verwilst <verwilst@gentoo.org>:
+  24 Aug 2004; Sven Wegener <swegener@gentoo.org> detect-0.9.72.ebuild:
+  Changed SRC_URI to use mirror:// syntax and added missing IUSE.
+
+  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> detect-0.9.72.ebuild:
+  virtual/glibc -> virtual/libc
+
+*detect-0.9.72 (15 Sep 2002) 
+
+  15 Sep 2002; Bart Verwilst <verwilst@gentoo.org>:
   
   Initial ebuild.
diff --git a/sys-libs/detect/Manifest b/sys-libs/detect/Manifest
index e69de29bb2d1..f76e2a598a8a 100644
--- a/sys-libs/detect/Manifest
+++ b/sys-libs/detect/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 add5ba23c1692923c79ecaf27bfe3411 ChangeLog 560
+MD5 086ace929b371946e01cf28457492d93 detect-0.9.72.ebuild 976
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 8861af0d18236fbf10c7754660853ed1 files/digest-detect-0.9.72 140
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBaJ8THTu7gpaalycRAmFHAKCVYyOmcLiZp+l83Y/6R37fnt+mFwCbBWHo
+4daEsn4uVcJaA10mI3nfEF0=
+=oPOY
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/detect/detect-0.9.72.ebuild b/sys-libs/detect/detect-0.9.72.ebuild
index e7357c2adb1c..2b061a7a976d 100644
--- a/sys-libs/detect/detect-0.9.72.ebuild
+++ b/sys-libs/detect/detect-0.9.72.ebuild
@@ -1,37 +1,41 @@
-# 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/sys-libs/detect/detect-0.9.72.ebuild,v 1.1 2002/09/15 15:37:45 verwilst Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/detect/detect-0.9.72.ebuild,v 1.1.1.1 2005/11/30 09:39:02 chriswhite Exp $
 
-DESCRIPTION="Detect is a library for automatic hardware detection."
+inherit eutils
+
+DESCRIPTION="library for automatic hardware detection"
 HOMEPAGE="http://www.mandrakelinux.com/harddrake/index.php"
-SRC_URI="http://ftp.debian.org/debian/pool/main/d/detect/${P//-/_}.orig.tar.gz 
-http://ftp.debian.org/debian/pool/main/d/detect/${P//-/_}-6.1.diff.gz"
+SRC_URI="mirror://debian/pool/main/d/detect/${P//-/_}.orig.tar.gz
+	mirror://debian/pool/main/d/detect/${P//-/_}-6.1.diff.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
-DEPEND="virtual/glibc"
+IUSE=""
+
+DEPEND="virtual/libc"
+
 S="${WORKDIR}/${PN}"
 
 src_unpack() {
-        unpack ${P//-/_}.orig.tar.gz
-        cd $S
-        gunzip -c ${DISTDIR}/${P//-/_}-6.1.diff.gz | patch -p1
+	unpack ${A}
+	cd ${S}
+	epatch ${WORKDIR}/${P//-/_}-6.1.diff
+	chmod a+rx configure config.sub config.guess
+	sed -i '/include.*genhd\.h/s:.*::' src/{detect.h,disk.c}
 }
 
 src_compile() {
-        ./autogen.sh \
-                --prefix=/usr \
-                --infodir=/usr/share/info \
-                --mandir=/usr/share/man || die "./configure failed"
-        emake || die
+	econf --with-kernel-source="${ROOT}/usr" || die
+	emake || die
 }
 
-src_install () {
-        #make DESTDIR=${D} install || die
-        make \
-                prefix=${D}/usr \
-                mandir=${D}/usr/share/man \
-                infodir=${D}/usr/share/info \
-                install || die
+src_install() {
+	make \
+		DESTDIR="${D}" \
+		localedir="${D}/usr/share/locale" \
+		gnulocaledir="${D}/usr/share/locale" \
+		install || die
 }
 
diff --git a/sys-libs/detect/metadata.xml b/sys-libs/detect/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-libs/detect/metadata.xml
+++ b/sys-libs/detect/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/sys-libs/freeipmi/ChangeLog b/sys-libs/freeipmi/ChangeLog
index 218e373bb5f1..471898d78c5c 100644
--- a/sys-libs/freeipmi/ChangeLog
+++ b/sys-libs/freeipmi/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-libs/freeipmi
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/ChangeLog,v 1.1 2005/03/25 09:36:43 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/ChangeLog,v 1.1.1.1 2005/11/30 09:39:08 chriswhite Exp $
+
+  24 May 2005; Tom Martin <slarti@gentoo.org> freeipmi-0.1.3.ebuild:
+  Marked ~amd64 for tigger^.
+
+  17 May 2005; Robin H. Johnson <robbat2@gentoo.org> freeipmi-0.1.3.ebuild:
+  Fix bug #92596.
+
+  29 Mar 2005; Robin H. Johnson <robbat2@gentoo.org> freeipmi-0.1.3.ebuild:
+  Add forgotten guile to RDEPEND.
 
 *freeipmi-0.1.3 (25 Mar 2005)
 
diff --git a/sys-libs/freeipmi/Manifest b/sys-libs/freeipmi/Manifest
index ebc5b9cad2fe..2517a07e66e7 100644
--- a/sys-libs/freeipmi/Manifest
+++ b/sys-libs/freeipmi/Manifest
@@ -1,2 +1,14 @@
-MD5 b75b2f9eb40ac8bb24fc9ad558f3e8f1 freeipmi-0.1.3.ebuild 1142
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e82454730ba7f2eccf132fe4f1db75ee freeipmi-0.1.3.ebuild 1298
+MD5 2fd53b9326f15a7e280fef269b4188a0 ChangeLog 705
+MD5 21cd68602737d7c996bceabf6e62c468 metadata.xml 223
 MD5 ea5c577b9e0721b51347c82db9d85c7c files/digest-freeipmi-0.1.3 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC0DNMBXaUFmZvwyMRAgzGAKCftnxBUn8ezIAouUhTFZc+H1/PngCgntvD
+QItsbnXONpFbcwRwurx4VLk=
+=VB1L
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/freeipmi/freeipmi-0.1.3.ebuild b/sys-libs/freeipmi/freeipmi-0.1.3.ebuild
index 35b405ed0045..27a1d2630fc9 100644
--- a/sys-libs/freeipmi/freeipmi-0.1.3.ebuild
+++ b/sys-libs/freeipmi/freeipmi-0.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/sys-libs/freeipmi/freeipmi-0.1.3.ebuild,v 1.1 2005/03/25 09:36:43 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/freeipmi-0.1.3.ebuild,v 1.1.1.1 2005/11/30 09:39:08 chriswhite Exp $
 
 inherit flag-o-matic
 
@@ -9,28 +9,31 @@ HOMEPAGE="http://www.gnu.org/software/freeipmi/"
 SRC_URI="ftp://ftp.californiadigital.com/pub/freeipmi/download/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-RDEPEND="virtual/libc"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+RDEPEND="virtual/libc
+		dev-util/guile"
 DEPEND="${RDEPEND}
 		virtual/os-headers
+		sys-apps/sed
 		doc? ( virtual/tetex )"
 
 src_unpack() {
 	unpack ${A}
-	sed 's,auth_type_t,output_type_t,' -i.orig ${S}/ipmipower/src/ipmipower_output.c
+	sed 's,auth_type_t,output_type_t,' -i.orig \
+		"${S}/ipmipower/src/ipmipower_output.c"
 }
 
 src_compile() {
 	# this is to make things compile
-	append-flags -DHAVE_VPRINTF=1
+	append-flags "-DHAVE_VPRINTF=1"
 
 	econf || die "econf failed"
 	emake || die "emake failed"
 }
 
 src_install() {
-	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" install || die "emake install failed"
+	emake -j1 DESTDIR="${D}" docdir="/usr/share/doc/${PF}" install || die "emake install failed"
 	dodoc AUTHORS COPYING* ChangeLog DISCLAIMER* NEWS README TODO doc/BUGS
 	# this is a redhat-style init script
 	# I still need to write a Gentoo init script later on
diff --git a/sys-libs/gdbm/ChangeLog b/sys-libs/gdbm/ChangeLog
index 477c8506c9f0..eac3f414cd77 100644
--- a/sys-libs/gdbm/ChangeLog
+++ b/sys-libs/gdbm/ChangeLog
@@ -1,6 +1,123 @@
 # ChangeLog for sys-libs/gdbm
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gdbm/ChangeLog,v 1.1 2002/02/01 21:53:38 gbevin Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gdbm/ChangeLog,v 1.1.1.1 2005/11/30 09:39:06 chriswhite Exp $
+
+*gdbm-1.8.3-r2 (24 Sep 2005)
+
+  24 Sep 2005; Bryan Østergaard <kloeri@gentoo.org> +gdbm-1.8.3-r2.ebuild:
+  Revert changes to src_compile and src_install fixing installation of
+  /usr/include/gdbm.h, bug 106970. Patch by Arndt Wills <arndt@wills-online.de>.
+
+  21 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/gdbm-1.8.3-fix-install-ownership.patch, gdbm-1.8.3-r1.ebuild:
+  Clean up ebuild and fix install permissions #24178.
+
+  10 Sep 2005; Fabian Groffen <grobian@gentoo.org> gdbm-1.8.3-r1.ebuild:
+  Replace "uclibctoolize" with "elibtoolize" and add the bin user/group if on
+  ppc-macos: this user is by default not on OSX.  This fixes this package on
+  ppc-macos.  Reviewed by Azarah.
+
+  16 Apr 2005; <gongloo@gentoo.org> gdbm-1.8.3-r1.ebuild:
+  Stable on ppc-macos.
+
+*gdbm-1.8.0-r5 (03 Apr 2005)
+
+  03 Apr 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +gdbm-1.8.0-r5.ebuild:
+  resurrect version needed by ppc-macos
+
+  07 Dec 2004; Hardave Riar <hardave@gentoo.org> gdbm-1.8.3-r1.ebuild:
+  Stable on mips, dep for bug #66360
+
+  04 Dec 2004; Robert Coie <rac@gentoo.org> gdbm-1.8.3-r1.ebuild:
+  keywording ppc
+
+  12 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> gdbm-1.8.3-r1.ebuild:
+  Stable on sparc
+
+  11 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> gdbm-1.8.0-r5.ebuild:
+  Added darwintoolize.
+
+  09 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> gdbm-1.8.3-r1.ebuild:
+  get_libdir fixes.
+
+  24 Aug 2004; Sven Wegener <swegener@gentoo.org> gdbm-1.8.3-r1.ebuild,
+  gdbm-1.8.3.ebuild:
+  Removed static from IUSE.
+
+  18 Aug 2004; Aron Griffis <agriffis@gentoo.org> gdbm-1.8.3-r1.ebuild:
+  stable on alpha and ia64
+
+*gdbm-1.8.3-r1 (01 Aug 2004)
+
+  01 Aug 2004; Mike Frysinger <vapier@gentoo.org> +gdbm-1.8.3-r1.ebuild:
+  Dont copy over the old library if it is of size 0 bytes; force those unlucky
+  users to revdep-rebuild.
+
+  25 Jul 2004; Mamoru KOMACHI <usata@gentoo.org> gdbm-1.8.0-r5.ebuild:
+  Added to macos.
+
+  24 Jul 2004; Mike Frysinger <vapier@gentoo.org> gdbm-1.8.3.ebuild:
+  Clean up the ebuild a bit and add temp backwards compat #32510.
+
+  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> gdbm-1.8.0-r5.ebuild,
+  gdbm-1.8.3.ebuild:
+  virtual/glibc -> virtual/libc
+
+  02 Jun 2004; Travis Tilley <lv@gentoo.org> gdbm-1.8.3.ebuild:
+  stable on amd64
+
+  23 Mar 2004; Jon Portnoy <avenj@gentoo.org> gdbm-1.8.3.ebuild,
+  gdbm-1.8.0-r5.ebuild :
+  Updated ebuilds to remove invalid : in DEPEND for amd64 conditionals.
+  Also trashed all the use arch && gnuconfig_update junk in favor of 
+  simply running gnuconfig_update for everybody.
+
+  29 Feb 2004; Tom Gall <tgall@gentoo.org> gdbm-1.8.3.ebuild,gdbm-1.8.0-r5.ebuild:
+  add gnuconfig_update for ppc64
+
+*gdbm-1.8.3 (01 Nov 2003)
+
+  01 Nov 2003; Seemant Kulleen <seemant@gentoo.org> gdbm-1.8.3.ebuild:
+  Version bump -- noticed this while fixing the bug mentioned below
+
+  30 Oct 2003; Seemant Kulleen <seemant@gentoo.org> gdbm-1.8.0-r5.ebuild:
+  Many many little fixes -- header fix to remove Chad Huneycutt's name (repoman
+  violation), use epatch from the eutils eclassh, use append-flags from
+  flag-o-matic eclass, switch to econf and einstall syntaxes. Finally, fix
+  SRC_URI to mirror://gnu thanks to: Stony Yakovac <stonyy@tek.com> in bug
+  #32352
+
+  17 Sep 2003; Jon Portnoy <avenj@gentoo.org> gdbm-1.8.0-r5.ebuild :
+  ia64 keywords.
+
+  05 May 2003; Guy Martin <gmsoft@gentoo.org> gdbm-1.8.0-r5.ebuild :
+  Added gnuconfig_update fix in unpack. Fix #20485.
+
+  20 Feb 2003; Zach Welch <zwelch@gentoo.org> gdbm-1.8.0-r5.ebuild :
+  Added arm to keywords. Add gnuconfig_update fix in unpack.
+
+  09 Feb 2003; Guy Martin <gmsoft@gentoo.org> gdbm-1.8.0-r5.ebuild :
+  Added hppa to keywords.
+
+*gdbm-1.8.0-r5 (20 Dec 2002)
+
+  26 Feb 2003; Zach Welch <zwelch@gentoo.org> gdbm-1.8.0-r5.ebuild:
+  add arm keyword
+
+  20 Dec 2002; Jan Seidel <tuxus@gentoo.org> : gdbm-1.8.0-r5
+  Added mips to keywords
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*gdbm-1.8.0-r5 (6 Apr 2002)
+
+  15 Jul 2002; Mark Guertin <gerk@gentoo.org>
+  Added ppc to keywords
+
+  6 Apr 2002; Donny Davies <woodchip@gentoo.org> :
+
+  Fix libgdbm.la to have the correct libdir;  s:/usr/local/lib:/usr/lib:
 
 *gdbm-1.8.0-r4 (1 Feb 2002)
 
diff --git a/sys-libs/gdbm/Manifest b/sys-libs/gdbm/Manifest
index e69de29bb2d1..59dd2c7a62a5 100644
--- a/sys-libs/gdbm/Manifest
+++ b/sys-libs/gdbm/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 046114f372f30d94d173376091d4175a gdbm-1.8.3-r2.ebuild 1444
+MD5 893b34bd914ab4b81e0df07da6818acf ChangeLog 4848
+MD5 c7bef9bbd37f161be399c58c61edef94 files/digest-gdbm-1.8.3-r2 62
+MD5 9ed34cb95efec19c95fbf28a2e7e0986 files/gdbm-1.8.3-fix-install-ownership.patch 1567
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDRI9qgIKl8Uu19MoRAhkrAJ9VpMAOIyGdBVBtyeB5K+CXg5sAhQCfbUS0
+KBLBts638YkjTVq3K3yCswk=
+=Smzg
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/gdbm/gdbm-1.8.3-r2.ebuild b/sys-libs/gdbm/gdbm-1.8.3-r2.ebuild
index b4c3b70331d9..ce046d2b6b96 100644
--- a/sys-libs/gdbm/gdbm-1.8.3-r2.ebuild
+++ b/sys-libs/gdbm/gdbm-1.8.3-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/sys-libs/gdbm/gdbm-1.8.3-r2.ebuild,v 1.1 2005/09/24 11:01:07 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gdbm/gdbm-1.8.3-r2.ebuild,v 1.1.1.1 2005/11/30 09:39:06 chriswhite Exp $
 
-inherit eutils libtool
+inherit eutils libtool multilib
 
 DESCRIPTION="Standard GNU database libraries included for compatibility with Perl"
 HOMEPAGE="http://www.gnu.org/software/gdbm/gdbm.html"
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/gdbm/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ppc-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc-macos ppc64 s390 sh sparc x86"
 IUSE="berkdb"
 
 DEPEND="berkdb? ( sys-libs/db )"
@@ -24,25 +24,20 @@ src_unpack() {
 
 src_compile() {
 	use berkdb || export ac_cv_lib_dbm_main=no ac_cv_lib_ndbm_main=no
-	econf || die
+	econf --includedir=/usr/include/gdbm || die
 	emake || die
 }
 
 src_install() {
-	make INSTALL_ROOT="${D}" install || die
-
-	make \
-	includedir=/usr/include/gdbm \
-	INSTALL_ROOT="${D}" \
-	install-compat || die
-
+	make INSTALL_ROOT="${D}" install install-compat || die
+	mv "${D}"/usr/include/gdbm/gdbm.h "${D}"/usr/include/ || die
 	dodoc ChangeLog NEWS README
 }
 
 pkg_preinst() {
 	# temp backwards support #32510
 	if [[ -e ${ROOT}/usr/$(get_libdir)/libgdbm.so.2 ]] ; then
-		touch "${D}"/usr/$(get_libdir)/libgdbm.so.2
+		touch "${ROOT}"/usr/$(get_libdir)/libgdbm.so.2
 	fi
 }
 
diff --git a/sys-libs/gdbm/metadata.xml b/sys-libs/gdbm/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-libs/gdbm/metadata.xml
+++ b/sys-libs/gdbm/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/sys-libs/gi-detect/ChangeLog b/sys-libs/gi-detect/ChangeLog
index 2f5843bf15d8..d073a58104ba 100644
--- a/sys-libs/gi-detect/ChangeLog
+++ b/sys-libs/gi-detect/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for sys-libs/gi-detect
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gi-detect/ChangeLog,v 1.1 2002/09/15 15:40:54 verwilst Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gi-detect/ChangeLog,v 1.1.1.1 2005/11/30 09:39:10 chriswhite Exp $
 
-*gi-detect-0.1 (15 Sept 2002) Bart Verwilst <verwilst@gentoo.org>:
+  24 Aug 2004; Sven Wegener <swegener@gentoo.org> gi-detect-0.1.ebuild:
+  Added missing IUSE.
+
+*gi-detect-0.1 (15 Sep 2002) 
+
+  15 Sep 2002; Bart Verwilst <verwilst@gentoo.org>:
   
   Initial ebuild.
diff --git a/sys-libs/gi-detect/Manifest b/sys-libs/gi-detect/Manifest
index e69de29bb2d1..0c6f47006540 100644
--- a/sys-libs/gi-detect/Manifest
+++ b/sys-libs/gi-detect/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 36d275a7d14f112b621bea6f19f0fb3e ChangeLog 410
+MD5 c7c78d56ff90008fc17a7b58c3d56d04 gi-detect-0.1.ebuild 656
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 87ca1c24ae679b39c8c300914f2e8c01 files/digest-gi-detect-0.1 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.5 (GNU/Linux)
+
+iD8DBQFBKsDII1lqEGTUzyQRAqMmAKCQJstwmtBaNDj8xH0XH9fdWHfoRQCfdLtj
+kSMP7/qFBL0I1yH0XKx8T8w=
+=9M3x
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/gi-detect/gi-detect-0.1.ebuild b/sys-libs/gi-detect/gi-detect-0.1.ebuild
index c360f14636fa..6161591ae874 100644
--- a/sys-libs/gi-detect/gi-detect-0.1.ebuild
+++ b/sys-libs/gi-detect/gi-detect-0.1.ebuild
@@ -1,6 +1,6 @@
-# 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/sys-libs/gi-detect/gi-detect-0.1.ebuild,v 1.1 2002/09/15 15:40:54 verwilst Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gi-detect/gi-detect-0.1.ebuild,v 1.1.1.1 2005/11/30 09:39:10 chriswhite Exp $
 
 DESCRIPTION="Python interface to detect."
 HOMEPAGE="http://sourceforge.net/projects/linbrew/"
@@ -8,16 +8,16 @@ SRC_URI="mirror://sourceforge/linbrew/GI_Detect-0.1.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
+IUSE=""
 DEPEND="sys-apps/discover
-        sys-libs/detect"
+	sys-libs/detect"
 S="${WORKDIR}/GI_Detect-0.1"
 
 src_compile() {
-        python setup.py build || die
+	python setup.py build || die
 }
 
 src_install () {
-        python setup.py install --root=${D} --prefix=/usr || die
-        dodoc API INSTALL example.py
+	python setup.py install --root=${D} --prefix=/usr || die
+	dodoc API INSTALL example.py
 }
-
diff --git a/sys-libs/gi-detect/metadata.xml b/sys-libs/gi-detect/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-libs/gi-detect/metadata.xml
+++ b/sys-libs/gi-detect/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/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 74e1a267b54a..01225e8f90ea 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,2072 @@
 # ChangeLog for sys-libs/glibc
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.1 2002/02/01 21:53:38 gbevin Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.1.1.1 2005/11/30 09:39:25 chriswhite Exp $
+
+  18 Nov 2005; Mike Frysinger <vapier@gentoo.org> glibc-2.3.6-r1.ebuild:
+  Add support for just installing glibc headers when doing a cross-compile.
+
+*glibc-2.3.6-r1 (14 Nov 2005)
+
+  14 Nov 2005; Martin Schlemmer <azarah@gentoo.org> +glibc-2.3.6-r1.ebuild:
+  Fix building with newer binutils. Fix building on ppc with gcc-4.1.
+
+  12 Nov 2005; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.6.ebuild:
+  Update DEPEND .. we need later binutils. Also update gcc and gcc-config
+  dependencies to be sure.
+
+  11 Nov 2005; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.6.ebuild:
+  Fix pthread manpages not installing with nptl.
+
+*glibc-2.3.6 (10 Nov 2005)
+
+  10 Nov 2005; Martin Schlemmer <azarah@gentoo.org> +glibc-2.3.6.ebuild:
+  New release.
+
+  03 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> glibc-2.3.5-r3.ebuild:
+  Give it some ~sparc keyword
+
+  27 Oct 2005; Michael Hanselmann <hansmi@gentoo.org> glibc-2.3.5-r3.ebuild:
+  Added to ~ppc.
+
+  28 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.5-r3.ebuild:
+  Cleaned up setup_env, and fixed the usage of CFLAGS_<CTARGET>.
+
+*glibc-2.3.5-r3 (27 Oct 2005)
+
+  27 Oct 2005; Mike Frysinger <vapier@gentoo.org> +glibc-2.3.5-r3.ebuild:
+  Fix alpha defunct threads #100259, add support for binutils as-needed
+  #108976, and split timezone data off into another package #109556.
+
+  21 Oct 2005; Tom Gall <tgall@gentoo.org> 
+  glibc-2.3.5-r1.ebuild, glibc-2.3.5-r2.ebuild:
+  going back to ~ppc64 in light of bug #109985
+
+  19 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.4.20041102-r2.ebuild, glibc-2.3.4.20050125-r1.ebuild,
+  glibc-2.3.5.ebuild, glibc-2.3.5-r1.ebuild, glibc-2.3.5-r2.ebuild,
+  glibc-2.3.5.20050421.ebuild, glibc-2.3.5.20050722.ebuild:
+  Removing my devspace as a fallback URI so people stop blaming me about
+  missing distfiles when mirrors fail.
+
+  17 Oct 2005; Joseph Jezak <josejx@gentoo.org> glibc-2.3.5-r2.ebuild:
+  Marked ppc stable.
+
+  14 Oct 2005; Mike Frysinger <vapier@gentoo.org> glibc-2.3.5-r2.ebuild:
+  Filter CFLAGS and force default ABI when cross-compiling.
+
+  11 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.5-r2.ebuild:
+  Set MULTILIB_ABIS to DEFAULT_ABI if ! use multilib.
+
+  08 Oct 2005; Chris PeBenito <pebenito@gentoo.org> glibc-2.3.5-r1.ebuild,
+  glibc-2.3.5-r2.ebuild:
+  Enable SELinux support only on primary ABI on multilib systems.
+
+  08 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.5-r2.ebuild:
+  Exclude 5005_all_enable-multilib-with-cross-compile.patch unless we're
+  building a mips64 crosscompiler as it breaks everything else.
+
+  07 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.5-r2.ebuild, glibc-2.3.5.20050722.ebuild:
+  Don't do get_libdir on crosscompiles except for mips64 since it breaks other
+  targets and only mildly fixes mips64.
+
+  07 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.5-r2.ebuild, glibc-2.3.5.20050421.ebuild,
+  glibc-2.3.5.20050722.ebuild:
+  Don't do the CC setting hack if you've got eselect-compiler as that sets
+  everything up correctly.
+
+  07 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.5-r2.ebuild, glibc-2.3.5.20050722.ebuild:
+  Avoid using CFLAGS_${ABI} for sparc64 as that is deprecated (and won't work
+  with the default eselect-compiler settings).
+
+  07 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.5-r2.ebuild, glibc-2.3.5.20050722.ebuild:
+  Punted some multilib config stuff to multilib.eclass.
+
+*glibc-2.3.5-r2 (06 Oct 2005)
+
+  06 Oct 2005; Mike Frysinger <vapier@gentoo.org> +glibc-2.3.5-r2.ebuild:
+  Push out accumulated fixes and fix amd64 multilib error where
+  C{BUILD,TARGET}_OPT bled across compiles.
+
+  28 Sep 2005; Mike Frysinger <vapier@gentoo.org> glibc-2.3.5-r1.ebuild:
+  Add fix by Fredrik Tolf #86313.
+
+  21 Sep 2005; Mike Frysinger <vapier@gentoo.org> glibc-2.3.5-r1.ebuild:
+  Rework ABI handling for cross-compiles so mips n32/n64 works now with mips64
+  targets.
+
+  21 Sep 2005; Stephen P. Becker <geoman@gentoo.org>
+  glibc-2.3.5.20050722.ebuild:
+  exclude patches 6640_mips_unistd_h-fixes.patch and 
+  6600_mips_librt-mips.patch since the first isn't required anymore, and 
+  the second breaks the glibc compile--note a new, similar patch may be 
+  needed to facilitate transition between old userlands with the GLIBC_2.0 
+  symbol in librt
+
+  18 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> glibc-2.3.5-r1.ebuild:
+  Added to ~ppc.
+
+  16 Sep 2005; Bryan Østergaard <kloeri@gentoo.org>
+  glibc-2.3.4.20041102-r1.ebuild, glibc-2.3.4.20041102-r2.ebuild,
+  glibc-2.3.4.20050125-r1.ebuild, glibc-2.3.5.ebuild, glibc-2.3.5-r1.ebuild,
+  glibc-2.3.5.20050421.ebuild, glibc-2.3.5.20050722.ebuild:
+  Enable nptl on alpha.
+
+  07 Sep 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.5-r1.ebuild:
+  Forcing -j1.  Found -j3 making problems on my u2 =(...
+
+  06 Sep 2005; Markus Rothe <corsair@gentoo.org> glibc-2.3.5-r1.ebuild:
+  Stable on ppc64
+
+  28 Aug 2005; Joshua Kinard <kumba@gentoo.org> glibc-2.3.5-r1.ebuild,
+  glibc-2.3.5.ebuild:
+  Bump 2.3.5 to stable, and 2.3.5-r1 to unstable on mips.
+
+  25 Aug 2005; Martin Schlemmer <azarah@gentoo.org> glibc-2.2.5-r10.ebuild:
+  Add localedef-fix-trampoline.patch, as we have the same issues with a
+  hardened kernel as with 2.3.x and gcc-[34].x.
+
+  21 Aug 2005; MATSUU Takuto <matsuu@gentoo.org> glibc-2.3.5-r1.ebuild:
+  Stable on sh.
+
+  17 Aug 2005; Mike Frysinger <vapier@gentoo.org> glibc-2.3.5-r1.ebuild,
+  glibc-2.3.5.20050421.ebuild, glibc-2.3.5.20050722.ebuild:
+  Make sure we filter all -O flags before we lock down to -O2 #77264.
+
+  16 Aug 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.5-r1.ebuild:
+  Stable on amd64 and x86 to address issues which cropped up since 2.3.5 went
+  stable. This fixes bugs #52374, #85718, #100190.
+
+  10 Aug 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.5-r1.ebuild, glibc-2.3.5.20050421.ebuild,
+  glibc-2.3.5.20050722.ebuild:
+  Fixed USE=profile support... bug #100092.
+
+  04 Aug 2005; Martin Schlemmer <azarah@gentoo.org>
+  glibc-2.3.4.20050125-r1.ebuild, glibc-2.3.5-r1.ebuild,
+  glibc-2.3.5.20050421.ebuild, glibc-2.3.5.20050722.ebuild:
+  Fix typo, bug #101374.
+
+  31 Jul 2005; MATSUU Takuto <matsuu@gentoo.org> glibc-2.3.5-r1.ebuild:
+  Added ~sh to KEYWORDS.
+
+  29 Jul 2005; Mike Frysinger <vapier@gentoo.org> glibc-2.3.5-r1.ebuild:
+  Add patches for SuperH.
+
+  29 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org> glibc-2.3.5.ebuild,
+  glibc-2.3.5-r1.ebuild, glibc-2.3.5.20050421.ebuild,
+  glibc-2.3.5.20050722.ebuild:
+  Fix cross-compilation RDEPENDs
+
+  29 Jul 2005; Guy Martin <gmsoft@gentoo.org> glibc-2.3.2-r12.ebuild,
+  glibc-2.3.3.20040420-r2.ebuild, glibc-2.3.4.20040619-r2.ebuild,
+  glibc-2.3.4.20040808-r1.ebuild, glibc-2.3.4.20041102-r1.ebuild:
+  Fixed hppa no pie patch path.
+
+  29 Jul 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/2.3.4/hppa-no-pie.patch, glibc-2.3.2-r12.ebuild,
+  glibc-2.3.3.20040420-r2.ebuild, glibc-2.3.4.20040619-r2.ebuild,
+  glibc-2.3.4.20040808-r1.ebuild, glibc-2.3.4.20041102-r1.ebuild:
+  Add patch to disable building nscd as PIE on hppa since PIE support is
+  broken in glibc for parisc.
+
+  26 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.5-r1.ebuild:
+  Remove a nested function from iconvconfig to make it play nicer for hardened
+  users. Closes bug #85718.
+
+  24 Jul 2005; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.5-r1.ebuild:
+  Add the stripping of the dynamic linker from the snapshot ebuilds, else we
+  cannot set breakpoints in shared libraries. Make sure we only move actual
+  files and not symlinks to the tmp directory.
+
+*glibc-2.3.5.20050722 (24 Jul 2005)
+
+  24 Jul 2005; Martin Schlemmer <azarah@gentoo.org>
+  +glibc-2.3.5.20050722.ebuild:
+  New snapshot release.
+
+  24 Jul 2005; Markus Rothe <corsair@gentoo.org> glibc-2.3.5-r1.ebuild:
+  added ~ppc64
+
+  23 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org> glibc-2.3.5.ebuild,
+  glibc-2.3.5-r1.ebuild:
+  Changed CHOST->CTARGET for 486/586 linuxthreads workaround. Set keywords in
+  2.3.5-r1 to ~amd64 ~sparc ~x86 in prep to remove from package.mask.
+
+  22 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.5-r1.ebuild, glibc-2.3.5.20050421.ebuild:
+  Readded 1040_all_2.3.3-localedef-fix-trampoline.patch which got lost during
+  a glibc bump. Shoud address bug #85718. Also, let --with-__thread be
+  controlled by linuxthread-tls instead of !glibc-compat20.
+
+  17 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org> glibc-2.3.5.ebuild,
+  glibc-2.3.5-r1.ebuild:
+  Workaround for bug #90236 in 2.3.5.  Bump of infopages in 2.3.5-r1.
+
+  15 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org> glibc-2.3.5.ebuild:
+  Stable on x86. This pushes fixes for the nslookup bug and bugs #74555,
+  #87671, #90825, and #98779 plus others into stable on x86.
+
+  15 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org> glibc-2.3.5.ebuild,
+  glibc-2.3.5-r1.ebuild:
+  Removed the PDEPEND on emul-glibc for amd64 as this release (and all future
+  releases) are masked on 2004.3 for amd64.
+
+*glibc-2.3.5-r1 (15 Jul 2005)
+
+  15 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +glibc-2.3.5-r1.ebuild, glibc-2.3.5.20050421:
+  Revision bump to address bugs #52374, #82424, and #95351.  Adds support for
+  the 'profile' USE flag which causes profiling glibc libs to be build.  The
+  glibc-omitfp USE flag is now used instead of the !debug flag and CFLAGS
+  checking to determine if we should pass --enable-omitfp to configure.  The
+  glibc-compat20 USE flag has been introduced to enable the glibc-compat
+  addon and force the linuxthreads glibc to be compiled with
+  --without-__thread.  This will allow better support for legacy (and in some
+  cases "broken") binaries to work with this glibc.  If you aren't using such
+  binaries, you're better off not using this USE flag.  See bug #95351.
+
+  14 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/glibc-2.2.4-string2.h.diff,
+  -files/2.2.5/glibc-2.2.5-alpha-gcc3-fix.diff,
+  -files/2.2.5/glibc-2.2.5-alpha-pcdyn-fix.diff,
+  -files/2.2.5/glibc-2.2.5-arm-errlist-fix.diff,
+  -files/2.2.5/glibc-2.2.5-arm-sysdeps-fix.diff,
+  -files/2.2.5/glibc-2.2.5-divdi3.diff,
+  -files/2.2.5/glibc-2.2.5-dns-network-overflow.diff,
+  -files/2.2.5/glibc-2.2.5-gcc311.patch,
+  -files/2.2.5/glibc-2.2.5-getgrouplist.patch,
+  -files/2.2.5/glibc-2.2.5-ppc-semctl.diff,
+  -files/2.2.5/glibc-2.2.5-ppc-sqrtl.diff,
+  -files/2.2.5/glibc-2.2.5-sandbox.diff,
+  -files/2.2.5/glibc-2.2.5-sparc-mathinline.patch,
+  -files/2.2.5/glibc-2.2.5-sparc-misc.diff,
+  -files/2.2.5/glibc-2.2.5-sparc32-semctl.patch,
+  -files/2.2.5/glibc-2.2.5-sparc64-fixups.diff,
+  -files/2.2.5/glibc-2.2.5-sunrpc-overflow.diff,
+  -files/2.2.5/glibc-2.2.5-threadsig.diff,
+  -files/2.2.5/glibc-2.2.5.divbyzero.patch,
+  -files/2.2.5/glibc-2.2.5.restrict_arr.patch,
+  -files/2.3.1/glibc-2.3.1-elf-machine-rela-mips.patch,
+  -files/2.3.1/glibc-2.3.1-exit-syscall-mips.patch,
+  -files/2.3.1/glibc-2.3.1-inline-syscall-mips.patch,
+  -files/glibc-xdr_security.patch, -glibc-2.3.4.20041102.ebuild,
+  -glibc-2.3.4.20050125.ebuild:
+  Cleaning out some old cruft.
+
+*glibc-2.3.4.20041102-r2 (13 Jul 2005)
+
+  13 Jul 2005; Yuta SATOH <nigoro@gentoo.org>
+  +glibc-2.3.4.20041102-r2.ebuild, glibc-2.3.5.ebuild,
+  glibc-2.3.5.20050421.ebuild:
+  added multilib support on ppc64, bug #97162
+
+  12 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.4.20041102.ebuild, glibc-2.3.4.20041102-r1.ebuild,
+  glibc-2.3.4.20050125.ebuild, glibc-2.3.4.20050125-r1.ebuild,
+  glibc-2.3.5.ebuild, glibc-2.3.5.20050421.ebuild:
+  Changed DEPEND to use ~ instead of >= for glibc so we keep version sync
+  between the packages.
+
+  11 Jul 2005; Martin Schlemmer <azarah@gentoo.org>
+  glibc-2.3.4.20050125-r1.ebuild:
+  Update to support selinux USE flag.
+
+  11 Jul 2005; Martin Schlemmer <azarah@gentoo.org>
+  glibc-2.3.4.20041102-r1.ebuild, glibc-2.3.5.ebuild,
+  glibc-2.3.5.20050421.ebuild:
+  Update to support selinux USE flag (blame spb).
+
+  07 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org> glibc-2.3.5.ebuild:
+  Stable amd64.
+
+  26 Jun 2005; Luca Barbato <lu_zero@gentoo.org> glibc-2.3.5.ebuild:
+  ppc doesn't build correctly with -nptlonly
+
+  16 June 2005; Martin Schlemmer <azarah@gentoo.org>
+  glibc-2.3.4.20050125-r1.ebuild, glibc-2.3.5.20050421.ebuild:
+  Do not backup symlinks for the 'do not strip thread/ld.so libs' action, as
+  it causes issues (basically the 'mv -f' followed the symlink instead of
+  moving it ...).
+
+  14 Jun 2005; Mike Frysinger <vapier@gentoo.org> files/nscd:
+  Add a permission check to nscd init.d #96108 by Paul Ortyl.
+
+  11 Jun 2005; Mike Frysinger <vapier@gentoo.org>
+  glibc-2.3.4.20041102.ebuild, glibc-2.3.4.20041102-r1.ebuild,
+  glibc-2.3.4.20050125.ebuild, glibc-2.3.4.20050125-r1.ebuild,
+  glibc-2.3.5.ebuild, glibc-2.3.5.20050421.ebuild:
+  Add missing popd by Sunil #95736.
+
+  07 Jun 2005; Mike Frysinger <vapier@gentoo.org> files/2.3.5/ssp.c,
+  +files/2.3.5/glibc-2.3.5-propolice-guard-functions.patch,
+  glibc-2.3.5.ebuild:
+  Make sure we dont build ssp.c with stack-protector and disable syslog()
+  until we have a better fix #94325.
+
+  05 Jun 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/2.3.4/glibc234-alpha-xstat.patch, glibc-2.3.4.20041102.ebuild,
+  glibc-2.3.4.20041102-r1.ebuild:
+  Add xstat patch for alpha for kloeri.
+
+  27 May 2005; Bryan Østergaard <kloeri@gentoo.org>
+  glibc-2.3.4.20041102-r1.ebuild:
+  Stable on alpha.
+
+  05 May 2005; Martin Schlemmer <azarah@gentoo.org>
+  glibc-2.3.4.20050125-r1.ebuild, glibc-2.3.5.20050421.ebuild:
+  Do not strip ld.so to enable setting breakpoints in shared libraries (Fix by
+  Lonnie Princehouse).
+
+  03 May 2005; Mike Frysinger <vapier@gentoo.org>
+  glibc-2.3.4.20041102-r1.ebuild, glibc-2.3.4.20050125-r1.ebuild,
+  glibc-2.3.5.ebuild, glibc-2.3.5.20050421.ebuild:
+  Dont try the ld.so test on static binaries #90836 by Vasilii Alferov.
+
+  29 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  glibc-2.3.4.20050125.ebuild, glibc-2.3.4.20050125-r1.ebuild,
+  glibc-2.3.5.ebuild, glibc-2.3.5.20050421.ebuild:
+  Filed in the values for CDEFINE on ppc64; bug #88749
+
+  28 Apr 2005; Markus Rothe <corsair@gentoo.org> glibc-2.3.5.ebuild,
+  glibc-2.3.5.20050421.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  27 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org> glibc-2.3.5.ebuild,
+  glibc-2.3.5.20050421.ebuild:
+  Don't use --enable-omitfp on i[345]86.
+
+  24 Apr 2005; Joshua Kinard <kumba@gentoo.org>
+  glibc-2.3.4.20050125-r1.ebuild, glibc-2.3.5.ebuild:
+  We're a bit dated on mips. Bump 2.3.4.20050125-r1 to stable, and 2.3.5 to
+  unstable.
+
+*glibc-2.3.5.20050421 (23 Apr 2005)
+
+  23 Apr 2005; Martin Schlemmer <azarah@gentoo.org>
+  +glibc-2.3.5.20050421.ebuild:
+  CVS update for gcc-4.0.0 testing.  Added 5090_all_stubs-rule-fix.patch
+  to patches to fix:
+  
+    http://sources.redhat.com/ml/libc-alpha/2005-04/msg00098.html
+
+  13 Apr 2005; Luca Barbato <lu_zero@gentoo.org> glibc-2.3.5.ebuild:
+  Marked ~ppc
+
+*glibc-2.3.5 (12 Apr 2005)
+
+  12 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +glibc-2.3.5.ebuild:
+  Version bump.
+
+  07 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.4.20050125-r1.ebuild:
+  Stop excluding the gcc4 patch.  Put code in pkg_postinst to remove nptl
+  libpthread-*.so if we have linuxthreads glibc.  Sometimes it doesn't get
+  emerged and can cause problems like bug #87671.
+
+  07 Apr 2005; Mike Frysinger <vapier@gentoo.org>
+  glibc-2.3.4.20050125-r1.ebuild:
+  Delete the glibc-compat dir since its useless to us #87739.
+
+  06 Apr 2005; Daniel Ostrow <dostrow@gentoo.org>
+  glibc-2.3.4.20041102-r1.ebuild:
+  Drop to -j1 for hardened ppc64
+
+  03 Apr 2005; Daniel Goller <morfic@gentoo.org>
+  glibc-2.3.4.20050125-r1.ebuild, glibc-2.3.4.20050125.ebuild:
+  marking 20050125 -ppc till breakage can be fixed see bug #87671
+
+  01 Apr 2005; Joseph Jezak <josejx@gentoo.org> glibc-2.3.4.20050125.ebuild,
+  glibc-2.3.4.20050125-r1.ebuild:
+  Added ~ppc for bug #87452.
+
+  31 Mar 2005; Danny van Dyk <kugelfang@gentoo.org>
+  glibc-2.3.4.20050125-r1.ebuild:
+  Fixed gconvdir on multilib arches, BUG #86861.
+
+  23 Mar 2005; Martin Schlemmer <azarah@gentoo.org>
+  glibc-2.3.4.20041102-r1.ebuild, glibc-2.3.4.20050125-r1.ebuild:
+  Fixup copy operations to not replace symlinks with files. Add a fix ala
+  vapier for bug #85555 (more a abort if this glibc is going to kill / than a
+  fix).
+
+  21 Mar 2005; Aron Griffis <agriffis@gentoo.org>
+  glibc-2.3.4.20041102-r1.ebuild:
+  Add ~alpha
+
+  15 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.4.20050125-r1.ebuild:
+  Fix assert in _dl_next_tls_modid-assert (sysdeps/generic/dl-tls.c), bug
+  #52374. Fix building a crosscompiled glibc with nptl when no libc is
+  present. Use --no-archive when creating locales as some apps don't like
+  locale-archive, bug #82106.
+
+*glibc-2.3.4.20041102-r1 (15 Mar 2005)
+
+  15 Mar 2005; Martin Schlemmer <azarah@gentoo.org>
+  +glibc-2.3.4.20041102-r1.ebuild:
+  Fix assert in _dl_next_tls_modid-assert (sysdeps/generic/dl-tls.c), bug
+  #52374. Bump x86 stable.
+
+  15 Mar 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/2.3.4/glibc-2.3.4-fix-_dl_next_tls_modid-assert.patch,
+  glibc-2.3.4.20050125.ebuild:
+  Fix assert in _dl_next_tls_modid-assert (sysdeps/generic/dl-tls.c), bug #52374.
+
+  15 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.4.20050125-r1.ebuild:
+  gcc-4 fix from bug #83403.  Fixes for when CBUILD != CHOST.
+
+  07 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.4.20050125-r1.ebuild:
+  Don't allow sys/kd.h to prevent linux/types.h from loading outside of its
+  context. This fixes a problem with glibc, linux-headers-2.6 and bigendian
+  archs.
+
+  05 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.4.20050125-r1.ebuild:
+  Fixed crosscompile want_nptl. Fixed broken src_install logic which resulted
+  in only nptl version being installed.
+
+  05 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.4.20050125-r1.ebuild:
+  Readded libidn addon missing in 2.3.4.20050125. Use configure option
+  --enable-omitfp if the user has -fomit-frame-pointer in their CFLAGS (before
+  we strip it out).
+
+  04 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.4.20050125-r1.ebuild:
+  A few sparc and multilib fixes with the changing CHOST. Readded warning
+  about crosscompiled glibc needing to be installed first before one can be
+  emerged with nptl. Added some fedora updates (glibc-compat) and an updated
+  mips patch from Kumba.
+
+  19 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.4.20050125-r1.ebuild, glibc-2.3.4.20050125.ebuild:
+  Updated ssp.c in -r1 with patch from bug #65892 thanks to Kevin F. Quinn
+  <co@kevquinn.com>
+
+  16 Feb 2005; Luca Barbato <lu_zero@gentoo.org>
+  glibc-2.3.4.20041102.ebuild:
+  Marked ppc
+
+*glibc-2.3.4.20050125-r1 (15 Feb 2005)
+
+  15 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +glibc-2.3.4.20050125-r1.ebuild, glibc-2.3.4.20050125.ebuild:
+  package.mask'd version bump to fix bugs that cropped up after release. Added
+  hardened patch that got left out of the patch tarball. -r1 unconditionally
+  applies it, and also readds the libidn addon.
+
+  12 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.4.20050125.ebuild:
+  Hack to allow USE=nptl when emerging a crosscompile glibc. More crosscompile
+  fixes for USE="nptl -nptlonly".  Multilib fixes.  Weworked sparc CHOST
+  setting logic to work better with crosscompiling.
+
+  12 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.4.20050125.ebuild:
+  Readd the 'kill -lgcc_eh hack' for static gccs.  Cleaned up crosscompiling
+  support to properly use CHOST and CBUILD, so tc-getCC works right.  Fixed
+  crosscompiling to mips-*
+
+  12 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.4.20050125.ebuild:
+  Added DEPEND for cross-compilation.
+
+  11 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.4.20050125.ebuild:
+  Always grab/unpack the linuxthreads tarball so the infopages can install
+  right. See bug #81661.
+
+  10 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.4.20050125.ebuild:
+  Added infopages. Fixed up cross-compilation for multilib CTARGETS. Don't
+  think we're multilib when crosscompiling for sparc-* or mips-*. Added
+  >=sys-devel/gcc-config-1.3.9 dependency for cross-compile multilib support.
+  Fixed some lib -> $(get_libdir) problems. This should be the final commit
+  before it can come out of package.mask.
+
+  06 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.4.20050125.ebuild:
+  Updated patchset for mips. Removed a few old sed calls from src_unpack which
+  don't do anything any more or were fixed in another way upstream. Adding
+  tested archs: ~mips, ~sparc, ~x86. Still in package.mask.  Added linuxthreads
+  manpages.
+
+  06 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.4.20041102.ebuild:
+  Adding in a fix for people bit by the rsync bug #80591.
+
+*glibc-2.2.5-r10 (06 Feb 2005)
+
+  06 Feb 2005; Mike Frysinger <vapier@gentoo.org> +glibc-2.2.5-r10.ebuild:
+  Clean up ebuild and move manpages/patches to our mirrors.
+
+  05 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.4.20050125.ebuild:
+  Multilibi/Cross-compile cleanups. Makde src_test the tests in both
+  linuxthreads and nptl builds.
+
+*glibc-2.3.4.20050125 (05 Feb 2005)
+
+  05 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +glibc-2.3.4.20050125.ebuild:
+  Version bump to upstream's 2.3.4 final release. Now using a patch tarball
+  instead of ${FILESDIR}. package.mask for testing. Patchset is subject to
+  change while it is in package.mask, so if you test it out during that time,
+  you might want to re-emerge it once it goes into ~arch.
+
+  02 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.4.20041102.ebuild:
+  Stable amd64.
+
+  31 Jan 2005; <plasmaroo@gentoo.org> glibc-2.3.4.20041102.ebuild:
+  Marking stable for the 2005.0 IA64 2005.0 profile to work.
+
+  12 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.4.20040808-r1.ebuild, glibc-2.3.4.20041102.ebuild:
+  Just a few more changes that do nothing on current profiles... Changed
+  multilib-pkg to multilib-pkg-force. Added prep_ml_includes. Added inherit
+  multilib.
+
+  11 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.4.20040619-r2.ebuild, glibc-2.3.4.20040808-r1.ebuild,
+  glibc-2.3.4.20041102.ebuild:
+  Changed linux26-headers depend to accept linux-headers-2.6 as well.
+
+  11 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.4.20040808-r1.ebuild, glibc-2.3.4.20041102.ebuild:
+  A few more multilib fixes and install_locales now uses -j1 as it died on me
+  because of a parallel-make problem.
+
+  11 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.4.20040808-r1.ebuild, glibc-2.3.4.20041102.ebuild:
+  Fix bug #77476 for amd64 building x86 libc.
+
+  10 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.4.20040808-r1.ebuild, glibc-2.3.4.20041102.ebuild:
+  Support MULTILIB_ABIS. Build for all of them by default so multilib archs
+  can have a multilib c++ compiler without usign ugly hacks.
+
+  04 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/2.3.2/glibc-2.3.2-assert.patch, glibc-2.3.2-r12.ebuild:
+  Add patch from upstream to clean up assert.h.
+
+  03 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/2.3.2/glibc-2.3.2-alpha-sysdeps.patch, glibc-2.3.2-r12.ebuild:
+  Backport USE=userlocale support.  Fix building on alpha with 2.6 headers with 
+  patch from upstream #52764 by 0g.
+
+  23 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.4.20040808-r1.ebuild, glibc-2.3.4.20041102.ebuild:
+  Added support for ${ABI} and if it's not set, we do sll ${MULTILIB_ABIS}.
+  This is restricted to the sparc64-multilib PROFILE_ARCH.
+
+  13 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.4.20040808-r1.ebuild, glibc-2.3.4.20041102.ebuild:
+  Added ~sparc to glibc-2.3.4.20040808-r1, but it is masked in the sparc32 and
+  sparc64 PROFILE_ARCHs. Older versions have v9a assembly code that doesn't
+  work with newer binutils. Glibc also isn't quite smart enough to realize
+  that it has v9a assembly, so if it uses the gcc default (v9), it will fail,
+  so we force v9a as flags. I also added the updated logic to 2.3.4.20041102,
+  but as I haven't tested it yet, it hasn't been marked.
+
+  05 Dec 2004; <solar@gentoo.org> glibc-2.3.4.20041102.ebuild:
+  - q/a - missed glibc-2.3.4.20041102 in last fix
+
+  05 Dec 2004; <solar@gentoo.org> glibc-2.3.4.20040808-r1.ebuild:
+  - q/a fix - hppa is the only arch with an upwords growing stack and thus can
+  not use ssp vs being the only arch that can use ssp
+
+  22 Nov 2004; Tom Gall <tgall@gentoo.org> glibc-2.3.4.20041102.ebuild:
+  stable on ppc64
+
+  12 Nov 2004; Joshua Kinard <kumba@gentoo.org>
+  glibc-2.3.4.20040619-r2.ebuild:
+  Tricksy patchesess, mispellses thems we does.
+
+  11 Nov 2004; Joshua Kinard <kumba@gentoo.org>
+  glibc-2.3.4.20040619-r2.ebuild:
+  Forgot to rename a patch in the ebuild.
+
+  10 Nov 2004; Joshua Kinard <kumba@gentoo.org> glibc-2.3.4.20041102.ebuild:
+  Removed line referencing a uneeded patch for mips.
+
+  10 Nov 2004; Joshua Kinard <kumba@gentoo.org>
+  glibc-2.3.4.20040808-r1.ebuild:
+  Masking via keywords directly. 2.3.4.20041102 works for o32 mips, n32 is still
+  experimental and broken, but I don't think it can get much more broken than it
+  is already. Winging it.
+
+  10 Nov 2004; Joshua Kinard <kumba@gentoo.org>
+  +files/2.3.3/glibc-2.3.3-mips-addabi.diff,
+  +files/2.3.3/glibc-2.3.3-mips-nolib3264.diff,
+  +files/2.3.3/glibc-2.3.3-mips-semtimedop.diff,
+  +files/2.3.3/glibc-2.3.3-mips-syscall.h.diff,
+  +files/2.3.3/glibc-2.3.3-mips-sysify.diff, -files/2.3.3/mips-addabi.diff,
+  -files/2.3.3/mips-nolib3264.diff, -files/2.3.3/mips-syscall.h.diff,
+  -files/2.3.3/mips-sysify.diff, -files/2.3.3/semtimedop.diff,
+  +files/2.3.4/glibc-2.3.4-mips-add-missing-sgidefs_h.patch,
+  +files/2.3.4/glibc-2.3.4-mips-prot_grows-undefined.patch,
+  +files/2.3.4/glibc-2.3.4-mips-rtld_deepbind-undefined.patch,
+  +files/2.3.4/glibc-2.3.4-mips-sysdep-cancel.diff,
+  +files/2.3.4/glibc-2.3.4-mips-update-__throw.patch,
+  -files/2.3.4/mips-sysdep-cancel.diff, glibc-2.3.3.20040420-r2.ebuild,
+  glibc-2.3.4.20040619-r2.ebuild, glibc-2.3.4.20040808-r1.ebuild,
+  glibc-2.3.4.20041021.ebuild, glibc-2.3.4.20041102.ebuild:
+  Renamed a few patches to better identify them for mips, masked 2.3.4.20041021,
+  and added a series of patches to 2.3.4.20041102 from libc-alpha ML that allows
+  it to build and usable. Also re-added use of the librt patchs to fix a
+  run-time error.
+
+  05 Nov 2004; Travis Tilley <lv@gentoo.org> glibc-2.3.4.20041102.ebuild:
+  keywording as ~amd64, ~ppc64, ~ia64, and ~x86. added ~ppc keyword thanks to
+  testing by morfic. hopefully this will be the last new revision for a bit.
+
+  05 Nov 2004; Travis Tilley <lv@gentoo.org> glibc-2.3.4.20041021.ebuild,
+  glibc-2.3.4.20041102.ebuild:
+  made the ebuild die if nptlonly is in USE without nptl also being in USE
+
+*glibc-2.3.4.20041102 (04 Nov 2004)
+
+  04 Nov 2004; Travis Tilley <lv@gentoo.org>
+  +files/2.3.4/glibc-2.3.4-features-header-fix.patch,
+  +files/2.3.4/glibc-2.3.4-fedora-branch-nomalloccheck.patch,
+  +files/2.3.4/glibc-2.3.4-mdns-resolver-20041102.diff,
+  +glibc-2.3.4.20041102.ebuild:
+  fedora-branch update. converted version checks to versionator.eclass. moved
+  all instances of CCHOST over to CTARGET. added the ability to disable the
+  malloc check at build-time with USE=nomalloccheck. remove
+  /$(get_libdir)/tls/ in preinst if migrating from nptl to nptlonly (bug
+  69258)
+
+  31 Oct 2004; Tom Gall <tgall@gentoo.org> glibc-2.3.4.20041021.ebuild:
+  build fix for ppc64
+
+  29 Oct 2004; Travis Tilley <lv@gentoo.org>
+  -files/2.3.4/glibc-2.3.3-mdns-resolver.diff,
+  +files/2.3.4/glibc-2.3.3-mdns-resolver2.diff, +files/2.3.4/host.conf,
+  glibc-2.3.4.20041021.ebuild:
+  updated the multicast dns patch from suse and added an example host.conf that
+  disables it by default. see bug 67385 for more info
+
+  29 Oct 2004; Daniel Drake <dsd@gentoo.org> glibc-2.3.4.20041021.ebuild:
+  Add exit condition to prevent more people running into bug 69258
+
+  27 Oct 2004; Travis Tilley <lv@gentoo.org> -glibc-2.3.4.20041006.ebuild,
+  glibc-2.3.4.20041021.ebuild:
+  keyworded 2.3.4.10041021 as testing on amd64, x86, and ppc64. removed the 1006
+  snapshot due to bug 67603, which 1021 fixes.
+
+*glibc-2.3.4.20041021 (26 Oct 2004)
+
+  26 Oct 2004; Travis Tilley <lv@gentoo.org>
+  +files/2.3.4/glibc-2.3.4-fedora-branch-no-force-nontls.patch,
+  +files/2.3.4/glibc-2.3.4-fedora-branch-no-libnoversion.patch,
+  glibc-2.3.4.20041006.ebuild, +glibc-2.3.4.20041021.ebuild:
+  updated to the fedora-branch snap in fedora's 2.3.3-73 src rpm and removed the
+  glibc 2.0 compat (libNoVersion) changes
+
+  19 Oct 2004; Tom Gall <tgall@gentoo.org> glibc-2.3.4.20040808-r1.ebuild:
+  sane fix for problem mentioned below
+
+  16 Oct 2004; Tom Gall <tgall@gentoo.org> glibc-2.3.4.20040808-r1.ebuild:
+  emergancy fix,  code from lv's change on 10/13 h0rked up ppc64 royally
+  and given this is the ppc64 stable version, I'm going to rush this in
+  to avoid the angry mob that's amassing outside my window
+
+  16 Oct 2004; Luca Barbato <lu_zero@gentoo.org>
+  glibc-2.3.4.20041006.ebuild:
+  Marked -ppc has proven to subtle flaw code, probably inline optimizations
+
+  14 Oct 2004; Guy Martin <gmsoft@gentoo.org> glibc-2.3.4.20041006.ebuild:
+  Updated hppa patches to 2004-09-30. Fixed unpacking (#67503). Marked -hppa
+  since it was never tested and problems where reported on the parisc mailing
+  list.
+
+  13 Oct 2004; Guy Martin <gmsoft@gentoo.org> glibc-2.3.4.20040808-r1.ebuild:
+  Moved Lv's latest patch into do_arch{ia64|amd64}_patches() to avoid breakage
+  for other arches.
+
+  13 Oct 2004; Guy Martin <gmsoft@gentoo.org> glibc-2.3.4.20040808-r1.ebuild:
+  Added unset of EPATCH_OPTS in do_arch_hppa_patches to fix patching at later
+  stage.
+
+  12 Oct 2004; Guy Martin <gmsoft@gentoo.org> glibc-2.3.4.20040808-r1.ebuild:
+  Stable on hppa.
+
+  13 Oct 2004; Travis Tilley <lv@gentoo.org> glibc-2.3.4.20040808-r1.ebuild,
+  glibc-2.3.4.20041006.ebuild:
+  it seems the strange libpthread-not-installed bug was an ebuild quirk and not
+  a portage quirk. it should hopefully be fixed now. i've also added a safety
+  function to 2.3.4.20040808 and 2.3.4.20041006 that will prevent glibc from
+  installing if libpthread is missing, which will likely be expanded further in
+  the future. re-keyworded 2.3.4.20041006 ~amd64.
+
+  12 Oct 2004; Travis Tilley <lv@gentoo.org> glibc-2.3.4.20041006.ebuild:
+  keyworded -amd64 for libpthread bug.
+
+  11 Oct 2004; <solar@gentoo.org> glibc-2.3.4.20040808-r1.ebuild:
+  marked 20040808-r1 stable x86 for 2004.3
+
+  11 Oct 2004; Travis Tilley <lv@gentoo.org> glibc-2.3.4.20041006.ebuild:
+  re-keyword as testing for x86, amd64, hppa, ppc64, and ppc
+
+  10 Oct 2004; Travis Tilley <lv@gentoo.org>
+  +files/2.3.4/glibc-2.3.4-res_init.patch, glibc-2.3.4.20040808-r1.ebuild:
+  added fix for a relocation error on at least amd64 and ia64. see
+  http://sources.redhat.com/ml/libc-alpha/2004-08/msg00076.html for more info.
+  closes bug 66396.
+
+*glibc-2.3.2-r12 (07 Oct 2004)
+
+  07 Oct 2004; Travis Tilley <lv@gentoo.org>
+  +files/2.3.3/glibc-2.3.3-tempfile.patch, -glibc-2.3.2-r11.ebuild,
+  +glibc-2.3.2-r12.ebuild, -glibc-2.3.3.20040420-r1.ebuild,
+  +glibc-2.3.3.20040420-r2.ebuild, -glibc-2.3.4.20040619-r1.ebuild,
+  +glibc-2.3.4.20040619-r2.ebuild, +glibc-2.3.4.20040808-r1.ebuild,
+  -glibc-2.3.4.20040808.ebuild, glibc-2.3.4.20041006.ebuild:
+  added a patch to fix insecure tempfile handling, closes bug 66358
+
+*glibc-2.3.4.20041006 (07 Oct 2004)
+
+  07 Oct 2004; Travis Tilley <lv@gentoo.org> -glibc-2.3.4.20041002.ebuild,
+  +glibc-2.3.4.20041006.ebuild:
+  fixed a small bootstrap timezone bug and the group permissions bug (66392)
+
+  04 Oct 2004; Travis Tilley <lv@gentoo.org>
+  +files/2.3.4/glibc-2.3.3-mdns-resolver.diff, glibc-2.3.4.20041002.ebuild:
+  added a patch from suse for multicast dns (rendezvous/howl) support, taken
+  from their glibc-2.3.3-63.src.rpm. closes bug 66295
+
+*glibc-2.3.4.20041002 (04 Oct 2004)
+
+  04 Oct 2004; Travis Tilley <lv@gentoo.org> -glibc-2.3.4.20040928.ebuild,
+  +glibc-2.3.4.20041002.ebuild:
+  updated to the latest fedora-branch snapshot. among other things, this fixes
+  the pthread_mutex_timedwait bug detailed at
+  http://sources.redhat.com/bugzilla/show_bug.cgi?id=417
+
+  01 Oct 2004; Joshua Kinard <kumba@gentoo.org> glibc-2.3.4.20040808.ebuild:
+  Added ~mips to keywords. Only n32 users should see this upgrade, but ONLY if
+  using the newer cascading profiles.
+
+  01 Oct 2004; Joshua Kinard <kumba@gentoo.org>
+  +files/2.3.4/glibc-2.3.4-mips-generate-syscall_h.patch,
+  glibc-2.3.4.20040808.ebuild:
+  Added patch for mips that properly generates bits/syscall.h when using 2.6.x
+  headers. Only enabled for n32 use currently.
+
+  01 Oct 2004; Luca Barbato <lu_zero@gentoo.org>
+  +files/2.3.4/glibc-2.3.4-getcontext.patch, glibc-2.3.4.20040808.ebuild:
+  Fixed getcontext behaviour, the 20040928 has that fixed already
+
+  29 Sep 2004; Mike Frysinger <vapier@gentoo.org> files/nscd,
+  glibc-2.2.5-r9.ebuild, glibc-2.3.2-r11.ebuild,
+  glibc-2.3.3.20040420-r1.ebuild, glibc-2.3.4.20040619-r1.ebuild,
+  glibc-2.3.4.20040808.ebuild, glibc-2.3.4.20040928.ebuild:
+  Install the nscd init.d script #43076 by Rui Malheiro.
+
+*glibc-2.3.4.20040928 (28 Sep 2004)
+
+  28 Sep 2004; Travis Tilley <lv@gentoo.org>
+  +files/2.3.4/glibc-2.3.4-dl_execstack-PaX-support.patch,
+  +files/2.3.4/glibc-sec-hotfix-20040916.patch, +glibc-2.3.4.20040928.ebuild:
+  new snapshot, masked -*, with fedora-branch patches. made nptl-enabled glibc
+  behave like the glibc in most other distributions, with nptl libs in lib/tls
+  and a fallback linuxthreads version in lib. If the linuxthreads fallback isnt
+  needed/wanted, you can revert to the old behavior by adding nptlonly to USE to
+  save yourself some compile time.
+
+  21 Sep 2004; Travis Tilley <lv@gentoo.org> glibc-2.3.4.20040808.ebuild:
+  stable on amd64
+
+  21 Sep 2004; Travis Tilley <lv@gentoo.org>
+  -files/2.3.4/glibc-2.3.4-fix-broken-ldd.patch,
+  +files/2.3.4/glibc-2.3.4-nptl-pthread.h-g++-fix.patch,
+  glibc-2.3.4.20040808.ebuild, -glibc-2.3.4.20040918.ebuild:
+  removed 0918 snapshot, it will occasionally cause processes to not return.
+  fixes bug 64787. backported the necessary nptl pthread header fix from it to
+  0808.
+
+  21 Sep 2004; Travis Tilley <lv@gentoo.org>
+  +files/2.3.4/glibc-2.3.4-fix-broken-ldd.patch, glibc-2.3.4.20040918.ebuild:
+  added a fix for the new snapshot's broken ldd. fixes bug 64732.
+
+  19 Sep 2004; Joshua Kinard <kumba@gentoo.org>
+  glibc-2.3.4.20040619-r1.ebuild:
+  QA fix: Added n32/n64 to IUSE.
+
+*glibc-2.3.4.20040918 (19 Sep 2004)
+
+  18 Sep 2004; Travis Tilley <lv@gentoo.org> -glibc-2.3.4.20040916.ebuild,
+  +glibc-2.3.4.20040918.ebuild:
+  new snapshot, fixes building with 2.4. go team upstream support.
+
+  17 Sep 2004; Travis Tilley <lv@gentoo.org> glibc-2.3.4.20040916.ebuild:
+  removed keywords for archs that still use a 2.4 kernel, since recent nscd
+  changes require 2.6 headers
+
+*glibc-2.3.4.20040916 (16 Sep 2004)
+
+  16 Sep 2004; Travis Tilley <lv@gentoo.org>
+  +files/glibc-sec-hotfix-20040916.patch, +glibc-2.3.4.20040916.ebuild:
+  new snapshot. among other things it fixes a bug with pthreads.h being unable
+  to be parsed by any version of GNU C++.
+
+  06 Sep 2004; Travis Tilley <lv@gentoo.org>
+  +files/2.3.4/glibc-gentoo-libdir.patch, glibc-2.3.4.20040808.ebuild:
+  added $(get_libdir) support for amd64 and x86 and changed locale building
+  logic to build user-specified locales only if USE=userlocales. fixes bug 62081
+
+  06 Sep 2004; <solar@gentoo.org> files/glibc-sec-hotfix-20040804.patch,
+  glibc-2.3.3.20040420-r1.ebuild, glibc-2.3.4.20040619-r1.ebuild:
+  added LD_TRACE_PRELINKING to list of sysdeps/generic/unsecvars.h to avoid info
+  leaking with suid apps
+
+  06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org>
+  glibc-2.3.4.20040619-r1.ebuild, glibc-2.3.4.20040808.ebuild:
+  Switch to use epause and ebeep, bug #62950
+
+  31 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  glibc-2.3.3.20040420-r1.ebuild:
+  Stable on sparc
+
+  30 Aug 2004; Guy Martin <gmsoft@gentoo.org> glibc-2.3.4.20040808.ebuild:
+  Updated hppa patches to 2004-08-24.
+
+  27 Aug 2004; Travis Tilley <lv@gentoo.org> -glibc-2.3.4.20040605.ebuild:
+  removed old ebuild
+
+  27 Aug 2004; Travis Tilley <lv@gentoo.org> glibc-2.3.4.20040619-r1.ebuild,
+  glibc-2.3.4.20040808.ebuild:
+  removed broken downgrade check, removed unneeded hardened gcc fixes, added
+  glibc-2.3.4-ld.so-brk-fix.patch to glibc-2.3.4.20040619-r1
+
+  26 Aug 2004; Tom Gall <tgall@gentoo.org> glibc-2.3.4.20040808.ebuild:
+  stable on ppc64
+
+  26 Aug 2004; Luca Barbato <lu_zero@gentoo.org> glibc-2.3.4.20040808.ebuild:
+  Marked ~ppc
+
+  18 Aug 2004; Ferris McCormick <fmccor@gentoo.org>
+  glibc-2.3.3.20040420-r1.ebuild:
+  Add 'hardened' to the IUSE list. The ebuild uses it on sparc as an indicator
+  that the compiler was built hardened, and so special care must be taken in the
+  build of the library to avoid SegFaults from the startup routines crt1.o &
+  friends. The main purpose for this change is to emphasize the point for anyone
+  building the library on sparc with hardened gcc; there is no change in
+  functionality.
+
+  17 Aug 2004; Luca Barbato <lu_zero@gentoo.org>
+  glibc-2.3.4.20040619-r1.ebuild:
+  Marked ~ppc
+
+  16 Aug 2004; Travis Tilley <lv@gentoo.org>
+  +files/2.3.4/glibc-2.3.4-ld.so-brk-fix.patch, glibc-2.3.4.20040808.ebuild:
+  added ld.so brk patch, which should fix the upstream bug detailed at
+  http://sources.redhat.com/bugzilla/show_bug.cgi?id=227
+
+  15 Aug 2004; Travis Tilley <lv@gentoo.org> -glibc-2.3.3_pre20040207.ebuild:
+  removed ebuild now that alpha and ia64 dont use it
+
+  15 Aug 2004; Aron Griffis <agriffis@gentoo.org>
+  glibc-2.3.3_pre20040207.ebuild:
+  Remove ~alpha and ~ia64 from glibc-2.3.3_pre20040207. We'll stick with stable
+  on those arches until we get new livecds released.
+
+  15 Aug 2004; Travis Tilley <lv@gentoo.org> -glibc-2.3.4.20040605-r1.ebuild,
+  -glibc-2.3.4.20040619.ebuild:
+  cleanup unneeded 2.3.4 ebuilds
+
+  15 Aug 2004; <solar@gentoo.org> glibc-2.3.3.20040420.ebuild,
+  glibc-2.3.3_pre20040420.ebuild:
+  removed a few unneeded ebuilds
+
+  12 Aug 2004; Joshua Kinard <kumba@gentoo.org>
+  glibc-2.3.4.20040619-r1.ebuild:
+  Bumped glibc-2.3.4.20040619-r1 to stable for the hotfix (Bug #59526).
+
+  11 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  glibc-2.3.3.20040420-r1.ebuild:
+  Keyworded ~sparc
+
+  11 Aug 2004; Ilya A. Volynets-Evenbach <iluxa@gentoo.org>
+  glibc-2.3.4.20040808.ebuild:
+  Latest GLIBC cvs has most of what is needed for N32/N64
+
+  11 Aug 2004; Michael Hanselmann <hansmi@gentoo.org>
+  glibc-2.3.3.20040420-r1.ebuild:
+  Stable on ppc.
+
+  11 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> glibc-2.3.2-r11.ebuild:
+  Stable on alpha, bug 59526.
+
+  09 Aug 2004; Guy Martin <gmsoft@gentoo.org> glibc-2.3.2-r11.ebuild:
+  Stable on hppa.
+
+*glibc-2.3.3.20040420-r1 (09 Aug 2004)
+
+  09 Aug 2004; Brandon Hale <tseng@gentoo.org>
+  +glibc-2.3.3.20040420-r1.ebuild:
+  Make a 20040420-r1 with the patch for x86 stableage.
+
+  09 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> glibc-2.3.2-r11.ebuild:
+  Stable on sparc wrt #59526
+
+  08 Aug 2004; Travis Tilley <lv@gentoo.org> glibc-2.3.4.20040605-r1.ebuild,
+  glibc-2.3.4.20040619-r1.ebuild, glibc-2.3.4.20040619.ebuild,
+  glibc-2.3.4.20040808.ebuild:
+  makecheck fails with sandbox enabled, so i've made the ebuilds die right away
+  if makecheck is in USE and sandbox is in FEATURES. this cannot be fixed by
+  disabling the sandbox from within the ebuild, as the bug occurs if sandbox is
+  loaded at all.
+
+  08 Aug 2004; Travis Tilley <lv@gentoo.org> glibc-2.3.4.20040808.ebuild:
+  made --enable-bind-now the default for all users instead of just hardened users
+
+*glibc-2.3.4.20040808 (08 Aug 2004)
+
+  08 Aug 2004; Travis Tilley <lv@gentoo.org>
+  +files/2.3.4/glibc-2.3.4.20040808-i386-got-fix.diff,
+  +glibc-2.3.4.20040808.ebuild:
+  new snapshot. added function to fix lib64 symlinks on amd64 and moved to using
+  branch updates against 2.3.3
+
+  07 Aug 2004; <agriffis@gentoo.org> glibc-2.3.2-r11.ebuild:
+  stable on ia64 #59526
+
+  08 Aug 2004; Luca Barbato <lu_zero@gentoo.org>
+  glibc-2.3.4.20040619-r1.ebuild:
+  Removed a patch
+
+  07 Aug 2004; <solar@gentoo.org> glibc-2.3.4.20040619-r1.ebuild,
+  files/2.3.3/ssp.c:
+  added some misc #ifdef's to the ssp.c for use with other libcs
+
+  06 Aug 2004; <solar@gentoo.org> glibc-2.3.4.20040619-r1.ebuild:
+  don't disable relro completly when not using hardened as it's still a valid
+  toolchain option
+
+  06 Aug 2004; Travis Tilley <lv@gentoo.org> glibc-2.3.4.20040619-r1.ebuild:
+  stable on amd64 for security fix
+
+  05 Aug 2004; Tom Martin <slarti@gentoo.org> glibc-2.3.2-r11.ebuild:
+  Stable on amd64 for bug 59526.
+
+*glibc-2.3.2-r11 (05 Aug 2004)
+
+  05 Aug 2004; Mike Frysinger <vapier@gentoo.org> +glibc-2.3.2-r11.ebuild:
+  Add hotfix for security issue relating to LD_DEBUG and suid binaries #59526.
+
+*glibc-2.3.4.20040619-r1 (04 Aug 2004)
+
+  04 Aug 2004; Brandon Hale <tseng@gentoo.org>
+  +files/glibc-sec-hotfix-20040804.patch, +glibc-2.3.4.20040619-r1.ebuild:
+  Add hotfix for security issue relating to LD_DEBUG and suid binaries #59526.
+
+  03 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  glibc-2.3.4.20040605.ebuild:
+  fix use invocation
+
+  02 Aug 2004; Mike Frysinger <vapier@gentoo.org> glibc-2.2.5-r9.ebuild,
+  glibc-2.3.2-r10.ebuild, glibc-2.3.4.20040619.ebuild:
+  Dont strip libthread_db and libpthread since it breaks gdb debugging badly
+  #46186.
+
+  26 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  glibc-2.3.4.20040619.ebuild:
+  fix use invocation
+
+  22 Jul 2004; Guy Martin <gmsoft@gentoo.org> glibc-2.3.4.20040619.ebuild:
+  Added hardened stuff for hppa from pappy.
+
+  21 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  glibc-2.3.3.20040420.ebuild:
+  use fewer shells
+
+  21 Jul 2004; Guy Martin <gmsoft@gentoo.org> glibc-2.3.4.20040619:
+  Added patches for hppa.
+
+  20 Jul 2004; Alexander Gabert <pappy@gentoo.org>
+  glibc-2.3.3.20040420.ebuild:
+  added sparc fix for glibc PIC building
+
+  14 Jul 2004; Travis Tilley <lv@gentoo.org> glibc-2.3.3.20040420.ebuild,
+  glibc-2.3.4.20040605-r1.ebuild, glibc-2.3.4.20040619.ebuild:
+  change pentium-m fix to use -mtune=pentium3 instead of -march=pentium4. that
+  should finally fix bug 55696, or at least work around it until upstream has a
+  proper fix
+
+  11 Jul 2004; Tom Gall <tgall@gentoo.org> glibc-2.3.4.20040619.ebuild,
+  glibc-2.3.4.20040605.ebuild:
+  let's try the right section and gussy it up a bit
+
+  11 Jul 2004; Tom Gall <tgall@gentoo.org> glibc-2.3.4.20040619.ebuild:
+  fix bug #56615, ld.so.1 prob on ppc64
+
+  11 Jul 2004; Tom Gall <tgall@gentoo.org> glibc-2.3.4.20040605.ebuild,
+  glibc-2.3.4.20040619.ebuild:
+  fix bug #56615, ld.so.1 prob on ppc64
+
+  11 Jul 2004; Joshua Kinard <kumba@gentoo.org> glibc-2.3.3.20040420.ebuild:
+  Commented out an epatch line referencing a (currently) non-existant patch.
+
+  09 Jul 2004; Travis Tilley <lv@gentoo.org> glibc-2.3.4.20040605-r1.ebuild,
+  glibc-2.3.4.20040605.ebuild, glibc-2.3.4.20040619.ebuild:
+  changed sys-kernel/linux-headers dependency for nptl to linux26-headers
+
+  09 Jul 2004; Travis Tilley <lv@gentoo.org> glibc-2.3.3.20040420.ebuild,
+  glibc-2.3.4.20040605-r1.ebuild, glibc-2.3.4.20040619.ebuild:
+  change -march=pentium-m to -march=pentium4 to work around bug 55696 until
+  upstream has a fix
+
+  08 Jul 2004; Travis Tilley <lv@gentoo.org> glibc-2.3.1-r5.ebuild,
+  glibc-2.3.2-r10.ebuild, glibc-2.3.2-r2.ebuild, glibc-2.3.2-r9.ebuild,
+  glibc-2.3.3.20040420.ebuild, glibc-2.3.3_pre20040207.ebuild,
+  glibc-2.3.3_pre20040420.ebuild, glibc-2.3.4.20040605-r1.ebuild,
+  glibc-2.3.4.20040605.ebuild, glibc-2.3.4.20040619.ebuild:
+  unset LD_RUN_PATH to fix bug 19043
+
+  08 Jul 2004; Travis Tilley <lv@gentoo.org> -glibc-2.3.3_pre20031210.ebuild,
+  -glibc-2.3.3_pre20040117-r1.ebuild, -glibc-2.3.3_pre20040117.ebuild,
+  -glibc-2.3.3_pre20040529.ebuild:
+  removed old _pre ebuilds, except for 2.3.3_pre20040207 which is needed for
+  ~alpha and 2.3.3_pre20040420 which is needed for ~sparc.
+
+  07 Jul 2004; Joshua Kinard <kumba@gentoo.org> glibc-2.3.3.20040420.ebuild:
+  Marked stable on mips.
+
+  05 Jul 2004; Marius Mauch <genone@gentoo.org> glibc-2.2.5-r9.ebuild,
+  glibc-2.3.1-r5.ebuild, glibc-2.3.2-r10.ebuild, glibc-2.3.2-r2.ebuild,
+  glibc-2.3.2-r9.ebuild, glibc-2.3.3.20040420.ebuild,
+  glibc-2.3.3_pre20031210.ebuild, glibc-2.3.3_pre20040117-r1.ebuild,
+  glibc-2.3.3_pre20040117.ebuild, glibc-2.3.3_pre20040207.ebuild,
+  glibc-2.3.3_pre20040420.ebuild, glibc-2.3.3_pre20040529.ebuild,
+  glibc-2.3.4.20040605-r1.ebuild, glibc-2.3.4.20040605.ebuild,
+  glibc-2.3.4.20040619.ebuild:
+  added a downgrade check to pkg_setup for bug #25230.
+
+  27 Jun 2004; Aron Griffis <agriffis@gentoo.org> glibc-2.3.1-r5.ebuild,
+  glibc-2.3.2-r10.ebuild, glibc-2.3.2-r2.ebuild, glibc-2.3.2-r9.ebuild,
+  glibc-2.3.3.20040420.ebuild, glibc-2.3.3_pre20031210.ebuild,
+  glibc-2.3.3_pre20040117-r1.ebuild, glibc-2.3.3_pre20040117.ebuild,
+  glibc-2.3.3_pre20040207.ebuild, glibc-2.3.3_pre20040420.ebuild,
+  glibc-2.3.3_pre20040529.ebuild, glibc-2.3.4.20040605-r1.ebuild,
+  glibc-2.3.4.20040605.ebuild, glibc-2.3.4.20040619.ebuild:
+  QA - fix use invocation
+
+  22 Jun 2004; <solar@gentoo.org> glibc-2.2.5-r9.ebuild,
+  glibc-2.3.1-r5.ebuild, glibc-2.3.2-r10.ebuild, glibc-2.3.2-r2.ebuild,
+  glibc-2.3.2-r9.ebuild, glibc-2.3.3.20040420.ebuild,
+  glibc-2.3.3_pre20031210.ebuild, glibc-2.3.3_pre20040117-r1.ebuild,
+  glibc-2.3.3_pre20040117.ebuild, glibc-2.3.3_pre20040207.ebuild,
+  glibc-2.3.3_pre20040420.ebuild, glibc-2.3.3_pre20040529.ebuild,
+  glibc-2.3.4.20040605-r1.ebuild, glibc-2.3.4.20040605.ebuild,
+  glibc-2.3.4.20040619.ebuild:
+  Added debug to IUSE for all glibc ebuilds, imported
+  pie-nptl-sysdep-shared.patch from bug 52254 #c13
+
+*glibc-2.3.4.20040619 (20 Jun 2004)
+
+  20 Jun 2004; Martin Schlemmer <azarah@gentoo.org>
+  +glibc-2.3.4.20040619.ebuild:
+  Update snapshot to 20040619. Add BRANCH_UPDATE support back, as it appears
+  there will be again official releases, and the snapshot is much less to
+  download for future updates to 2.3.4 ... It should be noted that
+  non-branch-update support was not tested fully, so there might be bugs on next
+  stable upstream release. Also add back testing of linux-headers version, as
+  well as kernel version for NPTL support. Remove stale info pages, else we have
+  ~40 unused files installed. Generate updated manpages tarball, and move it to
+  mirrors rather.
+
+  19 Jun 2004; <malc@gentoo.org> glibc-2.3.4.20040605.ebuild:
+  Mark stable for release on amd64. Complaints to lv@gentoo.org, he made me do it ;-) 
+
+  17 Jun 2004; Luca Barbato <lu_zero@gentoo.org>
+  glibc-2.3.4.20040605-r1.ebuild:
+  Ported the fix to this ebuild
+
+  16 Jun 2004; Luca Barbato <lu_zero@gentoo.org>
+  +files/2.3.4/glibc-2.3.4-nptl-altivec.patch, glibc-2.3.4.20040605.ebuild:
+  Added a patch for ppc, pending some tests
+
+  13 Jun 2004; Travis Tilley <lv@gentoo.org>
+  +files/2.3.4/glibc-2.3.4-hardened-sysdep-shared.patch,
+  glibc-2.3.4.20040605-r1.ebuild:
+  added potential fix for building nptl with a hardened toolchain and did a few
+  more cleanups in the ebuild, like moving ssp-related patches into their own
+  function.
+
+  12 Jun 2004; Tom Gall <tgall@gentoo.org> glibc-2.3.4.20040605.ebuild
+  stable on ppc64 (yeah!)
+
+  12 Jun 2004; Joshua Kinard <kumba@gentoo.org>
+  glibc-2.3.4.20040605-r1.ebuild:
+    - Clean up the usage of paranthesis around groups 
+      of use flag checks (unecessarily invokes a subshell)
+    - And allow a sed command that unconditionally disables 
+      relro for ld.so to fire (it previously only fired if 
+      use build == true or use build == false AND 
+      use hardened == true)
+    - Apply one of the mips patches only if use n32 or 
+      use n64 is true
+    - Add ~mips to KEYWORDS
+
+  11 Jun 2004; Joshua Kinard <kumba@gentoo.org>
+  glibc-2.3.4.20040605-r1.ebuild:
+  More cleanups: move strip-flags and friends into setup_flags where they belong.
+
+  11 Jun 2004; Joshua Kinard <kumba@gentoo.org>
+  glibc-2.3.4.20040605-r1.ebuild:
+  Fixup sparc bits in setup_flags.
+
+*glibc-2.3.4.20040605-r1 (11 Jun 2004)
+
+  11 Jun 2004; Joshua Kinard <kumba@gentoo.org>
+  +glibc-2.3.4.20040605-r1.ebuild:
+  MASSIVE cleanup to glibc's ebuild. Starting with 2.3.4.20040605, the following
+  changes were made:
+  - Moved PaX patches into its own function
+  - Moved all arch-specific patches into their own arch-specific 
+    functions
+  - Archs that lack any patches have empty arch-specific functions 
+    for later use
+  - Hardened/relro/nptl related tweaks moved into its own function
+  - Cleaned up 'if' conditionals and some spacing
+  - Added some missing tweaks that fixed an issue on non-hardened 
+    toolchains w/ nptl where the build would segfault during the 
+    sunrpc subsection of glibc
+
+  10 Jun 2004; Travis Tilley <lv@gentoo.org> glibc-2.3.4.20040605.ebuild:
+  passes "make check" on ppc64, adding ~ppc64 keyword
+
+  10 Jun 2004; Stephen P. Becker <geoman@gentoo.org>
+  glibc-2.3.3_pre20040529.ebuild:
+  removed ~mips keyword
+
+  09 Jun 2004; Travis Tilley <lv@gentoo.org> glibc-2.3.4.20040605.ebuild:
+  the 2.3.4 release needs pre-generated info pages to bootstrap without perl,
+  unlike previous releases that just needed pre-generated man pages. this
+  release is now usable from stage1.
+
+  08 Jun 2004; <solar@gentoo.org> glibc-2.3.3.20040420.ebuild:
+  glibc-2.3.3.20040420 marked stable for upcoming release
+
+  07 Jun 2004; Travis Tilley <lv@gentoo.org> glibc-2.3.4.20040605.ebuild:
+  glibc 2.3.4.20040605 should now pass all tests with USE="-nptl makecheck" on
+  at least amd64. nptl still fails.
+
+  06 Jun 2004; <solar@gentoo.org> glibc-2.3.3.20040420.ebuild:
+  patch source was incorrect for branch update.. bug #53107
+
+  06 Jun 2004; Brandon Hale <tseng@gentoo.org> glibc-2.3.3.20040420.ebuild:
+  Quick fix, epatch for the branch-update was still using the now incorrect PV.
+
+  06 Jun 2004; Brandon Hale <tseng@gentoo.org> -glibc-2.3.2-r11.ebuild,
+  -glibc-2.3.2-r3.ebuild, -glibc-2.3.3_pre20040420-r1.ebuild:
+  Cleanup obsoleted versions.
+
+*glibc-2.3.3.20040420 (06 Jun 2004)
+
+  06 Jun 2004; Brandon Hale <tseng@gentoo.org> +glibc-2.3.3.20040420.ebuild:
+  Update 20040420 snapshot to new naming scheme, add to ~x86.
+
+  05 Jun 2004; Joshua Kinard <kumba@gentoo.org> glibc-2.3.4.20040605.ebuild:
+  for sparc64 systems, export CCHOST as well as CHOST so glibc configures itself
+  properly.
+
+*glibc-2.3.4.20040605 (05 Jun 2004)
+
+  05 Jun 2004; Travis Tilley <lv@gentoo.org>
+  +files/2.3.4/glibc-execstack-disable.patch, -glibc-2.3.4.20040602.ebuild,
+  +glibc-2.3.4.20040605.ebuild:
+  new snapshot. it seems i caught Ulrich Drepper in the middle of a commit with
+  my last snapshot, breaking nptl on x86 and possibly elsewhere.
+
+*glibc-2.3.2-r11 (05 Jun 2004)
+
+  05 Jun 2004; Brandon Hale <tseng@gentoo.org>
+  +files/2.3.2/glibc-2.3.2-frandom-detect.patch,
+  +files/2.3.2/glibc-2.3.2-got-fix.diff,
+  +files/2.3.2/glibc-2.3.2-owl-malloc-unlink-sanity-check.diff,
+  +files/2.3.2/glibc-2.3.2-propolice-guard-functions-v3.patch,
+  +files/2.3.2/glibc-2.3.2-pt_pax.diff,
+  +files/2.3.2/glibc-2.3.2-signal-ssp.diff, +files/2.3.2/ssp.c,
+  +glibc-2.3.2-r11.ebuild:
+  Create an -r11 (-*) with backported patches from 2.3.3_pre, namely owl-unlink
+  checking and updated SSP.
+
+  04 Jun 2004; Ilya A. Volynets-Evenbach <iluxa@gentoo.org>
+  +files/2.3.4/mips-sysdep-cancel.diff, glibc-2.3.4.20040602.ebuild:
+  Finalize n32 fixes (n64 is yet to be tested, but should be
+  piece of cake now)
+  Add ALT_HEADERS variable, which will allows us to point glibc
+  to something other then /usr/lib. This will be needed for
+  x-compilation support.
+
+  04 Jun 2004; Travis Tilley <lv@gentoo.org> glibc-2.3.3_pre20040529.ebuild:
+  stable on amd64
+
+  04 Jun 2004; Ilya A. Volynets-Evenbach <iluxa@gentoo.org>
+  glibc-2.3.3_pre20040420-r1.ebuild, glibc-2.3.4.20040602.ebuild:
+  glibc is not using n32/n64 use flags (yet)
+
+  04 Jun 2004; Ilya A. Volynets-Evenbach <iluxa@gentoo.org>
+  glibc-2.3.4.20040602.ebuild:
+  Mark glibc-2.3.4 as ~mips
+
+  03 Jun 2004; Ilya A. Volynets-Evenbach <iluxa@gentoo.org>
+  +files/2.3.3/mips-addabi.diff, +files/2.3.3/mips-syscall.h.diff,
+  +files/2.3.3/mips-sysify.diff, +files/2.3.3/semtimedop.diff,
+  glibc-2.3.3_pre20040420-r1.ebuild, glibc-2.3.3_pre20040529.ebuild,
+  glibc-2.3.4.20040602.ebuild:
+  Add n32/n64 patches. Some of them are not quite ready, but it
+  shouldn't make any matters worse - o32 should not be affected
+  in any way.
+  Also add ${CHOST} and ${CCHOST} to configure (--build/--host)
+
+  03 Jun 2004; Tom Gall <tgall@gentoo.org> glibc-2.3.3_pre20040529.ebuild:
+  stable on ppc64
+
+  03 Jun 2004; Travis Tilley <lv@gentoo.org> glibc-2.3.4.20040602.ebuild:
+  fixed the ebuild to install all locales if doing a make check and repaired the
+  tarball so that the info pages arent broken
+
+  03 Jun 2004; Jason Eric Huebel <jhuebel@gentoo.org>
+  glibc-2.3.3_pre20040529.ebuild:
+  fixed header dependency based on NPTL use flag
+
+*glibc-2.3.4.20040602 (03 Jun 2004)
+
+  03 Jun 2004; Travis Tilley <lv@gentoo.org> -glibc-2.3.3.20040602.ebuild,
+  +glibc-2.3.4.20040602.ebuild:
+  added an ebuild with a proper version number. new features in this ebuild
+  include the makecheck USE flag for having glibc run tests on itself and the
+  ability to install only the locales that you want. a new configuration file
+  has been added for controlling this feature: /etc/locales.build. a default
+  should be installed when you emerge this version of glibc, please read the
+  comments for a description of this file's format.
+
+  02 Jun 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> glibc-2.3.3_pre20040420-r1.ebuild:
+  Mased stable on ppc
+
+*glibc-2.3.3.20040602 (02 Jun 2004)
+
+  02 Jun 2004; Travis Tilley <lv@gentoo.org> +glibc-2.3.3.20040602.ebuild:
+  new cvs snapshot. this ebuild marks a move from using branch updates against
+  2.3.2 to using actual cvs snapshot tarballs. it also marks a move in the
+  versioning scheme for glibc... since upstream has decided to let distributions
+  choose what they want to release instead of making releases themselves, the
+  pre has been dropped from the version.
+
+  02 Jun 2004; Joshua Kinard <kumba@gentoo.org>
+  glibc-2.3.3_pre20040529.ebuild:
+  Added ~mips to KEYWORDS.
+
+  30 May 2004; Travis Tilley <lv@gentoo.org> glibc-2.3.3_pre20040529.ebuild:
+  adding ~amd64 and ~ppc64 to keywords
+
+  30 May 2004; Travis Tilley <lv@gentoo.org> glibc-2.3.3_pre20040529.ebuild:
+  misc pax/grsec fixes from peter mazinger
+
+*glibc-2.3.3_pre20040529 (29 May 2004)
+
+  29 May 2004; Travis Tilley <lv@gentoo.org> -glibc-2.3.3_pre20040527.ebuild,
+  +glibc-2.3.3_pre20040529.ebuild:
+  new snapshot. this one should build on ppc64
+
+*glibc-2.3.3_pre20040527 (27 May 2004)
+
+  27 May 2004; Travis Tilley <lv@gentoo.org> +glibc-2.3.3_pre20040527.ebuild:
+  update snapshot
+
+  27 May 2004; Travis Tilley <lv@gentoo.org>
+  glibc-2.3.3_pre20040420-r1.ebuild:
+  adding ~amd64 keyword to satisfy gcc 3.4 dep
+
+  17 May 2004; Travis Tilley <lv@gentoo.org>
+  +files/2.3.3/glibc-2.3.3-ssp-gcc34-after-frandom.patch,
+  glibc-2.3.3_pre20040420-r1.ebuild:
+  added fix for compiling SSP with gcc 3.4
+
+*glibc-2.3.3_pre20040420-r1 (14 May 2004)
+
+  14 May 2004; <solar@gentoo.org> glibc-2.3.3_pre20040420-r1.ebuild,
+  files/2.3.3/glibc-2.3.2-propolice-guard-functions-v3.patch,
+  files/2.3.3/glibc-2.3.3-frandom-detect.patch:
+  frandom/SSP implementation for glibc. Adds new 'erandom' flag to IUSE. (-*
+  masked for testing now) bug #50864
+
+  12 May 2004; Alexander Gabert <pappy@gentoo.org> :
+  removing hardened-gcc vintage from some ebuilds
+
+  08 May 2004; Bryan Østergaard <kloeri@gentoo.org>
+  glibc-2.3.3_pre20040420.ebuild:
+  Removed ~alpha, see bug #50301.
+
+  04 May 2004; Ilya A. Volynets-Evenbaks <iluxa@gentoo.org>
+  +files/2.3.3/glibc-2.3.3_pre20040420-mips-dl-machine-calls.diff,
+  +files/2.3.3/glibc-2.3.3_pre20040420-mips-incl-sgidefs.diff,
+  glibc-2.3.3_pre20040420.ebuild:
+  - Remove unneeded patches
+  - Add patch by Thiemo Seufer to include <sgidefs.h> into all
+    files that use _MIPS_SIM. This is required for use with
+    gcc-3.4. Original can be found at
+    http://lists.debian.org/debian-glibc/2003/debian-glibc-200312/msg00201.html
+  - Add compile fix to sysdeps/mips/dl-machine.h
+  - mark as ~mips
+
+  29 Apr 2004; Joshua Kinard <kumba@gentoo.org>
+  glibc-2.3.3_pre20040420.ebuild:
+  Masked on mips until some patches can be dug/cooked/found to fix some issues.
+
+  28 Apr 2004; <solar@gentoo.org> glibc-2.3.3_pre20040420.ebuild,
+  files/2.3.3/glibc-2.3.3-localedef-fix-trampoline.patch:
+  localedef contains nested function trampolines, which trigger segfaults under
+  PaX while building. Adding patch that inlines functions in order to avoid
+  this. Debian Bug (#231438, #198099)
+
+  27 Apr 2004; Mike Frysinger <vapier@gentoo.org> 
+  +files/2.3.2/glibc-2.3.2-arm-bus-defines.patch,
+  +files/2.3.2/glibc-2.3.2-armformat.patch,
+  +files/2.3.2/glibc-2.3.2-arm-doargs.patch,
+  +files/2.3.2/glibc-2.3.2-framestate-USING_SJLJ_EXCEPTIONS.patch,
+  glibc-2.3.2-r10.ebuild:
+  Add a few patches to make glibc compile cleanly on arm.
+
+*glibc-2.3.3_pre20040420 (25 Apr 2004)
+
+  25 Apr 2004; Martin Schlemmer <azarah@gentoo.org>
+  +glibc-2.3.3_pre20040420.ebuild:
+  Update snapshot.
+
+  24 Apr 2004; Joshua Kinard <kumba@gentoo.org>
+  +files/2.3.2/glibc-2.3.2-mips-fix-nested-entend-pairs.patch,
+  glibc-2.3.2-r10.ebuild, glibc-2.3.2-r3.ebuild:
+  Added a patch for mips which fixes a compile bug with newer binutils. Also
+  removed an RDEPEND for portage-1.9.0 which seems to be triggering a bug in
+  repoman. If this change affects anyone, yell at me.
+
+  24 Apr 2004; Joshua Kinard <kumba@gentoo.org>
+  +files/2.3.2/glibc-2.3.2-mips-fix-nested-entend-pairs.patch,
+  glibc-2.3.2-r10.ebuild, glibc-2.3.2-r3.ebuild:
+  Added a patch for mips which fixes a compile bug with newer binutils. Also
+  removed an RDEPEND for portage-1.9.0 which seems to be triggering a bug in
+  repoman. If this change affects anyone, yell at me.
+
+*glibc-2.3.2-r10 (18 Apr 2004)
+
+  18 Apr 2004; Michael McCabe <randy@gentoo.org>
+  +files/2.3.2/glibc-2.3.2-s390-deprecated-ustat-fixup.patch,
+  +glibc-2.3.2-r10.ebuild:
+  Added s390 specific fixes to close bug #47415
+
+  24 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> glibc-2.3.2-r2.ebuild,
+  glibc-2.3.2-r3.ebuild, glibc-2.3.3_pre20031210.ebuild:
+  don't use deprecated ? : use syntax
+
+  18 Mar 2004; <solar@gentoo.org> glibc-2.3.2-r9.ebuild:
+  adding filter-ldflags -pie to stable glibc
+
+  16 Mar 2004; <solar@gentoo.org> glibc-2.3.3_pre20040207.ebuild:
+  glibc fails to link properly with global LDFLAGS=-pie so we filter it with new
+  flag-o-matic function called filter-ldflags
+
+  15 Mar 2004; Joshua Kinard <kumba@gentoo.org> glibc-2.3.2-r9.ebuild:
+  Marked stable on mips (it had ~mips, but someone removed the keyword and
+  didn't leave a Changelog entry on why).
+
+  09 Mar 2004; <agriffis@gentoo.org> glibc-2.3.2-r9.ebuild:
+  stable on alpha and ia64
+
+  02 Mar 2004; Brian Jackson <iggy@gentoo.org> glibc-2.3.2-r9.ebuild:
+  s390 keywords
+
+  01 Mar 2004; Tom Gall <tgall@gentoo.org> glibc-2.3.3_pre20031210.ebuild:
+  added in dependancy for ppc64 headers
+
+  26 Feb 2004; Sven Blumenstein <bazik@gentoo.org> glibc-2.3.2-r9.ebuild:
+  Stable on sparc (was about time).
+
+  25 Feb 2004; Luca Barbato <lu_zero@gentoo.org>
+  glibc-2.3.3_pre20040207.ebuild:
+  Marked ~ppc
+
+  24 Feb 2004; Alexander Gabert <pappy@gentoo.org>
+  glibc-2.3.3_pre20040207.ebuild:
+  added GOTOFF fix from previous glibc release
+
+  24 Feb 2004; Mike Frysinger <vapier@gentoo.org> :
+  Make the only headers info virtual/os-headers since hppa-headers PROVIDEs that.
+
+  23 Feb 2004; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.2-r9.ebuild,
+  files/2.3.2/glibc-2.3.2-ipv6-bytestring-fix.patch:
+  Fix broken reverse resolving for IPv6 addresses, bug #42492. Research done by
+  Bernhard Schmidt <berni@birkenwald.de>.
+
+  12 Feb 2004; <solar@gentoo.org> glibc-2.3.3_pre20040117-r1.ebuild,
+  files/2.3.3/glibc-2.3.3_pre20040117-got-fix.diff:
+  GOTOFF during linking seems to fail to recognize where main() is because it is
+  not visible in the object linked which might not be really legal C but it
+  apparently works anyway. This can be seen when trying to build bind9 as a
+  Position Independent Executable. ie CFLAGS=-fPIC,LDFLAGS=-pie. This patch
+  fixes that. Submitted by the PaX Team
+
+*glibc-2.3.3_pre20040207 (09 Feb 2004)
+*glibc-2.3.3_pre20031210 (09 Feb 2004)
+
+  09 Feb 2004; Brad House <brad_mssw@gentoo.org>
+  glibc-2.3.3_pre20031210.ebuild, glibc-2.3.3_pre20031222.ebuild,
+  glibc-2.3.3_pre20040117.ebuild, glibc-2.3.3_pre20040207.ebuild:
+  glibc 2.3.3_pre release for PPC64. This is the only version that works for
+  ppc64. Current VMX commits have caused later pulls to not work
+
+*glibc-2.3.3_pre20040207 (08 Feb 2004)
+
+  08 Feb 2004; Martin Schlemmer <azarah@gentoo.org>
+  glibc-2.3.3_pre20040207.ebuild,
+  files/2.3.2/glibc-2.3.2-rtld-assert-fix.patch:
+  Update snapshot to 20040207. Fix an assert when running libc.so from
+  commandline, bug #34733.  Add ia64 to nptl arches.
+
+  19 Jan 2004; Mike Frysinger <vapier@gentoo.org> glibc-2.3.2-r9.ebuild :
+  Add back in nptl support since gcc-3.3.2-r5 is now stable.
+
+*glibc-2.3.3_pre20040117-r1 (26 Jan 2004)
+
+  26 Jan 2004; <solar@gentoo.org> glibc-2.3.3_pre20040117-r1.ebuild,
+  files/2.3.3/glibc-2.3.3-owl-malloc-unlink-sanity-check.diff,
+  files/2.3.3/glibc-2.3.3_pre20040117-pt_pax.diff,
+  files/2.3.3/glibc-2.3.3_pre20040117-signal-ssp.diff:
+  added ptpax flags. cosmetic ssp patch and owl unlink sanity to testing
+
+  19 Jan 2004; Mike Frysinger <vapier@gentoo.org> glibc-2.3.2-r9.ebuild :
+  Remove nptl support since people dont understand nptl and this is now x86 stable.
+  See Bug #38622 for some good examples.  This is OK because 2.3.3_preXXX has
+  nptl support and it's unstable and it covers all the archs 2.3.2-r9 does.
+
+*glibc-2.3.3_pre20040117 (18 Jan 2004)
+
+  18 Jan 2004; Martin Schlemmer <azarah@gentoo.org>
+  glibc-2.3.3_pre20040117.ebuild:
+  Update snapshot to 20040117.
+
+  18 Jan 2004; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.2-r9.ebuild:
+  Mark stable for x86.
+
+  18 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> glibc-2.3.2-r9.ebuild:
+  PDEPEND on new linux-headers version on ppc
+
+  16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> glibc-2.3.2-r9.ebuild:
+  set ppc in keywords
+
+  10 Jan 2004; Aron Griffis <agriffis@gentoo.org> glibc-2.3.2-r9.ebuild:
+  stable on alpha for bug 37595... alpha really needs execstack-PaX-support.patch
+
+  09 Jan 2004; Luca Barbato <lu_zero@gentoo.org> glibc-2.3.2-r9.ebuild:
+  Marked ~ppc
+
+*glibc-2.3.3_pre20031222 (27 Dec 2003)
+
+  16 Jan 2004; Guy Martin <gmsoft@gentoo.org> glibc-2.3.3_pre20031222.ebuild :
+  Removed some patches which did not apply for hppa.
+
+  27 Dec 2003; Martin Schlemmer <azarah@gentoo.org>
+  glibc-2.3.3_pre20031222.ebuild:
+  Update snapshot to 20031222. Change code that searches for proper headers to
+  look first in /usr/include again.
+
+*glibc-2.3.3_pre20031212 (14 Dec 2003)
+
+  14 Dec 2003; Martin Schlemmer <azarah@gentoo.org>
+  glibc-2.3.3_pre20031212.ebuild,
+  files/2.3.3/glibc-2.3.3-dl_execstack-PaX-support.patch:
+  Update snapshot to 20031212, pre-release of 2.3.3.
+
+  29 Nov 2003; Brad House <brad_mssw@gentoo.org> glibc-2.3.2-r9.ebuild:
+  mark stable on amd64
+
+  23 Nov 2003; Tavis Ormandy <taviso@gentoo.org> glibc-2.3.2-r3.ebuild,
+  glibc-2.3.2-r8.ebuild, glibc-2.3.2-r9.ebuild:
+  glibc refuses to build with --relax in LDFLAGS.
+
+  20 Nov 2003; Aron Griffis <agriffis@gentoo.org> glibc-2.3.2-r8.ebuild:
+  Mark stable on alpha
+
+*glibc-2.3.2-r9 (18 Nov 2003)
+
+  08 Dec 2003; Guy Martin <gmsoft@gentoo.org> glibc-2.3.2-r9.ebuild :
+  Marked stable on hppa.
+
+  19 Nov 2003; Guy Martin <gmsoft@gentoo.org> glibc-2.3.2-r9.ebuild :
+  Added clean hppa patches. Seems not to suffer of the -r8 problems.
+
+  18 Nov 2003; Guy Martin <gmsoft@gentoo.org> glibc-2.3.2-r9.ebuild :
+  Removed hppa stuff. New patching method should come shortly.
+
+  18 Nov 2003; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.2-r9.ebuild:
+  - Update CVS branch to 20031115.
+  - With latest versions of glibc, a lot of apps failed on a PaX enabled
+  system with "cannot enable executable stack as shared object requires:
+  Permission denied".  This is due to PaX 'exec-protecting' the stack, and
+  ld.so then trying to make the stack executable due to some libraries not
+  containing the PT_GNU_STACK section.  Add dl_execstack-PaX-support.patch,
+  bug #32960.
+  - We do not want name_insert() in iconvconfig.c to be defined inside
+  write_output() as it causes issues with PaX.
+
+*glibc-2.3.1-r5 (16 Nov 2003)
+
+  16 Nov 2003; Martin Schlemmer <azarah@gentoo.org> glibc-2.2.5-r9.ebuild,
+  glibc-2.3.1-r5.ebuild, glibc-2.3.2-r2.ebuild, glibc-2.3.2-r3.ebuild,
+  files/2.2.5/glibc-2.2.5-getgrouplist.patch,
+  files/2.3.1/glibc-2.3.1-ftw.patch,
+  files/2.3.1/glibc-2.3.1-getgrouplist.patch,
+  files/2.3.2/glibc-2.3.2-dl_execstack-PaX-support.patch,
+  files/2.3.2/glibc-2.3.2-iconvconfig-name_insert.patch,
+  files/2.3.2/glibc-2.3.2-propolice-guard-functions-v2.patch,
+  files/2.3.2/glibc-2.3.2-propolice-guard-functions.patch:
+  - A bug in the getgrouplist function can cause a buffer overflow if the size
+  of the group list is too small to hold all the user's groups.  More info can
+  be found at:  https://rhn.redhat.com/errata/RHSA-2003-325.html
+  - Fix a memory leak in ftw_dir
+  - To circumvent problems with propolice when linking binaries statically among
+  things, __guard and __guard_setup__stack_smash_handler is now in libc.so. More
+  info at: http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml
+  Thanks for helping in developing these patchsets goes to "moid" from the
+  Openbsd team.
+  - We do not want name_insert() in iconvconfig.c to be defined inside
+  write_output() as it causes issues with PaX.
+
+  09 Nov 2003; Mike Frysinger <vapier@gentoo.org> :
+  Fix sscanf.c compilation.  This tiny patch can be found in 2.3.2 already.
+
+  01 Nov 2003; Aron Griffis <agriffis@gentoo.org> glibc-2.3.2-r8.ebuild,
+  files/2.3.2/glibc-2.3.2-alpha-crti.patch,
+  files/2.3.2/glibc-2.3.2-alpha-pwrite.patch:
+  Add crti and pwrite patches for alpha
+
+  28 Oct 2003; Guy Martin <gmsoft@gentoo.org> glibc-2.3.2-r8.ebuild :
+  Added depend to >=hppa-headers-2.4.21_p13 for succefull compilation.
+
+  27 Oct 2003; Guy Martin <gmsoft@gentoo.org> glibc-2.3.2-r8.ebuild :
+  Added patches for hppa. This glibc correct many bugs like the -static flag one.
+
+  27 Oct 2003; Martin Schlemmer <azarah@gentoo.org> files/nscd:
+  We need to pass '--pidfile' and not '--pid' to start-stop-daemon, thanks to
+  Markus Rippl <markus.rippl@iconparc.de> for reporting.
+
+  26 Oct 2003; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.2-r8.ebuild:
+  Remove the sysmacros.h hack, as it is no longer needed.
+
+  26 Oct 2003; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.2-r3.ebuild,
+  glibc-2.3.2-r4.ebuild, glibc-2.3.2-r5.ebuild, glibc-2.3.2-r8.ebuild:
+  Add sparch to NPTL archs; Cleanup.
+
+*glibc-2.3.2-r8 (26 Oct 2003)
+
+  18 Nov 2003; Guy Martin <gmsoft@gentoo.org> glibc-2.3.2-r8.ebuild :
+  Marked -hppa and removed hppa stuff from it.
+
+  26 Oct 2003; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.2-r8.ebuild:
+  Update snapshot.
+
+  18 Oct 2003; Brad House <brad_mssw@gentoo.org> glibc-2.3.2-r6.ebuild:
+  add ~amd64 flag to glibc-2.3.2-r6, works with and without nptl enabled in use
+  flags
+
+  15 Oct 2003; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.2-r1.ebuild,
+  glibc-2.3.2-r7.ebuild:
+  Sparc updates from Kumba <kumba@gentoo.org>:
+  
+    glibc-2.3.2-r1:  Change ~sparc -> sparc in keywords
+    glibc-2.3.2-r7:  Add ~sparc to keywords
+                     Remove the following patch for mips to let
+		     glibc compile:
+		     ${P}-mips-fix-n32-n64-sysdep-headers.patch
+
+  15 Oct 2003; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.2-r6.ebuild:
+  Mark as unstable for x86 - we should start wider testing sooner or later, and
+  except for an occasional break, current CVS snapshots looks good.
+
+*glibc-2.3.2-r7 (14 Oct 2003)
+
+  19 Nov 2003; Guy Martin <gmsoft@gentoo.org> glibc-2.3.2-r7.ebuild :
+  Added missing atomicity patch for hppa.
+
+  18 Nov 2003; Guy Martin <gmsoft@gentoo.org> glibc-2.3.2-r7.ebuild :
+  Readded for hppa only. Added hppa patches and depend to correct
+  hppa-headers.
+
+  14 Oct 2003; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.2-r7.ebuild:
+  Update CVS snapshot.  NPTL is now in official CVS.
+
+  13 Oct 2003; Tavis Ormandy <taviso@gentoo.org> glibc-2.3.2-r1.ebuild:
+  Downgrading glibc had some unintentional side effects, stable again.
+
+  10 Oct 2003; Alexander Gabert <pappy@gentoo.org> glibc-2.3.1-r4.ebuild,
+  glibc-2.3.2-r1.ebuild:
+  changed hardened-gcc build behaviour with CC
+
+  09 Oct 2003; Alexander Gabert <pappy@gentoo.org> glibc-2.3.1-r4.ebuild,
+  glibc-2.3.2-r1.ebuild:
+  added new hardened-gcc flags for hppa
+
+  09 Oct 2003; Alexander Gabert <pappy@gentoo.org> glibc-2.3.1-r4.ebuild,
+  glibc-2.3.2-r1.ebuild:
+  added new hardened-gcc building logic for ppc and sparc
+
+  07 Oct 2003; Aron Griffis <agriffis@gentoo.org> glibc-2.3.2-r1.ebuild:
+  Demote 2.3.2-r1 from alpha to ~alpha since it doesn't build on alpha with
+  recent gcc. We really need the more recent glibc to become available for
+  alpha.
+
+  30 Sep 2003; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.2-r6.ebuild,
+  files/2.3.2/sysmacros.h:
+  Quick fix for last changes to sysmacros.h that breaks a few things like
+  sys-libs/pwdb and xfree among others.
+
+*glibc-2.3.2-r6 (28 Sep 2003)
+
+  28 Sep 2003; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.2-r5.ebuild,
+  glibc-2.3.2-r6.ebuild, files/2.3.2/glibc-2.3.2-ia64-LOAD_ARGS-fixup.patch,
+  files/2.3.2/glibc-2.3.2-mips-add-n32-n64-sysdep-cancel.patch,
+  files/2.3.2/glibc-2.3.2-mips-configure-for-n64-symver.patch,
+  files/2.3.2/glibc-2.3.2-mips-fix-n32-n64-sysdep-headers.patch,
+  files/2.3.2/glibc-2.3.2-mips-pread-linux2.5.patch:
+  Update snapshot to 20030927 and NPTL to 0.60. Add a few patches from Kumba
+  <kumba@gentoo.org> for mips.
+
+*glibc-2.3.2-r5 (20 Sep 2003)
+
+  20 Sep 2003; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.2-r5.ebuild:
+  Update CVS snapshot to 20030919. Update NPTL to 0.59.
+
+  17 Sep 2003; Jon Portnoy <avenj@gentoo.org> glibc-2.3.2-r1.ebuild :
+  ia64 keywords.
+
+  14 Sep 2003; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.2-r4.ebuild,
+  files/2.3.2/glibc-2.3.2-cispeed-cospeed-fix.patch:
+  Fix sparc build issues, patch from glibc-alpha, thanks to <kumba@gentoo.org>.
+
+  13 Sep 2003; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.2-r1.ebuild,
+  glibc-2.3.2-r2.ebuild, glibc-2.3.2-r3.ebuild:
+  Add glibc-2.3.2-fix-omitted-operand-in-mathinline_h.patch to resolve bug
+  #28537.
+
+  08 Sep 2003; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.2-r1.ebuild:
+  Fix gcc DEPEND to be '>=sys-devel/gcc-3.2', and not '=sys-devel/gcc-3.2*'.
+
+*glibc-2.3.2-r4 (07 Sep 2003)
+
+  07 Sep 2003; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.2-r4.ebuild,
+  files/2.3.2/glibc-2.3.2-fix-omitted-operand-in-mathinline_h.patch:
+  Update cvs snapshot to 20030906.  Update nptl to version 0.57.  Add patch
+  for bug #27142.
+
+  12 Aug 2003; Alexander Gabert <pappy@gentoo.org> glibc-2.3.2-r1.ebuild:
+  hppa building fails, linuxthreads/sysdeps/hppa/pt-machine.h is missing proper
+  setup of pthread_descr
+
+  10 Aug 2003; Joshua Kinard <kumba@gentoo.org> glibc-2.3.2-r1.ebuild:
+  Moved to stable on mips.  Been using it for ages w/ no problems.
+
+  10 Aug 2003; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.2-r2.ebuild,
+  glibc-2.3.2-r3.ebuild, files/fix-sysctl_h.patch, files/test-sysctl_h.c:
+  Add test to detect broken headers in (user land) in 2.5.68 and later.
+
+  31 Jul 2003; <matt@gentoo.org> glibc-2.3.2-r1.ebuild, glibc-2.3.2-r2.ebuild,
+  glibc-2.3.2-r3.ebuild:
+  Removed warning from 2.3.2 ebuilds regarding
+  sandbox and -fstack-protector.  This was only
+  a problem with 2.3.1.
+
+  29 Jul 2003; Alex Veber <coronalvr@gentoo.org> glibc-2.3.2-r1.ebuild:
+  removed the winex block
+
+  28 Jul 2003; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.2-r3.ebuild:
+  Do not install librt.so linker script anymore, as librt.so.1 breaks things
+  with librt.so as a script.
+
+*glibc-2.3.2-r3 (23 Jul 2003)
+
+  23 Jul 2003; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.2-r3.ebuild:
+  Update CVS snapshot, as well as NPTL version to 0.55.  Note that this
+  needs gcc-3.3-r1 and latest binutils (2.14.90.4+) to build with NPTL
+  support.
+
+  23 Jul 2003; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.2-r1.ebuild,
+  glibc-2.3.2-r2.ebuild:
+  From Kumba <kumba@gentoo.org>:
+
+    This is the patch to glibc-2.3.2-r1.ebuild which allows it to build
+    on sparc64.  I modified it so sparc and sparc64 can use the -fcall-used-g6
+    flag, while sparc64-only gets a few more checks added in.
+
+  18 Jul 2003; Olivier Crete <tester@gentoo.org> glibc-2.3.2-r2.ebuild:
+  Removed all traces of multilib, 64bit libs are installed in lib/
+
+  18 Jul 2003; Will Woods <wwoods@gentoo.org> glibc-2.3.2-r1.ebuild:
+  Marked stable for alpha
+
+  17 Jul 2003; Alex Veber <coronalvr@gentoo.org> glibc-2.3.2-r1.ebuild:
+  set !app-emulation/winex-cvs
+
+  16 Jul 2003; Jay Pfeifer <pfeifer@gentoo.org> glibc-2.3.2-r1.ebuild:
+  set stable on x86
+  set !app-emulation/winex
+
+  01 Jul 2003; Luca Barbato <lu_zero@gentoo.org> glibc-2.3.2-r1.ebuild:
+  set stable on ppc
+
+  14 Jun 2003; Tavis Ormandy <taviso@gentoo.org> glibc-2.3.2-r1.ebuild,
+  glibc-2.3.2-r2.ebuild, files/2.3.2/glibc-2.3.2-decc-compaq.patch:
+  fixing ccc compatability, minor patch only applied on alpha.
+
+  05 Jun 2003; Christian Birchinger <joker@gentoo.org> glibc-2.3.1-r4.ebuild:
+  Replaced sparc64 CFLAGS hack with replace-sparc64-flags from flag-o-matic
+
+  02 Jun 2003; Joshua Kinard <kumba@gentoo.org> glibc-2.3.2-r1.ebuild:
+  Added ~mips to KEYWORDS
+
+  18 May 2003; Martin Schlemmer <azarah@gentoo.org> :
+  Fix LICENSE to be LGPL-2, bug #19074.  Fix glibc-2.3* < 2.3.2-r2 to depend
+  on <gcc-3.3.
+
+  18 May 2003; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.2-r1.ebuild,
+  glibc-2.3.2-gcc33-sscanf.patch :
+  Downgrade nptl to version 0.28 and add glibc-2.3.2-gcc33-sscanf.patch to
+  fix compile errors with gcc-3.3:
+
+    http://sources.redhat.com/ml/libc-alpha/2003-03/msg00052.html
+
+*glibc-2.3.2-r2 (18 May 2003)
+
+  18 May 2003; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.2-r2.ebuild :
+  New version.  Update to cvs 20030517 to fix problems with gcc-3.3.  Also
+  closes bug #18744 as it adds the en_US.utf8 locale.  Also enable NPTL
+  support for i[45]86, ppc and mips, as it should in theory work now.
+
+  14 May 2003; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.2-r{0,1}.ebuild :
+
+  Some MIPS updates from Kumba <kumba@gentoo.org>:
+    A few patches only for the MIPS platform.  Descriptions of what they
+    do can be found in the patch headers.
+    <tuxus@gentoo.org> thx <dragon@gentoo.org> (11 Jan 2003)
+    <kumba@gentoo.org> remove tst-rndseek-mips & ulps-mips patches
+
+  06 Apr 2003; Martin Schlemmer <azarah@gentoo.org> :
+  Fix all 2.3 ebuild to install timezone data if 'build' in USE, bug #16530.
+
+*glibc-2.3.2-r1 (06 Apr 2003)
+
+  19 Apr 2003; Joshua Brindle <method@gentoo.org> glibc-2.3.1-r4.ebuild:
+  give error and die if both sandbox and -fstack-protector are enabled
+
+  06 Apr 2003; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.2-r1.ebuild :
+  Fix calculation problems in allocate_static_tls that caused a TLS
+  enabled app that loads libGL.so to segfault.  Thanks to Gareth Hughes
+  from NVidia for pointing me in the right direction.  This patch is
+  from glibc CVS.
+
+  30 Mar 2003; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.2.ebuild :
+  Update NPTL version to 0.29.  As it is not used by many (or I cannot
+  imagine it), and with the errno problems, I will rather not bump the
+  revision.  Note that latest version is 0.32, but that (as well as 0.30
+  and up) needs glibc-2.3.3 snapshot.
+
+*glibc-2.3.1-r4 (21 Mar 2003)
+
+  14 Apr 2003; Joshua Brindle <method@gentoo.org> glibc-2.3.1-r4.ebuild:
+  give error and die if both sandbox and -fstack-protector are enabled
+
+  06 Apr 2003; Zach Welch <zwelch@gentoo.org> glibc-2.3.1-r4.ebuild:
+  add arm keyword
+
+  06 Apr 2003; Christian Birchinger <joker@gentoo.org> glibc-2.3.1-r4.ebuild:
+  Changed replace-flags for sparc
+
+  21 Mar 2003; Daniel Ahlberg <aliz@gentoo.org> glibc-2.3.1-r4.ebuild :
+  Security update.
+
+*glibc-2.2.5-r8 (21 Mar 2003)
+
+  06 Apr 2003; Christian Birchinger <joker@gentoo.org> glibc-2.2.5-r8.ebuild:
+  Added replace-flags for sparc
+
+  21 Mar 2003; Daniel Ahlberg <aliz@gentoo.org> glibc-2.2.5-r8.ebuild :
+  Security update.
+
+  11 Mar 2003; Zach Welch <zwelch@gentoo.org>
+  files/2.2.5/glibc-2.2.5-arm-sysdeps-fix.diff:
+  fix arm sysdep patch to not require autoconf
+
+  09 March 2003; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.1*.ebuild :
+  Add patch glibc-2.3.1-typeo_dl-runtime_c.patch to fix issues with Oracle,
+  bug #16504, thanks to Tri D. Hoang <tdhoang@ultramain.com> for reporting.
+
+*glibc-2.3.2 (05 March 2003)
+
+  06 Apr 2003; Christian Birchinger <joker@gentoo.org> glibc-2.3.2.ebuild:
+  Changed replace-flags for sparc
+
+  11 Mar 2003; Zach Welch <zwelch@gentoo.org> glibc-2.2.5-r7.ebuild,
+  glibc-2.3.1-r2.ebuild, glibc-2.3.1-r3.ebuild, glibc-2.3.2.ebuild:
+  change sys-kernel/linux-headers to new virtual/os-headers
+
+  05 March 2003; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.2.ebuild :
+  Update version.  Thanks to Georg Müller <georgmueller@gmx.net> for notifying
+  me.
+
+*glibc-2.3.2_pre1 (24 Feb 2003)
+
+  24 Feb 2003; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.2_pre1.ebuild :
+  Update version to official pre1 of 2.3.2.  Add NPTL support .. note that
+  this is extremely experimental and does not work with the nvidia drivers
+  among things.  Many other tweak and updates.
+
+  20 Feb 2003; Zach Welch <zwelch@gentoo.org> glibc-2.2.5-r7.ebuild :
+  Added patches for arm. See patches for description of each.
+  Added arm keyword.
+
+  09 Feb 2003; Guy Martin <gmsoft@gentoo.org> :
+  Added patches for hppa. See patches for description of each.
+  Added hppa to keywords.
+
+  29 Jan 2003; Jack Morganan <jmorgan@gentoo.org> glibc-2.3.1-r3.ebuild :
+  Changed ~sparc to sparc
+
+  23 Jan 2003; Jan Seidel <tuxus@gentoo.org> glibc-2.3.1-r3.ebuild :
+  Add MIPS inline-syscall-mips patch
+
+  16 Jan 2003; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.1-r3.ebuild :
+
+  Sync patches.
+
+  15 Jan 2003; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.1-r2.ebuild :
+
+  Fix 'locale -a' not listing all locales.  This to Stefan Jones
+  <cretin@gentoo.org> for this fix, bug #13240.
+
+  Add MIPS patches, thanks to <tuxus@gentoo.org> and <dragon@gentoo.org>.
+
+  Reload init to fix fsck on reboot ...
+
+  28 Dec 2002; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.1-r3.ebuild :
+
+  Always add --with-headers=${ROOT}usr/include as option to ./configure, as
+  linux-headers are usually well tested, and in some cases we get weird
+  problems ...
+
+  16 Dec 2002; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.1-r2.ebuild :
+
+  Add -freorder-blocks for x86 (commented).  Add Method's replace-flags for
+  sparc support.
+
+  13 Dec 2002; Mark Guertin <gerk@gentoo.org> glibc-2.3.1-r2.ebuild :
+  
+  Marked stable for ppc
+
+  10 Dec 2002; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.1-r2.ebuild :
+  
+  Mark as stable for x86.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> :
+
+  Changed sparc ~sparc keywords
+ 
+*glibc-2.3.1-r2 (7 Nov 2002)
+
+  17 Nov 2002; Stefan Jones <cretin@gentoo.org> glibc-2.3.1-r2.ebuild :
+
+  Small patch "prelinkfix" which fixes rare error with prelinking and
+  preloading some executables. Patch taken from glibc CVS.
+  http://sources.redhat.com/ml/libc-alpha/2002-11/msg00151.html
+
+  16 Nov 2002; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.1-r2.ebuild :
+
+  Fix type-o that caused manpages not installing (bug #10645).
+  Update to use epatch.
+
+  16 Nov 2002: Stefan Jones <cretin@gentoo.org> glibc-2.3.1-r2.ebuild :
+  Changed --with-header to --with-headers to fix fake configure option.
+
+  10 Nov 2002: Stefan Jones <cretin@gentoo.org> glibc-2.3.1-r2.ebuild :
+
+  Made sparc64's always use the system linux headers instead of the kernel 
+  headers. This fixes the 64bit sparc compile errors, see bug #10470.
+  
+  7 Nov 2002; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.1-r2.ebuild :
+
+  Second try at ctype-compat.patch.  Add stack_end-compat patch for missing
+  libc_stack_end symbold in linker.
+
+  30 Oct 2002; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.1-r1.ebuild :
+
+  One more compat issue which breaks sun-jdk-1.3.1.  See bug #8766 for more
+  info, and also:
+
+    http://sources.redhat.com/ml/libc-alpha/2002-04/msg00143.html
+
+  Thanks to Jan Gutter <jangutter@tuks.co.za> for reporting it.  Added
+  libc_wait-compat.patch as fix.
+
+*glibc-2.3.1-r1 (26 Oct 2002)
+
+  16 Nov 2002: Stefan Jones <cretin@gentoo.org> glibc-2.3.1-r1.ebuild :
+  Changed --with-header to --with-headers to fix fake configure option.
+  
+  26 Oct 2002; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.1-r1.ebuild :
+
+  Add the ctype-compat.patch to fix unresolved symbols in old static binaries
+  and libraries.  See bug #8766, #9586 and:
+
+    http://lists.debian.org/debian-glibc/2002/debian-glibc-200210/msg00093.html
+
+  We should think about remoing it in the future after things have settled.
+
+*glibc-2.2.5-r7 (13 Oct 2002)
+
+  16 Nov 2002: Stefan Jones <cretin@gentoo.org> glibc-2.2.5-r7.ebuild :
+  Changed --with-header to --with-headers to fix fake configure option.
+  
+  14 Nov 2002; Mark Guertin <gerk@gentoo.org> glibc-2.2.5-r7.ebuild :
+  backed out semctl patches for ppc, they cause problems with mozilla builds
+
+  29 Oct 2002; Jon Nall <nall@gentoo.org> glibc-2.2.5-r7.ebuild :
+
+  Added sqrtl patch for ppc. This closes bug #9796. Also added semctl
+  patch for ppc.
+
+  29 Oct 2002; Seemant Kulleen <seemant@gentoo.org> glibc-2.2.5-r7.ebuild :
+
+  Added semctl patch for sparc.  Thanks to nall <nall@gentoo.org> for
+  finding this at:
+  http://sources.redhat.com/ml/libc-hacker/2002-04/msg00071.html
+
+  13 Oct 2002; Martin Schlemmer <azarah@gentoo.org> glibc-2.2.5-r7.ebuild :
+
+  Some cleanups.  Tidy ebuild.  Move all patches to ${FILESDIR}/${PV/.
+  Remove old patches.
+
+  Add patches to fix warnings with gcc-3.2:
+
+    http://archive.linuxfromscratch.org/mail-archives/lfs-dev/2002/08/0228.html
+
+  13 Oct 2002; Martin Schlemmer <azarah@gentoo.org> glibc-2.2.5-r7.ebuild :
+
+  Fix stupid depend screwup I made when I merged in fixes from glibc-2.3.
+
+  11 Oct 2002; Seemant Kulleen <seemant@gentoo.org> glibc-2.2.5-r7.ebuild
+  files/glibc-2.2.5-sparc-misc.diff files/glibc-2.2.5-sparc64-fixups.diff :
+
+  Added patches from debian's patch set to fix miscellaneous issues on sparc
+  and sparc64.  One indication of the hassle with sparc64 was the mozilla
+  compile failure.  That _should_ be sorted out now.
+
+  09 Oct 2002; Martin Schlemmer <azarah@gentoo.org> glibc-2.2.5-r7.ebuild,
+                                                    glibc-2.2.5-divdi3.diff :
+
+  Add divdi3 patches for PPC, thanks to nall <nall@themountaingoats.net>.
+
+*glibc-2.2.5-r8 (27 Sep 2002)
+  
+  27 Sep 2002; Daniel Ahlberg <aliz@gentoo.org> :
+  Moved -r7 to -r8 to give room for updated -r6 release.
+
+*glibc-2.2.5-r7 (03 Aug 2002)
+
+  27 Sep 2002; Daniel Ahlberg <aliz@gentoo.org> :
+  Bumped -r6 to -r7 to include fix for sunrpc overflow.  
+
+  03 Aug 2002; Martin Schlemmer <azarah@gentoo.org> glibc-2.2.5-r7.ebuild :
+
+  Add the patch for fixing the segfaults in mutt, etc while sandbox is
+  running back in.  Seems the relocation problems was also a cause of
+  the atexit() bug, and fixed in gcc-2.95.3-r7 and later.
+
+   http://sources.redhat.com/ml/bug-glibc/2002-04/msg00025.html
+   http://bugs.gentoo.org/show_bug.cgi?id=501
+
+*glibc-2.2.5-r6 (02 Aug 2002)
+
+  22 Sep 2002; Martin Schlemmer <azarah@gentoo.org> glibc-2.2.5-r6.ebuild :
+
+  Fix pic support, thanks to Christopher Horler <chris@horler.demon.co.uk>.
+  This closes bug #8178.
+
+  08 Sep 2002; Martin Schlemmer <azarah@gentoo.org> glibc-2.2.5-r6.ebuild :
+
+  Add alpha related patches thanks to Bjoern Brauel <bjoern@tuxnetwork.de>.
+
+  02 Aug 2002; Daniel Ahlberg <aliz@gentoo.org>
+  Added patch for sunrpc overflow.
+
+*glibc-2.2.5-r5 (14 Jul 2002)
+
+  15 Jul 2002; Mark Guertin <gerk@gentoo.org>
+  Added ppc to keywords
+
+  14 Jul 2002; Martin Schlemmer <azarah@gentoo.org> glibc-2.2.5-r5.ebuild :
+
+  A buffer overflow vulnerability exists in multiple implementations of DNS
+  resolver libraries.  This affects glibc-2.2.5 and earlier.   See bug #4923
+  and:
+
+    http://www.cert.org/advisories/CA-2002-19.html
+
+  for details.
+
+  Seems gcc-3.1.1 is even more strict than 3.1 .. patch glibc for gcc-3.1.1.
+  This is also correct for previous gcc versions.
+
+*glibc-2.2.5-r4 (5 June 2002)
+
+  5 June 2002; Bart Verwilst <verwilst@gentoo.org> glibc-2.2.5-r4.ebuild :
+
+  Added gcc3.1/binutils 2.12 patch, wich solves the nvidia-glx package, 
+  amongst others... (__divdi3 stuff)
+  Update: Filtered -malign-double out of the ebuild as well now, because 
+  it b0rks glibc.
+  
+
+  13 Apr 2002; M.Schlemmer <azarah@gentoo.org> glibc-2.2.5-r2.ebuild :
+
+  Try to fix the pkg_postinst() and /etc/localtime issue sanely.  It just
+  newking my /etc/localtime with a symlink was starting to get irritating.
+
+*glibc-2.2.5-r3 (03 Apr 2002)
+
+  03 Apr 2002; Geert Bevin <gbevin@gentoo.org> glibc-2.2.5-r3.ebuild,
+  files/digest-glibc-2.2.5-r3, files/glibc-2.2.5-sandbox.diff :
+  
+  Added patch that fixes an ld.so.preload bug which made calls after freopen()
+  segfault. This now works correctly. This closes bug #501
+   
+*glibc-2.2.5-r1 (15 Feb 2002)
+
+  15 Feb 2002; Daniel Robbins <drobbins@gentoo.org>: Added tweaked version of
+  Brandon Low's patch that ensures that library symlinks are installed *after*
+  (not before) the actual libraries are installed.  This should fix glibc merge
+  deaths, but we need a generic solution to solve this problem.  This should
+  close bug #695.  Filing a new bug for adding this functionality to Portage.
+
+*glibc-2.2.5 (10 Feb 2002)
+
+  10 Feb 2002; Daniel Robbins <drobbins@gentoo.org>:  New glibc release for testing
+  only.  Masked.
 
 *glibc-2.2.4-r9 (1 Feb 2002)
 
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index a96a8bd05849..40587429ce30 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,68 +1,149 @@
-MD5 f87141919fc5723aad194a923fb809a9 glibc-2.3.1-r2.ebuild 9670
-MD5 f43c643984440c472205338059589202 glibc-2.3.2-r1.ebuild 15052
-MD5 6c22b1fdc3570ff7a75cd69f08709f5d glibc-2.3.1-r4.ebuild 10472
-MD5 a8447557fe0e36b955ed4af19ea5884b glibc-2.3.2.ebuild 14328
-MD5 9ca3d97fbb9c9b0b3958b00f2959947c glibc-2.2.5-r8.ebuild 9702
-MD5 88d5974e846a9911bcd8ea1eef0e5aa5 glibc-2.3.1-r3.ebuild 10014
-MD5 989e7389a6e31b13022d3be521dc811a glibc-2.2.5-r7.ebuild 9395
-MD5 7111808d24b20d14ea82251f9da47d64 ChangeLog 11792
-MD5 82be016c42c7cc353ee563fcbcbc4769 files/nscd 840
-MD5 135f8145885a2f4f9876fe973f33ddf6 files/glibc-2.2.4-string2.h.diff 5221
-MD5 d688e44731d6e4b757382d7646c492c3 files/glibc-xdr_security.patch 6612
-MD5 c02420990c4908a6336d81ea5192a37e files/glibc-manpages-2.3.1.tar.bz2 14755
-MD5 9cc1e6b6f749dba7c8759bd07266f7d9 files/digest-glibc-2.2.5-r7 143
-MD5 9cc1e6b6f749dba7c8759bd07266f7d9 files/digest-glibc-2.2.5-r8 143
-MD5 439cce38dd07f6669b9bb50f0c211b41 files/digest-glibc-2.3.1-r2 141
-MD5 439cce38dd07f6669b9bb50f0c211b41 files/digest-glibc-2.3.1-r3 141
-MD5 ca905d3e80744237818b2a36abda88be files/digest-glibc-2.3.1-r4 4698
-MD5 e13bb987c07c61465df20c0ae86491e8 files/digest-glibc-2.3.2-r1 4762
-MD5 52cfc7627fc62dfb26d8d163aac361f6 files/glibc-2.2.2-test-lfs-timeout.patch 320
-MD5 b712a49b5113fccb4c8b0ada2a30d390 files/glibc-manpages-2.2.5.tar.bz2 14610
-MD5 457a28df7cdef5c2860b89d6ee73262c files/digest-glibc-2.3.2 205
-MD5 184eddb92615fb991dce41b9edbfa690 files/glibc-manpages-2.3.2.tar.bz2 14700
-MD5 d8830438ea871dbfd1acf7a3d0299159 files/test-__thread.c 53
-MD5 93c2f3cb1c07d9a39da245b065c74f6c files/2.2.5/glibc-2.2.5-divdi3.diff 9752
-MD5 7481046043f42ecf4ac0a218abc896fc files/2.2.5/glibc-2.2.5-gcc311.patch 534
-MD5 e6dc1e4d7839d2bb08c6865466791183 files/2.2.5/glibc-2.2.5-sunrpc-overflow.diff 2460
-MD5 e9d9d086e8ed29ed49252d4cd0050f66 files/2.2.5/glibc-2.2.5.restrict_arr.patch 762
-MD5 a12b84b5af2808f5c0223259f7a9610c files/2.2.5/glibc-2.2.5-sparc-mathinline.patch 1014
-MD5 b07a316cbba4ddc1e1bb094a3056f12f files/2.2.5/glibc-2.2.5-ppc-semctl.diff 1337
-MD5 56a7a0273e0666eb40b0c6b45d62881d files/2.2.5/glibc-2.2.5-arm-sysdeps-fix.diff 362
-MD5 843eaa26ae2c49e894aa365b6f463546 files/2.2.5/glibc-2.2.5-alpha-pcdyn-fix.diff 471
-MD5 5182f441608833569cb9e78536baf8af files/2.2.5/glibc-2.2.5-arm-errlist-fix.diff 2210
-MD5 993732f56fdecf36f672198112fc5d5c files/2.2.5/glibc-2.2.5-threadsig.diff 636
-MD5 a50da56218f9aabc347d7e1130961cec files/2.2.5/glibc-2.2.5.divbyzero.patch 1694
-MD5 b12e1a7de85cd82bcb341863643c9ffd files/2.2.5/glibc-2.2.5-dns-network-overflow.diff 365
-MD5 c34a3c6bf21274a506090f05b7ea60ff files/2.2.5/glibc-2.2.5-ppc-sqrtl.diff 715
-MD5 c7783e49497814c3d86bd63bbed2a9b3 files/2.2.5/glibc-2.2.5-sandbox.diff 438
-MD5 6bdfb930ffdfdeb6b2ee823fefe42513 files/2.2.5/glibc-2.2.5-sparc-misc.diff 12252
-MD5 f75ebd335c4b882013cc12229d39c9f7 files/2.2.5/glibc-2.2.5-alpha-gcc3-fix.diff 475
-MD5 6afbd6fe65c0e2034587ba6d1da427a3 files/2.2.5/glibc-2.2.5-sparc64-fixups.diff 1407
-MD5 96914104dbdc2807c84549c3d20cb47c files/2.2.5/glibc-2.2.5-sparc32-semctl.patch 6311
-MD5 2474bda0015ede78a23190c3051a599b files/2.3.1/glibc-2.3.1-tst-rndseek-mips.patch 446
-MD5 66d8b78875e17e2d385a4d52af9698c4 files/2.3.1/glibc-2.3.1-ctype-compat.patch 728
-MD5 5a528678247e6bafe92d2483383afd5b files/2.3.1/glibc23-00-hppa-pthreads.dpatch 29951
-MD5 afaf2540d2803ac066eb2555f2019a6f files/2.3.1/glibc-2.3.1-exit-syscall-mips.patch 633
-MD5 4f8ecd70003c5ca153ff7c204c54c1cf files/2.3.1/glibc-2.3.1-elf-machine-rela-mips.patch 1246
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 15452ce5c55ab01fe633b28301eff49a ChangeLog 86778
 MD5 941f13d27badc76c1e3704c59acaff26 files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823
-MD5 035d42c51f2397339c1518baa06e3a81 files/2.3.1/glibc23-04-hppa-fcntl64.dpatch 2085
-MD5 41599dc27ba12b5f2428056dc0ebb1d1 files/2.3.1/glibc23-08-hppa-configure.dpatch 4704
-MD5 1c4e567ed001f9489e11ee06c1ced0b7 files/2.3.1/glibc-2.3.1-libc_wait-compat.patch 1053
-MD5 75983ceba061c090373c14394d08d32c files/2.3.1/glibc-2.3.1-typeo_dl-runtime_c.patch 848
-MD5 a49946706c7f248294896eeb64308a09 files/2.3.1/glibc23-03-hppa-mcontext.dpatch 1402
-MD5 1e95cbf4aed1619831947cdd35c73108 files/2.3.1/glibc23-hppa-shmlba.dpatch 1754
 MD5 67b125cec4f1f0d26ce4df706451fee6 files/2.3.1/glibc-2.3.1-fpu-cw-mips.patch 433
-MD5 e1cbb66f3d9823cf5a05ce52b2223acf files/2.3.1/glibc-2.3.1-ulps-mips.patch 27618
+MD5 1c4e567ed001f9489e11ee06c1ced0b7 files/2.3.1/glibc-2.3.1-libc_wait-compat.patch 1053
+MD5 23bbb51d1008f3009e6f1867b284c9bc files/2.3.1/glibc-2.3.1-libgcc-compat-mips.patch 5222
 MD5 f15c6dec40cefa86dae48a7dcb3b779a files/2.3.1/glibc-2.3.1-librt-mips.patch 396
 MD5 d84791059f1b4e7b157b3bbefe783208 files/2.3.1/glibc-2.3.1-stack_end-compat.patch 751
-MD5 235976914abfab3408d8d63cb4ffebe2 files/2.3.1/glibc-2.3.1-inline-syscall-mips.patch 7753
-MD5 b8f6b8b0ed8649fc9af439adef7472f2 files/2.3.1/glibc23-01-hppa-dl-machine.dpatch 12226
-MD5 1968bc39ae8224c1dee9534781203d2e files/2.3.1/glibc-2.3.1-locale.patch 8666
-MD5 a91843899c8ef4b59341313915f177b4 files/2.3.1/glibc23-05-hppa-buildhack.dpatch 1134
 MD5 dc18731db5bd28b8bd2074fc9177fd35 files/2.3.1/glibc23-07-hppa-atomicity.dpatch 2519
-MD5 23bbb51d1008f3009e6f1867b284c9bc files/2.3.1/glibc-2.3.1-libgcc-compat-mips.patch 5222
-MD5 2b746db4988cf7f5c6824302561b7eb5 files/2.3.1/glibc23-06-hppa-tests.dpatch 21021
-MD5 7f8ec486f1669036429acc8b272c453e files/2.3.1/glibc23-02-hppa-min-kern-unwind-fde.dpatch 1728
-MD5 cdbf2aacfaae7737f89ae733f148169c files/2.3.1/glibc-2.3.1-prelinkfix.patch 5005
-MD5 21506827cc2094c80d3c0c0e8ef3569c files/2.3.1/glibc-2.3.1-ctype-compat-v2.patch 1468
+MD5 080146d608b878d517b5cf4c29f0ef08 files/2.3.2/glibc-2.3.2-alpha-crti.patch 378
+MD5 9ef93639d5016677d41e5ec986fcb7f5 files/2.3.2/glibc-2.3.2-alpha-pwrite.patch 918
+MD5 d7097bf7fe910f2cba6ec69f86eb1958 files/2.3.2/glibc-2.3.2-alpha-sysdeps.patch 939
+MD5 afa967d5fea8e467dda9c588f5600ed1 files/2.3.2/glibc-2.3.2-amd64-nomultilib.patch 506
+MD5 523558956091d4ffcd33b72c57ac4bac files/2.3.2/glibc-2.3.2-arm-bus-defines.patch 276
+MD5 cfce14f1f90a3903ed076a5209198ce5 files/2.3.2/glibc-2.3.2-armformat.patch 416
+MD5 fa3bf332c71b0b5af56b536564abc480 files/2.3.2/glibc-2.3.2-assert.patch 1596
+MD5 855edac3c5abd21b4617408d4e3b5ae3 files/2.3.2/glibc-2.3.2-cispeed-cospeed-fix.patch 2424
+MD5 2f6605aae9bc4e538af783c0b2be3a7f files/2.3.2/glibc-2.3.2-decc-compaq.patch 1422
 MD5 1a926f1adc2f321abb31b1e11024e3ac files/2.3.2/glibc-2.3.2-dl-reloc-calc-fix.patch 1405
+MD5 8d75a288ff9aa450717048b43497c82c files/2.3.2/glibc-2.3.2-dl_execstack-PaX-support.patch 1945
+MD5 0c85c7ef9fbb066ad30ce8b6eb1c6228 files/2.3.2/glibc-2.3.2-fix-omitted-operand-in-mathinline_h.patch 680
+MD5 026be2442305eef0a3e3ff897a14768e files/2.3.2/glibc-2.3.2-framestate-USING_SJLJ_EXCEPTIONS.patch 440
+MD5 62f7e62583aaa70645d9c847b6a84299 files/2.3.2/glibc-2.3.2-frandom-detect.patch 1770
+MD5 a505a59f53c5e068728d0aba44007a10 files/2.3.2/glibc-2.3.2-gcc33-sscanf.patch 671
+MD5 175bde9b0017d4deb63cf55f38173e11 files/2.3.2/glibc-2.3.2-got-fix.diff 752
+MD5 cd0306085902d8629f2a77061cacdfd2 files/2.3.2/glibc-2.3.2-ia64-LOAD_ARGS-fixup.patch 4445
+MD5 15ac94e1ccc48f31120960dfe006818a files/2.3.2/glibc-2.3.2-iconvconfig-name_insert.patch 2262
+MD5 45b1fda5b64866e837a825d0add0b31c files/2.3.2/glibc-2.3.2-ipv6-bytestring-fix.patch 4088
+MD5 bfb5e3c2c46359a8c426e98fe0e39838 files/2.3.2/glibc-2.3.2-mips-add-n32-n64-sysdep-cancel.patch 6344
+MD5 03cbfe983ca93434ae6698f13d14c0e8 files/2.3.2/glibc-2.3.2-mips-configure-for-n64-symver.patch 741
+MD5 4e99301d9cb2865f14d82595f3b7bc0a files/2.3.2/glibc-2.3.2-mips-fix-n32-n64-sysdep-headers.patch 4398
+MD5 df41c3a20ead370c2208599cf4251f3d files/2.3.2/glibc-2.3.2-mips-fix-nested-entend-pairs.patch 612
+MD5 d21659e6aa8802290d6734ec118bbb81 files/2.3.2/glibc-2.3.2-mips-pread-linux2.5.patch 5310
+MD5 f62924cbf762eb230514a9859522f5e7 files/2.3.2/glibc-2.3.2-nptl-fix-include.patch 247
+MD5 0bfc56be86acec8ec52fe29249e267a4 files/2.3.2/glibc-2.3.2-owl-malloc-unlink-sanity-check.diff 1425
+MD5 578d3e5ff83cca218279a7a094fd0dad files/2.3.2/glibc-2.3.2-propolice-guard-functions-v2.patch 5107
+MD5 0e27dbd2a3b85a0e14625294296fad9a files/2.3.2/glibc-2.3.2-propolice-guard-functions-v3.patch 1986
+MD5 b27417338a4cd9906e2917701f0be575 files/2.3.2/glibc-2.3.2-propolice-guard-functions.patch 5069
+MD5 a3eb98943bc9db66df33bfc08dea4c2e files/2.3.2/glibc-2.3.2-pt_pax.diff 1470
+MD5 ba477be20da9885349e4599de7a08c18 files/2.3.2/glibc-2.3.2-redhat-linuxthreads-fixes.patch 2532
+MD5 9bc5a914b9625c662544785a4a685086 files/2.3.2/glibc-2.3.2-redhat-nptl-fixes.patch 1077
+MD5 3d32067de612f477862e9b24c158a7ce files/2.3.2/glibc-2.3.2-rtld-assert-fix.patch 1153
+MD5 3eeb5a5b2f01b1fdb7a4af923e5b0cec files/2.3.2/glibc-2.3.2-s390-deprecated-ustat-fixup.patch 6638
+MD5 7b6054c2e8ec654341690586bc2028c5 files/2.3.2/glibc-2.3.2-signal-ssp.diff 1431
+MD5 048d54dd8fc9e895cac6b1b53de4b730 files/2.3.2/posix_fadvise64.c 2752
+MD5 0e3ced9c3c484f502dcade7ffffa15f4 files/2.3.2/ssp.c 3935
+MD5 250d09cb52d2c3c7f6b0c4e0a1bf47f2 files/2.3.2/sysmacros.h 2443
+MD5 0e27dbd2a3b85a0e14625294296fad9a files/2.3.3/glibc-2.3.2-propolice-guard-functions-v3.patch 1986
+MD5 1b5df7c58ad160593192704cece47347 files/2.3.3/glibc-2.3.3-dl_execstack-PaX-support.patch 1791
+MD5 62f7e62583aaa70645d9c847b6a84299 files/2.3.3/glibc-2.3.3-frandom-detect.patch 1770
+MD5 ec83f3d86f23243a1fb334b8872d454f files/2.3.3/glibc-2.3.3-localedef-fix-trampoline.patch 2329
+MD5 ca1d4648f72e5fea2858fdb6ea3d39a0 files/2.3.3/glibc-2.3.3-mips-addabi.diff 1720
+MD5 f9343413b90877edfcaeedf89b3dec77 files/2.3.3/glibc-2.3.3-mips-nolib3264.diff 1166
+MD5 81d95470c5766e56e27ad8b6967d2a16 files/2.3.3/glibc-2.3.3-mips-semtimedop.diff 602
+MD5 847afe57e19abff1d5c49f6bb7084a3d files/2.3.3/glibc-2.3.3-mips-syscall.h.diff 1199
+MD5 84fa9a725c22975d735a2f91543a5cca files/2.3.3/glibc-2.3.3-mips-sysify.diff 2138
+MD5 0bfc56be86acec8ec52fe29249e267a4 files/2.3.3/glibc-2.3.3-owl-malloc-unlink-sanity-check.diff 1425
+MD5 ff0a2716aebc6fb8a2e3b3f2c9be8bba files/2.3.3/glibc-2.3.3-tempfile.patch 1787
+MD5 175bde9b0017d4deb63cf55f38173e11 files/2.3.3/glibc-2.3.3_pre20040117-got-fix.diff 752
+MD5 a3eb98943bc9db66df33bfc08dea4c2e files/2.3.3/glibc-2.3.3_pre20040117-pt_pax.diff 1470
+MD5 7b6054c2e8ec654341690586bc2028c5 files/2.3.3/glibc-2.3.3_pre20040117-signal-ssp.diff 1431
+MD5 86626ba8df9cac083bb3e1cfe23ec07e files/2.3.3/glibc-2.3.3_pre20040420-mips-dl-machine-calls.diff 1497
+MD5 ab91cb5bad07e1e79f990d4933741d42 files/2.3.3/glibc-2.3.3_pre20040420-mips-incl-sgidefs.diff 8287
+MD5 ae9425cd4199cccd69c6d22633583dc1 files/2.3.3/ssp.c 4041
+MD5 9db90105eb74d75834d25a599cba97ea files/2.3.4/glibc-2.3.3-mdns-resolver2.diff 12272
+MD5 89a6d0d924c8b05c4e06bdffb7c69b41 files/2.3.4/glibc-2.3.4-arm-ioperm.patch 4037
+MD5 9ee1438ba6ac30363130330c996dbb84 files/2.3.4/glibc-2.3.4-dl_execstack-PaX-support.patch 1443
+MD5 d902a9d990ee2970dd55dd805f352fa7 files/2.3.4/glibc-2.3.4-features-header-fix.patch 449
+MD5 ad71dc5c3f84f026c6e28865b2e90fbb files/2.3.4/glibc-2.3.4-fedora-branch-no-force-nontls.patch 2337
+MD5 973e31ce24c9622234c4293b367de6b3 files/2.3.4/glibc-2.3.4-fedora-branch-no-libnoversion.patch 2288
+MD5 1974267b1382fb38be7495b12c847f70 files/2.3.4/glibc-2.3.4-fedora-branch-nomalloccheck.patch 372
+MD5 b80890f83185acef8aeff622a1574e0b files/2.3.4/glibc-2.3.4-fix-_dl_next_tls_modid-assert.patch 9140
+MD5 7fca8a203196513f13e519903dedbfd5 files/2.3.4/glibc-2.3.4-getcontext.patch 9854
+MD5 03e0e9a2235886c0abbe98bdafd0d5ce files/2.3.4/glibc-2.3.4-hardened-sysdep-shared.patch 382
+MD5 659a9d64935d67a5938d0cb4e5fe4899 files/2.3.4/glibc-2.3.4-hppa-hardened-disable__init_arrays.patch 2310
+MD5 16f18501efd56811e724231470dc5d00 files/2.3.4/glibc-2.3.4-ld.so-brk-fix.patch 2562
+MD5 076484ade8a834efb73190b687196392 files/2.3.4/glibc-2.3.4-mdns-resolver-20041102.diff 12809
+MD5 41cec3deb89ffdbd670024a2b615b819 files/2.3.4/glibc-2.3.4-mips-add-missing-sgidefs_h.patch 1196
+MD5 d490f38bd9ca9c48a9799f1e48629f6e files/2.3.4/glibc-2.3.4-mips-generate-syscall_h.patch 8230
+MD5 03b2b9cfe46d287c2a28df70e7a9e9a1 files/2.3.4/glibc-2.3.4-mips-prot_grows-undefined.patch 1410
+MD5 8d43dc97fe220048ade220f23e84f006 files/2.3.4/glibc-2.3.4-mips-rtld_deepbind-undefined.patch 1425
+MD5 1185022e9a50560d1bf9116a0461e011 files/2.3.4/glibc-2.3.4-mips-sysdep-cancel.diff 2402
+MD5 039f62650037a4a15cef3066b26d27c9 files/2.3.4/glibc-2.3.4-mips-update-__throw.patch 1975
+MD5 207e313566b3fc24e0a5ca2ffd2da1d9 files/2.3.4/glibc-2.3.4-nptl-altivec.patch 6140
+MD5 7960564130a698073bdd3597a781e39b files/2.3.4/glibc-2.3.4-nptl-pthread.h-g++-fix.patch 3304
+MD5 fe21fd44628b90f50e5024462cf4c348 files/2.3.4/glibc-2.3.4-res_init.patch 3417
+MD5 340825c77e38e88e0ceaa12f154cbfa3 files/2.3.4/glibc-2.3.4.20040808-i386-got-fix.diff 4203
+MD5 e109c03013bd08a2b96e2c2ca9017a4b files/2.3.4/glibc-gentoo-libdir.patch 1347
+MD5 bbe355d94c5a36e11f543d12b70b5702 files/2.3.4/glibc-sec-hotfix-20040916.patch 3080
+MD5 ee692cfc6e7c810a2785093948638bbc files/2.3.4/glibc234-alpha-xstat.patch 7653
+MD5 b72e5aca6d834026a6f5fb87623e6fd3 files/2.3.4/host.conf 1302
+MD5 76185820806d5641f0314281ceb4790b files/2.3.4/hppa-no-pie.patch 1265
+MD5 04bcec718f2883f28bf862b7e390d1b0 files/2.3.5/glibc-2.3.5-frandom-detect.patch 3080
+MD5 13dd059e6383c7cac94d1bda126af21d files/2.3.5/glibc-2.3.5-propolice-guard-functions.patch 1302
+MD5 b3ce53b86060b6209a182366c501a0f1 files/2.3.5/ssp.c 4297
+MD5 bed7cbcac1e8582deda43664e5b3f19c files/digest-glibc-2.2.5-r10 290
+MD5 2d5306ef875573750af642a9f93b634a files/digest-glibc-2.3.2-r12 312
+MD5 42af7e35fe2404a49954f91fd1aee891 files/digest-glibc-2.3.3.20040420-r2 312
+MD5 470f57fe18dd0a94cb4a4d6cf51528af files/digest-glibc-2.3.4.20040619-r2 307
+MD5 2f05d3181e9a9ded61e074147af47e8e files/digest-glibc-2.3.4.20040808-r1 382
+MD5 75b85b24e4ded1b0e8a0a762d5805818 files/digest-glibc-2.3.4.20041102-r1 383
+MD5 2a03ed91154589a9473bac46eacff1e9 files/digest-glibc-2.3.4.20041102-r2 387
+MD5 71c18ba0155b5cf1e7e4bf990225d566 files/digest-glibc-2.3.4.20050125-r1 521
+MD5 6a7b14ffb6320bc8c7fc73e86f6bb973 files/digest-glibc-2.3.5 518
+MD5 433ac29a7eb82cc504288c72af4de3fb files/digest-glibc-2.3.5-r1 516
+MD5 a839a12be46a8fa315fd6244a60e1886 files/digest-glibc-2.3.5-r2 516
+MD5 b91f86f93c20eea8553de49ce7db0614 files/digest-glibc-2.3.5-r3 516
+MD5 7a909f8df7cc20f37fb7553c8dcb47b4 files/digest-glibc-2.3.5.20050421 604
+MD5 e8833674518301b1dc7798d5f856aad4 files/digest-glibc-2.3.5.20050722 604
+MD5 ad9e56a2eed9290c3dbf504897220dce files/digest-glibc-2.3.6 517
+MD5 b80f2ee659486d805675c488b6c14ec4 files/digest-glibc-2.3.6-r1 517
+MD5 e4393f4721a207750581d6265d5f7f40 files/fix-sysctl_h.patch 376
+MD5 52cfc7627fc62dfb26d8d163aac361f6 files/glibc-2.2.2-test-lfs-timeout.patch 320
+MD5 b712a49b5113fccb4c8b0ada2a30d390 files/glibc-manpages-2.2.5.tar.bz2 14610
+MD5 184eddb92615fb991dce41b9edbfa690 files/glibc-manpages-2.3.2.tar.bz2 14700
+MD5 13701e6cc0de584680502c0cd958f2cf files/glibc-sec-hotfix-20040804.patch 4319
+MD5 bbe355d94c5a36e11f543d12b70b5702 files/glibc-sec-hotfix-20040916.patch 3080
+MD5 c4300e2f8808cb38a308745ed8b77367 files/locales.build 602
+MD5 6d49cf08909f89da5748956452bebb03 files/nscd 1339
+MD5 2013443f5192d4b999953ba4248d288c files/nscd.conf 1158
+MD5 8d58079469aedb014a800101ef60558f files/nsswitch.conf 503
+MD5 d8830438ea871dbfd1acf7a3d0299159 files/test-__thread.c 53
+MD5 4404ee4b6e3017819d8f36082e0265e5 files/test-sysctl_h.c 54
+MD5 f8bf77d5057759d82db6401f9ff5211c glibc-2.2.5-r10.ebuild 4523
+MD5 e5c30ea961ed5d60c6c4b7ee1fc240ae glibc-2.3.2-r12.ebuild 22495
+MD5 6726c272dd0883b0c6f06a920c7ef30a glibc-2.3.3.20040420-r2.ebuild 21726
+MD5 a789e9155b746cc1c16da9a7604a0fb2 glibc-2.3.4.20040619-r2.ebuild 21400
+MD5 d4685f67b36e4a0c1fc0db8516523d2e glibc-2.3.4.20040808-r1.ebuild 27749
+MD5 53ca9d018c1156e40ae6b4aecfafc7c1 glibc-2.3.4.20041102-r1.ebuild 34314
+MD5 5eeb3fe6a71b64a081e642ffb08c0cbe glibc-2.3.4.20041102-r2.ebuild 41281
+MD5 9bc40ac03e72b63652f67be3dcecc184 glibc-2.3.4.20050125-r1.ebuild 39474
+MD5 2e7e5fc05139d73ced40d2cb52816b44 glibc-2.3.5-r1.ebuild 40533
+MD5 b1cba6eb03515d24e61e321c457670fd glibc-2.3.5-r2.ebuild 38859
+MD5 4536ac9d1f309dc0890741dce8cb012e glibc-2.3.5-r3.ebuild 38908
+MD5 1cb57f1757c26c0e0286cb0ef6c36171 glibc-2.3.5.20050421.ebuild 40152
+MD5 48b60115273ba9fa755a6ef94fe8c3b6 glibc-2.3.5.20050722.ebuild 39299
+MD5 9c15c32a0bbef91769c4fd0c0d7a66c3 glibc-2.3.5.ebuild 40143
+MD5 eb6575db85582f440333c8f79e5a1ca1 glibc-2.3.6-r1.ebuild 42013
+MD5 c1860f958f09de634ae4e2e0b0377bd9 glibc-2.3.6.ebuild 40082
+MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfVBAgIKl8Uu19MoRAq0QAJ0ceRpawZ4LqUD31dEkOsl+HTwdowCfRy9E
+5iiyfCxt3HJu1sswtcPE7HA=
+=DAX0
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/2.3.1/glibc-2.3.1-libc_wait-compat.patch b/sys-libs/glibc/files/2.3.1/glibc-2.3.1-libc_wait-compat.patch
index db4bfe27f861..d6f8bf51ab7b 100644
--- a/sys-libs/glibc/files/2.3.1/glibc-2.3.1-libc_wait-compat.patch
+++ b/sys-libs/glibc/files/2.3.1/glibc-2.3.1-libc_wait-compat.patch
@@ -1,26 +1,32 @@
-2002-04-19  Bruno Haible  <bruno@clisp.org>
-
-	* posix/Versions: Move back __libc_wait to GLIBC_2.0 section.
-
 --- glibc-20020408/posix/Versions.bak	2002-02-04 12:42:40.000000000 +0100
 +++ glibc-20020408/posix/Versions	2002-04-19 01:01:00.000000000 +0200
-@@ -14,6 +14,9 @@
-     # functions used by libstdc++ 2.7.2
-     __waitpid;
+@@ -3,6 +3,9 @@
+     # functions with special/multiple interfaces
+     __bsd_getpgrp; __setpgid; __getpgid;
  
-+    # functions used by SunJava2-1.3.1/jre/lib/i386/libjava.so
-+    __libc_wait;
++    # This will be GLIBC_PRIVATE, just give Sun JDK some time to catch up
++    __libc_wait; __libc_waitpid;
 +
-     # global variables
-     __environ; _environ;
+     # functions with required interface outside normal name space
+     _exit;
  
-@@ -108,7 +111,7 @@
+@@ -83,6 +86,9 @@
+   GLIBC_2.1.2 {
+     # functions used in other libraries
+     __vfork;
++
++    # This will be GLIBC_PRIVATE, just give wine some time to catch up
++    __libc_fork; 
+   }
+   GLIBC_2.2 {
+     # p*
+@@ -109,6 +115,7 @@
    GLIBC_PRIVATE {
      # functions which have an additional interface since they are
      # are cancelable.
 -    __libc_wait; __libc_waitpid; __libc_pause; __libc_nanosleep; __libc_fork;
-+    __libc_waitpid; __libc_pause; __libc_nanosleep; __libc_fork;
++    # __libc_wait; __libc_waitpid;
++    __libc_pause; __libc_nanosleep; # __libc_fork;
      __libc_pread; __libc_pread64; __libc_pwrite; __libc_pwrite64;
+     __waitid; __pselect;
    }
- }
-
diff --git a/sys-libs/glibc/files/2.3.2/ssp.c b/sys-libs/glibc/files/2.3.2/ssp.c
index ecaf24c068b0..a6cf162de512 100644
--- a/sys-libs/glibc/files/2.3.2/ssp.c
+++ b/sys-libs/glibc/files/2.3.2/ssp.c
@@ -1,6 +1,6 @@
 /*
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/2.3.2/ssp.c,v 1.1 2004/06/05 15:54:29 tseng Exp $
+ * $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/2.3.2/ssp.c,v 1.1.1.1 2005/11/30 09:39:37 chriswhite Exp $
  *
  * This is a modified version of Hiroaki Etoh's stack smashing routines
  * implemented for glibc.
diff --git a/sys-libs/glibc/files/2.3.3/glibc-2.3.3_pre20040117-pt_pax.diff b/sys-libs/glibc/files/2.3.3/glibc-2.3.3_pre20040117-pt_pax.diff
index aa8e3500c1fc..fdae6f514e62 100644
--- a/sys-libs/glibc/files/2.3.3/glibc-2.3.3_pre20040117-pt_pax.diff
+++ b/sys-libs/glibc/files/2.3.3/glibc-2.3.3_pre20040117-pt_pax.diff
@@ -1,5 +1,5 @@
---- elf/elf.h.orig	2004-01-23 19:41:56.000000000 -0500
-+++ elf/elf.h	2004-01-23 19:42:59.000000000 -0500
+--- elf/elf.h.orig	2004-01-26 12:54:15.000000000 -0500
++++ elf/elf.h	2004-01-26 12:53:23.000000000 -0500
 @@ -568,6 +568,7 @@
  #define PT_GNU_EH_FRAME	0x6474e550	/* GCC .eh_frame_hdr segment */
  #define PT_GNU_STACK	0x6474e551	/* Indicates stack executability */
@@ -8,7 +8,7 @@
  #define PT_LOSUNW	0x6ffffffa
  #define PT_SUNWBSS	0x6ffffffa	/* Sun Specific segment */
  #define PT_SUNWSTACK	0x6ffffffb	/* Stack segment */
-@@ -581,6 +582,16 @@
+@@ -581,6 +582,18 @@
  #define PF_X		(1 << 0)	/* Segment is executable */
  #define PF_W		(1 << 1)	/* Segment is writable */
  #define PF_R		(1 << 2)	/* Segment is readable */
@@ -22,6 +22,8 @@
 +#define PF_NORANDEXEC	(1 << 11)	/* Disable RANDEXEC */
 +#define PF_EMUTRAMP	(1 << 12)	/* Enable  EMUTRAMP */
 +#define PF_NOEMUTRAMP	(1 << 13)	/* Disable EMUTRAMP */
++#define PF_RANDMMAP	(1 << 14)	/* Enable  RANDMMAP */
++#define PF_NORANDMMAP	(1 << 15)	/* Disable RANDMMAP */
  #define PF_MASKOS	0x0ff00000	/* OS-specific */
  #define PF_MASKPROC	0xf0000000	/* Processor-specific */
  
diff --git a/sys-libs/glibc/files/2.3.3/ssp.c b/sys-libs/glibc/files/2.3.3/ssp.c
index 502a2e0fdb4d..1646f7a4fc54 100644
--- a/sys-libs/glibc/files/2.3.3/ssp.c
+++ b/sys-libs/glibc/files/2.3.3/ssp.c
@@ -1,6 +1,6 @@
 /*
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/2.3.3/ssp.c,v 1.1 2004/05/14 22:06:41 solar Exp $
+ * $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/2.3.3/ssp.c,v 1.1.1.1 2005/11/30 09:39:35 chriswhite Exp $
  *
  * This is a modified version of Hiroaki Etoh's stack smashing routines
  * implemented for glibc.
@@ -105,12 +105,17 @@ __guard_setup (void)
 void
 __stack_smash_handler (char func[], int damaged)
 {
-  struct sockaddr_un sock;	/* AF_UNIX address of local logger */
   struct sigaction sa;
   const char message[] = ": stack smashing attack in function ";
-  int bufsz, len, log;
+  int bufsz, len;
   char buf[512];
+#ifndef __dietlibc__
+  struct sockaddr_un sock;	/* AF_UNIX address of local logger */
+  int log;
   extern char *__progname;
+#else
+  static char *__progname = "dietapp";
+#endif
 
   sigset_t mask;
   sigfillset (&mask);
@@ -139,6 +144,7 @@ __stack_smash_handler (char func[], int damaged)
   /* print error message */
   write (STDERR_FILENO, buf + 3, len - 3);
   write (STDERR_FILENO, "()\n", 3);
+#ifndef __dietlibc__
   if ((log = socket (AF_UNIX, SOCK_DGRAM, 0)) != -1)
     {
       /* Send "found" message to the "/dev/log" path */
@@ -147,7 +153,7 @@ __stack_smash_handler (char func[], int damaged)
       sock.sun_path[sizeof (sock.sun_path) - 1] = '\0';
       sendto (log, buf, len, 0, (struct sockaddr *) &sock, sizeof (sock));
     }
-
+#endif
   /* Make sure the default handler is associated with the our signal handler */
 
   memset (&sa, 0, sizeof (struct sigaction));
diff --git a/sys-libs/glibc/files/2.3.4/glibc-2.3.3-mdns-resolver2.diff b/sys-libs/glibc/files/2.3.4/glibc-2.3.3-mdns-resolver2.diff
index 244f16d76e16..b9d8cdb3943e 100644
--- a/sys-libs/glibc/files/2.3.4/glibc-2.3.3-mdns-resolver2.diff
+++ b/sys-libs/glibc/files/2.3.4/glibc-2.3.3-mdns-resolver2.diff
@@ -1,19 +1,81 @@
---- resolv/res_query.c.orig	2004-02-07 16:20:17.000000000 +0000
-+++ resolv/res_query.c	2004-03-11 15:25:57.000000000 +0000
-@@ -272,6 +272,11 @@
+--- resolv/res_hconf.c
++++ resolv/res_hconf.c	2004/09/21 12:56:54
+@@ -59,6 +59,7 @@
+ #define ENV_TRIM_ADD	"RESOLV_ADD_TRIM_DOMAINS"
+ #define ENV_MULTI	"RESOLV_MULTI"
+ #define ENV_REORDER	"RESOLV_REORDER"
++#define ENV_MDNS	"RESOLV_MDNS"
+ 
+ static const char *arg_service_list (const char *, int, const char *,
+ 				     unsigned int);
+@@ -81,7 +82,8 @@
+   {"multi",		arg_bool,		HCONF_FLAG_MULTI},
+   {"nospoof",		arg_bool,		HCONF_FLAG_SPOOF},
+   {"spoofalert",	arg_bool,		HCONF_FLAG_SPOOFALERT},
+-  {"reorder",		arg_bool,		HCONF_FLAG_REORDER}
++  {"reorder",		arg_bool,		HCONF_FLAG_REORDER},
++  {"mdns",		arg_bool,		HCONF_FLAG_MDNS}
+ };
+ 
+ /* Structure containing the state.  */
+@@ -431,6 +433,9 @@
+ 
+   memset (&_res_hconf, '\0', sizeof (_res_hconf));
+ 
++  /* Default for mdns is "on".  */
++  _res_hconf.flags |= HCONF_FLAG_MDNS;
++ 
+   hconf_name = getenv (ENV_HOSTCONF);
+   if (hconf_name == NULL)
+     hconf_name = _PATH_HOSTCONF;
+@@ -483,6 +488,10 @@
+       arg_trimdomain_list (ENV_TRIM_OVERR, 1, envval, 0);
+     }
+ 
++  envval = getenv (ENV_MDNS);
++  if (envval)
++    arg_bool (ENV_MDNS, 1, envval, HCONF_FLAG_MDNS);
++
+   _res_hconf.initialized = 1;
+ }
+ 
+--- resolv/res_hconf.h
++++ resolv/res_hconf.h	2004/09/21 12:56:54
+@@ -44,6 +44,7 @@
+ #  define HCONF_FLAG_SPOOFALERT	(1 << 2) /* syslog warning of spoofed */
+ #  define HCONF_FLAG_REORDER	(1 << 3) /* list best address first */
+ #  define HCONF_FLAG_MULTI	(1 << 4) /* see comments for gethtbyname() */
++#  define HCONF_FLAG_MDNS	(1 << 5) /* Disable MDNS support */
+ };
+ extern struct hconf _res_hconf;
+ 
+--- resolv/res_query.c
++++ resolv/res_query.c	2004/09/21 12:57:59
+@@ -82,6 +82,8 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
++#include "res_hconf.h"
++
+ /* Options.  Leave them on. */
+ /* #undef DEBUG */
+ 
+@@ -278,6 +280,13 @@
  		     *domain && !done;
  		     domain++) {
  
-+			/* don't add "local" domain if query contains a dot */
-+			if (dots && (!__strcasecmp(*domain, "local") ||
-+				     !__strcasecmp(*domain, "local.")))
-+				continue;
++		        if ((_res_hconf.flags & HCONF_FLAG_MDNS) != 0) {
++			        /* don't add "local" domain if query contains a dot */
++			        if (dots && (!__strcasecmp(*domain, "local") ||
++				             !__strcasecmp(*domain, "local.")))
++				       continue;
++			}
 +
  			if (domain[0][0] == '\0' ||
  			    (domain[0][0] == '.' && domain[0][1] == '\0'))
  				root_on_list++;
---- resolv/res_send.c.orig	2004-02-07 16:21:17.000000000 +0000
-+++ resolv/res_send.c	2004-03-11 15:43:19.000000000 +0000
+--- resolv/res_send.c
++++ resolv/res_send.c	2004/09/21 12:58:14
 @@ -86,6 +86,9 @@
  #include <arpa/nameser.h>
  #include <arpa/inet.h>
@@ -24,7 +86,16 @@
  
  #include <errno.h>
  #include <netdb.h>
-@@ -188,6 +191,9 @@
+@@ -96,6 +99,8 @@
+ #include <string.h>
+ #include <unistd.h>
+ 
++#include "res_hconf.h"
++
+ #if PACKETSZ > 65536
+ #define MAXPACKET       PACKETSZ
+ #else
+@@ -188,6 +193,9 @@
  static int		send_dg(res_state, const u_char *, int,
  				u_char **, int *, int *, int,
  				int *, int *, u_char **);
@@ -33,16 +104,17 @@
 +				int *, int *, u_char **);
  #ifdef DEBUG
  static void		Aerror(const res_state, FILE *, const char *, int,
- 			       struct sockaddr_in);
-@@ -366,6 +372,34 @@
+ 			       const struct sockaddr *);
+@@ -366,6 +374,35 @@
  		 u_char *ans, int anssiz, u_char **ansp)
  {
  	int gotsomewhere, terrno, try, v_circuit, resplen, ns, n;
 +	int usemdns;
 +	HEADER *qhp = (HEADER *) buf;
-+	
++
 +	usemdns = 0;
-+	if (qhp->qr == 0 && qhp->opcode == QUERY && qhp->qdcount == htons(1)) {
++	if ((_res_hconf.flags & HCONF_FLAG_MDNS) != 0 &&
++	    qhp->qr == 0 && qhp->opcode == QUERY && qhp->qdcount == htons(1)) {
 +		/* got one simple query */
 +		const u_char *bp, *be;
 +		be = buf + buflen;
@@ -69,7 +141,7 @@
  
  	if (statp->nscount == 0) {
  		__set_errno (ESRCH);
-@@ -524,13 +558,28 @@
+@@ -524,13 +561,28 @@
  	 */
  	for (try = 0; try < statp->retry; try++) {
  #ifdef _LIBC
@@ -99,7 +171,7 @@
  
  		if (nsap == NULL)
  			goto next_ns;
-@@ -592,8 +641,11 @@
+@@ -602,8 +654,11 @@
  			resplen = n;
  		} else {
  			/* Use datagrams. */
@@ -113,7 +185,7 @@
  			if (n < 0)
  				return (-1);
  			if (n == 0)
-@@ -665,8 +717,15 @@
+@@ -675,8 +730,15 @@
  	if (!v_circuit) {
  		if (!gotsomewhere)
  			__set_errno (ECONNREFUSED);	/* no nameservers found */
@@ -130,7 +202,7 @@
  	} else
  		__set_errno (terrno);
  	return (-1);
-@@ -1127,6 +1186,255 @@
+@@ -1140,6 +1202,255 @@
  	return (resplen);
  }
  
diff --git a/sys-libs/glibc/files/2.3.4/glibc-gentoo-libdir.patch b/sys-libs/glibc/files/2.3.4/glibc-gentoo-libdir.patch
index 147968b3776f..01f414bb1255 100644
--- a/sys-libs/glibc/files/2.3.4/glibc-gentoo-libdir.patch
+++ b/sys-libs/glibc/files/2.3.4/glibc-gentoo-libdir.patch
@@ -10,10 +10,10 @@ diff -Nru glibc-2.3.3.old/sysdeps/unix/sysv/linux/configure glibc-2.3.3/sysdeps/
 -  sparc/sparc64 | x86_64 | powerpc/powerpc64 | s390/s390-64 | \
 -  mips/mips64/n64/* )
 -    libc_cv_slibdir="/lib64"
-+  libc_cv_slibdir="/@GENTOO_LIBDIR@/"
++  libc_cv_slibdir="/@GENTOO_LIBDIR@"
      if test "$libdir" = '${exec_prefix}/lib'; then
 -      libdir='${exec_prefix}/lib64';
-+  	libdir='${exec_prefix}/@GENTOO_LIBDIR@/'
++  	libdir='${exec_prefix}/@GENTOO_LIBDIR@'
        # Locale data can be shared between 32bit and 64bit libraries
        libc_cv_localedir='${exec_prefix}/lib/locale'
      fi
diff --git a/sys-libs/glibc/files/2.3.4/host.conf b/sys-libs/glibc/files/2.3.4/host.conf
index 23dfe1435248..a07f54d19b96 100644
--- a/sys-libs/glibc/files/2.3.4/host.conf
+++ b/sys-libs/glibc/files/2.3.4/host.conf
@@ -1,5 +1,5 @@
-# /etc/hosts.conf:
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/2.3.4/host.conf,v 1.1 2004/10/29 05:12:05 lv Exp $
+# /etc/host.conf:
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/2.3.4/host.conf,v 1.1.1.1 2005/11/30 09:39:40 chriswhite Exp $
 
 # The  file /etc/host.conf contains configuration information specific to
 # the resolver library.  It should contain one configuration keyword  per
@@ -31,4 +31,3 @@ mdns off
 # with large hosts files.
 #
 multi off
-
diff --git a/sys-libs/glibc/files/2.3.5/ssp.c b/sys-libs/glibc/files/2.3.5/ssp.c
index 4fcda2fa943c..918a6cf631dc 100644
--- a/sys-libs/glibc/files/2.3.5/ssp.c
+++ b/sys-libs/glibc/files/2.3.5/ssp.c
@@ -1,6 +1,6 @@
 /*
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/2.3.5/ssp.c,v 1.1 2005/05/26 22:36:28 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/2.3.5/ssp.c,v 1.1.1.1 2005/11/30 09:39:36 chriswhite Exp $
  *
  * This is a modified version of Hiroaki Etoh's stack smashing routines
  * implemented for glibc.
@@ -20,20 +20,21 @@
 # include <config.h>
 #endif
 
+#ifdef __SSP__
+# error ssp.c has to be built w/ -fno-stack-protector
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <signal.h>
 #include <sys/types.h>
-#include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/syslog.h>
 #include <sys/time.h>
-#include <sys/sysctl.h>
-
-#ifndef _PATH_LOG
-# define _PATH_LOG "/dev/log"
+#ifdef __SSP_USE_ERANDOM__
+# include <sys/sysctl.h>
 #endif
 
 #ifdef __PROPOLICE_BLOCK_SEGV__
@@ -51,121 +52,104 @@ unsigned long __guard = 0UL;
  * libraries that overload the associated standard library
  * functions.
  */
-void
-__guard_setup (void)
-{
-  size_t size;
-#ifdef HAVE_DEV_ERANDOM
-  int mib[3];
+#ifdef __UCLIBC__
+extern int __libc_open(__const char *file, int flags, ...);
+extern ssize_t __libc_read(int fd, void *buf, size_t count);
+extern int __libc_close(int fd);
+#else
+# define __libc_open(file, flags) __open(file, flags)
+# define __libc_read(fd, buf, count) __read(fd, buf, count)
+# define __libc_close(fd) __close(fd)
+# define __libc_write(fd, buf, count) __write(fd, buf, count)
 #endif
 
-  if (__guard != 0UL)
-    return;
+void __guard_setup(void) __attribute__ ((constructor));
+void __guard_setup(void)
+{
+	size_t size;
+
+	if (__guard != 0UL)
+		return;
+
+	/* Start with the "terminator canary". */
+	__guard = 0xFF0A0D00UL;
 
 #ifndef __SSP_QUICK_CANARY__
-#ifdef HAVE_DEV_ERANDOM
-  /* Random is another depth in Linux, hence an array of 3. */
-  mib[0] = CTL_KERN;
-  mib[1] = KERN_RANDOM;
-  mib[2] = RANDOM_ERANDOM;
-
-  size = sizeof (unsigned long);
-  if (__sysctl (mib, 3, &__guard, &size, NULL, 0) != (-1))
-    if (__guard != 0UL)
-      return;
-#endif /* ifdef HAVE_DEV_ERANDOM */
-  /* 
-   * Attempt to open kernel pseudo random device if one exists before 
-   * opening urandom to avoid system entropy depletion.
-   */
-  {
-    int fd;
-#ifdef HAVE_DEV_ERANDOM
-    if ((fd = __open ("/dev/erandom", O_RDONLY)) == (-1))
-#endif
-      fd = __open ("/dev/urandom", O_RDONLY);
-    if (fd != (-1))
-      {
-	size = __read (fd, (char *) &__guard, sizeof (__guard));
-	__close (fd);
-	if (size == sizeof (__guard))
-	  return;
-      }
-  }
+# ifdef __SSP_USE_ERANDOM__
+	{
+		int mib[3];
+		/* Random is another depth in Linux, hence an array of 3. */
+		mib[0] = CTL_KERN;
+		mib[1] = KERN_RANDOM;
+		mib[2] = RANDOM_ERANDOM;
+
+		size = sizeof(unsigned long);
+		if (__sysctl(mib, 3, &__guard, &size, NULL, 0) != (-1))
+			if (__guard != 0UL)
+				return;
+	}
+# endif /* ifdef __SSP_USE_ERANDOM__ */
+	/* 
+	 * Attempt to open kernel pseudo random device if one exists before 
+	 * opening urandom to avoid system entropy depletion.
+	 */
+	{
+		int fd;
+
+# ifdef __SSP_USE_ERANDOM__
+		if ((fd = __libc_open("/dev/erandom", O_RDONLY)) == (-1))
+# endif
+			fd = __libc_open("/dev/urandom", O_RDONLY);
+		if (fd != (-1)) {
+			size = __libc_read(fd, (char *) &__guard, sizeof(__guard));
+			__libc_close(fd);
+			if (size == sizeof(__guard))
+				return;
+		}
+	}
 #endif /* ifndef __SSP_QUICK_CANARY__ */
 
-  /* If sysctl was unsuccessful, use the "terminator canary". */
-  __guard = 0xFF0A0D00UL;
-
-  {
-    /* Everything failed? Or we are using a weakened model of the 
-     * terminator canary */
-    struct timeval tv;
-
-    __gettimeofday (&tv, NULL);
-    __guard ^= tv.tv_usec ^ tv.tv_sec;
-  }
+	/* Everything failed? Or we are using a weakened model of the 
+	 * terminator canary */
+	{
+		struct timeval tv;
+		__gettimeofday(&tv, NULL);
+		__guard ^= tv.tv_usec ^ tv.tv_sec;
+	}
 }
 
-void
-__stack_smash_handler (char func[], int damaged)
+void __stack_smash_handler(char func[], int damaged __attribute__ ((unused)));
+void __stack_smash_handler(char func[], int damaged)
 {
-  struct sigaction sa;
-  const char message[] = ": stack smashing attack in function ";
-  int bufsz, len;
-  char buf[512];
-#ifndef __dietlibc__
-  struct sockaddr_un sock;	/* AF_UNIX address of local logger */
-  int log;
-  extern char *__progname;
+	extern char *__progname;
+	const char message[] = ": stack smashing attack in function ";
+	struct sigaction sa;
+	sigset_t mask;
+
+	sigfillset(&mask);
+
+	sigdelset(&mask, SSP_SIGTYPE);	/* Block all signal handlers */
+	sigprocmask(SIG_BLOCK, &mask, NULL);	/* except SSP_SIGTYPE */
+
+	/* Print error message to stderr and syslog */
+#if 1 /* syslog() causes issues with glibc #94325 */
+	__libc_write(STDERR_FILENO, __progname, strlen(__progname));
+	__libc_write(STDERR_FILENO, message, strlen(message));
+	__libc_write(STDERR_FILENO, func, strlen(func));
+	__libc_write(STDERR_FILENO, "()\n", 3);
+	//_syscall3(int, _ssp_syslog, int, type, char *, bufp, int, len)
+	//_ssp_syslog(LOG_INFO,
 #else
-  static char *__progname = "dietapp";
+	fprintf(stderr, "%s%s%s()\n", __progname, message, func);
+	syslog(LOG_INFO, "%s%s%s()", __progname, message, func);
 #endif
 
-  sigset_t mask;
-  sigfillset (&mask);
-
-  sigdelset (&mask, SSP_SIGTYPE);	/* Block all signal handlers */
-  sigprocmask (SIG_BLOCK, &mask, NULL);	/* except SIGABRT */
-
-  bufsz = sizeof (buf);
-  strcpy (buf, "<2>");
-  len = 3;
-
-  strncat (buf, __progname, sizeof (buf) - 4);
-  len = strlen (buf);
-
-  if (bufsz > len)
-    {
-      strncat (buf, message, bufsz - len - 1);
-      len = strlen (buf);
-    }
-  if (bufsz > len)
-    {
-      strncat (buf, func, bufsz - len - 1);
-      len = strlen (buf);
-    }
-
-  /* print error message */
-  write (STDERR_FILENO, buf + 3, len - 3);
-  write (STDERR_FILENO, "()\n", 3);
-#ifndef __dietlibc__
-  if ((log = socket (AF_UNIX, SOCK_DGRAM, 0)) != -1)
-    {
-      /* Send "found" message to the "/dev/log" path */
-      sock.sun_family = AF_UNIX;
-      (void) strncpy (sock.sun_path, _PATH_LOG, sizeof (sock.sun_path) - 1);
-      sock.sun_path[sizeof (sock.sun_path) - 1] = '\0';
-      sendto (log, buf, len, 0, (struct sockaddr *) &sock, sizeof (sock));
-    }
-#endif
-  /* Make sure the default handler is associated with the our signal handler */
-
-  memset (&sa, 0, sizeof (struct sigaction));
-  sigfillset (&sa.sa_mask);	/* Block all signals */
-  sa.sa_flags = 0;
-  sa.sa_handler = SIG_DFL;
-  sigaction (SSP_SIGTYPE, &sa, NULL);
-  (void) kill (getpid (), SSP_SIGTYPE);
-  _exit (127);
+	/* Make the default handler associated with the signal handler */
+	memset(&sa, 0, sizeof(struct sigaction));
+	sigfillset(&sa.sa_mask);	/* Block all signals */
+	sa.sa_flags = 0;
+	sa.sa_handler = SIG_DFL;
+	sigaction(SSP_SIGTYPE, &sa, NULL);
+	(void) kill(getpid(), SSP_SIGTYPE);
+	_exit(127);
 }
diff --git a/sys-libs/glibc/files/digest-glibc-2.3.4.20050125-r1 b/sys-libs/glibc/files/digest-glibc-2.3.4.20050125-r1
index edcb4a9a0f82..112e879d5ee5 100644
--- a/sys-libs/glibc/files/digest-glibc-2.3.4.20050125-r1
+++ b/sys-libs/glibc/files/digest-glibc-2.3.4.20050125-r1
@@ -1,6 +1,7 @@
 MD5 174ac5ed4f2851fcc866a3bac1e4a6a5 glibc-2.3.4.tar.bz2 13213560
 MD5 7a199cd4965eb5622163756ae64358fe glibc-linuxthreads-2.3.4.tar.bz2 236183
-MD5 2fd95cbaff68634ab99a8a83f9a6d78f glibc-2.3.4-patches-1.2.tar.bz2 31940
+MD5 1f586b91280665cb8df70bdd7c4583ba glibc-libidn-2.3.4.tar.bz2 100711
+MD5 59e183db85229349e83585c35fd3c4c0 glibc-2.3.4-patches-1.7.tar.bz2 37421
 MD5 071ec6e3562813a382b75610980bab98 glibc-manpages-2.3.4-r1.tar.bz2 22276
 MD5 04166455bebb5563bb9a8feca2e3c26c glibc-infopages-2.3.4-r1.tar.bz2 1294898
-MD5 733cddb52c40a5656053631d31fe3cc7 libidn-0.5.13.tar.gz 1965864
+MD5 2c183c16b572f533d07525472d64cdc7 glibc-fedora-20041219T2331.tar.bz2 761998
diff --git a/sys-libs/glibc/files/digest-glibc-2.3.5 b/sys-libs/glibc/files/digest-glibc-2.3.5
index aa8e5ce0afc9..93f3d2bbe0eb 100644
--- a/sys-libs/glibc/files/digest-glibc-2.3.5
+++ b/sys-libs/glibc/files/digest-glibc-2.3.5
@@ -1,7 +1,7 @@
 MD5 93d9c51850e0513aa4846ac0ddcef639 glibc-2.3.5.tar.bz2 13583139
 MD5 77011b0898393c56b799bc011a0f37bf glibc-linuxthreads-2.3.5.tar.bz2 236946
 MD5 86ae1273e22af8766297ec21c0232743 glibc-libidn-2.3.5.tar.bz2 101118
-MD5 da69c41ba6a4b5084930884189d142b2 glibc-2.3.5-patches-1.1.tar.bz2 31959
+MD5 607613148fedcfd7af356950ddd2083f glibc-2.3.5-patches-1.4.tar.bz2 19222
 MD5 8c9a699dc6c24afe646ab4fba121a486 glibc-manpages-2.3.5.tar.bz2 22148
 MD5 04166455bebb5563bb9a8feca2e3c26c glibc-infopages-2.3.4-r1.tar.bz2 1294898
 MD5 2c183c16b572f533d07525472d64cdc7 glibc-fedora-20041219T2331.tar.bz2 761998
diff --git a/sys-libs/glibc/files/digest-glibc-2.3.5-r1 b/sys-libs/glibc/files/digest-glibc-2.3.5-r1
index d1ce61688d1b..a5f72fad8f85 100644
--- a/sys-libs/glibc/files/digest-glibc-2.3.5-r1
+++ b/sys-libs/glibc/files/digest-glibc-2.3.5-r1
@@ -1,7 +1,7 @@
 MD5 93d9c51850e0513aa4846ac0ddcef639 glibc-2.3.5.tar.bz2 13583139
 MD5 77011b0898393c56b799bc011a0f37bf glibc-linuxthreads-2.3.5.tar.bz2 236946
 MD5 86ae1273e22af8766297ec21c0232743 glibc-libidn-2.3.5.tar.bz2 101118
-MD5 d8ff97afc442c4136ceb60de0980a71f glibc-2.3.5-patches-1.5.tar.bz2 19505
+MD5 f4ca3a5089ab3e49bfb0a47cfbefe70d glibc-2.3.5-patches-1.13.tar.bz2 24793
 MD5 8c9a699dc6c24afe646ab4fba121a486 glibc-manpages-2.3.5.tar.bz2 22148
-MD5 04166455bebb5563bb9a8feca2e3c26c glibc-infopages-2.3.4-r1.tar.bz2 1294898
+MD5 893b344ace4f554f5c31b614ec7ab003 glibc-infopages-2.3.5.tar.bz2 1273846
 MD5 2c183c16b572f533d07525472d64cdc7 glibc-fedora-20041219T2331.tar.bz2 761998
diff --git a/sys-libs/glibc/files/digest-glibc-2.3.5-r2 b/sys-libs/glibc/files/digest-glibc-2.3.5-r2
index a5f72fad8f85..994b4e07db6f 100644
--- a/sys-libs/glibc/files/digest-glibc-2.3.5-r2
+++ b/sys-libs/glibc/files/digest-glibc-2.3.5-r2
@@ -1,7 +1,7 @@
+MD5 f4ca3a5089ab3e49bfb0a47cfbefe70d glibc-2.3.5-patches-1.13.tar.bz2 24793
 MD5 93d9c51850e0513aa4846ac0ddcef639 glibc-2.3.5.tar.bz2 13583139
-MD5 77011b0898393c56b799bc011a0f37bf glibc-linuxthreads-2.3.5.tar.bz2 236946
+MD5 2c183c16b572f533d07525472d64cdc7 glibc-fedora-20041219T2331.tar.bz2 761998
+MD5 893b344ace4f554f5c31b614ec7ab003 glibc-infopages-2.3.5.tar.bz2 1273846
 MD5 86ae1273e22af8766297ec21c0232743 glibc-libidn-2.3.5.tar.bz2 101118
-MD5 f4ca3a5089ab3e49bfb0a47cfbefe70d glibc-2.3.5-patches-1.13.tar.bz2 24793
+MD5 77011b0898393c56b799bc011a0f37bf glibc-linuxthreads-2.3.5.tar.bz2 236946
 MD5 8c9a699dc6c24afe646ab4fba121a486 glibc-manpages-2.3.5.tar.bz2 22148
-MD5 893b344ace4f554f5c31b614ec7ab003 glibc-infopages-2.3.5.tar.bz2 1273846
-MD5 2c183c16b572f533d07525472d64cdc7 glibc-fedora-20041219T2331.tar.bz2 761998
diff --git a/sys-libs/glibc/files/digest-glibc-2.3.5-r3 b/sys-libs/glibc/files/digest-glibc-2.3.5-r3
index 99f4567b4d9a..67e823f61327 100644
--- a/sys-libs/glibc/files/digest-glibc-2.3.5-r3
+++ b/sys-libs/glibc/files/digest-glibc-2.3.5-r3
@@ -1,4 +1,4 @@
-MD5 7ca40db4369f1ed3bf5279e8c2d6e7b8 glibc-2.3.5-patches-1.14.tar.bz2 25158
+MD5 96fb926b2ce0b82b849f3e27bfb63693 glibc-2.3.5-patches-1.15.tar.bz2 27300
 MD5 93d9c51850e0513aa4846ac0ddcef639 glibc-2.3.5.tar.bz2 13583139
 MD5 2c183c16b572f533d07525472d64cdc7 glibc-fedora-20041219T2331.tar.bz2 761998
 MD5 893b344ace4f554f5c31b614ec7ab003 glibc-infopages-2.3.5.tar.bz2 1273846
diff --git a/sys-libs/glibc/files/digest-glibc-2.3.5.20050421 b/sys-libs/glibc/files/digest-glibc-2.3.5.20050421
index 3498e68e7b30..dd2df6d8c79d 100644
--- a/sys-libs/glibc/files/digest-glibc-2.3.5.20050421
+++ b/sys-libs/glibc/files/digest-glibc-2.3.5.20050421
@@ -2,7 +2,7 @@ MD5 93d9c51850e0513aa4846ac0ddcef639 glibc-2.3.5.tar.bz2 13583139
 MD5 77011b0898393c56b799bc011a0f37bf glibc-linuxthreads-2.3.5.tar.bz2 236946
 MD5 86ae1273e22af8766297ec21c0232743 glibc-libidn-2.3.5.tar.bz2 101118
 MD5 9e5f724bedff000b31ed230b4308511c glibc-2.3.5-branch-update-20050421.patch.bz2 368850
-MD5 8734b06a3fb1e4c4be2dfa165f649014 glibc-2.3.5-patches-2.0.tar.bz2 31610
+MD5 55eef42667ef347b8f89cf19a8a78504 glibc-2.3.5-patches-2.2.tar.bz2 17011
 MD5 8c9a699dc6c24afe646ab4fba121a486 glibc-manpages-2.3.5.tar.bz2 22148
 MD5 893b344ace4f554f5c31b614ec7ab003 glibc-infopages-2.3.5.tar.bz2 1273846
 MD5 2c183c16b572f533d07525472d64cdc7 glibc-fedora-20041219T2331.tar.bz2 761998
diff --git a/sys-libs/glibc/files/digest-glibc-2.3.6 b/sys-libs/glibc/files/digest-glibc-2.3.6
index ab899c9343b8..a87559bdbe49 100644
--- a/sys-libs/glibc/files/digest-glibc-2.3.6
+++ b/sys-libs/glibc/files/digest-glibc-2.3.6
@@ -4,4 +4,4 @@ MD5 2c183c16b572f533d07525472d64cdc7 glibc-fedora-20041219T2331.tar.bz2 761998
 MD5 1c7fa36de8bdb130e4b697d25cc672cd glibc-infopages-2.3.6.tar.bz2 1298413
 MD5 49dbe06ce830fc73874d6b38bdc5b4db glibc-libidn-2.3.6.tar.bz2 101041
 MD5 d4eeda37472666a15cc1f407e9c987a9 glibc-linuxthreads-2.3.6.tar.bz2 243534
-MD5 4931bc9fdd2b9d05fc8a8e96717aa084 glibc-manpages-2.3.6.tar.bz2 15403
+MD5 0b5f8f3e19c4c4efd1ab15a3823c4538 glibc-manpages-2.3.6-1.tar.bz2 22216
diff --git a/sys-libs/glibc/files/glibc-2.2.2-test-lfs-timeout.patch b/sys-libs/glibc/files/glibc-2.2.2-test-lfs-timeout.patch
index 3ec6ab736383..ac4de72dad00 100644
--- a/sys-libs/glibc/files/glibc-2.2.2-test-lfs-timeout.patch
+++ b/sys-libs/glibc/files/glibc-2.2.2-test-lfs-timeout.patch
@@ -5,7 +5,7 @@
  
  /* We might need a bit longer timeout.  */
 -#define TIMEOUT 20 /* sec */
-+#define TIMEOUT 40 /* sec */
++#define TIMEOUT 120 /* sec */
  
  /* This defines the `main' function and some more.  */
  #include <test-skeleton.c>
diff --git a/sys-libs/glibc/files/glibc-sec-hotfix-20040804.patch b/sys-libs/glibc/files/glibc-sec-hotfix-20040804.patch
index c3ace5307931..14ffd90b5b28 100644
--- a/sys-libs/glibc/files/glibc-sec-hotfix-20040804.patch
+++ b/sys-libs/glibc/files/glibc-sec-hotfix-20040804.patch
@@ -49,11 +49,12 @@ exit 0
  }
 --- sysdeps/generic/unsecvars.h	2004-08-03 18:13:13 -0400
 +++ sysdeps/generic/unsecvars.h	2004-08-03 18:11:41 -0400
-@@ -3,6 +3,7 @@
+@@ -3,6 +3,8 @@
     with a '\0' explicitly.  */
  #define UNSECURE_ENVVARS \
    "LD_PRELOAD\0"							      \
 +  "LD_DEBUG\0"								      \
++  "LD_TRACE_PRELINKING\0"							      \
    "LD_LIBRARY_PATH\0"							      \
    "LD_ORIGIN_PATH\0"							      \
    "LD_DEBUG_OUTPUT\0"							      \
diff --git a/sys-libs/glibc/files/locales.build b/sys-libs/glibc/files/locales.build
index bcee239b3b69..571aa1c97433 100644
--- a/sys-libs/glibc/files/locales.build
+++ b/sys-libs/glibc/files/locales.build
@@ -5,20 +5,18 @@
 # ignored. Here is an example:
 # en_US/ISO-8859-1
 
-# the following are required, or else 'make check' will fail
-de_DE/ISO-8859-1
-de_DE@euro/ISO-8859-15
+en_US/ISO-8859-1
+en_US.UTF-8/UTF-8
+ja_JP.EUC-JP/EUC-JP
+ja_JP.UTF-8/UTF-8
+ja_JP/EUC-JP
 en_HK/ISO-8859-1
 en_PH/ISO-8859-1
-en_US/ISO-8859-1
+de_DE/ISO-8859-1
+de_DE@euro/ISO-8859-15
 es_MX/ISO-8859-1
 fa_IR/UTF-8
 fr_FR/ISO-8859-1
 fr_FR@euro/ISO-8859-15
 it_IT/ISO-8859-1
-ja_JP/EUC-JP
 
-# possibly useful
-en_US.UTF-8/UTF-8
-ja_JP.EUC-JP/EUC-JP
-ja_JP.UTF-8/UTF-8
diff --git a/sys-libs/glibc/files/nscd b/sys-libs/glibc/files/nscd
index 7945cc2796dd..5fa7d447be16 100755
--- a/sys-libs/glibc/files/nscd
+++ b/sys-libs/glibc/files/nscd
@@ -1,43 +1,53 @@
-#! /bin/sh
-#RCUPDATE:3 4:72
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/nscd,v 1.1.1.1 2005/11/30 09:39:33 chriswhite Exp $
 
-.  /etc/rc.d/config/functions
-
-SERVICE=nscd
-EXE=/usr/sbin/nscd
-opts="start stop restart"
+checkconfig() {
+	if [[ -z ${NSCD_PERMS_OK} && $(stat -c %a /var/run/nscd) != "755" ]] ; then
+		echo ""
+		ewarn "nscd run dir is not world readable, you should reset the perms:"
+		ewarn "chmod 755 /var/run/nscd"
+		ewarn "chmod a+rw /var/run/nscd/socket"
+		echo ""
+		ewarn "To disable this warning, set 'NSCD_PERMS_OK' in /etc/conf.d/nscd"
+		echo ""
+	fi
+}
 
 start() {
+	checkconfig
+
 	ebegin "Starting Name Service Cache Daemon"
-	secure=` cat /etc/nsswitch.conf | while read curline ; do
-	  table=${curline%:*}
-	  entries=${curline##$table:}
-	  table=${table%%[^a-z]*}
-	  case $table in
-	    passwd*|group*|hosts)
-	      for entry in $entries ; do
-		case $entry in
-		  nisplus*)
-		    /usr/sbin/nscd_nischeck $table || echo "-S $table,yes"
-		  ;;
+	local secure=`while read curline ; do
+		table=${curline%:*}
+		entries=${curline##$table:}
+		table=${table%%[^a-z]*}
+		case $table in
+			passwd*|group*|hosts)
+			for entry in $entries ; do
+			case $entry in
+				nisplus*)
+					/usr/sbin/nscd_nischeck $table || \
+					/echo "-S $table,yes"
+				;;
+			esac
+			done
+		;;
 		esac
-	      done
-	    ;;
-	  esac
-	done`
-	start-stop-daemon --start --quiet --exec $EXE -- $secure 1>&2
-	eend $? "Error starting $SERVICE"
-}
-stop () {
-	ebegin "Shutting down Name Service Cache Daemon"
-	start-stop-daemon --stop --quiet --pid /var/run/nscd.pid 1>&2
-	eend $? "Error stopping $SERVICE"
+		done < /etc/nsswitch.conf`
+	local pidfile="$(strings /usr/sbin/nscd | grep nscd.pid)"
+	mkdir -p "$(dirname ${pidfile})"
+	start-stop-daemon --start --quiet \
+		--exec /usr/sbin/nscd --pid ${pidfile} \
+		-- $secure
+	eend $?
 }
 
-restart () {
-	stop
-	start
+stop() {
+	ebegin "Shutting down Name Service Cache Daemon"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/nscd
+	eend $?
 }
 
-doservice ${@}
-
+# vim:ts=4
diff --git a/sys-libs/glibc/files/nsswitch.conf b/sys-libs/glibc/files/nsswitch.conf
index eb169614d4d1..51ba7fbde51c 100644
--- a/sys-libs/glibc/files/nsswitch.conf
+++ b/sys-libs/glibc/files/nsswitch.conf
@@ -1,5 +1,5 @@
 # /etc/nsswitch.conf:
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/nsswitch.conf,v 1.1 2005/05/17 00:52:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/nsswitch.conf,v 1.1.1.1 2005/11/30 09:39:34 chriswhite Exp $
 
 passwd:      compat
 shadow:      compat
diff --git a/sys-libs/glibc/glibc-2.2.5-r10.ebuild b/sys-libs/glibc/glibc-2.2.5-r10.ebuild
index 8c50777f08df..c3a8d4b19e8f 100644
--- a/sys-libs/glibc/glibc-2.2.5-r10.ebuild
+++ b/sys-libs/glibc/glibc-2.2.5-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/sys-libs/glibc/glibc-2.2.5-r10.ebuild,v 1.1 2005/02/06 07:45:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.5-r10.ebuild,v 1.1.1.1 2005/11/30 09:39:29 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
@@ -46,6 +46,7 @@ src_unpack() {
 	cd "${S}"
 	unpack ${P}-manpages.tar.bz2 glibc-linuxthreads-${PV}.tar.bz2
 	epatch ${WORKDIR}/patch
+	epatch ${FILESDIR}/2.3.3/glibc-2.3.3-localedef-fix-trampoline.patch
 }
 
 src_compile() {
@@ -115,6 +116,7 @@ src_install() {
 		insinto /etc
 		doins "${S}"/nscd/nscd.conf
 		doinitd "${FILESDIR}"/nscd
+		doins "${FILESDIR}"/nsswitch.conf
 
 		dodoc BUGS ChangeLog* CONFORMANCE FAQ INTERFACE \
 			NEWS NOTES PROJECTS README*
diff --git a/sys-libs/glibc/glibc-2.3.2-r12.ebuild b/sys-libs/glibc/glibc-2.3.2-r12.ebuild
index cc4e04c4c4b6..f4af7e5217bc 100644
--- a/sys-libs/glibc/glibc-2.3.2-r12.ebuild
+++ b/sys-libs/glibc/glibc-2.3.2-r12.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/sys-libs/glibc/glibc-2.3.2-r12.ebuild,v 1.1 2004/10/07 22:24:28 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r12.ebuild,v 1.1.1.1 2005/11/30 09:39:25 chriswhite Exp $
 
-inherit eutils flag-o-matic gcc
+inherit eutils flag-o-matic toolchain-funcs
 
 # Branch update support.  Following will disable:
 #  BRANCH_UPDATE=
@@ -16,6 +16,14 @@ export MIN_KV="2.4.1"
 #       you are doing !
 export MIN_NPTL_KV="2.6.0"
 
+# (very) Theoretical cross-compiler support
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} = ${CHOST} ]] ; then
+	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+		export CTARGET=${CATEGORY/cross-}
+	fi
+fi
+
 MY_PV="${PV/_}"
 S="${WORKDIR}/${P%_*}"
 DESCRIPTION="GNU libc6 (also called glibc2) C library"
@@ -28,9 +36,11 @@ SRC_URI="http://ftp.gnu.org/gnu/glibc/glibc-${MY_PV}.tar.bz2
 	hppa? ( mirror://gentoo/${P}-hppa-patches-p1.tar.bz2 )"
 
 LICENSE="LGPL-2"
-SLOT="2.2"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 s390"
-IUSE="nls pic build nptl debug"
+[[ ${CTARGET} != ${CHOST} ]] \
+	&& SLOT="${CTARGET}-2.2" \
+	|| SLOT="2.2"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc s390 sh sparc x86"
+IUSE="build nls nptl pic userlocales"
 RESTRICT="nostrip" # we'll handle stripping ourself #46186
 
 # We need new cleanup attribute support from gcc for NPTL among things ...
@@ -40,10 +50,9 @@ DEPEND=">=sys-devel/gcc-3.2.3-r1
 	virtual/os-headers
 	nls? ( sys-devel/gettext )"
 RDEPEND="virtual/os-headers
-	sys-apps/baselayout
 	nls? ( sys-devel/gettext )"
 PDEPEND="ppc? ( >=sys-kernel/linux-headers-2.4.22 )"
-PROVIDE="virtual/glibc virtual/libc"
+PROVIDE="virtual/libc"
 
 # Try to get a kernel source tree with version equal or greater
 # than $1.  We basically just try a few default locations.  The
@@ -110,7 +119,7 @@ use_nptl() {
 		# - Or we have 'amd64' in USE
 		# - Or we have 'mips' in USE
 		# - Or we have 'ppc' in USE
-		case ${ARCH} in
+		case $(tc-arch ${CTARGET}) in
 			"x86")
 				if [ "${CHOST/-*}" = "i486" -o \
 				     "${CHOST/-*}" = "i586" -o \
@@ -119,7 +128,7 @@ use_nptl() {
 					return 0
 				fi
 				;;
-			"alpha"|"amd64"|"mips"|"ppc"|"sparc")
+			"alpha"|"amd64"|"mips"|"ppc")
 				return 0
 				;;
 			*)
@@ -131,6 +140,35 @@ use_nptl() {
 	return 1
 }
 
+install_locales() {
+	einfo "Installing Locale data..."
+	make PARALLELMFLAGS="${MAKEOPTS}" \
+		install_root=${D} \
+		localedata/install-locales -C ${buildtarget} || die
+	keepdir /usr/lib/locale/ru_RU/LC_MESSAGES
+}
+
+setup_locales() {
+	if ! use userlocales ; then
+		einfo "userlocales not enabled, installing -ALL- locales..."
+	elif [[ -e ${ROOT}/etc/locales.build ]] ; then
+		einfo "Installing locales in /etc/locales.build..."
+		echo 'SUPPORTED-LOCALES=\' > SUPPORTED.locales
+		cat "${ROOT}"/etc/locales.build | grep -v -e ^$ -e ^\# | sed 's/$/\ \\/g' \
+			>> SUPPORTED.locales
+		cat SUPPORTED.locales > ${S}/localedata/SUPPORTED || die
+	elif [ -e ${FILESDIR}/locales.build ]; then
+		einfo "Installing locales in ${FILESDIR}/locales.build..."
+		echo 'SUPPORTED-LOCALES=\' > SUPPORTED.locales
+		cat ${FILESDIR}/locales.build | grep -v -e ^$ -e ^\# | sed 's/$/\ \\/g' \
+			>> SUPPORTED.locales
+		cat SUPPORTED.locales > ${S}/localedata/SUPPORTED || die
+	else
+		einfo "Installing -ALL- locales..."
+	fi
+	install_locales || die
+}
+
 glibc_setup() {
 	# Check if we are going to downgrade, we don't like that
 	#local old_version
@@ -244,6 +282,11 @@ src_unpack() {
 
 	unpack glibc-${MY_PV}.tar.bz2
 
+	# Needed for s390/linux-2.6 headers
+	cp ${FILESDIR}/2.3.2/posix_fadvise64.c \
+		${S}/sysdeps/unix/sysv/linux/s390/s390-32/posix_fadvise64.c \
+		|| die
+
 	# we only need to check this one time. Bug #61856
 	glibc_setup
 
@@ -253,18 +296,15 @@ src_unpack() {
 
 	cd ${S}
 	# Extract our threads package ...
-	if (! use_nptl) && [ -z "${BRANCH_UPDATE}" ]
-	then
+	if (! use_nptl) && [[ -z ${BRANCH_UPDATE} ]] ; then
 		unpack glibc-linuxthreads-${MY_PV}.tar.bz2
 	fi
 
-	if [ -n "${BRANCH_UPDATE}" ]
-	then
+	if [[ -n ${BRANCH_UPDATE} ]] ; then
 		epatch ${DISTDIR}/${P}-branch-update-${BRANCH_UPDATE}.patch.bz2
 	fi
 
-	if use_nptl
-	then
+	if use_nptl ; then
 		epatch ${FILESDIR}/2.3.2/${P}-redhat-nptl-fixes.patch
 	else
 		epatch ${FILESDIR}/2.3.2/${P}-redhat-linuxthreads-fixes.patch
@@ -274,8 +314,7 @@ src_unpack() {
 	# __guard_setup__stack_smash_handler
 	#
 	#  http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml
-	if [ "${ARCH}" != "hppa" -a "${ARCH}" != "hppa64" ]
-	then
+	if [[ $(tc-arch ${CTARGET}) != "hppa" ]] ; then
 		cd ${S}; epatch ${FILESDIR}/${PV}/${P}-propolice-guard-functions-v2.patch
 	fi
 
@@ -289,6 +328,9 @@ src_unpack() {
 	# PT_GNU_STACK section.  Bug #32960.  <azarah@gentoo.org> (12 Nov 2003).
 	epatch ${FILESDIR}/2.3.2/${PN}-2.3.2-dl_execstack-PaX-support.patch
 
+	# Upstream patch to fix assert.h
+	epatch ${FILESDIR}/2.3.2/${P}-assert.patch
+
 	# This next patch fixes a test that will timeout due to ReiserFS' slow handling of sparse files
 #	cd ${S}/io; epatch ${FILESDIR}/glibc-2.2.2-test-lfs-timeout.patch
 
@@ -340,8 +382,7 @@ src_unpack() {
 	# do can be found in the patch headers.
 	# <tuxus@gentoo.org> thx <dragon@gentoo.org> (11 Jan 2003)
 	# <kumba@gentoo.org> remove tst-rndseek-mips & ulps-mips patches
-	if [ "${ARCH}" = "mips" ]
-	then
+	if [[ $(tc-arch ${CTARGET}) == "mips" ]] ; then
 		cd ${S}
 		epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-fpu-cw-mips.patch
 		epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-libgcc-compat-mips.patch
@@ -352,8 +393,7 @@ src_unpack() {
 		epatch ${FILESDIR}/2.3.2/${P}-mips-fix-nested-entend-pairs.patch
 	fi
 
-	if [ "${ARCH}" = "alpha" ]
-	then
+	if [[ $(tc-arch ${CTARGET}) == "alpha" ]] ; then
 		cd ${S}
 		# Fix compatability with compaq compilers by ifdef'ing out some
 		# 2.3.2 additions.
@@ -363,15 +403,16 @@ src_unpack() {
 		# Fix compilation with >=gcc-3.2.3 (01 Nov 2003 agriffis)
 		epatch ${FILESDIR}/2.3.2/${P}-alpha-pwrite.patch
 		epatch ${FILESDIR}/2.3.2/${P}-alpha-crti.patch
+
+		# Fix building with 2.6 headers #52764
+		epatch ${FILESDIR}/2.3.2/${P}-alpha-sysdeps.patch
 	fi
 
-	if [ "${ARCH}" = "amd64" ]
-	then
+	if [[ $(tc-arch ${CTARGET}) == "amd64" ]] ; then
 		cd ${S}; epatch ${FILESDIR}/2.3.2/${P}-amd64-nomultilib.patch
 	fi
 
-	if [ "${ARCH}" = "ia64" ]
-	then
+	if [[ $(tc-arch ${CTARGET}) == "ia64" ]] ; then
 		# The basically problem is glibc doesn't store information about
 		# what the kernel interface is so that it can't efficiently set up
 		# parameters for system calls.  This patch from H.J. Lu fixes it:
@@ -381,11 +422,11 @@ src_unpack() {
 		cd ${S}; epatch ${FILESDIR}/2.3.2/${P}-ia64-LOAD_ARGS-fixup.patch
 	fi
 
-	if [ "${ARCH}" = "hppa" ]
-	then
+	if [[ $(tc-arch ${CTARGET}) == "hppa" ]] ; then
 		cd ${WORKDIR}
 		unpack ${P}-hppa-patches-p1.tar.bz2
 		cd ${S}
+		epatch "${FILESDIR}"/2.3.4/hppa-no-pie.patch
 		EPATCH_EXCLUDE="010* 020* 030* 040* 050* 055*"
 		for i in ${EPATCH_EXCLUDE}
 		do
@@ -400,8 +441,7 @@ src_unpack() {
 		patch -p 1 < ${FILESDIR}/2.3.1/glibc23-07-hppa-atomicity.dpatch
 	fi
 
-	if [ "${ARCH}" = "s390" ]
-	then
+	if [[ $(tc-arch ${CTARGET}) == "s390" ]] ; then
 		# The deprecated ustat.h causes problems on s390
 		#
 		#   http://sources.redhat.com/ml/bug-glibc/2003-08/msg00020.html
@@ -410,8 +450,7 @@ src_unpack() {
 		cd ${S}/sysdeps/unix/sysv/linux; epatch ${FILESDIR}/2.3.2/${P}-s390-deprecated-ustat-fixup.patch
 	fi
 
-	if [ "${ARCH}" == "arm" ]
-	then
+	if [[ $(tc-arch ${CTARGET}) == "arm" ]] ; then
 		cd ${S}
 		# sjlj exceptions causes undefined frame variables (ported from cvs)
 		epatch ${FILESDIR}/2.3.2/${P}-framestate-USING_SJLJ_EXCEPTIONS.patch
@@ -546,6 +585,15 @@ src_compile() {
 #	make check
 }
 
+src_test() {
+	# This is wrong, but glibc's tests fail bad when screwing 
+	# around with sandbox, so lets just punt it
+	unset LD_PRELOAD
+
+	cd ${S}/buildhere
+	make check || die "make check failed :("
+}
+
 src_install() {
 	local buildtarget="buildhere"
 
@@ -562,7 +610,7 @@ src_install() {
 	# now, strip everything but the thread libs #46186
 	mkdir ${T}/thread-backup
 	mv ${D}/lib/lib{pthread,thread_db}* ${T}/thread-backup/
-	env -uRESTRICT prepallstrip
+	env -uRESTRICT CHOST=${CTARGET} prepallstrip
 	mv ${T}/thread-backup/* ${D}/lib/
 
 	# If librt.so is a symlink, change it into linker script (Redhat)
@@ -596,14 +644,7 @@ EOF
 				info -C ${buildtarget} || die
 		fi
 
-		einfo "Installing Locale data..."
-		make PARALLELMFLAGS="${MAKEOPTS}" \
-			install_root=${D} \
-			localedata/install-locales -C ${buildtarget} || die
-
-		# Compatibility hack: this locale has vanished from glibc,
-		# but some other programs are still using it.
-		keepdir /usr/lib/locale/ru_RU/LC_MESSAGES
+		setup_locales
 
 		einfo "Installing man pages and docs..."
 		# Install linuxthreads man pages
@@ -615,6 +656,7 @@ EOF
 		# Install nscd config file
 		insinto /etc ; doins ${FILESDIR}/nscd.conf
 		exeinto /etc/init.d ; doexe ${FILESDIR}/nscd
+		doins "${FILESDIR}"/nsswitch.conf
 
 		dodoc BUGS ChangeLog* CONFORMANCE FAQ INTERFACE \
 			NEWS NOTES PROJECTS README*
@@ -626,6 +668,9 @@ EOF
 			install_root=${D} \
 			timezone/install-others -C ${buildtarget} || die
 	fi
+	insinto /etc
+	# This is our new config file for building locales
+	doins ${FILESDIR}/locales.build
 
 	if use pic
 	then
@@ -658,6 +703,11 @@ EOF
 	dosym /usr/lib/libbsd-compat.a /usr/lib/libbsd.a
 }
 
+pkg_preinst() {
+	# Shouldnt need to keep this updated
+	[[ -e ${ROOT}/etc/locales.build ]] && rm -f "${D}"/etc/locales.build
+}
+
 pkg_postinst() {
 	# Correct me if I am wrong here, but my /etc/localtime is a file
 	# created by zic ....
diff --git a/sys-libs/glibc/glibc-2.3.3.20040420-r2.ebuild b/sys-libs/glibc/glibc-2.3.3.20040420-r2.ebuild
index bb433949d791..54b8d729285a 100644
--- a/sys-libs/glibc/glibc-2.3.3.20040420-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.3.3.20040420-r2.ebuild
@@ -1,20 +1,19 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.3.20040420-r2.ebuild,v 1.1 2004/10/07 22:24:28 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.3.20040420-r2.ebuild,v 1.1.1.1 2005/11/30 09:39:32 chriswhite Exp $
 
-inherit eutils flag-o-matic gcc
+inherit eutils flag-o-matic toolchain-funcs
 
 # Branch update support.  Following will disable:
 #  BRANCH_UPDATE=
 BRANCH_UPDATE="20040420"
 
-
 # Minimum kernel version for --enable-kernel
-export MIN_KV="2.4.1"
+export MIN_KV=${LT_KERNEL_VERSION:-"2.4.1"}
 # Minimum kernel version for enabling TLS and NPTL ...
 # NOTE: do not change this if you do not know what
 #       you are doing !
-export MIN_NPTL_KV="2.6.0"
+export MIN_NPTL_KV=${NPTL_KERNEL_VERSION:-"2.6.0"}
 
 #MY_PV="${PV/_}"
 MY_PV="2.3.2"
@@ -33,7 +32,7 @@ LICENSE="LGPL-2"
 SLOT="2.2"
 #KEYWORDS="~x86 ~mips ~sparc ~amd64 -hppa ~ia64 ~ppc" # breaks on ~alpha
 KEYWORDS="x86 ppc sparc"
-IUSE="nls pic build nptl erandom debug hardened"
+IUSE="build erandom hardened nls nptl pic"
 
 # We need new cleanup attribute support from gcc for NPTL among things ...
 DEPEND=">=sys-devel/gcc-3.2.3-r1
@@ -42,9 +41,8 @@ DEPEND=">=sys-devel/gcc-3.2.3-r1
 	virtual/os-headers
 	nls? ( sys-devel/gettext )"
 RDEPEND="virtual/os-headers
-	sys-apps/baselayout
 	nls? ( sys-devel/gettext )"
-PROVIDE="virtual/glibc virtual/libc"
+PROVIDE="virtual/libc"
 
 
 # Try to get a kernel source tree with version equal or greater
@@ -121,7 +119,7 @@ use_nptl() {
 					return 0
 				fi
 				;;
-			"alpha"|"amd64"|"ia64"|"mips"|"ppc"|"sparc")
+			"alpha"|"amd64"|"ia64"|"mips"|"ppc")
 				return 0
 				;;
 			*)
@@ -287,11 +285,6 @@ src_unpack() {
 		epatch ${FILESDIR}/2.3.3/${LOCAL_P}-propolice-guard-functions-v3.patch
 		cp ${FILESDIR}/2.3.3/ssp.c ${S}/sysdeps/unix/sysv/linux || \
 			die "failed to copy ssp.c to ${S}/sysdeps/unix/sysv/linux/"
-		# gcc 3.4 nukes ssp without this patch
-		if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
-		then
-			epatch ${FILESDIR}/2.3.3/glibc-2.3.3-ssp-gcc34-after-frandom.patch
-		fi
 	fi
 
 	# sparc fails when building the components for the normal crt1.o
@@ -407,11 +400,11 @@ src_unpack() {
 		epatch ${FILESDIR}/2.3.2/${LOCAL_P}-mips-configure-for-n64-symver.patch
 		epatch ${FILESDIR}/2.3.3/${PN}-2.3.3_pre20040420-mips-dl-machine-calls.diff
 		epatch ${FILESDIR}/2.3.3/${PN}-2.3.3_pre20040420-mips-incl-sgidefs.diff
-		epatch ${FILESDIR}/2.3.3/mips-addabi.diff
-		epatch ${FILESDIR}/2.3.3/mips-syscall.h.diff
-		epatch ${FILESDIR}/2.3.3/semtimedop.diff
-		epatch ${FILESDIR}/2.3.3/mips-sysify.diff
-#####		epatch ${FILESDIR}/2.3.3/mips-n32n64regs.diff
+		epatch ${FILESDIR}/2.3.3/${PN}-2.3.3-mips-addabi.diff
+		epatch ${FILESDIR}/2.3.3/${PN}-2.3.3-mips-syscall.h.diff
+		epatch ${FILESDIR}/2.3.3/${PN}-2.3.3-semtimedop.diff
+		epatch ${FILESDIR}/2.3.3/${PN}-2.3.3-mips-sysify.diff
+#####		epatch ${FILESDIR}/2.3.3/${PN}-2.3.3-mips-n32n64regs.diff
 	fi
 
 	if [ "${ARCH}" = "alpha" ]
@@ -450,6 +443,7 @@ src_unpack() {
 		cd ${WORKDIR}
 		unpack ${LOCAL_P}-hppa-patches-p1.tar.bz2
 		cd ${S}
+		epatch "${FILESDIR}"/2.3.4/hppa-no-pie.patch
 		EPATCH_EXCLUDE="0[123459]0* 055* 1[2379]0* 200* 230*"
 		for x in ${EPATCH_EXCLUDE}
 		do
@@ -656,6 +650,7 @@ EOF
 		# Install nscd config file
 		insinto /etc ; doins ${FILESDIR}/nscd.conf
 		exeinto /etc/init.d ; doexe ${FILESDIR}/nscd
+		doins "${FILESDIR}"/nsswitch.conf
 
 		dodoc BUGS ChangeLog* CONFORMANCE FAQ INTERFACE \
 			NEWS NOTES PROJECTS README*
diff --git a/sys-libs/glibc/glibc-2.3.4.20040619-r2.ebuild b/sys-libs/glibc/glibc-2.3.4.20040619-r2.ebuild
index 06156e1999ec..668032ac9502 100644
--- a/sys-libs/glibc/glibc-2.3.4.20040619-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20040619-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/sys-libs/glibc/glibc-2.3.4.20040619-r2.ebuild,v 1.1 2004/10/07 22:24:28 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040619-r2.ebuild,v 1.1.1.1 2005/11/30 09:39:31 chriswhite Exp $
 
-inherit eutils flag-o-matic gcc
+inherit eutils flag-o-matic toolchain-funcs
 
 # Branch update support.  Following will disable:
 #  BRANCH_UPDATE=
@@ -45,7 +45,7 @@ fi
 LICENSE="LGPL-2"
 SLOT="2.2"
 KEYWORDS="-* ~x86 mips amd64 ~hppa ~ppc ~ia64"
-IUSE="userlocales pic build nptl erandom hardened makecheck multilib debug n32 n64"
+IUSE="build erandom hardened multilib n32 n64 nls nptl pic test userlocales"
 RESTRICT="nostrip" # we'll handle stripping ourself #46186
 
 # We need new cleanup attribute support from gcc for NPTL among things ...
@@ -56,13 +56,12 @@ DEPEND=">=sys-devel/gcc-3.2.3-r1
 	nptl? ( >=sys-devel/gcc-3.3.1-r1 )
 	>=sys-devel/binutils-2.14.90.0.6-r1
 	virtual/os-headers
-	nptl? ( =sys-kernel/linux26-headers-2.6* )
+	nptl? ( >=sys-kernel/linux-headers-2.6 )
 	nls? ( sys-devel/gettext )"
 RDEPEND="virtual/os-headers
-	sys-apps/baselayout
 	nls? ( sys-devel/gettext )"
 
-PROVIDE="virtual/glibc virtual/libc"
+PROVIDE="virtual/libc"
 
 
 # Theoretical cross-compiler support
@@ -186,7 +185,7 @@ want_nptl() {
 	if use nptl; then
 		# Archs that can use NPTL
 		if use amd64 || use alpha || use ia64 || use ppc || \
-		   use ppc64 || use s390 || use sparc; then
+		   use ppc64 || use s390 ; then
 			return 0
 		fi
 
@@ -205,7 +204,7 @@ want_nptl() {
 want_tls() {
 	# Archs that can use TLS (Thread Local Storage)
 	if use amd64 || use alpha || use ia64 || use ppc || \
-	   use ppc64 || use s390 || use sparc; then
+	   use ppc64 || use s390 ; then
 		return 0
 	fi
 
@@ -221,7 +220,7 @@ want_tls() {
 }
 
 
-do_makecheck() {
+do_test() {
 	ATIME=`mount | awk '{ print $3,$6 }' | grep ^\/\  | grep noatime`
 	if [ "$ATIME" = "" ]; then
 		cd ${WORKDIR}/build
@@ -249,8 +248,8 @@ install_locales() {
 
 
 setup_locales() {
-	if use !userlocales || use makecheck; then
-		einfo "makecheck in USE or userlocales not enabled, installing -ALL- locales..."
+	if use !userlocales || use test; then
+		einfo "test in USE or userlocales not enabled, installing -ALL- locales..."
 		install_locales || die
 	elif [ -e /etc/locales.build ]; then
 		einfo "Installing locales in /etc/locales.build..."
@@ -306,7 +305,7 @@ glibc_setup() {
 	fi
 	echo
 
-	hasq sandbox $FEATURES && use makecheck && die "sandbox breaks make check. either take makecheck out of USE or set FEATURES=-sandbox"
+	hasq sandbox $FEATURES && use test && die "sandbox breaks make check. either take test out of USE or set FEATURES=-sandbox"
 }
 
 
@@ -342,6 +341,7 @@ do_arch_hppa_patches() {
 	cd ${T}
 	unpack glibc-hppa-patches-${HPPA_PATCHES}.tar.gz
 	cd ${S}
+	epatch "${FILESDIR}"/2.3.4/hppa-no-pie.patch
 	export EPATCH_OPTS=-p1
 	for i in ${T}/glibc-hppa-patches-${HPPA_PATCHES}/*.diff
 	do
@@ -378,18 +378,18 @@ do_arch_mips_patches() {
 	epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-librt-mips.patch
 	epatch ${FILESDIR}/2.3.3/${PN}-2.3.3_pre20040420-mips-dl-machine-calls.diff
 	epatch ${FILESDIR}/2.3.3/${PN}-2.3.3_pre20040420-mips-incl-sgidefs.diff
-	epatch ${FILESDIR}/2.3.3/mips-addabi.diff
-	epatch ${FILESDIR}/2.3.3/mips-syscall.h.diff
-	epatch ${FILESDIR}/2.3.3/semtimedop.diff
-	epatch ${FILESDIR}/2.3.3/mips-sysify.diff
+	epatch ${FILESDIR}/2.3.3/${PN}-2.3.3-mips-addabi.diff
+	epatch ${FILESDIR}/2.3.3/${PN}-2.3.3-mips-syscall.h.diff
+	epatch ${FILESDIR}/2.3.3/${PN}-2.3.3-mips-semtimedop.diff
+	epatch ${FILESDIR}/2.3.3/${PN}-2.3.3-mips-sysify.diff
 
 	if use n32 || use n64; then
-		epatch ${FILESDIR}/2.3.4/mips-sysdep-cancel.diff
+		epatch ${FILESDIR}/2.3.4/${PN}-2.3.4-mips-sysdep-cancel.diff
 	fi
 
 	# Need to install into /lib for n32-only userland for now.
 	# Propper solution is to make all userland /lib{32|64}-aware.
-	use multilib || epatch ${FILESDIR}/2.3.3/mips-nolib3264.diff
+	use multilib || epatch ${FILESDIR}/2.3.3/${PN}-2.3.3-mips-nolib3264.diff
 }
 
 
@@ -606,6 +606,15 @@ src_compile() {
 	make PARALLELMFLAGS="${MAKEOPTS}" || die
 }
 
+src_test() {
+	# This is wrong, but glibc's tests fail bad when screwing 
+	# around with sandbox, so lets just punt it
+	unset LD_PRELOAD
+
+	cd ${WORKDIR}/build
+	make check || die "make check failed :("
+}
+
 src_install() {
 	setup_flags
 
@@ -665,6 +674,7 @@ EOF
 		# Install nscd config file
 		insinto /etc ; doins ${FILESDIR}/nscd.conf
 		exeinto /etc/init.d ; doexe ${FILESDIR}/nscd
+		doins "${FILESDIR}"/nsswitch.conf
 
 		cd ${S}
 		dodoc BUGS ChangeLog* CONFORMANCE FAQ INTERFACE \
@@ -711,16 +721,21 @@ EOF
 	insinto /etc
 	doins ${FILESDIR}/locales.build
 
-	if use makecheck; then
+	if use test; then
 		local OLD_SANDBOX_ON="${SANDBOX_ON}"
 		# make check will fail if sandbox is enabled.  Do not do it
 		# globally though, else we might fail to find sandbox violations ...
 		SANDBOX_ON="0"
-		do_makecheck
+		do_test
 		SANDBOX_ON="${OLD_SANDBOX_ON}"
 	fi
 }
 
+pkg_preinst() {
+	# Shouldnt need to keep this updated
+	[[ -e ${ROOT}/etc/locales.build ]] && rm -f "${D}"/etc/locales.build
+}
+
 pkg_postinst() {
 	# Correct me if I am wrong here, but my /etc/localtime is a file
 	# created by zic ....
diff --git a/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild b/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild
index 6b958305ddf9..12e534e2c23e 100644
--- a/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild
@@ -1,18 +1,27 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild,v 1.1 2004/10/07 22:24:28 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild,v 1.1.1.1 2005/11/30 09:39:31 chriswhite Exp $
 
-inherit eutils flag-o-matic gcc
+inherit eutils multilib flag-o-matic toolchain-funcs versionator
 
 # Branch update support.  Following will disable:
 #  BRANCH_UPDATE=
 BRANCH_UPDATE="20040808"
 
-
 # Minimum kernel version we support
 # (Recent snapshots fails with 2.6.5 and earlier)
+# also, we do not have a single 2.4 kernel in the tree with backported
+# support required to enable nptl.
 MIN_KERNEL_VERSION="2.6.5"
 
+# (very) Theoretical cross-compiler support
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} = ${CHOST} ]] ; then
+	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+		export CTARGET=${CATEGORY/cross-}
+	fi
+fi
+
 
 if [ -z "${BRANCH_UPDATE}" ]; then
 	BASE_PV="${NEW_PV}"
@@ -38,10 +47,14 @@ SRC_URI="http://dev.gentoo.org/~lv/${PN}-${BASE_PV}.tar.bz2
 	http://dev.gentoo.org/~lv/${PN}-${NEW_PV}-branch-update-${BRANCH_UPDATE}.patch.bz2"
 
 LICENSE="LGPL-2"
-SLOT="2.2"
-KEYWORDS="-* ~x86 amd64 ~hppa ppc64 ~ppc ~mips"
-IUSE="nls pic build nptl erandom hardened makecheck multilib debug userlocales"
-RESTRICT="nostrip" # we'll handle stripping ourself #46186
+[[ ${CTARGET} != ${CHOST} ]] \
+	&& SLOT="${CTARGET}-2.2" \
+	|| SLOT="2.2"
+#~sparc: This is only used by the sparc64-multilib PROFILE_ARCH as versions
+#        after ~2.3.3.20040420 break blackdown-jdk on sparc.
+KEYWORDS="x86 amd64 hppa ppc64 ~ppc -mips ~sparc"
+IUSE="build erandom hardened multilib n32 nls nptl pic userlocales"
+RESTRICT="nostrip multilib-pkg-force" # we'll handle stripping ourself #46186
 
 # We need new cleanup attribute support from gcc for NPTL among things ...
 # We also need linux26-headers if using NPTL. Including kernel headers is
@@ -51,31 +64,50 @@ DEPEND=">=sys-devel/gcc-3.2.3-r1
 	nptl? ( >=sys-devel/gcc-3.3.1-r1 )
 	>=sys-devel/binutils-2.14.90.0.6-r1
 	virtual/os-headers
-	nptl? ( >=sys-kernel/linux26-headers-2.6.5 )
+	nptl? ( >=sys-kernel/linux-headers-2.6.5 )
 	nls? ( sys-devel/gettext )"
 RDEPEND="virtual/os-headers
-	sys-apps/baselayout
 	nls? ( sys-devel/gettext )"
-# until we compile the 32bit glibc here
+# until amd64's 2004.3 is purged out of existence
 PDEPEND="amd64? ( multilib? ( app-emulation/emul-linux-x86-glibc ) )"
 
-PROVIDE="virtual/glibc virtual/libc"
-
-
-# (very) Theoretical cross-compiler support
-[ -z "${CCHOST}" ] && CCHOST="${CHOST}"
+PROVIDE="virtual/libc"
 
 # We need to be able to set alternative headers for
 # compiling for non-native platform
 # Will also become useful for testing kernel-headers without screwing up
-# whole system
-[ -z "${ALT_HEADERS}" ] && ALT_HEADERS="${ROOT}/usr/include"
-
+# the whole system.
+# note: intentionally undocumented.
+alt_headers() {
+	if [ -z "${ALT_HEADERS}" ] ; then
+		if [[ ${CTARGET} = ${CHOST} ]] ; then
+			ALT_HEADERS="${ROOT}/usr/include"
+		else
+			ALT_HEADERS="${ROOT}/usr/${CTARGET}/include"
+		fi
+	fi
+	echo "${ALT_HEADERS}"
+}
+alt_prefix() {
+	if [[ ${CTARGET} = ${CHOST} ]] ; then
+		echo /usr
+	else
+		echo /usr/${CTARGET}
+	fi
+}
+alt_libdir() {
+	if [[ ${CTARGET} = ${CHOST} ]] ; then
+		echo /$(get_libdir)
+	else
+		echo /usr/${CTARGET}/$(get_libdir)
+	fi
+}
 
 setup_flags() {
-	# Over-zealous CFLAGS can often cause problems.  What may work for one person may not
-	# work for another.  To avoid a large influx of bugs relating to failed builds, we
-	# strip most CFLAGS out to ensure as few problems as possible.
+	# Over-zealous CFLAGS can often cause problems.  What may work for one
+	# person may not work for another.  To avoid a large influx of bugs
+	# relating to failed builds, we strip most CFLAGS out to ensure as few
+	# problems as possible.
 	strip-flags
 	strip-unsupported-flags
 
@@ -89,37 +121,88 @@ setup_flags() {
 		append-flags "-fcall-used-g6"
 
 		# Sparc64 Only support...
-		if [ "${PROFILE_ARCH}" = "sparc64" ]; then
-			# Get rid of -mcpu options (the CHOST will fix this up) and flags known to fail
+		if [ "${PROFILE_ARCH}" = "sparc64" ] && !has_multilib_profile; then
+			# Get rid of -mcpu options (the CHOST will fix this up) and flags
+			# known to fail
 			filter-flags "-mcpu=ultrasparc -mcpu=v9 -mvis"
 
 			# Setup the CHOST properly to insure "sparcv9"
 			# This passes -mcpu=ultrasparc -Wa,-Av9a to the compiler
 			if [ "${CHOST}" = "sparc-unknown-linux-gnu" ]; then
-				export CHOST="sparcv9-unknown-linux-gnu"
-				export CCHOST="sparcv9-unknown-linux-gnu"
+				CTARGET="sparcv9-unknown-linux-gnu"
+				CHOST="${CTARGET}"
 			fi
 		fi
+
+		if [ "${PROFILE_ARCH}" = "sparc64" ] && has_multilib_profile; then
+			# We change our CHOST, so set this right here
+			export CC="$(tc-getCC)"
+
+			# glibc isn't too smart about guessing our flags.  It
+			# will default to -xarch=v9, but assembly in sparc64 glibc
+			# requires v9a or greater...
+			if is-flag "-mcpu=ultrasparc3"; then
+				# Change CHOST to include us3 assembly
+				if [ "${ABI}" = "sparc32" ]; then
+					CTARGET="sparcv9b-unknown-linux-gnu"
+					CHOST="${CTARGET}"
+				else
+					CTARGET="sparc64b-unknown-linux-gnu"
+					CHOST="${CTARGET}"
+					export CFLAGS_sparc64="$(get_abi_CFLAGS) -Wa,-xarch=v9b"
+				fi
+			else
+				if [ "${ABI}" = "sparc32" ]; then
+					CTARGET="sparcv9-unknown-linux-gnu"
+					CHOST="${CTARGET}"
+				else
+					CTARGET="sparc64-unknown-linux-gnu"
+					CHOST="${CTARGET}"
+					export CFLAGS_sparc64="$(get_abi_CFLAGS) -Wa,-xarch=v9a"
+				fi
+			fi
+
+			filter-flags -mvis -m32 -m64 -Wa,-xarch -Wa,-A
+		fi
+	fi
+
+	# AMD64 multilib
+	if use amd64 && has_multilib_profile; then
+		# We change our CHOST, so set this right here
+		export CC="$(tc-getCC)"
+
+		if [ "${ABI}" = "amd64" ]; then
+			CTARGET="x86_64-pc-linux-gnu"
+			CHOST="${CTARGET}"
+		else
+			CTARGET="i686-pc-linux-gnu"
+			CHOST="${CTARGET}"
+		fi
+
+		filter-flags -m32 -m64
 	fi
 
 	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]; then
 		# broken in 3.4.x
 		replace-flags -march=pentium-m -mtune=pentium3
-		ewarn "-march=pentium-m seems to be broken in gcc 3.4, changing to -mtune=pentium3"
+	fi
+
+	if gcc -v 2>&1 | grep -q 'gcc version 3.[0123]'; then
+		append-flags -finline-limit=2000
 	fi
 
 	# We don't want these flags for glibc
 	filter-flags -fomit-frame-pointer -malign-double
 	filter-ldflags -pie
 
-	# Lock glibc at -O2 -- linuxthreads needs it and we want to be conservative here
+	# Lock glibc at -O2 -- linuxthreads needs it and we want to be
+	# conservative here
 	append-flags -O2
-	export LDFLAGS="${LDFLAGS//-Wl,--relax}"
 }
 
 
 check_kheader_version() {
-	local header="${ALT_HEADERS}/linux/version.h"
+	local header="$(alt_headers)/linux/version.h"
 
 	[ -z "$1" ] && return 1
 
@@ -183,8 +266,8 @@ check_nptl_support() {
 want_nptl() {
 	if use nptl; then
 		# Archs that can use NPTL
-		if use amd64 || use alpha || use ia64 || use ppc || \
-		   use ppc64 || use s390 || use sparc; then
+		if use amd64 || use ia64 || use ppc || \
+		   use ppc64 || use s390 ; then
 			return 0
 		fi
 
@@ -219,36 +302,18 @@ want_tls() {
 }
 
 
-do_makecheck() {
-	ATIME=`mount | awk '{ print $3,$6 }' | grep ^\/\  | grep noatime`
-	if [ "$ATIME" = "" ]; then
-		cd ${WORKDIR}/build
-		make check || die
-	else
-		ewarn "remounting / without noatime option so that make check"
-		ewarn "does not fail!"
-		epause 2
-		mount / -o remount,atime
-		cd ${WORKDIR}/build
-		make check || die
-		einfo "remounting / with noatime"
-		mount / -o remount,noatime
-	fi
-}
-
-
 install_locales() {
 	unset LANGUAGE LANG LC_ALL
 	cd ${WORKDIR}/build
-	make PARALLELMFLAGS="${MAKEOPTS}" \
+	make PARALLELMFLAGS="${MAKEOPTS} -j1" \
 		install_root=${D} localedata/install-locales || die
-	keepdir /usr/lib/locale/ru_RU/LC_MESSAGES
+	[[ ${CTARGET} = ${CHOST} ]] && keepdir /usr/lib/locale/ru_RU/LC_MESSAGES
 }
 
 
 setup_locales() {
-	if use !userlocales || use makecheck; then
-		einfo "makecheck in USE or userlocales not enabled, installing -ALL- locales..."
+	if use !userlocales; then
+		einfo "userlocales not enabled, installing -ALL- locales..."
 		install_locales || die
 	elif [ -e /etc/locales.build ]; then
 		einfo "Installing locales in /etc/locales.build..."
@@ -280,20 +345,11 @@ pkg_setup() {
 		die "GCC too old"
 	fi
 	echo
-
-	hasq sandbox $FEATURES && use makecheck && die "sandbox breaks make check. either take makecheck out of USE or set FEATURES=-sandbox"
-}
-
-
-do_arch_amd64_patches() {
-	cd ${S};
-	# CONF_LIBDIR support
-	epatch ${FILESDIR}/2.3.4/glibc-gentoo-libdir.patch
-	sed -i -e "s:@GENTOO_LIBDIR@:$(get_libdir):g" ${S}/sysdeps/unix/sysv/linux/configure
 }
 
 
 do_arch_alpha_patches() {
+	[[ $(tc-arch ${CTARGET}) != "alpha" ]] && return 0
 	cd ${S}
 
 	# Fix compatability with compaq compilers by ifdef'ing out some
@@ -306,7 +362,25 @@ do_arch_alpha_patches() {
 }
 
 
+do_arch_amd64_patches() {
+	[[ $(tc-arch ${CTARGET}) != "amd64" ]] && return 0
+	cd ${S};
+
+	if ! has_multilib_profile; then
+		# CONF_LIBDIR support
+		epatch ${FILESDIR}/2.3.4/glibc-gentoo-libdir.patch
+		sed -i -e "s:@GENTOO_LIBDIR@:$(get_libdir):g" ${S}/sysdeps/unix/sysv/linux/configure
+	fi
+
+	# fixes compiling with the new binutils on at least amd64 and ia64.
+	# see http://sources.redhat.com/ml/libc-alpha/2004-08/msg00076.html
+	# and http://bugs.gentoo.org/show_bug.cgi?id=66396 for more info.
+	epatch ${FILESDIR}/2.3.4/glibc-2.3.4-res_init.patch
+}
+
+
 do_arch_arm_patches() {
+	[[ $(tc-arch ${CTARGET}) != "arm" ]] && return 0
 	cd ${S};
 
 	# Any needed patches for arm go here
@@ -315,22 +389,27 @@ do_arch_arm_patches() {
 
 
 do_arch_hppa_patches() {
+	[[ $(tc-arch ${CTARGET}) != "hppa" ]] && return 0
 	einfo "Applying hppa specific path of ${HPPA_PATCHES} ..."
 	cd ${T}
 	unpack glibc-hppa-patches-${HPPA_PATCHES}.tar.gz
 	cd ${S}
+	epatch "${FILESDIR}"/2.3.4/hppa-no-pie.patch
 	export EPATCH_OPTS=-p1
 	for i in ${T}/glibc-hppa-patches-${HPPA_PATCHES}/*.diff
 	do
 		epatch ${i}
 	done
 
+	unset EPATCH_OPTS
+
 	use hardened && epatch ${FILESDIR}/2.3.4/glibc-2.3.4-hppa-hardened-disable__init_arrays.patch
 
 }
 
 
 do_arch_ia64_patches() {
+	[[ $(tc-arch ${CTARGET}) != "ia64" ]] && return 0
 	cd ${S};
 
 	# The basically problem is glibc doesn't store information about
@@ -340,10 +419,17 @@ do_arch_ia64_patches() {
 	#   http://sources.redhat.com/ml/libc-alpha/2003-09/msg00165.html
 
 #	epatch ${FILESDIR}/2.3.2/${LOCAL_P}-ia64-LOAD_ARGS-fixup.patch
+
+
+	# fixes compiling with the new binutils on at least amd64 and ia64.
+	# see http://sources.redhat.com/ml/libc-alpha/2004-08/msg00076.html
+	# and http://bugs.gentoo.org/show_bug.cgi?id=66396 for more info.
+	epatch ${FILESDIR}/2.3.4/glibc-2.3.4-res_init.patch
 }
 
 
 do_arch_mips_patches() {
+	[[ $(tc-arch ${CTARGET}) != "mips" ]] && return 0
 	cd ${S}
 
 	# A few patches only for the MIPS platform.  Descriptions of what they
@@ -351,13 +437,13 @@ do_arch_mips_patches() {
 	# <tuxus@gentoo.org> thx <dragon@gentoo.org> (11 Jan 2003)
 	# <kumba@gentoo.org> remove tst-rndseek-mips & ulps-mips patches
 	# <iluxa@gentoo.org> add n32/n64 patches, remove pread patch
-	epatch ${FILESDIR}/2.3.3/mips-addabi.diff
-	epatch ${FILESDIR}/2.3.3/mips-syscall.h.diff
-	epatch ${FILESDIR}/2.3.3/mips-sysify.diff
+	epatch ${FILESDIR}/2.3.3/${PN}-2.3.3-mips-addabi.diff
+	epatch ${FILESDIR}/2.3.3/${PN}-2.3.3-mips-syscall.h.diff
+	epatch ${FILESDIR}/2.3.3/${PN}-2.3.3-mips-sysify.diff
 
 	# Need to install into /lib for n32-only userland for now.
 	# Propper solution is to make all userland /lib{32|64}-aware.
-	use multilib || epatch ${FILESDIR}/2.3.3/mips-nolib3264.diff
+	has_multilib_profile || use multilib || epatch ${FILESDIR}/2.3.3/${PN}-2.3.3-mips-nolib3264.diff
 
 	# Found this on Google (yay google!) and it fixes glibc not building
 	# a correct bits/syscall.h from 2.6.x headers.  It possibly breaks older
@@ -367,6 +453,7 @@ do_arch_mips_patches() {
 
 
 do_arch_ppc_patches() {
+	[[ $(tc-arch ${CTARGET}) != "ppc" ]] && return 0
 	cd ${S};
 	epatch ${FILESDIR}/2.3.4/glibc-2.3.4-getcontext.patch
 	# Any needed patches for ppc go here
@@ -374,6 +461,7 @@ do_arch_ppc_patches() {
 
 
 do_arch_ppc64_patches() {
+	[[ $(tc-arch ${CTARGET}) != "ppc64" ]] && return 0
 	cd ${S};
 	epatch ${FILESDIR}/2.3.4/glibc-2.3.4-getcontext.patch
 	# Any needed patches for ppc64 go here
@@ -381,6 +469,7 @@ do_arch_ppc64_patches() {
 
 
 do_arch_s390_patches() {
+	[[ $(tc-arch ${CTARGET}) != "s390" ]] && return 0
 	cd ${S};
 
 	# Any needed patches for s390 go here
@@ -388,6 +477,7 @@ do_arch_s390_patches() {
 
 
 do_arch_sparc_patches() {
+	[[ $(tc-arch ${CTARGET}) != "sparc" ]] && return 0
 	cd ${S};
 
 	# Any needed patches for sparc go here
@@ -395,6 +485,7 @@ do_arch_sparc_patches() {
 
 
 do_arch_x86_patches() {
+	[[ $(tc-arch ${CTARGET}) != "x86" ]] && return 0
 	cd ${S};
 	# CONF_LIBDIR support
 	epatch ${FILESDIR}/2.3.4/glibc-gentoo-libdir.patch
@@ -441,7 +532,7 @@ do_ssp_patches() {
 	# __guard_setup__stack_smash_handler
 	#
 	#  http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml
-	if [ "${ARCH}" != "hppa" ] && [ "${ARCH}" != "hppa64" ]; then
+	if use !hppa ; then
 		epatch ${FILESDIR}/2.3.3/glibc-2.3.2-propolice-guard-functions-v3.patch
 		cp ${FILESDIR}/2.3.3/ssp.c ${S}/sysdeps/unix/sysv/linux || \
 			die "failed to copy ssp.c to ${S}/sysdeps/unix/sysv/linux/"
@@ -483,30 +574,35 @@ src_unpack() {
 	# SSP support in glibc (where it belongs)
 	do_ssp_patches
 
-
 	# PaX-related Patches
 	do_pax_patches
 
 	# disable binutils -as-needed
 	sed -e 's/^have-as-needed.*/have-as-needed = no/' -i ${S}/config.make.in
 
+	# Glibc is stupid sometimes, and doesn't realize that with a 
+	# static C-Only gcc, -lgcc_eh doesn't exist.
+	# http://sources.redhat.com/ml/libc-alpha/2003-09/msg00100.html
+	echo 'int main(){}' > ${T}/gcc_eh_test.c
+	if ! $(tc-getCC) ${T}/gcc_eh_test.c -lgcc_eh 2>/dev/null ; then
+		sed -i -e 's:-lgcc_eh::' Makeconfig || die "sed gcc_eh"
+	fi
+
 	# hardened toolchain/relro/nptl/security/etc fixes
 	do_hardened_fixes
 
-
 	# Arch specific patching
-	use amd64	&& do_arch_amd64_patches
-	use alpha	&& do_arch_alpha_patches
-	use arm		&& do_arch_arm_patches
-	use hppa	&& do_arch_hppa_patches
-	use ia64	&& do_arch_ia64_patches
-	use mips	&& do_arch_mips_patches
-	use ppc		&& do_arch_ppc_patches
-	use ppc64	&& do_arch_ppc64_patches
-	use s390	&& do_arch_s390_patches
-	use sparc	&& do_arch_sparc_patches
-	use x86		&& do_arch_x86_patches
-
+	do_arch_alpha_patches
+	do_arch_amd64_patches
+	do_arch_arm_patches
+	do_arch_hppa_patches
+	do_arch_ia64_patches
+	do_arch_mips_patches
+	do_arch_ppc_patches
+	do_arch_ppc64_patches
+	do_arch_s390_patches
+	do_arch_sparc_patches
+	do_arch_x86_patches
 
 	# Remaining patches
 	cd ${S}
@@ -524,7 +620,23 @@ src_unpack() {
 	chmod u+x ${S}/scripts/*.sh
 }
 
+
 src_compile() {
+	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+	local MLTEST=$(type dyn_unpack)
+	if has_multilib_profile && [ -z "${OABI}" -a "${MLTEST/set_abi}" = "${MLTEST}" ]; then
+		OABI="${ABI}"
+		for ABI in $(get_install_abis); do
+			export ABI
+			einfo "Compiling ${ABI} glibc"
+			src_compile && mv ${WORKDIR}/build ${WORKDIR}/build.${ABI}
+		done
+		ABI="${OABI}"
+		unset OABI
+		return 0
+	fi
+	unset MLTEST
+
 	setup_flags
 
 	# These should not be set, else the
@@ -549,6 +661,9 @@ src_compile() {
 	want_tls || myconf="${myconf} --without-tls"
 	want_tls && myconf="${myconf} --with-tls"
 
+	# Who knows if this works :)
+	[[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
+
 	# some silly people set LD_RUN_PATH and that breaks things.
 	# see bug 19043
 	unset LD_RUN_PATH
@@ -559,15 +674,15 @@ src_compile() {
 	cd ${WORKDIR}/build
 	${S}/configure \
 		--build=${CHOST} \
-		--host=${CCHOST} \
+		--host=${CTARGET} \
 		--disable-profile \
 		--without-gd \
 		--without-cvs \
-		--with-headers=${ALT_HEADERS} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--libexecdir=/usr/lib/misc \
+		--with-headers=$(alt_headers) \
+		--prefix=$(alt_prefix) \
+		--mandir=$(alt_prefix)/share/man \
+		--infodir=$(alt_prefix)/share/info \
+		--libexecdir=$(alt_prefix)/lib/misc \
 		--enable-bind-now \
 		${myconf} || die
 
@@ -575,9 +690,67 @@ src_compile() {
 	make PARALLELMFLAGS="${MAKEOPTS}" || die
 }
 
+src_test() {
+	# This is wrong, but glibc's tests fail bad when screwing 
+	# around with sandbox, so lets just punt it
+	unset LD_PRELOAD
+
+	cd ${WORKDIR}/build
+	make check || die "make check failed :("
+}
+
 src_install() {
+	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+	local MLTEST=$(type dyn_unpack)
+	if has_multilib_profile && [ -z "${OABI}" -a "${MLTEST/set_abi}" = "${MLTEST}" ]; then
+		OABI="${ABI}"
+		for ABI in $(get_install_abis); do
+			export ABI
+			mv ${WORKDIR}/build.${ABI} ${WORKDIR}/build
+
+			# Handle stupid lib32 BS
+			if use amd64 && [ "${ABI}" = "x86" -a "$(get_libdir)" != "lib" ]; then
+				OLD_LIBDIR="$(get_libdir)"
+				LIBDIR_x86="lib"
+			fi
+
+			src_install && mv ${WORKDIR}/build ${WORKDIR}/build.${ABI}
+
+			# Handle stupid lib32 BS
+			if use amd64 && [ "${ABI}" = "x86" -a -n "${OLD_LIBDIR}" ]; then
+				LIBDIR_x86="${OLD_LIBDIR}"
+				unset OLD_LIBDIR
+
+				mv ${D}/lib ${D}/$(get_libdir)
+				mv ${D}/usr/lib ${D}/usr/$(get_libdir)
+				mkdir ${D}/lib
+				dosym ../$(get_libdir)/ld-linux.so.2 /lib/ld-linux.so.2
+				dosed "s:/lib/:/$(get_libdir)/:g" /usr/$(get_libdir)/libc.so /usr/$(get_libdir)/libpthread.so
+
+				rm -rf ${D}/usr/$(get_libdir)/misc ${D}/usr/$(get_libdir)/locale
+
+				for f in ${D}/usr/$(get_libdir)/*.so; do
+					local basef=$(basename ${f})
+					if [ -L ${f} ]; then
+						local target=$(readlink ${f})
+						target=${target/\/lib\//\/$(get_libdir)\/}
+						rm ${f}
+						dosym ${target} /usr/$(get_libdir)/${basef}
+					fi
+				done
+			fi
+
+		done
+		ABI="${OABI}"
+		unset OABI
+		return 0
+	fi
+	unset MLTEST
 	setup_flags
 
+	# Need to dodir first because it might not exist (bad amd64 profiles)
+	dodir /usr/$(get_libdir)
+
 	# These should not be set, else the
 	# zoneinfo do not always get installed ...
 	unset LANGUAGE LANG LC_ALL
@@ -588,35 +761,59 @@ src_install() {
 	make PARALLELMFLAGS="${MAKEOPTS}" \
 		install_root=${D} \
 		install || die
+	if [[ ${CTARGET} != ${CHOST} ]] ; then
+		# punt all the junk not needed by a cross-compiler
+		rm -r "${D}"/usr/${CTARGET}/{bin,etc,lib/gconv,sbin,share}
+	fi
+
 	# now, strip everything but the thread libs #46186
-	mkdir ${T}/thread-backup
-	mv ${D}/lib/lib{pthread,thread_db}* ${T}/thread-backup/
-	env -uRESTRICT prepallstrip
-	mv ${T}/thread-backup/* ${D}/lib/
+	mkdir -p ${T}/thread-backup
+	mv ${D}/$(alt_libdir)/lib{pthread,thread_db}* ${T}/thread-backup/
+	env -uRESTRICT CHOST=${CTARGET} prepallstrip
+
+	# this directory can be empty in certain cases so || die is wrong
+	ls  ${T}/thread-backup/*  1>/dev/null 2>&1 && mv -f ${T}/thread-backup/* ${D}/$(alt_libdir)/
 
 	# If librt.so is a symlink, change it into linker script (Redhat)
-	if [ -L "${D}/usr/lib/librt.so" -a "${LIBRT_LINKERSCRIPT}" = "yes" ]; then
-		local LIBRTSO="`cd ${D}/lib; echo librt.so.*`"
-		local LIBPTHREADSO="`cd ${D}/lib; echo libpthread.so.*`"
+	if [ -L "${D}/usr/$(get_libdir)/librt.so" -a "${LIBRT_LINKERSCRIPT}" = "yes" ]; then
+		local LIBRTSO="`cd ${D}/$(get_libdir); echo librt.so.*`"
+		local LIBPTHREADSO="`cd ${D}/$(get_libdir); echo libpthread.so.*`"
 
-		rm -f ${D}/usr/lib/librt.so
-		cat > ${D}/usr/lib/librt.so <<EOF
+		rm -f ${D}/usr/$(get_libdir)/librt.so
+		cat > ${D}/usr/$(get_libdir)/librt.so <<EOF
 /* GNU ld script
 	librt.so.1 needs libpthread.so.0 to come before libc.so.6*
 	in search scope.  */
 EOF
-		grep "OUTPUT_FORMAT" ${D}/usr/lib/libc.so >> ${D}/usr/lib/librt.so
-		echo "GROUP ( /lib/${LIBPTHREADSO} /lib/${LIBRTSO} )" \
-			>> ${D}/usr/lib/librt.so
+		grep "OUTPUT_FORMAT" ${D}/usr/$(get_libdir)/libc.so >> ${D}/usr/$(get_libdir)/librt.so
+		echo "GROUP ( /$(get_libdir)/${LIBPTHREADSO} /$(get_libdir)/${LIBRTSO} )" \
+			>> ${D}/usr/$(get_libdir)/librt.so
 
-		for x in ${D}/usr/lib/librt.so.[1-9]; do
+		for x in ${D}/usr/$(get_libdir)/librt.so.[1-9]; do
 			[ -L "${x}" ] && rm -f ${x}
 		done
 	fi
 
-	if ! use build; then
-		cd ${WORKDIR}/build
+	if use pic && ! use amd64 ; then
+		find ${S}/${buildtarget}/ -name "soinit.os" -exec cp {} ${D}/lib/soinit.o \;
+		find ${S}/${buildtarget}/ -name "sofini.os" -exec cp {} ${D}/lib/sofini.o \;
+		find ${S}/${buildtarget}/ -name "*_pic.a" -exec cp {} ${D}/lib \;
+		find ${S}/${buildtarget}/ -name "*.map" -exec cp {} ${D}/lib \;
+
+		for i in ${D}/lib/*.map; do
+			mv ${i} ${i%.map}_pic.map
+		done
+	fi
+
+	# We'll take care of the cache ourselves
+	rm -f ${D}/etc/ld.so.cache
+
+	#################################################################
+	# EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY #
+	[[ ${CTARGET} != ${CHOST} ]] && return 0
 
+	cd ${WORKDIR}/build
+	if ! use build ; then
 		if ! has noinfo ${FEATURES} ; then
 			einfo "Installing Info pages..."
 			make PARALLELMFLAGS="${MAKEOPTS}" \
@@ -632,11 +829,12 @@ EOF
 		doman ${S}/man/*.3thr
 
 		# Install nscd config file
-		insinto /etc
-		doins ${FILESDIR}/nscd.conf
+		insinto /etc ; doins ${FILESDIR}/nscd.conf
+		exeinto /etc/init.d ; doexe ${FILESDIR}/nscd
+		doins "${FILESDIR}"/nsswitch.conf
 
 		cd ${S}
-		dodoc BUGS ChangeLog* CONFORMANCE COPYING* FAQ INTERFACE \
+		dodoc BUGS ChangeLog* CONFORMANCE FAQ INTERFACE \
 			NEWS NOTES PROJECTS README*
 	else
 		rm -rf ${D}/usr/share ${D}/usr/lib/gconv
@@ -644,52 +842,26 @@ EOF
 		einfo "Installing Timezone data..."
 		make PARALLELMFLAGS="${MAKEOPTS}" \
 			install_root=${D} \
-			timezone/install-others -C ${WORKDIR}/build || die
-	fi
-
-	if use pic && ! use amd64 ; then
-		find ${S}/${buildtarget}/ -name "soinit.os" -exec cp {} ${D}/lib/soinit.o \;
-		find ${S}/${buildtarget}/ -name "sofini.os" -exec cp {} ${D}/lib/sofini.o \;
-		find ${S}/${buildtarget}/ -name "*_pic.a" -exec cp {} ${D}/lib \;
-		find ${S}/${buildtarget}/ -name "*.map" -exec cp {} ${D}/lib \;
-
-		for i in ${D}/lib/*.map; do
-			mv ${i} ${i%.map}_pic.map
-		done
+			timezone/install-others || die
 	fi
 
 	# Is this next line actually needed or does the makefile get it right?
 	# It previously has 0755 perms which was killing things.
 	fperms 4711 /usr/lib/misc/pt_chown
 
-	# Currently libraries in  /usr/lib/gconv do not get loaded if not
-	# in search path ...
-#	insinto /etc/env.d
-#	doins ${FILESDIR}/03glibc
-
-	rm -f ${D}/etc/ld.so.cache
-
 	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
 	# creation of the "factory" symlink in pkg_postinst().
 	rm -f ${D}/etc/localtime
 
 	# Some things want this, notably ash.
-	dosym /usr/lib/libbsd-compat.a /usr/lib/libbsd.a
+	dosym libbsd-compat.a /usr/$(get_libdir)/libbsd.a
 
 	# This is our new config file for building locales
 	insinto /etc
 	doins ${FILESDIR}/locales.build
 
-	# this whole section is useless, it fails if sandbox is LOADED, not if it's
-	# enabled. but forcing sandbox not to load isnt an option...
-	if use makecheck; then
-		local OLD_SANDBOX_ON="${SANDBOX_ON}"
-		# make check will fail if sandbox is enabled.  Do not do it
-		# globally though, else we might fail to find sandbox violations ...
-		SANDBOX_ON="0"
-		do_makecheck
-		SANDBOX_ON="${OLD_SANDBOX_ON}"
-	fi
+	# Handle includes for different ABIs
+	prep_ml_includes
 }
 
 fix_lib64_symlinks() {
@@ -734,7 +906,15 @@ pkg_preinst() {
 	# decide to be multilib compatible and FHS compliant. note that this 
 	# chunk of FHS compliance only applies to 64bit archs where 32bit
 	# compatibility is a major concern (not IA64, for example).
-	use amd64 && [ "$(get_libdir)" == "lib64" ] && fix_lib64_symlinks
+
+	# amd64's 2005.0 is the first amd64 profile to not need this code.
+	# 2005.0 is setup properly, and this is executed as part of the
+	# 2004.3 -> 2005.0 upgrade script.
+	# It can be removed after 2004.3 has been purged from portage.
+	use amd64 && [ "$(get_libdir)" == "lib64" ] && ! has_multilib_profile && fix_lib64_symlinks
+
+	# Shouldnt need to keep this updated
+	[[ -e ${ROOT}/etc/locales.build ]] && rm -f "${D}"/etc/locales.build
 }
 
 pkg_postinst() {
@@ -771,3 +951,7 @@ pkg_postinst() {
 		/sbin/init U &> /dev/null
 	fi
 }
+
+must_exist() {
+	test -e ${D}/${1}/${2} || die "${1}/${2} was not installed"
+}
diff --git a/sys-libs/glibc/glibc-2.3.4.20041102-r1.ebuild b/sys-libs/glibc/glibc-2.3.4.20041102-r1.ebuild
index c5ff9c5a5bef..d2e14275bd3b 100644
--- a/sys-libs/glibc/glibc-2.3.4.20041102-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20041102-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/sys-libs/glibc/glibc-2.3.4.20041102-r1.ebuild,v 1.1 2005/03/16 10:34:43 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041102-r1.ebuild,v 1.1.1.1 2005/11/30 09:39:23 chriswhite Exp $
 
 inherit eutils multilib flag-o-matic toolchain-funcs versionator
 
@@ -50,8 +50,8 @@ LICENSE="LGPL-2"
 [[ ${CTARGET} != ${CHOST} ]] \
 	&& SLOT="${CTARGET}-2.2" \
 	|| SLOT="2.2"
-KEYWORDS="amd64 ppc64 -hppa ia64 ppc x86 ~mips ~sparc"
-IUSE="nls pic build nptl nptlonly erandom hardened multilib debug userlocales nomalloccheck"
+KEYWORDS="alpha amd64 -hppa ia64 ~mips ppc ppc64 ~sparc x86"
+IUSE="build erandom hardened multilib nls nomalloccheck nptl nptlonly pic userlocales selinux"
 RESTRICT="nostrip multilib-pkg-force" # we'll handle stripping ourself #46186
 
 # We need new cleanup attribute support from gcc for NPTL among things ...
@@ -62,15 +62,16 @@ DEPEND=">=sys-devel/gcc-3.2.3-r1
 	nptl? ( >=sys-devel/gcc-3.3.1-r1 )
 	>=sys-devel/binutils-2.14.90.0.6-r1
 	virtual/os-headers
-	nptl? ( || ( >=sys-kernel/linux-headers-2.6.5 >=sys-kernel/linux26-headers-2.6.5 ) )
-	nls? ( sys-devel/gettext )"
+	nptl? ( >=sys-kernel/linux-headers-2.6.5 )
+	nls? ( sys-devel/gettext )
+	selinux? ( !build? ( sys-libs/libselinux ) )"
 RDEPEND="virtual/os-headers
-	sys-apps/baselayout
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+	selinux? ( !build? ( sys-libs/libselinux ) )"
 # until amd64's 2004.3 is purged out of existence
-PDEPEND="amd64? ( multilib? ( app-emulation/emul-linux-x86-glibc ) )"
+PDEPEND="amd64? ( multilib? ( ~app-emulation/emul-linux-x86-glibc-${PV} ) )"
 
-PROVIDE="virtual/glibc virtual/libc"
+PROVIDE="virtual/libc"
 
 # We need to be able to set alternative headers for
 # compiling for non-native platform
@@ -265,7 +266,7 @@ check_nptl_support() {
 want_nptl() {
 	if use nptl || use nptlonly ; then
 		# Archs that can use NPTL
-		if use amd64 || use ia64 || use ppc || \
+		if use alpha || use amd64 || use ia64 || use ppc || \
 		   use ppc64 || use s390 || use sparc; then
 			return 0
 		fi
@@ -365,6 +366,9 @@ do_arch_alpha_patches() {
 	# <taviso@gentoo.org> (14 Jun 2003).
 	epatch ${FILESDIR}/2.3.2/${PN}-2.3.2-decc-compaq.patch
 
+	# Fix xstat stuff
+	epatch ${FILESDIR}/2.3.4/glibc234-alpha-xstat.patch
+
 	# Fix compilation with >=gcc-3.2.3 (01 Nov 2003 agriffis)
 #	epatch ${FILESDIR}/2.3.2/${LOCAL_P}-alpha-pwrite.patch
 }
@@ -397,6 +401,7 @@ do_arch_hppa_patches() {
 	cd ${T}
 	unpack glibc-hppa-patches-${HPPA_PATCHES}.tar.gz
 	cd ${S}
+	epatch "${FILESDIR}"/2.3.4/hppa-no-pie.patch
 	export EPATCH_OPTS=-p1
 	for i in ${T}/glibc-hppa-patches-${HPPA_PATCHES}/*.diff
 	do
@@ -685,6 +690,12 @@ glibc_do_configure() {
 		die "invalid pthread option"
 	fi
 
+	if ! use build && use selinux; then
+		myconf="${myconf} --with-selinux"
+	else
+		myconf="${myconf} --without-selinux"
+	fi
+
 	# Who knows if this works :)
 	[[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
 	myconf="${myconf} --without-cvs
@@ -732,6 +743,11 @@ src_compile() {
 		export CPATH=/usr/include/gentoo-multilib/default
 	fi
 
+	# hardened ppc64 parallelization periodically fails so drop to -j1
+	if use ppc64 && use hardened; then
+		MAKEOPTS="${MAKEOPTS} -j1"
+	fi
+
 	# do the linuxthreads build unless we're using nptlonly
 	if use !nptlonly ; then
 		glibc_do_configure linuxthreads
@@ -887,25 +903,26 @@ src_install() {
 		mkdir -p ${D}/nptl ${D}/usr/include/nptl
 		make install_root=${D}/nptl install-headers PARALLELMFLAGS="${MAKEOPTS}"
 		pushd ${D}/nptl/usr/include > /dev/null
-			for i in `find . -type f`; do
-				if ! [ -f ${D}/usr/include/$i ] \
-					|| ! cmp -s $i ${D}/usr/include/$i; then
+		for i in `find . -type f`; do
+			if ! [ -f ${D}/usr/include/$i ] \
+			   || ! cmp -s $i ${D}/usr/include/$i; then
 				mkdir -p ${D}/usr/include/nptl/`dirname $i`
 				cp -a $i ${D}/usr/include/nptl/$i
 			fi
 		done
+		popd > /dev/null
 		rm -rf ${D}/nptl
 	fi
 
 	# now, strip everything but the thread libs #46186
 	mkdir -p ${T}/thread-backup
-	mv ${D}/$(alt_libdir)/lib{pthread,thread_db}* ${T}/thread-backup/
+	mv -f ${D}/$(alt_libdir)/lib{pthread,thread_db}* ${T}/thread-backup/
 	if use !nptlonly && want_nptl ; then
 		mkdir -p ${T}/thread-backup/tls
-		mv ${D}/$(alt_libdir)/tls/lib{pthread,thread_db}* ${T}/thread-backup/tls
+		mv -f ${D}/$(alt_libdir)/tls/lib{pthread,thread_db}* ${T}/thread-backup/tls
 	fi
 	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	cp -R -- ${T}/thread-backup/* ${D}/$(alt_libdir)/ || die
+	cp -a -- ${T}/thread-backup/* ${D}/$(alt_libdir)/ || die
 
 	# If librt.so is a symlink, change it into linker script (Redhat)
 	if [ -L "${D}/usr/$(get_libdir)/librt.so" -a "${LIBRT_LINKERSCRIPT}" = "yes" ]; then
@@ -973,6 +990,7 @@ EOF
 		# Install nscd config file
 		insinto /etc ; doins ${FILESDIR}/nscd.conf
 		exeinto /etc/init.d ; doexe ${FILESDIR}/nscd
+		doins "${FILESDIR}"/nsswitch.conf
 
 		cd ${S}
 		dodoc BUGS ChangeLog* CONFORMANCE FAQ INTERFACE \
@@ -1002,6 +1020,23 @@ EOF
 	doins ${FILESDIR}/locales.build
 	# example host.conf with multicast dns disabled by default
 	doins ${FILESDIR}/2.3.4/host.conf
+
+	# simple test to make sure our new glibc isnt completely broken.
+	# for now, skip the multilib scenario.  also make sure we don't
+	# test with statically built binaries since they will fail.
+	[[ ${CBUILD} != ${CHOST} ]] && return 0
+	[[ $(get_libdir) != "lib" ]] && return 0
+	for x in date env ls true uname ; do
+		x=$(type -p ${x})
+		[[ -z ${x} ]] && continue
+		striptest=$(file -L ${x} 2>/dev/null)
+		[[ -z ${striptest} ]] && continue
+		[[ ${striptest/statically linked} != "${striptest}" ]] && continue
+		"${D}"/$(get_libdir)/ld-*.so \
+			--library-path "${D}"/$(get_libdir) \
+			${x} > /dev/null \
+			|| die "simple run test (${x}) failed"
+	done
 }
 
 must_exist() {
@@ -1059,11 +1094,14 @@ pkg_preinst() {
 
 	# it appears that /lib/tls is sometimes not removed. See bug
 	# 69258 for more info.
-	if [ -d /${ROOT}/$(get_libdir)/tls ] && use nptlonly ; then
-		addwrite /${ROOT}/$(get_libdir)/
+	if [[ -d ${ROOT}/$(get_libdir)/tls ]] && use nptlonly ; then
+		addwrite "${ROOT}"/$(get_libdir)/
 		ewarn "nptlonly in USE, removing /${ROOT}/$(get_libdir)/tls..."
-		rm -rf /${ROOT}/$(get_libdir)/tls || die
+		rm -r "${ROOT}"/$(get_libdir)/tls || die
 	fi
+
+	# Shouldnt need to keep this updated
+	[[ -e ${ROOT}/etc/locales.build ]] && rm -f "${D}"/etc/locales.build
 }
 
 pkg_postinst() {
diff --git a/sys-libs/glibc/glibc-2.3.4.20041102-r2.ebuild b/sys-libs/glibc/glibc-2.3.4.20041102-r2.ebuild
index 3d7042ed795f..1f97a59fda93 100644
--- a/sys-libs/glibc/glibc-2.3.4.20041102-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20041102-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/sys-libs/glibc/glibc-2.3.4.20041102-r2.ebuild,v 1.1 2005/07/13 15:16:04 nigoro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041102-r2.ebuild,v 1.1.1.1 2005/11/30 09:39:26 chriswhite Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -34,14 +34,14 @@ PATCH_VER="1.0"
 # C Stubbs addon (contained in fedora, so ignoring)
 #CSTUBS_VER="2.1.2"
 #CSTUBS_TARBALL="c_stubs-${CSTUBS_VER}.tar.bz2"
-#CSTUBS_URI="http://dev.gentoo.org/~eradicator/glibc/${CSTUBS_TARBALL}"
+#CSTUBS_URI="mirror://gentoo/${CSTUBS_TARBALL}"
 
 # Fedora addons (from RHEL's glibc-2.3.4-2.src.rpm)
 #FEDORA_VER="20041219T2331"
 #FEDORA_TARBALL="glibc-fedora-${FEDORA_VER}.tar.bz2"
-#FEDORA_URI="http://dev.gentoo.org/~eradicator/glibc/${FEDORA_TARBALL}"
+#FEDORA_URI="mirror://gentoo/${FEDORA_TARBALL}"
 
-GENTOO_TOOLCHAIN_BASE_URI="http://dev.gentoo.org/~eradicator/glibc"
+GENTOO_TOOLCHAIN_BASE_URI="mirror://gentoo"
 
 ### PUNT OUT TO ECLASS?? ###
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
@@ -127,7 +127,7 @@ get_glibc_src_uri() {
 	# This variable should be set to the devspace of whoever is currently
 	# maintaining GLIBC. Please dont set this to mirror, that would just
 	# make the files unavailable until they get mirrored.
-	local devspace_uri="http://dev.gentoo.org/~eradicator/glibc/"
+	local devspace_uri="mirror://gentoo/"
 	GENTOO_TOOLCHAIN_BASE_URI=${GENTOO_TOOLCHAIN_BASE_URI:-${devspace_uri}}
 
 #	GLIBC_SRC_URI="http://ftp.gnu.org/gnu/glibc/${PN}-${GLIBC_RELEASE_VER}.tar.bz2
@@ -170,7 +170,7 @@ get_glibc_src_uri() {
 }
 
 SRC_URI=$(get_glibc_src_uri)
-S="${WORKDIR}/${PN}-${GLIBC_RELEASE_VER}"
+S=${WORKDIR}/${PN}-${GLIBC_RELEASE_VER}
 
 ### EXPORTED FUNCTIONS ###
 toolchain-glibc_src_unpack() {
@@ -245,8 +245,15 @@ toolchain-glibc_src_unpack() {
 
 toolchain-glibc_src_compile() {
 	# Set gconvdir to /usr/$(get_libdir)/gconv on archs with multiple ABIs
+	local MAKEFLAGS=""
 	has_multilib_profile && MAKEFLAGS="gconvdir=$(alt_usrlibdir)/gconv"
 
+	echo
+	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CFLAGS ; do
+		einfo " $(printf '%15s' ${v}:)   ${!v}"
+	done
+	echo
+
 	# -fomit-frame-pointer gets stripped in setup_flags, so we do this
 	# now to cache the value
 	want_omitfp
@@ -258,7 +265,7 @@ toolchain-glibc_src_compile() {
 	fi
 	if want_nptl ; then
 		# ... and then do the optional nptl build
-		unset LD_ASSUME_KERNEL || :
+		unset LD_ASSUME_KERNEL
 		glibc_do_configure nptl
 		einfo "Building GLIBC with NPTL..."
 		make PARALLELMFLAGS="${MAKEOPTS}" ${MAKEFLAGS} || die
@@ -272,12 +279,12 @@ toolchain-glibc_src_test() {
 
 	# do the linuxthreads build unless we're using nptlonly
 	if want_linuxthreads ; then
-		cd ${WORKDIR}/build-${ABI}-${CTARGET}-linuxthreads
+		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads
 		einfo "Checking GLIBC with linuxthreads..."
 		make check || die "linuxthreads glibc did not pass make check"
 	fi
 	if want_nptl ; then
-		cd ${WORKDIR}/build-${ABI}-${CTARGET}-nptl
+		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl
 		unset LD_ASSUME_KERNEL || :
 		einfo "Checking GLIBC with NPTL..."
 		make check || die "nptl glibc did not pass make check"
@@ -319,16 +326,16 @@ toolchain-glibc_src_install() {
 	unset LANGUAGE LANG LC_ALL
 
 	if want_linuxthreads ; then
-		cd ${WORKDIR}/build-${ABI}-${CTARGET}-linuxthreads
-		einfo "Installing GLIBC with linuxthreads..."
+		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads
+		einfo "Installing GLIBC ${ABI} with linuxthreads ..."
 		make PARALLELMFLAGS="${MAKEOPTS} -j1" \
-			install_root=${D} \
+			install_root="${D}" \
 			install || die
 	else # nptlonly
-		cd ${WORKDIR}/build-${ABI}-${CTARGET}-nptl
-		einfo "Installing GLIBC with NPTL..."
+		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl
+		einfo "Installing GLIBC ${ABI} with NPTL ..."
 		make PARALLELMFLAGS="${MAKEOPTS} -j1" \
-			install_root=${D} \
+			install_root="${D}" \
 			install || die
 	fi
 
@@ -338,7 +345,7 @@ toolchain-glibc_src_install() {
 		# crosscompile.
 		if [[ $(get_libdir) != "lib" && -d ${D}$(alt_prefix)/lib ]] ; then
 			dodir $(alt_libdir)
-			mv ${D}$(alt_prefix)/lib/* ${D}$(alt_libdir)
+			mv "${D}"$(alt_prefix)/lib/* "${D}"$(alt_libdir)
 		fi
 
 		# punt all the junk not needed by a cross-compiler
@@ -347,58 +354,58 @@ toolchain-glibc_src_install() {
 
 	if want_linuxthreads && want_nptl ; then
 		einfo "Installing NPTL to $(alt_libdir)/tls/..."
-		cd ${WORKDIR}/build-${ABI}-${CTARGET}-nptl
-		mkdir -p ${D}$(alt_libdir)/tls/
+		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl
+		mkdir -p "${D}"$(alt_libdir)/tls/
 
-		libcsofile=$(basename ${D}$(alt_libdir)/libc-*.so)
-		cp -a libc.so ${D}$(alt_libdir)/tls/${libcsofile} || die
+		libcsofile=$(basename "${D}"$(alt_libdir)/libc-*.so)
+		cp -a libc.so "${D}"$(alt_libdir)/tls/${libcsofile} || die
 		dosym ${libcsofile} $(alt_libdir)/tls/$(ls libc.so.*)
 
-		libmsofile=$(basename ${D}$(alt_libdir)/libm-*.so)
+		libmsofile=$(basename "${D}"$(alt_libdir)/libm-*.so)
 		pushd math > /dev/null
-		cp -a libm.so ${D}$(alt_libdir)/tls/${libmsofile} || die
+		cp -a libm.so "${D}"$(alt_libdir)/tls/${libmsofile} || die
 		dosym ${libmsofile} $(alt_libdir)/tls/$(ls libm.so.*)
 		popd > /dev/null
 
-		librtsofile=$(basename ${D}$(alt_libdir)/librt-*.so)
+		librtsofile=$(basename "${D}"$(alt_libdir)/librt-*.so)
 		pushd rt > /dev/null
-		cp -a librt.so ${D}$(alt_libdir)/tls/${librtsofile} || die
+		cp -a librt.so "${D}"$(alt_libdir)/tls/${librtsofile} || die
 		dosym ${librtsofile} $(alt_libdir)/tls/$(ls librt.so.*)
 		popd > /dev/null
 
-		libthreaddbsofile=$(basename ${D}$(alt_libdir)/libthread_db-*.so)
+		libthreaddbsofile=$(basename "${D}"$(alt_libdir)/libthread_db-*.so)
 		pushd nptl_db > /dev/null
-		cp -a libthread_db.so ${D}$(alt_libdir)/tls/${libthreaddbsofile} || die
+		cp -a libthread_db.so "${D}"$(alt_libdir)/tls/${libthreaddbsofile} || die
 		dosym ${libthreaddbsofile} $(alt_libdir)/tls/$(ls libthread_db.so.*)
 		popd > /dev/null
 
 		libpthreadsofile=libpthread-${GLIBC_RELEASE_VER}.so
-		cp -a nptl/libpthread.so ${D}$(alt_libdir)/tls/${libpthreadsofile} || die
+		cp -a nptl/libpthread.so "${D}"$(alt_libdir)/tls/${libpthreadsofile} || die
 		dosym ${libpthreadsofile} $(alt_libdir)/tls/libpthread.so.0
 
 		# and now for the static libs
-		mkdir -p ${D}$(alt_usrlibdir)/nptl
+		mkdir -p "${D}"$(alt_usrlibdir)/nptl
 		cp -a libc.a nptl/libpthread.a nptl/libpthread_nonshared.a rt/librt.a \
-			${D}$(alt_usrlibdir)/nptl
+			"${D}"$(alt_usrlibdir)/nptl
 
 		# linker script crap
 		for lib in libc libpthread; do
 			sed -e "s:$(alt_libdir)/${lib}.so:$(alt_libdir)/tls/${lib}.so:g" \
 			    -e "s:$(alt_usrlibdir)/${lib}_nonshared.a:$(alt_usrlibdir)/nptl/${lib}_nonshared.a:g" \
-			          ${D}$(alt_usrlibdir)/${lib}.so \
-				> ${D}$(alt_usrlibdir)/nptl/${lib}.so
+			          "${D}"$(alt_usrlibdir)/${lib}.so \
+				> "${D}"$(alt_usrlibdir)/nptl/${lib}.so
 
-			chmod 755 ${D}$(alt_usrlibdir)/nptl/${lib}.so
+			chmod 755 "${D}"$(alt_usrlibdir)/nptl/${lib}.so
 		done
 
 		dosym ../librt.so $(alt_usrlibdir)/nptl/librt.so
 
 		# last but not least... headers.
-		mkdir -p ${D}/nptl ${D}$(alt_headers)/nptl
-		make install_root=${D}/nptl install-headers PARALLELMFLAGS="${MAKEOPTS} -j1"
-		pushd ${D}/nptl/$(alt_headers) > /dev/null
-		for i in `find . -type f`; do
-			if ! [ -f ${D}$(alt_headers)/$i ] \
+		mkdir -p "${D}"/nptl "${D}"$(alt_headers)/nptl
+		make install_root="${D}"/nptl install-headers PARALLELMFLAGS="${MAKEOPTS} -j1"
+		pushd "${D}"/nptl/$(alt_headers) > /dev/null
+		for i in $(find . -type f) ; do
+			if ! [[ -f ${D}$(alt_headers)/$i ]] \
 			   || ! cmp -s $i ${D}$(alt_headers)/$i; then
 				mkdir -p ${D}$(alt_headers)/nptl/`dirname $i`
 				cp -a $i ${D}$(alt_headers)/nptl/$i
@@ -456,7 +463,7 @@ toolchain-glibc_src_install() {
 	else
 		MYMAINBUILDDIR=build-${ABI}-${CTARGET}-nptl
 	fi
-	cd ${WORKDIR}/${MYMAINBUILDDIR}
+	cd "${WORKDIR}"/${MYMAINBUILDDIR}
 	if ! use build ; then
 		if ! has noinfo ${FEATURES} && [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then
 			einfo "Installing info pages..."
@@ -472,7 +479,7 @@ toolchain-glibc_src_install() {
 			einfo "Installing man pages..."
 
 			# Install linuxthreads man pages even if nptl is enabled
-			cd ${WORKDIR}/man
+			cd "${WORKDIR}"/man
 			doman *.3thr
 		fi
 
@@ -616,7 +623,7 @@ alt_prefix() {
 
 alt_libdir() {
 	if is_crosscompile ; then
-		echo /usr/${CTARGET}/lib
+		echo /usr/${CTARGET}/$(get_libdir)
 	else
 		echo /$(get_libdir)
 	fi
@@ -624,7 +631,7 @@ alt_libdir() {
 
 alt_usrlibdir() {
 	if is_crosscompile ; then
-		echo /usr/${CTARGET}/lib
+		echo /usr/${CTARGET}/$(get_libdir)
 	else
 		echo /usr/$(get_libdir)
 	fi
@@ -639,7 +646,7 @@ setup_flags() {
 	strip-unsupported-flags
 	filter-flags -m32 -m64 -mabi=*
 
-	has_multilib_profile && CTARGET_OPT="$(get_abi_CHOST)"
+	has_multilib_profile && CTARGET_OPT=$(get_abi_CHOST)
 
 	case $(tc-arch) in
 		ppc)
@@ -769,7 +776,7 @@ want_nptl() {
 
 	# Archs that can use NPTL
 	case $(tc-arch) in
-		amd64|ia64|ppc|ppc64|s390|x86)
+		alpha|amd64|ia64|ppc|ppc64|s390|x86)
 			return 0;
 		;;
 		sparc)
@@ -852,7 +859,7 @@ want_omitfp() {
 
 install_locales() {
 	unset LANGUAGE LANG LC_ALL
-	cd ${WORKDIR}/${MYMAINBUILDDIR} || die "${WORKDIR}/${MYMAINBUILDDIR}"
+	cd "${WORKDIR}"/${MYMAINBUILDDIR} || die "${WORKDIR}/${MYMAINBUILDDIR}"
 	make PARALLELMFLAGS="${MAKEOPTS} -j1" \
 		install_root=${D} localedata/install-locales || die
 }
@@ -939,7 +946,7 @@ glibc_do_configure() {
 		--host=${CTARGET_OPT:-${CTARGET}}
 		--disable-profile
 		--without-gd
-		--with-headers=$(alt_headers)
+		--with-headers=${ROOT}$(alt_headers)
 		--prefix=$(alt_prefix)
 		--mandir=$(alt_prefix)/share/man
 		--infodir=$(alt_prefix)/share/info
@@ -948,10 +955,10 @@ glibc_do_configure() {
 
 	export CC="$(tc-getCC ${CTARGET})"
 
-	GBUILDDIR="${WORKDIR}/build-${ABI}-${CTARGET}-$1"
+	GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-$1
 	mkdir -p ${GBUILDDIR}
 	cd ${GBUILDDIR}
-	einfo "Configuring GLIBC for $1 with: ${myconf}"
+	einfo "Configuring GLIBC for $1 with: ${myconf// /\n\t\t}"
 	${S}/configure ${myconf} || die "failed to configure glibc"
 }
 
@@ -994,33 +1001,10 @@ fix_lib64_symlinks() {
 }
 
 use_multilib() {
-	case $(tc-arch) in
-		sparc)
-			case ${CHOST} in
-				sparc64*)
-					is_crosscompile || has_multilib_profile || use multilib
-					;;
-				*)
-					false
-					;;
-			esac
-		;;
-		mips)
-			case ${CHOST} in
-				mips64*)
-					is_crosscompile || has_multilib_profile || use multilib
-					;;
-				*)
-					false
-					;;
-			esac
-		;;
-		amd64|ppc64)
-			is_crosscompile || has_multilib_profile || use multilib
-		;;
-		*)
-			false
-		;;
+	case ${CTARGET} in
+		sparc64*|mips64*|amd64|ppc64)
+			is_crosscompile || has_multilib_profile || use multilib ;;
+		*)  false ;;
 	esac
 }
 
@@ -1033,13 +1017,13 @@ crosscompile_setup() {
 
 		case ${CTARGET} in
 			x86_64*)
-				export CFLAGS_x86="${CFLAGS_x86--m32}"
-				export CHOST_x86="i686-pc-linux-gnu"
+				export CFLAGS_x86=${CFLAGS_x86--m32}
+				export CHOST_x86=${CTARGET/x86_64/i686}
 				export CDEFINE_x86="__i386__"
 				export LIBDIR_x86="lib"
 
-				export CFLAGS_amd64="${CFLAGS_amd64--m64}"
-				export CHOST_amd64="x86_64-pc-linux-gnu"
+				export CFLAGS_amd64=${CFLAGS_amd64--m64}
+				export CHOST_amd64=${CTARGET}
 				export CDEFINE_amd64="__x86_64__"
 				export LIBDIR_amd64="lib64"
 
@@ -1047,18 +1031,18 @@ crosscompile_setup() {
 				export DEFAULT_ABI="amd64"
 			;;
 			mips64*)
-				export CFLAGS_o32="${CFLAGS_o32--mabi=32}"
-				export CHOST_o32="mips-unknown-linux-gnu"
+				export CFLAGS_o32=${CFLAGS_o32--mabi=32}
+				export CHOST_o32=${CTARGET/mips64/mips}
 				export CDEFINE_o32="_ABIO32"
 				export LIBDIR_o32="lib"
 
-				export CFLAGS_n32="${CFLAGS_n32--mabi=n32}"
-				export CHOST_n32="mips64-unknown-linux-gnu"
+				export CFLAGS_n32=${CFLAGS_n32--mabi=n32}
+				export CHOST_n32=${CTARGET}
 				export CDEFINE_n32="_ABIN32"
 				export LIBDIR_n32="lib32"
 
-				export CFLAGS_n64="${CFLAGS_n64--mabi=64}"
-				export CHOST_n64="mips64-unknown-linux-gnu"
+				export CFLAGS_n64=${CFLAGS_n64--mabi=64}
+				export CHOST_n64=${CTARGET}
 				export CDEFINE_n64="_ABI64"
 				export LIBDIR_n64="lib64"
 
@@ -1066,13 +1050,13 @@ crosscompile_setup() {
 				export DEFAULT_ABI="n32"
 			;;
 			powerpc64*)
-				export CFLAGS_ppc="${CFLAGS_ppc--m32}"
-				export CHOST_ppc="powerpc-unknown-linux-gnu"
+				export CFLAGS_ppc=${CFLAGS_ppc--m32}
+				export CHOST_ppc=${CTARGET/powerpc64/powerpc}
 				export CDEFINE_ppc="!__powerpc64__"
 				export LIBDIR_ppc="lib"
 
-				export CFLAGS_ppc64="${CFLAGS_ppc64--m64}"
-				export CHOST_ppc64="powerpc64-unknown-linux-gnu"
+				export CFLAGS_ppc64=${CFLAGS_ppc64--m64}
+				export CHOST_ppc64=${CTARGET}
 				export CDEFINE_ppc64="__powerpc64__"
 				export LIBDIR_ppc64="lib64"
 
@@ -1080,13 +1064,13 @@ crosscompile_setup() {
 				export DEFAULT_ABI="ppc64"
 			;;
 			sparc64*)
-				export CFLAGS_sparc32="${CFLAGS_sparc--m32}"
-				export CHOST_sparc32="sparc-unknown-linux-gnu"
+				export CFLAGS_sparc32=${CFLAGS_sparc--m32}
+				export CHOST_sparc32=${CTARGET/sparc64/sparc}
 				export CDEFINE_sparc32="!__arch64__"
 				export LIBDIR_sparc32="lib"
 
-				export CFLAGS_sparc64="${CFLAGS_sparc64--m64}"
-				export CHOST_sparc64="sparc64-unknown-linux-gnu"
+				export CFLAGS_sparc64=${CFLAGS_sparc64--m64}
+				export CHOST_sparc64=${CTARGET}
 				export CDEFINE_sparc64="__arch64__"
 				export LIBDIR_sparc64="lib64"
 
@@ -1126,21 +1110,19 @@ DEPEND=">=sys-devel/gcc-3.2.3-r1
 	virtual/os-headers
 	nls? ( sys-devel/gettext )
 	selinux? ( !build? ( sys-libs/libselinux ) )"
-
 RDEPEND="virtual/os-headers
 	nls? ( sys-devel/gettext )
 	selinux? ( !build? ( sys-libs/libselinux ) )"
 
 if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-	DEPEND="${DEPEND}
-	        >=${CATEGORY}/gcc-3.3.5-r1"
+	DEPEND="${DEPEND} ${CATEGORY}/gcc"
 
-	if [[ ${CATEGORY/mips} != ${CATEGORY} ]] ; then
-		DEPEND="${DEPEND}
-		        >=${CATEGORY}/mips-headers-2.6.10"
-	else
-		DEPEND="${DEPEND}
-		        >=${CATEGORY}/linux-headers-2.6.8"
+	if [[ ${CATEGORY} == *-linux* ]] ; then
+		if [[ ${CATEGORY/mips} != ${CATEGORY} ]] ; then
+			DEPEND="${DEPEND} >=${CATEGORY}/mips-headers-2.6.10"
+		else
+			DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
+		fi
 	fi
 
 	case ${CTARGET} in
@@ -1257,20 +1239,22 @@ src_unpack() {
 src_compile() {
 	crosscompile_setup
 
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if has_multilib_profile && [ -z "${OABI}" -a "${MLTEST/set_abi}" = "${MLTEST}" ] ; then
-		OABI="${ABI}"
-		for ABI in $(get_install_abis); do
-			export ABI
-			einfo "Compiling ${ABI} glibc"
-			src_compile
-		done
-		ABI="${OABI}"
-		unset OABI
-		return 0
+	if [[ -z ${OABI} ]] && has_multilib_profile ; then
+		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+		local MLTEST=$(type dyn_unpack)
+		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
+			OABI=${ABI}
+			einfo "Building multilib glibc for ABIs: $(get_install_abis)"
+			for ABI in $(get_install_abis) ; do
+				export ABI=${ABI}
+				src_compile
+			done
+			ABI=${OABI}
+			unset OABI
+			return 0
+		fi
+		unset MLTEST
 	fi
-	unset MLTEST
 
 	ABI=${ABI:-default}
 	toolchain-glibc_src_compile
@@ -1279,20 +1263,23 @@ src_compile() {
 src_test() {
 	crosscompile_setup
 
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if has_multilib_profile && [ -z "${OABI}" -a "${MLTEST/set_abi}" = "${MLTEST}" ] ; then
-		OABI="${ABI}"
-		for ABI in $(get_install_abis); do
-			export ABI
-			einfo "Testing ${ABI} glibc"
-			src_test
-		done
-		ABI="${OABI}"
-		unset OABI
-		return 0
+	if [[ -z ${OABI} ]] && has_multilib_profile ; then
+		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+		local MLTEST=$(type dyn_unpack)
+		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
+			OABI=${ABI}
+			einfo "Testing multilib glibc for ABIs: $(get_install_abis)"
+			for ABI in $(get_install_abis) ; do
+				export ABI
+				einfo "   Testing ${ABI} glibc"
+				src_test
+			done
+			ABI=${OABI}
+			unset OABI
+			return 0
+		fi
+		unset MLTEST
 	fi
-	unset MLTEST
 
 	ABI=${ABI:-default}
 	toolchain-glibc_src_test
@@ -1301,59 +1288,63 @@ src_test() {
 src_install() {
 	crosscompile_setup
 
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if has_multilib_profile && [ -z "${OABI}" -a "${MLTEST/set_abi}" = "${MLTEST}" ] ; then
-		OABI="${ABI}"
-		for ABI in $(get_install_abis); do
-			export ABI
-			einfo "Installing ${ABI} glibc"
-			src_install
-		done
-		ABI="${OABI}"
-		unset OABI
-		return 0
+	if [[ -z ${OABI} ]] && has_multilib_profile ; then
+		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+		local MLTEST=$(type dyn_unpack)
+		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
+			OABI=${ABI}
+			einfo "Installing multilib glibc for ABIs: $(get_install_abis)"
+			for ABI in $(get_install_abis) ; do
+				export ABI
+				src_install
+			done
+			ABI=${OABI}
+			unset OABI
+			return 0
+		fi
+		unset MLTEST
 	fi
-	unset MLTEST
 
 	ABI=${ABI:-default}
 
 	# Handle stupid lib32 BS
 	unset OLD_LIBDIR
-	if [[ $(tc-arch) == "amd64" && ${ABI} == "x86" && $(get_libdir) != "lib" ]] && ! is_crosscompile; then
-		OLD_LIBDIR="$(get_libdir)"
-		LIBDIR_x86="lib"
-	fi
+	if ! is_crosscompile ; then
+		if [[ $(tc-arch) == "amd64" && ${ABI} == "x86" && $(get_libdir) != "lib" ]] ; then
+			OLD_LIBDIR=$(get_libdir)
+			LIBDIR_x86="lib"
+		fi
 
-	if [[ $(tc-arch) == "ppc64" && ${ABI} == "ppc" && $(get_libdir) != "lib" ]] && ! is_crosscompile; then
-		OLD_LIBDIR="$(get_libdir)"
-		LIBDIR_ppc="lib"
+		if [[ $(tc-arch) == "ppc64" && ${ABI} == "ppc" && $(get_libdir) != "lib" ]] ; then
+			OLD_LIBDIR=$(get_libdir)
+			LIBDIR_ppc="lib"
+		fi
 	fi
 
 	toolchain-glibc_src_install
 
 	# Handle stupid lib32 BS on amd64 and ppc64
 	if [[ -n ${OLD_LIBDIR} ]] ; then
-		cd ${S}
-		[[ $(tc-arch) == "amd64" ]] && LIBDIR_x86="${OLD_LIBDIR}"
-		[[ $(tc-arch) == "ppc64" ]] && LIBDIR_ppc="${OLD_LIBDIR}"
+		cd "${S}"
+		[[ $(tc-arch) == "amd64" ]] && LIBDIR_x86=${OLD_LIBDIR}
+		[[ $(tc-arch) == "ppc64" ]] && LIBDIR_ppc=${OLD_LIBDIR}
 		unset OLD_LIBDIR
 
-		mv ${D}/lib ${D}/$(get_libdir)
-		mv ${D}/usr/lib ${D}/usr/$(get_libdir)
+		mv "${D}"/lib "${D}"/$(get_libdir)
+		mv "${D}"/usr/lib "${D}"/usr/$(get_libdir)
 		dodir /lib
 		dodir /usr/lib
-		mv ${D}/usr/$(get_libdir)/locale ${D}/usr/lib
+		mv "${D}"/usr/$(get_libdir)/locale "${D}"/usr/lib
 		[[ $(tc-arch) == "amd64" ]] && dosym ../$(get_libdir)/ld-linux.so.2 /lib/ld-linux.so.2
 		[[ $(tc-arch) == "ppc64" ]] && dosym ../$(get_libdir)/ld.so.1 /lib/ld.so.1
 
-		for f in ${D}/usr/$(get_libdir)/*.so; do
-			local basef=$(basename ${f})
-			if [ -L ${f} ] ; then
-				local target=$(readlink ${f})
+		for f in "${D}"/usr/$(get_libdir)/*.so; do
+			local basef=$(basename "${f}")
+			if [[ -L ${f} ]] ; then
+				local target=$(readlink "${f}")
 				target=${target/\/lib\//\/$(get_libdir)\/}
-				rm ${f}
-				dosym ${target} /usr/$(get_libdir)/${basef}
+				rm "${f}"
+				dosym "${target}" /usr/$(get_libdir)/"${basef}"
 			fi
 		done
 
diff --git a/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild b/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild
index 0d94c6338471..073d39b83b6e 100644
--- a/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild
@@ -1,8 +1,22 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild,v 1.1 2005/02/16 04:02:40 eradicator Exp $
-
-KEYWORDS="~amd64 ~mips ~sparc ~x86"
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild,v 1.1.1.1 2005/11/30 09:39:22 chriswhite Exp $
+
+# Here's how the cross-compile logic breaks down ...
+#  CTARGET - machine that will target the binaries
+#  CHOST   - machine that will host the binaries
+#  CBUILD  - machine that will build the binaries
+# If CTARGET != CHOST, it means you want a libc for cross-compiling.
+# If CHOST != CBUILD, it means you want to cross-compile the libc.
+#  CBUILD = CHOST = CTARGET    - native build/install
+#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
+#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
+#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
+# For install paths:
+#  CHOST = CTARGET  - install into /
+#  CHOST != CTARGET - install into /usr/CTARGET/
+
+KEYWORDS="~amd64 ~ia64 mips -ppc ~sparc ~x86"
 
 BRANCH_UPDATE=""
 
@@ -13,18 +27,19 @@ GLIBC_MANPAGE_VERSION="2.3.4-r1"
 GLIBC_INFOPAGE_VERSION="2.3.4-r1"
 
 # Gentoo patchset
-PATCH_VER="1.2"
+PATCH_VER="1.7"
 
-# Libidn addon - http://www.gnu.org/software/libidn/
-IDN_VER="0.5.13"
-IDN_TARBALL="libidn-${IDN_VER}.tar.gz"
-IDN_URI="http://josefsson.org/libidn/releases/${IDN_TARBALL}"
+# C Stubbs addon (contained in fedora, so ignoring)
+#CSTUBS_VER="2.1.2"
+#CSTUBS_TARBALL="c_stubs-${CSTUBS_VER}.tar.bz2"
+#CSTUBS_URI="mirror://gentoo/${CSTUBS_TARBALL}"
 
-# (Recent snapshots fails with 2.6.5 and earlier)
-LT_KERNEL_VERSION="2.4.1"
-NPTL_KERNEL_VERSION="2.6.6"
+# Fedora addons (from RHEL's glibc-2.3.4-2.src.rpm)
+FEDORA_VER="20041219T2331"
+FEDORA_TARBALL="glibc-fedora-${FEDORA_VER}.tar.bz2"
+FEDORA_URI="mirror://gentoo/${FEDORA_TARBALL}"
 
-GENTOO_TOOLCHAIN_BASE_URI="http://dev.gentoo.org/~eradicator/glibc"
+GENTOO_TOOLCHAIN_BASE_URI="mirror://gentoo"
 
 ### PUNT OUT TO ECLASS?? ###
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
@@ -33,16 +48,22 @@ DESCRIPTION="GNU libc6 (also called glibc2) C library"
 HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
 LICENSE="LGPL-2"
 
-IUSE="nls pic build nptl nptlonly erandom hardened debug userlocales nomalloccheck multilib"
-
-PROVIDE="virtual/glibc virtual/libc"
+IUSE="build erandom hardened multilib nls nomalloccheck nptl nptlonly pic userlocales selinux"
 
 export CBUILD=${CBUILD:-${CHOST}}
-if [[ ${CBUILD} = ${CHOST} ]] ; then
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
 	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-		export CHOST=${CATEGORY/cross-}
+		export CTARGET=${CATEGORY/cross-}
 	fi
 fi
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	PROVIDE="virtual/libc"
+fi
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
 
 GLIBC_RELEASE_VER=$(get_version_component_range 1-3)
 
@@ -97,43 +118,49 @@ get_glibc_src_uri() {
 	# This variable should be set to the devspace of whoever is currently
 	# maintaining GLIBC. Please dont set this to mirror, that would just
 	# make the files unavailable until they get mirrored.
-	local devspace_uri="http://dev.gentoo.org/~eradicator/glibc/"
+	local devspace_uri="mirror://gentoo/"
 	GENTOO_TOOLCHAIN_BASE_URI=${GENTOO_TOOLCHAIN_BASE_URI:-${devspace_uri}}
 
 #	GLIBC_SRC_URI="http://ftp.gnu.org/gnu/glibc/${PN}-${GLIBC_RELEASE_VER}.tar.bz2
-#	               http://ftp.gnu.org/gnu/glibc/${PN}-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2"
+#	               http://ftp.gnu.org/gnu/glibc/${PN}-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2
+#	               http://ftp.gnu.org/gnu/glibc/${PN}-libidn-${GLIBC_RELEASE_VER}.tar.bz2
 	GLIBC_SRC_URI="mirror://gnu/glibc/${PN}-${GLIBC_RELEASE_VER}.tar.bz2
-	               mirror://gnu/glibc/${PN}-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2"
+	               mirror://gnu/glibc/${PN}-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2
+	               mirror://gnu/glibc/${PN}-libidn-${GLIBC_RELEASE_VER}.tar.bz2"
 
-	if [[ -n ${BRANCH_UPDATE} ]]; then
+	if [[ -n ${BRANCH_UPDATE} ]] ; then
 		GLIBC_SRC_URI="${GLIBC_SRC_URI}
 			${GENTOO_TOOLCHAIN_BASE_URI}/${PN}-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2"
 	fi
 
-	if [[ -n ${PATCH_VER} ]]; then
+	if [[ -n ${PATCH_VER} ]] ; then
 		GLIBC_SRC_URI="${GLIBC_SRC_URI}
 			${GENTOO_TOOLCHAIN_BASE_URI}/${PN}-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2"
 	fi
 
-	if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]]; then
+	if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then
 		GLIBC_SRC_URI="${GLIBC_SRC_URI}
 			${GENTOO_TOOLCHAIN_BASE_URI}/${PN}-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2"
 	fi
 
-	if [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]]; then
+	if [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then
 		GLIBC_SRC_URI="${GLIBC_SRC_URI}
 			${GENTOO_TOOLCHAIN_BASE_URI}/${PN}-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2"
 	fi
 
-	if [[ -n "${IDN_URI}" ]]; then
-		GLIBC_SRC_URI="${GLIBC_SRC_URI} ${IDN_URI}"
+	if [[ -n ${CSTUBS_URI} ]] ; then
+		GLIBC_SRC_URI="${GLIBC_SRC_URI} ${CSTUBS_URI}"
+	fi
+
+	if [[ -n ${FEDORA_URI} ]] ; then
+		GLIBC_SRC_URI="${GLIBC_SRC_URI} ${FEDORA_URI}"
 	fi
 
 	echo "${GLIBC_SRC_URI}"
 }
 
 SRC_URI=$(get_glibc_src_uri)
-S="${WORKDIR}/${PN}-${GLIBC_RELEASE_VER}"
+S=${WORKDIR}/${PN}-${GLIBC_RELEASE_VER}
 
 ### EXPORTED FUNCTIONS ###
 toolchain-glibc_src_unpack() {
@@ -144,50 +171,54 @@ toolchain-glibc_src_unpack() {
 
 	cd ${S}
 	unpack ${PN}-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2
+	unpack ${PN}-libidn-${GLIBC_RELEASE_VER}.tar.bz2
+
+	if [[ -n ${CSTUBS_TARBALL} ]] ; then
+		unpack ${CSTUBS_TARBALL}
+	fi
 
-	if [[ -n "${IDN_TARBALL}" ]]; then
-		unpack ${IDN_TARBALL}
-		mv libidn-${IDN_VER} libidn
+	if [[ -n ${FEDORA_TARBALL} ]] ; then
+		unpack ${FEDORA_TARBALL}
 	fi
 
-	if [[ -n ${PATCH_VER} ]]; then
-		cd ${WORKDIR}
+	if [[ -n ${PATCH_VER} ]] ; then
+		cd "${WORKDIR}"
 		unpack ${PN}-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2
 	fi
 
-	if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]]; then
-		cd ${WORKDIR}
+	if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then
+		cd "${WORKDIR}"
 		unpack ${PN}-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2
 	fi
 
-	if [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]]; then
+	if [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then
 		cd ${S}
 		unpack ${PN}-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2
 	fi
 
-	if [[ -n "${BRANCH_UPDATE}" ]]; then
-		cd ${WORKDIR}
+	if [[ -n ${BRANCH_UPDATE} ]] ; then
+		cd "${WORKDIR}"
 		unpack ${PN}-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
 	fi
 
 	cd ${S}
 
-	if [[ -n "${BRANCH_UPDATE}" ]]; then
-		epatch ${WORKDIR}/${PN}-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch
+	if [[ -n ${BRANCH_UPDATE} ]] ; then
+		epatch "${WORKDIR}"/${PN}-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch
 
 		# Snapshot date patch
 		einfo "Patching version to display snapshot date ..."
 		sed -i -e "s:\(#define RELEASE\).*:\1 \"${BRANCH_UPDATE}\":" version.h
 	fi
 
-	if [[ -n ${PATCH_VER} ]]; then
+	if [[ -n ${PATCH_VER} ]] ; then
 		EPATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE}"
 		EPATCH_SUFFIX="patch"
 		OLD_ARCH="${ARCH}"
 		ARCH="$(tc-arch)"
 
 		einfo "Applying Gentoo Glibc Patches: ${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-${PATCH_VER}"
-		epatch ${WORKDIR}/patches
+		epatch "${WORKDIR}"/patches
 
 		ARCH="${OLD_ARCH}"
 		unset EPATCH_EXCLUDE
@@ -197,18 +228,27 @@ toolchain-glibc_src_unpack() {
 }
 
 toolchain-glibc_src_compile() {
-	# do the linuxthreads build unless we're using nptlonly
-	if use !nptlonly ; then
+	# Set gconvdir to /usr/$(get_libdir)/gconv on archs with multiple ABIs
+	local MAKEFLAGS=""
+	has_multilib_profile && MAKEFLAGS="gconvdir=$(alt_usrlibdir)/gconv"
+
+	echo
+	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CFLAGS ; do
+		einfo " $(printf '%15s' ${v}:)   ${!v}"
+	done
+	echo
+
+	if want_linuxthreads ; then
 		glibc_do_configure linuxthreads
 		einfo "Building GLIBC with linuxthreads..."
-		make PARALLELMFLAGS="${MAKEOPTS}" || die
+		make PARALLELMFLAGS="${MAKEOPTS}" ${MAKEFLAGS} || die
 	fi
 	if want_nptl ; then
-		# ...and then do the optional nptl build
-		unset LD_ASSUME_KERNEL || :
+		# ... and then do the optional nptl build
+		unset LD_ASSUME_KERNEL
 		glibc_do_configure nptl
 		einfo "Building GLIBC with NPTL..."
-		make PARALLELMFLAGS="${MAKEOPTS}" || die
+		make PARALLELMFLAGS="${MAKEOPTS}" ${MAKEFLAGS} || die
 	fi
 }
 
@@ -218,13 +258,13 @@ toolchain-glibc_src_test() {
 	unset LD_PRELOAD
 
 	# do the linuxthreads build unless we're using nptlonly
-	if use !nptlonly ; then
-		cd ${WORKDIR}/build-${ABI}-${CHOST}-linuxthreads
+	if want_linuxthreads ; then
+		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads
 		einfo "Checking GLIBC with linuxthreads..."
 		make check || die "linuxthreads glibc did not pass make check"
 	fi
-	if want_nptl; then
-		cd ${WORKDIR}/build-${ABI}-${CHOST}-nptl
+	if want_nptl ; then
+		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl
 		unset LD_ASSUME_KERNEL || :
 		einfo "Checking GLIBC with NPTL..."
 		make check || die "nptl glibc did not pass make check"
@@ -245,11 +285,14 @@ toolchain-glibc_pkg_preinst() {
 
 	# it appears that /lib/tls is sometimes not removed. See bug
 	# 69258 for more info.
-	if [ -d /${ROOT}$(alt_libdir)/tls ] && { use nptlonly || use !nptl; }; then
-		addwrite /${ROOT}$(alt_libdir)/
+	if [[ -d ${ROOT}$(alt_libdir)/tls ]] && ! { want_nptl && want_linuxthreads; }; then
+		addwrite "${ROOT}"/$(alt_libdir)/
 		ewarn "nptlonly or -nptl in USE, removing /${ROOT}$(alt_libdir)/tls..."
-		rm -rf /${ROOT}$(alt_libdir)/tls || die
+		rm -r "${ROOT}"/$(alt_libdir)/tls || die
 	fi
+
+	# Shouldnt need to keep this updated
+	[[ -e ${ROOT}/etc/locales.build ]] && rm -f "${D}"/etc/locales.build
 }
 
 toolchain-glibc_src_install() {
@@ -262,112 +305,114 @@ toolchain-glibc_src_install() {
 	# zoneinfo do not always get installed ...
 	unset LANGUAGE LANG LC_ALL
 
-	if use nptlonly ; then
-		MYMAINBUILDDIR=build-${ABI}-${CHOST}-nptl
-	else
-		MYMAINBUILDDIR=build-${ABI}-${CHOST}-linuxthreads
-	fi
-
-	if use !nptlonly ; then
-		cd ${WORKDIR}/build-${ABI}-${CHOST}-linuxthreads
-		einfo "Installing GLIBC with linuxthreads..."
-		make PARALLELMFLAGS="${MAKEOPTS}" \
-			install_root=${D} \
+	if want_linuxthreads ; then
+		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads
+		einfo "Installing GLIBC ${ABI} with linuxthreads ..."
+		make PARALLELMFLAGS="${MAKEOPTS} -j1" \
+			install_root="${D}" \
 			install || die
-	elif use nptlonly ; then
-		cd ${WORKDIR}/build-${ABI}-${CHOST}-nptl
-		einfo "Installing GLIBC with NPTL..."
-		make PARALLELMFLAGS="${MAKEOPTS}" \
-			install_root=${D} \
+	else # nptlonly
+		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl
+		einfo "Installing GLIBC ${ABI} with NPTL ..."
+		make PARALLELMFLAGS="${MAKEOPTS} -j1" \
+			install_root="${D}" \
 			install || die
 	fi
 
-	if tc-is-cross-compiler; then
+	if is_crosscompile ; then
 		# Glibc doesn't setup multilib crosscompiled dirs right, but it
 		# sets up native multilib dirs right, so just do this when we
 		# crosscompile.
-		if [[ $(get_libdir) != "lib" && -d ${D}$(alt_prefix)/lib ]]; then
+		if [[ $(get_libdir) != "lib" && -d ${D}$(alt_prefix)/lib ]] ; then
 			dodir $(alt_libdir)
-			mv ${D}$(alt_prefix)/lib/* ${D}$(alt_libdir)
+			mv "${D}"$(alt_prefix)/lib/* "${D}"$(alt_libdir)
 		fi
 
 		# punt all the junk not needed by a cross-compiler
 		rm -rf "${D}"$(alt_prefix)/{bin,etc,$(get_libdir)/gconv,sbin,share}
 	fi
 
-	if use !nptlonly && want_nptl ; then
+	if want_linuxthreads && want_nptl ; then
 		einfo "Installing NPTL to $(alt_libdir)/tls/..."
-		cd ${WORKDIR}/build-${ABI}-${CHOST}-nptl
-		mkdir -p ${D}$(alt_libdir)/tls/
+		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl
+		mkdir -p "${D}"$(alt_libdir)/tls/
 
-		libcsofile=$(basename ${D}$(alt_libdir)/libc-*.so)
-		cp -a libc.so ${D}$(alt_libdir)/tls/${libcsofile} || die
+		libcsofile=$(basename "${D}"$(alt_libdir)/libc-*.so)
+		cp -a libc.so "${D}"$(alt_libdir)/tls/${libcsofile} || die
 		dosym ${libcsofile} $(alt_libdir)/tls/$(ls libc.so.*)
 
-		libmsofile=$(basename ${D}$(alt_libdir)/libm-*.so)
+		libmsofile=$(basename "${D}"$(alt_libdir)/libm-*.so)
 		pushd math > /dev/null
-		cp -a libm.so ${D}$(alt_libdir)/tls/${libmsofile} || die
+		cp -a libm.so "${D}"$(alt_libdir)/tls/${libmsofile} || die
 		dosym ${libmsofile} $(alt_libdir)/tls/$(ls libm.so.*)
 		popd > /dev/null
 
-		librtsofile=$(basename ${D}$(alt_libdir)/librt-*.so)
+		librtsofile=$(basename "${D}"$(alt_libdir)/librt-*.so)
 		pushd rt > /dev/null
-		cp -a librt.so ${D}$(alt_libdir)/tls/${librtsofile} || die
+		cp -a librt.so "${D}"$(alt_libdir)/tls/${librtsofile} || die
 		dosym ${librtsofile} $(alt_libdir)/tls/$(ls librt.so.*)
 		popd > /dev/null
 
-		libthreaddbsofile=$(basename ${D}$(alt_libdir)/libthread_db-*.so)
+		libthreaddbsofile=$(basename "${D}"$(alt_libdir)/libthread_db-*.so)
 		pushd nptl_db > /dev/null
-		cp -a libthread_db.so ${D}$(alt_libdir)/tls/${libthreaddbsofile} || die
+		cp -a libthread_db.so "${D}"$(alt_libdir)/tls/${libthreaddbsofile} || die
 		dosym ${libthreaddbsofile} $(alt_libdir)/tls/$(ls libthread_db.so.*)
 		popd > /dev/null
 
 		libpthreadsofile=libpthread-${GLIBC_RELEASE_VER}.so
-		cp -a nptl/libpthread.so ${D}$(alt_libdir)/tls/${libpthreadsofile} || die
+		cp -a nptl/libpthread.so "${D}"$(alt_libdir)/tls/${libpthreadsofile} || die
 		dosym ${libpthreadsofile} $(alt_libdir)/tls/libpthread.so.0
 
 		# and now for the static libs
-		mkdir -p ${D}$(alt_usrlibdir)/nptl
+		mkdir -p "${D}"$(alt_usrlibdir)/nptl
 		cp -a libc.a nptl/libpthread.a nptl/libpthread_nonshared.a rt/librt.a \
-			${D}$(alt_usrlibdir)/nptl
+			"${D}"$(alt_usrlibdir)/nptl
 
 		# linker script crap
 		for lib in libc libpthread; do
 			sed -e "s:$(alt_libdir)/${lib}.so:$(alt_libdir)/tls/${lib}.so:g" \
 			    -e "s:$(alt_usrlibdir)/${lib}_nonshared.a:$(alt_usrlibdir)/nptl/${lib}_nonshared.a:g" \
-			          ${D}$(alt_usrlibdir)/${lib}.so \
-				> ${D}$(alt_usrlibdir)/nptl/${lib}.so
+			          "${D}"$(alt_usrlibdir)/${lib}.so \
+				> "${D}"$(alt_usrlibdir)/nptl/${lib}.so
 
-			chmod 755 ${D}$(alt_usrlibdir)/nptl/${lib}.so
+			chmod 755 "${D}"$(alt_usrlibdir)/nptl/${lib}.so
 		done
 
 		dosym ../librt.so $(alt_usrlibdir)/nptl/librt.so
 
 		# last but not least... headers.
-		mkdir -p ${D}/nptl ${D}$(alt_headers)/nptl
-		make install_root=${D}/nptl install-headers PARALLELMFLAGS="${MAKEOPTS}"
-		pushd ${D}/nptl/$(alt_headers) > /dev/null
-			for i in `find . -type f`; do
-				if ! [ -f ${D}$(alt_headers)/$i ] \
-					|| ! cmp -s $i ${D}$(alt_headers)/$i; then
+		mkdir -p "${D}"/nptl "${D}"$(alt_headers)/nptl
+		make install_root="${D}"/nptl install-headers PARALLELMFLAGS="${MAKEOPTS} -j1"
+		pushd "${D}"/nptl/$(alt_headers) > /dev/null
+		for i in $(find . -type f) ; do
+			if ! [[ -f ${D}$(alt_headers)/$i ]] \
+			   || ! cmp -s $i ${D}$(alt_headers)/$i; then
 				mkdir -p ${D}$(alt_headers)/nptl/`dirname $i`
 				cp -a $i ${D}$(alt_headers)/nptl/$i
 			fi
 		done
+		popd > /dev/null
 		rm -rf ${D}/nptl
 	fi
 
-	# now, strip everything but the thread libs #46186
+	# Now, strip everything but the thread libs #46186, as well as the dynamic
+	# linker, else we cannot set breakpoints in shared libraries.
+	# Fix for ld-* by Lonnie Princehouse.
 	mkdir -p ${T}/thread-backup
-	mv ${D}$(alt_libdir)/lib{pthread,thread_db}* ${T}/thread-backup/
-	if use !nptlonly && want_nptl ; then
+	for x in ${D}$(alt_libdir)/lib{pthread,thread_db}* \
+	         ${D}$(alt_libdir)/ld-* ; do
+		[[ -f ${x} ]] && mv -f ${x} ${T}/thread-backup/
+	done
+	if want_linuxthreads && want_nptl ; then
 		mkdir -p ${T}/thread-backup/tls
-		mv ${D}$(alt_libdir)/tls/lib{pthread,thread_db}* ${T}/thread-backup/tls
+		for x in ${D}$(alt_libdir)/tls/lib{pthread,thread_db}* ; do
+			[[ -f ${x} ]] && mv -f ${x} ${T}/thread-backup/tls
+		done
 	fi
-	env -uRESTRICT CHOST=${CHOST} prepallstrip
-	cp -R -- ${T}/thread-backup/* ${D}$(alt_libdir)/ || die
+	env -uRESTRICT CHOST=${CTARGET} prepallstrip
+	cp -a -- ${T}/thread-backup/* ${D}$(alt_libdir)/ || die
 
-	if use pic && [[ $(tc-arch) != "amd64" ]]; then
+	if use pic && [[ $(tc-arch) != "amd64" ]] ; then
 		find ${S}/${buildtarget}/ -name "soinit.os" -exec cp {} ${D}$(alt_libdir)/soinit.o \;
 		find ${S}/${buildtarget}/ -name "sofini.os" -exec cp {} ${D}$(alt_libdir)/sofini.o \;
 		find ${S}/${buildtarget}/ -name "*_pic.a" -exec cp {} ${D}$(alt_libdir) \;
@@ -389,14 +434,26 @@ toolchain-glibc_src_install() {
 
 	#################################################################
 	# EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY #
-	tc-is-cross-compiler && return 0
+	# Make sure we install the sys-include symlink so that when 
+	# we build a 2nd stage cross-compiler, gcc finds the target 
+	# system headers correctly.  See gcc/doc/gccinstall.info
+	if is_crosscompile ; then
+		dosym include $(alt_prefix)/sys-include
+		dosym . $(alt_prefix)/usr
+		return 0
+	fi
 
 	# Everything past this point just needs to be done once... don't waste time building locale files twice...
 	is_final_abi || return 0
 
-	cd ${WORKDIR}/${MYMAINBUILDDIR}
+	if want_linuxthreads ; then
+		MYMAINBUILDDIR=build-${ABI}-${CTARGET}-linuxthreads
+	else
+		MYMAINBUILDDIR=build-${ABI}-${CTARGET}-nptl
+	fi
+	cd "${WORKDIR}"/${MYMAINBUILDDIR}
 	if ! use build ; then
-		if ! has noinfo ${FEATURES} && [[ "${GLIBC_INFOPAGE_VERSION}" != "none" ]]; then
+		if ! has noinfo ${FEATURES} && [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then
 			einfo "Installing info pages..."
 
 			make PARALLELMFLAGS="${MAKEOPTS} -j1" \
@@ -406,17 +463,18 @@ toolchain-glibc_src_install() {
 
 		setup_locales
 
-		if [[ "${GLIBC_MANPAGE_VERSION}" != "none" ]]; then
+		if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then
 			einfo "Installing man pages..."
 
 			# Install linuxthreads man pages even if nptl is enabled
-			cd ${WORKDIR}/man
+			cd "${WORKDIR}"/man
 			doman *.3thr
 		fi
 
 		# Install nscd config file
 		insinto /etc
 		doins ${FILESDIR}/nscd.conf
+		doins "${FILESDIR}"/nsswitch.conf
 
 		exeinto /etc/init.d
 		doexe ${FILESDIR}/nscd
@@ -437,7 +495,7 @@ toolchain-glibc_src_install() {
 
 	# Is this next line actually needed or does the makefile get it right?
 	# It previously has 0755 perms which was killing things.
-	fperms 4711 $(alt_prefix)/libexec/glibc/pt_chown
+	fperms 4711 $(alt_prefix)/lib/misc/glibc/pt_chown
 
 	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
 	# creation of the "factory" symlink in pkg_postinst().
@@ -448,9 +506,39 @@ toolchain-glibc_src_install() {
 	doins ${FILESDIR}/locales.build
 	# example host.conf with multicast dns disabled by default
 	doins ${FILESDIR}/2.3.4/host.conf
+
+	# simple test to make sure our new glibc isnt completely broken.
+	# for now, skip the multilib scenario.  also make sure we don't
+	# test with statically built binaries since they will fail.
+	[[ ${CBUILD} != ${CHOST} ]] && return 0
+	[[ $(get_libdir) != "lib" ]] && return 0
+	for x in date env ls true uname ; do
+		x=$(type -p ${x})
+		[[ -z ${x} ]] && continue
+		striptest=$(file -L ${x} 2>/dev/null)
+		[[ -z ${striptest} ]] && continue
+		[[ ${striptest/statically linked} != "${striptest}" ]] && continue
+		"${D}"/$(get_libdir)/ld-*.so \
+			--library-path "${D}"/$(get_libdir) \
+			${x} > /dev/null \
+			|| die "simple run test (${x}) failed"
+	done
 }
 
 toolchain-glibc_pkg_postinst() {
+	# Mixing nptlonly and -nptlonly glibc can prove dangerous if libpthread
+	# isn't removed in unmerge which happens sometimes.  See bug #87671
+	if ! is_crosscompile && want_linuxthreads ; then
+		for libdir in $(get_all_libdirs) ; do
+			for f in ${ROOT}/${libdir}/libpthread-2.* ${ROOT}/${libdir}/libpthread-0.6* ; do
+				if [[ -f ${f} ]] ; then
+					rm -f ${f}
+					ldconfig
+				fi
+			done
+		done
+	fi
+
 	# Correct me if I am wrong here, but my /etc/localtime is a file
 	# created by zic ....
 	# I am thinking that it should only be recreated if no /etc/localtime
@@ -460,28 +548,24 @@ toolchain-glibc_pkg_postinst() {
 	#   -f && -e  will fail
 	#   -L will succeed
 	#
-	if [ ! -e "${ROOT}/etc/localtime" ]; then
+	if [ ! -e "${ROOT}/etc/localtime" ] ; then
 		echo "Please remember to set your timezone using the zic command."
 		rm -f ${ROOT}/etc/localtime
 		ln -s ../usr/share/zoneinfo/Factory ${ROOT}/etc/localtime
 	fi
 
-	if [ -x "${ROOT}/usr/sbin/iconvconfig" ]; then
+	if ! is_crosscompile && [ -x "${ROOT}/usr/sbin/iconvconfig" ] ; then
 		# Generate fastloading iconv module configuration file.
 		${ROOT}/usr/sbin/iconvconfig --prefix=${ROOT}
 	fi
 
-	if [ ! -e "${ROOT}/ld.so.1" ] && use ppc64
-	then
-		pushd ${ROOT}
+	if [ ! -e "${ROOT}/lib/ld.so.1" ] && use ppc64 && ! has_multilib_profile ; then
 		## SHOULDN'T THIS BE lib64??
-		cd ${ROOT}/lib
-		ln -s ld64.so.1 ld.so.1
-		popd
+		ln -s ld64.so.1 ${ROOT}/lib/ld.so.1
 	fi
 
 	# Reload init ...
-	if [ "${ROOT}" = "/" ]; then
+	if ! is_crosscompile && [ "${ROOT}" = "/" ] ; then
 		/sbin/init U &> /dev/null
 	fi
 
@@ -493,7 +577,7 @@ toolchain-glibc_pkg_postinst() {
 	einfo "remove the line that disables it (mdns off)."
 	echo
 
-	if use nptl && use !nptlonly; then
+	if want_nptl && want_linuxthreads ; then
 		einfo "The default behavior of glibc on your system is to use NPTL.  If"
 		einfo "you want to use linuxthreads for a particular program, start it"
 		einfo "by executing 'LD_ASSUME_KERNEL=${LT_KERNEL_VERSION} <program> [<options>]'"
@@ -508,9 +592,9 @@ toolchain-glibc_pkg_postinst() {
 # the whole system.
 # note: intentionally undocumented.
 alt_headers() {
-	if [ -z "${ALT_HEADERS}" ] ; then
-		if tc-is-cross-compiler; then
-			ALT_HEADERS="/usr/${CHOST}/include"
+	if [[ -z ${ALT_HEADERS} ]] ; then
+		if is_crosscompile ; then
+			ALT_HEADERS="/usr/${CTARGET}/include"
 		else
 			ALT_HEADERS="/usr/include"
 		fi
@@ -519,32 +603,33 @@ alt_headers() {
 }
 
 alt_prefix() {
-	if tc-is-cross-compiler; then
-		echo /usr/${CHOST}
+	if is_crosscompile ; then
+		echo /usr/${CTARGET}
 	else
 		echo /usr
 	fi
 }
 
 alt_libdir() {
-	if tc-is-cross-compiler; then
-		echo /usr/${CHOST}/$(get_libdir)
+	if is_crosscompile ; then
+		echo /usr/${CTARGET}/$(get_libdir)
 	else
 		echo /$(get_libdir)
 	fi
 }
 
 alt_usrlibdir() {
-	if tc-is-cross-compiler; then
-		echo /usr/${CHOST}/$(get_libdir)
+	if is_crosscompile ; then
+		echo /usr/${CTARGET}/$(get_libdir)
 	else
 		echo /usr/$(get_libdir)
 	fi
 }
 
 setup_flags() {
-	# We need to do this or the build system will want to use ${CHOST_OPT}-gcc
-	export CC=$(tc-getCC)
+	# If the user wants to use -fomit-frame-pointer, let the build system
+	# determine when it's safe
+	is-flag -fomit-frame-pointer && EXTRA_ECONF="--enable-omitfp ${EXTRA_ECONF}"
 
 	# Over-zealous CFLAGS can often cause problems.  What may work for one
 	# person may not work for another.  To avoid a large influx of bugs
@@ -554,7 +639,7 @@ setup_flags() {
 	strip-unsupported-flags
 	filter-flags -m32 -m64 -mabi=*
 
-	has_multilib_profile && CHOST_OPT="$(get_abi_CHOST)"
+	has_multilib_profile && CTARGET_OPT=$(get_abi_CHOST)
 
 	case $(tc-arch) in
 		ppc)
@@ -566,22 +651,21 @@ setup_flags() {
 			append-flags "-fcall-used-g6"
 			filter-flags "-mvis"
 
-			# Sparc64 Only support...
-			if has_multilib_profile || [ "${PROFILE_ARCH}" = "sparc64" ]; then
+			if is_crosscompile || [[ ${PROFILE_ARCH} == "sparc64" ]] || { has_multilib_profile && ! tc-is-cross-compiler; } ; then
 				case ${ABI} in
-					default|sparc)
+					default|sparc32)
 						if is-flag "-mcpu=ultrasparc3"; then
-							CHOST_OPT="sparcv9b-unknown-linux-gnu"
+							CTARGET_OPT="sparcv9b-unknown-linux-gnu"
 						else
-							CHOST_OPT="sparcv9-unknown-linux-gnu"
+							CTARGET_OPT="sparcv9-unknown-linux-gnu"
 						fi
 					;;
 					sparc64)
 						if is-flag "-mcpu=ultrasparc3"; then
-							CHOST_OPT="sparc64b-unknown-linux-gnu"
+							CTARGET_OPT="sparc64b-unknown-linux-gnu"
 							CFLAGS_sparc64="$(get_abi_CFLAGS) -Wa,-xarch=v9b"
 						else
-							CHOST_OPT="sparc64-unknown-linux-gnu"
+							CTARGET_OPT="sparc64-unknown-linux-gnu"
 							CFLAGS_sparc64="$(get_abi_CFLAGS) -Wa,-xarch=v9a"
 						fi
 
@@ -590,29 +674,28 @@ setup_flags() {
 				esac
 			else
 				if is-flag "-mcpu=ultrasparc3"; then
-					CHOST_OPT="sparcv9b-unknown-linux-gnu"
-				elif { tc-is-cross-compiler && use nptl; } || is-flag "-mcpu=ultrasparc2" || is-flag "-mcpu=ultrasparc"; then
-					CHOST_OPT="sparcv9-unknown-linux-gnu"
+					CTARGET_OPT="sparcv9b-unknown-linux-gnu"
+				elif { is_crosscompile && want_nptl; } || is-flag "-mcpu=ultrasparc2" || is-flag "-mcpu=ultrasparc"; then
+					CTARGET_OPT="sparcv9-unknown-linux-gnu"
 				fi
 			fi
 		;;
 	esac
 
-	if [[ -n "${CHOST_OPT}" ]] && ! tc-is-cross-compiler; then
-		CBUILD_OPT=${CHOST_OPT}
+	if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then
+		CBUILD_OPT=${CTARGET_OPT}
 	fi
 
-	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]; then
+	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ] ; then
 		# broken in 3.4.x
 		replace-flags -march=pentium-m -mtune=pentium3
 	fi
 
-	if $(tc-getCC) -v 2>&1 | grep -q 'gcc version 3.[0123]'; then
+	if $(tc-getCC ${CTARGET}) -v 2>&1 | grep -q 'gcc version 3.[0123]'; then
 		append-flags -finline-limit=2000
 	fi
 
 	# We don't want these flags for glibc
-	filter-flags -fomit-frame-pointer -malign-double
 	filter-ldflags -pie
 
 	# Lock glibc at -O2 -- linuxthreads needs it and we want to be
@@ -623,13 +706,13 @@ setup_flags() {
 check_kheader_version() {
 	local header="${ROOT}$(alt_headers)/linux/version.h"
 
-	[ -z "$1" ] && return 1
+	[[ -z $1 ]] && return 1
 
-	if [ -f "${header}" ]; then
+	if [ -f "${header}" ] ; then
 		local version="`grep 'LINUX_VERSION_CODE' ${header} | \
 			sed -e 's:^.*LINUX_VERSION_CODE[[:space:]]*::'`"
 
-		if [ "${version}" -ge "$1" ]; then
+		if [ "${version}" -ge "$1" ] ; then
 			return 0
 		fi
 	fi
@@ -643,7 +726,7 @@ check_nptl_support() {
 	echo
 
 	einfon "Checking gcc for __thread support ... "
-	if ! $(tc-getCC) -c ${FILESDIR}/test-__thread.c -o ${T}/test2.o &> /dev/null; then
+	if ! $(tc-getCC ${CTARGET}) -c ${FILESDIR}/test-__thread.c -o ${T}/test2.o &> /dev/null; then
 		echo "no"
 		echo
 		eerror "Could not find a gcc that supports the __thread directive!"
@@ -655,7 +738,7 @@ check_nptl_support() {
 
 	# Building fails on an non-supporting kernel
 	einfon "Checking kernel version (>=${NPTL_KERNEL_VERSION}) ... "
-	if [ "`get_KV`" -lt "${min_kernel_version}" ]; then
+	if [ "`get_KV`" -lt "${min_kernel_version}" ] ; then
 		echo "no"
 		echo
 		eerror "You need a kernel of at least version ${NPTL_KERNEL_VERSION}"
@@ -680,34 +763,50 @@ check_nptl_support() {
 	echo
 }
 
-
 want_nptl() {
-	if use nptl || use nptlonly ; then
-		# Archs that can use NPTL
-		case $(tc-arch) in
-			amd64|ia64|ppc|ppc64|s390|sparc)
-				return 0;
-			;;
-			x86)
-				case "${CHOST/-*}" in
-					i486|i586|i686)	return 0 ;;
-				esac
-			;;
-		esac
-	fi
+	want_tls || return 1
+	use nptl || return 1
+
+	# Archs that can use NPTL
+	case $(tc-arch) in
+		alpha|amd64|ia64|ppc|ppc64|s390|x86)
+			return 0;
+		;;
+		sparc)
+			# >= v9 is needed for nptl.
+			[[ "${PROFILE_ARCH}" == "sparc" ]] && return 1
+			return 0;
+		;;
+	esac
 
 	return 1
 }
 
+want_linuxthreads() {
+	! use nptlonly && return 0
+	want_nptl || return 0
+	return 1
+}
 
 want_tls() {
 	# Archs that can use TLS (Thread Local Storage)
 	case $(tc-arch) in
-		alpha|amd64|ia64|ppc|ppc64|s390|sparc)
+		alpha|amd64|ia64|ppc|ppc64|s390)
 			return 0;
 		;;
+		sparc)
+			case ${CTARGET/-*} in
+				sparc64*)
+					[[ ${ABI} == "sparc32" ]] && return 0
+					return 1
+				;;
+				*)
+					return 0
+				;;
+			esac
+		;;
 		x86)
-			case "${CHOST/-*}" in
+			case ${CTARGET/-*} in
 				i486|i586|i686)	return 0 ;;
 			esac
 		;;
@@ -718,7 +817,7 @@ want_tls() {
 
 install_locales() {
 	unset LANGUAGE LANG LC_ALL
-	cd ${WORKDIR}/${MYMAINBUILDDIR} || die "${WORKDIR}/${MYMAINBUILDDIR}"
+	cd "${WORKDIR}"/${MYMAINBUILDDIR} || die "${WORKDIR}/${MYMAINBUILDDIR}"
 	make PARALLELMFLAGS="${MAKEOPTS} -j1" \
 		install_root=${D} localedata/install-locales || die
 }
@@ -727,14 +826,14 @@ setup_locales() {
 	if use !userlocales ; then
 		einfo "userlocales not enabled, installing -ALL- locales..."
 		install_locales || die
-	elif [ -e /etc/locales.build ]; then
+	elif [ -e /etc/locales.build ] ; then
 		einfo "Installing locales in /etc/locales.build..."
 		echo 'SUPPORTED-LOCALES=\' > SUPPORTED.locales
 		cat /etc/locales.build | grep -v -e ^$ -e ^\# | sed 's/$/\ \\/g' \
 			>> SUPPORTED.locales
 		cat SUPPORTED.locales > ${S}/localedata/SUPPORTED || die
 		install_locales || die
-	elif [ -e ${FILESDIR}/locales.build ]; then
+	elif [ -e ${FILESDIR}/locales.build ] ; then
 		einfo "Installing locales in ${FILESDIR}/locales.build..."
 		echo 'SUPPORTED-LOCALES=\' > SUPPORTED.locales
 		cat ${FILESDIR}/locales.build | grep -v -e ^$ -e ^\# | sed 's/$/\ \\/g' \
@@ -760,7 +859,7 @@ glibc_do_configure() {
 
 	# set addons
 	pushd ${S} > /dev/null
-	ADDONS=$(echo */configure | sed -e 's!/configure!!g;s!\(linuxthreads\|nptl\|rtkaio\)\( \|$\)!!g;s! \+$!!;s! !,!g;s!^!,!;/^,\*$/d')
+	ADDONS=$(echo */configure | sed -e 's!/configure!!g;s!\(linuxthreads\|nptl\|rtkaio\|glibc-compat\)\( \|$\)!!g;s! \+$!!;s! !,!g;s!^!,!;/^,\*$/d')
 	popd > /dev/null
 
 	use nls || myconf="${myconf} --disable-nls"
@@ -779,22 +878,32 @@ glibc_do_configure() {
 		die "invalid pthread option"
 	fi
 
-	myconf="${myconf} --without-cvs
-			--enable-bind-now
-			--build=${CBUILD_OPT:-${CBUILD}}
-			--host=${CHOST_OPT:-${CHOST}}
-			--disable-profile
-			--without-gd
-			--with-headers=$(alt_headers)
-			--prefix=$(alt_prefix)
-			--mandir=$(alt_prefix)/share/man
-			--infodir=$(alt_prefix)/share/info
-			--libexecdir=$(alt_prefix)/libexec/glibc"
-
-	GBUILDDIR="${WORKDIR}/build-${ABI}-${CHOST}-$1"
+	if ! use build && use selinux ; then
+		myconf="${myconf} --with-selinux"
+	else
+		myconf="${myconf} --without-selinux"
+	fi
+
+	myconf="${myconf}
+		--without-cvs
+		--enable-bind-now
+		--build=${CBUILD_OPT:-${CBUILD}}
+		--host=${CTARGET_OPT:-${CTARGET}}
+		--disable-profile
+		--without-gd
+		--with-headers=${ROOT}$(alt_headers)
+		--prefix=$(alt_prefix)
+		--mandir=$(alt_prefix)/share/man
+		--infodir=$(alt_prefix)/share/info
+		--libexecdir=$(alt_prefix)/lib/misc/glibc
+		${EXTRA_ECONF}"
+
+	export CC="$(tc-getCC ${CTARGET})"
+
+	GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-$1
 	mkdir -p ${GBUILDDIR}
 	cd ${GBUILDDIR}
-	einfo "Configuring GLIBC for $1 with: ${myconf}"
+	einfo "Configuring GLIBC for $1 with: ${myconf// /\n\t\t}"
 	${S}/configure ${myconf} || die "failed to configure glibc"
 }
 
@@ -812,7 +921,8 @@ fix_lib64_symlinks() {
 		rm ${ROOT}/lib64
 		# now that lib64 is gone, nothing will run without calling ld.so
 		# directly. luckily the window of brokenness is almost non-existant
-		/lib/ld-linux-x86-64.so.2 /bin/mv ${ROOT}/lib ${ROOT}/lib64
+		use amd64 && /lib/ld-linux-x86-64.so.2 /bin/mv ${ROOT}/lib ${ROOT}/lib64
+		use ppc64 && /lib/ld64.so.1 /bin/mv ${ROOT}/lib ${ROOT}/lib64
 		# all better :)
 		ldconfig
 		ln -s lib64 ${ROOT}/lib
@@ -836,124 +946,95 @@ fix_lib64_symlinks() {
 }
 
 use_multilib() {
-	case $(tc-arch) in
-		sparc)
-			case ${CHOST} in
-				sparc64*)
-					tc-is-cross-compiler || has_multilib_profile || use multilib
-					;;
-				*)
-					false
-					;;
-			esac
-		;;
-		mips)
-			case ${CHOST} in
-				mips64*)
-					tc-is-cross-compiler || has_multilib_profile || use multilib
-					;;
-				*)
-					false
-					;;
-			esac
-		;;
-		amd64|ppc64)
-			tc-is-cross-compiler || has_multilib_profile || use multilib
-		;;
-		*)
-			false
-		;;
+	case ${CTARGET} in
+		sparc64*|mips64*|amd64|ppc64)
+			is_crosscompile || has_multilib_profile || use multilib ;;
+		*)  false ;;
 	esac
 }
 
 # Setup toolchain variables that would be defined in the profiles for these archs.
 crosscompile_setup() {
-	if tc-is-cross-compiler; then
-		local VAR="CFLAGS_"${CHOST//-/_}
-		local VAL=${!VAR}
-
-		if [[ -n "${VAL}" ]]; then
-			CFLAGS="${VAL}"
-		fi
-
-		if use_multilib; then
-			[[ -z "${MULTILIB_CROSSCOMPILE}" ]] && die "Crosscompiling for ${CTARGET} is nut supported by the glibc ebuild yet.  Please contact eradicator if you want to help testing/development."
-			case $(tc-arch) in
-				amd64)
-					export CFLAGS_x86="${CFLAGS_x86--m32}"
-					export CHOST_x86="i686-pc-linux-gnu"
-					export CDEFINE_x86="__i386__"
-					export LIBDIR_x86="lib"
-
-					export CFLAGS_amd64="${CFLAGS_amd64--m64}"
-					export CHOST_amd64="x86_64-pc-linux-gnu"
-					export CDEFINE_amd64="__x86_64__"
-					export LIBDIR_amd64="lib64"
-
-					export MULTILIB_ABIS="x86 amd64"
-					export DEFAULT_ABI="amd64"
-				;;
-				mips)
-					export CFLAGS_o32="${CFLAGS_o32--mabi=32}"
-					export CHOST_o32="mips-unknown-linux-gnu"
-					export CDEFINE_o32="_ABIO32"
-					export LIBDIR_o32="lib"
-
-					export CFLAGS_n32="${CFLAGS_n32--mabi=n32}"
-					export CHOST_n32="mips64-unknown-linux-gnu"
-					export CDEFINE_n32="_ABIN32"
-					export LIBDIR_n32="lib32"
-
-					export CFLAGS_n64="${CFLAGS_n64--mabi=64}"
-					export CHOST_n64="mips64-unknown-linux-gnu"
-					export CDEFINE_n64="_ABI64"
-					export LIBDIR_n64="lib64"
-
-					export MULTILIB_ABIS="n64 n32 o32"
-					export DEFAULT_ABI="o32"
-				;;
-				ppc64)
-					export CFLAGS_ppc="${CFLAGS_ppc--m32}"
-					export CHOST_ppc="powerpc-unknown-linux-gnu"
-					export CDEFINE_ppc=""
-					export LIBDIR_ppc="lib"
-
-					export CFLAGS_ppc64="${CFLAGS_ppc64--m64}"
-					export CHOST_ppc64="powerpc64-unknown-linux-gnu"
-					export CDEFINE_ppc64=""
-					export LIBDIR_ppc64="lib64"
-
-					export MULTILIB_ABIS="ppc ppc64"
-					export DEFAULT_ABI="ppc64"
+	if is_crosscompile || tc-is-cross-compiler; then
+		# CFLAGS are used by ${CTARGET}-gcc
+		local VAR="CFLAGS_"${CTARGET//-/_}
+		CFLAGS=${!VAR-"-O2"}
+
+		case ${CTARGET} in
+			x86_64*)
+				export CFLAGS_x86=${CFLAGS_x86--m32}
+				export CHOST_x86=${CTARGET/x86_64/i686}
+				export CDEFINE_x86="__i386__"
+				export LIBDIR_x86="lib"
+
+				export CFLAGS_amd64=${CFLAGS_amd64--m64}
+				export CHOST_amd64=${CTARGET}
+				export CDEFINE_amd64="__x86_64__"
+				export LIBDIR_amd64="lib64"
+
+				export MULTILIB_ABIS="amd64"
+				export DEFAULT_ABI="amd64"
+			;;
+			mips64*)
+				export CFLAGS_o32=${CFLAGS_o32--mabi=32}
+				export CHOST_o32=${CTARGET/mips64/mips}
+				export CDEFINE_o32="_ABIO32"
+				export LIBDIR_o32="lib"
+
+				export CFLAGS_n32=${CFLAGS_n32--mabi=n32}
+				export CHOST_n32=${CTARGET}
+				export CDEFINE_n32="_ABIN32"
+				export LIBDIR_n32="lib32"
+
+				export CFLAGS_n64=${CFLAGS_n64--mabi=64}
+				export CHOST_n64=${CTARGET}
+				export CDEFINE_n64="_ABI64"
+				export LIBDIR_n64="lib64"
+
+				export MULTILIB_ABIS="n64 n32"
+				export DEFAULT_ABI="n32"
+			;;
+			powerpc64*)
+				export CFLAGS_ppc=${CFLAGS_ppc--m32}
+				export CHOST_ppc=${CTARGET/powerpc64/powerpc}
+				export CDEFINE_ppc="!__powerpc64__"
+				export LIBDIR_ppc="lib"
+
+				export CFLAGS_ppc64=${CFLAGS_ppc64--m64}
+				export CHOST_ppc64=${CTARGET}
+				export CDEFINE_ppc64="__powerpc64__"
+				export LIBDIR_ppc64="lib64"
+
+				export MULTILIB_ABIS="ppc64"
+				export DEFAULT_ABI="ppc64"
+			;;
+			sparc64*)
+				export CFLAGS_sparc32=${CFLAGS_sparc--m32}
+				export CHOST_sparc32=${CTARGET/sparc64/sparc}
+				export CDEFINE_sparc32="!__arch64__"
+				export LIBDIR_sparc32="lib"
+
+				export CFLAGS_sparc64=${CFLAGS_sparc64--m64}
+				export CHOST_sparc64=${CTARGET}
+				export CDEFINE_sparc64="__arch64__"
+				export LIBDIR_sparc64="lib64"
+
+				export MULTILIB_ABIS="sparc64"
+				export DEFAULT_ABI="sparc64"
+			;;
+			*)
+				export MULTILIB_ABIS="default"
+				export DEFAULT_ABI="default"
+		esac
 
-					die "ppc64 crosscompile not yet supported.  Bug a ppc64 dev to fill in the CDEFINE values in the glibc ebuild."
-				;;
-				sparc)
-					export CFLAGS_sparc="${CFLAGS_sparc--m32}"
-					export CHOST_sparc="sparc-unknown-linux-gnu"
-					export CDEFINE_sparc="!__arch64__"
-					export LIBDIR_sparc="lib"
-
-					export CFLAGS_sparc64="${CFLAGS_sparc64--m64}"
-					export CHOST_sparc64="sparc64-unknown-linux-gnu"
-					export CDEFINE_sparc64="__arch64__"
-					export LIBDIR_sparc64="lib64"
-
-					export MULTILIB_ABIS="sparc64 sparc"
-					export DEFAULT_ABI="sparc"
-				;;
-			esac
-		else
-			export MULTILIB_ABIS="default"
-			export DEFAULT_ABI="default"
-		fi
+		ABI=${DEFAULT_ABI}
 	fi
 }
 
 ### /ECLASS PUNTAGE ###
 
-if tc-is-cross-compiler; then
-	SLOT="${CHOST}-2.2"
+if is_crosscompile ; then
+	SLOT="${CTARGET}-2.2"
 else
 	SLOT="2.2"
 fi
@@ -968,53 +1049,54 @@ RESTRICT="nostrip multilib-pkg-force"
 #
 # The gcc-config dep is for the cross-compile multilib stuff
 DEPEND=">=sys-devel/gcc-3.2.3-r1
-	nptl? ( >=sys-devel/gcc-3.3.1-r1
-	        || ( >=sys-kernel/linux-headers-2.6.5 >=sys-kernel/linux26-headers-2.6.5 ) )
+	nptl? ( >=sys-devel/gcc-3.3.1-r1 >=sys-kernel/linux-headers-2.6.5 )
 	>=sys-devel/binutils-2.14.90.0.6-r1
 	>=sys-devel/gcc-config-1.3.9
 	virtual/os-headers
-	nls? ( sys-devel/gettext )"
-
-if [[ ${CATEGORY/cross-} != ${CATEGORY} ]]; then
-	DEPEND="${DEPEND}
-	        >=${CATEGORY}/gcc-3.3.5-r1"
-
-# Set this if mips converts mips-headers to kernel-2.eclass rather than using
-# linux-headers.
-#	if [[ ${CATEGORY/mips} != ${CATEGORY} ]]; then
-#		DEPEND="${DEPEND}
-#		        || ( >=${CATEGORY}/mips-headers-2.6.8.1 )"
-#	else
-		DEPEND="${DEPEND}
-		        >=${CATEGORY}/linux-headers-2.6.8"
-#	fi
-fi
-
+	nls? ( sys-devel/gettext )
+	selinux? ( !build? ( sys-libs/libselinux ) )"
 RDEPEND="virtual/os-headers
-	sys-apps/baselayout
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+	selinux? ( !build? ( sys-libs/libselinux ) )"
+
+if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+	DEPEND="${DEPEND} ${CATEGORY}/gcc"
+
+	if [[ ${CATEGORY} == *-linux* ]] ; then
+		if [[ ${CATEGORY/mips} != ${CATEGORY} ]] ; then
+			DEPEND="${DEPEND} >=${CATEGORY}/mips-headers-2.6.10"
+		else
+			DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
+		fi
+	fi
+
+	case ${CTARGET} in
+		x86_64-pc-linux-gnu)
+			[[ ${CHOST/-*/} == "i686" ]] || RDEPEND="${RDEPEND} cross-i686-pc-linux-gnu/${PN}"
+		;;
+		sparc64-unknown-linux-gnu)
+			[[ ${CHOST/-*/} == "sparc" ]] || RDEPEND="${RDEPEND} cross-sparc-unknown-linux-gnu/${PN}"
+		;;
+		powerpc64-unknown-linux-gnu)
+			[[ ${CHOST/-*/} == "powerpc" ]] || RDEPEND="${RDEPEND} cross-powerpc-unknown-linux-gnu/${PN}"
+		;;
+		mips64-unknown-linux-gnu)
+			[[ ${CHOST/-*/} == "mips" ]] || RDEPEND="${RDEPEND} cross-mips-unknown-linux-gnu/${PN}"
+		;;
+	esac
+fi
 
 # until amd64's 2004.3 is purged out of existence
-PDEPEND="amd64? ( multilib? ( >=app-emulation/emul-linux-x86-glibc-2.3.4 ) )"
+PDEPEND="amd64? ( multilib? ( ~app-emulation/emul-linux-x86-glibc-2.3.4.20041102 ) )"
 
 pkg_setup() {
-	if use nptlonly && use !nptl ; then
+	if use nptlonly && ! use nptl ; then
 		eerror "If you want nptlonly, add nptl to your USE too ;p"
 		die "nptlonly without nptl"
 	fi
 
-	if tc-is-cross-compiler && ! has_version "${CATEGORY}/${PN}"; then
-		ewarn "This is your first install of ${CATEGORY}/${PN}, so we"
-		ewarn "must disable some configure checks to get glibc to compile.  You should"
-		ewarn "re-emerge ${CATEGORY}/${PN} after this one installs to"
-		ewarn "be safe.  Additionally, you must use -nptl for the first emerge."
-		want_nptl && die "You need to use -nptl when emerging a crosscompiled glibc for the first time"
-		ebeep
-		epause 5
-	fi
-
 	# give some sort of warning about the nptl logic changes...
-	if want_nptl && use !nptlonly ; then
+	if want_nptl && want_linuxthreads ; then
 		ewarn "Warning! Gentoo's GLIBC with NPTL enabled now behaves like the"
 		ewarn "glibc from almost every other distribution out there. This means"
 		ewarn "that glibc is compiled -twice-, once with linuxthreads and once"
@@ -1022,6 +1104,7 @@ pkg_setup() {
 		ewarn "used by default. If you do not need nor want the linuxthreads"
 		ewarn "fallback, you can disable this behavior by adding nptlonly to"
 		ewarn "USE to save yourself some compile time."
+
 		ebeep
 		epause 5
 	fi
@@ -1052,7 +1135,7 @@ src_unpack() {
 			rm -f sysdeps/alpha/alphaev6/memcpy.S
 		;;
 		amd64)
-			if ! has_multilib_profile && ! tc-is-cross-compiler; then
+			if ! has_multilib_profile && ! is_crosscompile; then
 				# CONF_LIBDIR support
 				epatch ${FILESDIR}/2.3.4/glibc-gentoo-libdir.patch
 				sed -i -e "s:@GENTOO_LIBDIR@:$(get_libdir):g" ${S}/sysdeps/unix/sysv/linux/configure
@@ -1072,14 +1155,14 @@ src_unpack() {
 	# http://sources.redhat.com/ml/libc-alpha/2003-09/msg00100.html
 	# http://sourceware.org/ml/libc-alpha/2005-02/msg00042.html
 	echo 'int main(){}' > ${T}/gcc_eh_test.c
-	if ! $(tc-getCC) ${T}/gcc_eh_test.c -lgcc_eh 2>/dev/null ; then
+	if ! $(tc-getCC ${CTARGET}) ${T}/gcc_eh_test.c -lgcc_eh 2>/dev/null ; then
 		sed -i -e 's:-lgcc_eh::' Makeconfig || die "sed gcc_eh"
 	fi
 
 	# Some configure checks fail on the first emerge through because they
 	# try to link.  This doesn't work well if we don't have a libc yet.
 	# http://sourceware.org/ml/libc-alpha/2005-02/msg00042.html
-	if tc-is-cross-compiler && ! has_version "${CATEGORY}/${PN}"; then
+	if is_crosscompile && use build; then
 		rm ${S}/sysdeps/sparc/sparc64/elf/configure{,.in}
 		rm ${S}/nptl/sysdeps/pthread/configure{,.in}
 	fi
@@ -1094,20 +1177,22 @@ src_unpack() {
 src_compile() {
 	crosscompile_setup
 
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if has_multilib_profile && [ -z "${OABI}" -a "${MLTEST/set_abi}" = "${MLTEST}" ]; then
-		OABI="${ABI}"
-		for ABI in $(get_install_abis); do
-			export ABI
-			einfo "Compiling ${ABI} glibc"
-			src_compile
-		done
-		ABI="${OABI}"
-		unset OABI
-		return 0
+	if [[ -z ${OABI} ]] && has_multilib_profile ; then
+		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+		local MLTEST=$(type dyn_unpack)
+		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
+			OABI=${ABI}
+			einfo "Building multilib glibc for ABIs: $(get_install_abis)"
+			for ABI in $(get_install_abis) ; do
+				export ABI=${ABI}
+				src_compile
+			done
+			ABI=${OABI}
+			unset OABI
+			return 0
+		fi
+		unset MLTEST
 	fi
-	unset MLTEST
 
 	ABI=${ABI:-default}
 	toolchain-glibc_src_compile
@@ -1116,20 +1201,23 @@ src_compile() {
 src_test() {
 	crosscompile_setup
 
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if has_multilib_profile && [ -z "${OABI}" -a "${MLTEST/set_abi}" = "${MLTEST}" ]; then
-		OABI="${ABI}"
-		for ABI in $(get_install_abis); do
-			export ABI
-			einfo "Testing ${ABI} glibc"
-			src_test
-		done
-		ABI="${OABI}"
-		unset OABI
-		return 0
+	if [[ -z ${OABI} ]] && has_multilib_profile ; then
+		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+		local MLTEST=$(type dyn_unpack)
+		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
+			OABI=${ABI}
+			einfo "Testing multilib glibc for ABIs: $(get_install_abis)"
+			for ABI in $(get_install_abis) ; do
+				export ABI
+				einfo "   Testing ${ABI} glibc"
+				src_test
+			done
+			ABI=${OABI}
+			unset OABI
+			return 0
+		fi
+		unset MLTEST
 	fi
-	unset MLTEST
 
 	ABI=${ABI:-default}
 	toolchain-glibc_src_test
@@ -1138,58 +1226,69 @@ src_test() {
 src_install() {
 	crosscompile_setup
 
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if has_multilib_profile && [ -z "${OABI}" -a "${MLTEST/set_abi}" = "${MLTEST}" ]; then
-		OABI="${ABI}"
-		for ABI in $(get_install_abis); do
-			export ABI
-			einfo "Installing ${ABI} glibc"
-			src_install
-		done
-		ABI="${OABI}"
-		unset OABI
-		return 0
+	if [[ -z ${OABI} ]] && has_multilib_profile ; then
+		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+		local MLTEST=$(type dyn_unpack)
+		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
+			OABI=${ABI}
+			einfo "Installing multilib glibc for ABIs: $(get_install_abis)"
+			for ABI in $(get_install_abis) ; do
+				export ABI
+				src_install
+			done
+			ABI=${OABI}
+			unset OABI
+			return 0
+		fi
+		unset MLTEST
 	fi
-	unset MLTEST
 
 	ABI=${ABI:-default}
 
 	# Handle stupid lib32 BS
 	unset OLD_LIBDIR
-	if [[ "$(tc-arch)" = "amd64" && "${ABI}" = "x86" && "$(get_libdir)" != "lib" ]] && ! tc-is-cross-compiler; then
-		OLD_LIBDIR="$(get_libdir)"
-		LIBDIR_x86="lib"
+	if ! is_crosscompile ; then
+		if [[ $(tc-arch) == "amd64" && ${ABI} == "x86" && $(get_libdir) != "lib" ]] ; then
+			OLD_LIBDIR=$(get_libdir)
+			LIBDIR_x86="lib"
+		fi
+
+		if [[ $(tc-arch) == "ppc64" && ${ABI} == "ppc" && $(get_libdir) != "lib" ]] ; then
+			OLD_LIBDIR=$(get_libdir)
+			LIBDIR_ppc="lib"
+		fi
 	fi
 
 	toolchain-glibc_src_install
 
-	# Handle stupid lib32 BS on amd64
-	if [[ -n "${OLD_LIBDIR}" ]]; then
-		cd ${S}
-		LIBDIR_x86="${OLD_LIBDIR}"
+	# Handle stupid lib32 BS on amd64 and ppc64
+	if [[ -n ${OLD_LIBDIR} ]] ; then
+		cd "${S}"
+		[[ $(tc-arch) == "amd64" ]] && LIBDIR_x86=${OLD_LIBDIR}
+		[[ $(tc-arch) == "ppc64" ]] && LIBDIR_ppc=${OLD_LIBDIR}
 		unset OLD_LIBDIR
 
-		mv ${D}/lib ${D}/$(get_libdir)
-		mv ${D}/usr/lib ${D}/usr/$(get_libdir)
+		mv "${D}"/lib "${D}"/$(get_libdir)
+		mv "${D}"/usr/lib "${D}"/usr/$(get_libdir)
 		dodir /lib
 		dodir /usr/lib
-		mv ${D}/usr/$(get_libdir)/locale ${D}/usr/lib
-		dosym ../$(get_libdir)/ld-linux.so.2 /lib/ld-linux.so.2
-
-		for f in ${D}/usr/$(get_libdir)/*.so; do
-			local basef=$(basename ${f})
-			if [ -L ${f} ]; then
-				local target=$(readlink ${f})
+		mv "${D}"/usr/$(get_libdir)/locale "${D}"/usr/lib
+		[[ $(tc-arch) == "amd64" ]] && dosym ../$(get_libdir)/ld-linux.so.2 /lib/ld-linux.so.2
+		[[ $(tc-arch) == "ppc64" ]] && dosym ../$(get_libdir)/ld.so.1 /lib/ld.so.1
+
+		for f in "${D}"/usr/$(get_libdir)/*.so; do
+			local basef=$(basename "${f}")
+			if [[ -L ${f} ]] ; then
+				local target=$(readlink "${f}")
 				target=${target/\/lib\//\/$(get_libdir)\/}
-				rm ${f}
-				dosym ${target} /usr/$(get_libdir)/${basef}
+				rm "${f}"
+				dosym "${target}" /usr/$(get_libdir)/"${basef}"
 			fi
 		done
 
 		dosed "s:/lib/:/$(get_libdir)/:g" /usr/$(get_libdir)/lib{c,pthread}.so
 
-		if use nptl && use !nptlonly; then
+		if want_nptl && want_linuxthreads ; then
 			dosed  "s:/lib/:/$(get_libdir)/:g" /usr/$(get_libdir)/nptl/lib{c,pthread}.so
 		fi
 	fi
diff --git a/sys-libs/glibc/glibc-2.3.5-r1.ebuild b/sys-libs/glibc/glibc-2.3.5-r1.ebuild
index 5add89ef7313..91a9b7c65dae 100644
--- a/sys-libs/glibc/glibc-2.3.5-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.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/sys-libs/glibc/glibc-2.3.5-r1.ebuild,v 1.1 2005/07/15 20:54:27 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r1.ebuild,v 1.1.1.1 2005/11/30 09:39:21 chriswhite Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -16,7 +16,7 @@
 #  CHOST = CTARGET  - install into /
 #  CHOST != CTARGET - install into /usr/CTARGET/
 
-KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="-* amd64 arm -hppa ~ia64 m68k ~mips ~ppc ~ppc64 ~s390 sh ~sparc x86"
 
 BRANCH_UPDATE=""
 
@@ -24,22 +24,22 @@ BRANCH_UPDATE=""
 GLIBC_MANPAGE_VERSION="2.3.5"
 
 # From manual
-GLIBC_INFOPAGE_VERSION="2.3.4-r1"
+GLIBC_INFOPAGE_VERSION="2.3.5"
 
 # Gentoo patchset
-PATCH_VER="1.5"
+PATCH_VER="1.13"
 
 # C Stubbs addon (contained in fedora, so ignoring)
 #CSTUBS_VER="2.1.2"
 #CSTUBS_TARBALL="c_stubs-${CSTUBS_VER}.tar.bz2"
-#CSTUBS_URI="http://dev.gentoo.org/~eradicator/glibc/${CSTUBS_TARBALL}"
+#CSTUBS_URI="mirror://gentoo/${CSTUBS_TARBALL}"
 
 # Fedora addons (from RHEL's glibc-2.3.4-2.src.rpm)
 FEDORA_VER="20041219T2331"
 FEDORA_TARBALL="glibc-fedora-${FEDORA_VER}.tar.bz2"
-FEDORA_URI="http://dev.gentoo.org/~eradicator/glibc/${FEDORA_TARBALL}"
+FEDORA_URI="mirror://gentoo/${FEDORA_TARBALL}"
 
-GENTOO_TOOLCHAIN_BASE_URI="http://dev.gentoo.org/~eradicator/glibc"
+GENTOO_TOOLCHAIN_BASE_URI="mirror://gentoo"
 
 ### PUNT OUT TO ECLASS?? ###
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
@@ -48,7 +48,7 @@ DESCRIPTION="GNU libc6 (also called glibc2) C library"
 HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
 LICENSE="LGPL-2"
 
-IUSE="nls pic build nptl nptlonly erandom hardened userlocales multilib selinux glibc-compat20 glibc-omitfp profile"
+IUSE="nls pic build nptl nptlonly erandom hardened userlocales multilib selinux glibc-compat20 glibc-omitfp linuxthreads-tls profile"
 
 export CBUILD=${CBUILD:-${CHOST}}
 export CTARGET=${CTARGET:-${CHOST}}
@@ -118,7 +118,7 @@ get_glibc_src_uri() {
 	# This variable should be set to the devspace of whoever is currently
 	# maintaining GLIBC. Please dont set this to mirror, that would just
 	# make the files unavailable until they get mirrored.
-	local devspace_uri="http://dev.gentoo.org/~eradicator/glibc/"
+	local devspace_uri="mirror://gentoo/"
 	GENTOO_TOOLCHAIN_BASE_URI=${GENTOO_TOOLCHAIN_BASE_URI:-${devspace_uri}}
 
 #	GLIBC_SRC_URI="http://ftp.gnu.org/gnu/glibc/${PN}-${GLIBC_RELEASE_VER}.tar.bz2
@@ -160,7 +160,7 @@ get_glibc_src_uri() {
 }
 
 SRC_URI=$(get_glibc_src_uri)
-S="${WORKDIR}/${PN}-${GLIBC_RELEASE_VER}"
+S=${WORKDIR}/${PN}-${GLIBC_RELEASE_VER}
 
 ### EXPORTED FUNCTIONS ###
 toolchain-glibc_src_unpack() {
@@ -185,11 +185,8 @@ toolchain-glibc_src_unpack() {
 	# infopages else it does not help much (mtimes change if there is a change
 	# to them with branchupdate)
 	if [[ -n ${BRANCH_UPDATE} ]] ; then
-		cd "${WORKDIR}"
-		unpack ${PN}-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
-
 		cd "${S}"
-		epatch "${WORKDIR}"/${PN}-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch
+		epatch "${DISTDIR}"/${PN}-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
 
 		# Snapshot date patch
 		einfo "Patching version to display snapshot date ..."
@@ -218,19 +215,26 @@ toolchain-glibc_src_unpack() {
 
 toolchain-glibc_src_compile() {
 	# Set gconvdir to /usr/$(get_libdir)/gconv on archs with multiple ABIs
+	local MAKEFLAGS=""
 	has_multilib_profile && MAKEFLAGS="gconvdir=$(alt_usrlibdir)/gconv"
 
+	echo
+	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CFLAGS ; do
+		einfo " $(printf '%15s' ${v}:)   ${!v}"
+	done
+	echo
+
 	if want_linuxthreads ; then
 		glibc_do_configure linuxthreads
 		einfo "Building GLIBC with linuxthreads..."
-		make PARALLELMFLAGS="${MAKEOPTS}" ${MAKEFLAGS} || die
+		make PARALLELMFLAGS="${MAKEOPTS} -j1" ${MAKEFLAGS} || die
 	fi
 	if want_nptl ; then
 		# ... and then do the optional nptl build
-		unset LD_ASSUME_KERNEL || :
+		unset LD_ASSUME_KERNEL
 		glibc_do_configure nptl
 		einfo "Building GLIBC with NPTL..."
-		make PARALLELMFLAGS="${MAKEOPTS}" ${MAKEFLAGS} || die
+		make PARALLELMFLAGS="${MAKEOPTS} -j1" ${MAKEFLAGS} || die
 	fi
 }
 
@@ -241,12 +245,12 @@ toolchain-glibc_src_test() {
 
 	# do the linuxthreads build unless we're using nptlonly
 	if want_linuxthreads ; then
-		cd ${WORKDIR}/build-${ABI}-${CTARGET}-linuxthreads
+		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads
 		einfo "Checking GLIBC with linuxthreads..."
 		make check || die "linuxthreads glibc did not pass make check"
 	fi
 	if want_nptl ; then
-		cd ${WORKDIR}/build-${ABI}-${CTARGET}-nptl
+		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl
 		unset LD_ASSUME_KERNEL || :
 		einfo "Checking GLIBC with NPTL..."
 		make check || die "nptl glibc did not pass make check"
@@ -278,8 +282,6 @@ toolchain-glibc_pkg_preinst() {
 }
 
 toolchain-glibc_src_install() {
-	setup_flags
-
 	# Need to dodir first because it might not exist (bad amd64 profiles)
 	dodir $(alt_usrlibdir)
 
@@ -288,16 +290,16 @@ toolchain-glibc_src_install() {
 	unset LANGUAGE LANG LC_ALL
 
 	if want_linuxthreads ; then
-		cd ${WORKDIR}/build-${ABI}-${CTARGET}-linuxthreads
-		einfo "Installing GLIBC with linuxthreads..."
+		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads
+		einfo "Installing GLIBC ${ABI} with linuxthreads ..."
 		make PARALLELMFLAGS="${MAKEOPTS} -j1" \
-			install_root=${D} \
+			install_root="${D}" \
 			install || die
 	else # nptlonly
-		cd ${WORKDIR}/build-${ABI}-${CTARGET}-nptl
-		einfo "Installing GLIBC with NPTL..."
+		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl
+		einfo "Installing GLIBC ${ABI} with NPTL ..."
 		make PARALLELMFLAGS="${MAKEOPTS} -j1" \
-			install_root=${D} \
+			install_root="${D}" \
 			install || die
 	fi
 
@@ -307,7 +309,7 @@ toolchain-glibc_src_install() {
 		# crosscompile.
 		if [[ $(get_libdir) != "lib" && -d ${D}$(alt_prefix)/lib ]] ; then
 			dodir $(alt_libdir)
-			mv ${D}$(alt_prefix)/lib/* ${D}$(alt_libdir)
+			mv "${D}"$(alt_prefix)/lib/* "${D}"$(alt_libdir)
 		fi
 
 		# punt all the junk not needed by a cross-compiler
@@ -316,58 +318,58 @@ toolchain-glibc_src_install() {
 
 	if want_linuxthreads && want_nptl ; then
 		einfo "Installing NPTL to $(alt_libdir)/tls/..."
-		cd ${WORKDIR}/build-${ABI}-${CTARGET}-nptl
-		mkdir -p ${D}$(alt_libdir)/tls/
+		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl
+		mkdir -p "${D}"$(alt_libdir)/tls/
 
-		libcsofile=$(basename ${D}$(alt_libdir)/libc-*.so)
-		cp -a libc.so ${D}$(alt_libdir)/tls/${libcsofile} || die
+		libcsofile=$(basename "${D}"$(alt_libdir)/libc-*.so)
+		cp -a libc.so "${D}"$(alt_libdir)/tls/${libcsofile} || die
 		dosym ${libcsofile} $(alt_libdir)/tls/$(ls libc.so.*)
 
-		libmsofile=$(basename ${D}$(alt_libdir)/libm-*.so)
+		libmsofile=$(basename "${D}"$(alt_libdir)/libm-*.so)
 		pushd math > /dev/null
-		cp -a libm.so ${D}$(alt_libdir)/tls/${libmsofile} || die
+		cp -a libm.so "${D}"$(alt_libdir)/tls/${libmsofile} || die
 		dosym ${libmsofile} $(alt_libdir)/tls/$(ls libm.so.*)
 		popd > /dev/null
 
-		librtsofile=$(basename ${D}$(alt_libdir)/librt-*.so)
+		librtsofile=$(basename "${D}"$(alt_libdir)/librt-*.so)
 		pushd rt > /dev/null
-		cp -a librt.so ${D}$(alt_libdir)/tls/${librtsofile} || die
+		cp -a librt.so "${D}"$(alt_libdir)/tls/${librtsofile} || die
 		dosym ${librtsofile} $(alt_libdir)/tls/$(ls librt.so.*)
 		popd > /dev/null
 
-		libthreaddbsofile=$(basename ${D}$(alt_libdir)/libthread_db-*.so)
+		libthreaddbsofile=$(basename "${D}"$(alt_libdir)/libthread_db-*.so)
 		pushd nptl_db > /dev/null
-		cp -a libthread_db.so ${D}$(alt_libdir)/tls/${libthreaddbsofile} || die
+		cp -a libthread_db.so "${D}"$(alt_libdir)/tls/${libthreaddbsofile} || die
 		dosym ${libthreaddbsofile} $(alt_libdir)/tls/$(ls libthread_db.so.*)
 		popd > /dev/null
 
 		libpthreadsofile=libpthread-${GLIBC_RELEASE_VER}.so
-		cp -a nptl/libpthread.so ${D}$(alt_libdir)/tls/${libpthreadsofile} || die
+		cp -a nptl/libpthread.so "${D}"$(alt_libdir)/tls/${libpthreadsofile} || die
 		dosym ${libpthreadsofile} $(alt_libdir)/tls/libpthread.so.0
 
 		# and now for the static libs
-		mkdir -p ${D}$(alt_usrlibdir)/nptl
+		mkdir -p "${D}"$(alt_usrlibdir)/nptl
 		cp -a libc.a nptl/libpthread.a nptl/libpthread_nonshared.a rt/librt.a \
-			${D}$(alt_usrlibdir)/nptl
+			"${D}"$(alt_usrlibdir)/nptl
 
 		# linker script crap
 		for lib in libc libpthread; do
 			sed -e "s:$(alt_libdir)/${lib}.so:$(alt_libdir)/tls/${lib}.so:g" \
 			    -e "s:$(alt_usrlibdir)/${lib}_nonshared.a:$(alt_usrlibdir)/nptl/${lib}_nonshared.a:g" \
-			          ${D}$(alt_usrlibdir)/${lib}.so \
-				> ${D}$(alt_usrlibdir)/nptl/${lib}.so
+			          "${D}"$(alt_usrlibdir)/${lib}.so \
+				> "${D}"$(alt_usrlibdir)/nptl/${lib}.so
 
-			chmod 755 ${D}$(alt_usrlibdir)/nptl/${lib}.so
+			chmod 755 "${D}"$(alt_usrlibdir)/nptl/${lib}.so
 		done
 
 		dosym ../librt.so $(alt_usrlibdir)/nptl/librt.so
 
 		# last but not least... headers.
-		mkdir -p ${D}/nptl ${D}$(alt_headers)/nptl
-		make install_root=${D}/nptl install-headers PARALLELMFLAGS="${MAKEOPTS} -j1"
-		pushd ${D}/nptl/$(alt_headers) > /dev/null
-		for i in `find . -type f`; do
-			if ! [ -f ${D}$(alt_headers)/$i ] \
+		mkdir -p "${D}"/nptl "${D}"$(alt_headers)/nptl
+		make install_root="${D}"/nptl install-headers PARALLELMFLAGS="${MAKEOPTS} -j1"
+		pushd "${D}"/nptl/$(alt_headers) > /dev/null
+		for i in $(find . -type f) ; do
+			if ! [[ -f ${D}$(alt_headers)/$i ]] \
 			   || ! cmp -s $i ${D}$(alt_headers)/$i; then
 				mkdir -p ${D}$(alt_headers)/nptl/`dirname $i`
 				cp -a $i ${D}$(alt_headers)/nptl/$i
@@ -377,12 +379,19 @@ toolchain-glibc_src_install() {
 		rm -rf ${D}/nptl
 	fi
 
-	# now, strip everything but the thread libs #46186
+	# Now, strip everything but the thread libs #46186, as well as the dynamic
+	# linker, else we cannot set breakpoints in shared libraries.
+	# Fix for ld-* by Lonnie Princehouse.
 	mkdir -p ${T}/thread-backup
-	mv -f ${D}$(alt_libdir)/lib{pthread,thread_db}* ${T}/thread-backup/
+	for x in ${D}$(alt_libdir)/lib{pthread,thread_db}* \
+	         ${D}$(alt_libdir)/ld-* ; do
+		[[ -f ${x} ]] && mv -f ${x} ${T}/thread-backup/
+	done
 	if want_linuxthreads && want_nptl ; then
 		mkdir -p ${T}/thread-backup/tls
-		mv -f ${D}$(alt_libdir)/tls/lib{pthread,thread_db}* ${T}/thread-backup/tls
+		for x in ${D}$(alt_libdir)/tls/lib{pthread,thread_db}* ; do
+			[[ -f ${x} ]] && mv -f ${x} ${T}/thread-backup/tls
+		done
 	fi
 	env -uRESTRICT CHOST=${CTARGET} prepallstrip
 	cp -a -- ${T}/thread-backup/* ${D}$(alt_libdir)/ || die
@@ -414,6 +423,7 @@ toolchain-glibc_src_install() {
 	# system headers correctly.  See gcc/doc/gccinstall.info
 	if is_crosscompile ; then
 		dosym include $(alt_prefix)/sys-include
+		dosym . $(alt_prefix)/usr
 		return 0
 	fi
 
@@ -425,7 +435,7 @@ toolchain-glibc_src_install() {
 	else
 		MYMAINBUILDDIR=build-${ABI}-${CTARGET}-nptl
 	fi
-	cd ${WORKDIR}/${MYMAINBUILDDIR}
+	cd "${WORKDIR}"/${MYMAINBUILDDIR}
 	if ! use build ; then
 		if ! has noinfo ${FEATURES} && [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then
 			einfo "Installing info pages..."
@@ -441,7 +451,7 @@ toolchain-glibc_src_install() {
 			einfo "Installing man pages..."
 
 			# Install linuxthreads man pages even if nptl is enabled
-			cd ${WORKDIR}/man
+			cd "${WORKDIR}"/man
 			doman *.3thr
 		fi
 
@@ -585,7 +595,7 @@ alt_prefix() {
 
 alt_libdir() {
 	if is_crosscompile ; then
-		echo /usr/${CTARGET}/lib
+		echo /usr/${CTARGET}/$(get_libdir)
 	else
 		echo /$(get_libdir)
 	fi
@@ -593,7 +603,7 @@ alt_libdir() {
 
 alt_usrlibdir() {
 	if is_crosscompile ; then
-		echo /usr/${CTARGET}/lib
+		echo /usr/${CTARGET}/$(get_libdir)
 	else
 		echo /usr/$(get_libdir)
 	fi
@@ -608,9 +618,12 @@ setup_flags() {
 	strip-unsupported-flags
 	filter-flags -m32 -m64 -mabi=*
 
-	has_multilib_profile && CTARGET_OPT="$(get_abi_CHOST)"
+	has_multilib_profile && CTARGET_OPT=$(get_abi_CHOST)
 
 	case $(tc-arch) in
+		amd64)
+			CFLAGS_x86="-m32"
+		;;
 		ppc)
 			append-flags "-freorder-blocks"
 		;;
@@ -655,11 +668,6 @@ setup_flags() {
 		CBUILD_OPT=${CTARGET_OPT}
 	fi
 
-	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ] ; then
-		# broken in 3.4.x
-		replace-flags -march=pentium-m -mtune=pentium3
-	fi
-
 	if $(tc-getCC ${CTARGET}) -v 2>&1 | grep -q 'gcc version 3.[0123]'; then
 		append-flags -finline-limit=2000
 	fi
@@ -669,6 +677,7 @@ setup_flags() {
 
 	# Lock glibc at -O2 -- linuxthreads needs it and we want to be
 	# conservative here
+	filter-flags -O?
 	append-flags -O2
 }
 
@@ -738,7 +747,7 @@ want_nptl() {
 
 	# Archs that can use NPTL
 	case $(tc-arch) in
-		amd64|ia64|ppc|ppc64|s390|x86)
+		alpha|amd64|ia64|mips|ppc|ppc64|s390|x86)
 			return 0;
 		;;
 		sparc)
@@ -760,7 +769,7 @@ want_linuxthreads() {
 want_tls() {
 	# Archs that can use TLS (Thread Local Storage)
 	case $(tc-arch) in
-		alpha|amd64|ia64|ppc|ppc64|s390)
+		alpha|amd64|ia64|mips|ppc|ppc64|s390)
 			return 0;
 		;;
 		sparc)
@@ -772,9 +781,8 @@ want_tls() {
 			esac
 		;;
 		x86)
-			case ${CTARGET/-*} in
-				i486|i586|i686)	return 0 ;;
-			esac
+			# requires i486 or better #106556
+			[[ ${CTARGET} == i[4567]86* ]] && return 0
 		;;
 	esac
 
@@ -797,7 +805,7 @@ want__thread() {
 
 install_locales() {
 	unset LANGUAGE LANG LC_ALL
-	cd ${WORKDIR}/${MYMAINBUILDDIR} || die "${WORKDIR}/${MYMAINBUILDDIR}"
+	cd "${WORKDIR}"/${MYMAINBUILDDIR} || die "${WORKDIR}/${MYMAINBUILDDIR}"
 	make PARALLELMFLAGS="${MAKEOPTS} -j1" \
 		install_root=${D} localedata/install-locales || die
 }
@@ -829,8 +837,6 @@ setup_locales() {
 glibc_do_configure() {
 	local myconf
 
-	setup_flags
-
 	# These should not be set, else the
 	# zoneinfo do not always get installed ...
 	unset LANGUAGE LANG LC_ALL
@@ -847,13 +853,14 @@ glibc_do_configure() {
 	use erandom || myconf="${myconf} --disable-dev-erandom"
 
 	use glibc-omitfp && myconf="${myconf} --enable-omitfp"
-	use profile && myconf="${myconf} --enable-profiling"
-	
+
+	[[ ${CTARGET} == *-softfloat-* ]] && myconf="${myconf} --without-fp"
+
 	if [ "$1" == "linuxthreads" ] ; then
-		if want_tls ; then
+		if want_tls && [[ ${CTARGET} != i[45]86-* ]] ; then
 			myconf="${myconf} --with-tls"
 
-			if want__thread && ! use glibc-compat20 ; then
+			if want__thread && use linuxthreads-tls ; then
 				myconf="${myconf} --with-__thread"
 			else
 				myconf="${myconf} --without-__thread"
@@ -872,8 +879,20 @@ glibc_do_configure() {
 		die "invalid pthread option"
 	fi
 
-	if ! use build && use selinux; then
-		myconf="${myconf} --with-selinux"
+	# Since SELinux support is only required for nscd, only enable it if:
+	# 1. USE selinux
+	# 2. ! USE build
+	# 3. only for the primary ABI on multilib systems
+	if use selinux && ! use build; then
+		if use multilib || has_multilib_profile; then
+			if is_final_abi; then
+				myconf="${myconf} --with-selinux"
+			else
+				myconf="${myconf} --without-selinux"
+			fi
+		else
+			myconf="${myconf} --with-selinux"
+		fi
 	else
 		myconf="${myconf} --without-selinux"
 	fi
@@ -883,9 +902,9 @@ glibc_do_configure() {
 		--enable-bind-now
 		--build=${CBUILD_OPT:-${CBUILD}}
 		--host=${CTARGET_OPT:-${CTARGET}}
-		--disable-profile
+		$(use_enable profile)
 		--without-gd
-		--with-headers=$(alt_headers)
+		--with-headers=${ROOT}$(alt_headers)
 		--prefix=$(alt_prefix)
 		--mandir=$(alt_prefix)/share/man
 		--infodir=$(alt_prefix)/share/info
@@ -894,10 +913,10 @@ glibc_do_configure() {
 
 	export CC="$(tc-getCC ${CTARGET})"
 
-	GBUILDDIR="${WORKDIR}/build-${ABI}-${CTARGET}-$1"
+	GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-$1
 	mkdir -p ${GBUILDDIR}
 	cd ${GBUILDDIR}
-	einfo "Configuring GLIBC for $1 with: ${myconf}"
+	einfo "Configuring GLIBC for $1 with: ${myconf// /\n\t\t}"
 	${S}/configure ${myconf} || die "failed to configure glibc"
 }
 
@@ -940,52 +959,27 @@ fix_lib64_symlinks() {
 }
 
 use_multilib() {
-	case $(tc-arch) in
-		sparc)
-			case ${CHOST} in
-				sparc64*)
-					is_crosscompile || has_multilib_profile || use multilib
-					;;
-				*)
-					false
-					;;
-			esac
-		;;
-		mips)
-			case ${CHOST} in
-				mips64*)
-					is_crosscompile || has_multilib_profile || use multilib
-					;;
-				*)
-					false
-					;;
-			esac
-		;;
-		amd64|ppc64)
-			is_crosscompile || has_multilib_profile || use multilib
-		;;
-		*)
-			false
-		;;
+	case ${CTARGET} in
+		sparc64*|mips64*|amd64|ppc64)
+			is_crosscompile || has_multilib_profile || use multilib ;;
+		*)  false ;;
 	esac
 }
 
 # Setup toolchain variables that would be defined in the profiles for these archs.
-crosscompile_setup() {
-	if is_crosscompile || tc-is-cross-compiler; then
-		# CFLAGS are used by ${CTARGET}-gcc
-		local VAR="CFLAGS_"${CTARGET//-/_}
-		CFLAGS=${!VAR-"-O2"}
+setup_env() {
+	setup_flags
 
+	if is_crosscompile || tc-is-cross-compiler ; then
 		case ${CTARGET} in
 			x86_64*)
-				export CFLAGS_x86="${CFLAGS_x86--m32}"
-				export CHOST_x86="i686-pc-linux-gnu"
+				export CFLAGS_x86=${CFLAGS_x86--m32}
+				export CHOST_x86=${CTARGET/x86_64/i686}
 				export CDEFINE_x86="__i386__"
 				export LIBDIR_x86="lib"
 
-				export CFLAGS_amd64="${CFLAGS_amd64--m64}"
-				export CHOST_amd64="x86_64-pc-linux-gnu"
+				export CFLAGS_amd64=${CFLAGS_amd64--m64}
+				export CHOST_amd64=${CTARGET}
 				export CDEFINE_amd64="__x86_64__"
 				export LIBDIR_amd64="lib64"
 
@@ -993,32 +987,32 @@ crosscompile_setup() {
 				export DEFAULT_ABI="amd64"
 			;;
 			mips64*)
-				export CFLAGS_o32="${CFLAGS_o32--mabi=32}"
-				export CHOST_o32="mips-unknown-linux-gnu"
-				export CDEFINE_o32="_ABIO32"
+				export CFLAGS_o32=${CFLAGS_o32--mabi=32}
+				export CHOST_o32=${CTARGET/mips64/mips}
+				export CDEFINE_o32="_MIPS_SIM == _ABIO32"
 				export LIBDIR_o32="lib"
 
-				export CFLAGS_n32="${CFLAGS_n32--mabi=n32}"
-				export CHOST_n32="mips64-unknown-linux-gnu"
-				export CDEFINE_n32="_ABIN32"
+				export CFLAGS_n32=${CFLAGS_n32--mabi=n32}
+				export CHOST_n32=${CTARGET}
+				export CDEFINE_n32="_MIPS_SIM == _ABIN32"
 				export LIBDIR_n32="lib32"
 
-				export CFLAGS_n64="${CFLAGS_n64--mabi=64}"
-				export CHOST_n64="mips64-unknown-linux-gnu"
-				export CDEFINE_n64="_ABI64"
+				export CFLAGS_n64=${CFLAGS_n64--mabi=64}
+				export CHOST_n64=${CTARGET}
+				export CDEFINE_n64="_MIPS_SIM == _ABI64"
 				export LIBDIR_n64="lib64"
 
 				export MULTILIB_ABIS="n64 n32"
 				export DEFAULT_ABI="n32"
 			;;
 			powerpc64*)
-				export CFLAGS_ppc="${CFLAGS_ppc--m32}"
-				export CHOST_ppc="powerpc-unknown-linux-gnu"
+				export CFLAGS_ppc=${CFLAGS_ppc--m32}
+				export CHOST_ppc=${CTARGET/powerpc64/powerpc}
 				export CDEFINE_ppc="!__powerpc64__"
 				export LIBDIR_ppc="lib"
 
-				export CFLAGS_ppc64="${CFLAGS_ppc64--m64}"
-				export CHOST_ppc64="powerpc64-unknown-linux-gnu"
+				export CFLAGS_ppc64=${CFLAGS_ppc64--m64}
+				export CHOST_ppc64=${CTARGET}
 				export CDEFINE_ppc64="__powerpc64__"
 				export LIBDIR_ppc64="lib64"
 
@@ -1026,13 +1020,13 @@ crosscompile_setup() {
 				export DEFAULT_ABI="ppc64"
 			;;
 			sparc64*)
-				export CFLAGS_sparc32="${CFLAGS_sparc--m32}"
-				export CHOST_sparc32="sparc-unknown-linux-gnu"
+				export CFLAGS_sparc32=${CFLAGS_sparc--m32}
+				export CHOST_sparc32=${CTARGET/sparc64/sparc}
 				export CDEFINE_sparc32="!__arch64__"
 				export LIBDIR_sparc32="lib"
 
-				export CFLAGS_sparc64="${CFLAGS_sparc64--m64}"
-				export CHOST_sparc64="sparc64-unknown-linux-gnu"
+				export CFLAGS_sparc64=${CFLAGS_sparc64--m64}
+				export CHOST_sparc64=${CTARGET}
 				export CDEFINE_sparc64="__arch64__"
 				export LIBDIR_sparc64="lib64"
 
@@ -1043,8 +1037,17 @@ crosscompile_setup() {
 				export MULTILIB_ABIS="default"
 				export DEFAULT_ABI="default"
 		esac
+	fi
 
-		ABI=${DEFAULT_ABI}
+	export ABI=${ABI:-${DEFAULT_ABI:-default}}
+
+	if is_crosscompile || tc-is-cross-compiler ; then
+		# We need to export CFLAGS with abi information in them because
+		# glibc's configure script checks CFLAGS for some targets (like mips)
+		local VAR=CFLAGS_${CTARGET//-/_}
+		export CFLAGS=${!VAR--O2}
+		VAR=CFLAGS_${ABI}
+		export CFLAGS="${CFLAGS} ${!VAR}"
 	fi
 }
 
@@ -1072,42 +1075,22 @@ DEPEND=">=sys-devel/gcc-3.2.3-r1
 	virtual/os-headers
 	nls? ( sys-devel/gettext )
 	selinux? ( !build? ( sys-libs/libselinux ) )"
-
 RDEPEND="virtual/os-headers
 	nls? ( sys-devel/gettext )
 	selinux? ( !build? ( sys-libs/libselinux ) )"
 
 if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-	DEPEND="${DEPEND}
-	        >=${CATEGORY}/gcc-3.3.5-r1"
+	DEPEND="${DEPEND} ${CATEGORY}/gcc"
 
-	if [[ ${CATEGORY/mips} != ${CATEGORY} ]] ; then
-		DEPEND="${DEPEND}
-		        >=${CATEGORY}/mips-headers-2.6.10"
-	else
-		DEPEND="${DEPEND}
-		        >=${CATEGORY}/linux-headers-2.6.8"
+	if [[ ${CATEGORY} == *-linux* ]] ; then
+		if [[ ${CATEGORY/mips} != ${CATEGORY} ]] ; then
+			DEPEND="${DEPEND} >=${CATEGORY}/mips-headers-2.6.10"
+		else
+			DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
+		fi
 	fi
-
-	case ${CTARGET} in
-		x86_64-pc-linux-gnu)
-			[[ ${CHOST/-*/} == "i686" ]] || RDEPEND="${RDEPEND} cross-i686-pc-linux-gnu/${PN}"
-		;;
-		sparc64-unknown-linux-gnu)
-			[[ ${CHOST/-*/} == "sparc" ]] || RDEPEND="${RDEPEND} cross-sparc-unknown-linux-gnu/${PN}"
-		;;
-		powerpc64-unknown-linux-gnu)
-			[[ ${CHOST/-*/} == "powerpc" ]] || RDEPEND="${RDEPEND} cross-powerpc-unknown-linux-gnu/${PN}"
-		;;
-		mips64-unknown-linux-gnu)
-			[[ ${CHOST/-*/} == "mips" ]] || RDEPEND="${RDEPEND} cross-mips-unknown-linux-gnu/${PN}"
-		;;
-	esac
 fi
 
-# until amd64's 2004.3 is purged out of existence
-PDEPEND="amd64? ( multilib? ( ~app-emulation/emul-linux-x86-glibc-${PV} ) )"
-
 pkg_setup() {
 	if use nptlonly && ! use nptl ; then
 		eerror "If you want nptlonly, add nptl to your USE too ;p"
@@ -1137,8 +1120,7 @@ pkg_setup() {
 }
 
 src_unpack() {
-	crosscompile_setup
-	export ABI="${DEFAULT_ABI}"
+	setup_env
 
 	case $(tc-arch) in
 		hppa)
@@ -1147,7 +1129,15 @@ src_unpack() {
 		;;
 		mips)
 			GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 3000-all-2.3.4-dl_execstack-PaX-support.patch"
-			use_multilib && GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 6680_mips_nolib3264.patch"
+			use_multilib \
+				&& GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 6680_mips_nolib3264.patch" \
+				|| GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 5005_all_enable-multilib-with-cross-compile.patch"
+		;;
+		amd64)
+			if ! has_multilib_profile && ! is_crosscompile ; then
+				# the gentoo-libdir patch hack conflicts with these
+				GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 5005_all_enable-multilib-with-cross-compile.patch"
+			fi
 		;;
 	esac
 
@@ -1200,113 +1190,119 @@ src_unpack() {
 		rm ${S}/nptl/sysdeps/pthread/configure{,.in}
 	fi
 
-	find . -type f -size 0 -o -name "*.orig" -exec rm -f {} \;
+	cd "${WORKDIR}"
+	find . -type f '(' -size 0 -o -name "*.orig" ')' -exec rm -f {} \;
 	find . -name configure -exec touch {} \;
 
 	# Fix permissions on some of the scripts
-	chmod u+x ${S}/scripts/*.sh
+	chmod u+x "${S}"/scripts/*.sh
 }
 
 src_compile() {
-	crosscompile_setup
-
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if has_multilib_profile && [ -z "${OABI}" -a "${MLTEST/set_abi}" = "${MLTEST}" ] ; then
-		OABI="${ABI}"
-		for ABI in $(get_install_abis); do
-			export ABI
-			einfo "Compiling ${ABI} glibc"
-			src_compile
-		done
-		ABI="${OABI}"
-		unset OABI
-		return 0
+	setup_env
+
+	if [[ -z ${OABI} ]] && has_multilib_profile ; then
+		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+		local MLTEST=$(type dyn_unpack)
+		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
+			OABI=${ABI}
+			einfo "Building multilib glibc for ABIs: $(get_install_abis)"
+			for ABI in $(get_install_abis) ; do
+				export ABI
+				src_compile
+			done
+			ABI=${OABI}
+			unset OABI
+			return 0
+		fi
+		unset MLTEST
 	fi
-	unset MLTEST
 
-	ABI=${ABI:-default}
 	toolchain-glibc_src_compile
 }
 
 src_test() {
-	crosscompile_setup
-
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if has_multilib_profile && [ -z "${OABI}" -a "${MLTEST/set_abi}" = "${MLTEST}" ] ; then
-		OABI="${ABI}"
-		for ABI in $(get_install_abis); do
-			export ABI
-			einfo "Testing ${ABI} glibc"
-			src_test
-		done
-		ABI="${OABI}"
-		unset OABI
-		return 0
+	setup_env
+
+	if [[ -z ${OABI} ]] && has_multilib_profile ; then
+		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+		local MLTEST=$(type dyn_unpack)
+		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
+			OABI=${ABI}
+			einfo "Testing multilib glibc for ABIs: $(get_install_abis)"
+			for ABI in $(get_install_abis) ; do
+				export ABI
+				einfo "   Testing ${ABI} glibc"
+				src_test
+			done
+			ABI=${OABI}
+			unset OABI
+			return 0
+		fi
+		unset MLTEST
 	fi
-	unset MLTEST
 
-	ABI=${ABI:-default}
 	toolchain-glibc_src_test
 }
 
 src_install() {
-	crosscompile_setup
-
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if has_multilib_profile && [ -z "${OABI}" -a "${MLTEST/set_abi}" = "${MLTEST}" ] ; then
-		OABI="${ABI}"
-		for ABI in $(get_install_abis); do
-			export ABI
-			einfo "Installing ${ABI} glibc"
-			src_install
-		done
-		ABI="${OABI}"
-		unset OABI
-		return 0
+	setup_env
+
+	if [[ -z ${OABI} ]] && has_multilib_profile ; then
+		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+		local MLTEST=$(type dyn_unpack)
+		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
+			OABI=${ABI}
+			einfo "Installing multilib glibc for ABIs: $(get_install_abis)"
+			for ABI in $(get_install_abis) ; do
+				export ABI
+				src_install
+			done
+			ABI=${OABI}
+			unset OABI
+			return 0
+		fi
+		unset MLTEST
 	fi
-	unset MLTEST
-
-	ABI=${ABI:-default}
 
 	# Handle stupid lib32 BS
 	unset OLD_LIBDIR
-	if [[ $(tc-arch) == "amd64" && ${ABI} == "x86" && $(get_libdir) != "lib" ]] && ! is_crosscompile; then
-		OLD_LIBDIR="$(get_libdir)"
-		LIBDIR_x86="lib"
-	fi
+	if ! is_crosscompile ; then
+		if [[ $(tc-arch) == "amd64" && ${ABI} == "x86" && $(get_libdir) != "lib" ]] ; then
+			OLD_LIBDIR=$(get_libdir)
+			LIBDIR_x86="lib"
+		fi
 
-	if [[ $(tc-arch) == "ppc64" && ${ABI} == "ppc" && $(get_libdir) != "lib" ]] && ! is_crosscompile; then
-		OLD_LIBDIR="$(get_libdir)"
-		LIBDIR_ppc="lib"
+		if [[ $(tc-arch) == "ppc64" && ${ABI} == "ppc" && $(get_libdir) != "lib" ]] ; then
+			OLD_LIBDIR=$(get_libdir)
+			LIBDIR_ppc="lib"
+		fi
 	fi
 
 	toolchain-glibc_src_install
 
 	# Handle stupid lib32 BS on amd64 and ppc64
 	if [[ -n ${OLD_LIBDIR} ]] ; then
-		cd ${S}
-		[[ $(tc-arch) == "amd64" ]] && LIBDIR_x86="${OLD_LIBDIR}"
-		[[ $(tc-arch) == "ppc64" ]] && LIBDIR_ppc="${OLD_LIBDIR}"
+		cd "${S}"
+		[[ $(tc-arch) == "amd64" ]] && LIBDIR_x86=${OLD_LIBDIR}
+		[[ $(tc-arch) == "ppc64" ]] && LIBDIR_ppc=${OLD_LIBDIR}
 		unset OLD_LIBDIR
 
-		mv ${D}/lib ${D}/$(get_libdir)
-		mv ${D}/usr/lib ${D}/usr/$(get_libdir)
+		mv "${D}"/lib "${D}"/$(get_libdir)
+		mv "${D}"/usr/lib "${D}"/usr/$(get_libdir)
 		dodir /lib
 		dodir /usr/lib
-		mv ${D}/usr/$(get_libdir)/locale ${D}/usr/lib
+		mv "${D}"/usr/$(get_libdir)/locale "${D}"/usr/lib
 		[[ $(tc-arch) == "amd64" ]] && dosym ../$(get_libdir)/ld-linux.so.2 /lib/ld-linux.so.2
 		[[ $(tc-arch) == "ppc64" ]] && dosym ../$(get_libdir)/ld.so.1 /lib/ld.so.1
 
-		for f in ${D}/usr/$(get_libdir)/*.so; do
-			local basef=$(basename ${f})
-			if [ -L ${f} ] ; then
-				local target=$(readlink ${f})
+		for f in "${D}"/usr/$(get_libdir)/*.so; do
+			local basef=$(basename "${f}")
+			if [[ -L ${f} ]] ; then
+				local target=$(readlink "${f}")
 				target=${target/\/lib\//\/$(get_libdir)\/}
-				rm ${f}
-				dosym ${target} /usr/$(get_libdir)/${basef}
+				rm "${f}"
+				dosym "${target}" /usr/$(get_libdir)/"${basef}"
 			fi
 		done
 
diff --git a/sys-libs/glibc/glibc-2.3.5-r2.ebuild b/sys-libs/glibc/glibc-2.3.5-r2.ebuild
index bde488568e67..5c14d06f7051 100644
--- a/sys-libs/glibc/glibc-2.3.5-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.3.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/sys-libs/glibc/glibc-2.3.5-r2.ebuild,v 1.1 2005/10/06 02:49:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r2.ebuild,v 1.1.1.1 2005/11/30 09:39:20 chriswhite Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -16,7 +16,7 @@
 #  CHOST = CTARGET  - install into /
 #  CHOST != CTARGET - install into /usr/CTARGET/
 
-KEYWORDS="-* amd64 arm -hppa ~ia64 m68k ~mips ~ppc ppc64 ~s390 sh ~sparc x86"
+KEYWORDS="-* amd64 arm -hppa ~ia64 m68k ~mips ppc ~ppc64 ~s390 sh ~sparc x86"
 
 BRANCH_UPDATE=""
 
@@ -32,14 +32,14 @@ PATCH_VER="1.13"
 # C Stubbs addon (contained in fedora, so ignoring)
 #CSTUBS_VER="2.1.2"
 #CSTUBS_TARBALL="c_stubs-${CSTUBS_VER}.tar.bz2"
-#CSTUBS_URI="http://dev.gentoo.org/~eradicator/glibc/${CSTUBS_TARBALL}"
+#CSTUBS_URI="mirror://gentoo/${CSTUBS_TARBALL}"
 
 # Fedora addons (from RHEL's glibc-2.3.4-2.src.rpm)
 FEDORA_VER="20041219T2331"
 FEDORA_TARBALL="glibc-fedora-${FEDORA_VER}.tar.bz2"
-FEDORA_URI="http://dev.gentoo.org/~eradicator/glibc/${FEDORA_TARBALL}"
+FEDORA_URI="mirror://gentoo/${FEDORA_TARBALL}"
 
-GENTOO_TOOLCHAIN_BASE_URI="http://dev.gentoo.org/~eradicator/glibc"
+GENTOO_TOOLCHAIN_BASE_URI="mirror://gentoo"
 
 ### PUNT OUT TO ECLASS?? ###
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
@@ -115,11 +115,7 @@ LT_KERNEL_VERSION=${LT_KERNEL_VERSION:-"2.4.1"}
 #			which is useful for individual library targets.
 #
 get_glibc_src_uri() {
-	# This variable should be set to the devspace of whoever is currently
-	# maintaining GLIBC. Please dont set this to mirror, that would just
-	# make the files unavailable until they get mirrored.
-	local devspace_uri="http://dev.gentoo.org/~eradicator/glibc/"
-	GENTOO_TOOLCHAIN_BASE_URI=${GENTOO_TOOLCHAIN_BASE_URI:-${devspace_uri}}
+	GENTOO_TOOLCHAIN_BASE_URI=${GENTOO_TOOLCHAIN_BASE_URI:-"mirror://gentoo"}
 
 #	GLIBC_SRC_URI="http://ftp.gnu.org/gnu/glibc/${PN}-${GLIBC_RELEASE_VER}.tar.bz2
 #	               http://ftp.gnu.org/gnu/glibc/${PN}-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2
@@ -227,14 +223,14 @@ toolchain-glibc_src_compile() {
 	if want_linuxthreads ; then
 		glibc_do_configure linuxthreads
 		einfo "Building GLIBC with linuxthreads..."
-		make PARALLELMFLAGS="${MAKEOPTS} -j1" ${MAKEFLAGS} || die
+		make PARALLELMFLAGS="${MAKEOPTS}" ${MAKEFLAGS} || die
 	fi
 	if want_nptl ; then
 		# ... and then do the optional nptl build
 		unset LD_ASSUME_KERNEL
 		glibc_do_configure nptl
 		einfo "Building GLIBC with NPTL..."
-		make PARALLELMFLAGS="${MAKEOPTS} -j1" ${MAKEFLAGS} || die
+		make PARALLELMFLAGS="${MAKEOPTS}" ${MAKEFLAGS} || die
 	fi
 }
 
@@ -304,16 +300,8 @@ toolchain-glibc_src_install() {
 	fi
 
 	if is_crosscompile ; then
-		# Glibc doesn't setup multilib crosscompiled dirs right, but it
-		# sets up native multilib dirs right, so just do this when we
-		# crosscompile.
-		if [[ $(get_libdir) != "lib" && -d ${D}$(alt_prefix)/lib ]] ; then
-			dodir $(alt_libdir)
-			mv "${D}"$(alt_prefix)/lib/* "${D}"$(alt_libdir)
-		fi
-
 		# punt all the junk not needed by a cross-compiler
-		rm -rf "${D}"$(alt_prefix)/{bin,etc,$(get_libdir)/gconv,sbin,share}
+		rm -rf "${D}"$(alt_prefix)/{bin,etc,$(get_libdir)/{gconv,misc},sbin,share}
 	fi
 
 	if want_linuxthreads && want_nptl ; then
@@ -610,6 +598,18 @@ alt_usrlibdir() {
 }
 
 setup_flags() {
+	# Make sure host make.conf doesn't pollute us
+	if is_crosscompile || tc-is-cross-compiler ; then
+		CHOST=${CTARGET} strip-unsupported-flags
+	fi
+
+	# Store our CFLAGS because it's changed depending on which CTARGET
+	# we are building when pulling glibc on a multilib profile
+	CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}}
+	CFLAGS=${CFLAGS_BASE}
+	ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}}
+	ASFLAGS=${ASFLAGS_BASE}
+
 	# Over-zealous CFLAGS can often cause problems.  What may work for one
 	# person may not work for another.  To avoid a large influx of bugs
 	# relating to failed builds, we strip most CFLAGS out to ensure as few
@@ -619,10 +619,14 @@ setup_flags() {
 	filter-flags -m32 -m64 -mabi=*
 
 	unset CBUILD_OPT CTARGET_OPT
-	has_multilib_profile && CTARGET_OPT=$(get_abi_CHOST)
+	if has_multilib_profile ; then
+		CTARGET_OPT=$(get_abi_CTARGET)
+		[[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST)
+	fi
 
 	case $(tc-arch) in
 		amd64)
+			# Punt this when amd64's 2004.3 is removed
 			CFLAGS_x86="-m32"
 		;;
 		ppc)
@@ -637,15 +641,17 @@ setup_flags() {
 			if is_crosscompile || [[ ${PROFILE_ARCH} == "sparc64" ]] || { has_multilib_profile && ! tc-is-cross-compiler; } ; then
 				case ${ABI} in
 					sparc64)
+						filter-flags -Wa,-xarch -Wa,-A
+
 						if is-flag "-mcpu=ultrasparc3"; then
 							CTARGET_OPT="sparc64b-unknown-linux-gnu"
-							CFLAGS_sparc64="$(get_abi_CFLAGS) -Wa,-xarch=v9b"
+							append-flags "-Wa,-xarch=v9b"
+							export ASFLAGS="${ASFLAGS} -Wa,-xarch=v9b"
 						else
 							CTARGET_OPT="sparc64-unknown-linux-gnu"
-							CFLAGS_sparc64="$(get_abi_CFLAGS) -Wa,-xarch=v9a"
+							append-flags "-Wa,-xarch=v9a"
+							export ASFLAGS="${ASFLAGS} -Wa,-xarch=v9a"
 						fi
-
-						filter-flags -Wa,-xarch -Wa,-A
 					;;
 					*)
 						if is-flag "-mcpu=ultrasparc3"; then
@@ -880,8 +886,20 @@ glibc_do_configure() {
 		die "invalid pthread option"
 	fi
 
-	if ! use build && use selinux; then
-		myconf="${myconf} --with-selinux"
+	# Since SELinux support is only required for nscd, only enable it if:
+	# 1. USE selinux
+	# 2. ! USE build
+	# 3. only for the primary ABI on multilib systems
+	if use selinux && ! use build; then
+		if use multilib || has_multilib_profile; then
+			if is_final_abi; then
+				myconf="${myconf} --with-selinux"
+			else
+				myconf="${myconf} --without-selinux"
+			fi
+		else
+			myconf="${myconf} --with-selinux"
+		fi
 	else
 		myconf="${myconf} --without-selinux"
 	fi
@@ -900,7 +918,7 @@ glibc_do_configure() {
 		--libexecdir=$(alt_prefix)/lib/misc/glibc
 		${EXTRA_ECONF}"
 
-	export CC="$(tc-getCC ${CTARGET})"
+	has_version app-admin/eselect-compiler || export CC="$(tc-getCC ${CTARGET})"
 
 	GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-$1
 	mkdir -p ${GBUILDDIR}
@@ -949,94 +967,37 @@ fix_lib64_symlinks() {
 
 use_multilib() {
 	case ${CTARGET} in
-		sparc64*|mips64*|amd64|ppc64)
-			is_crosscompile || has_multilib_profile || use multilib ;;
+		sparc64*|mips64*|x86_64*|powerpc64*|s390x*)
+			has_multilib_profile || use multilib ;;
 		*)  false ;;
 	esac
 }
 
 # Setup toolchain variables that would be defined in the profiles for these archs.
 setup_env() {
-	setup_flags
-
 	if is_crosscompile || tc-is-cross-compiler ; then
-		case ${CTARGET} in
-			x86_64*)
-				export CFLAGS_x86=${CFLAGS_x86--m32}
-				export CHOST_x86=${CTARGET/x86_64/i686}
-				export CDEFINE_x86="__i386__"
-				export LIBDIR_x86="lib"
-
-				export CFLAGS_amd64=${CFLAGS_amd64--m64}
-				export CHOST_amd64=${CTARGET}
-				export CDEFINE_amd64="__x86_64__"
-				export LIBDIR_amd64="lib64"
-
-				export MULTILIB_ABIS="amd64"
-				export DEFAULT_ABI="amd64"
-			;;
-			mips64*)
-				export CFLAGS_o32=${CFLAGS_o32--mabi=32}
-				export CHOST_o32=${CTARGET/mips64/mips}
-				export CDEFINE_o32="_MIPS_SIM == _ABIO32"
-				export LIBDIR_o32="lib"
-
-				export CFLAGS_n32=${CFLAGS_n32--mabi=n32}
-				export CHOST_n32=${CTARGET}
-				export CDEFINE_n32="_MIPS_SIM == _ABIN32"
-				export LIBDIR_n32="lib32"
-
-				export CFLAGS_n64=${CFLAGS_n64--mabi=64}
-				export CHOST_n64=${CTARGET}
-				export CDEFINE_n64="_MIPS_SIM == _ABI64"
-				export LIBDIR_n64="lib64"
-
-				export MULTILIB_ABIS="n64 n32"
-				export DEFAULT_ABI="n32"
-			;;
-			powerpc64*)
-				export CFLAGS_ppc=${CFLAGS_ppc--m32}
-				export CHOST_ppc=${CTARGET/powerpc64/powerpc}
-				export CDEFINE_ppc="!__powerpc64__"
-				export LIBDIR_ppc="lib"
-
-				export CFLAGS_ppc64=${CFLAGS_ppc64--m64}
-				export CHOST_ppc64=${CTARGET}
-				export CDEFINE_ppc64="__powerpc64__"
-				export LIBDIR_ppc64="lib64"
-
-				export MULTILIB_ABIS="ppc64"
-				export DEFAULT_ABI="ppc64"
-			;;
-			sparc64*)
-				export CFLAGS_sparc32=${CFLAGS_sparc--m32}
-				export CHOST_sparc32=${CTARGET/sparc64/sparc}
-				export CDEFINE_sparc32="!__arch64__"
-				export LIBDIR_sparc32="lib"
-
-				export CFLAGS_sparc64=${CFLAGS_sparc64--m64}
-				export CHOST_sparc64=${CTARGET}
-				export CDEFINE_sparc64="__arch64__"
-				export LIBDIR_sparc64="lib64"
-
-				export MULTILIB_ABIS="sparc64"
-				export DEFAULT_ABI="sparc64"
-			;;
-			*)
-				export MULTILIB_ABIS="default"
-				export DEFAULT_ABI="default"
-		esac
+		multilib_env ${CTARGET}
+		if ! use multilib ; then
+			MULTILIB_ABIS=${DEFAULT_ABI}
+		else
+			case ${CTARGET} in
+			mips64*) MULTILIB_ABIS=${MULTILIB_ABIS/o32} ;;
+			esac
+		fi
 	fi
 
 	export ABI=${ABI:-${DEFAULT_ABI:-default}}
 
+	setup_flags
+
 	if is_crosscompile || tc-is-cross-compiler ; then
+		# We only install for this CTARGET on crosscompilers
+		MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}}
+
 		# We need to export CFLAGS with abi information in them because
 		# glibc's configure script checks CFLAGS for some targets (like mips)
-		local VAR=CFLAGS_${CTARGET//-/_}
-		export CFLAGS=${!VAR--O2}
-		VAR=CFLAGS_${ABI}
-		export CFLAGS="${CFLAGS} ${!VAR}"
+		local VAR1=CFLAGS_${CTARGET//[-.]/_} VAR2=CFLAGS_${ABI}
+		export CFLAGS="${CFLAGS} ${!VAR1-${!VAR2--O2 -pipe}}"
 	fi
 }
 
@@ -1064,6 +1025,7 @@ DEPEND=">=sys-devel/gcc-3.2.3-r1
 	virtual/os-headers
 	nls? ( sys-devel/gettext )
 	selinux? ( !build? ( sys-libs/libselinux ) )"
+
 RDEPEND="virtual/os-headers
 	nls? ( sys-devel/gettext )
 	selinux? ( !build? ( sys-libs/libselinux ) )"
@@ -1190,13 +1152,17 @@ src_unpack() {
 src_compile() {
 	setup_env
 
-	if [[ -z ${OABI} ]] && has_multilib_profile ; then
-		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-		local MLTEST=$(type dyn_unpack)
-		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
+	if [[ -z ${OABI} ]] ; then
+		local abilist=""
+		if has_multilib_profile ; then
+			abilist=$(get_install_abis)
+			einfo "Building multilib glibc for ABIs: ${abilist}"
+		elif is_crosscompile || tc-is-cross-compiler ; then
+			abilist=${DEFAULT_ABI}
+		fi
+		if [[ -n ${abilist} ]] ; then
 			OABI=${ABI}
-			einfo "Building multilib glibc for ABIs: $(get_install_abis)"
-			for ABI in $(get_install_abis) ; do
+			for ABI in ${abilist} ; do
 				export ABI
 				src_compile
 			done
@@ -1204,7 +1170,6 @@ src_compile() {
 			unset OABI
 			return 0
 		fi
-		unset MLTEST
 	fi
 
 	toolchain-glibc_src_compile
@@ -1214,21 +1179,16 @@ src_test() {
 	setup_env
 
 	if [[ -z ${OABI} ]] && has_multilib_profile ; then
-		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-		local MLTEST=$(type dyn_unpack)
-		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
-			OABI=${ABI}
-			einfo "Testing multilib glibc for ABIs: $(get_install_abis)"
-			for ABI in $(get_install_abis) ; do
-				export ABI
-				einfo "   Testing ${ABI} glibc"
-				src_test
-			done
-			ABI=${OABI}
-			unset OABI
-			return 0
-		fi
-		unset MLTEST
+		OABI=${ABI}
+		einfo "Testing multilib glibc for ABIs: $(get_install_abis)"
+		for ABI in $(get_install_abis) ; do
+			export ABI
+			einfo "   Testing ${ABI} glibc"
+			src_test
+		done
+		ABI=${OABI}
+		unset OABI
+		return 0
 	fi
 
 	toolchain-glibc_src_test
@@ -1237,13 +1197,17 @@ src_test() {
 src_install() {
 	setup_env
 
-	if [[ -z ${OABI} ]] && has_multilib_profile ; then
-		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-		local MLTEST=$(type dyn_unpack)
-		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
+	if [[ -z ${OABI} ]] ; then
+		local abilist=""
+		if has_multilib_profile ; then
+			abilist=$(get_install_abis)
+			einfo "Installing multilib glibc for ABIs: ${abilist}"
+		elif is_crosscompile || tc-is-cross-compiler ; then
+			abilist=${DEFAULT_ABI}
+		fi
+		if [[ -n ${abilist} ]] ; then
 			OABI=${ABI}
-			einfo "Installing multilib glibc for ABIs: $(get_install_abis)"
-			for ABI in $(get_install_abis) ; do
+			for ABI in ${abilist} ; do
 				export ABI
 				src_install
 			done
@@ -1251,7 +1215,6 @@ src_install() {
 			unset OABI
 			return 0
 		fi
-		unset MLTEST
 	fi
 
 	# Handle stupid lib32 BS
diff --git a/sys-libs/glibc/glibc-2.3.5-r3.ebuild b/sys-libs/glibc/glibc-2.3.5-r3.ebuild
index 86e44850ac1c..034b33e9e2ba 100644
--- a/sys-libs/glibc/glibc-2.3.5-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.3.5-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/sys-libs/glibc/glibc-2.3.5-r3.ebuild,v 1.1 2005/10/27 01:07:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r3.ebuild,v 1.1.1.1 2005/11/30 09:39:31 chriswhite Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -16,7 +16,7 @@
 #  CHOST = CTARGET  - install into /
 #  CHOST != CTARGET - install into /usr/CTARGET/
 
-KEYWORDS="-* ~alpha ~amd64 ~arm -hppa ~x86"
+KEYWORDS="-* ~alpha ~amd64 ~arm -hppa ~ppc ~sparc ~x86"
 
 BRANCH_UPDATE=""
 
@@ -27,7 +27,7 @@ GLIBC_MANPAGE_VERSION="2.3.5"
 GLIBC_INFOPAGE_VERSION="2.3.5"
 
 # Gentoo patchset
-PATCH_VER="1.14"
+PATCH_VER="1.15"
 
 # C Stubbs addon (contained in fedora, so ignoring)
 #CSTUBS_VER="2.1.2"
@@ -103,7 +103,7 @@ LT_KERNEL_VERSION=${LT_KERNEL_VERSION:-"2.4.1"}
 #	PATCH_GLIBC_VER
 #			This should be set to the version of the gentoo patch tarball.
 #			The resulting filename of this tarball will be:
-#			${PN}-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2
+#			glibc-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2
 #
 #	GLIBC_MANPAGE_VERSION
 #	GLIBC_INFOPAGE_VERSION
@@ -117,31 +117,31 @@ LT_KERNEL_VERSION=${LT_KERNEL_VERSION:-"2.4.1"}
 get_glibc_src_uri() {
 	GENTOO_TOOLCHAIN_BASE_URI=${GENTOO_TOOLCHAIN_BASE_URI:-"mirror://gentoo"}
 
-#	GLIBC_SRC_URI="http://ftp.gnu.org/gnu/glibc/${PN}-${GLIBC_RELEASE_VER}.tar.bz2
-#	               http://ftp.gnu.org/gnu/glibc/${PN}-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2
-#	               http://ftp.gnu.org/gnu/glibc/${PN}-libidn-${GLIBC_RELEASE_VER}.tar.bz2
-	GLIBC_SRC_URI="mirror://gnu/glibc/${PN}-${GLIBC_RELEASE_VER}.tar.bz2
-	               mirror://gnu/glibc/${PN}-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2
-	               mirror://gnu/glibc/${PN}-libidn-${GLIBC_RELEASE_VER}.tar.bz2"
+#	GLIBC_SRC_URI="http://ftp.gnu.org/gnu/glibc/glibc-${GLIBC_RELEASE_VER}.tar.bz2
+#	               http://ftp.gnu.org/gnu/glibc/glibc-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2
+#	               http://ftp.gnu.org/gnu/glibc/glibc-libidn-${GLIBC_RELEASE_VER}.tar.bz2
+	GLIBC_SRC_URI="mirror://gnu/glibc/glibc-${GLIBC_RELEASE_VER}.tar.bz2
+	               mirror://gnu/glibc/glibc-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2
+	               mirror://gnu/glibc/glibc-libidn-${GLIBC_RELEASE_VER}.tar.bz2"
 
 	if [[ -n ${BRANCH_UPDATE} ]] ; then
 		GLIBC_SRC_URI="${GLIBC_SRC_URI}
-			${GENTOO_TOOLCHAIN_BASE_URI}/${PN}-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2"
+			${GENTOO_TOOLCHAIN_BASE_URI}/glibc-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2"
 	fi
 
 	if [[ -n ${PATCH_VER} ]] ; then
 		GLIBC_SRC_URI="${GLIBC_SRC_URI}
-			${GENTOO_TOOLCHAIN_BASE_URI}/${PN}-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2"
+			${GENTOO_TOOLCHAIN_BASE_URI}/glibc-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2"
 	fi
 
 	if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then
 		GLIBC_SRC_URI="${GLIBC_SRC_URI}
-			${GENTOO_TOOLCHAIN_BASE_URI}/${PN}-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2"
+			${GENTOO_TOOLCHAIN_BASE_URI}/glibc-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2"
 	fi
 
 	if [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then
 		GLIBC_SRC_URI="${GLIBC_SRC_URI}
-			${GENTOO_TOOLCHAIN_BASE_URI}/${PN}-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2"
+			${GENTOO_TOOLCHAIN_BASE_URI}/glibc-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2"
 	fi
 
 	if [[ -n ${CSTUBS_URI} ]] ; then
@@ -156,25 +156,25 @@ get_glibc_src_uri() {
 }
 
 SRC_URI=$(get_glibc_src_uri)
-S=${WORKDIR}/${PN}-${GLIBC_RELEASE_VER}
+S=${WORKDIR}/glibc-${GLIBC_RELEASE_VER}
 
 ### EXPORTED FUNCTIONS ###
 toolchain-glibc_src_unpack() {
 	# Check NPTL support _before_ we unpack things to save some time
 	want_nptl && check_nptl_support
 
-	unpack ${PN}-${GLIBC_RELEASE_VER}.tar.bz2
+	unpack glibc-${GLIBC_RELEASE_VER}.tar.bz2
 
 	cd "${S}"
-	unpack ${PN}-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2
-	unpack ${PN}-libidn-${GLIBC_RELEASE_VER}.tar.bz2
+	unpack glibc-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2
+	unpack glibc-libidn-${GLIBC_RELEASE_VER}.tar.bz2
 
 	[[ -n ${CSTUBS_TARBALL} ]] && unpack ${CSTUBS_TARBALL}
 	[[ -n ${FEDORA_TARBALL} ]] && unpack ${FEDORA_TARBALL}
 
 	if [[ -n ${PATCH_VER} ]] ; then
 		cd "${WORKDIR}"
-		unpack ${PN}-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2
+		unpack glibc-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2
 	fi
 
 	# XXX: We should do the branchupdate, before extracting the manpages and
@@ -182,7 +182,7 @@ toolchain-glibc_src_unpack() {
 	# to them with branchupdate)
 	if [[ -n ${BRANCH_UPDATE} ]] ; then
 		cd "${S}"
-		epatch "${DISTDIR}"/${PN}-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
+		epatch "${DISTDIR}"/glibc-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
 
 		# Snapshot date patch
 		einfo "Patching version to display snapshot date ..."
@@ -191,12 +191,12 @@ toolchain-glibc_src_unpack() {
 
 	if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then
 		cd "${WORKDIR}"
-		unpack ${PN}-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2
+		unpack glibc-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2
 	fi
 
 	if [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then
 		cd "${S}"
-		unpack ${PN}-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2
+		unpack glibc-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2
 	fi
 
 	if [[ -n ${PATCH_VER} ]] ; then
@@ -759,7 +759,7 @@ want_nptl() {
 
 	# Archs that can use NPTL
 	case $(tc-arch) in
-		alpha|amd64|ia64|mips|ppc|ppc64|s390|x86)
+		alpha|amd64|ia64|mips|ppc|ppc64|s390|sh|x86)
 			return 0;
 		;;
 		sparc)
@@ -781,7 +781,7 @@ want_linuxthreads() {
 want_tls() {
 	# Archs that can use TLS (Thread Local Storage)
 	case $(tc-arch) in
-		alpha|amd64|ia64|mips|ppc|ppc64|s390)
+		alpha|amd64|ia64|mips|ppc|ppc64|s390|sh)
 			return 0;
 		;;
 		sparc)
@@ -985,24 +985,24 @@ setup_env() {
 		if ! use multilib ; then
 			MULTILIB_ABIS=${DEFAULT_ABI}
 		else
-			case ${CTARGET} in
-			mips64*) MULTILIB_ABIS=${MULTILIB_ABIS/o32} ;;
-			esac
+			MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}}
 		fi
-	fi
 
-	export ABI=${ABI:-${DEFAULT_ABI:-default}}
+		# If the user has CFLAGS_<CTARGET> in their make.conf, use that,
+		# and fall back on CFLAGS.
+		local VAR=CFLAGS_${CTARGET//[-.]/_}
+		CFLAGS=${!VAR-${CFLAGS}}
+	fi
 
 	setup_flags
 
-	if is_crosscompile || tc-is-cross-compiler ; then
-		# We only install for this CTARGET on crosscompilers
-		MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}}
+	export ABI=${ABI:-${DEFAULT_ABI:-default}}
 
+	if is_crosscompile || tc-is-cross-compiler ; then
+		local VAR=CFLAGS_${ABI}
 		# We need to export CFLAGS with abi information in them because
 		# glibc's configure script checks CFLAGS for some targets (like mips)
-		local VAR1=CFLAGS_${CTARGET//[-.]/_} VAR2=CFLAGS_${ABI}
-		export CFLAGS="${CFLAGS} ${!VAR1-${!VAR2--O2 -pipe}}"
+		export CFLAGS="${!VAR} ${CFLAGS}"
 	fi
 }
 
diff --git a/sys-libs/glibc/glibc-2.3.5.20050421.ebuild b/sys-libs/glibc/glibc-2.3.5.20050421.ebuild
index 67d74752d67c..8569acefc757 100644
--- a/sys-libs/glibc/glibc-2.3.5.20050421.ebuild
+++ b/sys-libs/glibc/glibc-2.3.5.20050421.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.20050421.ebuild,v 1.1 2005/04/23 17:44:31 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.20050421.ebuild,v 1.1.1.1 2005/11/30 09:39:19 chriswhite Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -16,7 +16,7 @@
 #  CHOST = CTARGET  - install into /
 #  CHOST != CTARGET - install into /usr/CTARGET/
 
-KEYWORDS="-*"
+KEYWORDS="-* ~ppc64"
 
 # Versionator crap do not work here - not in the mood for hassle.
 BRANCH_UPDATE="20050421"
@@ -28,17 +28,17 @@ GLIBC_MANPAGE_VERSION="2.3.5"
 GLIBC_INFOPAGE_VERSION="2.3.5"
 
 # Gentoo patchset
-PATCH_VER="2.0"
+PATCH_VER="2.2"
 
 # C Stubbs addon (contained in fedora, so ignoring)
 #CSTUBS_VER="2.1.2"
 #CSTUBS_TARBALL="c_stubs-${CSTUBS_VER}.tar.bz2"
-#CSTUBS_URI="http://dev.gentoo.org/~eradicator/glibc/${CSTUBS_TARBALL}"
+#CSTUBS_URI="mirror://gentoo/${CSTUBS_TARBALL}"
 
 # Fedora addons (from RHEL's glibc-2.3.4-2.src.rpm)
 FEDORA_VER="20041219T2331"
 FEDORA_TARBALL="glibc-fedora-${FEDORA_VER}.tar.bz2"
-FEDORA_URI="http://dev.gentoo.org/~eradicator/glibc/${FEDORA_TARBALL}"
+FEDORA_URI="mirror://gentoo/${FEDORA_TARBALL}"
 
 GENTOO_TOOLCHAIN_BASE_URI="http://dev.gentoo.org/~azarah/glibc"
 
@@ -49,7 +49,7 @@ DESCRIPTION="GNU libc6 (also called glibc2) C library"
 HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
 LICENSE="LGPL-2"
 
-IUSE="nls pic build nptl nptlonly erandom hardened debug userlocales nomalloccheck multilib"
+IUSE="nls pic build nptl nptlonly erandom hardened userlocales multilib selinux glibc-compat20 glibc-omitfp linuxthreads-tls profile"
 
 export CBUILD=${CBUILD:-${CHOST}}
 export CTARGET=${CTARGET:-${CHOST}}
@@ -119,7 +119,7 @@ get_glibc_src_uri() {
 	# This variable should be set to the devspace of whoever is currently
 	# maintaining GLIBC. Please dont set this to mirror, that would just
 	# make the files unavailable until they get mirrored.
-	local devspace_uri="http://dev.gentoo.org/~eradicator/glibc/"
+	local devspace_uri="mirror://gentoo/"
 	GENTOO_TOOLCHAIN_BASE_URI=${GENTOO_TOOLCHAIN_BASE_URI:-${devspace_uri}}
 
 #	GLIBC_SRC_URI="http://ftp.gnu.org/gnu/glibc/${PN}-${GLIBC_RELEASE_VER}.tar.bz2
@@ -161,7 +161,7 @@ get_glibc_src_uri() {
 }
 
 SRC_URI=$(get_glibc_src_uri)
-S="${WORKDIR}/${PN}-${GLIBC_RELEASE_VER}"
+S=${WORKDIR}/${PN}-${GLIBC_RELEASE_VER}
 
 ### EXPORTED FUNCTIONS ###
 toolchain-glibc_src_unpack() {
@@ -170,68 +170,61 @@ toolchain-glibc_src_unpack() {
 
 	unpack ${PN}-${GLIBC_RELEASE_VER}.tar.bz2
 
-	cd ${S}
+	cd "${S}"
 	unpack ${PN}-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2
 	unpack ${PN}-libidn-${GLIBC_RELEASE_VER}.tar.bz2
 
-	if [[ -n ${CSTUBS_TARBALL} ]] ; then
-		unpack ${CSTUBS_TARBALL}
-	fi
-
-	if [[ -n ${FEDORA_TARBALL} ]] ; then
-		unpack ${FEDORA_TARBALL}
-	fi
+	[[ -n ${CSTUBS_TARBALL} ]] && unpack ${CSTUBS_TARBALL}
+	[[ -n ${FEDORA_TARBALL} ]] && unpack ${FEDORA_TARBALL}
 
 	if [[ -n ${PATCH_VER} ]] ; then
-		cd ${WORKDIR}
+		cd "${WORKDIR}"
 		unpack ${PN}-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2
 	fi
 
+	# XXX: We should do the branchupdate, before extracting the manpages and
+	# infopages else it does not help much (mtimes change if there is a change
+	# to them with branchupdate)
+	if [[ -n ${BRANCH_UPDATE} ]] ; then
+		cd "${S}"
+		epatch "${DISTDIR}"/${PN}-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
+
+		# Snapshot date patch
+		einfo "Patching version to display snapshot date ..."
+		sed -i -e "s:\(#define RELEASE\).*:\1 \"${BRANCH_UPDATE}\":" version.h
+	fi
+
 	if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then
-		cd ${WORKDIR}
+		cd "${WORKDIR}"
 		unpack ${PN}-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2
 	fi
 
 	if [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then
-		cd ${S}
+		cd "${S}"
 		unpack ${PN}-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2
 	fi
 
-	if [[ -n ${BRANCH_UPDATE} ]] ; then
-		cd ${WORKDIR}
-		unpack ${PN}-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
-	fi
-
-	cd ${S}
-
-	if [[ -n ${BRANCH_UPDATE} ]] ; then
-		epatch ${WORKDIR}/${PN}-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch
-
-		# Snapshot date patch
-		einfo "Patching version to display snapshot date ..."
-		sed -i -e "s:\(#define RELEASE\).*:\1 \"${BRANCH_UPDATE}\":" version.h
-	fi
-
 	if [[ -n ${PATCH_VER} ]] ; then
-		EPATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE}"
-		EPATCH_SUFFIX="patch"
-		OLD_ARCH="${ARCH}"
-		ARCH="$(tc-arch)"
-
-		einfo "Applying Gentoo Glibc Patches: ${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-${PATCH_VER}"
-		epatch ${WORKDIR}/patches
-
-		ARCH="${OLD_ARCH}"
-		unset EPATCH_EXCLUDE
-		unset EPATCH_SUFFIX
-		unset OLD_ARCH
+		cd "${S}"
+		EPATCH_MULTI_MSG="Applying Gentoo Glibc Patchset ${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-${PATCH_VER} ..." \
+		EPATCH_EXCLUDE=${GLIBC_PATCH_EXCLUDE} \
+		EPATCH_SUFFIX="patch" \
+		ARCH=$(tc-arch) \
+		epatch "${WORKDIR}"/patches
 	fi
 }
 
 toolchain-glibc_src_compile() {
 	# Set gconvdir to /usr/$(get_libdir)/gconv on archs with multiple ABIs
+	local MAKEFLAGS=""
 	has_multilib_profile && MAKEFLAGS="gconvdir=$(alt_usrlibdir)/gconv"
 
+	echo
+	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CFLAGS ; do
+		einfo " $(printf '%15s' ${v}:)   ${!v}"
+	done
+	echo
+
 	if want_linuxthreads ; then
 		glibc_do_configure linuxthreads
 		einfo "Building GLIBC with linuxthreads..."
@@ -239,7 +232,7 @@ toolchain-glibc_src_compile() {
 	fi
 	if want_nptl ; then
 		# ... and then do the optional nptl build
-		unset LD_ASSUME_KERNEL || :
+		unset LD_ASSUME_KERNEL
 		glibc_do_configure nptl
 		einfo "Building GLIBC with NPTL..."
 		make PARALLELMFLAGS="${MAKEOPTS}" ${MAKEFLAGS} || die
@@ -253,12 +246,12 @@ toolchain-glibc_src_test() {
 
 	# do the linuxthreads build unless we're using nptlonly
 	if want_linuxthreads ; then
-		cd ${WORKDIR}/build-${ABI}-${CTARGET}-linuxthreads
+		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads
 		einfo "Checking GLIBC with linuxthreads..."
 		make check || die "linuxthreads glibc did not pass make check"
 	fi
 	if want_nptl ; then
-		cd ${WORKDIR}/build-${ABI}-${CTARGET}-nptl
+		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl
 		unset LD_ASSUME_KERNEL || :
 		einfo "Checking GLIBC with NPTL..."
 		make check || die "nptl glibc did not pass make check"
@@ -275,15 +268,18 @@ toolchain-glibc_pkg_preinst() {
 	# 2005.0 is setup properly, and this is executed as part of the
 	# 2004.3 -> 2005.0 upgrade script.
 	# It can be removed after 2004.3 has been purged from portage.
-	use amd64 && [ "$(get_libdir)" == "lib64" ] && ! has_multilib_profile && fix_lib64_symlinks
+	{ use amd64 || use ppc64; } && [ "$(get_libdir)" == "lib64" ] && ! has_multilib_profile && fix_lib64_symlinks
 
 	# it appears that /lib/tls is sometimes not removed. See bug
 	# 69258 for more info.
-	if [ -d /${ROOT}$(alt_libdir)/tls ] && ! { want_nptl && want_linuxthreads; }; then
-		addwrite /${ROOT}$(alt_libdir)/
+	if [[ -d ${ROOT}/$(alt_libdir)/tls ]] && ! { want_nptl && want_linuxthreads; }; then
+		addwrite "${ROOT}"/$(alt_libdir)/
 		ewarn "nptlonly or -nptl in USE, removing /${ROOT}$(alt_libdir)/tls..."
-		rm -rf /${ROOT}$(alt_libdir)/tls || die
+		rm -r "${ROOT}"/$(alt_libdir)/tls || die
 	fi
+
+	# Shouldnt need to keep this updated
+	[[ -e ${ROOT}/etc/locales.build ]] && rm -f "${D}"/etc/locales.build
 }
 
 toolchain-glibc_src_install() {
@@ -297,16 +293,16 @@ toolchain-glibc_src_install() {
 	unset LANGUAGE LANG LC_ALL
 
 	if want_linuxthreads ; then
-		cd ${WORKDIR}/build-${ABI}-${CTARGET}-linuxthreads
-		einfo "Installing GLIBC with linuxthreads..."
+		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads
+		einfo "Installing GLIBC ${ABI} with linuxthreads ..."
 		make PARALLELMFLAGS="${MAKEOPTS} -j1" \
-			install_root=${D} \
+			install_root="${D}" \
 			install || die
 	else # nptlonly
-		cd ${WORKDIR}/build-${ABI}-${CTARGET}-nptl
-		einfo "Installing GLIBC with NPTL..."
+		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl
+		einfo "Installing GLIBC ${ABI} with NPTL ..."
 		make PARALLELMFLAGS="${MAKEOPTS} -j1" \
-			install_root=${D} \
+			install_root="${D}" \
 			install || die
 	fi
 
@@ -316,7 +312,7 @@ toolchain-glibc_src_install() {
 		# crosscompile.
 		if [[ $(get_libdir) != "lib" && -d ${D}$(alt_prefix)/lib ]] ; then
 			dodir $(alt_libdir)
-			mv ${D}$(alt_prefix)/lib/* ${D}$(alt_libdir)
+			mv "${D}"$(alt_prefix)/lib/* "${D}"$(alt_libdir)
 		fi
 
 		# punt all the junk not needed by a cross-compiler
@@ -325,72 +321,80 @@ toolchain-glibc_src_install() {
 
 	if want_linuxthreads && want_nptl ; then
 		einfo "Installing NPTL to $(alt_libdir)/tls/..."
-		cd ${WORKDIR}/build-${ABI}-${CTARGET}-nptl
-		mkdir -p ${D}$(alt_libdir)/tls/
+		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl
+		mkdir -p "${D}"$(alt_libdir)/tls/
 
-		libcsofile=$(basename ${D}$(alt_libdir)/libc-*.so)
-		cp -a libc.so ${D}$(alt_libdir)/tls/${libcsofile} || die
+		libcsofile=$(basename "${D}"$(alt_libdir)/libc-*.so)
+		cp -a libc.so "${D}"$(alt_libdir)/tls/${libcsofile} || die
 		dosym ${libcsofile} $(alt_libdir)/tls/$(ls libc.so.*)
 
-		libmsofile=$(basename ${D}$(alt_libdir)/libm-*.so)
+		libmsofile=$(basename "${D}"$(alt_libdir)/libm-*.so)
 		pushd math > /dev/null
-		cp -a libm.so ${D}$(alt_libdir)/tls/${libmsofile} || die
+		cp -a libm.so "${D}"$(alt_libdir)/tls/${libmsofile} || die
 		dosym ${libmsofile} $(alt_libdir)/tls/$(ls libm.so.*)
 		popd > /dev/null
 
-		librtsofile=$(basename ${D}$(alt_libdir)/librt-*.so)
+		librtsofile=$(basename "${D}"$(alt_libdir)/librt-*.so)
 		pushd rt > /dev/null
-		cp -a librt.so ${D}$(alt_libdir)/tls/${librtsofile} || die
+		cp -a librt.so "${D}"$(alt_libdir)/tls/${librtsofile} || die
 		dosym ${librtsofile} $(alt_libdir)/tls/$(ls librt.so.*)
 		popd > /dev/null
 
-		libthreaddbsofile=$(basename ${D}$(alt_libdir)/libthread_db-*.so)
+		libthreaddbsofile=$(basename "${D}"$(alt_libdir)/libthread_db-*.so)
 		pushd nptl_db > /dev/null
-		cp -a libthread_db.so ${D}$(alt_libdir)/tls/${libthreaddbsofile} || die
+		cp -a libthread_db.so "${D}"$(alt_libdir)/tls/${libthreaddbsofile} || die
 		dosym ${libthreaddbsofile} $(alt_libdir)/tls/$(ls libthread_db.so.*)
 		popd > /dev/null
 
 		libpthreadsofile=libpthread-${GLIBC_RELEASE_VER}.so
-		cp -a nptl/libpthread.so ${D}$(alt_libdir)/tls/${libpthreadsofile} || die
+		cp -a nptl/libpthread.so "${D}"$(alt_libdir)/tls/${libpthreadsofile} || die
 		dosym ${libpthreadsofile} $(alt_libdir)/tls/libpthread.so.0
 
 		# and now for the static libs
-		mkdir -p ${D}$(alt_usrlibdir)/nptl
+		mkdir -p "${D}"$(alt_usrlibdir)/nptl
 		cp -a libc.a nptl/libpthread.a nptl/libpthread_nonshared.a rt/librt.a \
-			${D}$(alt_usrlibdir)/nptl
+			"${D}"$(alt_usrlibdir)/nptl
 
 		# linker script crap
 		for lib in libc libpthread; do
 			sed -e "s:$(alt_libdir)/${lib}.so:$(alt_libdir)/tls/${lib}.so:g" \
 			    -e "s:$(alt_usrlibdir)/${lib}_nonshared.a:$(alt_usrlibdir)/nptl/${lib}_nonshared.a:g" \
-			          ${D}$(alt_usrlibdir)/${lib}.so \
-				> ${D}$(alt_usrlibdir)/nptl/${lib}.so
+			          "${D}"$(alt_usrlibdir)/${lib}.so \
+				> "${D}"$(alt_usrlibdir)/nptl/${lib}.so
 
-			chmod 755 ${D}$(alt_usrlibdir)/nptl/${lib}.so
+			chmod 755 "${D}"$(alt_usrlibdir)/nptl/${lib}.so
 		done
 
 		dosym ../librt.so $(alt_usrlibdir)/nptl/librt.so
 
 		# last but not least... headers.
-		mkdir -p ${D}/nptl ${D}$(alt_headers)/nptl
-		make install_root=${D}/nptl install-headers PARALLELMFLAGS="${MAKEOPTS} -j1"
-		pushd ${D}/nptl/$(alt_headers) > /dev/null
-			for i in `find . -type f`; do
-				if ! [ -f ${D}$(alt_headers)/$i ] \
-					|| ! cmp -s $i ${D}$(alt_headers)/$i; then
+		mkdir -p "${D}"/nptl "${D}"$(alt_headers)/nptl
+		make install_root="${D}"/nptl install-headers PARALLELMFLAGS="${MAKEOPTS} -j1"
+		pushd "${D}"/nptl/$(alt_headers) > /dev/null
+		for i in $(find . -type f) ; do
+			if ! [[ -f ${D}$(alt_headers)/$i ]] \
+			   || ! cmp -s $i ${D}$(alt_headers)/$i; then
 				mkdir -p ${D}$(alt_headers)/nptl/`dirname $i`
 				cp -a $i ${D}$(alt_headers)/nptl/$i
 			fi
 		done
+		popd > /dev/null
 		rm -rf ${D}/nptl
 	fi
 
-	# now, strip everything but the thread libs #46186
+	# Now, strip everything but the thread libs #46186, as well as the dynamic
+	# linker, else we cannot set breakpoints in shared libraries.
+	# Fix for ld-* by Lonnie Princehouse.
 	mkdir -p ${T}/thread-backup
-	mv -f ${D}$(alt_libdir)/lib{pthread,thread_db}* ${T}/thread-backup/
+	for x in ${D}$(alt_libdir)/lib{pthread,thread_db}* \
+	         ${D}$(alt_libdir)/ld-* ; do
+		[[ -f ${x} ]] && mv -f ${x} ${T}/thread-backup/
+	done
 	if want_linuxthreads && want_nptl ; then
 		mkdir -p ${T}/thread-backup/tls
-		mv -f ${D}$(alt_libdir)/tls/lib{pthread,thread_db}* ${T}/thread-backup/tls
+		for x in ${D}$(alt_libdir)/tls/lib{pthread,thread_db}* ; do
+			[[ -f ${x} ]] && mv -f ${x} ${T}/thread-backup/tls
+		done
 	fi
 	env -uRESTRICT CHOST=${CTARGET} prepallstrip
 	cp -a -- ${T}/thread-backup/* ${D}$(alt_libdir)/ || die
@@ -422,6 +426,7 @@ toolchain-glibc_src_install() {
 	# system headers correctly.  See gcc/doc/gccinstall.info
 	if is_crosscompile ; then
 		dosym include $(alt_prefix)/sys-include
+		dosym . $(alt_prefix)/usr
 		return 0
 	fi
 
@@ -433,7 +438,7 @@ toolchain-glibc_src_install() {
 	else
 		MYMAINBUILDDIR=build-${ABI}-${CTARGET}-nptl
 	fi
-	cd ${WORKDIR}/${MYMAINBUILDDIR}
+	cd "${WORKDIR}"/${MYMAINBUILDDIR}
 	if ! use build ; then
 		if ! has noinfo ${FEATURES} && [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then
 			einfo "Installing info pages..."
@@ -449,16 +454,16 @@ toolchain-glibc_src_install() {
 			einfo "Installing man pages..."
 
 			# Install linuxthreads man pages even if nptl is enabled
-			cd ${WORKDIR}/man
+			cd "${WORKDIR}"/man
 			doman *.3thr
 		fi
 
 		# Install nscd config file
 		insinto /etc
 		doins ${FILESDIR}/nscd.conf
+		doins "${FILESDIR}"/nsswitch.conf
 
-		exeinto /etc/init.d
-		doexe ${FILESDIR}/nscd
+		doinitd "${FILESDIR}"/nscd
 
 		cd ${S}
 		dodoc BUGS ChangeLog* CONFORMANCE FAQ INTERFACE NEWS NOTES PROJECTS README*
@@ -489,11 +494,16 @@ toolchain-glibc_src_install() {
 	doins ${FILESDIR}/2.3.4/host.conf
 
 	# simple test to make sure our new glibc isnt completely broken.
-	# for now, skip the multilib scenario.
+	# for now, skip the multilib scenario.  also make sure we don't
+	# test with statically built binaries since they will fail.
+	[[ ${CBUILD} != ${CHOST} ]] && return 0
 	[[ $(get_libdir) != "lib" ]] && return 0
 	for x in date env ls true uname ; do
 		x=$(type -p ${x})
 		[[ -z ${x} ]] && continue
+		striptest=$(file -L ${x} 2>/dev/null)
+		[[ -z ${striptest} ]] && continue
+		[[ ${striptest/statically linked} != "${striptest}" ]] && continue
 		"${D}"/$(get_libdir)/ld-*.so \
 			--library-path "${D}"/$(get_libdir) \
 			${x} > /dev/null \
@@ -530,7 +540,7 @@ toolchain-glibc_pkg_postinst() {
 		ln -s ../usr/share/zoneinfo/Factory ${ROOT}/etc/localtime
 	fi
 
-	if [ -x "${ROOT}/usr/sbin/iconvconfig" ] ; then
+	if ! is_crosscompile && [ -x "${ROOT}/usr/sbin/iconvconfig" ] ; then
 		# Generate fastloading iconv module configuration file.
 		${ROOT}/usr/sbin/iconvconfig --prefix=${ROOT}
 	fi
@@ -541,7 +551,7 @@ toolchain-glibc_pkg_postinst() {
 	fi
 
 	# Reload init ...
-	if [ "${ROOT}" = "/" ] ; then
+	if ! is_crosscompile && [ "${ROOT}" = "/" ] ; then
 		/sbin/init U &> /dev/null
 	fi
 
@@ -588,7 +598,7 @@ alt_prefix() {
 
 alt_libdir() {
 	if is_crosscompile ; then
-		echo /usr/${CTARGET}/lib
+		echo /usr/${CTARGET}/$(get_libdir)
 	else
 		echo /$(get_libdir)
 	fi
@@ -596,17 +606,13 @@ alt_libdir() {
 
 alt_usrlibdir() {
 	if is_crosscompile ; then
-		echo /usr/${CTARGET}/lib
+		echo /usr/${CTARGET}/$(get_libdir)
 	else
 		echo /usr/$(get_libdir)
 	fi
 }
 
 setup_flags() {
-	# If the user wants to use -fomit-frame-pointer, let the build system
-	# determine when it's safe
-	is-flag -fomit-frame-pointer && EXTRA_ECONF="--enable-omitfp ${EXTRA_ECONF}"
-
 	# Over-zealous CFLAGS can often cause problems.  What may work for one
 	# person may not work for another.  To avoid a large influx of bugs
 	# relating to failed builds, we strip most CFLAGS out to ensure as few
@@ -615,7 +621,7 @@ setup_flags() {
 	strip-unsupported-flags
 	filter-flags -m32 -m64 -mabi=*
 
-	has_multilib_profile && CTARGET_OPT="$(get_abi_CHOST)"
+	has_multilib_profile && CTARGET_OPT=$(get_abi_CHOST)
 
 	case $(tc-arch) in
 		ppc)
@@ -676,6 +682,7 @@ setup_flags() {
 
 	# Lock glibc at -O2 -- linuxthreads needs it and we want to be
 	# conservative here
+	filter-flags -O?
 	append-flags -O2
 }
 
@@ -745,7 +752,7 @@ want_nptl() {
 
 	# Archs that can use NPTL
 	case $(tc-arch) in
-		amd64|ia64|ppc|ppc64|s390|x86)
+		alpha|amd64|ia64|ppc|ppc64|s390|x86)
 			return 0;
 		;;
 		sparc)
@@ -779,9 +786,8 @@ want_tls() {
 			esac
 		;;
 		x86)
-			case ${CTARGET/-*} in
-				i486|i586|i686)	return 0 ;;
-			esac
+			# requires i486 or better #106556
+			[[ ${CTARGET} == i[4567]86* ]] && return 0
 		;;
 	esac
 
@@ -804,7 +810,7 @@ want__thread() {
 
 install_locales() {
 	unset LANGUAGE LANG LC_ALL
-	cd ${WORKDIR}/${MYMAINBUILDDIR} || die "${WORKDIR}/${MYMAINBUILDDIR}"
+	cd "${WORKDIR}"/${MYMAINBUILDDIR} || die "${WORKDIR}/${MYMAINBUILDDIR}"
 	make PARALLELMFLAGS="${MAKEOPTS} -j1" \
 		install_root=${D} localedata/install-locales || die
 }
@@ -847,16 +853,19 @@ glibc_do_configure() {
 	# set addons
 	pushd ${S} > /dev/null
 	ADDONS=$(echo */configure | sed -e 's!/configure!!g;s!\(linuxthreads\|nptl\|rtkaio\|glibc-compat\)\( \|$\)!!g;s! \+$!!;s! !,!g;s!^!,!;/^,\*$/d')
+	use glibc-compat20 && [[ -d glibc-compat ]] && ADDONS="${ADDONS},glibc-compat"
 	popd > /dev/null
 
 	use nls || myconf="${myconf} --disable-nls"
 	use erandom || myconf="${myconf} --disable-dev-erandom"
 
+	use glibc-omitfp && myconf="${myconf} --enable-omitfp"
+
 	if [ "$1" == "linuxthreads" ] ; then
 		if want_tls ; then
 			myconf="${myconf} --with-tls"
 
-			if want__thread ; then
+			if want__thread && use linuxthreads-tls ; then
 				myconf="${myconf} --with-__thread"
 			else
 				myconf="${myconf} --without-__thread"
@@ -875,26 +884,32 @@ glibc_do_configure() {
 		die "invalid pthread option"
 	fi
 
+	if ! use build && use selinux; then
+		myconf="${myconf} --with-selinux"
+	else
+		myconf="${myconf} --without-selinux"
+	fi
+
 	myconf="${myconf}
 		--without-cvs
 		--enable-bind-now
 		--build=${CBUILD_OPT:-${CBUILD}}
 		--host=${CTARGET_OPT:-${CTARGET}}
-		--disable-profile
+		$(use_enable profile)
 		--without-gd
-		--with-headers=$(alt_headers)
+		--with-headers=${ROOT}$(alt_headers)
 		--prefix=$(alt_prefix)
 		--mandir=$(alt_prefix)/share/man
 		--infodir=$(alt_prefix)/share/info
 		--libexecdir=$(alt_prefix)/lib/misc/glibc
 		${EXTRA_ECONF}"
 
-	export CC="$(tc-getCC ${CTARGET})"
+	has_version app-admin/eselect-compiler || export CC="$(tc-getCC ${CTARGET})"
 
-	GBUILDDIR="${WORKDIR}/build-${ABI}-${CTARGET}-$1"
+	GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-$1
 	mkdir -p ${GBUILDDIR}
 	cd ${GBUILDDIR}
-	einfo "Configuring GLIBC for $1 with: ${myconf}"
+	einfo "Configuring GLIBC for $1 with: ${myconf// /\n\t\t}"
 	${S}/configure ${myconf} || die "failed to configure glibc"
 }
 
@@ -912,7 +927,8 @@ fix_lib64_symlinks() {
 		rm ${ROOT}/lib64
 		# now that lib64 is gone, nothing will run without calling ld.so
 		# directly. luckily the window of brokenness is almost non-existant
-		/lib/ld-linux-x86-64.so.2 /bin/mv ${ROOT}/lib ${ROOT}/lib64
+		use amd64 && /lib/ld-linux-x86-64.so.2 /bin/mv ${ROOT}/lib ${ROOT}/lib64
+		use ppc64 && /lib/ld64.so.1 /bin/mv ${ROOT}/lib ${ROOT}/lib64
 		# all better :)
 		ldconfig
 		ln -s lib64 ${ROOT}/lib
@@ -936,33 +952,10 @@ fix_lib64_symlinks() {
 }
 
 use_multilib() {
-	case $(tc-arch) in
-		sparc)
-			case ${CHOST} in
-				sparc64*)
-					is_crosscompile || has_multilib_profile || use multilib
-					;;
-				*)
-					false
-					;;
-			esac
-		;;
-		mips)
-			case ${CHOST} in
-				mips64*)
-					is_crosscompile || has_multilib_profile || use multilib
-					;;
-				*)
-					false
-					;;
-			esac
-		;;
-		amd64|ppc64)
-			is_crosscompile || has_multilib_profile || use multilib
-		;;
-		*)
-			false
-		;;
+	case ${CTARGET} in
+		sparc64*|mips64*|amd64|ppc64)
+			is_crosscompile || has_multilib_profile || use multilib ;;
+		*)  false ;;
 	esac
 }
 
@@ -975,13 +968,13 @@ crosscompile_setup() {
 
 		case ${CTARGET} in
 			x86_64*)
-				export CFLAGS_x86="${CFLAGS_x86--m32}"
-				export CHOST_x86="i686-pc-linux-gnu"
+				export CFLAGS_x86=${CFLAGS_x86--m32}
+				export CHOST_x86=${CTARGET/x86_64/i686}
 				export CDEFINE_x86="__i386__"
 				export LIBDIR_x86="lib"
 
-				export CFLAGS_amd64="${CFLAGS_amd64--m64}"
-				export CHOST_amd64="x86_64-pc-linux-gnu"
+				export CFLAGS_amd64=${CFLAGS_amd64--m64}
+				export CHOST_amd64=${CTARGET}
 				export CDEFINE_amd64="__x86_64__"
 				export LIBDIR_amd64="lib64"
 
@@ -989,18 +982,18 @@ crosscompile_setup() {
 				export DEFAULT_ABI="amd64"
 			;;
 			mips64*)
-				export CFLAGS_o32="${CFLAGS_o32--mabi=32}"
-				export CHOST_o32="mips-unknown-linux-gnu"
+				export CFLAGS_o32=${CFLAGS_o32--mabi=32}
+				export CHOST_o32=${CTARGET/mips64/mips}
 				export CDEFINE_o32="_ABIO32"
 				export LIBDIR_o32="lib"
 
-				export CFLAGS_n32="${CFLAGS_n32--mabi=n32}"
-				export CHOST_n32="mips64-unknown-linux-gnu"
+				export CFLAGS_n32=${CFLAGS_n32--mabi=n32}
+				export CHOST_n32=${CTARGET}
 				export CDEFINE_n32="_ABIN32"
 				export LIBDIR_n32="lib32"
 
-				export CFLAGS_n64="${CFLAGS_n64--mabi=64}"
-				export CHOST_n64="mips64-unknown-linux-gnu"
+				export CFLAGS_n64=${CFLAGS_n64--mabi=64}
+				export CHOST_n64=${CTARGET}
 				export CDEFINE_n64="_ABI64"
 				export LIBDIR_n64="lib64"
 
@@ -1008,29 +1001,27 @@ crosscompile_setup() {
 				export DEFAULT_ABI="n32"
 			;;
 			powerpc64*)
-				export CFLAGS_ppc="${CFLAGS_ppc--m32}"
-				export CHOST_ppc="powerpc-unknown-linux-gnu"
-				export CDEFINE_ppc=""
+				export CFLAGS_ppc=${CFLAGS_ppc--m32}
+				export CHOST_ppc=${CTARGET/powerpc64/powerpc}
+				export CDEFINE_ppc="!__powerpc64__"
 				export LIBDIR_ppc="lib"
 
-				export CFLAGS_ppc64="${CFLAGS_ppc64--m64}"
-				export CHOST_ppc64="powerpc64-unknown-linux-gnu"
-				export CDEFINE_ppc64=""
+				export CFLAGS_ppc64=${CFLAGS_ppc64--m64}
+				export CHOST_ppc64=${CTARGET}
+				export CDEFINE_ppc64="__powerpc64__"
 				export LIBDIR_ppc64="lib64"
 
 				export MULTILIB_ABIS="ppc64"
 				export DEFAULT_ABI="ppc64"
-
-				die "ppc64 crosscompile not yet supported.  Bug a ppc64 dev to fill in the CDEFINE values in the glibc ebuild."
 			;;
 			sparc64*)
-				export CFLAGS_sparc32="${CFLAGS_sparc--m32}"
-				export CHOST_sparc32="sparc-unknown-linux-gnu"
+				export CFLAGS_sparc32=${CFLAGS_sparc--m32}
+				export CHOST_sparc32=${CTARGET/sparc64/sparc}
 				export CDEFINE_sparc32="!__arch64__"
 				export LIBDIR_sparc32="lib"
 
-				export CFLAGS_sparc64="${CFLAGS_sparc64--m64}"
-				export CHOST_sparc64="sparc64-unknown-linux-gnu"
+				export CFLAGS_sparc64=${CFLAGS_sparc64--m64}
+				export CHOST_sparc64=${CTARGET}
 				export CDEFINE_sparc64="__arch64__"
 				export LIBDIR_sparc64="lib64"
 
@@ -1068,42 +1059,24 @@ DEPEND=">=sys-devel/gcc-3.4
 	>=sys-devel/binutils-2.15.90
 	>=sys-devel/gcc-config-1.3.9
 	virtual/os-headers
-	nls? ( sys-devel/gettext )"
-
+	nls? ( sys-devel/gettext )
+	selinux? ( !build? ( sys-libs/libselinux ) )"
 RDEPEND="virtual/os-headers
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+	selinux? ( !build? ( sys-libs/libselinux ) )"
 
 if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-	DEPEND="${DEPEND}
-	        >=${CATEGORY}/gcc-3.4"
+	DEPEND="${DEPEND} ${CATEGORY}/gcc"
 
-	if [[ ${CATEGORY/mips} != ${CATEGORY} ]] ; then
-		DEPEND="${DEPEND}
-		        >=${CATEGORY}/mips-headers-2.6.10"
-	else
-		DEPEND="${DEPEND}
-		        >=${CATEGORY}/linux-headers-2.6.8"
+	if [[ ${CATEGORY} == *-linux* ]] ; then
+		if [[ ${CATEGORY/mips} != ${CATEGORY} ]] ; then
+			DEPEND="${DEPEND} >=${CATEGORY}/mips-headers-2.6.10"
+		else
+			DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
+		fi
 	fi
-
-	case ${CTARGET} in
-		x86_64-pc-linux-gnu)
-			[[ ${CHOST/-*/} == "i686" ]] || RDEPEND="${RDEPEND} cross-i686-pc-linux-gnu/${PN}"
-		;;
-		sparc64-unknown-linux-gnu)
-			[[ ${CHOST/-*/} == "sparc" ]] || RDEPEND="${RDEPEND} cross-sparc-unknown-linux-gnu/${PN}"
-		;;
-		powerpc64-unknown-linux-gnu)
-			[[ ${CHOST/-*/} == "powerpc" ]] || RDEPEND="${RDEPEND} cross-powerpc-unknown-linux-gnu/${PN}"
-		;;
-		mips64-unknown-linux-gnu)
-			[[ ${CHOST/-*/} == "mips" ]] || RDEPEND="${RDEPEND} cross-mips-unknown-linux-gnu/${PN}"
-		;;
-	esac
 fi
 
-# until amd64's 2004.3 is purged out of existence
-PDEPEND="amd64? ( multilib? ( >=app-emulation/emul-linux-x86-glibc-2.3.4 ) )"
-
 pkg_setup() {
 	if use nptlonly && ! use nptl ; then
 		eerror "If you want nptlonly, add nptl to your USE too ;p"
@@ -1158,10 +1131,15 @@ src_unpack() {
 		;;
 	esac
 
-	use nomalloccheck || GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 5020_all_nomalloccheck.patch"
-
 	toolchain-glibc_src_unpack
 
+	# XXX: do not package ssp up into tarballs, leave it in FILESDIR
+	cd "${S}"
+	cp "${FILESDIR}"/2.3.5/ssp.c sysdeps/unix/sysv/linux/ || die "could not find ssp.c"
+	rm -f "${WORKDIR}"/patches/2*
+	epatch "${FILESDIR}"/2.3.5/glibc-2.3.5-propolice-guard-functions.patch
+	epatch "${FILESDIR}"/2.3.5/glibc-2.3.5-frandom-detect.patch
+
 	case $(tc-arch) in
 		alpha)
 			# Is this still needed?
@@ -1180,6 +1158,8 @@ src_unpack() {
 		;;
 	esac
 
+	GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 5020_all_nomalloccheck.patch"
+
 	# disable binutils -as-needed
 	sed -e 's/^have-as-needed.*/have-as-needed = no/' -i ${S}/config.make.in
 
@@ -1210,20 +1190,22 @@ src_unpack() {
 src_compile() {
 	crosscompile_setup
 
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if has_multilib_profile && [ -z "${OABI}" -a "${MLTEST/set_abi}" = "${MLTEST}" ] ; then
-		OABI="${ABI}"
-		for ABI in $(get_install_abis); do
-			export ABI
-			einfo "Compiling ${ABI} glibc"
-			src_compile
-		done
-		ABI="${OABI}"
-		unset OABI
-		return 0
+	if [[ -z ${OABI} ]] && has_multilib_profile ; then
+		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+		local MLTEST=$(type dyn_unpack)
+		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
+			OABI=${ABI}
+			einfo "Building multilib glibc for ABIs: $(get_install_abis)"
+			for ABI in $(get_install_abis) ; do
+				export ABI=${ABI}
+				src_compile
+			done
+			ABI=${OABI}
+			unset OABI
+			return 0
+		fi
+		unset MLTEST
 	fi
-	unset MLTEST
 
 	ABI=${ABI:-default}
 	toolchain-glibc_src_compile
@@ -1232,20 +1214,23 @@ src_compile() {
 src_test() {
 	crosscompile_setup
 
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if has_multilib_profile && [ -z "${OABI}" -a "${MLTEST/set_abi}" = "${MLTEST}" ] ; then
-		OABI="${ABI}"
-		for ABI in $(get_install_abis); do
-			export ABI
-			einfo "Testing ${ABI} glibc"
-			src_test
-		done
-		ABI="${OABI}"
-		unset OABI
-		return 0
+	if [[ -z ${OABI} ]] && has_multilib_profile ; then
+		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+		local MLTEST=$(type dyn_unpack)
+		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
+			OABI=${ABI}
+			einfo "Testing multilib glibc for ABIs: $(get_install_abis)"
+			for ABI in $(get_install_abis) ; do
+				export ABI
+				einfo "   Testing ${ABI} glibc"
+				src_test
+			done
+			ABI=${OABI}
+			unset OABI
+			return 0
+		fi
+		unset MLTEST
 	fi
-	unset MLTEST
 
 	ABI=${ABI:-default}
 	toolchain-glibc_src_test
@@ -1254,52 +1239,63 @@ src_test() {
 src_install() {
 	crosscompile_setup
 
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if has_multilib_profile && [ -z "${OABI}" -a "${MLTEST/set_abi}" = "${MLTEST}" ] ; then
-		OABI="${ABI}"
-		for ABI in $(get_install_abis); do
-			export ABI
-			einfo "Installing ${ABI} glibc"
-			src_install
-		done
-		ABI="${OABI}"
-		unset OABI
-		return 0
+	if [[ -z ${OABI} ]] && has_multilib_profile ; then
+		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+		local MLTEST=$(type dyn_unpack)
+		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
+			OABI=${ABI}
+			einfo "Installing multilib glibc for ABIs: $(get_install_abis)"
+			for ABI in $(get_install_abis) ; do
+				export ABI
+				src_install
+			done
+			ABI=${OABI}
+			unset OABI
+			return 0
+		fi
+		unset MLTEST
 	fi
-	unset MLTEST
 
 	ABI=${ABI:-default}
 
 	# Handle stupid lib32 BS
 	unset OLD_LIBDIR
-	if [[ $(tc-arch) == "amd64" && ${ABI} == "x86" && $(get_libdir) != "lib" ]] && ! is_crosscompile; then
-		OLD_LIBDIR="$(get_libdir)"
-		LIBDIR_x86="lib"
+	if ! is_crosscompile ; then
+		if [[ $(tc-arch) == "amd64" && ${ABI} == "x86" && $(get_libdir) != "lib" ]] ; then
+			OLD_LIBDIR=$(get_libdir)
+			LIBDIR_x86="lib"
+		fi
+
+		if [[ $(tc-arch) == "ppc64" && ${ABI} == "ppc" && $(get_libdir) != "lib" ]] ; then
+			OLD_LIBDIR=$(get_libdir)
+			LIBDIR_ppc="lib"
+		fi
 	fi
 
 	toolchain-glibc_src_install
 
-	# Handle stupid lib32 BS on amd64
+	# Handle stupid lib32 BS on amd64 and ppc64
 	if [[ -n ${OLD_LIBDIR} ]] ; then
-		cd ${S}
-		LIBDIR_x86="${OLD_LIBDIR}"
+		cd "${S}"
+		[[ $(tc-arch) == "amd64" ]] && LIBDIR_x86=${OLD_LIBDIR}
+		[[ $(tc-arch) == "ppc64" ]] && LIBDIR_ppc=${OLD_LIBDIR}
 		unset OLD_LIBDIR
 
-		mv ${D}/lib ${D}/$(get_libdir)
-		mv ${D}/usr/lib ${D}/usr/$(get_libdir)
+		mv "${D}"/lib "${D}"/$(get_libdir)
+		mv "${D}"/usr/lib "${D}"/usr/$(get_libdir)
 		dodir /lib
 		dodir /usr/lib
-		mv ${D}/usr/$(get_libdir)/locale ${D}/usr/lib
-		dosym ../$(get_libdir)/ld-linux.so.2 /lib/ld-linux.so.2
-
-		for f in ${D}/usr/$(get_libdir)/*.so; do
-			local basef=$(basename ${f})
-			if [ -L ${f} ] ; then
-				local target=$(readlink ${f})
+		mv "${D}"/usr/$(get_libdir)/locale "${D}"/usr/lib
+		[[ $(tc-arch) == "amd64" ]] && dosym ../$(get_libdir)/ld-linux.so.2 /lib/ld-linux.so.2
+		[[ $(tc-arch) == "ppc64" ]] && dosym ../$(get_libdir)/ld.so.1 /lib/ld.so.1
+
+		for f in "${D}"/usr/$(get_libdir)/*.so; do
+			local basef=$(basename "${f}")
+			if [[ -L ${f} ]] ; then
+				local target=$(readlink "${f}")
 				target=${target/\/lib\//\/$(get_libdir)\/}
-				rm ${f}
-				dosym ${target} /usr/$(get_libdir)/${basef}
+				rm "${f}"
+				dosym "${target}" /usr/$(get_libdir)/"${basef}"
 			fi
 		done
 
diff --git a/sys-libs/glibc/glibc-2.3.5.20050722.ebuild b/sys-libs/glibc/glibc-2.3.5.20050722.ebuild
index 39e6a2b33774..818eacccdffa 100644
--- a/sys-libs/glibc/glibc-2.3.5.20050722.ebuild
+++ b/sys-libs/glibc/glibc-2.3.5.20050722.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.20050722.ebuild,v 1.1 2005/07/24 19:58:11 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.20050722.ebuild,v 1.1.1.1 2005/11/30 09:39:28 chriswhite Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -18,9 +18,8 @@
 
 KEYWORDS="-*"
 
-# Do not define this, and name the ebuild glibc-<ver>.<branch update>.ebuild,
-# and it should  just work.
-BRANCH_UPDATE=""
+# This is taken from ${PV}
+# BRANCH_UPDATE=""
 
 # From linuxthreads/man
 GLIBC_MANPAGE_VERSION="2.3.5"
@@ -34,12 +33,12 @@ PATCH_VER="2.3"
 # C Stubbs addon (contained in fedora, so ignoring)
 #CSTUBS_VER="2.1.2"
 #CSTUBS_TARBALL="c_stubs-${CSTUBS_VER}.tar.bz2"
-#CSTUBS_URI="http://dev.gentoo.org/~eradicator/glibc/${CSTUBS_TARBALL}"
+#CSTUBS_URI="mirror://gentoo/${CSTUBS_TARBALL}"
 
 # Fedora addons (from RHEL's glibc-2.3.4-2.src.rpm)
 FEDORA_VER="20041219T2331"
 FEDORA_TARBALL="glibc-fedora-${FEDORA_VER}.tar.bz2"
-FEDORA_URI="http://dev.gentoo.org/~eradicator/glibc/${FEDORA_TARBALL}"
+FEDORA_URI="mirror://gentoo/${FEDORA_TARBALL}"
 
 GENTOO_TOOLCHAIN_BASE_URI="http://dev.gentoo.org/~azarah/glibc"
 
@@ -69,17 +68,8 @@ is_crosscompile() {
 
 GLIBC_RELEASE_VER=$(get_version_component_range 1-3)
 
-## Don't set this to :-, - allows BRANCH_UPDATE=""
-#
-# Above is _WRONG_ .. from the bash manual:
-#
-#   ${parameter:-word}
-#     Use  Default Values.  If parameter is unset or null, the expansion of
-#     word is substituted.
-#
-# So, '-' will only work if $BRANCH_UPDATE is _UNSET_, and we _HAVE_ to
-# use ':-' instead ...
-BRANCH_UPDATE=${BRANCH_UPDATE:-$(get_version_component_range 4)}
+# Don't set this to :-, - allows BRANCH_UPDATE=""
+BRANCH_UPDATE=${BRANCH_UPDATE-$(get_version_component_range 4)}
 
 # (Recent snapshots fails with 2.6.5 and earlier with NPTL)
 NPTL_KERNEL_VERSION=${NPTL_KERNEL_VERSION:-"2.6.6"}
@@ -129,7 +119,7 @@ get_glibc_src_uri() {
 	# This variable should be set to the devspace of whoever is currently
 	# maintaining GLIBC. Please dont set this to mirror, that would just
 	# make the files unavailable until they get mirrored.
-	local devspace_uri="http://dev.gentoo.org/~eradicator/glibc/"
+	local devspace_uri="mirror://gentoo/"
 	GENTOO_TOOLCHAIN_BASE_URI=${GENTOO_TOOLCHAIN_BASE_URI:-${devspace_uri}}
 
 #	GLIBC_SRC_URI="http://ftp.gnu.org/gnu/glibc/${PN}-${GLIBC_RELEASE_VER}.tar.bz2
@@ -171,7 +161,7 @@ get_glibc_src_uri() {
 }
 
 SRC_URI=$(get_glibc_src_uri)
-S="${WORKDIR}/${PN}-${GLIBC_RELEASE_VER}"
+S=${WORKDIR}/${PN}-${GLIBC_RELEASE_VER}
 
 ### EXPORTED FUNCTIONS ###
 toolchain-glibc_src_unpack() {
@@ -196,10 +186,6 @@ toolchain-glibc_src_unpack() {
 	# infopages else it does not help much (mtimes change if there is a change
 	# to them with branchupdate)
 	if [[ -n ${BRANCH_UPDATE} ]] ; then
-		cd "${WORKDIR}"
-		# Why is it being unpacked first??
-		#unpack ${PN}-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
-
 		cd "${S}"
 		epatch "${DISTDIR}"/${PN}-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
 
@@ -230,8 +216,15 @@ toolchain-glibc_src_unpack() {
 
 toolchain-glibc_src_compile() {
 	# Set gconvdir to /usr/$(get_libdir)/gconv on archs with multiple ABIs
+	local MAKEFLAGS=""
 	has_multilib_profile && MAKEFLAGS="gconvdir=$(alt_usrlibdir)/gconv"
 
+	echo
+	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CFLAGS ; do
+		einfo " $(printf '%15s' ${v}:)   ${!v}"
+	done
+	echo
+
 	if want_linuxthreads ; then
 		glibc_do_configure linuxthreads
 		einfo "Building GLIBC with linuxthreads..."
@@ -239,7 +232,7 @@ toolchain-glibc_src_compile() {
 	fi
 	if want_nptl ; then
 		# ... and then do the optional nptl build
-		unset LD_ASSUME_KERNEL || :
+		unset LD_ASSUME_KERNEL
 		glibc_do_configure nptl
 		einfo "Building GLIBC with NPTL..."
 		make PARALLELMFLAGS="${MAKEOPTS}" ${MAKEFLAGS} || die
@@ -253,12 +246,12 @@ toolchain-glibc_src_test() {
 
 	# do the linuxthreads build unless we're using nptlonly
 	if want_linuxthreads ; then
-		cd ${WORKDIR}/build-${ABI}-${CTARGET}-linuxthreads
+		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads
 		einfo "Checking GLIBC with linuxthreads..."
 		make check || die "linuxthreads glibc did not pass make check"
 	fi
 	if want_nptl ; then
-		cd ${WORKDIR}/build-${ABI}-${CTARGET}-nptl
+		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl
 		unset LD_ASSUME_KERNEL || :
 		einfo "Checking GLIBC with NPTL..."
 		make check || die "nptl glibc did not pass make check"
@@ -290,7 +283,7 @@ toolchain-glibc_pkg_preinst() {
 }
 
 toolchain-glibc_src_install() {
-	setup_flags
+	setup_env
 
 	# Need to dodir first because it might not exist (bad amd64 profiles)
 	dodir $(alt_usrlibdir)
@@ -300,16 +293,16 @@ toolchain-glibc_src_install() {
 	unset LANGUAGE LANG LC_ALL
 
 	if want_linuxthreads ; then
-		cd ${WORKDIR}/build-${ABI}-${CTARGET}-linuxthreads
-		einfo "Installing GLIBC with linuxthreads..."
+		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads
+		einfo "Installing GLIBC ${ABI} with linuxthreads ..."
 		make PARALLELMFLAGS="${MAKEOPTS} -j1" \
-			install_root=${D} \
+			install_root="${D}" \
 			install || die
 	else # nptlonly
-		cd ${WORKDIR}/build-${ABI}-${CTARGET}-nptl
-		einfo "Installing GLIBC with NPTL..."
+		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl
+		einfo "Installing GLIBC ${ABI} with NPTL ..."
 		make PARALLELMFLAGS="${MAKEOPTS} -j1" \
-			install_root=${D} \
+			install_root="${D}" \
 			install || die
 	fi
 
@@ -319,7 +312,7 @@ toolchain-glibc_src_install() {
 		# crosscompile.
 		if [[ $(get_libdir) != "lib" && -d ${D}$(alt_prefix)/lib ]] ; then
 			dodir $(alt_libdir)
-			mv ${D}$(alt_prefix)/lib/* ${D}$(alt_libdir)
+			mv "${D}"$(alt_prefix)/lib/* "${D}"$(alt_libdir)
 		fi
 
 		# punt all the junk not needed by a cross-compiler
@@ -328,58 +321,58 @@ toolchain-glibc_src_install() {
 
 	if want_linuxthreads && want_nptl ; then
 		einfo "Installing NPTL to $(alt_libdir)/tls/..."
-		cd ${WORKDIR}/build-${ABI}-${CTARGET}-nptl
-		mkdir -p ${D}$(alt_libdir)/tls/
+		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl
+		mkdir -p "${D}"$(alt_libdir)/tls/
 
-		libcsofile=$(basename ${D}$(alt_libdir)/libc-*.so)
-		cp -a libc.so ${D}$(alt_libdir)/tls/${libcsofile} || die
+		libcsofile=$(basename "${D}"$(alt_libdir)/libc-*.so)
+		cp -a libc.so "${D}"$(alt_libdir)/tls/${libcsofile} || die
 		dosym ${libcsofile} $(alt_libdir)/tls/$(ls libc.so.*)
 
-		libmsofile=$(basename ${D}$(alt_libdir)/libm-*.so)
+		libmsofile=$(basename "${D}"$(alt_libdir)/libm-*.so)
 		pushd math > /dev/null
-		cp -a libm.so ${D}$(alt_libdir)/tls/${libmsofile} || die
+		cp -a libm.so "${D}"$(alt_libdir)/tls/${libmsofile} || die
 		dosym ${libmsofile} $(alt_libdir)/tls/$(ls libm.so.*)
 		popd > /dev/null
 
-		librtsofile=$(basename ${D}$(alt_libdir)/librt-*.so)
+		librtsofile=$(basename "${D}"$(alt_libdir)/librt-*.so)
 		pushd rt > /dev/null
-		cp -a librt.so ${D}$(alt_libdir)/tls/${librtsofile} || die
+		cp -a librt.so "${D}"$(alt_libdir)/tls/${librtsofile} || die
 		dosym ${librtsofile} $(alt_libdir)/tls/$(ls librt.so.*)
 		popd > /dev/null
 
-		libthreaddbsofile=$(basename ${D}$(alt_libdir)/libthread_db-*.so)
+		libthreaddbsofile=$(basename "${D}"$(alt_libdir)/libthread_db-*.so)
 		pushd nptl_db > /dev/null
-		cp -a libthread_db.so ${D}$(alt_libdir)/tls/${libthreaddbsofile} || die
+		cp -a libthread_db.so "${D}"$(alt_libdir)/tls/${libthreaddbsofile} || die
 		dosym ${libthreaddbsofile} $(alt_libdir)/tls/$(ls libthread_db.so.*)
 		popd > /dev/null
 
 		libpthreadsofile=libpthread-${GLIBC_RELEASE_VER}.so
-		cp -a nptl/libpthread.so ${D}$(alt_libdir)/tls/${libpthreadsofile} || die
+		cp -a nptl/libpthread.so "${D}"$(alt_libdir)/tls/${libpthreadsofile} || die
 		dosym ${libpthreadsofile} $(alt_libdir)/tls/libpthread.so.0
 
 		# and now for the static libs
-		mkdir -p ${D}$(alt_usrlibdir)/nptl
+		mkdir -p "${D}"$(alt_usrlibdir)/nptl
 		cp -a libc.a nptl/libpthread.a nptl/libpthread_nonshared.a rt/librt.a \
-			${D}$(alt_usrlibdir)/nptl
+			"${D}"$(alt_usrlibdir)/nptl
 
 		# linker script crap
 		for lib in libc libpthread; do
 			sed -e "s:$(alt_libdir)/${lib}.so:$(alt_libdir)/tls/${lib}.so:g" \
 			    -e "s:$(alt_usrlibdir)/${lib}_nonshared.a:$(alt_usrlibdir)/nptl/${lib}_nonshared.a:g" \
-			          ${D}$(alt_usrlibdir)/${lib}.so \
-				> ${D}$(alt_usrlibdir)/nptl/${lib}.so
+			          "${D}"$(alt_usrlibdir)/${lib}.so \
+				> "${D}"$(alt_usrlibdir)/nptl/${lib}.so
 
-			chmod 755 ${D}$(alt_usrlibdir)/nptl/${lib}.so
+			chmod 755 "${D}"$(alt_usrlibdir)/nptl/${lib}.so
 		done
 
 		dosym ../librt.so $(alt_usrlibdir)/nptl/librt.so
 
 		# last but not least... headers.
-		mkdir -p ${D}/nptl ${D}$(alt_headers)/nptl
-		make install_root=${D}/nptl install-headers PARALLELMFLAGS="${MAKEOPTS} -j1"
-		pushd ${D}/nptl/$(alt_headers) > /dev/null
-		for i in `find . -type f`; do
-			if ! [ -f ${D}$(alt_headers)/$i ] \
+		mkdir -p "${D}"/nptl "${D}"$(alt_headers)/nptl
+		make install_root="${D}"/nptl install-headers PARALLELMFLAGS="${MAKEOPTS} -j1"
+		pushd "${D}"/nptl/$(alt_headers) > /dev/null
+		for i in $(find . -type f) ; do
+			if ! [[ -f ${D}$(alt_headers)/$i ]] \
 			   || ! cmp -s $i ${D}$(alt_headers)/$i; then
 				mkdir -p ${D}$(alt_headers)/nptl/`dirname $i`
 				cp -a $i ${D}$(alt_headers)/nptl/$i
@@ -400,7 +393,7 @@ toolchain-glibc_src_install() {
 	if want_linuxthreads && want_nptl ; then
 		mkdir -p ${T}/thread-backup/tls
 		for x in ${D}$(alt_libdir)/tls/lib{pthread,thread_db}* ; do
-			[[ -f ${x} ]] && mv -f ${T}/thread-backup/tls
+			[[ -f ${x} ]] && mv -f ${x} ${T}/thread-backup/tls
 		done
 	fi
 	env -uRESTRICT CHOST=${CTARGET} prepallstrip
@@ -433,6 +426,7 @@ toolchain-glibc_src_install() {
 	# system headers correctly.  See gcc/doc/gccinstall.info
 	if is_crosscompile ; then
 		dosym include $(alt_prefix)/sys-include
+		dosym . $(alt_prefix)/usr
 		return 0
 	fi
 
@@ -444,7 +438,7 @@ toolchain-glibc_src_install() {
 	else
 		MYMAINBUILDDIR=build-${ABI}-${CTARGET}-nptl
 	fi
-	cd ${WORKDIR}/${MYMAINBUILDDIR}
+	cd "${WORKDIR}"/${MYMAINBUILDDIR}
 	if ! use build ; then
 		if ! has noinfo ${FEATURES} && [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then
 			einfo "Installing info pages..."
@@ -460,7 +454,7 @@ toolchain-glibc_src_install() {
 			einfo "Installing man pages..."
 
 			# Install linuxthreads man pages even if nptl is enabled
-			cd ${WORKDIR}/man
+			cd "${WORKDIR}"/man
 			doman *.3thr
 		fi
 
@@ -604,7 +598,10 @@ alt_prefix() {
 
 alt_libdir() {
 	if is_crosscompile ; then
-		echo /usr/${CTARGET}/lib
+		case ${CTARGET} in
+			mips64*) echo /usr/${CTARGET}/$(get_libdir) ;;
+			*)	 echo /usr/${CTARGET}/lib ;;
+		esac
 	else
 		echo /$(get_libdir)
 	fi
@@ -612,13 +609,23 @@ alt_libdir() {
 
 alt_usrlibdir() {
 	if is_crosscompile ; then
-		echo /usr/${CTARGET}/lib
+		case ${CTARGET} in
+			mips64*) echo /usr/${CTARGET}/$(get_libdir) ;;
+			*)	 echo /usr/${CTARGET}/lib ;;
+		esac
 	else
 		echo /usr/$(get_libdir)
 	fi
 }
 
 setup_flags() {
+	# Store our CFLAGS because it's changed depending on which CTARGET
+	# we are building when pulling glibc on a multilib profile
+	CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}}
+	CFLAGS=${CFLAGS_BASE}
+	ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}}
+	ASFLAGS=${ASFLAGS_BASE}
+
 	# Over-zealous CFLAGS can often cause problems.  What may work for one
 	# person may not work for another.  To avoid a large influx of bugs
 	# relating to failed builds, we strip most CFLAGS out to ensure as few
@@ -627,7 +634,11 @@ setup_flags() {
 	strip-unsupported-flags
 	filter-flags -m32 -m64 -mabi=*
 
-	has_multilib_profile && CTARGET_OPT="$(get_abi_CHOST)"
+	unset CBUILD_OPT CTARGET_OPT
+	if has_multilib_profile ; then
+		CTARGET_OPT=$(get_abi_CTARGET)
+		[[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST)
+	fi
 
 	case $(tc-arch) in
 		ppc)
@@ -642,15 +653,17 @@ setup_flags() {
 			if is_crosscompile || [[ ${PROFILE_ARCH} == "sparc64" ]] || { has_multilib_profile && ! tc-is-cross-compiler; } ; then
 				case ${ABI} in
 					sparc64)
+						filter-flags -Wa,-xarch -Wa,-A
+
 						if is-flag "-mcpu=ultrasparc3"; then
 							CTARGET_OPT="sparc64b-unknown-linux-gnu"
-							CFLAGS_sparc64="$(get_abi_CFLAGS) -Wa,-xarch=v9b"
+							append-flags "-Wa,-xarch=v9b"
+							export ASFLAGS="${ASFLAGS} -Wa,-xarch=v9b"
 						else
 							CTARGET_OPT="sparc64-unknown-linux-gnu"
-							CFLAGS_sparc64="$(get_abi_CFLAGS) -Wa,-xarch=v9a"
+							append-flags "-Wa,-xarch=v9a"
+							export ASFLAGS="${ASFLAGS} -Wa,-xarch=v9a"
 						fi
-
-						filter-flags -Wa,-xarch -Wa,-A
 					;;
 					*)
 						if is-flag "-mcpu=ultrasparc3"; then
@@ -688,6 +701,7 @@ setup_flags() {
 
 	# Lock glibc at -O2 -- linuxthreads needs it and we want to be
 	# conservative here
+	filter-flags -O?
 	append-flags -O2
 }
 
@@ -757,7 +771,7 @@ want_nptl() {
 
 	# Archs that can use NPTL
 	case $(tc-arch) in
-		amd64|ia64|ppc|ppc64|s390|x86)
+		alpha|amd64|ia64|ppc|ppc64|s390|x86)
 			return 0;
 		;;
 		sparc)
@@ -791,9 +805,8 @@ want_tls() {
 			esac
 		;;
 		x86)
-			case ${CTARGET/-*} in
-				i486|i586|i686)	return 0 ;;
-			esac
+			# requires i486 or better #106556
+			[[ ${CTARGET} == i[4567]86* ]] && return 0
 		;;
 	esac
 
@@ -816,7 +829,7 @@ want__thread() {
 
 install_locales() {
 	unset LANGUAGE LANG LC_ALL
-	cd ${WORKDIR}/${MYMAINBUILDDIR} || die "${WORKDIR}/${MYMAINBUILDDIR}"
+	cd "${WORKDIR}"/${MYMAINBUILDDIR} || die "${WORKDIR}/${MYMAINBUILDDIR}"
 	make PARALLELMFLAGS="${MAKEOPTS} -j1" \
 		install_root=${D} localedata/install-locales || die
 }
@@ -848,7 +861,7 @@ setup_locales() {
 glibc_do_configure() {
 	local myconf
 
-	setup_flags
+	setup_env
 
 	# These should not be set, else the
 	# zoneinfo do not always get installed ...
@@ -866,10 +879,9 @@ glibc_do_configure() {
 	use erandom || myconf="${myconf} --disable-dev-erandom"
 
 	use glibc-omitfp && myconf="${myconf} --enable-omitfp"
-	use profile && myconf="${myconf} --enable-profiling"
 
 	if [ "$1" == "linuxthreads" ] ; then
-		if want_tls && [[ ${CTARGET} != "i486-pc-linux-gnu" && ${CTARGET} != "i586-pc-linux-gnu" ]] ; then
+		if want_tls && [[ ${CTARGET} != i[45]86-* ]] ; then
 			myconf="${myconf} --with-tls"
 
 			if want__thread && use linuxthreads-tls ; then
@@ -902,21 +914,21 @@ glibc_do_configure() {
 		--enable-bind-now
 		--build=${CBUILD_OPT:-${CBUILD}}
 		--host=${CTARGET_OPT:-${CTARGET}}
-		--disable-profile
+		$(use_enable profile)
 		--without-gd
-		--with-headers=$(alt_headers)
+		--with-headers=${ROOT}$(alt_headers)
 		--prefix=$(alt_prefix)
 		--mandir=$(alt_prefix)/share/man
 		--infodir=$(alt_prefix)/share/info
 		--libexecdir=$(alt_prefix)/lib/misc/glibc
 		${EXTRA_ECONF}"
 
-	export CC="$(tc-getCC ${CTARGET})"
+	has_version app-admin/eselect-compiler || export CC="$(tc-getCC ${CTARGET})"
 
-	GBUILDDIR="${WORKDIR}/build-${ABI}-${CTARGET}-$1"
+	GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-$1
 	mkdir -p ${GBUILDDIR}
 	cd ${GBUILDDIR}
-	einfo "Configuring GLIBC for $1 with: ${myconf}"
+	einfo "Configuring GLIBC for $1 with: ${myconf// /\n\t\t}"
 	${S}/configure ${myconf} || die "failed to configure glibc"
 }
 
@@ -959,112 +971,31 @@ fix_lib64_symlinks() {
 }
 
 use_multilib() {
-	case $(tc-arch) in
-		sparc)
-			case ${CHOST} in
-				sparc64*)
-					is_crosscompile || has_multilib_profile || use multilib
-					;;
-				*)
-					false
-					;;
-			esac
-		;;
-		mips)
-			case ${CHOST} in
-				mips64*)
-					is_crosscompile || has_multilib_profile || use multilib
-					;;
-				*)
-					false
-					;;
-			esac
-		;;
-		amd64|ppc64)
-			is_crosscompile || has_multilib_profile || use multilib
-		;;
-		*)
-			false
-		;;
+	case ${CTARGET} in
+		sparc64*|mips64*|amd64|ppc64)
+			is_crosscompile || has_multilib_profile || use multilib ;;
+		*)  false ;;
 	esac
 }
 
 # Setup toolchain variables that would be defined in the profiles for these archs.
-crosscompile_setup() {
+setup_env() {
 	if is_crosscompile || tc-is-cross-compiler; then
-		# CFLAGS are used by ${CTARGET}-gcc
-		local VAR="CFLAGS_"${CTARGET//-/_}
-		CFLAGS=${!VAR-"-O2"}
-
-		case ${CTARGET} in
-			x86_64*)
-				export CFLAGS_x86="${CFLAGS_x86--m32}"
-				export CHOST_x86="i686-pc-linux-gnu"
-				export CDEFINE_x86="__i386__"
-				export LIBDIR_x86="lib"
-
-				export CFLAGS_amd64="${CFLAGS_amd64--m64}"
-				export CHOST_amd64="x86_64-pc-linux-gnu"
-				export CDEFINE_amd64="__x86_64__"
-				export LIBDIR_amd64="lib64"
-
-				export MULTILIB_ABIS="amd64"
-				export DEFAULT_ABI="amd64"
-			;;
-			mips64*)
-				export CFLAGS_o32="${CFLAGS_o32--mabi=32}"
-				export CHOST_o32="mips-unknown-linux-gnu"
-				export CDEFINE_o32="_ABIO32"
-				export LIBDIR_o32="lib"
-
-				export CFLAGS_n32="${CFLAGS_n32--mabi=n32}"
-				export CHOST_n32="mips64-unknown-linux-gnu"
-				export CDEFINE_n32="_ABIN32"
-				export LIBDIR_n32="lib32"
-
-				export CFLAGS_n64="${CFLAGS_n64--mabi=64}"
-				export CHOST_n64="mips64-unknown-linux-gnu"
-				export CDEFINE_n64="_ABI64"
-				export LIBDIR_n64="lib64"
-
-				export MULTILIB_ABIS="n64 n32"
-				export DEFAULT_ABI="n32"
-			;;
-			powerpc64*)
-				export CFLAGS_ppc="${CFLAGS_ppc--m32}"
-				export CHOST_ppc="powerpc-unknown-linux-gnu"
-				export CDEFINE_ppc="!__powerpc64__"
-				export LIBDIR_ppc="lib"
-
-				export CFLAGS_ppc64="${CFLAGS_ppc64--m64}"
-				export CHOST_ppc64="powerpc64-unknown-linux-gnu"
-				export CDEFINE_ppc64="__powerpc64__"
-				export LIBDIR_ppc64="lib64"
-
-				export MULTILIB_ABIS="ppc64"
-				export DEFAULT_ABI="ppc64"
-			;;
-			sparc64*)
-				export CFLAGS_sparc32="${CFLAGS_sparc--m32}"
-				export CHOST_sparc32="sparc-unknown-linux-gnu"
-				export CDEFINE_sparc32="!__arch64__"
-				export LIBDIR_sparc32="lib"
-
-				export CFLAGS_sparc64="${CFLAGS_sparc64--m64}"
-				export CHOST_sparc64="sparc64-unknown-linux-gnu"
-				export CDEFINE_sparc64="__arch64__"
-				export LIBDIR_sparc64="lib64"
-
-				export MULTILIB_ABIS="sparc64"
-				export DEFAULT_ABI="sparc64"
-			;;
-			*)
-				export MULTILIB_ABIS="default"
-				export DEFAULT_ABI="default"
-		esac
+		multilib_env ${CTARGET}
 
+		# We only install for this CTARGET on crosscompilers
+		MULTILIB_ABIS=${DEFAULT_ABI}
 		ABI=${DEFAULT_ABI}
+
+		# We need to export CFLAGS with abi information in them because
+		# glibc's configure script checks CFLAGS for some targets (like mips)
+		local VAR="CFLAGS_"${CTARGET//[-.]/_}
+		CFLAGS=${!VAR-"-O2 -pipe"}
 	fi
+
+	export ABI=${ABI:-${DEFAULT_ABI:-default}}
+
+	setup_flags
 }
 
 ### /ECLASS PUNTAGE ###
@@ -1091,37 +1022,20 @@ DEPEND=">=sys-devel/gcc-3.4
 	virtual/os-headers
 	nls? ( sys-devel/gettext )
 	selinux? ( !build? ( sys-libs/libselinux ) )"
-
 RDEPEND="virtual/os-headers
 	nls? ( sys-devel/gettext )
 	selinux? ( !build? ( sys-libs/libselinux ) )"
 
 if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-	DEPEND="${DEPEND}
-	        >=${CATEGORY}/gcc-3.4"
+	DEPEND="${DEPEND} ${CATEGORY}/gcc"
 
-	if [[ ${CATEGORY/mips} != ${CATEGORY} ]] ; then
-		DEPEND="${DEPEND}
-		        >=${CATEGORY}/mips-headers-2.6.10"
-	else
-		DEPEND="${DEPEND}
-		        >=${CATEGORY}/linux-headers-2.6.8"
+	if [[ ${CATEGORY} == *-linux* ]] ; then
+		if [[ ${CATEGORY/mips} != ${CATEGORY} ]] ; then
+			DEPEND="${DEPEND} >=${CATEGORY}/mips-headers-2.6.10"
+		else
+			DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
+		fi
 	fi
-
-	case ${CTARGET} in
-		x86_64-pc-linux-gnu)
-			[[ ${CHOST/-*/} == "i686" ]] || RDEPEND="${RDEPEND} cross-i686-pc-linux-gnu/${PN}"
-		;;
-		sparc64-unknown-linux-gnu)
-			[[ ${CHOST/-*/} == "sparc" ]] || RDEPEND="${RDEPEND} cross-sparc-unknown-linux-gnu/${PN}"
-		;;
-		powerpc64-unknown-linux-gnu)
-			[[ ${CHOST/-*/} == "powerpc" ]] || RDEPEND="${RDEPEND} cross-powerpc-unknown-linux-gnu/${PN}"
-		;;
-		mips64-unknown-linux-gnu)
-			[[ ${CHOST/-*/} == "mips" ]] || RDEPEND="${RDEPEND} cross-mips-unknown-linux-gnu/${PN}"
-		;;
-	esac
 fi
 
 pkg_setup() {
@@ -1171,8 +1085,7 @@ pkg_setup() {
 }
 
 src_unpack() {
-	crosscompile_setup
-	export ABI="${DEFAULT_ABI}"
+	setup_env
 
 	case $(tc-arch) in
 		hppa)
@@ -1180,7 +1093,7 @@ src_unpack() {
 			use hardened || GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 6490_hppa_hardened-disable__init_arrays.patch"
 		;;
 		mips)
-			GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 3000-all-2.3.4-dl_execstack-PaX-support.patch"
+			GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 3000-all-2.3.4-dl_execstack-PaX-support.patch 6600_mips_librt-mips.patch 6640_mips_unistd_h-fixes.patch"
 			use_multilib && GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 6680_mips_nolib3264.patch"
 		;;
 	esac
@@ -1241,105 +1154,114 @@ src_unpack() {
 }
 
 src_compile() {
-	crosscompile_setup
-
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if has_multilib_profile && [ -z "${OABI}" -a "${MLTEST/set_abi}" = "${MLTEST}" ] ; then
-		OABI="${ABI}"
-		for ABI in $(get_install_abis); do
-			export ABI
-			einfo "Compiling ${ABI} glibc"
-			src_compile
-		done
-		ABI="${OABI}"
-		unset OABI
-		return 0
+	setup_env
+
+	if [[ -z ${OABI} ]] && has_multilib_profile ; then
+		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+		local MLTEST=$(type dyn_unpack)
+		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
+			OABI=${ABI}
+			einfo "Building multilib glibc for ABIs: $(get_install_abis)"
+			for ABI in $(get_install_abis) ; do
+				export ABI=${ABI}
+				src_compile
+			done
+			ABI=${OABI}
+			unset OABI
+			return 0
+		fi
+		unset MLTEST
 	fi
-	unset MLTEST
 
 	ABI=${ABI:-default}
 	toolchain-glibc_src_compile
 }
 
 src_test() {
-	crosscompile_setup
-
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if has_multilib_profile && [ -z "${OABI}" -a "${MLTEST/set_abi}" = "${MLTEST}" ] ; then
-		OABI="${ABI}"
-		for ABI in $(get_install_abis); do
-			export ABI
-			einfo "Testing ${ABI} glibc"
-			src_test
-		done
-		ABI="${OABI}"
-		unset OABI
-		return 0
+	setup_env
+
+	if [[ -z ${OABI} ]] && has_multilib_profile ; then
+		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+		local MLTEST=$(type dyn_unpack)
+		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
+			OABI=${ABI}
+			einfo "Testing multilib glibc for ABIs: $(get_install_abis)"
+			for ABI in $(get_install_abis) ; do
+				export ABI
+				einfo "   Testing ${ABI} glibc"
+				src_test
+			done
+			ABI=${OABI}
+			unset OABI
+			return 0
+		fi
+		unset MLTEST
 	fi
-	unset MLTEST
 
 	ABI=${ABI:-default}
 	toolchain-glibc_src_test
 }
 
 src_install() {
-	crosscompile_setup
-
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if has_multilib_profile && [ -z "${OABI}" -a "${MLTEST/set_abi}" = "${MLTEST}" ] ; then
-		OABI="${ABI}"
-		for ABI in $(get_install_abis); do
-			export ABI
-			einfo "Installing ${ABI} glibc"
-			src_install
-		done
-		ABI="${OABI}"
-		unset OABI
-		return 0
+	setup_env
+
+	if [[ -z ${OABI} ]] && has_multilib_profile ; then
+		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+		local MLTEST=$(type dyn_unpack)
+		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
+			OABI=${ABI}
+			einfo "Installing multilib glibc for ABIs: $(get_install_abis)"
+			for ABI in $(get_install_abis) ; do
+				export ABI
+				src_install
+			done
+			ABI=${OABI}
+			unset OABI
+			return 0
+		fi
+		unset MLTEST
 	fi
-	unset MLTEST
 
 	ABI=${ABI:-default}
 
 	# Handle stupid lib32 BS
 	unset OLD_LIBDIR
-	if [[ $(tc-arch) == "amd64" && ${ABI} == "x86" && $(get_libdir) != "lib" ]] && ! is_crosscompile; then
-		OLD_LIBDIR="$(get_libdir)"
-		LIBDIR_x86="lib"
-	fi
+	if ! is_crosscompile ; then
+		if [[ $(tc-arch) == "amd64" && ${ABI} == "x86" && $(get_libdir) != "lib" ]] ; then
+			OLD_LIBDIR=$(get_libdir)
+			LIBDIR_x86="lib"
+		fi
 
-	if [[ $(tc-arch) == "ppc64" && ${ABI} == "ppc" && $(get_libdir) != "lib" ]] && ! is_crosscompile; then
-		OLD_LIBDIR="$(get_libdir)"
-		LIBDIR_ppc="lib"
+		if [[ $(tc-arch) == "ppc64" && ${ABI} == "ppc" && $(get_libdir) != "lib" ]] ; then
+			OLD_LIBDIR=$(get_libdir)
+			LIBDIR_ppc="lib"
+		fi
 	fi
 
 	toolchain-glibc_src_install
 
 	# Handle stupid lib32 BS on amd64 and ppc64
 	if [[ -n ${OLD_LIBDIR} ]] ; then
-		cd ${S}
-		[[ $(tc-arch) == "amd64" ]] && LIBDIR_x86="${OLD_LIBDIR}"
-		[[ $(tc-arch) == "ppc64" ]] && LIBDIR_ppc="${OLD_LIBDIR}"
+		cd "${S}"
+		[[ $(tc-arch) == "amd64" ]] && LIBDIR_x86=${OLD_LIBDIR}
+		[[ $(tc-arch) == "ppc64" ]] && LIBDIR_ppc=${OLD_LIBDIR}
 		unset OLD_LIBDIR
 
-		mv ${D}/lib ${D}/$(get_libdir)
-		mv ${D}/usr/lib ${D}/usr/$(get_libdir)
+		mv "${D}"/lib "${D}"/$(get_libdir)
+		mv "${D}"/usr/lib "${D}"/usr/$(get_libdir)
 		dodir /lib
 		dodir /usr/lib
-		mv ${D}/usr/$(get_libdir)/locale ${D}/usr/lib
+		mv "${D}"/usr/$(get_libdir)/locale "${D}"/usr/lib
 		[[ $(tc-arch) == "amd64" ]] && dosym ../$(get_libdir)/ld-linux.so.2 /lib/ld-linux.so.2
 		[[ $(tc-arch) == "ppc64" ]] && dosym ../$(get_libdir)/ld.so.1 /lib/ld.so.1
 
-		for f in ${D}/usr/$(get_libdir)/*.so; do
-			local basef=$(basename ${f})
-			if [ -L ${f} ] ; then
-				local target=$(readlink ${f})
+		for f in "${D}"/usr/$(get_libdir)/*.so; do
+			local basef=$(basename "${f}")
+			if [[ -L ${f} ]] ; then
+				local target=$(readlink "${f}")
 				target=${target/\/lib\//\/$(get_libdir)\/}
-				rm ${f}
-				dosym ${target} /usr/$(get_libdir)/${basef}
+				rm "${f}"
+				dosym "${target}" /usr/$(get_libdir)/"${basef}"
 			fi
 		done
 
diff --git a/sys-libs/glibc/glibc-2.3.5.ebuild b/sys-libs/glibc/glibc-2.3.5.ebuild
index dabd83f92ff0..d4d99f62f8dc 100644
--- a/sys-libs/glibc/glibc-2.3.5.ebuild
+++ b/sys-libs/glibc/glibc-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/sys-libs/glibc/glibc-2.3.5.ebuild,v 1.1 2005/04/12 19:30:24 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.ebuild,v 1.1.1.1 2005/11/30 09:39:27 chriswhite Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -16,7 +16,7 @@
 #  CHOST = CTARGET  - install into /
 #  CHOST != CTARGET - install into /usr/CTARGET/
 
-KEYWORDS="~amd64"
+KEYWORDS="amd64 arm ~ia64 mips ~ppc ~ppc64 ~sparc x86"
 
 BRANCH_UPDATE=""
 
@@ -27,19 +27,19 @@ GLIBC_MANPAGE_VERSION="2.3.5"
 GLIBC_INFOPAGE_VERSION="2.3.4-r1"
 
 # Gentoo patchset
-PATCH_VER="1.1"
+PATCH_VER="1.4"
 
 # C Stubbs addon (contained in fedora, so ignoring)
 #CSTUBS_VER="2.1.2"
 #CSTUBS_TARBALL="c_stubs-${CSTUBS_VER}.tar.bz2"
-#CSTUBS_URI="http://dev.gentoo.org/~eradicator/glibc/${CSTUBS_TARBALL}"
+#CSTUBS_URI="mirror://gentoo/${CSTUBS_TARBALL}"
 
 # Fedora addons (from RHEL's glibc-2.3.4-2.src.rpm)
 FEDORA_VER="20041219T2331"
 FEDORA_TARBALL="glibc-fedora-${FEDORA_VER}.tar.bz2"
-FEDORA_URI="http://dev.gentoo.org/~eradicator/glibc/${FEDORA_TARBALL}"
+FEDORA_URI="mirror://gentoo/${FEDORA_TARBALL}"
 
-GENTOO_TOOLCHAIN_BASE_URI="http://dev.gentoo.org/~eradicator/glibc"
+GENTOO_TOOLCHAIN_BASE_URI="mirror://gentoo"
 
 ### PUNT OUT TO ECLASS?? ###
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
@@ -48,7 +48,7 @@ DESCRIPTION="GNU libc6 (also called glibc2) C library"
 HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
 LICENSE="LGPL-2"
 
-IUSE="nls pic build nptl nptlonly erandom hardened debug userlocales nomalloccheck multilib"
+IUSE="nls pic build nptl nptlonly erandom hardened debug userlocales multilib selinux"
 
 export CBUILD=${CBUILD:-${CHOST}}
 export CTARGET=${CTARGET:-${CHOST}}
@@ -118,7 +118,7 @@ get_glibc_src_uri() {
 	# This variable should be set to the devspace of whoever is currently
 	# maintaining GLIBC. Please dont set this to mirror, that would just
 	# make the files unavailable until they get mirrored.
-	local devspace_uri="http://dev.gentoo.org/~eradicator/glibc/"
+	local devspace_uri="mirror://gentoo/"
 	GENTOO_TOOLCHAIN_BASE_URI=${GENTOO_TOOLCHAIN_BASE_URI:-${devspace_uri}}
 
 #	GLIBC_SRC_URI="http://ftp.gnu.org/gnu/glibc/${PN}-${GLIBC_RELEASE_VER}.tar.bz2
@@ -160,7 +160,7 @@ get_glibc_src_uri() {
 }
 
 SRC_URI=$(get_glibc_src_uri)
-S="${WORKDIR}/${PN}-${GLIBC_RELEASE_VER}"
+S=${WORKDIR}/${PN}-${GLIBC_RELEASE_VER}
 
 ### EXPORTED FUNCTIONS ###
 toolchain-glibc_src_unpack() {
@@ -169,68 +169,75 @@ toolchain-glibc_src_unpack() {
 
 	unpack ${PN}-${GLIBC_RELEASE_VER}.tar.bz2
 
-	cd ${S}
+	cd "${S}"
 	unpack ${PN}-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2
 	unpack ${PN}-libidn-${GLIBC_RELEASE_VER}.tar.bz2
 
-	if [[ -n ${CSTUBS_TARBALL} ]] ; then
-		unpack ${CSTUBS_TARBALL}
-	fi
-
-	if [[ -n ${FEDORA_TARBALL} ]] ; then
-		unpack ${FEDORA_TARBALL}
-	fi
+	[[ -n ${CSTUBS_TARBALL} ]] && unpack ${CSTUBS_TARBALL}
+	[[ -n ${FEDORA_TARBALL} ]] && unpack ${FEDORA_TARBALL}
 
 	if [[ -n ${PATCH_VER} ]] ; then
-		cd ${WORKDIR}
+		cd "${WORKDIR}"
 		unpack ${PN}-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2
 	fi
 
-	if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then
-		cd ${WORKDIR}
-		unpack ${PN}-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2
-	fi
-
-	if [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then
-		cd ${S}
-		unpack ${PN}-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2
-	fi
-
+	# XXX: We should do the branchupdate, before extracting the manpages and
+	# infopages else it does not help much (mtimes change if there is a change
+	# to them with branchupdate)
 	if [[ -n ${BRANCH_UPDATE} ]] ; then
-		cd ${WORKDIR}
+		cd "${WORKDIR}"
 		unpack ${PN}-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
-	fi
-
-	cd ${S}
 
-	if [[ -n ${BRANCH_UPDATE} ]] ; then
-		epatch ${WORKDIR}/${PN}-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch
+		cd "${S}"
+		epatch "${WORKDIR}"/${PN}-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch
 
 		# Snapshot date patch
 		einfo "Patching version to display snapshot date ..."
 		sed -i -e "s:\(#define RELEASE\).*:\1 \"${BRANCH_UPDATE}\":" version.h
 	fi
 
+	if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then
+		cd "${WORKDIR}"
+		unpack ${PN}-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2
+	fi
+
+	if [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then
+		cd "${S}"
+		unpack ${PN}-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2
+	fi
+
+	# XXX: do not package ssp up into tarballs, leave it in FILESDIR
+	cd "${S}"
+	cp "${FILESDIR}"/2.3.5/ssp.c sysdeps/unix/sysv/linux/ || die "could not find ssp.c"
+	rm -f "${WORKDIR}"/patches/2*
+	epatch "${FILESDIR}"/2.3.5/glibc-2.3.5-propolice-guard-functions.patch
+	epatch "${FILESDIR}"/2.3.5/glibc-2.3.5-frandom-detect.patch
+
 	if [[ -n ${PATCH_VER} ]] ; then
-		EPATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE}"
-		EPATCH_SUFFIX="patch"
-		OLD_ARCH="${ARCH}"
-		ARCH="$(tc-arch)"
-
-		einfo "Applying Gentoo Glibc Patches: ${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-${PATCH_VER}"
-		epatch ${WORKDIR}/patches
-
-		ARCH="${OLD_ARCH}"
-		unset EPATCH_EXCLUDE
-		unset EPATCH_SUFFIX
-		unset OLD_ARCH
+		cd "${S}"
+		EPATCH_MULTI_MSG="Applying Gentoo Glibc Patchset ${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-${PATCH_VER} ..." \
+		EPATCH_EXCLUDE=${GLIBC_PATCH_EXCLUDE} \
+		EPATCH_SUFFIX="patch" \
+		ARCH=$(tc-arch) \
+		epatch "${WORKDIR}"/patches
 	fi
 }
 
 toolchain-glibc_src_compile() {
 	# Set gconvdir to /usr/$(get_libdir)/gconv on archs with multiple ABIs
+	local MAKEFLAGS=""
 	has_multilib_profile && MAKEFLAGS="gconvdir=$(alt_usrlibdir)/gconv"
 
+	echo
+	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CFLAGS ; do
+		einfo " $(printf '%15s' ${v}:)   ${!v}"
+	done
+	echo
+
+	# -fomit-frame-pointer gets stripped in setup_flags, so we do this
+	# now to cache the value
+	want_omitfp
+
 	if want_linuxthreads ; then
 		glibc_do_configure linuxthreads
 		einfo "Building GLIBC with linuxthreads..."
@@ -238,7 +245,7 @@ toolchain-glibc_src_compile() {
 	fi
 	if want_nptl ; then
 		# ... and then do the optional nptl build
-		unset LD_ASSUME_KERNEL || :
+		unset LD_ASSUME_KERNEL
 		glibc_do_configure nptl
 		einfo "Building GLIBC with NPTL..."
 		make PARALLELMFLAGS="${MAKEOPTS}" ${MAKEFLAGS} || die
@@ -252,12 +259,12 @@ toolchain-glibc_src_test() {
 
 	# do the linuxthreads build unless we're using nptlonly
 	if want_linuxthreads ; then
-		cd ${WORKDIR}/build-${ABI}-${CTARGET}-linuxthreads
+		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads
 		einfo "Checking GLIBC with linuxthreads..."
 		make check || die "linuxthreads glibc did not pass make check"
 	fi
 	if want_nptl ; then
-		cd ${WORKDIR}/build-${ABI}-${CTARGET}-nptl
+		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl
 		unset LD_ASSUME_KERNEL || :
 		einfo "Checking GLIBC with NPTL..."
 		make check || die "nptl glibc did not pass make check"
@@ -274,15 +281,18 @@ toolchain-glibc_pkg_preinst() {
 	# 2005.0 is setup properly, and this is executed as part of the
 	# 2004.3 -> 2005.0 upgrade script.
 	# It can be removed after 2004.3 has been purged from portage.
-	use amd64 && [ "$(get_libdir)" == "lib64" ] && ! has_multilib_profile && fix_lib64_symlinks
+	{ use amd64 || use ppc64; } && [ "$(get_libdir)" == "lib64" ] && ! has_multilib_profile && fix_lib64_symlinks
 
 	# it appears that /lib/tls is sometimes not removed. See bug
 	# 69258 for more info.
-	if [ -d /${ROOT}$(alt_libdir)/tls ] && ! { want_nptl && want_linuxthreads; }; then
-		addwrite /${ROOT}$(alt_libdir)/
+	if [[ -d ${ROOT}/$(alt_libdir)/tls ]] && ! { want_nptl && want_linuxthreads; }; then
+		addwrite "${ROOT}"/$(alt_libdir)/
 		ewarn "nptlonly or -nptl in USE, removing /${ROOT}$(alt_libdir)/tls..."
-		rm -rf /${ROOT}$(alt_libdir)/tls || die
+		rm -r "${ROOT}"/$(alt_libdir)/tls || die
 	fi
+
+	# Shouldnt need to keep this updated
+	[[ -e ${ROOT}/etc/locales.build ]] && rm -f "${D}"/etc/locales.build
 }
 
 toolchain-glibc_src_install() {
@@ -296,16 +306,16 @@ toolchain-glibc_src_install() {
 	unset LANGUAGE LANG LC_ALL
 
 	if want_linuxthreads ; then
-		cd ${WORKDIR}/build-${ABI}-${CTARGET}-linuxthreads
-		einfo "Installing GLIBC with linuxthreads..."
+		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads
+		einfo "Installing GLIBC ${ABI} with linuxthreads ..."
 		make PARALLELMFLAGS="${MAKEOPTS} -j1" \
-			install_root=${D} \
+			install_root="${D}" \
 			install || die
 	else # nptlonly
-		cd ${WORKDIR}/build-${ABI}-${CTARGET}-nptl
-		einfo "Installing GLIBC with NPTL..."
+		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl
+		einfo "Installing GLIBC ${ABI} with NPTL ..."
 		make PARALLELMFLAGS="${MAKEOPTS} -j1" \
-			install_root=${D} \
+			install_root="${D}" \
 			install || die
 	fi
 
@@ -315,7 +325,7 @@ toolchain-glibc_src_install() {
 		# crosscompile.
 		if [[ $(get_libdir) != "lib" && -d ${D}$(alt_prefix)/lib ]] ; then
 			dodir $(alt_libdir)
-			mv ${D}$(alt_prefix)/lib/* ${D}$(alt_libdir)
+			mv "${D}"$(alt_prefix)/lib/* "${D}"$(alt_libdir)
 		fi
 
 		# punt all the junk not needed by a cross-compiler
@@ -324,63 +334,64 @@ toolchain-glibc_src_install() {
 
 	if want_linuxthreads && want_nptl ; then
 		einfo "Installing NPTL to $(alt_libdir)/tls/..."
-		cd ${WORKDIR}/build-${ABI}-${CTARGET}-nptl
-		mkdir -p ${D}$(alt_libdir)/tls/
+		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl
+		mkdir -p "${D}"$(alt_libdir)/tls/
 
-		libcsofile=$(basename ${D}$(alt_libdir)/libc-*.so)
-		cp -a libc.so ${D}$(alt_libdir)/tls/${libcsofile} || die
+		libcsofile=$(basename "${D}"$(alt_libdir)/libc-*.so)
+		cp -a libc.so "${D}"$(alt_libdir)/tls/${libcsofile} || die
 		dosym ${libcsofile} $(alt_libdir)/tls/$(ls libc.so.*)
 
-		libmsofile=$(basename ${D}$(alt_libdir)/libm-*.so)
+		libmsofile=$(basename "${D}"$(alt_libdir)/libm-*.so)
 		pushd math > /dev/null
-		cp -a libm.so ${D}$(alt_libdir)/tls/${libmsofile} || die
+		cp -a libm.so "${D}"$(alt_libdir)/tls/${libmsofile} || die
 		dosym ${libmsofile} $(alt_libdir)/tls/$(ls libm.so.*)
 		popd > /dev/null
 
-		librtsofile=$(basename ${D}$(alt_libdir)/librt-*.so)
+		librtsofile=$(basename "${D}"$(alt_libdir)/librt-*.so)
 		pushd rt > /dev/null
-		cp -a librt.so ${D}$(alt_libdir)/tls/${librtsofile} || die
+		cp -a librt.so "${D}"$(alt_libdir)/tls/${librtsofile} || die
 		dosym ${librtsofile} $(alt_libdir)/tls/$(ls librt.so.*)
 		popd > /dev/null
 
-		libthreaddbsofile=$(basename ${D}$(alt_libdir)/libthread_db-*.so)
+		libthreaddbsofile=$(basename "${D}"$(alt_libdir)/libthread_db-*.so)
 		pushd nptl_db > /dev/null
-		cp -a libthread_db.so ${D}$(alt_libdir)/tls/${libthreaddbsofile} || die
+		cp -a libthread_db.so "${D}"$(alt_libdir)/tls/${libthreaddbsofile} || die
 		dosym ${libthreaddbsofile} $(alt_libdir)/tls/$(ls libthread_db.so.*)
 		popd > /dev/null
 
 		libpthreadsofile=libpthread-${GLIBC_RELEASE_VER}.so
-		cp -a nptl/libpthread.so ${D}$(alt_libdir)/tls/${libpthreadsofile} || die
+		cp -a nptl/libpthread.so "${D}"$(alt_libdir)/tls/${libpthreadsofile} || die
 		dosym ${libpthreadsofile} $(alt_libdir)/tls/libpthread.so.0
 
 		# and now for the static libs
-		mkdir -p ${D}$(alt_usrlibdir)/nptl
+		mkdir -p "${D}"$(alt_usrlibdir)/nptl
 		cp -a libc.a nptl/libpthread.a nptl/libpthread_nonshared.a rt/librt.a \
-			${D}$(alt_usrlibdir)/nptl
+			"${D}"$(alt_usrlibdir)/nptl
 
 		# linker script crap
 		for lib in libc libpthread; do
 			sed -e "s:$(alt_libdir)/${lib}.so:$(alt_libdir)/tls/${lib}.so:g" \
 			    -e "s:$(alt_usrlibdir)/${lib}_nonshared.a:$(alt_usrlibdir)/nptl/${lib}_nonshared.a:g" \
-			          ${D}$(alt_usrlibdir)/${lib}.so \
-				> ${D}$(alt_usrlibdir)/nptl/${lib}.so
+			          "${D}"$(alt_usrlibdir)/${lib}.so \
+				> "${D}"$(alt_usrlibdir)/nptl/${lib}.so
 
-			chmod 755 ${D}$(alt_usrlibdir)/nptl/${lib}.so
+			chmod 755 "${D}"$(alt_usrlibdir)/nptl/${lib}.so
 		done
 
 		dosym ../librt.so $(alt_usrlibdir)/nptl/librt.so
 
 		# last but not least... headers.
-		mkdir -p ${D}/nptl ${D}$(alt_headers)/nptl
-		make install_root=${D}/nptl install-headers PARALLELMFLAGS="${MAKEOPTS} -j1"
-		pushd ${D}/nptl/$(alt_headers) > /dev/null
-			for i in `find . -type f`; do
-				if ! [ -f ${D}$(alt_headers)/$i ] \
-					|| ! cmp -s $i ${D}$(alt_headers)/$i; then
+		mkdir -p "${D}"/nptl "${D}"$(alt_headers)/nptl
+		make install_root="${D}"/nptl install-headers PARALLELMFLAGS="${MAKEOPTS} -j1"
+		pushd "${D}"/nptl/$(alt_headers) > /dev/null
+		for i in $(find . -type f) ; do
+			if ! [[ -f ${D}$(alt_headers)/$i ]] \
+			   || ! cmp -s $i ${D}$(alt_headers)/$i; then
 				mkdir -p ${D}$(alt_headers)/nptl/`dirname $i`
 				cp -a $i ${D}$(alt_headers)/nptl/$i
 			fi
 		done
+		popd > /dev/null
 		rm -rf ${D}/nptl
 	fi
 
@@ -421,6 +432,7 @@ toolchain-glibc_src_install() {
 	# system headers correctly.  See gcc/doc/gccinstall.info
 	if is_crosscompile ; then
 		dosym include $(alt_prefix)/sys-include
+		dosym . $(alt_prefix)/usr
 		return 0
 	fi
 
@@ -432,7 +444,7 @@ toolchain-glibc_src_install() {
 	else
 		MYMAINBUILDDIR=build-${ABI}-${CTARGET}-nptl
 	fi
-	cd ${WORKDIR}/${MYMAINBUILDDIR}
+	cd "${WORKDIR}"/${MYMAINBUILDDIR}
 	if ! use build ; then
 		if ! has noinfo ${FEATURES} && [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then
 			einfo "Installing info pages..."
@@ -448,16 +460,16 @@ toolchain-glibc_src_install() {
 			einfo "Installing man pages..."
 
 			# Install linuxthreads man pages even if nptl is enabled
-			cd ${WORKDIR}/man
+			cd "${WORKDIR}"/man
 			doman *.3thr
 		fi
 
 		# Install nscd config file
 		insinto /etc
 		doins ${FILESDIR}/nscd.conf
+		doins "${FILESDIR}"/nsswitch.conf
 
-		exeinto /etc/init.d
-		doexe ${FILESDIR}/nscd
+		doinitd "${FILESDIR}"/nscd
 
 		cd ${S}
 		dodoc BUGS ChangeLog* CONFORMANCE FAQ INTERFACE NEWS NOTES PROJECTS README*
@@ -488,11 +500,16 @@ toolchain-glibc_src_install() {
 	doins ${FILESDIR}/2.3.4/host.conf
 
 	# simple test to make sure our new glibc isnt completely broken.
-	# for now, skip the multilib scenario.
+	# for now, skip the multilib scenario.  also make sure we don't
+	# test with statically built binaries since they will fail.
+	[[ ${CBUILD} != ${CHOST} ]] && return 0
 	[[ $(get_libdir) != "lib" ]] && return 0
 	for x in date env ls true uname ; do
 		x=$(type -p ${x})
 		[[ -z ${x} ]] && continue
+		striptest=$(file -L ${x} 2>/dev/null)
+		[[ -z ${striptest} ]] && continue
+		[[ ${striptest/statically linked} != "${striptest}" ]] && continue
 		"${D}"/$(get_libdir)/ld-*.so \
 			--library-path "${D}"/$(get_libdir) \
 			${x} > /dev/null \
@@ -529,7 +546,7 @@ toolchain-glibc_pkg_postinst() {
 		ln -s ../usr/share/zoneinfo/Factory ${ROOT}/etc/localtime
 	fi
 
-	if [ -x "${ROOT}/usr/sbin/iconvconfig" ] ; then
+	if ! is_crosscompile && [ -x "${ROOT}/usr/sbin/iconvconfig" ] ; then
 		# Generate fastloading iconv module configuration file.
 		${ROOT}/usr/sbin/iconvconfig --prefix=${ROOT}
 	fi
@@ -540,7 +557,7 @@ toolchain-glibc_pkg_postinst() {
 	fi
 
 	# Reload init ...
-	if [ "${ROOT}" = "/" ] ; then
+	if ! is_crosscompile && [ "${ROOT}" = "/" ] ; then
 		/sbin/init U &> /dev/null
 	fi
 
@@ -587,7 +604,7 @@ alt_prefix() {
 
 alt_libdir() {
 	if is_crosscompile ; then
-		echo /usr/${CTARGET}/lib
+		echo /usr/${CTARGET}/$(get_libdir)
 	else
 		echo /$(get_libdir)
 	fi
@@ -595,17 +612,13 @@ alt_libdir() {
 
 alt_usrlibdir() {
 	if is_crosscompile ; then
-		echo /usr/${CTARGET}/lib
+		echo /usr/${CTARGET}/$(get_libdir)
 	else
 		echo /usr/$(get_libdir)
 	fi
 }
 
 setup_flags() {
-	# If the user wants to use -fomit-frame-pointer, let the build system
-	# determine when it's safe
-	is-flag -fomit-frame-pointer && EXTRA_ECONF="--enable-omitfp ${EXTRA_ECONF}"
-
 	# Over-zealous CFLAGS can often cause problems.  What may work for one
 	# person may not work for another.  To avoid a large influx of bugs
 	# relating to failed builds, we strip most CFLAGS out to ensure as few
@@ -614,9 +627,12 @@ setup_flags() {
 	strip-unsupported-flags
 	filter-flags -m32 -m64 -mabi=*
 
-	has_multilib_profile && CTARGET_OPT="$(get_abi_CHOST)"
+	has_multilib_profile && CTARGET_OPT=$(get_abi_CHOST)
 
 	case $(tc-arch) in
+		amd64)
+			CFLAGS_x86="-m32"
+		;;
 		ppc)
 			append-flags "-freorder-blocks"
 		;;
@@ -628,13 +644,6 @@ setup_flags() {
 
 			if is_crosscompile || [[ ${PROFILE_ARCH} == "sparc64" ]] || { has_multilib_profile && ! tc-is-cross-compiler; } ; then
 				case ${ABI} in
-					default|sparc32)
-						if is-flag "-mcpu=ultrasparc3"; then
-							CTARGET_OPT="sparcv9b-unknown-linux-gnu"
-						else
-							CTARGET_OPT="sparcv9-unknown-linux-gnu"
-						fi
-					;;
 					sparc64)
 						if is-flag "-mcpu=ultrasparc3"; then
 							CTARGET_OPT="sparc64b-unknown-linux-gnu"
@@ -646,6 +655,13 @@ setup_flags() {
 
 						filter-flags -Wa,-xarch -Wa,-A
 					;;
+					*)
+						if is-flag "-mcpu=ultrasparc3"; then
+							CTARGET_OPT="sparcv9b-unknown-linux-gnu"
+						else
+							CTARGET_OPT="sparcv9-unknown-linux-gnu"
+						fi
+					;;
 				esac
 			else
 				if is-flag "-mcpu=ultrasparc3"; then
@@ -701,14 +717,14 @@ check_nptl_support() {
 	echo
 
 	einfon "Checking gcc for __thread support ... "
-	if ! $(tc-getCC ${CTARGET}) -c ${FILESDIR}/test-__thread.c -o ${T}/test2.o &> /dev/null; then
+	if want__thread ; then
+		echo "yes"
+	else
 		echo "no"
 		echo
 		eerror "Could not find a gcc that supports the __thread directive!"
 		eerror "please update to gcc-3.2.2-r1 or later, and try again."
 		die "No __thread support in gcc!"
-	else
-		echo "yes"
 	fi
 
 	# Building fails on an non-supporting kernel
@@ -744,12 +760,12 @@ want_nptl() {
 
 	# Archs that can use NPTL
 	case $(tc-arch) in
-		amd64|ia64|ppc|ppc64|s390|x86)
+		alpha|amd64|ia64|ppc|ppc64|s390|x86)
 			return 0;
 		;;
 		sparc)
 			# >= v9 is needed for nptl.
-			[[ "${PROFILE_ARCH}" == "sparc32" ]] && return 1
+			[[ "${PROFILE_ARCH}" == "sparc" ]] && return 1
 			return 0;
 		;;
 	esac
@@ -770,14 +786,11 @@ want_tls() {
 			return 0;
 		;;
 		sparc)
+			# 2.3.6 should have tls support on sparc64
+			# when using newer binutils
 			case ${CTARGET/-*} in
-				sparc64*)
-					[[ ${ABI} == "sparc32" ]] && return 0
-					return 1
-				;;
-				*)
-					return 0
-				;;
+				sparc64*) return 1 ;;
+				*) return 0 ;;
 			esac
 		;;
 		x86)
@@ -790,9 +803,47 @@ want_tls() {
 	return 1
 }
 
+want__thread() {
+	want_tls || return 1
+
+	# For some reason --with-tls --with__thread is causing segfaults on sparc32.
+	[[ ${PROFILE_ARCH} == "sparc" ]] && return 1
+
+	[[ -n ${WANT__THREAD} ]] && return ${WANT__THREAD}
+
+	$(tc-getCC ${CTARGET}) -c ${FILESDIR}/test-__thread.c -o ${T}/test2.o &> /dev/null
+	WANT__THREAD=$?
+
+	return ${WANT__THREAD}
+}
+
+# Under what conditions should we optimize glibc with --enable-omitfp.
+# We strip -fomit-frame-pointer from CFLAGS and let the build system decide
+# where it's safe to use
+want_omitfp() {
+	[[ -n ${WANT_OMITFP} ]] && return ${WANT_OMITFP}
+
+	WANT_OMITFP=1
+	if is-flag -fomit-frame-pointer && ! use debug; then
+		case $(tc-arch) in
+			x86)
+				case ${CTARGET/-*} in
+					i386|i486|i586)	WANT_OMITFP=1 ;;
+					*) WANT_OMITFP=0 ;;
+				esac
+			;;
+			*)
+				WANT_OMITFP=0
+			;;
+		esac
+	fi
+
+	return ${WANT_OMITFP}
+}
+
 install_locales() {
 	unset LANGUAGE LANG LC_ALL
-	cd ${WORKDIR}/${MYMAINBUILDDIR} || die "${WORKDIR}/${MYMAINBUILDDIR}"
+	cd "${WORKDIR}"/${MYMAINBUILDDIR} || die "${WORKDIR}/${MYMAINBUILDDIR}"
 	make PARALLELMFLAGS="${MAKEOPTS} -j1" \
 		install_root=${D} localedata/install-locales || die
 }
@@ -840,19 +891,37 @@ glibc_do_configure() {
 	use nls || myconf="${myconf} --disable-nls"
 	use erandom || myconf="${myconf} --disable-dev-erandom"
 
+	want_omitfp && myconf="${myconf} --enable-omitfp"
+
 	if [ "$1" == "linuxthreads" ] ; then
-		want_tls && myconf="${myconf} --with-tls --without-__thread"
-		want_tls || myconf="${myconf} --without-tls --without-__thread"
+		if want_tls && [[ ${CTARGET} != i[45]86-* ]] ; then
+			myconf="${myconf} --with-tls"
+
+			if want__thread ; then
+				myconf="${myconf} --with-__thread"
+			else
+				myconf="${myconf} --without-__thread"
+			fi
+		else
+			myconf="${myconf} --without-tls --without-__thread"
+		fi
+
 		myconf="${myconf} --enable-add-ons=linuxthreads${ADDONS}"
 		myconf="${myconf} --enable-kernel=${LT_KERNEL_VERSION}"
 	elif [ "$1" == "nptl" ] ; then
-		want_nptl && myconf="${myconf} --with-tls --with-__thread"
+		myconf="${myconf} --with-tls --with-__thread"
 		myconf="${myconf} --enable-add-ons=nptl${ADDONS}"
 		myconf="${myconf} --enable-kernel=${NPTL_KERNEL_VERSION}"
 	else
 		die "invalid pthread option"
 	fi
 
+	if ! use build && use selinux; then
+		myconf="${myconf} --with-selinux"
+	else
+		myconf="${myconf} --without-selinux"
+	fi
+
 	myconf="${myconf}
 		--without-cvs
 		--enable-bind-now
@@ -860,7 +929,7 @@ glibc_do_configure() {
 		--host=${CTARGET_OPT:-${CTARGET}}
 		--disable-profile
 		--without-gd
-		--with-headers=$(alt_headers)
+		--with-headers=${ROOT}$(alt_headers)
 		--prefix=$(alt_prefix)
 		--mandir=$(alt_prefix)/share/man
 		--infodir=$(alt_prefix)/share/info
@@ -869,10 +938,10 @@ glibc_do_configure() {
 
 	export CC="$(tc-getCC ${CTARGET})"
 
-	GBUILDDIR="${WORKDIR}/build-${ABI}-${CTARGET}-$1"
+	GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-$1
 	mkdir -p ${GBUILDDIR}
 	cd ${GBUILDDIR}
-	einfo "Configuring GLIBC for $1 with: ${myconf}"
+	einfo "Configuring GLIBC for $1 with: ${myconf// /\n\t\t}"
 	${S}/configure ${myconf} || die "failed to configure glibc"
 }
 
@@ -890,7 +959,8 @@ fix_lib64_symlinks() {
 		rm ${ROOT}/lib64
 		# now that lib64 is gone, nothing will run without calling ld.so
 		# directly. luckily the window of brokenness is almost non-existant
-		/lib/ld-linux-x86-64.so.2 /bin/mv ${ROOT}/lib ${ROOT}/lib64
+		use amd64 && /lib/ld-linux-x86-64.so.2 /bin/mv ${ROOT}/lib ${ROOT}/lib64
+		use ppc64 && /lib/ld64.so.1 /bin/mv ${ROOT}/lib ${ROOT}/lib64
 		# all better :)
 		ldconfig
 		ln -s lib64 ${ROOT}/lib
@@ -914,33 +984,10 @@ fix_lib64_symlinks() {
 }
 
 use_multilib() {
-	case $(tc-arch) in
-		sparc)
-			case ${CHOST} in
-				sparc64*)
-					is_crosscompile || has_multilib_profile || use multilib
-					;;
-				*)
-					false
-					;;
-			esac
-		;;
-		mips)
-			case ${CHOST} in
-				mips64*)
-					is_crosscompile || has_multilib_profile || use multilib
-					;;
-				*)
-					false
-					;;
-			esac
-		;;
-		amd64|ppc64)
-			is_crosscompile || has_multilib_profile || use multilib
-		;;
-		*)
-			false
-		;;
+	case ${CTARGET} in
+		sparc64*|mips64*|amd64|ppc64)
+			is_crosscompile || has_multilib_profile || use multilib ;;
+		*)  false ;;
 	esac
 }
 
@@ -953,13 +1000,13 @@ crosscompile_setup() {
 
 		case ${CTARGET} in
 			x86_64*)
-				export CFLAGS_x86="${CFLAGS_x86--m32}"
-				export CHOST_x86="i686-pc-linux-gnu"
+				export CFLAGS_x86=${CFLAGS_x86--m32}
+				export CHOST_x86=${CTARGET/x86_64/i686}
 				export CDEFINE_x86="__i386__"
 				export LIBDIR_x86="lib"
 
-				export CFLAGS_amd64="${CFLAGS_amd64--m64}"
-				export CHOST_amd64="x86_64-pc-linux-gnu"
+				export CFLAGS_amd64=${CFLAGS_amd64--m64}
+				export CHOST_amd64=${CTARGET}
 				export CDEFINE_amd64="__x86_64__"
 				export LIBDIR_amd64="lib64"
 
@@ -967,18 +1014,18 @@ crosscompile_setup() {
 				export DEFAULT_ABI="amd64"
 			;;
 			mips64*)
-				export CFLAGS_o32="${CFLAGS_o32--mabi=32}"
-				export CHOST_o32="mips-unknown-linux-gnu"
+				export CFLAGS_o32=${CFLAGS_o32--mabi=32}
+				export CHOST_o32=${CTARGET/mips64/mips}
 				export CDEFINE_o32="_ABIO32"
 				export LIBDIR_o32="lib"
 
-				export CFLAGS_n32="${CFLAGS_n32--mabi=n32}"
-				export CHOST_n32="mips64-unknown-linux-gnu"
+				export CFLAGS_n32=${CFLAGS_n32--mabi=n32}
+				export CHOST_n32=${CTARGET}
 				export CDEFINE_n32="_ABIN32"
 				export LIBDIR_n32="lib32"
 
-				export CFLAGS_n64="${CFLAGS_n64--mabi=64}"
-				export CHOST_n64="mips64-unknown-linux-gnu"
+				export CFLAGS_n64=${CFLAGS_n64--mabi=64}
+				export CHOST_n64=${CTARGET}
 				export CDEFINE_n64="_ABI64"
 				export LIBDIR_n64="lib64"
 
@@ -986,29 +1033,27 @@ crosscompile_setup() {
 				export DEFAULT_ABI="n32"
 			;;
 			powerpc64*)
-				export CFLAGS_ppc="${CFLAGS_ppc--m32}"
-				export CHOST_ppc="powerpc-unknown-linux-gnu"
-				export CDEFINE_ppc=""
+				export CFLAGS_ppc=${CFLAGS_ppc--m32}
+				export CHOST_ppc=${CTARGET/powerpc64/powerpc}
+				export CDEFINE_ppc="!__powerpc64__"
 				export LIBDIR_ppc="lib"
 
-				export CFLAGS_ppc64="${CFLAGS_ppc64--m64}"
-				export CHOST_ppc64="powerpc64-unknown-linux-gnu"
-				export CDEFINE_ppc64=""
+				export CFLAGS_ppc64=${CFLAGS_ppc64--m64}
+				export CHOST_ppc64=${CTARGET}
+				export CDEFINE_ppc64="__powerpc64__"
 				export LIBDIR_ppc64="lib64"
 
 				export MULTILIB_ABIS="ppc64"
 				export DEFAULT_ABI="ppc64"
-
-				die "ppc64 crosscompile not yet supported.  Bug a ppc64 dev to fill in the CDEFINE values in the glibc ebuild."
 			;;
 			sparc64*)
-				export CFLAGS_sparc32="${CFLAGS_sparc--m32}"
-				export CHOST_sparc32="sparc-unknown-linux-gnu"
+				export CFLAGS_sparc32=${CFLAGS_sparc--m32}
+				export CHOST_sparc32=${CTARGET/sparc64/sparc}
 				export CDEFINE_sparc32="!__arch64__"
 				export LIBDIR_sparc32="lib"
 
-				export CFLAGS_sparc64="${CFLAGS_sparc64--m64}"
-				export CHOST_sparc64="sparc64-unknown-linux-gnu"
+				export CFLAGS_sparc64=${CFLAGS_sparc64--m64}
+				export CHOST_sparc64=${CTARGET}
 				export CDEFINE_sparc64="__arch64__"
 				export LIBDIR_sparc64="lib64"
 
@@ -1042,47 +1087,30 @@ RESTRICT="nostrip multilib-pkg-force"
 #
 # The gcc-config dep is for the cross-compile multilib stuff
 DEPEND=">=sys-devel/gcc-3.2.3-r1
-	nptl? ( >=sys-devel/gcc-3.3.1-r1
-	        || ( >=sys-kernel/linux-headers-2.6.5 >=sys-kernel/linux26-headers-2.6.5 ) )
+	nptl? ( >=sys-devel/gcc-3.3.1-r1 >=sys-kernel/linux-headers-2.6.5 )
 	>=sys-devel/binutils-2.14.90.0.6-r1
 	>=sys-devel/gcc-config-1.3.9
 	virtual/os-headers
-	nls? ( sys-devel/gettext )"
-
+	nls? ( sys-devel/gettext )
+	selinux? ( !build? ( sys-libs/libselinux ) )"
 RDEPEND="virtual/os-headers
-	sys-apps/baselayout
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+	selinux? ( !build? ( sys-libs/libselinux ) )"
 
 if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-	DEPEND="${DEPEND}
-	        >=${CATEGORY}/gcc-3.3.5-r1"
+	DEPEND="${DEPEND} ${CATEGORY}/gcc"
 
-	if [[ ${CATEGORY/mips} != ${CATEGORY} ]] ; then
-		DEPEND="${DEPEND}
-		        >=${CATEGORY}/mips-headers-2.6.10"
-	else
-		DEPEND="${DEPEND}
-		        >=${CATEGORY}/linux-headers-2.6.8"
+	if [[ ${CATEGORY} == *-linux* ]] ; then
+		if [[ ${CATEGORY/mips} != ${CATEGORY} ]] ; then
+			DEPEND="${DEPEND} >=${CATEGORY}/mips-headers-2.6.10"
+		else
+			DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
+		fi
 	fi
-
-	case ${CTARGET} in
-		x86_64-pc-linux-gnu)
-			[[ ${CHOST/-*/} == "i686" ]] || RDEPEND="${RDEPEND} cross-i686-pc-linux-gnu/${PN}"
-		;;
-		sparc64-unknown-linux-gnu)
-			[[ ${CHOST/-*/} == "sparc" ]] || RDEPEND="${RDEPEND} cross-sparc-unknown-linux-gnu/${PN}"
-		;;
-		powerpc64-unknown-linux-gnu)
-			[[ ${CHOST/-*/} == "powerpc" ]] || RDEPEND="${RDEPEND} cross-powerpc-unknown-linux-gnu/${PN}"
-		;;
-		mips64-unknown-linux-gnu)
-			[[ ${CHOST/-*/} == "mips" ]] || RDEPEND="${RDEPEND} cross-mips-unknown-linux-gnu/${PN}"
-		;;
-	esac
 fi
 
 # until amd64's 2004.3 is purged out of existence
-PDEPEND="amd64? ( multilib? ( >=app-emulation/emul-linux-x86-glibc-2.3.4 ) )"
+PDEPEND="amd64? ( multilib? ( =app-emulation/emul-linux-x86-glibc-${PVR} ) )"
 
 pkg_setup() {
 	if use nptlonly && ! use nptl ; then
@@ -1090,8 +1118,15 @@ pkg_setup() {
 		die "nptlonly without nptl"
 	fi
 
+
 	# give some sort of warning about the nptl logic changes...
 	if want_nptl && want_linuxthreads ; then
+
+		if use ppc ; then
+			eerror "glibc doesn't currently work with nptl and linuxthreads"
+			eerror "please select either nptlonly or -nptl"
+			die "nptlonly not set on ppc"
+		fi
 		ewarn "Warning! Gentoo's GLIBC with NPTL enabled now behaves like the"
 		ewarn "glibc from almost every other distribution out there. This means"
 		ewarn "that glibc is compiled -twice-, once with linuxthreads and once"
@@ -1120,7 +1155,7 @@ src_unpack() {
 		;;
 	esac
 
-	use nomalloccheck || GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 5020_all_nomalloccheck.patch"
+	GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 5020_all_nomalloccheck.patch"
 
 	toolchain-glibc_src_unpack
 
@@ -1172,20 +1207,22 @@ src_unpack() {
 src_compile() {
 	crosscompile_setup
 
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if has_multilib_profile && [ -z "${OABI}" -a "${MLTEST/set_abi}" = "${MLTEST}" ] ; then
-		OABI="${ABI}"
-		for ABI in $(get_install_abis); do
-			export ABI
-			einfo "Compiling ${ABI} glibc"
-			src_compile
-		done
-		ABI="${OABI}"
-		unset OABI
-		return 0
+	if [[ -z ${OABI} ]] && has_multilib_profile ; then
+		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+		local MLTEST=$(type dyn_unpack)
+		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
+			OABI=${ABI}
+			einfo "Building multilib glibc for ABIs: $(get_install_abis)"
+			for ABI in $(get_install_abis) ; do
+				export ABI=${ABI}
+				src_compile
+			done
+			ABI=${OABI}
+			unset OABI
+			return 0
+		fi
+		unset MLTEST
 	fi
-	unset MLTEST
 
 	ABI=${ABI:-default}
 	toolchain-glibc_src_compile
@@ -1194,20 +1231,23 @@ src_compile() {
 src_test() {
 	crosscompile_setup
 
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if has_multilib_profile && [ -z "${OABI}" -a "${MLTEST/set_abi}" = "${MLTEST}" ] ; then
-		OABI="${ABI}"
-		for ABI in $(get_install_abis); do
-			export ABI
-			einfo "Testing ${ABI} glibc"
-			src_test
-		done
-		ABI="${OABI}"
-		unset OABI
-		return 0
+	if [[ -z ${OABI} ]] && has_multilib_profile ; then
+		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+		local MLTEST=$(type dyn_unpack)
+		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
+			OABI=${ABI}
+			einfo "Testing multilib glibc for ABIs: $(get_install_abis)"
+			for ABI in $(get_install_abis) ; do
+				export ABI
+				einfo "   Testing ${ABI} glibc"
+				src_test
+			done
+			ABI=${OABI}
+			unset OABI
+			return 0
+		fi
+		unset MLTEST
 	fi
-	unset MLTEST
 
 	ABI=${ABI:-default}
 	toolchain-glibc_src_test
@@ -1216,52 +1256,63 @@ src_test() {
 src_install() {
 	crosscompile_setup
 
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if has_multilib_profile && [ -z "${OABI}" -a "${MLTEST/set_abi}" = "${MLTEST}" ] ; then
-		OABI="${ABI}"
-		for ABI in $(get_install_abis); do
-			export ABI
-			einfo "Installing ${ABI} glibc"
-			src_install
-		done
-		ABI="${OABI}"
-		unset OABI
-		return 0
+	if [[ -z ${OABI} ]] && has_multilib_profile ; then
+		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+		local MLTEST=$(type dyn_unpack)
+		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
+			OABI=${ABI}
+			einfo "Installing multilib glibc for ABIs: $(get_install_abis)"
+			for ABI in $(get_install_abis) ; do
+				export ABI
+				src_install
+			done
+			ABI=${OABI}
+			unset OABI
+			return 0
+		fi
+		unset MLTEST
 	fi
-	unset MLTEST
 
 	ABI=${ABI:-default}
 
 	# Handle stupid lib32 BS
 	unset OLD_LIBDIR
-	if [[ $(tc-arch) == "amd64" && ${ABI} == "x86" && $(get_libdir) != "lib" ]] && ! is_crosscompile; then
-		OLD_LIBDIR="$(get_libdir)"
-		LIBDIR_x86="lib"
+	if ! is_crosscompile ; then
+		if [[ $(tc-arch) == "amd64" && ${ABI} == "x86" && $(get_libdir) != "lib" ]] ; then
+			OLD_LIBDIR=$(get_libdir)
+			LIBDIR_x86="lib"
+		fi
+
+		if [[ $(tc-arch) == "ppc64" && ${ABI} == "ppc" && $(get_libdir) != "lib" ]] ; then
+			OLD_LIBDIR=$(get_libdir)
+			LIBDIR_ppc="lib"
+		fi
 	fi
 
 	toolchain-glibc_src_install
 
-	# Handle stupid lib32 BS on amd64
+	# Handle stupid lib32 BS on amd64 and ppc64
 	if [[ -n ${OLD_LIBDIR} ]] ; then
-		cd ${S}
-		LIBDIR_x86="${OLD_LIBDIR}"
+		cd "${S}"
+		[[ $(tc-arch) == "amd64" ]] && LIBDIR_x86=${OLD_LIBDIR}
+		[[ $(tc-arch) == "ppc64" ]] && LIBDIR_ppc=${OLD_LIBDIR}
 		unset OLD_LIBDIR
 
-		mv ${D}/lib ${D}/$(get_libdir)
-		mv ${D}/usr/lib ${D}/usr/$(get_libdir)
+		mv "${D}"/lib "${D}"/$(get_libdir)
+		mv "${D}"/usr/lib "${D}"/usr/$(get_libdir)
 		dodir /lib
 		dodir /usr/lib
-		mv ${D}/usr/$(get_libdir)/locale ${D}/usr/lib
-		dosym ../$(get_libdir)/ld-linux.so.2 /lib/ld-linux.so.2
-
-		for f in ${D}/usr/$(get_libdir)/*.so; do
-			local basef=$(basename ${f})
-			if [ -L ${f} ] ; then
-				local target=$(readlink ${f})
+		mv "${D}"/usr/$(get_libdir)/locale "${D}"/usr/lib
+		[[ $(tc-arch) == "amd64" ]] && dosym ../$(get_libdir)/ld-linux.so.2 /lib/ld-linux.so.2
+		[[ $(tc-arch) == "ppc64" ]] && dosym ../$(get_libdir)/ld.so.1 /lib/ld.so.1
+
+		for f in "${D}"/usr/$(get_libdir)/*.so; do
+			local basef=$(basename "${f}")
+			if [[ -L ${f} ]] ; then
+				local target=$(readlink "${f}")
 				target=${target/\/lib\//\/$(get_libdir)\/}
-				rm ${f}
-				dosym ${target} /usr/$(get_libdir)/${basef}
+				rm "${f}"
+				dosym "${target}" /usr/$(get_libdir)/"${basef}"
 			fi
 		done
 
diff --git a/sys-libs/glibc/glibc-2.3.6-r1.ebuild b/sys-libs/glibc/glibc-2.3.6-r1.ebuild
index 3dd564804fe0..0e4892d334df 100644
--- a/sys-libs/glibc/glibc-2.3.6-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.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/sys-libs/glibc/glibc-2.3.6-r1.ebuild,v 1.1 2005/11/14 22:52:59 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6-r1.ebuild,v 1.1.1.1 2005/11/30 09:39:33 chriswhite Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -66,6 +66,10 @@ fi
 is_crosscompile() {
 	[[ ${CHOST} != ${CTARGET} ]]
 }
+just_headers() {
+	[[ -z ${_E_CROSS_HEADERS_ONLY} ]] && return 1
+	is_crosscompile
+}
 
 GLIBC_RELEASE_VER=$(get_version_component_range 1-3)
 
@@ -248,6 +252,31 @@ toolchain-glibc_src_compile() {
 	fi
 }
 
+toolchain-glibc_headers_compile() {
+	GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-headers
+	mkdir -p "${GBUILDDIR}"
+	cd "${GBUILDDIR}"
+
+	local myconf="--disable-sanity-checks --enable-hacker-mode"
+	myconf="${myconf}
+		--enable-add-ons=linuxthreads
+		--without-cvs
+		--enable-bind-now
+		--build=${CBUILD_OPT:-${CBUILD}}
+		--host=${CTARGET_OPT:-${CTARGET}}
+		--with-headers=${ROOT}$(alt_headers)
+		--prefix=$(alt_prefix)
+		--mandir=$(alt_prefix)/share/man
+		--infodir=$(alt_prefix)/share/info
+		--libexecdir=$(alt_prefix)/lib/misc/glibc
+		${EXTRA_ECONF}"
+
+	einfo "Configuring GLIBC headers with: ${myconf// /\n\t\t}"
+	CC=gcc \
+	CFLAGS="-O1 -pipe" \
+	${S}/configure ${myconf} || die "failed to configure glibc"
+}
+
 toolchain-glibc_src_test() {
 	# This is wrong, but glibc's tests fail bad when screwing
 	# around with sandbox, so lets just punt it
@@ -515,6 +544,23 @@ toolchain-glibc_src_install() {
 	done
 }
 
+toolchain-glibc_headers_install() {
+	GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-headers
+	cd "${GBUILDDIR}"
+	make install_root="${D}" install-headers || die "install-headers failed"
+	# Copy over headers that are not part of install-headers ... these
+	# are pretty much taken verbatim from crosstool, see it for more details
+	insinto $(alt_headers)/bits
+	doins misc/syscall-list.h bits/stdio_lim.h || die "doins include bits"
+	insinto $(alt_headers)/gnu
+	doins "${S}"/include/gnu/stubs.h || die "doins include gnu"
+	# Make sure we install the sys-include symlink so that when 
+	# we build a 2nd stage cross-compiler, gcc finds the target 
+	# system headers correctly.  See gcc/doc/gccinstall.info
+	dosym include $(alt_prefix)/sys-include
+	dosym . $(alt_prefix)/usr
+}
+
 toolchain-glibc_pkg_postinst() {
 	# Mixing nptlonly and -nptlonly glibc can prove dangerous if libpthread
 	# isn't removed in unmerge which happens sometimes.  See bug #87671
@@ -863,12 +909,6 @@ setup_locales() {
 glibc_do_configure() {
 	local myconf
 
-	# These should not be set, else the
-	# zoneinfo do not always get installed ...
-	unset LANGUAGE LANG LC_ALL
-	# silly users
-	unset LD_RUN_PATH
-
 	# set addons
 	pushd ${S} > /dev/null
 	ADDONS=$(echo */configure | sed -e 's!/configure!!g;s!\(linuxthreads\|nptl\|rtkaio\|glibc-compat\)\( \|$\)!!g;s! \+$!!;s! !,!g;s!^!,!;/^,\*$/d')
@@ -994,15 +1034,17 @@ use_multilib() {
 
 # Setup toolchain variables that would be defined in the profiles for these archs.
 setup_env() {
+	# These should not be set, else the zoneinfo do not always get installed ...
+	unset LANGUAGE LANG LC_ALL
+	# silly users
+	unset LD_RUN_PATH
+
 	if is_crosscompile || tc-is-cross-compiler ; then
 		multilib_env ${CTARGET}
 		if ! use multilib ; then
 			MULTILIB_ABIS=${DEFAULT_ABI}
 		else
-			case ${CTARGET} in
-			mips64*) MULTILIB_ABIS=${MULTILIB_ABIS/o32} ;;
-			*)       MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}} ;;
-			esac
+			MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}}
 		fi
 
 		# If the user has CFLAGS_<CTARGET> in their make.conf, use that,
@@ -1211,7 +1253,11 @@ src_compile() {
 		fi
 	fi
 
-	toolchain-glibc_src_compile
+	if just_headers ; then
+		toolchain-glibc_headers_compile
+	else
+		toolchain-glibc_src_compile
+	fi
 }
 
 src_test() {
@@ -1270,7 +1316,11 @@ src_install() {
 		fi
 	fi
 
-	toolchain-glibc_src_install
+	if just_headers ; then
+		toolchain-glibc_headers_install
+	else
+		toolchain-glibc_src_install
+	fi
 
 	# Handle stupid lib32 BS on amd64 and ppc64
 	if [[ -n ${OLD_LIBDIR} ]] ; then
diff --git a/sys-libs/glibc/glibc-2.3.6.ebuild b/sys-libs/glibc/glibc-2.3.6.ebuild
index b276b329c523..a48baa421d90 100644
--- a/sys-libs/glibc/glibc-2.3.6.ebuild
+++ b/sys-libs/glibc/glibc-2.3.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/sys-libs/glibc/glibc-2.3.6.ebuild,v 1.1 2005/11/10 14:34:49 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6.ebuild,v 1.1.1.1 2005/11/30 09:39:29 chriswhite Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -21,7 +21,7 @@ KEYWORDS="-*"
 BRANCH_UPDATE=""
 
 # From linuxthreads/man
-GLIBC_MANPAGE_VERSION="2.3.6"
+GLIBC_MANPAGE_VERSION="2.3.6-1"
 
 # From manual
 GLIBC_INFOPAGE_VERSION="2.3.6"
@@ -1039,10 +1039,10 @@ RESTRICT="nostrip multilib-pkg-force"
 # should work with userspace apps, at least on amd64 and ppc64.
 #
 # We need a new-enough binutils for as-needed
-DEPEND=">=sys-devel/gcc-3.2.3-r1
-	nptl? ( >=sys-devel/gcc-3.3.1-r1 >=sys-kernel/linux-headers-2.6.5 )
-	>=sys-devel/binutils-2.15
-	>=sys-devel/gcc-config-1.3.9
+DEPEND=">=sys-devel/gcc-3.3.3
+	nptl? ( >=sys-kernel/linux-headers-2.6.5 )
+	>=sys-devel/binutils-2.16.1
+	>=sys-devel/gcc-config-1.3.12
 	virtual/os-headers
 	sys-libs/timezone-data
 	nls? ( sys-devel/gettext )
@@ -1066,9 +1066,15 @@ if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
 fi
 
 pkg_setup() {
-	eerror "Portage have a serious bug in regards to symlinks, and merging"
-	eerror "this with current versions will fail!"
-	die "Portage sucks."
+	if portageq has_version / '>=sys-libs/glibc-2.3.5.20050201' && \
+	   portageq	has_version / '<sys-libs/glibc-2.3.6' ; then
+		eerror "Portage have a serious bug in regards to symlinks, and merging"
+		eerror "this with current versions will fail!  See:"
+		echo
+		eerror "  http://bugs.gentoo.org/show_bug.cgi?id=112082"
+		echo
+		die "Might break upgrading."
+	fi
 
 	if use nptlonly && ! use nptl ; then
 		eerror "If you want nptlonly, add nptl to your USE too ;p"
diff --git a/sys-libs/glibc/metadata.xml b/sys-libs/glibc/metadata.xml
index f093d416cbb1..fb4199eb7afe 100644
--- a/sys-libs/glibc/metadata.xml
+++ b/sys-libs/glibc/metadata.xml
@@ -1,7 +1,5 @@
- * Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<herd>toolchain</herd>
 </pkgmetadata>
diff --git a/sys-libs/gpm/ChangeLog b/sys-libs/gpm/ChangeLog
index a918c7b2bb21..9259e3d84608 100644
--- a/sys-libs/gpm/ChangeLog
+++ b/sys-libs/gpm/ChangeLog
@@ -1,11 +1,187 @@
 # ChangeLog for sys-libs/gpm
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/ChangeLog,v 1.1 2002/02/01 21:53:38 gbevin Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/ChangeLog,v 1.1.1.1 2005/11/30 09:39:17 chriswhite Exp $
+
+  21 Aug 2005; Mike Frysinger <vapier@gentoo.org> gpm-1.20.1-r5.ebuild:
+  Disable emacs support #99533.
+
+  07 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> gpm-1.20.1-r4.ebuild:
+  Stable on mips.
+
+*gpm-1.20.1-r5 (07 Aug 2005)
+
+  07 Aug 2005; Mike Frysinger <vapier@gentoo.org> +gpm-1.20.1-r5.ebuild:
+  Add mousewheel support by Andrzej Zaborowski #101605.
+
+  05 May 2005; Mamoru KOMACHI <usata@gentoo.org> gpm-1.20.1-r4.ebuild:
+  Forgot to add emacs to DEPEND when emacs is in USE
+
+  03 May 2005; Mamoru KOMACHI <usata@gentoo.org> gpm-1.20.1-r4.ebuild:
+  Added emacs IUSE; bug #80217.
+
+  01 Apr 2005; Lars Weiler <pylon@gentoo.org> gpm-1.20.1-r4.ebuild:
+  Stable on ppc.
+
+  19 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> gpm-1.20.1-r4.ebuild:
+  Stable on alpha.
+
+  12 Mar 2005; Markus Rothe <corsair@gentoo.org> gpm-1.20.1-r4.ebuild:
+  Stable on ppc64
+
+  11 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> gpm-1.20.1-r4.ebuild:
+  Stable on sparc
+
+*gpm-1.20.1-r4 (12 Feb 2005)
+
+  12 Feb 2005; Mike Frysinger <vapier@gentoo.org> +gpm-1.20.1-r4.ebuild:
+  Add patch by Pavel Semerad to fix synps 4way handling #36790 and break the
+  ncurses/gpm circular loop with a patch from Fedora #80942 by babykart.
+
+  07 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  gpm-1.20.1-r3.ebuild:
+  Multilib fix
+
+*gpm-1.20.1-r3 (06 Feb 2005)
+
+  06 Feb 2005; Mike Frysinger <vapier@gentoo.org> -gpm-1.20.1-r2.ebuild,
+  +gpm-1.20.1-r3.ebuild:
+  Move shared libraries into /lib since ncurses can link against them now #80403.
+
+*gpm-1.20.1-r2 (30 Jan 2005)
+
+  30 Jan 2005; Mike Frysinger <vapier@gentoo.org> -gpm-1.20.1-r1.ebuild,
+  +gpm-1.20.1-r2.ebuild:
+  I am retarded and dropped the libgpm.so.1 symlink with -r1.
+
+*gpm-1.20.1-r1 (30 Jan 2005)
+
+  30 Jan 2005; Mike Frysinger <vapier@gentoo.org> +gpm-1.20.1-r1.ebuild:
+  Clean up ebuild and the source code so that we can do fun things like not
+  require autoconf and build in parallel ! Whoo !
+
+  31 Oct 2004; Tom Gall <tgall@gentoo.org> gpm-1.20.1.ebuild, 
+  +files/gpm-linux26-headers.patch:
+  fix bug #66222 for ppc64
+
+  01 Oct 2004; Simon Stelling <blubb@gentoo.org> gpm-1.20.1.ebuild:
+  get_libdir-ized
+
+  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> gpm-1.19.6.ebuild:
+  virtual/glibc -> virtual/libc
+
+  06 Apr 2004; Joshua Brindle <method@gentoo.org> gpm-1.20.1.ebuild:
+  added selinux policy to rdepend
+
+  09 Jan 2004; Jason Wever <weeve@gentoo.org> gpm-1.20.1.ebuild:
+  Marked stable on sparc.
+
+  28 Dec 2003; Joshua Kinard <kumba@gentoo.org> gpm-1.20.1.ebuild:
+  Move to mips stable (~mips -> mips)
+
+  24 Jun 2003; Aron Griffis <agriffis@gentoo.org> gpm-1.20.1.ebuild:
+  Mark stable on alpha
+
+  16 Jun 2003; Michael Nazaroff <naz@gentoo.org> gpm-1.20.1.ebuild:
+  Marked ebuild stable for x86.
+  
+  12 Jun 2003; <msterret@gentoo.org> gpm-1.20.1.ebuild:
+  add Header
+
+*gpm-1.20.1 (03 Jun 2003)
+
+  28 Jul 2003; Martin Schlemmer <azarah@gentoo.org> files/gpm.rc6:
+  Service should 'use' logger.
+
+  06 Jul 2003; Guy Martin <gmsoft@gentoo.org> gpm-1.20.1.ebuild :
+  Marked stable on hppa.
+
+  03 Jun 2003; Michael Nazaroff <naz@gentoo.org> gpm-1.20.1.ebuild :
+  Did a major overhall of gpm ebuild and bumped up to a newer version 
+  application.  The patches include fixes for mc and various other issues.
+
+*gpm-1.20.0-r6 (13 Jan 2002)
+
+  24 Feb 2003; Zach Welch <zwelch@gentoo.org> gpm-1.20.0-r6.ebuild :
+  Add arm keyword
+
+  08 Feb 2003; Guy Martin <gmsoft@gentoo.org> :
+  Added hppa to keywords.
+
+  13 Jan 2002; Michael Nazaroff <naz@gentoo.org> gpm-1.20.0-r6.ebuild :
+
+  Fix for bug #5232 which helps keep useless logs to minimum.
+
+  02 May 2003; Michael Nazaroff <naz@gentoo.org> gpm.conf.d :
+  Added option to /etc/conf.d/gpm to allow it to use a fuller character 
+  set if desired by the user. A added feature via a request in bug 19381. 
+
+*gpm-1.20.0-r5 (18 Nov 2002)
+
+  14 Mar 2003; Jan Seidel <tuxus@gentoo.org> :
+  Added mips to KEYWORDS
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  18 Nov 2002; Martin Schlemmer <azarah@gentoo.org> gpm-1.20.0-r5.ebuild :
+
+  Fix missing /usr/lib/libgpm.so.1, bug #10355.  Convert to use epatch from
+  eutils.eclass.  Add missing IUSE.
+
+*gpm-1.20.0-r4 (23 Oct 2002)
+
+  23 Oct 2002; Seemant Kulleen <seemant@gentoo.org> gpm-1.20.0-r4.ebuild :
+
+  The ebuild kinda smelled bad, so I gave it a refresher.
+  - Change make to MAKEOPTS="-j1" emake
+  - Change make blah install to einstall
+  - (the kicker) make all libraries, not just some mode 755 to prevent
+    a segfault I was getting when trying to start mc.
+
+*gpm-1.20.0-r3 (3 Jun 2002)
+
+  11 Sep 2002; Seemant Kulleen <seemant@gentoo.org> gpm-1.20.0-r3.ebuild :
+
+  emake->make, as suggested by j2ee to: filippo@esaurito.net (Filippo
+  Giunchedi) in bug #7762.
+
+  15 Jul 2002; Mark Guertin <gerk@gentoo.org>
+  Added ppc to keywords
+
+  3 Jun 2002; Micahel Nazaroff <naz@gentoo.org> gpm-1.20.0-r3.ebuild :
+
+  Well I added more fix's to my patch to fix a intellimouse ps2 timeout problem
+  the seems to only pop up occasionally.  This code patch add's retries to ps2
+  imps/2 protocol section in the mice.c file.
+
+
+*gpm-1.20.0-r2 (29 May 2002)
+
+  29 May 2002; Micahel Nazaroff <naz@gentoo.org> gpm-1.20.0-r2.ebuild :
+
+  Ok with this added patch should take care of the svgalib and ncurses problem
+  hopefully. Moved the ebuild to r2 to update force update from the r1 when it's
+  unmasked.
+
+*gpm-1.19.6 (26 May 2002)
+
+  26 May 2002; Martin Schlemmer <azarah@gentoo.org>
+
+  Added 1.19.6 back again, as I and many other have problems with 1.20.0.
+  It gives problems with svgalib and ncurses (give debug info and do not
+  work), and dies randomly.
+
+*gpm-1.20.0-r1 (4 March 2002)
+
+  4 march 2002; Donny Davies <woodchip@gentoo.org> gpm-1.20.0-r1.ebuild :
+
+  Fix to install the library 755.
+
+*gpm-1.20.0 (26 Feb 2002)
 
 *gpm-1.19.6-r2 (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/sys-libs/gpm/Manifest b/sys-libs/gpm/Manifest
index e69de29bb2d1..ab504536f4d5 100644
--- a/sys-libs/gpm/Manifest
+++ b/sys-libs/gpm/Manifest
@@ -0,0 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 81f80af7a34f9e25f9213422bcb30b09 gpm-1.20.1.ebuild 1644
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 6bf047ae7f02e0e5acbbc657ff51c53d gpm-1.20.1-r5.ebuild 1890
+MD5 d7b8b284ac7155667fb47eb116d8d841 ChangeLog 6455
+MD5 9f2da86014b09df3affbb844964a6887 gpm-1.20.1-r4.ebuild 1798
+MD5 1e2ab7c222263d460e9e881f7a1558c7 files/gpm-linux26-headers.patch 423
+MD5 73d6199d600c0f63c31a6de234159bba files/digest-gpm-1.20.1-r4 136
+MD5 5968cb47e493e348cf289b0dd1990f4a files/gpm.conf.d 580
+MD5 cbbd61829b8751340f80666ca67afaff files/digest-gpm-1.20.1-r5 136
+MD5 b1364fd3bf27cda742dbcfc87497cc18 files/gpm.rc6 951
+MD5 97f0853f825f506bf47be3b8ce6f9ce9 files/digest-gpm-1.20.1 136
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDCAifgIKl8Uu19MoRArVbAJ46DE4TBkPyzkjYllDxZxSX9qWI+gCeLek1
+fC7fxTCDoYglAD+Yx+8tOJI=
+=+S7q
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/gpm/files/gpm.conf.d b/sys-libs/gpm/files/gpm.conf.d
index 089c75406002..f21c25755b4a 100644
--- a/sys-libs/gpm/files/gpm.conf.d
+++ b/sys-libs/gpm/files/gpm.conf.d
@@ -1,7 +1,23 @@
-# Config file for /etc/init.d/gpm
+# /etc/init.d/gpm
 
-# The type of mouse you have and the device it is connected to
+# Please uncomment the type of mouse you have and the appropriate MOUSEDEV entry
 
-#MOUSE=ps2
+MOUSE=ps2
+#MOUSE=imps2
 #MOUSEDEV=/dev/psaux
+MOUSEDEV=/dev/input/mice
 
+# Extra settings
+
+#RESPONSIVENESS=
+#REPEAT_TYPE=raw
+
+# Please uncomment this line if you want gpm to understand charsets used
+# in URLs and names with ~ or : in them, etc. This is a good idea to turn on!
+
+#APPEND="-l \"a-zA-Z0-9_.:~/\300-\326\330-\366\370-\377\""
+
+# Various other options, see gpm(8) manpage for more.
+
+#APPEND="-g 1 -A60"
+#APPEND="-l \"a-zA-Z0-9_.:~/\300-\326\330-\366\370-\377\" -g 1 -A60"
diff --git a/sys-libs/gpm/files/gpm.rc6 b/sys-libs/gpm/files/gpm.rc6
index e460100fe6ef..d6c44192f24a 100644
--- a/sys-libs/gpm/files/gpm.rc6
+++ b/sys-libs/gpm/files/gpm.rc6
@@ -1,13 +1,38 @@
 #!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/files/gpm.rc6,v 1.1.1.1 2005/11/30 09:39:17 chriswhite Exp $
+
+#NB: Config is in /etc/conf.d/gpm
+
+depend() {
+	need localmount
+	use hotplug logger
+}
+
+checkconfig() {
+	if [ -z "$MOUSEDEV" ] || [ -z "$MOUSE" ] ; then
+		eerror "You need to setup MOUSEDEV and MOUSE in /etc/conf.d/gpm first"
+		return 1
+	fi
+}
 
 start() {
-    ebegin "Starting gpm"
-    start-stop-daemon --start --quiet --exec /usr/sbin/gpm -- -m ${MOUSEDEV} -t ${MOUSE}
-    eend ${?}
+	checkconfig || return 1
+
+	local params=""
+	[ -n "$RESPONSIVENESS" ] && params="$params -r $RESPONSIVENESS"
+	[ -n "$REPEAT_TYPE" ]    && params="$params -R$REPEAT_TYPE"
+	[ -n "$APPEND" ]         && params="$params $APPEND "
+	
+	ebegin "Starting gpm"
+	start-stop-daemon --start --quiet --exec /usr/sbin/gpm \
+		-- -m ${MOUSEDEV} -t ${MOUSE} ${params}
+	eend ${?}
 }
 
 stop() {
-    ebegin "Stopping gpm"
-    start-stop-daemon --stop --quiet --pidfile /var/run/gpm.pid
-    eend ${?}
+	ebegin "Stopping gpm"
+	start-stop-daemon --stop --quiet --pidfile /var/run/gpm.pid
+	eend ${?}
 }
diff --git a/sys-libs/gpm/gpm-1.20.1-r4.ebuild b/sys-libs/gpm/gpm-1.20.1-r4.ebuild
index 242c74c76251..9ac5725a4039 100644
--- a/sys-libs/gpm/gpm-1.20.1-r4.ebuild
+++ b/sys-libs/gpm/gpm-1.20.1-r4.ebuild
@@ -1,21 +1,23 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/gpm-1.20.1-r4.ebuild,v 1.1 2005/02/13 04:52:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/gpm-1.20.1-r4.ebuild,v 1.1.1.1 2005/11/30 09:39:17 chriswhite Exp $
 
-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs elisp-common
 
 PATCH_VER="1.3"
 DESCRIPTION="Console-based mouse driver"
-HOMEPAGE="ftp://arcana.linux.it/pub/gpm/"
+HOMEPAGE="http://linux.schottelius.org/gpm/"
 SRC_URI="ftp://arcana.linux.it/pub/gpm/${P}.tar.bz2
+	ftp://ftp.schottelius.org/pub/linux/gpm/${P}.tar.bz2
 	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="selinux"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
+IUSE="selinux emacs"
 
-DEPEND="sys-libs/ncurses"
+DEPEND="sys-libs/ncurses
+	emacs? ( virtual/emacs )"
 RDEPEND="selinux? ( sec-policy/selinux-gpm )"
 
 src_unpack() {
@@ -33,11 +35,18 @@ src_compile() {
 		CC=$(tc-getCC) \
 		AR=$(tc-getAR) \
 		RANLIB=$(tc-getRANLIB) \
+		EMACS=: \
 		|| die "emake failed"
+
+	local lisp="emacs/t-mouse.el emacs/t-mouse.elc"
+	if use emacs ; then
+		cd ${S}/contrib ; make clean
+		make EMACS=emacs ELISP="${lisp}" || die
+	fi
 }
 
 src_install() {
-	make install DESTDIR="${D}" || die "make install failed"
+	make install DESTDIR="${D}" EMACS=: ELISP="" || die "make install failed"
 	# fix lib symlinks since the default is missing/bogus
 	dosym libgpm.so.1.19.0 /$(get_libdir)/libgpm.so.1
 	dosym libgpm.so.1 /$(get_libdir)/libgpm.so
@@ -45,6 +54,11 @@ src_install() {
 	mv "${D}"/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/
 	gen_usr_ldscript libgpm.so
 
+	if use emacs ; then
+		cd ${S}/contrib/emacs
+		elisp-install . t-mouse*
+	fi
+
 	insinto /etc/gpm
 	doins conf/gpm-*.conf
 
diff --git a/sys-libs/gpm/gpm-1.20.1-r5.ebuild b/sys-libs/gpm/gpm-1.20.1-r5.ebuild
index 8b29c72299e2..9f2f9ea1a1d4 100644
--- a/sys-libs/gpm/gpm-1.20.1-r5.ebuild
+++ b/sys-libs/gpm/gpm-1.20.1-r5.ebuild
@@ -1,8 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/gpm-1.20.1-r5.ebuild,v 1.1 2005/08/07 22:09:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/gpm-1.20.1-r5.ebuild,v 1.1.1.1 2005/11/30 09:39:17 chriswhite Exp $
 
-inherit eutils toolchain-funcs elisp-common
+# emacs support disabled due to Bug 99533
+
+inherit eutils toolchain-funcs
+#elisp-common
 
 PATCH_VER="1.4"
 DESCRIPTION="Console-based mouse driver"
@@ -16,8 +19,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="selinux emacs"
 
-DEPEND="sys-libs/ncurses
-	emacs? ( virtual/emacs )"
+DEPEND="sys-libs/ncurses"
+#	emacs? ( virtual/emacs )"
 RDEPEND="selinux? ( sec-policy/selinux-gpm )"
 
 src_unpack() {
@@ -38,11 +41,11 @@ src_compile() {
 		EMACS=: \
 		|| die "emake failed"
 
-	local lisp="emacs/t-mouse.el emacs/t-mouse.elc"
-	if use emacs ; then
-		cd "${S}"/contrib ; make clean
-		make EMACS=emacs ELISP="${lisp}" || die
-	fi
+#	local lisp="emacs/t-mouse.el emacs/t-mouse.elc"
+#	if use emacs ; then
+#		cd "${S}"/contrib ; make clean
+#		make EMACS=emacs ELISP="${lisp}" || die
+#	fi
 }
 
 src_install() {
@@ -54,10 +57,10 @@ src_install() {
 	mv "${D}"/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/
 	gen_usr_ldscript libgpm.so
 
-	if use emacs ; then
-		cd ${S}/contrib/emacs
-		elisp-install . t-mouse*
-	fi
+#	if use emacs ; then
+#		cd "${S}"/contrib/emacs
+#		elisp-install . t-mouse*
+#	fi
 
 	insinto /etc/gpm
 	doins conf/gpm-*.conf
diff --git a/sys-libs/gpm/gpm-1.20.1.ebuild b/sys-libs/gpm/gpm-1.20.1.ebuild
index b4d9a2a91a7e..f8cc6afdf3f4 100644
--- a/sys-libs/gpm/gpm-1.20.1.ebuild
+++ b/sys-libs/gpm/gpm-1.20.1.ebuild
@@ -1,44 +1,36 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-
-IUSE=""
-# Please use this variable to keep patch names sane for our patches!
-PATCH_VER="1.0"
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/gpm-1.20.1.ebuild,v 1.1.1.1 2005/11/30 09:39:17 chriswhite Exp $
 
 inherit eutils
 
-S="${WORKDIR}/${P}"
+PATCH_VER="1.0"
 DESCRIPTION="Console-based mouse driver"
-# Future patch's for gpm should keep this format.  This should help others
-# maintain the ebuild and keep patch's simple and and easy to read.
-SRC_PATH="ftp://arcana.linux.it/pub/gpm/${P}.tar.bz2"
-GPM_PATCHES="mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2"
-
-SRC_URI="${SRC_PATH}
-		${GPM_PATCHES}"
-
-
 HOMEPAGE="ftp://arcana.linux.it/pub/gpm/"
+SRC_URI="ftp://arcana.linux.it/pub/gpm/${P}.tar.bz2
+	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2"
 
-DEPEND=">=sys-libs/ncurses-5.2
-	sys-devel/autoconf"
-	
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa arm"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
+IUSE="selinux"
+
+DEPEND=">=sys-libs/ncurses-5.2"
+RDEPEND="selinux? ( sec-policy/selinux-gpm )"
 
 PATCHDIR=${WORKDIR}/patches
 
 src_unpack() {
 	unpack ${A}
 	unpack ${P}-patches-${PATCH_VER}.tar.bz2
-	
-	# This little hack turns off EMACS byte compilation.  We really
-	# don't want this thing auto-detecting emacs.
-	cd ${S}; epatch ${WORKDIR}/patches
+	cd ${S}
+
+	epatch ${WORKDIR}/patches
 
 	# Add missing 'mkinstalldirs' script
 	cp -f /usr/share/automake/mkinstalldirs ${S}
+
+	use ppc64 && epatch ${FILESDIR}/gpm-linux26-headers.patch
 }
 
 src_compile() {
@@ -51,16 +43,16 @@ src_compile() {
 	sed -e 's:all\: $(srcdir)/gpmdoc.ps:all\::' \
 		doc/Makefile.orig > doc/Makefile
 
-	MAKEOPTS="-j1" emake || die
+	emake -j1 || die
 }
 
 src_install() {
 	einstall
-	
-	chmod 755 ${D}/usr/lib/*
-	# Fix missing /usr/lib/libgpm.so.1
+
+	chmod 755 ${D}/usr/$(get_libdir)/*
+	# Fix missing /usr/$(get_libdir)/libgpm.so.1
 	preplib
-	
+
 	dodoc BUGS COPYING ChangeLog Changes MANIFEST README TODO
 	dodoc doc/Announce doc/FAQ doc/README*
 	doinfo doc/gpm.info
@@ -73,4 +65,3 @@ src_install() {
 	insinto /etc/conf.d
 	newins ${FILESDIR}/gpm.conf.d gpm
 }
-
diff --git a/sys-libs/gpm/metadata.xml b/sys-libs/gpm/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-libs/gpm/metadata.xml
+++ b/sys-libs/gpm/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/sys-libs/gwenhywfar/ChangeLog b/sys-libs/gwenhywfar/ChangeLog
index 05c8561a491d..0bbb51f02b7b 100644
--- a/sys-libs/gwenhywfar/ChangeLog
+++ b/sys-libs/gwenhywfar/ChangeLog
@@ -1,9 +1,70 @@
 # ChangeLog for sys-libs/gwenhywfar
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gwenhywfar/ChangeLog,v 1.1 2004/11/23 23:11:12 hanno Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gwenhywfar/ChangeLog,v 1.1.1.1 2005/11/30 09:39:16 chriswhite Exp $
+
+*gwenhywfar-1.18.0 (26 Sep 2005)
+
+  26 Sep 2005; Hanno Boeck <hanno@gentoo.org> +gwenhywfar-1.18.0.ebuild:
+  Version bump.
+
+  17 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  16 Sep 2005; Aron Griffis <agriffis@gentoo.org> gwenhywfar-1.9.0.ebuild:
+  Mark 1.9.0 stable on alpha
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> gwenhywfar-1.14.0.ebuild:
+  add ~ia46
+
+*gwenhywfar-1.14.0 (12 Jul 2005)
+
+  12 Jul 2005; Hanno Boeck <hanno@gentoo.org> +gwenhywfar-1.14.0.ebuild:
+  Version bump.
+
+*gwenhywfar-1.11.0 (13 Apr 2005)
+
+  13 Apr 2005; Hanno Boeck <hanno@gentoo.org> +gwenhywfar-1.11.0.ebuild:
+  Version bump.
+
+*gwenhywfar-1.9.0 (13 Mar 2005)
+
+  13 Mar 2005; Hanno Boeck <hanno@gentoo.org> +gwenhywfar-1.9.0.ebuild:
+  Version bump.
+
+  22 Feb 2005; Hanno Boeck <hanno@gentoo.org> gwenhywfar-1.7.2.ebuild:
+  Stable on x86.
+
+*gwenhywfar-1.7.2 (31 Jan 2005)
+
+  31 Jan 2005; Hanno Boeck <hanno@gentoo.org> +gwenhywfar-1.7.2.ebuild:
+  Version bump.
+
+*gwenhywfar-1.6.0 (23 Jan 2005)
+
+  23 Jan 2005; Hanno Boeck <hanno@gentoo.org> +gwenhywfar-1.6.0.ebuild:
+  Version bump.
+
+*gwenhywfar-1.4.1 (14 Jan 2005)
+
+  14 Jan 2005; Hanno Boeck <hanno@gentoo.org> +gwenhywfar-1.4.1.ebuild:
+  Version bump.
+
+*gwenhywfar-1.4 (05 Jan 2005)
+
+  05 Jan 2005; Hanno Boeck <hanno@gentoo.org> +gwenhywfar-1.4.ebuild:
+  Version bump.
+
+  03 Jan 2005; Chris White <chriswhite@gentoo.org> gwenhywfar-1.3.ebuild:
+  ~ppc towards bug #73702.
+
+  27 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> gwenhywfar-1.3.ebuild:
+  ~alpha keyword.
+
+  26 Dec 2004; Jason Wever <weeve@gentoo.org> gwenhywfar-1.3.ebuild:
+  Added ~sparc keyword wrt bug #73702.
 
 *gwenhywfar-1.3 (24 Nov 2004)
 
   24 Nov 2004; Hanno Boeck <hanno@gentoo.org> +gwenhywfar-1.3.ebuild:
-  Initial commit, ebuild by Florian M�ller in bug #65401.
+  Initial commit, ebuild by Florian Müller in bug #65401.
 
diff --git a/sys-libs/gwenhywfar/Manifest b/sys-libs/gwenhywfar/Manifest
index fbc73b5b2e23..7c1540b50ee8 100644
--- a/sys-libs/gwenhywfar/Manifest
+++ b/sys-libs/gwenhywfar/Manifest
@@ -1,4 +1,24 @@
-MD5 489d50b60b795e8a2cc8bc46c39569b6 gwenhywfar-1.3.ebuild 1092
-MD5 89a08114dadd32561dbba7c3450612ac ChangeLog 370
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2f883d40a272bfa794eae0aaac4708cc ChangeLog 2049
+MD5 2db30840398a62ed59eb67c68c27292f gwenhywfar-1.11.0.ebuild 1098
+MD5 9aa3742e06e1a806e02b44400574942e gwenhywfar-1.14.0.ebuild 1104
+MD5 816da59220df0db55a1ad2ead0e5b247 gwenhywfar-1.6.0.ebuild 1097
+MD5 00e12ab49aa5d55916221e2edd679ed3 gwenhywfar-1.7.2.ebuild 1096
+MD5 5f5eb6d1feda6711e9d705d895b56301 gwenhywfar-1.9.0.ebuild 1095
 MD5 a72a06a37ca4e5905085ebff07fe9e9e metadata.xml 217
-MD5 db1374385ede30f3b9d88a9d2583647e files/digest-gwenhywfar-1.3 66
+MD5 632947dfb43f57854fd28e5a74c654d7 gwenhywfar-1.18.0.ebuild 1172
+MD5 fc33ab392abe9d756648cfb811cac8c7 files/digest-gwenhywfar-1.11.0 70
+MD5 bde20725b03dc2ab865ec30137dd9b9f files/digest-gwenhywfar-1.14.0 70
+MD5 9d8deffe26f8ddf8b83efff2ec9ed17b files/digest-gwenhywfar-1.6.0 68
+MD5 5235175c0f49d38d01e77c84c9778ae1 files/digest-gwenhywfar-1.7.2 68
+MD5 7a1cc07892a744298df2923c784938f4 files/digest-gwenhywfar-1.9.0 69
+MD5 35464166f520326de0ba5402b73bf187 files/digest-gwenhywfar-1.18.0 70
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDOBrDr2QksT29OyARAjgMAJ9OZObWoatfrse4aUQbsIjojLm1iwCfVSMV
+7aEHzGtVsWX1GoKg+Pq2BSI=
+=7ulc
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/gwenhywfar/gwenhywfar-1.11.0.ebuild b/sys-libs/gwenhywfar/gwenhywfar-1.11.0.ebuild
index 3f48bdb32c7c..a614d5ef41b5 100644
--- a/sys-libs/gwenhywfar/gwenhywfar-1.11.0.ebuild
+++ b/sys-libs/gwenhywfar/gwenhywfar-1.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/sys-libs/gwenhywfar/gwenhywfar-1.11.0.ebuild,v 1.1 2005/04/13 07:01:45 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gwenhywfar/gwenhywfar-1.11.0.ebuild,v 1.1.1.1 2005/11/30 09:39:17 chriswhite Exp $
 
 DESCRIPTION="A multi-platform helper library for other libraries"
 HOMEPAGE="http://gwenhywfar.sourceforge.net"
@@ -15,8 +15,6 @@ DEPEND="ssl? ( >=dev-libs/openssl-0.9.6b )
 		sys-libs/ncurses
 		doc? ( app-doc/doxygen )"
 
-S=${WORKDIR}/${P}
-
 src_compile() {
 	if use doc; then
 		APIDOC="--with-docpath=/usr/share/doc/${P}/apidoc"
diff --git a/sys-libs/gwenhywfar/gwenhywfar-1.14.0.ebuild b/sys-libs/gwenhywfar/gwenhywfar-1.14.0.ebuild
index 8ba307168088..a5707fb6e74c 100644
--- a/sys-libs/gwenhywfar/gwenhywfar-1.14.0.ebuild
+++ b/sys-libs/gwenhywfar/gwenhywfar-1.14.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gwenhywfar/gwenhywfar-1.14.0.ebuild,v 1.1 2005/07/12 21:41:32 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gwenhywfar/gwenhywfar-1.14.0.ebuild,v 1.1.1.1 2005/11/30 09:39:17 chriswhite Exp $
 
 DESCRIPTION="A multi-platform helper library for other libraries"
 HOMEPAGE="http://gwenhywfar.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~sparc ~alpha ~ppc"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 
 IUSE="debug ssl doc"
 
diff --git a/sys-libs/gwenhywfar/gwenhywfar-1.18.0.ebuild b/sys-libs/gwenhywfar/gwenhywfar-1.18.0.ebuild
index 1886cda93bd5..045ab4bcd416 100644
--- a/sys-libs/gwenhywfar/gwenhywfar-1.18.0.ebuild
+++ b/sys-libs/gwenhywfar/gwenhywfar-1.18.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gwenhywfar/gwenhywfar-1.18.0.ebuild,v 1.1 2005/09/26 15:58:07 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gwenhywfar/gwenhywfar-1.18.0.ebuild,v 1.1.1.1 2005/11/30 09:39:17 chriswhite Exp $
 
 DESCRIPTION="A multi-platform helper library for other libraries"
 HOMEPAGE="http://gwenhywfar.sourceforge.net"
diff --git a/sys-libs/gwenhywfar/gwenhywfar-1.6.0.ebuild b/sys-libs/gwenhywfar/gwenhywfar-1.6.0.ebuild
index 644bf323a03d..7a6fdd87cd60 100644
--- a/sys-libs/gwenhywfar/gwenhywfar-1.6.0.ebuild
+++ b/sys-libs/gwenhywfar/gwenhywfar-1.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/sys-libs/gwenhywfar/gwenhywfar-1.6.0.ebuild,v 1.1 2005/01/23 01:39:23 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gwenhywfar/gwenhywfar-1.6.0.ebuild,v 1.1.1.1 2005/11/30 09:39:16 chriswhite Exp $
 
 DESCRIPTION="A multi-platform helper library for other libraries"
 HOMEPAGE="http://gwenhywfar.sourceforge.net"
@@ -15,8 +15,6 @@ DEPEND="ssl? ( >=dev-libs/openssl-0.9.6b )
 		sys-libs/ncurses
 		doc? ( app-doc/doxygen )"
 
-S=${WORKDIR}/${P}
-
 src_compile() {
 	if use doc; then
 		APIDOC="--with-docpath=/usr/share/doc/${P}/apidoc"
diff --git a/sys-libs/gwenhywfar/gwenhywfar-1.7.2.ebuild b/sys-libs/gwenhywfar/gwenhywfar-1.7.2.ebuild
index b1d955894332..2420447515e5 100644
--- a/sys-libs/gwenhywfar/gwenhywfar-1.7.2.ebuild
+++ b/sys-libs/gwenhywfar/gwenhywfar-1.7.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/sys-libs/gwenhywfar/gwenhywfar-1.7.2.ebuild,v 1.1 2005/01/31 11:33:29 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gwenhywfar/gwenhywfar-1.7.2.ebuild,v 1.1.1.1 2005/11/30 09:39:17 chriswhite Exp $
 
 DESCRIPTION="A multi-platform helper library for other libraries"
 HOMEPAGE="http://gwenhywfar.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~sparc ~alpha ~ppc"
+KEYWORDS="x86 ~amd64 ~sparc ~alpha ~ppc"
 
 IUSE="debug ssl doc"
 
@@ -15,8 +15,6 @@ DEPEND="ssl? ( >=dev-libs/openssl-0.9.6b )
 		sys-libs/ncurses
 		doc? ( app-doc/doxygen )"
 
-S=${WORKDIR}/${P}
-
 src_compile() {
 	if use doc; then
 		APIDOC="--with-docpath=/usr/share/doc/${P}/apidoc"
diff --git a/sys-libs/gwenhywfar/gwenhywfar-1.9.0.ebuild b/sys-libs/gwenhywfar/gwenhywfar-1.9.0.ebuild
index 4adf11d72ebb..5cd9a2625ba4 100644
--- a/sys-libs/gwenhywfar/gwenhywfar-1.9.0.ebuild
+++ b/sys-libs/gwenhywfar/gwenhywfar-1.9.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gwenhywfar/gwenhywfar-1.9.0.ebuild,v 1.1 2005/03/13 22:36:15 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gwenhywfar/gwenhywfar-1.9.0.ebuild,v 1.1.1.1 2005/11/30 09:39:17 chriswhite Exp $
 
 DESCRIPTION="A multi-platform helper library for other libraries"
 HOMEPAGE="http://gwenhywfar.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="x86 ~amd64 ~sparc ~alpha ~ppc"
+KEYWORDS="alpha ~amd64 ~ppc ~sparc x86"
 
 IUSE="debug ssl doc"
 
@@ -15,8 +15,6 @@ DEPEND="ssl? ( >=dev-libs/openssl-0.9.6b )
 		sys-libs/ncurses
 		doc? ( app-doc/doxygen )"
 
-S=${WORKDIR}/${P}
-
 src_compile() {
 	if use doc; then
 		APIDOC="--with-docpath=/usr/share/doc/${P}/apidoc"
diff --git a/sys-libs/ldetect-lst/ChangeLog b/sys-libs/ldetect-lst/ChangeLog
index a2b94110b8ea..fbbe64110b36 100644
--- a/sys-libs/ldetect-lst/ChangeLog
+++ b/sys-libs/ldetect-lst/ChangeLog
@@ -1,7 +1,15 @@
 # ChangeLog for sys-libs/ldetect-lst
-# Copyright 2002 Damien Krotkine; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldetect-lst/ChangeLog,v 1.1 2002/12/07 18:30:54 dams Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldetect-lst/ChangeLog,v 1.1.1.1 2005/11/30 09:39:09 chriswhite Exp $
 
+  03 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  11 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> ldetect-lst-0.1.4.ebuild:
+  Stable on alpha.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *ldetect-lst-0.1.4 (1 Dec 2002)
 
   1 Dec 2002; <dams@gentoo.org> ldetect-lst-0.1.4.ebuild:
diff --git a/sys-libs/ldetect-lst/Manifest b/sys-libs/ldetect-lst/Manifest
index e69de29bb2d1..5b002750cd00 100644
--- a/sys-libs/ldetect-lst/Manifest
+++ b/sys-libs/ldetect-lst/Manifest
@@ -0,0 +1,5 @@
+MD5 d477f1e741804c5ab4d1411011272c41 ldetect-lst-0.1.4.ebuild 1109
+MD5 4ad12758766d19d1d67291a5af57b754 ChangeLog 610
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ldetect-lst-0.1.4 0
+MD5 4a22f1a47a32bf01df07bad058da1534 files/ldetect-lst-0.1.4.patch 252
diff --git a/sys-libs/ldetect-lst/ldetect-lst-0.1.4.ebuild b/sys-libs/ldetect-lst/ldetect-lst-0.1.4.ebuild
index 7f1cd86a8ae2..5d62bb377773 100644
--- a/sys-libs/ldetect-lst/ldetect-lst-0.1.4.ebuild
+++ b/sys-libs/ldetect-lst/ldetect-lst-0.1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 2002 damien krotkine <dams@gentoo.org>
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldetect-lst/ldetect-lst-0.1.4.ebuild,v 1.1 2002/12/07 18:30:54 dams Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldetect-lst/ldetect-lst-0.1.4.ebuild,v 1.1.1.1 2005/11/30 09:39:09 chriswhite Exp $
 
 ECVS_ANON="no"
 ECVS_USER="anoncvs"
@@ -17,13 +17,13 @@ HOMEPAGE="http://cvs.mandrakesoft.com/cgi-bin/cvsweb.cgi/soft/ldetect-lst/"
 SRC_URI=""
 
 SLOT="0"
-LICENSE="GPL"
-KEYWORDS="~x86 ~ppc ~sparc ~sparc64 ~alpha"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc alpha"
 
 src_compile() {
 	cd ../../ldetect-lst;
 	echo " ------- pwd : $PWD"
-        patch -p1 <${FILESDIR}/ldetect-lst-0.1.4.patch || die
+	patch -p1 <${FILESDIR}/ldetect-lst-0.1.4.patch || die
 	make prefix=${D}/usr clean;
 	make
 }
@@ -32,4 +32,9 @@ src_install() {
 	cd ../../ldetect-lst;
 	echo " ----------- install in ${PWD}"
 	make prefix=${D}/usr install
+	cd ${D}/usr/share/ldetect-lst/
+	ln -s pcitable.d/90default.lst ./pcitable
+	ln -s usbtable.d/90default.lst ./usbtable
+	ln -s pcmciatable.d/90default.lst ./pcmciatable
+	ln -s isatable.d/90default.lst ./isatable
 }
diff --git a/sys-libs/ldetect-lst/metadata.xml b/sys-libs/ldetect-lst/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-libs/ldetect-lst/metadata.xml
+++ b/sys-libs/ldetect-lst/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/sys-libs/ldetect/ChangeLog b/sys-libs/ldetect/ChangeLog
index 25372e35b83d..0774f2db8514 100644
--- a/sys-libs/ldetect/ChangeLog
+++ b/sys-libs/ldetect/ChangeLog
@@ -1,9 +1,20 @@
 # ChangeLog for sys-libs/ldetect
-# Copyright 2002 Damien Krotkine; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldetect/ChangeLog,v 1.1 2002/12/01 19:02:36 dams Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldetect/ChangeLog,v 1.1.1.1 2005/11/30 09:39:09 chriswhite Exp $
 
-*ldetect-0.4.6 (1 Dec 2002)
+  03 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
 
-  1 Dec 2002; <dams@gentoo.org> Common-0.4.6.ebuild:
+  24 Aug 2004; Sven Wegener <swegener@gentoo.org> ldetect-0.4.7.ebuild:
+  Added missing IUSE.
+
+  11 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> ldetect-0.4.7.ebuild:
+  Stable on alpha.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*ldetect-0.4.7 (1 Dec 2002)
+
+  1 Dec 2002; <dams@gentoo.org> ldetect-0.4.7.ebuild:
 
   Initial version.
diff --git a/sys-libs/ldetect/Manifest b/sys-libs/ldetect/Manifest
index e69de29bb2d1..bae04c43750f 100644
--- a/sys-libs/ldetect/Manifest
+++ b/sys-libs/ldetect/Manifest
@@ -0,0 +1,5 @@
+MD5 bf7e2854fe10d68c0c362a3ea8092a48 ChangeLog 685
+MD5 2f1ef2c63b283c0396a6bc168fdfcf80 ldetect-0.4.7.ebuild 910
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 b6094324c4a30c43d28844eca14b3496 files/ldetect-0.4.7.patch 320
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ldetect-0.4.7 0
diff --git a/sys-libs/ldetect/ldetect-0.4.7.ebuild b/sys-libs/ldetect/ldetect-0.4.7.ebuild
index cc9860762b0d..d882414af80d 100644
--- a/sys-libs/ldetect/ldetect-0.4.7.ebuild
+++ b/sys-libs/ldetect/ldetect-0.4.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 2002 damien krotkine <dams@gentoo.org>
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldetect/ldetect-0.4.7.ebuild,v 1.1 2002/12/01 21:00:08 dams Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldetect/ldetect-0.4.7.ebuild,v 1.1.1.1 2005/11/30 09:39:09 chriswhite Exp $
 
 ECVS_ANON="no"
 ECVS_USER="anoncvs"
@@ -18,44 +18,18 @@ HOMEPAGE="http://cvs.mandrakesoft.com/cgi-bin/cvsweb.cgi/soft/ldetect/"
 SRC_URI=""
 
 SLOT="0"
-LICENSE="GPL"
-KEYWORDS="~x86"
-
-#DEPEND="${DEPEND}
-#        >=dev-lang/ocaml"
-
-#This patch may or may not be backwards compatible with perl-5.6.1
-#Add gaurd as necessary...
-
-#src_unpack() {
-#	echo " ***** pouet $PWD";
-#	echo "filesdir : ${FILESDIR}"
-#        #unpack ${A}
-#	echo " pwd : $PWD"
-#        patch -p0 <${FILESDIR}/Common-1.0.4.patch || die
-#}
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc alpha"
+IUSE=""
 
 src_compile() {
 	cd ../../ldetect;
-	echo " ------- pwd : $PWD"
-        patch -p1 <${FILESDIR}/ldetect-0.4.7.patch || die
-	echo "compile in ${PWD}";
+	patch -p1 <${FILESDIR}/ldetect-0.4.7.patch || die
 	make clean;
 	make
-	#perl-module_src_prep;
-	#perl-module_src_compile;
 }
 
 src_install() {
 	cd ../../ldetect;
-	echo " ----------- install in ${PWD}"
 	make prefix=${D}/usr install
 }
-
-src_prep() {
-	SRC_PREP="yes"
-	cd ../../perl-MDK-Common
-	echo "prep in ${PWD}";	
-}
-
-
diff --git a/sys-libs/ldetect/metadata.xml b/sys-libs/ldetect/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-libs/ldetect/metadata.xml
+++ b/sys-libs/ldetect/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/sys-libs/lib-compat-loki/ChangeLog b/sys-libs/lib-compat-loki/ChangeLog
index 95f512a0092d..02b19b0a04a1 100644
--- a/sys-libs/lib-compat-loki/ChangeLog
+++ b/sys-libs/lib-compat-loki/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-libs/lib-compat-loki
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/lib-compat-loki/ChangeLog,v 1.1 2005/02/23 02:47:50 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/lib-compat-loki/ChangeLog,v 1.1.1.1 2005/11/30 09:39:05 chriswhite Exp $
+
+*lib-compat-loki-0.2 (12 Nov 2005)
+
+  12 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  +lib-compat-loki-0.2.ebuild:
+  Added libsmpeg compiled against older glibc for descent3 compatibility on
+  amd64.
 
 *lib-compat-loki-0.1 (22 Feb 2005)
 
diff --git a/sys-libs/lib-compat-loki/Manifest b/sys-libs/lib-compat-loki/Manifest
index e69de29bb2d1..8ecaf802fe28 100644
--- a/sys-libs/lib-compat-loki/Manifest
+++ b/sys-libs/lib-compat-loki/Manifest
@@ -0,0 +1,6 @@
+MD5 a997129b692aaf2cc96ff88dbf60e54e ChangeLog 664
+MD5 87382f8b0cc430a42a23c0dcdd7e6688 files/digest-lib-compat-loki-0.1 73
+MD5 fc36301c272f38a42b33933ef2e84df2 files/digest-lib-compat-loki-0.2 73
+MD5 9740a48307e453f7348c25dc741fca8e lib-compat-loki-0.1.ebuild 995
+MD5 5e33d2939fa112b02a239c09970b7906 lib-compat-loki-0.2.ebuild 1092
+MD5 11a7e1491b1ac042ac7216b26b4ad1fb metadata.xml 254
diff --git a/sys-libs/lib-compat-loki/lib-compat-loki-0.1.ebuild b/sys-libs/lib-compat-loki/lib-compat-loki-0.1.ebuild
index 3c730817a8b1..b0582768cf2f 100644
--- a/sys-libs/lib-compat-loki/lib-compat-loki-0.1.ebuild
+++ b/sys-libs/lib-compat-loki/lib-compat-loki-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/sys-libs/lib-compat-loki/lib-compat-loki-0.1.ebuild,v 1.1 2005/02/23 02:47:50 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/lib-compat-loki/lib-compat-loki-0.1.ebuild,v 1.1.1.1 2005/11/30 09:39:05 chriswhite Exp $
 
 DESCRIPTION="Compatibility libc6 libraries for Loki games"
 HOMEPAGE="http://www.gentoo.org/"
diff --git a/sys-libs/lib-compat-loki/lib-compat-loki-0.2.ebuild b/sys-libs/lib-compat-loki/lib-compat-loki-0.2.ebuild
index 6dd795d729b8..7c39be952ae0 100644
--- a/sys-libs/lib-compat-loki/lib-compat-loki-0.2.ebuild
+++ b/sys-libs/lib-compat-loki/lib-compat-loki-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/sys-libs/lib-compat-loki/lib-compat-loki-0.2.ebuild,v 1.1 2005/11/12 16:09:52 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/lib-compat-loki/lib-compat-loki-0.2.ebuild,v 1.1.1.1 2005/11/30 09:39:05 chriswhite Exp $
 
 DESCRIPTION="Compatibility libc6 libraries for Loki games"
 HOMEPAGE="http://www.gentoo.org/"
diff --git a/sys-libs/lib-compat/ChangeLog b/sys-libs/lib-compat/ChangeLog
index c4f66279e694..975d5f32d695 100644
--- a/sys-libs/lib-compat/ChangeLog
+++ b/sys-libs/lib-compat/ChangeLog
@@ -1,9 +1,81 @@
 # ChangeLog for sys-libs/lib-compat
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/lib-compat/ChangeLog,v 1.1 2002/02/01 21:53:38 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/lib-compat/ChangeLog,v 1.1.1.1 2005/11/30 09:39:17 chriswhite Exp $
+
+  10 May 2005; Aron Griffis <agriffis@gentoo.org> lib-compat-1.4.ebuild:
+  stable on ia64
+
+  17 Feb 2005; <plasmaroo@gentoo.org> lib-compat-1.4.ebuild:
+  Mark ~ia64.
+
+*lib-compat-1.4 (09 Oct 2004)
+
+  09 Oct 2004: Mike Frysinger <vapier@gentoo.org> :
+  Add ld-linux.so.1 #39485 by Ulrich Mueller.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  lib-compat-1.2.ebuild:
+  Masked lib-compat-1.2.ebuild stable for ppc
+
+  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  lib-compat-1.1.ebuild, lib-compat-1.2-r1.ebuild, lib-compat-1.2.ebuild,
+  lib-compat-1.3.ebuild:
+  virtual/glibc -> virtual/libc
+
+  14 Apr 2004; Travis Tilley <lv@gentoo.org> lib-compat-1.3.ebuild:
+  removed amd64 keyword, as this package isnt even installable there
+
+*lib-compat-1.3 (28 Oct 2003)
+
+  28 Oct 2003; Mike Frysinger <vapier@gentoo.org> :
+  Let's add libsmpeg to the horde since many binary games need an old school glibc-2.2 
+  version.  Most binary games come with their own copy, but not all.
+
+*lib-compat-1.2-r1 (11 Oct 2003)
+
+  26 Oct 2003; Martin Schlemmer <azarah@gentoo.org> lib-compat-1.2-r1.ebuild:
+  Mark stable for all archs.
+
+  11 Oct 2003; Martin Schlemmer <azarah@gentoo.org> lib-compat-1.2-r1.ebuild:
+  Cleanup the filename s to be a bit more uniform, and fix warning forwith
+  ldconfig from glibc-2.3.3.
+
+  08 Sep 2003; Seemant Kulleen <seemant@gentoo.org> lib-compat-1.2.ebuild:
+  bumped to stable. Closing bug #27856, by: Brett Simpson
+  <simpsonb@impmail.dnsalias.com>
+
+  02 Jun 2003; Seemant Kulleen <seemant@gentoo.org> lib-compat-1.2.ebuild :
+  version bump. The x86 part now contains libstdc++.so.2.9 as well, which is
+  needed for hp-web-jetadmin. Additionally, added some compatibility libs for
+  sparc, alpha and ppc
+
+*lib-compat-1.1 (18 Dec 2002)
+
+  14 Feb 2003; Aron Griffis <agriffis@gentoo.org> lib-compat-1.1.ebuild :
+  Add alpha to KEYWORDS
+  
+  19 Dec 2002; Seemant Kulleen <seemant@gentoo.org> lib-compat-1.1.ebuild :
+
+  granted, it's only been a day, but the tests for this have been coming in
+  very positively -- and many of them -- so moving to stable.
+
+  18 Dec 2002; Seemant Kulleen <seemant@gentoo.org> lib-compat-1.1.ebuild
+  files/digest-lib-compat-1.1 :
+
+  Added the libstdc++ from gcc-2.95.3
 
 *lib-compat-1.0-r2 (1 Feb 2002)
 
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  07 Sep 2002; Mark Guertin <gerk@gentoo.org> lib-compat-1.0-r2 :
+  set x86 USE on SRC_URI and src_install function, these are not valid
+  on ppc or sparc (x86 libs), but may need to add ppc libs in future so 
+  left it as a stub build for future usage
+
+  15 Jul 2002; Mark Guertin <gerk@gentoo.org>
+  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/sys-libs/lib-compat/Manifest b/sys-libs/lib-compat/Manifest
index e69de29bb2d1..66cb7ceddc0b 100644
--- a/sys-libs/lib-compat/Manifest
+++ b/sys-libs/lib-compat/Manifest
@@ -0,0 +1,4 @@
+MD5 151b35485d83539f1e8e65bf8e85e9b7 lib-compat-1.4.ebuild 1108
+MD5 1160e729066658a795c9debf73a09b23 ChangeLog 3327
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 cd1bc668a06184e6e98d7b69aa780495 files/digest-lib-compat-1.4 68
diff --git a/sys-libs/lib-compat/lib-compat-1.4.ebuild b/sys-libs/lib-compat/lib-compat-1.4.ebuild
index 4ddb130f0433..d83a63a7057b 100644
--- a/sys-libs/lib-compat/lib-compat-1.4.ebuild
+++ b/sys-libs/lib-compat/lib-compat-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/sys-libs/lib-compat/lib-compat-1.4.ebuild,v 1.1 2004/10/09 23:04:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/lib-compat/lib-compat-1.4.ebuild,v 1.1.1.1 2005/11/30 09:39:17 chriswhite Exp $
 
 DESCRIPTION="Compatibility C++ and libc5 and libc6 libraries for programs new and old"
 HOMEPAGE="http://www.gentoo.org/"
@@ -8,10 +8,11 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc alpha"
+KEYWORDS="alpha ia64 ppc sparc x86"
 IUSE="sdl"
 
-DEPEND="virtual/libc"
+RDEPEND="virtual/libc
+	sdl? ( media-libs/libsdl )"
 
 S=${WORKDIR}/${P}/${ARCH}
 
diff --git a/sys-libs/lib-compat/metadata.xml b/sys-libs/lib-compat/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-libs/lib-compat/metadata.xml
+++ b/sys-libs/lib-compat/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/sys-libs/libaal/ChangeLog b/sys-libs/libaal/ChangeLog
index b6650e2c2625..98d256ce5cbc 100644
--- a/sys-libs/libaal/ChangeLog
+++ b/sys-libs/libaal/ChangeLog
@@ -1,6 +1,85 @@
 # ChangeLog for sys-libs/libaal
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libaal/ChangeLog,v 1.1 2004/01/11 04:02:38 vapier Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libaal/ChangeLog,v 1.1.1.1 2005/11/30 09:39:07 chriswhite Exp $
+
+*libaal-1.0.5 (12 Aug 2005)
+
+  12 Aug 2005; Mike Frysinger <vapier@gentoo.org> +libaal-1.0.5.ebuild:
+  Version bump #102292 by Ingo Bormuth.
+
+  27 Jun 2005; Markus Rothe <corsair@gentoo.org> libaal-1.0.4.ebuild:
+  Stable on ppc64
+
+  15 May 2005; Markus Rothe <corsair@gentoo.org> libaal-1.0.4.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+*libaal-1.0.4 (12 Mar 2005)
+
+  12 Mar 2005; Tony Vroon <chainsaw@gentoo.org> +libaal-1.0.4.ebuild:
+  Version bump, closes bug #82865.
+
+*libaal-1.0.3 (16 Dec 2004)
+
+  16 Dec 2004; Mike Frysinger <vapier@gentoo.org> +libaal-1.0.3.ebuild:
+  Version bump #74570 by infirit (Sander Sweers).
+
+*libaal-1.0.2 (30 Oct 2004)
+
+  30 Oct 2004; Mike Frysinger <vapier@gentoo.org> +libaal-1.0.2.ebuild,
+  -libaal-1.0.2_pre1.ebuild:
+  Version bump #69446 by Stefan Schweizer.
+
+  01 Oct 2004; Simon Stelling <blubb@gentoo.org> libaal-1.0.1.ebuild,
+  libaal-1.0.2_pre1.ebuild:
+  get_libdir-ized
+
+*libaal-1.0.2_pre1 (19 Sep 2004)
+
+  19 Sep 2004; Mike Frysinger <vapier@gentoo.org> +libaal-1.0.2_pre1.ebuild:
+  Version bump #64539 by Stefan Schweizer.
+
+*libaal-1.0.1 (24 Aug 2004)
+
+  24 Aug 2004; Mike Frysinger <vapier@gentoo.org> +libaal-1.0.1.ebuild:
+  Version bump #61563 by Daniel Webert.
+
+*libaal-1.0.0 (14 Aug 2004)
+
+  14 Aug 2004; Mike Frysinger <vapier@gentoo.org> -libaal-0.5.1.ebuild,
+  -libaal-0.5.2.ebuild, -libaal-0.5.3.ebuild, +libaal-1.0.0.ebuild:
+  Version bump #60076 by Stefan Schweizer.
+
+*libaal-0.5.3 (14 Jul 2004)
+
+  14 Jul 2004; Mike Frysinger <vapier@gentoo.org> +libaal-0.5.3.ebuild:
+  Version bump #57075 by Stefan Schweizer.
+
+*libaal-0.5.2 (17 Jun 2004)
+
+  17 Jun 2004; Mike Frysinger <vapier@gentoo.org> -libaal-0.5.0.ebuild,
+  +libaal-0.5.2.ebuild:
+  Version bump #53990 by Redeeman.
+
+*libaal-0.5.1 (17 May 2004)
+
+  17 May 2004; <coxj@gentoo.org> libaal-0.5.1.ebuild:
+  Version Bump
+
+  12 Apr 2004; Travis Tilley <lv@gentoo.org> libaal-0.5.0.ebuild:
+  added ~amd64 keyword
+
+  12 Apr 2004; David Holm <dholm@gentoo.org> libaal-0.5.0.ebuild:
+  Added to ~ppc.
+
+*libaal-0.5.0 (06 Feb 2004)
+
+  06 Feb 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bump.
+
+*libaal-0.4.15-r1 (30 Jan 2004)
+
+  30 Jan 2004; Mike Frysinger <vapier@gentoo.org> :
+  Upstream released new tarballs with a few fixes #39443.
 
 *libaal-0.4.15 (10 Jan 2004)
 
diff --git a/sys-libs/libaal/Manifest b/sys-libs/libaal/Manifest
index 701715ea9421..276178e43e9d 100644
--- a/sys-libs/libaal/Manifest
+++ b/sys-libs/libaal/Manifest
@@ -1,3 +1,16 @@
-MD5 e8f416d95b48a2f17841744b6ebda468 ChangeLog 361
-MD5 a446835f16f37748e5d1db8db44471ff libaal-0.4.15.ebuild 748
-MD5 3ff23798ef874a9d03659ea6d4bddd49 files/digest-libaal-0.4.15 65
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7316b9588533b80ebea8b25729670b72 ChangeLog 2591
+MD5 abb17580068f400e620e0699f645ffb1 files/digest-libaal-1.0.4 64
+MD5 cd25c6f6d3226ee68e58120be045de7b files/digest-libaal-1.0.5 64
+MD5 7205709d0f66b5dd36621324842a9e04 libaal-1.0.4.ebuild 1232
+MD5 d5a8e2d46d43346825d7530e2285dc0f libaal-1.0.5.ebuild 1231
+MD5 e204859e37f5c66efadbae832356f236 metadata.xml 330
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDUcA7gIKl8Uu19MoRAhsfAKCEL6SfKQznWOY4t65j4N876bZ/OACffCQO
+S4dPSYNL3AY+dCM/RtJnb0I=
+=uTlK
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/libaal/libaal-1.0.4.ebuild b/sys-libs/libaal/libaal-1.0.4.ebuild
index 34237cedd3c3..2d9b1ef4badc 100644
--- a/sys-libs/libaal/libaal-1.0.4.ebuild
+++ b/sys-libs/libaal/libaal-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/sys-libs/libaal/libaal-1.0.4.ebuild,v 1.1 2005/03/12 20:14:04 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libaal/libaal-1.0.4.ebuild,v 1.1.1.1 2005/11/30 09:39:07 chriswhite Exp $
 
 inherit eutils
 
@@ -10,14 +10,14 @@ SRC_URI="ftp://ftp.namesys.com/pub/reiser4progs/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc ppc64 -sparc x86"
 IUSE=""
 
 DEPEND=""
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	# remove stupid CFLAG hardcodes
 	sed -i \
 		-e "/GENERIC_CFLAGS/s:-O3::" \
diff --git a/sys-libs/libaal/libaal-1.0.5.ebuild b/sys-libs/libaal/libaal-1.0.5.ebuild
index 508b49ff9830..5ca2b8ff4d69 100644
--- a/sys-libs/libaal/libaal-1.0.5.ebuild
+++ b/sys-libs/libaal/libaal-1.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/sys-libs/libaal/libaal-1.0.5.ebuild,v 1.1 2005/08/12 23:12:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libaal/libaal-1.0.5.ebuild,v 1.1.1.1 2005/11/30 09:39:07 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.namesys.com/pub/reiser4progs/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 -sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 -sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-libs/libavc1394/ChangeLog b/sys-libs/libavc1394/ChangeLog
index 402e2d4f9e77..9ce907367f2d 100644
--- a/sys-libs/libavc1394/ChangeLog
+++ b/sys-libs/libavc1394/ChangeLog
@@ -1,8 +1,57 @@
 # ChangeLog for sys-libs/libavc1394
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libavc1394/ChangeLog,v 1.1.1.1 2005/11/30 09:39:04 chriswhite Exp $
+
+*libavc1394-0.5.0 (21 Apr 2005)
+
+  21 Apr 2005; Mike Frysinger <vapier@gentoo.org> +libavc1394-0.5.0.ebuild:
+  Version bump #89800 by Martin Mokrejs.
+
+  06 Feb 2005; Markus Rothe <corsair@gentoo.org> libavc1394-0.4.1.ebuild:
+  Stable on ppc64
+
+  03 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  18 Dec 2004; Markus Rothe <corsair@gentoo.org> libavc1394-0.4.1.ebuild:
+  added ~ppc64 to KEYWORDS
+
+  19 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> libavc1394-0.4.1.ebuild:
+  Stable on alpha.
+
+  14 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> libavc1394-0.4.1.ebuild:
+  Add ~alpha keyword.
+
+  02 Oct 2004; Sven Wegener <swegener@gentoo.org> libavc1394-0.3.1.ebuild,
+  libavc1394-0.4.1.ebuild:
+  Added missing IUSE. Don't assign default to S
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  libavc1394-0.4.1.ebuild:
+  Masked libavc1394-0.4.1.ebuild stable for ppc
+
+  01 Jun 2004; Travis Tilley <lv@gentoo.org> libavc1394-0.4.1.ebuild:
+  stable on amd64
+
+  21 Mar 2004; Martin Holzer <mholzer@gentoo.org> libavc1394-0.3.1.ebuild:
+  adding categorie. see 45110 for details
+
+  09 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> libavc1394-0.4.1.ebuild:
+  AMD64 keyword.
+
+  29 Jan 2004; <gustavoz@gentoo.org> libavc1394-0.4.1.ebuild:
+  stable on sparc
+
+*libavc1394-0.4.1 (21 Oct 2002)
+
+  21 Oct 2002; Hanno Boeck <hanno@gentoo.org> libavc1394-0.4.1 :
+  Version updated. Resolves bug #9366.
 
 *libavc1394-0.3.1 (12 Jul 2002)
 
+  20 July 2002; Mark Guertin <gerk@gentoo.org> libavc1394-0.3.1.ebuild :
+  Adjusted keywords (added ppc)
+
   12 Jul 2002; Doug Goldstein <cardoe@gentoo.org> libavc1394-0.3.1.ebuild
   ChangeLog files/digest-libavc1394-0.3.1 :
 
diff --git a/sys-libs/libavc1394/Manifest b/sys-libs/libavc1394/Manifest
index e69de29bb2d1..a6091f570660 100644
--- a/sys-libs/libavc1394/Manifest
+++ b/sys-libs/libavc1394/Manifest
@@ -0,0 +1,6 @@
+MD5 83b3518e7b794bfce5058862ae0a4f5e ChangeLog 2254
+MD5 5ed8e9c7eb78c41238d43ad650237ec1 libavc1394-0.5.0.ebuild 690
+MD5 4ef9a4d57c65a02a40ec940e3faff715 libavc1394-0.4.1.ebuild 663
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 8f05956702f7198fd2e9b332333ff2d9 files/digest-libavc1394-0.5.0 68
+MD5 22363b2362e88752e67a8dd37624ecce files/digest-libavc1394-0.4.1 68
diff --git a/sys-libs/libavc1394/libavc1394-0.4.1.ebuild b/sys-libs/libavc1394/libavc1394-0.4.1.ebuild
index 68c87ba72597..32e28d272335 100644
--- a/sys-libs/libavc1394/libavc1394-0.4.1.ebuild
+++ b/sys-libs/libavc1394/libavc1394-0.4.1.ebuild
@@ -1,22 +1,23 @@
-# Copyright 1999-2002 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/sys-libs/libavc1394/libavc1394-0.4.1.ebuild,v 1.1.1.1 2005/11/30 09:39:04 chriswhite Exp $
 
-DESCRIPTION="libavc1394 is a programming interface for the 1394 Trade Association AV/C (Audio/Video Control) Digital Interface Command Set."
+DESCRIPTION="library for the 1394 Trade Association AV/C (Audio/Video Control) Digital Interface Command Set"
 HOMEPAGE="http://sourceforge.net/projects/libavc1394/"
-LICENSE="LGPL"
 SRC_URI="mirror://sourceforge/libavc1394/${P}.tar.gz"
-S=${WORKDIR}/${P}
 
-DEPEND=">=libraw1394-0.8"
+LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc sparc amd64 alpha ppc64"
+IUSE=""
+
+DEPEND=">=sys-libs/libraw1394-0.8"
 
 src_compile() {
-	econf || die	
+	econf || die
 	emake || die
 }
 
-src_install () {
+src_install() {
 	make DESTDIR=${D} install || die
 }
diff --git a/sys-libs/libavc1394/libavc1394-0.5.0.ebuild b/sys-libs/libavc1394/libavc1394-0.5.0.ebuild
index d8f34a591c0f..b5ece56af95e 100644
--- a/sys-libs/libavc1394/libavc1394-0.5.0.ebuild
+++ b/sys-libs/libavc1394/libavc1394-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/sys-libs/libavc1394/libavc1394-0.5.0.ebuild,v 1.1 2005/04/21 01:59:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libavc1394/libavc1394-0.5.0.ebuild,v 1.1.1.1 2005/11/30 09:39:04 chriswhite Exp $
 
 DESCRIPTION="library for the 1394 Trade Association AV/C (Audio/Video Control) Digital Interface Command Set"
 HOMEPAGE="http://www.linux1394.org/ http://sourceforge.net/projects/libavc1394/"
diff --git a/sys-libs/libavc1394/metadata.xml b/sys-libs/libavc1394/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-libs/libavc1394/metadata.xml
+++ b/sys-libs/libavc1394/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/sys-libs/libcap/ChangeLog b/sys-libs/libcap/ChangeLog
index 0c22d4742b54..6b59d96af7dc 100644
--- a/sys-libs/libcap/ChangeLog
+++ b/sys-libs/libcap/ChangeLog
@@ -1,6 +1,115 @@
 # ChangeLog for sys-libs/libcap
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.1 2003/05/15 21:53:30 robbat2 Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.1.1.1 2005/11/30 09:39:11 chriswhite Exp $
+
+*libcap-1.10-r5 (09 Feb 2005)
+
+  09 Feb 2005; Mike Frysinger <vapier@gentoo.org> +libcap-1.10-r5.ebuild:
+  Make sure we install a linker script in /usr/lib alongside the static library.
+
+  03 Feb 2005; <solar@gentoo.org> -libcap-1.10-r3.ebuild,
+  libcap-1.10-r4.ebuild:
+  - removed old -r3 ebuild as -r4 is stable on all arches. removed unused pic
+  USE flag. added support for nocxx to keep swig from getting pulled in via the
+  python use flag for this package - bug #73635
+
+  01 Oct 2004; Simon Stelling <blubb@gentoo.org> libcap-1.10-r3.ebuild,
+  libcap-1.10-r4.ebuild:
+  get_libdir-ized
+
+  15 Jul 2004; Tom Gall <tgall@gentoo.org> libcap-1.10-r4.ebuild:
+  stable on ppc64, bug #55530
+
+  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  libcap-1.10-r3.ebuild, libcap-1.10-r4.ebuild:
+  virtual/glibc -> virtual/libc
+
+  23 Jun 2004; Mike Frysinger <vapier@gentoo.org> files/1.10-python.patch,
+  libcap-1.10-r4.ebuild:
+  Update the swig/python module to build with the shared objects instead of the
+  static objects so we get a PIC aware module #52813 by Joe Jezak.
+
+  03 May 2004; Michael Sterrett <mr_bones_@gentoo.org> libcap-1.10-r2.ebuild,
+  libcap-1.10.ebuild:
+  clean extra ebuilds
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> libcap-1.10-r2.ebuild,
+  libcap-1.10.ebuild:
+  Add inherit eutils
+
+*libcap-1.10-r4 (25 Apr 2004)
+
+  25 Apr 2004; Robin H. Johnson <robbat2@gentoo.org> libcap-1.10-r4.ebuild,
+  files/libcap-1.10-r4-staticfix.diff:
+  finally finish static support from bug #22495, slight cleanup and latest
+  debian patch.
+
+  05 Apr 2004; Jason Wever <weeve@gentoo.org> libcap-1.10-r3.ebuild:
+  Stable on sparc.
+
+  28 Mar 2004; <solar@gentoo.org> libcap-1.10-r3.ebuild:
+  stable on x86. Bugzilla Bug 44955
+
+  24 Feb 2004; <agriffis@gentoo.org> libcap-1.10-r3.ebuild:
+  stable on alpha and ia64
+
+  24 Feb 2004; Rajiv Aaron Manglani <rajiv@gentoo.org> libcap-1.10.ebuild,
+  libcap-1.10-r2.ebuild, libcap-1.10-r3.ebuild:
+  updated HOMEPAGE url.
+
+  14 Dec 2003; Guy Martin <gmsoft@gentoo.org> libcap-1.10-r3.ebuild:
+  Marked stable on hppa.
+
+  16 Nov 2003; Alexander Gabert <pappy@gentoo.org> libcap-1.10.ebuild:
+  removed text relocations out of the libcap library for hardened-gcc via
+  syscall removal patch
+
+  04 Nov 2003; Brad House <brad_mssw@gentoo.org> libcap-1.10-r3.ebuild:
+  add amd64 flag
+
+  16 Oct 2003; Aron Griffis <agriffis@gentoo.org> libcap-1.10-r3.ebuild:
+  Use -fPIC on alpha
+
+  10 Oct 2003; Alexander Gabert <pappy@gentoo.org> libcap-1.10.ebuild:
+  changed hardened-gcc flags
+
+  09 Oct 2003; Alexander Gabert <pappy@gentoo.org> libcap-1.10.ebuild:
+  added new hardened-gcc flags for hppa
+
+  09 Oct 2003; <tuxus@gentoo.org> libcap-1.10-r2.ebuild:
+  stable on mips
+
+*libcap-1.10-r3 (29 Sep 2003)
+
+  29 Sep 2003; Mike Frysinger <vapier@gentoo.org> libcap-1.10-r3.ebuild:
+  Version bump to add deb patch and add full pic support #29958.
+
+  29 Sep 2003; Mike Frysinger <vapier@gentoo.org> libcap-1.10.ebuild:
+  Filtered out -fPIC from CFLAGS #29958.
+
+  27 Sep 2003; Alexander Gabert <pappy@gentoo.org> libcap-1.10.ebuild:
+  added hcc exclusion for PIC but leave propolice in place
+
+  26 Sep 2003; Aron Griffis <agriffis@gentoo.org> libcap-1.10-r2.ebuild:
+  Stable on alpha
+
+  23 Aug 2003; <rac@gentoo.org> libcap-1.10-r2.ebuild:
+  Add amd64 support
+
+*libcap-1.10-r2 (17 Aug 2003)
+
+  29 Aug 2003; Stefan Jones <cretin@gentoo.org> :
+  Only add -fPIC to the library objectfiles
+  
+  27 Aug 2003; Stefan Jones <cretin@gentoo.org> :
+  Add patch which removes the wrapping of the syscall, glibc wraps all syscalls
+  for you. Now the library can be built with -fPIC on all platforms.
+
+  17 Aug 2003; Robin H. Johnson <robbat2@gentoo.org> libcap-1.10-r2.ebuild:
+  remove -ansi from WARNINGS in the Make system as it seems to break non-x86
+
+  11 Aug 2003; Robin H. Johnson <robbat2@gentoo.org> :
+  hopefully fix non-x86 bugs with -fPIC being needed
 
 *libcap-1.10 (15 May 2003)
   15 May 2003; Robin Johnson <robbat2@gentoo.org> Manifest,
diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index 2d1a20235c91..df664bb68cef 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -1,3 +1,8 @@
-MD5 1703f11464496c56875e35d93f3f2c39 libcap-1.10.ebuild 1490
-MD5 1703f11464496c56875e35d93f3f2c39 libcap-1.10.ebuild~ 1490
-MD5 f55c8f8c068940da50e21f4d4b840422 files/digest-libcap-1.10 63
+MD5 a3a7e29412444976ea4e51394b1eba53 ChangeLog 4346
+MD5 ef17e2df46a45e05b5d7be352e3444c4 libcap-1.10-r5.ebuild 2133
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 c91cacf89f9e42e3f7ae3fc8c4fb8501 files/1.10-python.patch 2796
+MD5 2f1adcade85a501a8b4d47ddeb66ec9b files/digest-libcap-1.10-r5 129
+MD5 3aa7335821ba75c0994083995b0331f2 files/libcap-1.10-syscall.patch 1051
+MD5 1f60409beeba2a799bfbc44a8b826f11 files/libcap-1.10-r4-staticfix.diff 2113
+MD5 225f8c45bc6ff1df2eb5bee87f4a940f files/libcap-1.10-python-2.patch 3349
diff --git a/sys-libs/libcap/files/1.10-python.patch b/sys-libs/libcap/files/1.10-python.patch
index 7e1e77fb3881..6e87babc983e 100644
--- a/sys-libs/libcap/files/1.10-python.patch
+++ b/sys-libs/libcap/files/1.10-python.patch
@@ -21,26 +21,30 @@ diff -ur libcap-1.10.orig/libcap/Makefile libcap-1.10/libcap/Makefile
  
  _makenames: _makenames.c cap_names.sed
  	$(CC) $(CFLAGS) $(LDFLAGS) $< -o $@
-@@ -66,6 +71,12 @@
+@@ -66,6 +71,15 @@
  	ln -sf $(MINLIBNAME) $(MAJLIBNAME)
  	ln -sf $(MAJLIBNAME) $(LIBNAME).so
  
 +libcap_wrap.c: include/sys/capability.h
 +	swig -python -o libcap_wrap.c include/sys/capability.h
 +
-+$(PYTHONMODNAME): $(OBJS) libcap_wrap.o
-+	$(LD) -x -shared -o $@ libcap_wrap.o $(OBJS)
++libcap_wrap.o: libcap_wrap.c
++	$(CC) $(CFLAGS) -fPIC -c $< -o $@
++
++$(PYTHONMODNAME): $(LOBJS) libcap_wrap.o
++	$(LD) -x -shared -o $@ libcap_wrap.o $(LOBJS)
 +
  %.o: %.c $(INCLS)
  	$(CC) $(CFLAGS) -c $< -o $@
  
-@@ -82,10 +93,14 @@
+@@ -82,10 +93,15 @@
  	ln -sf $(MINLIBNAME) $(LIBDIR)/$(MAJLIBNAME)
  	ln -sf $(MAJLIBNAME) $(LIBDIR)/$(LIBNAME).so
  	-/sbin/ldconfig
 +ifdef PYTHON
 +	mkdir -p $(PYTHONMODDIR)
 +	install -m 0644 $(PYTHONMODNAME) $(PYTHONMODDIR)/$(PYTHONMODNAME)
++	install -m 0644 libcap.py $(PYTHONMODDIR)/
 +endif
  
  clean:
diff --git a/sys-libs/libcap/files/libcap-1.10-syscall.patch b/sys-libs/libcap/files/libcap-1.10-syscall.patch
index 3ef01c3cd73c..7dd084ba32b4 100644
--- a/sys-libs/libcap/files/libcap-1.10-syscall.patch
+++ b/sys-libs/libcap/files/libcap-1.10-syscall.patch
@@ -17,7 +17,24 @@
 +*/
  /*
   * $Log: libcap-1.10-syscall.patch,v $
+  * Revision 1.1.1.1  2005/11/30 09:39:11  chriswhite
+  * *** empty log message ***
+  *
+  * Revision 1.2  2003/08/29 06:28:38  cretin
+  * Only add -fPIC for libcap.so objects
+  *
   * Revision 1.1  2003/08/27 06:10:53  cretin
   * Added -fPIC for prelink to work, and fixed compile error
   *
   * Revision 1.1.1.1  1999/04/17 22:16:31  morgan
+--- libcap-1.10/libcap/Makefile.jj	2003-08-29 07:19:21.863907872 +0100
++++ libcap-1.10/libcap/Makefile	2003-08-29 07:20:21.562832256 +0100
+@@ -61,7 +61,7 @@
+ 	ln -sf $(MAJLIBNAME) $(LIBNAME)
+ 
+ %.o: %.c $(INCLS)
+-	$(CC) $(CFLAGS) -c $< -o $@
++	$(CC) $(CFLAGS) -fPIC -c $< -o $@
+ 
+ install: all
+ 	mkdir -p -m 0755 $(INCDIR)/sys
diff --git a/sys-libs/libcap/libcap-1.10-r5.ebuild b/sys-libs/libcap/libcap-1.10-r5.ebuild
index 114f9822f12a..2a210c87737b 100644
--- a/sys-libs/libcap/libcap-1.10-r5.ebuild
+++ b/sys-libs/libcap/libcap-1.10-r5.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/sys-libs/libcap/libcap-1.10-r5.ebuild,v 1.1 2004/10/15 01:21:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-1.10-r5.ebuild,v 1.1.1.1 2005/11/30 09:39:11 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
@@ -12,22 +12,20 @@ SRC_URI="http://www.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.4/${
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="python pic static"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
+IUSE="nocxx python static"
 
 #patch is in recent 2.2 kernels so it works there
-DEPEND="virtual/libc
-	virtual/os-headers
-	python? ( >=virtual/python-2.2.1 >=dev-lang/swig-1.3.10 )"
-RDEPEND="python? ( >=virtual/python-2.2.1 )
-	virtual/libc"
+DEPEND="virtual/os-headers
+	!nocxx? ( python? ( >=virtual/python-2.2.1 >=dev-lang/swig-1.3.10 ) )"
+RDEPEND="!nocxx? ( python? ( >=virtual/python-2.2.1 ) )"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${WORKDIR}/libcap_${PV}-${DEB_PVER}.diff
-	epatch ${FILESDIR}/${PF}-staticfix.patch
-	epatch ${FILESDIR}/${P}-python-2.patch
+	epatch ${FILESDIR}/${PV}-python.patch
+	epatch ${FILESDIR}/libcap-1.10-r4-staticfix.diff
 	sed -i 's|WARNINGS=-ansi|WARNINGS=|' Make.Rules
 }
 
@@ -35,7 +33,7 @@ src_compile() {
 	local PYTHONVER="`python -V 2>&1 | sed 's/^Python //'|sed 's/\([0-9]*\.[0-9]*\).*/\1/'`"
 	local myflags=""
 	use static && CFLAGS="${CFLAGS} -static" && LDFLAGS="${LDFLAGS} -static"
-	if use python ; then
+	if ! use nocxx && use python ; then
 		myflags="${myflags} PYTHON=1 PYTHONMODDIR=/usr/$(get_libdir)/python${PYTHONVER}/site-packages"
 		append-flags -I/usr/include/python${PYTHONVER}
 	fi
@@ -46,12 +44,12 @@ src_compile() {
 src_install() {
 	local PYTHONVER="`python -V 2>&1 | sed 's/^Python //'|sed 's/\([0-9]*\.[0-9]*\).*/\1/'`"
 	local myflags=""
-	if use python ; then
+	if ! use nocxx && use python ; then
 		myflags="${myflags} PYTHON=1 PYTHONMODDIR=${D}/usr/$(get_libdir)/python${PYTHONVER}/site-packages"
 	fi
 	make install FAKEROOT="${D}" man_prefix=/usr/share LIBDIR="${D}/$(get_libdir)" ${myflags} || die
 	dodir /usr/$(get_libdir)
-	mv ${D}/$(get_libdir)/libcap.a ${D}/usr/$(get_libdir)
+	mv "${D}"/$(get_libdir)/libcap.a "${D}"/usr/$(get_libdir)
 	gen_usr_ldscript libcap.so
 	dodoc CHANGELOG README pgp.keys.asc doc/capability.notes capfaq-0.2.txt
 }
diff --git a/sys-libs/libcap/metadata.xml b/sys-libs/libcap/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-libs/libcap/metadata.xml
+++ b/sys-libs/libcap/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/sys-libs/libchipcard/ChangeLog b/sys-libs/libchipcard/ChangeLog
index 3c85e2e28bc1..98be791c5cca 100644
--- a/sys-libs/libchipcard/ChangeLog
+++ b/sys-libs/libchipcard/ChangeLog
@@ -1,6 +1,106 @@
 # ChangeLog for sys-libs/libchipcard
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libchipcard/ChangeLog,v 1.1.1.1 2005/11/30 09:39:18 chriswhite Exp $
+
+*libchipcard-1.9.15_beta (26 Sep 2005)
+
+  26 Sep 2005; Hanno Boeck <hanno@gentoo.org>
+  +libchipcard-1.9.15_beta.ebuild:
+  Version bump.
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org>
+  libchipcard-1.9.12_beta.ebuild:
+  add ~ia64
+
+*libchipcard-1.9.12_beta (12 Jul 2005)
+
+  12 Jul 2005; Hanno Boeck <hanno@gentoo.org> +files/opensc.patch,
+  +libchipcard-1.9.12_beta.ebuild:
+  Version bump.
+
+*libchipcard-1.9.11_beta (13 Mar 2005)
+
+  13 Mar 2005; Hanno Boeck <hanno@gentoo.org>
+  +libchipcard-1.9.11_beta.ebuild:
+  Version bump.
+
+  14 Feb 2005; Simon Stelling <blubb@gentoo.org>
+  libchipcard-1.9.9_beta.ebuild:
+  added ~amd64
+
+  14 Feb 2005; Simon Stelling <blubb@gentoo.org> :
+  added ~amd64
+
+  13 Feb 2005; Hanno Boeck <hanno@gentoo.org> libchipcard-1.9.9_beta.ebuild:
+  Added hard dependency to sysfsutils, libchipcard doesn't support switching
+  this by configure, to avoid broken trees and compilation failures due to old
+  libsysfs-versions this dep is neccessary.
+
+  02 Feb 2005; Hanno Boeck <hanno@gentoo.org> libchipcard-1.9.9_beta.ebuild:
+  Add fix for compile error.
+
+*libchipcard-1.9.9_beta (02 Feb 2005)
+
+  02 Feb 2005; Hanno Boeck <hanno@gentoo.org> +files/chipcardd2,
+  +libchipcard-1.9.9_beta.ebuild:
+  Added libchipcard2 (former packages chipcard-server and chipcard-client).
+
+  30 Jan 2005; Hanno Boeck <hanno@gentoo.org> libchipcard-0.9.1-r1.ebuild:
+  Added SLOT="1" to make parallel install with libchipcard2 possible.
+
+  11 Dec 2004; Jason Wever <weeve@gentoo.org> libchipcard-0.9.1-r1.ebuild:
+  Stable on sparc.
+
+  19 Sep 2004; Danny van Dyk <kugelfang@gentoo.org>
+  libchipcard-0.9.1-r1.ebuild:
+  Marked ~amd64.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  libchipcard-0.9.1-r1.ebuild:
+  Masked libchipcard-0.9.1-r1.ebuild stable for ppc
+
+  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  libchipcard-0.9.1-r1.ebuild:
+  virtual/glibc -> virtual/libc
+
+  10 Apr 2004; Jason Wever <weeve@gentoo.org> libchipcard-0.9.1-r1.ebuild:
+  Added ~sparc keyword, helps resolve bug #47243.
+
+  04 Mar 2004; David Holm <dholm@gentoo.org> libchipcard-0.9.1-r1.ebuild:
+  Added to ~ppc.
+
+  09 Jan 2004; Aron Griffis <agriffis@gentoo.org> libchipcard-0.9.1-r1.ebuild:
+  stable on alpha
+
+*libchipcard-0.9.1-r1 (11 Oct 2003)
+
+  11 Oct 2003; Hanno Boeck <hanno@gentoo.org> libchipcard-0.9.1-r1.ebuild,
+  files/chipcardd:
+  Fix location of config-files to be /etc and add init-skript.
+
+*libchipcard-0.9.1 (08 Jul 2003)
+
+  08 Jul 2003; Hanno Boeck <hanno@gentoo.org> libchipcard-0.9.1.ebuild:
+  Version bump.
+
+*libchipcard-0.9 (18 Jun 2003)
+
+  18 Jun 2003; Hanno Boeck <hanno@gentoo.org> libchipcard-0.9.ebuild:
+  Version bump.
+
+*libchipcard-0.8.5 (13 May 2003)
+
+  13 May 2003; Hanno Boeck <hanno@gentoo.org> libchipcard-0.8.5.ebuild :
+  New version.
+
+  29 Apr 2003; Bartosch Pixa <darkspecter@gentoo.org> libchipcard-0.6.ebuild,
+  libchipcard-0.8.ebuild:
+  changed the ebuilds to use the correct place for pidfiles and logfiles
+
+*libchipcard-0.8 (20 Feb 2003)
+
+  20 Feb 2003; Hanno Boeck <hanno@gentoo.org> libchipcard-0.8.ebuild :
+  Version bump and added dependencies.
 
 *libchipcard-0.6 (7 Nov 2002)
   
diff --git a/sys-libs/libchipcard/Manifest b/sys-libs/libchipcard/Manifest
index 356974525ee5..e6337f616d02 100644
--- a/sys-libs/libchipcard/Manifest
+++ b/sys-libs/libchipcard/Manifest
@@ -1,7 +1,26 @@
-MD5 0a38873d4cf849109a21864a3be2e44c ChangeLog 955
-MD5 4a81511b7cb4bccfece0f91b3d1e5fde libchipcard-0.6.ebuild 911
-MD5 92c15b63e0dcd0f784a255cd9e8ac5d5 libchipcard-0.8.ebuild 977
-MD5 3955d09b187ba119da550acbbf4f8a3c libchipcard-0.8.5.ebuild 831
-MD5 1c38820f0f82edc810497665e67c9784 files/digest-libchipcard-0.6 67
-MD5 153bb0640ed90550a33c0c842bfda300 files/digest-libchipcard-0.8 67
-MD5 2cea935f1f1af7a0b7feac476ee0816c files/digest-libchipcard-0.8.5 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 da93a7d6612ec3701e26781300517690 ChangeLog 3603
+MD5 67421dc98d1b41fc9f4ea296c2714e49 libchipcard-0.9.1-r1.ebuild 1022
+MD5 9f13f406444b3d3188d6d458c861aba5 libchipcard-1.9.11_beta.ebuild 1353
+MD5 834c0900076c181a32ff2484b0f8b92d libchipcard-1.9.12_beta.ebuild 1435
+MD5 9dbe28c9f5da4eaf84f3c7e9b580e8f5 libchipcard-1.9.9_beta.ebuild 1430
+MD5 a72a06a37ca4e5905085ebff07fe9e9e metadata.xml 217
+MD5 fb6eb2c045948bcf02f325d1bfbe4b29 libchipcard-1.9.15_beta.ebuild 1399
+MD5 0dd97ad441e61b3374622f7fe4372cb0 files/chipcardd 498
+MD5 ec257807a12a9e2af2decfb68e6337e8 files/chipcardd2 494
+MD5 604d568a90ef59070dc8955956f898f7 files/digest-libchipcard-0.9.1-r1 69
+MD5 f3877fe95678bbd376273f5ab506170f files/digest-libchipcard-1.9.11_beta 75
+MD5 96d258198239a54da121b0fb3cfc9d3d files/digest-libchipcard-1.9.12_beta 75
+MD5 87d6efb54dea6ae07d1f3b884eecbf0f files/digest-libchipcard-1.9.9_beta 74
+MD5 5e3a81887c254e4d043d9a0779957f1f files/libchipcard_compile_fix.gz 293
+MD5 cb7710ce500feb06e33ebe6fd6dd6745 files/opensc.patch 673
+MD5 3d26fed59a35b9153a34b601f142c46d files/digest-libchipcard-1.9.15_beta 75
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDOBxBr2QksT29OyARAkbGAJ0aFwdxPTLlTHGN2VEBIjrUftjj0QCfZruZ
+2M6MdC9ejS5YxUUBysxPbjg=
+=hmXX
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/libchipcard/files/chipcardd b/sys-libs/libchipcard/files/chipcardd
index 76dcc6c5608d..57ce498d21c9 100644
--- a/sys-libs/libchipcard/files/chipcardd
+++ b/sys-libs/libchipcard/files/chipcardd
@@ -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/sys-libs/libchipcard/files/chipcardd,v 1.1 2003/10/11 12:03:16 hanno Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libchipcard/files/chipcardd,v 1.1.1.1 2005/11/30 09:39:18 chriswhite Exp $
 
 start() {
     ebegin "Starting libchipcard daemon"
diff --git a/sys-libs/libchipcard/files/chipcardd2 b/sys-libs/libchipcard/files/chipcardd2
index 31bc0207df41..3810d478e1d7 100644
--- a/sys-libs/libchipcard/files/chipcardd2
+++ b/sys-libs/libchipcard/files/chipcardd2
@@ -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/sys-libs/libchipcard/files/chipcardd2,v 1.1 2005/02/01 23:26:35 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libchipcard/files/chipcardd2,v 1.1.1.1 2005/11/30 09:39:18 chriswhite Exp $
 
 start() {
     ebegin "Starting chipcard2 daemon"
diff --git a/sys-libs/libchipcard/libchipcard-0.9.1-r1.ebuild b/sys-libs/libchipcard/libchipcard-0.9.1-r1.ebuild
index fbf01ecd89b9..0a1ef9a9b5f1 100644
--- a/sys-libs/libchipcard/libchipcard-0.9.1-r1.ebuild
+++ b/sys-libs/libchipcard/libchipcard-0.9.1-r1.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/sys-libs/libchipcard/libchipcard-0.9.1-r1.ebuild,v 1.1 2003/10/11 12:03:16 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libchipcard/libchipcard-0.9.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:39:18 chriswhite Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Libchipcard is a library for easy access to chip cards via chip card readers (terminals)."
 SRC_URI="mirror://sourceforge/libchipcard/${P}.tar.gz"
 HOMEPAGE="http://www.libchipcard.de/"
 
-SLOT="0"
+SLOT="1"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 alpha ppc sparc ~amd64"
 IUSE="ssl"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	ssl? ( dev-libs/openssl )"
 
 src_compile() {
diff --git a/sys-libs/libchipcard/libchipcard-1.9.11_beta.ebuild b/sys-libs/libchipcard/libchipcard-1.9.11_beta.ebuild
index dd738e6757d7..d0c374c2464c 100644
--- a/sys-libs/libchipcard/libchipcard-1.9.11_beta.ebuild
+++ b/sys-libs/libchipcard/libchipcard-1.9.11_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/sys-libs/libchipcard/libchipcard-1.9.11_beta.ebuild,v 1.1 2005/03/13 22:38:12 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libchipcard/libchipcard-1.9.11_beta.ebuild,v 1.1.1.1 2005/11/30 09:39:18 chriswhite Exp $
 
 inherit eutils
 
diff --git a/sys-libs/libchipcard/libchipcard-1.9.12_beta.ebuild b/sys-libs/libchipcard/libchipcard-1.9.12_beta.ebuild
index 901eaeff561b..ce1437976f94 100644
--- a/sys-libs/libchipcard/libchipcard-1.9.12_beta.ebuild
+++ b/sys-libs/libchipcard/libchipcard-1.9.12_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/sys-libs/libchipcard/libchipcard-1.9.12_beta.ebuild,v 1.1 2005/07/12 21:47:05 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libchipcard/libchipcard-1.9.12_beta.ebuild,v 1.1.1.1 2005/11/30 09:39:17 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.libchipcard.de"
 SRC_URI="mirror://sourceforge/libchipcard/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~x86 ~sparc ~alpha ~ppc ~amd64"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 
 IUSE="debug ssl usb"
 
diff --git a/sys-libs/libchipcard/libchipcard-1.9.15_beta.ebuild b/sys-libs/libchipcard/libchipcard-1.9.15_beta.ebuild
index 269e85deb7b4..ba135ab15493 100644
--- a/sys-libs/libchipcard/libchipcard-1.9.15_beta.ebuild
+++ b/sys-libs/libchipcard/libchipcard-1.9.15_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/sys-libs/libchipcard/libchipcard-1.9.15_beta.ebuild,v 1.1 2005/09/26 16:04:21 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libchipcard/libchipcard-1.9.15_beta.ebuild,v 1.1.1.1 2005/11/30 09:39:18 chriswhite Exp $
 
 inherit eutils
 
diff --git a/sys-libs/libchipcard/libchipcard-1.9.9_beta.ebuild b/sys-libs/libchipcard/libchipcard-1.9.9_beta.ebuild
index 09383d8f76b9..6b1d1d3b7349 100644
--- a/sys-libs/libchipcard/libchipcard-1.9.9_beta.ebuild
+++ b/sys-libs/libchipcard/libchipcard-1.9.9_beta.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/sys-libs/libchipcard/libchipcard-1.9.9_beta.ebuild,v 1.1 2005/02/01 23:26:35 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libchipcard/libchipcard-1.9.9_beta.ebuild,v 1.1.1.1 2005/11/30 09:39:18 chriswhite Exp $
+
+inherit eutils
 
 MY_P="${PN}2-${PV/_/}"
 DESCRIPTION="Libchipcard is a library for easy access to chip cards via chip card readers (terminals)."
@@ -8,17 +10,23 @@ HOMEPAGE="http://www.libchipcard.de"
 SRC_URI="mirror://sourceforge/libchipcard/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~x86 ~sparc ~alpha ~ppc"
+KEYWORDS="~x86 ~sparc ~alpha ~ppc ~amd64"
 
 IUSE="debug ssl usb"
 
 DEPEND=">=sys-libs/gwenhywfar-1.7.2
 	ssl? ( >=dev-libs/openssl-0.9.6b )
-	usb? ( dev-libs/libusb )"
+	usb? ( dev-libs/libusb )
+	>=sys-fs/sysfsutils-1.2.0 "
 
 
 S=${WORKDIR}/${MY_P}
 
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/libchipcard_compile_fix.gz
+}
+
 src_compile() {
 
 	# Fix location of pid file
diff --git a/sys-libs/libfreevec/ChangeLog b/sys-libs/libfreevec/ChangeLog
index 810eaa3091fd..2e3bb7d57332 100644
--- a/sys-libs/libfreevec/ChangeLog
+++ b/sys-libs/libfreevec/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/libfreevec
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libfreevec/ChangeLog,v 1.1 2005/09/29 13:56:46 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libfreevec/ChangeLog,v 1.1.1.1 2005/11/30 09:39:04 chriswhite Exp $
+
+*libfreevec-0.8-r1 (05 Oct 2005)
+
+  05 Oct 2005; Luca Barbato <lu_zero@gentoo.org> +libfreevec-0.8-r1.ebuild:
+  Removed strcpy and memmove, enable by default the build (HAVE_ALTIVEC_H).
 
 *libfreevec-0.8 (29 Sep 2005)
 
diff --git a/sys-libs/libfreevec/Manifest b/sys-libs/libfreevec/Manifest
index bed25d002660..aee42cc8e806 100644
--- a/sys-libs/libfreevec/Manifest
+++ b/sys-libs/libfreevec/Manifest
@@ -1,4 +1,6 @@
-MD5 a194758d57dae972a4e27bf4e8df1014 ChangeLog 387
-MD5 367d699b5c274563fa59a61f35c6cb77 files/digest-libfreevec-0.8 67
-MD5 42eaa8e54ec52b589d4281a1ee743c54 libfreevec-0.8.ebuild 908
 MD5 4efdf2e1a900716cbb311c31af227d77 metadata.xml 225
+MD5 8984829f8f0fb94f36b40a2e6b5ce7d1 libfreevec-0.8.ebuild 911
+MD5 a4fb0800a2e55713382d4c468bce48b9 libfreevec-0.8-r1.ebuild 1201
+MD5 5128e636f9dc3f0ce8bf7c2e4b44d3de ChangeLog 574
+MD5 367d699b5c274563fa59a61f35c6cb77 files/digest-libfreevec-0.8-r1 67
+MD5 367d699b5c274563fa59a61f35c6cb77 files/digest-libfreevec-0.8 67
diff --git a/sys-libs/libfreevec/libfreevec-0.8-r1.ebuild b/sys-libs/libfreevec/libfreevec-0.8-r1.ebuild
index 38880e72eace..c6468aedb0d8 100644
--- a/sys-libs/libfreevec/libfreevec-0.8-r1.ebuild
+++ b/sys-libs/libfreevec/libfreevec-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/sys-libs/libfreevec/libfreevec-0.8-r1.ebuild,v 1.1 2005/10/05 22:59:45 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libfreevec/libfreevec-0.8-r1.ebuild,v 1.1.1.1 2005/11/30 09:39:04 chriswhite Exp $
 
 inherit flag-o-matic
 
diff --git a/sys-libs/libfreevec/libfreevec-0.8.ebuild b/sys-libs/libfreevec/libfreevec-0.8.ebuild
index b6e5eeaf7705..8a4810ec2db1 100644
--- a/sys-libs/libfreevec/libfreevec-0.8.ebuild
+++ b/sys-libs/libfreevec/libfreevec-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/sys-libs/libfreevec/libfreevec-0.8.ebuild,v 1.1 2005/09/29 13:56:46 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libfreevec/libfreevec-0.8.ebuild,v 1.1.1.1 2005/11/30 09:39:04 chriswhite Exp $
 
 inherit flag-o-matic
 
@@ -20,7 +20,7 @@ DEPEND=">=sys-devel/gcc-3.4
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	libtoolize --copy --force
 	autoreconf
 }
@@ -37,7 +37,5 @@ src_install() {
 }
 
 pkg_postinst() {
-
-ewarn "Beware that library has known bugs, DO NOT PRELOAD IT"
-
+	ewarn "Beware that library has known bugs, DO NOT PRELOAD IT"
 }
diff --git a/sys-libs/libieee1284/ChangeLog b/sys-libs/libieee1284/ChangeLog
index e7cccadf2ec2..1217234a5a3b 100644
--- a/sys-libs/libieee1284/ChangeLog
+++ b/sys-libs/libieee1284/ChangeLog
@@ -1,9 +1,42 @@
 # ChangeLog for sys-libs/libieee1284
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libieee1284/ChangeLog,v 1.1 2002/07/05 15:06:51 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libieee1284/ChangeLog,v 1.1.1.1 2005/11/30 09:39:09 chriswhite Exp $
+
+  27 Jan 2005; Joseph Jezak <josejx@gentoo.org> libieee1284-0.2.8.ebuild:
+  Marked ~ppc, as it seems to work now.
+
+*libieee1284-0.2.8 (16 Jan 2005)
+
+  16 Jan 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +files/libieee1284-0.2.8-dbjh-v4.diff, +libieee1284-0.2.8.ebuild:
+  Bug #75119, #53971, a version bump finally.
+
+  18 May 2003; Seemant Kulleen <seemant@gentoo.org> libieee1284-0.2.1.ebuild:
+  wrapped the DEPENDS in the doc USE flag, closing bug #12704 by Aaron Stone
+  <aaron@engr.Paly.NET>
+
+*libieee1284-0.2.1 (29 Aug 2002)
+
+  29 Sep 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Libtoolize to fix bug #5638.
+
+  29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> libieee1284-0.2.1.ebuild
+  files/digest-libieee1284-0.2.1 :
+
+  Version bump to bugfix release.
+
+*libieee1284-0.2.0 (04 Aug 2002)
+
+  04 Aug 2002; Seemant Kulleen <seemant@gentoo.org> libieee1284-0.2.0.ebuild :
+
+  Version bump, and dependency changed to be NOT version specific for
+  docbook-sgml-utils.
 
 *libieee1284-0.1.6 (03 Jul 2002)
 
+  20 Jul 2002; mark Guertin <gerk@gentoo.org> libieee1284-0.1.6.ebuild
+  Adjusted keywords (-ppc)
+
   03 Jul 2002; Seemant Kulleen <seemant@gentoo.org> libieee1284-0.1.6.ebuild
   ChangeLog files/digest-libieee1284-0.1.6 :
 
diff --git a/sys-libs/libieee1284/Manifest b/sys-libs/libieee1284/Manifest
index adec221743bc..ba2e26b6d5f7 100644
--- a/sys-libs/libieee1284/Manifest
+++ b/sys-libs/libieee1284/Manifest
@@ -1,5 +1,18 @@
-MD5 afb1d57d9024901ec6cdf0178c328998 libieee1284-0.2.1.ebuild 735
-MD5 0147a7a2babe577028b56bfc945513c4 libieee1284-0.2.0.ebuild 728
-MD5 496edd85274a0990b7aade3f7ebd485f ChangeLog 1108
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3bf59a40ae39f0e2e1560f7896be3932 ChangeLog 1597
 MD5 b4e4403ebc3467710fdf39e924a45993 files/digest-libieee1284-0.2.0 70
 MD5 433881468f692034796edba42e16d93a files/digest-libieee1284-0.2.1 70
+MD5 27968a8a07338f966223e10f9cb85056 files/digest-libieee1284-0.2.8 147
+MD5 679eb771355771ee465821c4e3709802 libieee1284-0.2.0.ebuild 712
+MD5 8fd02dbc35e44db3ddc686473dc56359 libieee1284-0.2.1.ebuild 726
+MD5 99168e1d1ef5305153e72cc1fcea5d58 libieee1284-0.2.8.ebuild 987
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC0HNTI1lqEGTUzyQRAl7BAKC4zEsByzta7Vo5e94PlV/HRIso6wCeJXDa
+/UWFVi8yRdGalaSe3w5LNdQ=
+=JfV3
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/libieee1284/libieee1284-0.2.0.ebuild b/sys-libs/libieee1284/libieee1284-0.2.0.ebuild
index 8281aed9d113..e162f5939c26 100644
--- a/sys-libs/libieee1284/libieee1284-0.2.0.ebuild
+++ b/sys-libs/libieee1284/libieee1284-0.2.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/sys-libs/libieee1284/libieee1284-0.2.0.ebuild,v 1.1 2002/08/04 23:03:26 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libieee1284/libieee1284-0.2.0.ebuild,v 1.1.1.1 2005/11/30 09:39:09 chriswhite Exp $
+
+inherit libtool
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Library to query devices using IEEE1284"
 HOMEPAGE="http://cyberelk.net/tim/libieee1284/index.html"
-SRC_URI="http://cyberelk.net/tim/data/libieee1284/stable/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+IUSE=""
 
 LICENSE="GPL-2"
-KEYWORDS="x86 -ppc"
 SLOT="0"
+KEYWORDS="x86 -ppc"
 
 DEPEND="app-text/docbook-sgml-utils
 	>=app-text/docbook-sgml-dtd-4.1
@@ -18,6 +20,8 @@ DEPEND="app-text/docbook-sgml-utils
 
 
 src_compile() {
+	elibtoolize
+
 	econf || die "./configure failed"
 
 	make || die
diff --git a/sys-libs/libieee1284/libieee1284-0.2.1.ebuild b/sys-libs/libieee1284/libieee1284-0.2.1.ebuild
index f3c0a31f21a9..67f6f8e7e3ca 100644
--- a/sys-libs/libieee1284/libieee1284-0.2.1.ebuild
+++ b/sys-libs/libieee1284/libieee1284-0.2.1.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/sys-libs/libieee1284/libieee1284-0.2.1.ebuild,v 1.1 2002/08/29 11:53:08 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libieee1284/libieee1284-0.2.1.ebuild,v 1.1.1.1 2005/11/30 09:39:09 chriswhite Exp $
+
+inherit libtool
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Library to query devices using IEEE1284"
 HOMEPAGE="http://cyberelk.net/tim/libieee1284/index.html"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+IUSE="doc"
 
 LICENSE="GPL-2"
-KEYWORDS="x86 -ppc"
 SLOT="0"
+KEYWORDS="x86 -ppc amd64"
 
-DEPEND="app-text/docbook-sgml-utils
+DEPEND="doc? ( app-text/docbook-sgml-utils
 	>=app-text/docbook-sgml-dtd-4.1
 	app-text/docbook-dsssl-stylesheets
-	dev-perl/XML-RegExp"
+	dev-perl/XML-RegExp )"
 
 
 src_compile() {
+	elibtoolize
 	econf || die "./configure failed"
-
 	make || die
 }
 
diff --git a/sys-libs/libieee1284/libieee1284-0.2.8.ebuild b/sys-libs/libieee1284/libieee1284-0.2.8.ebuild
index 5faba5403b0c..66736ce9f69d 100644
--- a/sys-libs/libieee1284/libieee1284-0.2.8.ebuild
+++ b/sys-libs/libieee1284/libieee1284-0.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/sys-libs/libieee1284/libieee1284-0.2.8.ebuild,v 1.1 2005/01/16 23:23:01 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libieee1284/libieee1284-0.2.8.ebuild,v 1.1.1.1 2005/11/30 09:39:09 chriswhite Exp $
 
 inherit libtool eutils gnuconfig
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 -ppc"
+KEYWORDS="~x86 ~amd64 ~ppc"
 IUSE="doc"
 
 RDEPEND="virtual/libc"
@@ -32,11 +32,6 @@ src_unpack() {
 	gnuconfig_update
 }
 
-src_compile() {
-	econf || die "./configure failed"
-	emake || die
-}
-
 src_install () {
 	einstall || die
 	dodoc AUTHORS NEWS README* TODO doc/interface*
diff --git a/sys-libs/libieee1284/metadata.xml b/sys-libs/libieee1284/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-libs/libieee1284/metadata.xml
+++ b/sys-libs/libieee1284/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/sys-libs/libkudzu/ChangeLog b/sys-libs/libkudzu/ChangeLog
index 47e6824f901c..3669ef9bc9ac 100644
--- a/sys-libs/libkudzu/ChangeLog
+++ b/sys-libs/libkudzu/ChangeLog
@@ -1,6 +1,59 @@
 # ChangeLog for sys-libs/libkudzu
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libkudzu/ChangeLog,v 1.1 2005/07/12 14:17:35 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libkudzu/ChangeLog,v 1.1.1.1 2005/11/30 09:39:04 chriswhite Exp $
+
+  18 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  libkudzu-1.1.62-r1.ebuild:
+  Removed obsolete blocks and added hwdata-gentoo to RDEPEND.
+
+  16 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/typedef_byte.patch, libkudzu-1.1.62-r1.ebuild:
+  Added typedef_byte.patch and closing bug #109516.
+
+  16 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  -libkudzu-1.1.62.ebuild, libkudzu-1.1.62-r1.ebuild:
+  Removed blockers on packages which no longer exist and remove older versions.
+
+  17 Oct 2005; Joseph Jezak <josejx@gentoo.org> libkudzu-1.1.62-r1.ebuild:
+  Marked ppc stable for bug #104149.
+
+  11 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  libkudzu-1.1.62-r1.ebuild:
+  Marked stable on alpha/amd64.
+
+  02 Oct 2005; Aron Griffis <agriffis@gentoo.org> libkudzu-1.1.62-r1.ebuild:
+  Mark 1.1.62-r1 stable on ia64
+
+  30 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  libkudzu-1.1.62-r1.ebuild:
+  Stable on sparc wrt #104149
+
+  24 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  libkudzu-1.1.62-r1.ebuild:
+  Marking stable on x86 per bug #104149.
+
+  24 Sep 2005; Markus Rothe <corsair@gentoo.org> libkudzu-1.1.62-r1.ebuild:
+  Stable on ppc64
+
+  06 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> +files/ppc.patch:
+  Forgot to add the patch... d'oh...
+
+*libkudzu-1.1.62-r1 (06 Sep 2005)
+
+  06 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  +libkudzu-1.1.62-r1.ebuild:
+  Added tiny patch for compiling on ppc and closing bug #100022.
+
+  24 Aug 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  libkudzu-1.1.62.ebuild:
+  Added libkudzu-knoppix blocker.
+
+  31 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  libkudzu-1.1.62.ebuild:
+  Marking -ppc64 due to bug #100022.
+
+  23 Jul 2005; Lars Weiler <pylon@gentoo.org> libkudzu-1.1.62.ebuild:
+  Masked -ppc due to bug #100022.
 
 *libkudzu-1.1.62 (12 Jul 2005)
 
diff --git a/sys-libs/libkudzu/Manifest b/sys-libs/libkudzu/Manifest
index a6d7a59974b4..29b41b056592 100644
--- a/sys-libs/libkudzu/Manifest
+++ b/sys-libs/libkudzu/Manifest
@@ -1,4 +1,7 @@
-MD5 b4bef8f70c8a05aa48d893d74b327fd1 libkudzu-1.1.62.ebuild 1075
+MD5 99ad0fe2a3f8fd6e0cf0489f0364571b ChangeLog 2380
+MD5 5a34775ded0d577c19911b83ea61884c files/digest-libkudzu-1.1.62-r1 65
+MD5 04eb5ef4b3ee508cd36744ff1f709b39 files/ppc.patch 274
+MD5 f997880b4d33533af23ca07e2656bd31 files/sunlance.patch 470
+MD5 3d0fb1858d2751dd4be312fc067ccc0c files/typedef_byte.patch 410
+MD5 8700e435c9077102544e774f7d22b100 libkudzu-1.1.62-r1.ebuild 1121
 MD5 d86e5b5e47260e5a965eae2afe6d6d40 metadata.xml 159
-MD5 5a34775ded0d577c19911b83ea61884c files/digest-libkudzu-1.1.62 65
-MD5 7cf6227fd7e640efa2462086ed448521 files/sunlance.patch 479
diff --git a/sys-libs/libkudzu/libkudzu-1.1.62-r1.ebuild b/sys-libs/libkudzu/libkudzu-1.1.62-r1.ebuild
index 623c09269378..e28e23fae959 100644
--- a/sys-libs/libkudzu/libkudzu-1.1.62-r1.ebuild
+++ b/sys-libs/libkudzu/libkudzu-1.1.62-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/sys-libs/libkudzu/libkudzu-1.1.62-r1.ebuild,v 1.1 2005/09/06 21:51:33 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libkudzu/libkudzu-1.1.62-r1.ebuild,v 1.1.1.1 2005/11/30 09:39:04 chriswhite Exp $
 
 inherit eutils
 
@@ -11,23 +11,21 @@ HOMEPAGE="http://fedora.redhat.com/projects/additional-projects/kudzu/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 -mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ia64 -mips ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="dev-libs/popt
-	|| (
+	|| ( sys-apps/hwdata-gentoo
 		sys-apps/hwdata-knoppix
 		sys-apps/hwdata )"
 DEPEND="dev-libs/popt
-	sys-apps/pciutils
-	!sys-apps/kudzu
-	!sys-apps/kudzu-knoppix
-	!sys-libs/libkudzu-knoppix"
+	sys-apps/pciutils"
 
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/sunlance.patch
 	epatch ${FILESDIR}/ppc.patch
+	epatch ${FILESDIR}/typedef_byte.patch
 }
 
 src_compile() {
diff --git a/sys-libs/libmath++/ChangeLog b/sys-libs/libmath++/ChangeLog
index f7131ccac864..e333c42d47e9 100644
--- a/sys-libs/libmath++/ChangeLog
+++ b/sys-libs/libmath++/ChangeLog
@@ -1,9 +1,28 @@
-# ChangeLog for sys-libs/libmath++-0.0.3 
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libmath++/ChangeLog,v 1.1 2002/08/01 14:59:34 bass Exp $
+# ChangeLog for sys-libs/libmath++
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libmath++/ChangeLog,v 1.1.1.1 2005/11/30 09:39:10 chriswhite Exp $
 
-*sys-libs/libmath++-0.0.3 (1 Aug 2002)
+  17 Mar 2005; Christian Parpart <trapni@gentoo.org> libmath++-0.0.4.ebuild:
+  adding to amd64
 
-  1 Aug 2002; J. Alberto Su�rez L�pez <bass@gentoo.org> libmath++-0.0.3.ebuild
+  03 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*libmath++-0.0.4 (25 Nov 2004)
+
+  25 Nov 2004; Christian Parpart <trapni@gentoo.org> libmath++-0.0.3.ebuild,
+  +libmath++-0.0.4.ebuild:
+  * version bump to 0.0.4 (contains bugfixes and gcc3.4 compile fixes)
+  * updated download URLs
+
+  30 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org> libmath++-0.0.3.ebuild:
+  Add IUSE; use generic src_compile; install some docs
+
+  17 Apr 2004; Michael McCabe <randy@gentoo.org> libmath++-0.0.3.ebuild:
+  added s390 to keywords
+
+*libmath++-0.0.3 (1 Aug 2002)
+
+  1 Aug 2002; J. Alberto Suárez López <bass@gentoo.org> libmath++-0.0.3.ebuild
   First relase 
 
diff --git a/sys-libs/libmath++/Manifest b/sys-libs/libmath++/Manifest
index e69de29bb2d1..c8709aa1897e 100644
--- a/sys-libs/libmath++/Manifest
+++ b/sys-libs/libmath++/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f45cfefccddc7ef76b9ab66916ebbbbb ChangeLog 1007
+MD5 cde912b2e24516456741854dd6875294 files/digest-libmath++-0.0.4 66
+MD5 0a100ca28e32c790cf2189117b3c0366 libmath++-0.0.4.ebuild 891
+MD5 41d7ac32dc54956e937401bb5a2c3810 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDUs1hgIKl8Uu19MoRApsZAJ4/QDG2n0dMCzYBNQa9l1TLlT0bLgCeLyW4
+Hjj6v00MBncC2uzRHtxtUL4=
+=UeJV
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/libmath++/libmath++-0.0.4.ebuild b/sys-libs/libmath++/libmath++-0.0.4.ebuild
index 03be10a0349b..2cb589e79dbc 100644
--- a/sys-libs/libmath++/libmath++-0.0.4.ebuild
+++ b/sys-libs/libmath++/libmath++-0.0.4.ebuild
@@ -1,28 +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/sys-libs/libmath++/libmath++-0.0.4.ebuild,v 1.1 2004/11/25 10:12:03 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libmath++/libmath++-0.0.4.ebuild,v 1.1.1.1 2005/11/30 09:39:10 chriswhite Exp $
 
 DESCRIPTION="template based math library, written in C++, for symbolic and numeric calculus applications"
-HOMEPAGE="http://www.surakware.net/projects/libmath++/index.xml"
+HOMEPAGE="http://upstream.trapni-akane.org/libmath%2B%2B/"
 SRC_URI="http://upstream.trapni-akane.org/libmath%2B%2B/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~x86 ~ppc ~s390"
+KEYWORDS="ppc s390 x86 amd64"
 IUSE=""
 
 DEPEND=">=sys-devel/autoconf-2.59-r5
-		>=sys-devel/automake-1.8.5-r1"
-
+	>=sys-devel/automake-1.8.5-r1"
 RDEPEND=""
 
 src_compile() {
 	export WANT_AUTOCONF=2.5
 	export WANT_AUTOMAKE=1.7
-	autoreconf -v --install
+	autoreconf -v --install || die "autoreconf failed"
 
 	econf || die "configure failed"
-
 	emake || die "make filed"
 }
 
diff --git a/sys-libs/libmath++/metadata.xml b/sys-libs/libmath++/metadata.xml
index f093d416cbb1..8434377a6047 100644
--- a/sys-libs/libmath++/metadata.xml
+++ b/sys-libs/libmath++/metadata.xml
@@ -1,7 +1,5 @@
- * Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<herd>cpp</herd>
 </pkgmetadata>
diff --git a/sys-libs/libraw1394/ChangeLog b/sys-libs/libraw1394/ChangeLog
index c143ad481b14..1833c59346ae 100644
--- a/sys-libs/libraw1394/ChangeLog
+++ b/sys-libs/libraw1394/ChangeLog
@@ -1,7 +1,103 @@
 # ChangeLog for sys-libs/libraw1394
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libraw1394/ChangeLog,v 1.1.1.1 2005/11/30 09:39:09 chriswhite Exp $
 
-*libavc1394-0.3.1 (12 Jul 2002)
+  16 Sep 2005; Aron Griffis <agriffis@gentoo.org> libraw1394-1.2.0.ebuild:
+  Mark 1.2.0 stable on alpha
+
+  05 Sep 2005; Markus Rothe <corsair@gentoo.org> libraw1394-1.2.0.ebuild:
+  Stable on ppc64
+
+  24 Aug 2005; Aron Griffis <agriffis@gentoo.org> libraw1394-1.2.0.ebuild:
+  stable on ia64
+
+  09 May 2005; Aron Griffis <agriffis@gentoo.org> libraw1394-1.2.0.ebuild:
+  add ~ia64
+
+  25 Apr 2005; Bryan Østergaard <kloeri@gentoo.org>
+  libraw1394-1.1.0.ebuild:
+  Stable on alpha.
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org> libraw1394-1.1.0.ebuild:
+  Stable on ppc64
+
+  01 Apr 2005; Lars Weiler <pylon@gentoo.org> libraw1394-1.1.0.ebuild:
+  Stable on ppc.
+
+  23 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> libraw1394-1.1.0.ebuild:
+  Stable on sparc
+
+*libraw1394-1.2.0 (20 Mar 2005)
+
+  20 Mar 2005; Mike Frysinger <vapier@gentoo.org> +libraw1394-1.2.0.ebuild:
+  Version bump.
+
+*libraw1394-1.1.0 (12 Feb 2005)
+
+  12 Feb 2005; Mike Frysinger <vapier@gentoo.org> +libraw1394-1.1.0.ebuild:
+  Version bump #81696 by Simon Koch.
+
+  25 Jan 2005; Markus Rothe <corsair@gentoo.org> libraw1394-0.10.1.ebuild:
+  Stable on ppc64
+
+  03 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  04 Dec 2004; Markus Rothe <corsair@gentoo.org> libraw1394-0.10.1.ebuild:
+  Added ~ppc64 to KEYWORDS; bug #72992
+
+  19 Oct 2004; Bryan Østergaard <kloeri@gentoo.org>
+  libraw1394-0.10.1.ebuild, libraw1394-0.9.0.ebuild:
+  Stable on alpha, fix license.
+
+*libraw1394-0.10.1 (03 Oct 2004)
+
+  03 Oct 2004; Mike Frysinger <vapier@gentoo.org> +libraw1394-0.10.1.ebuild:
+  Version bump #37979 by hendrik / Scott Taylor / James Kyle.
+
+  09 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> libraw1394-0.9.0.ebuild:
+  Keyword ~alpha.
+
+  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  libraw1394-0.9.0.ebuild:
+  virtual/glibc -> virtual/libc
+
+  01 Jun 2004; Travis Tilley <lv@gentoo.org> libraw1394-0.9.0.ebuild:
+  stable on amd64
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> libraw1394-0.9.0.ebuild:
+  Add inherit eutils
+
+  09 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> libraw1394-0.9.0.ebuild:
+  AMD64 keyword.
+
+  29 Jan 2004; <gustavoz@gentoo.org> libraw1394-0.9.0.ebuild:
+  marked stable on sparc
+
+  13 Jan 2004; <gustavoz@gentoo.org> libraw1394-0.9.0.ebuild:
+  keyworded ~sparc
+
+  12 Jan 2004; Martin Holzer <mholzer@gentoo.org> libraw1394-0.9.0.ebuild:
+  adding RESTRICT=nomirror
+
+  06 Sep 2003; Hanno Boeck <hanno@gentoo.org> libraw1394-0.9.0.ebuild,
+  files/libraw_gcc33_fix:
+  Fix for gcc 3.3.
+
+  02 Sep 2003; Seemant Kulleen <seemant@gentoo.org> libraw1394-0.9.0.ebuild:
+  devfs will create the /dev/raw1394 device when the module is loaded -- thanks
+  to Luca Barbato <lu_zero@gentoo.org> in #gentoo-ppc
+
+  12 Jun 2003; <msterret@gentoo.org> libraw1394-0.9.0.ebuild:
+  fix Header
+
+*libraw1394-0.9.0 (12 Jul 2002)
+
+  27 Mar 2003; Seemant Kulleen <seemant@gentoo.org> libraw1394-0.9.0.ebuild:
+  create device.  Closes bug #18287 by Frantz Dhin <tragedy_rm@hotmail.com>
+
+  20 Jul 2002; Mark Guertin <gerk@gentoo.org> libraw1394-0.9.0.ebuild :
+  Added ppc keyword
 
   12 Jul 2002; Doug Goldstein <cardoe@gentoo.org> libraw1394-0.9.0.ebuild
   ChangeLog files/digest-libraw1394-0.9.0 :
diff --git a/sys-libs/libraw1394/Manifest b/sys-libs/libraw1394/Manifest
index e69de29bb2d1..545b2b411c93 100644
--- a/sys-libs/libraw1394/Manifest
+++ b/sys-libs/libraw1394/Manifest
@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3b3752b510604285257bc50d9292095a libraw1394-1.2.0.ebuild 645
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 cd2861b2bc0983859e05134ce9941777 libraw1394-1.1.0.ebuild 611
+MD5 8d58b1eab29b84e8d64fed9975d0d444 libraw1394-0.10.1.ebuild 630
+MD5 8b31b8f56d518401205fa664d41df904 ChangeLog 3727
+MD5 2bc0a95108d281eccd478c423bb9f918 files/digest-libraw1394-1.2.0 68
+MD5 73ddb811165c153d57d5e43909e6c136 files/digest-libraw1394-0.10.1 69
+MD5 ac2865a22563af78175dcace3ad04ce9 files/digest-libraw1394-1.1.0 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDRJvxgIKl8Uu19MoRAlH3AJsHIJc17S+BJ65gNOu8XioELJaOWwCeLhMX
+7zgrWampzuSgc997uXwiw1M=
+=FvSd
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/libraw1394/libraw1394-0.10.1.ebuild b/sys-libs/libraw1394/libraw1394-0.10.1.ebuild
index c7f231f3c5de..eadf5bde4727 100644
--- a/sys-libs/libraw1394/libraw1394-0.10.1.ebuild
+++ b/sys-libs/libraw1394/libraw1394-0.10.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/sys-libs/libraw1394/libraw1394-0.10.1.ebuild,v 1.1 2004/10/03 07:58:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libraw1394/libraw1394-0.10.1.ebuild,v 1.1.1.1 2005/11/30 09:39:09 chriswhite Exp $
 
 inherit gnuconfig
 
@@ -8,9 +8,9 @@ DESCRIPTION="library that provides direct access to the IEEE 1394 bus"
 HOMEPAGE="http://sourceforge.net/projects/libraw1394/"
 SRC_URI="http://www.linux1394.org/files/${PN}/${P}.tar.gz"
 
-LICENSE="LGPL-2.1 | GPL-2"
+LICENSE="|| ( LGPL-2.1 GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="virtual/libc"
diff --git a/sys-libs/libraw1394/libraw1394-1.1.0.ebuild b/sys-libs/libraw1394/libraw1394-1.1.0.ebuild
index a3acb6f9d30b..88a6bbedcce8 100644
--- a/sys-libs/libraw1394/libraw1394-1.1.0.ebuild
+++ b/sys-libs/libraw1394/libraw1394-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/sys-libs/libraw1394/libraw1394-1.1.0.ebuild,v 1.1 2005/02/12 20:07:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libraw1394/libraw1394-1.1.0.ebuild,v 1.1.1.1 2005/11/30 09:39:09 chriswhite Exp $
 
 DESCRIPTION="library that provides direct access to the IEEE 1394 bus"
 HOMEPAGE="http://sourceforge.net/projects/libraw1394/"
@@ -8,10 +8,10 @@ SRC_URI="mirror://sourceforge/libraw1394/${P}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86"
 IUSE=""
 
-DEPEND="virtual/libc"
+DEPEND=""
 
 src_install() {
 	make DESTDIR="${D}" install || die
diff --git a/sys-libs/libraw1394/libraw1394-1.2.0.ebuild b/sys-libs/libraw1394/libraw1394-1.2.0.ebuild
index cc10c58a5d50..d38f9c4b5d60 100644
--- a/sys-libs/libraw1394/libraw1394-1.2.0.ebuild
+++ b/sys-libs/libraw1394/libraw1394-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/sys-libs/libraw1394/libraw1394-1.2.0.ebuild,v 1.1 2005/03/20 23:47:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libraw1394/libraw1394-1.2.0.ebuild,v 1.1.1.1 2005/11/30 09:39:09 chriswhite Exp $
 
 DESCRIPTION="library that provides direct access to the IEEE 1394 bus"
 HOMEPAGE="http://www.linux1394.org/"
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/libraw1394/${P}.tar.gz
 
 LICENSE="|| ( LGPL-2.1 GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ~ppc ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-libs/libraw1394/metadata.xml b/sys-libs/libraw1394/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-libs/libraw1394/metadata.xml
+++ b/sys-libs/libraw1394/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/sys-libs/libsafe/ChangeLog b/sys-libs/libsafe/ChangeLog
index 955435ab6aba..67091f1bf9eb 100644
--- a/sys-libs/libsafe/ChangeLog
+++ b/sys-libs/libsafe/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for sys-libs/libsafe
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsafe/ChangeLog,v 1.1 2004/03/02 17:03:10 matsuu Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsafe/ChangeLog,v 1.1.1.1 2005/11/30 09:39:16 chriswhite Exp $
+
+  03 Mar 2005; MATSUU Takuto <matsuu@gentoo.org> libsafe-2.0_p16-r1.ebuild:
+  Added filter-flags "-fomit-frame-pointer". Bug 83634.
+
+  03 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  libsafe-2.0_p16-r1.ebuild:
+  Multilib friendly fix.  Closes bug #80391.
+
+*libsafe-2.0_p16-r1 (06 Nov 2004)
+
+  06 Nov 2004; MATSUU Takuto <matsuu@gentoo.org> +libsafe-2.0_p16-r1.ebuild:
+  Fixed ${CC} to $(tc-getCC). bugs 70115.
+  Added ~amd64 to KEYWORDS.
+
+  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  libsafe-2.0_p16.ebuild:
+  virtual/glibc -> virtual/libc
 
 *libsafe-2.0_p16 (03 Mar 2004)
 
diff --git a/sys-libs/libsafe/Manifest b/sys-libs/libsafe/Manifest
index 65e7af8d5256..80208c95c097 100644
--- a/sys-libs/libsafe/Manifest
+++ b/sys-libs/libsafe/Manifest
@@ -1,2 +1,4 @@
-MD5 0df3ec64b12b9446345f77e15a1e2fdc libsafe-2.0_p16.ebuild 1594
-MD5 4802aa342dde49b03cd59d85b07e801c files/digest-libsafe-2.0_p16 63
+MD5 0d2437f233a2faa4ca4e894bb265b628 libsafe-2.0_p16-r1.ebuild 1807
+MD5 28f0b9826e4379950f738c2aa064890d ChangeLog 949
+MD5 bb8d0a4581b8faf1798232a83d6b2553 metadata.xml 520
+MD5 4802aa342dde49b03cd59d85b07e801c files/digest-libsafe-2.0_p16-r1 63
diff --git a/sys-libs/libsafe/libsafe-2.0_p16-r1.ebuild b/sys-libs/libsafe/libsafe-2.0_p16-r1.ebuild
index b5f3fb587f4c..c15e9ecb5531 100644
--- a/sys-libs/libsafe/libsafe-2.0_p16-r1.ebuild
+++ b/sys-libs/libsafe/libsafe-2.0_p16-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/sys-libs/libsafe/libsafe-2.0_p16-r1.ebuild,v 1.1 2004/11/06 04:57:28 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsafe/libsafe-2.0_p16-r1.ebuild,v 1.1.1.1 2005/11/30 09:39:16 chriswhite Exp $
 
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs multilib
 
 MY_P="${P/_p/-}"
 DESCRIPTION="Protection against buffer overflow vulnerabilities"
@@ -22,6 +22,8 @@ S=${WORKDIR}/${MY_P}
 src_compile() {
 	local mycflags=""
 
+	filter-flags "-fomit-frame-pointer"
+
 	mycflags="${mycflags} ${CFLAGS}"
 	mycflags="${mycflags} -DLIBSAFE_VERSION=\"\$(VERSION)\""
 	use prelude && mycflags="${mycflags} \$(LIBPRELUDE_CFLAGS)"
@@ -31,17 +33,16 @@ src_compile() {
 	# It safer not too assume it is. Uncomment the following if desired
 	# use mta && mycflags="${mycflags} -DNOTIFY_WITH_EMAIL"
 
-	emake CC="$(tc-getCC)" CFLAGS="${mycflags}" || die
+	emake CC="$(tc-getCC)" CFLAGS="${mycflags}" libsafe || die
 }
 
 src_install() {
-
 	# libsafe stuff
 	into /
 	dolib.so src/libsafe.so.${PV/_p/.} || die
 	# dodir /lib
-	dosym libsafe.so.${PV/_p/.} /lib/libsafe.so || die
-	dosym libsafe.so.${PV/_p/.} /lib/libsafe.so.${PV%%.*} || die
+	dosym libsafe.so.${PV/_p/.} /$(get_libdir)/libsafe.so || die
+	dosym libsafe.so.${PV/_p/.} /$(get_libdir)/libsafe.so.${PV%%.*} || die
 
 	# Documentation
 	doman doc/libsafe.8
@@ -57,6 +58,6 @@ pkg_postinst() {
 	einfo "To use this you have to put the library as one of the variables"
 	einfo "in LD_PRELOAD."
 	einfo "Example in bash:"
-	einfo "export LD_PRELOAD=/lib/libsafe.so.${PV%%.*}"
+	einfo "export LD_PRELOAD=libsafe.so.${PV%%.*}"
 	einfo
 }
diff --git a/sys-libs/libselinux/ChangeLog b/sys-libs/libselinux/ChangeLog
index 7d30a2482e54..7809516447d7 100644
--- a/sys-libs/libselinux/ChangeLog
+++ b/sys-libs/libselinux/ChangeLog
@@ -1,6 +1,158 @@
 # ChangeLog for sys-libs/libselinux
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.1 2003/08/04 04:19:16 pebenito Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.1.1.1 2005/11/30 09:39:10 chriswhite Exp $
+
+  09 Sep 2005; Chris PeBenito <pebenito@gentoo.org> libselinux-1.24.ebuild:
+  Mark stable.
+
+*libselinux-1.24 (25 Jun 2005)
+
+  25 Jun 2005; Chris PeBenito <pebenito@gentoo.org> -libselinux-1.20.ebuild,
+  -libselinux-1.22.ebuild, +libselinux-1.24.ebuild:
+  New upstream release.
+
+  13 May 2005; Chris PeBenito <pebenito@gentoo.org>
+  libselinux-1.22-r1.ebuild:
+  Mark stable.
+
+  10 May 2005; Stephen Bennett <spb@gentoo.org> libselinux-1.22.ebuild:
+  mips stable
+
+*libselinux-1.22-r1 (08 May 2005)
+
+  08 May 2005; Chris PeBenito <pebenito@gentoo.org>
+  +files/libselinux-1.22.diff, +libselinux-1.22-r1.ebuild:
+  A couple fixes, including one for bug #91921.
+
+  01 May 2005; Stephen Bennett <spb@gentoo.org> libselinux-1.22.ebuild:
+  Mark ~mips.
+
+  01 May 2005; Chris PeBenito <pebenito@gentoo.org> libselinux-1.22.ebuild:
+  Mark stable.
+
+*libselinux-1.22 (13 Mar 2005)
+
+  13 Mar 2005; Chris PeBenito <pebenito@gentoo.org> +libselinux-1.22.ebuild:
+  New upstream release.
+
+  13 Feb 2005; Chris PeBenito <pebenito@gentoo.org> libselinux-1.20.ebuild:
+  Mark stable.
+
+*libselinux-1.20 (07 Jan 2005)
+
+  07 Jan 2005; Chris PeBenito <pebenito@gentoo.org> libselinux-1.18.ebuild,
+  +libselinux-1.20.ebuild:
+  New upstream release.  Mark 1.18 stable.
+
+  03 Jan 2005; Chris PeBenito <pebenito@gentoo.org> libselinux-1.16.ebuild,
+  libselinux-1.18.ebuild:
+  Switch to libc virtual for DEP since uclibc now has xattr support.
+
+*libselinux-1.18 (14 Nov 2004)
+
+  14 Nov 2004; Chris PeBenito <pebenito@gentoo.org>
+  +files/selinuxconfig.c.diff, +libselinux-1.18.ebuild:
+  New upstream release.
+
+*libselinux-1.16 (07 Sep 2004)
+
+  07 Sep 2004; Chris PeBenito <pebenito@gentoo.org> +libselinux-1.16.ebuild:
+  New upstream release.
+
+*libselinux-1.14 (02 Jul 2004)
+
+  02 Jul 2004; Chris PeBenito <pebenito@gentoo.org> +libselinux-1.14.ebuild:
+  New upstream version.
+
+  11 Jun 2004; Chris PeBenito <pebenito@gentoo.org> -libselinux-1.10.ebuild,
+  libselinux-1.12.ebuild:
+  Mark stable
+
+*libselinux-1.12 (14 May 2004)
+
+  14 May 2004; Chris PeBenito <pebenito@gentoo.org> +libselinux-1.12.ebuild:
+  New upstream release.
+
+*libselinux-1.10 (17 Apr 2004)
+
+  17 Apr 2004; Chris PeBenito <pebenito@gentoo.org> +libselinux-1.10.ebuild:
+  New upstream version.
+
+  08 Apr 2004; Chris PeBenito <pebenito@gentoo.org> libselinux-1.8.ebuild:
+  Mark stable for 2004.1
+
+*libselinux-1.8 (12 Mar 2004)
+
+  12 Mar 2004; Chris PeBenito <pebenito@gentoo.org> libselinux-1.8.ebuild:
+  New upstream release.
+
+*libselinux-1.6 (24 Feb 2004)
+
+  24 Feb 2004; Chris PeBenito <pebenito@gentoo.org> libselinux-1.6.ebuild:
+  New upstream release.
+
+  16 Dec 2003; Chris PeBenito <pebenito@gentoo.org> libselinux-1.4.ebuild:
+  Mark stable.
+
+*libselinux-1.4 (06 Dec 2003)
+
+  06 Dec 2003; Chris PeBenito <pebenito@gentoo.org> libselinux-1.4.ebuild:
+  New upstream version.
+
+  29 Oct 2003; Joshua Brindle <method@gentoo.org> libselinux-1.2-r2.ebuild:
+  added sparc
+
+*libselinux-1.2-r2 (20 Oct 2003)
+
+  20 Oct 2003; Chris PeBenito <pebenito@gentoo.org> libselinux-1.2-r2.ebuild,
+  files/libselinux-1.2-attr.diff:
+  Compile against sys-apps/attr only if linux-headers are older than 2.4.20.
+
+*libselinux-1.2-r1 (07 Oct 2003)
+
+  07 Oct 2003; Chris PeBenito <pebenito@gentoo.org> libselinux-1.2-r1.ebuild,
+  files/libselinux-1.2-gentoo.diff:
+  Move libraries to /lib, to fix problems with having a separate /usr during
+  booting.
+
+*libselinux-1.2 (03 Oct 2003)
+
+  03 Oct 2003; Chris PeBenito <pebenito@gentoo.org> libselinux-1.2.ebuild,
+  files/libselinux-1.2-const.diff:
+  New upstream version.
+
+  22 Sep 2003; <paul@gentoo.org> metadata.xml:
+  Fix metadata.xml
+
+  21 Aug 2003; Chris PeBenito <pebenito@gentoo.org> libselinux-1.1-r1.ebuild:
+  Add a dep for portage. The newer versions have labelling support for the old
+  API.
+
+  18 Aug 2003; Chris PeBenito <pebenito@gentoo.org> libselinux-1.1-r1.ebuild,
+  metadata.xml:
+  Fix license, this is public-domain, not GPL-2. Use package description in RPM
+  spec file as metadata.xml long description.
+
+  15 Aug 2003; Chris PeBenito <pebenito@gentoo.org> libselinux-1.0.ebuild,
+  libselinux-1.1-r1.ebuild, files/libselinux-1.0-gentoo.diff:
+  Mark stable
+
+*libselinux-1.1-r1 (14 Aug 2003)
+
+  14 Aug 2003; Chris PeBenito <pebenito@gentoo.org> libselinux-1.1-r1.ebuild,
+  libselinux-1.1.ebuild, files/libselinux-1.1-linkfix.diff:
+  Add fix for a random linking problem that causes libselinux to work
+  incorrectly.
+
+*libselinux-1.1 (14 Aug 2003)
+
+  14 Aug 2003; Chris PeBenito <pebenito@gentoo.org> libselinux-1.1.ebuild,
+  files/libselinux-1.1-gentoo.diff:
+  New upstream version
+
+  04 Aug 2003; Chris PeBenito <pebenito@gentoo.org>
+  files/libselinux-1.0-gentoo.diff:
+  Add on a NSA nullbyte patch to the gentoo patch
 
 *libselinux-1.0 (03 Aug 2003)
 
diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index 64c03295ca41..361beda77ac3 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -1,2 +1,7 @@
-MD5 5ae237cc290686460abe2cfa58cbe564 libselinux-1.0.ebuild 1066
-MD5 fa6cb6d507ae7a7c1b4ccc7e673d37cc files/digest-libselinux-1.0 62
+MD5 5653b21e8e732c431e64efef47c6cdc7 ChangeLog 5091
+MD5 652c5e8a0a081bf4317359f04f65a603 metadata.xml 537
+MD5 5ed95bef5301cc0f7e721362deca2da0 libselinux-1.22-r1.ebuild 1134
+MD5 40825b53dc0b57fadf0823982bdac34b libselinux-1.24.ebuild 1131
+MD5 f3012b7c7d5f07966ad2f2ca5e3c27ba files/libselinux-1.22.diff 1333
+MD5 af0d662a5302b215b6ad5794277d9cea files/digest-libselinux-1.22-r1 63
+MD5 7f7600bda169c50d374156b98d0fa86a files/digest-libselinux-1.24 63
diff --git a/sys-libs/libselinux/libselinux-1.22-r1.ebuild b/sys-libs/libselinux/libselinux-1.22-r1.ebuild
index 6d2b4626e86f..e08f92322a1a 100644
--- a/sys-libs/libselinux/libselinux-1.22-r1.ebuild
+++ b/sys-libs/libselinux/libselinux-1.22-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/sys-libs/libselinux/libselinux-1.22-r1.ebuild,v 1.1 2005/05/08 23:02:28 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-1.22-r1.ebuild,v 1.1.1.1 2005/11/30 09:39:10 chriswhite Exp $
 
 IUSE=""
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.nsa.gov/selinux"
 SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz"
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~mips"
+KEYWORDS="x86 ppc sparc amd64 mips"
 
 DEPEND="virtual/libc"
 
diff --git a/sys-libs/libselinux/libselinux-1.24.ebuild b/sys-libs/libselinux/libselinux-1.24.ebuild
index 57a4376bdaf6..d4eaaeb0d38b 100644
--- a/sys-libs/libselinux/libselinux-1.24.ebuild
+++ b/sys-libs/libselinux/libselinux-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/sys-libs/libselinux/libselinux-1.24.ebuild,v 1.1 2005/06/25 23:31:22 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-1.24.ebuild,v 1.1.1.1 2005/11/30 09:39:10 chriswhite Exp $
 
 IUSE=""
 
@@ -11,7 +11,8 @@ HOMEPAGE="http://www.nsa.gov/selinux"
 SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz"
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~mips"
+KEYWORDS="x86 ppc sparc amd64 mips"
+#KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~mips"
 
 DEPEND="virtual/libc"
 
diff --git a/sys-libs/libselinux/metadata.xml b/sys-libs/libselinux/metadata.xml
index 6b1fc4d87ba1..c21564fef080 100644
--- a/sys-libs/libselinux/metadata.xml
+++ b/sys-libs/libselinux/metadata.xml
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>hardened</herd>
 <maintainer>
@@ -5,5 +7,9 @@
 	<name>Chris PeBenito</name>
 	<description>Primary Maintainer</description>
 </maintainer>
-<longdescription>Base required libraries for SELinux userland</longdescription>
+<longdescription>
+Libselinux provides an API for SELinux applications to get and set
+process and file security contexts and to obtain security policy
+decisions.  Required for any applications that use the SELinux API.
+</longdescription>
 </pkgmetadata>
diff --git a/sys-libs/libsepol/ChangeLog b/sys-libs/libsepol/ChangeLog
index 7931a5cd094f..a87cd8041914 100644
--- a/sys-libs/libsepol/ChangeLog
+++ b/sys-libs/libsepol/ChangeLog
@@ -1,6 +1,40 @@
 # ChangeLog for sys-libs/libsepol
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/ChangeLog,v 1.1 2004/09/08 00:32:56 pebenito Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/ChangeLog,v 1.1.1.1 2005/11/30 09:39:18 chriswhite Exp $
+
+  09 Sep 2005; Chris PeBenito <pebenito@gentoo.org> libsepol-1.6.ebuild:
+  Mark stable.
+
+*libsepol-1.6 (25 Jun 2005)
+
+  25 Jun 2005; Chris PeBenito <pebenito@gentoo.org> +libsepol-1.6.ebuild:
+  New upstream release.
+
+  10 May 2005; Stephen Bennett <spb@gentoo.org> libsepol-1.4.ebuild:
+  mips stable
+
+  01 May 2005; Stephen Bennett <spb@gentoo.org> libsepol-1.4.ebuild:
+  Added ~mips.
+
+  01 May 2005; Chris PeBenito <pebenito@gentoo.org> libsepol-1.4.ebuild:
+  Mark stable.
+
+*libsepol-1.4 (13 Mar 2005)
+
+  13 Mar 2005; Chris PeBenito <pebenito@gentoo.org> +libsepol-1.4.ebuild:
+  New upstream release.
+
+  07 Jan 2005; Chris PeBenito <pebenito@gentoo.org> libsepol-1.0.ebuild,
+  libsepol-1.2.ebuild:
+  Mark 1.2 stable.  Change glibc dep to libc virtual.
+
+  15 Nov 2004; Chris PeBenito <pebenito@gentoo.org> libsepol-1.2.ebuild:
+  Fix non mls compile.
+
+*libsepol-1.2 (14 Nov 2004)
+
+  14 Nov 2004; Chris PeBenito <pebenito@gentoo.org> +libsepol-1.2.ebuild:
+  New upstream release.
 
 *libsepol-1.0 (07 Sep 2004)
 
diff --git a/sys-libs/libsepol/Manifest b/sys-libs/libsepol/Manifest
index cf56fa7032e7..93a802574b4c 100644
--- a/sys-libs/libsepol/Manifest
+++ b/sys-libs/libsepol/Manifest
@@ -1,2 +1,6 @@
-MD5 0a0416b34ec3a5a5fdea979a75babd21 libsepol-1.0.ebuild 1260
-MD5 2eb262533f23f8db93423978584e3033 files/digest-libsepol-1.0 60
+MD5 77bbd07b4b596ae67c79079d2b13f3af metadata.xml 300
+MD5 7a10bbee3caa59058609b65bce6b4fed ChangeLog 1328
+MD5 850c8ed73f93af3b49ad360e8a6adbb6 libsepol-1.4.ebuild 1032
+MD5 78801c460cda10505cb6960980478bc9 libsepol-1.6.ebuild 1079
+MD5 8661756a5a779f265a5d03e8e17a1f6a files/digest-libsepol-1.4 60
+MD5 05ac1efb03172378fffe98ce979053be files/digest-libsepol-1.6 60
diff --git a/sys-libs/libsepol/libsepol-1.4.ebuild b/sys-libs/libsepol/libsepol-1.4.ebuild
index 8c2666ba265b..bee1964bbd77 100644
--- a/sys-libs/libsepol/libsepol-1.4.ebuild
+++ b/sys-libs/libsepol/libsepol-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/sys-libs/libsepol/libsepol-1.4.ebuild,v 1.1 2005/03/13 13:29:39 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/libsepol-1.4.ebuild,v 1.1.1.1 2005/11/30 09:39:18 chriswhite Exp $
 
 IUSE=""
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.nsa.gov/selinux"
 SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="x86 ppc sparc amd64 mips"
 
 DEPEND="virtual/libc"
 
diff --git a/sys-libs/libsepol/libsepol-1.6.ebuild b/sys-libs/libsepol/libsepol-1.6.ebuild
index cb227fe99385..7b1f3a37e78d 100644
--- a/sys-libs/libsepol/libsepol-1.6.ebuild
+++ b/sys-libs/libsepol/libsepol-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/sys-libs/libsepol/libsepol-1.6.ebuild,v 1.1 2005/06/25 23:33:57 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/libsepol-1.6.ebuild,v 1.1.1.1 2005/11/30 09:39:18 chriswhite Exp $
 
 IUSE=""
 
@@ -11,7 +11,8 @@ HOMEPAGE="http://www.nsa.gov/selinux"
 SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~mips"
+KEYWORDS="x86 ppc sparc amd64 mips"
+#KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~mips"
 
 DEPEND="virtual/libc"
 
diff --git a/sys-libs/libstatgrab/ChangeLog b/sys-libs/libstatgrab/ChangeLog
index c9f057bc1331..9a6f5a19a950 100644
--- a/sys-libs/libstatgrab/ChangeLog
+++ b/sys-libs/libstatgrab/ChangeLog
@@ -1,6 +1,62 @@
 # ChangeLog for sys-libs/libstatgrab
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstatgrab/ChangeLog,v 1.1 2004/06/15 00:42:31 dragonheart Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstatgrab/ChangeLog,v 1.1.1.1 2005/11/30 09:39:18 chriswhite Exp $
+
+*libstatgrab-0.12 (03 Sep 2005)
+
+  03 Sep 2005; Daniel Black <dragonheart@gentoo.org>
+  +libstatgrab-0.12.ebuild:
+  version bump
+
+  08 May 2005; Herbie Hopkins <herbs@gentoo.org> libstatgrab-0.11.1.ebuild:
+  Marked ~amd64 wrt bug #90658.
+
+*libstatgrab-0.11.1 (21 Apr 2005)
+
+  21 Apr 2005; Daniel Black <dragonheart@gentoo.org>
+  +libstatgrab-0.11.1.ebuild:
+  added version 0.11.1 in the hope of fixing bug #87522. Thanks to Botykai
+  Zsolt <zsolt.botykai@online.hSPAMLESSu>
+
+*libstatgrab-0.11 (07 Dec 2004)
+
+  07 Dec 2004; Daniel Black <dragonheart@gentoo.org>
+  -libstatgrab-0.10.2.ebuild, libstatgrab-0.10.3.ebuild,
+  -libstatgrab-0.10.ebuild, +libstatgrab-0.11.ebuild:
+  version bump
+
+*libstatgrab-0.10.3 (12 Sep 2004)
+
+  04 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>:
+  Mask this version (which has BSD support btw) stable
+
+  12 Sep 2004; Daniel Black <dragonheart@gentoo.org>
+  libstatgrab-0.10.2.ebuild, +libstatgrab-0.10.3.ebuild:
+  x86 stable + version bump
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  libstatgrab-0.10.ebuild:
+  Masked libstatgrab-0.10.ebuild stable for ppc
+
+*libstatgrab-0.10.2 (31 Jul 2004)
+
+  04 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>:
+  PPC stable
+
+  31 Jul 2004; Daniel Black <dragonheart@gentoo.org>
+  +libstatgrab-0.10.2.ebuild, libstatgrab-0.10.ebuild:
+  SRC_URI changed and version bump. Thanks to notification by author Tim Bishop
+  <tdb@i-scream.org>
+
+  18 Jul 2004; Daniel Black <dragonheart@gentoo.org> libstatgrab-0.10.ebuild:
+  x86 stable
+
+  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  libstatgrab-0.10.ebuild:
+  virtual/glibc -> virtual/libc
+
+  18 Jun 2004; David Holm <dholm@gentoo.org> libstatgrab-0.10.ebuild:
+  Added to ~ppc.
 
 *libstatgrab-0.10 (15 Jun 2004)
 
diff --git a/sys-libs/libstatgrab/Manifest b/sys-libs/libstatgrab/Manifest
index c7b33b40307f..41a2fc98bce7 100644
--- a/sys-libs/libstatgrab/Manifest
+++ b/sys-libs/libstatgrab/Manifest
@@ -1,2 +1,20 @@
-MD5 277af3e965aec7eb891bfdfe7b10655e libstatgrab-0.10.ebuild 657
-MD5 de876db041af220fa9dbec5f31ee01e8 files/digest-libstatgrab-0.10 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6739f1cc96c49a30a66781868c412c4c libstatgrab-0.12.ebuild 974
+MD5 a8952cf8970fc1344c060bfab7718abd ChangeLog 2150
+MD5 6d796b061ed1c1337ef157a5f74dab35 metadata.xml 403
+MD5 eb8f174bdd78a1523c63d1549ffe3f3f libstatgrab-0.11.1.ebuild 970
+MD5 97577bc5e6b9fec29b7c633b7e661052 libstatgrab-0.10.3.ebuild 967
+MD5 819855219663d48b16ab3cfd8b09ac02 libstatgrab-0.11.ebuild 967
+MD5 529531cfd8da060fa0d21031175b4087 files/digest-libstatgrab-0.12 68
+MD5 cd6c9ca0e32d060a34829d66c2a83a2a files/digest-libstatgrab-0.11 68
+MD5 fc3acae8170ce00d097746d81f21e961 files/digest-libstatgrab-0.11.1 70
+MD5 ecd8e09b4add7c415c7136be9085c1a7 files/digest-libstatgrab-0.10.3 70
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGUhbmdTrptrqvGERAmZfAJ9kC43nmwfc59eWnpShc8XJ3U2yqwCgm9PE
+c1IkR9Z2fZUKAg3TbVCyg/c=
+=KS1/
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/libstatgrab/libstatgrab-0.10.3.ebuild b/sys-libs/libstatgrab/libstatgrab-0.10.3.ebuild
index 42d2fead6cc1..9183fc68a620 100644
--- a/sys-libs/libstatgrab/libstatgrab-0.10.3.ebuild
+++ b/sys-libs/libstatgrab/libstatgrab-0.10.3.ebuild
@@ -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/sys-libs/libstatgrab/libstatgrab-0.10.3.ebuild,v 1.1 2004/09/11 15:49:31 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstatgrab/libstatgrab-0.10.3.ebuild,v 1.1.1.1 2005/11/30 09:39:18 chriswhite Exp $
 
 DESCRIPTION="Provides cross platform access to statistics about the system on which it's run."
-SRC_URI="http://www.mirrorservice.org/sites/ftp.i-scream.org/pub/i-scream/libstatgrab/${P}.tar.gz"
 HOMEPAGE="http://www.i-scream.org/libstatgrab/"
+SRC_URI="http://www.mirrorservice.org/sites/ftp.i-scream.org/pub/i-scream/libstatgrab/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 LGPL-2.1 )"
 SLOT=0
-LICENSE="GPL-2 | LGPL-2.1"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc"
 IUSE=""
 RDEPEND=">=sys-libs/ncurses-5.4-r1
 	virtual/libc"
diff --git a/sys-libs/libstatgrab/libstatgrab-0.11.1.ebuild b/sys-libs/libstatgrab/libstatgrab-0.11.1.ebuild
index f3cc527e01b9..953f0b9b891b 100644
--- a/sys-libs/libstatgrab/libstatgrab-0.11.1.ebuild
+++ b/sys-libs/libstatgrab/libstatgrab-0.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/sys-libs/libstatgrab/libstatgrab-0.11.1.ebuild,v 1.1 2005/04/21 09:26:14 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstatgrab/libstatgrab-0.11.1.ebuild,v 1.1.1.1 2005/11/30 09:39:18 chriswhite Exp $
 
 DESCRIPTION="Provides cross platform access to statistics about the system on which it's run."
 HOMEPAGE="http://www.i-scream.org/libstatgrab/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.mirrorservice.org/sites/ftp.i-scream.org/pub/i-scream/libsta
 
 LICENSE="|| ( GPL-2 LGPL-2.1 )"
 SLOT=0
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~amd64"
 IUSE=""
 RDEPEND=">=sys-libs/ncurses-5.4-r1
 	virtual/libc"
diff --git a/sys-libs/libstatgrab/libstatgrab-0.11.ebuild b/sys-libs/libstatgrab/libstatgrab-0.11.ebuild
index f042c7fa9d21..8fba1e3c6153 100644
--- a/sys-libs/libstatgrab/libstatgrab-0.11.ebuild
+++ b/sys-libs/libstatgrab/libstatgrab-0.11.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/sys-libs/libstatgrab/libstatgrab-0.11.ebuild,v 1.1 2004/12/07 13:55:38 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstatgrab/libstatgrab-0.11.ebuild,v 1.1.1.1 2005/11/30 09:39:18 chriswhite Exp $
 
 DESCRIPTION="Provides cross platform access to statistics about the system on which it's run."
 HOMEPAGE="http://www.i-scream.org/libstatgrab/"
diff --git a/sys-libs/libstatgrab/libstatgrab-0.12.ebuild b/sys-libs/libstatgrab/libstatgrab-0.12.ebuild
index 2153adf1e8f9..cf23feb31476 100644
--- a/sys-libs/libstatgrab/libstatgrab-0.12.ebuild
+++ b/sys-libs/libstatgrab/libstatgrab-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/sys-libs/libstatgrab/libstatgrab-0.12.ebuild,v 1.1 2005/09/03 06:52:55 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstatgrab/libstatgrab-0.12.ebuild,v 1.1.1.1 2005/11/30 09:39:18 chriswhite Exp $
 
 DESCRIPTION="Provides cross platform access to statistics about the system on which it's run."
 HOMEPAGE="http://www.i-scream.org/libstatgrab/"
diff --git a/sys-libs/libstdc++-v3/ChangeLog b/sys-libs/libstdc++-v3/ChangeLog
index 7a707338ad94..6cc8bf7d18f9 100644
--- a/sys-libs/libstdc++-v3/ChangeLog
+++ b/sys-libs/libstdc++-v3/ChangeLog
@@ -1,6 +1,144 @@
 # ChangeLog for sys-libs/libstdc++-v3
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/ChangeLog,v 1.1 2004/05/23 09:14:24 lv Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/ChangeLog,v 1.1.1.1 2005/11/30 09:39:08 chriswhite Exp $
+
+  25 Sep 2005; Chris Bainbridge <chrb@gentoo.org>
+  libstdc++-v3-3.3.3-r1.ebuild, libstdc++-v3-3.3.4.ebuild,
+  libstdc++-v3-3.3.6.ebuild:
+  Remove gcc 3.4 flag -mno-tls-direct-seg-refs, bug #103827
+
+  23 Jul 2005; Tony Vroon <chainsaw@gentoo.org> libstdc++-v3-3.3.4.ebuild,
+  libstdc++-v3-3.3.6.ebuild:
+  Fix typo; has_multlib_profile -> has_multilib_profile.
+
+*libstdc++-v3-3.3.6 (23 Jul 2005)
+
+  23 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +libstdc++-v3-3.3.6.ebuild:
+  Version bump.
+
+  04 Jun 2005; Danny van Dyk <kugelfang@gentoo.org>
+  libstdc++-v3-3.3.4.ebuild:
+  Fixed multilib handling, both triggers (has_multilib_profile) and
+  directories (lib64 instead lib).
+
+  11 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  libstdc++-v3-3.3.4.ebuild:
+  Make libstdc++ depend on glibc only on glibc systems.
+
+  07 Feb 2005; Markus Rothe <corsair@gentoo.org> libstdc++-v3-3.3.4.ebuild:
+  Fix typo in ppc64 CFLAGS-filter
+
+  21 Nov 2004; Tom Gall <tgall@gentoo.org> libstdc++-v3-3.3.4.ebuild:
+  fix bug #70972 on ppc64
+
+  11 Nov 2004; Joshua Kinard <kumba@gentoo.org> libstdc++-v3-3.3.3-r1.ebuild,
+  libstdc++-v3-3.3.4.ebuild:
+  Marked unstable on sparc.
+
+  31 Oct 2004; Joshua Kinard <kumba@gentoo.org> libstdc++-v3-3.3.3-r1.ebuild:
+  Marked stable on mips.
+
+  30 Oct 2004; Travis Tilley <lv@gentoo.org> libstdc++-v3-3.3.3-r1.ebuild,
+  libstdc++-v3-3.3.4.ebuild:
+  updated the ebuild with a table of known valid arch settings for i386/x86-64,
+  mips, and rs6000/ppc/ppc64
+
+  26 Oct 2004; Daniel Goller <morfic@gentoo.org> libstdc++-v3-3.3.4.ebuild:
+  Do the required magic to deal with G3, G4, G5 archs on gcc3.3
+  Closing bug 64252
+
+  11 Sep 2004; Travis Tilley <lv@gentoo.org> -libstdc++-v3-3.3.4-r1.ebuild:
+  temporarily removing ebuild pending a redesign of the toolchain eclass.
+  compatibility library targets should be handled differently from normal
+  library targets.
+
+*libstdc++-v3-3.3.4-r1 (05 Sep 2004)
+
+  05 Sep 2004; Travis Tilley <lv@gentoo.org> +libstdc++-v3-3.3.4-r1.ebuild:
+  added stack smashing protection and converted the ebuild over to using the new
+  toolchain.eclass
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  libstdc++-v3-3.3.3-r1.ebuild:
+  Masked libstdc++-v3-3.3.3-r1.ebuild stable for ppc
+
+  01 Sep 2004; Travis Tilley <lv@gentoo.org> libstdc++-v3-3.3.3-r1.ebuild,
+  libstdc++-v3-3.3.4.ebuild:
+  made libstdc++-v3 use $(get_libdir) for optionally installing to lib32/lib64
+  based on the CONF_LIBDIR setting. CONF_LIBDIR wont be fully supported until
+  portage 2.0.51
+
+*libstdc++-v3-3.3.4 (29 Aug 2004)
+
+  29 Aug 2004; Travis Tilley <lv@gentoo.org> +libstdc++-v3-3.3.4.ebuild:
+  version bump
+
+  28 Aug 2004; <solar@gentoo.org> libstdc++-v3-3.3.3-r1.ebuild:
+  added call to gnuconfig_update
+
+  28 Aug 2004; <solar@gentoo.org> libstdc++-v3-3.3.3-r1.ebuild:
+  remove glibc from the depends if USE=uclibc is set
+
+  19 Aug 2004; Guy Martin <gmsoft@gentoo.org> libstdc++-v3-3.3.3-r1.ebuild:
+  Removed hppa KEYWORD until we have a working >=gcc-3.3.3.
+
+  17 Aug 2004; Luca Barbato <lu_zero@gentoo.org> libstdc++-v3-3.3.3-r1.ebuild:
+  Marked ~ppc
+
+  02 Aug 2004; Daniel Goller <morfic@gentoo.org> libstdc++-v3-3.3.3-r1.ebuild:
+  Without stable deps reversing x86 to ~x86
+
+  01 Aug 2004; Tom Gall <tgall@gentoo.org> libstdc++-v3-3.3.3-r1.ebuild:
+  stable on ppc64, bug #59028
+
+  31 Jul 2004; Aron Griffis <agriffis@gentoo.org>
+  libstdc++-v3-3.3.3-r1.ebuild:
+  replace-flags -march=pentium-m -march=pentium3 for gcc-3.3 compat #58967
+
+  30 Jul 2004; Daniel Goller <morfic@gentoo.org> libstdc++-v3-3.3.3-r1.ebuild:
+  Marked stable on x86
+
+  25 Jul 2004; Daniel Goller <morfic@gentoo.org> libstdc++-v3-3.3.3-r1.ebuild:
+  Marked ~x86 for gcc3.4 profile
+
+  15 Jul 2004; Travis Tilley <lv@gentoo.org> libstdc++-v3-3.3.3-r1.ebuild:
+  added -fstack-protector and a few others to the list of filtered flags
+
+  13 Jul 2004; Travis Tilley <lv@gentoo.org> libstdc++-v3-3.3.3-r1.ebuild:
+  filter some gcc 3.4 flags that the gcc 3.3.3 xgcc will fail on
+
+  11 Jul 2004; Travis Tilley <lv@gentoo.org> libstdc++-v3-3.3.3-r1.ebuild:
+  gcc 3.3 doesnt support -mtune on numerous archs, so xgcc will fail if we have
+  it in CFLAGS. the ebuild now filters this flag.
+
+  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  libstdc++-v3-3.3.3-r1.ebuild:
+  virtual/glibc -> virtual/libc
+
+  10 Jun 2004; Travis Tilley <lv@gentoo.org> libstdc++-v3-3.3.3-r1.ebuild:
+  stable on amd64
+
+  10 Jun 2004; Travis Tilley <lv@gentoo.org> libstdc++-v3-3.3.3-r1.ebuild:
+  fixed the bug where some apps would fail to link if libstdc++-v3 is installed.
+  I didnt have previous ebuilds remove the .so symlink... this one does.
+
+  31 May 2004; Joshua Kinard <kumba@gentoo.org> libstdc++-v3-3.3.3-r1.ebuild:
+  Added ~mips to KEYWORDS.
+
+  26 May 2004; Travis Tilley <lv@gentoo.org> libstdc++-v3-3.3.3-r1.ebuild:
+  adding ~amd64 keyword now that gcc 3.4 is also marked ~amd64
+
+  27 May 2004; Travis Tilley <lv@gentoo.org> libstdc++-v3-3.3.3-r1.ebuild:
+  changed directory so that it doesnt clash with gcc 3.3.3
+
+*libstdc++-v3-3.3.3-r1 (24 May 2004)
+
+  24 May 2004; Travis Tilley <lv@gentoo.org> +libstdc++-v3-3.3.3-r1.ebuild,
+  -libstdc++-v3-3.3.3.ebuild:
+  moved library to versioned directory with an env.d entry that tries to be as
+  far after the 3.4 libstdc++ as possible. hopefully this will fix the problems
+  people see with arts and similar ebuilds when the compat package is installed.
 
 *libstdc++-v3-3.3.3 (23 May 2004)
 
diff --git a/sys-libs/libstdc++-v3/Manifest b/sys-libs/libstdc++-v3/Manifest
index ec0c174ce13e..f1d3a5c44ddf 100644
--- a/sys-libs/libstdc++-v3/Manifest
+++ b/sys-libs/libstdc++-v3/Manifest
@@ -1,3 +1,9 @@
-MD5 f8d5d1bac2f8921e71d0ad579d801d88 libstdc++-v3-3.3.3.ebuild 5647
-MD5 14f4d6619c938dbb907e2420c0eeefd9 files/digest-libstdc++-v3-3.3.3 64
+MD5 0ee2af43b0368900ecc516c1b4104690 ChangeLog 5808
+MD5 b6c1db1060c4e856b248a22adec1ff53 metadata.xml 220
+MD5 71295808377595fcb8bdf7a99e76586f libstdc++-v3-3.3.4.ebuild 8302
+MD5 8df2d29fd2b540a650f447a6ff68f829 libstdc++-v3-3.3.6.ebuild 8304
+MD5 b88c0b00824daf43da881b7291fa3b06 libstdc++-v3-3.3.3-r1.ebuild 7908
+MD5 14f4d6619c938dbb907e2420c0eeefd9 files/digest-libstdc++-v3-3.3.3-r1 64
 MD5 b2a96584f4cee72362695ba44c911c40 files/libstdc++_amd64_multilib_hack.patch 350
+MD5 4068b84d9ce9d440b063718549cfc354 files/digest-libstdc++-v3-3.3.4 64
+MD5 79ef0db9c6e9750aa92334dded832283 files/digest-libstdc++-v3-3.3.6 64
diff --git a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.3-r1.ebuild b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.3-r1.ebuild
index e35914d1eafc..e1ef1700e1a9 100644
--- a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.3-r1.ebuild
+++ b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.3-r1.ebuild
@@ -1,46 +1,104 @@
-# 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/sys-libs/libstdc++-v3/libstdc++-v3-3.3.3-r1.ebuild,v 1.1 2004/05/24 21:17:43 lv Exp $
-
-IUSE="nls"
-
-inherit eutils flag-o-matic libtool
-
-# Compile problems with these (bug #6641 among others)...
-#filter-flags "-fno-exceptions -fomit-frame-pointer -fforce-addr"
-
-# Recently there has been a lot of stability problem in Gentoo-land.  Many
-# things can be the cause to this, but I believe that it is due to gcc3
-# still having issues with optimizations, or with it not filtering bad
-# combinations (protecting the user maybe from himeself) yet.
-#
-# This can clearly be seen in large builds like glibc, where too aggressive
-# CFLAGS cause the tests to fail miserbly.
-#
-# Quote from Nick Jones <carpaski@gentoo.org>, who in my opinion
-# knows what he is talking about:
-#
-#   People really shouldn't force code-specific options on... It's a
-#   bad idea. The -march options aren't just to look pretty. They enable
-#   options that are sensible (and include sse,mmx,3dnow when apropriate).
-#
-# The next command strips CFLAGS and CXXFLAGS from nearly all flags.  If
-# you do not like it, comment it, but do not bugreport if you run into
-# problems.
-#
-# <azarah@gentoo.org> (13 Oct 2002)
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/libstdc++-v3-3.3.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:39:08 chriswhite Exp $
+
+inherit eutils flag-o-matic libtool gnuconfig versionator
+
+transform_known_flags() {
+	declare setting
+
+	# and on x86, we just need to filter the 3.4 specific amd64 -marchs
+	replace-cpu-flags k8 athlon64 opteron x86-64
+
+	# gcc 3.3 doesn't support -march=pentium-m
+	replace-cpu-flags pentium-m pentium3m pentium3
+
+	#GCC 3.3 does not understand G3, G4, G5 on ppc
+	replace-cpu-flags G3 750
+	replace-cpu-flags G4 7400
+	replace-cpu-flags G5 7400
+}
+
+is_arch_allowed() {
+	i386_processor_table="i386 i486 i586 pentium pentium-mmx winchip-c6 \
+		winchip2 c3 i686 pentiumpro pentium2 pentium3 pentium4 prescott \
+		nocona k6 k6-2 k6-3 athlon athlon-tbird x86-64 athlon-4 athlon-xp \
+		athlon-mp"
+
+	for proc in ${i386_processor_table} ; do
+		[ "${proc}" == "${1}" ] && return 0
+	done
+
+
+	mips_processor_table="mips1 mips2 mips3 mips4 mips32 mips64 r3000 r2000 \
+		r3900 r6000 r4000 vr4100 vr4111 vr4120 vr4300 r4400 r4600 orion \
+		r4650 r8000 vr5000 vr5400 vr5500 4kc 4kp 5kc 20kc sr71000 sb1"
+
+	for proc in ${mips_processor_table} ; do
+		[ "${proc}" == "${1}" ] && return 0
+	done
+
+
+	rs6000_processor_table="common power power2 power3 power4 powerpc \
+		powerpc64 rios rios1 rsc rsc1 rios2 rs64a 401 403 405 505 601 602 \
+		603 603e ec603e 604 604e 620 630 740 750 7400 7450 8540 801 821 823 \
+		860"
+
+	for proc in ${rs6000_processor_table} ; do
+		[ "${proc}" == "${1}" ] && return 0
+	done
+
+
+	return 1
+}
+
+
 do_filter_flags() {
-	strip-flags
+	declare setting
 
 	# In general gcc does not like optimization, and add -O2 where
 	# it is safe.  This is especially true for gcc 3.3 + 3.4
 	replace-flags -O? -O2
 
-	if use amd64
-	then
-		setting="`get-flag march`"
-		[ ! -z "${setting}" ] && filter-flags -march="${setting}"
+
+	# gcc 3.3 doesn't support -mtune on numerous archs, so xgcc will fail
+	setting="`get-flag mtune`"
+	[ ! -z "${setting}" ] && filter-flags -mtune="${setting}"
+
+
+	# only allow the flags that we -know- are supported
+	transform_known_flags
+	setting="`get-flag march`"
+	if [ ! -z "${setting}" ] ; then
+		is_arch_allowed "${setting}" || filter-flags -march="${setting}"
 	fi
+	setting="`get-flag mcpu`"
+	if [ ! -z "${setting}" ] ; then
+		is_arch_allowed "${setting}" || filter-flags -mcpu="${setting}"
+	fi
+
+
+	# xgcc wont understand gcc 3.4 flags...
+	filter-flags -fno-unit-at-a-time
+	filter-flags -funit-at-a-time
+	filter-flags -fweb
+	filter-flags -fno-web
+	filter-flags -mno-tls-direct-seg-refs
+
+	# xgcc isnt patched with propolice
+	filter-flags -fstack-protector-all
+	filter-flags -fno-stack-protector-all
+	filter-flags -fstack-protector
+	filter-flags -fno-stack-protector
+
+	# xgcc isnt patched with the gcc symbol visibility patch
+	filter-flags -fvisibility-inlines-hidden
+	filter-flags -fvisibility=hidden
+
+	# ...sure, why not?
+	strip-unsupported-flags
+
+	strip-flags
 }
 
 S=${WORKDIR}/gcc-${PV}
@@ -49,8 +107,10 @@ S=${WORKDIR}/gcc-${PV}
 [ ! -n "${CCHOST}" ] && export CCHOST="${CHOST}"
 
 LOC="/usr"
-MY_PV="`echo ${PV} | awk -F. '{ gsub(/_pre.*|_alpha.*/, ""); print $1 "." $2 }'`"
-MY_PV_FULL="`echo ${PV} | awk '{ gsub(/_pre.*|_alpha.*/, ""); print $0 }'`"
+#MY_PV="`echo ${PV} | awk -F. '{ gsub(/_pre.*|_alpha.*/, ""); print $1 "." $2 }'`"
+#MY_PV_FULL="`echo ${PV} | awk '{ gsub(/_pre.*|_alpha.*/, ""); print $0 }'`"
+MY_PV="$(get_version_component_range 1-2)"
+MY_PV_FULL="$(get_version_component_range 1-3)"
 
 LIBPATH="${LOC}/lib/gcc-lib/${CCHOST}/${MY_PV_FULL}"
 BINPATH="${LOC}/${CCHOST}/gcc-bin/${MY_PV}"
@@ -66,26 +126,28 @@ HOMEPAGE="http://gcc.gnu.org/libstdc++/"
 
 LICENSE="GPL-2 LGPL-2.1"
 
-KEYWORDS="-*"
+KEYWORDS="amd64 ~x86 mips ppc64 ppc ~sparc"
+IUSE="nls nptl uclibc build"
 
+# 3.2.3 -> 3.3.x install .so.5, so lets slot to 5
 if [ "${CHOST}" == "${CCHOST}" ]
 then
-	SLOT="3.3.3"
+	SLOT="5"
 else
-	SLOT="${CCHOST}-3.3.3"
+	SLOT="${CCHOST}-5"
 fi
 
-DEPEND="virtual/glibc
-	!nptl? ( >=sys-libs/glibc-2.3.2-r3 )
+DEPEND="virtual/libc
+	!nptl? ( !uclibc? ( >=sys-libs/glibc-2.3.2-r3 ) )
 	>=sys-devel/binutils-2.14.90.0.6-r1
 	>=sys-devel/bison-1.875
 	>=sys-devel/gcc-config-1.3.1
-	>=sys-devel/gcc-3.4*
+	>=sys-devel/gcc-3.3.3_pre20040130
 	!build? ( >=sys-libs/ncurses-5.2-r2
 	          nls? ( sys-devel/gettext ) )"
 
-RDEPEND="virtual/glibc
-	!nptl? ( >=sys-libs/glibc-2.3.2-r3 )
+RDEPEND="virtual/libc
+	!nptl? ( !uclibc? ( >=sys-libs/glibc-2.3.2-r3 ) )
 	>=sys-devel/gcc-config-1.3.1
 	>=sys-libs/zlib-1.1.4
 	>=sys-apps/texinfo-4.2-r4
@@ -106,6 +168,7 @@ src_unpack() {
 	cp -a ${S}/libstdc++-v3/config/cpu/i{4,3}86/atomicity.h
 
 	cd ${S}; ./contrib/gcc_update --touch &> /dev/null
+	gnuconfig_update
 }
 
 src_compile() {
@@ -154,9 +217,6 @@ src_compile() {
 
 	touch ${S}/gcc/c-gperf.h
 
-	# Setup -j in MAKEOPTS
-	get_number_of_jobs
-
 	einfo "Compiling libstdc++..."
 	S="${WORKDIR}/build" \
 	emake all-target-libstdc++-v3 \
@@ -201,14 +261,27 @@ src_install() {
 		LIBPATH="${LIBPATH}" \
 		install-target-libstdc++-v3 || die
 
+	# we'll move this into a directory we can put at the end of ld.so.conf
+	# other than the normal versioned directory, so that it doesnt conflict
+	# with gcc 3.3.3
+	mkdir -p ${D}/${LOC}/lib/libstdc++-v3/
+	mv ${D}/${LIBPATH}/lib* ${D}/${LOC}/lib/libstdc++-v3/
 	# we dont want the headers...
-	rm -rf ${D}/${STDCXX_INCDIR}
+	rm -rf ${D}/${LOC}/lib/gcc*
 	# or locales...
 	rm -rf ${D}/${LOC}/share
 	# or anything other than the .so files, really.
 	find ${D} | grep -e c++.la$ -e c++.a$ | xargs rm -f
+	# we dont even want the un-versioned .so symlink, as it confuses some
+	# apps and also causes others to link against the old libstdc++...
+	rm ${D}/${LOC}/lib/libstdc++-v3/libstdc++.so
+
+	# and it's much easier to just move around the result than it is to
+	# configure libstdc++-v3 to use CONF_LIDIR
+	if [ "$(get_libdir)" != "lib" ] ; then
+		mv ${D}/${LOC}/lib ${D}/${LOC}/$(get_libdir)
+	fi
 
 	mkdir -p ${D}/etc/env.d/
-	echo "LDPATH=\"${LIBPATH}\"" >> ${D}/etc/env.d/99libstdc++
+	echo "LDPATH=\"${LOC}/lib/libstdc++-v3/\"" >> ${D}/etc/env.d/99libstdc++
 }
-
diff --git a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.4.ebuild b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.4.ebuild
index 9a5731b93d2d..63a689a9bc94 100644
--- a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.4.ebuild
+++ b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.4.ebuild
@@ -1,44 +1,93 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/libstdc++-v3-3.3.4.ebuild,v 1.1 2004/08/29 05:15:37 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/libstdc++-v3-3.3.4.ebuild,v 1.1.1.1 2005/11/30 09:39:08 chriswhite Exp $
 
-inherit eutils flag-o-matic libtool gnuconfig
+inherit eutils flag-o-matic libtool gnuconfig versionator
 
-do_filter_flags() {
+transform_known_flags() {
 	declare setting
 
-	strip-flags
+	# and on x86, we just need to filter the 3.4 specific amd64 -marchs
+	replace-cpu-flags k8 athlon64 opteron x86-64
 
-	# In general gcc does not like optimization, and add -O2 where
-	# it is safe.  This is especially true for gcc 3.3 + 3.4
-	replace-flags -O? -O2
+	# gcc 3.3 doesn't support -march=pentium-m
+	replace-cpu-flags pentium-m pentium3m pentium3
 
-	if use amd64
-	then
-		# gcc 3.3 doesn't support -march=k8/etc on amd64, so xgcc will fail
-		setting="`get-flag march`"
-		[ ! -z "${setting}" ] && filter-flags -march="${setting}"
-	fi
+	#GCC 3.3 does not understand G3, G4, G5 on ppc
+	replace-cpu-flags G3 750
+	replace-cpu-flags G4 7400
+	replace-cpu-flags G5 7400
+}
 
-	# and on x86, we just need to filter the 3.4 specific amd64 -marchs
-	filter-flags -march=k8
-	filter-flags -march=athlon64
-	filter-flags -march=opteron
+is_arch_allowed() {
+	i386_processor_table="i386 i486 i586 pentium pentium-mmx winchip-c6 \
+		winchip2 c3 i686 pentiumpro pentium2 pentium3 pentium4 prescott \
+		nocona k6 k6-2 k6-3 athlon athlon-tbird x86-64 athlon-4 athlon-xp \
+		athlon-mp"
 
-	# gcc 3.3 doesn't support -march=pentium-m
-	replace-flags -march=pentium-m -march=pentium3
+	for proc in ${i386_processor_table} ; do
+		[ "${proc}" == "${1}" ] && return 0
+	done
+
+
+	mips_processor_table="mips1 mips2 mips3 mips4 mips32 mips64 r3000 r2000 \
+		r3900 r6000 r4000 vr4100 vr4111 vr4120 vr4300 r4400 r4600 orion \
+		r4650 r8000 vr5000 vr5400 vr5500 4kc 4kp 5kc 20kc sr71000 sb1"
+
+	for proc in ${mips_processor_table} ; do
+		[ "${proc}" == "${1}" ] && return 0
+	done
+
+
+	rs6000_processor_table="common power power2 power3 power4 powerpc \
+		powerpc64 rios rios1 rsc rsc1 rios2 rs64a 401 403 405 505 601 602 \
+		603 603e ec603e 604 604e 620 630 740 750 7400 7450 8540 801 821 823 \
+		860"
+
+	for proc in ${rs6000_processor_table} ; do
+		[ "${proc}" == "${1}" ] && return 0
+	done
+
+
+	return 1
+}
+
+
+do_filter_flags() {
+	declare setting
+
+	# In general gcc does not like optimization, and add -O2 where
+	# it is safe.  This is especially true for gcc 3.3 + 3.4
+	replace-flags -O? -O2
 
 	# gcc 3.3 doesn't support -mtune on numerous archs, so xgcc will fail
-	if use x86 || use amd64 ; then
-		setting="`get-flag mtune`"
-		[ ! -z "${setting}" ] && filter-flags -mtune="${setting}"
+	setting="`get-flag mtune`"
+	[ ! -z "${setting}" ] && filter-flags -mtune="${setting}"
+
+	# in gcc 3.3 there is a bug on ppc64 where if -mcpu is used
+	# the compiler incorrectly assumes the code you are about to build
+	# is 32 bit
+	use ppc64 && setting="`get-flag mcpu`"
+	[ ! -z "${setting}" ] && filter-flags -mcpu="${setting}"
+
+	# only allow the flags that we -know- are supported
+	transform_known_flags
+	setting="`get-flag march`"
+	if [ ! -z "${setting}" ] ; then
+		is_arch_allowed "${setting}" || filter-flags -march="${setting}"
+	fi
+	setting="`get-flag mcpu`"
+	if [ ! -z "${setting}" ] ; then
+		is_arch_allowed "${setting}" || filter-flags -mcpu="${setting}"
 	fi
 
+
 	# xgcc wont understand gcc 3.4 flags...
 	filter-flags -fno-unit-at-a-time
 	filter-flags -funit-at-a-time
 	filter-flags -fweb
 	filter-flags -fno-web
+	filter-flags -mno-tls-direct-seg-refs
 
 	# xgcc isnt patched with propolice
 	filter-flags -fstack-protector-all
@@ -52,6 +101,8 @@ do_filter_flags() {
 
 	# ...sure, why not?
 	strip-unsupported-flags
+
+	strip-flags
 }
 
 S=${WORKDIR}/gcc-${PV}
@@ -60,8 +111,10 @@ S=${WORKDIR}/gcc-${PV}
 [ ! -n "${CCHOST}" ] && export CCHOST="${CHOST}"
 
 LOC="/usr"
-MY_PV="`echo ${PV} | awk -F. '{ gsub(/_pre.*|_alpha.*/, ""); print $1 "." $2 }'`"
-MY_PV_FULL="`echo ${PV} | awk '{ gsub(/_pre.*|_alpha.*/, ""); print $0 }'`"
+#MY_PV="`echo ${PV} | awk -F. '{ gsub(/_pre.*|_alpha.*/, ""); print $1 "." $2 }'`"
+#MY_PV_FULL="`echo ${PV} | awk '{ gsub(/_pre.*|_alpha.*/, ""); print $0 }'`"
+MY_PV="$(get_version_component_range 1-2)"
+MY_PV_FULL="$(get_version_component_range 1-3)"
 
 LIBPATH="${LOC}/lib/gcc-lib/${CCHOST}/${MY_PV_FULL}"
 BINPATH="${LOC}/${CCHOST}/gcc-bin/${MY_PV}"
@@ -77,18 +130,19 @@ HOMEPAGE="http://gcc.gnu.org/libstdc++/"
 
 LICENSE="GPL-2 LGPL-2.1"
 
-KEYWORDS="-* ~x86 ~mips ~amd64 ~ppc64 ~ppc"
-IUSE="nls"
+KEYWORDS="amd64 ~x86 ~mips ppc64 ppc ~sparc"
+IUSE="multilib nls nptl build"
 
+# 3.2.3 -> 3.3.x install .so.5, so lets slot to 5
 if [ "${CHOST}" == "${CCHOST}" ]
 then
-	SLOT="3.3.3"
+	SLOT="5"
 else
-	SLOT="${CCHOST}-3.3.3"
+	SLOT="${CCHOST}-5"
 fi
 
 DEPEND="virtual/libc
-	!nptl? ( !uclibc? ( >=sys-libs/glibc-2.3.2-r3 ) )
+	!nptl? ( elibc_glibc? ( >=sys-libs/glibc-2.3.2-r3 ) )
 	>=sys-devel/binutils-2.14.90.0.6-r1
 	>=sys-devel/bison-1.875
 	>=sys-devel/gcc-config-1.3.1
@@ -97,7 +151,7 @@ DEPEND="virtual/libc
 	          nls? ( sys-devel/gettext ) )"
 
 RDEPEND="virtual/libc
-	!nptl? ( !uclibc? ( >=sys-libs/glibc-2.3.2-r3 ) )
+	!nptl? ( elibc_glibc? ( >=sys-libs/glibc-2.3.2-r3 ) )
 	>=sys-devel/gcc-config-1.3.1
 	>=sys-libs/zlib-1.1.4
 	>=sys-apps/texinfo-4.2-r4
@@ -112,7 +166,12 @@ src_unpack() {
 	# Fixup libtool to correctly generate .la files with portage
 	elibtoolize --portage --shallow
 
-	use amd64 && epatch ${FILESDIR}/libstdc++_amd64_multilib_hack.patch
+	if (has_multilib_profile || use multilib) ; then
+		sed -i \
+			-e 's:\(MULTILIB_OSDIRNAMES = \).*:\1../lib64 ../lib32:' \
+			${S}/gcc/config/i386/t-linux64 \
+			|| die "sed failed!"
+	fi
 
 	# Misdesign in libstdc++ (Redhat)
 	cp -a ${S}/libstdc++-v3/config/cpu/i{4,3}86/atomicity.h
@@ -132,7 +191,7 @@ src_compile() {
 		myconf="${myconf} --enable-nls --without-included-gettext"
 	fi
 
-	use amd64 && myconf="${myconf} --disable-multilib"
+	(has_multilib_profile || use multilib) || myconf="${myconf} --disable-multilib"
 
 	do_filter_flags
 	einfo "CFLAGS=\"${CFLAGS}\""
@@ -167,9 +226,6 @@ src_compile() {
 
 	touch ${S}/gcc/c-gperf.h
 
-	# Setup -j in MAKEOPTS
-	get_number_of_jobs
-
 	einfo "Compiling libstdc++..."
 	S="${WORKDIR}/build" \
 	emake all-target-libstdc++-v3 \
@@ -229,6 +285,12 @@ src_install() {
 	# apps and also causes others to link against the old libstdc++...
 	rm ${D}/${LOC}/lib/libstdc++-v3/libstdc++.so
 
+	# and it's much easier to just move around the result than it is to
+	# configure libstdc++-v3 to use CONF_LIDIR
+	if [ "$(get_libdir)" != "lib" ] ; then
+		mv ${D}/${LOC}/lib ${D}/${LOC}/$(get_libdir)
+	fi
+
 	mkdir -p ${D}/etc/env.d/
 	echo "LDPATH=\"${LOC}/lib/libstdc++-v3/\"" >> ${D}/etc/env.d/99libstdc++
 }
diff --git a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6.ebuild b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6.ebuild
index f1fcb4a5214d..67ecc394bb85 100644
--- a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6.ebuild
+++ b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.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/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6.ebuild,v 1.1 2005/07/23 07:34:55 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6.ebuild,v 1.1.1.1 2005/11/30 09:39:08 chriswhite Exp $
 
 inherit eutils flag-o-matic libtool gnuconfig versionator
 
@@ -87,6 +87,7 @@ do_filter_flags() {
 	filter-flags -funit-at-a-time
 	filter-flags -fweb
 	filter-flags -fno-web
+	filter-flags -mno-tls-direct-seg-refs
 
 	# xgcc isnt patched with propolice
 	filter-flags -fstack-protector-all
@@ -130,7 +131,7 @@ HOMEPAGE="http://gcc.gnu.org/libstdc++/"
 LICENSE="GPL-2 LGPL-2.1"
 
 KEYWORDS="~amd64 ~x86 ~mips ~ppc64 ~ppc ~sparc"
-IUSE="multilib nls nptl"
+IUSE="multilib nls nptl build"
 
 # 3.2.3 -> 3.3.x install .so.5, so lets slot to 5
 if [ "${CHOST}" == "${CCHOST}" ]
@@ -190,7 +191,7 @@ src_compile() {
 		myconf="${myconf} --enable-nls --without-included-gettext"
 	fi
 
-	(has_multlib_profile || use multilib) || myconf="${myconf} --disable-multilib"
+	(has_multilib_profile || use multilib) || myconf="${myconf} --disable-multilib"
 
 	do_filter_flags
 	einfo "CFLAGS=\"${CFLAGS}\""
diff --git a/sys-libs/libstreams/ChangeLog b/sys-libs/libstreams/ChangeLog
index f4e0a9b8b47d..39d551d04d09 100644
--- a/sys-libs/libstreams/ChangeLog
+++ b/sys-libs/libstreams/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-libs/libstreams
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstreams/ChangeLog,v 1.1 2004/11/07 19:02:03 kito Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstreams/ChangeLog,v 1.1.1.1 2005/11/30 09:39:18 chriswhite Exp $
+
+  26 May 2005; Sven Wegener <swegener@gentoo.org> metadata.xml:
+  'no-herd' instead of empty herd tag
+
+*libstreams-24.1 (19 May 2005)
+
+  19 May 2005; Kito <kito@gentoo.org> +libstreams-24.1.ebuild:
+  version bump.
+
+  03 Mar 2005; Kito <kito@gentoo.org> libstreams-23.ebuild:
+  stable on ppc-macos
 
 *libstreams-23 (07 Nov 2004)
 
diff --git a/sys-libs/libstreams/Manifest b/sys-libs/libstreams/Manifest
index faf86b33e6c6..b82d6ab48ba0 100644
--- a/sys-libs/libstreams/Manifest
+++ b/sys-libs/libstreams/Manifest
@@ -1,4 +1,16 @@
-MD5 cc851927ebda1c1cdd199690b02f3f8b ChangeLog 254
-MD5 b309bd08fa9ca8b199287b04ec2b7b95 libstreams-23.ebuild 958
-MD5 65d0ad2167dd016e2981b7a3df82cc50 metadata.xml 212
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b4fdf681a6df48bbf17e49ca1fae34c8 libstreams-23.ebuild 1058
+MD5 5b07c74f948cbba45ebff500b2cfc3fa libstreams-24.1.ebuild 1062
+MD5 ac116f540be9dfd53bf0332ce5559591 ChangeLog 645
+MD5 e526e84277cb8eb1bcf73840117ff45a metadata.xml 220
+MD5 afd14bf665cba4b8ea473a70c0d3a257 files/digest-libstreams-24.1 66
 MD5 589cbe62f6794d45d8f383a80db2971d files/digest-libstreams-23 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFClikVI1lqEGTUzyQRAknSAKDC2HujyzCi7tkH3LIPszfShRTpFwCfUcFj
+2puaNDUy1zB+Hdf4LSRZ2Wg=
+=jKtA
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/libstreams/libstreams-23.ebuild b/sys-libs/libstreams/libstreams-23.ebuild
index 65cd7be549e7..df9fc03b8ee8 100644
--- a/sys-libs/libstreams/libstreams-23.ebuild
+++ b/sys-libs/libstreams/libstreams-23.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/sys-libs/libstreams/libstreams-23.ebuild,v 1.1 2004/11/07 19:02:03 kito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstreams/libstreams-23.ebuild,v 1.1.1.1 2005/11/30 09:39:18 chriswhite Exp $
 
 DESCRIPTION="NeXT/Darwin Streams routines."
 HOMEPAGE="http://darwinsource.opendarwin.org/10.3.6/"
@@ -9,7 +9,7 @@ SRC_URI="http://darwinsource.opendarwin.org/tarballs/apsl/Libstreams-${PV}.tar.g
 LICENSE="APSL-2"
 
 SLOT="0"
-KEYWORDS="~ppc-macos"
+KEYWORDS="ppc-macos"
 IUSE="debug"
 
 DEPEND="virtual/libc"
@@ -32,8 +32,8 @@ src_compile() {
 }
 
 src_install() {
-	into /usr/lib/system
-	dolib.a *.a
+	insinto /usr/lib/system
+	doins *.a
 
 	insinto /usr/include/streams
 	doins *.h
diff --git a/sys-libs/libstreams/libstreams-24.1.ebuild b/sys-libs/libstreams/libstreams-24.1.ebuild
index 9251707cc2e8..8332aa6e9cf8 100644
--- a/sys-libs/libstreams/libstreams-24.1.ebuild
+++ b/sys-libs/libstreams/libstreams-24.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstreams/libstreams-24.1.ebuild,v 1.1 2005/05/19 20:46:58 kito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstreams/libstreams-24.1.ebuild,v 1.1.1.1 2005/11/30 09:39:18 chriswhite Exp $
 
 DESCRIPTION="NeXT/Darwin Streams routines."
 HOMEPAGE="http://darwinsource.opendarwin.org/10.3.6/"
diff --git a/sys-libs/libstreams/metadata.xml b/sys-libs/libstreams/metadata.xml
index f3c4173ce6dc..a65e8c2fdf72 100644
--- a/sys-libs/libstreams/metadata.xml
+++ b/sys-libs/libstreams/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></herd>
+<herd>no-herd</herd>
 <maintainer>
   <email>kito@gentoo.org</email>
 </maintainer>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>
diff --git a/sys-libs/libsystem/ChangeLog b/sys-libs/libsystem/ChangeLog
index ed87a974c6d8..7dce4bef8697 100644
--- a/sys-libs/libsystem/ChangeLog
+++ b/sys-libs/libsystem/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for sys-libs/libsystem
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsystem/ChangeLog,v 1.1 2004/07/11 00:34:43 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsystem/ChangeLog,v 1.1.1.1 2005/11/30 09:39:10 chriswhite Exp $
 
 *libsystem-7.1 (11 Jul 2004)
 
diff --git a/sys-libs/libsystem/Manifest b/sys-libs/libsystem/Manifest
index e7224efb3a1b..4c4b9e46279b 100644
--- a/sys-libs/libsystem/Manifest
+++ b/sys-libs/libsystem/Manifest
@@ -1,3 +1,13 @@
-MD5 00b8f74e756e671771c8d93775cd45e7 ChangeLog 378
-MD5 2c3a413c83d5f578886ff30a471e7207 libsystem-7.1.ebuild 705
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d77fdca3607d4907137808c04633e51a ChangeLog 470
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-libsystem-7.1 0
+MD5 1e34bf708185a56ca84188f007b32b3c libsystem-7.1.ebuild 966
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC69c/I1lqEGTUzyQRArdSAKCtxFr5WQV8LPLd1q3lmi8YU1zBIwCg1FQS
+n+SjSTWCcn/Oboeuitk+/Ok=
+=DkN1
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/libsystem/libsystem-7.1.ebuild b/sys-libs/libsystem/libsystem-7.1.ebuild
index eb506d9f1ede..6d172095f90f 100644
--- a/sys-libs/libsystem/libsystem-7.1.ebuild
+++ b/sys-libs/libsystem/libsystem-7.1.ebuild
@@ -1,35 +1,34 @@
-# Copyright 1999-2004 Gentoo Foundation, Pieter Van den Abeele <pvdabeel@gentoo.org>
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsystem/libsystem-7.1.ebuild,v 1.1 2004/07/11 00:34:43 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsystem/libsystem-7.1.ebuild,v 1.1.1.1 2005/11/30 09:39:10 chriswhite Exp $
 
 DESCRIPTION="Darwin Libsystem, a collection of core libs similar to glibc on linux"
 
-HOMEPAGE="http://www.opendarwin.org/"
+HOMEPAGE="http://www.opensource.apple.com/darwinsource/"
 SRC_URI=""
-LICENSE="BSD"
+LICENSE="APSL-2"
 SLOT="0"
-KEYWORDS="-* macos"
+KEYWORDS="-* ppc-macos"
 IUSE=""
-
+PROVIDE="virtual/libc"
 
 # I haven't listed any deps here, we're currently not building Darwin from scratch yet.
-# For now, this is a dummy package provided upstream. The version provided by the 
-# distributor is pinpointed in the users profile
+# For now, this is a dummy package provided upstream. The version provided by the
+# distributor is pinpointed in the users profile. I am not going to be injecting this 
+# because its the root of the dependency tree. I'm not comfortable with portage
+# having an injected, non-existant package as the root of its tree.
 
 DEPEND=""
 RDEPEND=""
 
 src_unpack() {
-	mkdir -p ${S} # You have to do something in ${S}, otherwise ${S} doesn't exist and
-                      # portage craps its pants
+	mkdir -p ${S}
 }
 
 src_compile() {
-	# This is not an empty function
-	sleep 0	
+	true
 }
 
 src_install() {
-	# This is not an empty function
-	sleep 0
+	true
 }
diff --git a/sys-libs/libtermcap-compat/ChangeLog b/sys-libs/libtermcap-compat/ChangeLog
index 538d212de899..f9dd582f8794 100644
--- a/sys-libs/libtermcap-compat/ChangeLog
+++ b/sys-libs/libtermcap-compat/ChangeLog
@@ -1,10 +1,108 @@
 # ChangeLog for sys-libs/libtermcap-compat
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtermcap-compat/ChangeLog,v 1.1 2002/09/05 06:39:01 azarah Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtermcap-compat/ChangeLog,v 1.1.1.1 2005/11/30 09:39:17 chriswhite Exp $
 
-*libtermcap-compat-1.2.3 (5 Sep 2002)
+*libtermcap-compat-2.0.8-r2 (20 Aug 2005)
 
-  5 Sep 2002; Martin Schlemmer <azarah@gentoo.org> libtermcap-compat-1.2.3.ebuild :
+  20 Aug 2005; Mike Frysinger <vapier@gentoo.org>
+  +libtermcap-compat-2.0.8-r2.ebuild:
+  Version bump to start deprecating this craptastic package.
 
+  28 Jul 2005; Seemant Kulleen <seemant@gentoo.org>
+  -libtermcap-compat-1.2.3.ebuild, -libtermcap-compat-2.0.8.ebuild,
+  libtermcap-compat-2.0.8-r1.ebuild:
+  cruft ebuild clean out and src_uri fix
+
+  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  libtermcap-compat-1.2.3-r1.ebuild, libtermcap-compat-1.2.3.ebuild,
+  libtermcap-compat-2.0.8-r1.ebuild, libtermcap-compat-2.0.8.ebuild:
+  virtual/glibc -> virtual/libc
+
+  12 May 2004; Guy Martin <gmsoft@gentoo.org> libtermcap-compat-2.0.8-r1.ebuild:
+  Marked stable on hppa.
+
+  19 Apr 2004; Tom Gall <tgall@gentoo.org>
+  libtermcap-compat-2.0.8-r1.ebuild:
+  marked stable on ppc64
+
+  07 Apr 2004; Brian Jackson <iggy@gentoo.org>
+  libtermcap-compat-2.0.8-r1.ebuild:
+  added s390 keyword
+
+  26 Mar 2004; Aron Griffis <agriffis@gentoo.org>
+  libtermcap-compat-2.0.8-r1.ebuild:
+  stable on alpha and ia64
+
+*libtermcap-compat-2.0.8-r1 (17 Mar 2004)
+
+  17 Mar 2004; Daniel Ahlberg <aliz@gentoo.org>
+  libtermcap-compat-2.0.8-r1.ebuild, files/libtermcap-compat-2.0.8-fPIC.patch:
+  Compile both static and shared lib with -fPIC.
+  Fix symlinks, closing #42709.
+
+  11 Jan 2004; Martin Schlemmer <azarah@gentoo.org>
+  libtermcap-compat-1.2.3-r1.ebuild, libtermcap-compat-1.2.3.ebuild,
+  libtermcap-compat-2.0.8.ebuild:
+  Make sure we link to /lib/libtermcap.so, not /usr/lib/libtermcap.a, bug #4411.
+
+  05 Jan 2004; Seemant Kulleen <seemant@gentoo.org>
+  libtermcap-compat-2.0.8.ebuild:
+  KEYWORD into testing :/
+
+*libtermcap-compat-2.0.8 (30 Dec 2003)
+
+  30 Dec 2003; Seemant Kulleen <seemant@gentoo.org>
+  libtermcap-compat-2.0.8.ebuild:
+  version bump. This incorporates Eric Raymond's latest iteration of the
+  /etc/termcap file, patched with some patches from Mandrake. Additionally,
+  libtermcap's src.rpm was liberally raided for Mandrake patches. This is
+  designed to work with coreutils-5.0.91-r3
+
+  17 Sep 2003; Jon Portnoy <avenj@gentoo.org>
+  libtermcap-compat-1.2.3-r1.ebuild :
+  ia64 keywords.
+
+  17 Sep 2003; Tavis Ormandy <taviso@gentoo.org>
+  libtermcap-compat-1.2.3-r1.ebuild:
+  stable
+
+  08 Sep 2003; Tavis Ormandy <taviso@gentoo.org>
+  libtermcap-compat-1.2.3-r1.ebuild:
+  inherit eutils
+
+*libtermcap-compat-1.2.3-r1 (06 Sep 2003)
+
+  06 Sep 2003; Tavis Ormandy <taviso@gentoo.org>
+  libtermcap-compat-1.2.3-r1.ebuild:
+  libraries owned by user `bin` instead of `root` #24211
+  changed patch command to use `epatch`.
+
+  08 Feb 2003; Guy Martin <gmsoft@gentoo.org> libtermcap-compat-1.2.3.ebuild :
+  Added hppa to keywords.
+
+*libtermcap-compat-1.2.3 (05 Sep 2002)
+
+  27 Feb 2003; Zach Welch <zwelch@gentoo.org> libtermcap-compat-1.2.3.ebuild:
+  add arm keyword
+
+  09 Feb 2003; Jan Seidel <tuxus@gentoo.org> 
+  Added mips to keywords :
+
+  13 Dec 2002; Seemant Kulleen <seemant@gentoo.org>
+  libtermcap-compat-1.2.3.ebuild :
+
+  ChangeLog and README are now properly installed in the docs folder.
+  Thanks to: fede2@fuerzag.ulatina.ac.cr (Alvaro Figueroa) for catching this
+  in bug #12087.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  02 Dec 2002; Will Woods <wwoods@gentoo.org> libtermcap-compat-1.2.3.ebuild:
+  Added alpha keyword.
+
+  12 Sep 2002; Maarten Thibaut <murphy@gentoo.org> libtermcap-compat-1.2.3.ebuild :
+  Added description to ebuild. Added sparc/sparc64 keywords.
+
+  05 Sep 2002; Martin Schlemmer <azarah@gentoo.org> libtermcap-compat-1.2.3.ebuild :
   Initial version.  This is based on Debian's termcap-compat package.
 
diff --git a/sys-libs/libtermcap-compat/Manifest b/sys-libs/libtermcap-compat/Manifest
index e69de29bb2d1..98692377d4be 100644
--- a/sys-libs/libtermcap-compat/Manifest
+++ b/sys-libs/libtermcap-compat/Manifest
@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6fdbddb178ac8f4ad820b9b239cc197b libtermcap-compat-2.0.8-r2.ebuild 1409
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 e4c495e6effb4372d8b4a1189b7bfd4d libtermcap-compat-2.0.8-r1.ebuild 1570
+MD5 96d21ddd5f180229bfc30eb538c76e5d ChangeLog 3861
+MD5 88a1c08b3377362fbf228dd424880fe9 files/digest-libtermcap-compat-2.0.8-r1 211
+MD5 88a1c08b3377362fbf228dd424880fe9 files/digest-libtermcap-compat-2.0.8-r2 211
+MD5 c5389fda988845f0c56af4ec72c8d524 files/libtermcap-compat_bcopy_fix.patch 314
+MD5 f44d7442f29d0a63d10f7633925ccd6e files/libtermcap-compat-2.0.8-fPIC.patch 740
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDBrA0gIKl8Uu19MoRAq8ZAJsEjR9Oh2Ypx55A8a5DhIWrvoeQ4gCcCXYa
+4P349VJbBQJf4j3AkxsVJxg=
+=B6B2
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r1.ebuild b/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r1.ebuild
index 847b5ee00dfc..79fc7f682c36 100644
--- a/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r1.ebuild
+++ b/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-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/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r1.ebuild,v 1.1 2004/03/17 18:29:46 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r1.ebuild,v 1.1.1.1 2005/11/30 09:39:17 chriswhite Exp $
 
 inherit eutils
 
@@ -14,16 +14,15 @@ PATCHDIR="${WORKDIR}/patch"
 DESCRIPTION="Compatibility package for old termcap-based programs"
 HOMEPAGE="http://www.catb.org/~esr/terminfo/"
 SRC_URI="http://www.catb.org/~esr/terminfo/termtypes.tc.gz
-	http://dev.gentoo.org/~seemant/extras/${MY_P}.tar.bz2
-	http://dev.gentoo.org/~seemant/extras/${P}-gentoo-${PATCHVER}.tar.bz2
 	mirror://gentoo/${MY_P}.tar.bz2
 	mirror://gentoo/${P}-gentoo-${PATCHVER}.tar.bz2"
 
-SLOT="0"
 LICENSE="freedist"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~amd64 ~ia64 ~ppc64"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
@@ -53,7 +52,8 @@ src_install () {
 	# Make sure we link to /lib/libtermcap.so, not /usr/lib/libtermcap.a,
 	# bug #4411.
 	gen_usr_ldscript libtermcap.so
-	dosym libtermcap.so.${PV} /lib/libtermcap.so
+	dosym libtermcap.so.2 /lib/libtermcap.so
+	dosym libtermcap.so.${PV} /lib/libtermcap.so.2
 
 	insinto /etc
 	doins ${WORKDIR}/termcap
@@ -61,4 +61,3 @@ src_install () {
 	cd ${S}
 	dodoc ChangeLog README
 }
-
diff --git a/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r2.ebuild b/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r2.ebuild
index 86f5cf3625cb..1e009695d5f6 100644
--- a/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r2.ebuild
+++ b/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-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/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r2.ebuild,v 1.1 2005/08/20 04:22:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r2.ebuild,v 1.1.1.1 2005/11/30 09:39:17 chriswhite Exp $
 
 inherit eutils multilib
 
diff --git a/sys-libs/libtermcap-compat/metadata.xml b/sys-libs/libtermcap-compat/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-libs/libtermcap-compat/metadata.xml
+++ b/sys-libs/libtermcap-compat/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/sys-libs/libtpm/ChangeLog b/sys-libs/libtpm/ChangeLog
index 2342d588b071..07ab180f8bb6 100644
--- a/sys-libs/libtpm/ChangeLog
+++ b/sys-libs/libtpm/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for sys-libs/libtpm
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtpm/ChangeLog,v 1.1 2005/02/03 11:12:02 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtpm/ChangeLog,v 1.1.1.1 2005/11/30 09:39:07 chriswhite Exp $
 
 *libtpm-2.0 (03 Feb 2005)
 
diff --git a/sys-libs/libtpm/Manifest b/sys-libs/libtpm/Manifest
index 6ba83fa7d922..9e1fa0bf643e 100644
--- a/sys-libs/libtpm/Manifest
+++ b/sys-libs/libtpm/Manifest
@@ -1,2 +1,14 @@
-MD5 1c7d848de6de15eee00ce2137b38d03f libtpm-2.0.ebuild 465
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2558fbde897c8edf21d439b78ed19dd9 libtpm-2.0.ebuild 565
+MD5 340fbfef19426331492d7063aad76a62 metadata.xml 317
+MD5 5ff03a1ec408dab64546d255d9a4814c ChangeLog 415
 MD5 95e1fe65a5cd55c3dd7954669f46f8bd files/digest-libtpm-2.0 59
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCAgcJmdTrptrqvGERApJmAJ95grYqc4VmAs1lt+BS6ImfKFywJACdEro6
+WRexS+XLkugQStwrDhDW248=
+=1iY1
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/libtpm/libtpm-2.0.ebuild b/sys-libs/libtpm/libtpm-2.0.ebuild
index 1d3fa506c5f0..f2a2eb2813bd 100644
--- a/sys-libs/libtpm/libtpm-2.0.ebuild
+++ b/sys-libs/libtpm/libtpm-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/sys-libs/libtpm/libtpm-2.0.ebuild,v 1.1 2005/02/03 11:12:02 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtpm/libtpm-2.0.ebuild,v 1.1.1.1 2005/11/30 09:39:07 chriswhite Exp $
 
 DESCRIPTION="Driver for TPM chips"
 
diff --git a/sys-libs/libtrash/ChangeLog b/sys-libs/libtrash/ChangeLog
index 691e212e3ac7..81ea544e19ba 100644
--- a/sys-libs/libtrash/ChangeLog
+++ b/sys-libs/libtrash/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for sys-libs/libtrash
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtrash/ChangeLog,v 1.1 2004/03/27 00:27:27 matsuu Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtrash/ChangeLog,v 1.1.1.1 2005/11/30 09:39:06 chriswhite Exp $
+
+*libtrash-2.4 (05 Nov 2005)
+
+  05 Nov 2005; MATSUU Takuto <matsuu@gentoo.org>
+  +files/libtrash-2.4-gentoo.patch, +libtrash-2.4.ebuild:
+  Version bumped. Bug 108127.
+
+  16 May 2005; MATSUU Takuto <matsuu@gentoo.org> libtrash-2.2.ebuild:
+  Fixed inheriting gcc, Bug 92745.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  libtrash-2.2.ebuild:
+  Masked libtrash-2.2.ebuild stable for ppc
+
+  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> libtrash-2.2.ebuild:
+  virtual/glibc -> virtual/libc
+
+  27 Mar 2004; David Holm <dholm@gentoo.org> libtrash-2.2.ebuild:
+  Added to ~ppc.
 
 *libtrash-2.2 (27 Mar 2004)
 
diff --git a/sys-libs/libtrash/Manifest b/sys-libs/libtrash/Manifest
index aecb417f31a0..8d67c3e39c9f 100644
--- a/sys-libs/libtrash/Manifest
+++ b/sys-libs/libtrash/Manifest
@@ -1,5 +1,9 @@
-MD5 9f100727fd4d8b8ed1dc90539d1062d0 libtrash-2.2.ebuild 1154
-MD5 fba61a0991c764c1dcee2644e52ea06a ChangeLog 243
-MD5 8600c86ec08b5db06b59aa2a2e0ec2a3 files/digest-libtrash-2.2 60
+MD5 0a328af4f791fa3960fe2648d9d5baf8 ChangeLog 919
 MD5 a165552d7dee01c2d7bbf914ae701cba files/cleanTrash.cron 200
+MD5 8600c86ec08b5db06b59aa2a2e0ec2a3 files/digest-libtrash-2.2 60
+MD5 d69a03bb7138b6a25e6ef708afae2823 files/digest-libtrash-2.4 60
 MD5 02701c7978b919cf96660c80a3ff1a82 files/libtrash-2.2-gentoo.patch 2708
+MD5 bd1b945f46e09170c290b6d6bc0fd0c1 files/libtrash-2.4-gentoo.patch 2632
+MD5 6b8b68ba011a24eed705ff95f892461e libtrash-2.2.ebuild 1377
+MD5 406acd7140455321e87e340a0cdfa9be libtrash-2.4.ebuild 1778
+MD5 e10a0da4fac2882942ffa8360ccdd921 metadata.xml 201
diff --git a/sys-libs/libtrash/libtrash-2.2.ebuild b/sys-libs/libtrash/libtrash-2.2.ebuild
index 609616279ca0..8a324e35b372 100644
--- a/sys-libs/libtrash/libtrash-2.2.ebuild
+++ b/sys-libs/libtrash/libtrash-2.2.ebuild
@@ -1,31 +1,33 @@
-# 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/sys-libs/libtrash/libtrash-2.2.ebuild,v 1.1 2004/03/27 00:27:27 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtrash/libtrash-2.2.ebuild,v 1.1.1.1 2005/11/30 09:39:06 chriswhite Exp $
+
+inherit eutils toolchain-funcs
 
 DESCRIPTION="provides a trash can by intercepting certain calls to glibc"
 HOMEPAGE="http://www.m-arriaga.net/software/libtrash/"
 SRC_URI="http://www.m-arriaga.net/software/libtrash/${P}.tgz"
 
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ppc"
 IUSE=""
 
-DEPEND=">=virtual/glibc-2.3.2
+DEPEND=">=virtual/libc-2.3.2
 	dev-lang/perl"
 
 src_unpack() {
 	unpack ${A}
-
 	epatch ${FILESDIR}/${P}-gentoo.patch
+	sed -i -e "/^INSTLIBDIR/s/lib/$(get_libdir)/" ${S}/src/Makefile || die
 }
 
 src_compile() {
-	make CC="${CC}" CFLAGS="${CFLAGS}" || die
+	make CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die
 }
 
 src_install() {
-	dodir /etc /usr/lib
+	dodir /etc /usr/$(get_libdir)
 	make DESTDIR=${D} install || die
 
 	dosbin cleanTrash/ct2.pl
@@ -43,7 +45,7 @@ pkg_postinst() {
 	einfo "To use this you have to put the trash library as one"
 	einfo "of the variables in LD_PRELOAD."
 	einfo "Example in bash:"
-	einfo "export LD_PRELOAD=/usr/lib/libtrash.so"
+	einfo "export LD_PRELOAD=/usr/$(get_libdir)/libtrash.so"
 	einfo
 	einfo "Also, see /etc/cron.daily/cleanTrash.cron if you'd like to turn on"
 	einfo "daily trash cleanup."
diff --git a/sys-libs/libtrash/libtrash-2.4.ebuild b/sys-libs/libtrash/libtrash-2.4.ebuild
index a0df0c140b04..d320fff0b196 100644
--- a/sys-libs/libtrash/libtrash-2.4.ebuild
+++ b/sys-libs/libtrash/libtrash-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/sys-libs/libtrash/libtrash-2.4.ebuild,v 1.1 2005/11/05 05:16:30 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtrash/libtrash-2.4.ebuild,v 1.1.1.1 2005/11/30 09:39:06 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
diff --git a/sys-libs/libunwind/ChangeLog b/sys-libs/libunwind/ChangeLog
index d960bf8c12ea..15e91a84e13f 100644
--- a/sys-libs/libunwind/ChangeLog
+++ b/sys-libs/libunwind/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/libunwind
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libunwind/ChangeLog,v 1.1 2005/04/09 02:13:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libunwind/ChangeLog,v 1.1.1.1 2005/11/30 09:39:18 chriswhite Exp $
+
+*libunwind-0.98.5 (21 Sep 2005)
+
+  21 Sep 2005; Mike Frysinger <vapier@gentoo.org> +libunwind-0.98.5.ebuild:
+  Version bump.
 
 *libunwind-0.98.4 (08 Apr 2005)
 
diff --git a/sys-libs/libunwind/Manifest b/sys-libs/libunwind/Manifest
index b05f77fe77bd..76ed131a7134 100644
--- a/sys-libs/libunwind/Manifest
+++ b/sys-libs/libunwind/Manifest
@@ -1,2 +1,16 @@
-MD5 340de0d3be1a8ce94cfd90bc5e82ebc3 libunwind-0.98.4.ebuild 460
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f8a4a3c105cc320fe2d488b2aaf0c0df libunwind-0.98.5.ebuild 595
+MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
+MD5 bacba3661ba64d8303ded922154ca5ee libunwind-0.98.4.ebuild 595
+MD5 56550e6fa857a1eef5a20a0f70b18248 ChangeLog 463
 MD5 0d17274a86e9a49bfd1dd8cfcc7db374 files/digest-libunwind-0.98.4 68
+MD5 f204f2cb28edc79e6203858ec9af562a files/digest-libunwind-0.98.5 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDMMhTgIKl8Uu19MoRAv4pAJ0Z3w1G1TBhZ35Jsh4BB5jOP6xa/gCeMGrt
+YHhNoKTkjweBFCqMxM2a72A=
+=qC4h
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/libunwind/libunwind-0.98.4.ebuild b/sys-libs/libunwind/libunwind-0.98.4.ebuild
index 3df31095fb27..00cb825bcfae 100644
--- a/sys-libs/libunwind/libunwind-0.98.4.ebuild
+++ b/sys-libs/libunwind/libunwind-0.98.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/sys-libs/libunwind/libunwind-0.98.4.ebuild,v 1.1 2005/04/09 02:13:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libunwind/libunwind-0.98.4.ebuild,v 1.1.1.1 2005/11/30 09:39:18 chriswhite Exp $
 
 DESCRIPTION="portable and efficient API to determine the call-chain of a program"
 HOMEPAGE="http://www.hpl.hp.com/research/linux/libunwind/"
diff --git a/sys-libs/libunwind/libunwind-0.98.5.ebuild b/sys-libs/libunwind/libunwind-0.98.5.ebuild
index 07d44b4d3d50..0a2f2d81b53c 100644
--- a/sys-libs/libunwind/libunwind-0.98.5.ebuild
+++ b/sys-libs/libunwind/libunwind-0.98.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/sys-libs/libunwind/libunwind-0.98.5.ebuild,v 1.1 2005/09/21 02:40:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libunwind/libunwind-0.98.5.ebuild,v 1.1.1.1 2005/11/30 09:39:18 chriswhite Exp $
 
 DESCRIPTION="portable and efficient API to determine the call-chain of a program"
 HOMEPAGE="http://www.hpl.hp.com/research/linux/libunwind/"
diff --git a/sys-libs/libutempter/ChangeLog b/sys-libs/libutempter/ChangeLog
index fe882dd0ce2d..b8f2d7bfdf0b 100644
--- a/sys-libs/libutempter/ChangeLog
+++ b/sys-libs/libutempter/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/libutempter
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libutempter/ChangeLog,v 1.1 2005/05/13 21:05:13 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libutempter/ChangeLog,v 1.1.1.1 2005/11/30 09:39:11 chriswhite Exp $
+
+  29 Jul 2005; Seemant Kulleen <seemant@gentoo.org>
+  libutempter-1.1.2.1.ebuild:
+  ready for stable on x86 and amd64
 
 *libutempter-1.1.2.1 (13 May 2005)
 
diff --git a/sys-libs/libutempter/Manifest b/sys-libs/libutempter/Manifest
index bc2a273ca70f..6880f389d996 100644
--- a/sys-libs/libutempter/Manifest
+++ b/sys-libs/libutempter/Manifest
@@ -1,2 +1,4 @@
-MD5 01dfd03a707b91a0342688899ff8ca16 libutempter-1.1.2.1.ebuild 1894
+MD5 981564579c44ddb3987dee1f1fb8c530 libutempter-1.1.2.1.ebuild 1870
+MD5 1fe2f84f5f9d41bc80bb795ef8845ff2 metadata.xml 244
+MD5 ae982cbd6afe6657eee9f5702cf249c9 ChangeLog 763
 MD5 ffebc89596505e2ec9dc3c4f0851780f files/digest-libutempter-1.1.2.1 146
diff --git a/sys-libs/libutempter/libutempter-1.1.2.1.ebuild b/sys-libs/libutempter/libutempter-1.1.2.1.ebuild
index 4e71617f8a5b..3ffea3a8f351 100644
--- a/sys-libs/libutempter/libutempter-1.1.2.1.ebuild
+++ b/sys-libs/libutempter/libutempter-1.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/sys-libs/libutempter/libutempter-1.1.2.1.ebuild,v 1.1 2005/05/13 21:05:13 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libutempter/libutempter-1.1.2.1.ebuild,v 1.1.1.1 2005/11/30 09:39:11 chriswhite Exp $
 
 inherit rpm eutils flag-o-matic versionator
 
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.altlinux.ru/pub/distributions/ALTLinux/Sisyphus/SRPMS.classic
 
 LICENSE="LGPL-2.1"
 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=""
 
 RDEPEND="virtual/libc"
diff --git a/sys-libs/libvserver/ChangeLog b/sys-libs/libvserver/ChangeLog
index e8c90d62850e..dad5c66ac78a 100644
--- a/sys-libs/libvserver/ChangeLog
+++ b/sys-libs/libvserver/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for sys-libs/libvserver
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libvserver/ChangeLog,v 1.1 2005/07/20 06:25:03 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libvserver/ChangeLog,v 1.1.1.1 2005/11/30 09:39:07 chriswhite Exp $
+
+*libvserver-0.4 (01 Oct 2005)
+
+  01 Oct 2005; Benedikt Boehm <hollow@gentoo.org> -libvserver-0.1.ebuild,
+  -libvserver-0.2.ebuild, -libvserver-0.2.1.ebuild, +libvserver-0.4.ebuild:
+  Version bump
+
+  28 Aug 2005; Mike Frysinger <vapier@gentoo.org> libvserver-0.1.ebuild,
+  libvserver-0.2.1.ebuild:
+  Punt USE=diet.
+
+*libvserver-0.2.1 (23 Jul 2005)
+
+  23 Jul 2005; Benedikt Boehm <hollow@gentoo.org> +libvserver-0.2.1.ebuild:
+  Version bump
+
+  21 Jul 2005; David Holm <dholm@gentoo.org> libvserver-0.2.ebuild:
+  Added to ~ppc.
 
 *libvserver-0.2 (20 Jul 2005)
 *libvserver-0.1 (20 Jul 2005)
diff --git a/sys-libs/libvserver/Manifest b/sys-libs/libvserver/Manifest
index f2697f18a08f..75908a736511 100644
--- a/sys-libs/libvserver/Manifest
+++ b/sys-libs/libvserver/Manifest
@@ -1,6 +1,14 @@
-MD5 3d4dfb4356f56ee83e0f426163e3b6cf metadata.xml 231
-MD5 08bb87dce5cee836eb6c82182b12b54d libvserver-0.1.ebuild 516
-MD5 2803f487c9ec442f63e4cbdd9cdf3df6 libvserver-0.2.ebuild 650
-MD5 143719052ebbf484466f7d88fe768c68 ChangeLog 315
-MD5 8c9ce1ad7d85796b5a21d4c7ace62395 files/digest-libvserver-0.1 67
-MD5 0cef644a8bfd4934c99fae8ef70da01b files/digest-libvserver-0.2 67
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a6270f5ec998954cc34747f728fe5bae ChangeLog 932
+MD5 266ee2cf5cab2ae2cf414eec11b6a932 metadata.xml 449
+MD5 00b0c0c649023c9eb2fe14c6e7610b7f libvserver-0.4.ebuild 506
+MD5 d11a959f0c30c88713f951d7fbf7505a files/digest-libvserver-0.4 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDPoqYmPFBzbX68WERAlpZAJ9ewE4Myk0qj0Cl6u6yYQEa8VlxrgCeL4nC
+uHO/6YMGG3TuZBIa+LD7eDA=
+=dK3U
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/libvserver/libvserver-0.4.ebuild b/sys-libs/libvserver/libvserver-0.4.ebuild
index 363205d88d32..20aa85c6f2ec 100644
--- a/sys-libs/libvserver/libvserver-0.4.ebuild
+++ b/sys-libs/libvserver/libvserver-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/sys-libs/libvserver/libvserver-0.4.ebuild,v 1.1 2005/10/01 13:07:35 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libvserver/libvserver-0.4.ebuild,v 1.1.1.1 2005/11/30 09:39:07 chriswhite Exp $
 
 DESCRIPTION="Linux-VServer syscall library"
 HOMEPAGE="http://dev.gentoo.org/~hollow/vserver/libvserver"
diff --git a/sys-libs/libvserver/metadata.xml b/sys-libs/libvserver/metadata.xml
index 0fb4a0cdedca..2233551ce6d4 100644
--- a/sys-libs/libvserver/metadata.xml
+++ b/sys-libs/libvserver/metadata.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>hollow@gentoo.org</email>
-  <name>Benedikt Boehm</name>
-</maintainer>
+	<herd>vserver</herd>
+	<maintainer>
+		<email>vserver-devs@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		libvserver is a clean implementation of the Linux-VServer
+		2.0 API using a library which handles all vserver syscalls
+		and provides an interface usable in other applications.
+	</longdescription>
 </pkgmetadata>
diff --git a/sys-libs/libxcrypt/ChangeLog b/sys-libs/libxcrypt/ChangeLog
index b93ca7c13052..8d248fc8b3c8 100644
--- a/sys-libs/libxcrypt/ChangeLog
+++ b/sys-libs/libxcrypt/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-libs/libxcrypt
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libxcrypt/ChangeLog,v 1.1 2004/01/20 23:10:23 method Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libxcrypt/ChangeLog,v 1.1.1.1 2005/11/30 09:39:07 chriswhite Exp $
+
+  20 Oct 2004; Danny van Dyk <kugelfang@gentoo.org> libxcrypt-2.0.ebuild:
+  Marked ~amd64.
+
+  07 May 2004; Brandon Hale <tseng@gentoo.org> libxcrypt-2.0.ebuild:
+  Removed S=
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> libxcrypt-2.0.ebuild:
+  Add die following econf for bug 48950
 
 *libxcrypt-2.0 (20 Jan 2004)
 
diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index 12aa3feefbc9..8eb883f6a71c 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -1,2 +1,4 @@
-MD5 bcd299225c3abbe485ed8fedeff59f2b libxcrypt-2.0.ebuild 748
+MD5 6bb0c4a997aa9e7176749c1088811096 ChangeLog 620
+MD5 e6a900915ff21a37849ad634cc9014a3 libxcrypt-2.0.ebuild 745
+MD5 b631fdbc12856dd67816db640abe536c metadata.xml 523
 MD5 1cafd0c372aaba855d7b2bb02cd06576 files/digest-libxcrypt-2.0 66
diff --git a/sys-libs/libxcrypt/libxcrypt-2.0.ebuild b/sys-libs/libxcrypt/libxcrypt-2.0.ebuild
index f212cc276035..af968f721b2a 100644
--- a/sys-libs/libxcrypt/libxcrypt-2.0.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-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/sys-libs/libxcrypt/libxcrypt-2.0.ebuild,v 1.1 2004/01/20 23:10:23 method Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libxcrypt/libxcrypt-2.0.ebuild,v 1.1.1.1 2005/11/30 09:39:07 chriswhite Exp $
 
 DESCRIPTION="Libxcrypt is a replacement for libcrypt, which comes with the GNU C \
 Library. It supports DES crypt, MD5, and passwords with blowfish encryption."
@@ -9,14 +9,11 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 HOMEPAGE="http://www.suse.de/us/private/products/suse_linux/i386/packages_personal/libxcrypt.html"
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 IUSE=""
 
 DEPEND=""
 
-#RDEPEND=""
-S=${WORKDIR}/${P}
-
 src_unpack() {
 
 	unpack ${P}.tar.bz2
@@ -25,7 +22,7 @@ src_unpack() {
 }
 
 src_compile() {
-	econf
+	econf || die "econf failed"
 	emake
 
 }
diff --git a/sys-libs/lrmi/ChangeLog b/sys-libs/lrmi/ChangeLog
index 0977caa3de75..6c61dc5f3f92 100644
--- a/sys-libs/lrmi/ChangeLog
+++ b/sys-libs/lrmi/ChangeLog
@@ -1,6 +1,39 @@
-# ChangeLog for media-gfx/icoutils
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/lrmi/ChangeLog,v 1.1 2002/10/21 17:52:19 hanno Exp $
+# ChangeLog for sys-libs/lrmi
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/lrmi/ChangeLog,v 1.1.1.1 2005/11/30 09:39:10 chriswhite Exp $
+
+  13 Nov 2005; Mark Loeser <halcy0n@gentoo.org> lrmi-0.8.ebuild:
+  Stable on x86; bug #112364
+
+*lrmi-0.9 (13 Nov 2005)
+
+  13 Nov 2005; Mike Frysinger <vapier@gentoo.org> +lrmi-0.9.ebuild:
+  Version bump #112179 by PaX Team.
+
+  08 Nov 2004; Daniel Drake <dsd@gentoo.org> lrmi-0.8.ebuild:
+  Library installation fix thanks to Stefan Schweizer <sschweizer@gmail.com> in
+  bug 57299 (ok'd by vapier)
+
+  07 Aug 2004; Tom Martin <slarti@gentoo.org> lrmi-0.8.ebuild:
+  Added fix for static library installation which was left out previously.
+
+  07 Aug 2004; Tom Martin <slarti@gentoo.org> lrmi-0.8.ebuild:
+  Fixed dynamic library installation; bug 57299. Thanks very much to Stefan
+  Schweizer <sschweizer@gmail.com> for reporting.
+
+  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> lrmi-0.6.ebuild,
+  lrmi-0.7.ebuild, lrmi-0.8.ebuild:
+  virtual/glibc -> virtual/libc
+
+*lrmi-0.8 (15 Jun 2004)
+
+  15 Jun 2004; Hanno Boeck <hanno@gentoo.org> +lrmi-0.8.ebuild:
+  Version bump.
+
+*lrmi-0.7 (23 Mar 2003)
+
+  23 Mar 2003; Hanno Boeck <hanno@gentoo.org> lrmi-0.7.ebuild :
+  New version.
 
 *lrmi-0.6 (21 Oct 2002)
 
diff --git a/sys-libs/lrmi/Manifest b/sys-libs/lrmi/Manifest
index e69de29bb2d1..9615356a3e97 100644
--- a/sys-libs/lrmi/Manifest
+++ b/sys-libs/lrmi/Manifest
@@ -0,0 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6a7ce60b9975a5d9aafdd2ade12d04d4 ChangeLog 1397
+MD5 c2587bd78295f2acb8207bd8875dc762 files/digest-lrmi-0.6 58
+MD5 2bd5cbd06eeb3edcb25852c477959924 files/digest-lrmi-0.7 58
+MD5 a40620a0f6617e99fd2156a09a4ecd64 files/digest-lrmi-0.8 58
+MD5 e763e812a3112be19646c15758bf219d files/digest-lrmi-0.9 59
+MD5 56e3adaff4cac9fa4791a823dce2405f lrmi-0.6.ebuild 641
+MD5 004c0994a69b79084efd604e0f77b11a lrmi-0.7.ebuild 640
+MD5 88a8a366fe42a072a00b730409d92686 lrmi-0.8.ebuild 730
+MD5 bd572a0b1cc5a96f86dcaae028ef2573 lrmi-0.9.ebuild 780
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDduAcCRZPokWLroQRAsmaAKCijkbhzz3G5tlmxP710tFR0jC3qgCguTDK
+bGF2JfdDocxu/5JxDRAOIZI=
+=BUZw
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/lrmi/lrmi-0.6.ebuild b/sys-libs/lrmi/lrmi-0.6.ebuild
index 9cd518998c16..8f1f70700aa4 100644
--- a/sys-libs/lrmi/lrmi-0.6.ebuild
+++ b/sys-libs/lrmi/lrmi-0.6.ebuild
@@ -1,16 +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/sys-libs/lrmi/lrmi-0.6.ebuild,v 1.1 2002/10/21 17:52:19 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/lrmi/lrmi-0.6.ebuild,v 1.1.1.1 2005/11/30 09:39:10 chriswhite Exp $
 
+IUSE=""
 DESCRIPTION="LRMI is a library for calling real mode BIOS routines under Linux."
 HOMEPAGE="http://www.sourceforge.net/projects/lrmi/"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 SLOT="0"
 LICENSE="MIT"
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 RDEPEND=""
 SRC_URI="mirror://sourceforge/lrmi/${P}.tar.gz"
-S=${WORKDIR}/${P}
 
 src_compile() {
 	emake CFLAGS="${CFLAGS}" || die
@@ -20,6 +20,6 @@ src_install () {
 	dobin vbetest
 	insinto /usr/lib
 	doins liblrmi.so
-        insinto /usr/include
+	insinto /usr/include
 	doins lrmi.h vbe.h
 }
diff --git a/sys-libs/lrmi/lrmi-0.7.ebuild b/sys-libs/lrmi/lrmi-0.7.ebuild
index f3b3d8ec4844..6408d8ce67ae 100644
--- a/sys-libs/lrmi/lrmi-0.7.ebuild
+++ b/sys-libs/lrmi/lrmi-0.7.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/sys-libs/lrmi/lrmi-0.7.ebuild,v 1.1 2003/03/23 18:09:27 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/lrmi/lrmi-0.7.ebuild,v 1.1.1.1 2005/11/30 09:39:10 chriswhite Exp $
 
 IUSE=""
 DESCRIPTION="LRMI is a library for calling real mode BIOS routines under Linux."
 HOMEPAGE="http://www.sourceforge.net/projects/lrmi/"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 SLOT="0"
 LICENSE="MIT"
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 RDEPEND=""
 SRC_URI="mirror://sourceforge/lrmi/${P}.tar.gz"
-S=${WORKDIR}/${P}
 
 src_compile() {
 	emake CFLAGS="${CFLAGS}" || die
diff --git a/sys-libs/lrmi/lrmi-0.8.ebuild b/sys-libs/lrmi/lrmi-0.8.ebuild
index 381b88039b41..67439d85cc4c 100644
--- a/sys-libs/lrmi/lrmi-0.8.ebuild
+++ b/sys-libs/lrmi/lrmi-0.8.ebuild
@@ -1,17 +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/sys-libs/lrmi/lrmi-0.8.ebuild,v 1.1 2004/06/15 18:22:35 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/lrmi/lrmi-0.8.ebuild,v 1.1.1.1 2005/11/30 09:39:10 chriswhite Exp $
 
 IUSE=""
 DESCRIPTION="LRMI is a library for calling real mode BIOS routines under Linux."
 HOMEPAGE="http://www.sourceforge.net/projects/lrmi/"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 SLOT="0"
 LICENSE="MIT"
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 RDEPEND=""
 SRC_URI="mirror://sourceforge/lrmi/${P}.tar.gz"
-S=${WORKDIR}/${P}
 
 src_compile() {
 	emake CFLAGS="${CFLAGS}" || die
@@ -19,8 +18,13 @@ src_compile() {
 
 src_install () {
 	dobin vbetest
-	insinto /usr/lib
-	doins liblrmi.so
+
+	dolib.a liblrmi.a
+
+	dolib.so liblrmi.so
+	dosym liblrmi.so /usr/lib/liblrmi.so.0
+	dosym liblrmi.so.0 /usr/lib/liblrmi.so.0.0
+
 	insinto /usr/include
 	doins lrmi.h vbe.h
 }
diff --git a/sys-libs/lrmi/lrmi-0.9.ebuild b/sys-libs/lrmi/lrmi-0.9.ebuild
index 8de5dad5cbf4..e48ef52f6e81 100644
--- a/sys-libs/lrmi/lrmi-0.9.ebuild
+++ b/sys-libs/lrmi/lrmi-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/sys-libs/lrmi/lrmi-0.9.ebuild,v 1.1 2005/11/13 04:28:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/lrmi/lrmi-0.9.ebuild,v 1.1.1.1 2005/11/30 09:39:10 chriswhite Exp $
 
 DESCRIPTION="library for calling real mode BIOS routines under Linux"
 HOMEPAGE="http://www.sourceforge.net/projects/lrmi/"
diff --git a/sys-libs/lrmi/metadata.xml b/sys-libs/lrmi/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-libs/lrmi/metadata.xml
+++ b/sys-libs/lrmi/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/sys-libs/lwp/ChangeLog b/sys-libs/lwp/ChangeLog
index 496ba4892e5b..d3d6e9fee20f 100644
--- a/sys-libs/lwp/ChangeLog
+++ b/sys-libs/lwp/ChangeLog
@@ -1,6 +1,98 @@
 # ChangeLog for sys-libs/lwp
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/lwp/ChangeLog,v 1.1 2002/07/23 21:48:04 lostlogic Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/lwp/ChangeLog,v 1.1.1.1 2005/11/30 09:39:11 chriswhite Exp $
+
+  17 Oct 2005; Maurice van der Pot <griffon26@gentoo.org>
+  -files/lwp-1.10-amd64.patch, -lwp-1.12.ebuild:
+  Removed old version.
+
+*lwp-2.1 (23 Sep 2005)
+
+  23 Sep 2005; Maurice van der Pot <griffon26@gentoo.org> +lwp-2.1.ebuild:
+  Added lwp 2.1 for new coda release 6.0.12
+
+  23 Aug 2005; Aron Griffis <agriffis@gentoo.org> lwp-2.0.ebuild:
+  stable on ia64
+
+  18 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> lwp-2.0.ebuild:
+  Stable on ppc.
+
+  19 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> lwp-2.0.ebuild:
+  Stable on alpha.
+
+  07 Jul 2005; Maurice van der Pot <griffon26@gentoo.org> lwp-2.0.ebuild:
+  Marked stable on x86
+
+  08 Jun 2005; Maurice van der Pot <griffon26@gentoo.org> -lwp-1.9.ebuild,
+  -lwp-1.10.ebuild, -lwp-1.11.ebuild, lwp-1.12.ebuild, lwp-2.0.ebuild:
+  Removed old versions. Adapted to change in location of source package.
+
+*lwp-2.0 (05 May 2005)
+
+  05 May 2005; Maurice van der Pot <griffon26@gentoo.org>
+  +files/lwp-2.0-amd64.patch, +lwp-2.0.ebuild:
+  Added new release and updated amd64 patch.
+
+  20 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> lwp-1.12.ebuild:
+  Stable on ppc.
+
+  19 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> lwp-1.12.ebuild:
+  Stable on alpha.
+
+  03 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  22 Dec 2004; Maurice van der Pot <griffon26@gentoo.org> lwp-1.12.ebuild:
+  Marked stable on x86
+
+*lwp-1.12 (23 Oct 2004)
+
+  23 Oct 2004; Maurice van der Pot <griffon26@gentoo.org> lwp-1.11.ebuild,
+  +lwp-1.12.ebuild:
+  Version bump for new coda release 6.0.7
+  Marked lwp-1.11 stable on x86
+
+*lwp-1.12 (21 Oct 2004)
+
+  21 Oct 2004; Maurice van der Pot <griffon26@gentoo.org> +lwp-1.12.ebuild:
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> lwp-1.10.ebuild:
+  Masked lwp-1.10.ebuild stable for ppc
+
+  26 Aug 2004; Maurice van der Pot <griffon26@gentoo.org> lwp-1.11.ebuild:
+  Fixed incorrect reference to amd64 patch
+
+  12 Aug 2004; Maurice van der Pot <griffon26@gentoo.org> metadata.xml,
+  lwp-1.10.ebuild, lwp-1.9.ebuild:
+  Took over maintenance from Daniel Black <dragonheart@gentoo.org>
+  Fixed some cosmetics
+
+  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> lwp-1.10.ebuild,
+  lwp-1.11.ebuild, lwp-1.9.ebuild:
+  virtual/glibc -> virtual/libc
+
+  11 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> lwp-1.11.ebuild:
+  Stable on alpha.
+
+  12 May 2004; Daniel Black <dragonheart@gentoo.org> lwp-1.10.ebuild:
+  x86 stable
+
+*lwp-1.11 (12 May 2004)
+
+  12 May 2004; Daniel Black <dragonheart@gentoo.org> :
+  version bump. Changed maintainer to me and net-fs herd
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> lwp-1.10.ebuild:
+  Add inherit eutils
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> lwp-1.9.ebuild:
+  Add die following econf for bug 48950
+
+*lwp-1.10 (15 Nov 2003)
+
+  15 Nov 2003; Seemant Kulleen <seemant@gentoo.org> :
+  version bump, as part of a coda version bump -- thanks to: Michael C. Ferguson
+  <mcf@augustmail.com> in bug #26132
 
 *lwp-1.9 (30 Jun 2002)
 
diff --git a/sys-libs/lwp/Manifest b/sys-libs/lwp/Manifest
index e69de29bb2d1..c197024d0808 100644
--- a/sys-libs/lwp/Manifest
+++ b/sys-libs/lwp/Manifest
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 35caccb32e864542520775c8a14e3ee2 ChangeLog 3322
+MD5 30ec12e50fe24609f01a4b5887448a42 files/digest-lwp-2.0 59
+MD5 e3d82442ff9aa23abe755f6dfca0cdc2 files/digest-lwp-2.1 59
+MD5 147bcbca707eadf9faeea72963a197e1 files/lwp-2.0-amd64.patch 866
+MD5 7593634172e32819f08a194ab88232e7 lwp-2.0.ebuild 816
+MD5 ad92edaa3add3a5b4bca8d3b208e6585 lwp-2.1.ebuild 821
+MD5 fdd307ea78fc900a01e57b8151f34d4e metadata.xml 224
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDU/pBMGnpIbeahxwRAnDSAJ4uIySzt4c8ic4Lxyk0w6a99YLCUQCgtfiU
+6P7HPbsloC7tcm0casyD2QU=
+=uyhB
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/lwp/lwp-2.0.ebuild b/sys-libs/lwp/lwp-2.0.ebuild
index 5289c3925d3f..0b23b194cb1b 100644
--- a/sys-libs/lwp/lwp-2.0.ebuild
+++ b/sys-libs/lwp/lwp-2.0.ebuild
@@ -1,25 +1,24 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/lwp/lwp-2.0.ebuild,v 1.1 2005/05/05 13:18:20 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/lwp/lwp-2.0.ebuild,v 1.1.1.1 2005/11/30 09:39:11 chriswhite Exp $
 
 inherit eutils
 
 DESCRIPTION="Light weight process library (used by Coda).  This is NOT libwww-perl."
 HOMEPAGE="http://www.coda.cs.cmu.edu/"
-SRC_URI="ftp://ftp.coda.cs.cmu.edu/pub/lwp/src/${P}.tar.gz"
+SRC_URI="http://www.coda.cs.cmu.edu/pub/lwp/src/${P}.tar.gz"
 
 SLOT="1"
 LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~amd64 ~ia64"
+KEYWORDS="alpha ~amd64 ~hppa ia64 ~mips ppc ~sparc x86"
 IUSE=""
 
-DEPEND="virtual/libc
-	sys-apps/grep
+DEPEND="sys-apps/grep
 	sys-apps/sed
 	sys-devel/libtool
 	sys-devel/gcc"
 
-RDEPEND="virtual/libc"
+RDEPEND=""
 
 src_unpack() {
 	unpack ${A} ; cd ${S}
diff --git a/sys-libs/lwp/lwp-2.1.ebuild b/sys-libs/lwp/lwp-2.1.ebuild
index 1e4876c4fa0c..9909b8645e01 100644
--- a/sys-libs/lwp/lwp-2.1.ebuild
+++ b/sys-libs/lwp/lwp-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/sys-libs/lwp/lwp-2.1.ebuild,v 1.1 2005/09/25 14:08:58 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/lwp/lwp-2.1.ebuild,v 1.1.1.1 2005/11/30 09:39:11 chriswhite Exp $
 
 inherit eutils
 
diff --git a/sys-libs/lwp/metadata.xml b/sys-libs/lwp/metadata.xml
index f093d416cbb1..e55bab8edce3 100644
--- a/sys-libs/lwp/metadata.xml
+++ b/sys-libs/lwp/metadata.xml
@@ -1,7 +1,8 @@
- * Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<herd>net-fs</herd>
+<maintainer>
+  <email>griffon26@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-libs/metadata.xml b/sys-libs/metadata.xml
index facfd0946fa4..73e1c9602f2c 100644
--- a/sys-libs/metadata.xml
+++ b/sys-libs/metadata.xml
@@ -4,5 +4,23 @@
 	<longdescription lang="en">
 		The sys-libs category contains various system-level libraries.
 	</longdescription>
+	<longdescription lang="es">
+		La categoría sys-libs contiene varias librerías del sistema.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie sys-libs enthält verschiedene Systembibliotheken.
+	</longdescription>
+	<longdescription lang="ja">
+		sys-libsカテゴリには様々なシステムレベルライブラリが含まれます。
+	</longdescription>
+	<longdescription lang="nl">
+		De sys-libs categorie bevat verschillende systeembibliotheken.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm sys-libs chứa các thư viện cấp hệ thống.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria sys-libs contiene varie librerie di sistema.
+	</longdescription>
 </catmetadata>
 
diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog
index 068096a5e5a1..42b22b51b0d7 100644
--- a/sys-libs/ncurses/ChangeLog
+++ b/sys-libs/ncurses/ChangeLog
@@ -1,6 +1,421 @@
 # ChangeLog for sys-libs/ncurses
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.1 2002/02/01 21:53:38 gbevin Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.1.1.1 2005/11/30 09:39:05 chriswhite Exp $
+
+  10 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/ncurses-5.5-gfbsd.patch, ncurses-5.5-r1.ebuild:
+  Add patch from gentoo-alt overlay to use Linux soname naming on FreeBSD to
+  avoid linking breakage.
+
+*ncurses-5.5-r1 (10 Nov 2005)
+
+  10 Nov 2005; Mike Frysinger <vapier@gentoo.org> +ncurses-5.5-r1.ebuild:
+  Add support for --enable-const #111961 by Horst Schirmeier.
+
+*ncurses-5.5 (20 Oct 2005)
+
+  20 Oct 2005; Mike Frysinger <vapier@gentoo.org> +ncurses-5.5.ebuild:
+  Version bump #109838 by Vorobyev Dmitri.
+
+*ncurses-5.4.20050827 (15 Sep 2005)
+
+  15 Sep 2005; Mike Frysinger <vapier@gentoo.org> -ncurses-5.4.20050827.ebuild:
+  Punt since it is binary incompat with earlier versions.  Next jumbo patchset 
+  should address this though.
+
+  29 Jun 2005; Joshua Kinard <kumba@gentoo.org> ncurses-5.4-r6.ebuild:
+  Marked stable on mips.
+
+  06 Jun 2005; Markus Rothe <corsair@gentoo.org> ncurses-5.4-r6.ebuild:
+  Stable on ppc64
+
+  29 May 2005; <solar@gentoo.org> ncurses-5.4-r5.ebuild:
+  - update sys-libs/ncurses to use libc expanded variable elibc_uclibc vs uclibc
+  so USE=-* works
+
+  10 May 2005; Mike Frysinger <vapier@gentoo.org>
+  ncurses-5.4.20050319.ebuild:
+  Install libraries into /usr/lib on Darwin #92018.
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> ncurses-5.4-r6.ebuild:
+  Stable on ppc.
+
+*ncurses-5.4.20050319 (28 Apr 2005)
+
+  28 Apr 2005; Mike Frysinger <vapier@gentoo.org>
+  +ncurses-5.4.20050319.ebuild:
+  Add patch from upstream.
+
+  28 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> ncurses-5.4-r6.ebuild:
+  Stable on sparc
+
+*ncurses-5.4-r6 (23 Mar 2005)
+
+  23 Mar 2005; Mike Frysinger <vapier@gentoo.org> +ncurses-5.4-r6.ebuild:
+  Install both normal ncurses and wide ncurses with USE=unicode. Take a page
+  from RedHat to do this.
+
+  22 Mar 2005; Heinrich Wendel <lanius@gentoo.org> ncurses-5.4-r5.ebuild:
+  add warning for bug #78313
+
+  30 Jan 2005; Mike Frysinger <vapier@gentoo.org> ncurses-5.4-r5.ebuild:
+  Since gpm no longer DEPENDs on autoconf, it should be save to DEPEND on again.
+
+  03 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  07 Dec 2004; <solar@gentoo.org> ncurses-5.4-r5.ebuild:
+  - Stopped abusing uclibc for cxx handling, the ebuild now uses nocxx bug
+  #73633 - enable work around --program-prefix= as ncurses will pick up the arch
+  tuple and put it in the program prefix incorrectly as
+  arch-vendor-linux-<libc>-<app>
+
+  17 Oct 2004; Dylan Carlson <absinthe@gentoo.org> ncurses-5.4-r5.ebuild:
+  stable on amd64.
+ 
+  04 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> 
+  ncurses-5.4-r5.ebuild:
+  PPC stable
+
+  02 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> ncurses-5.4-r5.ebuild:
+  Stable on alpha.
+
+  25 Sep 2004; Joshua Kinard <kumba@gentoo.org> ncurses-5.4-r5.ebuild:
+  Marked stable on mips.
+
+  22 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> ncurses-5.4-r5.ebuild:
+  Stable on sparc
+
+  21 Sep 2004; Heinrich Wendel <lanius@gentoo.org> ncurses-5.4-r5.ebuild:
+  mark x86
+
+  08 Sep 2004; Mike Frysinger <vapier@gentoo.org> ncurses-5.3-r5.ebuild,
+  ncurses-5.4-r1.ebuild, ncurses-5.4-r2.ebuild, ncurses-5.4-r3.ebuild,
+  ncurses-5.4-r4.ebuild, ncurses-5.4-r5.ebuild:
+  Generate a ldscript for libcurses.so too #51901.
+
+  02 Sep 2004; Travis Tilley <lv@gentoo.org> ncurses-5.4-r1.ebuild,
+  ncurses-5.4-r2.ebuild, ncurses-5.4-r3.ebuild, ncurses-5.4-r4.ebuild,
+  ncurses-5.4-r5.ebuild:
+  changed CONF_LIBDIR to $(get_libdir), since the get_libdir function has sane
+  defaults when using a version a portage without CONF_LIBDIR support
+
+*ncurses-5.4-r5 (30 Aug 2004)
+
+  30 Aug 2004; Guy Martin <gmsoft@gentoo.org> +ncurses-5.4-r5.ebuild:
+  Unconditonal use of -fPIC (#55238).
+
+  19 Aug 2004; Travis Tilley <lv@gentoo.org> ncurses-5.4-r4.ebuild:
+  fix utf-8 support so that it doesnt totally bork installs with a /lib64
+  directory. fixes bug 60920
+
+*ncurses-5.4-r4 (19 Aug 2004)
+
+  19 Aug 2004; Heinrich Wendel <lanius@gentoo.org> ncurses-5.4-r4.ebuild:
+  add utf-8 support, bug #20006, #27700
+
+  17 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org> ncurses-5.4-r3.ebuild:
+  IUSE doc
+
+  17 Aug 2004; Aron Griffis <agriffis@gentoo.org> ncurses-5.4-r3.ebuild:
+  stable on alpha and ia64
+
+  14 Aug 2004; Travis Tilley <lv@gentoo.org> ncurses-5.4-r1.ebuild,
+  ncurses-5.4-r2.ebuild, ncurses-5.4-r3.ebuild:
+  added CONF_LIBDIR support for installing to lib64/lib32
+
+  11 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org> ncurses-5.3-r5.ebuild,
+  ncurses-5.4-r1.ebuild, ncurses-5.4-r2.ebuild, ncurses-5.4-r3.ebuild:
+  gnuconfig_update in src_unpack
+
+*ncurses-5.4-r3 (28 Jul 2004)
+
+  28 Jul 2004; Jon Portnoy <avenj@gentoo.org> ncurses-5.3-r5.ebuild,
+  ncurses-5.4-r1.ebuild, ncurses-5.4-r2.ebuild, ncurses-5.4-r3.ebuild :
+  Updated ebuilds to use --enable-symlinks per bug #41886.
+
+  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ncurses-5.3-r5.ebuild, ncurses-5.4-r1.ebuild, ncurses-5.4-r2.ebuild:
+  virtual/glibc -> virtual/libc
+
+  27 Jun 2004; Aron Griffis <agriffis@gentoo.org> ncurses-5.3-r5.ebuild:
+  QA - fix use invocation
+
+*ncurses-5.4-r2 (19 Jun 2004)
+
+  19 Jun 2004; <solar@gentoo.org> ncurses-5.4-r2.ebuild:
+  Add missing IUSE='build bootstrap' flags and new uclibc IUSE flag. Remove
+  extraneous ncurses libraries when bootstraping and or when uclibc is set.
+
+  07 Jun 2004; Mike Frysinger <vapier@gentoo.org> ncurses-5.4-r1.ebuild:
+  Move back into ~ppc since latest xfree/xorg-x11/gcc combination should fix the
+  xfree compile bug.
+
+  15 May 2004; Joshua Kinard <kumba@gentoo.org> ncurses-5.4-r1.ebuild:
+  Marked stable on mips.
+
+  13 Apr 2004; Mike Frysinger <vapier@gentoo.org> ncurses-5.3-r1.ebuild 
+  ncurses-5.3-r2.ebuild ncurses-5.3-r3.ebuild ncurses-5.3-r4.ebuild 
+  ncurses-5.4.ebuild ncurses-5.4-r1.ebuild :
+  Prune out old ebuilds since KEYWORDS overrides the previous ones and 
+  add back in parallel support with 5.4 via (emake).  Tested on a P4 with -j
+  and on a 8way with -j16 ;).
+
+  02 Apr 2004; Jon Portnoy <avenj@gentoo.org> ncurses-5.4.ebuild, 
+  ncurses-5.4-r1.ebuild :
+  Revert gpm support entirely due to bootstrap problems.
+
+  30 Mar 2004; <rac@gentoo.org> ncurses-5.4-r1.ebuild, ncurses-5.4.ebuild:
+  Make gpm support not come in if USE=bootstrap, fix bootstrap with USE=gpm set
+
+  29 Mar 2004; Jon Portnoy <avenj@gentoo.org> ncurses-5.4.ebuild,
+  ncurses-5.4-r1.ebuild :
+  Added gpm support. Bug #22005.
+
+  26 Mar 2004; Jason Wever <weeve@gentoo.org> ncurses-5.4-r1.ebuild:
+  Marked ncurses-5.4-r1 stable on sparc again.
+
+  16 Mar 2004; <solar@gentoo.org> ncurses-5.4-r1.ebuild:
+  new filter-ldflags function in flag-o-matic allows us to filter exactly what
+  we need here which is -pie.. So lets use that function vs all of filter-flags
+  and all it's glory
+
+  15 Mar 2004; Jason Wever <weeve@gentoo.org> ncurses-5.4-r1.ebuild,
+  ncurses-5.4.ebuild:
+  Marked ncurses-5.4.* to testing on sparc as it breaks things and never was in
+  testing first.
+
+  12 Mar 2004; <solar@gentoo.org> ncurses-5.4-r1.ebuild:
+  ncurses fails to link properly with global LDFLAGS=-pie so we filter it
+
+  08 Mar 2004; Bartosch Pixa <darkspecter@gentoo.org> ncurses-5.4-r1.ebuild,
+  ncurses-5.4.ebuild:
+  set ~ppc as 5.4 breaks building xfree on ppc
+
+  07 Mar 2004; Joshua Kinard <kumba@gentoo.org> ncurses-5.3-r5.ebuild:
+  Marked stable on mips.
+
+*ncurses-5.4-r1 (03 Mar 2004)
+
+  03 Mar 2004; Martin Schlemmer <azarah@gentoo.org> ncurses-5.4-r1.ebuild,
+  files/ncurses-5.4-xterm.patch:
+  Do not use current capabilities for xterm terminfo, but rather those of older
+  xfree 4.3 (matches ncurses 5.3 behaviour ...).  Bug #43432.
+
+*ncurses-5.4 (29 Feb 2004)
+
+  29 Feb 2004; Martin Schlemmer <azarah@gentoo.org> ncurses-5.4.ebuild,
+  files/ncurses-5.4-share-sed.patch, files/ncurses-5.4-xterm.patch:
+  Update version, closes bug #43302.
+
+  29 Feb 2004; Martin Schlemmer <azarah@gentoo.org> ncurses-5.3-r5.ebuild,
+  files/ncurses-5.3-share-sed.patch:
+  Sed replaces all 'share' in patch with 'lib', which causes sandbox errors with
+  a PORTAGE_TMPDIR with 'share' in it, bug #42336.
+  Patch by gna <gnagent2@yahoo.com.au>.
+
+  21 Feb 2004; Brad House <brad_mssw@gentoo.org> ncurses-5.3-r5.ebuild:
+  mark stable on amd64 and ppc64
+
+  16 Feb 2004; Brandon Low <lostlogic@gentoo.org> ncurses-5.3-r5.ebuild:
+  Bump to stable on ARM to fix a bad dep from less
+
+  17 Jan 2004; Christian Birchinger <joker@gentoo.org> ncurses-5.3-r5.ebuild:
+  Added sparc stable keyword
+
+  16 Jan 2004; Joshua Kinard <kumba@gentoo.org> ncurses-5.3-r1.ebuild,
+  ncurses-5.3-r2.ebuild, ncurses-5.3-r3.ebuild, ncurses-5.3-r4.ebuild,
+  ncurses-5.3-r5.ebuild:
+  Added gnuconfig support for mips in ncurses-5.3-r2 through -r5 and bumped -r1
+  back into arm unstable to fix dependency issue.
+
+  15 Jan 2004; Aron Griffis <agriffis@gentoo.org> ncurses-5.3-r5.ebuild:
+  stable on alpha and ia64
+
+*ncurses-5.3-r5 (11 Jan 2004)
+
+  11 Jan 2004; Martin Schlemmer <azarah@gentoo.org> ncurses-5.3-r5.ebuild,
+  files/ncurses-5.3-coretutils.patch, files/ncurses-5.3-coreutils.patch:
+  We need the basic terminfo files in /etc, bug #37026.  We will
+  add '--with-terminfo-dirs="/etc/terminfo:..." to ./configure and
+  then populate /etc/terminfo in src_install() ...
+
+  28 Dec 2003; Joshua Kinard <kumba@gentoo.org> ncurses-5.3-r2.ebuild:
+  Move to mips stable (~mips -> mips)
+
+  22 Dec 2003; Guy Martin <gmsoft@gentoo.org> ncurses-5.3-r4.ebuild :
+  Marked stable on hppa. This will add -fPIC to ncurses.
+
+  14 Dec 2003; Guy Martin <gmsoft@gentoo.org> ncurses-5.3-r2.ebuild:
+  Marked stable on hppa.
+
+  10 Dec 2003; Aron Griffis <agriffis@gentoo.org> ncurses-5.3-r4.ebuild:
+  Use the brand-spanking-new 64-bit eclass for -fPIC
+
+  08 Nov 2003; Brad House <brad_mssw@gentoo.org> ncurses-5.3-r4.ebuild:
+  need -fPIC for amd64 for building static libs as well as shared libs
+
+  04 Nov 2003; Brad House <brad_mssw@gentoo.org> ncurses-5.3-r4.ebuild:
+  mark stable on amd64
+
+  04 Nov 2003; Christian Birchinger <joker@gentoo.org> ncurses-5.3-r2.ebuild:
+  Added sparc stable keyword
+
+  22 Oct 2003; Bartosch Pixa <darkspecter@gentoo.org> ncurses-5.3-r4.ebuild:
+  set ppc in keywords
+
+  17 Sep 2003; Jon Portnoy <avenj@gentoo.org> ncurses-5.3-r4.ebuild :
+  ia64 keywords.
+
+  16 Aug 2003; Nick Hadaway <raker@gentoo.org> ncurses-5.3-r{1-4}.ebuild:
+  Changed the die message for make so users aren't confused.
+
+*ncurses-5.3-r4 (04 Aug 2003)
+
+  04 Aug 2003; Aron Griffis <agriffis@gentoo.org> ncurses-5.3-r4.ebuild:
+  Need to inherit eutils for gen_usr_ldscript
+
+*ncurses-5.3-r3 (01 Aug 2003)
+
+  01 Aug 2003; Aron Griffis <agriffis@gentoo.org> ncurses-5.3-r3.ebuild,
+  files/xterm-debian.ti:
+  Add xterm-debian terminfo entry for bug 18486
+
+*ncurses-5.3-r2 (11 Jun 2003)
+
+  01 Jul 2003; Todd Sunderlin <todd@gentoo.org> ncurses-5.3-r2.ebuild,
+  set stable on sparc
+
+  11 Jun 2003; Seemant Kulleen <seemant@gentoo.org> ncurses-5.2-r7.ebuild,
+  ncurses-5.2.20020511-r3.ebuild, ncurses-5.3-r2.ebuild,
+  files/ncurses-5.3-xterm.patch:
+  bartron <bartron@gmx.net> submitted a patch which allows home and end keys to
+  work in things like nano. Thanks to him in bug #21356
+
+  13 Mar 2003; Olivier Reisch <doctomoe@gentoo.org> ncurses-5.3-r1.ebuild :
+  Marked ppc stable
+
+  07 Feb 2003; Zach Welch <zwelch@gentoo.org> ncurses-5.3-r1.ebuild :
+  Added arm to keywords.
+
+  07 Feb 2003; Guy Martin <gmsof@gentoo.org> ncurses-5.3-r1.ebuild :
+  Added hppa to keywords.
+
+  06 Jan 2003; Jan Seidel <tuxus@gentoo.org> ncurses-5.2.20020511-r3 :
+  Added mips to keywords.
+
+  01 Jan 2003; Nick Hadaway <raker@gentoo.org> ncurses-5.3-r1.ebuild :
+  Added --without-ada to build options as a newer version of ncurses and
+  a modified gcc are required for this support.  See bug #12288 and
+  #11204.
+
+  10 Dec Martin Schlemmer <azarah@gentoo.org> ncurses-5.3-r1.ebuild :
+  Mark as stable for x86.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> :
+  Changed sparc ~sparc keywords
+ 
+*ncurses-5.2-r7 (26 Oct 2002)
+*ncurses-5.2.20020511-r3 (26 Oct 2002)
+*ncurses-5.3-r1 (26 Oct 2002)
+
+  28 Mar 2003; Christian Birchinger <joker@gentoo.org> ncurses-5.3-r1.ebuild:
+  Added sparc stable keyword
+
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> ncurses-5.3-r1.ebuild :
+  Tested on mips extensively, works fine.  Marked as stable for mips.
+
+  10 Nov 2002; Nick Hadaway <raker@gentoo.org> ncurses-5.3-r1.ebuild :
+  Marked unstable and unmasking.
+
+  26 Oct 2002; Martin Schlemmer <azarah@gentoo.org> ncurses*.ebuild :
+  Add linker scripts in /usr/lib to fix bug #4411.
+
+*ncurses-5.3 (17 Oct 2002)
+
+  23 Oct 2002; Martin Schlemmer <azarah@gentoo.org> ncurses-5.3.ebuild :
+  
+  Because ncurses-5.3 have c++ bindings, we cannot enable them during
+  bootstrap.  Thus disable it if "build" or "bootstrap" in USE, and
+  then get bootstrap.sh to rebuild it afterwards without those flags.
+  Also fix a problem where old build images had ncurses-5.2 libs, which
+  did not get removed.
+
+  17 Oct 2002; Nick Hadaway <raker@gentoo.org> ncurses-5.3.ebuild,
+  files/digest-ncurses-5.3 :
+  New version of ncurses.  Many years worth of fixes culminating to a
+  new release.
+
+*ncurses-5.2.20020511-r2 (3 Sep 2002)
+*ncurses-5.2-r6 (3 Sep 2002)
+
+  3 Sep 2002; Martin Schlemmer <azarah@gentoo.org> ncurses-5.2.20020511-r2,
+                                                   ncurses-5.2-r6 :
+  
+  Change --enable-termcap to --disable-termcap.  This fixes the starup
+  problems in screen with the presence of /etc/termcap.  This should
+  close bug #7060.  NOTE: remerge screen after ncurses update.
+
+*ncurses-5.2.20020511-r1 (9 Jun 2002)
+	
+  31 Jul 2002; Seemant Kulleen <seemant@gentoo.org> :
+
+  the second gcc-3.1 patch (from files/) attempts to replace lines in the
+  cursesw.cc file that do not even exist any longer.  the patch fails.  It
+  has been commented out, with the hope that whoever generated it for the
+  older snapshots will investigate and sort this out.  ncurses, it must be
+  noted, appears to work well in production, despite the failed patch,
+  anyway.
+
+  24 Jul 2002; Spider <spider@gentoo.org> :
+  change CXXFLAGS in the ebuild to accomodate for -fno-exceptions
+
+  15 Jul 2002; Mark Guertin <gerk@gentoo.org>
+  Added ppc to keywords
+
+  26 June 2002; mark Guertin <gerk@gentoo.org> :
+
+  changed bzcat to bunzip2 -c (bzcat doesn't exist until
+  building bzip2 outside of USE="build" so this broke
+  building stage1)
+
+  9 Jun 2002; Dan Armak <danarmak@gentoo.org> :
+  
+  Add bzip2 as a dep so that said patch, which is compressed, can be applied.
+
+*ncurses-5.2.20020511-r1 (26 May 2002)
+
+  26 May 2002; Preston A. Elder <prez@gentoo.org> :
+
+  Added patch to make it work with gcc 3.1
+
+*ncurses-5.2.20020511 (18 May 2002)
+
+  18 May 2002; Donny Davies <woodchip@gentoo.org> :
+
+  New snapshot for gcc-3.x testing.
+
+*ncurses-5.2.20020112a-r1 (205 Apr 2002)
+
+  05 Apr 2002; Geert Bevin <gbevin@gentoo.org> :
+
+  Small header file fix to make apps that use ncurses compile correctly with gcc3.
+	
+*ncurses-5.2.20020112a (21 Mar 2002)
+
+  21 Mar 2002; Grant Goodyear <g2boojum@gentoo.org> :
+
+  New version that compiles w/ gcc3.
+	
+*ncurses-5.2-r5 (21 Mar 2002)
+  04 Aug 2002; Spider <spider@gentoo.org> ncurses-5.2-r5.ebuild :
+  filter out -fno-exceptions from this build as well.
+  
+  12 Mar 2002; Seemant Kulleen <seemant@gentoo.org> ncurses-5.2-r5.ebuild :
+	
+  stefan@mdy.univie.ac.at pointed out html documentation getting gzipped
+  unnecessarily.  This is now fixed in r5.  I noticed a prior r4 which does
+  not work anyway, so this is based off r3.
 
 *ncurses-5.2-r3 (1 Feb 2002)
 
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index e69de29bb2d1..2bd19b01a839 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -0,0 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0edf86746761d52686203e67bb8da47d ChangeLog 16087
+MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4-r5 64
+MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4-r6 64
+MD5 97d66c7857e4be9c07d6ae8d7798a16c files/digest-ncurses-5.4.20050319 142
+MD5 cfb597b362a2079e24880e47e24357df files/digest-ncurses-5.5 64
+MD5 cfb597b362a2079e24880e47e24357df files/digest-ncurses-5.5-r1 64
+MD5 118971faee11066510aa77e6c6a2c51b files/ncurses-5.4-c++-templates.patch 351
+MD5 1ecbf68a55269d2cebeb997f6973fc1d files/ncurses-5.4-share-sed.patch 686
+MD5 61ecd5aac5ddbd35cc4d4a00282eed01 files/ncurses-5.4-xterm.patch 495
+MD5 44e644063b6a69d58662e363af118df8 files/ncurses-5.5-gfbsd.patch 3049
+MD5 2167b54d7c96964183554e767e5f5376 files/xterm-debian.ti 342
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 a885c047e0ef76d733b76f158c480f2a ncurses-5.4-r5.ebuild 6147
+MD5 d303a209fc62dfcb17c00343f1fc6dcb ncurses-5.4-r6.ebuild 5385
+MD5 45af8f6f6c26f746944e5e170f4ce537 ncurses-5.4.20050319.ebuild 5741
+MD5 c3076137c2592607280360168b438d9c ncurses-5.5-r1.ebuild 5294
+MD5 05ffcf86aeb3d3f5c9a5bfd5a72fb2d2 ncurses-5.5.ebuild 5253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDc7uSAiZjviIA2XgRArTTAJ4kW/AC8JZd8ipPd7vmDPGt7/TzZACfffCx
+hC7q9GaBNetODmp05B0CgWw=
+=dbPR
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/ncurses/files/ncurses-5.4-xterm.patch b/sys-libs/ncurses/files/ncurses-5.4-xterm.patch
index b50fc0ab7867..a2515e48de5a 100644
--- a/sys-libs/ncurses/files/ncurses-5.4-xterm.patch
+++ b/sys-libs/ncurses/files/ncurses-5.4-xterm.patch
@@ -1,13 +1,13 @@
 --- ncurses-5.3/misc/terminfo.src.orig	2002-10-05 20:40:53.000000000 +0200
 +++ ncurses-5.3/misc/terminfo.src	2003-05-23 15:50:57.000000000 +0200
-@@ -2922,8 +2922,8 @@
+@@ -2922,8 +2922,9 @@
  
  # This is xterm for ncurses.
  xterm|xterm terminal emulator (X Window System), 
 -	use=xterm-r6, 
--#	use=xterm-xfree86, 
 +#	use=xterm-r6, 
-+	use=xterm-xfree86, 
+ #	use=xterm-xfree86, 
++	use=xterm-xf86-v43, 
  
  # These entries allow access to the X titlebar and icon name as a status line. 
  # Note that twm (and possibly window managers descended from it such as tvtwm, 
diff --git a/sys-libs/ncurses/metadata.xml b/sys-libs/ncurses/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-libs/ncurses/metadata.xml
+++ b/sys-libs/ncurses/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/sys-libs/ncurses/ncurses-5.4-r5.ebuild b/sys-libs/ncurses/ncurses-5.4-r5.ebuild
index 87c9c378d4f1..e8b986ecc9d6 100644
--- a/sys-libs/ncurses/ncurses-5.4-r5.ebuild
+++ b/sys-libs/ncurses/ncurses-5.4-r5.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/sys-libs/ncurses/ncurses-5.4-r5.ebuild,v 1.1 2004/08/30 10:33:50 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.4-r5.ebuild,v 1.1.1.1 2005/11/30 09:39:05 chriswhite Exp $
 
-inherit eutils flag-o-matic gnuconfig
+inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="console display library"
 HOMEPAGE="http://www.gnu.org/software/ncurses/ncurses.html"
@@ -10,31 +10,27 @@ SRC_URI="mirror://gnu/ncurses/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="5"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
-IUSE="build bootstrap debug doc uclibc unicode"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
+IUSE="gpm build bootstrap debug doc unicode nocxx"
 
-DEPEND="virtual/libc"
-# This doesn't fix the problem. bootstrap builds ncurses again with
-# normal USE flags while bootstrap is unset, which apparently causes
-# things to break -- avenj  2 Apr 04
-#	!bootstrap? ( gpm? ( sys-libs/gpm ) )"
+DEPEND="gpm? ( sys-libs/gpm )"
 
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-xterm.patch
-	# Bug #42336.
-	epatch ${FILESDIR}/${P}-share-sed.patch
-	gnuconfig_update
+pkg_setup() {
+	# check for unicode use flag, see bug #78313
+	if use !unicode && [ -f /usr/lib/libncursesw.so ] && [ "$COMPILE_NCURSES" != "TRUE" ]; then
+		ewarn "Remerging ncurses without unicode in USE flags will break your system."
+		ewarn "For more information see bug #78313."
+		ewarn "If you still want continue set COMPILE_NCURSES variable to TRUE."
+		die
+	fi
 }
 
-pkg_setup() {
-	# this adds support for installing to lib64/lib32. since only portage
-	# 2.0.51 will have this functionality supported in dolib and friends,
-	# and since it isnt expected that many profiles will define it, we need
-	# to make this variable default to lib.
-	[ -z "${CONF_LIBDIR}" ] && export CONF_LIBDIR="lib"
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-xterm.patch
+	epatch "${FILESDIR}"/${P}-share-sed.patch #42336
+	epatch "${FILESDIR}"/${P}-c++-templates.patch #90819
 }
 
 src_compile() {
@@ -55,11 +51,11 @@ src_compile() {
 	# building it.  We will rebuild ncurses after gcc's second
 	# build in bootstrap.sh.
 	# <azarah@gentoo.org> (23 Oct 2002)
-	( use build || use bootstrap || use uclibc ) \
+	( use build || use bootstrap || use nocxx ) \
 		&& myconf="${myconf} --without-cxx --without-cxx-binding --without-ada"
 
-	# see note about DEPEND above -- avenj@gentoo.org  2 Apr 04
-#	use gpm && myconf="${myconf} --with-gpm"
+	# whee gpm !
+	use gpm && myconf="${myconf} --with-gpm"
 
 	# enable utf-8 support
 	use unicode && myconf="${myconf} --enable-widec"
@@ -67,14 +63,16 @@ src_compile() {
 	# We need the basic terminfo files in /etc, bug #37026.  We will
 	# add '--with-terminfo-dirs' and then populate /etc/terminfo in
 	# src_install() ...
+	tc-export BUILD_CC
 	econf \
-		--libdir=/${CONF_LIBDIR} \
+		--libdir=/$(get_libdir) \
 		--with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo" \
 		--disable-termcap \
 		--with-shared \
 		--with-rcs-ids \
 		--without-ada \
 		--enable-symlinks \
+		--program-prefix="" \
 		${myconf} \
 		|| die "configure failed"
 
@@ -90,26 +88,28 @@ src_compile() {
 src_install() {
 	local x=
 
-	make DESTDIR=${D} install || die "make install failed"
+	make DESTDIR="${D}" install || die "make install failed"
 
 	# Move static and extraneous ncurses libraries out of /lib
-	cd ${D}/${CONF_LIBDIR}
-	dodir /usr/${CONF_LIBDIR}
-	mv libform* libmenu* libpanel* *.a ${D}/usr/${CONF_LIBDIR}
+	cd ${D}/$(get_libdir)
+	dodir /usr/$(get_libdir)
+	mv libform* libmenu* libpanel* *.a ${D}/usr/$(get_libdir)
 
 	if use unicode ; then
-		gen_usr_ldscript libncursesw.so
-		for i in ${D}/usr/${CONF_LIBDIR}/*w.*; do
+		gen_usr_ldscript libncursesw.so || die "gen_usr_ldscript failed"
+		gen_usr_ldscript libcursesw.so || die "gen_usr_ldscript failed"
+		for i in ${D}/usr/$(get_libdir)/*w.* ; do
 			local libncurses=${i/${D}/}
 			dosym ${libncurses} ${libncurses/w./.}
 		done
-		for i in ${D}/${CONF_LIBDIR}/libncursesw.so*; do
+		for i in ${D}/$(get_libdir)/libncursesw.so* ; do
 			local libncurses=${i/${D}}
 			dosym ${libncurses} ${libncurses/w./.}
 		done
 	else
 		# bug #4411
 		gen_usr_ldscript libncurses.so || die "gen_usr_ldscript failed"
+		gen_usr_ldscript libcurses.so || die "gen_usr_ldscript failed"
 	fi
 
 	# We need the basic terminfo files in /etc, bug #37026
@@ -118,11 +118,10 @@ src_install() {
 	#for x in dumb linux rxvt screen sun vt{52,100,102,220} xterm
 	for x in ansi console dumb linux rxvt screen sun vt{52,100,102,200,220} xterm xterm-color xterm-xfree86
 	do
-		local termfile="$(find "${D}/usr/share/terminfo/" -name "${x}" 2>/dev/null)"
-		local basedir="$(basename $(dirname "${termfile}"))"
+		local termfile=$(find "${D}"/usr/share/terminfo/ -name "${x}" 2>/dev/null)
+		local basedir=$(basename $(dirname "${termfile}"))
 
-		if [ -n "${termfile}" ]
-		then
+		if [[ -n ${termfile} ]] ; then
 			dodir /etc/terminfo/${basedir}
 			mv ${termfile} ${D}/etc/terminfo/${basedir}/
 			dosym ../../../../etc/terminfo/${basedir}/${x} \
@@ -131,40 +130,39 @@ src_install() {
 	done
 
 	# Build fails to create this ...
-	dosym ../share/terminfo /usr/${CONF_LIBDIR}/terminfo
+	dosym ../share/terminfo /usr/$(get_libdir)/terminfo
 
 	dodir /etc/env.d
 	echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > ${D}/etc/env.d/50ncurses
 
-	if use build
-	then
+	if use build ; then
 		cd ${D}
 		rm -rf usr/share/man
 		cd usr/share/terminfo
-		cp -a l/linux n/nxterm v/vt100 ${T}
+		cp -pPR l/linux n/nxterm v/vt100 ${T}
 		rm -rf *
 		mkdir l x v
-		cp -a ${T}/linux l
-		cp -a ${T}/nxterm x/xterm
-		cp -a ${T}/vt100 v
+		cp -pPR ${T}/linux l
+		cp -pPR ${T}/nxterm x/xterm
+		cp -pPR ${T}/vt100 v
 		# bash compilation requires static libncurses libraries, so
 		# this breaks the "build a new build image" system.  We now
 		# need to remove libncurses.a from the build image manually.
 		# cd ${D}/usr/lib; rm *.a
 		# remove extraneous ncurses libraries
-		cd ${D}/usr/${CONF_LIBDIR}; rm -f lib{form,menu,panel}*
+		cd ${D}/usr/$(get_libdir); rm -f lib{form,menu,panel}*
 		cd ${D}/usr/include; rm -f {eti,form,menu,panel}.h
 	else
 		if use bootstrap ; then
-			cd ${D}/usr/${CONF_LIBDIR}; rm -f lib{form,menu,panel,ncurses++}*
+			cd ${D}/usr/$(get_libdir); rm -f lib{form,menu,panel,ncurses++}*
 			cd ${D}/usr/include; rm -f {eti,form,menu,panel}.h cursesapp.h curses?.h cursslk.h etip.h
 		fi
 		# Install xterm-debian terminfo entry to satisfy bug #18486
-		LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${D}/usr/${CONF_LIBDIR}:${D}/${CONF_LIBDIR} \
+		LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${D}/usr/$(get_libdir):${D}/$(get_libdir) \
 			TERMINFO=${D}/usr/share/terminfo \
 			${D}/usr/bin/tic ${FILESDIR}/xterm-debian.ti
 
-		if use uclibc ; then
+		if use elibc_uclibc ; then
 			cp ${D}/usr/share/terminfo/x/xterm-debian ${D}/etc/terminfo/x/
 			rm -rf ${D}/usr/share/terminfo/*
 		fi
@@ -176,19 +174,18 @@ src_install() {
 }
 
 pkg_preinst() {
-	if [ ! -f "${ROOT}/etc/env.d/50ncurses" ]
-	then
-		mkdir -p "${ROOT}/etc/env.d"
+	if [[ ! -f ${ROOT}/etc/env.d/50ncurses ]] ; then
+		mkdir -p "${ROOT}"/etc/env.d
 		echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > \
-			${ROOT}/etc/env.d/50ncurses
+			"${ROOT}"/etc/env.d/50ncurses
 	fi
 }
 
 pkg_postinst() {
 	# Old ncurses may still be around from old build tbz2's.
-	rm -f /lib/libncurses.so.5.[23] /usr/lib/lib{form,menu,panel}.so.5.[23]
-	if [ "${CONF_LIBDIR}" != "lib" ] ;then
-		rm -f /${CONF_LIBDIR}/libncurses.so.5.[23] \
-			/usr/${CONF_LIBDIR}/lib{form,menu,panel}.so.5.[23]
+	rm -f ${ROOT}/lib/libncurses.so.5.[23] ${ROOT}/usr/lib/lib{form,menu,panel}.so.5.[23]
+	if [ "$(get_libdir)" != "lib" ] ; then
+		rm -f ${ROOT}/$(get_libdir)/libncurses.so.5.[23] \
+			${ROOT}/usr/$(get_libdir)/lib{form,menu,panel}.so.5.[23]
 	fi
 }
diff --git a/sys-libs/ncurses/ncurses-5.4-r6.ebuild b/sys-libs/ncurses/ncurses-5.4-r6.ebuild
index f148058e4a2f..50967ec6dca1 100644
--- a/sys-libs/ncurses/ncurses-5.4-r6.ebuild
+++ b/sys-libs/ncurses/ncurses-5.4-r6.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/sys-libs/ncurses/ncurses-5.4-r6.ebuild,v 1.1 2005/03/23 05:01:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.4-r6.ebuild,v 1.1.1.1 2005/11/30 09:39:04 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="console display library"
 HOMEPAGE="http://www.gnu.org/software/ncurses/"
-SRC_URI="mirror://gnu/ncurses/${P}.tar.gz
-	ftp://invisible-island.net/ncurses/5.4/ncurses-5.4-20050319-patch.sh.bz2"
+SRC_URI="mirror://gnu/ncurses/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="5"
-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="gpm build bootstrap debug doc minimal unicode nocxx"
 
 DEPEND="gpm? ( sys-libs/gpm )"
@@ -31,6 +30,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-xterm.patch
 	epatch "${FILESDIR}"/${P}-share-sed.patch #42336
+	epatch "${FILESDIR}"/${P}-c++-templates.patch #90819
 }
 
 src_compile() {
@@ -130,12 +130,12 @@ src_install() {
 		cd "${D}"
 		rm -rf usr/share/man
 		cd usr/share/terminfo
-		cp -a l/linux n/nxterm v/vt100 "${T}"
+		cp -pPR l/linux n/nxterm v/vt100 "${T}"
 		rm -rf *
 		mkdir l x v
-		cp -a "${T}"/linux l
-		cp -a "${T}"/nxterm x/xterm
-		cp -a "${T}"/vt100 v
+		cp -pPR "${T}"/linux l
+		cp -pPR "${T}"/nxterm x/xterm
+		cp -pPR "${T}"/vt100 v
 	else
 		# Install xterm-debian terminfo entry to satisfy bug #18486
 		LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${D}/usr/$(get_libdir):${D}/$(get_libdir) \
diff --git a/sys-libs/ncurses/ncurses-5.4.20050319.ebuild b/sys-libs/ncurses/ncurses-5.4.20050319.ebuild
index 20c0d04fdaa3..fc68be02ac0d 100644
--- a/sys-libs/ncurses/ncurses-5.4.20050319.ebuild
+++ b/sys-libs/ncurses/ncurses-5.4.20050319.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.4.20050319.ebuild,v 1.1 2005/04/28 23:08:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.4.20050319.ebuild,v 1.1.1.1 2005/11/30 09:39:05 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -35,6 +35,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${WORKDIR}"/${MY_P}-${PV_SNAP}-patch.sh
 	epatch "${FILESDIR}"/${MY_P}-share-sed.patch #42336
+	epatch "${FILESDIR}"/${MY_P}-c++-templates.patch #90819
 }
 
 src_compile() {
@@ -64,11 +65,14 @@ src_compile() {
 do_compile() {
 	ECONF_SOURCE=${S}
 
+	local mylibprefix=""
+	[[ ${USERLAND} == "Darwin" ]] && mylibprefix="/usr"
+
 	# We need the basic terminfo files in /etc, bug #37026.  We will
 	# add '--with-terminfo-dirs' and then populate /etc/terminfo in
 	# src_install() ...
 	econf \
-		--libdir=/$(get_libdir) \
+		--libdir=${mylibprefix}/$(get_libdir) \
 		--with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo" \
 		--disable-termcap \
 		--with-shared \
@@ -101,12 +105,14 @@ src_install() {
 	cd "${WORKDIR}"/narrowc
 	make DESTDIR="${D}" install || die "make narrowc install failed"
 
-	# Move static and extraneous ncurses libraries out of /lib
-	dodir /usr/$(get_libdir)
-	cd "${D}"/$(get_libdir)
-	mv libform* libmenu* libpanel* *.a "${D}"/usr/$(get_libdir)/
-	gen_usr_ldscript lib{,n}curses.so
-	use unicode && gen_usr_ldscript lib{,n}cursesw.so
+	if [[ ${USERLAND} != "Darwin" ]] ; then
+		# Move static and extraneous ncurses libraries out of /lib
+		dodir /usr/$(get_libdir)
+		cd "${D}"/$(get_libdir)
+		mv lib{form,menu,panel}.so* *.a "${D}"/usr/$(get_libdir)/
+		gen_usr_ldscript lib{,n}curses.so
+		use unicode && gen_usr_ldscript lib{,n}cursesw.so
+	fi
 
 	# We need the basic terminfo files in /etc, bug #37026
 	einfo "Installing basic terminfo files in /etc..."
@@ -134,12 +140,12 @@ src_install() {
 		cd "${D}"
 		rm -rf usr/share/man
 		cd usr/share/terminfo
-		cp -a l/linux n/nxterm v/vt100 "${T}"
+		cp -pPR l/linux n/nxterm v/vt100 "${T}"
 		rm -rf *
 		mkdir l x v
-		cp -a "${T}"/linux l
-		cp -a "${T}"/nxterm x/xterm
-		cp -a "${T}"/vt100 v
+		cp -pPR "${T}"/linux l
+		cp -pPR "${T}"/nxterm x/xterm
+		cp -pPR "${T}"/vt100 v
 	else
 		# Install xterm-debian terminfo entry to satisfy bug #18486
 		LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${D}/usr/$(get_libdir):${D}/$(get_libdir) \
diff --git a/sys-libs/ncurses/ncurses-5.5-r1.ebuild b/sys-libs/ncurses/ncurses-5.5-r1.ebuild
index 714eade21579..fcb9f37b3926 100644
--- a/sys-libs/ncurses/ncurses-5.5-r1.ebuild
+++ b/sys-libs/ncurses/ncurses-5.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/sys-libs/ncurses/ncurses-5.5-r1.ebuild,v 1.1 2005/11/10 02:46:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.5-r1.ebuild,v 1.1.1.1 2005/11/30 09:39:05 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -24,6 +24,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	[[ -n ${PV_SNAP} ]] && epatch "${WORKDIR}"/${MY_P}-${PV_SNAP}-patch.sh
+
+	epatch "${FILESDIR}/${P}-gfbsd.patch"
 }
 
 src_compile() {
diff --git a/sys-libs/ncurses/ncurses-5.5.ebuild b/sys-libs/ncurses/ncurses-5.5.ebuild
index 90a16d7f1ae7..97c55b444cc8 100644
--- a/sys-libs/ncurses/ncurses-5.5.ebuild
+++ b/sys-libs/ncurses/ncurses-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/sys-libs/ncurses/ncurses-5.5.ebuild,v 1.1 2005/10/20 04:59:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.5.ebuild,v 1.1.1.1 2005/11/30 09:39:05 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
diff --git a/sys-libs/nss-db/ChangeLog b/sys-libs/nss-db/ChangeLog
index 91e048c43a71..701a6ffcf97e 100644
--- a/sys-libs/nss-db/ChangeLog
+++ b/sys-libs/nss-db/ChangeLog
@@ -1,9 +1,37 @@
 # ChangeLog for sys-libs/nss-db
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/nss-db/ChangeLog,v 1.1 2002/02/01 21:53:38 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/nss-db/ChangeLog,v 1.1.1.1 2005/11/30 09:39:17 chriswhite Exp $
+
+  04 Jul 2005; David Holm <dholm@gentoo.org> nss-db-2.2.3_pre1-r1.ebuild:
+  Added to ~ppc.
+
+*nss-db-2.2.3_pre1-r1 (03 Jul 2005)
+
+  03 Jul 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +files/nss-db-2.2.3_pre1-root-upgrade-only.patch,
+  +nss-db-2.2.3_pre1-r1.ebuild:
+  Add small patch to only use db->update when root privileges are present.
+
+*nss-db-2.2.3_pre1 (16 Feb 2005)
+
+  16 Feb 2005; Robin H. Johnson <robbat2@gentoo.org> +files/remake-all-db,
+  +nss-db-2.2.3_pre1.ebuild:
+  Finally, a new version of nss_db, from Redhat's upstream work, plus patches
+  from Mandrake.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> nss-db-2.2-r1.ebuild:
+  Add inherit eutils
+
+  27 Jun 2003; Paul de Vrieze <pauldv@gentoo.org> nss-db-2.2-r1.ebuild,
+  files/db3.patch:
+  This does not work with glibc-2.3.x, so block it in the dependencies. Also
+  patch the configure script to use the db3 lib
 
 *nss-db-2.2-r1 (1 Feb 2002)
 
+  20 Jul 2002; mark Guertin <gerk@gentoo.org> :
+  Added keywords (-ppc)
+
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/sys-libs/nss-db/Manifest b/sys-libs/nss-db/Manifest
index e69de29bb2d1..eef8931b5f89 100644
--- a/sys-libs/nss-db/Manifest
+++ b/sys-libs/nss-db/Manifest
@@ -0,0 +1,11 @@
+MD5 5842c62d80f8bdba0e6c242e6b864065 ChangeLog 1623
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 610312df9caa3ff32a3b73dc9430e21f nss-db-2.2-r1.ebuild 1021
+MD5 f16cb958d7aa84151d64918c033ae2c9 nss-db-2.2.3_pre1.ebuild 2658
+MD5 3cba3c7d8be1c8e30d78a19a88d91823 nss-db-2.2.3_pre1-r1.ebuild 2765
+MD5 03cdab663eb8542cea7c07707d596740 files/db3.patch 1174
+MD5 ca50c2850faf4fa26fcf5dd10838aab9 files/digest-nss-db-2.2-r1 62
+MD5 b5919430d82230e5d31c30d730da9149 files/digest-nss-db-2.2.3_pre1 299
+MD5 597edf0286c0a43308c48b9f7112e798 files/remake-all-db 233
+MD5 b5919430d82230e5d31c30d730da9149 files/digest-nss-db-2.2.3_pre1-r1 299
+MD5 bfa0ad4e21b3a2d1a8ee63b734c67bc0 files/nss-db-2.2.3_pre1-root-upgrade-only.patch 706
diff --git a/sys-libs/nss-db/files/digest-nss-db-2.2-r1 b/sys-libs/nss-db/files/digest-nss-db-2.2-r1
index 1b8f725c050d..7ef370947914 100644
--- a/sys-libs/nss-db/files/digest-nss-db-2.2-r1
+++ b/sys-libs/nss-db/files/digest-nss-db-2.2-r1
@@ -1 +1 @@
-MD5 c2565cbd4a941ba70e41391693c3252d nss_db-2.2.tar.gz
+MD5 c2565cbd4a941ba70e41391693c3252d nss_db-2.2.tar.gz 128636
diff --git a/sys-libs/nss-db/metadata.xml b/sys-libs/nss-db/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-libs/nss-db/metadata.xml
+++ b/sys-libs/nss-db/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/sys-libs/nss-db/nss-db-2.2-r1.ebuild b/sys-libs/nss-db/nss-db-2.2-r1.ebuild
index 8f3ee5774567..58c89a05811f 100644
--- a/sys-libs/nss-db/nss-db-2.2-r1.ebuild
+++ b/sys-libs/nss-db/nss-db-2.2-r1.ebuild
@@ -1,30 +1,39 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/nss-db/nss-db-2.2-r1.ebuild,v 1.1 2001/02/07 16:10:52 achim Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/nss-db/nss-db-2.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:39:17 chriswhite Exp $
+
+inherit libtool eutils
 
-A=nss_db-${PV}.tar.gz
-S=${WORKDIR}/nss_db-${PV}
 DESCRIPTION="Allows important system files to be stored in a fast database file rather than plain text"
-SRC_URI="ftp://ftp.gnu.org/gnu/glibc/${A}"
-HOMEPAGE="http://www.gnu.org"
-#now db needs to move to the base install, that's ok.
+HOMEPAGE="http://www.gnu.org/"
+SRC_URI="ftp://ftp.gnu.org/gnu/glibc/nss_db-${PV}.tar.gz"
 
-DEPEND=">=sys-libs/db-3.2.3-r1
-        sys-devel/gettext"
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="x86 -ppc"
 
 RDEPEND=">=sys-libs/db-3.2.3-r1"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	!>=sys-libs/glibc-2.3"
+IUSE=""
 
+S=${WORKDIR}/nss_db-${PV}
 
-src_compile() {
-
-    try ./configure --with-db=/usr/include/db3 --prefix=/usr --libdir=/usr/lib
-    try make ${MAKEOPTS}
-
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/db3.patch
+	autoconf
 }
 
-src_install () {
+src_compile() {
+	elibtoolize
+	./configure --with-db=/usr/include/db3 --prefix=/usr --libdir=/usr/lib || die
+	make ${MAKEOPTS} || die
+}
 
+src_install() {
 	make DESTDIR=${D} install
 
 	rm -rf ${D}/usr/lib
@@ -34,4 +43,3 @@ src_install () {
 	cd ${S}
 	dodoc AUTHORS COPYING* ChangeLog NEWS README THANKS
 }
-
diff --git a/sys-libs/nss-db/nss-db-2.2.3_pre1-r1.ebuild b/sys-libs/nss-db/nss-db-2.2.3_pre1-r1.ebuild
index e124856cc5d7..7559a814f99a 100644
--- a/sys-libs/nss-db/nss-db-2.2.3_pre1-r1.ebuild
+++ b/sys-libs/nss-db/nss-db-2.2.3_pre1-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/sys-libs/nss-db/nss-db-2.2.3_pre1-r1.ebuild,v 1.1 2005/07/03 15:01:32 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/nss-db/nss-db-2.2.3_pre1-r1.ebuild,v 1.1.1.1 2005/11/30 09:39:17 chriswhite Exp $
 
 inherit eutils versionator multilib
 
@@ -17,7 +17,7 @@ SRC_URI="ftp://sources.redhat.com/pub/glibc/releases/${MY_P}.tar.gz
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 IUSE="nls"
 
 # awk and make ARE needed at runtime!
diff --git a/sys-libs/nss-db/nss-db-2.2.3_pre1.ebuild b/sys-libs/nss-db/nss-db-2.2.3_pre1.ebuild
index fab12dd0b8a4..9b292e76ea3b 100644
--- a/sys-libs/nss-db/nss-db-2.2.3_pre1.ebuild
+++ b/sys-libs/nss-db/nss-db-2.2.3_pre1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/nss-db/nss-db-2.2.3_pre1.ebuild,v 1.1 2005/02/16 11:04:36 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/nss-db/nss-db-2.2.3_pre1.ebuild,v 1.1.1.1 2005/11/30 09:39:17 chriswhite Exp $
 
 inherit eutils versionator
 
diff --git a/sys-libs/openhpi/ChangeLog b/sys-libs/openhpi/ChangeLog
index 79d208ac51cd..1e40848f8b49 100644
--- a/sys-libs/openhpi/ChangeLog
+++ b/sys-libs/openhpi/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-libs/openhpi
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/openhpi/ChangeLog,v 1.1 2005/03/25 23:06:00 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/openhpi/ChangeLog,v 1.1.1.1 2005/11/30 09:39:40 chriswhite Exp $
+
+  05 May 2005; Sven Wegener <swegener@gentoo.org> openhpi-2.0.3.ebuild:
+  Removed trailing * from <, <=, >= and > dependencies.
 
 *openhpi-2.0.3 (25 Mar 2005)
 
diff --git a/sys-libs/openhpi/Manifest b/sys-libs/openhpi/Manifest
index aec55d10be03..9ba108a1577d 100644
--- a/sys-libs/openhpi/Manifest
+++ b/sys-libs/openhpi/Manifest
@@ -1,842 +1,14 @@
-MD5 c2160d02241b1d2f03c91586bbb44128 openhpi-2.0.3-1.tar.gz 1814536
-MD5 99161cd73956a506d61ab321a53a2f11 openhpi-2.0.3.ebuild 1718
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b74fe92bb07cb5f45c69f5490faf7d5b openhpi-2.0.3.ebuild 1937
+MD5 efc8dcc6e9c6b3c608bef92b2b600c1d ChangeLog 527
+MD5 21cd68602737d7c996bceabf6e62c468 metadata.xml 223
 MD5 9133e404874f16420d387266a9ee914a files/digest-openhpi-2.0.3 68
-MD5 59e9e4161e491e3c8955655b077c076f openhpi-2.0.3/openhpi.spec 3781
-MD5 e181e2c8720c60522c4c4c981108e367 openhpi-2.0.3/depcomp 15205
-MD5 ac3286cfa590601f5120601dd9f4c1e6 openhpi-2.0.3/aclocal.m4 249931
-MD5 8e44ff7378a29b57e1c0cead1a7d4c8c openhpi-2.0.3/openhpi.spec.in 3860
-MD5 73ee6c3275ebfed7a84d8b6f2e4b83a6 openhpi-2.0.3/README 3198
-MD5 81df5218daa0f36cc959a2f9134c7312 openhpi-2.0.3/rt-env.sh.in 931
-MD5 8f9d63ac39a7516e1fd780b46bcbbd14 openhpi-2.0.3/ltmain.sh 183326
-MD5 e225ec5229b2fcf0c9a300e651052259 openhpi-2.0.3/configure 789276
-MD5 89e5a88c1ca0f843d744517d9abe2e50 openhpi-2.0.3/configure.ac 17775
-MD5 700b7c48c28272f0948f093a247abad6 openhpi-2.0.3/config.guess 43632
-MD5 dbf44cd757322fdcb922457bcff2b892 openhpi-2.0.3/install-sh 9212
-MD5 88781acf828adfe5f80640d8ba2aae9d openhpi-2.0.3/config.sub 31175
-MD5 d1e9ac50f3bf49004061ea85f565cbce openhpi-2.0.3/missing 10678
-MD5 b691354d38d5fe55ae2920a783e09b4b openhpi-2.0.3/Makefile.am 3921
-MD5 f44e5da1e554c4da565671c2da353e4a openhpi-2.0.3/Makefile.in 24802
-MD5 205cad0f12481fd4f27a93b2621627fc openhpi-2.0.3/config.h.in 2995
-MD5 16d0f527b684c136b8531949065a1025 openhpi-2.0.3/openhpi.pc.in 265
-MD5 ec13b01c78b390ac461282e87be796a5 openhpi-2.0.3/acinclude.m4 5438
-MD5 285b7a9c9c345726b69e803cc72bc1fd openhpi-2.0.3/COPYING 1568
-MD5 0a3a902d3c80b88fedb243253f06889c openhpi-2.0.3/src/domain.c 6787
-MD5 60b385fe5fc317319fa033f3d8f03b4e openhpi-2.0.3/src/hotswap.c 8676
-MD5 8e655344ed5e3c95e5c72b6fd94070e3 openhpi-2.0.3/src/plugin_static.c.in 607
-MD5 c5f1dcd0fe7ae4b635a856a97c8159f4 openhpi-2.0.3/src/session.c 11585
-MD5 258c7839229ea7d767524c003bd5c347 openhpi-2.0.3/src/event.c 15687
-MD5 c6690b9e887a28a46d521c7cc730f603 openhpi-2.0.3/src/plugin_static.c 570
-MD5 d6dba3ba8127f86cd29c56d0f55c0c92 openhpi-2.0.3/src/config.c 31030
-MD5 d695191e78de28a034125c559416ae43 openhpi-2.0.3/src/Makefile.am 2755
-MD5 524c7d188ba36301ff9cd58135aeb90c openhpi-2.0.3/src/Makefile.in 22873
-MD5 44e836335debb4358e3812e2ac78f22a openhpi-2.0.3/src/init.c 6610
-MD5 24d9c06e568da257f033270807f33ec2 openhpi-2.0.3/src/lock.c 994
-MD5 2ed0e841d6b8e65dd2742d13a5fe0d79 openhpi-2.0.3/src/ohpi.c 7950
-MD5 69a8585065813668e8ab23cd8714c723 openhpi-2.0.3/src/alarm.c 19484
-MD5 a4424345b2937761e079d0bfed117bb3 openhpi-2.0.3/src/hpi.sym 2029
-MD5 66cfef4aa6260b27f3d502da23cb538b openhpi-2.0.3/src/safhpi.c 136272
-MD5 318779fbcb6637faddcee07335e8c7ac openhpi-2.0.3/src/plugin.c 16551
-MD5 b7207442567fffedf36fd27b247ef09b openhpi-2.0.3/docs/Makefile.am 1603
-MD5 87dc02e6d0754947a466225a6af49da2 openhpi-2.0.3/docs/Makefile.in 16570
-MD5 2254d3edac0a0fabee75a92204548bb2 openhpi-2.0.3/snmp/snmp_utils.c 15696
-MD5 e7eb2946f17cc4e53a017ec1586817f8 openhpi-2.0.3/snmp/snmp_utils.h 3105
-MD5 7ed974f5833b639c76bda8f3e99d120d openhpi-2.0.3/snmp/Makefile.am 729
-MD5 c1edf8d00e925af21615c328150da9b0 openhpi-2.0.3/snmp/Makefile.in 16217
-MD5 da87fdbccf98a7aec9744f660d52f954 openhpi-2.0.3/test/conformance_report.pl 1135
-MD5 97889980e5582b34348d7e99cc73971a openhpi-2.0.3/test/gcov2html.pl 2887
-MD5 2898905d20972cd3dcc83477f04520b9 openhpi-2.0.3/test/gsum2html.pl 3034
-MD5 fa136ae3e99340a455f887f64022ae9a openhpi-2.0.3/test/Makefile.am 2995
-MD5 7b292fa73a044042d95c4ff6d1dbec5e openhpi-2.0.3/test/Makefile.in 12732
-MD5 be09b3dc71b9d59f1ecbc1defd173261 openhpi-2.0.3/test/testcoverage.pl 3803
-MD5 2afdacb86f8ea9b8db7c5975d0314000 openhpi-2.0.3/test/generate_index.pl 2394
-MD5 3ec78bbb2ee8bdf5a9c1d0be2d073a76 openhpi-2.0.3/test/testconformance.pl 2466
-MD5 80f9d4b30c0b8e066cb83394ae304f23 openhpi-2.0.3/test/coverage_report.pl 1197
-MD5 c65a1a8b979c52efe7e9e1937d4412c6 openhpi-2.0.3/utils/rpt_utils.c 32777
-MD5 a9abc6b27d93751289b8b82d338281e0 openhpi-2.0.3/utils/rpt_utils.h 3226
-MD5 9f168d23b0263f08b13afe42fefef983 openhpi-2.0.3/utils/event_utils.h 1298
-MD5 7df6b8defe6c9eb801a9c3e6b09201e7 openhpi-2.0.3/utils/epath_utils.c 19234
-MD5 eead3ac487243ecb7089ce8da3b99e77 openhpi-2.0.3/utils/epath_utils.h 2102
-MD5 b284346b64be649c7ea2ea7d4b089c67 openhpi-2.0.3/utils/uid_utils.c 14244
-MD5 ea9d59b4aa31607eeb614f949defe723 openhpi-2.0.3/utils/uid_utils.h 1882
-MD5 1bf7a2f1601acca365367c10cd881f55 openhpi-2.0.3/utils/sahpi_time_utils.c 3069
-MD5 13d18d6db723c8d4442e59109b254998 openhpi-2.0.3/utils/sahpi_time_utils.h 837
-MD5 384fc12d7bcfa5c979abe5c1443f0ba5 openhpi-2.0.3/utils/openhpiutils.pc.in 294
-MD5 e4be617a48b46041f96f64916eb312a2 openhpi-2.0.3/utils/sahpi_enum_utils.c 115153
-MD5 817340395266a091ffbb7f18adce95ac openhpi-2.0.3/utils/sahpi_enum_utils.h 12523
-MD5 70c51191ad1a45c8414957648e02bb66 openhpi-2.0.3/utils/el_utils.c 12421
-MD5 7e966f2f7ad1a0ec52c7849515f68bba openhpi-2.0.3/utils/el_utils.h 2629
-MD5 f02a22b9bba0109a07e6b6b08b38a69b openhpi-2.0.3/utils/Makefile.am 2910
-MD5 656bd681a39a4566500191a7517970d0 openhpi-2.0.3/utils/Makefile.in 24013
-MD5 57bce6b2285a619525ba77cca15fc888 openhpi-2.0.3/utils/sahpi_event_utils.c 15545
-MD5 fab61ba6867e91aaafcdb5b2ddd7a6d7 openhpi-2.0.3/utils/sahpi_event_utils.h 1144
-MD5 c65e29983f3896c48110522e742d2346 openhpi-2.0.3/utils/oh_utils.h 893
-MD5 4e1bcc0b6ba2fc2c12053c5752b1ef9c openhpi-2.0.3/utils/sahpi_event_encode.c 5631
-MD5 c08f597ca19f93f45ca1d68b48caa10e openhpi-2.0.3/utils/sahpi_event_encode.h 1471
-MD5 ccf0bd8ce2a8a3ba6f697fb563b6d2d7 openhpi-2.0.3/utils/sahpi_struct_utils.c 107559
-MD5 b1d7341f8f1b1fc10ac2b4bffdd05c07 openhpi-2.0.3/utils/sahpi_struct_utils.h 6053
-MD5 ba6a6b5823bd402075120efa66b746b5 openhpi-2.0.3/scripts/text2cstr.pl 2069
-MD5 37740ee48cbd0999e3d6afc7195ca7cc openhpi-2.0.3/scripts/SaHpi2code.pl 31069
-MD5 3722f4ac003b6deb823e466f2746bf5e openhpi-2.0.3/scripts/Makefile.am 1587
-MD5 3076334d7d1d1a9f19364e99be0453f4 openhpi-2.0.3/scripts/Makefile.in 11182
-MD5 1622a7b6a84a273280ec0a4a268f53dd openhpi-2.0.3/marshal/marshal_hpi_types.c 32255
-MD5 e1f3817e3e3b03fb997df30b9aba1048 openhpi-2.0.3/marshal/marshal_hpi_types.h 7757
-MD5 0edcff0bdb6640f0fad7af67cc9e8b70 openhpi-2.0.3/marshal/strmsock.h 3337
-MD5 6302a040608ed4f986008213b1f77430 openhpi-2.0.3/marshal/strmsock.cpp 7999
-MD5 333a3f464abd8939e434585a7a7d8f6a openhpi-2.0.3/marshal/marshal.c 19444
-MD5 c9449f9d6ed0cfc6b2a9970580c77e1e openhpi-2.0.3/marshal/marshal.h 6475
-MD5 3cb86fb414dafc6d4cb7fdee248bb780 openhpi-2.0.3/marshal/Makefile.am 1397
-MD5 97b641247ad15e41d1cd5adbcb218946 openhpi-2.0.3/marshal/Makefile.in 23652
-MD5 7e919f1059abdb47ffff061bf4534bb2 openhpi-2.0.3/marshal/marshal_hpi.c 37627
-MD5 24b888f9bfea8bf6df76e98876f4a54d openhpi-2.0.3/marshal/marshal_hpi.h 6771
-MD5 d74e5c0a595ecc2ef814e4d0cff22bd3 openhpi-2.0.3/marshal/connection.c 16032
-MD5 152c2601ae36eb1d6b45159b89090dfa openhpi-2.0.3/marshal/connection.h 5153
-MD5 20f11b054ad87468e628d0e1719e742a openhpi-2.0.3/hpi_ui_lib/service.c 26541
-MD5 8848c9e1a6ae2ea71d1a9f310fe81428 openhpi-2.0.3/hpi_ui_lib/hpi_ui.sym 380
-MD5 481668c3d9ff8710d2cbb3367c7a2161 openhpi-2.0.3/hpi_ui_lib/Makefile.am 2305
-MD5 4ef9a68bd05857ab79d99ed0de10e379 openhpi-2.0.3/hpi_ui_lib/Makefile.in 17809
-MD5 2da178201655cc1ff89135c8c209cbf7 openhpi-2.0.3/hpi_ui_lib/show.c 22828
-MD5 c8d5567919472ccb4536c1f02e6265b9 openhpi-2.0.3/openhpid2/openhpiclient.h 1170
-MD5 3a5afb999d5f9b83f8b24af0d7029a40 openhpi-2.0.3/openhpid2/openhpid.cpp 77164
-MD5 ae59498e28220c1efe52ae8db1608a29 openhpi-2.0.3/openhpid2/README 4647
-MD5 ac2c62759d1c89e24b79832888b39686 openhpi-2.0.3/openhpid2/Makefile.am 1476
-MD5 f7f50c6332820ecbaa364f0aca57d177 openhpi-2.0.3/openhpid2/Makefile.in 23048
-MD5 764aed3c66882e1694063fd24964240d openhpi-2.0.3/openhpid2/openhpiclient.cpp 150574
-MD5 1d2994bcbca981b165e87c1f9dc256e6 openhpi-2.0.3/examples/list_resources.c 23634
-MD5 beaf9a13b12f65baac3d98ce924c413a openhpi-2.0.3/examples/openhpi.conf.example 5835
-MD5 1f90bb13e86faaa83c0dde4b971ddfbe openhpi-2.0.3/examples/Makefile.am 1242
-MD5 12c48702bacc38a9f5face0145f5dd86 openhpi-2.0.3/examples/Makefile.in 17457
-MD5 41e1733227308497b4390b4d35872d27 openhpi-2.0.3/examples/list_resources_threaded.c 29874
-MD5 0902dab7a009871cd3a4102d05eaec6b openhpi-2.0.3/include/oh_hotswap.h 1368
-MD5 9685b7ab4352ca4f092a411de660d2b5 openhpi-2.0.3/include/oh_config.h 2391
-MD5 205b736f7e14e94ab4d4b2130599d1c7 openhpi-2.0.3/include/oh_error.h 2539
-MD5 04a261f260f5499b5d4fb01a789735e5 openhpi-2.0.3/include/sahpimacros.h 3402
-MD5 369d2ac35e75065b3895d62f9a548d49 openhpi-2.0.3/include/oh_event.h 2341
-MD5 74cd60d7b7497615550960a0d65c0748 openhpi-2.0.3/include/SaHpi.h 323006
-MD5 3208f117c67a5e50783a08ee26a31ca8 openhpi-2.0.3/include/oh_session.h 2272
-MD5 b30a3596ae92d854ff8844a043b87761 openhpi-2.0.3/include/openhpi.h 1490
-MD5 d43768fdef20c3b2453355db436f30d2 openhpi-2.0.3/include/hpi_ui.h 4748
-MD5 61f96dac7ea49d897cb41a4f273a0d7c openhpi-2.0.3/include/oHpi.h 3495
-MD5 367b8a31e1566d03d0c45e61f1ebd89d openhpi-2.0.3/include/oh_alarm.h 2625
-MD5 5ce5cbe7aa2d0a9b3be156ec8ba10ee3 openhpi-2.0.3/include/oh_init.h 1007
-MD5 15d20880f28df65a5015172c7ddd4043 openhpi-2.0.3/include/oh_lock.h 3304
-MD5 fe412e0882dece6c5b4d39755bd6dfe4 openhpi-2.0.3/include/oh_plugin.h 1883
-MD5 04ce7558c5f2ffd3f17480cbfe7e037e openhpi-2.0.3/include/oh_handler.h 18300
-MD5 07d68621c7d1626d2e7a4dcd9e7c4c57 openhpi-2.0.3/include/oh_domain.h 2377
-MD5 e76f4f382e40cddfa5e94e1ee551f667 openhpi-2.0.3/plugins/Makefile.am 1762
-MD5 2aa580a72c3b86f9c1518db2c5aa3760 openhpi-2.0.3/plugins/Makefile.in 16716
-MD5 c8d5567919472ccb4536c1f02e6265b9 openhpi-2.0.3/hpi_shell/openhpiclient.h 1170
-MD5 0e7f51673b204906f2aa70ed6bac8a18 openhpi-2.0.3/hpi_shell/session.c 5866
-MD5 bfec350439f3f025abd79b7dd1318072 openhpi-2.0.3/hpi_shell/Makefile.am 1156
-MD5 bd913966bc89c5389c6c4ff7644b87ab openhpi-2.0.3/hpi_shell/Makefile.in 20401
-MD5 492053cde6d51090f66cf107d3a2aa36 openhpi-2.0.3/hpi_shell/cmdparser.c 4260
-MD5 764aed3c66882e1694063fd24964240d openhpi-2.0.3/hpi_shell/openhpiclient.cpp 150574
-MD5 e5aa89c1f89040a114c2bc30ed1f27a5 openhpi-2.0.3/hpi_shell/commands.c 53937
-MD5 9c069702afaec084a5de614bc27be113 openhpi-2.0.3/hpi_shell/hpi_cmd.c 1244
-MD5 9d2e42a872184dc0dc4b559858f8ee7b openhpi-2.0.3/hpi_shell/hpi_cmd.h 1335
-MD5 3756550142f5a38366a1234bb56926e5 openhpi-2.0.3/clients/hpireset.c 5606
-MD5 2e486f91b3df656a446c5d5ae4a26883 openhpi-2.0.3/clients/hpisettime.c 7389
-MD5 631481fcd2b6b900a9621834288a9d06 openhpi-2.0.3/clients/hpisensor.c 14357
-MD5 46e2764ae8313a429367c651e7789882 openhpi-2.0.3/clients/hpitree.c 17274
-MD5 19b2d1a787325e3c73fe9a638747030f openhpi-2.0.3/clients/hpialarmpanel.c 13193
-MD5 9274c28f05239dc37daebb5fb51fa5ee openhpi-2.0.3/clients/hpievent.c 1893
-MD5 ed7fe1fa159a9e4c9b11d589968754ad openhpi-2.0.3/clients/hpithres.c 15710
-MD5 7303dde789b488d30df4f31f766bd4e3 openhpi-2.0.3/clients/Makefile.am 2235
-MD5 9258f194376caf1f12323d51f5df2914 openhpi-2.0.3/clients/Makefile.in 24422
-MD5 e2143a68e7f5d252b1d5fbf24e443011 openhpi-2.0.3/clients/hpifan.c 8752
-MD5 b0aea6621f848e7a3b5a4362799cdcee openhpi-2.0.3/clients/hpiinv.c 7251
-MD5 385a9b3a7980d9a666dcbc5e6e7900d9 openhpi-2.0.3/clients/hpigetevents.c 5828
-MD5 591033c53d07836ea6fc1ab5e07348fc openhpi-2.0.3/clients/hpiwdt.c 8590
-MD5 c13c39b66ef8df55e6012e95cafdd167 openhpi-2.0.3/clients/hpireset2.c 4144
-MD5 5cda6b327f936c071bb50336a593b348 openhpi-2.0.3/clients/hpiel.c 7540
-MD5 6e92a01579da52a65cc942010ba41714 openhpi-2.0.3/clients/hpipower.c 14962
-MD5 761d6c3ed31ce9fb9b852bec700212ad openhpi-2.0.3/clients/hpipower2.c 4891
-MD5 da1b340ae2ddf966ec37467db473abf1 openhpi-2.0.3/src/t/Makefile.am 533
-MD5 deeebb7f58dadaddd9a535d1cf1bd4be openhpi-2.0.3/src/t/Makefile.in 15454
-MD5 8ceb4a5e4bf5c608bf4e094467f701c8 openhpi-2.0.3/docs/hld/openhpi_highlevel.sgml 9376
-MD5 924b823ba263a4bd7019c23a3e7ca783 openhpi-2.0.3/docs/hld/bookinfo.sgml 1030
-MD5 33aef2591760ae9f2cedec5dc9135747 openhpi-2.0.3/docs/hld/uid_utils.sgml 5048
-MD5 95394a23ea301fa1117bd37af487daf0 openhpi-2.0.3/docs/hld/epath_utils.sgml 6765
-MD5 efb005f9be7e70e0722948c7565042bb openhpi-2.0.3/docs/hld/snmp_util.sgml 3616
-MD5 69c7117b6856d38d968b5705c751a68f openhpi-2.0.3/docs/hld/legal.dtd 1698
-MD5 25bd61b9c32b7bd33ac34d4205d3845f openhpi-2.0.3/docs/hld/obtaining.sgml 2548
-MD5 c5dd0788efb01ee7e2e44460681765e5 openhpi-2.0.3/docs/hld/openhpi_structure.sgml 3858
-MD5 8bf6b0cde761c4611a1f9823417f20e6 openhpi-2.0.3/docs/hld/authors.dtd 1770
-MD5 7457e69cb38918f08f43de23aefaab4e openhpi-2.0.3/docs/hld/introduction.sgml 2705
-MD5 de67dd6062095f3fd195f75a983eb0d8 openhpi-2.0.3/docs/hld/Makefile.am 3256
-MD5 00b74c37cbee48e2adae48780263dd82 openhpi-2.0.3/docs/hld/Makefile.in 12990
-MD5 cf52b1ebe809c93db1a7073e2f2e2fd3 openhpi-2.0.3/docs/hld/revisions.dtd 1210
-MD5 2c708c879e2a805b4b2e367b3510ca1c openhpi-2.0.3/docs/hld/openhpi-manual.sgml 2122
-MD5 6db5e7094f05c29913e327fcbd1af6f8 openhpi-2.0.3/docs/hld/rpt_utils.sgml 24672
-MD5 743e5ddaf60a8f965591204332e922a0 openhpi-2.0.3/docs/hld/plugin_guide.sgml 13278
-MD5 05ab23e3dd5095c0f6745209c99b592f openhpi-2.0.3/docs/hld/sahpi_breakdown.sgml 19292
-MD5 c4b53ab3294529d84da0f38e9815ed94 openhpi-2.0.3/docs/hld/appendix.sgml 4236
-MD5 565418e63d747d5701dedf0f8c661363 openhpi-2.0.3/docs/hld/plugin_usage.sgml 20915
-MD5 adf5599dbec9ee1a1212ea956b120a4d openhpi-2.0.3/utils/t/Makefile.am 1696
-MD5 6bf95672789034dcd8187936f482f3ec openhpi-2.0.3/utils/t/Makefile.in 16623
-MD5 d978a4576c56a6b6624e899346bbfdde openhpi-2.0.3/marshal/t/Makefile.am 4008
-MD5 8944789c67c203788971375318b92263 openhpi-2.0.3/marshal/t/Makefile.in 13790
-MD5 c8d5567919472ccb4536c1f02e6265b9 openhpi-2.0.3/openhpid2/t/openhpiclient.h 1170
-MD5 711e9f29b3c89b15ddc350728e60a2cb openhpi-2.0.3/openhpid2/t/Makefile.am 1515
-MD5 2522cc024408fd85213fdc206170cb0f openhpi-2.0.3/openhpid2/t/Makefile.in 16333
-MD5 764aed3c66882e1694063fd24964240d openhpi-2.0.3/openhpid2/t/openhpiclient.cpp 150574
-MD5 1ce8548c776acda4b79382807c8b0f99 openhpi-2.0.3/plugins/ipmi/ipmi_controls.c 16782
-MD5 192bd1721fb095d18cdbd1d0b146c70e openhpi-2.0.3/plugins/ipmi/hotswap.c 10597
-MD5 aa67fa2d653a8ee6252f94a684948ddd openhpi-2.0.3/plugins/ipmi/posix_vlog.c 1384
-MD5 b747aa812293f91604f60fe5386ed7c0 openhpi-2.0.3/plugins/ipmi/ipmi.sym 44
-MD5 7b2df62b9ac288332d8dfacdd3b9ac95 openhpi-2.0.3/plugins/ipmi/ipmi_close.c 1390
-MD5 f33a1720ad1be760fff82b43ac1ea99d openhpi-2.0.3/plugins/ipmi/ipmi_drv.c 6076
-MD5 fbdd131177993f828749ecfee09043c8 openhpi-2.0.3/plugins/ipmi/ipmi_sel.c 10226
-MD5 b0146e5e0f374b2c78df11d998a74852 openhpi-2.0.3/plugins/ipmi/ipmi_sensor_event.c 24356
-MD5 4733e070fd706bb625995ba87cf016a1 openhpi-2.0.3/plugins/ipmi/ipmi_util.c 4141
-MD5 51cd8559f921e806f3293aa13bae86d7 openhpi-2.0.3/plugins/ipmi/ipmi_mc_event.c 6702
-MD5 356b68ebca9895fac71b528737e2f99c openhpi-2.0.3/plugins/ipmi/Makefile.am 2360
-MD5 6a9fc03bd8105529aea0a6b7df1b0665 openhpi-2.0.3/plugins/ipmi/Makefile.in 23230
-MD5 380c542feae4da7314d6ae7c7533493f openhpi-2.0.3/plugins/ipmi/ipmi.c 47083
-MD5 be5c0a16a61f949df0004537c035bbe3 openhpi-2.0.3/plugins/ipmi/ipmi.h 13158
-MD5 0a20cf192a2522603852bdfaf506b7b2 openhpi-2.0.3/plugins/ipmi/ipmi_entity.c 547
-MD5 9c3e35387f670c64b9729546b33c6264 openhpi-2.0.3/plugins/ipmi/ipmi_entity_event.c 11215
-MD5 c727aaf80269b72f0a616a34585bba80 openhpi-2.0.3/plugins/ipmi/ipmi_inventory.c 11813
-MD5 d345e4ed515cfe6295a3c8150fd8022b openhpi-2.0.3/plugins/ipmi/ipmi_inventory_event.c 3145
-MD5 9fa21d8e266d307ea1eff19082cec5e8 openhpi-2.0.3/plugins/ipmi/ipmi_sensor.c 20936
-MD5 512c167d7ffc2ad3d02b18cd0307dff0 openhpi-2.0.3/plugins/ipmi/sync.c 1315
-MD5 0dc8a685c498b87e4b33ef7d81ac48af openhpi-2.0.3/plugins/ipmi/ipmi_event.c 2611
-MD5 4ce18843550cc09d67305f24666c8e75 openhpi-2.0.3/plugins/ipmi/ipmi_control_event.c 8637
-MD5 1d747acc9d1bd70d845bb04fe7d54f96 openhpi-2.0.3/plugins/ipmi/ipmi_connection.c 1335
-MD5 dd2e6b38cfa625605be948a13073e53f openhpi-2.0.3/plugins/dummy/dummy.c 80332
-MD5 96c26a682611a6d630033edd71776460 openhpi-2.0.3/plugins/dummy/Makefile.am 1972
-MD5 4a4248d2aef79a62293a55efccab1a2a openhpi-2.0.3/plugins/dummy/Makefile.in 17475
-MD5 8a54b0a7427c0b56d0453e9e1895a8b3 openhpi-2.0.3/plugins/sysfs/README 851
-MD5 2d66f40c2966b0564bc2373345d5fcbb openhpi-2.0.3/plugins/sysfs/Makefile.am 1841
-MD5 b01adc1dd4e7bb6a24ab58986425a30e openhpi-2.0.3/plugins/sysfs/Makefile.in 17410
-MD5 6287cf811f1c337956fdb0d0e85c48cd openhpi-2.0.3/plugins/sysfs/sysfs2hpi.c 30744
-MD5 1c8ebbbe8d737c7a4cf45a5ce6f68995 openhpi-2.0.3/plugins/remote_client/Makefile.am 2386
-MD5 6c8607be258d21887b28029b764d9200 openhpi-2.0.3/plugins/remote_client/Makefile.in 18693
-MD5 00ca77132533577ec3440fb821251275 openhpi-2.0.3/plugins/remote_client/client_config.h 752
-MD5 30f906751ef49c49ff86eabb3327c7d8 openhpi-2.0.3/plugins/remote_client/openhpiclient.cpp 49759
-MD5 64d60783679eff595a1bd8376545d4d9 openhpi-2.0.3/plugins/remote_client/remote_client.cpp 30437
-MD5 1f504c0efb6c6f9a42ba479e7ddf5ceb openhpi-2.0.3/plugins/ipmidirect/ipmi_domain.h 5521
-MD5 c4df574e4fd35d53d228e5f4c2d8351a openhpi-2.0.3/plugins/ipmidirect/ipmi_sensor_threshold.h 11906
-MD5 86e7cef8708737faab8ff3015367c1af openhpi-2.0.3/plugins/ipmidirect/ipmi_entity.cpp 5201
-MD5 128e0689ca5309bc1a5529fe9785204e openhpi-2.0.3/plugins/ipmidirect/ipmi_addr.h 2704
-MD5 a2e485d91a1491f198bfafcde4c98dd6 openhpi-2.0.3/plugins/ipmidirect/ipmi_auth.h 3854
-MD5 c1bb771a95c902e254748dca02012199 openhpi-2.0.3/plugins/ipmidirect/ipmi_sensor_factors.cpp 8571
-MD5 9a54f8dd775331438395712932630567 openhpi-2.0.3/plugins/ipmidirect/ipmi_sensor_hotswap.cpp 5750
-MD5 757f47275efdcb3b3307a0c7ccc15894 openhpi-2.0.3/plugins/ipmidirect/ipmi_auth.cpp 3871
-MD5 30b3d12e051482371c134930d83f2d3f openhpi-2.0.3/plugins/ipmidirect/ipmi.cpp 39492
-MD5 264c4f5638ec1a066a58973123325b54 openhpi-2.0.3/plugins/ipmidirect/ipmi_mc.h 6005
-MD5 0e7611281f024bcd58af88595567f861 openhpi-2.0.3/plugins/ipmidirect/ipmi_sensor.cpp 20593
-MD5 cb0406a94e984ae1f589fdbe84053722 openhpi-2.0.3/plugins/ipmidirect/ipmi_mc.cpp 20532
-MD5 a624951eef595ba3b2fe3f4f3b2e8851 openhpi-2.0.3/plugins/ipmidirect/ipmi_sensor_threshold.cpp 38719
-MD5 806414db6468ae8f25d36dd4c224fb08 openhpi-2.0.3/plugins/ipmidirect/ipmi_resource.cpp 8900
-MD5 a301d2be8e33c8bade3a67168a90cbe4 openhpi-2.0.3/plugins/ipmidirect/ipmi_cmd.cpp 20146
-MD5 fd9ef0bf3102a05dd38317e3ffe1b61c openhpi-2.0.3/plugins/ipmidirect/ipmi_cmd.h 10697
-MD5 28c431d3e7442826cc0e2f327e1bc6d1 openhpi-2.0.3/plugins/ipmidirect/ipmi_con.h 5000
-MD5 7ee4462b58f4896e8b0ca750bf0f0a92 openhpi-2.0.3/plugins/ipmidirect/ipmi_log.h 2222
-MD5 e70017fca13cb4ddceaba847a6d976e7 openhpi-2.0.3/plugins/ipmidirect/ipmi_msg.h 1192
-MD5 bcc162ff62ee0581d39f8430e7b5c9b8 openhpi-2.0.3/plugins/ipmidirect/ipmi_rdr.h 2094
-MD5 2b4530a6ce9f26ed928dd98ce65fe573 openhpi-2.0.3/plugins/ipmidirect/ipmi_sdr.h 4534
-MD5 584bff5abfab209c0c1695b4523b9ed2 openhpi-2.0.3/plugins/ipmidirect/ipmi_sel.h 3942
-MD5 36e216e9633422e5829af3f846ed0ddc openhpi-2.0.3/plugins/ipmidirect/ipmi_discover.cpp 17760
-MD5 f9b9203a0abd18d99b50e0da2d352b81 openhpi-2.0.3/plugins/ipmidirect/ipmi_con.cpp 12739
-MD5 7e5e9969c01f376a7f57e264bc74fa59 openhpi-2.0.3/plugins/ipmidirect/ipmi_rdr.cpp 2481
-MD5 ae8207988b28dfecb13ec2c8b2699c9c openhpi-2.0.3/plugins/ipmidirect/ipmi_control.cpp 2090
-MD5 1d37a32a6b9b48e672c497d6419c2471 openhpi-2.0.3/plugins/ipmidirect/ipmi_sensor_discrete.cpp 7152
-MD5 da7944621e9bbae53edf68c9c273fb8a openhpi-2.0.3/plugins/ipmidirect/ipmi_mc_vendor.h 5901
-MD5 d72c629cf6108858f0e0f16c05d55b9b openhpi-2.0.3/plugins/ipmidirect/ipmi_fru_info.cpp 4605
-MD5 622593ab89b68704f5f4fc33bfe5777a openhpi-2.0.3/plugins/ipmidirect/ipmi_sensor_discrete.h 1664
-MD5 1c7d3300a73421570726c30812ea1ce3 openhpi-2.0.3/plugins/ipmidirect/ipmi_discover.h 2315
-MD5 6072baa000ef48a501799457056388aa openhpi-2.0.3/plugins/ipmidirect/ipmi_inventory_parser.cpp 21581
-MD5 16027403a0a134ae1e6e6df493100f27 openhpi-2.0.3/plugins/ipmidirect/ipmi_utils.cpp 2533
-MD5 9755cb06d455071230be841bd62cbc73 openhpi-2.0.3/plugins/ipmidirect/ipmi_sdr.cpp 40361
-MD5 abb14d7538b5a1aac5e5d30005f46c5c openhpi-2.0.3/plugins/ipmidirect/ipmi_sel.cpp 21226
-MD5 207ff8d503d681f4db9cff3d8b54d546 openhpi-2.0.3/plugins/ipmidirect/ipmi_mc_vendor_force.cpp 6036
-MD5 c51e8b7b7c7a2981d028eaf49e3508f0 openhpi-2.0.3/plugins/ipmidirect/Makefile.am 3363
-MD5 480f8ac583affe2cb7291a2ee2b973cc openhpi-2.0.3/plugins/ipmidirect/Makefile.in 26281
-MD5 79210f84e1063abc2727d948c9690557 openhpi-2.0.3/plugins/ipmidirect/ipmi_addr.cpp 1420
-MD5 ce6bc72cb2905c1fd3d751ada99c859d openhpi-2.0.3/plugins/ipmidirect/ipmi_sensor_hotswap.h 1709
-MD5 250a4214dee43378dcc6ee7aeaef3fb0 openhpi-2.0.3/plugins/ipmidirect/ipmi.h 3007
-MD5 6d7d8191d9b40705b9b09596e9b87ef4 openhpi-2.0.3/plugins/ipmidirect/ipmi_resource.h 3409
-MD5 f8d98c78a2fd83dcd213e133cf5bc98b openhpi-2.0.3/plugins/ipmidirect/ipmi_con_lan.cpp 28599
-MD5 7ac84fd755e7da5264a0bede8a3764ab openhpi-2.0.3/plugins/ipmidirect/ipmi_mc_vendor_fix_sdr.cpp 5348
-MD5 22657dffcb4845832f115a68eccc9b1b openhpi-2.0.3/plugins/ipmidirect/ipmi_mc_vendor_force.h 914
-MD5 b39702c40d24a8b4d2cc8fb771e3c2e6 openhpi-2.0.3/plugins/ipmidirect/ipmi_entity.h 4409
-MD5 fd1e78aacd2513d9034c4d2f848aa697 openhpi-2.0.3/plugins/ipmidirect/ipmi_sensor_factors.h 3507
-MD5 54a50b26bc7c1adf3fe77a0a12dbb1ed openhpi-2.0.3/plugins/ipmidirect/ipmi_mc_vendor.cpp 24443
-MD5 b4d169771b98e5ec1065a5f750adce48 openhpi-2.0.3/plugins/ipmidirect/ipmi_log.cpp 6152
-MD5 def1c0b5fcc1ba35a2aa919864144514 openhpi-2.0.3/plugins/ipmidirect/ipmi_inventory.h 1646
-MD5 d50be181d0a9062a8f01ef81ea77b985 openhpi-2.0.3/plugins/ipmidirect/ipmi_con_lan.h 3470
-MD5 c4bac145934e06ce18e50903feca16ad openhpi-2.0.3/plugins/ipmidirect/ipmi_inventory.cpp 4693
-MD5 a5f99514d7bae9c58ec34f611dcd41af openhpi-2.0.3/plugins/ipmidirect/ipmi_con_smi.h 1201
-MD5 476c2989c0f6f9351e3dd793fa859cfd openhpi-2.0.3/plugins/ipmidirect/ipmi_sensor.h 10265
-MD5 519398c0f6f25ba5bac1c267ac2c4aec openhpi-2.0.3/plugins/ipmidirect/hotswap.cpp 12257
-MD5 04d05b125be9ce6fbe34cc0dfc68f133 openhpi-2.0.3/plugins/ipmidirect/ipmi_fru_info.h 2797
-MD5 d134b8dfca9726b561ad532996876457 openhpi-2.0.3/plugins/ipmidirect/ipmi_event.h 2076
-MD5 2e3ac7853f70f877c32e433a9e785ad7 openhpi-2.0.3/plugins/ipmidirect/ipmi_inventory_parser.h 6001
-MD5 2a98bd28af92fcad53a2992b0259d384 openhpi-2.0.3/plugins/ipmidirect/ipmi_con_smi.cpp 10915
-MD5 707073f87f82bb95a45490586ce27902 openhpi-2.0.3/plugins/ipmidirect/thread.h 2604
-MD5 60f4fdabb6994574f72d644d7a110db9 openhpi-2.0.3/plugins/ipmidirect/ipmi_mc_vendor_fix_sdr.h 1332
-MD5 1d7f8efb549dcce210f7d5ac6613d0d9 openhpi-2.0.3/plugins/ipmidirect/ipmi_text_buffer.h 2531
-MD5 c1457a0a6f455a58c1e709eee4c9262c openhpi-2.0.3/plugins/ipmidirect/ipmi_control_fan.cpp 5645
-MD5 fb314e8154df1489ba5a84b27a7f7cc5 openhpi-2.0.3/plugins/ipmidirect/ipmi_text_buffer.cpp 12636
-MD5 a5f45385c178aa0e658dba693a624b06 openhpi-2.0.3/plugins/ipmidirect/ipmi_domain.cpp 21656
-MD5 fca57b664b56d7183809c659a10778d4 openhpi-2.0.3/plugins/ipmidirect/array.h 4086
-MD5 1a4847fc3b755c63cc1abe4e676e4e16 openhpi-2.0.3/plugins/ipmidirect/ipmi_msg.cpp 1266
-MD5 ae7986a9c65ac54b47552f7db5829254 openhpi-2.0.3/plugins/ipmidirect/ipmi_control_fan.h 1712
-MD5 0f7e5348b499839894dfe24c659d5b5c openhpi-2.0.3/plugins/ipmidirect/ipmi_control.h 1527
-MD5 e4561064dbd783438a006540722333b6 openhpi-2.0.3/plugins/ipmidirect/ipmi_event.cpp 4036
-MD5 fa6a72dd6677e449ab7b81d612e2fe14 openhpi-2.0.3/plugins/ipmidirect/thread.cpp 6153
-MD5 88cd565e06abc2c48f99ce29b10b6864 openhpi-2.0.3/plugins/ipmidirect/ipmi_utils.h 3722
-MD5 315a57fc423974c32f5d05ef8d917633 openhpi-2.0.3/plugins/snmp_bc/eventmap2code.pl 19330
-MD5 dc94f3d0ea704fedc9505e1c3a1fd37b openhpi-2.0.3/plugins/snmp_bc/el.h 1049
-MD5 38acec063d8722ff21d7bf557507a770 openhpi-2.0.3/plugins/snmp_bc/snmp_bc_event.c 43898
-MD5 35d51894dde11825b37bb1bf2e33e937 openhpi-2.0.3/plugins/snmp_bc/snmp_bc_event.h 1205
-MD5 bc79dddd455f11d2cc616947c0ab1f10 openhpi-2.0.3/plugins/snmp_bc/el2event.c 206849
-MD5 7aabd3026152a3cabb22bc4c42cbe63e openhpi-2.0.3/plugins/snmp_bc/el2event.h 1600
-MD5 22dcd70d93a4f3f912cf18f5d489d7e9 openhpi-2.0.3/plugins/snmp_bc/snmp_bc_watchdog.c 1085
-MD5 12dd0e8aeba651a4619d33a15dd06db5 openhpi-2.0.3/plugins/snmp_bc/snmp_bc_watchdog.h 908
-MD5 6f24ca58f5edac4d43a0fb37bce02208 openhpi-2.0.3/plugins/snmp_bc/snmp_bc_plugin.h 1129
-MD5 1165524a633be2f13b17c53b3b3db40e openhpi-2.0.3/plugins/snmp_bc/snmp_bc_resources_rsa.c 83442
-MD5 c341eed34a2a9f12f5ab91660e8f84d1 openhpi-2.0.3/plugins/snmp_bc/snmp_bc_discover_bc.c 40980
-MD5 77c4531379f5daba9cf0c205debbd265 openhpi-2.0.3/plugins/snmp_bc/snmp_bc_resources.c 263690
-MD5 914ea47c553c8c3543273a42b086f92c openhpi-2.0.3/plugins/snmp_bc/snmp_bc_resources.h 12810
-MD5 9caa19e2b2f4c8a30bd4fa48323c1243 openhpi-2.0.3/plugins/snmp_bc/snmp_bc_discover_rsa.c 10119
-MD5 af1b8213746a4ce3ff78be10872ba00e openhpi-2.0.3/plugins/snmp_bc/snmp_bc_discover.c 19754
-MD5 841558e2cbed6867a93c50ca35faa3f2 openhpi-2.0.3/plugins/snmp_bc/snmp_bc_discover.h 1547
-MD5 b6e4ea4a5d57974a77e745d8e5a629eb openhpi-2.0.3/plugins/snmp_bc/snmp_bc_utils.c 6909
-MD5 b226262111997e1af6f23b077b89ca2a openhpi-2.0.3/plugins/snmp_bc/snmp_bc_utils.h 733
-MD5 fb7d41e0268fd7d7e7a20a43754269b2 openhpi-2.0.3/plugins/snmp_bc/snmp_bc_hotswap.c 8263
-MD5 62f9201ecd4850ae728d11364a21fc4c openhpi-2.0.3/plugins/snmp_bc/snmp_bc_hotswap.h 1096
-MD5 6e0325a94fc6c7e6ceecd9255bc229e6 openhpi-2.0.3/plugins/snmp_bc/snmp_bc_sel.c 26690
-MD5 c29e453c99db54c5ab59fba62393054c openhpi-2.0.3/plugins/snmp_bc/snmp_bc_sel.h 2286
-MD5 06822c30c957516cf703effea8b5a69e openhpi-2.0.3/plugins/snmp_bc/sim_init.c 792
-MD5 b33e1220122a9ea90b55733f4f1aff77 openhpi-2.0.3/plugins/snmp_bc/sim_init.h 664
-MD5 7de91459eb38adab1fa0f2ab9516ba9e openhpi-2.0.3/plugins/snmp_bc/snmp_bc_annunciator.c 11491
-MD5 e6291a90a94a14be03f8098550c7cac9 openhpi-2.0.3/plugins/snmp_bc/snmp_bc_annunciator.h 1699
-MD5 8a16694f27849f191dcc97925de8b5ca openhpi-2.0.3/plugins/snmp_bc/Makefile.am 3057
-MD5 7e4198e213c1ffea2f83931b7b805882 openhpi-2.0.3/plugins/snmp_bc/Makefile.in 24529
-MD5 9fb2b2244bda0ea85f51e44f77e35ac0 openhpi-2.0.3/plugins/snmp_bc/snmp_bc_power.c 5838
-MD5 4a000bd3aa619c735fb96066b4384858 openhpi-2.0.3/plugins/snmp_bc/snmp_bc_power.h 740
-MD5 ab7d4ebe8eff87f8bf4004e88dd52f1d openhpi-2.0.3/plugins/snmp_bc/snmp_bc_session.c 9164
-MD5 e3d0473a7de3792cc04fd9c70a72afbc openhpi-2.0.3/plugins/snmp_bc/snmp_bc_session.h 810
-MD5 976cc3c3d55629fa808d14b6140944b1 openhpi-2.0.3/plugins/snmp_bc/snmp_bc_xml2event.c 10718
-MD5 728aeac533ede56727fc1dda07a0c3ae openhpi-2.0.3/plugins/snmp_bc/snmp_bc_control.c 8840
-MD5 6c8498a9e0528e26a3d8daabeb885613 openhpi-2.0.3/plugins/snmp_bc/snmp_bc_control.h 865
-MD5 1847d32adaf63e2750333c3b8df2056a openhpi-2.0.3/plugins/snmp_bc/snmp_bc_lock.h 4045
-MD5 f7b949dc1037452aebf886e1eafb7cf3 openhpi-2.0.3/plugins/snmp_bc/snmp_bc_event.map 155933
-MD5 5b33e36d32a8ff40f0dd59d8c4a2540a openhpi-2.0.3/plugins/snmp_bc/snmp_bc_reset.c 4729
-MD5 ee5148af3033f239ac3881181b688c47 openhpi-2.0.3/plugins/snmp_bc/snmp_bc_reset.h 737
-MD5 1308d9b4b06065cd2ce60f8ca73c1db8 openhpi-2.0.3/plugins/snmp_bc/snmp_bc.c 15601
-MD5 3134cbaf6a680ea54099095127f4b0c2 openhpi-2.0.3/plugins/snmp_bc/snmp_bc.h 2474
-MD5 e812a3d7c885bb0b46f955d9fa45ff2e openhpi-2.0.3/plugins/snmp_bc/snmp_bc_inventory.c 20900
-MD5 284a8389f7331320ac5331b083325473 openhpi-2.0.3/plugins/snmp_bc/snmp_bc_inventory.h 3348
-MD5 405043a82e89d5106c4536d086928e0c openhpi-2.0.3/plugins/snmp_bc/snmp_bc_time.c 11955
-MD5 0f22349aa1306638072f053d74c2acba openhpi-2.0.3/plugins/snmp_bc/snmp_bc_time.h 2661
-MD5 eb46b1f75430c827a72f8405614204f8 openhpi-2.0.3/plugins/snmp_bc/snmp_bc_sensor.c 46393
-MD5 30605ddd3df0459a6798e96c99fec66a openhpi-2.0.3/plugins/snmp_bc/snmp_bc_sensor.h 2573
-MD5 d3b807a66c0c66d124639402b1c8a8e3 openhpi-2.0.3/plugins/watchdog/README 505
-MD5 35dc1dbc532100da797e2f07931f0e45 openhpi-2.0.3/plugins/watchdog/Makefile.am 1809
-MD5 d1a0422aaf3e39dea7711f4326d645ab openhpi-2.0.3/plugins/watchdog/Makefile.in 17369
-MD5 802ea93c4e494286609762141f06bb79 openhpi-2.0.3/plugins/watchdog/watchdog.c 18061
-MD5 8086b12ea2f364eb2d199340cceca9e2 openhpi-2.0.3/plugins/simulator/sim_parser.c 68744
-MD5 3e0e9fb93ded26a1c41cb6c15b2ab05c openhpi-2.0.3/plugins/simulator/sim_parser.h 1227
-MD5 42406db66ef230948f9820a9de40c530 openhpi-2.0.3/plugins/simulator/Makefile.am 1913
-MD5 801c0d8b0c48996c763c1c7939f53329 openhpi-2.0.3/plugins/simulator/Makefile.in 17842
-MD5 eed7cf88ddb20eaa4d6fda06c612ca17 openhpi-2.0.3/plugins/simulator/sim_sensor.c 9707
-MD5 bf8ce8240934427714a51ac642d15cb6 openhpi-2.0.3/plugins/simulator/sim_sensor.h 195
-MD5 30512340aa08beff5ca8a40237c21c7b openhpi-2.0.3/plugins/simulator/sim_event.c 8237
-MD5 6d47e613ca890719dad8a94affe435a5 openhpi-2.0.3/plugins/simulator/sim_event.h 787
-MD5 d10417b22a54aba891ba2ab25d3a6d87 openhpi-2.0.3/plugins/simulator/sim_util.c 10962
-MD5 c35ba2fdd184c5169b79dd28a683ac1f openhpi-2.0.3/plugins/simulator/sim_util.h 2245
-MD5 7ebc7cfa52a18d72b949b10b8010c8bd openhpi-2.0.3/plugins/simulator/simulator.c 11588
-MD5 5ebb14dd2a1c6ee813f2879fa1ba2691 openhpi-2.0.3/src/t/ohpi/openhpi.conf 67
-MD5 8f95f594162aadbcc53b3baed0390bed openhpi-2.0.3/src/t/ohpi/Makefile.am 4367
-MD5 29fb6f571e966ae4ed4c1ee91f3abb81 openhpi-2.0.3/src/t/ohpi/Makefile.in 37939
-MD5 6bb5c704f939d4fcf4126720276faaa5 openhpi-2.0.3/src/t/ohpi/ohpi_000.c 871
-MD5 8ee8db8dbb0b7e21d6c93af08f5187b8 openhpi-2.0.3/src/t/ohpi/ohpi_001.c 1156
-MD5 2fa04d1a82c29af176737f83129697ee openhpi-2.0.3/src/t/ohpi/ohpi_002.c 1057
-MD5 6c990400aeb2cbaac84d1ddc5721ce08 openhpi-2.0.3/src/t/ohpi/ohpi_003.c 1569
-MD5 d35865672641b121fea79143e50480c3 openhpi-2.0.3/src/t/ohpi/ohpi_004.c 1267
-MD5 5bb8e59a2b5492ce84e9cab1e58060c0 openhpi-2.0.3/src/t/ohpi/ohpi_005.c 2379
-MD5 fd88ff3b9e6fb588868515114edbddff openhpi-2.0.3/src/t/ohpi/ohpi_006.c 1995
-MD5 5259b73b8c3659b37f55ed1a033f34d6 openhpi-2.0.3/src/t/ohpi/ohpi_007.c 2659
-MD5 28edca8f0b8585ef1708fe2e8b2603fa openhpi-2.0.3/src/t/ohpi/ohpi_008.c 3039
-MD5 15e8ecd1742b17683e896a4b44f1e1cc openhpi-2.0.3/src/t/ohpi/ohpi_009.c 1854
-MD5 4cb4dcdc109449fc92b87dc4ad0cd360 openhpi-2.0.3/src/t/ohpi/ohpi_010.c 2979
-MD5 607b813b9e6b47641f016c27ae66fe7c openhpi-2.0.3/src/t/ohpi/ohpi_011.c 901
-MD5 0c8ba44482023f53c71b4d109e6978b5 openhpi-2.0.3/src/t/ohpi/ohpi_012.c 923
-MD5 017df30eaca7abffaa5e0902251a0c6b openhpi-2.0.3/src/t/ohpi/ohpi_013.c 979
-MD5 015dc5e9a3123b4a09b8c984dc434c2c openhpi-2.0.3/src/t/ohpi/ohpi_014.c 1003
-MD5 02863677bf8d7dcad86f1644f2984f48 openhpi-2.0.3/src/t/ohpi/ohpi_015.c 1013
-MD5 760dda1c447d96032750a67dd5cabc54 openhpi-2.0.3/src/t/ohpi/ohpi_016.c 1483
-MD5 6c078f822c5e815aa5702bb7f7e7ad21 openhpi-2.0.3/src/t/ohpi/ohpi_017.c 1063
-MD5 11c28c937e3b19f5053db89ee02216df openhpi-2.0.3/src/t/ohpi/ohpi_018.c 1079
-MD5 33e9319f29e0d54412d07a20ac48ddb3 openhpi-2.0.3/src/t/ohpi/ohpi_019.c 1128
-MD5 5d9ded4b9462e4dd7c3b4b8b82bb30ef openhpi-2.0.3/src/t/ohpi/ohpi_020.c 1202
-MD5 b1a686443b65bd666762a2c19537a190 openhpi-2.0.3/src/t/ohpi/ohpi_021.c 1388
-MD5 fc63d1365e10c0a26c69fec408e504e6 openhpi-2.0.3/src/t/ohpi/ohpi_022.c 1504
-MD5 c491d83848e3ba30329a09f17464fd3f openhpi-2.0.3/src/t/ohpi/ohpi_023.c 1463
-MD5 53112cbbdaa8323e2aefc12336acce11 openhpi-2.0.3/src/t/ohpi/ohpi_024.c 1052
-MD5 d09e831ce9266842ad55bf0b514406db openhpi-2.0.3/src/t/ohpi/ohpi_025.c 1423
-MD5 152d3f4094da3d2c4b43b092a9a179b7 openhpi-2.0.3/src/t/ohpi/ohpi_026.c 1380
-MD5 fbd1b7903f6d19882a139a5972683af9 openhpi-2.0.3/src/t/ohpi/ohpi_027.c 1522
-MD5 7c346ac4dc09dd054e46d23a619c83f4 openhpi-2.0.3/src/t/ohpi/ohpi_028.c 1513
-MD5 c136fd9dbba0c425bbf3321340978096 openhpi-2.0.3/src/t/ohpi/ohpi_029.c 1618
-MD5 1042f3566e890447fd3b26a2750eeeb5 openhpi-2.0.3/src/t/ohpi/ohpi_030.c 1559
-MD5 8af358fed9ca305eedccbd6cee0d462e openhpi-2.0.3/src/t/ohpi/ohpi_031.c 1592
-MD5 9bfdb6eeed88eb56139875ea3086dec4 openhpi-2.0.3/src/t/ohpi/ohpi_032.c 2281
-MD5 ba035dfbb9d83b161dad135ff36d8ca9 openhpi-2.0.3/src/t/ohpi/ohpi_033.c 2303
-MD5 e28361e313452f9b80b674e046891658 openhpi-2.0.3/src/t/ohpi/ohpi_034.c 2491
-MD5 2d32b23e3422c6f8fed3a0332741e160 openhpi-2.0.3/src/t/ohpi/ohpi_035.c 1262
-MD5 0bc76e14b23601203447843b2e79071b openhpi-2.0.3/src/t/ohpi/ohpi_036.c 1409
-MD5 4fd99ffe21ecda73ff3ce074d096ed08 openhpi-2.0.3/src/t/ohpi/ohpi_037.c 1032
-MD5 91b7e1788275822ead1f25c050db01e2 openhpi-2.0.3/src/t/ohpi/ohpi_038.c 1200
-MD5 7280f42fc58511a4cc2b75522ed148e5 openhpi-2.0.3/src/t/ohpi/ohpi_039.c 1010
-MD5 206bad03b8c133d44b16beb76d6d31e7 openhpi-2.0.3/docs/hld/images/saf_hpi_rpt.png 125993
-MD5 ee9b9f7007f298057843c7b698999ce7 openhpi-2.0.3/docs/hld/images/implementation_view.png 50734
-MD5 708b93b8d6cd40302edfe9056ad58145 openhpi-2.0.3/docs/hld/images/physical_view.png 33673
-MD5 779e305c264b335e8a8fed380136937e openhpi-2.0.3/docs/hld/images/hld_diagram.gif 4217
-MD5 09e9711111e7b8081979b77931ef9bf4 openhpi-2.0.3/docs/hld/images/domain_view.png 72464
-MD5 2c03b2beebea764ca875233266ad153c openhpi-2.0.3/utils/t/el/el_compare.c 2355
-MD5 70c51191ad1a45c8414957648e02bb66 openhpi-2.0.3/utils/t/el/el_utils.c 12421
-MD5 489e6ed47d18e3801bcb46bd4ba52a78 openhpi-2.0.3/utils/t/el/Makefile.am 2421
-MD5 44d26b42deb9d11f71eb41c3c69ccb43 openhpi-2.0.3/utils/t/el/Makefile.in 28003
-MD5 35ea17cf2b6e18cc0a36863b3c636c50 openhpi-2.0.3/utils/t/el/el_test.h 618
-MD5 2f9060f0886522c1a1c186ca2c557336 openhpi-2.0.3/utils/t/el/addel.c 5092
-MD5 b1d4f46013fdc058ddb9d3d9e7d57899 openhpi-2.0.3/utils/t/el/el_test_001.c 1932
-MD5 a943435784873768c35734ce270f8872 openhpi-2.0.3/utils/t/el/el_test_002.c 2712
-MD5 9917f7175dbac63df9da2ed020c113a1 openhpi-2.0.3/utils/t/el/el_test_003.c 2649
-MD5 10de83392d9d814b0214a55039bb9286 openhpi-2.0.3/utils/t/el/el_test_004.c 2662
-MD5 ad9c9a0eb88d6eea71df6d4b1bdbab19 openhpi-2.0.3/utils/t/el/el_test_005.c 3039
-MD5 c6d32753b1f30e707ebdd1ecc5218f75 openhpi-2.0.3/utils/t/el/el_test_006.c 4539
-MD5 2a91cd89e541bb8d845031717b67fa23 openhpi-2.0.3/utils/t/el/el_test_007.c 2613
-MD5 4215c379c00edac7e676ffabf62cba94 openhpi-2.0.3/utils/t/el/el_test_008.c 2304
-MD5 13b5956173f368211b15fd9d7a11428f openhpi-2.0.3/utils/t/el/el_test_009.c 1229
-MD5 2a79eed50518cdc7c01381a0e79486c9 openhpi-2.0.3/utils/t/el/el_test_010.c 2910
-MD5 b68764609b937876fa80dc3c6f806ea6 openhpi-2.0.3/utils/t/el/el_test_011.c 2823
-MD5 c0304cad5b771ac7700523c84af58884 openhpi-2.0.3/utils/t/el/el_test_012.c 1178
-MD5 9fd719b3667b828a425c06cec08b4ffb openhpi-2.0.3/utils/t/el/el_test_013.c 3885
-MD5 06fb99487584a38373dc1addbc0cf3de openhpi-2.0.3/utils/t/el/el_test_014.c 1723
-MD5 f604eec7e7a1793d479853c36b9931e6 openhpi-2.0.3/utils/t/el/el_test_015.c 1202
-MD5 66404c44718e4b75472aa8384a0fd1a0 openhpi-2.0.3/utils/t/el/el_test_016.c 1711
-MD5 874487f9faf14e97a43fe2bf1262d22b openhpi-2.0.3/utils/t/el/el_test_017.c 2810
-MD5 238bbac6c7f90ce789e8dfcf573c7a8a openhpi-2.0.3/utils/t/el/el_test_018.c 1753
-MD5 49a066af4c0301f98aa5cfe71196a192 openhpi-2.0.3/utils/t/el/el_test_019.c 1336
-MD5 272de75b716e79aad7c5d0c0a67c4327 openhpi-2.0.3/utils/t/rpt/rpt_utils_1000.c 1734
-MD5 c65a1a8b979c52efe7e9e1937d4412c6 openhpi-2.0.3/utils/t/rpt/rpt_utils.c 32777
-MD5 7df6b8defe6c9eb801a9c3e6b09201e7 openhpi-2.0.3/utils/t/rpt/epath_utils.c 19234
-MD5 1bf7a2f1601acca365367c10cd881f55 openhpi-2.0.3/utils/t/rpt/sahpi_time_utils.c 3069
-MD5 e4be617a48b46041f96f64916eb312a2 openhpi-2.0.3/utils/t/rpt/sahpi_enum_utils.c 115153
-MD5 8c8e3648bbe163d4bd1021b63e92431d openhpi-2.0.3/utils/t/rpt/rpt_utils_000.c 1323
-MD5 9b0521cc643fda2f30698c107c053d91 openhpi-2.0.3/utils/t/rpt/rpt_utils_001.c 1331
-MD5 ab628abefd5c297165d2d28442085887 openhpi-2.0.3/utils/t/rpt/rpt_utils_002.c 1405
-MD5 a6683fcc8b5dd5fb3229b75d4c5a6432 openhpi-2.0.3/utils/t/rpt/rpt_utils_003.c 2204
-MD5 c30e4292b776f5137728011141b6e50b openhpi-2.0.3/utils/t/rpt/rpt_utils_004.c 2112
-MD5 065983b18c2412d53e05c9100bf7d4f0 openhpi-2.0.3/utils/t/rpt/rpt_utils_005.c 2228
-MD5 eff81c6acc72250926c094b0dfe6e000 openhpi-2.0.3/utils/t/rpt/rpt_utils_006.c 1570
-MD5 66430da5fbac52d6e39a71ad9742d600 openhpi-2.0.3/utils/t/rpt/rpt_utils_007.c 1553
-MD5 b5182fe657caec0705c6d63de929bc99 openhpi-2.0.3/utils/t/rpt/rpt_utils_008.c 1635
-MD5 45efb14d42e186c38025ec08731b40f0 openhpi-2.0.3/utils/t/rpt/rpt_utils_009.c 1765
-MD5 e06518b9948410723f30e7b197235a83 openhpi-2.0.3/utils/t/rpt/rpt_utils_010.c 1806
-MD5 1a6d2edbbbb677b622623e042d3f8ac8 openhpi-2.0.3/utils/t/rpt/rpt_utils_011.c 2424
-MD5 f9703d14336083ffa93c21fb53f15fbc openhpi-2.0.3/utils/t/rpt/rpt_utils_012.c 2487
-MD5 adc673bd9056d980d047f5d8b2c4651b openhpi-2.0.3/utils/t/rpt/rpt_utils_013.c 1745
-MD5 922f553ad95da206118c384f62790213 openhpi-2.0.3/utils/t/rpt/rpt_utils_014.c 1708
-MD5 93d498671afe286795d7ab53bba0ccb2 openhpi-2.0.3/utils/t/rpt/rpt_utils_015.c 1740
-MD5 b03d16f673ff12a499345c327f006c57 openhpi-2.0.3/utils/t/rpt/rpt_utils_016.c 1896
-MD5 9af667ba66a9fe21af61c01e9b4970fe openhpi-2.0.3/utils/t/rpt/rpt_utils_017.c 1746
-MD5 db5cde104e08fac3391b73c1414456fe openhpi-2.0.3/utils/t/rpt/rpt_utils_018.c 1817
-MD5 0ab277c096290fbf2e656bd8831e5ecf openhpi-2.0.3/utils/t/rpt/rpt_utils_019.c 1898
-MD5 603fdbdd0e8abc0e0333d43baa67e8fe openhpi-2.0.3/utils/t/rpt/rpt_utils_020.c 971
-MD5 1a10fc048df0126bc094dd3f14e22d3f openhpi-2.0.3/utils/t/rpt/rpt_utils_021.c 1012
-MD5 3bbefb367c442511fbf16cc695eac5de openhpi-2.0.3/utils/t/rpt/rpt_utils_022.c 1118
-MD5 059cef3a6b3804d72106c8efd26dbd7f openhpi-2.0.3/utils/t/rpt/rpt_utils_023.c 875
-MD5 e516e0b29bf809eb33473676acde4f08 openhpi-2.0.3/utils/t/rpt/rpt_utils_024.c 1141
-MD5 6daad426432528714f9d98a39252c85a openhpi-2.0.3/utils/t/rpt/rpt_utils_025.c 1259
-MD5 2772d65d56b8332d3c0c170f5df4ba94 openhpi-2.0.3/utils/t/rpt/rpt_utils_026.c 1419
-MD5 83caa07ab7e0b177dc34175613c83407 openhpi-2.0.3/utils/t/rpt/rpt_utils_027.c 1208
-MD5 b31b5680cb647d8bf56ec9fa617584a5 openhpi-2.0.3/utils/t/rpt/rpt_utils_028.c 1367
-MD5 1a60b16567d8c757c1653759fa40b775 openhpi-2.0.3/utils/t/rpt/rpt_utils_029.c 1426
-MD5 98516a942e8558cec29b68e27cec0198 openhpi-2.0.3/utils/t/rpt/rpt_utils_030.c 1318
-MD5 117b226741fe0e99139999d63de9aafa openhpi-2.0.3/utils/t/rpt/rpt_utils_031.c 1149
-MD5 476d9432cf77fa7500b77a5a6723452f openhpi-2.0.3/utils/t/rpt/rpt_utils_032.c 1290
-MD5 b8f4bfb628fd4abae8632415bc18d00c openhpi-2.0.3/utils/t/rpt/rpt_utils_033.c 1471
-MD5 f4da7497fb47dd0057d3a0035d5005eb openhpi-2.0.3/utils/t/rpt/rpt_utils_034.c 1165
-MD5 aa2a934d5137aa3f2671e64b3d078419 openhpi-2.0.3/utils/t/rpt/rpt_utils_035.c 1272
-MD5 e37f86d322c29f0723c9499c413f1036 openhpi-2.0.3/utils/t/rpt/rpt_utils_037.c 1239
-MD5 5c3ad300c60feb9f42eac20be3c077b7 openhpi-2.0.3/utils/t/rpt/rpt_utils_038.c 1264
-MD5 2f1eb87f29c962794a5bbd71ac11f6d2 openhpi-2.0.3/utils/t/rpt/rpt_utils_039.c 1508
-MD5 0809d7dee25537f14f70881830f6291b openhpi-2.0.3/utils/t/rpt/rpt_utils_040.c 1250
-MD5 8e2dbfde337c0ad9ea5f5d0f134434bd openhpi-2.0.3/utils/t/rpt/rpt_utils_041.c 1157
-MD5 9631af095bc13a392d552d8a026d9ba2 openhpi-2.0.3/utils/t/rpt/rpt_utils_042.c 1271
-MD5 0e52df121492bb8b6a0028c50ca215c1 openhpi-2.0.3/utils/t/rpt/rpt_utils_043.c 1141
-MD5 0b820ff0e75be255b871a0b1dff5ede1 openhpi-2.0.3/utils/t/rpt/rpt_utils_044.c 1156
-MD5 e65764afca5391712e1770155d4f7983 openhpi-2.0.3/utils/t/rpt/rpt_utils_045.c 1271
-MD5 006790ffb9b73a52cd0efe0faaa511d6 openhpi-2.0.3/utils/t/rpt/rpt_utils_046.c 1397
-MD5 a54e80f466bb1474d9e042c772bb609c openhpi-2.0.3/utils/t/rpt/rpt_utils_047.c 1393
-MD5 d251c00bd577c38171fed398d294c183 openhpi-2.0.3/utils/t/rpt/rpt_utils_048.c 1311
-MD5 9bbeec87c60d1f165ffffb4c8e9480d5 openhpi-2.0.3/utils/t/rpt/rpt_utils_049.c 1323
-MD5 633a2a6a22502ee20b4500b90f02d049 openhpi-2.0.3/utils/t/rpt/rpt_utils_050.c 1438
-MD5 4a3dc931e93101aa326b86d00a4202ca openhpi-2.0.3/utils/t/rpt/rpt_utils_051.c 1365
-MD5 be0cbab95108c561a51fa62f6935a4db openhpi-2.0.3/utils/t/rpt/rpt_utils_052.c 1386
-MD5 0f98b115fc69ac6cee4de2f369645228 openhpi-2.0.3/utils/t/rpt/rpt_utils_053.c 1378
-MD5 11d1d58903f298b2d8032a21928b3f73 openhpi-2.0.3/utils/t/rpt/rpt_utils_054.c 1427
-MD5 6c60315dbe08197dc0a67d542581a1c4 openhpi-2.0.3/utils/t/rpt/rpt_utils_055.c 1456
-MD5 e6764df3fd1190de777b0424de55265f openhpi-2.0.3/utils/t/rpt/rpt_utils_056.c 1364
-MD5 2348cef072b4c6924d1dc1af3643ac8d openhpi-2.0.3/utils/t/rpt/rpt_utils_057.c 1393
-MD5 ce9587d3e1aba52ae66a25d6e857d94e openhpi-2.0.3/utils/t/rpt/rpt_utils_058.c 1385
-MD5 5c41fb8278bf509017629cd546504c2c openhpi-2.0.3/utils/t/rpt/rpt_utils_059.c 1398
-MD5 ff12cee39e7939f8830e00a6cec9db9d openhpi-2.0.3/utils/t/rpt/rpt_utils_060.c 1385
-MD5 638b1f814c8883f5eba67f180f46cbb0 openhpi-2.0.3/utils/t/rpt/rpt_utils_061.c 815
-MD5 ea32b86a80b2fbc7a562bd85b8e2c718 openhpi-2.0.3/utils/t/rpt/rpt_utils_062.c 1779
-MD5 b548f01cdb177a16325d80488f3b67bd openhpi-2.0.3/utils/t/rpt/rpt_utils_063.c 1400
-MD5 9e59a3ac06f9c4eff7242fb0c0769172 openhpi-2.0.3/utils/t/rpt/rpt_utils_064.c 1337
-MD5 9a0976d08a2ce05a2f9a38ff0494633c openhpi-2.0.3/utils/t/rpt/rpt_utils_065.c 1379
-MD5 23662f07c312f7d98d66268805497fb2 openhpi-2.0.3/utils/t/rpt/rpt_utils_066.c 1138
-MD5 24c0ac844ed730aa0f23af3a132e949f openhpi-2.0.3/utils/t/rpt/rpt_utils_067.c 1340
-MD5 0c07cd2ff4e477dbce47fa28361e205b openhpi-2.0.3/utils/t/rpt/rpt_utils_068.c 1429
-MD5 667443b2ce6fe0de94f79e4b0a24bae1 openhpi-2.0.3/utils/t/rpt/rpt_utils_069.c 1351
-MD5 8ea257ad3c72a482bf63e9fb4874b8ef openhpi-2.0.3/utils/t/rpt/rpt_utils_070.c 1404
-MD5 7af4769cfbc6baae5604c3cfcc592d42 openhpi-2.0.3/utils/t/rpt/rpt_utils_071.c 842
-MD5 b9b14e51a7ff12f41d6ddaeafefc5b59 openhpi-2.0.3/utils/t/rpt/rpt_utils_072.c 1312
-MD5 ae0ac8144ff95621300902d327703f84 openhpi-2.0.3/utils/t/rpt/rpt_utils_073.c 1336
-MD5 793c0bab805e0ed82dfaa979b8124106 openhpi-2.0.3/utils/t/rpt/rpt_utils_074.c 1318
-MD5 e4a94b6fd17183d6d1095e3a68b90199 openhpi-2.0.3/utils/t/rpt/rpt_utils_075.c 1318
-MD5 897a694aea0546528329e8dcd4306d62 openhpi-2.0.3/utils/t/rpt/rpt_utils_076.c 1317
-MD5 c5c57149dbd079692c53979c8bf7b486 openhpi-2.0.3/utils/t/rpt/rpt_utils_077.c 1317
-MD5 a9b20fe86648c049e622a7038c78547a openhpi-2.0.3/utils/t/rpt/rpt_utils_078.c 1701
-MD5 9eb1e7bb62571c2c35a8e7d83eaed7ba openhpi-2.0.3/utils/t/rpt/Makefile.am 7308
-MD5 fb8b35df240abd6d41e886411de12ed4 openhpi-2.0.3/utils/t/rpt/Makefile.in 65861
-MD5 57bce6b2285a619525ba77cca15fc888 openhpi-2.0.3/utils/t/rpt/sahpi_event_utils.c 15545
-MD5 e5553834302f09c7d489d7a668ebecf6 openhpi-2.0.3/utils/t/rpt/rpt_resources.h 38346
-MD5 4e1bcc0b6ba2fc2c12053c5752b1ef9c openhpi-2.0.3/utils/t/rpt/sahpi_event_encode.c 5631
-MD5 ccf0bd8ce2a8a3ba6f697fb563b6d2d7 openhpi-2.0.3/utils/t/rpt/sahpi_struct_utils.c 107559
-MD5 9bea629cc7026150441980ce8ef3d301 openhpi-2.0.3/utils/t/uid/uid_utils_000.c 1021
-MD5 995ce4c36fed77a4cc7a7c9401c54053 openhpi-2.0.3/utils/t/uid/uid_utils_001.c 999
-MD5 2ff2127dbae6832846d19090f14157dd openhpi-2.0.3/utils/t/uid/uid_utils_002.c 1309
-MD5 d0ee290cd74c04d162446fddbab3c88b openhpi-2.0.3/utils/t/uid/uid_utils_003.c 1246
-MD5 aa7e297896ef67ff9abbad8a5c7f85a6 openhpi-2.0.3/utils/t/uid/uid_utils_004.c 1334
-MD5 1f42febb8374c7af55907af8abb09943 openhpi-2.0.3/utils/t/uid/uid_utils_005.c 1283
-MD5 53023a57c13657b73e588e988f108a05 openhpi-2.0.3/utils/t/uid/uid_utils_006.c 1200
-MD5 ca10b4919f3672c3a122f6cb2c11a4ae openhpi-2.0.3/utils/t/uid/uid_utils_007.c 1300
-MD5 5921bb8a5c3d4a37738cdcb668d5cec8 openhpi-2.0.3/utils/t/uid/uid_utils_008.c 863
-MD5 207dac5479054426c27cb66e04b3ad9c openhpi-2.0.3/utils/t/uid/uid_utils_009.c 980
-MD5 bb2cb628608e765a32eba58acad98b36 openhpi-2.0.3/utils/t/uid/uid_utils_010.c 968
-MD5 f55951e7d2ac8ae317e531f5f2243e7e openhpi-2.0.3/utils/t/uid/uid_utils_011.c 988
-MD5 3805a675ffc360c93d8785cf73b9a557 openhpi-2.0.3/utils/t/uid/uid_utils_012.c 1026
-MD5 68f01fd9b5a6e717efa1d58ce24675a3 openhpi-2.0.3/utils/t/uid/uid_utils_013.c 1034
-MD5 7df6b8defe6c9eb801a9c3e6b09201e7 openhpi-2.0.3/utils/t/uid/epath_utils.c 19234
-MD5 b284346b64be649c7ea2ea7d4b089c67 openhpi-2.0.3/utils/t/uid/uid_utils.c 14244
-MD5 1bf7a2f1601acca365367c10cd881f55 openhpi-2.0.3/utils/t/uid/sahpi_time_utils.c 3069
-MD5 e4be617a48b46041f96f64916eb312a2 openhpi-2.0.3/utils/t/uid/sahpi_enum_utils.c 115153
-MD5 42272774e3941f6619558486145d2a5d openhpi-2.0.3/utils/t/uid/Makefile.am 2424
-MD5 4d83ad254bb60c2eddbcabf1344cbbb1 openhpi-2.0.3/utils/t/uid/Makefile.in 26028
-MD5 57bce6b2285a619525ba77cca15fc888 openhpi-2.0.3/utils/t/uid/sahpi_event_utils.c 15545
-MD5 4e1bcc0b6ba2fc2c12053c5752b1ef9c openhpi-2.0.3/utils/t/uid/sahpi_event_encode.c 5631
-MD5 ccf0bd8ce2a8a3ba6f697fb563b6d2d7 openhpi-2.0.3/utils/t/uid/sahpi_struct_utils.c 107559
-MD5 7df6b8defe6c9eb801a9c3e6b09201e7 openhpi-2.0.3/utils/t/epath/epath_utils.c 19234
-MD5 ab9a4fd2b261c75d76c635c2d9bce32f openhpi-2.0.3/utils/t/epath/set_ep_loc_000.c 980
-MD5 1e4b6230e24b93eac98ca26dde9c4211 openhpi-2.0.3/utils/t/epath/set_ep_loc_001.c 1280
-MD5 468018b8e2e53de54b6827c0e4bb658f openhpi-2.0.3/utils/t/epath/set_ep_loc_002.c 1306
-MD5 e0e35a3488cf0586174dad38d6fa4d68 openhpi-2.0.3/utils/t/epath/set_ep_loc_003.c 1585
-MD5 a272c2cb3dd8ff0a0a45137fddf52420 openhpi-2.0.3/utils/t/epath/set_ep_loc_004.c 1984
-MD5 c29a3813df5632e2fd5eb6a701c80505 openhpi-2.0.3/utils/t/epath/set_ep_loc_005.c 2351
-MD5 5435bf8e2b51e470db2a6019912523ae openhpi-2.0.3/utils/t/epath/set_ep_loc_006.c 2397
-MD5 abb35dc2bb8854c8918451aeeae74ef7 openhpi-2.0.3/utils/t/epath/set_ep_loc_007.c 2458
-MD5 f35c0375fbb83a439114c52605800cde openhpi-2.0.3/utils/t/epath/set_ep_loc_008.c 2451
-MD5 771d007c90165216e89605637322d6b2 openhpi-2.0.3/utils/t/epath/set_ep_loc_009.c 1305
-MD5 dc5e5dd780f57bd0d4772987a0c0792f openhpi-2.0.3/utils/t/epath/set_ep_loc_010.c 2843
-MD5 10f2138cee02b290c5ad39f5d6e59bf7 openhpi-2.0.3/utils/t/epath/set_ep_loc_011.c 2078
-MD5 3093c267ada70aa310b7f2268386a847 openhpi-2.0.3/utils/t/epath/set_ep_loc_012.c 2366
-MD5 9056a9bbaf49ddb8b703eae537ecb378 openhpi-2.0.3/utils/t/epath/set_ep_loc_013.c 1509
-MD5 b6f2123cd8c521364708e20022e40a23 openhpi-2.0.3/utils/t/epath/epath_utils_test.c 8616
-MD5 1bf7a2f1601acca365367c10cd881f55 openhpi-2.0.3/utils/t/epath/sahpi_time_utils.c 3069
-MD5 5427e984412c06d6ce6918437b2feebf openhpi-2.0.3/utils/t/epath/epath_numeric_000.c 1425
-MD5 35befc65b91b3c8776abb89daf572201 openhpi-2.0.3/utils/t/epath/epath_numeric_001.c 1040
-MD5 9489704d6bec7fd958fece3d68114760 openhpi-2.0.3/utils/t/epath/epath_numeric_002.c 1051
-MD5 5cc9aa22b9a3ee104873c023fdf0866d openhpi-2.0.3/utils/t/epath/epath_numeric_003.c 1358
-MD5 a655e5c6c398c367965ecedaaa417a89 openhpi-2.0.3/utils/t/epath/epath_numeric_004.c 1433
-MD5 8373a32b57f2e08cb33e466fe946e2bc openhpi-2.0.3/utils/t/epath/epath_numeric_005.c 1428
-MD5 e4be617a48b46041f96f64916eb312a2 openhpi-2.0.3/utils/t/epath/sahpi_enum_utils.c 115153
-MD5 2a081c9ba6d209b674981737acdedcd9 openhpi-2.0.3/utils/t/epath/ep_derive_001.c 1862
-MD5 504c99e403da3cee1694260e254fbf87 openhpi-2.0.3/utils/t/epath/Makefile.am 14588
-MD5 26afb6473082bd0aa24d6772d633e301 openhpi-2.0.3/utils/t/epath/Makefile.in 116761
-MD5 57bce6b2285a619525ba77cca15fc888 openhpi-2.0.3/utils/t/epath/sahpi_event_utils.c 15545
-MD5 225c6ff668a4f0aa5c663bd6ef4e0033 openhpi-2.0.3/utils/t/epath/print_ep_000.c 968
-MD5 e7699f13288e4b144df7c1288c0d5123 openhpi-2.0.3/utils/t/epath/print_ep_001.c 1033
-MD5 90389041ee482b54169fc8459556c638 openhpi-2.0.3/utils/t/epath/print_ep_002.c 999
-MD5 6e514308b5e51f2e70f974ae92251bb4 openhpi-2.0.3/utils/t/epath/print_ep_003.c 1198
-MD5 0adc02250580e032d2d054dc11f57953 openhpi-2.0.3/utils/t/epath/print_ep_004.c 1362
-MD5 b651984f176b6d6f2ca63b184a1d8994 openhpi-2.0.3/utils/t/epath/print_ep_005.c 1160
-MD5 4e1bcc0b6ba2fc2c12053c5752b1ef9c openhpi-2.0.3/utils/t/epath/sahpi_event_encode.c 5631
-MD5 ccf0bd8ce2a8a3ba6f697fb563b6d2d7 openhpi-2.0.3/utils/t/epath/sahpi_struct_utils.c 107559
-MD5 7f7f93835d5cd5c3b82c7e31c30757eb openhpi-2.0.3/utils/t/epath/ep_concat_000.c 1238
-MD5 08bb3eae55b560608a871c9327da9827 openhpi-2.0.3/utils/t/epath/ep_concat_001.c 1184
-MD5 7cab749a01c840919f02b97849d8f447 openhpi-2.0.3/utils/t/epath/ep_concat_002.c 1353
-MD5 0a6926d596ca72b9d52bcefbeaf3487a openhpi-2.0.3/utils/t/epath/ep_concat_003.c 1333
-MD5 cebda93c7ba92a0203fa12e02d2a1d4f openhpi-2.0.3/utils/t/epath/ep_concat_004.c 1653
-MD5 230658c28e326d17a27bb9341c44a3e5 openhpi-2.0.3/utils/t/epath/ep_concat_005.c 1963
-MD5 a8acaec51cc7120cade85be8eca7a9cc openhpi-2.0.3/utils/t/epath/ep_concat_006.c 2269
-MD5 867ecdd999c71203e65ba813b5563e8b openhpi-2.0.3/utils/t/epath/ep_concat_007.c 3215
-MD5 2986ca7e29e3c3eee3bca6abd93ea239 openhpi-2.0.3/utils/t/epath/ep_concat_008.c 1533
-MD5 2321c9747d3df2e448ad35ffce1a744d openhpi-2.0.3/utils/t/epath/ep_concat_009.c 1453
-MD5 ee9dbc7d8ab95ede02a4f3593ceb0096 openhpi-2.0.3/utils/t/epath/ep_concat_010.c 1453
-MD5 634ce09591497e84f21247fe260189cf openhpi-2.0.3/utils/t/epath/ep_concat_011.c 2327
-MD5 b49b39d74b47732e97aefec66e954817 openhpi-2.0.3/utils/t/epath/ep_concat_012.c 3039
-MD5 3e0d8a1ce875cc14f512b3fdb687cbd3 openhpi-2.0.3/utils/t/epath/ep_concat_013.c 1198
-MD5 204079e487a21b40c66c51976a238f47 openhpi-2.0.3/utils/t/epath/ep_concat_014.c 1949
-MD5 b6a5db2b6149946ace43eb139e717c6c openhpi-2.0.3/utils/t/epath/ep_concat_015.c 2615
-MD5 4fc11be2b6862fe5e8c4fdd0231530c6 openhpi-2.0.3/utils/t/epath/epath_conv_000.c 2645
-MD5 445f68c745e581f34f2bca3aea0e98c3 openhpi-2.0.3/utils/t/epath/epath_conv_001.c 2600
-MD5 bd7edbe0dc761ed02513f4c4088269fa openhpi-2.0.3/utils/t/epath/epath_conv_002.c 2627
-MD5 d3766a0fdc6365a0634af631cf2e5d48 openhpi-2.0.3/utils/t/epath/epath_conv_003.c 2618
-MD5 18b1edf8d226fdd041c36b30d7caf101 openhpi-2.0.3/utils/t/epath/epath_conv_004.c 2633
-MD5 8092e949d70466ebec769e189a029e74 openhpi-2.0.3/utils/t/epath/epath_conv_005.c 2609
-MD5 70483f856ae4737a9e799d80a557424d openhpi-2.0.3/utils/t/epath/epath_conv_006.c 2612
-MD5 2b886482622c921c83092c464c583c37 openhpi-2.0.3/utils/t/epath/epath_conv_007.c 2633
-MD5 398bf22aac56d47062fc47c6eb079586 openhpi-2.0.3/utils/t/epath/epath_conv_008.c 2612
-MD5 468301cd36b9d3b913e52810bf53a47c openhpi-2.0.3/utils/t/epath/epath_conv_009.c 2618
-MD5 1bf334209f75501c2e823c34eca78822 openhpi-2.0.3/utils/t/epath/epath_conv_010.c 2615
-MD5 36402ce1a9f6846f336136234ba10afc openhpi-2.0.3/utils/t/epath/epath_conv_011.c 2600
-MD5 c0e1287ca678b4e919c0bac45dc06922 openhpi-2.0.3/utils/t/epath/epath_conv_012.c 2618
-MD5 ac70b2232e5180520ad04fa2a5b4b319 openhpi-2.0.3/utils/t/epath/epath_conv_013.c 2612
-MD5 8d9fc07f3fab2ae4fb7fdeb91aad4a62 openhpi-2.0.3/utils/t/epath/epath_conv_014.c 2603
-MD5 acf72abcfa7f6dbb9644c3092cc82c55 openhpi-2.0.3/utils/t/epath/epath_conv_015.c 2609
-MD5 e09ba3d31ad5618c7e23aa695dc20733 openhpi-2.0.3/utils/t/epath/epath_conv_016.c 2621
-MD5 0350b6795997117302a95b470d2e3632 openhpi-2.0.3/utils/t/epath/epath_conv_017.c 2627
-MD5 3fd873008293aba8cc0e5f589c1b5e66 openhpi-2.0.3/utils/t/epath/epath_conv_018.c 2579
-MD5 344b6a46b75a2d2ca49a148a596097c0 openhpi-2.0.3/utils/t/epath/epath_conv_019.c 2633
-MD5 807292843c6a1f9c58082b2a22d5286a openhpi-2.0.3/utils/t/epath/epath_conv_020.c 2627
-MD5 a78bbbf3f2ff395c5dc4b0b7922c4988 openhpi-2.0.3/utils/t/epath/epath_conv_021.c 2627
-MD5 759f84d5b82a774cfb6ea4cad80a7fc4 openhpi-2.0.3/utils/t/epath/epath_conv_022.c 2630
-MD5 e8ca840dbf16132e0ec17deb2b24a314 openhpi-2.0.3/utils/t/epath/epath_conv_023.c 2651
-MD5 b5cf01f23fe20578c3f46e1753036a56 openhpi-2.0.3/utils/t/epath/epath_conv_024.c 2633
-MD5 8d64335edf44106920e65b6dc38532d9 openhpi-2.0.3/utils/t/epath/epath_conv_025.c 2585
-MD5 d4e6ddff361444297f03995ea3467d1f openhpi-2.0.3/utils/t/epath/epath_conv_026.c 2624
-MD5 37a0e3214bc2b5bbc39308a532d7b96b openhpi-2.0.3/utils/t/epath/epath_conv_027.c 2597
-MD5 8de8b91cd2f1b14b3a4647d038e2b3d6 openhpi-2.0.3/utils/t/epath/epath_conv_028.c 2636
-MD5 1090c6baa67580cdfc5b165fe7def7e7 openhpi-2.0.3/utils/t/epath/epath_conv_029.c 2612
-MD5 8a2ff0d5fbf367c9092bafb96f8f1a80 openhpi-2.0.3/utils/t/epath/epath_conv_030.c 2639
-MD5 1be1d860741f1cd0b9de2588197adb3a openhpi-2.0.3/utils/t/epath/epath_conv_031.c 2594
-MD5 f39f1a1baae480d7acbe905855d54fa6 openhpi-2.0.3/utils/t/epath/epath_conv_032.c 2621
-MD5 9d56d0ac556914f150f506a4cad29ecc openhpi-2.0.3/utils/t/epath/epath_conv_033.c 2615
-MD5 5e0d36aed3f038bcd7765c311c562bd0 openhpi-2.0.3/utils/t/epath/epath_conv_034.c 2615
-MD5 f82557af77ecd91024e89adf33663104 openhpi-2.0.3/utils/t/epath/epath_conv_035.c 2627
-MD5 6cf973387f09087d8d05ab8b89098f44 openhpi-2.0.3/utils/t/epath/epath_conv_036.c 2663
-MD5 d62ac90030d7ee0c1a5b12b49f821582 openhpi-2.0.3/utils/t/epath/epath_conv_037.c 2627
-MD5 06d32e665b17d4527d934645d8c02cce openhpi-2.0.3/utils/t/epath/epath_conv_038.c 2636
-MD5 5fd9a598c15ad59f0d3b438d050fdb05 openhpi-2.0.3/utils/t/epath/epath_conv_039.c 2579
-MD5 39fdd033912b02f3b4a3509fefed34bd openhpi-2.0.3/utils/t/epath/epath_conv_040.c 2651
-MD5 6db9e3a9754e1f650fb01f546b3f6e53 openhpi-2.0.3/utils/t/epath/epath_conv_041.c 2651
-MD5 a101f0c57a42b553f91502715bf696dc openhpi-2.0.3/utils/t/epath/epath_conv_042.c 2618
-MD5 5e5f0a65efe94dd98c9e7dce7dbdd6af openhpi-2.0.3/utils/t/epath/epath_conv_043.c 2648
-MD5 e6fda6e73d9ee39e33ddde16e1e4a5ba openhpi-2.0.3/utils/t/epath/epath_conv_044.c 2630
-MD5 aa17c4ea8420ebbde90346eb38e17018 openhpi-2.0.3/utils/t/epath/epath_conv_045.c 2606
-MD5 227105b85a028d54c073e5b2816bb8e5 openhpi-2.0.3/utils/t/epath/epath_conv_046.c 2618
-MD5 c005212a076a500c38677cef9a6be53e openhpi-2.0.3/utils/t/epath/epath_conv_047.c 2618
-MD5 5ef088b571d4c06588e2d863a55cdf51 openhpi-2.0.3/utils/t/epath/epath_conv_048.c 2627
-MD5 2daf571cae3409c7b18d528c12b2b149 openhpi-2.0.3/utils/t/epath/epath_conv_049.c 2651
-MD5 fed17693fc9cc5d43a90fa2d7ab983c2 openhpi-2.0.3/utils/t/epath/epath_conv_050.c 2600
-MD5 391af824910977db9edd8a3a56d4bd67 openhpi-2.0.3/utils/t/epath/epath_conv_051.c 2621
-MD5 8b1a3055520bfb9cfda2bdfebd01821c openhpi-2.0.3/utils/t/epath/epath_conv_052.c 2639
-MD5 73bddb55172fa5d8a91c1ba969e1bf5e openhpi-2.0.3/utils/t/epath/epath_conv_053.c 2618
-MD5 9d682487c730b746bebde367a92e9ede openhpi-2.0.3/utils/t/epath/epath_conv_054.c 2594
-MD5 c3970d6a68446fecd727e9b6b3069a74 openhpi-2.0.3/utils/t/epath/epath_conv_055.c 2633
-MD5 c062235b6fd628c2ac35465dc42ed505 openhpi-2.0.3/utils/t/epath/epath_conv_056.c 2639
-MD5 f5eb52ef5e77a24ba0137840d82d5ddd openhpi-2.0.3/utils/t/epath/epath_conv_057.c 2612
-MD5 bea81223ec9607f98d458d82bd0aff26 openhpi-2.0.3/utils/t/epath/epath_conv_058.c 2585
-MD5 cc093169bae737879250c8200fa90085 openhpi-2.0.3/utils/t/epath/epath_conv_059.c 2636
-MD5 911de39c531cce8dbfa8853ed1675ae6 openhpi-2.0.3/utils/t/epath/epath_conv_060.c 2621
-MD5 20b747f72bb84e32de4144d90a59305b openhpi-2.0.3/utils/t/epath/epath_conv_061.c 2624
-MD5 feaf1046944628229bc4e37b9bdb1ffa openhpi-2.0.3/utils/t/epath/epath_conv_062.c 2621
-MD5 3b1096df55f69a0ca73336faaa09b3d8 openhpi-2.0.3/utils/t/epath/epath_conv_063.c 2627
-MD5 a5690407a49e9ac817c4d517fce442b7 openhpi-2.0.3/utils/t/epath/epath_conv_064.c 2615
-MD5 93871ddfe514e35a728d6223ffc091f2 openhpi-2.0.3/utils/t/epath/epath_conv_065.c 2609
-MD5 600d485b917a9b7c32ad8743ea3ea336 openhpi-2.0.3/utils/t/epath/epath_conv_066.c 2633
-MD5 802957ab4f99a4b41361bc4125e8904a openhpi-2.0.3/utils/t/epath/epath_conv_067.c 2609
-MD5 011925530221704a1ef7b1c923953d3c openhpi-2.0.3/utils/t/epath/epath_conv_068.c 2618
-MD5 0e657a47e1f438e0dbdf53cb04c43157 openhpi-2.0.3/utils/t/epath/epath_conv_069.c 2654
-MD5 acc1e85d808abed46744af3e933bd9b0 openhpi-2.0.3/utils/t/epath/epath_conv_070.c 2582
-MD5 18deb875dff9943e8357e9068896a8bd openhpi-2.0.3/utils/t/epath/epath_conv_071.c 2606
-MD5 ff2f331fde97f1f352f63494a9e82a28 openhpi-2.0.3/utils/t/epath/epath_conv_072.c 2606
-MD5 8d1a81ae18b3fdaf1b5fb9cc153dc1e9 openhpi-2.0.3/utils/t/epath/epath_conv_073.c 2603
-MD5 0dc85f95a8f3a6220d59b2776f04e576 openhpi-2.0.3/utils/t/epath/epath_conv_074.c 2615
-MD5 cf326065eb5859825acdc91a6dedd06a openhpi-2.0.3/utils/t/epath/epath_conv_075.c 2621
-MD5 0251154106e109a2154ea741582d32b9 openhpi-2.0.3/utils/t/epath/epath_conv_076.c 2582
-MD5 151145059af14a592be0909560492db2 openhpi-2.0.3/utils/t/epath/epath_conv_077.c 2612
-MD5 b27bb0e92c85d56a88a4d70b2da34fdd openhpi-2.0.3/utils/t/epath/epath_conv_078.c 2651
-MD5 9e982c7ef24d262a63fe50b3dc9f2970 openhpi-2.0.3/utils/t/epath/epath_conv_079.c 2621
-MD5 4f7b96c2889dc4e78b52ffb08fd1726a openhpi-2.0.3/utils/t/epath/epath_conv_080.c 2603
-MD5 3be788055a16f966e57be902b1867f7e openhpi-2.0.3/utils/t/epath/epath_conv_081.c 2615
-MD5 bb83208baa997edb32b05763e7a97668 openhpi-2.0.3/utils/t/epath/epath_conv_082.c 2636
-MD5 57cb655099fab203dc5ef8e99af33c69 openhpi-2.0.3/utils/t/epath/epath_conv_083.c 2609
-MD5 bda5f1293e8971067a52c69ddaa07eb4 openhpi-2.0.3/utils/t/epath/epath_conv_084.c 2651
-MD5 897e58de9fa97f38e0959362533c9f2f openhpi-2.0.3/utils/t/epath/epath_conv_085.c 2615
-MD5 abe0a34f4171d95d1d003e46dd9ffa4f openhpi-2.0.3/utils/t/epath/epath_conv_086.c 2633
-MD5 7e8c3228d4288376b1afa8636a601005 openhpi-2.0.3/utils/t/epath/epath_conv_087.c 2627
-MD5 c8177cddda8e9f475695f3576cb8b3ae openhpi-2.0.3/utils/t/epath/epath_conv_088.c 2663
-MD5 59ee56e3a9b6a07f3b03983c6f107706 openhpi-2.0.3/utils/t/epath/epath_conv_089.c 2639
-MD5 1d3cb590d7c1301ac956dd119ebe7d82 openhpi-2.0.3/utils/t/epath/epath_conv_090.c 2606
-MD5 c02c4714b55cf1aab6768043e77aaf41 openhpi-2.0.3/utils/t/epath/epath_conv_091.c 2621
-MD5 48beb33583bd1abde3c6c27332774660 openhpi-2.0.3/utils/t/epath/epath_conv_092.c 2654
-MD5 cd6f3935cfdfd64ce89d4d21781c681e openhpi-2.0.3/utils/t/epath/epath_conv_093.c 2636
-MD5 7104dfc6afbc5eef636b3deb8a732eeb openhpi-2.0.3/utils/t/epath/epath_conv_094.c 2603
-MD5 70af034054b4e710aa798b6cdf02b993 openhpi-2.0.3/utils/t/epath/epath_conv_095.c 2624
-MD5 c6b7c2ecaa0cb2222fac612934e8dfbd openhpi-2.0.3/utils/t/epath/epath_conv_096.c 2627
-MD5 6615d091501edde95b2226bbd1d1e1df openhpi-2.0.3/utils/t/epath/epath_conv_097.c 2618
-MD5 32d2c14dda529d13c9ee54029595e728 openhpi-2.0.3/utils/t/epath/epath_conv_098.c 2597
-MD5 19f26fc128c6fbcee41effdfba19e050 openhpi-2.0.3/utils/t/epath/epath_conv_099.c 2663
-MD5 3fc5fe29cd947ea4ef708fb387cc81be openhpi-2.0.3/utils/t/epath/epath_conv_100.c 1977
-MD5 01e2524192289f7dc2badc6ef3965b81 openhpi-2.0.3/utils/t/epath/epath_conv_101.c 1998
-MD5 8d18cd6c6c2991a6675542460537ae50 openhpi-2.0.3/utils/t/epath/ep_cmp_000.c 766
-MD5 6fedab06eaf772c4c3e4bc8772bb014c openhpi-2.0.3/utils/t/epath/ep_cmp_001.c 924
-MD5 b429fb1391f21b44d3b3ab1d771240e0 openhpi-2.0.3/utils/t/epath/ep_cmp_002.c 1059
-MD5 44a9dc2b67c4a9f4f489ec93cba98d76 openhpi-2.0.3/utils/t/epath/ep_cmp_003.c 1457
-MD5 bcc619c00ed199bd75f49ed54d042fc1 openhpi-2.0.3/utils/t/epath/ep_cmp_004.c 2007
-MD5 07147e02a76a634728f35272e61e8765 openhpi-2.0.3/utils/t/epath/ep_cmp_005.c 1188
-MD5 2b9bde62a5f44f01b455ea32a390d020 openhpi-2.0.3/utils/t/epath/ep_cmp_006.c 834
-MD5 01e90bfa140b68c87dd66fd8d5abf62a openhpi-2.0.3/utils/t/epath/ep_cmp_007.c 834
-MD5 7888a90e513406099279ff421a2ee4f4 openhpi-2.0.3/utils/t/epath/ep_cmp_008.c 1163
-MD5 1eefb90540320d4a705ce58719dcc07c openhpi-2.0.3/utils/t/epath/ep_cmp_009.c 1117
-MD5 7182655cdb5fae5a7e52090648db8c24 openhpi-2.0.3/utils/t/epath/ep_cmp_010.c 2015
-MD5 a9c1c16d61e31adc60fe414316f43ea2 openhpi-2.0.3/utils/t/epath/ep_cmp_011.c 1993
-MD5 0fb452ec8569015c49d1dfa6daf46177 openhpi-2.0.3/utils/t/sahpi/sahpi_event_utils_test.c 13173
-MD5 9385c50b930d1d8063acb3b6e9fb3f64 openhpi-2.0.3/utils/t/sahpi/sahpi_event_encode_test.c 123179
-MD5 7df6b8defe6c9eb801a9c3e6b09201e7 openhpi-2.0.3/utils/t/sahpi/epath_utils.c 19234
-MD5 1bf7a2f1601acca365367c10cd881f55 openhpi-2.0.3/utils/t/sahpi/sahpi_time_utils.c 3069
-MD5 a3799a153c5c0aa2b32c2de4a66c74ce openhpi-2.0.3/utils/t/sahpi/sahpi_struct_rptentry_test.c 4255
-MD5 3bce5b1043e4e4e2f8d83a6e36a337f6 openhpi-2.0.3/utils/t/sahpi/sahpi_struct_idrfield_test.c 3243
-MD5 e4be617a48b46041f96f64916eb312a2 openhpi-2.0.3/utils/t/sahpi/sahpi_enum_utils.c 115153
-MD5 57d65ea95e6a7c0198485db504d01d73 openhpi-2.0.3/utils/t/sahpi/sahpi_struct_idrinfo_test.c 2982
-MD5 953fc1335a71da32e21e688e61a5a1f0 openhpi-2.0.3/utils/t/sahpi/Makefile.am 2353
-MD5 4ef033eee67dc78a4dd6752337060114 openhpi-2.0.3/utils/t/sahpi/Makefile.in 26668
-MD5 03ee357b19486309d3096c8dfe3e87d0 openhpi-2.0.3/utils/t/sahpi/sahpi_time_utils_test.c 3272
-MD5 57bce6b2285a619525ba77cca15fc888 openhpi-2.0.3/utils/t/sahpi/sahpi_event_utils.c 15545
-MD5 3f29ebecc62d8c31ac14526af8323b02 openhpi-2.0.3/utils/t/sahpi/sahpi_struct_utils_test.c 75028
-MD5 aef33d43b7526b666731c4d778d14dc4 openhpi-2.0.3/utils/t/sahpi/sahpi_enum_utils_test.c 672130
-MD5 8b79da9ce38090fad1548014b14589d8 openhpi-2.0.3/utils/t/sahpi/sahpi_struct_idrarea_test.c 3010
-MD5 4e1bcc0b6ba2fc2c12053c5752b1ef9c openhpi-2.0.3/utils/t/sahpi/sahpi_event_encode.c 5631
-MD5 ccf0bd8ce2a8a3ba6f697fb563b6d2d7 openhpi-2.0.3/utils/t/sahpi/sahpi_struct_utils.c 107559
-MD5 b06429521b0d22c32ddbea9972fbe8c2 openhpi-2.0.3/utils/t/sahpi/sahpi_struct_rdr_test.c 8183
-MD5 c5f19a1634255e408f03cea1e28bc57b openhpi-2.0.3/utils/t/sahpi/sahpi_text_utils_test.c 3873
-MD5 d854a55bb1d9dd8a94ca1f5edcb01916 openhpi-2.0.3/plugins/ipmi/t/ipmi_thres_test.c 12889
-MD5 b240fc12c41c7352c15426db8ae81930 openhpi-2.0.3/plugins/ipmi/t/Makefile.am 2009
-MD5 10615e356bca9b1db6d9ad108b121077 openhpi-2.0.3/plugins/ipmi/t/Makefile.in 16154
-MD5 4ef7bb65ec1b055304c722c64656f061 openhpi-2.0.3/plugins/ipmidirect/t/con_001.c 8785
-MD5 c1bb771a95c902e254748dca02012199 openhpi-2.0.3/plugins/ipmidirect/t/ipmi_sensor_factors.cpp 8571
-MD5 757f47275efdcb3b3307a0c7ccc15894 openhpi-2.0.3/plugins/ipmidirect/t/ipmi_auth.cpp 3871
-MD5 d62f674e872248e0dcfcab186cf283f6 openhpi-2.0.3/plugins/ipmidirect/t/con_000.cpp 4983
-MD5 a301d2be8e33c8bade3a67168a90cbe4 openhpi-2.0.3/plugins/ipmidirect/t/ipmi_cmd.cpp 20146
-MD5 2d16540c47c9dcde85543589165edd5f openhpi-2.0.3/plugins/ipmidirect/t/sensor_factors_000.cpp 2460
-MD5 f9b9203a0abd18d99b50e0da2d352b81 openhpi-2.0.3/plugins/ipmidirect/t/ipmi_con.cpp 12739
-MD5 16027403a0a134ae1e6e6df493100f27 openhpi-2.0.3/plugins/ipmidirect/t/ipmi_utils.cpp 2533
-MD5 4c5e910d6657a943ff38b0bf834815cb openhpi-2.0.3/plugins/ipmidirect/t/Makefile.am 1760
-MD5 9a4c3a500de2c26ecbb2e88d9520057d openhpi-2.0.3/plugins/ipmidirect/t/Makefile.in 22476
-MD5 79210f84e1063abc2727d948c9690557 openhpi-2.0.3/plugins/ipmidirect/t/ipmi_addr.cpp 1420
-MD5 b7262be7ea65fadfc0bbe9b605e1982f openhpi-2.0.3/plugins/ipmidirect/t/thread_000.cpp 1304
-MD5 f8d98c78a2fd83dcd213e133cf5bc98b openhpi-2.0.3/plugins/ipmidirect/t/ipmi_con_lan.cpp 28599
-MD5 b4d169771b98e5ec1065a5f750adce48 openhpi-2.0.3/plugins/ipmidirect/t/ipmi_log.cpp 6152
-MD5 c89d504290ad33c4df9880e49110e2c4 openhpi-2.0.3/plugins/ipmidirect/t/test.h 484
-MD5 2a98bd28af92fcad53a2992b0259d384 openhpi-2.0.3/plugins/ipmidirect/t/ipmi_con_smi.cpp 10915
-MD5 1a4847fc3b755c63cc1abe4e676e4e16 openhpi-2.0.3/plugins/ipmidirect/t/ipmi_msg.cpp 1266
-MD5 fa6a72dd6677e449ab7b81d612e2fe14 openhpi-2.0.3/plugins/ipmidirect/t/thread.cpp 6153
-MD5 d89a943f2114c97c8d2962ba46a337c5 openhpi-2.0.3/plugins/snmp_bc/t/openhpi.conf 3731
-MD5 38acec063d8722ff21d7bf557507a770 openhpi-2.0.3/plugins/snmp_bc/t/snmp_bc_event.c 43898
-MD5 bc79dddd455f11d2cc616947c0ab1f10 openhpi-2.0.3/plugins/snmp_bc/t/el2event.c 206849
-MD5 22dcd70d93a4f3f912cf18f5d489d7e9 openhpi-2.0.3/plugins/snmp_bc/t/snmp_bc_watchdog.c 1085
-MD5 37f2f2a5359d848b5b5ce73406ca206f openhpi-2.0.3/plugins/snmp_bc/t/sim_resources.c 350670
-MD5 3f33d8c2cf528f1058194f9b1e0339af openhpi-2.0.3/plugins/snmp_bc/t/sim_resources.h 907
-MD5 d7dbd38dd26e33630a6cd833e50d26bd openhpi-2.0.3/plugins/snmp_bc/t/tel001.c 1570
-MD5 580f6dc9ea727da4172f97ef86e4419c openhpi-2.0.3/plugins/snmp_bc/t/tel002.c 1911
-MD5 5fe65c4932311a69352a5522b8f97176 openhpi-2.0.3/plugins/snmp_bc/t/tel003.c 1880
-MD5 950a88bbb09df4f5ed68de036bf7d496 openhpi-2.0.3/plugins/snmp_bc/t/tel004.c 1850
-MD5 d4be3717226af64039f505e6f2d5d222 openhpi-2.0.3/plugins/snmp_bc/t/tel005.c 2748
-MD5 bd2c204052804860179a4aeddaf61c26 openhpi-2.0.3/plugins/snmp_bc/t/tel006.c 1520
-MD5 4b3d57d65344f8883e4830df71afa07a openhpi-2.0.3/plugins/snmp_bc/t/tel007.c 2866
-MD5 2da45551ee0f71889750be0b4049528b openhpi-2.0.3/plugins/snmp_bc/t/tsensorget001.c 1162
-MD5 ca956ee2590c5121f13bd3f29a87670b openhpi-2.0.3/plugins/snmp_bc/t/tsensorget002.c 1429
-MD5 11ba1719c68132001855cb51f5b95773 openhpi-2.0.3/plugins/snmp_bc/t/tsensorget003.c 1336
-MD5 8522486c114c7c3fdedb98f5cfad4e87 openhpi-2.0.3/plugins/snmp_bc/t/tsensorget004.c 1985
-MD5 f7743aeb75c1f9a553174f4da9946fd0 openhpi-2.0.3/plugins/snmp_bc/t/tsensorget005.c 1985
-MD5 09955dd3632d6d3ee6cf02ccef85bedb openhpi-2.0.3/plugins/snmp_bc/t/tsensorget010.c 3040
-MD5 31c5f276e8d276b11969eb4fd27f55d7 openhpi-2.0.3/plugins/snmp_bc/t/tsensorget013.c 3237
-MD5 16951dd2fbc4856250b6017ca80f00c3 openhpi-2.0.3/plugins/snmp_bc/t/tsensorget016.c 2382
-MD5 61cc9f41840e35822f578fce6656c692 openhpi-2.0.3/plugins/snmp_bc/t/tsensorget031.c 2398
-MD5 b4624ce1658c9117dcec17dc4f2e30e0 openhpi-2.0.3/plugins/snmp_bc/t/tsensorget033.c 1934
-MD5 edbfc2aef1998424204d809b27c95c44 openhpi-2.0.3/plugins/snmp_bc/t/tsensorget034.c 2908
-MD5 f891506183ede9a3a11be10407292943 openhpi-2.0.3/plugins/snmp_bc/t/tsensorget035.c 1163
-MD5 43ec92fd8845f3b533869c42cfa4c2ce openhpi-2.0.3/plugins/snmp_bc/t/tsensorget036.c 2773
-MD5 6b9ad22dc366f757b92ff7169d0f0c3e openhpi-2.0.3/plugins/snmp_bc/t/tsensorget040.c 1975
-MD5 315713cce8a89c56d4c31bf7b35a2c22 openhpi-2.0.3/plugins/snmp_bc/t/tsensorget041.c 3002
-MD5 44e0bf327829f61e843d0d7dac0d33e0 openhpi-2.0.3/plugins/snmp_bc/t/tsetup.c 4450
-MD5 b908bb6e8d2165ca16cc213fefc954fa openhpi-2.0.3/plugins/snmp_bc/t/tsetup.h 1205
-MD5 1165524a633be2f13b17c53b3b3db40e openhpi-2.0.3/plugins/snmp_bc/t/snmp_bc_resources_rsa.c 83442
-MD5 c341eed34a2a9f12f5ab91660e8f84d1 openhpi-2.0.3/plugins/snmp_bc/t/snmp_bc_discover_bc.c 40980
-MD5 3bf5dedcf2cbcec2e01a57f112719f02 openhpi-2.0.3/plugins/snmp_bc/t/snmp_utils.c 2141
-MD5 77c4531379f5daba9cf0c205debbd265 openhpi-2.0.3/plugins/snmp_bc/t/snmp_bc_resources.c 263690
-MD5 9caa19e2b2f4c8a30bd4fa48323c1243 openhpi-2.0.3/plugins/snmp_bc/t/snmp_bc_discover_rsa.c 10119
-MD5 af1b8213746a4ce3ff78be10872ba00e openhpi-2.0.3/plugins/snmp_bc/t/snmp_bc_discover.c 19754
-MD5 323dc49ca664f6d9d68fcf6fdd4acae3 openhpi-2.0.3/plugins/snmp_bc/t/tevent.c 44298
-MD5 b6e4ea4a5d57974a77e745d8e5a629eb openhpi-2.0.3/plugins/snmp_bc/t/snmp_bc_utils.c 6909
-MD5 c65eb323f6d07c87d71368446fd9c22c openhpi-2.0.3/plugins/snmp_bc/t/tsnmp_bc_getset.c 3874
-MD5 fb7d41e0268fd7d7e7a20a43754269b2 openhpi-2.0.3/plugins/snmp_bc/t/snmp_bc_hotswap.c 8263
-MD5 6e0325a94fc6c7e6ceecd9255bc229e6 openhpi-2.0.3/plugins/snmp_bc/t/snmp_bc_sel.c 26690
-MD5 f2f6f498c3910a01d5f9d30b4ea22dd3 openhpi-2.0.3/plugins/snmp_bc/t/tsensorset001.c 2468
-MD5 aad81ee6088380af04a67431ed5ec8ab openhpi-2.0.3/plugins/snmp_bc/t/tsensorset002.c 2704
-MD5 29987b7ece0be4bb52809abcbf1ddab9 openhpi-2.0.3/plugins/snmp_bc/t/tsensorset003.c 2710
-MD5 fb480ea148e35ae61125afef710bbb73 openhpi-2.0.3/plugins/snmp_bc/t/tsensorset004.c 2921
-MD5 ffe20a7abc9706fae5e4d32c77e59c25 openhpi-2.0.3/plugins/snmp_bc/t/tsensorset005.c 2465
-MD5 62be7c9c8c1d5a6a895963ac6fc363dc openhpi-2.0.3/plugins/snmp_bc/t/tsensorset006.c 2718
-MD5 9e1ad6f766035b37b5ccb8083f38afa6 openhpi-2.0.3/plugins/snmp_bc/t/tsensorset007.c 2789
-MD5 afe56b6164a003454034e690feb576e8 openhpi-2.0.3/plugins/snmp_bc/t/tsensorset008.c 3624
-MD5 ec4b5880fd99436fe6563196d87e6e14 openhpi-2.0.3/plugins/snmp_bc/t/tsensorset009.c 2686
-MD5 23f08974fbaa6252756a2c05cc9417d7 openhpi-2.0.3/plugins/snmp_bc/t/tsensorset010.c 2887
-MD5 acc929a7d2e7a542f7b4debdbc1ca89d openhpi-2.0.3/plugins/snmp_bc/t/tsensorset011.c 2893
-MD5 4362813c837ef9fa8a3280d1fdc9b234 openhpi-2.0.3/plugins/snmp_bc/t/tsensorset012.c 2963
-MD5 e36c322a984874170d2fb9a9ab242560 openhpi-2.0.3/plugins/snmp_bc/t/tsensorset013.c 2940
-MD5 c3dbd858d0aca6dd56cebf3c6207abd2 openhpi-2.0.3/plugins/snmp_bc/t/tsensorset015.c 3301
-MD5 2bc5c6fcf141eb69f0f9f3296711e8af openhpi-2.0.3/plugins/snmp_bc/t/tsensorset017.c 3325
-MD5 25165c1b2ed9675bd26aa15d58c997d4 openhpi-2.0.3/plugins/snmp_bc/t/tsensorset018.c 3270
-MD5 d56428e01640747bd5494495e506e484 openhpi-2.0.3/plugins/snmp_bc/t/tsensorset019.c 2693
-MD5 3caecaa2e28cf04b1bece1f9e51e8e3f openhpi-2.0.3/plugins/snmp_bc/t/tsensorset020.c 1970
-MD5 5c290df99b251b18cc184d4506f9dbc8 openhpi-2.0.3/plugins/snmp_bc/t/tsensorset021.c 2724
-MD5 b478d558298c10407698428b593a776c openhpi-2.0.3/plugins/snmp_bc/t/tsensorset022.c 2803
-MD5 430b2e4c1fcdc53e470d4d435c2aa08c openhpi-2.0.3/plugins/snmp_bc/t/tsensorset023.c 2783
-MD5 c9d7f459617a17d806e0e60ca142c6c4 openhpi-2.0.3/plugins/snmp_bc/t/tsensorset024.c 2823
-MD5 f860504352808f02eec34a79535eb7da openhpi-2.0.3/plugins/snmp_bc/t/sim_init.c 3007
-MD5 7de91459eb38adab1fa0f2ab9516ba9e openhpi-2.0.3/plugins/snmp_bc/t/snmp_bc_annunciator.c 11491
-MD5 8774eb1806d6e19690a4781a508cf7b0 openhpi-2.0.3/plugins/snmp_bc/t/Makefile.am 19656
-MD5 983dda961c18562d25dc951ca2412628 openhpi-2.0.3/plugins/snmp_bc/t/Makefile.in 81848
-MD5 90e310c0bd88f8dc15d96c0ed57663aa openhpi-2.0.3/plugins/snmp_bc/t/tdiscover001.c 1100
-MD5 5d94ee20e79c394d923673efc41eb048 openhpi-2.0.3/plugins/snmp_bc/t/thotswap001.c 4419
-MD5 793453b3e6e874a61ff26a1eb791c1d5 openhpi-2.0.3/plugins/snmp_bc/t/thotswap002.c 2689
-MD5 583f5077e5dcd32fed229439846e9737 openhpi-2.0.3/plugins/snmp_bc/t/thotswap003.c 2680
-MD5 ba069fa81f8f99a91feb008810b78910 openhpi-2.0.3/plugins/snmp_bc/t/thotswap004.c 2483
-MD5 3e80a35e945bbfeefdd1e89a2b4fb70f openhpi-2.0.3/plugins/snmp_bc/t/thotswap005.c 2616
-MD5 44b4c916389ce07ce11367850d110cad openhpi-2.0.3/plugins/snmp_bc/t/thotswap006.c 2438
-MD5 0d5678fff3674fd04eed012f38be9a74 openhpi-2.0.3/plugins/snmp_bc/t/thotswap007.c 1877
-MD5 250f1c1f2f71cdbebbdfb8033f999c07 openhpi-2.0.3/plugins/snmp_bc/t/thotswap008.c 2385
-MD5 5c96a892ce814be2215123969763062a openhpi-2.0.3/plugins/snmp_bc/t/thotswap009.c 2318
-MD5 955cda12b994066ea836962c6d5ac245 openhpi-2.0.3/plugins/snmp_bc/t/tinv001.c 3796
-MD5 9ff3941fb79577494568b7f03d751e39 openhpi-2.0.3/plugins/snmp_bc/t/tinv002.c 2820
-MD5 062f6a4c38727eccab4469b0913401e5 openhpi-2.0.3/plugins/snmp_bc/t/tinv003.c 3448
-MD5 cad881a64a2bbc4720f25460b5af2487 openhpi-2.0.3/plugins/snmp_bc/t/tinv004.c 3489
-MD5 532af4ef23359d8b5710b43b1cbac3ca openhpi-2.0.3/plugins/snmp_bc/t/tinv005.c 3537
-MD5 8888a6c2efeb584a3c67c7aec3d0a70a openhpi-2.0.3/plugins/snmp_bc/t/tinv006.c 2879
-MD5 d88c7a512865f5ed7a81668e24589d44 openhpi-2.0.3/plugins/snmp_bc/t/tinv007.c 2844
-MD5 9fb2b2244bda0ea85f51e44f77e35ac0 openhpi-2.0.3/plugins/snmp_bc/t/snmp_bc_power.c 5838
-MD5 ab7d4ebe8eff87f8bf4004e88dd52f1d openhpi-2.0.3/plugins/snmp_bc/t/snmp_bc_session.c 9164
-MD5 976cc3c3d55629fa808d14b6140944b1 openhpi-2.0.3/plugins/snmp_bc/t/snmp_bc_xml2event.c 10718
-MD5 bac2cbe1df174772878ce8c68450d1ad openhpi-2.0.3/plugins/snmp_bc/t/tsptime001.c 1502
-MD5 7bfb93262ed735c18c4bd1717c481319 openhpi-2.0.3/plugins/snmp_bc/t/tsptime002.c 1508
-MD5 728aeac533ede56727fc1dda07a0c3ae openhpi-2.0.3/plugins/snmp_bc/t/snmp_bc_control.c 8840
-MD5 5b33e36d32a8ff40f0dd59d8c4a2540a openhpi-2.0.3/plugins/snmp_bc/t/snmp_bc_reset.c 4729
-MD5 749d4b2ab7e9424c980f4f694ae722b3 openhpi-2.0.3/plugins/snmp_bc/t/tcontrol_parms.c 2863
-MD5 1308d9b4b06065cd2ce60f8ca73c1db8 openhpi-2.0.3/plugins/snmp_bc/t/snmp_bc.c 15601
-MD5 e812a3d7c885bb0b46f955d9fa45ff2e openhpi-2.0.3/plugins/snmp_bc/t/snmp_bc_inventory.c 20900
-MD5 405043a82e89d5106c4536d086928e0c openhpi-2.0.3/plugins/snmp_bc/t/snmp_bc_time.c 11955
-MD5 5c7cf032451863bbc33361a0816cbf9b openhpi-2.0.3/plugins/snmp_bc/t/tset_resource_sev.c 2482
-MD5 b70e29a4f6244867808ceef0afa5c1a9 openhpi-2.0.3/plugins/snmp_bc/t/tset_resource_tag.c 2576
-MD5 c8071f505ac87695401f56836ba30ccb openhpi-2.0.3/plugins/snmp_bc/t/tcontrol001.c 3992
-MD5 2a114e4ccf8803dce70091fb608ac967 openhpi-2.0.3/plugins/snmp_bc/t/tcontrol002.c 3029
-MD5 8464a5354739688562af4b8a915b9a8f openhpi-2.0.3/plugins/snmp_bc/t/tcontrol003.c 4273
-MD5 eb46b1f75430c827a72f8405614204f8 openhpi-2.0.3/plugins/snmp_bc/t/snmp_bc_sensor.c 46393
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCeqUOI1lqEGTUzyQRAuuZAJ4548TOpaQEo8weQlX2y5PSJ3jXcgCgkrn1
+c9yohdzYn5PoZIhoLQi5pzM=
+=buV+
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/openhpi/openhpi-2.0.3.ebuild b/sys-libs/openhpi/openhpi-2.0.3.ebuild
index 269ed8688bfb..431f14f76061 100644
--- a/sys-libs/openhpi/openhpi-2.0.3.ebuild
+++ b/sys-libs/openhpi/openhpi-2.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/sys-libs/openhpi/openhpi-2.0.3.ebuild,v 1.1 2005/03/25 23:06:00 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/openhpi/openhpi-2.0.3.ebuild,v 1.1.1.1 2005/11/30 09:39:40 chriswhite Exp $
 
 inherit flag-o-matic
 
@@ -15,7 +15,7 @@ IUSE="snmp examples"
 RDEPEND="virtual/libc
 		>=sys-fs/sysfsutils-1.0
 		>=sys-libs/openipmi-0.26
-		<sys-libs/openipmi-1.4*
+		<sys-libs/openipmi-1.4
 		snmp? ( >=net-analyzer/net-snmp-5.07 )"
 DEPEND="${RDEPEND}
 		virtual/os-headers"
diff --git a/sys-libs/openipmi/ChangeLog b/sys-libs/openipmi/ChangeLog
index 36ec3cde992b..6be2e9e91d5b 100644
--- a/sys-libs/openipmi/ChangeLog
+++ b/sys-libs/openipmi/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for sys-libs/openipmi
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/openipmi/ChangeLog,v 1.1 2005/03/01 07:13:43 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/openipmi/ChangeLog,v 1.1.1.1 2005/11/30 09:39:16 chriswhite Exp $
+
+*openipmi-1.3.18 (25 Mar 2005)
+
+  25 Mar 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +openipmi-1.3.18.ebuild:
+  Add old stable version for OpenHPI to use.
+
+*openipmi-1.4.14 (25 Mar 2005)
+
+  25 Mar 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +openipmi-1.4.14.ebuild:
+  Version bump.
+
+  28 Feb 2005; Robin H. Johnson <robbat2@gentoo.org> openipmi-1.4.12.ebuild:
+  Missed two deps.
 
 *openipmi-1.4.12 (28 Feb 2005)
 
diff --git a/sys-libs/openipmi/Manifest b/sys-libs/openipmi/Manifest
index 85d92fccf419..a8beb511b6e7 100644
--- a/sys-libs/openipmi/Manifest
+++ b/sys-libs/openipmi/Manifest
@@ -1,2 +1,8 @@
-MD5 017f538d9e4d5238aa236a859e0ccec1 openipmi-1.4.12.ebuild 563
+MD5 f3a52204085aed872dc38ab3a2b41901 openipmi-1.3.18.ebuild 1003
+MD5 aee419f2de24393a6616e508698aebed openipmi-1.4.12.ebuild 1206
+MD5 cfbba7d3875a26ccc4d43b2a4ed9e116 openipmi-1.4.14.ebuild 1206
+MD5 af9d8b9e82908d0fd95f602a74404dc0 ChangeLog 757
+MD5 21cd68602737d7c996bceabf6e62c468 metadata.xml 223
+MD5 5ffac0d0e5aea2cf96bae5f18ce90ff3 files/digest-openipmi-1.3.18 67
 MD5 d8b92faf5be2c84664830f92ed974b2f files/digest-openipmi-1.4.12 68
+MD5 2a65267d9408b84ddebcdf52cc1d0161 files/digest-openipmi-1.4.14 68
diff --git a/sys-libs/openipmi/openipmi-1.3.18.ebuild b/sys-libs/openipmi/openipmi-1.3.18.ebuild
index 6e2147fd41e6..d9db578fbcb5 100644
--- a/sys-libs/openipmi/openipmi-1.3.18.ebuild
+++ b/sys-libs/openipmi/openipmi-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/sys-libs/openipmi/openipmi-1.3.18.ebuild,v 1.1 2005/03/25 22:03:50 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/openipmi/openipmi-1.3.18.ebuild,v 1.1.1.1 2005/11/30 09:39:16 chriswhite Exp $
 
 DESCRIPTION="Library interface to IPMI"
 HOMEPAGE="http://sourceforge.net/projects/${PN}/"
diff --git a/sys-libs/openipmi/openipmi-1.4.12.ebuild b/sys-libs/openipmi/openipmi-1.4.12.ebuild
index 20093857df5a..d38fb96044d5 100644
--- a/sys-libs/openipmi/openipmi-1.4.12.ebuild
+++ b/sys-libs/openipmi/openipmi-1.4.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/sys-libs/openipmi/openipmi-1.4.12.ebuild,v 1.1 2005/03/01 07:13:43 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/openipmi/openipmi-1.4.12.ebuild,v 1.1.1.1 2005/11/30 09:39:16 chriswhite Exp $
 
 DESCRIPTION="Library interface to IPMI"
 HOMEPAGE="http://sourceforge.net/projects/${PN}/"
@@ -17,6 +17,8 @@ S="${WORKDIR}/${MY_P}"
 DEPEND="virtual/libc
 		dev-libs/glib
 		>=dev-lang/swig-1.3.21
+		sys-libs/gdbm
+		dev-util/pkgconfig
 		crypt? ( dev-libs/openssl )
 		snmp? ( net-analyzer/net-snmp )
 		perl? ( dev-lang/perl )"
diff --git a/sys-libs/openipmi/openipmi-1.4.14.ebuild b/sys-libs/openipmi/openipmi-1.4.14.ebuild
index be1147125606..0ca112578fbb 100644
--- a/sys-libs/openipmi/openipmi-1.4.14.ebuild
+++ b/sys-libs/openipmi/openipmi-1.4.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/sys-libs/openipmi/openipmi-1.4.14.ebuild,v 1.1 2005/03/25 22:02:57 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/openipmi/openipmi-1.4.14.ebuild,v 1.1.1.1 2005/11/30 09:39:16 chriswhite Exp $
 
 DESCRIPTION="Library interface to IPMI"
 HOMEPAGE="http://sourceforge.net/projects/${PN}/"
diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index e263832352d5..8a6e28108d64 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,13 +1,402 @@
 # ChangeLog for sys-libs/pam
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.1 2002/02/01 21:53:38 gbevin Exp $
-
-*pam-0.75-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/sys-libs/pam/ChangeLog,v 1.1.1.1 2005/11/30 09:39:41 chriswhite Exp $
+
+*pam-0.78-r3 (26 Oct 2005)
+
+  26 Oct 2005; Chris PeBenito <pebenito@gentoo.org> +pam-0.78-r3.ebuild:
+  Add fix for CAN-2005-2977. This is specific to the SELinux users. See bug
+  #109485.
+
+  09 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> metadata.xml:
+  Add pam-bugs email address as maintainer.
+
+  23 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> pam-0.78-r2.ebuild:
+  Don't use cp -a.
+
+  09 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> pam-0.78-r2.ebuild:
+  Stable on mips.
+
+  01 Aug 2005; Martin Schlemmer <azarah@gentoo.org> files/pam.d/system-auth:
+  Add some password sanity checking to system-auth.
+
+  28 Jul 2005; Seemant Kulleen <seemant@gentoo.org> -pam-0.77.ebuild,
+  -pam-0.77-r1.ebuild, -pam-0.77-r2.ebuild, -pam-0.77-r3.ebuild,
+  -pam-0.77-r4.ebuild, -pam-0.77-r7.ebuild, -pam-0.78.ebuild,
+  -pam-0.78-r1.ebuild:
+  clean out cruft ebuilds
+
+  19 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> pam-0.78-r2.ebuild:
+  Stable on alpha.
+
+  09 Jul 2005; Joseph Jezak <josejx@gentoo.org> pam-0.78-r2.ebuild:
+  Marked ppc stable.
+
+  08 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org> pam-0.78-r2.ebuild:
+  Stable on hppa.
+
+  08 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> pam-0.78-r2.ebuild:
+  Stable on sparc
+
+  08 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> files/README.pam_console,
+  pam-0.78-r2.ebuild:
+  Tweak documentation for pam_console (#31877).
+
+  07 Jul 2005; Markus Rothe <corsair@gentoo.org> pam-0.78-r2.ebuild:
+  Stable on ppc64
+
+  07 Jul 2005; Diego Pettenò <flameeyes@gentoo.org> pam-0.78-r2.ebuild:
+  Make glib stuff dependant on pam_console useflag. See bug #98190.
+
+  06 Jul 2005; Danny van Dyk <kugelfang@gentoo.org> pam-0.78-r2.ebuild:
+  Marked stable on amd64.
+
+  04 Jul 2005; Martin Schlemmer <azarah@gentoo.org> pam-0.78-r2.ebuild:
+  Add --host to glib/db's configure lines, bug #88439.
+
+  30 Jun 2005; Diego Pettenò <flameeyes@gentoo.org> pam-0.77.ebuild,
+  pam-0.77-r1.ebuild, pam-0.77-r2.ebuild, pam-0.77-r3.ebuild,
+  pam-0.77-r4.ebuild, pam-0.77-r6.ebuild, pam-0.77-r7.ebuild,
+  pam-0.77-r8.ebuild, pam-0.78.ebuild, pam-0.78-r1.ebuild,
+  pam-0.78-r2.ebuild:
+  Doesn't count on ${P} for patches as the package is going to be renamed.
+
+  27 Jun 2005; Martin Schlemmer <azarah@gentoo.org> pam-0.78-r2.ebuild:
+  Add /usr/lib specifically again, as at least here ldd does not return lib64
+  in output.
+
+  27 Jun 2005; Martin Schlemmer <azarah@gentoo.org> pam-0.78-r2.ebuild:
+  Update cracklib dependencies, bug #85679.
+
+  21 Jun 2005; Danny van Dyk <kugelfang@gentoo.org> pam-0.77-r6.ebuild:
+  Fixed BUG #96385 by changing hardcoded libdir in pam_cracklib's Makefile to
+  $(get_libdir).
+
+  24 May 2005; Diego Pettenò <flameeyes@gentoo.org> files/pam.d/other,
+  files/pam.d/system-auth:
+  Removed full path from pam.d files, to fix AMD64 issues.
+
+  22 May 2005; Diego Pettenò <flameeyes@gentoo.org> -files/pam.d/rexec,
+  -files/pam.d/rlogin, -files/pam.d/rsh:
+  Removed pam.d files for rexec, rlogin and rsh, as they are installed by
+  netkit-rsh.
+
+  20 May 2005; Diego Pettenò <flameeyes@gentoo.org> pam-0.78.ebuild,
+  pam-0.78-r1.ebuild, pam-0.78-r2.ebuild:
+  Use new pam eclass for new dopamd/newpamd functions. Fixes #86823.
+
+  16 May 2005; Diego Pettenò <flameeyes@gentoo.org> pam-0.77.ebuild,
+  pam-0.77-r1.ebuild, pam-0.77-r2.ebuild, pam-0.77-r3.ebuild,
+  pam-0.77-r4.ebuild, pam-0.77-r6.ebuild, pam-0.77-r7.ebuild,
+  pam-0.77-r8.ebuild, pam-0.78.ebuild, pam-0.78-r1.ebuild:
+  Converted to use toolchain-funcs instead of gcc eclass.
+
+  28 Apr 2005; Martin Schlemmer <azarah@gentoo.org> pam-0.77.ebuild,
+  pam-0.77-r1.ebuild, pam-0.77-r2.ebuild, pam-0.77-r3.ebuild,
+  pam-0.77-r4.ebuild, pam-0.77-r6.ebuild, pam-0.77-r7.ebuild,
+  pam-0.77-r8.ebuild:
+  Only add the virtual to the >=0.78 series, as we want to use it for the
+  'include' directive to have bsd support.
+
+  28 Apr 2005; Martin Schlemmer <azarah@gentoo.org> pam-0.77.ebuild,
+  pam-0.77-r1.ebuild, pam-0.77-r2.ebuild, pam-0.77-r3.ebuild,
+  pam-0.77-r4.ebuild, pam-0.77-r6.ebuild, pam-0.77-r7.ebuild,
+  pam-0.77-r8.ebuild, pam-0.78.ebuild, pam-0.78-r1.ebuild,
+  pam-0.78-r2.ebuild:
+  Add virtual.
+
+  25 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org> pam-0.78-r2.ebuild:
+  Use proper toolchain compiler.
+
+  23 Mar 2005; Martin Schlemmer <azarah@gentoo.org> pam-0.78-r2.ebuild:
+  Do not care about sandbox in /usr check for module dependencies. Add message
+  to warn about restarting sshd.
+
+  13 Mar 2005; Martin Schlemmer <azarah@gentoo.org> pam-0.78-r2.ebuild:
+  Tweak dependency test to hopefully fix bug #84836
+
+  09 Mar 2005; Martin Schlemmer <azarah@gentoo.org> pam-0.78-r2.ebuild:
+  Do not check for gcc dir when we check if modules are link to libs in /usr.
+
+*pam-0.78-r2 (09 Mar 2005)
+
+  09 Mar 2005; Martin Schlemmer <azarah@gentoo.org> +pam-0.78-r2.ebuild:
+  Compile glib internal to fix the -fPIC issues.
+
+*pam-0.78-r1 (07 Mar 2005)
+
+  07 Mar 2005; Martin Schlemmer <azarah@gentoo.org> +pam-0.78-r1.ebuild:
+  Do not link cracklib and pwdb static, bug #83899. Add /dev/dri/\* to
+  console.perms, bug #55833. Add NIS patche from Peter S. Mazinger
+  <ps.m@gmx.net>.
+
+  26 Feb 2005; Martin Schlemmer <azarah@gentoo.org> pam-0.78.ebuild:
+  Use econf and some tweaking to fix some man pages installing into /man, bug
+  #83389.
+
+*pam-0.78 (25 Feb 2005)
+
+  25 Feb 2005; Martin Schlemmer <azarah@gentoo.org>
+  files/README.pam_console, +files/pam.d/other, +files/pam.d/system-auth,
+  +pam-0.78.ebuild:
+  Add patch from bug #80566 (by Mark Loeser <halcyon@whiterapid.com>). Added
+  workaround from bug #80604 (by Roland Bar <roland@pinguin.tv>). Force
+  locales to default, bug #70471 (by Alessandro Guido <devnull@box.it>). Fix
+  sound perms on pam_console_reset, bug #55305. Add patch for bug #62059 (by
+  Jason Fritcher <jkf@wolfnet.org>). Add pam_chroot, pam_console and
+  pam_timestamp USE flags for these optional modules
+
+*pam-0.77-r7 (04 Feb 2005)
+
+  04 Feb 2005; Martin Schlemmer <azarah@gentoo.org> +pam-0.77-r7.ebuild:
+  Update static patches to not reference /usr/lib, etc directly.
+
+*pam-0.77-r6 (03 Feb 2005)
+
+  03 Feb 2005; Martin Schlemmer <azarah@gentoo.org> +pam-0.77-r6.ebuild:
+  Fix missing '|| die' at the patch section.  Fix patch not applying.
+
+*pam-0.77-r5 (02 Feb 2005)
+
+  02 Feb 2005; Martin Schlemmer <azarah@gentoo.org> +pam-0.77-r5.ebuild:
+  Fix permission borkage, bug #74040 (added to stable for all, as its a
+  serious bug), thanks to Ulrich Mueller <ulm@kph.uni-mainz.de>.
+
+*pam-0.77-r4 (13 Dec 2004)
+
+  13 Dec 2004; Martin Schlemmer <azarah@gentoo.org> files/pam_env.conf,
+  +pam-0.77-r4.ebuild:
+  Fix DISPLAY not set for ssh -X.
+
+*pam-0.77-r3 (08 Nov 2004)
+
+  08 Nov 2004; Martin Schlemmer <azarah@gentoo.org> +files/pam_env.conf,
+  +pam-0.77-r1.ebuild, +pam-0.77-r3.ebuild:
+  Install again pam.d files for rexec, rlogin and rsh. Update
+  /etc/security/pam_env.conf to allow su to export DISPLAY and XAUTHORITY if
+  needed, bug #69925.
+
+*pam-0.77-r2 (31 Oct 2004)
+
+  31 Oct 2004; Martin Schlemmer <azarah@gentoo.org>
+  +files/pam-0.77-console-reset.patch, +pam-0.77-r2.ebuild, pam-0.77.ebuild:
+  Fix pam_console_apply -r segfaulting if a group used in
+  /etc/security/console.perms are missing, bug #50315
+
+  01 Sep 2004; Travis Tilley <lv@gentoo.org> pam-0.77-r1.ebuild:
+  made pam use $(get_libdir) for installing to lib64/lib32
+
+  13 Aug 2004; Robin H. Johnson <robbat2@gentoo.org> pam-0.77-r1.ebuild:
+  fix bug #58626, need a newer autoconf.
+
+  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> pam-0.77-r1.ebuild:
+  stable on alpha and ia64
+
+  27 Jun 2004; Aron Griffis <agriffis@gentoo.org> pam-0.75-r10.ebuild,
+  pam-0.75-r11.ebuild, pam-0.75-r7.ebuild, pam-0.75-r8.ebuild,
+  pam-0.75-r9.ebuild, pam-0.77-r1.ebuild, pam-0.77.ebuild:
+  QA - fix use invocation
+
+  02 Jun 2004; Travis Tilley <lv@gentoo.org> pam-0.77-r1.ebuild:
+  stable on amd64
+
+  12 May 2004; Alexander Gabert <pappy@gentoo.org> pam-0.75-r11.ebuild:
+  changed hardened-gcc logic to use flag logic
+
+  26 Apr 2004; Michael McCabe <randy@gentoo.org> pam-0.77-r1.ebuild:
+  Marked stable on s390
+
+  16 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> pam-0.75-r11.ebuild:
+  move inherit to the right place
+
+*pam-0.77-r1 (26 Mar 2004)
+
+  26 Mar 2004; Paul de Vrieze <pauldv@gentoo.org> pam-0.77-r1.ebuild:
+  Fix pam_userdb building
+
+  09 Mar 2004; <agriffis@gentoo.org> pam-0.77.ebuild:
+  stable on alpha and ia64
+
+  07 Mar 2004; Joshua Kinard <kumba@gentoo.org> pam-0.77.ebuild:
+  Marked stable on mips.
+
+  09 Feb 2004; <gustavoz@gentoo.org> pam-0.77.ebuild:
+  stable on sparc
+
+  09 Feb 2004; Guy Martin <gmsoft@gentoo.org> pam-0.75-r11.ebuild,
+  pam-0.77.ebuild:
+  Marked stable on hppa. Removed arm keywords to commit.
+
+  06 Feb 2004; Martin Schlemmer <azarah@gentoo.org> pam-0.77.ebuild:
+  Bump to stable for x86.
+
+  03 Feb 2004; Bartosch Pixa <darkspecter@gentoo.org> pam-0.77.ebuild:
+  set ppc in keywords
+
+  18 Jan 2004; Chris PeBenito <pebenito@gentoo.org> pam-0.77.ebuild:
+  Fix SELinux patch so that it compiles correctly on a system that does not have
+  a prexisting PAM install.
+
+  22 Dec 2003; Joshua Kinard <kumba@gentoo.org> pam-0.77.ebuild:
+  Added a small gnuconfig block to the berkdb build bit, because pam-0.77 pulls in
+  db-4.1.x in most cases, and 4.1.x can't detect a mips64 system properly.
+
+  21 Dec 2003; Brad House <brad_mssw@gentoo.org> pam-0.77.ebuild:
+  mark stable on amd64
+
+  15 Dec 2003; Martin Schlemmer <azarah@gentoo.org> pam-0.77.ebuild:
+  Mark unstable for all.
+
+  09 Dec 2003; Chris PeBenito <pebenito@gentoo.org> pam-0.77.ebuild:
+  Update SELinux patch in patch tarball.
+
+  10 Nov 2003; Martin Schlemmer <azarah@gentoo.org> pam-0.77.ebuild:
+  Add a 'return 0' to pkg_setup() to make sure it returns the correct value.
+
+*pam-0.77 (10 Nov 2003)
+
+  10 Nov 2003; Martin Schlemmer <azarah@gentoo.org> pam-0.77.ebuild:
+  New version. The bulk of the work was done by Donny Davies
+  <woodchip@gentoo.org>.  I just added all the gentoo patches, as well
+  as made the db stuff link to our own version of db, and not ndbm. I
+  also (in gentoo patches) made pam_pwdb, pam_radius and pam_crack link
+  to static versions of libraries, and split new pwdb as an new version
+  of our existing sys-libs/pwdb.  Other cleanups.
+
+  28 Oct 2003; Chris PeBenito <pebenito@gentoo.org> pam-0.75-r11.ebuild,
+  files/pam-0.75-selinux.diff.bz2:
+  Add new API SELinux patch
+
+  08 Oct 2003; Alexander Gabert <pappy@gentoo.org> pam-0.75-r11.ebuild:
+  added hardened-gcc lcrypt dependency again
+
+  11 Aug 2003; Luke-Jr <luke-jr@gentoo.org> pam-0.75-r10.ebuild,
+  pam-0.75-r11.ebuild, pam-0.75-r7.ebuild, pam-0.75-r8.ebuild,
+  pam-0.75-r9.ebuild:
+  Changed LICENSE to "BSD | GPL-2"
+
+  01 Jul 2003; Olivier Crete <tester@tester.ca> pam-0.75-r11.ebuild:
+  Configure finds db4
+
+  18 May 2003; Tavis Ormandy <taviso@gentoo.org> pam-0.75-r11.ebuild:
+  If glib was compiled with ccc, we need -lots.
+
+  20 Feb 2003; Zach Welch <zwelch@gentoo.org> pam-0.75-r11.ebuild :
+  Added arm to keywords.
+
+  09 Feb 2003; Guy Martin <gmsoft@gentoo.org> pam-0.75-r11.ebuild :
+  Added hppa to keywords.
+
+  08 Jan 2003; Martin Schlemmer <azarah@gentoo.org> pam-0.75-r11.ebuild :
+  Mark stable.
+
+*pam-0.75-r11 (25 Dec 2002)
+
+  15 Mar 2003; Jan Seidel <tuxus@gentoo.org> :
+  Added mips to KEYWORDS
+
+  07 Jan 2003; Martin Holzer <mholzer@gentoo.org> pam-0.75-r11.ebuild :
+  Corrected Homepage.
+
+  25 Dec 2002; Martin Schlemmer <azarah@gentoo.org> pam-0.75-r11.ebuild :
+
+  Add pam-0.75-pam_console_apply-use-correct-device.patch.bz2 to fix a
+  problem where pam_console_apply and co did not use the correct device
+  if devfsd was not used, closing bug #12207.  The patch was created by
+  Sam Yates <sam@quux.dropbear.id.au>.
+
+  16 Dec 2002; Martin Schlemmer <azarah@gentoo.org> pam-0.75-r10.ebuild :
+
+  Change DEPEND to only depend on db3 or greater, per request from Donny ...
+  this is for db4 support in future ...
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  05 Dec 2002; Martin Schlemmer <azarah@gentoo.org> pam-0.75-r10.ebuild :
+
+  Fix bison syntax for bison-1.50 or later, thanks to Redhat.  Added
+  pam-0.75-pam_console-bison.fixes.patch for this.
+
+  26 Oct 2002; Martin Schlemmer <azarah@gentoo.org> pam-0.75-r10.ebuild :
+
+  Add pam-0.75-pam_userdb-use-db3.patch to get pam_userdb to link to
+  db3 or db4 if present, rather than libndbm, as that causes unresolved
+  symbols.
+
+*pam-0.75-r10 (26 Oct 2002)
+
+  26 Oct 2002; Martin Schlemmer <azarah@gentoo.org> pam-0.75-r10.ebuild :
+
+  Generate the linker scripts in /usr/lib to fix bug #4411.
+
+*pam-0.75-r9 (24 Oct 2002)
+
+  18 Jan 2003; Jan Seidel <tuxus@gentoo.org> :
+  Added mips to keywords
+
+  24 Oct 2002; Martin Schlemmer <azarah@gentoo.org> pam-0.75-r9.ebuild :
+
+  Another snag in the problem with gcc3 linking static libs in /usr/lib
+  before dynamic ones in /lib (bug #4411).  Seems like c++ stuff do not
+  link properly with libpam.so, but rather with libpam.a, and as pam
+  must be dynamic to load its modules, it breaks auth for a few critical
+  things (like gdm and kdm).  This is not tested, but the urgency demands
+  a solution.  This release just do not install static libs for pam until
+  the gcc/binutils issue can be resolved.
+
+*pam-0.75-r8 (13 Oct 2002)
+
+  13 Oct 2002; Martin Schlemmer <azarah@gentoo.org> pam-0.75-r8.ebuild :
+
+  Add pam-0.75-pam_console-fix-fullpath-in-file-classes.patch to fix a small
+  compat problem between pam-login and pam_console.so.  pam_console.so expects
+  PAM_TTY to be set by login without prefixing "/dev/" it seems, which
+  pam-login did.  This should close bug #6612.
+
+  Synced with Mandrake and Redhat for latest patches.
+
+  05 Aug 2002; M.Schlemmer <azarah@gentoo.org> ${P}-pam_group-confile.patch :
+  Fixes the config file location of pam_group.so.  This resolves bug #6010.
+
+  31 Jul 2002; M.Schlemmer <azarah@gentoo.org> ${P}-pam_wheel-segfault.patch :
+  Fix a segfault in pam_wheel.so if "use_uid" was not given as parameter.
+  This resolves bug #5686.
+
+*pam-0.75-r7 (31 Jul 2002)
+
+  31 Jul 2002; M.Schlemmer <azarah@gentoo.org> pam-0.75-r7.ebuild :
+  Update some patches.  Ebuild cleanups, as well as some compiler
+  fixes.
+
+
+  15 Jul 2002; Mark Guertin <gerk@gentoo.org>
+  Added ppc to keywords
+
+  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
+
+
+  04 Apr 2002; M.Schlemmer <azarah@gentoo.org> pam-0.75-r6.ebuild :
+
+  Add module build checking back as we do not want some module to 
+  silently fail and lock the user out of his system.
+
+*pam-0.75-r6 (04 Apr 2002)
+
+  04 Apr 2002; Jared H. Hudson <jhhudso@gentoo.org> pam-0.75-r6.ebuild :
+
+  Made changes to make it compile without berkdb being defined as a use
+  item.
+
+*pam-0.75-r5 (03 Apr 2002)
+
+  03 Apr 2002; Geert Bevin <gbevin@gentoo.org> pam-0.75-r5.ebuild :
+
+  Made changes to make it compile the pwdb module successfully with gcc3.
+
+*pam-0.75-r2 (17 Feb 2002)
+
+  17 Feb 2002; Bruce A. Locke <blocke@shivan.org> pam-0.75-r2.ebuild :
+
+  Part 1 of PAM revamp.  Ebuild is masked out...  FOR DEVELOPER TESTING ONLY
+
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index 1acd19bd9c7c..4ef18a80f322 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -1,31 +1,15 @@
-MD5 bbf2b0e4cf2591f0e584aec93f380535 pam-0.75-r8.ebuild 3656
-MD5 c6dd412c5ea2a0d9bb29f3a92581af30 pam-0.75-r11.ebuild 4226
-MD5 c9236bb96b7706360557c5e20dc9be90 pam-0.75-r7.ebuild 4101
-MD5 7061de7516c97091f54368c7fea303b9 ChangeLog 4527
-MD5 74ae95d84c212c3b40daba2be84485f7 pam-0.75-r9.ebuild 4105
-MD5 ced117a94cd0e0c7aa1274a2d2d27837 pam-0.75-r10.ebuild 4226
-MD5 4d5ecc1712e4049e98db0efd1e474b89 files/digest-pam-0.75-r7 66
-MD5 3fb178824771809622dba0425d744143 files/digest-pam-0.75-r8 136
-MD5 31d4fe7f6f41d6523aaef448ac68e10c files/digest-pam-0.75-r9 134
-MD5 6a4d8c09b6a1825f28cbd1127a2fe582 files/pam-0.75-pam_userdb-use-db3.patch 1157
-MD5 4a38d68124955388013f9ad6ead0b9fa files/pam-0.75-pam_group-confile.patch 478
-MD5 e23ff84c5fee1855b966271fd61b8f44 files/pam-0.75-pam_console-bison.fixes.patch 534
-MD5 83fe40b0072c25238cb0918e9aee8652 files/pam-0.75-pam_wheel-segfault.patch 949
-MD5 1d0f8d7d82eebab1b2cbe31ec0020833 files/pam-0.75-r7-gentoo.tbz2 114830
-MD5 d7ac33a4d3bc266bf5d36862b40c76e5 files/digest-pam-0.75-r10 135
-MD5 c8500e98a74c35c4c2007b2bc9ea7589 files/digest-pam-0.75-r11 135
-MD5 7b9d8d0930734500608538c166d0179a files/0.75-r10/pam.d/rsh 445
-MD5 849aa086002eda305d4d6d59a94fadd8 files/0.75-r10/pam.d/rexec 457
-MD5 ec3d6de902670c90897507f4a098f668 files/0.75-r10/pam.d/rlogin 580
-MD5 7b9d8d0930734500608538c166d0179a files/0.75-r11/pam.d/rsh 445
-MD5 849aa086002eda305d4d6d59a94fadd8 files/0.75-r11/pam.d/rexec 457
-MD5 ec3d6de902670c90897507f4a098f668 files/0.75-r11/pam.d/rlogin 580
-MD5 7b9d8d0930734500608538c166d0179a files/0.75-r7/pam.d/rsh 445
-MD5 849aa086002eda305d4d6d59a94fadd8 files/0.75-r7/pam.d/rexec 457
-MD5 ec3d6de902670c90897507f4a098f668 files/0.75-r7/pam.d/rlogin 580
-MD5 7b9d8d0930734500608538c166d0179a files/0.75-r8/pam.d/rsh 445
-MD5 849aa086002eda305d4d6d59a94fadd8 files/0.75-r8/pam.d/rexec 457
-MD5 ec3d6de902670c90897507f4a098f668 files/0.75-r8/pam.d/rlogin 580
-MD5 7b9d8d0930734500608538c166d0179a files/0.75-r9/pam.d/rsh 445
-MD5 849aa086002eda305d4d6d59a94fadd8 files/0.75-r9/pam.d/rexec 457
-MD5 ec3d6de902670c90897507f4a098f668 files/0.75-r9/pam.d/rlogin 580
+MD5 27137d20ba3f34895dd90a66b5068b7b ChangeLog 15222
+MD5 73f196808b2658496c9a9bd525ca30da files/README.pam_console 2615
+MD5 b38aa656e6c205427dd4c4ba7d6d3f97 files/digest-pam-0.77-r6 201
+MD5 693d0527279f95e01ad9a5ba6ef45389 files/digest-pam-0.77-r8 201
+MD5 f6222db3bcd34dad4edfcdcd8e488920 files/digest-pam-0.78-r2 264
+MD5 9ac651407da8dec3264c075cc3bb6717 files/digest-pam-0.78-r3 264
+MD5 69f8cfad7f241eb669085eaa753cd9dd files/pam-0.77-console-reset.patch 1826
+MD5 2d840b9afde7319bc8a8f7676582af11 files/pam.d/other 139
+MD5 c3d3871612bfb718a50454c8fba54b64 files/pam.d/system-auth 402
+MD5 652f6b0ebdc63b0aa9ca6e1783c468a1 files/pam_env.conf 2980
+MD5 393d06cf4b76671f8e6ce72ac71bdad8 metadata.xml 218
+MD5 45e4ffa616491f670f6b43f7482889e7 pam-0.77-r6.ebuild 8080
+MD5 a12e7f860965fe8642486460693e8aa2 pam-0.77-r8.ebuild 8152
+MD5 71f87e5903b032bb13cdca94d73bc2ce pam-0.78-r2.ebuild 11223
+MD5 13b1c1305c3ce125bde42d2ce984bb4f pam-0.78-r3.ebuild 11288
diff --git a/sys-libs/pam/files/README.pam_console b/sys-libs/pam/files/README.pam_console
index 27442c8997de..66f80c83c950 100644
--- a/sys-libs/pam/files/README.pam_console
+++ b/sys-libs/pam/files/README.pam_console
@@ -25,14 +25,22 @@ have to be members of the audio group to access audio devices).
 However, Gentoo gives you the possibility to enable pam_console, you just have
 to follow these advices:
 
-1) In /etc/pam.d/system-auth, add the following line:
+1) Make sure you compiled sys-libs/pam with USE="pam_console", otherwise the
+   pam_console module will not be built.
 
-  session    optional     /lib/security/pam_console.so
+2) In /etc/pam.d/login, add the following line:
+
+  session    optional     pam_console.so
 
    Thus, pam_console will apply permissions from /etc/security/console.perms
-   when you log in.
+   when you log in in text consoles.
+   Do the same with /etc/pam.d/xdm if you login through xdm, with /etc/pam.d/kde
+   if you login through kdm, and so on.
+
+   Alternatively (but not recommended), you can add the line above to
+   /etc/pam.d/system-auth so that pam_console will be enabled everywhere.
    
-2) If you're using devfs, add the following lines in /etc/devfsd.conf:
+3) If you're using devfs, add the following lines in /etc/devfsd.conf:
 
   REGISTER  .*  CFUNCTION /lib/security/pam_console_apply_devfsd.so\
                     pam_console_apply_single $devpath
@@ -40,12 +48,12 @@ to follow these advices:
    In this way, permissions from /etc/security/console.perms will be applied
    also to those devices that are created dynamically.
 
-3) If you're using udev, create a file in /etc/dev.d/default/ ending with
+4) If you're using udev, create a file in /etc/dev.d/default/ ending with
    '.dev', for instance /etc/dev.d/default/pam_console.dev, containing the
    following lines:
 
-   #!/bin/sh
-   exec /sbin/pam_console_apply
+  #!/bin/sh
+  exec /sbin/pam_console_apply
  
    and make it executable:
 
@@ -54,5 +62,7 @@ to follow these advices:
    In this way, pam_console will reevaluate permissions from
    /etc/security/console.perms each time a device is dynamically created.
 
-4) Tweak /etc/security/console.perms to your own needs.
+   Another possible way to obtain the same result is to use the RUN key
+   in udev rules (see the udev documentation for more info).
 
+5) Tweak /etc/security/console.perms to your own needs.
diff --git a/sys-libs/pam/files/digest-pam-0.78-r2 b/sys-libs/pam/files/digest-pam-0.78-r2
index dedd7b207227..04e882013f62 100644
--- a/sys-libs/pam/files/digest-pam-0.78-r2
+++ b/sys-libs/pam/files/digest-pam-0.78-r2
@@ -1,4 +1,4 @@
 MD5 58cd055892e97648651d5a318888f3a0 Linux-PAM-0.78.tar.gz 488936
 MD5 ee1a1ab60f9868ea2e0bddf8492df009 pam-0.78-patches-1.2.tar.bz2 86593
 MD5 fcc481d52c3b80e20a328f8c0cb042bd db-4.3.27.tar.gz 5921872
-MD5 8f69ad5387197114b356efc64ce88d77 glib-2.6.3.tar.bz2 2300144
+MD5 777d2e34a60edad28319207b576cda91 glib-2.6.5.tar.bz2 2357089
diff --git a/sys-libs/pam/files/pam_env.conf b/sys-libs/pam/files/pam_env.conf
index 91fdad2070b4..9180dd14d044 100644
--- a/sys-libs/pam/files/pam_env.conf
+++ b/sys-libs/pam/files/pam_env.conf
@@ -1,6 +1,6 @@
-# $Date: 2004/11/08 18:33:46 $
-# $Author: azarah $
-# $Id: pam_env.conf,v 1.1 2004/11/08 18:33:46 azarah Exp $
+# $Date: 2005/11/30 09:39:41 $
+# $Author: chriswhite $
+# $Id: pam_env.conf,v 1.1.1.1 2005/11/30 09:39:41 chriswhite Exp $
 #
 # This is the configuration file for pam_env, a PAM module to load in 
 # a configurable list of environment variables for a 
@@ -49,15 +49,14 @@
 #
 # Set the REMOTEHOST variable for any hosts that are remote, default
 # to "localhost" rather than not being set at all
-# Note: Rather set default to "", as DISPLAY=localhost:0.0 do not work
-#       here at least.
-REMOTEHOST	DEFAULT= OVERRIDE=@{PAM_RHOST}
+#REMOTEHOST	DEFAULT=localhost OVERRIDE=@{PAM_RHOST}
 #
-# Set the DISPLAY variable if it seems reasonable 
-DISPLAY		DEFAULT=${REMOTEHOST}:0.0 OVERRIDE=${DISPLAY}
+# Set the DISPLAY variable if it seems reasonable
+#DISPLAY		DEFAULT=${REMOTEHOST}:0.0 OVERRIDE=${DISPLAY}
+#DISPLAY		DEFAULT= OVERRIDE=@{DISPLAY}
 #
 # Set the XAUTHORITY variable if pam_xauth is used
-XAUTHORITY	DEFAULT= OVERRIDE=@{XAUTHORITY}
+#XAUTHORITY	DEFAULT= OVERRIDE=@{XAUTHORITY}
 #
 #
 #  Now some simple variables
diff --git a/sys-libs/pam/metadata.xml b/sys-libs/pam/metadata.xml
index f093d416cbb1..b3bf86cd59b4 100644
--- a/sys-libs/pam/metadata.xml
+++ b/sys-libs/pam/metadata.xml
@@ -1,7 +1,8 @@
- * Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<herd>pam</herd>
+<maintainer>
+<email>pam-bugs@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-libs/pam/pam-0.77-r6.ebuild b/sys-libs/pam/pam-0.77-r6.ebuild
index 94400929e17c..854ca5d309fe 100644
--- a/sys-libs/pam/pam-0.77-r6.ebuild
+++ b/sys-libs/pam/pam-0.77-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/sys-libs/pam/pam-0.77-r6.ebuild,v 1.1 2005/02/03 16:47:41 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.77-r6.ebuild,v 1.1.1.1 2005/11/30 09:39:41 chriswhite Exp $
 
 PATCH_LEVEL="1.7"
 BDB_VER="4.1.25"
@@ -32,7 +32,7 @@ DEPEND="$RDEPEND
 # link statically to it - <azarah@gentoo.org> (09 Nov 2003).
 
 #inherit needs to be after DEPEND definition to protect RDEPEND
-inherit gcc eutils flag-o-matic gnuconfig
+inherit toolchain-funcs eutils flag-o-matic gnuconfig
 
 # Note that we link to static versions of glib (pam_console.so)
 # and pwdb (pam_pwdb.so) ...
@@ -43,7 +43,7 @@ DESCRIPTION="Pluggable Authentication Modules"
 S="${WORKDIR}/Linux-PAM-${PV}"
 S2="${WORKDIR}/pam-${PV}-patches"
 SRC_URI="http://www.kernel.org/pub/linux/libs/pam/pre/library/Linux-PAM-${PV}.tar.gz
-	mirror://gentoo/${P}-patches-${PATCH_LEVEL}.tar.bz2
+	mirror://gentoo/pam-${PV}-patches-${PATCH_LEVEL}.tar.bz2
 	berkdb? ( http://www.sleepycat.com/update/snapshot/db-${BDB_VER}.tar.gz )"
 
 LICENSE="PAM"
@@ -96,6 +96,12 @@ src_unpack() {
 			sed -e 's|^modules/||')
 	done
 
+	# Fix building of sys-libs/pam for no-symlink amd64 profiles
+	# BUG #96385
+	sed -i \
+		-e "s|^\(MODULE_SIMPLE_EXTRALIBS=.*\/usr\/\)lib\/|\1$(get_libdir)\/|" \
+		${S}/modules/pam_cracklib/Makefile || die sed failed
+
 	cp /usr/share/automake/install-sh . || die
 	export WANT_AUTOCONF=2.5
 	autoconf || die
diff --git a/sys-libs/pam/pam-0.77-r8.ebuild b/sys-libs/pam/pam-0.77-r8.ebuild
index e4afe31e629e..6955153f3b86 100644
--- a/sys-libs/pam/pam-0.77-r8.ebuild
+++ b/sys-libs/pam/pam-0.77-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/sys-libs/pam/pam-0.77-r8.ebuild,v 1.1 2005/02/09 17:39:13 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.77-r8.ebuild,v 1.1.1.1 2005/11/30 09:39:41 chriswhite Exp $
 
 PATCH_LEVEL="1.9"
 BDB_VER="4.1.25"
@@ -32,7 +32,7 @@ DEPEND="${RDEPEND}
 # link statically to it - <azarah@gentoo.org> (09 Nov 2003).
 
 #inherit needs to be after DEPEND definition to protect RDEPEND
-inherit gcc eutils flag-o-matic gnuconfig
+inherit toolchain-funcs eutils flag-o-matic gnuconfig
 
 # Note that we link to static versions of glib (pam_console.so)
 # and pwdb (pam_pwdb.so) ...
@@ -43,7 +43,7 @@ DESCRIPTION="Pluggable Authentication Modules"
 S="${WORKDIR}/Linux-PAM-${PV}"
 S2="${WORKDIR}/pam-${PV}-patches"
 SRC_URI="http://www.kernel.org/pub/linux/libs/pam/pre/library/Linux-PAM-${PV}.tar.gz
-	mirror://gentoo/${P}-patches-${PATCH_LEVEL}.tar.bz2
+	mirror://gentoo/pam-${PV}-patches-${PATCH_LEVEL}.tar.bz2
 	berkdb? ( http://www.sleepycat.com/update/snapshot/db-${BDB_VER}.tar.gz )"
 
 LICENSE="PAM"
diff --git a/sys-libs/pam/pam-0.78-r2.ebuild b/sys-libs/pam/pam-0.78-r2.ebuild
index dd778ea20506..a6b8fb866f37 100644
--- a/sys-libs/pam/pam-0.78-r2.ebuild
+++ b/sys-libs/pam/pam-0.78-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/sys-libs/pam/pam-0.78-r2.ebuild,v 1.1 2005/03/09 10:36:17 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.78-r2.ebuild,v 1.1.1.1 2005/11/30 09:39:40 chriswhite Exp $
 
 FORCE_SYSTEMAUTH_UPDATE="no"
 
@@ -14,7 +14,7 @@ FORCE_SYSTEMAUTH_UPDATE="no"
 PATCH_LEVEL="1.2"
 BDB_VER="4.3.27"
 BDB_VER2="4.1.25"
-GLIB_VER="2.6.3"
+GLIB_VER="2.6.5"
 PAM_REDHAT_VER="0.78-3"
 
 HOMEPAGE="http://www.kernel.org/pub/linux/libs/pam/"
@@ -23,17 +23,16 @@ DESCRIPTION="Pluggable Authentication Modules"
 S="${WORKDIR}/Linux-PAM-${PV}"
 S2="${WORKDIR}/pam-${PV}-patches"
 SRC_URI="http://www.kernel.org/pub/linux/libs/pam/pre/library/Linux-PAM-${PV}.tar.gz
-	mirror://gentoo/${P}-patches-${PATCH_LEVEL}.tar.bz2
-	http://dev.gentoo.org/~seemant/distfiles/${P}-patches-${PATCH_LEVEL}.tar.bz2
+	mirror://gentoo/pam-${PV}-patches-${PATCH_LEVEL}.tar.bz2
 	berkdb? ( http://downloads.sleepycat.com/db-${BDB_VER}.tar.gz )
 	pam_console? ( ftp://ftp.gtk.org/pub/gtk/v2.6/glib-${GLIB_VER}.tar.bz2 )"
 
 LICENSE="PAM"
 SLOT="0"
-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"
 IUSE="berkdb pwdb selinux pam_chroot pam_console pam_timestamp nis"
 
-RDEPEND=">=sys-libs/cracklib-2.7-r8
+RDEPEND=">=sys-libs/cracklib-2.8.3
 	selinux? ( sys-libs/libselinux )
 	berkdb? ( >=sys-libs/db-${BDB_VER2} )
 	pwdb? ( >=sys-libs/pwdb-0.62 )"
@@ -51,8 +50,10 @@ DEPEND="${RDEPEND}
 # Have python sandbox issues currently ...
 #	doc? ( app-text/sgmltools-lite )
 
+PROVIDE="virtual/pam"
+
 #inherit needs to be after DEPEND definition to protect RDEPEND
-inherit gcc eutils flag-o-matic gnuconfig
+inherit toolchain-funcs eutils flag-o-matic gnuconfig pam
 
 apply_pam_patches() {
 	local x=
@@ -164,6 +165,7 @@ src_compile() {
 		#./s_config
 		CFLAGS="${CFLAGS} -fPIC" \
 		../dist/configure \
+			--host=${CHOST} \
 			--cache-file=config.cache \
 			--disable-compat185 \
 			--disable-cxx \
@@ -184,7 +186,7 @@ src_compile() {
 		# XXX: hack out O_DIRECT support in db4 for now.
 		#      (Done above now with --disable-o_direct now)
 
-		make || die "BDB build failed"
+		make CC="$(tc-getCC)" || die "BDB build failed"
 		make install || die
 	fi
 
@@ -196,7 +198,9 @@ src_compile() {
 		sed -i -s 's:G_GNUC_INTERNAL::g' "${GLIB_DIR}/glib"/*.c
 
 		CFLAGS="${CFLAGS} -fPIC" \
-		./configure --enable-static \
+		./configure \
+			--host=${CHOST} \
+			--enable-static \
 			--disable-shared \
 			--with-pic \
 			--disable-threads \
@@ -207,7 +211,7 @@ src_compile() {
 
 		# Do not need to build the whole shebang
 		cd "${GLIB_DIR}/glib" || die
-		make || die "GLIB build failed"
+		make CC="$(tc-getCC)" || die "GLIB build failed"
 		make install || die
 		# Install pkg-config stuff and needed headers
 		cd "${GLIB_DIR}" || die
@@ -264,7 +268,7 @@ src_compile() {
 			_pam_aconf.h
 	fi
 
-	make || die "PAM build failed"
+	make CC="$(tc-getCC)" || die "PAM build failed"
 }
 
 src_install() {
@@ -290,7 +294,12 @@ src_install() {
 				echo
 				die "${mod_name} module did not build."
 			fi
-			if [[ -n $(ldd "${sec_dir}/${mod_name}"*.so 2>&1 | grep '/usr/') ]] ; then
+			if [[ -n $(ldd "${sec_dir}/${mod_name}"*.so 2>&1 | \
+			           grep "/usr/lib/" | \
+			           grep "/usr/$(get_libdir)/" | \
+			           grep -v "/usr/lib/gcc" | \
+			           grep -v "/usr/$(get_libdir)/gcc" | \
+			           grep -v "libsandbox") ]] ; then
 				echo
 				eerror "ERROR: ${mod_name} have dependencies in /usr."
 				echo
@@ -341,6 +350,12 @@ src_install() {
 }
 
 pkg_postinst() {
+	echo
+	einfo "If you have sshd running, please restart it to avoid possible login issues."
+	echo
+	ebeep
+	sleep 3
+
 	if [[ ${FORCE_SYSTEMAUTH_UPDATE} = "yes" ]] ; then
 		local CHECK1=$(md5sum ${ROOT}/etc/pam.d/system-auth | cut -d ' ' -f 1)
 		local CHECK2=$(md5sum ${ROOT}/etc/pam.d/system-auth.new | cut -d ' ' -f 1)
@@ -353,7 +368,7 @@ pkg_postinst() {
 			ewarn "  ${ROOT}etc/pam.d/system-auth.bak"
 			echo
 
-			cp -a ${ROOT}/etc/pam.d/system-auth \
+			cp -pPR ${ROOT}/etc/pam.d/system-auth \
 				${ROOT}/etc/pam.d/system-auth.bak;
 			mv -f ${ROOT}/etc/pam.d/system-auth.new \
 				${ROOT}/etc/pam.d/system-auth
@@ -362,4 +377,11 @@ pkg_postinst() {
 			rm -f ${ROOT}/etc/pam.d/system-auth.new
 		fi
 	fi
+
+	if use pam_console; then
+		echo
+		einfo "If you want to enable the pam_console module, please follow"
+		einfo "the instructions in /usr/share/doc/${PF}/README.pam_console."
+		echo
+	fi
 }
diff --git a/sys-libs/pam/pam-0.78-r3.ebuild b/sys-libs/pam/pam-0.78-r3.ebuild
index f22861f5a825..bf9513b124a7 100644
--- a/sys-libs/pam/pam-0.78-r3.ebuild
+++ b/sys-libs/pam/pam-0.78-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/sys-libs/pam/pam-0.78-r3.ebuild,v 1.1 2005/10/26 14:05:31 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.78-r3.ebuild,v 1.1.1.1 2005/11/30 09:39:41 chriswhite Exp $
 
 FORCE_SYSTEMAUTH_UPDATE="no"
 
diff --git a/sys-libs/pwdb/ChangeLog b/sys-libs/pwdb/ChangeLog
index f123436fafc7..a1d9b26d6cca 100644
--- a/sys-libs/pwdb/ChangeLog
+++ b/sys-libs/pwdb/ChangeLog
@@ -1,11 +1,111 @@
 # ChangeLog for sys-libs/pwdb
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pwdb/ChangeLog,v 1.1 2002/02/01 21:53:38 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pwdb/ChangeLog,v 1.1.1.1 2005/11/30 09:39:13 chriswhite Exp $
+
+  08 Oct 2005; Simon Stelling <blubb@gentoo.org> pwdb-0.62.ebuild,
+  -pwdb-0.62-r1.ebuild:
+  backport -r1 changes to 0.62, no need to do a revision bump for
+  multilib-strict fixes
+
+*pwdb-0.62-r1 (03 Feb 2005)
+
+  03 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +pwdb-0.62-r1.ebuild:
+  Multilib fixes.
+
+  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> pwdb-0.61-r4.ebuild,
+  pwdb-0.62.ebuild:
+  virtual/glibc -> virtual/libc
+
+  09 Mar 2004; <agriffis@gentoo.org> pwdb-0.62.ebuild:
+  stable on alpha and ia64
+
+  07 Mar 2004; Joshua Kinard <kumba@gentoo.org> pwdb-0.62.ebuild:
+  Marked stable on mips.
+
+  02 Mar 2004; Brian Jackson <iggy@gentoo.org> pwdb-0.62.ebuild:
+  adding initial s390 support
+
+  27 Feb 2004; Seemant Kulleen <seemant@gentoo.org> pwdb-0.61-r4.ebuild,
+  pwdb-0.62.ebuild:
+  move the filter-flags statement into src_compile
+
+  09 Feb 2004; <gustavoz@gentoo.org> pwdb-0.62.ebuild:
+  stable on sparc
+
+  09 Feb 2004; Guy Martin <gmsoft@gentoo.org> pwdb-0.62.ebuild:
+  Marked stable on hppa.
+
+  06 Feb 2004; Martin Schlemmer <azarah@gentoo.org> pwdb-0.62.ebuild:
+  Bump to stable for x86 (needed by pam).
+
+  03 Feb 2004; Bartosch Pixa <darkspecter@gentoo.org> pwdb-0.62.ebuild:
+  set ppc in keywords
+
+  21 Jan 2004; Chris PeBenito <pebenito@gentoo.org>
+  files/pwdb-0.62-selinux.patch:
+  Fix selinux patch to not link against attr
+
+  21 Dec 2003; Brad House <brad_mssw@gentoo.org> pwdb-0.62.ebuild:
+  mark stable on amd64
+
+*pwdb-0.62 (09 Nov 2003)
+
+  09 Nov 2003; Martin Schlemmer <azarah@gentoo.org> pwdb-0.62.ebuild,
+  files/pwdb-0.62-selinux.patch, files/pwdb-0.62-use-gcc-as-linker.patch:
+  Update version.
+
+  28 Oct 2003; Chris PeBenito <pebenito@gentoo.org> pwdb-0.61-r4.ebuild,
+  files/pwdb-0.61-selinux.diff.bz2:
+  Add new API SELinux patch
+
+  11 Aug 2003; Luke-Jr <luke-jr@gentoo.org> pwdb-0.61-r3.ebuild,
+  pwdb-0.61-r4.ebuild:
+  Changed LICENSE to "BSD | GPL-2"
+
+  08 Aug 2003; Matthew Rickard <frogger@gentoo.org> pwdb-0.61-r3.ebuild,
+  pwdb-0.61-r4.ebuild:
+  Filter -fstack-protector or else pam_pwdb module
+  will not build.  This should resolve Bug 23934.
+
+  18 May 2003; Tavis Ormandy <taviso@gentoo.org> pwdb-0.61-r4.ebuild:
+  stop gcc being hardcoded.
+
+  24 Mar 2003; Guy Martin <gmsoft@gentoo.org> pwdb-0.61-r4.ebuild, pwdb-0.61-hppa.patch :
+  Added patch to fix linking under some circumstances on hppa.
+
+  18 Feb 2003; Zach Welch <zwelch@gentoo.org> pwdb-0.61-r4.ebuild :
+  Added arm to keywords.
+
+  09 Feb 2003; Guy Martin <gmsoft@gentoo.org> pwdb-0.61-r4.ebuild :
+  Added hppa to keywords.
+
+="x86 ppc sparc alpha mips"
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*pwdb-0.61-r4 (26 Oct 2002)
+
+  18 Jan 2003; Jan Seidel <tuxus@gentoo.org> :
+  Added mips to keywords
+
+  26 Oct 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Fix pwdb for bug #4411.
 
 *pwdb-0.61-r3 (1 Feb 2002)
 
+  21 Sep 2002; Mike Frysinger <vapier@gentoo.org> :
+  Added HOMEPAGE variable and updated SRC_URI
+
+  15 Jul 2002; Mark Guertin <gerk@gentoo.org>
+  Added ppc to keywords
+
+  5 Apr 2002; M.Schlemmer <azarah@gentoo.org> pwdb-0.61-r3.ebuild :
+  Remove lines to install /etc/pam.d/passwd, since it comes with shadow.
+
+  21 Mar 2002; Seemant Kulleen <seemant@gentoo.org> pwdb-0.61-r3.ebuild :
+  HTML documentation no longer gzipped.
+
   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/sys-libs/pwdb/Manifest b/sys-libs/pwdb/Manifest
index c181e3e09a5a..b0264420c356 100644
--- a/sys-libs/pwdb/Manifest
+++ b/sys-libs/pwdb/Manifest
@@ -1,7 +1,7 @@
-MD5 c8596ae374b674c04d8fa970622d8685 pwdb-0.61-r4.ebuild 1595
-MD5 d9a454d78f5b53f9f25b99baacb52bc7 pwdb-0.61-r3.ebuild 1117
-MD5 9bbe7452503292cd5cbe83ce27db5fdb ChangeLog 1827
-MD5 cd2a9858f40c4a6e7098424f5785b7bc files/pwdb-0.61-hppa.patch 487
-MD5 bfc6ac3622c2b25c39d9f48d8474c2dc files/digest-pwdb-0.61-r3 61
-MD5 bfc6ac3622c2b25c39d9f48d8474c2dc files/digest-pwdb-0.61-r4 61
+MD5 97c58cf064760b2aeb64c91f73e4b647 ChangeLog 3918
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 7a17e8560e8f8e8efe9f9c87d5ebe774 pwdb-0.62.ebuild 1655
+MD5 8cc9a65a57937cd962ff641cf94e40c3 files/digest-pwdb-0.62 61
 MD5 0d0c7a6216f5cf079472dfe36ea9d71c files/passwd 143
+MD5 bf4eb22a793eb0683d8c62b4677d66f8 files/pwdb-0.62-selinux.patch 10567
+MD5 f2d1888e60ba62137f53ed5378eb7e25 files/pwdb-0.62-use-gcc-as-linker.patch 508
diff --git a/sys-libs/pwdb/files/passwd b/sys-libs/pwdb/files/passwd
index f28b525c8547..09a3643714cf 100644
--- a/sys-libs/pwdb/files/passwd
+++ b/sys-libs/pwdb/files/passwd
@@ -1,5 +1,4 @@
-auth	   required	pam_pwdb.so	nullok
+auth	   required	pam_pwdb.so shadow nullok
 account	   required	pam_pwdb.so
-password   required	pam_pwdb.so
+password   required	pam_pwdb.so md5
 session	   required	pam_pwdb.so
-
diff --git a/sys-libs/pwdb/files/pwdb-0.62-selinux.patch b/sys-libs/pwdb/files/pwdb-0.62-selinux.patch
index e87d5a8a8f52..4bbd8a6dc749 100644
--- a/sys-libs/pwdb/files/pwdb-0.62-selinux.patch
+++ b/sys-libs/pwdb/files/pwdb-0.62-selinux.patch
@@ -4,7 +4,7 @@
  SRCS = $(addsuffix .c,$(PROGS))
  OBJS = $(addsuffix .o,$(PROGS))
  
-+SELINUXLIBS = -lselinux -lattr
++SELINUXLIBS = -lselinux
 +
  # rules
  junk:
@@ -438,7 +438,7 @@
  $(LIBDYNAME): $(LIBOBJ)
  	#$(LD) -soname $(LIBSONAME) -x -shared -o $(LIBFILENAME) $(LIBOBJ) -lcrypt -lnsl -lc
 -	$(CC) -shared -Wl,-soname -Wl,$(LIBSONAME) -Wl,-x -o $(LIBFILENAME) $(LIBOBJ)  -lcrypt -lnsl -lc
-+	$(CC) -shared -Wl,-soname -Wl,$(LIBSONAME) -Wl,-x -o $(LIBFILENAME) $(LIBOBJ)  -lcrypt -lnsl -lc -lselinux -lattr
++	$(CC) -shared -Wl,-soname -Wl,$(LIBSONAME) -Wl,-x -o $(LIBFILENAME) $(LIBOBJ)  -lcrypt -lnsl -lc -lselinux
  	@ln -sf $(LIBFILENAME) $@
  
  $(LIBSTATIC): $(LIBOBJ)
diff --git a/sys-libs/pwdb/metadata.xml b/sys-libs/pwdb/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-libs/pwdb/metadata.xml
+++ b/sys-libs/pwdb/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/sys-libs/pwdb/pwdb-0.62.ebuild b/sys-libs/pwdb/pwdb-0.62.ebuild
index 0a0c53b5e30e..75f47f1d0900 100644
--- a/sys-libs/pwdb/pwdb-0.62.ebuild
+++ b/sys-libs/pwdb/pwdb-0.62.ebuild
@@ -1,22 +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/sys-libs/pwdb/pwdb-0.62.ebuild,v 1.1 2003/11/09 18:48:05 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pwdb/pwdb-0.62.ebuild,v 1.1.1.1 2005/11/30 09:39:13 chriswhite Exp $
 
 inherit eutils flag-o-matic
-filter-flags "-fstack-protector"
-
-IUSE="selinux"
 
 DESCRIPTION="Password database"
-HOMEPAGE="http://www.firstlinux.com/cgi-bin/package/content.cgi?ID=6886"
-SRC_URI="mirror://gentoo/${P}.tar.gz
-	http://nl.lunar-linux.org/lunar/sources/sources/${P}.tar.gz"
+HOMEPAGE="http://packages.gentoo.org/ebuilds/?pwdb-${PVR}"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
-LICENSE="BSD | GPL-2"
+LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm ~ia64"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
+IUSE="selinux"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	selinux? ( sys-libs/libselinux )"
 
 src_unpack () {
@@ -28,12 +25,16 @@ src_unpack () {
 
 	use selinux && epatch ${FILESDIR}/${P}-selinux.patch
 
-	sed -i -e "s/^DIRS = .*/DIRS = libpwdb/" -e "s:EXTRAS += :EXTRAS += ${CFLAGS} :" \
+	sed -i \
+		-e "s/^DIRS = .*/DIRS = libpwdb/" \
+		-e "s:EXTRAS += :EXTRAS += ${CFLAGS} :" \
 		Makefile
-	sed -i -e "s/=gcc/=${CC:-gcc}/g" default.defs
+	sed -i -e "s/=gcc/=$(tc-getCC)/g" default.defs
 }
 
 src_compile() {
+	filter-flags -fstack-protector
+
 	# author has specified application to be compiled with `-g` 
 	# no problem, but with ccc `-g` disables optimisation to make
 	# debugging easier, `-g3` enables debugging and optimisation
@@ -43,25 +44,24 @@ src_compile() {
 }
 
 src_install() {
-	dodir /lib /usr/include/pwdb
-	make INCLUDED=${D}/usr/include/pwdb \
-		LIBDIR=${D}/lib \
+	dodir /$(get_libdir) /usr/$(get_libdir) /usr/include/pwdb
+	make \
+		INCLUDED=${D}/usr/include/pwdb \
+		LIBDIR=${D}/$(get_libdir) \
 		LDCONFIG="echo" \
 		install || die
 
 	preplib /
-	dodir /usr/lib
-	mv ${D}/lib/*.a ${D}/usr/lib
+	mv ${D}/$(get_libdir)/*.a ${D}/usr/$(get_libdir)
 
-	# See bug $4411 for more info
+	# See bug #4411 for more info
 	gen_usr_ldscript libpwdb.so
 
 	insinto /etc
 	doins conf/pwdb.conf
 
-	dodoc CHANGES Copyright CREDITS README
+	dodoc CHANGES CREDITS README
 	dohtml -r doc
 	docinto txt
 	dodoc doc/*.txt
 }
-
diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index c8a980d88a07..ac47cfb33b63 100644
--- a/sys-libs/readline/ChangeLog
+++ b/sys-libs/readline/ChangeLog
@@ -1,6 +1,192 @@
 # ChangeLog for sys-libs/readline
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.1 2002/02/01 21:53:38 gbevin Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.1.1.1 2005/11/30 09:39:07 chriswhite Exp $
+
+  10 Sep 2005; Kito <kito@gentoo.org> readline-5.0-r2.ebuild:
+  ~ppc-macos keyword. Keep shlibs in /usr/lib and skip gen_usr_ldscript on
+  Darwin userland.
+
+  16 Jul 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/readline-5.0-darwin.patch, readline-5.0-r2.ebuild:
+  Fix support for Darwin8.  Patch by Kito #99143.
+
+  27 Jun 2005; Aron Griffis <agriffis@gentoo.org>
+  +files/readline-5.0-parallel.patch, readline-5.0-r2.ebuild:
+  Fix parallel build
+
+  09 Jun 2005; Mike Frysinger <vapier@gentoo.org> readline-5.0-r2.ebuild:
+  Stabilize for all arches.
+
+  14 Feb 2005; Michael Sterrett <mr_bones_@gentoo.org> readline-4.3-r6.ebuild:
+  macos went away
+
+*readline-5.0-r2 (12 Feb 2005)
+
+  12 Feb 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/readline-5.0-del-backspace-policy.patch,
+  +files/readline-5.0-no_rpath.patch, +files/readline-5.0-self-insert.patch,
+  +files/readline-5.0-solaris.patch, +readline-5.0-r2.ebuild:
+  Add some patches from Debian/Fedora fixing #74807 by Ivan Todoroski in the
+  process.
+
+  11 Feb 2005; Mike Frysinger <vapier@gentoo.org> +files/5.0-solaris.patch,
+  readline-5.0-r1.ebuild:
+  Add patch by Sunil to fix solaris linking #81058.
+
+  03 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  24 Nov 2004; Mike Frysinger <vapier@gentoo.org> readline-5.0-r1.ebuild:
+  Force ncurses linking #71420.
+
+  30 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> readline-4.3-r5.ebuild:
+  Stable on sparc
+
+*readline-5.0-r1 (29 Sep 2004)
+
+  29 Sep 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/bash-3.0-etc-inputrc.patch, +readline-5.0-r1.ebuild:
+  Add more patches from upstream and add support for /etc/inputrc #38955.
+
+  29 Sep 2004; Lina Pezzella <j4rg0n@gentoo.org> readline-4.3-r6.ebuild:
+  Fixed collisions with history(3) on macos.
+
+  02 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> readline-5.0.ebuild:
+  get_libdir fixups for backwards compatibility with readline-4.
+
+  26 Aug 2004; Travis Tilley <lv@gentoo.org> readline-4.3-r5.ebuild,
+  readline-4.3-r6.ebuild, readline-5.0.ebuild:
+  readline failed to install correctly when lib64 was a directory, CONF_LIBDIR
+  wasnt set, and when using portage 2.0.50. to fix this i've converted the
+  ebuilds to using the new get_libdir function, set
+  --libdir=/usr/$(get_libdir), and changed einstall to make DESTDIR=${D}
+  install (since the version in 2.0.50 doesnt set libdir, breaking sandbox)
+
+  24 Aug 2004; Sven Wegener <swegener@gentoo.org> readline-4.1-r5.ebuild,
+  readline-4.3-r4.ebuild, readline-4.3-r5.ebuild, readline-4.3-r6.ebuild,
+  readline-5.0.ebuild:
+  Changed SRC_URI to use mirror:// syntax. Don't assign default to S and added
+  missing IUSE.
+
+  14 Aug 2004; Travis Tilley <lv@gentoo.org> readline-4.3-r5.ebuild,
+  readline-4.3-r6.ebuild, readline-5.0.ebuild:
+  added CONF_LIBDIR support and changed make install to einstall to avoid a
+  sandbox violation that occurs when CONF_LIBDIR is set
+
+*readline-5.0 (28 Jul 2004)
+
+  28 Jul 2004; Mike Frysinger <vapier@gentoo.org> readline-4.3-r4.ebuild,
+  readline-4.3-r5.ebuild, readline-4.3-r6.ebuild, +readline-5.0.ebuild:
+  Version bump #58648. Also add in support for upgrading from previous
+  incompatible versions #29865.
+
+  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  readline-4.1-r5.ebuild, readline-4.2a-r1.ebuild, readline-4.2a-r2.ebuild:
+  virtual/glibc -> virtual/libc
+
+  11 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> readline-4.3-r5.ebuild:
+  Stable on alpha.
+
+  21 Mar 2004; Joshua Kinard <kumba@gentoo.org> readline-4.3-r5.ebuild:
+  Added gnuconfig support for mips
+
+  21 Feb 2004; Brad House <brad_mssw@gentoo.org> readline-4.3-r5.ebuild:
+  stable on amd64 for 2004.0 release
+
+*readline-4.3-r5 (28 Sep 2003)
+
+  28 Sep 2003; Martin Schlemmer <azarah@gentoo.org> readline-4.3-r5.ebuild:
+  Update to use official patches, which also have the multi-byte stuff.
+
+  17 Sep 2003; Jon Portnoy <avenj@gentoo.org> readline-4.3-r4.ebuild :
+  ia64 keywords.
+
+  24 Jun 2003; Aron Griffis <agriffis@gentoo.org> readline-4.3-r4.ebuild:
+  Mark stable on alpha
+
+  15 Mar 2003; Martin Schlemmer <azarah@gentoo.org> readline-4.3-r4.ebuild :
+  Remove /lib/*.old files, closing bug #16731.  Mark stable for x86.
+
+  13 Mar 2003; Olivier Reisch <doctomoe@gentoo.org> readline-4.2a-r2.ebuild:
+  Marked ppc stable.
+
+*readline-4.2a-r2 (13 Mar 2003)
+
+  13 Mar 2003; Seemant Kulleen <seemant@gentoo.org> readline-4.2a-r2.ebuild:
+  force upgrade to install the proper header
+
+  20 Feb 2003; Zach Welch <zwelch@gentoo.org> readline-4.3-r4.ebuild :
+  Added arm to keywords.
+
+  07 Feb 2003; Guy Martin <gmsoft@gentoo.org> readline-4.3-r4.ebuild :
+  Added hppa to keywords.
+
+  12 Dec 2002; Jan Seidel <tuxus@gentoo.org> readline-4.2a-r1.ebuild :
+  
+  Added mips to keywords.
+
+*readline-4.3-r4 (09 Dec 2002)
+
+  28 Mar 2003; Christian Birchinger <joker@gentoo.org> readline-4.3-r4.ebuild:
+  Added sparc stable keyword
+
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> readline-4.3-r4.ebuild :
+  Marked as stable for mips.
+
+  09 Dec 2002; Jon Portnoy <avenj@gentoo.org> readline-4.3-r4.ebuild :
+
+  Added a patch from upstream maintainer to fix bug:
+  
+    http://bugs.gentoo.org/show_bug.cgi?id=11762
+
+  (Python segfaults when using latin-1 chars in interactive mode)
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*readline-4.1-r5 (26 Oct 2002)
+*readline-4.2a-r1 (26 Oct 2002)
+
+  05 Mar 2003; Seemant Kulleen <seemant@gentoo.org> readline-4.2a-r1.ebuild:
+  fixed a problem with a broken include in the tilde.h file
+
+*readline-4.3-r3 (26 Oct 2002)
+
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> readline-4.3-r3.ebuild :
+  Marked as stable for mips.
+
+  26 Oct 2002; Martin Schlemmer <azarah@gentoo.org> readline*.ebuild :
+  Add linker scripts in /usr/lib to fix bug #4411.
+
+*readline-4.3-r2 (20 Oct 2002)
+
+  20 Oct 2002; Martin Schlemmer <azarah@gentoo.org> readline-4.3-r2.ebuild :
+  Add some official patches.
+
+*readline-4.3-r1 (1 Sep 2002)
+
+  1 Sep 2002; Martin Schlemmer <azarah@gentoo.org> readline-4.3-r1.ebuild :
+  Depend on bash that always link against internal readline, else bash
+  may break on readline update.
+
+*readline-4.3 (30 Aug 2002)
+
+  30 Aug 2002; Mark Guertin <gerk@gentoo.org> readline-4.3.ebuild :
+  set -ppc, inplace upgrade completely broke system
+
+  30 Aug 2002; Seemant Kulleen <seemant@gentoo.org> readline-4.3.ebuild
+  files/digest-readline-4.3 :
+
+  Version bump -- required by bash-2.05b (USE dependent, of course)
+
+*readline-4.1-r4 (21 Mar 2002)
+
+  15 Jul 2002; Mark Guertin <gerk@gentoo.org>
+  Added ppc to keywords
+
+  21 Mar 2002; Seemant Kulleen <seemant@gentoo.org> readline-4.1-r4.ebuild :
+
+  stefan@mdy.univie.ac.at discovered that html documentation was getting
+  gzipped.  This fixes that.
 
 *readline-4.1-r3 (1 Feb 2002)
 
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index e69de29bb2d1..302573574833 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -0,0 +1,16 @@
+MD5 5f09ffd9d364d7216a30dd17bf343531 ChangeLog 7435
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 82ac0eae5f66926062b260f7d09de7c0 readline-4.3-r5.ebuild 2764
+MD5 e16aefe27f29117c7a4e7be342e920b4 readline-4.3-r6.ebuild 3090
+MD5 d33ebebef248a79c288c6b1dce06b0ee readline-5.0-r2.ebuild 2778
+MD5 e3ee94eed45baf4ca76736da56d72bad files/digest-readline-5.0-r2 350
+MD5 b6bf5c9721fc8c623377b40768d18dae files/readline-5.0-del-backspace-policy.patch 1475
+MD5 d5f28667389d9681136307274ebc1f28 files/readline-5.0-no_rpath.patch 363
+MD5 cca21eb56279efff8356d028b1b39dd8 files/digest-readline-4.3-r5 348
+MD5 4a3ebcb995491c2730d156b314cbab0b files/bash-3.0-etc-inputrc.patch 1223
+MD5 cca21eb56279efff8356d028b1b39dd8 files/digest-readline-4.3-r6 348
+MD5 a0bad5c8ba91f5c50ea6c2c97a76f2d1 files/readline-5.0-self-insert.patch 2463
+MD5 9905e333ead392447a670e0f2374651a files/macos.patch 504
+MD5 fe45d673627dab53fb3fcffcb4f55e4e files/readline-5.0-solaris.patch 756
+MD5 cd1beb3627cb585cac6adcb530a01823 files/readline-5.0-parallel.patch 849
+MD5 b908c05444b4c9edbeefa1977345182e files/readline-5.0-darwin.patch 461
diff --git a/sys-libs/readline/metadata.xml b/sys-libs/readline/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-libs/readline/metadata.xml
+++ b/sys-libs/readline/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/sys-libs/readline/readline-4.3-r5.ebuild b/sys-libs/readline/readline-4.3-r5.ebuild
index 444f828f6b0a..84051c4fd72e 100644
--- a/sys-libs/readline/readline-4.3-r5.ebuild
+++ b/sys-libs/readline/readline-4.3-r5.ebuild
@@ -1,30 +1,28 @@
-# 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/sys-libs/readline/readline-4.3-r5.ebuild,v 1.1 2003/09/28 12:32:30 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-4.3-r5.ebuild,v 1.1.1.1 2005/11/30 09:39:07 chriswhite Exp $
 
-inherit eutils
+inherit eutils gnuconfig
 
 # Official patches
 PLEVEL="x001 x002 x003 x004 x005"
 
-S="${WORKDIR}/${P}"
 DESCRIPTION="Another cute console display library"
-SRC_URI="ftp://ftp.gnu.org/gnu/readline/${P}.tar.gz
-	 ftp://gatekeeper.dec.com/pub/GNU/readline/${P}.tar.gz
-	 ${PLEVEL//x/ftp://ftp.gnu.org/gnu/${PN}/${PN}-${PV}-patches/${PN}${PV/\.}-}"
 HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"
+SRC_URI="mirror://gnu/readline/${P}.tar.gz
+	${PLEVEL//x/mirror://gnu/${PN}/${PN}-${PV}-patches/${PN}${PV/\.}-}"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~ppc ~sparc ~alpha ~hppa ~arm ~mips ~ia64"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
 
-# We must be sertain that we have a bash that is linked
+# We must be certain that we have a bash that is linked
 # to its internal readline, else we may get problems.
 DEPEND=">=app-shells/bash-2.05b-r2
 	>=sys-libs/ncurses-5.2-r2"
 
 src_unpack() {
-
 	unpack ${P}.tar.gz
 
 	cd ${S}
@@ -32,11 +30,18 @@ src_unpack() {
 	do
 		epatch ${DISTDIR}/${PN}${PV/\.}-${x}
 	done
+
+	# force ncurses linking #71420
+	sed -i -e 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncurses:' support/shobj-conf || die "sed"
+
+	gnuconfig_update
 }
 
 src_compile() {
-
-	econf --with-curses || die
+	# the --libdir= is needed because if lib64 is a directory, it will default
+	# to using that... even if CONF_LIBDIR isnt set or we're using a version
+	# of portage without CONF_LIBDIR support.
+	econf --with-curses --libdir=/usr/$(get_libdir) || die
 
 	emake || die
 	cd shlib
@@ -45,32 +50,45 @@ src_compile() {
 
 
 src_install() {
-
-	make prefix=${D}/usr mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info install || die
+	# portage 2.0.50's einstall causes sandbox violations if lib64 is a
+	# directory, since readline's configure automatically sets libdir for you.
+	make DESTDIR="${D}" install || die
 	cd ${S}/shlib
-	make prefix=${D}/usr mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info install || die
+	make DESTDIR="${D}" install || die
 
 	cd ${S}
 
-	dodir /lib
-	mv ${D}/usr/lib/*.so* ${D}/lib
-	rm -f ${D}/lib/*.old
+	dodir /$(get_libdir)
+	mv ${D}/usr/$(get_libdir)/*.so* ${D}/$(get_libdir)
+	rm -f ${D}/$(get_libdir)/*.old
 	# bug #4411
 	gen_usr_ldscript libreadline.so
 	gen_usr_ldscript libhistory.so
 	# end bug #4411
-	dosym libhistory.so.${PV/a/} /lib/libhistory.so
-	dosym libreadline.so.${PV/a/} /lib/libreadline.so
+	dosym libhistory.so.${PV/a/} /$(get_libdir)/libhistory.so
+	dosym libreadline.so.${PV/a/} /$(get_libdir)/libreadline.so
 	# Needed because make install uses ${D} for the link
-	dosym libhistory.so.${PV/a/} /lib/libhistory.so.4
-	dosym libreadline.so.${PV/a/} /lib/libreadline.so.4
-	chmod 755 ${D}/lib/*.${PV/a/}
+	dosym libhistory.so.${PV/a/} /$(get_libdir)/libhistory.so.4
+	dosym libreadline.so.${PV/a/} /$(get_libdir)/libreadline.so.4
+	chmod 755 ${D}/$(get_libdir)/*.${PV/a/}
 
-	dodoc CHANGELOG CHANGES COPYING MANIFEST README USAGE
+	dodoc CHANGELOG CHANGES README USAGE
 	docinto ps
 	dodoc doc/*.ps
 	dohtml -r doc
+
+	# Backwards compatibility #29865
+	if [ -e ${ROOT}/lib/libreadline.so.4.1 ] ; then
+		[ "$(get_libdir)" != "lib" ] && dodir /lib
+		cp -pPR ${ROOT}/lib/libreadline.so.4.1 ${D}/lib/
+		touch ${D}/lib/libreadline.so.4.1
+	fi
 }
 
+pkg_postinst() {
+	if [ -e ${ROOT}/lib/libreadline.so.4.1 ] ; then
+		ewarn "Your old readline libraries have been copied over."
+		ewarn "You should run 'revdep-rebuild --soname libreadline.so.4.1' asap."
+		ewarn "Once you have, you can safely delete /lib/libreadline.so.4.1"
+	fi
+}
diff --git a/sys-libs/readline/readline-4.3-r6.ebuild b/sys-libs/readline/readline-4.3-r6.ebuild
index 745bad3f08bd..573b349fbec1 100644
--- a/sys-libs/readline/readline-4.3-r6.ebuild
+++ b/sys-libs/readline/readline-4.3-r6.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/sys-libs/readline/readline-4.3-r6.ebuild,v 1.1 2004/07/11 02:32:29 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-4.3-r6.ebuild,v 1.1.1.1 2005/11/30 09:39:07 chriswhite Exp $
 
 inherit eutils gnuconfig
 
@@ -9,13 +9,12 @@ PLEVEL="x001 x002 x003 x004 x005"
 
 DESCRIPTION="Another cute console display library"
 HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"
-SRC_URI="ftp://ftp.gnu.org/gnu/readline/${P}.tar.gz
-	 ftp://gatekeeper.dec.com/pub/GNU/readline/${P}.tar.gz
-	 ${PLEVEL//x/ftp://ftp.gnu.org/gnu/${PN}/${PN}-${PV}-patches/${PN}${PV/\.}-}"
+SRC_URI="mirror://gnu/readline/${P}.tar.gz
+	 ${PLEVEL//x/mirror://gnu/${PN}/${PN}-${PV}-patches/${PN}${PV/\.}-}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="macos" # Only changed Darwin specific part, should work just fine on other archs.
+KEYWORDS="ppc-macos" # Only changed Darwin specific part, should work just fine on other archs.
 IUSE=""
 
 # We must be certain that we have a bash that is linked
@@ -31,14 +30,16 @@ src_unpack() {
 	do
 		epatch ${DISTDIR}/${PN}${PV/\.}-${x}
 	done
-	use macos && epatch ${FILESDIR}/macos.patch
+	use ppc-macos && epatch ${FILESDIR}/macos.patch
+
+	gnuconfig_update
 }
 
 src_compile() {
-	# Detect mips systems properly
-	use mips && gnuconfig_update
-
-	econf --with-curses || die
+	# the --libdir= is needed because if lib64 is a directory, it will default
+	# to using that... even if CONF_LIBDIR isnt set or we're using a version
+	# of portage without CONF_LIBDIR support.
+	econf --with-curses --libdir=/usr/$(get_libdir) || die
 
 	emake || die
 	cd shlib
@@ -47,32 +48,53 @@ src_compile() {
 
 
 src_install() {
-	make prefix=${D}/usr mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info install || die
+	# portage 2.0.50's einstall causes sandbox violations if lib64 is a
+	# directory, since readline's configure automatically sets libdir for you.
+	make DESTDIR="${D}" install || die
 	cd ${S}/shlib
-	make prefix=${D}/usr mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info install || die
+	make DESTDIR="${D}" install || die
 
 	cd ${S}
 
-	if ! use macos; then
-		dodir /lib
-		mv ${D}/usr/lib/*.so* ${D}/lib
-		rm -f ${D}/lib/*.old
+	if ! use ppc-macos; then
+		dodir /$(get_libdir)
+		mv ${D}/usr/$(get_libdir)/*.so* ${D}/$(get_libdir)
+		rm -f ${D}/$(get_libdir)/*.old
 		# bug #4411
 		gen_usr_ldscript libreadline.so
 		gen_usr_ldscript libhistory.so
 		# end bug #4411
-		dosym libhistory.so.${PV/a/} /lib/libhistory.so
-		dosym libreadline.so.${PV/a/} /lib/libreadline.so
+		dosym libhistory.so.${PV/a/} /$(get_libdir)/libhistory.so
+		dosym libreadline.so.${PV/a/} /$(get_libdir)/libreadline.so
 		# Needed because make install uses ${D} for the link
-		dosym libhistory.so.${PV/a/} /lib/libhistory.so.4
-		dosym libreadline.so.${PV/a/} /lib/libreadline.so.4
-		chmod 755 ${D}/lib/*.${PV/a/}
+		dosym libhistory.so.${PV/a/} /$(get_libdir)/libhistory.so.4
+		dosym libreadline.so.${PV/a/} /$(get_libdir)/libreadline.so.4
+		chmod 755 ${D}/$(get_libdir)/*.${PV/a/}
+	fi
+
+	# history(3) is MacOS's manpage for editline. We can delete the file as below since we are keeping the .gz. man knows to show both.
+	if use ppc-macos; then
+		rm ${D}/usr/share/man/man3/history.3 || die "Unable to remove conflicting manpage from the image."
+		einfo "Not installing /usr/share/man/man3/history.3 on MacOS"
 	fi
 
 	dodoc CHANGELOG CHANGES README USAGE
 	docinto ps
 	dodoc doc/*.ps
 	dohtml -r doc
+
+	# Backwards compatibility #29865
+	if [ -e ${ROOT}/lib/libreadline.so.4.1 ] ; then
+		[ "$(get_libdir)" != "lib" ] && dodir /lib
+		cp -pPR ${ROOT}/lib/libreadline.so.4.1 ${D}/lib/
+		touch ${D}/lib/libreadline.so.4.1
+	fi
+}
+
+pkg_postinst() {
+	if [ -e ${ROOT}/lib/libreadline.so.4.1 ] ; then
+		ewarn "Your old readline libraries have been copied over."
+		ewarn "You should run 'revdep-rebuild --soname libreadline.so.4.1' asap."
+		ewarn "Once you have, you can safely delete /lib/libreadline.so.4.1"
+	fi
 }
diff --git a/sys-libs/readline/readline-5.0-r2.ebuild b/sys-libs/readline/readline-5.0-r2.ebuild
index e3bfed866a38..c62dfd0ca58e 100644
--- a/sys-libs/readline/readline-5.0-r2.ebuild
+++ b/sys-libs/readline/readline-5.0-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/sys-libs/readline/readline-5.0-r2.ebuild,v 1.1 2005/02/12 05:25:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-5.0-r2.ebuild,v 1.1.1.1 2005/11/30 09:39:07 chriswhite Exp $
 
-inherit eutils gnuconfig
+inherit eutils multilib
 
 # Official patches
 PLEVEL="x001 x002 x003 x004 x005"
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnu/readline/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ~ppc-macos ppc64 s390 sh sparc x86"
 IUSE=""
 
 # We must be certain that we have a bash that is linked
@@ -35,9 +35,13 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-no_rpath.patch
 	epatch "${FILESDIR}"/${P}-self-insert.patch
 	epatch "${FILESDIR}"/${P}-del-backspace-policy.patch
+	epatch "${FILESDIR}"/${P}-darwin.patch
 
 	# force ncurses linking #71420
 	sed -i -e 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncurses:' support/shobj-conf || die "sed"
+
+	# fix building in parallel
+	epatch "${FILESDIR}"/readline-5.0-parallel.patch
 }
 
 src_compile() {
@@ -53,21 +57,26 @@ src_install() {
 	# directory, since readline's configure automatically sets libdir for you.
 	make DESTDIR="${D}" install || die
 	dodir /$(get_libdir)
-	mv "${D}"/usr/$(get_libdir)/*.so* "${D}"/$(get_libdir)
-	chmod a+rx "${D}"/$(get_libdir)/*.so*
 
-	# Bug #4411
-	gen_usr_ldscript libreadline.so
-	gen_usr_ldscript libhistory.so
+	if ! use userland_Darwin ; then
+		mv "${D}"/usr/$(get_libdir)/*.so* "${D}"/$(get_libdir)
+		chmod a+rx "${D}"/$(get_libdir)/*.so*
+
+		# Bug #4411
+		gen_usr_ldscript libreadline.so
+		gen_usr_ldscript libhistory.so
+	fi
 
 	dodoc CHANGELOG CHANGES README USAGE NEWS
 	docinto ps
 	dodoc doc/*.ps
 	dohtml -r doc
+}
 
+pkg_preinst() {
 	# Backwards compatibility #29865
 	if [[ -e ${ROOT}/$(get_libdir)/libreadline.so.4 ]] ; then
-		cp -a "${ROOT}"/$(get_libdir)/libreadline.so.4* "${D}"/$(get_libdir)/
+		cp -pPR "${ROOT}"/$(get_libdir)/libreadline.so.4* "${D}"/$(get_libdir)/
 		touch "${D}"/$(get_libdir)/libreadline.so.4*
 	fi
 }
diff --git a/sys-libs/rvm/ChangeLog b/sys-libs/rvm/ChangeLog
index de46edc73f14..310d92489c21 100644
--- a/sys-libs/rvm/ChangeLog
+++ b/sys-libs/rvm/ChangeLog
@@ -1,6 +1,71 @@
 # ChangeLog for sys-libs/rvm
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# 
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/rvm/ChangeLog,v 1.1.1.1 2005/11/30 09:39:08 chriswhite Exp $
+
+  17 Oct 2005; Maurice van der Pot <griffon26@gentoo.org> -rvm-1.10.ebuild:
+  Removed old version.
+
+  16 Sep 2005; Aron Griffis <agriffis@gentoo.org> rvm-1.11.ebuild:
+  Mark 1.11 stable on alpha
+
+  23 Aug 2005; Aron Griffis <agriffis@gentoo.org> rvm-1.11.ebuild:
+  stable on ia64
+
+  18 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> rvm-1.11.ebuild:
+  Stable on ppc.
+
+  07 Jul 2005; Maurice van der Pot <griffon26@gentoo.org> rvm-1.11.ebuild:
+  Marked stable on x86
+
+  08 Jun 2005; Maurice van der Pot <griffon26@gentoo.org> -rvm-1.6.ebuild,
+  -rvm-1.8.ebuild, -rvm-1.9.ebuild, rvm-1.10.ebuild, rvm-1.11.ebuild:
+  Removed old versions. Adapted to new location of source package.
+
+*rvm-1.11 (05 May 2005)
+
+  05 May 2005; Maurice van der Pot <griffon26@gentoo.org> +rvm-1.11.ebuild:
+  Added new release.
+
+  20 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> rvm-1.10.ebuild:
+  Stable on ppc.
+
+  22 Dec 2004; Maurice van der Pot <griffon26@gentoo.org> rvm-1.10.ebuild:
+  Marked stable on x86
+
+*rvm-1.10 (23 Oct 2004)
+
+  23 Oct 2004; Maurice van der Pot <griffon26@gentoo.org> +rvm-1.10.ebuild,
+  rvm-1.9.ebuild:
+  Version bump for new coda release
+  Marked rvm-1.9 stable on x86
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> rvm-1.8.ebuild:
+  Masked rvm-1.8.ebuild stable for ppc
+
+  12 Aug 2004; Maurice van der Pot <griffon26@gentoo.org> metadata.xml,
+  rvm-1.6.ebuild, rvm-1.8.ebuild:
+  Took over maintenance from Daniel Black <dragonheart@gentoo.org>
+  Fixed some cosmetics
+
+  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> rvm-1.6.ebuild,
+  rvm-1.8.ebuild, rvm-1.9.ebuild:
+  virtual/glibc -> virtual/libc
+
+*rvm-1.9 (12 May 2004)
+
+  12 May 2004; Daniel Black <dragonheart@gentoo.org> metadata.xml,
+  rvm-1.8.ebuild, +rvm-1.9.ebuild:
+  version bump. 1.8 x86 stable. Maintainer changed to me/net-fs herd.
+  thanks to Sebastian Dröge <sebastian.droege@gmx.de> in bug #50632.
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> rvm-1.6.ebuild:
+  Add die following econf for bug 48950
+
+*rvm-1.8 (15 Nov 2003)
+
+  15 Nov 2003; Seemant Kulleen <seemant@gentoo.org> rvm-1.8.ebuild:
+  version bump, as part of a coda version bump -- thanks to: Michael C. Ferguson
+  <mcf@augustmail.com> in bug #26132
 
 *rvm-1.6 (01 Jul 2002)
 
diff --git a/sys-libs/rvm/Manifest b/sys-libs/rvm/Manifest
index e69de29bb2d1..61c2c92fda0e 100644
--- a/sys-libs/rvm/Manifest
+++ b/sys-libs/rvm/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ac00214bcbd04bc1612d031e23320275 ChangeLog 2548
+MD5 ab7a0893e657a22aee60e1bf9e5ead5f files/digest-rvm-1.11 60
+MD5 fdd307ea78fc900a01e57b8151f34d4e metadata.xml 224
+MD5 e07e42f32e14813bd40128a22ec6e2ee rvm-1.11.ebuild 636
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDU/n3MGnpIbeahxwRAnpXAJ9Trj8hkmAwLEqTRFCrhl3JJjEtrACfdVLk
+GWIZTEE8miUx7ZCNLnnEbrM=
+=2a1h
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/rvm/metadata.xml b/sys-libs/rvm/metadata.xml
index f093d416cbb1..e55bab8edce3 100644
--- a/sys-libs/rvm/metadata.xml
+++ b/sys-libs/rvm/metadata.xml
@@ -1,7 +1,8 @@
- * Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<herd>net-fs</herd>
+<maintainer>
+  <email>griffon26@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-libs/rvm/rvm-1.11.ebuild b/sys-libs/rvm/rvm-1.11.ebuild
index 5d11ae3ba232..393faabfa547 100644
--- a/sys-libs/rvm/rvm-1.11.ebuild
+++ b/sys-libs/rvm/rvm-1.11.ebuild
@@ -1,23 +1,21 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/rvm/rvm-1.11.ebuild,v 1.1 2005/05/05 13:20:14 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/rvm/rvm-1.11.ebuild,v 1.1.1.1 2005/11/30 09:39:08 chriswhite Exp $
 
 DESCRIPTION="Recoverable Virtual Memory (used by Coda)"
 HOMEPAGE="http://www.coda.cs.cmu.edu/"
-SRC_URI="ftp://ftp.coda.cs.cmu.edu/pub/rvm/src/${P}.tar.gz"
+SRC_URI="http://www.coda.cs.cmu.edu/pub/rvm/src/${P}.tar.gz"
 IUSE=""
 SLOT="1"
 LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~amd64 ~ia64"
+KEYWORDS="alpha ~amd64 ~hppa ia64 ~mips ppc ~sparc x86"
 
-DEPEND="virtual/libc
-	>=sys-libs/lwp-2.0
+DEPEND=">=sys-libs/lwp-2.0
 	sys-apps/grep
 	sys-devel/libtool
 	sys-devel/gcc"
 
-RDEPEND="virtual/libc
-	>=sys-libs/lwp-2.0"
+RDEPEND=">=sys-libs/lwp-2.0"
 
 
 src_install() {
diff --git a/sys-libs/slang/ChangeLog b/sys-libs/slang/ChangeLog
index 76fd55f8e770..229f0f0c7b78 100644
--- a/sys-libs/slang/ChangeLog
+++ b/sys-libs/slang/ChangeLog
@@ -1,13 +1,156 @@
 # ChangeLog for sys-libs/slang
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/ChangeLog,v 1.1 2002/02/01 21:53:38 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/ChangeLog,v 1.1.1.1 2005/11/30 09:39:03 chriswhite Exp $
 
-*slang-1.4.4-r1 (1 Feb 2002)
+*slang-1.4.9-r2 (16 May 2005)
+
+  16 May 2005; Heinrich Wendel <lanius@gentoo.org>
+  +files/slang-utf8-fix2.patch, +slang-1.4.9-r2.ebuild:
+  add another utf8 fix from fedora, bug #92735
+
+  03 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  07 Nov 2004; Mamoru KOMACHI <usata@gentoo.org> slang-1.4.9-r1.ebuild:
+  Fixed chmod failure when unicode USE flag is set; bug #70328.
+
+  06 Nov 2004; Mamoru KOMACHI <usata@gentoo.org>
+  files/slang-1.4.9-fsuid.patch, files/slang-1.4.9.patch,
+  slang-1.4.9-r1.ebuild:
+  Added a patch to remove glibc specific calls. Thanks to Peter S. Mazinger
+  <ps.m@gmx.net>; bug #67666. Fixed compilation on ppc-macos and LICENSE
+  syntax.
+
+  26 Oct 2004; Tom Martin <slarti@gentoo.org> slang-1.4.9-r1.ebuild:
+  Stable on amd64.
+
+  16 Oct 2004; <gongloo@gentoo.org> slang-1.4.9-r1.ebuild:
+  Keyworded ~ppc-macos.
+
+  06 Oct 2004; Guy Martin <gmsoft@gentoo.org> slang-1.4.9-r1.ebuild:
+  Stable on hppa.
+
+  30 Sep 2004; Bryan Østergaard,,, <kloeri@gentoo.org> slang-1.4.9-r1.ebuild:
+  Stable on alpha.
+
+  25 Sep 2004; Joshua Kinard <kumba@gentoo.org> slang-1.4.9-r1.ebuild:
+  Marked stable on mips.
+
+  22 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> slang-1.4.9-r1.ebuild:
+  Stable on sparc
+
+  21 Sep 2004; Heinrich Wendel <lanius@gentoo.org> slang-1.4.9-r1.ebuild:
+  mark slang-1.4.9-r1 stable on x86
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> slang-1.4.9.ebuild:
+  Masked slang-1.4.9.ebuild stable for ppc
+
+  01 Sep 2004; Travis Tilley <lv@gentoo.org> slang-1.4.9-r1.ebuild,
+  slang-1.4.9.ebuild:
+  made slang use $(get_libdir) for cleanly installing to lib64/lib32
+
+  23 Jul 2004; Mamoru KOMACHI <usata@gentoo.org> slang-1.4.9.ebuild:
+  Added to macos.
+
+*slang-1.4.9-r1 (07 Jun 2004)
+
+  04 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>:
+  PPC stable
+
+  07 Jun 2004; Mamoru KOMACHI <usata@gentoo.org> metadata.xml,
+  +slang-1.4.9-r1.ebuild:
+  Added unicode patches. Thanks to Alexander Darovsky <adarovsky@users.sf.net>
+  and Stanislav Karchebny <berk@inbox.ru>, see bug #47675 and #52846.
+
+  27 Apr 2004; Mike Frysinger <vapier@gentoo.org> slang-1.4.9.ebuild :
+  Mark arm stable and remove the trimming of the gcc/slang.h stuff since
+  this has been fixed in latest gcc's.
+
+  22 Jan 2004; Guy Martin <gmsoft@gentoo.org> slang-1.4.9.ebuild :
+  Marked stable on hppa.
+
+  15 Jan 2004; Jon Portnoy <avenj@gentoo.org> slang-1.4.9.ebuild :
+  Stable on AMD64.
+
+  09 Jan 2004; Aron Griffis <agriffis@gentoo.org> slang-1.4.9.ebuild:
+  stable on alpha
+
+  28 Dec 2003; Joshua Kinard <kumba@gentoo.org> slang-1.4.9.ebuild:
+  Move to mips stable (~mips -> mips)
+
+  20 Oct 2003; Christian Birchinger <joker@gentoo.org> slang-1.4.9.ebuild:
+  Added sparc stable keyword
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  08 Oct 2003; Alastair Tse <liquidx@gentoo.org> slang-1.4.9.ebuild:
+  stable bump for x86
+
+  17 Sep 2003; Jon Portnoy <avenj@gentoo.org> slang-1.4.9.ebuild :
+  ia64 keywords.
+
+  19 Jul 2003; Alastair Tse <liquidx@gentoo.org> slang-1.4.5-r2.ebuild,
+  slang-1.4.5-r3.ebuild:
+  fix library links on first install for 1.4.5
+
+*slang-1.4.9 (10 Jun 2003)
+
+  10 Jun 2003; YAMAKURA Makot <yakina@gentoo.org> slang-1.4.5-r3.ebuild,
+  slang-1.4.9.ebuild, files/digest-slang-1.4.5-r3, files/digest-slang-1.4.9 :
+  New version 1.4.9. Added cjk USE flag to 1.4.9 and 1.4.5-r3.
+
+  18 May 2003; Tavis Ormandy <taviso@gentoo.org> slang-1.4.5-r2.ebuild:
+  removing hardcoded compiler.
+
+*slang-1.4.8 (22 Feb 2003)
+
+  16 Mar 2003; Alastair Tse <liquidx@gentoo.org> slang-1.4.8.ebuild:
+  add postinst cleanup for old ANSIfied slang.h, prevents #16678.
+
+  22 Feb 2003; Aron Griffis <agriffis@gentoo.org> slang-1.4.8.ebuild :
+  Update to latest version; thanks to Robert Bragg for the heads-up.
+  Closes bug #15015.
+
+  18 Feb 2003; Zach Welch <zwelch@gentoo.org> slang-1.4.5-r2.ebuild :
+  Added arm to keywords.
+
+  09 Feb 2003; Guy Martin <gmsoft@gentoo.org> slang-1.4.5-r2.ebuild :
+  Added hppa to keywords.
   
-  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
+ 
+*slang-1.4.5-r2 (21 Mar 2002)
+
+        18 Jan 2003; Jan Seidel <tuxus@gentoo.org> :
+        Added mips to keywords
+
+	15 Jul 2002; Mark Guertin <gerk@gentoo.org>
+	Added ppc to keywords
+
+	21 Mar 2002; Seemant Kulleen <seemant@gentoo.org> slang-1.4.5-r2.ebuild :
+
+	html documentation no longer getting gzipped.  caught by 
+	stefan@mdy.univie.ac.at 
+
+*slang-1.4.5-r1 (4 March 2002)
+
+	4 March 2002; Donny Davies <woodchip@gentoo.org> slang-1.4.5-r1.ebuild :
+
+	Fixed to install libslang.so.1.4.5 mode 755.  Also fix a small doc
+	install bug where it wasnt deleting the right directory.
+
+*slang-1.4.5 (20 Feb 2002)
+
+	20 Feb 2002; Aron Griffis <agriffis@gentoo.org> slang-1.4.5.ebuild :
+
+	Updated to 1.4.5.  Removed setting of ELF_CFLAGS since our CFLAGS are
+	picked up anyway.  This seems a safer approach.
+
+*slang-1.4.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.
diff --git a/sys-libs/slang/Manifest b/sys-libs/slang/Manifest
index e69de29bb2d1..e72839918e8b 100644
--- a/sys-libs/slang/Manifest
+++ b/sys-libs/slang/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0e3377e5ce60380f611f078707979da0 slang-1.4.9-r2.ebuild 1846
+MD5 91a55ea69d65d2d3171b938b80ce3925 ChangeLog 5493
+MD5 bc00f0356947154d3250243bd5ec08f5 metadata.xml 219
+MD5 aa05b5e6a399e3db621b204b914913ea slang-1.4.9-r1.ebuild 1792
+MD5 074ddbf39cb8b9708ca9de2b1fb24366 files/digest-slang-1.4.9-r1 64
+MD5 074ddbf39cb8b9708ca9de2b1fb24366 files/digest-slang-1.4.9-r2 64
+MD5 7ba45dd45645107adc167e543634b8eb files/slang-1.4.9-fsuid.patch 1661
+MD5 7f9b0cb76e754575d54b6ea8f5de59f4 files/slang-1.4.9.patch 1367
+MD5 e2ddc20bfbb1ac10becb53e1707b067c files/slang-debian-utf8.patch 21377
+MD5 3531d8ba2b07b43cf6d758815200bfa9 files/slang-utf8-acs.patch 14366
+MD5 4be647282e8c01060db9d1707098bd1d files/slang-utf8-fix.patch 855
+MD5 1d7e5eab24fec79cc60d8dbdede252e7 files/slang-utf8-fix2.patch 487
+MD5 11daf6d137e1d6ec0e3475e55522cd06 files/slang-1.4.9-autoconf.patch 4143
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCiLQ1evY57Fted3ERAtjjAJ9N+i4G3NTfJSUHabsJdPSZ81ECpgCfc1y8
++JABUgtbKrdMxYhaRqQVhNg=
+=KESU
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/slang/files/digest-slang-1.4.9-r1 b/sys-libs/slang/files/digest-slang-1.4.9-r1
index 06193fb25edc..7e9a9175d8b3 100644
--- a/sys-libs/slang/files/digest-slang-1.4.9-r1
+++ b/sys-libs/slang/files/digest-slang-1.4.9-r1
@@ -1,7 +1 @@
 MD5 4fbb1a7f1257e065ca830deefe13d350 slang-1.4.9.tar.bz2 631079
-MD5 5617c722a455c1aa405c699ff361bd58 slang-1.4.9.dif 1808
-MD5 007cb225c11034b59197bdb5d507aa84 slang-1.4.9-fsuid.dif 808
-MD5 11daf6d137e1d6ec0e3475e55522cd06 slang-1.4.9-autoconf.dif 4143
-MD5 e2ddc20bfbb1ac10becb53e1707b067c slang-debian-utf8.patch 21377
-MD5 3531d8ba2b07b43cf6d758815200bfa9 slang-utf8-acs.patch 14366
-MD5 4be647282e8c01060db9d1707098bd1d slang-utf8-fix.patch 855
diff --git a/sys-libs/slang/files/slang-1.4.9-fsuid.patch b/sys-libs/slang/files/slang-1.4.9-fsuid.patch
index 23c8e1fa66f1..c7c38c756e37 100644
--- a/sys-libs/slang/files/slang-1.4.9-fsuid.patch
+++ b/sys-libs/slang/files/slang-1.4.9-fsuid.patch
@@ -29,3 +29,38 @@
 +#endif
 +
  #endif				       /* _SLANG_INCLUDE_H_ */
+--- src/sltermin.c
++++ src/sltermin.c
+@@ -105,7 +105,32 @@
+     * I will also look into the use of setreuid, seteuid and setregid, setegid.
+     * FIXME: Priority=medium
+     */
++   /* If your system lacks setfsuid/getfsuid either write
++      equivalent support or dont use slang to build setuid/setgid
++      apps like Mutt */
++
++   if(setfsuid(getuid())==-1)
++   {
++       perror("setfsuid");
++       return NULL;
++   }
++   if(setfsgid(getgid())==-1)
++   {
++       perror("setfsgid");
++       return NULL;
++   }    
+    fp = fopen (file, "rb");
++   if(setfsuid(geteuid())==-1)
++   {
++       perror("setfsuid");
++       return NULL;
++   }
++   if(setfsgid(getegid())==-1)
++   {
++       perror("setfsgid");
++       return NULL;
++   }
++
+    if (fp == NULL) return NULL;
+ 
+    if ((12 == fread ((char *) buf, 1, 12, fp) && (MAGIC == make_integer (buf))))
diff --git a/sys-libs/slang/files/slang-1.4.9.patch b/sys-libs/slang/files/slang-1.4.9.patch
index ea32f46be479..05da2f74664c 100644
--- a/sys-libs/slang/files/slang-1.4.9.patch
+++ b/sys-libs/slang/files/slang-1.4.9.patch
@@ -35,38 +35,14 @@
  }
  
  #ifdef VMS
---- src/sltermin.c
-+++ src/sltermin.c
-@@ -105,7 +105,32 @@
-     * I will also look into the use of setreuid, seteuid and setregid, setegid.
-     * FIXME: Priority=medium
-     */
-+   /* If your system lacks setfsuid/getfsuid either write
-+      equivalent support or dont use slang to build setuid/setgid
-+      apps like Mutt */
-+
-+   if(setfsuid(getuid())==-1)
-+   {
-+       perror("setfsuid");
-+       return NULL;
-+   }
-+   if(setfsgid(getgid())==-1)
-+   {
-+       perror("setfsgid");
-+       return NULL;
-+   }    
-    fp = fopen (file, "rb");
-+   if(setfsuid(geteuid())==-1)
-+   {
-+       perror("setfsuid");
-+       return NULL;
-+   }
-+   if(setfsgid(getegid())==-1)
-+   {
-+       perror("setfsgid");
-+       return NULL;
-+   }
-+
-    if (fp == NULL) return NULL;
+--- src/slmisc.c.mps	2003-03-23 08:06:40.000000000 +0100
++++ src/slmisc.c	2004-09-17 12:28:44.000000000 +0200
+@@ -565,7 +565,7 @@
+    return (int) SLatol (s);
+ }
  
-    if ((12 == fread ((char *) buf, 1, 12, fp) && (MAGIC == make_integer (buf))))
+-#if !defined(HAVE_ISSETUGID) && defined(__GLIBC__) && (__GLIBC__ >= 2)
++#if !defined(HAVE_ISSETUGID) && defined(__GLIBC__) && (__GLIBC__ >= 2) && !defined(__UCLIBC__)
+ extern int __libc_enable_secure;
+ # define HAVE___LIBC_ENABLE_SECURE 1
+ #endif
diff --git a/sys-libs/slang/metadata.xml b/sys-libs/slang/metadata.xml
index 118c083af80d..68b30e9e5ccb 100644
--- a/sys-libs/slang/metadata.xml
+++ b/sys-libs/slang/metadata.xml
@@ -1,7 +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>liquidx@gentoo.org</email></maintainer>
-<maintainer><email>yakina@gentoo.org</email></maintainer>
+<herd>cjk</herd>
+<maintainer>
+  <email>liquidx@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-libs/slang/slang-1.4.9-r1.ebuild b/sys-libs/slang/slang-1.4.9-r1.ebuild
index 8d2a2a38b827..9fbc107b9198 100644
--- a/sys-libs/slang/slang-1.4.9-r1.ebuild
+++ b/sys-libs/slang/slang-1.4.9-r1.ebuild
@@ -1,18 +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/sys-libs/slang/slang-1.4.9-r1.ebuild,v 1.1 2004/06/06 16:52:12 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/slang-1.4.9-r1.ebuild,v 1.1.1.1 2005/11/30 09:39:03 chriswhite Exp $
 
-inherit gcc eutils
+inherit eutils
 
-DESCRIPTION="Console display library used by most text viewer"
-HOMEPAGE="http://space.mit.edu/~davis/slang/"
 # Patches are taken from http://www.suse.de/~nadvornik/slang/
 # They were originally Red Hat and Debian's patches
+
+DESCRIPTION="Console display library used by most text viewer"
+HOMEPAGE="http://www.s-lang.org/"
 SRC_URI="ftp://space.mit.edu/pub/davis/slang/v1.4/${P}.tar.bz2"
 
-LICENSE="GPL-2 | Artistic"
+LICENSE="|| ( GPL-2 Artistic )"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ppc-macos s390 sh sparc x86"
 IUSE="cjk unicode"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2"
@@ -21,43 +22,44 @@ src_unpack() {
 	unpack ${P}.tar.bz2
 	cd ${S}
 
-	epatch ${FILESDIR}/${P}.dif
-	epatch ${FILESDIR}/${P}-fsuid.dif
-	epatch ${FILESDIR}/${P}-autoconf.dif
+	epatch ${FILESDIR}/${P}.patch
+	use ppc-macos || epatch ${FILESDIR}/${P}-fsuid.patch
+	epatch ${FILESDIR}/${P}-autoconf.patch
 	if use unicode ; then
 		epatch ${FILESDIR}/slang-debian-utf8.patch
 		epatch ${FILESDIR}/slang-utf8-acs.patch
 		epatch ${FILESDIR}/slang-utf8-fix.patch
 	fi
 	if use cjk ; then
-		# enable Kanji Support
-		cp src/sl-feat.h src/sl-feat.h.bak
-		sed "/SLANG_HAS_KANJI_SUPPORT/s/0/1/" \
-			src/sl-feat.h.bak > src/sl-feat.h
+		sed -i \
+			-e "/SLANG_HAS_KANJI_SUPPORT/s/0/1/" \
+			src/sl-feat.h
 	fi
 }
 
 src_compile() {
 	econf || die "econf failed"
-	# emake doesn't work well with slang, so just use normal make.
-	make all elf || die "make failed"
+	emake -j1 all elf || die "make failed"
 }
 
 src_install() {
 	make install install-elf DESTDIR=${D} || die "make install failed"
-	fperms 755 /usr/lib/libslang.so.*
+	if use ppc-macos ; then
+		chmod a+rx "${D}"/usr/$(get_libdir)/libslang*dylib || die "chmod failed"
+	else
+		chmod a+rx "${D}"/usr/$(get_libdir)/libslang*so* || die "chmod failed"
+	fi
 
 	if use unicode ; then
-		for i in ${D}/usr/lib/libslang-utf8* ; do
+		for i in ${D}/usr/$(get_libdir)/libslang-utf8* ; do
 			local libslang=${i/${D}/}
 			dosym ${libslang} ${libslang/-utf8/}
 		done
-		dosym /usr/lib/libslang{-utf8,}.a
+		dosym /usr/$(get_libdir)/libslang{-utf8,}.a
 	fi
 
-	# remove the documentation... we want to install it ourselves
 	rm -rf ${D}/usr/doc
-	dodoc COPYING* NEWS README *.txt
+	dodoc NEWS README *.txt
 	dodoc doc/*.txt doc/internal/*.txt doc/text/*.txt
 	dohtml doc/*.html
 }
diff --git a/sys-libs/slang/slang-1.4.9-r2.ebuild b/sys-libs/slang/slang-1.4.9-r2.ebuild
index ae429f9a4109..f6bf752a1946 100644
--- a/sys-libs/slang/slang-1.4.9-r2.ebuild
+++ b/sys-libs/slang/slang-1.4.9-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/sys-libs/slang/slang-1.4.9-r2.ebuild,v 1.1 2005/05/16 14:51:33 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/slang-1.4.9-r2.ebuild,v 1.1.1.1 2005/11/30 09:39:03 chriswhite Exp $
 
 inherit eutils
 
diff --git a/sys-libs/ss/ChangeLog b/sys-libs/ss/ChangeLog
index 2434065a1ff6..9a9d12946f61 100644
--- a/sys-libs/ss/ChangeLog
+++ b/sys-libs/ss/ChangeLog
@@ -1,6 +1,68 @@
 # ChangeLog for sys-libs/ss
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ss/ChangeLog,v 1.1 2005/03/24 03:55:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ss/ChangeLog,v 1.1.1.1 2005/11/30 09:39:12 chriswhite Exp $
+
+  10 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> ss-1.38.ebuild:
+  Move exporting of vars in src_compile() and src_install() to work around
+  portage env bug, similar to sys-fs/e2fsprogs-1.38.
+
+  10 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/ss-1.38-locale.patch, ss-1.38.ebuild:
+  Fix building with non-C locales (like estonian) #104116 by Toomas Mottus.
+
+  08 Sep 2005; Aaron Walker <ka0ttic@gentoo.org> ss-1.38.ebuild:
+  Stable on mips.
+
+  11 Aug 2005; Mike Frysinger <vapier@gentoo.org>
+  files/ss-1.37-makefile.patch:
+  Clean up cross-compile support.
+
+  03 Aug 2005; Mike Frysinger <vapier@gentoo.org> ss-1.38.ebuild:
+  Use bsd-shlibs on Darwin but elf-shlibs on all other systems #99728 by Kito.
+
+  25 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org> ss-1.38.ebuild:
+  Stable on hppa.
+
+  20 Jul 2005; Markus Rothe <corsair@gentoo.org> ss-1.38.ebuild:
+  Stable on ppc64
+
+  19 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> ss-1.38.ebuild:
+  Stable on alpha.
+
+  18 Jul 2005; Joseph Jezak <josejx@gentoo.org> ss-1.38.ebuild:
+  Marked ppc stable.
+
+  15 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> ss-1.38.ebuild:
+  Stable on sparc
+
+  14 Jul 2005; Seemant Kulleen <seemant@gentoo.org> ss-1.38.ebuild:
+  bumping to stable, fixes bug #98303 by WGi <wgi@muenster.de>
+
+*ss-1.38 (09 Jul 2005)
+
+  09 Jul 2005; Mike Frysinger <vapier@gentoo.org> +ss-1.38.ebuild:
+  Version bump #98330 by Joshua.
+
+  29 Jun 2005; Joshua Kinard <kumba@gentoo.org> ss-1.37.ebuild:
+  Marked stable on mips.
+
+  28 Jun 2005; Bryan Østergaard <kloeri@gentoo.org> ss-1.37.ebuild:
+  Stable on alpha.
+
+  27 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> ss-1.37.ebuild:
+  Stable on hppa.
+
+  27 Jun 2005; Seemant Kulleen <seemant@gentoo.org> ss-1.37.ebuild:
+  stable x86 and amd64 because of bug 96727
+
+  26 Jun 2005; Markus Rothe <corsair@gentoo.org> ss-1.37.ebuild:
+  Stable on ppc64 (bug #96156)
+
+  24 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> ss-1.37.ebuild:
+  Stable on sparc wrt #96727
+
+  22 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> ss-1.37.ebuild:
+  Stable on ppc (#96727).
 
 *ss-1.37 (23 Mar 2005)
 
diff --git a/sys-libs/ss/Manifest b/sys-libs/ss/Manifest
index 8867fe3f183b..5c4d1f7ee991 100644
--- a/sys-libs/ss/Manifest
+++ b/sys-libs/ss/Manifest
@@ -1,2 +1,19 @@
-MD5 e2d0bc25eb73e34e4b263fc928b949c8 com_err-1.37.ebuild 1581
-MD5 65689a8be4c1b58f8e64f22165313292 files/digest-com_err-1.37 67
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2a7cf21710522670addb999c59773afb ChangeLog 2429
+MD5 65689a8be4c1b58f8e64f22165313292 files/digest-ss-1.37 67
+MD5 0911aedd4968aa4053139791a961e2a2 files/digest-ss-1.38 67
+MD5 7f1f3f4827354d52879671fc615fba03 files/ss-1.37-makefile.patch 1318
+MD5 4a7d54ccac4002d10462c40660712a72 files/ss-1.37-sed-locale.patch 2142
+MD5 00423a451b42112f3b6897978f16ccdd files/ss-1.38-locale.patch 220
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 cf167c86a300ffb7f8e3762c30723b6f ss-1.37.ebuild 1618
+MD5 7988ad933c4aee6d7d7504406e71629c ss-1.38.ebuild 1723
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDc7siAiZjviIA2XgRAkqIAJ9Oqk1gW173l0w0YjgdhtfJZV7odACfWJa+
+Yi3K5RQIacjF25PHTV0ZdNY=
+=05UX
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/ss/files/ss-1.37-makefile.patch b/sys-libs/ss/files/ss-1.37-makefile.patch
index f6322fea403d..b60ea5a37677 100644
--- a/sys-libs/ss/files/ss-1.37-makefile.patch
+++ b/sys-libs/ss/files/ss-1.37-makefile.patch
@@ -1,9 +1,47 @@
 Fix the symlinks that submakefiles create so that they don't suck at life.
 
---- e2fsprogs-1.37/lib/Makefile.elf-lib
-+++ e2fsprogs-1.37/lib/Makefile.elf-lib
+Don't use target LDFLAGS/CFLAGS when compiling native apps.
+
+--- lib/Makefile.elf-lib
++++ lib/Makefile.elf-lib
 @@ -49,3 +49,3 @@
  	@echo "	SYMLINK $(libdir)/$(ELF_IMAGE).so"
 -	@$(LN_S) -f $(ELF_INSTALL_DIR)/$(ELF_SONAME) \
 +	@$(LN_S) -f $(ELF_SONAME) \
  		$(DESTDIR)$(libdir)/$(ELF_IMAGE).so
+--- util/Makefile.in
++++ util/Makefile.in
+@@ -15,7 +15,7 @@
+ 
+ .c.o:
+ 	@echo "	CC $<"
+-	@$(BUILD_CC) -c $(ALL_CFLAGS) $< -o $@
++	@$(BUILD_CC) -c $(DEFS) $< -o $@
+ 
+ PROGS=		subst
+ 
+@@ -23,11 +23,11 @@
+ 
+ subst: subst.o
+ 	@echo "	LD $@"
+-	@$(BUILD_CC) $(ALL_LDFLAGS) -o subst subst.o
++	@$(BUILD_CC) -o subst subst.o
+ 
+ copy_sparse: copy_sparse.o
+ 	@echo "	LD $@"
+-	@$(BUILD_CC) $(ALL_LDFLAGS) -o copy_sparse copy_sparse.o
++	@$(BUILD_CC) -o copy_sparse copy_sparse.o
+ 
+ gen-tarball: $(srcdir)/gen-tarball.in $(top_builddir)/config.status
+ 	@echo "	CONFIG.STATUS $@"
+--- lib/Makefile.elf-lib
++++ lib/Makefile.elf-lib
+@@ -26,7 +26,7 @@
+ 
+ $(ELF_LIB): $(OBJS)
+ 	@echo "	GEN_ELF_SOLIB $(ELF_LIB)"
+-	@(cd elfshared; $(CC) --shared -o $(ELF_LIB) \
++	@(cd elfshared; $(CC) --shared -o $(ELF_LIB) $(LDFLAGS) \
+ 		-Wl,-soname,$(ELF_SONAME) $(OBJS) $(ELF_OTHER_LIBS))
+ 	@$(MV) elfshared/$(ELF_LIB) .
+ 	@$(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME)
diff --git a/sys-libs/ss/ss-1.37.ebuild b/sys-libs/ss/ss-1.37.ebuild
index 80c0a164cb67..4d6175510f9a 100644
--- a/sys-libs/ss/ss-1.37.ebuild
+++ b/sys-libs/ss/ss-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/sys-libs/ss/ss-1.37.ebuild,v 1.1 2005/03/24 03:55:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ss/ss-1.37.ebuild,v 1.1.1.1 2005/11/30 09:39:12 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -10,8 +10,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/e2fsprogs-${PV}.tar.gz"
 
 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="nls"
 
 RDEPEND=">=sys-libs/com_err-${PV}"
diff --git a/sys-libs/ss/ss-1.38.ebuild b/sys-libs/ss/ss-1.38.ebuild
index f68def4020da..4f11243b8c46 100644
--- a/sys-libs/ss/ss-1.38.ebuild
+++ b/sys-libs/ss/ss-1.38.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ss/ss-1.38.ebuild,v 1.1 2005/07/09 22:37:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ss/ss-1.38.ebuild,v 1.1.1.1 2005/11/30 09:39:12 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/e2fsprogs-${PV}.tar.gz"
 
 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="nls"
 
 RDEPEND="~sys-libs/com_err-${PV}"
@@ -22,18 +22,23 @@ S=${WORKDIR}/e2fsprogs-${PV}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	# Clean up makefile to suck less
+	epatch "${FILESDIR}"/${PN}-1.38-locale.patch
 	epatch "${FILESDIR}"/${PN}-1.37-makefile.patch
+}
 
-	# Keep the package from doing silly things
+src_compile() {
 	export LDCONFIG=/bin/true
 	export CC=$(tc-getCC)
 	export STRIP=/bin/true
-}
 
-src_compile() {
+	local libtype
+	case ${USERLAND} in
+		Darwin) libtype=bsd;;
+		*)      libtype=elf;;
+	esac
+	mkdir -p lib/{blkid,e2p,et,ext2fs,ss,uuid}/{checker,elfshared,pic,profiled} #102412
 	econf \
-		--enable-elf-shlibs \
+		--enable-${libtype}-shlibs \
 		--with-ldopts="${LDFLAGS}" \
 		$(use_enable nls) \
 		|| die
@@ -45,13 +50,17 @@ src_test() {
 }
 
 src_install() {
+	export LDCONFIG=/bin/true
+	export CC=$(tc-getCC)
+	export STRIP=/bin/true
+
 	dodir /usr/share/man/man1
 	make -C lib/ss DESTDIR="${D}" install || die
 
 	# Move shared libraries to /lib/, install static libraries to /usr/lib/,
 	# and install linker scripts to /usr/lib/.
 	dodir /$(get_libdir)
-	mv "${D}"/usr/$(get_libdir)/*.so* "${D}"/$(get_libdir)/
+	mv "${D}"/usr/$(get_libdir)/*.so* "${D}"/$(get_libdir)/ || die "move .so"
 	dolib.a lib/libss.a || die "dolib.a"
 	gen_usr_ldscript libss.so
 }
diff --git a/sys-libs/timezone-data/ChangeLog b/sys-libs/timezone-data/ChangeLog
index d4422749f6cb..ebfa9a554946 100644
--- a/sys-libs/timezone-data/ChangeLog
+++ b/sys-libs/timezone-data/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-libs/timezone-data
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.1 2005/10/27 01:00:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.1.1.1 2005/11/30 09:39:02 chriswhite Exp $
+
+  03 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  timezone-data-2005n-r1.ebuild:
+  ~sparc good
+
+*timezone-data-2005n-r1 (28 Oct 2005)
+
+  28 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+  files/timezone-data-2005n-makefile.patch, +timezone-data-2005n-r1.ebuild:
+  Fix tzselect shell interpreter #110681 by Priit Laes.
 
 *timezone-data-2005n (19 Oct 2005)
 
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 1e12e8ad8b61..95b64c1860f8 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -1,2 +1,15 @@
-MD5 d63afc85b422a2e85f255c74ea505795 files/digest-tzdata-2005n 126
-MD5 585aec9b144551c5c48793da3dd9381e tzdata-2005n.ebuild 477
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1d36f71fd5e00fec23080164a966daec ChangeLog 682
+MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
+MD5 63ded0862d9bc0129673a41d1d197f51 timezone-data-2005n-r1.ebuild 826
+MD5 d63afc85b422a2e85f255c74ea505795 files/digest-timezone-data-2005n-r1 126
+MD5 648febdd6feeaeb8c85323151917d163 files/timezone-data-2005n-makefile.patch 3128
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDaldnKRy60XGEcJIRAtqHAJ4+wtlBngfP2MacoMFaynvWq5ta8QCeNt8U
+rDl2+TZmAzYy+IJ+5v6+IIU=
+=AQDk
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/timezone-data/files/timezone-data-2005n-makefile.patch b/sys-libs/timezone-data/files/timezone-data-2005n-makefile.patch
index 31aa4c371068..5e325681374d 100644
--- a/sys-libs/timezone-data/files/timezone-data-2005n-makefile.patch
+++ b/sys-libs/timezone-data/files/timezone-data-2005n-makefile.patch
@@ -6,6 +6,8 @@
  - Move zic zdump to sbin and tzselect to bin ala glibc
  - Install posix zoneinfo into zoneinfo/posix/ instead of zoneinfo-posix/ ala glibc
  - Install leaps zoneinfo into zoneinfo/right/ ala glibc
+ - Disable broken web test
+ - Make sure tzselect uses #!/bin/bash and not #!/bin/ksh
 
 --- Makefile
 +++ Makefile
@@ -90,3 +92,17 @@
 +			-d $(TZDIR)/right -L leapseconds $(TDATA)
  
  posix_right:	posix_only other_two
+@@ -366,5 +366,5 @@
+ 		chmod +x $@
+ 
+-check:		check_tables check_web
++check:		check_tables
+ 
+ check_tables:	checktab.awk $(PRIMARY_YDATA)
+--- tzselect.ksh
++++ tzselect.ksh
+@@ -1,3 +1,3 @@
+-#! /bin/ksh
++#! /bin/bash
+ 
+ # '@(#)tzselect.ksh	1.8'
diff --git a/sys-libs/timezone-data/timezone-data-2005n-r1.ebuild b/sys-libs/timezone-data/timezone-data-2005n-r1.ebuild
index 9094141edb09..48286923f6e0 100644
--- a/sys-libs/timezone-data/timezone-data-2005n-r1.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2005n-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/sys-libs/timezone-data/timezone-data-2005n-r1.ebuild,v 1.1 2005/10/28 23:14:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2005n-r1.ebuild,v 1.1.1.1 2005/11/30 09:39:02 chriswhite Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~sparc ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-libs/uclibc++/ChangeLog b/sys-libs/uclibc++/ChangeLog
index 350e5e678773..47d9e873666a 100644
--- a/sys-libs/uclibc++/ChangeLog
+++ b/sys-libs/uclibc++/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-libs/uclibc++
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc++/ChangeLog,v 1.1 2005/01/09 23:21:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc++/ChangeLog,v 1.1.1.1 2005/11/30 09:39:10 chriswhite Exp $
+
+*uclibc++-0.1.11 (02 Jul 2005)
+
+  02 Jul 2005; Mike Frysinger <vapier@gentoo.org> +uclibc++-0.1.11.ebuild:
+  Version bump.
+
+*uclibc++-0.1.9 (22 Jan 2005)
+
+  22 Jan 2005; Mike Frysinger <vapier@gentoo.org> +uclibc++-0.1.9.ebuild:
+  Version bump.
 
 *uclibc++-0.1.8 (09 Jan 2004)
 
diff --git a/sys-libs/uclibc++/Manifest b/sys-libs/uclibc++/Manifest
index 9f320e8a1c72..7596b8ffc7c7 100644
--- a/sys-libs/uclibc++/Manifest
+++ b/sys-libs/uclibc++/Manifest
@@ -1,2 +1,19 @@
-MD5 849f72150a5f9d0eb0b71cee153b0917 uclibc++-0.1.8.ebuild 416
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e08bf263d99149128a40ae9b4abcce26 uclibc++-0.1.11.ebuild 1756
+MD5 8ef75eba39772bdd1a8facc7815dbebb metadata.xml 161
+MD5 ebcdf62d71d1f590552ba8d07a9dc1bb uclibc++-0.1.8.ebuild 1811
+MD5 dfd27ed6e59f4d6914f4ac2122c38868 uclibc++-0.1.9.ebuild 1755
+MD5 3132796bed23822310ed2a58d8b7321b ChangeLog 579
+MD5 d43392a03d5232ce855c01cb22c38007 files/0.1.8-pop_back.patch 439
+MD5 a9f96b9243b7bbcd16b6198563acf1d7 files/digest-uclibc++-0.1.11 65
 MD5 a901c9aaefec85a5a52af92d49a2f09e files/digest-uclibc++-0.1.8 64
+MD5 d567d10c1cf2efcd0954cd9b7367cd6e files/digest-uclibc++-0.1.9 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCxss6gIKl8Uu19MoRAlEQAJ9NfEmB6RiVVKCWL6ZNeKRuJ8I+YQCfbGrX
+9xJwPKEris2elx84TF+IJrs=
+=Zy12
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/uclibc++/uclibc++-0.1.11.ebuild b/sys-libs/uclibc++/uclibc++-0.1.11.ebuild
index ff6325f28b9c..be64c3cf69ff 100644
--- a/sys-libs/uclibc++/uclibc++-0.1.11.ebuild
+++ b/sys-libs/uclibc++/uclibc++-0.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/sys-libs/uclibc++/uclibc++-0.1.11.ebuild,v 1.1 2005/07/02 17:12:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc++/uclibc++-0.1.11.ebuild,v 1.1.1.1 2005/11/30 09:39:10 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
diff --git a/sys-libs/uclibc++/uclibc++-0.1.8.ebuild b/sys-libs/uclibc++/uclibc++-0.1.8.ebuild
index 95003fff906d..899cd1f221e2 100644
--- a/sys-libs/uclibc++/uclibc++-0.1.8.ebuild
+++ b/sys-libs/uclibc++/uclibc++-0.1.8.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/sys-libs/uclibc++/uclibc++-0.1.8.ebuild,v 1.1 2005/01/09 23:21:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc++/uclibc++-0.1.8.ebuild,v 1.1.1.1 2005/11/30 09:39:10 chriswhite Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
+
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+		export CTARGET=${CATEGORY/cross-}
+	fi
+fi
 
 DESCRIPTION="embedded C++ library"
 HOMEPAGE="http://cxx.uclibc.org/"
 SRC_URI="http://cxx.uclibc.org/src/uClibc++-${PV}.tbz2"
 
 LICENSE="GPL-2"
-SLOT="0"
+[[ ${CTARGET} != ${CHOST} ]] \
+	&& SLOT="${CTARGET}" \
+	|| SLOT="0"
 KEYWORDS="~arm ~ppc ~x86"
-IUSE=""
+IUSE="debug static"
 
 DEPEND=""
 
@@ -22,35 +31,42 @@ src_unpack() {
 	cd ${S}
 	make defconfig || die "defconfig failed"
 
-	export CTARGET="${CTARGET:-${CHOST}}"
 	local target
-	case ${CTARGET} in
-		arm*)		target="arm";;
-		mips*)		target="mips";;
-		powerpc*)	target="powerpc";;
-		i?86*)		target="i386";;
-		*)			die "${CTARGET} lists no defaults :/";;
+	case $(tc-arch ${CTARGET}) in
+		arm)	target="arm";;
+		mips)	target="mips";;
+		ppc)	target="powerpc";;
+		x86)	target="i386";;
+		*)		die "$(tc-arch ${CTARGET}) lists no defaults :/";;
 	esac
 
 	sed -i \
-		-e '/^UCLIBCXX_RUNTIME_PREFIX=/d'
+		-e '/^UCLIBCXX_RUNTIME_PREFIX=/d' \
 		-e '/^TARGET_'${target}'/d' \
 		.config
 
-	cat << EOF >> .config
-TARGET_${target}=y
-UCLIBCXX_RUNTIME_PREFIX="/usr/${CTARGET}"
-EOF
+	echo "UCLIBCXX_RUNTIME_PREFIX=\"/usr/${CTARGET}\"" >> .config
 	echo "TARGET_${target}=y" >> .config
+	use debug && echo "CONFIG_DODEBUG=y" >> .config
 
 	yes "" | make oldconfig || die "oldconfig failed"
 
+	# has to come after make oldconfig, else it will be disabled
+	echo "BUILD_STATIC_LIB=y" >> .config
+	if use static ; then
+		echo "BUILD_ONLY_STATIC_LIB=y" >> .config
+	fi
+
 	# Patches!
 	epatch "${FILESDIR}"/${PV}-pop_back.patch
 }
 
 src_compile() {
-	emake -j1 CROSS=${CTARGET}- || die "make failed"
+	emake -j1 ARCH_CFLAGS="${CFLAGS}" CROSS=${CTARGET}- || die "make failed"
+}
+
+src_test() {
+	make test || die "test failed"
 }
 
 src_install() {
diff --git a/sys-libs/uclibc++/uclibc++-0.1.9.ebuild b/sys-libs/uclibc++/uclibc++-0.1.9.ebuild
index bfb538add994..2b8bb21a4d97 100644
--- a/sys-libs/uclibc++/uclibc++-0.1.9.ebuild
+++ b/sys-libs/uclibc++/uclibc++-0.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/sys-libs/uclibc++/uclibc++-0.1.9.ebuild,v 1.1 2005/01/22 05:21:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc++/uclibc++-0.1.9.ebuild,v 1.1.1.1 2005/11/30 09:39:10 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
diff --git a/sys-libs/uclibc/ChangeLog b/sys-libs/uclibc/ChangeLog
index 27741de2c29f..2c9baf60f98a 100644
--- a/sys-libs/uclibc/ChangeLog
+++ b/sys-libs/uclibc/ChangeLog
@@ -1,6 +1,51 @@
-# ChangeLog for dev-libs/uclibc
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/ChangeLog,v 1.1 2005/01/12 00:50:53 vapier Exp $
+# ChangeLog for sys-libs/uclibc
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/ChangeLog,v 1.1.1.1 2005/11/30 09:39:12 chriswhite Exp $
+
+  13 Nov 2005; <solar@gentoo.org> uclibc-0.9.28.ebuild:
+  - moredefs..
+
+  07 Nov 2005; <solar@gentoo.org> uclibc-0.9.28.ebuild:
+  Enabled DL_FINI_CRT_COMPAT by default
+
+  05 Sep 2005; Mike Frysinger <vapier@gentoo.org> uclibc-0.9.27.ebuild,
+  uclibc-0.9.27-r1.ebuild:
+  Fix optimized strn functions so nano stops crashing #95395.
+
+*uclibc-0.9.28 (18 Aug 2005)
+
+  18 Aug 2005; Mike Frysinger <vapier@gentoo.org> +uclibc-0.9.28.ebuild:
+  Version bump.
+
+  05 Aug 2005; Mike Frysinger <vapier@gentoo.org> uclibc-0.9.27.ebuild,
+  uclibc-0.9.27-r1.ebuild:
+  Add patch by Yuri Vasilevski to fix FPU endian on arm #75585.
+
+  29 Jul 2005; Mike Frysinger <vapier@gentoo.org> uclibc-0.9.27.ebuild,
+  uclibc-0.9.27-r1.ebuild:
+  Update patchset to include armeb stat and getent fixes.
+
+*uclibc-0.9.27-r1 (18 Jun 2005)
+
+  18 Jun 2005; Mike Frysinger <vapier@gentoo.org> +uclibc-0.9.27-r1.ebuild:
+  New testing version by psm with partial locale support.
+
+  18 Jun 2005; Mike Frysinger <vapier@gentoo.org> uclibc-0.9.27.ebuild:
+  Add patches from upstream to fix arm/TEXTRELs and remove the duplicated
+  pthread_atfork() prototype from unistd.h.
+
+  21 Apr 2005; <solar@gentoo.org> files/getent, uclibc-0.9.27.ebuild:
+  - update getent script in FILESDIR
+
+  17 Jan 2005; Mike Frysinger <vapier@gentoo.org> uclibc-0.9.26-r8.ebuild,
+  uclibc-0.9.27.ebuild:
+  Make sure uclibc doesnt destroy glibc hosts (sorry solar!) and fix
+  src_test() so it actually works.
+
+*uclibc-0.9.27 (14 Jan 2005)
+
+  14 Jan 2005; Mike Frysinger <vapier@gentoo.org> +uclibc-0.9.27.ebuild:
+  Version bump.
 
   11 Jan 2005; Mike Frysinger <vapier@gentoo.org> uclibc-0.9.26-r8.ebuild:
   Merge psm & my cross compile work together and BAM we have a sweet ebuild.
diff --git a/sys-libs/uclibc/Manifest b/sys-libs/uclibc/Manifest
index 92f811f7ffd9..cf6bc94ab07d 100644
--- a/sys-libs/uclibc/Manifest
+++ b/sys-libs/uclibc/Manifest
@@ -1,43 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 1265061fc51e9b3db8020c13f2e25a76 ChangeLog 8165
+MD5 98593b73a38e03d2bc137170b9760678 ChangeLog 9728
+MD5 e6443710aea7fb2e9056b67be27b68d1 files/digest-uclibc-0.9.27 229
+MD5 9a39fb9a2446443aa355070e819107a0 files/digest-uclibc-0.9.27-r1 298
+MD5 851ff3547906842b0d94c848a876be2c files/digest-uclibc-0.9.28 213
+MD5 684def72ebc0da73cb8b6d1c53e7e8fb files/getent 1112
 MD5 e96b4dfc373a1cdf7735aeae52c4cf7e metadata.xml 999
-MD5 965ff7a705ad0a3133b02c98f8100e92 uclibc-0.9.21.ebuild 1097
-MD5 17ba3d0e6436718dafb750dade5d0869 uclibc-0.9.26-r5.ebuild 7658
-MD5 64742403e39911df25935b6099d30043 uclibc-0.9.26-r7.ebuild 7862
-MD5 c2b3545d487eac266e731aee91620602 uclibc-0.9.26-r8.ebuild 9426
-MD5 14f021d1cfb0e76ce684b8eefba1adfc uclibc-9999.ebuild 5442
-MD5 d16f404e56abc9f0ab5c372b88a6905d files/Makefile-cp-order-fix.patch 897
-MD5 799adc7fb6ec9ffd653831cea1d32dd5 files/digest-uclibc-0.9.21 67
-MD5 0b733285f186f31c1be9ffcc42f1064e files/getent 973
-MD5 e0556dd58957468793213ab327c590d3 files/digest-uclibc-0.9.26-r8 232
-MD5 6d2b5c523d34c86df9bc37747d9261dc files/digest-uclibc-0.9.26-r5 231
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-uclibc-9999 0
-MD5 6d2b5c523d34c86df9bc37747d9261dc files/digest-uclibc-0.9.26-r7 231
-MD5 17ecd222df47b5253f35787097440a5a files/0.9.23/uClibc-0.9.23-etdyn.patch 5832
-MD5 298b7b42f80e1f8ae395df81c47eb213 files/0.9.23/uClibc-0.9.23-flipturn.patch 1821
-MD5 4216cdf86d54f45fa04cb44a5425b3ff files/0.9.23/uClibc-0.9.23-pax.patch 3607
-MD5 7eea15a7a3e8d8a2a222b815e57dc221 files/cvs/13_all_uClibc-enable-ssp.patch 331
-MD5 9cb04f6f038b903868f99d90f81e7e61 files/cvs/21_all_uClibc-ld-relro.patch 1040
-MD5 df59fcf3a02c17b7dac6999bd9262d05 files/cvs/22_all_uClibc-ld-now.patch 1072
-MD5 46d965d8bdfe981f75fb8696799d9d2a files/0.9.26/ssp.c 3937
-MD5 2416f5e954ccb8b39b1c0d6a3cf5e827 files/0.9.26/uClibc-0.9.26-Makefile.patch 1478
-MD5 bdd1e91ee48fb8be0d28cabdfcfdf3ff files/0.9.26/uClibc-0.9.26-pie-option.patch 863
-MD5 49671ccbdf2c8055efc6cde0003cb6c5 files/0.9.26/arm-fix-missing-syscalls.patch 2264
-MD5 874260fc77637deccf7588cfc1c76674 files/0.9.26/uClibc-20040613-do_rem.patch 391
-MD5 b9df87c681aa3a1ef3033cb195e516df files/0.9.26/uclibc-0.9.26-arm-dl-sysdep.patch 795
-MD5 d35beaf332590fed8c619483d4598dc6 files/0.9.26/uclibc-0.9.26-ssp-gcc34-after-frandom.patch 542
-MD5 f7c264d37687f1a32f1c6e31239f2276 files/0.9.26/uclibc-0.9.26-noexecstack.patch 15273
-MD5 6835449424e7a8a38e9c85ecf1b73577 files/0.9.26/arm-ucontext.patch 303
-MD5 efd96414f3be520f07eabd1c02be1ecb files/0.9.26/uclibc-0.9.26-resolve-segfault.patch 1227
-MD5 7157f784ba7672c9904d289712131a52 files/0.9.26/uclibc-0.9.26-ldso-cache.patch 410
-MD5 7ff9f1e05cdfbbe0e156ea81bf8b55ee files/0.9.26/uClibc-20040921-ldso-unsecvars.patch 1024
-MD5 a503ef49001f5f67d61cd40b0809fb76 files/0.9.26/unsecvars.h 682
+MD5 8a028ea0b10d685a727217115e064d5e uclibc-0.9.27-r1.ebuild 12127
+MD5 81cee933f6981c689db448c06576ec3c uclibc-0.9.27.ebuild 10387
+MD5 51c0b93443372c137ce89a259c59cfe2 uclibc-0.9.28.ebuild 12402
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.14 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFB43AqroRuSHgZdywRAkz9AJ97qifC1HRxNe2/sx7W47TTP1ViMwCfTmlR
-PzPgsUYl+C5wwvRlsF7Hiro=
-=S87t
+iD8DBQFDfU54gIKl8Uu19MoRApkyAJ4+xaOJiM5yOn907Xcv97pthcsfoQCeKZUo
+CE8x6xHrhZXyrvUsJSl0+g4=
+=+XRP
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/uclibc/files/digest-uclibc-0.9.27 b/sys-libs/uclibc/files/digest-uclibc-0.9.27
index 56ed37ebbba9..d308fe841c87 100644
--- a/sys-libs/uclibc/files/digest-uclibc-0.9.27
+++ b/sys-libs/uclibc/files/digest-uclibc-0.9.27
@@ -1,3 +1,3 @@
-MD5 6250bd6524283bd8e7bc976d43a46ec0 uClibc-0.9.27.tar.bz2 1693895
 MD5 ab2fed54aff1801b1cd4fbfdb1403a82 uClibc-0.9.27-cvs-update-20050114.patch.bz2 839
-MD5 a7f57f597405c1596937adc4d17324bb uClibc-0.9.27-patches-1.0.tar.bz2 18074
+MD5 afeb95e839ad27f2d0177cb749d1f530 uClibc-0.9.27-patches-1.4.tar.bz2 18874
+MD5 6250bd6524283bd8e7bc976d43a46ec0 uClibc-0.9.27.tar.bz2 1693895
diff --git a/sys-libs/uclibc/files/digest-uclibc-0.9.27-r1 b/sys-libs/uclibc/files/digest-uclibc-0.9.27-r1
index 54bcb57731aa..0386e393beea 100644
--- a/sys-libs/uclibc/files/digest-uclibc-0.9.27-r1
+++ b/sys-libs/uclibc/files/digest-uclibc-0.9.27-r1
@@ -1,4 +1,4 @@
-MD5 6250bd6524283bd8e7bc976d43a46ec0 uClibc-0.9.27.tar.bz2 1693895
 MD5 ab2fed54aff1801b1cd4fbfdb1403a82 uClibc-0.9.27-cvs-update-20050114.patch.bz2 839
-MD5 cca21bec9b2b9f96dd5be565cdfe46b1 uClibc-0.9.27-patches-1.1.tar.bz2 16052
+MD5 ca1868b347a0128fd06122f60fea007f uClibc-0.9.27-patches-1.5.tar.bz2 23312
+MD5 6250bd6524283bd8e7bc976d43a46ec0 uClibc-0.9.27.tar.bz2 1693895
 MD5 d75b2239b4e27c3c9cbed1c8f6eabba6 uClibc-locale-030818.tgz 236073
diff --git a/sys-libs/uclibc/files/digest-uclibc-0.9.28 b/sys-libs/uclibc/files/digest-uclibc-0.9.28
index f580002d766a..4d5df4c5bbbc 100644
--- a/sys-libs/uclibc/files/digest-uclibc-0.9.28
+++ b/sys-libs/uclibc/files/digest-uclibc-0.9.28
@@ -1,2 +1,3 @@
+MD5 7b867551d59399d2fff438aaee08f296 uClibc-0.9.28-patches-1.1.tar.bz2 20041
 MD5 1ada58d919a82561061e4741fb6abd29 uClibc-0.9.28.tar.bz2 1763847
 MD5 d75b2239b4e27c3c9cbed1c8f6eabba6 uClibc-locale-030818.tgz 236073
diff --git a/sys-libs/uclibc/files/getent b/sys-libs/uclibc/files/getent
index 5617cb0c6e0f..8e69115079b4 100755
--- a/sys-libs/uclibc/files/getent
+++ b/sys-libs/uclibc/files/getent
@@ -1,4 +1,5 @@
 #!/bin/sh
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/files/getent,v 1.1.1.1 2005/11/30 09:39:13 chriswhite Exp $
 
 search_entry() {
   if [ -e "$1" ] ; then
@@ -15,12 +16,16 @@ string="dummy"
 
 #aliases|ethers|group|hosts|netgroup|networks|passwd|protocols|rpc|services|shadow)
 # dns based search is not supported for hosts|networks
-# networks searches ^string
-# protocols|rpc|services searches string anywhere
-# ethers|netgroup ?
+# ethers|netgroup (not done, needed)?
 # it returns only the first match
 case $1 in
-  group|passwd|shadow)
+  passwd)
+    string="(^\<$2\>:|^.*:.*:\<$2\>:.*:.*:.*:.*)"
+    ;;
+  group)
+    string="(^|:)\<$2\>:"
+    ;;
+  shadow)
     string="^\<$2\>:"
     ;;
   aliases)
@@ -34,7 +39,7 @@ case $1 in
   networks)
     string="^\<$2\>"
     ;;
-  hosts|protocol|rpc|services)
+  hosts|protocols|rpc|services)
     string="\<$2\>"
     ;;
   *)
diff --git a/sys-libs/uclibc/uclibc-0.9.27-r1.ebuild b/sys-libs/uclibc/uclibc-0.9.27-r1.ebuild
index 502b86f847a3..bff3a1a09bde 100644
--- a/sys-libs/uclibc/uclibc-0.9.27-r1.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.27-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/sys-libs/uclibc/uclibc-0.9.27-r1.ebuild,v 1.1 2005/06/18 06:12:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.27-r1.ebuild,v 1.1.1.1 2005/11/30 09:39:12 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -23,9 +23,9 @@ fi
 # diff -urN --exclude .svn uClibc-0.9.27 uClibc | bzip2 - > uClibc-0.9.27-svn-update-`date +%Y%m%d`.patch.bz2
 # rm -rf uClibc-0.9.27-svn-update-`date +%Y%m%d`.patch.bz2  uClibc uClibc-0.9.27
 
-MY_P=${P/ucl/uCl}
+MY_P=uClibc-${PV}
 SVN_VER="20050114"
-PATCH_VER="1.1"
+PATCH_VER="1.5"
 DESCRIPTION="C library for developing embedded Linux systems"
 HOMEPAGE="http://www.uclibc.org/"
 SRC_URI="http://www.kernel.org/pub/linux/libs/uclibc/${MY_P}.tar.bz2
@@ -40,7 +40,7 @@ LICENSE="LGPL-2"
 	&& SLOT="${CTARGET}" \
 	|| SLOT="0"
 KEYWORDS="-*" #~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86"
-IUSE="wordexp build debug hardened ipv6 static minimal nls pregen userlocales"
+IUSE="build debug hardened ipv6 minimal nls pregen userlocales wordexp"
 RESTRICT="nostrip"
 
 DEPEND="virtual/os-headers"
@@ -72,14 +72,24 @@ alt_rprefix() {
 		echo /usr/${CTARGET}/
 	fi
 }
+just_headers() {
+	[[ -z ${_E_CROSS_HEADERS_ONLY} ]] && return 1
+	[[ ${CHOST} == ${CTARGET} ]] && return 1
+	return 0
+}
 
 pkg_setup() {
-	if ! built_with_use sys-libs/uclibc nls && use nls && ! use pregen ; then
+	just_headers && return 0
+	has_version ${CATEGORY}/uclibc || return 0
+	[[ -n ${UCLIBC_AND_GLIBC} ]] && return 0
+	[[ ${ROOT} != "/" ]] && return 0
+
+	if ! built_with_use ${CATEGORY}/uclibc nls && use nls && ! use pregen ; then
 		eerror "You previously built uclibc with USE=-nls."
 		eerror "You cannot generate locale data with this"
 		eerror "system.  Please rerun emerge with USE=pregen."
 		die "host cannot support locales"
-	elif built_with_use sys-libs/uclibc nls && ! use nls ; then
+	elif built_with_use ${CATEGORY}/uclibc nls && ! use nls ; then
 		eerror "You previously built uclibc with USE=nls."
 		eerror "Rebuilding uClibc with USE=-nls will prob"
 		eerror "destroy your system."
@@ -180,6 +190,11 @@ src_unpack() {
 	sed -i -e '/ARCH_.*_ENDIAN/d' .config
 	echo "ARCH_$(tc-endian | tr [a-z] [A-Z])_ENDIAN=y" >> .config
 
+	if [[ ${CTARGET} == *-softfloat-* ]] ; then
+		sed -i -e '/^HAS_FPU=y$/d' .config
+		echo 'HAS_FPU=n' >> .config
+	fi
+
 	for def in DO_C99_MATH UCLIBC_HAS_{RPC,CTYPE_CHECKED,WCHAR,HEXADECIMAL_FLOATS,GLIBC_CUSTOM_PRINTF,FOPEN_EXCLUSIVE_MODE,GLIBC_CUSTOM_STREAMS,PRINTF_M_SPEC,FTW} ; do
 		sed -i -e "s:# ${def} is not set:${def}=y:" .config
 	done
@@ -198,11 +213,11 @@ src_unpack() {
 			echo "UCLIBC_PREGENERATED_LOCALE_DATA=y" >> .config
 			echo "UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=y" >> .config
 			if use userlocales ; then
-				cp "${DISTDIR}"/${P}-user-locale.tar.gz \
+				cp "${DISTDIR}"/${MY_P}-user-locale.tar.gz \
 					extra/locale/uClibc-locale-030818.tgz \
-					|| die "could not copy ${P}-user-locale.tar.gz"
+					|| die "could not copy ${MY_P}-user-locale.tar.gz"
 			else
-				cp "${DISTDIR}"/${P}-$(tc-arch)-full-locale.tar.gz \
+				cp "${DISTDIR}"/${MY_P}-$(tc-arch)-full-locale.tar.gz \
 					extra/locale/uClibc-locale-030818.tgz \
 					|| die "could not copy locale"
 			fi
@@ -297,6 +312,8 @@ src_compile() {
 	type -p ${CTARGET}-ar && export MAKEOPTS="${MAKEOPTS} CROSS=${CTARGET}-"
 
 	emake headers || die "make headers failed"
+	just_headers && return 0
+
 	if use nls && ! use pregen ; then
 		cd extra/locale
 		make clean || die "make locale clean failed"
@@ -311,11 +328,11 @@ src_compile() {
 	if [[ ${CHOST} == *-uclibc ]] ; then
 		emake utils || die "could not make utils"
 	fi
-
-	! use build && ! hasq test $RESTRICT && src_test
 }
 
 src_test() {
+	return 0
+
 	[[ ${CHOST} != ${CTARGET} ]] && return 0
 	[[ ${CBUILD} != ${CHOST} ]] && return 0
 
@@ -333,10 +350,11 @@ src_test() {
 }
 
 src_install() {
-	emake PREFIX="${D}" install || die "install failed"
+	local target="install"
+	just_headers && target="install_dev"
+	make PREFIX="${D}" ${target} || die "install failed"
 
 	# remove files coming from kernel-headers
-	# scsi is uclibc's own directory since cvs 20040212
 	rm -rf "${D}"$(alt_prefix)/include/{asm,linux,asm-generic}
 
 	# clean up misc cruft
@@ -348,6 +366,7 @@ src_install() {
 	# system headers correctly.  See gcc/doc/gccinstall.info
 	if [[ ${CTARGET} != ${CHOST} ]] ; then
 		dosym include $(alt_prefix)/sys-include
+		dosym . $(alt_prefix)/usr
 		return 0
 	fi
 
diff --git a/sys-libs/uclibc/uclibc-0.9.27.ebuild b/sys-libs/uclibc/uclibc-0.9.27.ebuild
index dabe565e5dfb..cd18ae8f260a 100644
--- a/sys-libs/uclibc/uclibc-0.9.27.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.27.ebuild
@@ -1,70 +1,86 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.27.ebuild,v 1.1 2005/01/15 04:13:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.27.ebuild,v 1.1.1.1 2005/11/30 09:39:13 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
+export CBUILD=${CBUILD:-${CHOST}}
 export CTARGET=${CTARGET:-${CHOST}}
 if [[ ${CTARGET} == ${CHOST} ]] ; then
 	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
 		export CTARGET=${CATEGORY/cross-}
 	fi
 fi
+# Handle the case where we want uclibc on glibc ...
+if [[ ${CTARGET} == ${CHOST} ]] && [[ ${CHOST} != *-uclibc ]] ; then
+	export UCLIBC_AND_GLIBC="sitting in a tree"
+	export CTARGET=${CHOST%%-*}-pc-linux-uclibc
+fi
 
-# To make a new CVS_VER we do.
+# To make a new SVN_VER we do.
 # wget -O - http://uclibc.org/downloads/snapshots/uClibc-`date +%Y%m%d`.tar.bz2 | tar jxf -
-# tar jxf /usr/portage/distfiles/uClibc-0.9.26.tar.bz2
-# diff -urN --exclude .cvsignore --exclude CVS uClibc-0.9.26 uClibc | bzip2 - > uClibc-0.9.26-cvs-update-`date +%Y%m%d`.patch.bz2
-# rm -rf uClibc-0.9.26-cvs-update-`date +%Y%m%d`.patch.bz2  uClibc uClibc-0.9.26
+# tar jxf /usr/portage/distfiles/uClibc-0.9.27.tar.bz2
+# diff -urN --exclude .svn uClibc-0.9.27 uClibc | bzip2 - > uClibc-0.9.27-svn-update-`date +%Y%m%d`.patch.bz2
+# rm -rf uClibc-0.9.27-svn-update-`date +%Y%m%d`.patch.bz2  uClibc uClibc-0.9.27
 
 MY_P=${P/ucl/uCl}
-# only CVS_VER >= 20041117 is supported
-CVS_VER="20050114"
-PATCH_VER="1.0"
+SVN_VER="20050114"
+PATCH_VER="1.4"
 DESCRIPTION="C library for developing embedded Linux systems"
 HOMEPAGE="http://www.uclibc.org/"
 SRC_URI="http://www.kernel.org/pub/linux/libs/uclibc/${MY_P}.tar.bz2
-	mirror://gentoo/${MY_P}-cvs-update-${CVS_VER}.patch.bz2
+	mirror://gentoo/${MY_P}-cvs-update-${SVN_VER}.patch.bz2
 	mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2"
 
 LICENSE="LGPL-2"
 [[ ${CTARGET} != ${CHOST} ]] \
 	&& SLOT="${CTARGET}" \
 	|| SLOT="0"
-KEYWORDS="~arm ~mips ~ppc ~sh ~sparc ~x86"
-IUSE="alsa build debug hardened ipv6 static" # nls is not supported yet
+KEYWORDS="arm m68k mips ppc sh sparc x86"
+IUSE="build debug hardened ipv6 wordexp" # nls is not supported yet
 RESTRICT="nostrip"
 
-DEPEND="sys-devel/gcc"
+DEPEND="virtual/os-headers"
 RDEPEND=""
-PROVIDE="virtual/libc"
+[[ ${CTARGET} == ${CHOST} ]] && PROVIDE="virtual/libc"
 
 S=${WORKDIR}/${MY_P}
 
+alt_kprefix() {
+	if [[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] \
+	   || [[ -n ${UCLIBC_AND_GLIBC} ]]
+	then
+		echo /usr
+	else
+		echo /usr/${CTARGET}
+	fi
+}
 alt_prefix() {
-	if [[ ${CTARGET} = ${CHOST} ]] ; then
+	if [[ ${CTARGET} == ${CHOST} ]] ; then
 		echo /usr
 	else
 		echo /usr/${CTARGET}
 	fi
 }
 alt_rprefix() {
-	if [[ ${CTARGET} = ${CHOST} ]] ; then
+	if [[ ${CTARGET} == ${CHOST} ]] ; then
 		echo /
 	else
-		echo /usr/${CTARGET}
+		echo /usr/${CTARGET}/
 	fi
 }
 
 CPU_ARM="GENERIC_ARM ARM{610,710,720T,920T,922T,926T,_{SA110,SA1100,XSCALE}}"
+CPU_M68K=""
 CPU_MIPS="MIPS_ISA_{1,2,3,4,MIPS{32,64}}"
 CPU_PPC=""
 CPU_SH="SH{2,3,4,5}"
-CPU_X86="GENERIC_386 {3,4,5,6}86 PENTIUM{II,III,4} K{6,7} ELAN CRUSOE WINCHIP{C6,2} CYRIXIII NEHEMIAH"
-IUSE_UCLIBC_CPU="${CPU_ARM} ${CPU_MIPS} ${CPU_PPC} ${CPU_SH} ${CPU_X86}"
+CPU_SPARC=""
+CPU_X86="GENERIC_386 {3,4,5,6}86 586MMX PENTIUM{II,III,4} K{6,7} ELAN CRUSOE WINCHIP{C6,2} CYRIXIII NEHEMIAH"
+IUSE_UCLIBC_CPU="${CPU_ARM} ${CPU_MIPS} ${CPU_PPC} ${CPU_SH} ${CPU_SPARC} ${CPU_X86}"
 
 check_cpu_opts() {
-	local cpu_var="CPU_$(echo $(tc-arch ${CTARGET}) | tr [a-z] [A-Z])"
+	local cpu_var="CPU_$(echo $(tc-arch) | tr [a-z] [A-Z])"
 	if [[ -z ${UCLIBC_CPU} ]] ; then
 		ewarn "You really should consider setting UCLIBC_CPU"
 		ewarn "Otherwise, the build will be generic (read: slow)."
@@ -88,31 +104,44 @@ check_cpu_opts() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	check_cpu_opts
 
+	echo
+	einfo "Runtime Prefix: $(alt_rprefix)"
+	einfo "Kernel Prefix:  $(alt_kprefix)"
+	einfo "Devel Prefix:   $(alt_prefix)"
+	einfo "CBUILD:         ${CBUILD}"
+	einfo "CHOST:          ${CHOST}"
+	einfo "CTARGET:        ${CTARGET}"
+	einfo "CPU:            ${UCLIBC_CPU}"
+	einfo "ENDIAN:         $(tc-endian)"
+	echo
+
 	########## PATCHES ##########
 
-	[[ -n ${CVS_VER} ]] && \
-		epatch ${WORKDIR}/${MY_P}-cvs-update-${CVS_VER}.patch
+	[[ -n ${SVN_VER} ]] && \
+		epatch "${WORKDIR}"/${MY_P}-cvs-update-${SVN_VER}.patch
 
 	if [[ -n ${PATCH_VER} ]] ; then
 		unpack ${MY_P}-patches-${PATCH_VER}.tar.bz2
-		epatch ${WORKDIR}/patch
+		EPATCH_SUFFIX="patch"
+		epatch "${WORKDIR}"/patch
 		# math functions (sinf,cosf,tanf,atan2f,powf,fabsf,copysignf,scalbnf,rem_pio2f)
-		use build || epatch ${WORKDIR}/patch/math
+		use build || epatch "${WORKDIR}"/patch/math
 	fi
 
 	########## CPU SELECTION ##########
 
 	local target config_target
-	case $(tc-arch ${CTARGET}) in
+	case $(tc-arch) in
 		arm)  target="arm";     config_target="GENERIC_ARM";;
+		m68k) target="m68k";    config_target="no cpu-specific options";;
 		mips) target="mips";    config_target="MIPS_ISA_1";;
 		ppc)  target="powerpc"; config_target="no cpu-specific options";;
 		sh)   target="sh";      config_target="SH4";;
 		x86)  target="i386";    config_target="GENERIC_386";;
-		*)    die "$(tc-arch ${CTARGET}) lists no defaults :/";;
+		*)    die "$(tc-arch) lists no defaults :/";;
 	esac
 	sed -i -e "s:default TARGET_i386:default TARGET_${target}:" \
 		extra/Configs/Config.in
@@ -131,14 +160,20 @@ src_unpack() {
 		echo "DODEBUG=y" >> .config
 	fi
 
-	sed -i -e 's:^ARCH_.*_ENDIAN=y::' .config
+	sed -i -e '/ARCH_.*_ENDIAN/d' .config
 	echo "ARCH_$(tc-endian | tr [a-z] [A-Z])_ENDIAN=y" >> .config
 
+	if [[ ${CTARGET} == *-softfloat-* ]] ; then
+		sed -i -e '/^HAS_FPU=y$/d' .config
+		echo 'HAS_FPU=n' >> .config
+	fi
+
 	for def in DO_C99_MATH UCLIBC_HAS_{RPC,CTYPE_CHECKED,WCHAR,HEXADECIMAL_FLOATS,GLIBC_CUSTOM_PRINTF,FOPEN_EXCLUSIVE_MODE,GLIBC_CUSTOM_STREAMS,PRINTF_M_SPEC,FTW} ; do
 		sed -i -e "s:# ${def} is not set:${def}=y:" .config
 	done
 	echo "UCLIBC_HAS_FULL_RPC=y" >> .config
 	echo "PTHREADS_DEBUG_SUPPORT=y" >> .config
+	echo "UCLIBC_HAS_TZ_FILE_READ_MANY=n" >> .config
 
 	#if use nls ; then
 	#	sed -i -e "s:# UCLIBC_HAS_LOCALE is not set:UCLIBC_HAS_LOCALE=y:" .config
@@ -156,11 +191,11 @@ src_unpack() {
 	use ipv6 && sed -i -e "s:# UCLIBC_HAS_IPV6 is not set:UCLIBC_HAS_IPV6=y:" .config
 
 	# uncomment if you miss wordexp (alsa-lib)
-	use alsa && sed -i -e "s:# UCLIBC_HAS_WORDEXP is not set:UCLIBC_HAS_WORDEXP=y:" .config
+	use wordexp && sed -i -e "s:# UCLIBC_HAS_WORDEXP is not set:UCLIBC_HAS_WORDEXP=y:" .config
 
 	# we need to do it independently of hardened to get ssp.c built into libc
 	sed -i -e "s:# UCLIBC_SECURITY.*:UCLIBC_SECURITY=y:" .config
-	echo "UCLIBC_HAS_SSP=y:" >> .config
+	echo "UCLIBC_HAS_SSP=y" >> .config
 	echo "PROPOLICE_BLOCK_ABRT=n" >> .config
 	if use debug ; then
 		echo "PROPOLICE_BLOCK_SEGV=y" >> .config
@@ -171,7 +206,7 @@ src_unpack() {
 	fi
 
 	if use hardened ; then
-		if has $(tc-arch ${CTARGET}) mips ppc x86 ; then
+		if has $(tc-arch) mips ppc x86 ; then
 			echo "UCLIBC_BUILD_PIE=y" >> .config
 		else
 			echo "UCLIBC_BUILD_PIE=n" >> .config
@@ -192,58 +227,54 @@ src_unpack() {
 
 	# we are building against system installed kernel headers
 	sed -i \
-		-e "s:KERNEL_SOURCE.*:KERNEL_SOURCE=\"$(alt_prefix)\":" \
-		-e "s:SHARED_LIB_LOADER_PREFIX=.*:SHARED_LIB_LOADER_PREFIX=\"$(alt_rprefix)/$(get_libdir)\":" \
+		-e "s:KERNEL_SOURCE.*:KERNEL_SOURCE=\"$(alt_kprefix)\":" \
+		-e "s:SHARED_LIB_LOADER_PREFIX=.*:SHARED_LIB_LOADER_PREFIX=\"$(alt_rprefix)$(get_libdir)\":" \
 		-e "s:DEVEL_PREFIX=.*:DEVEL_PREFIX=\"$(alt_prefix)\":" \
 		-e "s:RUNTIME_PREFIX=.*:RUNTIME_PREFIX=\"$(alt_rprefix)\":" \
 		.config
 
-	make -s oldconfig > /dev/null || die "could not make oldconfig"
+	yes "" 2> /dev/null | make -s oldconfig > /dev/null || die "could not make oldconfig"
 
 	chmod +x extra/scripts/relative_path.sh
 
 	cp .config myconfig
 
-	emake clean >/dev/null || die "could not clean"
+	emake clean > /dev/null || die "could not clean"
 }
 
 src_compile() {
-	# running tests require this
-	use build || addwrite /dev/ptmx
 	cp myconfig .config
 
-	#if use nls ; then
-	#	# these can be built only if the build system supports locales (as of 0.9.26)
-	#	emake -j1 headers
-	#	cd extra/locale
-	#	make clean
-	#	find ./charmaps -name "*.pairs" > codesets.txt
-	#	cp LOCALES locales.txt
-	#	emake -j1 || die "could not make locales"
-	#	cd ../..
-	#fi
-	local makeopts
-	type -p ${CTARGET}-ar && makeopts="CROSS=${CTARGET}-"
+	# last release doesnt support parallel build, 
+	# but the current svn repo does ...
+	export MAKEOPTS="${MAKEOPTS} -j1"
+	type -p ${CTARGET}-ar && export MAKEOPTS="${MAKEOPTS} CROSS=${CTARGET}-"
 
-	emake -j1 ${makeopts} || die "could not make"
+	emake || die "could not make"
 	[[ ${CTARGET} != ${CHOST} ]] && return 0
 
 	if [[ ${CHOST} == *-uclibc ]] ; then
-		emake -j1 ${makeopts} utils || die "could not make utils"
-	fi
-
-	if ! use build ; then
-		if ! hasq maketest $RESTRICT ; then
-			src_test
-		fi
+		emake utils || die "could not make utils"
 	fi
 }
 
 src_test() {
+	return 0
+
+	[[ ${CHOST} != ${CTARGET} ]] && return 0
+	[[ ${CBUILD} != ${CHOST} ]] && return 0
+
+	# running tests require this
+	use build || addwrite /dev/ptmx
+
+	# This is wrong, but uclibc's tests fail bad when screwing 
+	# around with sandbox, so lets just punt it
+	unset LD_PRELOAD
+
 	# assert test fails on pax/grsec enabled kernels - normal
 	# vfork test fails in sandbox (both glibc/uclibc)
 	cd test
-	make
+	make || die "test failed"
 }
 
 src_install() {
@@ -251,18 +282,24 @@ src_install() {
 
 	# remove files coming from kernel-headers
 	# scsi is uclibc's own directory since cvs 20040212
-	rm -r "${D}"$(alt_prefix)/include/{asm,linux,asm-generic}
-
-	[[ ${CTARGET} != ${CHOST} ]] && return 0
+	rm -rf "${D}"$(alt_prefix)/include/{asm,linux,asm-generic}
+
+	# clean up misc cruft
+	find "${D}"$(alt_prefix)/include -type d '(' -name CVS -o -name .svn ')' -print0 | xargs -0 rm -r
+	find "${D}"$(alt_prefix)/include -type f -name .cvsignore -print0 | xargs -0 rm -f
+
+	# Make sure we install the sys-include symlink so that when 
+	# we build a 2nd stage cross-compiler, gcc finds the target 
+	# system headers correctly.  See gcc/doc/gccinstall.info
+	if [[ ${CTARGET} != ${CHOST} ]] ; then
+		dosym include $(alt_prefix)/sys-include
+		dosym . $(alt_prefix)/usr
+		return 0
+	fi
 
 	if [[ ${CHOST} == *-uclibc ]] ; then
-#		rm -f "${D}"$(alt_prefix)/lib/lib*_pic.a
-#		! use static && use build && rm -f "${D}"$(alt_prefix)/lib/lib*.a
-
 		emake PREFIX="${D}" install_utils || die "install-utils failed"
-		dodir /usr/bin
-		exeinto /usr/bin
-		doexe extra/scripts/getent
+		dobin extra/scripts/getent
 	fi
 
 	if ! use build ; then
@@ -286,12 +323,6 @@ if [[ ${CHOST} == *-uclibc ]] ; then
 		echo "UTC" > "${ROOT}"/etc/TZ
 	fi
 
-	if [[ ! -e ${ROOT}/etc/ld.so.conf ]] ; then
-		[[ -d ${ROOT}/usr/X11R6/lib ]] \
-			&& echo "/usr/X11R6/lib" > "${ROOT}"/etc/ld.so.conf \
-			|| > "${ROOT}"/etc/ld.so.conf
-	fi
-
 	if [[ ${ROOT} == "/" ]] ; then
 		# update cache before reloading init
 		/sbin/ldconfig
diff --git a/sys-libs/uclibc/uclibc-0.9.28.ebuild b/sys-libs/uclibc/uclibc-0.9.28.ebuild
index 0ef0b610d737..5ffd888ec82f 100644
--- a/sys-libs/uclibc/uclibc-0.9.28.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.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/sys-libs/uclibc/uclibc-0.9.28.ebuild,v 1.1 2005/08/18 03:53:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.ebuild,v 1.1.1.1 2005/11/30 09:39:12 chriswhite Exp $
 
 #ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc"
 #inherit subversion
@@ -19,22 +19,26 @@ if [[ ${CTARGET} == ${CHOST} ]] && [[ ${CHOST} != *-uclibc ]] ; then
 	export CTARGET=${CHOST%%-*}-pc-linux-uclibc
 fi
 
-MY_P=${P/ucl/uCl}
+MY_P=uClibc-${PV}
 SVN_VER=""
-PATCH_VER=""
+PATCH_VER="1.1"
 DESCRIPTION="C library for developing embedded Linux systems"
 HOMEPAGE="http://www.uclibc.org/"
 SRC_URI="http://www.kernel.org/pub/linux/libs/uclibc/${MY_P}.tar.bz2
 	nls? ( !userlocales? ( pregen? (
 		x86? ( http://www.uclibc.org/downloads/uClibc-locale-030818.tgz )
 	) ) )"
+[[ -z ${SVN_VER} ]] || \
+	SRC_URI="${SRC_URI} mirror://gentoo/${MY_P}-svn-update-${SVN_VER}.patch.bz2"
+[[ -z ${PATCH_VER} ]] || \
+	SRC_URI="${SRC_URI} mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2"
 
 LICENSE="LGPL-2"
 [[ ${CTARGET} != ${CHOST} ]] \
 	&& SLOT="${CTARGET}" \
 	|| SLOT="0"
-KEYWORDS="-* ~sh" #~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86"
-IUSE="build debug hardened ipv6 minimal nls pregen userlocales wordexp"
+KEYWORDS="-* ~arm ~m68k ~mips ~ppc sh ~sparc ~x86"
+IUSE="build uclibc-compat debug hardened iconv ipv6 minimal nls pregen userlocales wordexp"
 RESTRICT="nostrip"
 
 DEPEND="virtual/os-headers"
@@ -66,9 +70,17 @@ alt_rprefix() {
 		echo /usr/${CTARGET}/
 	fi
 }
+just_headers() {
+	[[ -z ${_E_CROSS_HEADERS_ONLY} ]] && return 1
+	[[ ${CHOST} == ${CTARGET} ]] && return 1
+	return 0
+}
 
 pkg_setup() {
-	[[ -z $(best_version ${CATEGORY}/uclibc) ]] && return 0
+	just_headers && return 0
+	has_version ${CATEGORY}/uclibc || return 0
+	[[ -n ${UCLIBC_AND_GLIBC} ]] && return 0
+	[[ ${ROOT} != "/" ]] && return 0
 
 	if ! built_with_use ${CATEGORY}/uclibc nls && use nls && ! use pregen ; then
 		eerror "You previously built uclibc with USE=-nls."
@@ -83,6 +95,8 @@ pkg_setup() {
 	fi
 }
 
+PIE_STABLE="arm mips ppc x86"
+
 CPU_AMD64=""
 CPU_ARM="GENERIC_ARM ARM{610,710,720T,920T,922T,926T,_{SA110,SA1100,XSCALE}}"
 CPU_M68K=""
@@ -103,7 +117,12 @@ check_cpu_opts() {
 		ewarn "Available CPU options:"
 		UCLIBC_CPU=$(eval echo ${!cpu_var})
 		echo ${UCLIBC_CPU}
-		export UCLIBC_CPU=${UCLIBC_CPU%% *}
+		case ${CTARGET} in
+			mips[1234]*) export UCLIBC_CPU="MIPS_ISA_${CTARGET:4:1}";;
+			sh[2345]*)   export UCLIBC_CPU="SH${CTARGET:2:1}";;
+			i[456]86*)   export UCLIBC_CPU="${CTARGET:1:1}86";;
+			*)           export UCLIBC_CPU=${UCLIBC_CPU%% *};;
+		esac
 	else
 		local cpu found=0
 		for cpu in $(eval echo ${!cpu_var}) ; do
@@ -123,6 +142,7 @@ src_unpack() {
 		&& subversion_src_unpack \
 		|| unpack ${A}
 	cd "${S}"
+
 	check_cpu_opts
 
 	echo
@@ -146,7 +166,8 @@ src_unpack() {
 		EPATCH_SUFFIX="patch"
 		epatch "${WORKDIR}"/patch
 		# math functions (sinf,cosf,tanf,atan2f,powf,fabsf,copysignf,scalbnf,rem_pio2f)
-		use build || epatch "${WORKDIR}"/patch/math
+		cp "${WORKDIR}"/patch/math/libm/* "${S}"/libm/ || die
+		epatch "${WORKDIR}"/patch/math
 	fi
 
 	########## CPU SELECTION ##########
@@ -159,6 +180,7 @@ src_unpack() {
 		mips)  target="mips";    config_target="MIPS_ISA_1";;
 		ppc)   target="powerpc"; config_target="no cpu-specific options";;
 		sh)    target="sh";      config_target="SH4";;
+		sparc) target="sparc";   config_target="no cpu-specific options";;
 		x86)   target="i386";    config_target="GENERIC_386";;
 		*)     die "$(tc-arch) lists no defaults :/";;
 	esac
@@ -171,12 +193,14 @@ src_unpack() {
 
 	make defconfig >/dev/null || die "could not config"
 
-	for def in UCLIBC_PROFILING DO{DEBUG,ASSERTS} SUPPORT_LD_DEBUG{,_EARLY} ; do
+	for def in DO{DEBUG{,_PT},ASSERTS} SUPPORT_LD_DEBUG{,_EARLY} ; do
 		sed -i -e "s:${def}=y:# ${def} is not set:" .config
 	done
 	if use debug ; then
+		#echo "SUPPORT_LD_DEBUG_EARLY=y" >> .config
 		echo "SUPPORT_LD_DEBUG=y" >> .config
 		echo "DODEBUG=y" >> .config
+		#echo "DODEBUG_PT=y" >> .config
 	fi
 
 	sed -i -e '/ARCH_.*_ENDIAN/d' .config
@@ -187,29 +211,36 @@ src_unpack() {
 		echo 'HAS_FPU=n' >> .config
 	fi
 
-	for def in DO_C99_MATH UCLIBC_HAS_{RPC,CTYPE_CHECKED,WCHAR,HEXADECIMAL_FLOATS,GLIBC_CUSTOM_PRINTF,FOPEN_EXCLUSIVE_MODE,GLIBC_CUSTOM_STREAMS,PRINTF_M_SPEC,FTW} ; do
+	local moredefs=""
+	use uclibc-compat && moredefs="DL_FINI_CRT_COMPAT"
+	for def in ${moredefs} MALLOC_GLIBC_COMPAT DO_C99_MATH UCLIBC_HAS_{RPC,CTYPE_CHECKED,WCHAR,HEXADECIMAL_FLOATS,GLIBC_CUSTOM_PRINTF,FOPEN_EXCLUSIVE_MODE,GLIBC_CUSTOM_STREAMS,PRINTF_M_SPEC,FTW} ; do
 		sed -i -e "s:# ${def} is not set:${def}=y:" .config
 	done
 	echo "UCLIBC_HAS_FULL_RPC=y" >> .config
 	echo "PTHREADS_DEBUG_SUPPORT=y" >> .config
 	echo "UCLIBC_HAS_TZ_FILE_READ_MANY=n" >> .config
 
-	if use nls ; then
+	if use iconv ; then
 		sed -i -e "s:# UCLIBC_HAS_LOCALE is not set:UCLIBC_HAS_LOCALE=y:" .config
 		echo "UCLIBC_HAS_XLOCALE=n" >> .config
 		echo "UCLIBC_HAS_GLIBC_DIGIT_GROUPING=y" >> .config
 		echo "UCLIBC_HAS_SCANF_LENIENT_DIGIT_GROUPING=y" >> .config
-		echo "UCLIBC_HAS_GETTEXT_AWARENESS=y" >> .config
+
+		if use nls ; then
+			echo "UCLIBC_HAS_GETTEXT_AWARENESS=y" >> .config
+		else
+			echo "UCLIBC_HAS_GETTEXT_AWARENESS=n" >> .config
+		fi
 
 		if use pregen ; then
 			echo "UCLIBC_PREGENERATED_LOCALE_DATA=y" >> .config
 			echo "UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=y" >> .config
 			if use userlocales ; then
-				cp "${DISTDIR}"/${P}-user-locale.tar.gz \
+				cp "${DISTDIR}"/${MY_P}-user-locale.tar.gz \
 					extra/locale/uClibc-locale-030818.tgz \
-					|| die "could not copy ${P}-user-locale.tar.gz"
+					|| die "could not copy ${MY_P}-user-locale.tar.gz"
 			else
-				cp "${DISTDIR}"/${P}-$(tc-arch)-full-locale.tar.gz \
+				cp "${DISTDIR}"/${MY_P}-$(tc-arch)-full-locale.tar.gz \
 					extra/locale/uClibc-locale-030818.tgz \
 					|| die "could not copy locale"
 			fi
@@ -228,6 +259,7 @@ src_unpack() {
 	# we need to do it independently of hardened to get ssp.c built into libc
 	sed -i -e "s:# UCLIBC_SECURITY.*:UCLIBC_SECURITY=y:" .config
 	echo "UCLIBC_HAS_SSP=y" >> .config
+	echo "SSP_USE_ERANDOM=n" >> .config
 	echo "PROPOLICE_BLOCK_ABRT=n" >> .config
 	if use debug ; then
 		echo "PROPOLICE_BLOCK_SEGV=y" >> .config
@@ -237,23 +269,33 @@ src_unpack() {
 		echo "PROPOLICE_BLOCK_KILL=y" >> .config
 	fi
 
+	# arm/mips do not emit PT_GNU_STACK, but if we enable this here
+	# it will be emitted as RWE, ppc has to be checked, x86 needs it
+	# this option should be used independently of hardened
+	# relro could be also moved out of hardened
+	if has $(tc-arch) x86 ; then
+		echo "UCLIBC_BUILD_NOEXECSTACK=y" >> .config
+	else
+		echo "UCLIBC_BUILD_NOEXECSTACK=n" >> .config
+	fi
+	echo "UCLIBC_BUILD_RELRO=y" >> .config
 	if use hardened ; then
-		echo "UCLIBC_BUILD_PIE=y" >> .config
+		if has $(tc-arch) ${PIE_STABLE} ; then
+			echo "UCLIBC_BUILD_PIE=y" >> .config
+		else
+			echo "UCLIBC_BUILD_PIE=n" >> .config
+		fi
 		echo "SSP_QUICK_CANARY=n" >> .config
 		echo "UCLIBC_BUILD_SSP=y" >> .config
-		echo "UCLIBC_BUILD_RELRO=y" >> .config
 		echo "UCLIBC_BUILD_NOW=y" >> .config
-		echo "UCLIBC_BUILD_NOEXECSTACK=y" >> .config
 	else
 		echo "UCLIBC_BUILD_PIE=n" >> .config
 		echo "SSP_QUICK_CANARY=y" >> .config
 		echo "UCLIBC_BUILD_SSP=n" >> .config
-		echo "UCLIBC_BUILD_RELRO=n" >> .config
 		echo "UCLIBC_BUILD_NOW=n" >> .config
-		echo "UCLIBC_BUILD_NOEXECSTACK=n" >> .config
 	fi
 
-	# we are building against system installed kernel headers
+	# setup build and run paths
 	local cross=${CTARGET}-
 	type -p ${cross}ar > /dev/null || cross=""
 	sed -i \
@@ -266,8 +308,6 @@ src_unpack() {
 
 	yes "" 2> /dev/null | make -s oldconfig > /dev/null || die "could not make oldconfig"
 
-	chmod +x extra/scripts/relative_path.sh
-
 	cp .config myconfig
 
 	emake -s clean > /dev/null || die "could not clean"
@@ -298,7 +338,9 @@ src_compile() {
 	cp myconfig .config
 
 	emake headers || die "make headers failed"
-	if use nls && ! use pregen ; then
+	just_headers && return 0
+
+	if use iconv && ! use pregen ; then
 		cd extra/locale
 		make clean || die "make locale clean failed"
 		setup_locales
@@ -318,20 +360,18 @@ src_test() {
 	[[ ${CHOST} != ${CTARGET} ]] && return 0
 	[[ ${CBUILD} != ${CHOST} ]] && return 0
 
-	# This is wrong, but uclibc's tests fail bad when screwing 
-	# around with sandbox, so lets just punt it
-	unset LD_PRELOAD
-
 	# assert test fails on pax/grsec enabled kernels - normal
 	# vfork test fails in sandbox (both glibc/uclibc)
 	make check || die "test failed"
 }
 
 src_install() {
-	make PREFIX="${D}" install || die "install failed"
+	local target="install"
+	just_headers && target="install_dev"
+	make PREFIX="${D}" ${target} || die "install failed"
 
 	# remove files coming from kernel-headers
-	rm -rf "${D}"$(alt_prefix)/include/{asm,linux,asm-generic}
+	rm -rf "${D}"$(alt_prefix)/include/{linux,asm*}
 
 	# Make sure we install the sys-include symlink so that when 
 	# we build a 2nd stage cross-compiler, gcc finds the target 
@@ -349,7 +389,7 @@ src_install() {
 
 	if ! use build ; then
 		dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
-		doman docs/man/*.1
+		doman docs/man/*.[1-9]
 	fi
 }
 
diff --git a/sys-libs/zlib/ChangeLog b/sys-libs/zlib/ChangeLog
index fe0111c1ee4e..7d7537e1d1f2 100644
--- a/sys-libs/zlib/ChangeLog
+++ b/sys-libs/zlib/ChangeLog
@@ -1,6 +1,214 @@
 # ChangeLog for sys-libs/zlib
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.1 2002/02/01 21:53:38 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.1.1.1 2005/11/30 09:39:09 chriswhite Exp $
+
+  22 Jul 2005; Hardave Riar <hardave@gentoo.org> zlib-1.2.3.ebuild:
+  Stable on mips, bug #99751.
+
+  21 Jul 2005; Aron Griffis <agriffis@gentoo.org> zlib-1.2.3.ebuild:
+  stable on ia64
+
+  21 Jul 2005; Herbie Hopkins <herbs@gentoo.org> zlib-1.2.3.ebuild:
+  Stable on amd64 wrt bug #99751.
+
+  21 Jul 2005; <solar.@gentoo.org> zlib-1.2.3.ebuild:
+  - stable on x86 for CAN-2005-1849 bug #99751
+
+*zlib-1.2.3 (21 Jul 2005)
+
+  21 Jul 2005; Tavis Ormandy <taviso@gentoo.org> +zlib-1.2.3.ebuild:
+  security bump #99751
+
+  06 Jul 2005; Stephen Bennett <spb@gentoo.org> zlib-1.2.2-r1.ebuild:
+  mips stable for bug #98121
+
+*zlib-1.2.2-r1 (06 Jul 2005)
+
+  06 Jul 2005; Tavis Ormandy <taviso@gentoo.org>
+  +files/zlib-1.2.2-inftrees.patch, +zlib-1.2.2-r1.ebuild:
+  fix #97547 CAN-2005-2096
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org> zlib-1.2.2.ebuild:
+  Stable on ppc64
+
+  19 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> zlib-1.2.2.ebuild:
+  Stable on alpha.
+
+  17 Feb 2005; Luca Barbato <lu_zero@gentoo.org> zlib-1.2.2.ebuild:
+  Marked ppc
+
+  06 Feb 2005; Joshua Kinard <kumba@gentoo.org> zlib-1.2.2.ebuild:
+  Marked stable on mips.
+
+  20 Jan 2005; Marcus Hanwell <cryos@gentoo.org> zlib-1.2.2.ebuild:
+  Marking stable on amd64.
+
+  20 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> zlib-1.2.2.ebuild:
+  Stable on sparc
+
+  02 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  zlib-1.2.1-r3.ebuild, zlib-1.2.2.ebuild:
+  Make zlib friendly with multilib by moving some stuff from src_compile to
+  pkg_setup.
+
+  03 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*zlib-1.2.2 (03 Nov 2004)
+
+  03 Nov 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/zlib-1.2.2-mapfile.patch, +zlib-1.2.2.ebuild:
+  Version bump #69920 by Tobias Sager.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  zlib-1.1.4-r4.ebuild, zlib-1.2.1-r2.ebuild:
+  Masked zlib-1.2.1-r2.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  zlib-1.1.4-r4.ebuild:
+  Masked zlib-1.1.4-r4.ebuild stable for ppc
+
+  28 Aug 2004; Travis Tilley <lv@gentoo.org> +files/zlib-1.2.1-fPIC.patch,
+  zlib-1.2.1-r3.ebuild:
+  added a patch to always use -fPIC for the shared library test, otherwise it
+  may fail on -fPIC dependant archs. fixes bug #61868
+
+  27 Aug 2004; Travis Tilley <lv@gentoo.org> zlib-1.2.1-r3.ebuild:
+  moved CONF_LIBDIR logic to use $(get_libdir) instead so that the ebuild will
+  still use lib when CONF_LIBDIR is set, but the current version of portage
+  doesnt have CONF_LIBDIR support
+
+  27 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> zlib-1.2.1-r3.ebuild:
+  Stable on alpha, bug 61749.
+
+  26 Aug 2004; Tom Gall <tgall@gentoo.org> zlib-1.2.1-r3.ebuild:
+  stable on ppc64, bug #61749
+
+  26 Aug 2004; Jon Portnoy <avenj@gentoo.org> zlib-1.2.1-r3.ebuild :
+  Stable on x86
+
+  26 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> zlib-1.2.1-r3.ebuild:
+  Stable on sparc wrt #61749
+
+*zlib-1.2.1-r3 (26 Aug 2004)
+
+  26 Aug 2004; <solar@gentoo.org> +files/zlib-1.2.1-CAN-2004-0797.patch,
+  +zlib-1.2.1-r3.ebuild:
+  security fix. bug #61749
+
+  24 Aug 2004; Sven Wegener <swegener@gentoo.org> zlib-1.1.4-r2.ebuild,
+  zlib-1.1.4-r3.ebuild, zlib-1.1.4-r4.ebuild, zlib-1.2.1-r1.ebuild,
+  zlib-1.2.1.ebuild:
+  Don't assign default to S and added missing IUSE.
+
+  14 Aug 2004; Travis Tilley <lv@gentoo.org> zlib-1.2.1-r2.ebuild:
+  made zlib ebuild CONF_LIBDIR aware for installing to lib64/lib32
+
+  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> zlib-1.1.4-r2.ebuild,
+  zlib-1.1.4-r3.ebuild, zlib-1.1.4-r4.ebuild, zlib-1.2.1-r1.ebuild,
+  zlib-1.2.1-r2.ebuild, zlib-1.2.1.ebuild:
+  virtual/glibc -> virtual/libc
+
+  01 Jul 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/zlib-1.2.1-configure.patch:
+  Patch the custom configure file to not error when warnings are spat out #55434
+  by Honza.
+
+  29 Jun 2004; Joshua Kinard <kumba@gentoo.org> zlib-1.2.1-r2.ebuild:
+  Marked stable on sparc and mips.
+
+  28 Jun 2004; Brandon Hale <tseng@gentoo.org> zlib-1.2.1-r2.ebuild:
+  Stable on x86.
+
+  11 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> zlib-1.2.1-r2.ebuild:
+  Stable on alpha.
+
+*zlib-1.2.1-r2 (23 Dec 2003)
+
+  02 May 2004; Mike Frysinger <vapier@gentoo.org> :
+  Don't install doc/man pages if build is in USE.
+
+  23 Dec 2003; Robin H. Johnson <robbat2@gentoo.org> zlib-1.2.1-r2.ebuild:
+  fix bug #36333.
+
+*zlib-1.2.1-r1 (21 Dec 2003)
+
+  21 Dec 2003; Robin H. Johnson <robbat2@gentoo.org> zlib-1.2.1-r1.ebuild:
+  move libraries from /usr/lib to /lib as per bug 27064
+
+*zlib-1.2.1 (02 Dec 2003)
+
+  02 Dec 2003; Seemant Kulleen <seemant@gentoo.org> zlib-1.1.3-r3.ebuild,
+  zlib-1.1.4-r1.ebuild, zlib-1.1.4.ebuild, zlib-1.2.1.ebuild,
+  files/zlib-1.2.1-build-fPIC.patch, files/zlib-1.2.1-glibc.patch,
+  files/zlib-1.2.1-mapfile.patch:
+  version bumped to newest upstream -- includes an updated mapfile patch from:
+  Danek Duvall <duvall@emufarm.org>
+
+  16 Nov 2003; Bartosch Pixa <darkspecter@gentoo.org> zlib-1.1.4-r3.ebuild:
+  set ppc in keywords
+
+*zlib-1.1.4-r4 (07 Nov 2003)
+
+  07 Nov 2003; Martin Schlemmer <azarah@gentoo.org> zlib-1.1.4-r4.ebuild,
+  files/zlib-1.1.4-mapfile.patch:
+  Only export global symbols, bug #32764. Patch thanks to Danek Duvall
+  <duvall@emufarm.org>.
+
+*zlib-1.1.4-r3 (29 Oct 2003)
+
+  29 Oct 2003; Martin Schlemmer <azarah@gentoo.org> zlib-1.1.4-r3.ebuild,
+  files/zlib-1.1.4-build-fPIC.patch, files/zlib-1.1.4-glibc.patch,
+  files/zlib-1.1.4-gzprintf.patch:
+  Add patches from Mandrake to add -fPIC rather than append-flags, hopefully
+  this will solve bug #32140.  Also add updated security patch.
+
+*zlib-1.1.4-r2 (27 Oct 2003)
+
+  27 Oct 2003; Martin Schlemmer <azarah@gentoo.org> zlib-1.1.4-r2.ebuild:
+  Do not call make with 'make CFLAGS=$CFLAGS', as that discards flags set by the
+  Makefile, and breaks things, bug #28021, thanks to Denys Duchier
+  <duchier@ps.uni-sb.de>.
+
+  17 Sep 2003; Jon Portnoy <avenj@gentoo.org> :
+  ia64 keywords.
+
+*zlib-1.1.4-r1 (25 Feb 2003)
+
+  25 Feb 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Security update. Added patch by Kelledin <kelledin+BTQ@skarpsey.dyndns.org> posted
+  on bugtraq.
+
+*zlib-1.1.4 (11 Mar 2002)
+
+  20 Feb 2003; Zach Welch <zwelch@gentoo.org> zlib-1.1.4.ebuild :
+  Added arm to keywords.
+
+  07 Feb 2003; Guy Martin <gmsoft@gentoo.org> zlib-1.1.4.ebuild :
+  Added hppa to keywords.
+
+  12 Dec 2002; Jan Seidel <tuxus@gentoo.org> zlib-1.1.4.ebuild : 
+  Added mips to keywords.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+
+  17 Nov 2002: Stefan Jones <cretin@gentoo.org> zlib-1.1.4.ebuild :
+  Added -fPIC CFLAG, stop prelink error non-PIC shared library.
+
+  15 Jul 2002; Mark Guertin <gerk@gentoo.org>
+  Added ppc to keywords
+
+  11 Mar 2002; Bruce A. Locke <blocke@shivan.org> zlib-1.1.4.ebuild :
+
+  - upstream security update (possible exploitable buffer overflow)
+  - website moved
+  - src_install is now version independent
+  
+*zlib-1.1.3-r3 (4 March 2002)
+
+  4 March 2002; Donny Davies <woodchip@gentoo.org> zlib-1.1.3-r3.ebuild :
+
+  Fix to install the library 755.
 
 *zlib-1.1.3-r2 (1 Feb 2002)
 
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index e69de29bb2d1..c27845f348e8 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -0,0 +1,14 @@
+MD5 81c626acfa8f6fa08a8b22152697014d ChangeLog 7716
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 8064f3ee210d73a2f545ca908f6e6863 zlib-1.2.2.ebuild 1779
+MD5 efe93e20bc888ec8bf234c75314379c2 zlib-1.2.2-r1.ebuild 1861
+MD5 509ebed695e0ba6f6137fa7790f0160d zlib-1.2.3.ebuild 1802
+MD5 3ccc7437df1921bba1a37d42a70e711f files/digest-zlib-1.2.2-r1 63
+MD5 3ccc7437df1921bba1a37d42a70e711f files/digest-zlib-1.2.2 63
+MD5 571442813f5f960edd0e7498786dff1f files/zlib-1.2.2-inftrees.patch 474
+MD5 d821453623869d6d8f7de1eca8b12e2f files/zlib-1.2.1-build-fPIC.patch 2211
+MD5 9d3fdd73e1997aa5c823fc210f29919d files/zlib-1.2.1-configure.patch 3149
+MD5 a337d1727a4f6f9ed8d29e43cde40e89 files/zlib-1.2.1-fPIC.patch 662
+MD5 f84d68bd9a614ad5495a369cb258cf8d files/zlib-1.2.1-glibc.patch 395
+MD5 8040cf924143b9328aa2d584222e0f51 files/digest-zlib-1.2.3 63
+MD5 40634a4cbdcd9c795cfc34473c76038c files/zlib-1.2.2-mapfile.patch 2139
diff --git a/sys-libs/zlib/files/zlib-1.2.1-build-fPIC.patch b/sys-libs/zlib/files/zlib-1.2.1-build-fPIC.patch
index 3f122c9cfc2b..86d05c8a61c5 100644
--- a/sys-libs/zlib/files/zlib-1.2.1-build-fPIC.patch
+++ b/sys-libs/zlib/files/zlib-1.2.1-build-fPIC.patch
@@ -1,6 +1,5 @@
-diff -urN zlib-1.2.1-old/Makefile.in zlib-1.2.1/Makefile.in
---- zlib-1.2.1-old/Makefile.in	2003-12-02 12:14:28.000000000 -0800
-+++ zlib-1.2.1/Makefile.in	2003-12-02 12:16:46.000000000 -0800
+--- zlib-1.2.1/Makefile.in
++++ zlib-1.2.1/Makefile.in
 @@ -49,6 +49,8 @@
  OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
         zutil.o inflate.o infback.o inftrees.o inffast.o
@@ -51,9 +50,17 @@ diff -urN zlib-1.2.1-old/Makefile.in zlib-1.2.1/Makefile.in
  uninstall:
  	cd $(includedir); \
  	cd $(libdir); rm -f libz.a; \
-diff -urN zlib-1.2.1-old/configure zlib-1.2.1/configure
---- zlib-1.2.1-old/configure	2003-11-16 19:50:39.000000000 -0800
-+++ zlib-1.2.1/configure	2003-12-02 12:18:01.000000000 -0800
+@@ -127,7 +127,7 @@
+ 
+ mostlyclean: clean
+ clean:
+-	rm -f *.o *~ example$(EXE) minigzip$(EXE) \
++	rm -f *.lo *.o *~ example$(EXE) minigzip$(EXE) \
+ 	   libz.* foo.gz so_locations \
+ 	   _match.s maketree contrib/infback9/*.o
+ 
+--- zlib-1.2.1/configure
++++ zlib-1.2.1/configure
 @@ -160,7 +160,7 @@
    if test "`($CC -c $SFLAGS $test.c) 2>&1`" = "" &&
       test "`($LDSHARED -o $test$shared_ext $test.o) 2>&1`" = ""; then
diff --git a/sys-libs/zlib/metadata.xml b/sys-libs/zlib/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-libs/zlib/metadata.xml
+++ b/sys-libs/zlib/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/sys-libs/zlib/zlib-1.2.2-r1.ebuild b/sys-libs/zlib/zlib-1.2.2-r1.ebuild
index ad051b4d090c..8bdead589297 100644
--- a/sys-libs/zlib/zlib-1.2.2-r1.ebuild
+++ b/sys-libs/zlib/zlib-1.2.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/sys-libs/zlib/zlib-1.2.2-r1.ebuild,v 1.1 2005/07/06 13:10:50 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:39:09 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.gzip.org/zlib/${P}.tar.bz2
 
 LICENSE="ZLIB"
 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="build"
 
 RDEPEND=""
diff --git a/sys-libs/zlib/zlib-1.2.2.ebuild b/sys-libs/zlib/zlib-1.2.2.ebuild
index d24684ded461..49519156abf9 100644
--- a/sys-libs/zlib/zlib-1.2.2.ebuild
+++ b/sys-libs/zlib/zlib-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/sys-libs/zlib/zlib-1.2.2.ebuild,v 1.1 2004/11/04 00:27:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.2.ebuild,v 1.1.1.1 2005/11/30 09:39:09 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -11,12 +11,15 @@ SRC_URI="http://www.gzip.org/zlib/${P}.tar.bz2
 
 LICENSE="ZLIB"
 SLOT="0"
-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"
 IUSE="build"
 
-RDEPEND="virtual/libc"
-DEPEND="${RDEPEND}
-	>=sys-devel/binutils-2.14.90.0.6"
+RDEPEND=""
+
+pkg_setup() {
+	tc-export CC RANLIB
+	export AR="$(tc-getAR) rc"
+}
 
 src_unpack() {
 	unpack ${A}
@@ -37,17 +40,11 @@ src_unpack() {
 src_compile() {
 	./configure --shared --prefix=/usr --libdir=/$(get_libdir) || die
 	emake || die
-	make test || die
-
-	./configure --prefix=/usr --libdir=/$(get_libdir) || die
-	emake || die
 }
 
 src_install() {
 	einstall libdir=${D}/$(get_libdir) || die
-	rm ${D}/$(get_libdir)/libz.a
-	into /usr
-	dodir /usr/include
+	rm "${D}"/$(get_libdir)/libz.a
 	insinto /usr/include
 	doins zconf.h zlib.h
 
@@ -60,7 +57,6 @@ src_install() {
 
 	# we don't need the static lib in /lib
 	# as it's only for compiling against
-	into /usr
 	dolib libz.a
 
 	# all the shared libs go into /lib
@@ -70,6 +66,5 @@ src_install() {
 	( cd ${D}/$(get_libdir) ; chmod 755 libz.so.* )
 	dosym libz.so.${PV} /$(get_libdir)/libz.so
 	dosym libz.so.${PV} /$(get_libdir)/libz.so.1
-	# with an extra symlink at /usr/lib
-	dosym /$(get_libdir)/libz.so.${PV} /usr/$(get_libdir)/libz.so
+	gen_usr_ldscript libz.so
 }
diff --git a/sys-libs/zlib/zlib-1.2.3.ebuild b/sys-libs/zlib/zlib-1.2.3.ebuild
index 473bbb83e441..23637f71a871 100644
--- a/sys-libs/zlib/zlib-1.2.3.ebuild
+++ b/sys-libs/zlib/zlib-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/sys-libs/zlib/zlib-1.2.3.ebuild,v 1.1 2005/07/21 08:17:06 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.3.ebuild,v 1.1.1.1 2005/11/30 09:39:09 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.gzip.org/zlib/${P}.tar.bz2
 
 LICENSE="ZLIB"
 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="build"
 
 RDEPEND=""
@@ -24,17 +24,17 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
+	cd "${S}"
 	# Make sure we link with glibc at all times
-	epatch ${FILESDIR}/${PN}-1.2.1-glibc.patch
+	epatch "${FILESDIR}"/${PN}-1.2.1-glibc.patch
 	# Needed for Alpha and prelink
-	epatch ${FILESDIR}/${PN}-1.2.1-build-fPIC.patch
+	epatch "${FILESDIR}"/${PN}-1.2.1-build-fPIC.patch
 	# Only export global symbols, bug #32764
-	epatch ${FILESDIR}/${PN}-1.2.2-mapfile.patch
+	epatch "${FILESDIR}"/${PN}-1.2.2-mapfile.patch
 	# The configure script can be kind of dumb #55434
-	epatch ${FILESDIR}/${PN}-1.2.1-configure.patch
+	epatch "${FILESDIR}"/${PN}-1.2.1-configure.patch
 	# fix shared library test on -fPIC dependant archs
-	epatch ${FILESDIR}/${PN}-1.2.1-fPIC.patch
+	epatch "${FILESDIR}"/${PN}-1.2.1-fPIC.patch
 }
 
 src_compile() {
@@ -43,7 +43,7 @@ src_compile() {
 }
 
 src_install() {
-	einstall libdir=${D}/$(get_libdir) || die
+	einstall libdir="${D}"/$(get_libdir) || die
 	rm "${D}"/$(get_libdir)/libz.a
 	insinto /usr/include
 	doins zconf.h zlib.h
@@ -63,7 +63,7 @@ src_install() {
 	# for NFS based /usr
 	into /
 	dolib libz.so.${PV}
-	( cd ${D}/$(get_libdir) ; chmod 755 libz.so.* )
+	( cd "${D}"/$(get_libdir) ; chmod 755 libz.so.* )
 	dosym libz.so.${PV} /$(get_libdir)/libz.so
 	dosym libz.so.${PV} /$(get_libdir)/libz.so.1
 	gen_usr_ldscript libz.so
diff --git a/www-apps/Apache-Gallery/Apache-Gallery-0.6.ebuild b/www-apps/Apache-Gallery/Apache-Gallery-0.6.ebuild
index 860ac0166712..8f3d015a941f 100644
--- a/www-apps/Apache-Gallery/Apache-Gallery-0.6.ebuild
+++ b/www-apps/Apache-Gallery/Apache-Gallery-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/www-apps/Apache-Gallery/Apache-Gallery-0.6.ebuild,v 1.1 2004/08/15 09:37:21 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/Apache-Gallery/Apache-Gallery-0.6.ebuild,v 1.1.1.1 2005/11/30 09:37:07 chriswhite Exp $
 
 inherit perl-module
 
@@ -8,19 +8,19 @@ DESCRIPTION="Apache gallery for mod_perl"
 SRC_URI="http://cpan.org/modules/by-module/Apache/${P}.tar.gz"
 HOMEPAGE="http://search.cpan.org/author/LEGART/${P}"
 
+LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-LICENSE="Artistic | GPL-2"
-KEYWORDS="x86 amd64 ~ppc ~alpha ~sparc"
+KEYWORDS="alpha amd64 ppc ~sparc x86"
 IUSE=""
 
 
 DEPEND="${DEPEND}
-	>=dev-perl/libapreq-1.0
+	>=www-apache/libapreq-1.0
 	>=media-libs/imlib2-1.0.6-r1
-	>=dev-perl/mod_perl-1.27-r1
+	>=www-apache/mod_perl-1.27-r1
 	>=dev-perl/ImageInfo-1.04-r2
 	>=dev-perl/ImageSize-2.99-r1
-	>=dev-perl/CGI-2.78-r3
+	>=perl-core/CGI-2.78-r3
 	>=dev-perl/CGI-FastTemplate-1.09
 	>=dev-perl/Parse-RecDescent-1.80-r3
 	>=dev-perl/Inline-0.43-r1
@@ -47,7 +47,7 @@ pkg_postinst() {
 	install -d -o root -g root -m0755 ${ROOT}/etc/apache/conf/ssl
 
 	einfo
-	einfo "Execute \"ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\""
+	einfo "Execute \"emerge --config =${PF}\""
 	einfo "to have your apache.conf auto-updated."
 	einfo "You should then edit your /etc/apache/conf/apache-gallery.conf file to suit."
 	einfo
diff --git a/www-apps/Apache-Gallery/Apache-Gallery-0.8-r1.ebuild b/www-apps/Apache-Gallery/Apache-Gallery-0.8-r1.ebuild
index 19dfd832e49f..6e57b10b83ed 100644
--- a/www-apps/Apache-Gallery/Apache-Gallery-0.8-r1.ebuild
+++ b/www-apps/Apache-Gallery/Apache-Gallery-0.8-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/www-apps/Apache-Gallery/Apache-Gallery-0.8-r1.ebuild,v 1.1 2004/09/21 16:15:11 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/Apache-Gallery/Apache-Gallery-0.8-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:07 chriswhite Exp $
 
 inherit perl-module webapp
 
@@ -8,18 +8,18 @@ DESCRIPTION="Apache gallery for mod_perl"
 SRC_URI="http://cpan.org/modules/by-module/Apache/${P}.tar.gz"
 HOMEPAGE="http://search.cpan.org/author/LEGART/${P}"
 
-LICENSE="Artistic | GPL-2"
+LICENSE="|| ( Artistic GPL-2 )"
 KEYWORDS="~x86 ~amd64 ~ppc ~alpha ~sparc"
 IUSE="apache2"
 
 DEPEND="${DEPEND}
-	>=dev-perl/libapreq-1.0
+	>=www-apache/libapreq-1.0
 	>=media-libs/imlib2-1.0.6-r1
-	>=dev-perl/mod_perl-1.27-r1
+	>=www-apache/mod_perl-1.27-r1
 	>=dev-perl/ImageInfo-1.04-r2
 	>=dev-perl/ImageSize-2.99-r1
 	dev-perl/Image-Imlib2
-	>=dev-perl/CGI-2.93
+	>=perl-core/CGI-2.93
 	>=dev-perl/CGI-FastTemplate-1.09
 	>=dev-perl/Parse-RecDescent-1.80-r3
 	dev-perl/URI
@@ -35,16 +35,16 @@ src_install() {
 
 	perl-module_src_install
 
-	insinto ${MY_ICONSDIR}
+	insinto ${MY_ICONSDIR}/gallery
 	doins htdocs/*.png
 
 	dodir ${MY_HOSTROOTDIR}/${PN}/templates/default
 	dodir ${MY_HOSTROOTDIR}/${PN}/templates/new
 
 	insinto ${MY_HOSTROOTDIR}/${PN}/templates/default
-	doins templates/default/*.tpl
+	doins templates/default/*
 	insinto ${MY_HOSTROOTDIR}/${PN}/templates/new
-	doins templates/default/*.tpl
+	doins templates/new/*
 
 	if use apache2; then
 		insinto /etc/apache2/conf/modules.d
@@ -62,7 +62,7 @@ pkg_postinst() {
 		einfo "You should edit your /etc/apache2/conf/modules.d/76_apache-gallery.conf file to suit."
 	else
 		einfo
-		einfo "Execute \"ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\""
+		einfo "Execute \"emerge --config =${PF}\""
 		einfo "to have your apache.conf auto-updated."
 		einfo "You should then edit your /etc/apache/conf/addon-modules/apache-gallery.conf file to suit."
 		einfo
diff --git a/www-apps/Apache-Gallery/Apache-Gallery-0.8-r2.ebuild b/www-apps/Apache-Gallery/Apache-Gallery-0.8-r2.ebuild
index a0722f5525b9..ef56c804677e 100644
--- a/www-apps/Apache-Gallery/Apache-Gallery-0.8-r2.ebuild
+++ b/www-apps/Apache-Gallery/Apache-Gallery-0.8-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/www-apps/Apache-Gallery/Apache-Gallery-0.8-r2.ebuild,v 1.1 2005/03/07 13:57:38 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/Apache-Gallery/Apache-Gallery-0.8-r2.ebuild,v 1.1.1.1 2005/11/30 09:37:07 chriswhite Exp $
 
 inherit perl-module webapp
 
@@ -13,13 +13,13 @@ KEYWORDS="~x86 ~amd64 ~ppc ~alpha ~sparc"
 IUSE="apache2"
 
 DEPEND="${DEPEND}
-	>=dev-perl/libapreq-1.0
+	>=www-apache/libapreq-1.0
 	>=media-libs/imlib2-1.0.6-r1
-	>=dev-perl/mod_perl-1.27-r1
+	>=www-apache/mod_perl-1.27-r1
 	>=dev-perl/ImageInfo-1.04-r2
 	>=dev-perl/ImageSize-2.99-r1
 	dev-perl/Image-Imlib2
-	>=dev-perl/CGI-2.93
+	>=perl-core/CGI-2.93
 	>=dev-perl/CGI-FastTemplate-1.09
 	>=dev-perl/Parse-RecDescent-1.80-r3
 	dev-perl/URI
@@ -62,7 +62,7 @@ pkg_postinst() {
 		einfo "You should edit your /etc/apache2/conf/modules.d/76_apache-gallery.conf file to suit."
 	else
 		einfo
-		einfo "Execute \"ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\""
+		einfo "Execute \"emerge --config =${PF}\""
 		einfo "to have your apache.conf auto-updated."
 		einfo "You should then edit your /etc/apache/conf/addon-modules/apache-gallery.conf file to suit."
 		einfo
diff --git a/www-apps/Apache-Gallery/Apache-Gallery-0.8.ebuild b/www-apps/Apache-Gallery/Apache-Gallery-0.8.ebuild
index a63d58d4a16a..5f88fe3b5fae 100644
--- a/www-apps/Apache-Gallery/Apache-Gallery-0.8.ebuild
+++ b/www-apps/Apache-Gallery/Apache-Gallery-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/www-apps/Apache-Gallery/Apache-Gallery-0.8.ebuild,v 1.1 2004/08/15 09:37:21 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/Apache-Gallery/Apache-Gallery-0.8.ebuild,v 1.1.1.1 2005/11/30 09:37:07 chriswhite Exp $
 
 inherit perl-module
 
@@ -8,22 +8,24 @@ DESCRIPTION="Apache gallery for mod_perl"
 SRC_URI="http://cpan.org/modules/by-module/Apache/${P}.tar.gz"
 HOMEPAGE="http://search.cpan.org/author/LEGART/${P}"
 
+LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-LICENSE="Artistic | GPL-2"
 KEYWORDS="~x86 ~amd64 ~ppc ~alpha ~sparc"
 IUSE=""
 
 
 DEPEND="${DEPEND}
-	>=dev-perl/libapreq-1.0
+	>=www-apache/libapreq-1.0
 	>=media-libs/imlib2-1.0.6-r1
-	>=dev-perl/mod_perl-1.27-r1
+	>=www-apache/mod_perl-1.27-r1
 	>=dev-perl/ImageInfo-1.04-r2
 	>=dev-perl/ImageSize-2.99-r1
 	dev-perl/Image-Imlib2
-	>=dev-perl/CGI-2.78-r3
+	>=perl-core/CGI-2.78-r3
 	>=dev-perl/CGI-FastTemplate-1.09
 	>=dev-perl/Parse-RecDescent-1.80-r3
+	dev-perl/URI
+	dev-perl/text-template
 	>=dev-perl/Inline-0.43-r1
 	virtual/x11"
 
@@ -48,7 +50,7 @@ pkg_postinst() {
 	install -d -o root -g root -m0755 ${ROOT}/etc/apache/conf/ssl
 
 	einfo
-	einfo "Execute \"ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\""
+	einfo "Execute \"emerge --config =${PF}\""
 	einfo "to have your apache.conf auto-updated."
 	einfo "You should then edit your /etc/apache/conf/apache-gallery.conf file to suit."
 	einfo
diff --git a/www-apps/Apache-Gallery/Apache-Gallery-0.9.1.ebuild b/www-apps/Apache-Gallery/Apache-Gallery-0.9.1.ebuild
index 819aa78ce0c9..6f3dad203336 100644
--- a/www-apps/Apache-Gallery/Apache-Gallery-0.9.1.ebuild
+++ b/www-apps/Apache-Gallery/Apache-Gallery-0.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/Apache-Gallery/Apache-Gallery-0.9.1.ebuild,v 1.1 2005/08/02 20:41:53 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/Apache-Gallery/Apache-Gallery-0.9.1.ebuild,v 1.1.1.1 2005/11/30 09:37:07 chriswhite Exp $
 
 inherit depend.apache perl-module webapp
 
@@ -9,7 +9,7 @@ SRC_URI="http://apachegallery.dk/download/${P}.tar.gz"
 HOMEPAGE="http://apachegallery.dk/"
 
 LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="~x86 ~amd64 ~ppc ~alpha ~sparc"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 IUSE="apache2"
 
 DEPEND="${DEPEND}
@@ -25,11 +25,10 @@ DEPEND="${DEPEND}
 	dev-perl/text-template
 	>=dev-perl/Inline-0.43-r1
 	virtual/x11
-	>=www-apache/libapreq-1.0
 	!apache2? ( >=net-www/apache-1.3.26-r2
-		=www-apache/mod_perl-1* )
+		=www-apache/libapreq-1* )
 	apache2? ( >=net-www/apache-2.0.43-r1
-		>=www-apache/mod_perl-1.99 ) "
+		=www-apache/libapreq2-2* )"
 
 src_install() {
 	webapp_src_preinst
diff --git a/www-apps/Apache-Gallery/ChangeLog b/www-apps/Apache-Gallery/ChangeLog
index bb60d079a902..4043a316c4e4 100644
--- a/www-apps/Apache-Gallery/ChangeLog
+++ b/www-apps/Apache-Gallery/ChangeLog
@@ -1,6 +1,71 @@
-# ChangeLog for dev-perl/Apache-Gallery
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/Apache-Gallery/ChangeLog,v 1.1 2004/08/15 09:37:21 stuart Exp $
+# ChangeLog for www-apps/Apache-Gallery
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/Apache-Gallery/ChangeLog,v 1.1.1.1 2005/11/30 09:37:07 chriswhite Exp $
+
+  23 Oct 2005; Renat Lumpau <rl03@gentoo.org> Apache-Gallery-0.6.ebuild,
+  Apache-Gallery-0.8.ebuild, Apache-Gallery-0.8-r1.ebuild,
+  Apache-Gallery-0.8-r2.ebuild:
+  Fixed emerge --config wrt bug #109482.
+
+  24 Sep 2005; Bryan Østergaard <kloeri@gentoo.org>
+  Apache-Gallery-0.9.1.ebuild:
+  Add back ~alpha keyword, bug 104737.
+
+  16 Sep 2005; Aron Griffis <agriffis@gentoo.org> Apache-Gallery-0.6.ebuild:
+  Mark 0.6 stable on alpha
+
+  03 Sep 2005; Jason Wever <weeve@gentoo.org> Apache-Gallery-0.9.1.ebuild:
+  Added ~sparc keyword as it was inadvertently dropped in the version bump.
+
+  08 Aug 2005; Renat Lumpau <rl03@gentoo.org> Apache-Gallery-0.9.1.ebuild:
+  Fixed libapreq2 dependency wrt bug #101329.
+
+  05 Aug 2005; Renat Lumpau <rl03@gentoo.org> +files/postinstall-en.txt:
+  Added missing postinstall-en.txt
+
+*Apache-Gallery-0.9.1 (02 Aug 2005)
+
+  02 Aug 2005; Renat Lumpau <rl03@gentoo.org>
+  +files/76_apache1-gallery.conf, +files/76_apache2-gallery.conf,
+  +Apache-Gallery-0.9.1.ebuild:
+  Version bump (#97231). Fixed Apache paths (#79432).
+
+  24 May 2005; Michael Cummings <mcummings@gentoo.org>
+  Apache-Gallery-0.6.ebuild, Apache-Gallery-0.8-r1.ebuild,
+  Apache-Gallery-0.8-r2.ebuild, Apache-Gallery-0.8.ebuild:
+  dev-perl/CGI => perl-core/CGI
+
+  10 May 2005; Elfyn McBratney <beu@gentoo.org> Apache-Gallery-0.6.ebuild,
+  Apache-Gallery-0.8.ebuild, Apache-Gallery-0.8-r1.ebuild,
+  Apache-Gallery-0.8-r2.ebuild:
+  dev-perl/libapreq{,2} -> www-apache
+
+  09 May 2005; Elfyn McBratney <beu@gentoo.org> Apache-Gallery-0.6.ebuild,
+  Apache-Gallery-0.8.ebuild, Apache-Gallery-0.8-r1.ebuild,
+  Apache-Gallery-0.8-r2.ebuild:
+  dev-perl/mod_perl -> www-apache/mod_perl
+
+  07 Mar 2005; Michael Cummings <mcummings@gentoo.org>
+  Apache-Gallery-0.8-r1.ebuild:
+  Modified what's installed from templates [ bug 71196 - thanks to Wayne Love
+  <wayne@wslove.org> ]. Also corrected default vs new ins's.
+
+*Apache-Gallery-0.8-r1 (21 Sep 2004)
+
+  21 Sep 2004; Renat Lumpau <rl03@gentoo.org> metadata.xml,
+  files/apache-gallery.conf, +Apache-Gallery-0.8-r1.ebuild:
+  Version bump, this time done right. Resolves bug #52020.
+
+  20 Sep 2004; Michael Cummings <mcummings@gentoo.org>
+  Apache-Gallery-0.8.ebuild:
+  Missing deps added
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  Apache-Gallery-0.6.ebuild:
+  Masked Apache-Gallery-0.6.ebuild stable for ppc
 
 *Apache-Gallery-0.8 (15 Aug 2004)
 
diff --git a/www-apps/Apache-Gallery/Manifest b/www-apps/Apache-Gallery/Manifest
index 22c94c000bef..6afe68a9e772 100644
--- a/www-apps/Apache-Gallery/Manifest
+++ b/www-apps/Apache-Gallery/Manifest
@@ -1,7 +1,27 @@
-MD5 0c95e696234ae2a30445187d871245a4 Apache-Gallery-0.6.ebuild 1451
-MD5 8b71b38122ae994bad9e7e34260a0c2c Apache-Gallery-0.8.ebuild 1476
-MD5 3562592293d7e68204c9f423e565677f ChangeLog 1051
-MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 aefd824be16643a56f802d7d6ef4d209 Apache-Gallery-0.8-r2.ebuild 2086
+MD5 81ea0232b55758d1c56a1ff0342b4695 Apache-Gallery-0.6.ebuild 1421
+MD5 ed5914f590c899b06f60b1925b42ebfc Apache-Gallery-0.8.ebuild 1486
+MD5 32430db3c6811677f44ca51b4bd0a6d6 Apache-Gallery-0.8-r1.ebuild 2086
+MD5 d810d3fda63ae815ed953913e95c14f7 Apache-Gallery-0.9.1.ebuild 1594
+MD5 de22fd772d54b278fd2c9c02279c7162 ChangeLog 3746
+MD5 2a5bdc93be7720976d88be5034a17df2 metadata.xml 444
+MD5 3c77fe3e38d06f53fca962becfe10d81 files/digest-Apache-Gallery-0.8-r1 69
+MD5 3c77fe3e38d06f53fca962becfe10d81 files/digest-Apache-Gallery-0.8-r2 69
 MD5 f372bf3342f63c4d3a680051e80b5571 files/digest-Apache-Gallery-0.6 69
 MD5 3c77fe3e38d06f53fca962becfe10d81 files/digest-Apache-Gallery-0.8 69
-MD5 d7306e4a4568b0c242ef3b73d3ad0e4e files/apache-gallery.conf 719
+MD5 004b7af7fb9d52598cf9ed7db91697c6 files/76_apache2-gallery.conf 1442
+MD5 d9a1361f6d0f1dac9def27a0b57cf30c files/apache-gallery.conf 757
+MD5 5edd6a9688af26ad0b3f71d8e2ad8770 files/postinstall-en.txt 90
+MD5 9e0a44b67c66dc689a3769827946f3f8 files/76_apache1-gallery.conf 738
+MD5 f946c05f08e4b517465f3a09639a5fe7 files/digest-Apache-Gallery-0.9.1 71
+MD5 862b7db14e194f66c345bdaee71e0d00 files/76_apache-gallery.conf 1461
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDW6VVEzitwsaoONoRAusgAKCG/LrSpU2h1es/KddF9RfQd6t7BACfbh/8
+NjkJOlIUA4YRqljl6dPlWCw=
+=jT2S
+-----END PGP SIGNATURE-----
diff --git a/www-apps/Apache-Gallery/files/apache-gallery.conf b/www-apps/Apache-Gallery/files/apache-gallery.conf
index 364635d512c9..dfa55426b31c 100644
--- a/www-apps/Apache-Gallery/files/apache-gallery.conf
+++ b/www-apps/Apache-Gallery/files/apache-gallery.conf
@@ -1,5 +1,3 @@
-
-
 ##### Apache::Gallery configuration
 #
 # This is actually a virtual host definition with mod_perl directives
@@ -7,10 +5,10 @@
 
 #<VirtualHost 123.123.123.123>
 #  ServerName   gallery.yourdomain.org
-#  DocumentRoot /data/pictures/
-#  ErrorLog     logs/gallery-error_log
-#  TransferLog  logs/gallery-access_log
-#  PerlSetVar   GalleryTemplateDir '/etc/apache/gallery/templates'
+#  DocumentRoot /var/www/localhost/htdocs/data/pictures/
+#  ErrorLog     /var/log/gallery-error_log
+#  TransferLog  /var/log/gallery-access_log
+#  PerlSetVar   GalleryTemplateDir '/var/www/localhost/Apache-Gallery/templates'
 #  PerlSetVar   GalleryInfo 'Picture Taken => DateTimeOriginal, Flash => Flash' 
 #  PerlSetVar   GallerySizes '640 1024 1600 2272'
 #  PerlSetVar   GalleryThumbnailSize '100x75'
@@ -20,4 +18,3 @@
 #    PerlHandler       Apache::Gallery
 #  </Location>
 #</VirtualHost>
-						
diff --git a/www-apps/Apache-Gallery/metadata.xml b/www-apps/Apache-Gallery/metadata.xml
index 86672fe64c10..867de5ad9ad5 100644
--- a/www-apps/Apache-Gallery/metadata.xml
+++ b/www-apps/Apache-Gallery/metadata.xml
@@ -6,5 +6,10 @@
 		<email>perl@gentoo.org</email>
 		<description>Primary Maintainer</description>
 	</maintainer>
+	<herd>web-apps</herd>
+	<maintainer>
+		<email>web-apps@gentoo.org</email>
+		<description>Secondary Maintainer</description>
+	</maintainer>
 	<longdescription></longdescription>
 </pkgmetadata>
diff --git a/www-apps/ampache/ChangeLog b/www-apps/ampache/ChangeLog
index 6afa00271a57..cda32f856909 100644
--- a/www-apps/ampache/ChangeLog
+++ b/www-apps/ampache/ChangeLog
@@ -1,6 +1,38 @@
 # ChangeLog for www-apps/ampache
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/ampache/ChangeLog,v 1.1 2005/06/27 00:47:04 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/ampache/ChangeLog,v 1.1.1.1 2005/11/30 09:37:01 chriswhite Exp $
+
+  09 Oct 2005; Doug Goldstein <cardoe@gentoo.org> ampache-3.3.1.4.ebuild:
+  Fixing PHP depends bug #105419
+
+*ampache-3.3.1.4 (14 Aug 2005)
+
+  14 Aug 2005; Michael Marineau <marineam@gentoo.org>
+  -files/ampache-3.3.1.2-webinstall.txt,
+  -files/ampache-3.3.1.3-webinstall.txt,
+  +files/ampache-3.3.1.4-webinstall.txt, -ampache-3.3.1.2.ebuild,
+  -ampache-3.3.1.3.ebuild, +ampache-3.3.1.4.ebuild:
+  Security update, new xml-rpc expoit.
+
+*ampache-3.3.1.2 (07 Jul 2005)
+
+  07 Jul 2005; Michael Marineau <marineam@gentoo.org>
+  -files/ampache-3.3.1.1-webinstall.txt,
+  +files/ampache-3.3.1.2-webinstall.txt, -ampache-3.3.1.1.ebuild,
+  +ampache-3.3.1.2.ebuild:
+  Security Update. This fixes the XML-RPC issues. Thanks to Karl Vollmer for
+  the reminder.
+
+  27 Jun 2005; David Holm <dholm@gentoo.org> ampache-3.3.1.1.ebuild:
+  Added to ~ppc.
+
+*ampache-3.3.1.1 (27 Jun 2005)
+
+  27 Jun 2005; Michael Marineau <marineam@gentoo.org>
+  +files/ampache-3.3.1.1-webinstall.txt, -ampache-3.3.1.ebuild,
+  +ampache-3.3.1.1.ebuild:
+  A little ebuild bump. Also cleaned up a couple things, closing bug #93544
+  again. Hopefully all is happy now.
 
 *ampache-3.3.1 (27 Jun 2005)
 
diff --git a/www-apps/ampache/Manifest b/www-apps/ampache/Manifest
index 0bca437fd673..266c510af6c6 100644
--- a/www-apps/ampache/Manifest
+++ b/www-apps/ampache/Manifest
@@ -1,3 +1,15 @@
-MD5 a619035ceae418a52baf27954bada3f1 ampache-3.3.1.ebuild 682
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3ab405a4374ae32387c4d2ebf3f55ad9 ChangeLog 1553
+MD5 82bd9de456e80fa7ff67a985a8672498 ampache-3.3.1.4.ebuild 776
+MD5 bca60999fc1787d45fa77e621731126c files/ampache-3.3.1.4-webinstall.txt 1376
+MD5 49d2f119dd0a765786d25674bc06cbcf files/digest-ampache-3.3.1.4 68
 MD5 46ab575d4d218ddb1fe7500850065f03 metadata.xml 257
-MD5 54dbaabc383b0fa56e0cc41c9d61e5e6 files/digest-ampache-3.3.1 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDSNf8BtvusYtCZMsRArXoAJ9j8Z0c2QlHhiBfHXR1QTG7PzorLgCfUnYZ
++r9ZiZJPWxgROdzQfz58374=
+=aDRE
+-----END PGP SIGNATURE-----
diff --git a/www-apps/ampache/ampache-3.3.1.4.ebuild b/www-apps/ampache/ampache-3.3.1.4.ebuild
index 9ef4c9b2ad5f..58ae1b194e0e 100644
--- a/www-apps/ampache/ampache-3.3.1.4.ebuild
+++ b/www-apps/ampache/ampache-3.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/www-apps/ampache/ampache-3.3.1.4.ebuild,v 1.1 2005/08/14 23:11:23 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/ampache/ampache-3.3.1.4.ebuild,v 1.1.1.1 2005/11/30 09:37:01 chriswhite Exp $
 
 inherit webapp
 
@@ -12,8 +12,7 @@ LICENSE="GPL-2"
 KEYWORDS="~ppc ~x86"
 IUSE=""
 
-RDEPEND="net-www/apache
-	dev-php/php
+RDEPEND="virtual/httpd-php
 	dev-db/mysql"
 DEPEND=""
 
diff --git a/www-apps/b2evolution/ChangeLog b/www-apps/b2evolution/ChangeLog
index dbe3e908ff0c..c5fa070e92c9 100644
--- a/www-apps/b2evolution/ChangeLog
+++ b/www-apps/b2evolution/ChangeLog
@@ -1,6 +1,54 @@
 # ChangeLog for www-apps/b2evolution
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/ChangeLog,v 1.1 2005/02/05 21:44:47 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/ChangeLog,v 1.1.1.1 2005/11/30 09:37:12 chriswhite Exp $
+
+  20 Nov 2005; Stuart Herbert <stuart@gentoo.org> b2evolution-0.9.1.ebuild:
+  Fix broken DEPEND
+
+  13 Oct 2005; Carlos Silva <r3pek@gentoo.org>
+  -b2evolution-0.9.0.12-r2.ebuild:
+  Removed old version
+
+*b2evolution-0.9.1 (13 Oct 2005)
+
+  13 Oct 2005; Carlos Silva <r3pek@gentoo.org> +b2evolution-0.9.1.ebuild:
+  Version bump. Closes bug #107464, thx to Andy Blyler for reporting.
+  Also fixing deps as according to bug #105419
+
+*b2evolution-0.9.0.12-r2 (09 Sep 2005)
+
+  09 Sep 2005; Mark Loeser <halcy0n@gentoo.org>
+  -files/b2evolution-0.9.0.11.xmlrpc.patch,
+  -files/b2evolution-0.9.0.12-xmlrpc.patch, -b2evolution-0.9.0.12.ebuild,
+  -b2evolution-0.9.0.12-r1.ebuild, +b2evolution-0.9.0.12-r2.ebuild:
+  Remove old ebuilds and use upstream's XML-RPC patch so all features of
+  b2evolution are restored.
+
+  06 Sep 2005; Ilya A. Volynets-Evenbakh <ilya@total-knowledge.com>
+  b2evolution-0.9.0.12-r1.ebuild:
+  Mark ~alpha and ~amd64
+
+*b2evolution-0.9.0.12-r1 (24 Aug 2005)
+
+  24 Aug 2005; Stuart Herbert <stuart@gentoo.org>
+  +b2evolution-0.9.0.12-r1.ebuild:
+  Patched for XMLRPC vulnerability; see bug #102375
+
+*b2evolution-0.9.0.12 (05 Jul 2005)
+
+  05 Jul 2005; Mark Loeser <halcy0n@gentoo.org>
+  +files/b2evolution-0.9.0.12-xmlrpc.patch, +b2evolution-0.9.0.12.ebuild:
+  Version bump, and apply security patch; fixes bug #97650
+
+*b2evolution-0.9.0.11-r1 (06 Jul 2005)
+
+  06 Jul 2005; Stuart Herbert <stuart@gentoo.org>
+  +files/b2evolution-0.9.0.11.xmlrpc.patch, +b2evolution-0.9.0.11-r1.ebuild:
+  Patch for security bug #97650
+
+  19 Jun 2005; Daniel Ostrow <dostrow@gentoo.org>
+  b2evolution-0.9.0.11.ebuild:
+  Marked ~ppc for testing.
 
 *b2evolution-0.9.0.11 (05 Feb 2005)
 
diff --git a/www-apps/b2evolution/Manifest b/www-apps/b2evolution/Manifest
index b4166cf364aa..33e903728968 100644
--- a/www-apps/b2evolution/Manifest
+++ b/www-apps/b2evolution/Manifest
@@ -1,5 +1,5 @@
-MD5 35aa3b1068d4abeda0816fb7aa2b7e4e b2evolution-0.9.0.11.ebuild 1330
-MD5 658dbad234350042bf15eb030e90ac20 ChangeLog 360
+MD5 263b1a55befd561a1f2117078c840545 ChangeLog 2091
 MD5 a87207b3b148a8e1057c02dad9d02af8 metadata.xml 247
-MD5 e57db6ef581b931b9954af9b12359894 files/digest-b2evolution-0.9.0.11 82
+MD5 24131224d61c768490af97a3e1a4b36e b2evolution-0.9.1.ebuild 1215
+MD5 aa3594668732d94839440295a8b4fb79 files/digest-b2evolution-0.9.1 79
 MD5 d584b5d4ec8d7378cbfcc77cde85306d files/postinstall-en.txt 340
diff --git a/www-apps/b2evolution/b2evolution-0.9.1.ebuild b/www-apps/b2evolution/b2evolution-0.9.1.ebuild
index 273721ccd3fb..060186959c66 100644
--- a/www-apps/b2evolution/b2evolution-0.9.1.ebuild
+++ b/www-apps/b2evolution/b2evolution-0.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/b2evolution-0.9.1.ebuild,v 1.1 2005/10/13 14:57:04 r3pek Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/b2evolution-0.9.1.ebuild,v 1.1.1.1 2005/11/30 09:37:12 chriswhite Exp $
 
 inherit webapp eutils
 
@@ -16,7 +16,6 @@ RDEPEND="virtual/httpd-php
 	 >=dev-db/mysql-3.23.23"
 
 DEPEND="${DEPEND} ${RDEPEND}
-	>=net-www/webapp-config-1.10-r5
 	app-arch/unzip"
 
 S="${WORKDIR}/${PN}"
diff --git a/www-apps/back-end/ChangeLog b/www-apps/back-end/ChangeLog
index 7b856bed54aa..40836cdc55de 100644
--- a/www-apps/back-end/ChangeLog
+++ b/www-apps/back-end/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for www-apps/back-end
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/back-end/ChangeLog,v 1.1 2004/08/29 14:08:14 rl03 Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/back-end/ChangeLog,v 1.1.1.1 2005/11/30 09:37:08 chriswhite Exp $
+
+  22 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt:
+  Housekeeping
+
+*back-end-0.7.2.1 (21 Aug 2005)
+
+  21 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  files/reconfig, -back-end-0.7.1.2.ebuild, +back-end-0.7.2.1.ebuild:
+  Version bump
+
+  09 Jan 2005; Jason Wever <weeve@gentoo.org> back-end-0.7.1.2.ebuild:
+  Added ~sparc keyword.
+
+  03 Sep 2004; Renat Lumpau <rl03@gentoo.org> files/reconfig:
+  Checked if the reconfig hook needs to cleanup---no, it doesn't.
+
+  02 Sep 2004; David Holm <dholm@gentoo.org> back-end-0.7.1.2.ebuild:
+  Added to ~ppc.
+
+  30 Aug 2004; Renat Lumpau <rl03@gentoo.org> back-end-0.7.1.2.ebuild:
+  Fixed DEPEND/RDEPEND
 
 *back-end-0.7.1.2 (29 Aug 2004)
 
diff --git a/www-apps/back-end/Manifest b/www-apps/back-end/Manifest
index e8ea4e7a172d..5c1187c86be6 100644
--- a/www-apps/back-end/Manifest
+++ b/www-apps/back-end/Manifest
@@ -1,6 +1,16 @@
-MD5 4823f863a4245f77267237a46def05d1 back-end-0.7.1.2.ebuild 1313
-MD5 3d801aaf4d26ac823d7d81dde4c0710a ChangeLog 324
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c6732df8b96ae41533e998e9ef43f2a0 back-end-0.7.2.1.ebuild 1380
+MD5 3be54c135ad516ef9a69030936e39c90 ChangeLog 1098
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
-MD5 43c5bc7ad48e732dfebc7e63c7413228 files/postinstall-en.txt 469
-MD5 6296918b10c4dbe3aea4326191951a96 files/digest-back-end-0.7.1.2 68
-MD5 06e1caff32c38d6a02f664565dcb5aab files/reconfig 178
+MD5 2f271e738a430a6b379e6244fd95660a files/postinstall-en.txt 556
+MD5 d3f9e8e8743505e23dacd88221d77a67 files/digest-back-end-0.7.2.1 68
+MD5 2017d5e6838cb5fc6636a5ac794cf096 files/reconfig 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDCldXEzitwsaoONoRAkX/AKChzVnBD5PrOkd9ezT0Txq7fo092gCgtHm2
+8XZRkuzpwW93uEWoAMKfvUs=
+=E/7M
+-----END PGP SIGNATURE-----
diff --git a/www-apps/back-end/back-end-0.7.2.1.ebuild b/www-apps/back-end/back-end-0.7.2.1.ebuild
index 4ca07d8f6c5d..345140eb0e33 100644
--- a/www-apps/back-end/back-end-0.7.2.1.ebuild
+++ b/www-apps/back-end/back-end-0.7.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/www-apps/back-end/back-end-0.7.2.1.ebuild,v 1.1 2005/08/21 16:48:14 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/back-end/back-end-0.7.2.1.ebuild,v 1.1.1.1 2005/11/30 09:37:08 chriswhite Exp $
 
 inherit webapp
 
diff --git a/www-apps/back-end/files/postinstall-en.txt b/www-apps/back-end/files/postinstall-en.txt
index d1a61edd0153..592b016acd3c 100644
--- a/www-apps/back-end/files/postinstall-en.txt
+++ b/www-apps/back-end/files/postinstall-en.txt
@@ -1,10 +1,15 @@
-Browse to http://${VHOST_HOSTNAME}/${PN} and complete the installation. 
+Now, create a database for back-end to use, fex:
 
-When you are done,:
-- edit ${MY_INSTALLDIR}/config.ini.php and set 
-classdir = "${VHOST_ROOT}/${PN}/class"
+ mysqladmin create be7
 
-- rm ${MY_INSTALLDIR}/config_setup.php and 
+Browse to http://${VHOST_HOSTNAME}/${VHOST_APPDIR} and complete the installation
+
+When you are done:
+
+- edit ${MY_INSTALLDIR}/config.ini.php and set
+classdir = "${VHOST_ROOT}/${PN}-${PVR}/class"
+
+- rm ${MY_INSTALLDIR}/config_setup.php and
 - chmod 644 ${MY_INSTALLDIR}/config.ini.php
 
 Change the god password but don't delete the accound yet.
diff --git a/www-apps/back-end/files/reconfig b/www-apps/back-end/files/reconfig
index 891ff813b60b..c1383f7f0e31 100644
--- a/www-apps/back-end/files/reconfig
+++ b/www-apps/back-end/files/reconfig
@@ -1,5 +1,13 @@
 #!/bin/bash
-if [ $1 = "start" -o $1 = "install" ]; then
+
+die() {
+	echo "#####"
+	echo $1
+	echo "#####"
+	exit 1
+}
+
+if [ $1 = "install" ]; then
 	# fix location of SQL tables
-	sed -e "s|../tables/|${VHOST_ROOT}/${PN}/tables/|" -i ${MY_INSTALLDIR}/config_setup.php
+	sed -e "s|../tables/|'${VHOST_ROOT}/${PN}-${PVR}/tables/|" -i ${MY_INSTALLDIR}/config_setup.php || die "sed failed"
 fi
diff --git a/www-apps/browser-config/ChangeLog b/www-apps/browser-config/ChangeLog
index 0757be3de05f..7f3e9b3029f5 100644
--- a/www-apps/browser-config/ChangeLog
+++ b/www-apps/browser-config/ChangeLog
@@ -1,6 +1,17 @@
-# ChangeLog for net-www/browser-config
+# ChangeLog for www-apps/browser-config
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/browser-config/ChangeLog,v 1.1 2004/08/15 09:40:44 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/browser-config/ChangeLog,v 1.1.1.1 2005/11/30 09:36:54 chriswhite Exp $
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  browser-config-1.0.ebuild, browser-config-1.1.ebuild:
+  Masked browser-config-1.1.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  browser-config-1.0.ebuild:
+  Masked browser-config-1.0.ebuild stable for ppc
 
 *browser-config-1.1 (15 Aug 2004)
 
diff --git a/www-apps/browser-config/Manifest b/www-apps/browser-config/Manifest
index b1d34c892ca3..6e0e8a3f21d8 100644
--- a/www-apps/browser-config/Manifest
+++ b/www-apps/browser-config/Manifest
@@ -1,5 +1,15 @@
-MD5 cad5449a9744f3b96a17c1c3d8772e68 browser-config-1.1.ebuild 1057
-MD5 349f82f27ddc03123204096281edb83e browser-config-1.0.ebuild 656
-MD5 6fb72cf11a6066fd2a5d1760f34404ed ChangeLog 572
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 27c88db82c6628855842c4b235b1d3cc browser-config-1.0.ebuild 656
+MD5 b5a8143aeb2858bbbb04163fc75f7812 browser-config-1.1.ebuild 1057
+MD5 7028202caf0d3276d6db1ff368e6eaba ChangeLog 1166
 MD5 14e7b15b23fe359fa1dded672c66e510 files/digest-browser-config-1.0 69
 MD5 5641217d4d94086694f1ae2e6e2a56a5 files/digest-browser-config-1.1 69
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBOs62I1lqEGTUzyQRAqr7AJ0Ti8xwKV1XBXphvnqYpGFHy0+gMACfUjwc
+u3xCKOsNgESNRREJrjWehhE=
+=YzgJ
+-----END PGP SIGNATURE-----
diff --git a/www-apps/browser-config/browser-config-1.0.ebuild b/www-apps/browser-config/browser-config-1.0.ebuild
index 2827ec5f76ff..1b37a180a09e 100644
--- a/www-apps/browser-config/browser-config-1.0.ebuild
+++ b/www-apps/browser-config/browser-config-1.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/www-apps/browser-config/browser-config-1.0.ebuild,v 1.1 2004/08/15 09:40:44 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/browser-config/browser-config-1.0.ebuild,v 1.1.1.1 2005/11/30 09:36:54 chriswhite Exp $
 
 DESCRIPTION="A lightweight modular configurable http url handler/browser launcher"
 HOMEPAGE="http://www.pocketninja.com/"
 SRC_URI="http://www.pocketninja.com/code/browser-config/download/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc x86"
+KEYWORDS="ppc x86"
 IUSE=""
 DEPEND=""
 
diff --git a/www-apps/browser-config/browser-config-1.1.ebuild b/www-apps/browser-config/browser-config-1.1.ebuild
index 9f0c327b2fff..2987935640d8 100644
--- a/www-apps/browser-config/browser-config-1.1.ebuild
+++ b/www-apps/browser-config/browser-config-1.1.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/www-apps/browser-config/browser-config-1.1.ebuild,v 1.1 2004/08/15 09:40:44 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/browser-config/browser-config-1.1.ebuild,v 1.1.1.1 2005/11/30 09:36:54 chriswhite Exp $
 
 DESCRIPTION="A lightweight modular configurable http url handler/browser launcher"
 HOMEPAGE="http://www.pocketninja.com/"
 SRC_URI="http://www.pocketninja.com/code/browser-config/download/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc x86"
+KEYWORDS="ppc x86"
 IUSE=""
 DEPEND=""
 
diff --git a/www-apps/bugs-bug-genie/ChangeLog b/www-apps/bugs-bug-genie/ChangeLog
index 480fa3a54c83..f8e9d17b8943 100644
--- a/www-apps/bugs-bug-genie/ChangeLog
+++ b/www-apps/bugs-bug-genie/ChangeLog
@@ -1,6 +1,28 @@
 # ChangeLog for www-apps/bugs-bug-genie
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugs-bug-genie/ChangeLog,v 1.1 2004/08/30 11:22:12 rl03 Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugs-bug-genie/ChangeLog,v 1.1.1.1 2005/11/30 09:37:11 chriswhite Exp $
+
+  21 Aug 2005; Renat Lumpau <rl03@gentoo.org> -bugs-bug-genie-1.5.ebuild,
+  bugs-bug-genie-1.7.1.ebuild:
+  Housekeeping
+
+*bugs-bug-genie-1.7.1 (04 Jul 2005)
+
+  04 Jul 2005; Renat Lumpau <rl03@gentoo.org> +bugs-bug-genie-1.7.1.ebuild:
+  Version bump, closes #67083
+
+  17 Feb 2005; Robin H. Johnson <robbat2@gentoo.org>
+  bugs-bug-genie-1.5.ebuild:
+  Bug #69831: Ensure unzip is in DEPEND.
+
+  09 Jan 2005; Jason Wever <weeve@gentoo.org> bugs-bug-genie-1.5.ebuild:
+  Added ~sparc keyword.
+
+  02 Sep 2004; David Holm <dholm@gentoo.org> bugs-bug-genie-1.5.ebuild:
+  Added to ~ppc.
+
+  30 Aug 2004; Renat Lumpau <rl03@gentoo.org> bugs-bug-genie-1.5.ebuild:
+  Fixed DEPEND/RDEPEND
 
 *bugs-bug-genie-1.5 (30 Aug 2004)
 
diff --git a/www-apps/bugs-bug-genie/Manifest b/www-apps/bugs-bug-genie/Manifest
index 284a7c67e58b..f2d9a4579049 100644
--- a/www-apps/bugs-bug-genie/Manifest
+++ b/www-apps/bugs-bug-genie/Manifest
@@ -1,5 +1,15 @@
-MD5 b745ff00dfa68a81a9c3baa29f187891 bugs-bug-genie-1.5.ebuild 1443
-MD5 d494b47d7a68305d6c90b404e11aca75 ChangeLog 341
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 89e2305b0bc740500791127b756af456 bugs-bug-genie-1.7.1.ebuild 997
+MD5 92da06be464be92fafc0e33fcab3c073 ChangeLog 1108
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
+MD5 8c1b4d53a9794646061928a9a036c8b6 files/digest-bugs-bug-genie-1.7.1 60
 MD5 b7f5cb0f5d933404fcec3322eb4da94c files/postinstall-en.txt 113
-MD5 656de087ae73d2733da138cf9fe7e48e files/digest-bugs-bug-genie-1.5 57
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDCLEbEzitwsaoONoRArmjAKCV/RCWgaAnfc1WlPqNPTUG2GwyjwCglGmI
+3Zr1AurzesKux8TiBJf8ETA=
+=9BQ6
+-----END PGP SIGNATURE-----
diff --git a/www-apps/bugs-bug-genie/bugs-bug-genie-1.7.1.ebuild b/www-apps/bugs-bug-genie/bugs-bug-genie-1.7.1.ebuild
index 9f436fd7ad2b..6fd20891cb1e 100644
--- a/www-apps/bugs-bug-genie/bugs-bug-genie-1.7.1.ebuild
+++ b/www-apps/bugs-bug-genie/bugs-bug-genie-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/www-apps/bugs-bug-genie/bugs-bug-genie-1.7.1.ebuild,v 1.1 2005/07/04 01:54:04 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugs-bug-genie/bugs-bug-genie-1.7.1.ebuild,v 1.1.1.1 2005/11/30 09:37:11 chriswhite Exp $
 
 inherit webapp
 S=${WORKDIR}/BUGS_${PV}
@@ -13,11 +13,10 @@ SRC_URI="mirror://sourceforge/${PN}/BUGS_${PV}.zip"
 
 KEYWORDS="~x86 ~ppc ~sparc"
 
+DEPEND="app-arch/unzip"
 RDEPEND=">=net-www/apache-1.3
-		>=virtual/php-4.2.1
+		virtual/php
 		>=dev-db/mysql-4"
-DEPEND="app-arch/unzip
-		sys-apps/sed"
 
 LICENSE="MPL-1.1"
 
diff --git a/www-apps/bugzilla/ChangeLog b/www-apps/bugzilla/ChangeLog
index db60b311b18f..1ea5166bef8b 100644
--- a/www-apps/bugzilla/ChangeLog
+++ b/www-apps/bugzilla/ChangeLog
@@ -1,6 +1,219 @@
-# ChangeLog for net-www/bugzilla
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/ChangeLog,v 1.1 2004/08/15 09:44:27 stuart Exp $
+# ChangeLog for www-apps/bugzilla
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/ChangeLog,v 1.1.1.1 2005/11/30 09:36:54 chriswhite Exp $
+
+  09 Nov 2005; Renat Lumpau <rl03@gentoo.org> bugzilla-2.18.4.ebuild,
+  bugzilla-2.20.ebuild:
+  Fixed DBD-mysql dependency wrt bug #111922.
+
+  08 Oct 2005; Renat Lumpau <rl03@gentoo.org> -bugzilla-2.18.3.ebuild:
+  Removing vulnerable version
+
+  07 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  bugzilla-2.18.4.ebuild:
+  Stable on sparc wrt #107796
+
+  07 Oct 2005; Simon Stelling <blubb@gentoo.org> bugzilla-2.18.4.ebuild:
+  stable on amd64 wrt bug 107796
+
+  06 Oct 2005; Aron Griffis <agriffis@gentoo.org> bugzilla-2.18.4.ebuild,
+  bugzilla-2.20.ebuild:
+  Mark 2.20 2.18.4 ~alpha/~ia64 #108234
+
+  05 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  bugzilla-2.18.4.ebuild:
+  Marking stable on x86 due to bug #107796.
+
+  03 Oct 2005; Renat Lumpau <rl03@gentoo.org>
+  +files/2.18/postinstall-en.txt, files/2.18/reconfig,
+  files/2.20/postinstall-en.txt, files/2.20/reconfig,
+  bugzilla-2.18.4.ebuild:
+  Reconfig hook is no longer interactive, per bug #107918.
+
+  02 Oct 2005; Markus Rothe <corsair@gentoo.org> bugzilla-2.18.4.ebuild:
+  Stable on ppc64 (bug #107796)
+
+  02 Oct 2005; Michael Hanselmann <hansmi@gentoo.org>
+  bugzilla-2.18.4.ebuild:
+  Stable on ppc. See bug #107796.
+
+*bugzilla-2.20 (01 Oct 2005)
+*bugzilla-2.18.4 (01 Oct 2005)
+
+  01 Oct 2005; Renat Lumpau <rl03@gentoo.org>
+  -files/2.18.1-r1/apache.htaccess, -files/2.18.1-r1/reconfig,
+  -files/2.18.1-r1/bugzilla.cron.daily, +files/2.20/apache.htaccess,
+  -files/2.18.1-r1/bugzilla.cron.tab, +files/2.20/bugzilla.cron.daily,
+  +files/2.18/bugzilla.cron.daily, +files/2.20/bugzilla.cron.tab,
+  +files/2.18/apache.htaccess, +files/2.18/bugzilla.cron.tab,
+  +files/2.18/reconfig, +files/2.20/postinstall-en.txt,
+  +files/2.20/reconfig, -files/2.20_rc1/apache.htaccess,
+  -files/2.20_rc1/bugzilla.cron.daily, -files/2.20_rc1/bugzilla.cron.tab,
+  -files/2.20_rc1/reconfig, bugzilla-2.18.3.ebuild, +bugzilla-2.18.4.ebuild,
+  -bugzilla-2.20_rc1.ebuild, -bugzilla-2.20_rc2.ebuild,
+  +bugzilla-2.20.ebuild:
+  Version bumps wrt security bug #107796.
+
+*bugzilla-2.20_rc2 (08 Aug 2005)
+
+  08 Aug 2005; Renat Lumpau <rl03@gentoo.org> +bugzilla-2.20_rc2.ebuild:
+  Added 2.20_rc2
+
+  11 Jul 2005; Renat Lumpau <rl03@gentoo.org> -files/bugzilla.conf,
+  -files/bugzilla.cron.daily, -files/bugzilla.cron.tab, -files/bz.cfg.templ,
+  -files/firstcheck.sh, -bugzilla-2.18.1.ebuild, -bugzilla-2.18.1-r1.ebuild:
+  Cleaning house
+
+  11 Jul 2005; Markus Rothe <corsair@gentoo.org> bugzilla-2.18.3.ebuild:
+  Stable on ppc64 (bug #98348)
+
+  11 Jul 2005; Simon Stelling <blubb@gentoo.org> bugzilla-2.18.3.ebuild:
+  stable on amd64 wrt bug 98348
+
+  10 Jul 2005; Jory A. Pratt <anarchy@gentoo.org> bugzilla-2.18.3.ebuild:
+  Stable on SPARC wrt security bug #98348
+
+  10 Jul 2005; Jason Wever <weeve@gentoo.org> bugzilla-2.18.3.ebuild:
+  Stable on SPARC wrt security bug #98348.
+
+*bugzilla-2.18.3 (10 Jul 2005)
+
+  10 Jul 2005; Renat Lumpau <rl03@gentoo.org> files/2.18.1-r1/reconfig,
+  +bugzilla-2.18.3.ebuild:
+  Version bump wrt security #98348.
+
+  09 Jul 2005; Renat Lumpau <rl03@gentoo.org>
+  -files/2.20_rc1/pgsql-version-detect-broken-gentoo.patch,
+  bugzilla-2.20_rc1.ebuild:
+  Update DBD:Pg dependency
+
+*bugzilla-2.20_rc1 (08 Jul 2005)
+
+  08 Jul 2005; Renat Lumpau <rl03@gentoo.org>
+  +files/2.20_rc1/apache.htaccess, +files/2.20_rc1/bugzilla.cron.daily,
+  +files/2.20_rc1/bugzilla.cron.tab,
+  +files/2.20_rc1/pgsql-version-detect-broken-gentoo.patch,
+  +files/2.20_rc1/reconfig, +bugzilla-2.20_rc1.ebuild:
+  Adding latest RC
+
+  26 Jun 2005; Renat Lumpau <rl03@gentoo.org> bugzilla-2.18.1.ebuild:
+  Fixed location of reconfig script
+
+*bugzilla-2.18.1-r1 (26 Jun 2005)
+
+  26 Jun 2005; Renat Lumpau <rl03@gentoo.org>
+  +files/2.18.1-r1/apache.htaccess, +files/2.18.1-r1/bugzilla.cron.daily,
+  +files/2.18.1-r1/bugzilla.cron.tab, +files/2.18.1-r1/reconfig,
+  +bugzilla-2.18.1-r1.ebuild:
+  Fixed reconfig script. Closes #80996 and #96072
+
+  26 Jun 2005; Renat Lumpau <rl03@gentoo.org> :
+  Cleaning house.
+
+  26 Jun 2005; Renat Lumpau <rl03@gentoo.org> -files/CAN-2004-1061.patch,
+  -files/2.18.0_rc1/apache.htaccess, -files/2.18.0_rc1/reconfig,
+  -files/2.18.0_rc2/apache.htaccess, -files/2.18.0_rc2/reconfig,
+  -files/2.18.0_rc3/apache.htaccess, -files/2.18.0_rc3/reconfig,
+  -files/2.18.0_rc4/apache.htaccess, -files/2.18.0_rc4/reconfig,
+  files/bz.cfg.templ, -bugzilla-2.18.0_rc1.ebuild,
+  -bugzilla-2.18.0_rc2.ebuild, -bugzilla-2.18.0_rc3.ebuild,
+  -bugzilla-2.18.0_rc4.ebuild:
+  Removing obsolete versions.
+
+  12 Jun 2005; Jason Wever <weeve@gentoo.org> bugzilla-2.18.1.ebuild:
+  Stable on SPARC.
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> bugzilla-2.18.1.ebuild:
+  dev-perl/File-Spec => perl-core/File-Spec migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  bugzilla-2.18.0_rc4.ebuild:
+  dev-perl/File-Spec => perl-core/File-Spec migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  bugzilla-2.18.0_rc3.ebuild:
+  dev-perl/File-Spec => perl-core/File-Spec migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  bugzilla-2.18.0_rc2.ebuild:
+  dev-perl/File-Spec => perl-core/File-Spec migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  bugzilla-2.18.0_rc1.ebuild:
+  dev-perl/File-Spec => perl-core/File-Spec migration
+
+  24 May 2005; Michael Cummings <mcummings@gentoo.org>
+  bugzilla-2.18.0_rc1.ebuild, bugzilla-2.18.0_rc2.ebuild,
+  bugzilla-2.18.0_rc3.ebuild, bugzilla-2.18.0_rc4.ebuild,
+  bugzilla-2.18.1.ebuild:
+  dev-perl/CGI => perl-core/CGI
+
+  18 May 2005; Markus Rothe <corsair@gentoo.org> bugzilla-2.18.1.ebuild:
+  Stable on ppc64
+
+  13 May 2005; Michael Hanselmann <hansmi@gentoo.org>
+  bugzilla-2.18.1.ebuild:
+  Stable on ppc.
+
+*bugzilla-2.18.1 (13 May 2005)
+
+  13 May 2005; Aaron Walker <ka0ttic@gentoo.org> +bugzilla-2.18.1.ebuild:
+  Version bump for security bug 92376.
+
+  12 Apr 2005; Konstantin Arkhipov <voxus@gentoo.org>
+  bugzilla-2.18.0_rc4.ebuild:
+  Added ~amd64.
+
+  29 Mar 2005; Michael Cummings <mcummings@gentoo.org>
+  bugzilla-2.18.0_rc1.ebuild, bugzilla-2.18.0_rc2.ebuild,
+  bugzilla-2.18.0_rc3.ebuild, bugzilla-2.18.0_rc4.ebuild:
+  Removing dep on dev-perl/Data-Dumper - this ebuild is superceded by the core
+  perl install. Bug 80440.
+
+  09 Mar 2005; Markus Rothe <corsair@gentoo.org> bugzilla-2.18.0_rc4.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  21 Jan 2005; Luca Barbato <lu_zero@gentoo.org> bugzilla-2.18.0_rc4.ebuild:
+  Marked ppc
+
+*bugzilla-2.18.0_rc4 (19 Jan 2005)
+
+  19 Jan 2005; Stuart Herbert <stuart@gentoo.org>
+  +files/2.18.0_rc4/apache.htaccess, +files/2.18.0_rc4/reconfig,
+  +bugzilla-2.18.0_rc4.ebuild:
+  Added patch for CAN-2004-1061; see bug #76631
+
+  29 Oct 2004; <SeJo@gentoo.org> bugzilla-2.18.0_rc3.ebuild:
+  stable on ppc gsla: 68851
+
+*bugzilla-2.18.0_rc3 (27 Oct 2004)
+
+  27 Oct 2004; Renat Lumpau <rl03@gentoo.org> +bugzilla-2.18.0_rc3.ebuild:
+  Version bump. Security bug #68851.
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  bugzilla-2.18.0_rc1.ebuild, bugzilla-2.18.0_rc2.ebuild:
+  Masked bugzilla-2.18.0_rc2.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  bugzilla-2.18.0_rc1.ebuild:
+  Masked bugzilla-2.18.0_rc1.ebuild stable for ppc
+
+  30 Aug 2004; Renat Lumpau <rl03@gentoo.org> :
+  Recommitting Manifest
+
+  30 Aug 2004; Renat Lumpau <rl03@gentoo.org> bugzilla-2.18.0_rc1.ebuild,
+  bugzilla-2.18.0_rc2.ebuild:
+  Fixed DEPEND/RDEPEND
+
+*bugzilla-2.18.0_rc2 (17 Aug 2004)
+
+  17 Aug 2004; Renat Lumpau <rl03@gentoo.org> +files/2.18.0_rc2/apache.htaccess,
+  +files/2.18.0_rc2/reconfig, +bugzilla-2.18.0_rc2.ebuild:
+  Version bump (bug 59165). Cleaned up dependancies.
 
 *bugzilla-2.18.0_rc1 (15 Aug 2004)
 
diff --git a/www-apps/bugzilla/Manifest b/www-apps/bugzilla/Manifest
index a30b4e09816d..ec879855c69c 100644
--- a/www-apps/bugzilla/Manifest
+++ b/www-apps/bugzilla/Manifest
@@ -1,12 +1,26 @@
-MD5 ddf46c4706a664e877c51705a6519312 ChangeLog 2062
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 438eb678506682782baeb279889d55da bugzilla-2.18.4.ebuild 1825
+MD5 47aa0157107e020c3ad3537ae57d016d bugzilla-2.20.ebuild 1857
+MD5 0d20b25ade49a4a82dba50986cc13f81 ChangeLog 10123
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
-MD5 97f885e96e9c482584e546e539d11609 bugzilla-2.18.0_rc1.ebuild 1777
-MD5 4a9b1a263f16b2a53b44bce45350b373 files/bugzilla.conf 148
-MD5 0be5a588dc7fdfc9e4898a855bd32361 files/bugzilla.cron.daily 115
-MD5 b38d67b03726b84833bd8c5f632e4020 files/bugzilla.cron.tab 54
-MD5 b243138916c1a9e7390fa352aa184a81 files/bz.cfg.templ 273
-MD5 0606a9da89d19a505c52818d14de61e3 files/cronset.sh 70
-MD5 8d37835f4224135a849a73ab8b6b893a files/digest-bugzilla-2.18.0_rc1 69
-MD5 a001fc92584de0cd6f1a0d8de99ee6ce files/firstcheck.sh 48
-MD5 32cb42777a779ac279c5384643970729 files/2.18.0_rc1/apache.htaccess 70
-MD5 2b4f3ae5bc1d383a4951a22cf65b28ae files/2.18.0_rc1/reconfig 3214
+MD5 24f132ccd4b11bb49c26326fd0584f4c files/digest-bugzilla-2.20 66
+MD5 4a34a6ec468afb645b29aaddedeef49a files/digest-bugzilla-2.18.4 68
+MD5 b38d67b03726b84833bd8c5f632e4020 files/2.18/bugzilla.cron.tab 54
+MD5 06e21bd2fe59b4517ed05fb46c1bff9e files/2.18/postinstall-en.txt 148
+MD5 0be5a588dc7fdfc9e4898a855bd32361 files/2.18/bugzilla.cron.daily 115
+MD5 42151252d49e42c9839f80c80dff9138 files/2.18/apache.htaccess 94
+MD5 c1913bf27d5ee8cd7f4f88de0b88312a files/2.18/reconfig 348
+MD5 b38d67b03726b84833bd8c5f632e4020 files/2.20/bugzilla.cron.tab 54
+MD5 7b5e1b8ee2d4e49224f15287c5070b57 files/2.20/postinstall-en.txt 278
+MD5 0be5a588dc7fdfc9e4898a855bd32361 files/2.20/bugzilla.cron.daily 115
+MD5 42151252d49e42c9839f80c80dff9138 files/2.20/apache.htaccess 94
+MD5 899c42853fbf73268c49d3602eae77d2 files/2.20/reconfig 349
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDckMPEzitwsaoONoRAguKAKCA1iztEoC3uR/K6Z/hv29A7ykhMQCgoC6J
+vaqR6HWlnBADdmrPtrI/MeA=
+=ojUw
+-----END PGP SIGNATURE-----
diff --git a/www-apps/bugzilla/bugzilla-2.18.4.ebuild b/www-apps/bugzilla/bugzilla-2.18.4.ebuild
index 01d358cdbefe..a0b50bd748a3 100644
--- a/www-apps/bugzilla/bugzilla-2.18.4.ebuild
+++ b/www-apps/bugzilla/bugzilla-2.18.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/www-apps/bugzilla/bugzilla-2.18.4.ebuild,v 1.1 2005/10/01 16:00:59 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-2.18.4.ebuild,v 1.1.1.1 2005/11/30 09:36:54 chriswhite Exp $
 
 inherit webapp
 
@@ -9,7 +9,7 @@ SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/webtools/${P}.tar.gz"
 HOMEPAGE="http://www.bugzilla.org"
 
 LICENSE="MPL-1.1 NPL-1.1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
 
 IUSE="apache2"
 
@@ -22,7 +22,7 @@ RDEPEND=">=dev-db/mysql-3.23.41
 	>=perl-core/CGI-2.93
 	>=dev-perl/TimeDate-1.16
 	>=dev-perl/DBI-1.36
-	>=dev-perl/DBD-mysql-2.1010
+	<dev-perl/DBD-mysql-3.0000
 	>=perl-core/File-Spec-0.8.2
 	>=dev-perl/Template-Toolkit-2.08
 	>=dev-perl/Text-Tabs+Wrap-2001.0131
@@ -59,8 +59,8 @@ src_install () {
 	cd ${FILESDIR}/2.18
 	cp ${FILE} ${D}/${MY_HTDOCSDIR}
 
-	# add the reconfigure hook
 	webapp_hook_script ${FILESDIR}/2.18/reconfig
+	webapp_postinst_txt en ${FILESDIR}/2.18/postinstall-en.txt
 
 	webapp_src_install
 }
diff --git a/www-apps/bugzilla/bugzilla-2.20.ebuild b/www-apps/bugzilla/bugzilla-2.20.ebuild
index 0b09f8ce1830..8977246f32bf 100644
--- a/www-apps/bugzilla/bugzilla-2.20.ebuild
+++ b/www-apps/bugzilla/bugzilla-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/www-apps/bugzilla/bugzilla-2.20.ebuild,v 1.1 2005/10/01 16:00:59 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-2.20.ebuild,v 1.1.1.1 2005/11/30 09:36:54 chriswhite Exp $
 
 inherit webapp eutils
 
@@ -9,14 +9,14 @@ SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/webtools/${P}.tar.gz"
 HOMEPAGE="http://www.bugzilla.org"
 
 LICENSE="MPL-1.1 NPL-1.1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="apache2 postgres graphviz"
 
 RDEPEND="
 	>=dev-lang/perl-5.6.1
 	postgres? ( >=dev-db/postgresql-7.3 >=dev-perl/DBD-Pg-1.43 )
-	!postgres? ( >=dev-db/mysql-3.23.41 >=dev-perl/DBD-mysql-2.9003 )
+	!postgres? ( >=dev-db/mysql-3.23.41 <dev-perl/DBD-mysql-3.0000 )
 	apache2? ( >=net-www/apache-2.0 )
 	!apache2? ( =net-www/apache-1* )
 	graphviz? ( media-gfx/graphviz )
diff --git a/www-apps/bugzilla/files/2.18/reconfig b/www-apps/bugzilla/files/2.18/reconfig
index f62bfe278642..9d2c893b1711 100644
--- a/www-apps/bugzilla/files/2.18/reconfig
+++ b/www-apps/bugzilla/files/2.18/reconfig
@@ -2,7 +2,7 @@
 
 FILE="bugzilla.cron.daily bugzilla.cron.tab"
 
-function die () 
+function die ()
 {
 	echo
 	echo "***"
@@ -12,85 +12,8 @@ function die ()
 }
 
 if [ $1 = "install" ]; then
-
 	cd "${MY_INSTALLDIR}" || die "Cannot find install dir ${MY_INSTALLDIR}"
-
-	sed -e "s|/var/www/bugzilla|${MY_INSTALLDIR}|g;" -i ${FILE}
-
-	[[ -a localconfig ]] && die "The following does not work on previous installations, please run checksetup.pl in ${MY_INSTALLDIR}"
-
-	echo
-	echo "Finalizing the installation of bugzilla in ${MY_INSTALLDIR}"
-	echo
-	
-	# config setting
-	echo "Details for the bugzilla database"
-	echo "(This scripts creates the database & user)"
-	echo
-
-	echo -n "mysql bugs db host [localhost]: "; read mybugshost
-	[[ -z "${mybugshost}" ]] && mybugshost="localhost"
-
-	echo -n "mysql bugs db port [3306]: "; read mybugsport
-	[[ -z "${mybugsport}" ]] && mybugsport="3306"
-	
-	echo -n "mysql bugs db name [bugs]: "; read mybugsdb
-	[[ -z "${mybugsdb}" ]] && mybugsdb="bugs"
-	
-	echo -n "mysql bugs dbuser name [bugs]: "; read mybugsuser
-	[[ -z "${mybugsuser}" ]] && mybugsuser="bugs"
-
-	echo -n "mysql bugs dbuser password: "; read mybugspwd
-	[[ -z "${mybugspwd}" ]] && die "Error: no dbuser password"
-	pw=${mybugspwd//\'/\\\'}
-
-	# let's create a config file for checksetup.pl
-	echo "\$answer{'db_host'} = '\$db_host = \"${mybugshost}\";" > bz.cfg.pl
-	echo "\$db_port = ${mybugsport};" >> bz.cfg.pl
-	echo "\$db_name = \"${mybugsdb}\";" >> bz.cfg.pl
-	echo "\$db_user = \"${mybugsuser}\";';" >> bz.cfg.pl
-	echo "\$answer{'db_pass'} = q[\$db_pass = '${mybugspwd}';];" >> bz.cfg.pl
-	echo "\$answer{'db_sock'} = q[\$db_sock = '/var/run/mysqld/mysqld.sock';];" >> bz.cfg.pl
-
-	# privileges
-	echo "Setting correct privileges for bugzilla mysql connection"
-	echo -n "Please enter login info for user who has grant privileges on ${mybugshost} [${USER}]: "; read adminuser
-	[[ -z ${adminuser} ]] && adminuser="${USER}"
-	if [ "${mybugshost}" != "localhost" ]; then
-		echo -n "Client address for bugzilla (at db side) [$(hostname -f)]: "; read clientaddr
-		[[ -z ${clientaddr} ]] && clientaddr="$(hostname -f)"
-	fi
-	# this will be default for localhost
-	[[ -z ${clientaddr} ]] && clientaddr="${mybugshost}"
-
-	# check the installed mysql version
-	type -p mysql &>/dev/null || die "mysql program not found !  Check your PATH (or did you emerge with --nodeps ?)"
-	mysql_version="`mysql -V | cut -d' ' -f6 | sed -e 's:,$::'`"
-	[[ -z ${mysql_version} ]] && die "mysql version check failed (got '${mysql_version}')"
-	extra_bugzie_privs=""
-	(( ${mysql_version:0:1} < 4 )) && extra_bugzie_privs=",LOCK TABLES,CREATE TEMPORARY TABLES"
-
-	# if $bugshost == localhost, don't specify -h argument, so local socket can be used.
-	host=${mybugshost/localhost}
-	/etc/init.d/mysql restart || die "Could not (re)start mysql!"
-	mysql -u "${adminuser}" "${host:+-h ${host}}" -p \
-		-P "${mybugsport}" \
-		-e "GRANT SELECT,INSERT,UPDATE,DELETE,INDEX,ALTER,CREATE,DROP,REFERENCES${extra_bugzie_privs} ON ${mybugsdb}.* TO '${mybugsuser}'@'${clientaddr}' IDENTIFIED BY '${pw}'; FLUSH PRIVILEGES;" \
-		|| die "Error initializing database. Please grant permissions manually. See http://www.bugzilla.org/docs/2.18/html/configuration.html."
-
-	echo "Setting the template for localconfig variables"
-	chmod 755 ./checksetup.pl
-	./checksetup.pl bz.cfg.pl || exit 1
-
-	echo "Final step: setting all html templates and db tables"
-	./checksetup.pl || exit 1
-
-	echo -n "Do you want to set a crontab [y/N]" ; read cronyes
-	if [ "${cronyes}+" = "y+" ] ; then 
-		/usr/bin/crontab -u apache ${MY_INSTALLDIR}/bugzilla.cron.tab
-	fi
-
+	sed -e "s|/var/www/bugzilla|${MY_INSTALLDIR}|g" -i ${FILE} || die "sed failed"
 else
-	[[ -z "${MY_INSTALLDIR}" ]] && die "${MY_INSTALLDIR} not found!"
-	rm -f "${FILES}" bz.cfg.pl
+	echo "done"
 fi
diff --git a/www-apps/bugzilla/files/2.20/postinstall-en.txt b/www-apps/bugzilla/files/2.20/postinstall-en.txt
index ba8abb222a26..8dabca5e6590 100644
--- a/www-apps/bugzilla/files/2.20/postinstall-en.txt
+++ b/www-apps/bugzilla/files/2.20/postinstall-en.txt
@@ -1,2 +1,7 @@
-Please read the Release Notes, especially if you are upgrading:
+Bugzilla has been installed into ${MY_INSTALLDIR}
+
+To finish the installation, please read
+ http://www.bugzilla.org/docs/2.20/html/installation.html
+
+Also, please read the Release Notes, especially if you are upgrading:
  http://www.bugzilla.org/releases/2.20/release-notes.html
diff --git a/www-apps/bugzilla/files/2.20/reconfig b/www-apps/bugzilla/files/2.20/reconfig
index 4d24f23d0adf..71b0acea2585 100644
--- a/www-apps/bugzilla/files/2.20/reconfig
+++ b/www-apps/bugzilla/files/2.20/reconfig
@@ -2,7 +2,7 @@
 
 FILE="bugzilla.cron.daily bugzilla.cron.tab"
 
-function die () 
+function die ()
 {
 	echo
 	echo "***"
@@ -12,127 +12,8 @@ function die ()
 }
 
 if [ $1 = "install" ]; then
-
 	cd "${MY_INSTALLDIR}" || die "Cannot find install dir ${MY_INSTALLDIR}"
-
-	sed -e "s|/var/www/bugzilla|${MY_INSTALLDIR}|g;" -i ${FILE}
-
-	[[ -a localconfig ]] && die "The following does not work on previous installations, please run checksetup.pl in ${MY_INSTALLDIR}"
-
-	echo
-	echo "Finalizing the installation of bugzilla in ${MY_INSTALLDIR}"
-	echo
-	
-	# config setting
-	echo "Details for the bugzilla database"
-	echo "(This scripts creates the database & user)"
-	echo
-
-	echo "If you want to use Postgres, please enter numeric IP"
-	echo "or the config script will hang"
-	echo -n "bugs db host [127.0.0.1]: "; read mybugshost
-	[[ -z "${mybugshost}" ]] && mybugshost="127.0.0.1"
-
-	echo -n "bugs db driver (mysql or pg) [mysql]: "; read mydriver
-	[[ -z "${mydriver}" ]] && mydriver="mysql"
-
-	if [[ ${mydriver} == "mysql" ]]; then
-		port="3306"
-		granter="root"
-	elif [[ ${mydriver} == "pg" ]]; then
-		port="5432"
-		granter="postgres"
-	else
-		die "Wrong db driver"
-	fi
-	
-	echo -n "bugs db port [${port}]: "; read mybugsport
-	[[ -z "${mybugsport}" ]] && mybugsport="${port}"
-	
-	echo -n "bugs db name [bugs]: "; read mybugsdb
-	[[ -z "${mybugsdb}" ]] && mybugsdb="bugs"
-	
-	echo -n "bugs dbuser name [bugs]: "; read mybugsuser
-	[[ -z "${mybugsuser}" ]] && mybugsuser="bugs"
-
-	echo -n "bugs dbuser password: "; read mybugspwd
-	[[ -z "${mybugspwd}" ]] && die "Error: no dbuser password"
-	pw=${mybugspwd//\'/\\\'}
-	
-	echo -n "your SMTP server [localhost]: "; read mysmtp
-	[[ -z "${mysmtp}" ]] && mysmtp="localhost"
-
-	# let's create a config file for checksetup.pl
-	echo "\$answer{'db_host'} = q[" > bz.cfg.pl
-	echo "\$db_host = '${mybugshost}';" >> bz.cfg.pl
-	echo "\$db_driver = '${mydriver}';" >> bz.cfg.pl
-	echo "\$db_port = ${mybugsport};" >> bz.cfg.pl
-	echo "\$db_name = '${mybugsdb}';" >> bz.cfg.pl
-	echo "\$db_user = '${mybugsuser}';" >> bz.cfg.pl
-	echo "];" >> bz.cfg.pl
-	echo "\$answer{'db_pass'} = q[\$db_pass = '${mybugspwd}';];" >> bz.cfg.pl
-	echo "\$answer{'SMTP_SERVER'} = q['${mysmtp}';];" >> bz.cfg.pl
-	if [[ ${mydriver} == "mysql" ]]; then
-		echo "\$answer{'db_sock'} = q[\$db_sock = '/var/run/mysqld/mysqld.sock';];" >> bz.cfg.pl
-	elif [[ ${mydriver} == "pg" ]]; then
-		echo "\$answer{'db_sock'} = q[\$db_sock = '/tmp/.s.PGSQL.${mybugsport}';];" >> bz.cfg.pl
-	else
-		die "Wrong db driver"
-	fi
-
-	# privileges
-	echo "Setting correct privileges for bugzilla connection"
-	echo -n "Please enter login info for user who has grant privileges on ${mybugshost} [${granter}]: "; read adminuser
-	[[ -z ${adminuser} ]] && adminuser="${granter}"
-	if [ "${mybugshost}" != "127.0.0.1" ]; then
-		echo -n "Client address for bugzilla (at db side) [$(hostname -f)]: "; read clientaddr
-		[[ -z ${clientaddr} ]] && clientaddr="$(hostname -f)"
-	fi
-	# this will be default for localhost
-	[[ -z ${clientaddr} ]] && clientaddr="${mybugshost}"
-
-	if [[ ${mydriver} == "mysql" ]]; then
-
-		# check the installed mysql version
-		type -p mysql &>/dev/null || die "mysql program not found !  Check your PATH (or did you emerge with --nodeps ?)"
-		mysql_version="`mysql -V | cut -d' ' -f6 | sed -e 's:,$::'`"
-		[[ -z ${mysql_version} ]] && die "mysql version check failed (got '${mysql_version}')"
-		extra_bugzie_privs=""
-		(( ${mysql_version:0:1} < 4 )) && extra_bugzie_privs=",LOCK TABLES,CREATE TEMPORARY TABLES"
-
-		# if $bugshost == localhost, don't specify -h argument, so local socket can be used.
-		host=${mybugshost/"127.0.0.1"}
-		/etc/init.d/mysql restart || die "Could not (re)start mysql!"
-		mysql -u "${adminuser}" "${host:+-h ${host}}" -p \
-			-P "${mybugsport}" \
-			-e "GRANT SELECT,INSERT,UPDATE,DELETE,INDEX,ALTER,CREATE,DROP,REFERENCES${extra_bugzie_privs} ON ${mybugsdb}.* TO '${mybugsuser}'@'${clientaddr}' IDENTIFIED BY '${pw}'; FLUSH PRIVILEGES;" \
-			|| die "Error initializing database. Please grant permissions manually. See http://www.bugzilla.org/docs/tip/html/configuration.html."
-	
-	elif [[ ${mydriver} == "pg" ]]; then
-		# if $bugshost == localhost, don't specify -h argument, so local socket can be used.
-		host=${mybugshost/"127.0.0.1"}
-		/etc/init.d/postgresql restart || die "Could not (re)start postgresql!"
-		createdb -U "${adminuser}" ${host:+-h ${host}} -W \
-			-p "${mybugsport}" -O "${mybugsuser}" "${mybugsdb}" \
-			|| die "Error initializing database. Please grant permissions manually. See http://www.bugzilla.org/docs/tip/html/configuration.html."
-
-	else
-		die "Wrong db driver"
-	fi
-	
-	echo "Setting the template for localconfig variables"
-	cd ${MY_INSTALLDIR} || die
-	chmod 755 ./checksetup.pl
-	./checksetup.pl bz.cfg.pl || exit 1
-
-	echo "Final step: setting all html templates and db tables"
-	./checksetup.pl || exit 1
-
-	echo -n "Do you want to set a crontab [y/N]" ; read cronyes
-	if [ "${cronyes}+" = "y+" ] ; then 
-		/usr/bin/crontab -u apache ${MY_INSTALLDIR}/bugzilla.cron.tab
-	fi
-
+	sed -e "s|/var/www/bugzilla|${MY_INSTALLDIR}|g" -i ${FILE} || die "sed failed"
 else
 	echo "done."
 fi
diff --git a/www-apps/coppermine/ChangeLog b/www-apps/coppermine/ChangeLog
index 44ad69779699..b61af7f08fb5 100644
--- a/www-apps/coppermine/ChangeLog
+++ b/www-apps/coppermine/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for www-apps/coppermine
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/coppermine/ChangeLog,v 1.1 2005/05/15 16:06:13 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/coppermine/ChangeLog,v 1.1.1.1 2005/11/30 09:37:01 chriswhite Exp $
+
+  22 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt:
+  Housekeeping
+
+  22 Aug 2005; Renat Lumpau <rl03@gentoo.org> -coppermine-1.3.3.ebuild:
+  Removing vulnerable versions
+
+*coppermine-1.3.4 (22 Aug 2005)
+
+  22 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  +coppermine-1.3.4.ebuild:
+  Version bump wrt security bug #103357.
+
+  27 Jun 2005; Stuart Herbert <stuart@gentoo.org> metadata.xml:
+  Fixed herd listing in metadata
+
+  03 Jun 2005; Jason Wever <weeve@gentoo.org> coppermine-1.3.3.ebuild:
+  Added ~sparc keyword wrt bug #94720.
+
+  15 May 2005; Sven Wegener <swegener@gentoo.org> coppermine-1.3.3.ebuild:
+  Fixed invalid atoms in *DEPEND. Use versionator.eclass.
 
 *coppermine-1.3.3 (15 May 2005)
 
diff --git a/www-apps/coppermine/Manifest b/www-apps/coppermine/Manifest
index 89ccb5bb370c..676c53686cd2 100644
--- a/www-apps/coppermine/Manifest
+++ b/www-apps/coppermine/Manifest
@@ -1,5 +1,15 @@
-MD5 5ba9aa9ad0149da319213cb436ea6057 coppermine-1.3.3.ebuild 1143
-MD5 95b096b7d88b9a1942986367502728a3 metadata.xml 223
-MD5 46c9dad2326596a2bff6c08a90e8b81d ChangeLog 369
-MD5 dccc51095d51095bcefdcb88b58f6060 files/postinstall-en.txt 205
-MD5 75788e2668d0043e58453dd4d06c7682 files/digest-coppermine-1.3.3 58
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 dc7727f1cd87af66533023d4c4abd89f coppermine-1.3.4.ebuild 1197
+MD5 d04d6fd58e6699c63898d740c2b3e655 ChangeLog 1168
+MD5 4f723686129a68a7dcb5ce4e21c775ad metadata.xml 223
+MD5 bfdfc969829e2247f3b8ecf5fec1d861 files/digest-coppermine-1.3.4 58
+MD5 ea33c1ce025613ef9346a01b37e1cc20 files/postinstall-en.txt 212
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDCleHEzitwsaoONoRAgbeAJkBMR8UQzD868/Z2hgW3jOGRZ/CkgCgl1bs
+Cq+IrtjnV5Vvc3jYldtpX/w=
+=Tpab
+-----END PGP SIGNATURE-----
diff --git a/www-apps/coppermine/coppermine-1.3.4.ebuild b/www-apps/coppermine/coppermine-1.3.4.ebuild
index bd06215589a8..46fb038c0f97 100644
--- a/www-apps/coppermine/coppermine-1.3.4.ebuild
+++ b/www-apps/coppermine/coppermine-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/www-apps/coppermine/coppermine-1.3.4.ebuild,v 1.1 2005/08/22 22:02:52 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/coppermine/coppermine-1.3.4.ebuild,v 1.1.1.1 2005/11/30 09:37:01 chriswhite Exp $
 
 inherit webapp versionator
 
diff --git a/www-apps/coppermine/files/postinstall-en.txt b/www-apps/coppermine/files/postinstall-en.txt
index d78050a224ab..57e01db4af45 100644
--- a/www-apps/coppermine/files/postinstall-en.txt
+++ b/www-apps/coppermine/files/postinstall-en.txt
@@ -3,4 +3,4 @@ To complete the installation, you must
 1. Manually create a MySQL user and database.
      The installer will handle the rest.
 
-Finally, point your browser to http://your_server/coppermine_dir/install.php
+Finally, point your browser to http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/install.php
diff --git a/www-apps/coppermine/metadata.xml b/www-apps/coppermine/metadata.xml
index 3cda8e828434..12eaa2617165 100644
--- a/www-apps/coppermine/metadata.xml
+++ b/www-apps/coppermine/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>www-apps</herd>
+<herd>web-apps</herd>
 <maintainer>
   <email>stuart@gentoo.org</email>
 </maintainer>
diff --git a/www-apps/curator/ChangeLog b/www-apps/curator/ChangeLog
index cf39934ab023..5a3723c1deef 100644
--- a/www-apps/curator/ChangeLog
+++ b/www-apps/curator/ChangeLog
@@ -1,13 +1,22 @@
-# ChangeLog for net-www/curator
+# ChangeLog for www-apps/curator
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/curator/ChangeLog,v 1.1 2004/08/15 09:54:49 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/curator/ChangeLog,v 1.1.1.1 2005/11/30 09:36:59 chriswhite Exp $
+
+  29 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.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> curator-2.0.ebuild:
+  Masked curator-2.0.ebuild stable for ppc
 
 *curator-2.0 (15 Aug 2004)
 
   15 Aug 2004; Stuart Herbert <stuart@gentoo.org> +curator-2.0.ebuild:
   Moved from net-www/curator to www-apps/curator.
 
-  08 Jun 2004; Bryan �stergaard <kloeri@gentoo.org> curator-2.0.ebuild:
+  08 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> curator-2.0.ebuild:
   Stable on alpha.
 
 *curator-2.0 (02 Apr 2003)
diff --git a/www-apps/curator/Manifest b/www-apps/curator/Manifest
index 199f9f5d1fe3..118dc05b5d22 100644
--- a/www-apps/curator/Manifest
+++ b/www-apps/curator/Manifest
@@ -1,3 +1,3 @@
-MD5 580daf4511b7508ccd21d9ea91df63e4 ChangeLog 423
-MD5 070d0e31d9cb003ba0871768bd776c34 curator-2.0.ebuild 648
+MD5 a7016b0ba1072e250d43f4b0b7430b45 curator-2.0.ebuild 646
+MD5 ea0476241c556069fb7b794b0e989e55 ChangeLog 882
 MD5 c238a1f3d057b653febb27ec81e375ef files/digest-curator-2.0 62
diff --git a/www-apps/curator/curator-2.0.ebuild b/www-apps/curator/curator-2.0.ebuild
index 328fdcc84a8c..55aa86af8637 100644
--- a/www-apps/curator/curator-2.0.ebuild
+++ b/www-apps/curator/curator-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/www-apps/curator/curator-2.0.ebuild,v 1.1 2004/08/15 09:54:49 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/curator/curator-2.0.ebuild,v 1.1.1.1 2005/11/30 09:36:59 chriswhite Exp $
 
 MY_P=curator-2.0
 DESCRIPTION="Webpage thumbnail creator"
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/curator/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc alpha ~mips amd64"
+KEYWORDS="x86 ppc ~sparc alpha ~mips amd64"
 IUSE=""
 
 DEPEND=">=dev-lang/python-2.2.1
diff --git a/www-apps/diaria/ChangeLog b/www-apps/diaria/ChangeLog
index e2a729dbcd08..1a32a0ac4d8a 100644
--- a/www-apps/diaria/ChangeLog
+++ b/www-apps/diaria/ChangeLog
@@ -1,6 +1,16 @@
-# ChangeLog for net-www/diaria
+# ChangeLog for www-apps/diaria
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/diaria/ChangeLog,v 1.1 2004/08/15 09:57:12 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/diaria/ChangeLog,v 1.1.1.1 2005/11/30 09:37:11 chriswhite Exp $
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  diaria-0.1.4.ebuild:
+  Masked diaria-0.1.4.ebuild stable for ppc
+
+  29 Aug 2004; David Holm <dholm@gentoo.org> diaria-0.1.4.ebuild:
+  Added to ~ppc.
 
 *diaria-0.1.4 (15 Aug 2004)
 
diff --git a/www-apps/diaria/Manifest b/www-apps/diaria/Manifest
index 86adf1a1b488..7a026aa53786 100644
--- a/www-apps/diaria/Manifest
+++ b/www-apps/diaria/Manifest
@@ -1,4 +1,14 @@
-MD5 42735660124647c5f0a29716c730c481 diaria-0.1.4.ebuild 817
-MD5 ce1b79af06ae42bad8a7f9059a812017 ChangeLog 526
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f51a1fdb3544353a7d00c4747c76f425 diaria-0.1.4.ebuild 822
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
+MD5 ba22890d994b598ccce613ee76650937 ChangeLog 985
 MD5 8e9564c60f459c4ddbbdefe8616e77a3 files/digest-diaria-0.1.4 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBOs80I1lqEGTUzyQRAgG8AJ4zaajoR9VFaP8joyneoIkV6gvX6ACdHEcS
+dQkRPhAQR7EfKGjrQe7RAUM=
+=HPGF
+-----END PGP SIGNATURE-----
diff --git a/www-apps/diaria/diaria-0.1.4.ebuild b/www-apps/diaria/diaria-0.1.4.ebuild
index 3c07a36f7be4..58692f1d989c 100644
--- a/www-apps/diaria/diaria-0.1.4.ebuild
+++ b/www-apps/diaria/diaria-0.1.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/www-apps/diaria/diaria-0.1.4.ebuild,v 1.1 2004/08/15 09:57:12 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/diaria/diaria-0.1.4.ebuild,v 1.1.1.1 2005/11/30 09:37:11 chriswhite Exp $
 
 inherit ruby
 
@@ -10,7 +10,7 @@ SRC_URI="http://rubyforge.org/download.php/208/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 USE_RUBY="any"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ppc"
 USE_RUBY="any"
 IUSE=""
 DEPEND="virtual/ruby"
diff --git a/www-apps/disc-cover/ChangeLog b/www-apps/disc-cover/ChangeLog
index 5dbfa40eeb26..eab0f4cd9ce4 100644
--- a/www-apps/disc-cover/ChangeLog
+++ b/www-apps/disc-cover/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-apps/disc-cover
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/disc-cover/ChangeLog,v 1.1 2005/07/15 19:07:00 dju Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/disc-cover/ChangeLog,v 1.1.1.1 2005/11/30 09:36:56 chriswhite Exp $
+
+  16 Jul 2005; David Holm <dholm@gentoo.org> disc-cover-1.5.4-r1.ebuild:
+  Added to ~ppc.
 
 *disc-cover-1.5.4-r1 (15 Jul 2005)
 
diff --git a/www-apps/disc-cover/Manifest b/www-apps/disc-cover/Manifest
index 8a1181dc3d2c..9ecb33198a18 100644
--- a/www-apps/disc-cover/Manifest
+++ b/www-apps/disc-cover/Manifest
@@ -1,3 +1,5 @@
-MD5 37944074ba41d7025dd71bad73ae6257 disc-cover-1.5.4-r1.ebuild 1125
+MD5 318327a31d33d95e568c3a50dfed3ea1 ChangeLog 556
+MD5 3100013082453699ea103dc9f9342b2e disc-cover-1.5.4-r1.ebuild 1237
+MD5 b0deccce5f48d04a4b0ab5991bffcaae metadata.xml 491
 MD5 bdfcca30685c062b3dcd80a4e96fd263 files/digest-disc-cover-1.5.4-r1 67
 MD5 31d8b199f55b164cc94fae78b8a338ae files/postinst-en.txt 265
diff --git a/www-apps/disc-cover/disc-cover-1.5.4-r1.ebuild b/www-apps/disc-cover/disc-cover-1.5.4-r1.ebuild
index 1fffc5d383cc..4ab20868ec73 100644
--- a/www-apps/disc-cover/disc-cover-1.5.4-r1.ebuild
+++ b/www-apps/disc-cover/disc-cover-1.5.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/www-apps/disc-cover/disc-cover-1.5.4-r1.ebuild,v 1.1 2005/07/15 19:07:00 dju Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/disc-cover/disc-cover-1.5.4-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:56 chriswhite Exp $
 
 inherit webapp
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://homepages.inf.ed.ac.uk/jvanheme/disc-cover.html"
 SRC_URI="http://homepages.inf.ed.ac.uk/jvanheme/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 IUSE=""
 
 SLOT="0"
diff --git a/www-apps/dokuwiki/ChangeLog b/www-apps/dokuwiki/ChangeLog
index 3aede455d396..c969dfe177dc 100644
--- a/www-apps/dokuwiki/ChangeLog
+++ b/www-apps/dokuwiki/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for www-apps/dokuwiki
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.1 2005/07/24 22:21:20 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.1.1.1 2005/11/30 09:36:57 chriswhite Exp $
+
+*dokuwiki-20050922 (20 Nov 2005)
+
+  20 Nov 2005; Lance Albertson <ramereth@gentoo.org>
+  dokuwiki-20050713.ebuild, +dokuwiki-20050922.ebuild:
+  * Version bump
+  * Stable on x86
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> dokuwiki-20050713.ebuild:
+  Added to ~ppc.
 
 *dokuwiki-20050713 (24 Jul 2005)
 
diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index 975683afeaad..dd169f80571d 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -1,4 +1,7 @@
-MD5 e7dda3e50ea7e764345e76da03eb5cb6 dokuwiki-20050713.ebuild 1379
-MD5 494ac870858e3c1dd3e6e1ca041856fa metadata.xml 703
+MD5 81e31544f5fdc97318231fa56e0ecded dokuwiki-20050713.ebuild 1498
+MD5 0922f8bcb85431dab1ce19e2675e2e24 metadata.xml 704
+MD5 a5c075b4e6fcbe66980fdb13de69a846 ChangeLog 666
+MD5 da4a0bb22291929771c528fcc26566ad dokuwiki-20050922.ebuild 1499
 MD5 a65ef20ee770f09cfcd76f346f3da136 files/digest-dokuwiki-20050713 68
 MD5 1b5b86b6942f3451fc286451dbaf7c4a files/postinstall-en.txt 1590
+MD5 a8cdb48781eb1d76bdd22351814a2b9a files/digest-dokuwiki-20050922 68
diff --git a/www-apps/dokuwiki/dokuwiki-20050713.ebuild b/www-apps/dokuwiki/dokuwiki-20050713.ebuild
index f813e1cd2696..902af02c7270 100644
--- a/www-apps/dokuwiki/dokuwiki-20050713.ebuild
+++ b/www-apps/dokuwiki/dokuwiki-20050713.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20050713.ebuild,v 1.1 2005/07/24 22:21:20 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20050713.ebuild,v 1.1.1.1 2005/11/30 09:36:57 chriswhite Exp $
 
 inherit webapp
 
@@ -13,11 +13,11 @@ HOMEPAGE="http://wiki.splitbrain.org/wiki:dokuwiki"
 SRC_URI="http://www.splitbrain.org/Programming/PHP/DokuWiki/${PN}-${MY_PV}.tgz"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~ppc x86"
 IUSE=""
 
 DEPEND="virtual/php"
-RDEPEND=""
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	cd ${WORKDIR}
diff --git a/www-apps/dokuwiki/dokuwiki-20050922.ebuild b/www-apps/dokuwiki/dokuwiki-20050922.ebuild
index abd02994310a..235ac571d9af 100644
--- a/www-apps/dokuwiki/dokuwiki-20050922.ebuild
+++ b/www-apps/dokuwiki/dokuwiki-20050922.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20050922.ebuild,v 1.1 2005/11/20 05:11:07 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20050922.ebuild,v 1.1.1.1 2005/11/30 09:36:57 chriswhite Exp $
 
 inherit webapp
 
diff --git a/www-apps/dokuwiki/metadata.xml b/www-apps/dokuwiki/metadata.xml
index 94f975f42e92..c881626d8ae2 100644
--- a/www-apps/dokuwiki/metadata.xml
+++ b/www-apps/dokuwiki/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>webapp</herd>
+	<herd>web-apps</herd>
 	<maintainer>
 		<email>ramereth@gentoo.org</email>
 		<name>Lance Albertson</name>
@@ -15,4 +15,3 @@
 		files - no database is required.
 	</longdescription>
 </pkgmetadata>
-
diff --git a/www-apps/dragonflycms/ChangeLog b/www-apps/dragonflycms/ChangeLog
index 2a544351fe44..849ef8fee2b6 100644
--- a/www-apps/dragonflycms/ChangeLog
+++ b/www-apps/dragonflycms/ChangeLog
@@ -1,6 +1,34 @@
 # ChangeLog for www-apps/dragonflycms
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dragonflycms/ChangeLog,v 1.1 2005/05/16 14:31:22 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dragonflycms/ChangeLog,v 1.1.1.1 2005/11/30 09:37:03 chriswhite Exp $
+
+  04 Jul 2005; Jochen Maes <sejo@gentoo.org> files/postinstall-en.txt,
+  dragonflycms-9.0.3.0.ebuild, dragonflycms-9.0.4.0.ebuild,
+  dragonflycms-9.0.5.0.ebuild:
+  fixed permissions problems
+
+  03 Jul 2005; Sven Wegener <swegener@gentoo.org>
+  dragonflycms-9.0.3.0.ebuild, dragonflycms-9.0.4.0.ebuild,
+  dragonflycms-9.0.5.0.ebuild:
+  QA: Removed src_unpack because it was the default, exchanged RDEPEND and
+  DEPEND, removed unused digest entries.
+
+*dragonflycms-9.0.5.0 (03 Jul 2005)
+
+  03 Jul 2005; Jochen Maes <sejo@gentoo.org> dragonflycms-9.0.4.0.ebuild,
+  +dragonflycms-9.0.5.0.ebuild:
+  fixed bug in 9.0.4.0 and added 9.0.5.0
+
+*dragonflycms-9.0.4.0 (26 Jun 2005)
+
+  26 Jun 2005; Jochen Maes <sejo@gentoo.org> +dragonflycms-9.0.4.0.ebuild:
+  new version
+
+  25 Jun 2005; Jochen Maes <sejo@gentoo.org> dragonflycms-9.0.3.0.ebuild:
+  marked unstable x86 and changed description
+
+  16 May 2005; Jochen Maes <sejo@gentoo.org> dragonflycms-9.0.3.0.ebuild:
+  added my devspace for the tarball
 
   16 May 2005; Jochen Maes <sejo@gentoo.org> :
   Initial ebuild
diff --git a/www-apps/dragonflycms/Manifest b/www-apps/dragonflycms/Manifest
index 92f868d87382..7495044f02a2 100644
--- a/www-apps/dragonflycms/Manifest
+++ b/www-apps/dragonflycms/Manifest
@@ -1,5 +1,21 @@
-MD5 f072b32ca888a97e10be006a4e097111 ChangeLog 187
-MD5 ed0191aae14b6c7743eb9b27b1e0202f metadata.xml 461
-MD5 bf11beb13a5fce51f3e4e790f0c4f44b dragonflycms-9.0.3.0.ebuild 969
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ede77ca0f059c716b755868e73a180f6 ChangeLog 1272
+MD5 1bbf11c642643230e581cb138f93cb98 dragonflycms-9.0.3.0.ebuild 1524
+MD5 5489d8ebd937cd75db0cb4937d0082b3 dragonflycms-9.0.4.0.ebuild 1477
+MD5 61bf86b88c5802f1960720e2610c42f0 dragonflycms-9.0.5.0.ebuild 1539
+MD5 5ca169fcfd41c2e46f99f51f5967b236 metadata.xml 574
+MD5 4a36804915bb957e5580417773201cc5 dragonflycms-9.0.6.1.ebuild 1537
 MD5 0de8c25d7b281327a6e87009d44c9f20 files/digest-dragonflycms-9.0.3.0 70
-MD5 64a19aed532f6b3b4729c0819b6bfedf files/postinstall-en.txt 196
+MD5 30e21c32d1b9515d3805387218d50fa2 files/digest-dragonflycms-9.0.4.0 70
+MD5 d51ee9843ef583fd547b75e420105250 files/digest-dragonflycms-9.0.5.0 70
+MD5 1d15a225bbe4934b0abc439d9131ee41 files/postinstall-en.txt 826
+MD5 772df86b0bb435027373f5e22676ee11 files/digest-dragonflycms-9.0.6.1 70
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDQmc4MXMsRNMHhmARAgcUAJ42A+7MVvEBoiNJi5nzJ33R1f7G6ACfVDV1
+jHTuiOXB7sCFW/ySeOi70t8=
+=GMMN
+-----END PGP SIGNATURE-----
diff --git a/www-apps/dragonflycms/dragonflycms-9.0.3.0.ebuild b/www-apps/dragonflycms/dragonflycms-9.0.3.0.ebuild
index e2db7687e649..ef0cfb2fceb4 100644
--- a/www-apps/dragonflycms/dragonflycms-9.0.3.0.ebuild
+++ b/www-apps/dragonflycms/dragonflycms-9.0.3.0.ebuild
@@ -1,25 +1,23 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dragonflycms/dragonflycms-9.0.3.0.ebuild,v 1.1 2005/05/16 14:31:22 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dragonflycms/dragonflycms-9.0.3.0.ebuild,v 1.1.1.1 2005/11/30 09:37:03 chriswhite Exp $
 
 inherit webapp
 
 MY_P=Dragonfly${PV}
-DESCRIPTION="DragonFly CMS is an Open Source CMS/Portal in php"
+DESCRIPTION="CPG Dragonfly CMS is a feature-rich open source content management
+system based off of PHP-Nuke 6.5"
 HOMEPAGE="http://dragonflycms.org"
-SRC_URI="mirror://gentoo/$MY_P.tar.bz2"
+SRC_URI="mirror://gentoo/$MY_P.tar.bz2
+http://dev.gentoo.org/~sejo/files/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="~ppc"
+KEYWORDS="~ppc ~x86"
 IUSE=""
 
-DEPEND=">=dev-db/mysql-3.23.32 <dev-db/mysql-5.1
+RDEPEND=">=dev-db/mysql-3.23.32 <dev-db/mysql-5.1
 	 virtual/httpd-php"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-}
+DEPEND=""
 
 src_install() {
 
@@ -46,4 +44,17 @@ src_install() {
 
 	webapp_src_install
 
+	# manually changing the permissions on the directories
+	# if no-suexec then perms should be 777 else 755
+
+	if useq no-suexec; then
+		PERMS=777
+	else
+		PERMS=755
+	fi
+	fperms 600 ${D}/cpg_error.log
+	fperms ${PERMS} ${D}/cache
+	fperms ${PERMS} ${D}/modules/coppermine/albums
+	fperms ${PERMS} ${D}/modules/coppermine/albums/userpics
+	fperms ${PERMS} ${D}/uploads/{avatars,forums}
 }
diff --git a/www-apps/dragonflycms/dragonflycms-9.0.4.0.ebuild b/www-apps/dragonflycms/dragonflycms-9.0.4.0.ebuild
index 61cddd06d50c..25f380861120 100644
--- a/www-apps/dragonflycms/dragonflycms-9.0.4.0.ebuild
+++ b/www-apps/dragonflycms/dragonflycms-9.0.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/www-apps/dragonflycms/dragonflycms-9.0.4.0.ebuild,v 1.1 2005/06/26 06:33:35 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dragonflycms/dragonflycms-9.0.4.0.ebuild,v 1.1.1.1 2005/11/30 09:37:03 chriswhite Exp $
 
 inherit webapp
 
@@ -8,20 +8,15 @@ MY_P=Dragonfly${PV}
 DESCRIPTION="CPG Dragonfly CMS is a feature-rich open source content management
 system based off of PHP-Nuke 6.5"
 HOMEPAGE="http://dragonflycms.org"
-SRC_URI="mirror://gentoo/$MY_P.tar.bz2
-http://dev.gentoo.org/~sejo/files/Dragonfly9.0.3.0.tar.bz2"
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 KEYWORDS="~ppc ~x86"
 IUSE=""
 
-DEPEND=">=dev-db/mysql-3.23.32 <dev-db/mysql-5.1
+RDEPEND=">=dev-db/mysql-3.23.32 <dev-db/mysql-5.1
 	 virtual/httpd-php"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-}
+DEPEND=""
 
 src_install() {
 
@@ -48,4 +43,18 @@ src_install() {
 
 	webapp_src_install
 
+	# manually changing the permissions on the directories
+	# if no-suexec then perms should be 777 else 755
+
+	if useq no-suexec; then
+		PERMS=777
+	else
+		PERMS=755
+	fi
+	fperms 600 ${D}/cpg_error.log
+	fperms ${PERMS} ${D}/cache
+	fperms ${PERMS} ${D}/modules/coppermine/albums
+	fperms ${PERMS} ${D}/modules/coppermine/albums/userpics
+	fperms ${PERMS} ${D}/uploads/{avatars,forums}
+
 }
diff --git a/www-apps/dragonflycms/dragonflycms-9.0.5.0.ebuild b/www-apps/dragonflycms/dragonflycms-9.0.5.0.ebuild
index 1f481f5a6103..6a083b29132f 100644
--- a/www-apps/dragonflycms/dragonflycms-9.0.5.0.ebuild
+++ b/www-apps/dragonflycms/dragonflycms-9.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/www-apps/dragonflycms/dragonflycms-9.0.5.0.ebuild,v 1.1 2005/07/03 06:56:53 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dragonflycms/dragonflycms-9.0.5.0.ebuild,v 1.1.1.1 2005/11/30 09:37:03 chriswhite Exp $
 
 inherit webapp
 
@@ -8,20 +8,16 @@ MY_P=Dragonfly${PV}
 DESCRIPTION="CPG Dragonfly CMS is a feature-rich open source content management
 system based off of PHP-Nuke 6.5"
 HOMEPAGE="http://dragonflycms.org"
-SRC_URI="mirror://gentoo/$MY_P.tar.bz2
-http://dev.gentoo.org/~sejo/files/Dragonfly9.0.5.0.tar.bz2"
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
+http://dev.gentoo.org/~sejo/files/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~arm ~ppc ~s390 ~x86"
 IUSE=""
 
-DEPEND=">=dev-db/mysql-3.23.32 <dev-db/mysql-5.1
+RDEPEND=">=dev-db/mysql-3.23.32 <dev-db/mysql-5.1
 	 virtual/httpd-php"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-}
+DEPEND=""
 
 src_install() {
 
@@ -48,4 +44,17 @@ src_install() {
 
 	webapp_src_install
 
+	# manually changing the permissions on the directories
+	# if no-suexec then perms should be 777 else 755
+
+	if useq no-suexec; then
+		PERMS=777
+	else
+		PERMS=755
+	fi
+	fperms 600 ${D}/cpg_error.log
+	fperms ${PERMS} ${D}/cache
+	fperms ${PERMS} ${D}/modules/coppermine/albums
+	fperms ${PERMS} ${D}/modules/coppermine/albums/userpics
+	fperms ${PERMS} ${D}/uploads/{avatars,forums}
 }
diff --git a/www-apps/dragonflycms/dragonflycms-9.0.6.1.ebuild b/www-apps/dragonflycms/dragonflycms-9.0.6.1.ebuild
index 7d95fcee6da4..ab4386aa32fc 100644
--- a/www-apps/dragonflycms/dragonflycms-9.0.6.1.ebuild
+++ b/www-apps/dragonflycms/dragonflycms-9.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/www-apps/dragonflycms/dragonflycms-9.0.6.1.ebuild,v 1.1 2005/10/04 11:28:07 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dragonflycms/dragonflycms-9.0.6.1.ebuild,v 1.1.1.1 2005/11/30 09:37:03 chriswhite Exp $
 
 inherit webapp
 
diff --git a/www-apps/dragonflycms/files/digest-dragonflycms-9.0.4.0 b/www-apps/dragonflycms/files/digest-dragonflycms-9.0.4.0
index 5a6dfc16004d..f7d8064dcb82 100644
--- a/www-apps/dragonflycms/files/digest-dragonflycms-9.0.4.0
+++ b/www-apps/dragonflycms/files/digest-dragonflycms-9.0.4.0
@@ -1,2 +1 @@
 MD5 c1edc0a8bf536aa44cd2656de0b42846 Dragonfly9.0.4.0.tar.bz2 1373280
-MD5 0440927ff7ef378aa187e5ff61e753e7 Dragonfly9.0.3.0.tar.bz2 1359238
diff --git a/www-apps/dragonflycms/files/postinstall-en.txt b/www-apps/dragonflycms/files/postinstall-en.txt
index a580f4521ce8..4c3cf1837adf 100644
--- a/www-apps/dragonflycms/files/postinstall-en.txt
+++ b/www-apps/dragonflycms/files/postinstall-en.txt
@@ -1,8 +1,24 @@
 To complete your installation, you must
 
-1) add a database to mysql that will contain your DragonFly tables
+1) Create a new database, for example, 'dragonfly': mysqladmin create dragonfly
+   OR add a database through your web control panel.
+   
+2) Edit the file "config.php". Change all the fields until you are happy with
+   the changes and they fit the need of your web site. Give special attention
+   to the database configuration section. When you have finished editing
+   config.php, save it.
+	 
+3) install by going to http://localhost/dragonflycms/install.php
+
+4) IMPORTANT: certain directories have been chmodded 755 if you don't have
+no-suexec in your useflags! if however you don't use suexec please change the
+permissions on following dirs to 777
+	- cache
+	- modules/coppermine/albums
+	- modules/coppermine/albums/userpics
+	- uploads/avatars
+	- uploads/forums
 
-2) install by going to http://localhost/dragonflycms/install.php
 
 Enjoy DragonFly!!!
 
diff --git a/www-apps/dragonflycms/metadata.xml b/www-apps/dragonflycms/metadata.xml
index d6ec37e9ce41..d5d4e4cf3df4 100644
--- a/www-apps/dragonflycms/metadata.xml
+++ b/www-apps/dragonflycms/metadata.xml
@@ -1,16 +1,18 @@
 <?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>sejo@gentoo.org</email>
 <name>Jochen Maes</name>
 </maintainer>
 <longdescription lang="en">
-	DragonFly CMS is an Opensource CMS/portal based on CPG-Nuke.
+	CPG Dragonfly CMS is a feature-rich open source content management system
+	based off of PHP-Nuke 6.5
 </longdescription>
 <longdescription lang="nl">
-	DragonFLy CMS is een Opensource CMS/portaal gebaseerd op CPG-Nuke.
+	CPG Dragonfly CMS is een open source content management system met enorm
+	veel mogelijkheden. Dragonfly is gebaseerd op PHP-Nuke 6.5
 </longdescription>
 </pkgmetadata>
 
diff --git a/www-apps/drraw/ChangeLog b/www-apps/drraw/ChangeLog
index 1f0963594947..a08c0679e570 100644
--- a/www-apps/drraw/ChangeLog
+++ b/www-apps/drraw/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for www-apps/drraw
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drraw/ChangeLog,v 1.1 2004/08/29 10:59:53 rl03 Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drraw/ChangeLog,v 1.1.1.1 2005/11/30 09:36:57 chriswhite Exp $
+
+*drraw-2.1.3 (21 Aug 2005)
+
+  21 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  +drraw-2.1.3.ebuild:
+  Version bump
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> drraw-2.0.1.ebuild:
+  Masked drraw-2.0.1.ebuild stable for ppc
+
+  03 Sep 2004; David Holm <dholm@gentoo.org> drraw-2.0.1.ebuild:
+  Added to ~ppc.
+
+  30 Aug 2004; Renat Lumpau <rl03@gentoo.org> drraw-2.0.1.ebuild:
+  Fixed DEPEND/RDEPEND
 
 *drraw-2.0.1 (29 Aug 2004)
 
diff --git a/www-apps/drraw/Manifest b/www-apps/drraw/Manifest
index dc1b8acd2409..bb3a8950794c 100644
--- a/www-apps/drraw/Manifest
+++ b/www-apps/drraw/Manifest
@@ -1,5 +1,17 @@
-MD5 813ca00059a5c325c09c061dd0f118bf drraw-2.0.1.ebuild 1003
-MD5 03adbbd918aebb62574fe70db67174b2 ChangeLog 293
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3e4e7517e1e6968a7182fa4773f2b1c2 drraw-2.0.1.ebuild 1075
+MD5 0edd1c39cf66fc0134c0e05595fc3515 drraw-2.1.3.ebuild 1163
+MD5 df1319f3fe15d5772e308eb7c0c6141b ChangeLog 812
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
-MD5 9a8ac5bac3a337a6f32ce1ebdeade4b7 files/postinstall-en.txt 34
+MD5 abc92b5fcf332477e7222cb8ad0cc5f7 files/postinstall-en.txt 132
 MD5 be199e53ff4d84bf38e361364b1a6ffe files/digest-drraw-2.0.1 59
+MD5 05a8dbaad6a7d20e615a1d86f5ead134 files/digest-drraw-2.1.3 59
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDCLZVEzitwsaoONoRAqB6AJwPbBLUfzbHufDI+dKPDNI4isb+6QCfcvO5
+Bkc8iifEsGaaEAu2uGUehBM=
+=zFal
+-----END PGP SIGNATURE-----
diff --git a/www-apps/drraw/drraw-2.0.1.ebuild b/www-apps/drraw/drraw-2.0.1.ebuild
index ea56fc2442cf..ca8329d9f139 100644
--- a/www-apps/drraw/drraw-2.0.1.ebuild
+++ b/www-apps/drraw/drraw-2.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/www-apps/drraw/drraw-2.0.1.ebuild,v 1.1 2004/08/29 10:59:53 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drraw/drraw-2.0.1.ebuild,v 1.1.1.1 2005/11/30 09:36:57 chriswhite Exp $
 
 inherit webapp
 
@@ -10,11 +10,9 @@ DESCRIPTION="drraw is a simple web based presentation front-end for RRDtool that
 HOMEPAGE="http://web.taranis.org/drraw"
 SRC_URI="http://web.taranis.org/${PN}/dist/${P}.tgz"
 
-KEYWORDS="~x86"
+KEYWORDS="~x86 ppc"
 
-DEPEND="$DEPEND"
 RDEPEND="
-	${DEPEND}
 	>=dev-lang/perl-5.6
 	>=net-analyzer/rrdtool-1.0.47
 "
diff --git a/www-apps/drraw/drraw-2.1.3.ebuild b/www-apps/drraw/drraw-2.1.3.ebuild
index 76563e9c0024..de8227725917 100644
--- a/www-apps/drraw/drraw-2.1.3.ebuild
+++ b/www-apps/drraw/drraw-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/www-apps/drraw/drraw-2.1.3.ebuild,v 1.1 2005/08/21 17:13:35 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drraw/drraw-2.1.3.ebuild,v 1.1.1.1 2005/11/30 09:36:57 chriswhite Exp $
 
 inherit webapp
 
diff --git a/www-apps/drraw/files/postinstall-en.txt b/www-apps/drraw/files/postinstall-en.txt
index 0d4502023744..346174483263 100644
--- a/www-apps/drraw/files/postinstall-en.txt
+++ b/www-apps/drraw/files/postinstall-en.txt
@@ -1 +1,3 @@
 Now edit ${VHOST_ROOT}/drraw.conf
+You may want to edit the CGI executable in ${VHOST_CGIBINDIR}
+to set the path to the config file.
diff --git a/www-apps/drupal/ChangeLog b/www-apps/drupal/ChangeLog
index 30867cf7728f..c68f212a868d 100644
--- a/www-apps/drupal/ChangeLog
+++ b/www-apps/drupal/ChangeLog
@@ -1,29 +1,55 @@
-# ChangeLog for net-www/drupal
+# ChangeLog for www-apps/drupal
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.1 2005/02/01 02:58:29 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.1.1.1 2005/11/30 09:37:00 chriswhite Exp $
 
-  01 Feb 2005; Lim Swee Tat <st_lim@gentoo.org> +metadata.xml,
-  +files/4.4.2/postinstall-en.txt, +drupal-4.4.2-r1.ebuild,
-  +drupal-4.4.2.ebuild:
-  Moved from net-www/drupal to www-apps/drupal.
+  31 Oct 2005; <soulse@gentoo.org> +files/postinstall-en-4.6.3.txt,
+  drupal-4.6.3.ebuild:
+  * Fixed ebuild as per bug #109482
+  * Fixed post-install text
 
-  04 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
-  drupal-4.4.2-r1.ebuild, drupal-4.4.2.ebuild:
-  Masked drupal-4.4.2.ebuild stable for ppc
+*drupal-4.6.3 (05 Sep 2005)
 
-*drupal-4.4.2-r1 (04 Sep 2004)
+  05 Sep 2005; Lim Swee Tat <st_lim@gentoo.org> files/4.6.0/engines,
+  files/4.6.0/language, files/4.6.0/modules, files/4.6.0/themes,
+  +drupal-4.6.3.ebuild:
+  Version bumped to 4.6.3
 
-  04 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
-  drupal-4.4.2-r1.ebuild:
-  Masked drupal-4.4.2-r1.ebuild stable for ppc
+  04 Aug 2005; Lim Swee Tat <st_lim@gentoo.org> drupal-4.5.2.ebuild,
+  drupal-4.6.2.ebuild:
+  Added ~amd64
 
-  16 Jul 2004; David Holm <dholm@gentoo.org> drupal-4.4.2.ebuild:
-  Added to ~ppc.
+  04 Aug 2005; Lim Swee Tat <st_lim@gentoo.org> drupal-4.6.2.ebuild:
+  Updated drupal hopefully that fixes bugs #100219, #100077, #98485, #98524
 
-*drupal-4.4.2 (11 Jul 2004)
+  14 Jul 2005; Stuart Herbert <stuart@gentoo.org> drupal-4.6.2.ebuild:
+  Removed calls to deprecated webapp_runbycgibin function; fixes bug 98484
 
-  11 Jul 2004; Stuart Herbert <stuart@gentoo.org> +metadata.xml,
-  +files/4.4.2/postinstall-en.txt, +drupal-4.4.2.ebuild:
-  Initial import; from bug #25423; thanks to Al Maw <gentoo@almaw.com> and Peter
-  Westwood <peter.westwood@ftwr.co.uk>
+*drupal-4.6.2 (05 Jul 2005)
+
+  05 Jul 2005; Lim Swee Tat <st_lim@gentoo.org> files/4.6.0/modules,
+  files/4.6.0/themes, +drupal-4.6.2.ebuild:
+  Bumped version
+
+  16 Jun 2005; Luca Barbato <lu_zero@gentoo.org> drupal-4.6.1.ebuild:
+  Marked ~ppc
+
+  16 Jun 2005; Fernando J. Pereda <ferdy@gentoo.org> drupal-4.6.1.ebuild:
+  keyworded ~alpha. wrt keywording policy and bug #94927
+
+*drupal-4.6.1 (16 Jun 2005)
+
+  16 Jun 2005; Lim Swee Tat <st_lim@gentoo.org> files/4.6.0/language,
+  files/4.6.0/modules, files/4.6.0/themes, +drupal-4.6.1.ebuild:
+  Version bump.  There was a security flaw.
+
+  05 May 2005; Lim Swee Tat <st_lim@gentoo.org> +files/4.6.0/engines,
+  +files/4.6.0/language, +files/4.6.0/modules, +files/4.6.0/themes,
+  drupal-4.6.0.ebuild:
+  Devised new method of getting the modules themes and others
+
+  02 May 2005; Lim Swee Tat <st_lim@gentoo.org> drupal-4.6.0.ebuild:
+  Updated modules to today's list
+
+  27 Apr 2005; Jose Luis Rivero <yoswink@gentoo.org> drupal-4.5.2.ebuild:
+  keyworded ~alpha
 
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index d6badba28f53..6e935211b458 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,7 +1,14 @@
-MD5 ff60b15d01637e3c18af4a65314c3586 ChangeLog 875
-MD5 1768b0472621e7c028a2d48c225f57fa drupal-4.4.2-r1.ebuild 7270
-MD5 c1878a84b579e5daaf6341d232b315a8 drupal-4.4.2.ebuild 2013
-MD5 88b2c84c1b3552228d711637cb7d9269 metadata.xml 274
-MD5 81d4a3470011f2ae831be4604c756895 files/digest-drupal-4.4.2 61
-MD5 27569f69aadd4b46d4940b41bb93c5c8 files/digest-drupal-4.4.2-r1 5597
-MD5 0f20a567ce1310d62af69bd56921cea3 files/4.4.2/postinstall-en.txt 2595
+MD5 7bbf157ae899186eab4e55fe64429b39 ChangeLog 1983
+MD5 e4f9cbc61147e254fac7a43c679cc943 drupal-4.5.2.ebuild 30641
+MD5 e82b6e40e3e223403bb373c04d346d72 drupal-4.6.2.ebuild 3757
+MD5 c33f1bf60abf50566e003ed060542ae4 drupal-4.6.3.ebuild 3763
+MD5 7f7293c73bc101820993496a98f5d4fe files/4.6.0/engines 28
+MD5 507fcec40f954b5af6ceab22a0676c5d files/4.6.0/language 130
+MD5 16b758714ff6fe1fcc744d02d952c2b5 files/4.6.0/modules 2080
+MD5 4638c8007177182e9a8acf02f7cdd681 files/4.6.0/themes 278
+MD5 6b1fbcd29d9526434338ea3f8b61e5c0 files/digest-drupal-4.5.2 64
+MD5 3696ea6a2d2569722c9feebb2c9a7093 files/digest-drupal-4.6.2 64
+MD5 35efbdccb8fc0c5155a69dff4283ce9b files/digest-drupal-4.6.3 64
+MD5 1be3dc7c7bfe18ac669d422297723067 files/postinstall-en-4.6.3.txt 2604
+MD5 0f20a567ce1310d62af69bd56921cea3 files/postinstall-en.txt 2595
+MD5 31a7762b97d644514268dab18f853a27 metadata.xml 274
diff --git a/www-apps/drupal/drupal-4.5.2.ebuild b/www-apps/drupal/drupal-4.5.2.ebuild
index 20ca3a3ddfa6..38722101703f 100644
--- a/www-apps/drupal/drupal-4.5.2.ebuild
+++ b/www-apps/drupal/drupal-4.5.2.ebuild
@@ -1,270 +1,654 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-4.5.2.ebuild,v 1.1 2005/02/01 03:12:16 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-4.5.2.ebuild,v 1.1.1.1 2005/11/30 09:37:01 chriswhite Exp $
 
 inherit webapp eutils
 
 DESCRIPTION="Drupal is a PHP-based open-source platform and content management system for building dynamic web sites offering a broad range of features and services; including user administration, publishing workflow, discussion capabilities, news aggregation, metadata functionalities using controlled vocabularies and XML publishing for content sharing purposes. Equipped with a powerful blend of features and configurability, Drupal can support a diverse range of web projects ranging from personal weblogs to large community-driven sites."
 HOMEPAGE="http://drupal.org"
-IUSE="$IUSE minimal"
+IUSE="minimal"
 MOD_PV="4.5.0"
-S="${WORKDIR}/${P}"
-
-SRC_URI="http://drupal.org/files/projects/${P}.tar.gz
-	!minimal? ( http://drupal.org/files/projects/affiliate-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/api-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/article-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/atom-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/attached_node-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/attachment-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/automember-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/banner-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/bbcode-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/bookmarks-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/buddylist-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/captcha-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/chatbox-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/codefilter-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/collimator-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/commentcloser-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/contextlinks-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/csvfilter-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/postcount_rank-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/daily-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/dba-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/dkosfilter-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/ecommerce-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/event-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/feature-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/feedback-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/filemanager-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/filestore2-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/flexinode-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/foaf-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/forms-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/form_mail-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/fscache-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/glossary-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/htmlarea-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/htmlcorrector-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/htmltidy-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/image-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/image_filter-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/img_assist-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/inline-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/im-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/jsdomenu-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/listhandler-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/mail-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/mailalias-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/mailhandler-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/marksmarty-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/members-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/mypage-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/news_page-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/nmoderation-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/node_privacy_byrole-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/typecat-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/node_import-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/notify-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/optin-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/og-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/over_text-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/paypal_framework-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/paypal_tipjar-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/periodical-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/poormanscron-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/postcard-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/print-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/privatemsg-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/quickpost-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/quote-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/quotes-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/recipe-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/relatedlinks-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/role_to_file-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/scheduler-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/simpletest-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/site_map-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/smileys-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/spam-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/subscriptions-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/summary-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/survey-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/sxip-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/syndication-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/taxonomy_access-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/taxonomy_browser-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/taxonomy_context-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/taxonomy_dhtml-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/taxonomy_html-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/taxonomy_image-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/taxonomy_menu-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/term_statistics-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/textile-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/themedev-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/title-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/trackback-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/translation-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/trip_search-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/urlfilter-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/userposts-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/validation-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/variable-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/weather-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/webform-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/weblink-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/webserver_auth-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/workspace-${MOD_PV}.tar.gz
-
-				http://drupal.org/files/projects/adc-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/box_grey_smarty-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/box_grey-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/goofy-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/interlaced-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/kubrick-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/marvin_2k_phptemplate-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/persian-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/sunflower-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/phptemplate-${MOD_PV}.tar.gz
-				http://drupal.org/files/projects/smarty-${MOD_PV}.tar.gz
-				
-				http://drupal.org/files/projects/zh-hans-${MOD_PV}.tar.gz
-				)"
 
+SRC_URI="http://drupal.org/files/projects/${P}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~alpha ~amd64"
 
 DEPEND="virtual/php"
 
 src_unpack() {
-	cd ${WORKDIR}
-	tar xfz ${DISTDIR}/${P}.tar.gz
+	unpack ${P}.tar.gz
 
-	cd ${S}/modules
-	tar xfz  ${DISTDIR}/affiliate-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/api-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/article-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/atom-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/attached_node-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/attachment-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/automember-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/banner-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/bbcode-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/bookmarks-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/buddylist-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/captcha-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/chatbox-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/codefilter-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/collimator-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/commentcloser-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/contextlinks-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/csvfilter-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/postcount_rank-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/daily-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/dba-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/dkosfilter-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/ecommerce-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/event-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/feature-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/feedback-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/filemanager-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/filestore2-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/flexinode-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/foaf-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/forms-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/form_mail-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/fscache-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/glossary-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/htmlarea-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/htmlcorrector-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/htmltidy-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/image-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/image_filter-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/img_assist-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/inline-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/im-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/jsdomenu-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/listhandler-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/mail-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/mailalias-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/mailhandler-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/marksmarty-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/members-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/mypage-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/news_page-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/nmoderation-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/node_privacy_byrole-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/typecat-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/node_import-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/notify-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/optin-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/og-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/over_text-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/paypal_framework-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/paypal_tipjar-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/periodical-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/poormanscron-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/postcard-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/print-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/privatemsg-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/quickpost-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/quote-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/quotes-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/recipe-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/relatedlinks-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/role_to_file-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/scheduler-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/simpletest-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/site_map-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/smileys-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/spam-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/subscriptions-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/summary-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/survey-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/sxip-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/syndication-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/taxonomy_access-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/taxonomy_browser-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/taxonomy_context-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/taxonomy_dhtml-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/taxonomy_html-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/taxonomy_image-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/taxonomy_menu-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/term_statistics-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/textile-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/themedev-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/title-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/trackback-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/translation-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/trip_search-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/urlfilter-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/userposts-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/validation-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/variable-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/weather-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/webform-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/weblink-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/webserver_auth-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/workspace-${MOD_PV}.tar.gz
+	if ! use minimal ; then
+		cd ${S}/modules
+		einfo "Unpacking affiliate"
+		wget http://www.drupal.org/files/projects/affiliate-${MOD_PV}.tar.gz
+		tar xfz affiliate-${MOD_PV}.tar.gz
+		einfo "Unpacking album"
+		wget http://www.drupal.org/files/projects/album-${MOD_PV}.tar.gz
+		tar xfz album-${MOD_PV}.tar.gz
+		einfo "Unpacking amazon_items"
+		wget http://www.drupal.org/files/projects/amazon_items-${MOD_PV}.tar.gz
+		tar xfz amazon_items-${MOD_PV}.tar.gz
+		einfo "Unpacking amazonsearch"
+		wget http://www.drupal.org/files/projects/amazonsearch-${MOD_PV}.tar.gz
+		tar xfz amazonsearch-${MOD_PV}.tar.gz
+		einfo "Unpacking api"
+		wget http://www.drupal.org/files/projects/api-${MOD_PV}.tar.gz
+		tar xfz api-${MOD_PV}.tar.gz
+		einfo "Unpacking article"
+		wget http://www.drupal.org/files/projects/article-${MOD_PV}.tar.gz
+		tar xfz article-${MOD_PV}.tar.gz
+		einfo "Unpacking atom"
+		wget http://www.drupal.org/files/projects/atom-${MOD_PV}.tar.gz
+		tar xfz atom-${MOD_PV}.tar.gz
+		einfo "Unpacking attached_node"
+		wget http://www.drupal.org/files/projects/attached_node-${MOD_PV}.tar.gz
+		tar xfz attached_node-${MOD_PV}.tar.gz
+		einfo "Unpacking attachment"
+		wget http://www.drupal.org/files/projects/attachment-${MOD_PV}.tar.gz
+		tar xfz attachment-${MOD_PV}.tar.gz
+		einfo "Unpacking automember"
+		wget http://www.drupal.org/files/projects/automember-${MOD_PV}.tar.gz
+		tar xfz automember-${MOD_PV}.tar.gz
+		einfo "Unpacking banner"
+		wget http://www.drupal.org/files/projects/banner-${MOD_PV}.tar.gz
+		tar xfz banner-${MOD_PV}.tar.gz
+		einfo "Unpacking bbcode"
+		wget http://www.drupal.org/files/projects/bbcode-${MOD_PV}.tar.gz
+		tar xfz bbcode-${MOD_PV}.tar.gz
+		einfo "Unpacking blogroll"
+		wget http://www.drupal.org/files/projects/blogroll-${MOD_PV}.tar.gz
+		tar xfz blogroll-${MOD_PV}.tar.gz
+		einfo "Unpacking bookreview"
+		wget http://www.drupal.org/files/projects/bookreview-${MOD_PV}.tar.gz
+		tar xfz bookreview-${MOD_PV}.tar.gz
+		einfo "Unpacking bookmarks"
+		wget http://www.drupal.org/files/projects/bookmarks-${MOD_PV}.tar.gz
+		tar xfz bookmarks-${MOD_PV}.tar.gz
+		einfo "Unpacking buddylist"
+		wget http://www.drupal.org/files/projects/buddylist-${MOD_PV}.tar.gz
+		tar xfz buddylist-${MOD_PV}.tar.gz
+		einfo "Unpacking captcha"
+		wget http://www.drupal.org/files/projects/captcha-${MOD_PV}.tar.gz
+		tar xfz captcha-${MOD_PV}.tar.gz
+		einfo "Unpacking challenge_response"
+		wget http://www.drupal.org/files/projects/challenge_response-${MOD_PV}.tar.gz
+		tar xfz challenge_response-${MOD_PV}.tar.gz
+		einfo "Unpacking chatbox"
+		wget http://www.drupal.org/files/projects/chatbox-${MOD_PV}.tar.gz
+		tar xfz chatbox-${MOD_PV}.tar.gz
+		einfo "Unpacking codefilter"
+		wget http://www.drupal.org/files/projects/codefilter-${MOD_PV}.tar.gz
+		tar xfz codefilter-${MOD_PV}.tar.gz
+		einfo "Unpacking collimator"
+		wget http://www.drupal.org/files/projects/collimator-${MOD_PV}.tar.gz
+		tar xfz collimator-${MOD_PV}.tar.gz
+		einfo "Unpacking commentcloser"
+		wget http://www.drupal.org/files/projects/commentcloser-${MOD_PV}.tar.gz
+		tar xfz commentcloser-${MOD_PV}.tar.gz
+		einfo "Unpacking commentrss"
+		wget http://www.drupal.org/files/projects/commentrss-${MOD_PV}.tar.gz
+		tar xfz commentrss-${MOD_PV}.tar.gz
+		einfo "Unpacking contact_dir"
+		wget http://www.drupal.org/files/projects/contact_dir-${MOD_PV}.tar.gz
+		tar xfz contact_dir-${MOD_PV}.tar.gz
+		einfo "Unpacking contextlinks"
+		wget http://www.drupal.org/files/projects/contextlinks-${MOD_PV}.tar.gz
+		tar xfz contextlinks-${MOD_PV}.tar.gz
+		einfo "Unpacking copyright"
+		wget http://www.drupal.org/files/projects/copyright-${MOD_PV}.tar.gz
+		tar xfz copyright-${MOD_PV}.tar.gz
+		einfo "Unpacking creativecommons"
+		wget http://www.drupal.org/files/projects/creativecommons-${MOD_PV}.tar.gz
+		tar xfz creativecommons-${MOD_PV}.tar.gz
+		einfo "Unpacking csvfilter"
+		wget http://www.drupal.org/files/projects/csvfilter-${MOD_PV}.tar.gz
+		tar xfz csvfilter-${MOD_PV}.tar.gz
+		einfo "Unpacking postcount_rank"
+		wget http://www.drupal.org/files/projects/postcount_rank-${MOD_PV}.tar.gz
+		tar xfz postcount_rank-${MOD_PV}.tar.gz
+		einfo "Unpacking customerror"
+		wget http://www.drupal.org/files/projects/customerror-${MOD_PV}.tar.gz
+		tar xfz customerror-${MOD_PV}.tar.gz
+		einfo "Unpacking daily"
+		wget http://www.drupal.org/files/projects/daily-${MOD_PV}.tar.gz
+		tar xfz daily-${MOD_PV}.tar.gz
+		einfo "Unpacking dba"
+		wget http://www.drupal.org/files/projects/dba-${MOD_PV}.tar.gz
+		tar xfz dba-${MOD_PV}.tar.gz
+		einfo "Unpacking distantparent"
+		wget http://www.drupal.org/files/projects/distantparent-${MOD_PV}.tar.gz
+		tar xfz distantparent-${MOD_PV}.tar.gz
+		einfo "Unpacking donations"
+		wget http://www.drupal.org/files/projects/donations-${MOD_PV}.tar.gz
+		tar xfz donations-${MOD_PV}.tar.gz
+		einfo "Unpacking ecommerce"
+		wget http://www.drupal.org/files/projects/ecommerce-${MOD_PV}.tar.gz
+		tar xfz ecommerce-${MOD_PV}.tar.gz
+		einfo "Unpacking editasnew"
+		wget http://www.drupal.org/files/projects/editasnew-${MOD_PV}.tar.gz
+		tar xfz editasnew-${MOD_PV}.tar.gz
+		einfo "Unpacking event"
+		wget http://www.drupal.org/files/projects/event-${MOD_PV}.tar.gz
+		tar xfz event-${MOD_PV}.tar.gz
+		einfo "Unpacking excerpt"
+		wget http://www.drupal.org/files/projects/excerpt-${MOD_PV}.tar.gz
+		tar xfz excerpt-${MOD_PV}.tar.gz
+		einfo "Unpacking ezmlm"
+		wget http://www.drupal.org/files/projects/ezmlm-${MOD_PV}.tar.gz
+		tar xfz ezmlm-${MOD_PV}.tar.gz
+		einfo "Unpacking fckeditor"
+		wget http://www.drupal.org/files/projects/fckeditor-${MOD_PV}.tar.gz
+		tar xfz fckeditor-${MOD_PV}.tar.gz
+		einfo "Unpacking feature"
+		wget http://www.drupal.org/files/projects/feature-${MOD_PV}.tar.gz
+		tar xfz feature-${MOD_PV}.tar.gz
+		einfo "Unpacking feedback"
+		wget http://www.drupal.org/files/projects/feedback-${MOD_PV}.tar.gz
+		tar xfz feedback-${MOD_PV}.tar.gz
+		einfo "Unpacking filebrowser"
+		wget http://www.drupal.org/files/projects/filebrowser-${MOD_PV}.tar.gz
+		tar xfz filebrowser-${MOD_PV}.tar.gz
+		einfo "Unpacking filemanager"
+		wget http://www.drupal.org/files/projects/filemanager-${MOD_PV}.tar.gz
+		tar xfz filemanager-${MOD_PV}.tar.gz
+		einfo "Unpacking filestore2"
+		wget http://www.drupal.org/files/projects/filestore2-${MOD_PV}.tar.gz
+		tar xfz filestore2-${MOD_PV}.tar.gz
+		einfo "Unpacking flexinode"
+		wget http://www.drupal.org/files/projects/flexinode-${MOD_PV}.tar.gz
+		tar xfz flexinode-${MOD_PV}.tar.gz
+		einfo "Unpacking foaf"
+		wget http://www.drupal.org/files/projects/foaf-${MOD_PV}.tar.gz
+		tar xfz foaf-${MOD_PV}.tar.gz
+		einfo "Unpacking folksonomy"
+		wget http://www.drupal.org/files/projects/folksonomy-${MOD_PV}.tar.gz
+		tar xfz folksonomy-${MOD_PV}.tar.gz
+		einfo "Unpacking fontsize"
+		wget http://www.drupal.org/files/projects/fontsize-${MOD_PV}.tar.gz
+		tar xfz fontsize-${MOD_PV}.tar.gz
+		einfo "Unpacking forms"
+		wget http://www.drupal.org/files/projects/forms-${MOD_PV}.tar.gz
+		tar xfz forms-${MOD_PV}.tar.gz
+		einfo "Unpacking form_mail"
+		wget http://www.drupal.org/files/projects/form_mail-${MOD_PV}.tar.gz
+		tar xfz form_mail-${MOD_PV}.tar.gz
+		einfo "Unpacking front"
+		wget http://www.drupal.org/files/projects/front-${MOD_PV}.tar.gz
+		tar xfz front-${MOD_PV}.tar.gz
+		einfo "Unpacking fscache"
+		wget http://www.drupal.org/files/projects/fscache-${MOD_PV}.tar.gz
+		tar xfz fscache-${MOD_PV}.tar.gz
+		einfo "Unpacking glossary"
+		wget http://www.drupal.org/files/projects/glossary-${MOD_PV}.tar.gz
+		tar xfz glossary-${MOD_PV}.tar.gz
+		einfo "Unpacking guestbook"
+		wget http://www.drupal.org/files/projects/guestbook-${MOD_PV}.tar.gz
+		tar xfz guestbook-${MOD_PV}.tar.gz
+		einfo "Unpacking helpedit"
+		wget http://www.drupal.org/files/projects/helpedit-${MOD_PV}.tar.gz
+		tar xfz helpedit-${MOD_PV}.tar.gz
+		einfo "Unpacking htmlcorrector"
+		wget http://www.drupal.org/files/projects/htmlcorrector-${MOD_PV}.tar.gz
+		tar xfz htmlcorrector-${MOD_PV}.tar.gz
+		einfo "Unpacking htmlarea"
+		wget http://www.drupal.org/files/projects/htmlarea-${MOD_PV}.tar.gz
+		tar xfz htmlarea-${MOD_PV}.tar.gz
+		einfo "Unpacking htmltidy"
+		wget http://www.drupal.org/files/projects/htmltidy-${MOD_PV}.tar.gz
+		tar xfz htmltidy-${MOD_PV}.tar.gz
+		einfo "Unpacking image"
+		wget http://www.drupal.org/files/projects/image-${MOD_PV}.tar.gz
+		tar xfz image-${MOD_PV}.tar.gz
+		einfo "Unpacking image_filter"
+		wget http://www.drupal.org/files/projects/image_filter-${MOD_PV}.tar.gz
+		tar xfz image_filter-${MOD_PV}.tar.gz
+		einfo "Unpacking img_assist"
+		wget http://www.drupal.org/files/projects/img_assist-${MOD_PV}.tar.gz
+		tar xfz img_assist-${MOD_PV}.tar.gz
+		einfo "Unpacking inline"
+		wget http://www.drupal.org/files/projects/inline-${MOD_PV}.tar.gz
+		tar xfz inline-${MOD_PV}.tar.gz
+		einfo "Unpacking im"
+		wget http://www.drupal.org/files/projects/im-${MOD_PV}.tar.gz
+		tar xfz im-${MOD_PV}.tar.gz
+		einfo "Unpacking i18n"
+		wget http://www.drupal.org/files/projects/i18n-${MOD_PV}.tar.gz
+		tar xfz i18n-${MOD_PV}.tar.gz
+		einfo "Unpacking interwiki"
+		wget http://www.drupal.org/files/projects/interwiki-${MOD_PV}.tar.gz
+		tar xfz interwiki-${MOD_PV}.tar.gz
+		einfo "Unpacking jsdomenu"
+		wget http://www.drupal.org/files/projects/jsdomenu-${MOD_PV}.tar.gz
+		tar xfz jsdomenu-${MOD_PV}.tar.gz
+		einfo "Unpacking ldap_integration"
+		wget http://www.drupal.org/files/projects/ldap_integration-${MOD_PV}.tar.gz
+		tar xfz ldap_integration-${MOD_PV}.tar.gz
+		einfo "Unpacking legal"
+		wget http://www.drupal.org/files/projects/legal-${MOD_PV}.tar.gz
+		tar xfz legal-${MOD_PV}.tar.gz
+		einfo "Unpacking listhandler"
+		wget http://www.drupal.org/files/projects/listhandler-${MOD_PV}.tar.gz
+		tar xfz listhandler-${MOD_PV}.tar.gz
+		einfo "Unpacking livediscussions"
+		wget http://www.drupal.org/files/projects/livediscussions-${MOD_PV}.tar.gz
+		tar xfz livediscussions-${MOD_PV}.tar.gz
+		einfo "Unpacking livejournal"
+		wget http://www.drupal.org/files/projects/livejournal-${MOD_PV}.tar.gz
+		tar xfz livejournal-${MOD_PV}.tar.gz
+		einfo "Unpacking mail"
+		wget http://www.drupal.org/files/projects/mail-${MOD_PV}.tar.gz
+		tar xfz mail-${MOD_PV}.tar.gz
+		einfo "Unpacking mailalias"
+		wget http://www.drupal.org/files/projects/mailalias-${MOD_PV}.tar.gz
+		tar xfz mailalias-${MOD_PV}.tar.gz
+		einfo "Unpacking mailhandler"
+		wget http://www.drupal.org/files/projects/mailhandler-${MOD_PV}.tar.gz
+		tar xfz mailhandler-${MOD_PV}.tar.gz
+		einfo "Unpacking marksmarty"
+		wget http://www.drupal.org/files/projects/marksmarty-${MOD_PV}.tar.gz
+		tar xfz marksmarty-${MOD_PV}.tar.gz
+		einfo "Unpacking massmailer"
+		wget http://www.drupal.org/files/projects/massmailer-${MOD_PV}.tar.gz
+		tar xfz massmailer-${MOD_PV}.tar.gz
+		einfo "Unpacking members"
+		wget http://www.drupal.org/files/projects/members-${MOD_PV}.tar.gz
+		tar xfz members-${MOD_PV}.tar.gz
+		einfo "Unpacking menu_otf"
+		wget http://www.drupal.org/files/projects/menu_otf-${MOD_PV}.tar.gz
+		tar xfz menu_otf-${MOD_PV}.tar.gz
+		einfo "Unpacking mypage"
+		wget http://www.drupal.org/files/projects/mypage-${MOD_PV}.tar.gz
+		tar xfz mypage-${MOD_PV}.tar.gz
+		einfo "Unpacking news_page"
+		wget http://www.drupal.org/files/projects/news_page-${MOD_PV}.tar.gz
+		tar xfz news_page-${MOD_PV}.tar.gz
+		einfo "Unpacking nicelinks"
+		wget http://www.drupal.org/files/projects/nicelinks-${MOD_PV}.tar.gz
+		tar xfz nicelinks-${MOD_PV}.tar.gz
+		einfo "Unpacking nodewords"
+		wget http://www.drupal.org/files/projects/nodewords-${MOD_PV}.tar.gz
+		tar xfz nodewords-${MOD_PV}.tar.gz
+		einfo "Unpacking nmoderation"
+		wget http://www.drupal.org/files/projects/nmoderation-${MOD_PV}.tar.gz
+		tar xfz nmoderation-${MOD_PV}.tar.gz
+		einfo "Unpacking node_privacy_byrole"
+		wget http://www.drupal.org/files/projects/node_privacy_byrole-${MOD_PV}.tar.gz
+		tar xfz node_privacy_byrole-${MOD_PV}.tar.gz
+		einfo "Unpacking relativity"
+		wget http://www.drupal.org/files/projects/relativity-${MOD_PV}.tar.gz
+		tar xfz relativity-${MOD_PV}.tar.gz
+		einfo "Unpacking typecat"
+		wget http://www.drupal.org/files/projects/typecat-${MOD_PV}.tar.gz
+		tar xfz typecat-${MOD_PV}.tar.gz
+		einfo "Unpacking node_import"
+		wget http://www.drupal.org/files/projects/node_import-${MOD_PV}.tar.gz
+		tar xfz node_import-${MOD_PV}.tar.gz
+		einfo "Unpacking notify"
+		wget http://www.drupal.org/files/projects/notify-${MOD_PV}.tar.gz
+		tar xfz notify-${MOD_PV}.tar.gz
+		einfo "Unpacking optin"
+		wget http://www.drupal.org/files/projects/optin-${MOD_PV}.tar.gz
+		tar xfz optin-${MOD_PV}.tar.gz
+		einfo "Unpacking og"
+		wget http://www.drupal.org/files/projects/og-${MOD_PV}.tar.gz
+		tar xfz og-${MOD_PV}.tar.gz
+		einfo "Unpacking over_text"
+		wget http://www.drupal.org/files/projects/over_text-${MOD_PV}.tar.gz
+		tar xfz over_text-${MOD_PV}.tar.gz
+		einfo "Unpacking pathauto"
+		wget http://www.drupal.org/files/projects/pathauto-${MOD_PV}.tar.gz
+		tar xfz pathauto-${MOD_PV}.tar.gz
+		einfo "Unpacking paypal_framework"
+		wget http://www.drupal.org/files/projects/paypal_framework-${MOD_PV}.tar.gz
+		tar xfz paypal_framework-${MOD_PV}.tar.gz
+		einfo "Unpacking paypal_subscription"
+		wget http://www.drupal.org/files/projects/paypal_subscription-${MOD_PV}.tar.gz
+		tar xfz paypal_subscription-${MOD_PV}.tar.gz
+		einfo "Unpacking paypal_tipjar"
+		wget http://www.drupal.org/files/projects/paypal_tipjar-${MOD_PV}.tar.gz
+		tar xfz paypal_tipjar-${MOD_PV}.tar.gz
+		einfo "Unpacking pdfview"
+		wget http://www.drupal.org/files/projects/pdfview-${MOD_PV}.tar.gz
+		tar xfz pdfview-${MOD_PV}.tar.gz
+		einfo "Unpacking peoplesemailnetwork"
+		wget http://www.drupal.org/files/projects/peoplesemailnetwork-${MOD_PV}.tar.gz
+		tar xfz peoplesemailnetwork-${MOD_PV}.tar.gz
+		einfo "Unpacking periodical"
+		wget http://www.drupal.org/files/projects/periodical-${MOD_PV}.tar.gz
+		tar xfz periodical-${MOD_PV}.tar.gz
+		einfo "Unpacking poormanscron"
+		wget http://www.drupal.org/files/projects/poormanscron-${MOD_PV}.tar.gz
+		tar xfz poormanscron-${MOD_PV}.tar.gz
+		einfo "Unpacking postcard"
+		wget http://www.drupal.org/files/projects/postcard-${MOD_PV}.tar.gz
+		tar xfz postcard-${MOD_PV}.tar.gz
+		einfo "Unpacking powells"
+		wget http://www.drupal.org/files/projects/powells-${MOD_PV}.tar.gz
+		tar xfz powells-${MOD_PV}.tar.gz
+		einfo "Unpacking print"
+		wget http://www.drupal.org/files/projects/print-${MOD_PV}.tar.gz
+		tar xfz print-${MOD_PV}.tar.gz
+		einfo "Unpacking privatemsg"
+		wget http://www.drupal.org/files/projects/privatemsg-${MOD_PV}.tar.gz
+		tar xfz privatemsg-${MOD_PV}.tar.gz
+		einfo "Unpacking project"
+		wget http://www.drupal.org/files/projects/project-${MOD_PV}.tar.gz
+		tar xfz project-${MOD_PV}.tar.gz
+		einfo "Unpacking pureftp"
+		wget http://www.drupal.org/files/projects/pureftp-${MOD_PV}.tar.gz
+		tar xfz pureftp-${MOD_PV}.tar.gz
+		einfo "Unpacking quickpost"
+		wget http://www.drupal.org/files/projects/quickpost-${MOD_PV}.tar.gz
+		tar xfz quickpost-${MOD_PV}.tar.gz
+		einfo "Unpacking quicktags"
+		wget http://www.drupal.org/files/projects/quicktags-${MOD_PV}.tar.gz
+		tar xfz quicktags-${MOD_PV}.tar.gz
+		einfo "Unpacking quote"
+		wget http://www.drupal.org/files/projects/quote-${MOD_PV}.tar.gz
+		tar xfz quote-${MOD_PV}.tar.gz
+		einfo "Unpacking quotes"
+		wget http://www.drupal.org/files/projects/quotes-${MOD_PV}.tar.gz
+		tar xfz quotes-${MOD_PV}.tar.gz
+		einfo "Unpacking recipe"
+		wget http://www.drupal.org/files/projects/recipe-${MOD_PV}.tar.gz
+		tar xfz recipe-${MOD_PV}.tar.gz
+		einfo "Unpacking relatedlinks"
+		wget http://www.drupal.org/files/projects/relatedlinks-${MOD_PV}.tar.gz
+		tar xfz relatedlinks-${MOD_PV}.tar.gz
+		einfo "Unpacking remindme"
+		wget http://www.drupal.org/files/projects/remindme-${MOD_PV}.tar.gz
+		tar xfz remindme-${MOD_PV}.tar.gz
+		einfo "Unpacking role_to_file"
+		wget http://www.drupal.org/files/projects/role_to_file-${MOD_PV}.tar.gz
+		tar xfz role_to_file-${MOD_PV}.tar.gz
+		einfo "Unpacking rsvp"
+		wget http://www.drupal.org/files/projects/rsvp-${MOD_PV}.tar.gz
+		tar xfz rsvp-${MOD_PV}.tar.gz
+		einfo "Unpacking scheduler"
+		wget http://www.drupal.org/files/projects/scheduler-${MOD_PV}.tar.gz
+		tar xfz scheduler-${MOD_PV}.tar.gz
+		einfo "Unpacking series"
+		wget http://www.drupal.org/files/projects/series-${MOD_PV}.tar.gz
+		tar xfz series-${MOD_PV}.tar.gz
+		einfo "Unpacking sidecontent"
+		wget http://www.drupal.org/files/projects/sidecontent-${MOD_PV}.tar.gz
+		tar xfz sidecontent-${MOD_PV}.tar.gz
+		einfo "Unpacking simpletest"
+		wget http://www.drupal.org/files/projects/simpletest-${MOD_PV}.tar.gz
+		tar xfz simpletest-${MOD_PV}.tar.gz
+		einfo "Unpacking site_map"
+		wget http://www.drupal.org/files/projects/site_map-${MOD_PV}.tar.gz
+		tar xfz site_map-${MOD_PV}.tar.gz
+		einfo "Unpacking sitemenu"
+		wget http://www.drupal.org/files/projects/sitemenu-${MOD_PV}.tar.gz
+		tar xfz sitemenu-${MOD_PV}.tar.gz
+		einfo "Unpacking smartypants"
+		wget http://www.drupal.org/files/projects/smartypants-${MOD_PV}.tar.gz
+		tar xfz smartypants-${MOD_PV}.tar.gz
+		einfo "Unpacking smileys"
+		wget http://www.drupal.org/files/projects/smileys-${MOD_PV}.tar.gz
+		tar xfz smileys-${MOD_PV}.tar.gz
+		einfo "Unpacking spam"
+		wget http://www.drupal.org/files/projects/spam-${MOD_PV}.tar.gz
+		tar xfz spam-${MOD_PV}.tar.gz
+		einfo "Unpacking statistics_filter"
+		wget http://www.drupal.org/files/projects/statistics_filter-${MOD_PV}.tar.gz
+		tar xfz statistics_filter-${MOD_PV}.tar.gz
+		einfo "Unpacking stock"
+		wget http://www.drupal.org/files/projects/stock-${MOD_PV}.tar.gz
+		tar xfz stock-${MOD_PV}.tar.gz
+		einfo "Unpacking subscriptions"
+		wget http://www.drupal.org/files/projects/subscriptions-${MOD_PV}.tar.gz
+		tar xfz subscriptions-${MOD_PV}.tar.gz
+		einfo "Unpacking summary"
+		wget http://www.drupal.org/files/projects/summary-${MOD_PV}.tar.gz
+		tar xfz summary-${MOD_PV}.tar.gz
+		einfo "Unpacking survey"
+		wget http://www.drupal.org/files/projects/survey-${MOD_PV}.tar.gz
+		tar xfz survey-${MOD_PV}.tar.gz
+		einfo "Unpacking swish"
+		wget http://www.drupal.org/files/projects/swish-${MOD_PV}.tar.gz
+		tar xfz swish-${MOD_PV}.tar.gz
+		einfo "Unpacking sxip"
+		wget http://www.drupal.org/files/projects/sxip-${MOD_PV}.tar.gz
+		tar xfz sxip-${MOD_PV}.tar.gz
+		einfo "Unpacking syndication"
+		wget http://www.drupal.org/files/projects/syndication-${MOD_PV}.tar.gz
+		tar xfz syndication-${MOD_PV}.tar.gz
+		einfo "Unpacking taxonomy_access"
+		wget http://www.drupal.org/files/projects/taxonomy_access-${MOD_PV}.tar.gz
+		tar xfz taxonomy_access-${MOD_PV}.tar.gz
+		einfo "Unpacking taxonomy_assoc"
+		wget http://www.drupal.org/files/projects/taxonomy_assoc-${MOD_PV}.tar.gz
+		tar xfz taxonomy_assoc-${MOD_PV}.tar.gz
+		einfo "Unpacking taxonomy_block"
+		wget http://www.drupal.org/files/projects/taxonomy_block-${MOD_PV}.tar.gz
+		tar xfz taxonomy_block-${MOD_PV}.tar.gz
+		einfo "Unpacking taxonomy_browser"
+		wget http://www.drupal.org/files/projects/taxonomy_browser-${MOD_PV}.tar.gz
+		tar xfz taxonomy_browser-${MOD_PV}.tar.gz
+		einfo "Unpacking taxonomy_context"
+		wget http://www.drupal.org/files/projects/taxonomy_context-${MOD_PV}.tar.gz
+		tar xfz taxonomy_context-${MOD_PV}.tar.gz
+		einfo "Unpacking taxonomy_dhtml"
+		wget http://www.drupal.org/files/projects/taxonomy_dhtml-${MOD_PV}.tar.gz
+		tar xfz taxonomy_dhtml-${MOD_PV}.tar.gz
+		einfo "Unpacking taxonomy_html"
+		wget http://www.drupal.org/files/projects/taxonomy_html-${MOD_PV}.tar.gz
+		tar xfz taxonomy_html-${MOD_PV}.tar.gz
+		einfo "Unpacking taxonomy_image"
+		wget http://www.drupal.org/files/projects/taxonomy_image-${MOD_PV}.tar.gz
+		tar xfz taxonomy_image-${MOD_PV}.tar.gz
+		einfo "Unpacking taxonomy_xml"
+		wget http://www.drupal.org/files/projects/taxonomy_xml-${MOD_PV}.tar.gz
+		tar xfz taxonomy_xml-${MOD_PV}.tar.gz
+		einfo "Unpacking taxonomy_menu"
+		wget http://www.drupal.org/files/projects/taxonomy_menu-${MOD_PV}.tar.gz
+		tar xfz taxonomy_menu-${MOD_PV}.tar.gz
+		einfo "Unpacking taxonomy_otf"
+		wget http://www.drupal.org/files/projects/taxonomy_otf-${MOD_PV}.tar.gz
+		tar xfz taxonomy_otf-${MOD_PV}.tar.gz
+		einfo "Unpacking term_statistics"
+		wget http://www.drupal.org/files/projects/term_statistics-${MOD_PV}.tar.gz
+		tar xfz term_statistics-${MOD_PV}.tar.gz
+		einfo "Unpacking textile"
+		wget http://www.drupal.org/files/projects/textile-${MOD_PV}.tar.gz
+		tar xfz textile-${MOD_PV}.tar.gz
+		einfo "Unpacking theme_editor"
+		wget http://www.drupal.org/files/projects/theme_editor-${MOD_PV}.tar.gz
+		tar xfz theme_editor-${MOD_PV}.tar.gz
+		einfo "Unpacking themedev"
+		wget http://www.drupal.org/files/projects/themedev-${MOD_PV}.tar.gz
+		tar xfz themedev-${MOD_PV}.tar.gz
+		einfo "Unpacking title"
+		wget http://www.drupal.org/files/projects/title-${MOD_PV}.tar.gz
+		tar xfz title-${MOD_PV}.tar.gz
+		einfo "Unpacking trackback"
+		wget http://www.drupal.org/files/projects/trackback-${MOD_PV}.tar.gz
+		tar xfz trackback-${MOD_PV}.tar.gz
+		einfo "Unpacking translation"
+		wget http://www.drupal.org/files/projects/translation-${MOD_PV}.tar.gz
+		tar xfz translation-${MOD_PV}.tar.gz
+		einfo "Unpacking trip_search"
+		wget http://www.drupal.org/files/projects/trip_search-${MOD_PV}.tar.gz
+		tar xfz trip_search-${MOD_PV}.tar.gz
+		einfo "Unpacking troll"
+		wget http://www.drupal.org/files/projects/troll-${MOD_PV}.tar.gz
+		tar xfz troll-${MOD_PV}.tar.gz
+		einfo "Unpacking urlfilter"
+		wget http://www.drupal.org/files/projects/urlfilter-${MOD_PV}.tar.gz
+		tar xfz urlfilter-${MOD_PV}.tar.gz
+		einfo "Unpacking userposts"
+		wget http://www.drupal.org/files/projects/userposts-${MOD_PV}.tar.gz
+		tar xfz userposts-${MOD_PV}.tar.gz
+		einfo "Unpacking validation"
+		wget http://www.drupal.org/files/projects/validation-${MOD_PV}.tar.gz
+		tar xfz validation-${MOD_PV}.tar.gz
+		einfo "Unpacking variable"
+		wget http://www.drupal.org/files/projects/variable-${MOD_PV}.tar.gz
+		tar xfz variable-${MOD_PV}.tar.gz
+		einfo "Unpacking volunteer"
+		wget http://www.drupal.org/files/projects/volunteer-${MOD_PV}.tar.gz
+		tar xfz volunteer-${MOD_PV}.tar.gz
+		einfo "Unpacking weather"
+		wget http://www.drupal.org/files/projects/weather-${MOD_PV}.tar.gz
+		tar xfz weather-${MOD_PV}.tar.gz
+		einfo "Unpacking webform"
+		wget http://www.drupal.org/files/projects/webform-${MOD_PV}.tar.gz
+		tar xfz webform-${MOD_PV}.tar.gz
+		einfo "Unpacking weblink"
+		wget http://www.drupal.org/files/projects/weblink-${MOD_PV}.tar.gz
+		tar xfz weblink-${MOD_PV}.tar.gz
+		einfo "Unpacking webserver_auth"
+		wget http://www.drupal.org/files/projects/webserver_auth-${MOD_PV}.tar.gz
+		tar xfz webserver_auth-${MOD_PV}.tar.gz
+		einfo "Unpacking week"
+		wget http://www.drupal.org/files/projects/week-${MOD_PV}.tar.gz
+		tar xfz week-${MOD_PV}.tar.gz
+		einfo "Unpacking wiki"
+		wget http://www.drupal.org/files/projects/wiki-${MOD_PV}.tar.gz
+		tar xfz wiki-${MOD_PV}.tar.gz
+		einfo "Unpacking workflow"
+		wget http://www.drupal.org/files/projects/workflow-${MOD_PV}.tar.gz
+		tar xfz workflow-${MOD_PV}.tar.gz
+		einfo "Unpacking workspace"
+		wget http://www.drupal.org/files/projects/workspace-${MOD_PV}.tar.gz
+		tar xfz workspace-${MOD_PV}.tar.gz
+		einfo "Unpacking ystock"
+		wget http://www.drupal.org/files/projects/ystock-${MOD_PV}.tar.gz
+		tar xfz ystock-${MOD_PV}.tar.gz
 
-	cd ${S}/themes
-	tar xfz  ${DISTDIR}/adc-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/box_grey_smarty-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/box_grey-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/goofy-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/interlaced-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/kubrick-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/marvin_2k_phptemplate-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/persian-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/sunflower-${MOD_PV}.tar.gz
+		cd ${S}/themes
+		einfo "Unpacking adc"
+		wget http://www.drupal.org/files/projects/adc-${MOD_PV}.tar.gz
+		tar xfz adc-${MOD_PV}.tar.gz
+		einfo "Unpacking box_grey_smarty"
+		wget http://www.drupal.org/files/projects/box_grey_smarty-${MOD_PV}.tar.gz
+		tar xfz box_grey_smarty-${MOD_PV}.tar.gz
+		einfo "Unpacking box_grey"
+		wget http://www.drupal.org/files/projects/box_grey-${MOD_PV}.tar.gz
+		tar xfz box_grey-${MOD_PV}.tar.gz
+		einfo "Unpacking democratica"
+		wget http://www.drupal.org/files/projects/democratica-${MOD_PV}.tar.gz
+		tar xfz democratica-${MOD_PV}.tar.gz
+		einfo "Unpacking friendselectric"
+		wget http://www.drupal.org/files/projects/friendselectric-${MOD_PV}.tar.gz
+		tar xfz friendselectric-${MOD_PV}.tar.gz
+		einfo "Unpacking goofy"
+		wget http://www.drupal.org/files/projects/goofy-${MOD_PV}.tar.gz
+		tar xfz goofy-${MOD_PV}.tar.gz
+		einfo "Unpacking interlaced"
+		wget http://www.drupal.org/files/projects/interlaced-${MOD_PV}.tar.gz
+		tar xfz interlaced-${MOD_PV}.tar.gz
+		einfo "Unpacking kubrick"
+		wget http://www.drupal.org/files/projects/kubrick-${MOD_PV}.tar.gz
+		tar xfz kubrick-${MOD_PV}.tar.gz
+		einfo "Unpacking lincolns_revenge"
+		wget http://www.drupal.org/files/projects/lincolns_revenge-${MOD_PV}.tar.gz
+		tar xfz lincolns_revenge-${MOD_PV}.tar.gz
+		einfo "Unpacking manji"
+		wget http://www.drupal.org/files/projects/manji-${MOD_PV}.tar.gz
+		tar xfz manji-${MOD_PV}.tar.gz
+		einfo "Unpacking marvin_2k_phptemplate"
+		wget http://www.drupal.org/files/projects/marvin_2k_phptemplate-${MOD_PV}.tar.gz
+		tar xfz marvin_2k_phptemplate-${MOD_PV}.tar.gz
+		einfo "Unpacking persian"
+		wget http://www.drupal.org/files/projects/persian-${MOD_PV}.tar.gz
+		tar xfz persian-${MOD_PV}.tar.gz
+		einfo "Unpacking pushbutton_phptemplate"
+		wget http://www.drupal.org/files/projects/pushbutton_phptemplate-${MOD_PV}.tar.gz
+		tar xfz pushbutton_phptemplate-${MOD_PV}.tar.gz
+		einfo "Unpacking spreadfirefox"
+		wget http://www.drupal.org/files/projects/spreadfirefox-${MOD_PV}.tar.gz
+		tar xfz spreadfirefox-${MOD_PV}.tar.gz
+		einfo "Unpacking sunflower"
+		wget http://www.drupal.org/files/projects/sunflower-${MOD_PV}.tar.gz
+		tar xfz sunflower-${MOD_PV}.tar.gz
 
-	cd ${S}/themes/engines
-	tar xfz  ${DISTDIR}/phptemplate-${MOD_PV}.tar.gz
-	tar xfz  ${DISTDIR}/smarty-${MOD_PV}.tar.gz
+		cd ${S}
+		einfo "Unpacking sq"
+		wget http://www.drupal.org/files/projects/sq-${MOD_PV}.tar.gz
+		tar xfz sq-${MOD_PV}.tar.gz
+		einfo "Unpacking ar"
+		wget http://www.drupal.org/files/projects/ar-${MOD_PV}.tar.gz
+		tar xfz ar-${MOD_PV}.tar.gz
+		einfo "Unpacking eu"
+		wget http://www.drupal.org/files/projects/eu-${MOD_PV}.tar.gz
+		tar xfz eu-${MOD_PV}.tar.gz
+		einfo "Unpacking pt-br"
+		wget http://www.drupal.org/files/projects/pt-br-${MOD_PV}.tar.gz
+		tar xfz pt-br-${MOD_PV}.tar.gz
+		einfo "Unpacking ca"
+		wget http://www.drupal.org/files/projects/ca-${MOD_PV}.tar.gz
+		tar xfz ca-${MOD_PV}.tar.gz
+		einfo "Unpacking zh-hans"
+		wget http://www.drupal.org/files/projects/zh-hans-${MOD_PV}.tar.gz
+		tar xfz zh-hans-${MOD_PV}.tar.gz
+		einfo "Unpacking cs"
+		wget http://www.drupal.org/files/projects/cs-${MOD_PV}.tar.gz
+		tar xfz cs-${MOD_PV}.tar.gz
+		einfo "Unpacking da"
+		wget http://www.drupal.org/files/projects/da-${MOD_PV}.tar.gz
+		tar xfz da-${MOD_PV}.tar.gz
+		einfo "Unpacking nl"
+		wget http://www.drupal.org/files/projects/nl-${MOD_PV}.tar.gz
+		tar xfz nl-${MOD_PV}.tar.gz
+		einfo "Unpacking eo"
+		wget http://www.drupal.org/files/projects/eo-${MOD_PV}.tar.gz
+		tar xfz eo-${MOD_PV}.tar.gz
+		einfo "Unpacking fr"
+		wget http://www.drupal.org/files/projects/fr-${MOD_PV}.tar.gz
+		tar xfz fr-${MOD_PV}.tar.gz
+		einfo "Unpacking de"
+		wget http://www.drupal.org/files/projects/de-${MOD_PV}.tar.gz
+		tar xfz de-${MOD_PV}.tar.gz
+		einfo "Unpacking hu"
+		wget http://www.drupal.org/files/projects/hu-${MOD_PV}.tar.gz
+		tar xfz hu-${MOD_PV}.tar.gz
+		einfo "Unpacking id"
+		wget http://www.drupal.org/files/projects/id-${MOD_PV}.tar.gz
+		tar xfz id-${MOD_PV}.tar.gz
+		einfo "Unpacking it"
+		wget http://www.drupal.org/files/projects/it-${MOD_PV}.tar.gz
+		tar xfz it-${MOD_PV}.tar.gz
+		einfo "Unpacking ja"
+		wget http://www.drupal.org/files/projects/ja-${MOD_PV}.tar.gz
+		tar xfz ja-${MOD_PV}.tar.gz
+		einfo "Unpacking nno"
+		wget http://www.drupal.org/files/projects/nno-${MOD_PV}.tar.gz
+		tar xfz nno-${MOD_PV}.tar.gz
+		einfo "Unpacking pl"
+		wget http://www.drupal.org/files/projects/pl-${MOD_PV}.tar.gz
+		tar xfz pl-${MOD_PV}.tar.gz
+		einfo "Unpacking pt-pt"
+		wget http://www.drupal.org/files/projects/pt-pt-${MOD_PV}.tar.gz
+		tar xfz pt-pt-${MOD_PV}.tar.gz
+		einfo "Unpacking ro"
+		wget http://www.drupal.org/files/projects/ro-${MOD_PV}.tar.gz
+		tar xfz ro-${MOD_PV}.tar.gz
+		einfo "Unpacking ru"
+		wget http://www.drupal.org/files/projects/ru-${MOD_PV}.tar.gz
+		tar xfz ru-${MOD_PV}.tar.gz
+		einfo "Unpacking sv"
+		wget http://www.drupal.org/files/projects/sv-${MOD_PV}.tar.gz
+		tar xfz sv-${MOD_PV}.tar.gz
+		einfo "Unpacking drupal-pot"
+		wget http://www.drupal.org/files/projects/drupal-pot-${MOD_PV}.tar.gz
+		tar xfz drupal-pot-${MOD_PV}.tar.gz
 
-	cd ${S}
-	tar xfz  ${DISTDIR}/zh-hans-${MOD_PV}.tar.gz
+		cd ${S}/themes/engines
+		einfo "Unpacking phptemplate"
+		wget http://www.drupal.org/files/projects/phptemplate-${MOD_PV}.tar.gz
+		tar xfz phptemplate-${MOD_PV}.tar.gz
+		einfo "Unpacking smarty"
+		wget http://www.drupal.org/files/projects/smarty-${MOD_PV}.tar.gz
+		tar xfz smarty-${MOD_PV}.tar.gz
+
+		find ${S} -name "*.tar.gz" -exec rm -rf {} \;
+		find ${S} -type f -exec chmod 644 {} \;
+		find ${S} -type d -exec chmod 755 {} \;
+	fi
 }
 
 src_compile() {
@@ -320,4 +704,3 @@ src_install() {
 
 	webapp_src_install
 }
-
diff --git a/www-apps/drupal/drupal-4.6.2.ebuild b/www-apps/drupal/drupal-4.6.2.ebuild
index 49921198d57f..5a85816960d7 100644
--- a/www-apps/drupal/drupal-4.6.2.ebuild
+++ b/www-apps/drupal/drupal-4.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/www-apps/drupal/drupal-4.6.2.ebuild,v 1.1 2005/07/05 15:10:40 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-4.6.2.ebuild,v 1.1.1.1 2005/11/30 09:37:00 chriswhite Exp $
 
 inherit webapp eutils
 
@@ -8,39 +8,15 @@ MY_PV=${PV:0:3}.0
 
 DESCRIPTION="Drupal is a PHP-based open-source platform and content management system for building dynamic web sites offering a broad range of features and services; including user administration, publishing workflow, discussion capabilities, news aggregation, metadata functionalities using controlled vocabularies and XML publishing for content sharing purposes. Equipped with a powerful blend of features and configurability, Drupal can support a diverse range of web projects ranging from personal weblogs to large community-driven sites."
 HOMEPAGE="http://drupal.org"
-IUSE="$IUSE minimal"
-S="${WORKDIR}/${P}"
+IUSE="mysql"
 
 SRC_URI="http://drupal.org/files/projects/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~ppc ~x86"
+KEYWORDS="~alpha ~ppc ~x86 ~amd64"
 
 DEPEND="virtual/php"
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack ${P}.tar.gz
-
-	if ! use minimal ; then
-
-		for i in modules themes engines language; do
-			cd ${S}/$i
-			[ "$i" == "engines" ] && cd ${S}/themes/$i
-			[ "$i" == "language" ] && cd ${S}/includes
-			einfo "`pwd`"
-			for item in `cat ${FILESDIR}/${MY_PV}/$i`; do
-				einfo "Unpacking $item"
-				wget -q http://www.drupal.org/files/projects/$item-${MY_PV}.tar.gz
-				tar xfz $item-${MY_PV}.tar.gz
-			done
-		done
-
-		find ${S} -name "*.tar.gz" -exec rm -rf {} \;
-		find ${S} -type f -exec chmod 644 {} \;
-		find ${S} -type d -exec chmod 755 {} \;
-	fi
-}
+RDEPEND="mysql? ( dev-db/mysql )"
 
 src_compile() {
 	#Default compile hangs!
@@ -55,7 +31,7 @@ src_install() {
 
 	# handle documentation files
 	#
-	D# NOTE that doc files go into /usr/share/doc as normal; they do NOT
+	# NOTE that doc files go into /usr/share/doc as normal; they do NOT
 	# get installed per vhost!
 
 	einfo "Installing docs"
@@ -74,16 +50,6 @@ src_install() {
 	mkdir ${D}/${MY_HTDOCSDIR}/files
 	webapp_serverowned ${MY_HTDOCSDIR}/files
 
-	# Identify any script files that need #! headers adding to run under
-	# a CGI script (such as PHP/CGI)
-	#
-	# for drupal, we *assume* that all .php files need to have CGI/BIN
-	# support added
-
-	for x in `find . -name '*.php' -print ` ; do
-		webapp_runbycgibin php ${MY_HTDOCSDIR}/$x
-	done
-
 	#All files must be owned by server
 	for x in `find . -type f -print` ; do
 		webapp_serverowned ${MY_HTDOCSDIR}/$x
@@ -95,3 +61,58 @@ src_install() {
 
 	webapp_src_install
 }
+
+pkg_postinst() {
+	webapp_pkg_postinst
+	einfo
+	einfo "You might want to run:"
+	einfo "\"ebuild /var/db/pkg/www-apps/${PF}/${PF}.ebuild config\""
+	einfo "if this is a new install."
+	einfo
+}
+
+pkg_config() {
+	# This is the default directory, but we have this portion for the user to
+	# change the default directory if it does not exist.
+	MY_HTDOCSDIR=/usr/share/webapps/${PN}/${PV}/htdocs
+	if [ ! -d ${MY_HTDOCSDIR} ] && \
+		[ ! -d ${MY_HTDOCSDIR}/modules ] && \
+		[ ! -d ${MY_HTDOCSDIR}/themes ] && \
+		[ ! -d ${MY_HTDOCSDIR}/themes/engines ] && \
+		[ ! -d ${MY_HTDOCSDIR}/language ] ; then
+		einfo "Please specify the directory your drupal installation "
+		einfo "is installed in."
+		echo
+		while true
+		do
+			read -p " Please type in the name of the directory: " MY_HTDOCSDIR
+			[ -d ${MY_HTDOCSDIR} ] && \
+				[ -d ${MY_HTDOCSDIR}/modules ] && \
+				[ -d ${MY_HTDOCSDIR}/themes ] && \
+				[ -d ${MY_HTDOCSDIR}/themes/engines ] && \
+				[ -d ${MY_HTDOCSDIR}/language ] && \
+				break || \
+				ewarn "The directory ${MY_HTDOCSDIR} does not exist"
+		done
+	fi
+	if [ -d ${MY_HTDOCSDIR} ] && \
+		[ -d ${MY_HTDOCSDIR}/modules ] && \
+		[ -d ${MY_HTDOCSDIR}/themes ] && \
+		[ -d ${MY_HTDOCSDIR}/themes/engines ] && \
+		[ -d ${MY_HTDOCSDIR}/language ] ; then
+		for i in modules themes engines language; do
+			cd ${MY_HTDOCSDIR}/$i
+			[ "$i" == "engines" ] && cd ${S}/themes/$i
+			[ "$i" == "language" ] && cd ${S}/includes
+			for item in `cat ${PORTDIR}/www-apps/${PN}/files/${MY_PV}/$i`; do
+				einfo "Unpacking $item"
+				wget -q http://www.drupal.org/files/projects/$item-${MY_PV}.tar.gz
+				tar xfz $item-${MY_PV}.tar.gz
+			done
+		done
+
+		find ${MY_HTDOCSDIR} -name "*.tar.gz" -exec rm -rf {} \;
+		find ${MY_HTDOCSDIR} -type f -exec chmod 644 {} \;
+		find ${MY_HTDOCSDIR} -type d -exec chmod 755 {} \;
+	fi
+}
diff --git a/www-apps/drupal/drupal-4.6.3.ebuild b/www-apps/drupal/drupal-4.6.3.ebuild
index e88805d85f16..985b38691690 100644
--- a/www-apps/drupal/drupal-4.6.3.ebuild
+++ b/www-apps/drupal/drupal-4.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/www-apps/drupal/drupal-4.6.3.ebuild,v 1.1 2005/09/05 01:23:44 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-4.6.3.ebuild,v 1.1.1.1 2005/11/30 09:37:01 chriswhite Exp $
 
 inherit webapp eutils
 
@@ -8,7 +8,7 @@ MY_PV=${PV:0:3}.0
 
 DESCRIPTION="Drupal is a PHP-based open-source platform and content management system for building dynamic web sites offering a broad range of features and services; including user administration, publishing workflow, discussion capabilities, news aggregation, metadata functionalities using controlled vocabularies and XML publishing for content sharing purposes. Equipped with a powerful blend of features and configurability, Drupal can support a diverse range of web projects ranging from personal weblogs to large community-driven sites."
 HOMEPAGE="http://drupal.org"
-IUSE="mysql"
+IUSE=""
 
 SRC_URI="http://drupal.org/files/projects/${P}.tar.gz"
 
@@ -16,7 +16,8 @@ LICENSE="GPL-2"
 KEYWORDS="~alpha ~ppc ~x86 ~amd64"
 
 DEPEND="virtual/php"
-RDEPEND="mysql? ( dev-db/mysql )"
+RDEPEND="|| ( dev-db/mysql dev-db/postgresql )
+		>=net-www/apache-1.3"
 
 src_compile() {
 	#Default compile hangs!
@@ -57,7 +58,7 @@ src_install() {
 
 	webapp_configfile ${MY_HTDOCSDIR}/sites/default/settings.php
 
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en-4.6.3.txt
 
 	webapp_src_install
 }
@@ -66,7 +67,7 @@ pkg_postinst() {
 	webapp_pkg_postinst
 	einfo
 	einfo "You might want to run:"
-	einfo "\"ebuild /var/db/pkg/www-apps/${PF}/${PF}.ebuild config\""
+	einfo "\"emerge --config =${PF} \""
 	einfo "if this is a new install."
 	einfo
 }
diff --git a/www-apps/drupal/files/4.6.0/engines b/www-apps/drupal/files/4.6.0/engines
index d7180787161f..a44e677b2183 100644
--- a/www-apps/drupal/files/4.6.0/engines
+++ b/www-apps/drupal/files/4.6.0/engines
@@ -1 +1,3 @@
 phptemplate
+smarty
+wgsmarty
diff --git a/www-apps/drupal/files/4.6.0/language b/www-apps/drupal/files/4.6.0/language
index cba463dc4ae0..ce4a0e8f001c 100644
--- a/www-apps/drupal/files/4.6.0/language
+++ b/www-apps/drupal/files/4.6.0/language
@@ -1,8 +1,35 @@
+drupal-pot
+af
+sq
+ar
+eu
 pt-br
+bg
+ca
+zh-hans
+zh-hant
+cs
+da
+nl
+et
+fi
 fr
+de
+el
+gu
 hu
+id
+it
 ja
+kn
+lt
+nb
+nno
 pl
 pt-pt
+ro
+ru
+sk
 es
-drupal-pot
+sv
+uk
diff --git a/www-apps/drupal/files/4.6.0/modules b/www-apps/drupal/files/4.6.0/modules
index aab4fb4de737..67eacc46601c 100644
--- a/www-apps/drupal/files/4.6.0/modules
+++ b/www-apps/drupal/files/4.6.0/modules
@@ -1,49 +1,95 @@
-album
+acidfree
+actionfeed
+adminblock
+adsense
 amazontools
-amazonsearch
+amazon_items
 article
+asterisk
+atom
 attachment
+badbehavior
+banner
+bbcode_wysiwyg
+blogtheme
 bookreview
 bookmarks
+browscap
 buddylist
+captcha
 chatbox
+checkout
+civicrm
 codefilter
+comic
 commentcloser
 contact_dir
 contextlinks
+controlpanel
+cronplus
+csvfilter
+currency
 customerror
 daily
+dashboard
 dba
+delicious
 diff
+distantparent
+donations
 download_counter
 ecommerce
+epublish
+evaluation
 event
+eventfinder
 excerpt
 ezmlm
 fckeditor
 feedback
 filemanager
+filestore2
+flexiblock
 flexinode
 foaf
 folksonomy
-fontsize
 forms
 form_mail
+forward
 freelinking
 front
+fscache
 gallery
 glossary
+gmap
+gsitemap
+guestbook
 hof
 helpedit
+highlight
 htmlcorrector
+html2txt
 htmlarea
 image
+image_filter
+image_import
 img_assist
+imood
+import_export
+indexpage
+inline
 i18n
 interwiki
+jobsearch
 jsdomenu
+keyword_links
+latex
+ldap_integration
 legal
+linkattach
+listhandler
 livediscussions
+location
 mail
 mailalias
 mailhandler
@@ -51,55 +97,109 @@ marksmarty
 massmailer
 members
 menu_otf
+microfiction
+modauthmysql
+moviereview
 nodewords
+naggregator
+node_footnotes
 nodelist
 nmoderation
 node_privacy_byrole
+node_type_filter
+nodevote
 node_import
 notify
+opusfilter
 og
 pathauto
 paypal_framework
 paypal_subscription
+pdfview
+album
+ping_server
 poormanscron
+print
 privatemsg
+prodigem
+project
+quicktags
 quote
 quotes
 recipe
+remindme
+roledelay
 rsvp
 scheduler
+scripturefilter
 securesite
 series
+shoutbox
 sidecontent
+signup
+similar
+simple_access
+simplenews
 simpletest
 site_map
+profile_pages
 sitemenu
-smartypants
 smileys
+smsgateway
 spam
 trip_search
 statistics_filter
+statistics_trends
 stock
+stockapi
+subscription
 subscriptions
 summary
 survey
+swish
 sxip
 syndication
+tables
+tagadelic
+tagnode
 taxonomy_access
+taxonomy_assoc
 taxonomy_block
 taxonomy_browser
 taxonomy_context
 taxonomy_dhtml
+taxonomy_hide
+taxonomy_image
 taxonomy_xml
 taxonomy_menu
 taxonomy_multi_edit
+taxonomy_theme
 textile
 theme_editor
+themedev
 tinymce
+topic
+trackback
 troll
 urlfilter
+userpoints
+user_related_content
 variable
+variables
+video
 vimcolor
+volunteer
+voting
+sfvote
 webform
+weblink
 webserver_auth
 week
+wghtml
+whatsrelated
+wiki
+wishlist
+wordfilter
+workspace
+xstatistics
+
diff --git a/www-apps/drupal/files/4.6.0/themes b/www-apps/drupal/files/4.6.0/themes
index a07c2ae24dec..c47168582403 100644
--- a/www-apps/drupal/files/4.6.0/themes
+++ b/www-apps/drupal/files/4.6.0/themes
@@ -1,7 +1,12 @@
 adc
+argeebee
 blix
 bluemarine
+bluemarine_smarty
 box_grey
+box_grey_smarty
+civicspace
+connections
 democratica
 friendselectric
 gespaa
@@ -9,12 +14,15 @@ goofy
 greenmarinee
 gworks
 interlaced
+kubrick
 leaf
+leaf_smarty
+leaves
 lincolns_revenge
+manji
 marvinclassic
 rdc
 slash
 slurpee
 spreadfirefox
 sunflower
-unconed
diff --git a/www-apps/drupal/files/digest-drupal-4.5.2 b/www-apps/drupal/files/digest-drupal-4.5.2
index bc33b3e43806..f4c6878d645e 100644
--- a/www-apps/drupal/files/digest-drupal-4.5.2
+++ b/www-apps/drupal/files/digest-drupal-4.5.2
@@ -1,118 +1 @@
 MD5 90b11363f95351e09e1bcf3f32708d78 drupal-4.5.2.tar.gz 471370
-MD5 b9dc84db14ab10dd882542a42314950c affiliate-4.5.0.tar.gz 10256
-MD5 cb0cbe58c2c2e51da13eff28b7ab971a api-4.5.0.tar.gz 17969
-MD5 bd124566b8f0e54a5b88120db5759a59 article-4.5.0.tar.gz 12118
-MD5 2ed9ec6c5987bac419f4e7ac90cd6300 atom-4.5.0.tar.gz 8070
-MD5 d4805febe848b8098cced7013adad6c0 attached_node-4.5.0.tar.gz 11236
-MD5 983f456c759938930196b0ac309ba9a9 attachment-4.5.0.tar.gz 10595
-MD5 abfddb241178162c2a331a3bed943d9f automember-4.5.0.tar.gz 19029
-MD5 7cbe5d38b1196076da3bca0bf9561185 banner-4.5.0.tar.gz 40190
-MD5 dbbbb12fbbeba5b7ffe5cabfe182bbad bbcode-4.5.0.tar.gz 18557
-MD5 cee3256705441f526f389ce0a96b2d99 bookmarks-4.5.0.tar.gz 13683
-MD5 eacc7019671fe78c358fc49c07896588 buddylist-4.5.0.tar.gz 12916
-MD5 cec26b872b57e11d2a3e824f526538a7 captcha-4.5.0.tar.gz 8902
-MD5 34ca562cceafdebf8eeb1b0f9f3a8c59 chatbox-4.5.0.tar.gz 14649
-MD5 2d5f0490f63c7f7f92db929dd5314cae codefilter-4.5.0.tar.gz 8733
-MD5 1b7c13df4f9184788827ffe88e3cd70b collimator-4.5.0.tar.gz 11800
-MD5 c20256bcfe2519b7d20e26a8b32d38c3 commentcloser-4.5.0.tar.gz 8527
-MD5 d1ac742631e233638310c01c279fcc79 contextlinks-4.5.0.tar.gz 83399
-MD5 b82baf1e989efcd0c99347f9603dde3e csvfilter-4.5.0.tar.gz 10571
-MD5 00fea20dfa3a00cfae78980c52424f03 postcount_rank-4.5.0.tar.gz 9455
-MD5 6ea435a7058db748255f6316eb474f23 daily-4.5.0.tar.gz 21025
-MD5 8226f597033a2b91037c32a894c62673 dba-4.5.0.tar.gz 15704
-MD5 7f4f46a67b412ea621da4ac25801085e dkosfilter-4.5.0.tar.gz 8461
-MD5 872a437441a625ec7500f4b19a6f9e69 ecommerce-4.5.0.tar.gz 85610
-MD5 dc7bfd93efa15385f5646ab126ec1027 event-4.5.0.tar.gz 30635
-MD5 808874a1f1e95929e47ad6edc16b003d feature-4.5.0.tar.gz 8809
-MD5 18827af334898d89316a76458dc561ee feedback-4.5.0.tar.gz 11540
-MD5 66308572978f3963d5d519871c387fb1 filemanager-4.5.0.tar.gz 13641
-MD5 780ff1c5d0bc8e8b6a2a3b8c82505c65 filestore2-4.5.0.tar.gz 15203
-MD5 75da280b1128e161225cd10eb2a32277 flexinode-4.5.0.tar.gz 33985
-MD5 5cd53a0988ba5f15c7606c314352761c foaf-4.5.0.tar.gz 12726
-MD5 e02265e0d258067b4cecefa0ecea8ce4 forms-4.5.0.tar.gz 10568
-MD5 7ba83518b49168267198622297ee8878 form_mail-4.5.0.tar.gz 7966
-MD5 dd20ca314927d9b85d4466ceed07b94d fscache-4.5.0.tar.gz 11106
-MD5 80ae25f4f733fc63e68800d8f9ac2fa7 glossary-4.5.0.tar.gz 19957
-MD5 9c66c469c9b747a8a2f1f9b77437cafd htmlarea-4.5.0.tar.gz 323373
-MD5 45d7598944d4e6dac2d1a62cb059413b htmlcorrector-4.5.0.tar.gz 8712
-MD5 5b44f7167bb596fba99be7a0142ef635 htmltidy-4.5.0.tar.gz 11891
-MD5 3e96b59826e7222fd9578926c14c00bc image-4.5.0.tar.gz 47111
-MD5 fbb7542c181665fb93ec6eb878c7c900 image_filter-4.5.0.tar.gz 9139
-MD5 4c3763a2d1fad27c381c075f68f1e124 img_assist-4.5.0.tar.gz 19349
-MD5 5b133212a056b5974958407caed579ba inline-4.5.0.tar.gz 9957
-MD5 2c712e54eaf6b6996817acb38ea9f859 im-4.5.0.tar.gz 8852
-MD5 50a7ca83d5e0fbf3724a9e7a8c634eb2 jsdomenu-4.5.0.tar.gz 18993
-MD5 6fb22e89139a0aa13e06e3cfddba4d9d listhandler-4.5.0.tar.gz 12766
-MD5 8a77e86fdfbe2cd46f22d2de8a814fce mail-4.5.0.tar.gz 10107
-MD5 789875346927af4a0cb6dbc7d3702d95 mailalias-4.5.0.tar.gz 7949
-MD5 42304788bd8c66b90333a27c3cab4b03 mailhandler-4.5.0.tar.gz 18166
-MD5 649d163eac4af10a72a214234c8381c1 marksmarty-4.5.0.tar.gz 36420
-MD5 195a86304097fdc3ba02766a19857650 members-4.5.0.tar.gz 9569
-MD5 2a795de9900ffa8a9ce00117b6df9b50 mypage-4.5.0.tar.gz 11311
-MD5 75e0e1d4fb0cb853a940c35ee48dffc5 news_page-4.5.0.tar.gz 9937
-MD5 e868977938bbd314381c5d4480541ad8 nmoderation-4.5.0.tar.gz 12502
-MD5 e314a1649f65e35c32d8cc0fbc681133 node_privacy_byrole-4.5.0.tar.gz 12779
-MD5 becff439975480507fa4d2cecdd4aca1 typecat-4.5.0.tar.gz 9281
-MD5 3a229f68704b243e75cd754f40b0f3d8 node_import-4.5.0.tar.gz 8266
-MD5 743a24aed4ec206494ff89a6abb235f0 notify-4.5.0.tar.gz 14184
-MD5 8c4e4c5654a08925e218db8d6a32ec5d optin-4.5.0.tar.gz 10414
-MD5 82422700a781ce27cfc2a46c207c188e og-4.5.0.tar.gz 15382
-MD5 b2bf268e9ae4811ce04f75c117bef363 over_text-4.5.0.tar.gz 15451
-MD5 247b029959e362884d6d3679f2888e49 paypal_framework-4.5.0.tar.gz 15913
-MD5 71f64894d35b0e98b64bf88fff8e7277 paypal_tipjar-4.5.0.tar.gz 10257
-MD5 b2dea915288dbda31eb9a034a9851eee periodical-4.5.0.tar.gz 12662
-MD5 9b09731888966362d6bc6b9cd1e13a5a poormanscron-4.5.0.tar.gz 8526
-MD5 63676fd4324a8bec0f2143acf01b9b1d postcard-4.5.0.tar.gz 15400
-MD5 ff586779ef95659c5643dcb97573ff1c print-4.5.0.tar.gz 10111
-MD5 bd95b0b4c000eca65cd6903aa7298345 privatemsg-4.5.0.tar.gz 19330
-MD5 fa3436a01a8a6cf8e9979dc960d1ead2 quickpost-4.5.0.tar.gz 12148
-MD5 5d3593117509c6504268e96ac76f0e38 quote-4.5.0.tar.gz 9202
-MD5 b69a68c8815cab142654148181d0a1d7 quotes-4.5.0.tar.gz 21253
-MD5 bb96e9e3805cd56d8b3f90de5113a55a recipe-4.5.0.tar.gz 11820
-MD5 7c0a249810cc4cbbb079d7b9ad620db6 relatedlinks-4.5.0.tar.gz 9600
-MD5 06f9f2dc53ad422fd8b556f7c18e2562 role_to_file-4.5.0.tar.gz 9064
-MD5 dadf3fe925a1a94fe31b16bd798535de scheduler-4.5.0.tar.gz 11859
-MD5 1206aed9ab18160c4d467fca791d7a26 simpletest-4.5.0.tar.gz 8865
-MD5 f23ece5678aa9e7ded20fdd672ba27e1 site_map-4.5.0.tar.gz 9606
-MD5 61d16f552fc24ada59e90241ec1d69c2 smileys-4.5.0.tar.gz 20374
-MD5 d17fc554b55b41ee8815c8b7b841998a spam-4.5.0.tar.gz 30853
-MD5 5b1fff14e472b8f2194b913082531008 subscriptions-4.5.0.tar.gz 13791
-MD5 7e59add95efa3f3212aec3275370c640 summary-4.5.0.tar.gz 11660
-MD5 de970fd9fe62ae6ad062ffd2fdba5b6a survey-4.5.0.tar.gz 10344
-MD5 7bd38306b882f5f07c4dfe0d3f720492 sxip-4.5.0.tar.gz 12380
-MD5 d294e673cef33695c465cffc4bacf089 syndication-4.5.0.tar.gz 9464
-MD5 5ac5086d78e3b745281b0bb54571c499 taxonomy_access-4.5.0.tar.gz 15382
-MD5 d8c7789437c244c915a54e0dbb282432 taxonomy_browser-4.5.0.tar.gz 10217
-MD5 6dd6aa59beaed6f254faa7f56d9a3b14 taxonomy_context-4.5.0.tar.gz 14499
-MD5 112dba982f26d39bedbea17f8e7e59d2 taxonomy_dhtml-4.5.0.tar.gz 35030
-MD5 2819263e3e5de399a936b4bbfc637a1e taxonomy_html-4.5.0.tar.gz 8906
-MD5 288446a274528f6293b000237a1e1438 taxonomy_image-4.5.0.tar.gz 16753
-MD5 9c9c76397650cc7ff7e0e40d6eba3942 taxonomy_menu-4.5.0.tar.gz 9540
-MD5 d7a6a19552e3e251cd01628b2f6c56bd term_statistics-4.5.0.tar.gz 13081
-MD5 6c76c202512eb4b2b649d36a8485b83a textile-4.5.0.tar.gz 133301
-MD5 5aa72df44dff17ab0940e7e043aee296 themedev-4.5.0.tar.gz 13588
-MD5 6aa42bc843862ae77e6df116b17795c3 title-4.5.0.tar.gz 8533
-MD5 9157fd6e1a5edd912759d91dfd845281 trackback-4.5.0.tar.gz 11579
-MD5 464b4f03523c91ab125977294f33ffb0 translation-4.5.0.tar.gz 20881
-MD5 ca784c21ed212de100f4e666d177e321 trip_search-4.5.0.tar.gz 11144
-MD5 93fe89f85a2eff12246088a00050365a urlfilter-4.5.0.tar.gz 8238
-MD5 8e6a0c1214588132c2984d39f62bf3cf userposts-4.5.0.tar.gz 8088
-MD5 06944aa6b8cf6d6b957dfcfad99a7dc7 validation-4.5.0.tar.gz 7855
-MD5 3db3c0e8e60e50e7421417dfecacea86 variable-4.5.0.tar.gz 8070
-MD5 cfbbd26b2ae0ebe56178af1054766dbd weather-4.5.0.tar.gz 15442
-MD5 2c697b7dcf86b963a7b68fb9ee92d926 webform-4.5.0.tar.gz 22394
-MD5 36af8f83bed934d62749550391e9af2f weblink-4.5.0.tar.gz 23656
-MD5 aa0c09f2807ba76047e92db1935b391f webserver_auth-4.5.0.tar.gz 8581
-MD5 4601659e212fbc0e334c2af58fe42800 workspace-4.5.0.tar.gz 63987
-MD5 562fa7f425566a3456d7f5f3dae50964 adc-4.5.0.tar.gz 94773
-MD5 d4a0ddfaea874218d5247bfce3ed7d6f box_grey_smarty-4.5.0.tar.gz 23324
-MD5 d037ce98d035a7bda4bba73a462bcf18 box_grey-4.5.0.tar.gz 43665
-MD5 c48a172f8b3d0f09d1f7467ab98a4991 goofy-4.5.0.tar.gz 197749
-MD5 d5221a0ff757413e46e712735a8347c3 interlaced-4.5.0.tar.gz 214880
-MD5 8db220afc76e6c43ac79b16dadb10bb1 kubrick-4.5.0.tar.gz 67626
-MD5 1c6680fc9a411d24f7caaf0864b9b673 marvin_2k_phptemplate-4.5.0.tar.gz 49976
-MD5 bad4c303288ace9f0cc7a94d8c65d2e6 persian-4.5.0.tar.gz 65997
-MD5 11d14553123ff04a1395b2cdfc7e3053 sunflower-4.5.0.tar.gz 99009
-MD5 56dfa1ec057bd590912c3d0b0676c1f8 phptemplate-4.5.0.tar.gz 13486
-MD5 63c67964e2cb9628ca4cd333c903451b smarty-4.5.0.tar.gz 11913
-MD5 d9ecd0865a2c7030fefe91105f281f9f zh-hans-4.5.0.tar.gz 75585
diff --git a/www-apps/drupal/metadata.xml b/www-apps/drupal/metadata.xml
index 118b90e92ffc..6f8922777081 100644
--- a/www-apps/drupal/metadata.xml
+++ b/www-apps/drupal/metadata.xml
@@ -4,7 +4,7 @@
 <pkgmetadata>
 <herd>web-apps</herd>
 <maintainer>
-  <email>stuart@gentoo.org</email>
+  <email>st_lim@gentoo.org</email>
     <description>Primary maintainer</description>
 </maintainer>
 </pkgmetadata>
diff --git a/www-apps/dspam-web/ChangeLog b/www-apps/dspam-web/ChangeLog
index 8f5fc5466c5a..66a3b7a6b789 100644
--- a/www-apps/dspam-web/ChangeLog
+++ b/www-apps/dspam-web/ChangeLog
@@ -1,6 +1,93 @@
-# ChangeLog for net-www/dspam-web
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/ChangeLog,v 1.1 2004/08/23 14:14:01 st_lim Exp $
+# ChangeLog for www-apps/dspam-web
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/ChangeLog,v 1.1.1.1 2005/11/30 09:37:10 chriswhite Exp $
+
+*dspam-web-3.6.1 (15 Nov 2005)
+
+  15 Nov 2005; Lim Swee Tat <st_lim@gentoo.org> +dspam-web-3.6.1.ebuild:
+  Version bump
+
+  06 Nov 2005; Lim Swee Tat <st_lim@gentoo.org> dspam-web-3.6.0.ebuild:
+  Fixed bug #103398
+
+*dspam-web-3.4.2 (05 Apr 2005)
+
+  05 Apr 2005; Lim Swee Tat <st_lim@gentoo.org> +dspam-web-3.4.2.ebuild:
+  Version bumped at long last
+
+*dspam-web-3.4.1 (23 Mar 2005)
+
+  23 Mar 2005; Lim Swee Tat <st_lim@gentoo.org> dspam-web-3.4.0.ebuild,
+  +dspam-web-3.4.1.ebuild:
+  Added 3.4.1
+
+*dspam-web-3.4_beta3 (11 Mar 2005)
+
+  11 Mar 2005; Lim Swee Tat <st_lim@gentoo.org> -dspam-web-3.2.4.ebuild,
+  +dspam-web-3.2.7.ebuild, -dspam-web-3.3.11.ebuild,
+  -dspam-web-3.3.8.ebuild, -dspam-web-3.4_beta1.ebuild,
+  -dspam-web-3.4_beta2.ebuild, -dspam-web-3.4_beta3.ebuild,
+  +dspam-web-3.4_rc3.ebuild:
+  Upgraded to 3.2.7 and 3.4_rc3
+  Removed old stuff
+
+  17 Feb 2005; Lim Swee Tat <st_lim@gentoo.org> :
+  Version bump
+
+*dspam-web-3.4_beta2 (14 Feb 2005)
+
+  14 Feb 2005; Lim Swee Tat <st_lim@gentoo.org> dspam-web-3.4_beta1.ebuild,
+  +dspam-web-3.4_beta2.ebuild:
+  Version bump
+
+*dspam-web-3.4_beta1 (18 Jan 2005)
+
+  18 Jan 2005; Lim Swee Tat <st_lim@gentoo.org> +dspam-web-3.4_beta1.ebuild:
+  Version bump, removing 3.3.11
+
+  13 Jan 2005; Lim Swee Tat <st_lim@gentoo.org> :
+  Version bump
+
+  05 Jan 2005; Lim Swee Tat <st_lim@gentoo.org> :
+  Fixed URL for dspam
+
+*dspam-web-3.3.8 (05 Jan 2005)
+
+  05 Jan 2005; Lim Swee Tat <st_lim@gentoo.org> +dspam-web-3.2.4.ebuild,
+  +dspam-web-3.3.8.ebuild:
+  Version bump and stable version bugfix bump.
+
+  09 Dec 2004; Lim Swee Tat <st_lim@gentoo.org> :
+  Version bump
+
+*dspam-web-3.2.2 (18 Nov 2004)
+
+  18 Nov 2004; Lim Swee Tat <st_lim@gentoo.org> +dspam-web-3.2.2.ebuild:
+  Version bump
+
+  05 Nov 2004; Lim Swee Tat <st_lim@gentoo.org> :
+  Version bump
+
+  21 Oct 2004; Lim Swee Tat <st_lim@gentoo.org> dspam-web-3.2_rc3.ebuild:
+  Need to make to get configure.pl
+
+*dspam-web-3.2_rc3 (21 Oct 2004)
+
+  21 Oct 2004; Lim Swee Tat <st_lim@gentoo.org> dspam-web-3.2_rc3.ebuild:
+  Forgot to put in configure.pl
+
+  20 Oct 2004; Lim Swee Tat <st_lim@gentoo.org> :
+  Fixed up dspam-3.2_rc3
+  Fixed the various digest files
+  Try it to see if this works.
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+*dspam-web-3.1.1 (24 Aug 2004)
+
+  24 Aug 2004; Lim Swee Tat <st_lim@gentoo.org> +dspam-web-3.1.1.ebuild:
+  Version bump and transfer to www-apps
 
   23 Aug 2004; Lim Swee Tat <st_lim@gentoo.org> +metadata.xml,
   +files/htaccess, +files/htpasswd, +dspam-web-3.0.0.ebuild,
diff --git a/www-apps/dspam-web/Manifest b/www-apps/dspam-web/Manifest
index 18323480c8c2..53bbb6b977b8 100644
--- a/www-apps/dspam-web/Manifest
+++ b/www-apps/dspam-web/Manifest
@@ -1,8 +1,12 @@
-MD5 1c5c72933289251b7514d3831c13dc41 dspam-web-3.0.0.ebuild 2465
-MD5 dda464d63ad1c3b8dc1e56915cb5aedc dspam-web-3.1.0.ebuild 2495
-MD5 ec3cdf18d70c8c7559a14935a7cc1018 ChangeLog 670
-MD5 f1ea445d6b4ddf81c55a4e886bc04218 metadata.xml 341
+MD5 e4c9d4ffcf435941fab8f329716d7b25 ChangeLog 3294
+MD5 03096ac1ea250450da7db871a098de1a dspam-web-3.2.7.ebuild 5253
+MD5 b03f7e094bd7bedf29e20baff13ca420 dspam-web-3.4.9.ebuild 5064
+MD5 dd8731eb3e2b022fc6de7a4d8df368df dspam-web-3.6.0.ebuild 5214
+MD5 1e6db0a8cace60d0859f8ec4d683c6f2 dspam-web-3.6.1.ebuild 5214
+MD5 7735956f416bd58bfcbeee99af43bea0 files/digest-dspam-web-3.2.7 63
+MD5 c26bf920b2afa7ae432ac6b6d96fb9b4 files/digest-dspam-web-3.4.9 63
+MD5 03b69dda833751bdda04e5413a9305e0 files/digest-dspam-web-3.6.0 129
+MD5 5a495629f2b3fbcfabc0f4ae4a9b4e4b files/digest-dspam-web-3.6.1 129
 MD5 ffdfc8d816078f4c58b75b9bed07503f files/htaccess 135
 MD5 b4099a94a52af9abd4ade48d82914c3c files/htpasswd 19
-MD5 05dce5dc8cf516655657aa2a4cc5f1da files/digest-dspam-web-3.0.0 63
-MD5 7f1185a1a89bc7c74aafba93afc2b0cf files/digest-dspam-web-3.1.0 63
+MD5 f1ea445d6b4ddf81c55a4e886bc04218 metadata.xml 341
diff --git a/www-apps/dspam-web/dspam-web-3.2.7.ebuild b/www-apps/dspam-web/dspam-web-3.2.7.ebuild
index 4cff6f04351c..6cab34515abc 100644
--- a/www-apps/dspam-web/dspam-web-3.2.7.ebuild
+++ b/www-apps/dspam-web/dspam-web-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/www-apps/dspam-web/dspam-web-3.2.7.ebuild,v 1.1 2005/03/11 04:26:41 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/dspam-web-3.2.7.ebuild,v 1.1.1.1 2005/11/30 09:37:10 chriswhite Exp $
 
 inherit webapp eutils
 
@@ -20,7 +20,8 @@ DEPEND=">=mail-filter/dspam-3.2_rc3
 	dev-perl/GD-Graph3d
 	dev-perl/GDGraph
 	dev-perl/GDTextUtil"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="debug mysql neural oci8 postgres sqlite"
 S=${WORKDIR}/${MY_P}
 HOMEDIR=/etc/mail/dspam
 
@@ -51,7 +52,7 @@ src_compile() {
 	use debug && myconf="${myconf} --enable-debug --enable-verbose-debug"
 
 	# select storage driver
-	if use mysql || use mysql41; then
+	if use mysql ; then
 		myconf="${myconf} --with-storage-driver=mysql_drv"
 		myconf="${myconf} --with-mysql-includes=/usr/include/mysql"
 		myconf="${myconf} --with-mysql-libraries=/usr/lib/mysql"
diff --git a/www-apps/dspam-web/dspam-web-3.4.9.ebuild b/www-apps/dspam-web/dspam-web-3.4.9.ebuild
index 765fe4890687..2c93af892d71 100644
--- a/www-apps/dspam-web/dspam-web-3.4.9.ebuild
+++ b/www-apps/dspam-web/dspam-web-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/www-apps/dspam-web/dspam-web-3.4.9.ebuild,v 1.1 2005/11/05 15:53:55 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/dspam-web-3.4.9.ebuild,v 1.1.1.1 2005/11/30 09:37:10 chriswhite Exp $
 
 inherit webapp eutils
 
diff --git a/www-apps/dspam-web/dspam-web-3.6.0.ebuild b/www-apps/dspam-web/dspam-web-3.6.0.ebuild
index dc5cda68d430..1c3c5f8efb99 100644
--- a/www-apps/dspam-web/dspam-web-3.6.0.ebuild
+++ b/www-apps/dspam-web/dspam-web-3.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/www-apps/dspam-web/dspam-web-3.6.0.ebuild,v 1.1 2005/11/05 15:53:55 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/dspam-web-3.6.0.ebuild,v 1.1.1.1 2005/11/30 09:37:10 chriswhite Exp $
 
 inherit webapp eutils
 
@@ -109,42 +109,26 @@ src_install () {
 		-i ${S}/webui/cgi-bin/admin.cgi
 	sed -e 's,/var/dspam,/etc/mail/dspam,' \
 		-e 's,/usr/local,/usr,' \
-		-i ${S}/webui/cgi-bin/admingraph.cgi
-	sed -e 's,/var/dspam,/etc/mail/dspam,' \
-		-e 's,/usr/local,/usr,' \
 		-i ${S}/webui/cgi-bin/dspam.cgi
-	sed -e 's,/var/dspam,/etc/mail/dspam,' \
-		-e 's,/usr/local,/usr,' \
-		-i ${S}/webui/cgi-bin/graph.cgi
 
+	cp -r ${S}/webui/htdocs/* ${D}/${MY_HTDOCSDIR} || die
+	cp -r ${S}/webui/cgi-bin/* ${D}/${MY_CGIBINDIR} || die
 	insinto ${MY_HTDOCSDIR}
 	insopts -m644 -o apache -g apache
-	doins ${S}/webui/htdocs/base.css
-	doins ${S}/webui/htdocs/dspam-logo-small.gif
-	doins ${S}/webui/cgi-bin/rgb.txt
-	doins ${S}/webui/cgi-bin/default.prefs
-	doins ${S}/webui/cgi-bin/admins
-	doins ${S}/webui/cgi-bin/configure.pl
 
 	newins ${FILESDIR}/htaccess .htaccess
 	newins ${FILESDIR}/htpasswd .htpasswd
 
-	insopts -m755 -o apache -g apache
-	doins ${S}/webui/cgi-bin/*.cgi
-
-	for CGI_SCRIPT in admin.cgi admingraph.cgi dspam.cgi graph.cgi; do
-		webapp_runbycgibin perl ${MY_HTDOCSDIR}/${CGI_SCRIPT}
+	#All files must be owned by server
+	cd ${D}/${MY_HTDOCSDIR}
+	for file in `find -type d -printf "%p/* "`; do
+		webapp_serverowned "${MY_HTDOCSDIR}/${file}"
 	done
 
-	dodir ${MY_HTDOCSDIR}/templates
-
-	insinto ${MY_HTDOCSDIR}/templates
-	doins ${S}/webui/cgi-bin/templates/*.html
-
 	#All files must be owned by server
-	cd ${D}${MY_HTDOCSDIR}
-	for x in `find . -type f -print` ; do
-		webapp_serverowned ${MY_HTDOCSDIR}/$x
+	cd ${D}/${MY_CGIBINDIR}
+	for file in `find -type d -printf "%p/* "`; do
+		webapp_serverowned "${MY_CGIBINDIR}/${file}"
 	done
 
 	webapp_src_install
diff --git a/www-apps/dspam-web/dspam-web-3.6.1.ebuild b/www-apps/dspam-web/dspam-web-3.6.1.ebuild
index ada5121f338f..a4a13de341b6 100644
--- a/www-apps/dspam-web/dspam-web-3.6.1.ebuild
+++ b/www-apps/dspam-web/dspam-web-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/www-apps/dspam-web/dspam-web-3.6.1.ebuild,v 1.1 2005/11/15 08:47:37 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/dspam-web-3.6.1.ebuild,v 1.1.1.1 2005/11/30 09:37:10 chriswhite Exp $
 
 inherit webapp eutils
 
diff --git a/www-apps/egroupware/ChangeLog b/www-apps/egroupware/ChangeLog
index 130312e928ed..e0ecb34d82f3 100644
--- a/www-apps/egroupware/ChangeLog
+++ b/www-apps/egroupware/ChangeLog
@@ -1,6 +1,211 @@
-# ChangeLog for dev-php/egroupware
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/egroupware/ChangeLog,v 1.1 2004/08/19 09:43:07 rl03 Exp $
+# ChangeLog for www-apps/egroupware
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/egroupware/ChangeLog,v 1.1.1.1 2005/11/30 09:37:09 chriswhite Exp $
+
+  25 Sep 2005; Renat Lumpau <rl03@gentoo.org> -egroupware-1.0.0.009.ebuild,
+  -egroupware-1.0.0.009_p2.ebuild:
+  Removing vulnerable versions
+
+  24 Sep 2005; Bryan Østergaard <kloeri@gentoo.org>
+  egroupware-1.0.0.009_p3.ebuild:
+  Stable on alpha, bug 106841.
+
+  24 Sep 2005; Simon Stelling <blubb@gentoo.org>
+  egroupware-1.0.0.009_p3.ebuild:
+  stable on amd64 wrt bug 106841
+
+  22 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
+  egroupware-1.0.0.009_p3.ebuild:
+  Stable on ppc.
+
+  22 Sep 2005; Renat Lumpau <rl03@gentoo.org>
+  egroupware-1.0.0.009_p3.ebuild:
+  Stable on x86
+
+*egroupware-1.0.0.009_p3 (21 Sep 2005)
+
+  21 Sep 2005; Renat Lumpau <rl03@gentoo.org>
+  +egroupware-1.0.0.009_p3.ebuild:
+  Version bump wrt security bug #106841.
+
+  18 Sep 2005; Bryan Østergaard <kloeri@gentoo.org>
+  egroupware-1.0.0.009_p2.ebuild:
+  Add back alpha keyword, bug 106002.
+
+  18 Sep 2005; Renat Lumpau <rl03@gentoo.org> -egroupware-1.0.0.008.ebuild,
+  -egroupware-1.0.0.008_p2.ebuild:
+  Cleaning old versions
+
+  18 Sep 2005; Renat Lumpau <rl03@gentoo.org>
+  egroupware-1.0.0.009_p2.ebuild:
+  Not using depend.php as it is not yet stable
+
+  18 Sep 2005; Bryan Østergaard <kloeri@gentoo.org>
+  egroupware-1.0.0.009_p2.ebuild:
+  Removing alpha keyword until the dev-lang/php problem is fixed.
+
+  18 Sep 2005; Bryan Østergaard <kloeri@gentoo.org>
+  egroupware-1.0.0.009_p2.ebuild:
+  Stable on alpha, bug 106002.
+
+  17 Sep 2005; Simon Stelling <blubb@gentoo.org>
+  egroupware-1.0.0.009_p2.ebuild:
+  stable on amd64 wrt bug 106002
+
+  15 Sep 2005; Renat Lumpau <rl03@gentoo.org>
+  egroupware-1.0.0.009_p2.ebuild:
+  Stable on x86 wrt bug #106002.
+
+  15 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
+  egroupware-1.0.0.009_p2.ebuild:
+  Stable on ppc.
+
+*egroupware-1.0.0.009_p2 (14 Sep 2005)
+
+  14 Sep 2005; Renat Lumpau <rl03@gentoo.org>
+  +egroupware-1.0.0.009_p2.ebuild:
+  Version bump wrt security bug #106002
+
+  24 Aug 2005; Homer Parker <hparker@gentoo.org>
+  egroupware-1.0.0.009.ebuild:
+  Stable on amd64.
+
+  24 Aug 2005; Homer Parker <hparker@gentoo.org> ChangeLog:
+  Stable on amd64.
+
+  21 Aug 2005; Renat Lumpau <rl03@gentoo.org> egroupware-1.0.0.009.ebuild:
+  Housekeeping
+
+  20 Aug 2005; Jose Luis Rivero <yoswink@gentoo.org>
+  egroupware-1.0.0.009.ebuild:
+  Stable on alpha wrt security bug #102374
+
+  17 Aug 2005; Renat Lumpau <rl03@gentoo.org> egroupware-1.0.0.009.ebuild:
+  stable on x86
+
+  16 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  egroupware-1.0.0.009.ebuild:
+  Stable on ppc.
+
+*egroupware-1.0.0.009 (16 Aug 2005)
+
+  16 Aug 2005; Renat Lumpau <rl03@gentoo.org> +egroupware-1.0.0.009.ebuild:
+  Version bump wrt security bug #102374.
+
+*egroupware-1.0.0.008_p2 (17 Jul 2005)
+
+  17 Jul 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  +egroupware-1.0.0.008_p2.ebuild:
+  Version bump
+
+  10 Jul 2005; Renat Lumpau <rl03@gentoo.org> -egroupware-1.0.0.007.ebuild:
+  Removed old versions
+
+  10 Jul 2005; Danny van Dyk <kugelfang@gentoo.org>
+  egroupware-1.0.0.008.ebuild:
+  Stable on amd64 wrt BUG #97651.
+
+*egroupware-1.0.0.008 (10 Jul 2005)
+
+  10 Jul 2005; Renat Lumpau <rl03@gentoo.org>
+  -files/egroupware-1.0.0.007-xmlrpc.patch, -egroupware-1.0.0.007-r1.ebuild,
+  +egroupware-1.0.0.008.ebuild:
+  Version bump wrt security bug 97651. Remove unnecessary 007-r1.
+
+  08 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  egroupware-1.0.0.007-r1.ebuild:
+  Stable on alpha, bug 97651.
+
+  06 Jul 2005; Michael Hanselmann <hansmi@gentoo.org>
+  egroupware-1.0.0.007-r1.ebuild:
+  Stable on ppc.
+
+*egroupware-1.0.0.007-r1 (06 Jul 2005)
+
+  06 Jul 2005; Stuart Herbert <stuart@gentoo.org>
+  +files/egroupware-1.0.0.007-xmlrpc.patch, +egroupware-1.0.0.007-r1.ebuild:
+  Patch for security bug #97651
+
+  24 Apr 2005; Martin Holzer <mholzer@gentoo.org>
+  egroupware-1.0.0.007.ebuild:
+  x86 stable
+
+  22 Apr 2005; Bryan Østergaard <kloeri@gentoo.org>
+  egroupware-1.0.0.007.ebuild:
+  Stable on alpha, bug 89517.
+
+  20 Apr 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  egroupware-1.0.0.007.ebuild:
+  Stable on amd64, bug 89517.
+
+  20 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  egroupware-1.0.0.007.ebuild:
+  Stable on ppc.
+
+*egroupware-1.0.0.007 (20 Apr 2005)
+
+  20 Apr 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +egroupware-1.0.0.007.ebuild:
+  Version bump for security bug 89517.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  08 Dec 2004; Karol Wojtaszek <sekretarz@gentoo.org>
+  egroupware-1.0.00.006.ebuild:
+  Stable on amd64, bug #70515
+
+  05 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
+  egroupware-1.0.00.006.ebuild:
+  Stable on alpha, bug 70515.
+
+  03 Dec 2004; <SeJo@gentoo.org> egroupware-1.0.00.006.ebuild:
+  stable on ppc gsla: 70515, btw i'm back!!!!
+
+*egroupware-1.0.00.006 (02 Dec 2004)
+
+  02 Dec 2004; Stuart Herbert <stuart@gentoo.org>
+  +egroupware-1.0.00.006.ebuild:
+  Version bump; addresses bug #70515
+
+*egroupware-1.0.00.005 (03 Nov 2004)
+
+  03 Nov 2004; Martin Holzer <mholzer@gentoo.org>
+  +egroupware-1.0.00.005.ebuild:
+  Version bumped.
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  egroupware-1.0.00.004.ebuild:
+  Masked egroupware-1.0.00.004.ebuild stable for ppc
+
+  03 Sep 2004; Renat Lumpau <rl03@gentoo.org> -egroupware-0.9.99.008.ebuild,
+  -egroupware-0.9.99.015.ebuild, -egroupware-1.0.00.003.ebuild:
+  Obsolete version; removed by eversionrm tool
+
+  30 Aug 2004; Renat Lumpau <rl03@gentoo.org> egroupware-1.0.00.003.ebuild,
+  egroupware-1.0.00.004.ebuild:
+  Fixed DEPEND/RDEPEND. Removed empty src_compile
+
+  25 Aug 2004; Bryan Østergaard <kloeri@gentoo.org>
+  egroupware-1.0.00.004.ebuild:
+  Stable on alpha, bug 61510.
+
+*egroupware-1.0.00.004 (25 Aug 2004)
+
+  25 Aug 2004; Renat Lumpau <rl03@gentoo.org> +egroupware-1.0.00.004.ebuild:
+  Version bump (security update, bug #61510)
+
+  25 Aug 2004; Renat Lumpau <rl03@gentoo.org> egroupware-1.0.00.003.ebuild:
+  Removed sleep. Fixed pkg_compile insanity.
+
+*egroupware-1.0.00.003 (19 Aug 2004)
+
+  19 Aug 2004; Renat Lumpau <rl03@gentoo.org> +files/postinstall-en.txt,
+  +egroupware-1.0.00.003.ebuild:
+  Version bump (bug #59778). Converted to use webapp.eclass (bug #53749).
 
 *egroupware-0.9.99.015 (19 Aug 2004)
 
@@ -14,7 +219,7 @@
   +egroupware-0.9.99.015.ebuild:
   Version bumped. Closes 53747
 
-  31 May 2004; Bryan �stergaard <kloeri@gentoo.org>
+  31 May 2004; Bryan Østergaard <kloeri@gentoo.org>
   egroupware-0.9.99.008.ebuild:
   Stable on alpha.
 
diff --git a/www-apps/egroupware/Manifest b/www-apps/egroupware/Manifest
index d8a47b770db1..5b434e3c1926 100644
--- a/www-apps/egroupware/Manifest
+++ b/www-apps/egroupware/Manifest
@@ -1,6 +1,15 @@
-MD5 254a1ae4a7080861d624c8b10afc5e42 egroupware-0.9.99.008.ebuild 1551
-MD5 34b376f52ca199fffb4e52b83169574a metadata.xml 156
-MD5 7fdd0f6c4f4e5f5fead1301ada6cbb13 ChangeLog 1713
-MD5 42e2f1aefd3bfe444e8e1ef7c9bd9681 egroupware-0.9.99.015.ebuild 1552
-MD5 da8e1975f63b112c72f732c2d6279354 files/digest-egroupware-0.9.99.008 77
-MD5 8885a0517fbc24b08c81bb3bb5678067 files/digest-egroupware-0.9.99.015 78
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 31794927c816e482e64aa85ebc7e41a0 egroupware-1.0.0.009_p3.ebuild 1421
+MD5 e9db2697420124cbfb4d5c6bd409ae3d ChangeLog 8175
+MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
+MD5 e76f8e156f0ad2ebdbdb725b9954d33f files/postinstall-en.txt 393
+MD5 e7f10c95953f8abeaa26b544b2ba30df files/digest-egroupware-1.0.0.009_p3 77
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDNsD5EzitwsaoONoRAtgoAKCjPa0ai1YHV3A1jvS2z/k8u4tsXQCdHrJy
+vLUwplMoVWTpIsk8vc2gcAc=
+=TID3
+-----END PGP SIGNATURE-----
diff --git a/www-apps/egroupware/egroupware-1.0.0.009_p3.ebuild b/www-apps/egroupware/egroupware-1.0.0.009_p3.ebuild
index 23325bcfce9c..854251d6d806 100644
--- a/www-apps/egroupware/egroupware-1.0.0.009_p3.ebuild
+++ b/www-apps/egroupware/egroupware-1.0.0.009_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/www-apps/egroupware/egroupware-1.0.0.009_p3.ebuild,v 1.1 2005/09/21 23:04:36 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/egroupware/egroupware-1.0.0.009_p3.ebuild,v 1.1.1.1 2005/11/30 09:37:10 chriswhite Exp $
 
 inherit webapp #depend.php
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.eGroupWare.org/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 ~hppa ppc ~sparc x86"
 IUSE="gd ldap"
 
 RDEPEND="virtual/php
diff --git a/www-apps/egroupware/files/postinstall-en.txt b/www-apps/egroupware/files/postinstall-en.txt
index 0b1325ab3ab7..da7ba0318f89 100644
--- a/www-apps/egroupware/files/postinstall-en.txt
+++ b/www-apps/egroupware/files/postinstall-en.txt
@@ -3,7 +3,7 @@ You are almost done!
 
 1. Restart your webserver and your database daemon.
 
-2. Point your browser to the URL http://<your_server_address>/egroupware/setup
+2. Point your browser to the URL http://${VHOST_HOSTNAME}/egroupware/setup
 and follow the install script.
 
 Don't forget to read the installation manual, available from 
diff --git a/www-apps/egroupware/metadata.xml b/www-apps/egroupware/metadata.xml
index 40dbb4c4bbaf..95c06f0095bb 100644
--- a/www-apps/egroupware/metadata.xml
+++ b/www-apps/egroupware/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+<herd>web-apps</herd>
 </pkgmetadata>
diff --git a/www-apps/freeradius-dialupadmin/ChangeLog b/www-apps/freeradius-dialupadmin/ChangeLog
index 80b1682af780..224e6cfe37d0 100644
--- a/www-apps/freeradius-dialupadmin/ChangeLog
+++ b/www-apps/freeradius-dialupadmin/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for www-apps/freeradius-dialupadmin
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/freeradius-dialupadmin/ChangeLog,v 1.1 2005/03/28 22:58:29 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/freeradius-dialupadmin/ChangeLog,v 1.1.1.1 2005/11/30 09:36:59 chriswhite Exp $
+
+  04 Oct 2005; Alin Nastac <mrness@gentoo.org>
+  -freeradius-dialupadmin-1.70.ebuild:
+  Remove obsolete test version.
+
+*freeradius-dialupadmin-1.70-r1 (06 Aug 2005)
+
+  06 Aug 2005; Alin Nastac <mrness@gentoo.org>
+  +files/freeradius-dialupadmin-1.70-sqldebug.patch,
+  +freeradius-dialupadmin-1.70-r1.ebuild:
+  Fix include paths to configuration files and disable sql debug, thanks to
+  Robert Withrow <witr@rwwa.com> (#101226).
+
+*freeradius-dialupadmin-1.70 (23 Jun 2005)
+
+  23 Jun 2005; Alin Nastac <mrness@gentoo.org>
+  -freeradius-dialupadmin-1.0.2.ebuild, +freeradius-dialupadmin-1.70.ebuild:
+  Correct version number - it does not share version with freeradius package.
 
 *freeradius-dialupadmin-1.0.2 (29 Mar 2005)
 
diff --git a/www-apps/freeradius-dialupadmin/Manifest b/www-apps/freeradius-dialupadmin/Manifest
index ec044cbab20d..bc3a921aa861 100644
--- a/www-apps/freeradius-dialupadmin/Manifest
+++ b/www-apps/freeradius-dialupadmin/Manifest
@@ -1,2 +1,16 @@
-MD5 c10a320de4c90f994c0b7d9ea8189f5a freeradius-dialupadmin-1.0.2.ebuild 2901
-MD5 5a26f9881af51aed070957e5fc4ed808 files/digest-freeradius-dialupadmin-1.0.2 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4f8a6a76fbb8578d3a99f52a37c5d0a0 freeradius-dialupadmin-1.70-r1.ebuild 1920
+MD5 6a4d4a90dd08f2220092c18fe2f6edc0 ChangeLog 1107
+MD5 c4dcaab5383cc9eb6c10a80049cb3f65 metadata.xml 525
+MD5 5a26f9881af51aed070957e5fc4ed808 files/digest-freeradius-dialupadmin-1.70-r1 69
+MD5 efcbf471e41edf8ce54ab910ad44945d files/setrootpath 184
+MD5 80e8e3fb8529fed61541dcfeaec0123a files/freeradius-dialupadmin-1.70-sqldebug.patch 370
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDQuUBNSP4Vda7IdsRAvTcAJ9obxPW36/X1gD+LfhTqNGZmBFgAgCeIKee
+zLMBn4tQPi/WR8zXwf10lqs=
+=xzfu
+-----END PGP SIGNATURE-----
diff --git a/www-apps/freeradius-dialupadmin/files/setrootpath b/www-apps/freeradius-dialupadmin/files/setrootpath
index 6098945fbcd4..d7d8d000d366 100644
--- a/www-apps/freeradius-dialupadmin/files/setrootpath
+++ b/www-apps/freeradius-dialupadmin/files/setrootpath
@@ -1,5 +1,6 @@
 #!/bin/sh
 
 if [ "$1" = "install" ]; then
-	sed -i -e "s:/usr/dialup_admin:${VHOST_ROOT}:" ${VHOST_ROOT}/conf/{._*admin.conf,admin.conf}
+	sed -i -e "s:/usr/dialup_admin:${VHOST_ROOT}:" ${VHOST_ROOT}/{conf/._*admin.conf,conf/admin.conf,bin/*}
+	chmod -R o-rwx ${VHOST_ROOT}/conf
 fi
diff --git a/www-apps/freeradius-dialupadmin/freeradius-dialupadmin-1.70-r1.ebuild b/www-apps/freeradius-dialupadmin/freeradius-dialupadmin-1.70-r1.ebuild
index e22585cebbbe..704b59c78fb5 100644
--- a/www-apps/freeradius-dialupadmin/freeradius-dialupadmin-1.70-r1.ebuild
+++ b/www-apps/freeradius-dialupadmin/freeradius-dialupadmin-1.70-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/www-apps/freeradius-dialupadmin/freeradius-dialupadmin-1.70-r1.ebuild,v 1.1 2005/08/06 11:28:03 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/freeradius-dialupadmin/freeradius-dialupadmin-1.70-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:59 chriswhite Exp $
 
 inherit eutils webapp
 MY_FREERADIUS_P="freeradius-1.0.2"
diff --git a/www-apps/gallery/ChangeLog b/www-apps/gallery/ChangeLog
index fcfaa41c034a..2a1d10052fcd 100644
--- a/www-apps/gallery/ChangeLog
+++ b/www-apps/gallery/ChangeLog
@@ -1,6 +1,160 @@
-# ChangeLog for app-misc/gallery
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/ChangeLog,v 1.1 2004/08/15 10:00:35 stuart Exp $
+# ChangeLog for www-apps/gallery
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/ChangeLog,v 1.1.1.1 2005/11/30 09:37:12 chriswhite Exp $
+
+  23 Oct 2005; Renat Lumpau <rl03@gentoo.org> -gallery-2.0.ebuild:
+  Removing vulnerable version
+
+*gallery-2.0.1 (23 Oct 2005)
+
+  23 Oct 2005; Renat Lumpau <rl03@gentoo.org> gallery-1.5.1.ebuild,
+  +gallery-2.0.1.ebuild:
+  Version bump wrt security bug #109255.
+
+*gallery-1.5.1 (22 Sep 2005)
+
+  22 Sep 2005; Renat Lumpau <rl03@gentoo.org> -gallery-1.5.1_rc3.ebuild,
+  +gallery-1.5.1.ebuild:
+  Version bump
+
+  13 Sep 2005; Renat Lumpau <rl03@gentoo.org> -gallery-2.0_rc1.ebuild,
+  -gallery-2.0_rc2.ebuild:
+  Cleaning old versions
+
+*gallery-2.0 (13 Sep 2005)
+
+  13 Sep 2005; Renat Lumpau <rl03@gentoo.org> +gallery-2.0.ebuild:
+  Version bump (bug #105784)
+
+  11 Sep 2005; Renat Lumpau <rl03@gentoo.org> -gallery-1.4.4_p6.ebuild:
+  Removing vulnerable version
+
+  05 Sep 2005; Simon Stelling <blubb@gentoo.org> gallery-1.5_p1.ebuild:
+  stable on amd64 wrt bug 104722
+
+  05 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> gallery-1.5_p1.ebuild:
+  Stable on hppa and ppc.
+
+  05 Sep 2005; Renat Lumpau <rl03@gentoo.org> gallery-1.5_p1.ebuild:
+  Stable on x86 wrt security bug #104722.
+
+  05 Sep 2005; Jose Luis Rivero <yoswink@gentoo.org> gallery-1.5_p1.ebuild:
+  Stable on alpha due to security bug #104722.
+
+  04 Sep 2005; Jason Wever <weeve@gentoo.org> gallery-1.5_p1.ebuild:
+  Stable on SPARC wrt security bug #104722.
+
+  03 Sep 2005; Renat Lumpau <rl03@gentoo.org> gallery-2.0_rc2.ebuild:
+  Added ffmpeg support to gallery2
+
+*gallery-1.5_p1 (03 Sep 2005)
+
+  03 Sep 2005; Renat Lumpau <rl03@gentoo.org> -gallery-1.5.ebuild,
+  +gallery-1.5_p1.ebuild:
+  Version bump wrt security bug #104722.
+
+*gallery-1.5.1_rc3 (03 Sep 2005)
+
+  03 Sep 2005; Renat Lumpau <rl03@gentoo.org> -gallery-1.5.1_rc2.ebuild,
+  +gallery-1.5.1_rc3.ebuild:
+  Version bump
+
+*gallery-2.0_rc2 (24 Aug 2005)
+
+  24 Aug 2005; Renat Lumpau <rl03@gentoo.org> +gallery-2.0_rc2.ebuild:
+  Version bump
+
+  21 Aug 2005; Renat Lumpau <rl03@gentoo.org> gallery-1.5.1_rc2.ebuild:
+  Housekeeping
+
+*gallery-2.0_rc1 (21 Aug 2005)
+*gallery-1.5.1_rc2 (21 Aug 2005)
+
+  21 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  +files/postinstall-en2.txt, +gallery-1.5.1_rc2.ebuild,
+  +gallery-2.0_rc1.ebuild:
+  Add unstable versions.
+
+  20 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt:
+  Fixed postinstall instructions wrt bug #103096.
+
+  30 Jun 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  gallery-1.5.ebuild:
+  Housekeeping. Fix #62405.
+
+*gallery-1.5 (01 May 2005)
+
+  01 May 2005; Elfyn McBratney <beu@gentoo.org> +gallery-1.5.ebuild:
+  Version bump, closes bug #89698.
+
+*gallery-1.4.4_p6 (07 Feb 2005)
+
+  07 Feb 2005; Scott W Taylor <swtaylor@gentoo.org>
+  +gallery-1.4.4_p6.ebuild:
+  version bump
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  06 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
+  gallery-1.4.4_p4.ebuild:
+  Stable on alpha, bug 69904.
+
+  05 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> gallery-1.4.4_p4.ebuild:
+  Stable on sparc wrt #69904
+
+  05 Nov 2004; <SeJo@gentoo.org> gallery-1.4.4_p4.ebuild:
+  stable on ppc bug: 69904
+
+*gallery-1.4.4_p4 (04 Nov 2004)
+
+  04 Nov 2004; Stuart Herbert <stuart@gentoo.org> +gallery-1.4.4_p4.ebuild:
+  Version bump; fix for bug #69904; thanks to Tom Hosiawa (tomek32@gmail.com)
+  for the ebuild
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  03 Sep 2004; Renat Lumpau <rl03@gentoo.org> -gallery-1.4.4_p1.ebuild:
+  Obsolete version; removed by eversionrm tool
+
+  03 Sep 2004; Renat Lumpau <rl03@gentoo.org> -gallery-1.4.4-r1.ebuild,
+  -gallery-1.4.4.ebuild:
+  Obsolete version; removed by eversionrm tool
+
+  30 Aug 2004; Renat Lumpau <rl03@gentoo.org> gallery-1.4.4-r1.ebuild,
+  gallery-1.4.4_p1.ebuild, gallery-1.4.4_p2.ebuild:
+  Fixed DEPEND, removed unnecessary src_unpack and src_compile
+
+*gallery-1.4.4_p2 (27 Aug 2004)
+
+  27 Aug 2004; Martin Holzer <mholzer@gentoo.org> gallery-1.4.4_p2.ebuild:
+  Security Bump. See 60742
+
+*gallery-1.4.4_p1 (27 Aug 2004)
+
+  27 Aug 2004; Martin Holzer <mholzer@gentoo.org> +gallery-1.4.4_p1.ebuild:
+  Version bumped. Closes 61164
+
+  27 Aug 2004; Guy Martin <gmsoft@gentoo.org> gallery-1.4.4-r1.ebuild:
+  Marked stable on hppa.
+
+  23 Aug 2004; Stuart Herbert <stuart@gentoo.org> files/vuln-20040817.diff,
+  gallery-1.4.4-r1.ebuild:
+  Fix syntax error in the patch, and mark stable on x86
+
+  20 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> gallery-1.4.4-r1.ebuild:
+  Stable on alpha, bug 60742.
+
+  19 Aug 2004; Jason Wever <weeve@gentoo.org> gallery-1.4.4-r1.ebuild:
+  Stable on sparc wrt securit bug #60742.
+
+*gallery-1.4.4-r1 (19 Aug 2004)
+
+  19 Aug 2004; Renat Lumpau <rl03@gentoo.org> +files/vuln-20040817.diff,
+  +gallery-1.4.4-r1.ebuild:
+  Fix for possible PHP insertion (bug #60742). Updated for webapp.eclass (bug
+  #58375).
 
 *gallery-1.4.3_p2 (15 Aug 2004)
 
@@ -30,7 +184,7 @@
   08 Jun 2004; Jason Wever <weeve@gentoo.org> gallery-1.4.3_p2.ebuild:
   Marked stable on sparc wrt bug #52798.
 
-  09 Jun 2004; Bryan �stergaard <kloeri@gentoo.org> gallery-1.4.3_p2.ebuild:
+  09 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> gallery-1.4.3_p2.ebuild:
   Stable on alpha.
 
 *gallery-1.4.3_p2 (04 Jun 2004)
@@ -43,7 +197,7 @@
   06 May 2004; Scott W Taylor <swtaylor@gentoo.org> +gallery-1.4.3_p1.ebuild:
   version bump
 
-  04 May 2004; Bryan �stergaard <kloeri@gentoo.org> gallery-1.4.1_p1.ebuild,
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> gallery-1.4.1_p1.ebuild,
   gallery-1.4.2.ebuild:
   Stable on alpha.
 
diff --git a/www-apps/gallery/Manifest b/www-apps/gallery/Manifest
index 049702b0aeb6..9547db1f639b 100644
--- a/www-apps/gallery/Manifest
+++ b/www-apps/gallery/Manifest
@@ -1,14 +1,20 @@
-MD5 ebb7be3df3a3c8d49f7c061bfb767ea7 ChangeLog 4079
-MD5 a634f343806b8f29e65d7dc37f55c151 gallery-1.4.1_p1.ebuild 1782
-MD5 af8bfec3bb8d80efd8bd338725e68a51 gallery-1.4.2.ebuild 1737
-MD5 9a2718e33c5a1117f12ace30d666f97a gallery-1.4.3.ebuild 1738
-MD5 0db9f0201bc0dea57d882671c72ef1f7 gallery-1.4.3_p1.ebuild 1741
-MD5 c3751d7c11ee91b539624a1728f38424 gallery-1.4.3_p2.ebuild 1763
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4d5507b46a55c4d8ed0d5bcbec9acbcf gallery-1.5_p1.ebuild 981
+MD5 ee46f62377995bf9784aa4bdde3fa290 gallery-2.0.1.ebuild 997
+MD5 73236b6975260c00097fd899ae3c7cba gallery-1.5.1.ebuild 986
+MD5 55982103c95f0f640d12cfcda8d60836 ChangeLog 9210
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
-MD5 c2edfb65e8ce3dddc52d8b82a447497a gallery-1.4.4.ebuild 1762
-MD5 d4812c8c0c1fad4c00cda3e8ad7bbe8a files/digest-gallery-1.4.1_p1 69
-MD5 44bf6fed00843f0654d7cfcb988beb36 files/digest-gallery-1.4.2 66
-MD5 4aa62ed7c1c8cd620528145cfc3a09c2 files/digest-gallery-1.4.3 66
-MD5 78950371f06d5607461f8f3feb91ecc7 files/digest-gallery-1.4.3_p1 70
-MD5 0b10bc559288d96d6521d6e48339e3b1 files/digest-gallery-1.4.3_p2 70
-MD5 763f3e84ab504c5f79b9bc2feaae0083 files/digest-gallery-1.4.4 66
+MD5 d86a2cffa618ecf7fe9a2b001be69523 files/postinstall-en.txt 430
+MD5 d8aa1a55fbfe46c99088bb0c360794f2 files/postinstall-en2.txt 770
+MD5 57ed8c8bd13cb72d366ece232dcc2fe9 files/digest-gallery-1.5.1 66
+MD5 333c010f344b786fc985f3f1bff279ff files/digest-gallery-2.0.1 71
+MD5 60f82816cecf216b054f0e889324bcde files/digest-gallery-1.5_p1 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDW+XGEzitwsaoONoRAi/hAKChzupa6OIgBmfM1FaQoWWX+ZMQcACfd2BP
+3u3lDkss5bIKU7bJx13VDnM=
+=k/og
+-----END PGP SIGNATURE-----
diff --git a/www-apps/gallery/files/postinstall-en.txt b/www-apps/gallery/files/postinstall-en.txt
index 164cd3b705d8..2543c1067cbd 100644
--- a/www-apps/gallery/files/postinstall-en.txt
+++ b/www-apps/gallery/files/postinstall-en.txt
@@ -1,7 +1,9 @@
 For new installations:

-- touch ${MY_INSTALLDIR}/.htaccess ${MY_INSTALLDIR}/config.php

-and 

-chown ${VHOST_SERVER_GID}:${VHOST_SERVER_UID} ${MY_INSTALLDIR}/.htaccess ${MY_INSTALLDIR}/config.php

+  touch ${MY_INSTALLDIR}/.htaccess ${MY_INSTALLDIR}/config.php

+  chown ${VHOST_SERVER_GID}:${VHOST_SERVER_UID} ${MY_INSTALLDIR}/.htaccess ${MY_INSTALLDIR}/config.php

 

-Then point your browser to http://yourhost/gallery/setup/

+Then create an albums directory and set permissions, e.g.,

+ chown ${VHOST_SERVER_GID}:${VHOST_SERVER_UID} my_albums_directory

+

+Now, point your browser to http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/setup/

 and follow the instructions.

diff --git a/www-apps/gallery/gallery-1.5.1.ebuild b/www-apps/gallery/gallery-1.5.1.ebuild
index 6d7f9a4af3cb..99ebb162f98e 100644
--- a/www-apps/gallery/gallery-1.5.1.ebuild
+++ b/www-apps/gallery/gallery-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/www-apps/gallery/gallery-1.5.1.ebuild,v 1.1 2005/09/22 22:22:17 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-1.5.1.ebuild,v 1.1.1.1 2005/11/30 09:37:12 chriswhite Exp $
 
 inherit webapp
 
@@ -16,7 +16,7 @@ IUSE="imagemagick"
 
 RDEPEND=">=net-www/apache-1.3.24-r1
 	virtual/php
-	>=media-gfx/jhead-1.6
+	>=media-gfx/jhead-2.2
 	app-arch/unzip
 	media-libs/jpeg
 	>=media-libs/netpbm-9.12
diff --git a/www-apps/gallery/gallery-1.5_p1.ebuild b/www-apps/gallery/gallery-1.5_p1.ebuild
index 4849808235e1..1aeddb144207 100644
--- a/www-apps/gallery/gallery-1.5_p1.ebuild
+++ b/www-apps/gallery/gallery-1.5_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/www-apps/gallery/gallery-1.5_p1.ebuild,v 1.1 2005/09/03 15:10:14 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-1.5_p1.ebuild,v 1.1.1.1 2005/11/30 09:37:12 chriswhite Exp $
 
 inherit webapp
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://gallery.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ppc sparc x86"
 IUSE="imagemagick"
 
 RDEPEND=">=net-www/apache-1.3.24-r1
diff --git a/www-apps/gallery/gallery-2.0.1.ebuild b/www-apps/gallery/gallery-2.0.1.ebuild
index f335a927a225..110fa87bf397 100644
--- a/www-apps/gallery/gallery-2.0.1.ebuild
+++ b/www-apps/gallery/gallery-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/www-apps/gallery/gallery-2.0.1.ebuild,v 1.1 2005/10/23 19:33:02 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-2.0.1.ebuild,v 1.1.1.1 2005/11/30 09:37:12 chriswhite Exp $
 
 inherit webapp
 
diff --git a/www-apps/gitweb/ChangeLog b/www-apps/gitweb/ChangeLog
index 98e528c6a316..e63d02091566 100644
--- a/www-apps/gitweb/ChangeLog
+++ b/www-apps/gitweb/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for www-apps/gitweb
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/gitweb/ChangeLog,v 1.1 2005/10/05 16:31:35 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gitweb/ChangeLog,v 1.1.1.1 2005/11/30 09:37:12 chriswhite Exp $
+
+  20 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org> gitweb-248.ebuild:
+  depend on at least git-0.99.8f
+
+*gitweb-248 (19 Oct 2005)
+
+  19 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org> -gitweb-247.ebuild,
+  +gitweb-248.ebuild:
+  version bump, remove old version
+
+  12 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org> gitweb-247.ebuild:
+  set +x on gitweb.cgi
+
+  06 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org> gitweb-247.ebuild:
+  add missing git dependency
 
 *gitweb-247 (05 Oct 2005)
 
diff --git a/www-apps/gitweb/Manifest b/www-apps/gitweb/Manifest
index 759054474511..986012379bac 100644
--- a/www-apps/gitweb/Manifest
+++ b/www-apps/gitweb/Manifest
@@ -1,6 +1,16 @@
-MD5 2c278e24e8af39c1e9740d1e740827e7 gitweb-247.ebuild 689
-MD5 be01bf97420f9f8b82b9e9a19af36f37 ChangeLog 285
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 867fbd1ee1a69082a652af185975c707 gitweb-248.ebuild 828
+MD5 aba2e724973c2933ef6bdbe41fc47482 ChangeLog 833
 MD5 b32bfee3c12fac430c39b4247b8ff31f metadata.xml 259
 MD5 f1a84515eba72a08a13816239fe73998 files/README.gentoo 1265
-MD5 9272f93dddc13f4407e7354314666e24 files/digest-gitweb-247 62
+MD5 75f526dcd49a41971749678634560e1b files/digest-gitweb-248 62
 MD5 ba79e998d31eedfab7871f5372d6890c files/postinstall-en.txt 93
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDV/yFViELBEf1JB0RAj0BAJ0bZE4kE75j8Kf1tPFD6CDk2ERiuQCeM4KE
+GjvY8Zf48nKw6o6bVa6Bcmk=
+=Mxcc
+-----END PGP SIGNATURE-----
diff --git a/www-apps/gitweb/gitweb-248.ebuild b/www-apps/gitweb/gitweb-248.ebuild
index 8a663f63bca1..a89c69b11d98 100644
--- a/www-apps/gitweb/gitweb-248.ebuild
+++ b/www-apps/gitweb/gitweb-248.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/gitweb/gitweb-248.ebuild,v 1.1 2005/10/19 15:42:39 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gitweb/gitweb-248.ebuild,v 1.1.1.1 2005/11/30 09:37:12 chriswhite Exp $
 
 inherit webapp
 
@@ -14,7 +14,7 @@ IUSE=""
 
 DEPEND=""
 RDEPEND="dev-lang/perl
->=dev-util/git-0.99.8a"
+>=dev-util/git-0.99.8f"
 
 src_install() {
 	webapp_src_preinst
diff --git a/www-apps/groupoffice/ChangeLog b/www-apps/groupoffice/ChangeLog
index 989438d2ff29..8e8f049b85c3 100644
--- a/www-apps/groupoffice/ChangeLog
+++ b/www-apps/groupoffice/ChangeLog
@@ -1,6 +1,43 @@
-# ChangeLog for dev-php/groupoffice
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/groupoffice/ChangeLog,v 1.1 2004/11/14 13:30:01 mholzer Exp $
+# ChangeLog for www-apps/groupoffice
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/groupoffice/ChangeLog,v 1.1.1.1 2005/11/30 09:36:56 chriswhite Exp $
+
+  22 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall2-en.txt:
+  Housekeeping
+
+  21 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall2-en.txt,
+  groupoffice-2.13.ebuild:
+  Housekeeping
+
+*groupoffice-2.13 (07 Jul 2005)
+
+  07 Jul 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall2-en.txt,
+  +groupoffice-2.13.ebuild:
+  Version bump (#88374).
+
+*groupoffice-2.12 (24 Apr 2005)
+
+  24 Apr 2005; Martin Holzer <mholzer@gentoo.org>
+  +files/postinstall2-en.txt, +groupoffice-2.12.ebuild:
+  Version bumped.
+
+*groupoffice-2.11a (28 Mar 2005)
+
+  28 Mar 2005; Martin Holzer <mholzer@gentoo.org> +groupoffice-2.11a.ebuild:
+  Version bumped. Closes 81653
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*groupoffice-2.10 (23 Nov 2004)
+
+  23 Nov 2004; Martin Holzer <mholzer@gentoo.org> +groupoffice-2.10.ebuild:
+  Version bumped.
+
+*groupoffice-2.09 (14 Nov 2004)
+
+  14 Nov 2004; Martin Holzer <mholzer@gentoo.org> +groupoffice-2.09.ebuild:
+  Version bumped.
 
 *groupoffice-2.07 (14 Nov 2004)
 
@@ -26,7 +63,7 @@
   groupoffice-2.05.ebuild:
   Typo in DESCRIPTION: powerfull -> powerful. Bug 59717.
 
-  31 May 2004; Bryan �stergaard <kloeri@gentoo.org> groupoffice-2.04.ebuild:
+  31 May 2004; Bryan Østergaard <kloeri@gentoo.org> groupoffice-2.04.ebuild:
   Stable on alpha.
 
 *groupoffice-2.05 (23 May 2004)
diff --git a/www-apps/groupoffice/Manifest b/www-apps/groupoffice/Manifest
index 302c891742d8..37ae66b83332 100644
--- a/www-apps/groupoffice/Manifest
+++ b/www-apps/groupoffice/Manifest
@@ -1,13 +1,28 @@
-MD5 3006ca18a54c02f245bf78e867fbcf39 groupoffice-2.04.ebuild 1862
-MD5 eb2e88d4f3c2fcd52562a2389e3a98a6 groupoffice-2.05.ebuild 1052
-MD5 62416a897f7cdb74221bbe1ee35472e0 groupoffice-2.06.ebuild 1053
-MD5 197e114eec0fbfaa2867990b885de5e7 groupoffice-2.02.ebuild 1863
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b04a05402ef560925b9358f13db57899 groupoffice-2.02.ebuild 1865
+MD5 ed5cc77434c59133d35e0c4714a5df57 groupoffice-2.04.ebuild 1864
+MD5 e9f8498d6bf6f5a848e20729343f85cb groupoffice-2.09.ebuild 955
+MD5 db3d765f32e22da52b933016fc38d493 groupoffice-2.10.ebuild 955
+MD5 b417702e37814a93777fe92611ab3123 groupoffice-2.11a.ebuild 956
+MD5 9af82c8e056682b507eaf5e9ff95011a groupoffice-2.12.ebuild 956
+MD5 ea00f276ebf42d01ad99cd393d7abd74 groupoffice-2.13.ebuild 1634
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
-MD5 dec0dcd54e24dc7cc6d790d89c434964 groupoffice-2.07.ebuild 954
-MD5 b148f10754b5627b5bdf7842c3420315 ChangeLog 2901
-MD5 f97b1d800d135c8cf64b6ce982b21e56 files/digest-groupoffice-2.05 146
-MD5 25de94b493244adff1a2a706f44ff5d3 files/digest-groupoffice-2.06 146
-MD5 03b0875f9af980cbeea34ed8a18f919b files/digest-groupoffice-2.07 146
+MD5 76c438f46da3c47bc3a9e74ba9bd93db ChangeLog 4250
 MD5 56c18997ce16cb2efd35f0cdfb679b67 files/digest-groupoffice-2.02 146
 MD5 0699a14fa9aca95a209915564dc81cd1 files/digest-groupoffice-2.04 146
+MD5 4de08382716b125fc1a27a1d5f6bb70b files/digest-groupoffice-2.09 73
+MD5 f26fd7d079d2d1b897e210d725f3f4e1 files/digest-groupoffice-2.10 73
+MD5 fb7074ba1a64d6bcecd6d5a55683497e files/digest-groupoffice-2.11a 74
+MD5 2ffc086e706637a4b29e375e2417a83b files/digest-groupoffice-2.12 73
+MD5 4f44d03fe37a5f608410fb1d13774f8c files/digest-groupoffice-2.13 73
 MD5 252288f5d0f5b81c836d57317005d1b7 files/postinstall-en.txt 403
+MD5 e7703a13bc262885858c5dd9baa5d8e8 files/postinstall2-en.txt 279
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDK/6kKf2g/qXtneoRAvcQAJkBWzORIoAqMzU76NkLQsya21XOrwCgsfiy
+PvwRUgLei8xS7QILBxYjtIs=
+=oIq9
+-----END PGP SIGNATURE-----
diff --git a/www-apps/groupoffice/files/postinstall2-en.txt b/www-apps/groupoffice/files/postinstall2-en.txt
index 7877f7a75ca2..7243fe2dabaf 100644
--- a/www-apps/groupoffice/files/postinstall2-en.txt
+++ b/www-apps/groupoffice/files/postinstall2-en.txt
@@ -1,19 +1,8 @@
-Follow the instructions at /usr/share/doc/${PF}/INSTALL
-to complete the install.  You need to add MySQL users
-and configure group-office 
+Now browse to http://${VHOST_HOSTNAME}/${VHOST_APPDIR}
+to complete the install.
 
-Before installing/configure you have to
-
-touch /var/www/localhost/htdocs/groupoffice/config.php
-chmod 0777 /var/www/localhost/htdocs/groupoffice/config.php
-mkdir /var/www/localhost/htdocs/groupoffice/local/
-chown apache:apache /var/www/localhost/htdocs/groupoffice/local/
-chmod 644 /var/www/localhost/htdocs/groupoffice/config.php
-rm -Rf /var/www/localhost/htdocs/groupoffice/install/
-
-
-After that, make groupoffice secure again
-chmod 644 /var/www/localhost/htdocs/groupoffice/config.php
-and
-rm -Rf /var/www/localhost/htdocs/groupoffice/install/
+Note: User data are stored in ${VHOST_ROOT}/groupoffice-<VERSION>/userdata
+Local data are stored in ${MY_INSTALLDIR}/local
 
+When you are done with the installation,
+rm -Rf ${MY_INSTALLDIR}/install/
diff --git a/www-apps/groupoffice/groupoffice-2.02.ebuild b/www-apps/groupoffice/groupoffice-2.02.ebuild
index 6541b770423e..9b6c620d3261 100644
--- a/www-apps/groupoffice/groupoffice-2.02.ebuild
+++ b/www-apps/groupoffice/groupoffice-2.02.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/www-apps/groupoffice/groupoffice-2.02.ebuild,v 1.1 2004/11/14 13:30:01 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/groupoffice/groupoffice-2.02.ebuild,v 1.1.1.1 2005/11/30 09:36:56 chriswhite Exp $
 
 inherit webapp-apache
 
diff --git a/www-apps/groupoffice/groupoffice-2.04.ebuild b/www-apps/groupoffice/groupoffice-2.04.ebuild
index 765baded0e3a..f71d421e00ef 100644
--- a/www-apps/groupoffice/groupoffice-2.04.ebuild
+++ b/www-apps/groupoffice/groupoffice-2.04.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/www-apps/groupoffice/groupoffice-2.04.ebuild,v 1.1 2004/11/14 13:30:01 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/groupoffice/groupoffice-2.04.ebuild,v 1.1.1.1 2005/11/30 09:36:56 chriswhite Exp $
 
 inherit webapp-apache
 
diff --git a/www-apps/groupoffice/groupoffice-2.09.ebuild b/www-apps/groupoffice/groupoffice-2.09.ebuild
index 03097807084c..57434a263d34 100644
--- a/www-apps/groupoffice/groupoffice-2.09.ebuild
+++ b/www-apps/groupoffice/groupoffice-2.09.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/www-apps/groupoffice/groupoffice-2.09.ebuild,v 1.1 2004/11/14 14:30:57 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/groupoffice/groupoffice-2.09.ebuild,v 1.1.1.1 2005/11/30 09:36:56 chriswhite Exp $
 
 inherit webapp
 
diff --git a/www-apps/groupoffice/groupoffice-2.10.ebuild b/www-apps/groupoffice/groupoffice-2.10.ebuild
index 6a9229433279..b8b90605f999 100644
--- a/www-apps/groupoffice/groupoffice-2.10.ebuild
+++ b/www-apps/groupoffice/groupoffice-2.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/www-apps/groupoffice/groupoffice-2.10.ebuild,v 1.1 2004/11/23 18:44:38 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/groupoffice/groupoffice-2.10.ebuild,v 1.1.1.1 2005/11/30 09:36:56 chriswhite Exp $
 
 inherit webapp
 
diff --git a/www-apps/groupoffice/groupoffice-2.11a.ebuild b/www-apps/groupoffice/groupoffice-2.11a.ebuild
index 28595b867c56..7509ace6e866 100644
--- a/www-apps/groupoffice/groupoffice-2.11a.ebuild
+++ b/www-apps/groupoffice/groupoffice-2.11a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/groupoffice/groupoffice-2.11a.ebuild,v 1.1 2005/03/28 13:54:54 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/groupoffice/groupoffice-2.11a.ebuild,v 1.1.1.1 2005/11/30 09:36:56 chriswhite Exp $
 
 inherit webapp
 
diff --git a/www-apps/groupoffice/groupoffice-2.12.ebuild b/www-apps/groupoffice/groupoffice-2.12.ebuild
index f1f038791414..d3d08bb0f8da 100644
--- a/www-apps/groupoffice/groupoffice-2.12.ebuild
+++ b/www-apps/groupoffice/groupoffice-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/www-apps/groupoffice/groupoffice-2.12.ebuild,v 1.1 2005/04/23 21:56:07 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/groupoffice/groupoffice-2.12.ebuild,v 1.1.1.1 2005/11/30 09:36:56 chriswhite Exp $
 
 inherit webapp
 
diff --git a/www-apps/groupoffice/groupoffice-2.13.ebuild b/www-apps/groupoffice/groupoffice-2.13.ebuild
index aaaaab78d0b2..450ec8a94516 100644
--- a/www-apps/groupoffice/groupoffice-2.13.ebuild
+++ b/www-apps/groupoffice/groupoffice-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/www-apps/groupoffice/groupoffice-2.13.ebuild,v 1.1 2005/07/07 16:57:47 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/groupoffice/groupoffice-2.13.ebuild,v 1.1.1.1 2005/11/30 09:36:56 chriswhite Exp $
 
 inherit eutils webapp
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/group-office/${PN}-com-${PV}.tar.gz"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~alpha ~amd64 ~sparc"
 IUSE=""
-DEPEND=">=virtual/php-4.3
+DEPEND="virtual/php
 	>=dev-db/mysql-4.0
 	net-www/apache"
 
diff --git a/www-apps/horde-accounts/ChangeLog b/www-apps/horde-accounts/ChangeLog
index bdbb3377be9a..1a47681cce5c 100644
--- a/www-apps/horde-accounts/ChangeLog
+++ b/www-apps/horde-accounts/ChangeLog
@@ -1,6 +1,24 @@
-# ChangeLog for net-www/horde-accounts
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-accounts/ChangeLog,v 1.1 2004/08/15 10:07:28 stuart Exp $
+# ChangeLog for www-apps/horde-accounts
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-accounts/ChangeLog,v 1.1.1.1 2005/11/30 09:37:13 chriswhite Exp $
+
+*horde-accounts-2.1.2 (26 Apr 2005)
+
+  26 Apr 2005; Mike Frysinger <vapier@gentoo.org>
+  +horde-accounts-2.1.2.ebuild:
+  Version bump for security #90365.
+
+*horde-accounts-2.1.1 (24 Dec 2004)
+
+  24 Dec 2004; Mike Frysinger <vapier@gentoo.org>
+  +horde-accounts-2.1.1.ebuild:
+  Version bump.
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  15 Aug 2004; Stuart Herbert <stuart@gentoo.org> horde-accounts-2.1.ebuild:
+  Updated dep to reflect net-www split
 
 *horde-accounts-2.1 (15 Aug 2004)
 
diff --git a/www-apps/horde-accounts/Manifest b/www-apps/horde-accounts/Manifest
index e0df748ca6ba..1bceef609d3a 100644
--- a/www-apps/horde-accounts/Manifest
+++ b/www-apps/horde-accounts/Manifest
@@ -1,4 +1,14 @@
-MD5 664aae311527938cdbbb885a904e5333 horde-accounts-2.1.ebuild 423
-MD5 930008f45adeddef6694a8366048ea5d ChangeLog 426
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 251e5d111a87e795e7e2f528b45211a1 metadata.xml 715
-MD5 bfa7a2b0dbc3620cbf7828acbd840d50 files/digest-horde-accounts-2.1 63
+MD5 96842db1225b6f0fe7c46dbdfef6557e horde-accounts-2.1.2.ebuild 425
+MD5 04cdc17f459e47f4e9c6cf603b4bc62e ChangeLog 1109
+MD5 14aa4056110daa95cf7b4f357bac970b files/digest-horde-accounts-2.1.2 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDMjKtgIKl8Uu19MoRAo6wAJ9lZJJL/PM4Bi3KM9t8ASmwWlPuegCfd1iH
+plkecTFlZyF4IaugyT2PQWo=
+=4V/0
+-----END PGP SIGNATURE-----
diff --git a/www-apps/horde-accounts/horde-accounts-2.1.2.ebuild b/www-apps/horde-accounts/horde-accounts-2.1.2.ebuild
index c0057bd2f263..036e23bbab59 100644
--- a/www-apps/horde-accounts/horde-accounts-2.1.2.ebuild
+++ b/www-apps/horde-accounts/horde-accounts-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/www-apps/horde-accounts/horde-accounts-2.1.2.ebuild,v 1.1 2005/04/26 02:53:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-accounts/horde-accounts-2.1.2.ebuild,v 1.1.1.1 2005/11/30 09:37:13 chriswhite Exp $
 
 inherit horde
 
diff --git a/www-apps/horde-chora/ChangeLog b/www-apps/horde-chora/ChangeLog
index 8731129f309d..c0978a2da84c 100644
--- a/www-apps/horde-chora/ChangeLog
+++ b/www-apps/horde-chora/ChangeLog
@@ -1,6 +1,27 @@
-# ChangeLog for net-www/horde-chora
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-chora/ChangeLog,v 1.1 2004/08/15 10:09:42 stuart Exp $
+# ChangeLog for www-apps/horde-chora
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-chora/ChangeLog,v 1.1.1.1 2005/11/30 09:37:03 chriswhite Exp $
+
+*horde-chora-2.0.1 (14 Oct 2005)
+
+  14 Oct 2005; Mike Frysinger <vapier@gentoo.org> +horde-chora-2.0.1.ebuild:
+  Version bump #109171 by Christoph Gysin.
+
+*horde-chora-1.2.3 (26 Apr 2005)
+
+  26 Apr 2005; Mike Frysinger <vapier@gentoo.org> +horde-chora-1.2.3.ebuild:
+  Version bump for security #90365.
+
+*horde-chora-2.0 (24 Dec 2004)
+
+  24 Dec 2004; Mike Frysinger <vapier@gentoo.org> +horde-chora-2.0.ebuild:
+  Version bump.
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  15 Aug 2004; Stuart Herbert <stuart@gentoo.org> horde-chora-1.2.2.ebuild:
+  Dep change to reflect net-www split
 
 *horde-chora-1.2.2 (15 Aug 2004)
 
diff --git a/www-apps/horde-chora/Manifest b/www-apps/horde-chora/Manifest
index 60e7aec581a4..336ada486e42 100644
--- a/www-apps/horde-chora/Manifest
+++ b/www-apps/horde-chora/Manifest
@@ -1,4 +1,18 @@
-MD5 90f115d9ab73f387d6c410805145478c horde-chora-1.2.2.ebuild 420
-MD5 ed1668667d8281d1add051e61eac4cef ChangeLog 1661
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1f7f3cb56482a3df635d87a78b232e37 ChangeLog 2468
+MD5 a70d78711aa4fc4e80c8d7a3c88bbfc9 files/digest-horde-chora-1.2.3 63
+MD5 16cdd2f4b43be853174134ca398fc621 files/digest-horde-chora-2.0 64
+MD5 413cb80f0fd8feeece68a77fe1f0b6ad files/digest-horde-chora-2.0.1 66
+MD5 ee4f3ef5b0a7060b87702f02afb7f56f horde-chora-1.2.3.ebuild 420
+MD5 e08f952811706da195652d7c4bd3ed8f horde-chora-2.0.1.ebuild 438
+MD5 1c022b77e69fc238589c4f34f4a357bc horde-chora-2.0.ebuild 436
 MD5 6365671491544cf2ce501433af5f560d metadata.xml 1387
-MD5 a3cb613cce208501c004fcffe708762b files/digest-horde-chora-1.2.2 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDTv99gIKl8Uu19MoRAmChAJ9y6mj9slY9pPSoZHpv6RpWW0xgUACdGKRH
+d/3aJm+wUz8U/5tYnbKOJtQ=
+=qGW0
+-----END PGP SIGNATURE-----
diff --git a/www-apps/horde-chora/horde-chora-1.2.3.ebuild b/www-apps/horde-chora/horde-chora-1.2.3.ebuild
index 2b9b13b359e8..20001ed9e372 100644
--- a/www-apps/horde-chora/horde-chora-1.2.3.ebuild
+++ b/www-apps/horde-chora/horde-chora-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/www-apps/horde-chora/horde-chora-1.2.3.ebuild,v 1.1 2005/04/26 02:54:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-chora/horde-chora-1.2.3.ebuild,v 1.1.1.1 2005/11/30 09:37:03 chriswhite Exp $
 
 inherit horde
 
diff --git a/www-apps/horde-chora/horde-chora-2.0.1.ebuild b/www-apps/horde-chora/horde-chora-2.0.1.ebuild
index 4659eedcbf81..51d18a51628e 100644
--- a/www-apps/horde-chora/horde-chora-2.0.1.ebuild
+++ b/www-apps/horde-chora/horde-chora-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/www-apps/horde-chora/horde-chora-2.0.1.ebuild,v 1.1 2005/10/14 00:42:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-chora/horde-chora-2.0.1.ebuild,v 1.1.1.1 2005/11/30 09:37:03 chriswhite Exp $
 
 HORDE_MAJ="-h3"
 inherit horde
diff --git a/www-apps/horde-chora/horde-chora-2.0.ebuild b/www-apps/horde-chora/horde-chora-2.0.ebuild
index e0ee5a8e7b07..8ea46f9405b9 100644
--- a/www-apps/horde-chora/horde-chora-2.0.ebuild
+++ b/www-apps/horde-chora/horde-chora-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/www-apps/horde-chora/horde-chora-2.0.ebuild,v 1.1 2004/12/24 07:58:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-chora/horde-chora-2.0.ebuild,v 1.1.1.1 2005/11/30 09:37:03 chriswhite Exp $
 
 HORDE_MAJ="-h3"
 inherit horde
diff --git a/www-apps/horde-forwards/ChangeLog b/www-apps/horde-forwards/ChangeLog
index 66fdb4afac69..710879feb0de 100644
--- a/www-apps/horde-forwards/ChangeLog
+++ b/www-apps/horde-forwards/ChangeLog
@@ -1,6 +1,24 @@
-# ChangeLog for net-www/horde-forwards
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-forwards/ChangeLog,v 1.1 2004/08/15 10:12:26 stuart Exp $
+# ChangeLog for www-apps/horde-forwards
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-forwards/ChangeLog,v 1.1.1.1 2005/11/30 09:36:58 chriswhite Exp $
+
+*horde-forwards-2.2.2 (26 Apr 2005)
+
+  26 Apr 2005; Mike Frysinger <vapier@gentoo.org>
+  +horde-forwards-2.2.2.ebuild:
+  Version bump for security #90365.
+
+*horde-forwards-2.2.1 (24 Dec 2004)
+
+  24 Dec 2004; Mike Frysinger <vapier@gentoo.org>
+  +horde-forwards-2.2.1.ebuild:
+  Version bump.
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  15 Aug 2004; Stuart Herbert <stuart@gentoo.org> horde-forwards-2.2.ebuild:
+  Deps updated to reflect net-www split
 
 *horde-forwards-2.2 (15 Aug 2004)
 
diff --git a/www-apps/horde-forwards/Manifest b/www-apps/horde-forwards/Manifest
index 2c4a35af98b8..90ccf4bc7ab5 100644
--- a/www-apps/horde-forwards/Manifest
+++ b/www-apps/horde-forwards/Manifest
@@ -1,4 +1,14 @@
-MD5 274ee038be0373c3ffc1a59f6da0f869 horde-forwards-2.2.ebuild 425
-MD5 2a8481304bcc8b3dd18c57faea1fc584 ChangeLog 557
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 01ab9567e584275bd867c6aac2d80dec metadata.xml 742
-MD5 907d5521c0362b3cdbab48406ca761fe files/digest-horde-forwards-2.2 64
+MD5 adf02af9d1589d081e4ca923fb5907e4 horde-forwards-2.2.2.ebuild 427
+MD5 1d9cc7b935d22a05b5e11fc21121a7ce ChangeLog 1241
+MD5 26b348af2ea14019f1bd3247e8e02150 files/digest-horde-forwards-2.2.2 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDMjGlgIKl8Uu19MoRAlttAJ9DtbfTFK8W3CWP9Cu0ueHTF4u1CgCcD7F1
+EujDsjj2fqVhLKIOtGlbqPE=
+=WhWB
+-----END PGP SIGNATURE-----
diff --git a/www-apps/horde-forwards/horde-forwards-2.2.2.ebuild b/www-apps/horde-forwards/horde-forwards-2.2.2.ebuild
index 7625dd9eef63..62f0e14810c7 100644
--- a/www-apps/horde-forwards/horde-forwards-2.2.2.ebuild
+++ b/www-apps/horde-forwards/horde-forwards-2.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/www-apps/horde-forwards/horde-forwards-2.2.2.ebuild,v 1.1 2005/04/26 02:53:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-forwards/horde-forwards-2.2.2.ebuild,v 1.1.1.1 2005/11/30 09:36:58 chriswhite Exp $
 
 inherit horde
 
diff --git a/www-apps/horde-gollem/ChangeLog b/www-apps/horde-gollem/ChangeLog
index 4f920a124d8f..9f8fea671f5b 100644
--- a/www-apps/horde-gollem/ChangeLog
+++ b/www-apps/horde-gollem/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for www-apps/horde-gollem
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-gollem/ChangeLog,v 1.1 2005/09/22 04:25:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-gollem/ChangeLog,v 1.1.1.1 2005/11/30 09:36:55 chriswhite Exp $
 
 *horde-gollem-1.0 (22 Sep 2005)
 
diff --git a/www-apps/horde-gollem/Manifest b/www-apps/horde-gollem/Manifest
index a1966f9541c0..7adda3462e57 100644
--- a/www-apps/horde-gollem/Manifest
+++ b/www-apps/horde-gollem/Manifest
@@ -1,4 +1,14 @@
-MD5 df7b9cb8aaba349bce3d45e694e2f7a1 metadata.xml 375
-MD5 39f923e5b8c6b041c40b4d20743b1c73 horde-gollem-1.0.ebuild 405
-MD5 57fcf16f2018eb46974b8955f2527320 ChangeLog 348
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c8532e9fff10dd851fb682c74d1138a0 metadata.xml 222
+MD5 3631d5cbc636f179b15dac7c091c0f1a horde-gollem-1.0.ebuild 409
+MD5 dcd588749154e1b197caa73d04e89907 ChangeLog 348
 MD5 40f7c605a2ca03bac11f3dbeaa96b63d files/digest-horde-gollem-1.0 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDMjJzgIKl8Uu19MoRAg2NAJ95M+pxr/UCBr4gVr74zgbvQQudbgCeJjTn
+78KGQOw7k+5CFJfXzOM7N2k=
+=5bN+
+-----END PGP SIGNATURE-----
diff --git a/www-apps/horde-gollem/horde-gollem-1.0.ebuild b/www-apps/horde-gollem/horde-gollem-1.0.ebuild
index c731be5f48fa..5110cb0ebff4 100644
--- a/www-apps/horde-gollem/horde-gollem-1.0.ebuild
+++ b/www-apps/horde-gollem/horde-gollem-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/www-apps/horde-gollem/horde-gollem-1.0.ebuild,v 1.1 2005/09/22 04:25:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-gollem/horde-gollem-1.0.ebuild,v 1.1.1.1 2005/11/30 09:36:55 chriswhite Exp $
 
 HORDE_MAJ="-h3"
 inherit horde
diff --git a/www-apps/horde-imp/ChangeLog b/www-apps/horde-imp/ChangeLog
index 9747ba95c326..54bc61509077 100644
--- a/www-apps/horde-imp/ChangeLog
+++ b/www-apps/horde-imp/ChangeLog
@@ -1,6 +1,56 @@
-# ChangeLog for net-www/horde-imp
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-imp/ChangeLog,v 1.1 2004/08/15 12:24:24 stuart Exp $
+# ChangeLog for www-apps/horde-imp
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-imp/ChangeLog,v 1.1.1.1 2005/11/30 09:36:57 chriswhite Exp $
+
+*horde-imp-4.0.4 (25 Oct 2005)
+
+  25 Oct 2005; Mike Frysinger <vapier@gentoo.org> +horde-imp-4.0.4.ebuild:
+  Version bump.
+
+*horde-imp-3.2.8 (26 Apr 2005)
+
+  26 Apr 2005; Mike Frysinger <vapier@gentoo.org> +horde-imp-3.2.8.ebuild:
+  Version bump for security #90365.
+
+*horde-imp-4.0.3 (16 Apr 2005)
+
+  16 Apr 2005; Mike Frysinger <vapier@gentoo.org> -horde-imp-4.0.2.ebuild,
+  +horde-imp-4.0.3.ebuild:
+  Version bump.
+
+*horde-imp-4.0.2 (23 Feb 2005)
+
+  23 Feb 2005; Mike Frysinger <vapier@gentoo.org> -horde-imp-4.0.1.ebuild,
+  +horde-imp-4.0.2.ebuild:
+  Version bump.
+
+*horde-imp-4.0.1 (16 Jan 2005)
+
+  16 Jan 2005; Mike Frysinger <vapier@gentoo.org> +horde-imp-4.0.1.ebuild:
+  Version bump.
+
+*horde-imp-3.2.7 (16 Jan 2005)
+
+  16 Jan 2005; Mike Frysinger <vapier@gentoo.org> +horde-imp-3.2.7.ebuild:
+  Version bump.
+
+*horde-imp-4.0 (24 Dec 2004)
+
+  24 Dec 2004; Mike Frysinger <vapier@gentoo.org> +horde-imp-4.0.ebuild:
+  Version bump.
+
+*horde-imp-3.2.6 (08 Nov 2004)
+
+  08 Nov 2004; Mike Frysinger <vapier@gentoo.org> -horde-imp-3.2.4.ebuild,
+  horde-imp-3.2.5.ebuild, +horde-imp-3.2.6.ebuild:
+  Version bump.
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  15 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org> horde-imp-3.2.4.ebuild,
+  horde-imp-3.2.5.ebuild:
+  net-www/horde -> www-apps/horde
 
 *horde-imp-3.2.4 (15 Aug 2004)
 
diff --git a/www-apps/horde-imp/Manifest b/www-apps/horde-imp/Manifest
index 9638e245f9e8..5a32532796b4 100644
--- a/www-apps/horde-imp/Manifest
+++ b/www-apps/horde-imp/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 7863b473560379f4d675e01c96392da3 ChangeLog 2521
-MD5 72fd082f3c962e2edcbc276b3487379e horde-imp-3.2.4.ebuild 423
+MD5 712846811b9aeadae3425bbcd1907a86 ChangeLog 4059
+MD5 30858165271c5a478adad508885c92c0 files/digest-horde-imp-3.2.8 62
+MD5 da42d451f00c3b4dea34d180e1be7b20 files/digest-horde-imp-4.0.3 65
+MD5 97425b6d30965775a0d1982df040c49b files/digest-horde-imp-4.0.4 65
+MD5 0769a91faa3fbaf0814b695daf190448 horde-imp-3.2.8.ebuild 423
+MD5 04d26b313ae468c9503e38928fb967cd horde-imp-4.0.3.ebuild 441
+MD5 c5cf5a1e0ce3b47a6add80e73029911a horde-imp-4.0.4.ebuild 441
 MD5 df7b9cb8aaba349bce3d45e694e2f7a1 metadata.xml 375
-MD5 28a3a6b869624b72f8b130baed692130 horde-imp-3.2.5.ebuild 421
-MD5 ab6319265637b2e97f326f84f3c42692 files/digest-horde-imp-3.2.4 62
-MD5 6dbc492bcf6051df18686a586ba309fb files/digest-horde-imp-3.2.5 62
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.8 (GNU/Linux)
-
-iD8DBQFBFcrmHTu7gpaalycRAlprAKCRuOAIUq8Idhk5Tx1RZZMeLWYa3wCePG75
-e6MZxCb2B1JMmV25DBOybR8=
-=9x0U
------END PGP SIGNATURE-----
diff --git a/www-apps/horde-imp/horde-imp-3.2.8.ebuild b/www-apps/horde-imp/horde-imp-3.2.8.ebuild
index a89ad36c8f79..943deb25d760 100644
--- a/www-apps/horde-imp/horde-imp-3.2.8.ebuild
+++ b/www-apps/horde-imp/horde-imp-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/www-apps/horde-imp/horde-imp-3.2.8.ebuild,v 1.1 2005/04/26 02:54:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-imp/horde-imp-3.2.8.ebuild,v 1.1.1.1 2005/11/30 09:36:57 chriswhite Exp $
 
 HORDE_PHP_FEATURES="imap"
 inherit horde
diff --git a/www-apps/horde-imp/horde-imp-4.0.3.ebuild b/www-apps/horde-imp/horde-imp-4.0.3.ebuild
index 4935ffa81a76..d18c9dab8dd6 100644
--- a/www-apps/horde-imp/horde-imp-4.0.3.ebuild
+++ b/www-apps/horde-imp/horde-imp-4.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/www-apps/horde-imp/horde-imp-4.0.3.ebuild,v 1.1 2005/04/16 09:24:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-imp/horde-imp-4.0.3.ebuild,v 1.1.1.1 2005/11/30 09:36:57 chriswhite Exp $
 
 HORDE_PHP_FEATURES="imap"
 HORDE_MAJ="-h3"
diff --git a/www-apps/horde-imp/horde-imp-4.0.4.ebuild b/www-apps/horde-imp/horde-imp-4.0.4.ebuild
index 9173aff49f8d..304ba623fc03 100644
--- a/www-apps/horde-imp/horde-imp-4.0.4.ebuild
+++ b/www-apps/horde-imp/horde-imp-4.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/www-apps/horde-imp/horde-imp-4.0.4.ebuild,v 1.1 2005/10/25 01:41:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-imp/horde-imp-4.0.4.ebuild,v 1.1.1.1 2005/11/30 09:36:57 chriswhite Exp $
 
 HORDE_PHP_FEATURES="imap"
 HORDE_MAJ="-h3"
diff --git a/www-apps/horde-ingo/ChangeLog b/www-apps/horde-ingo/ChangeLog
index 240701497f25..250daedc75dd 100644
--- a/www-apps/horde-ingo/ChangeLog
+++ b/www-apps/horde-ingo/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for www-apps/horde-ingo
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-ingo/ChangeLog,v 1.1 2004/12/24 07:56:41 vapier Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-ingo/ChangeLog,v 1.1.1.1 2005/11/30 09:36:59 chriswhite Exp $
+
+*horde-ingo-1.0.2 (14 Oct 2005)
+
+  14 Oct 2005; Mike Frysinger <vapier@gentoo.org> +horde-ingo-1.0.2.ebuild:
+  Version bump #109171 by Christoph Gysin.
+
+*horde-ingo-1.0.1 (23 Feb 2005)
+
+  23 Feb 2005; Mike Frysinger <vapier@gentoo.org> +horde-ingo-1.0.1.ebuild,
+  -horde-ingo-1.0.ebuild:
+  Version bump.
 
 *horde-ingo-1.0 (24 Dec 2004)
 
diff --git a/www-apps/horde-ingo/Manifest b/www-apps/horde-ingo/Manifest
index 6e2503113a01..eee3313e3b0d 100644
--- a/www-apps/horde-ingo/Manifest
+++ b/www-apps/horde-ingo/Manifest
@@ -1,4 +1,16 @@
-MD5 ff88fff21d778672bcea28bdf7fe9a6f ChangeLog 334
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 baf7cc63d7b6a4806d7015a9ee7e3545 ChangeLog 639
+MD5 1a21dfdc9c0407f29e76ecaf6c337909 files/digest-horde-ingo-1.0.1 65
+MD5 3a43843bc3183485e5dcd09069461cad files/digest-horde-ingo-1.0.2 65
+MD5 7b1e50f87fb2ceb5fe4f32ccad83ebb3 horde-ingo-1.0.1.ebuild 428
+MD5 2b269e148e3706ae4de4888249ad8b95 horde-ingo-1.0.2.ebuild 428
 MD5 e1bc808ac21e8a6f97dbaffbcf3c642d metadata.xml 298
-MD5 128c66cc16dbbaccfbbc87db97c81487 horde-ingo-1.0.ebuild 439
-MD5 25ea63bff2c75a15c37bfb7a1d7e4c98 files/digest-horde-ingo-1.0 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDTv8lgIKl8Uu19MoRAi5rAJ9kDXvmSmfRWx+zdkJy2N8mIPhm7ACfeCYN
+Nqe7C+S8gpFFb4Id4rrvXJk=
+=JyU9
+-----END PGP SIGNATURE-----
diff --git a/www-apps/horde-ingo/horde-ingo-1.0.1.ebuild b/www-apps/horde-ingo/horde-ingo-1.0.1.ebuild
index fd85cc823a9f..f950766385f6 100644
--- a/www-apps/horde-ingo/horde-ingo-1.0.1.ebuild
+++ b/www-apps/horde-ingo/horde-ingo-1.0.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/www-apps/horde-ingo/horde-ingo-1.0.1.ebuild,v 1.1 2005/02/23 23:05:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-ingo/horde-ingo-1.0.1.ebuild,v 1.1.1.1 2005/11/30 09:36:59 chriswhite Exp $
 
 HORDE_PHP_FEATURES="imap"
 HORDE_MAJ="-h3"
 inherit horde
 
-DESCRIPTION="Horde IMP provides webmail access to IMAP/POP3 mailboxes"
+DESCRIPTION="e-mail filter rules manager for Horde IMP"
 
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
 
diff --git a/www-apps/horde-ingo/horde-ingo-1.0.2.ebuild b/www-apps/horde-ingo/horde-ingo-1.0.2.ebuild
index 1fbc3867a7a7..57523456d6e2 100644
--- a/www-apps/horde-ingo/horde-ingo-1.0.2.ebuild
+++ b/www-apps/horde-ingo/horde-ingo-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/www-apps/horde-ingo/horde-ingo-1.0.2.ebuild,v 1.1 2005/10/14 00:41:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-ingo/horde-ingo-1.0.2.ebuild,v 1.1.1.1 2005/11/30 09:36:59 chriswhite Exp $
 
 HORDE_PHP_FEATURES="imap"
 HORDE_MAJ="-h3"
diff --git a/www-apps/horde-kronolith/ChangeLog b/www-apps/horde-kronolith/ChangeLog
index 4056dda06856..01c754f3cbed 100644
--- a/www-apps/horde-kronolith/ChangeLog
+++ b/www-apps/horde-kronolith/ChangeLog
@@ -1,6 +1,61 @@
-# ChangeLog for net-www/horde-kronolith
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-kronolith/ChangeLog,v 1.1 2004/08/15 12:26:37 stuart Exp $
+# ChangeLog for www-apps/horde-kronolith
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-kronolith/ChangeLog,v 1.1.1.1 2005/11/30 09:37:04 chriswhite Exp $
+
+*horde-kronolith-2.0.5 (15 Nov 2005)
+
+  15 Nov 2005; Mike Frysinger <vapier@gentoo.org>
+  +horde-kronolith-2.0.5.ebuild:
+  Version bump.
+
+*horde-kronolith-2.0.4 (25 Oct 2005)
+
+  25 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+  +horde-kronolith-2.0.4.ebuild:
+  Version bump #109599 by Christoph Gysin.
+
+*horde-kronolith-2.0.3 (07 May 2005)
+
+  07 May 2005; Mike Frysinger <vapier@gentoo.org>
+  +horde-kronolith-2.0.3.ebuild:
+  Version bump.
+
+*horde-kronolith-1.1.4 (26 Apr 2005)
+
+  26 Apr 2005; Mike Frysinger <vapier@gentoo.org>
+  +horde-kronolith-1.1.4.ebuild:
+  Version bump for security #90365.
+
+*horde-kronolith-2.0.2 (23 Feb 2005)
+
+  23 Feb 2005; Mike Frysinger <vapier@gentoo.org>
+  -horde-kronolith-2.0.1.ebuild, +horde-kronolith-2.0.2.ebuild:
+  Version bump.
+
+*horde-kronolith-2.0.1 (16 Jan 2005)
+
+  16 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  +horde-kronolith-2.0.1.ebuild:
+  Version bump.
+
+*horde-kronolith-1.1.3 (16 Jan 2005)
+
+  16 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  +horde-kronolith-1.1.3.ebuild:
+  Version bump.
+
+*horde-kronolith-2.0 (24 Dec 2004)
+
+  24 Dec 2004; Mike Frysinger <vapier@gentoo.org>
+  +horde-kronolith-2.0.ebuild:
+  Version bump.
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  15 Aug 2004; Stuart Herbert <stuart@gentoo.org>
+  horde-kronolith-1.1.2.ebuild:
+  Deps updated to reflect net-www split
 
 *horde-kronolith-1.1.2 (15 Aug 2004)
 
diff --git a/www-apps/horde-kronolith/Manifest b/www-apps/horde-kronolith/Manifest
index 7f368bd4081b..d8dc9542d751 100644
--- a/www-apps/horde-kronolith/Manifest
+++ b/www-apps/horde-kronolith/Manifest
@@ -1,4 +1,18 @@
-MD5 d5132c235bc00f029b999662c32fc203 horde-kronolith-1.1.2.ebuild 442
-MD5 e2451affd7b9311bc12d4c256effd527 ChangeLog 1785
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 098330644fb13b049a79417b2997e7f7 ChangeLog 3368
+MD5 c3d3a41e728426654d970b9531d841fc files/digest-horde-kronolith-1.1.4 67
+MD5 1892080bae87e2a1303692dcc56ca440 files/digest-horde-kronolith-2.0.4 71
+MD5 317ea579b149f10e3b61455dcab9009e files/digest-horde-kronolith-2.0.5 71
+MD5 d2c39d934e4acf12cfb67b4bc285c485 horde-kronolith-1.1.4.ebuild 445
+MD5 58998b6c07ffd61fa063d37aa0f08149 horde-kronolith-2.0.4.ebuild 463
+MD5 8296e0681e2c884f91f797fa67de2927 horde-kronolith-2.0.5.ebuild 463
 MD5 852eb8fe9390c47a540b8e248d128632 metadata.xml 1230
-MD5 94d65c6caba3a424d6a58706db30f20f files/digest-horde-kronolith-1.1.2 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDeSyRgIKl8Uu19MoRAqZoAJwMEIEZEtCtx8q//Yr/6vUyXpXI+wCfbWH4
+aylPqL/WySplDbcSgNMXGAc=
+=da5p
+-----END PGP SIGNATURE-----
diff --git a/www-apps/horde-kronolith/horde-kronolith-1.1.4.ebuild b/www-apps/horde-kronolith/horde-kronolith-1.1.4.ebuild
index 0339b1f529f3..0701c7bcb372 100644
--- a/www-apps/horde-kronolith/horde-kronolith-1.1.4.ebuild
+++ b/www-apps/horde-kronolith/horde-kronolith-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/www-apps/horde-kronolith/horde-kronolith-1.1.4.ebuild,v 1.1 2005/04/26 02:54:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-kronolith/horde-kronolith-1.1.4.ebuild,v 1.1.1.1 2005/11/30 09:37:04 chriswhite Exp $
 
 HORDE_PHP_FEATURES="-o mysql odbc postgres ldap"
 inherit horde
diff --git a/www-apps/horde-kronolith/horde-kronolith-2.0.4.ebuild b/www-apps/horde-kronolith/horde-kronolith-2.0.4.ebuild
index 12308863a4da..7bdbbcdf8d13 100644
--- a/www-apps/horde-kronolith/horde-kronolith-2.0.4.ebuild
+++ b/www-apps/horde-kronolith/horde-kronolith-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/www-apps/horde-kronolith/horde-kronolith-2.0.4.ebuild,v 1.1 2005/10/25 01:39:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-kronolith/horde-kronolith-2.0.4.ebuild,v 1.1.1.1 2005/11/30 09:37:04 chriswhite Exp $
 
 HORDE_PHP_FEATURES="-o mysql odbc postgres ldap"
 HORDE_MAJ="-h3"
diff --git a/www-apps/horde-kronolith/horde-kronolith-2.0.5.ebuild b/www-apps/horde-kronolith/horde-kronolith-2.0.5.ebuild
index 699485eaf8cc..151ea97ca46b 100644
--- a/www-apps/horde-kronolith/horde-kronolith-2.0.5.ebuild
+++ b/www-apps/horde-kronolith/horde-kronolith-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/www-apps/horde-kronolith/horde-kronolith-2.0.5.ebuild,v 1.1 2005/11/15 00:31:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-kronolith/horde-kronolith-2.0.5.ebuild,v 1.1.1.1 2005/11/30 09:37:04 chriswhite Exp $
 
 HORDE_PHP_FEATURES="-o mysql odbc postgres ldap"
 HORDE_MAJ="-h3"
diff --git a/www-apps/horde-mnemo/ChangeLog b/www-apps/horde-mnemo/ChangeLog
index 14fa25ec5d0b..c9d7f1d1e362 100644
--- a/www-apps/horde-mnemo/ChangeLog
+++ b/www-apps/horde-mnemo/ChangeLog
@@ -1,6 +1,40 @@
-# ChangeLog for net-www/horde-mnemo
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-mnemo/ChangeLog,v 1.1 2004/08/15 12:29:14 stuart Exp $
+# ChangeLog for www-apps/horde-mnemo
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-mnemo/ChangeLog,v 1.1.1.1 2005/11/30 09:36:54 chriswhite Exp $
+
+*horde-mnemo-2.0.2 (14 Oct 2005)
+
+  14 Oct 2005; Mike Frysinger <vapier@gentoo.org> +horde-mnemo-2.0.2.ebuild:
+  Version bump #109171 by Christoph Gysin.
+
+*horde-mnemo-1.1.4 (26 Apr 2005)
+
+  26 Apr 2005; Mike Frysinger <vapier@gentoo.org> +horde-mnemo-1.1.4.ebuild:
+  Version bump for security #90365.
+
+*horde-mnemo-2.0.1 (23 Feb 2005)
+
+  23 Feb 2005; Mike Frysinger <vapier@gentoo.org> +horde-mnemo-2.0.1.ebuild,
+  -horde-mnemo-2.0.ebuild:
+  Version bump.
+
+*horde-mnemo-1.1.3 (16 Jan 2005)
+
+  16 Jan 2005; Mike Frysinger <vapier@gentoo.org> -horde-mnemo-1.1.2.ebuild,
+  +horde-mnemo-1.1.3.ebuild:
+  Version bump.
+
+*horde-mnemo-2.0 (24 Dec 2004)
+
+  24 Dec 2004; Mike Frysinger <vapier@gentoo.org> +horde-mnemo-2.0.ebuild:
+  Version bump.
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  15 Aug 2004; Stuart Herbert <stuart@gentoo.org> horde-mnemo-1.1.1.ebuild,
+  horde-mnemo-1.1.2.ebuild:
+  Deps updated to reflect net-www split
 
 *horde-mnemo-1.1.2 (15 Aug 2004)
 
diff --git a/www-apps/horde-mnemo/Manifest b/www-apps/horde-mnemo/Manifest
index 56ebd5acd7bf..385794882a8d 100644
--- a/www-apps/horde-mnemo/Manifest
+++ b/www-apps/horde-mnemo/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 7733df942fbe683590d49168477ae03d ChangeLog 671
-MD5 d6cb5553bf5311e4e1acac0f1562cd80 horde-mnemo-1.1.2.ebuild 420
+MD5 119a0a126ae50521b3dae8d1ec30f198 ChangeLog 1850
+MD5 3308ae704f3012264a5e59587930c0b8 files/digest-horde-mnemo-1.1.4 63
+MD5 5ccd7c89dea9941c4766ab82ae4f3458 files/digest-horde-mnemo-2.0.1 66
+MD5 99bcb3b12079119975fb200553a4cb7a files/digest-horde-mnemo-2.0.2 66
+MD5 6cad54738ea2ced39092787a784f7107 horde-mnemo-1.1.4.ebuild 425
+MD5 468ea3364330c3b3a1988dd9f4d5c5a3 horde-mnemo-2.0.1.ebuild 443
+MD5 00625cbf2000919edbe7c760a5c671f9 horde-mnemo-2.0.2.ebuild 443
 MD5 c14b95659ea882d1d9a416001fc1463e metadata.xml 284
-MD5 4f241b2945a8bb6a8a18a1efb65f7f30 horde-mnemo-1.1.1.ebuild 422
-MD5 4d3025519de243051ffc0a33708b4aca files/digest-horde-mnemo-1.1.2 63
-MD5 9c8bb21f3df2d0dff58c96d056d76fad files/digest-horde-mnemo-1.1.1 63
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.8 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFBFcr9HTu7gpaalycRAiAEAJ9vQorNuZnBBlBQXUgVEvcmgN56zgCdGZUa
-jJ8LT9uxOSqpkwCl7jTA08I=
-=LSPd
+iD8DBQFDTv8ugIKl8Uu19MoRAl8xAJ9nD9KKczxWfYgRPrUcNxGtAsql9wCfWT2n
+KR7voqpwxD3/SrbeSETao80=
+=MD56
 -----END PGP SIGNATURE-----
diff --git a/www-apps/horde-mnemo/horde-mnemo-1.1.4.ebuild b/www-apps/horde-mnemo/horde-mnemo-1.1.4.ebuild
index b8352d5a5a7f..2d594d79f31a 100644
--- a/www-apps/horde-mnemo/horde-mnemo-1.1.4.ebuild
+++ b/www-apps/horde-mnemo/horde-mnemo-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/www-apps/horde-mnemo/horde-mnemo-1.1.4.ebuild,v 1.1 2005/04/26 02:54:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-mnemo/horde-mnemo-1.1.4.ebuild,v 1.1.1.1 2005/11/30 09:36:54 chriswhite Exp $
 
 HORDE_PHP_FEATURES="-o mysql odbc postgres ldap"
 inherit horde
diff --git a/www-apps/horde-mnemo/horde-mnemo-2.0.1.ebuild b/www-apps/horde-mnemo/horde-mnemo-2.0.1.ebuild
index f4eeb353e727..b28de6ee8acf 100644
--- a/www-apps/horde-mnemo/horde-mnemo-2.0.1.ebuild
+++ b/www-apps/horde-mnemo/horde-mnemo-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/www-apps/horde-mnemo/horde-mnemo-2.0.1.ebuild,v 1.1 2005/02/23 23:05:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-mnemo/horde-mnemo-2.0.1.ebuild,v 1.1.1.1 2005/11/30 09:36:54 chriswhite Exp $
 
 HORDE_PHP_FEATURES="-o mysql odbc postgres ldap"
 HORDE_MAJ="-h3"
diff --git a/www-apps/horde-mnemo/horde-mnemo-2.0.2.ebuild b/www-apps/horde-mnemo/horde-mnemo-2.0.2.ebuild
index d133a0588437..a5cf21fa2259 100644
--- a/www-apps/horde-mnemo/horde-mnemo-2.0.2.ebuild
+++ b/www-apps/horde-mnemo/horde-mnemo-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/www-apps/horde-mnemo/horde-mnemo-2.0.2.ebuild,v 1.1 2005/10/14 00:41:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-mnemo/horde-mnemo-2.0.2.ebuild,v 1.1.1.1 2005/11/30 09:36:54 chriswhite Exp $
 
 HORDE_PHP_FEATURES="-o mysql odbc postgres ldap"
 HORDE_MAJ="-h3"
diff --git a/www-apps/horde-nag/ChangeLog b/www-apps/horde-nag/ChangeLog
index f1c35038e6bc..881907da2af0 100644
--- a/www-apps/horde-nag/ChangeLog
+++ b/www-apps/horde-nag/ChangeLog
@@ -1,6 +1,44 @@
-# ChangeLog for net-www/horde-nag
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-nag/ChangeLog,v 1.1 2004/08/15 12:31:30 stuart Exp $
+# ChangeLog for www-apps/horde-nag
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-nag/ChangeLog,v 1.1.1.1 2005/11/30 09:36:57 chriswhite Exp $
+
+*horde-nag-2.0.3 (25 Oct 2005)
+
+  25 Oct 2005; Mike Frysinger <vapier@gentoo.org> +horde-nag-2.0.3.ebuild:
+  Version bump.
+
+*horde-nag-2.0.2 (07 Aug 2005)
+
+  07 Aug 2005; Mike Frysinger <vapier@gentoo.org> +horde-nag-2.0.2.ebuild:
+  Version bump.
+
+*horde-nag-1.1.3 (26 Apr 2005)
+
+  26 Apr 2005; Mike Frysinger <vapier@gentoo.org> +horde-nag-1.1.3.ebuild:
+  Version bump for security #90365.
+
+*horde-nag-2.0.1 (23 Feb 2005)
+
+  23 Feb 2005; Mike Frysinger <vapier@gentoo.org> +horde-nag-2.0.1.ebuild,
+  -horde-nag-2.0.ebuild:
+  Version bump.
+
+*horde-nag-1.1.2 (16 Jan 2005)
+
+  16 Jan 2005; Mike Frysinger <vapier@gentoo.org> -horde-nag-1.1.1.ebuild,
+  +horde-nag-1.1.2.ebuild:
+  Version bump.
+
+*horde-nag-2.0 (24 Dec 2004)
+
+  24 Dec 2004; Mike Frysinger <vapier@gentoo.org> +horde-nag-2.0.ebuild:
+  Version bump.
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  15 Aug 2004; Stuart Herbert <stuart@gentoo.org> horde-nag-1.1.1.ebuild:
+  Deps updated to reflect net-www split
 
 *horde-nag-1.1.1 (15 Aug 2004)
 
diff --git a/www-apps/horde-nag/Manifest b/www-apps/horde-nag/Manifest
index 3df08c7523dc..fba3c4dff507 100644
--- a/www-apps/horde-nag/Manifest
+++ b/www-apps/horde-nag/Manifest
@@ -1,4 +1,8 @@
-MD5 c7213b1e5cea7daeb53649dcc3b87657 horde-nag-1.1.1.ebuild 431
-MD5 da15dff3ee85a50fc891e6713ffcdd3c ChangeLog 445
+MD5 57b3eb9b8e11e5bba91f05d25927b363 ChangeLog 1630
+MD5 66abde609e86dcbe7c35aab0cbb19ac7 files/digest-horde-nag-1.1.3 61
+MD5 a5e37b8aaaaff48efec348b88dc65a1b files/digest-horde-nag-2.0.2 65
+MD5 688597260465d44a164c488b71608cfe files/digest-horde-nag-2.0.3 65
+MD5 351685ba89f1629a6beceb1465731fea horde-nag-1.1.3.ebuild 434
+MD5 31c36250e7aa87d07579b240b69a2cfd horde-nag-2.0.2.ebuild 452
+MD5 2ddd318c4d13fccdef1cef6c22c06c07 horde-nag-2.0.3.ebuild 452
 MD5 6d4c399f10b562f26c52f03f47275f66 metadata.xml 305
-MD5 ed87062d38fb658a4109dc36e44afceb files/digest-horde-nag-1.1.1 61
diff --git a/www-apps/horde-nag/horde-nag-1.1.3.ebuild b/www-apps/horde-nag/horde-nag-1.1.3.ebuild
index 40abc79a673b..5944b0fd338f 100644
--- a/www-apps/horde-nag/horde-nag-1.1.3.ebuild
+++ b/www-apps/horde-nag/horde-nag-1.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/www-apps/horde-nag/horde-nag-1.1.3.ebuild,v 1.1 2005/04/26 02:53:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-nag/horde-nag-1.1.3.ebuild,v 1.1.1.1 2005/11/30 09:36:57 chriswhite Exp $
 
 HORDE_PHP_FEATURES="-o mysql odbc postgres ldap"
 inherit horde
diff --git a/www-apps/horde-nag/horde-nag-2.0.2.ebuild b/www-apps/horde-nag/horde-nag-2.0.2.ebuild
index fed50a25c09a..d453e69cdb67 100644
--- a/www-apps/horde-nag/horde-nag-2.0.2.ebuild
+++ b/www-apps/horde-nag/horde-nag-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/www-apps/horde-nag/horde-nag-2.0.2.ebuild,v 1.1 2005/08/07 21:58:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-nag/horde-nag-2.0.2.ebuild,v 1.1.1.1 2005/11/30 09:36:57 chriswhite Exp $
 
 HORDE_PHP_FEATURES="-o mysql odbc postgres ldap"
 HORDE_MAJ="-h3"
diff --git a/www-apps/horde-nag/horde-nag-2.0.3.ebuild b/www-apps/horde-nag/horde-nag-2.0.3.ebuild
index ca2f1b4ab811..b235e8a5769c 100644
--- a/www-apps/horde-nag/horde-nag-2.0.3.ebuild
+++ b/www-apps/horde-nag/horde-nag-2.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/www-apps/horde-nag/horde-nag-2.0.3.ebuild,v 1.1 2005/10/25 01:42:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-nag/horde-nag-2.0.3.ebuild,v 1.1.1.1 2005/11/30 09:36:57 chriswhite Exp $
 
 HORDE_PHP_FEATURES="-o mysql odbc postgres ldap"
 HORDE_MAJ="-h3"
diff --git a/www-apps/horde-passwd/ChangeLog b/www-apps/horde-passwd/ChangeLog
index d52e057a7ff0..c09b36a240c9 100644
--- a/www-apps/horde-passwd/ChangeLog
+++ b/www-apps/horde-passwd/ChangeLog
@@ -1,6 +1,25 @@
-# ChangeLog for net-www/horde-passwd
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-passwd/ChangeLog,v 1.1 2004/08/15 12:34:02 stuart Exp $
+# ChangeLog for www-apps/horde-passwd
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-passwd/ChangeLog,v 1.1.1.1 2005/11/30 09:37:10 chriswhite Exp $
+
+*horde-passwd-3.0 (14 Oct 2005)
+
+  14 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/horde-passwd-3.0-no-clear-password.patch, +horde-passwd-3.0.ebuild:
+  Version bump #109171 by Christoph Gysin.
+
+*horde-passwd-2.2.2 (26 Apr 2005)
+
+  26 Apr 2005; Mike Frysinger <vapier@gentoo.org>
+  +horde-passwd-2.2.2.ebuild:
+  Version bump for security #90365.
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  15 Aug 2004; Stuart Herbert <stuart@gentoo.org> horde-passwd-2.2.1.ebuild,
+  horde-passwd-2.2.ebuild:
+  Deps updated to reflect net-www split
 
 *horde-passwd-2.2 (15 Aug 2004)
 
diff --git a/www-apps/horde-passwd/Manifest b/www-apps/horde-passwd/Manifest
index 1849e96997fb..566a7c8504e0 100644
--- a/www-apps/horde-passwd/Manifest
+++ b/www-apps/horde-passwd/Manifest
@@ -1,20 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 82242b22737e554961d4e5033ede0a05 ChangeLog 661
-MD5 075dd9cd7a01fc419c1871899d0b5b2f horde-passwd-2.2.ebuild 400
-MD5 536fc68713fc6d618f6ac8c02145bddb metadata.xml 687
-MD5 bd63b9fce4e434f960e2caff5189a4a5 horde-passwd-2.2.1.ebuild 686
-MD5 7bcd285ae78e88952238b0935d4387f7 files/digest-horde-passwd-2.2 62
-MD5 e73821bef4d5298d35f771b3d496b8b3 files/digest-horde-passwd-2.2.1 64
-MD5 57778ef05cbb06b1e142a98592d3f18c files/2.2.1-crypt-support.patch 3959
-MD5 41137756c734ffcc398b429aacb06634 files/2.2.1-example-backend-setup.patch 1047
-MD5 b47a9e2b4ef864a7b9a4937c7bd24ae6 files/2.2.1-main.php-typo.patch 840
+MD5 0bc2a4576b17ab0d4518895dbeb430f3 ChangeLog 1610
 MD5 90a30b8eff0510043a20370d85462e3d files/2.2.1-no-clear-password.patch 496
+MD5 a11c3fe18a03687a5e83771b2555b370 files/digest-horde-passwd-2.2.2 64
+MD5 9a059ac5faff646369e70fe84762ecac files/digest-horde-passwd-3.0 65
+MD5 a663a0df1829b79b8197da762868127a files/horde-passwd-3.0-no-clear-password.patch 424
+MD5 13a1020cf3bd92179d5ed3f108169933 horde-passwd-2.2.2.ebuild 546
+MD5 69f1e1f6a4b43b705625d9ae6efa871b horde-passwd-3.0.ebuild 563
+MD5 536fc68713fc6d618f6ac8c02145bddb metadata.xml 687
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.8 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFBGZABHTu7gpaalycRAtq7AJ0VtS43SOp7s2LMwZPvHXkJymEtRwCgq5Pc
-ClsA9VTwra7d3P4et+6vI84=
-=5gOA
+iD8DBQFDTv7lgIKl8Uu19MoRAhexAJ9ZJlFezn6NuAWpp5c41jIUEnYcpgCdEtQr
+SM7s4rH9iCJeZYBQUbRYtiU=
+=FiGM
 -----END PGP SIGNATURE-----
diff --git a/www-apps/horde-passwd/horde-passwd-2.2.2.ebuild b/www-apps/horde-passwd/horde-passwd-2.2.2.ebuild
index 1f3041c94e52..f2bd7c3f88d0 100644
--- a/www-apps/horde-passwd/horde-passwd-2.2.2.ebuild
+++ b/www-apps/horde-passwd/horde-passwd-2.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/www-apps/horde-passwd/horde-passwd-2.2.2.ebuild,v 1.1 2005/04/26 02:54:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-passwd/horde-passwd-2.2.2.ebuild,v 1.1.1.1 2005/11/30 09:37:10 chriswhite Exp $
 
 inherit horde eutils
 
diff --git a/www-apps/horde-passwd/horde-passwd-3.0.ebuild b/www-apps/horde-passwd/horde-passwd-3.0.ebuild
index 023d3042a9b5..4dc8200526cf 100644
--- a/www-apps/horde-passwd/horde-passwd-3.0.ebuild
+++ b/www-apps/horde-passwd/horde-passwd-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/www-apps/horde-passwd/horde-passwd-3.0.ebuild,v 1.1 2005/10/14 00:40:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-passwd/horde-passwd-3.0.ebuild,v 1.1.1.1 2005/11/30 09:37:10 chriswhite Exp $
 
 HORDE_MAJ="-h3"
 inherit horde eutils
diff --git a/www-apps/horde-pear/ChangeLog b/www-apps/horde-pear/ChangeLog
index 2da818f2ee26..2502b039ba62 100644
--- a/www-apps/horde-pear/ChangeLog
+++ b/www-apps/horde-pear/ChangeLog
@@ -1,6 +1,56 @@
-# ChangeLog for net-www/horde-pear
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-pear/ChangeLog,v 1.1 2004/08/15 12:36:30 stuart Exp $
+# ChangeLog for www-apps/horde-pear
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-pear/ChangeLog,v 1.1.1.1 2005/11/30 09:37:13 chriswhite Exp $
+
+  18 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  horde-pear-1.3-r3.ebuild:
+  Stable on ppc.
+
+  06 May 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  horde-pear-1.3-r3.ebuild:
+  Stable on sparc wrt #84525
+
+  11 Apr 2005; Roy Marples <uberlord@gentoo.org> horde-pear-1.3-r3.ebuild:
+  RDEPEND on dev-php/PEAR-Mail - fixes #87362
+
+  06 Apr 2005; Markus Rothe <corsair@gentoo.org> horde-pear-1.3-r3.ebuild:
+  Stable on ppc64
+
+  27 Mar 2005; Bryan Østergaard <kloeri@gentoo.org>
+  horde-pear-1.3-r3.ebuild:
+  Stable on alpha.
+
+  20 Mar 2005; Sebastian Bergmann <sebastian@gentoo.org>
+  horde-pear-1.3-r3.ebuild:
+  Reduced the RDEPENDencies to the PEAR packages that are listed in
+  http://cvs.horde.org/co.php/horde/docs/INSTALL.
+
+  12 Mar 2005; Sebastian Bergmann <sebastian@gentoo.org>
+  horde-pear-1.3-r3.ebuild:
+  Stable on x86 and amd64, see bug 84525.
+
+  09 Mar 2005; Markus Rothe <corsair@gentoo.org> horde-pear-1.3-r3.ebuild:
+  Added ~ppc64 to KEYWORDS; bug #84525
+
+  09 Mar 2005; Sebastian Bergmann <sebastian@gentoo.org>
+  horde-pear-1.3-r3.ebuild:
+  Mark unstable for ARCHes that www-apps/horde-pear-r2 is marked stable for.
+
+*horde-pear-1.3-r3 (19 Feb 2005)
+
+  19 Feb 2005; Sebastian Bergmann <sebastian@gentoo.org>
+  +horde-pear-1.3-r3.ebuild:
+  Make this a meta-ebuild that RDEPENDS on the required PEAR packages, see bug
+  82100.
+
+*horde-pear-1.3-r2 (15 Feb 2005)
+
+  15 Feb 2005; Sebastian Bergmann <sebastian@gentoo.org>
+  +horde-pear-1.3-r2.ebuild:
+  Fix bug 79684.
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
 
 *horde-pear-1.3-r1 (15 Aug 2004)
 
diff --git a/www-apps/horde-pear/Manifest b/www-apps/horde-pear/Manifest
index 64ac85572813..f062318d2ae3 100644
--- a/www-apps/horde-pear/Manifest
+++ b/www-apps/horde-pear/Manifest
@@ -1,14 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 6acec9d7e3cebcf75f39610080c57852 ChangeLog 1226
+MD5 26f9508ab1e7fa9b49b9866bb7664010 horde-pear-1.3-r2.ebuild 865
 MD5 ed43df3a2681ce4431c0e2bb80ea1e2f metadata.xml 597
-MD5 67a84483cb416d42fb77b8500c2173fc horde-pear-1.3-r1.ebuild 770
+MD5 3603874073aef03be538d5cf894d5b59 ChangeLog 2977
+MD5 732dc815f69e535465bf387fd67991ad horde-pear-1.3-r3.ebuild 686
+MD5 71094235c3416e85787c3fe1ce4931b4 horde-pear-1.3-r1.ebuild 774
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-horde-pear-1.3-r3 0
+MD5 4205e3abaa29875a9315ceb34a93b945 files/digest-horde-pear-1.3-r2 60
 MD5 4205e3abaa29875a9315ceb34a93b945 files/digest-horde-pear-1.3-r1 60
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.8 (GNU/Linux)
-
-iD8DBQFA9J4WHTu7gpaalycRAs/2AKDzF8SNephqMhwV6KvBiB04ebFdDwCfasUw
-FcpAprPLvLhG0g8/yghsoWI=
-=cJ3K
------END PGP SIGNATURE-----
diff --git a/www-apps/horde-pear/horde-pear-1.3-r1.ebuild b/www-apps/horde-pear/horde-pear-1.3-r1.ebuild
index aad60c26c074..b6e259fe89ab 100644
--- a/www-apps/horde-pear/horde-pear-1.3-r1.ebuild
+++ b/www-apps/horde-pear/horde-pear-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/www-apps/horde-pear/horde-pear-1.3-r1.ebuild,v 1.1 2004/08/15 12:36:30 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-pear/horde-pear-1.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:13 chriswhite Exp $
 
 inherit horde
 
diff --git a/www-apps/horde-pear/horde-pear-1.3-r2.ebuild b/www-apps/horde-pear/horde-pear-1.3-r2.ebuild
index 687e1e7e1483..796c8351e25f 100644
--- a/www-apps/horde-pear/horde-pear-1.3-r2.ebuild
+++ b/www-apps/horde-pear/horde-pear-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/www-apps/horde-pear/horde-pear-1.3-r2.ebuild,v 1.1 2005/02/15 08:14:57 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-pear/horde-pear-1.3-r2.ebuild,v 1.1.1.1 2005/11/30 09:37:13 chriswhite Exp $
 
 inherit horde
 
diff --git a/www-apps/horde-pear/horde-pear-1.3-r3.ebuild b/www-apps/horde-pear/horde-pear-1.3-r3.ebuild
index 104cdb704c8a..23c391eb50c5 100644
--- a/www-apps/horde-pear/horde-pear-1.3-r3.ebuild
+++ b/www-apps/horde-pear/horde-pear-1.3-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/www-apps/horde-pear/horde-pear-1.3-r3.ebuild,v 1.1 2005/02/19 05:48:27 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-pear/horde-pear-1.3-r3.ebuild,v 1.1.1.1 2005/11/30 09:37:13 chriswhite Exp $
 
 DESCRIPTION="Meta package for the PEAR packages required by Horde."
 HOMEPAGE="http://pear.php.net/"
@@ -9,39 +9,15 @@ LICENSE="as-is"
 SLOT="1"
 # when unmasking for an arch
 # double check none of the deps are still masked!
-KEYWORDS="~x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 s390 sparc x86"
 IUSE=""
 
 S=${WORKDIR}
 
-RDEPEND="dev-php/PEAR-Archive_Tar
-	dev-php/PEAR-Auth_SASL
-	dev-php/PEAR-Cache
-	dev-php/PEAR-Console_Getopt
-	dev-php/PEAR-Crypt_RC4
-	dev-php/PEAR-Date
-	dev-php/PEAR-DB
-	dev-php/PEAR-File
-	dev-php/PEAR-File_Find
-	dev-php/PEAR-HTML_Common
-	dev-php/PEAR-HTTP
-	dev-php/PEAR-HTTP_Request
-	dev-php/PEAR-HTTP_WebDAV_Server
-	dev-php/PEAR-Log
-	dev-php/PEAR-Mail
+RDEPEND="dev-php/PEAR-Log
 	dev-php/PEAR-Mail_Mime
-	dev-php/PEAR-Net_DIME
-	dev-php/PEAR-Net_DNS
-	dev-php/PEAR-Net_Sieve
-	dev-php/PEAR-Net_SMTP
-	dev-php/PEAR-Net_Socket
-	dev-php/PEAR-Net_URL
-	dev-php/PEAR-PEAR
-	dev-php/PEAR-Services_Weather
-	dev-php/PEAR-SOAP
-	dev-php/PEAR-Text_Wiki
-	dev-php/PEAR-Tree
-	dev-php/PEAR-XML_Parser
-	dev-php/PEAR-XML_RPC
-	dev-php/PEAR-XML_Serializer
-	dev-php/PEAR-XML_Util"
+	>=dev-php/PEAR-DB-1.6.0
+	dev-php/PEAR-File
+	dev-php/PEAR-Date
+	>=dev-php/PEAR-Services_Weather-1.3.1
+	dev-php/PEAR-Mail"
diff --git a/www-apps/horde-sork/ChangeLog b/www-apps/horde-sork/ChangeLog
index 44cc25ea6036..3ec665fa4fca 100644
--- a/www-apps/horde-sork/ChangeLog
+++ b/www-apps/horde-sork/ChangeLog
@@ -1,6 +1,12 @@
-# ChangeLog for net-www/horde-sork
+# ChangeLog for www-apps/horde-sork
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-sork/ChangeLog,v 1.1 2004/08/15 12:38:35 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-sork/ChangeLog,v 1.1.1.1 2005/11/30 09:37:13 chriswhite Exp $
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  15 Aug 2004; Stuart Herbert <stuart@gentoo.org> horde-sork-0.ebuild:
+  Deps updated to reflect net-www split
 
 *horde-sork-0 (15 Aug 2004)
 
diff --git a/www-apps/horde-sork/Manifest b/www-apps/horde-sork/Manifest
index e2af16b73006..55d32d6a61f3 100644
--- a/www-apps/horde-sork/Manifest
+++ b/www-apps/horde-sork/Manifest
@@ -1,4 +1,4 @@
-MD5 18a4856efed88d3e042b1ed2626aa4a8 horde-sork-0.ebuild 588
-MD5 e96a296023e6e0ca42c8c7f8f26c5dfa ChangeLog 406
+MD5 4ee5c563cab58e69d1dd15e300fd6e8c ChangeLog 774
+MD5 8cf74bae6ec5e6bdd45718402d5be55d horde-sork-0.ebuild 624
 MD5 2f11fff2aabbcd5b418d4e419a3a3a6b metadata.xml 525
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-horde-sork-0 0
diff --git a/www-apps/horde-sork/horde-sork-0.ebuild b/www-apps/horde-sork/horde-sork-0.ebuild
index 775b241ad041..4809045eed9f 100644
--- a/www-apps/horde-sork/horde-sork-0.ebuild
+++ b/www-apps/horde-sork/horde-sork-0.ebuild
@@ -1,21 +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/www-apps/horde-sork/horde-sork-0.ebuild,v 1.1 2004/08/15 12:38:35 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-sork/horde-sork-0.ebuild,v 1.1.1.1 2005/11/30 09:37:13 chriswhite Exp $
 
 inherit horde
 
 DESCRIPTION="Sork is comprised of four Horde modules: accounts, forwards, passwd, vacation"
 SRC_URI=""
 
-KEYWORDS="x86 ppc sparc alpha hppa amd64"
+KEYWORDS="alpha amd64 hppa ppc sparc x86"
 
 DEPEND=""
-RDEPEND="net-www/horde-accounts
-	net-www/horde-forwards
-	net-www/horde-passwd
-	net-www/horde-vacation"
+RDEPEND="www-apps/horde-accounts
+	www-apps/horde-forwards
+	www-apps/horde-passwd
+	www-apps/horde-vacation"
+
+S=${WORKDIR}
 
 # this is just a meta package
 pkg_setup() { :;}
+src_unpack() { :;}
 src_install() { :;}
 pkg_postinst() { :;}
diff --git a/www-apps/horde-turba/ChangeLog b/www-apps/horde-turba/ChangeLog
index 2d76360add80..678c08d03a78 100644
--- a/www-apps/horde-turba/ChangeLog
+++ b/www-apps/horde-turba/ChangeLog
@@ -1,6 +1,50 @@
-# ChangeLog for net-www/horde-turba
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-turba/ChangeLog,v 1.1 2004/08/15 12:40:40 stuart Exp $
+# ChangeLog for www-apps/horde-turba
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-turba/ChangeLog,v 1.1.1.1 2005/11/30 09:36:57 chriswhite Exp $
+
+*horde-turba-2.0.4 (25 Oct 2005)
+
+  25 Oct 2005; Mike Frysinger <vapier@gentoo.org> +horde-turba-2.0.4.ebuild:
+  Version bump.
+
+*horde-turba-2.0.3 (07 Aug 2005)
+
+  07 Aug 2005; Mike Frysinger <vapier@gentoo.org> +horde-turba-2.0.3.ebuild:
+  Version bump.
+
+*horde-turba-1.2.5 (26 Apr 2005)
+
+  26 Apr 2005; Mike Frysinger <vapier@gentoo.org> +horde-turba-1.2.5.ebuild:
+  Version bump for security #90365.
+
+*horde-turba-2.0.2 (23 Feb 2005)
+
+  23 Feb 2005; Mike Frysinger <vapier@gentoo.org> +horde-turba-2.0.2.ebuild,
+  -horde-turba-2.0.ebuild:
+  Version bump.
+
+*horde-turba-1.2.4 (16 Jan 2005)
+
+  16 Jan 2005; Mike Frysinger <vapier@gentoo.org> -horde-turba-1.2.3.ebuild,
+  +horde-turba-1.2.4.ebuild:
+  Version bump.
+
+*horde-turba-1.2.3 (16 Jan 2005)
+
+  16 Jan 2005; Mike Frysinger <vapier@gentoo.org> -horde-turba-1.2.2.ebuild,
+  +horde-turba-1.2.3.ebuild:
+  Version bump.
+
+*horde-turba-2.0 (24 Dec 2004)
+
+  24 Dec 2004; Mike Frysinger <vapier@gentoo.org> +horde-turba-2.0.ebuild:
+  Version bump.
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  15 Aug 2004; Stuart Herbert <stuart@gentoo.org> horde-turba-1.2.2.ebuild:
+  Deps updated to reflect net-www split
 
 *horde-turba-1.2.2 (15 Aug 2004)
 
diff --git a/www-apps/horde-turba/Manifest b/www-apps/horde-turba/Manifest
index 9aa8e3d3e1aa..2423db1e4743 100644
--- a/www-apps/horde-turba/Manifest
+++ b/www-apps/horde-turba/Manifest
@@ -1,4 +1,8 @@
-MD5 d9a1d6fc377646b253ce5670a32a7022 horde-turba-1.2.2.ebuild 451
-MD5 bf467424de8eaf04256e8e7c21510f98 ChangeLog 1466
+MD5 73105df591a32459e7bf0e044ef4279d ChangeLog 2846
+MD5 8453ae3c91fc2fbd94a61cd9c642bb1d files/digest-horde-turba-1.2.5 63
+MD5 e8a9598e6938fb23a7321e7d552283bd files/digest-horde-turba-2.0.3 67
+MD5 5d12747a63afd55f2aeab1ebc4839b27 files/digest-horde-turba-2.0.4 67
+MD5 4a64c82bf8e2a72a45219595e0b212b7 horde-turba-1.2.5.ebuild 454
+MD5 f83e2251ed9a405fbdf0d44c476920fe horde-turba-2.0.3.ebuild 472
+MD5 f1f8863987cd32ee313a988c50a83536 horde-turba-2.0.4.ebuild 472
 MD5 4a52cd771138efea4026da82a803a812 metadata.xml 1156
-MD5 542db7c4cdfc71f525e260fd6b8c4fb5 files/digest-horde-turba-1.2.2 63
diff --git a/www-apps/horde-turba/horde-turba-1.2.5.ebuild b/www-apps/horde-turba/horde-turba-1.2.5.ebuild
index 8b9490521f6b..7ca043e630e3 100644
--- a/www-apps/horde-turba/horde-turba-1.2.5.ebuild
+++ b/www-apps/horde-turba/horde-turba-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/www-apps/horde-turba/horde-turba-1.2.5.ebuild,v 1.1 2005/04/26 02:55:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-turba/horde-turba-1.2.5.ebuild,v 1.1.1.1 2005/11/30 09:36:58 chriswhite Exp $
 
 HORDE_PHP_FEATURES="-o mysql odbc postgres ldap"
 inherit horde
diff --git a/www-apps/horde-turba/horde-turba-2.0.3.ebuild b/www-apps/horde-turba/horde-turba-2.0.3.ebuild
index 3bc8546210e1..4a5f2041043f 100644
--- a/www-apps/horde-turba/horde-turba-2.0.3.ebuild
+++ b/www-apps/horde-turba/horde-turba-2.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/www-apps/horde-turba/horde-turba-2.0.3.ebuild,v 1.1 2005/08/07 21:58:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-turba/horde-turba-2.0.3.ebuild,v 1.1.1.1 2005/11/30 09:36:57 chriswhite Exp $
 
 HORDE_PHP_FEATURES="-o mysql odbc postgres ldap"
 HORDE_MAJ="-h3"
diff --git a/www-apps/horde-turba/horde-turba-2.0.4.ebuild b/www-apps/horde-turba/horde-turba-2.0.4.ebuild
index 291021144512..29285e294f35 100644
--- a/www-apps/horde-turba/horde-turba-2.0.4.ebuild
+++ b/www-apps/horde-turba/horde-turba-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/www-apps/horde-turba/horde-turba-2.0.4.ebuild,v 1.1 2005/10/25 01:44:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-turba/horde-turba-2.0.4.ebuild,v 1.1.1.1 2005/11/30 09:36:57 chriswhite Exp $
 
 HORDE_PHP_FEATURES="-o mysql odbc postgres ldap"
 HORDE_MAJ="-h3"
diff --git a/www-apps/horde-vacation/ChangeLog b/www-apps/horde-vacation/ChangeLog
index 5b4597825e29..ad743f4d0733 100644
--- a/www-apps/horde-vacation/ChangeLog
+++ b/www-apps/horde-vacation/ChangeLog
@@ -1,6 +1,24 @@
-# ChangeLog for net-www/horde-vacation
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-vacation/ChangeLog,v 1.1 2004/08/15 12:42:45 stuart Exp $
+# ChangeLog for www-apps/horde-vacation
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-vacation/ChangeLog,v 1.1.1.1 2005/11/30 09:37:10 chriswhite Exp $
+
+*horde-vacation-2.2.2 (26 Apr 2005)
+
+  26 Apr 2005; Mike Frysinger <vapier@gentoo.org>
+  +horde-vacation-2.2.2.ebuild:
+  Version bump for security #90365.
+
+*horde-vacation-2.2.1 (24 Dec 2004)
+
+  24 Dec 2004; Mike Frysinger <vapier@gentoo.org>
+  +horde-vacation-2.2.1.ebuild:
+  Version bump.
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  15 Aug 2004; Stuart Herbert <stuart@gentoo.org> horde-vacation-2.2.ebuild:
+  Deps updated to reflect net-www split
 
 *horde-vacation-2.2 (15 Aug 2004)
 
diff --git a/www-apps/horde-vacation/Manifest b/www-apps/horde-vacation/Manifest
index 9fee0eb122e1..4f58591cb4d4 100644
--- a/www-apps/horde-vacation/Manifest
+++ b/www-apps/horde-vacation/Manifest
@@ -1,4 +1,14 @@
-MD5 5bab6ea883e4833b3e727cb07dbb5af4 horde-vacation-2.2.ebuild 433
-MD5 a4f9c6420df47cee649694e0886f9c7b ChangeLog 543
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 795f03be31638dd8d2ccc7ba969735c2 horde-vacation-2.2.2.ebuild 435
 MD5 cea755126ddbd78c8e6ce1c63c1d0216 metadata.xml 992
-MD5 520fdede856558ee941b0cae48b86e51 files/digest-horde-vacation-2.2 64
+MD5 1296c6c12123a080fdb98f1ff04b69f3 ChangeLog 1227
+MD5 a97fe76a65da020c7665530b47215042 files/digest-horde-vacation-2.2.2 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDMjChgIKl8Uu19MoRAvxDAJ97pYLppFqhk8vn5wl0ogvnT4kSgQCePYYz
+wNkokup5d1zl7dqAlY3spls=
+=zLHb
+-----END PGP SIGNATURE-----
diff --git a/www-apps/horde-vacation/horde-vacation-2.2.2.ebuild b/www-apps/horde-vacation/horde-vacation-2.2.2.ebuild
index d6d941e49c7e..ec7bb794529a 100644
--- a/www-apps/horde-vacation/horde-vacation-2.2.2.ebuild
+++ b/www-apps/horde-vacation/horde-vacation-2.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/www-apps/horde-vacation/horde-vacation-2.2.2.ebuild,v 1.1 2005/04/26 02:54:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-vacation/horde-vacation-2.2.2.ebuild,v 1.1.1.1 2005/11/30 09:37:10 chriswhite Exp $
 
 inherit horde
 
diff --git a/www-apps/horde/ChangeLog b/www-apps/horde/ChangeLog
index 6b60696de2c4..47e801655bb3 100644
--- a/www-apps/horde/ChangeLog
+++ b/www-apps/horde/ChangeLog
@@ -1,6 +1,83 @@
-# ChangeLog for net-www/horde
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/horde/ChangeLog,v 1.1 2004/08/15 10:04:53 stuart Exp $
+# ChangeLog for www-apps/horde
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde/ChangeLog,v 1.1.1.1 2005/11/30 09:36:55 chriswhite Exp $
+
+  19 Nov 2005; Simon Stelling <blubb@gentoo.org> horde-2.2.9.ebuild:
+  stable on amd64 wrt bug 112491
+
+  18 Nov 2005; Mark Loeser <halcy0n@gentoo.org> horde-2.2.9.ebuild:
+  Stable on x86; bug #112491
+
+  16 Nov 2005; Jose Luis Rivero <yoswink@gentoo.org> horde-2.2.9.ebuild:
+  Stable on alpha wrt security #112491
+
+  15 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> horde-2.2.9.ebuild:
+  Stable on hppa, ppc. See bug #112491.
+
+  15 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> horde-2.2.9.ebuild:
+  Stable on sparc wrt security #112491
+
+*horde-2.2.9 (15 Nov 2005)
+
+  15 Nov 2005; Mike Frysinger <vapier@gentoo.org> +horde-2.2.9.ebuild:
+  Version bump for security #112491.
+
+*horde-3.0.6 (28 Oct 2005)
+
+  28 Oct 2005; Mike Frysinger <vapier@gentoo.org> +horde-3.0.6.ebuild:
+  Version bump #110754 by Christoph Gysin.
+
+*horde-3.0.5 (07 Aug 2005)
+
+  07 Aug 2005; Mike Frysinger <vapier@gentoo.org> +horde-3.0.5.ebuild:
+  Version bump.
+
+*horde-3.0.4-r1 (07 May 2005)
+
+  07 May 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/horde-3.0.4-freebusy.patch, +horde-3.0.4-r1.ebuild:
+  Add patch from upstream to fix Free/Busy information #89227 by Jeffrey
+  Crawford.
+
+*horde-2.2.8 (26 Apr 2005)
+
+  26 Apr 2005; Mike Frysinger <vapier@gentoo.org> +horde-2.2.8.ebuild:
+  Version bump for security #90365.
+
+*horde-3.0.4 (29 Mar 2005)
+
+  29 Mar 2005; Mike Frysinger <vapier@gentoo.org> -horde-3.0.3.ebuild,
+  +horde-3.0.4.ebuild:
+  Version bump for security #87134.
+
+*horde-3.0.3 (23 Feb 2005)
+
+  23 Feb 2005; Mike Frysinger <vapier@gentoo.org> -horde-3.0.2.ebuild,
+  +horde-3.0.3.ebuild:
+  Version bump.
+
+*horde-3.0.2 (16 Jan 2005)
+
+  16 Jan 2005; Mike Frysinger <vapier@gentoo.org> +horde-3.0.2.ebuild,
+  -horde-3.0.ebuild:
+  Version bump for security #77872.
+
+*horde-3.0 (24 Dec 2004)
+
+  17 Dec 2004; Mike Frysinger <vapier@gentoo.org> +horde-3.0.ebuild:
+  Version bump #72276 by Jory A. Pratt.
+
+*horde-2.2.7 (08 Nov 2004)
+
+  08 Nov 2004; Mike Frysinger <vapier@gentoo.org> horde-2.2.5.ebuild,
+  +horde-2.2.7.ebuild:
+  Version bump.
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  15 Aug 2004; Stuart Herbert <stuart@gentoo.org> horde-2.2.5.ebuild:
+  Deps updated to reflect net-www split
 
 *horde-2.2.5 (15 Aug 2004)
 
diff --git a/www-apps/horde/Manifest b/www-apps/horde/Manifest
index d1d9d37bf128..7d564364f585 100644
--- a/www-apps/horde/Manifest
+++ b/www-apps/horde/Manifest
@@ -1,14 +1,29 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 52f8f5ee4dc810684a7130323d2f296d ChangeLog 2224
+<<<<<<< Manifest
 MD5 cb784fc68f8ebab5c112b7067200fa7f metadata.xml 475
-MD5 b9dd68f751617d76b55b901ea854836e horde-2.2.5.ebuild 843
-MD5 d8b718b0d6bc749a31be0bc6a7c73ff6 files/digest-horde-2.2.5 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.8 (GNU/Linux)
-
-iD8DBQFBHR5zHTu7gpaalycRAl4SAKCJId8/J9aI76I1YZgrBolkasjxfgCfVbIx
-+gxnR0zCXoOMrqRORmyDqYM=
-=mL71
------END PGP SIGNATURE-----
+MD5 f8759cab230c8cd470f20651f56b25b5 ChangeLog 4409
+MD5 daab28ac5b3709bdd815154702de48d0 horde-3.0.6.ebuild 972
+MD5 3345450bd8cfbc5559b1cee8f2a2d6e6 horde-2.2.9.ebuild 921
+MD5 e1b0135f6c049420d351f89fc104f2b6 horde-2.2.8.ebuild 919
+=======
+MD5 0362af891262ff429a6d196a21eae796 ChangeLog 4608
+>>>>>>> 1.39
+MD5 6524736531d7994854b73a50a0c8ffe0 horde-3.0.5.ebuild 972
+<<<<<<< Manifest
+MD5 9a28ec87236a9af3ed92026ab2a57f66 files/digest-horde-3.0.5 64
+MD5 5d24743096fc0e5fc9f7f722dd3a8a02 files/digest-horde-2.2.9 63
+MD5 e006efb695d97f8d93d98db662e911f3 files/horde-3.0.4-freebusy.patch 894
+=======
+MD5 cb784fc68f8ebab5c112b7067200fa7f metadata.xml 475
+MD5 e1b0135f6c049420d351f89fc104f2b6 horde-2.2.8.ebuild 919
+MD5 daab28ac5b3709bdd815154702de48d0 horde-3.0.6.ebuild 972
+MD5 05bad901f6d6ca0da54839bad99bc5d6 horde-2.2.9.ebuild 918
+MD5 9a28ec87236a9af3ed92026ab2a57f66 files/digest-horde-3.0.5 64
+MD5 6363f343a1660856e69cd972adb28432 files/digest-horde-3.0.6 64
+>>>>>>> 1.39
+MD5 0dfe32b896302fd5440a7b79bc5a9324 files/digest-horde-2.2.8 63
+<<<<<<< Manifest
+MD5 6363f343a1660856e69cd972adb28432 files/digest-horde-3.0.6 64
+=======
+MD5 5d24743096fc0e5fc9f7f722dd3a8a02 files/digest-horde-2.2.9 63
+MD5 e006efb695d97f8d93d98db662e911f3 files/horde-3.0.4-freebusy.patch 894
+>>>>>>> 1.39
diff --git a/www-apps/horde/horde-2.2.8.ebuild b/www-apps/horde/horde-2.2.8.ebuild
index 80aa93e3d2ba..6d7e9927fb43 100644
--- a/www-apps/horde/horde-2.2.8.ebuild
+++ b/www-apps/horde/horde-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/www-apps/horde/horde-2.2.8.ebuild,v 1.1 2005/04/26 02:52:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde/horde-2.2.8.ebuild,v 1.1.1.1 2005/11/30 09:36:55 chriswhite Exp $
 
 inherit horde
 
@@ -11,14 +11,14 @@ KEYWORDS="alpha amd64 hppa ppc sparc x86"
 IUSE="mysql"
 
 DEPEND=""
-RDEPEND=">=dev-php/mod_php-4.1.0
+RDEPEND="virtual/php
 	>=sys-devel/gettext-0.10.40
 	>=dev-libs/libxml2-2.4.21
 	>=www-apps/horde-pear-1.3
 	mysql? ( dev-php/PEAR-DB )"
 
 pkg_setup() {
-	has_version '>=dev-php/mod_php-5' \
+	has_version '>=virtual/php-5' \
 		&& HORDE_PHP_FEATURES="nls session" \
 		|| HORDE_PHP_FEATURES="nls"
 	horde_pkg_setup
diff --git a/www-apps/horde/horde-2.2.9.ebuild b/www-apps/horde/horde-2.2.9.ebuild
index 33f8095b2f0b..ae7f60abd1fe 100644
--- a/www-apps/horde/horde-2.2.9.ebuild
+++ b/www-apps/horde/horde-2.2.9.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/www-apps/horde/horde-2.2.9.ebuild,v 1.1 2005/11/15 00:30:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde/horde-2.2.9.ebuild,v 1.1.1.1 2005/11/30 09:36:55 chriswhite Exp $
 
 inherit horde
 
 DESCRIPTION="Horde Application Framework"
 HOMEPAGE="http://www.horde.org/"
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+<<<<<<< horde-2.2.9.ebuild
+KEYWORDS="alpha ~amd64 hppa ppc sparc x86"
+=======
+KEYWORDS="alpha amd64 hppa ppc sparc x86"
+>>>>>>> 1.6
 IUSE="mysql"
 
 DEPEND=""
diff --git a/www-apps/horde/horde-3.0.5.ebuild b/www-apps/horde/horde-3.0.5.ebuild
index d586dd063f0c..809efd1fec7d 100644
--- a/www-apps/horde/horde-3.0.5.ebuild
+++ b/www-apps/horde/horde-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/www-apps/horde/horde-3.0.5.ebuild,v 1.1 2005/08/07 21:58:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde/horde-3.0.5.ebuild,v 1.1.1.1 2005/11/30 09:36:56 chriswhite Exp $
 
 inherit horde
 
@@ -19,8 +19,6 @@ RDEPEND="virtual/php
 	dev-php/PEAR-Mail_Mime
 	mysql? ( dev-php/PEAR-DB )"
 
-EHORDE_PATCHES="${FILESDIR}/horde-3.0.4-freebusy.patch"
-
 pkg_setup() {
 	has_version '>=virtual/php-5' \
 		&& HORDE_PHP_FEATURES="nls session xml2" \
diff --git a/www-apps/horde/horde-3.0.6.ebuild b/www-apps/horde/horde-3.0.6.ebuild
index ba632252fe06..84c7f11cb491 100644
--- a/www-apps/horde/horde-3.0.6.ebuild
+++ b/www-apps/horde/horde-3.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/www-apps/horde/horde-3.0.6.ebuild,v 1.1 2005/10/28 23:10:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde/horde-3.0.6.ebuild,v 1.1.1.1 2005/11/30 09:36:55 chriswhite Exp $
 
 inherit horde
 
diff --git a/www-apps/ids/ChangeLog b/www-apps/ids/ChangeLog
index 23cc0af0fc3c..bf792a888734 100644
--- a/www-apps/ids/ChangeLog
+++ b/www-apps/ids/ChangeLog
@@ -1,6 +1,31 @@
-# ChangeLog for net-www/ids
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/ids/ChangeLog,v 1.1 2004/08/15 15:03:59 stuart Exp $
+# ChangeLog for www-apps/ids
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/ids/ChangeLog,v 1.1.1.1 2005/11/30 09:37:04 chriswhite Exp $
+
+  11 Sep 2005; Renat Lumpau <rl03@gentoo.org> -ids-0.82.ebuild:
+  Removing old and broken version
+
+  11 Jul 2005; Renat Lumpau <rl03@gentoo.org> ids-0.83_beta2-r1.ebuild:
+  Added Archive-Zip per bug #98587, cleaned old versions
+
+  27 Apr 2005; Karol Wojtaszek <sekretarz@gentoo.org>
+  ids-0.83_beta2-r1.ebuild:
+  Perlmagick is now part of imagemagick ebuild and ids doesn't need special
+  depend on perlmagick
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  30 Aug 2004; Renat Lumpau <rl03@gentoo.org> ids-0.83_beta2-r1.ebuild:
+  Fixed DEPEND/RDEPEND, removed unneeded src_compile
+
+*ids-0.83_beta2-r1 (30 Aug 2004)
+
+  30 Aug 2004; David Holm <dholm@gentoo.org> ids-0.83_beta2-r1.ebuild:
+  Added to ~ppc.
+
+  18 Aug 2004; Renat Lumpau <rl03@gentoo.org> :
+  Converted to webapp.eclass (bug #58379).
 
 *ids-0.83_beta2 (15 Aug 2004)
 
diff --git a/www-apps/ids/Manifest b/www-apps/ids/Manifest
index c30f7e0d0457..b260a35e29d5 100644
--- a/www-apps/ids/Manifest
+++ b/www-apps/ids/Manifest
@@ -1,6 +1,15 @@
-MD5 4f15fa749492320f8e2cbeac7a4fcaca ids-0.83_beta2.ebuild 1478
-MD5 e6a4187cdbfa46fb24341a56c37e9366 ids-0.82.ebuild 1442
-MD5 11fe8c3ee89a6a90e223eb4af600722f ChangeLog 860
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 67ee22e6c3af912fc3794e397a0dfa58 ids-0.83_beta2-r1.ebuild 887
+MD5 76a461a8cbcf87e61d0dc56c17412ac2 ChangeLog 1872
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
-MD5 f3c2e1e60ba2b89234c3aa7931cbaf50 files/digest-ids-0.83_beta2 62
-MD5 2fafb5c9f461a7bd803bad263cad0228 files/digest-ids-0.82 60
+MD5 f3c2e1e60ba2b89234c3aa7931cbaf50 files/digest-ids-0.83_beta2-r1 62
+MD5 d82018294820900e72eddf227d213fc7 files/postinstall-en.txt 131
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDJDd7EzitwsaoONoRArP2AKCIDEf1aN2ju/PvrMW/+NLp5TwOogCgkJKi
+xUN9LlGvNidghdmBH7ueTGQ=
+=zCS7
+-----END PGP SIGNATURE-----
diff --git a/www-apps/ids/ids-0.83_beta2-r1.ebuild b/www-apps/ids/ids-0.83_beta2-r1.ebuild
index c7bdd72fb37f..ca5034b5caef 100644
--- a/www-apps/ids/ids-0.83_beta2-r1.ebuild
+++ b/www-apps/ids/ids-0.83_beta2-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/www-apps/ids/ids-0.83_beta2-r1.ebuild,v 1.1 2004/08/18 17:31:21 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/ids/ids-0.83_beta2-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:04 chriswhite Exp $
 
 inherit webapp
 
@@ -10,31 +10,22 @@ HOMEPAGE="http://ids.sf.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="BSD"
 IUSE=""
-KEYWORDS="~x86 ~sparc"
-DEPEND="$DEPEND"
+KEYWORDS="~x86 ~sparc ~ppc"
 RDEPEND="net-www/apache
 	>=dev-lang/perl-5.6.1
 	dev-perl/ImageInfo
-	dev-perl/perlmagick
-	>=media-gfx/imagemagick-5.4.9.1-r1"
+	dev-perl/Archive-Zip
+	>=media-gfx/imagemagick-6.2.2.0"
 
 S=${WORKDIR}/${PN}
 
-src_compile() {
-	:;
-}
-
 src_install() {
 	webapp_src_preinst
 
-	#Do not remove docs as it will not work without
 	dodoc CREDITS ChangeLog PATCH.SUBMISSION README
 
 	cp -R . ${D}/${MY_HTDOCSDIR}
 	webapp_serverowned ${MY_HTDOCSDIR}/image-cache
-
-	# add post-installation instructions
 	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-
 	webapp_src_install
 }
diff --git a/www-apps/issue-tracker/ChangeLog b/www-apps/issue-tracker/ChangeLog
index 57722df28ed5..10249018b75e 100644
--- a/www-apps/issue-tracker/ChangeLog
+++ b/www-apps/issue-tracker/ChangeLog
@@ -1,6 +1,18 @@
-# ChangeLog for net-www/issue-tracker
+# ChangeLog for www-apps/issue-tracker
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/issue-tracker/ChangeLog,v 1.1 2004/08/15 15:06:14 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/issue-tracker/ChangeLog,v 1.1.1.1 2005/11/30 09:37:02 chriswhite Exp $
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  issue-tracker-4.0.3.ebuild:
+  Masked issue-tracker-4.0.3.ebuild stable for ppc
+
+*issue-tracker-4.0.3-r1 (29 Aug 2004)
+
+  29 Aug 2004; Karl Trygve Kalleberg <karltk@gentoo.org>
+  issue-tracker-4.0.3-r1.ebuild: Rewrite, by rl103, for the new webapp-config.
 
 *issue-tracker-4.0.3 (15 Aug 2004)
 
diff --git a/www-apps/issue-tracker/Manifest b/www-apps/issue-tracker/Manifest
index a63cbb4430a5..51697027831e 100644
--- a/www-apps/issue-tracker/Manifest
+++ b/www-apps/issue-tracker/Manifest
@@ -1,4 +1,18 @@
-MD5 5132e65d7eb680aeeba719dbb952efd7 issue-tracker-4.0.3.ebuild 3043
-MD5 f5678d78d911a14ce784b3dba4f32436 ChangeLog 478
-MD5 80cbe8e469a257c0f7a48d256c2a0740 metadata.xml 849
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 688a89c6baa854def763317ebdc40381 ChangeLog 1069
 MD5 ce0a8a8c6b5c5004b17d0c84d62e9473 files/digest-issue-tracker-4.0.3 72
+MD5 ce0a8a8c6b5c5004b17d0c84d62e9473 files/digest-issue-tracker-4.0.3-r1 72
+MD5 c4d20207168365712714ca94164c9c2d files/postinstall-en.txt 1338
+MD5 08c75a0b0ac01fa786a74ff8775bcfca files/reconfig 3203
+MD5 6d03d39a43499204916263056d83ad05 issue-tracker-4.0.3-r1.ebuild 1209
+MD5 b6b10936188d68d4b7139a49471b32b0 issue-tracker-4.0.3.ebuild 3000
+MD5 80cbe8e469a257c0f7a48d256c2a0740 metadata.xml 849
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC2SntI1lqEGTUzyQRAn0JAJ4ipQYHrPMPJiDJKx0JT3S1d80rnQCfURQ4
+uTmTHJVj6T4y4jN8CeH9iZc=
+=f3FU
+-----END PGP SIGNATURE-----
diff --git a/www-apps/issue-tracker/issue-tracker-4.0.3-r1.ebuild b/www-apps/issue-tracker/issue-tracker-4.0.3-r1.ebuild
index 1dbce9b70db7..de70cb78e455 100644
--- a/www-apps/issue-tracker/issue-tracker-4.0.3-r1.ebuild
+++ b/www-apps/issue-tracker/issue-tracker-4.0.3-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/www-apps/issue-tracker/issue-tracker-4.0.3-r1.ebuild,v 1.1 2004/09/08 15:58:15 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/issue-tracker/issue-tracker-4.0.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:02 chriswhite Exp $
 
 inherit webapp
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc"
 IUSE=""
-DEPEND="$DEPEND"
+DEPEND=""
 RDEPEND="virtual/php
 	|| ( dev-db/mysql dev-db/postgresql )"
 
diff --git a/www-apps/issue-tracker/issue-tracker-4.0.3.ebuild b/www-apps/issue-tracker/issue-tracker-4.0.3.ebuild
index 5b609ed8fb27..d7235ab5ff5f 100644
--- a/www-apps/issue-tracker/issue-tracker-4.0.3.ebuild
+++ b/www-apps/issue-tracker/issue-tracker-4.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/www-apps/issue-tracker/issue-tracker-4.0.3.ebuild,v 1.1 2004/08/15 15:06:14 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/issue-tracker/issue-tracker-4.0.3.ebuild,v 1.1.1.1 2005/11/30 09:37:02 chriswhite Exp $
 
 inherit webapp-apache
 
@@ -9,14 +9,12 @@ HOMEPAGE="http://www.issue-tracker.com/"
 SRC_URI="mirror://sourceforge/issue-tracker/issue-tracker-4.0.3.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ppc"
 IUSE=""
 DEPEND=""
 RDEPEND="virtual/php
 	|| ( dev-db/mysql dev-db/postgresql )"
 
-S=${WORKDIR}/${P}
-
 src_unpack() {
 	unpack ${A}
 	file ${S}/conf/const.php
@@ -53,13 +51,13 @@ pkg_postinst() {
 	webapp-detect
 
 	einfo "You will need to configure issue-tracker for a particular database"
-	einfo ""
+	einfo
 	einfo "(1) First, you must decide on:"
 	einfo " - a database username, <it-username>"
 	einfo " - a database name in the database, <it-dbname>"
-	einfo ""
+	einfo
 	einfo "(2) Next, you must create the database"
-	einfo ""
+	einfo
 	einfo "For MySQL:"
 	einfo "mysqladmin -p -u <it-username> create <it-dbname>"
 	einfo "mysql -p -u <it-username> <it-dbname> \\"
@@ -68,7 +66,7 @@ pkg_postinst() {
 	einfo "      < ${HTTPD_ROOT}/issue-tracker/setup/data.sql"
 	einfo "mysql -p -u <it-username> <it-dbname> \\"
 	einfo "      < ${HTTPD_ROOT}/issue-tracker/setup/indexes.sql"
-	einfo ""
+	einfo
 	einfo "For PostgreSQL:"
 	einfo "createdb -U <it-username> <it-dbname>"
 	einfo "psql -U <it-username> \\"
@@ -77,16 +75,16 @@ pkg_postinst() {
 	einfo "     < ${HTTPD_ROOT}/issue-tracker/setup/data.sql"
 	einfo "psql -U <it-username> \\"
 	einfo "     < ${HTTPD_ROOT}/issue-tracker/setup/indexes.sql"
-	einfo ""
+	einfo
 	einfo "(3) Next, you will need to configure issue-tracker"
 	einfo "cp ${HTTPD_ROOT}/issue-tracker/conf/config.php-default \\"
 	einfo "   ${HTTPD_ROOT}/issue-tracker/conf/config.php"
-	einfo ""
+	einfo
 	einfo "Edit ${HTTPD_ROOT}/issue-tracker/conf/config.php"
 	einfo "with name=<it-dbname>, user=<it-username> and the correct db info"
-	einfo ""
+	einfo
 	ewarn "Make sure you don't just edit the commented-out example;)"
-	einfo ""
+	einfo
 	ewarn "(4) Finally, you must log in to the issue-tracker as admin/demo, and"
 	ewarn "change the password in Preferences."
 }
diff --git a/www-apps/joomla/ChangeLog b/www-apps/joomla/ChangeLog
index 6ff73a84637d..7ce2f144e812 100644
--- a/www-apps/joomla/ChangeLog
+++ b/www-apps/joomla/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for www-apps/joomla
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/joomla/ChangeLog,v 1.1 2005/09/28 00:27:11 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/joomla/ChangeLog,v 1.1.1.1 2005/11/30 09:36:56 chriswhite Exp $
+
+*joomla-1.0.3 (23 Oct 2005)
+
+  23 Oct 2005; Renat Lumpau <rl03@gentoo.org> -joomla-1.0.1.ebuild,
+  +joomla-1.0.3.ebuild:
+  Version bump wrt bug #108621.
+
+  23 Oct 2005; Renat Lumpau <rl03@gentoo.org> joomla-1.0.1.ebuild:
+  Fixed emerge --config wrt bug #109482.
+
+  29 Sep 2005; Renat Lumpau <rl03@gentoo.org> joomla-1.0.1.ebuild:
+  Fixed reference to old name
 
 *joomla-1.0.1 (28 Sep 2005)
 
diff --git a/www-apps/joomla/Manifest b/www-apps/joomla/Manifest
index 3d9a2ef45257..99873b3b5ad7 100644
--- a/www-apps/joomla/Manifest
+++ b/www-apps/joomla/Manifest
@@ -1,4 +1,15 @@
-MD5 523157018433bd8beeaeeb1302ef3530 joomla-1.0.1.ebuild 2970
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ab059e97561486dbd1c2ac67b0b2aceb joomla-1.0.3.ebuild 2908
+MD5 919fb9972193d0bac055455feb089629 ChangeLog 738
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
 MD5 c81ce886a23ab451a7c1a3e0a4b1984d files/postinstall-en.txt 830
-MD5 aab606d225591bb796c9ba39b0c72192 files/digest-joomla-1.0.1 72
+MD5 3b873806cd33f8c97a1e148122ed51bd files/digest-joomla-1.0.3 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDXAfGEzitwsaoONoRAoF6AKCyPpRdk92Di8a5y18yxl7gaA/TzgCgpihL
+H1yxVo6FYEIhqsMu1H9+mCk=
+=Pmki
+-----END PGP SIGNATURE-----
diff --git a/www-apps/joomla/joomla-1.0.3.ebuild b/www-apps/joomla/joomla-1.0.3.ebuild
index b90e72e8ea7a..3c0567f57fa8 100644
--- a/www-apps/joomla/joomla-1.0.3.ebuild
+++ b/www-apps/joomla/joomla-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/www-apps/joomla/joomla-1.0.3.ebuild,v 1.1 2005/10/23 21:59:23 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/joomla/joomla-1.0.3.ebuild,v 1.1.1.1 2005/11/30 09:36:56 chriswhite Exp $
 
 inherit webapp eutils
 
diff --git a/www-apps/knowledgetree/ChangeLog b/www-apps/knowledgetree/ChangeLog
index 0eac54c6f334..e627f75752c7 100644
--- a/www-apps/knowledgetree/ChangeLog
+++ b/www-apps/knowledgetree/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/knowledgetree
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/knowledgetree/ChangeLog,v 1.1 2005/08/09 11:35:05 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/knowledgetree/ChangeLog,v 1.1.1.1 2005/11/30 09:36:57 chriswhite Exp $
+
+  22 Aug 2005; Renat Lumpau <rl03@gentoo.org>
+  files/postinstall-en-2.0.7.txt:
+  Housekeeping
 
 *knowledgetree-2.0.7 (09 Aug 2005)
 
diff --git a/www-apps/knowledgetree/Manifest b/www-apps/knowledgetree/Manifest
index 17dfdbd285bb..3c5ffa26ee24 100644
--- a/www-apps/knowledgetree/Manifest
+++ b/www-apps/knowledgetree/Manifest
@@ -1,6 +1,16 @@
-MD5 f0ccbf524251f959c1399c299896a00f knowledgetree-2.0.7.ebuild 1967
-MD5 da09cb38b827fe3a82308ede7a7403ce ChangeLog 367
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6bd6ef4ff11bf403c2b526fbda762a76 knowledgetree-2.0.7.ebuild 2089
+MD5 6825d224fe9c17120e3156bb88d4ae54 ChangeLog 555
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
-MD5 16a0ed193f1dce99f774b42840fd947d files/postinstall-en-2.0.7.txt 1847
+MD5 cdffaf0b390060eab7ac6e2146e91123 files/postinstall-en-2.0.7.txt 1848
 MD5 74f02fdd8e803af4673121fe6df90ae4 files/digest-knowledgetree-2.0.7 68
 MD5 3b1ebecb999e40f5b64494b9b9e34096 files/config-hook-2.0.0.sh 251
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDClgUEzitwsaoONoRAqZSAKDey7LS6xkf4TujYXoSXFHkiztc5ACgn0SB
+KDB3Cmj8seY4CRLXkrjVF5Y=
+=11tp
+-----END PGP SIGNATURE-----
diff --git a/www-apps/knowledgetree/files/postinstall-en-2.0.7.txt b/www-apps/knowledgetree/files/postinstall-en-2.0.7.txt
index 6e8e2c7eb3f6..f62b4f2445f3 100644
--- a/www-apps/knowledgetree/files/postinstall-en-2.0.7.txt
+++ b/www-apps/knowledgetree/files/postinstall-en-2.0.7.txt
@@ -27,7 +27,7 @@ You also need to set the MySQL passwords for the dms and dmsadmin user in
 the ${MY_INSTALLDIR}/config/environment.php file so that knowledgeTree can
 access the database.
 
-Now you can go to http://${VHOST_HOSTNAME}${VHOST_APPDIR} and log in
+Now you can go to http://${VHOST_HOSTNAME}/${VHOST_APPDIR} and log in
 as user "admin" with the password "admin".
 
 ------------------------------------------------------------------------
diff --git a/www-apps/knowledgetree/knowledgetree-2.0.7.ebuild b/www-apps/knowledgetree/knowledgetree-2.0.7.ebuild
index 2ca7082f0ad1..fc47a752c480 100644
--- a/www-apps/knowledgetree/knowledgetree-2.0.7.ebuild
+++ b/www-apps/knowledgetree/knowledgetree-2.0.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/www-apps/knowledgetree/knowledgetree-2.0.7.ebuild,v 1.1 2005/08/09 11:35:05 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/knowledgetree/knowledgetree-2.0.7.ebuild,v 1.1.1.1 2005/11/30 09:36:57 chriswhite Exp $
 
-inherit eutils webapp
+inherit webapp
 
 MY_PN=${PN/tree/Tree}
 MY_P=${MY_PN}-${PV}
@@ -17,8 +17,8 @@ IUSE=""
 DEPEND="
 		virtual/php
 		dev-db/mysql
-		>=PEAR-DB-1.6.4
-		>=PEAR-Log-1.8.3
+		>=dev-php/PEAR-DB-1.6.4
+		>=dev-php/PEAR-Log-1.8.3
 		"
 S=${WORKDIR}/${MY_PN}
 
diff --git a/www-apps/lxr/ChangeLog b/www-apps/lxr/ChangeLog
index 521c16810981..21dc4b3fd2e6 100644
--- a/www-apps/lxr/ChangeLog
+++ b/www-apps/lxr/ChangeLog
@@ -1,6 +1,18 @@
-# ChangeLog for net-www/lxr
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/lxr/ChangeLog,v 1.1 2004/08/15 15:08:21 stuart Exp $
+# ChangeLog for www-apps/lxr
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/lxr/ChangeLog,v 1.1.1.1 2005/11/30 09:37:09 chriswhite Exp $
+
+  24 May 2005; Michael Cummings <mcummings@gentoo.org> lxr-0.3.1.ebuild:
+  dev-perl/DB_File => perl-core/DB_File
+
+  08 Sep 2004; Renat Lumpau <rl03@gentoo.org> metadata.xml:
+  Fixed herd name
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> lxr-0.3.1.ebuild:
+  Masked lxr-0.3.1.ebuild stable for ppc
 
 *lxr-0.3.1 (15 Aug 2004)
 
diff --git a/www-apps/lxr/Manifest b/www-apps/lxr/Manifest
index bc11573ea137..37f1ce310022 100644
--- a/www-apps/lxr/Manifest
+++ b/www-apps/lxr/Manifest
@@ -1,4 +1,14 @@
-MD5 d596f9e7835d453dfd0fefea7236fdd4 ChangeLog 867
-MD5 87364697d231e305b56a5bb245f8bb77 lxr-0.3.1.ebuild 1737
-MD5 3d182d43f7f0341a9a42f96694f04e72 metadata.xml 224
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ca02c50ca9d00154748a09796f449046 ChangeLog 1418
+MD5 dd932f0988c68a07db8e35fce86af72a lxr-0.3.1.ebuild 1741
+MD5 4defd726d2b03decc5b7ff21b0aac1a3 metadata.xml 225
 MD5 8ce5e2b6e0ab9fcc6a3a116347a24204 files/digest-lxr-0.3.1 60
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCkz7mtG5z4I8BtQoRAu1+AKCKw0etJtaks4rS+2Deyhi6VvNMFACfRoIH
+hgDYa9hOwCjy7U4b0VWmsgY=
+=JieC
+-----END PGP SIGNATURE-----
diff --git a/www-apps/lxr/lxr-0.3.1.ebuild b/www-apps/lxr/lxr-0.3.1.ebuild
index dddba821e1e9..c5be88c2f256 100644
--- a/www-apps/lxr/lxr-0.3.1.ebuild
+++ b/www-apps/lxr/lxr-0.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/www-apps/lxr/lxr-0.3.1.ebuild,v 1.1 2004/08/15 15:08:21 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/lxr/lxr-0.3.1.ebuild,v 1.1.1.1 2005/11/30 09:37:09 chriswhite Exp $
 
 inherit webapp
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://sourceforge.net/projects/lxr"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ppc"
 
 RESTRICT="nomirror"
 IUSE=""
@@ -19,7 +19,7 @@ IUSE=""
 # Glimpse is actually optional, but since there is no USE flag, require it
 RDEPEND="app-misc/glimpse
 	     dev-lang/perl
-		 >=dev-perl/DB_File-1.807"
+		 >=perl-core/DB_File-1.807"
 DEPEND=${RDEPEND}
 
 src_compile() {
diff --git a/www-apps/lxr/metadata.xml b/www-apps/lxr/metadata.xml
index 0d59c319c3eb..bee101f41174 100644
--- a/www-apps/lxr/metadata.xml
+++ b/www-apps/lxr/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/www-apps/mambo/ChangeLog b/www-apps/mambo/ChangeLog
index cc6c8690326b..41a857389d66 100644
--- a/www-apps/mambo/ChangeLog
+++ b/www-apps/mambo/ChangeLog
@@ -1,6 +1,75 @@
 # ChangeLog for www-apps/mambo
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mambo/ChangeLog,v 1.1 2004/08/18 18:15:42 rl03 Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mambo/ChangeLog,v 1.1.1.1 2005/11/30 09:37:11 chriswhite Exp $
+
+*mambo-4.5.2.3-r1 (20 Nov 2005)
+
+  20 Nov 2005; Stuart Herbert <stuart@gentoo.org>
+  +files/mambo-4.5.2.3-globals_overwrite.patch, +mambo-4.5.2.3-r1.ebuild:
+  Added patch for security bug #112968; thanks to Vic Fryzel <vic@shellsage.com>
+  for the patch
+
+  23 Oct 2005; Renat Lumpau <rl03@gentoo.org> mambo-4.5.2.3.ebuild:
+  Fixed emerge --config wrt bug #109482.
+
+  22 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt:
+  Housekeeping
+
+  22 Aug 2005; Renat Lumpau <rl03@gentoo.org> mambo-4.5.2.3.ebuild:
+  Housekeeping
+
+  15 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  mambo-4.5.2.3.ebuild:
+  minor cleanup
+
+  03 Jul 2005; Renat Lumpau <rl03@gentoo.org> mambo-4.5.2.3.ebuild:
+  Clean up pkg_config. Fix #71289
+
+  16 Jun 2005; Renat Lumpau <rl03@gentoo.org> -mambo-4.5-r1.ebuild,
+  -mambo-4.5.2.ebuild, -mambo-4.5.2.2.ebuild:
+  Removing old versions.
+
+*mambo-4.5.2.3 (16 Jun 2005)
+
+  16 Jun 2005; Renat Lumpau <rl03@gentoo.org> +mambo-4.5.2.3.ebuild:
+  Version bump (bug #96183).
+
+*mambo-4.5.2.2 (02 Jun 2005)
+
+  02 Jun 2005; Aaron Walker <ka0ttic@gentoo.org> +mambo-4.5.2.2.ebuild:
+  Version bump for security bug 94817.
+
+  08 Apr 2005; Marcus D. Hanwell <cryos@gentoo.org> mambo-4.5.2.ebuild:
+  Marked ~amd64, closes bug 88270.
+
+*mambo-4.5.2 (21 Feb 2005)
+
+  25 Feb 2005; Elfyn McBratney <beu@gentoo.org> mambo-4.5.2.ebuild:
+  The "Changelog" file has been renamed to "CHANGELOG". Also, the
+  "documentation" directory has been punted, so remove that dohtml.
+
+  21 Feb 2005; Stuart Herbert <stuart@gentoo.org> +mambo-4.5.2.ebuild:
+  Version bump; includes the patch needed for bug 82830
+
+*mambo-4.5-r1 (10 Feb 2005)
+
+  10 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> +mambo-4.5-r1.ebuild,
+  -mambo-4.5.ebuild:
+  Revision bump for sec bug 80578.
+
+  09 Jan 2005; Jason Wever <weeve@gentoo.org> mambo-4.5.ebuild:
+  Added ~sparc keyword.
+
+  19 Oct 2004; Michael Hanselmann <hansmi@gentoo.org> mambo-4.5.ebuild:
+  Added to ~ppc.
+
+  22 Sep 2004; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  -files/reconfig, mambo-4.5.ebuild:
+  Don't rm things in src_install. Move reconfig hook to pkg_config. Warn about
+  db and dbuser.
+
+  30 Aug 2004; Renat Lumpau <rl03@gentoo.org> mambo-4.5.ebuild:
+  Fixed DEPEND/RDEPEND, removed sleep
 
 *mambo-4.5 (18 Aug 2004)
 
diff --git a/www-apps/mambo/Manifest b/www-apps/mambo/Manifest
index c5ef5c44715c..56e9684d5efa 100644
--- a/www-apps/mambo/Manifest
+++ b/www-apps/mambo/Manifest
@@ -1,6 +1,8 @@
-MD5 867c353b644702c87b431f4ab16663a0 mambo-4.5.ebuild 1017
-MD5 4a07512cb266539edefb1fabfdb0a708 ChangeLog 311
+MD5 0a2d9189783f06404ed80c355976f98c ChangeLog 2674
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
-MD5 1d7786882cf944d4456e6e356e2a9cec files/digest-mambo-4.5 74
-MD5 59b39cb8d36aac8cfeff7918ee784531 files/postinstall-en.txt 906
-MD5 2d97c19e7db984a98f4b70f019a6ed32 files/reconfig 1960
+MD5 833ddb4f175a688b0893107e846b608d mambo-4.5.2.3.ebuild 2891
+MD5 3a4fe61a2ddf7b07cbdce52f3f67566a mambo-4.5.2.3-r1.ebuild 2990
+MD5 3d99cf82feda374b93fb14a227f3d37f files/mambo-4.5.2.3-globals_overwrite.patch 683
+MD5 3601661ea6b8a216f15131f63bc24388 files/postinstall-en.txt 991
+MD5 6c941a8ae21f670067d3ce092d91b9cc files/digest-mambo-4.5.2.3 73
+MD5 6c941a8ae21f670067d3ce092d91b9cc files/digest-mambo-4.5.2.3-r1 73
diff --git a/www-apps/mambo/files/postinstall-en.txt b/www-apps/mambo/files/postinstall-en.txt
index b6e8a450ffac..242477ce98b9 100644
--- a/www-apps/mambo/files/postinstall-en.txt
+++ b/www-apps/mambo/files/postinstall-en.txt
@@ -1,9 +1,11 @@
 You are almost done!
 
+  0. Setup the db.
 
   1. Restart Apache
 
-  2. Login on http://YOURHOST and finish the installation. IMPORTANT: the web
+  2. Login on http://${VHOST_HOSTNAME}/${VHOST_APPDIR} 
+  and finish the installation. IMPORTANT: the web
   installer will complain that configuration.php is not writeable. When you
   are done, create configuration.php in ${MY_INSTALLDIR} and copy the generated
   configuration into it. Then execute the following:
@@ -19,8 +21,8 @@ You are almost done!
 
   You can now launch your browser and point it to your MOS site e.g.
 
-  http://www.mysite.com -> Main Site
-  http://www.mysite.com/administrator -> Admin
+  http://${VHOST_HOSTNAME}/${VHOST_APPDIR} -> Main Site
+  http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/administrator -> Admin
 
   You can log into Admin using the username 'admin' along with the
   password that was generated or you chose during the web based install.
diff --git a/www-apps/mambo/mambo-4.5.2.3-r1.ebuild b/www-apps/mambo/mambo-4.5.2.3-r1.ebuild
index 1c2c9ce0112b..34c0999be07d 100644
--- a/www-apps/mambo/mambo-4.5.2.3-r1.ebuild
+++ b/www-apps/mambo/mambo-4.5.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/www-apps/mambo/mambo-4.5.2.3-r1.ebuild,v 1.1 2005/11/20 10:41:41 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mambo/mambo-4.5.2.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:11 chriswhite Exp $
 
 inherit webapp eutils
 
diff --git a/www-apps/mambo/mambo-4.5.2.3.ebuild b/www-apps/mambo/mambo-4.5.2.3.ebuild
index fb107ba6011c..34a0502af685 100644
--- a/www-apps/mambo/mambo-4.5.2.3.ebuild
+++ b/www-apps/mambo/mambo-4.5.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/www-apps/mambo/mambo-4.5.2.3.ebuild,v 1.1 2005/06/16 12:26:25 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mambo/mambo-4.5.2.3.ebuild,v 1.1.1.1 2005/11/30 09:37:11 chriswhite Exp $
 
 inherit webapp eutils
 
@@ -16,13 +16,13 @@ S=${WORKDIR}
 IUSE=""
 
 RDEPEND="dev-db/mysql
-	>=virtual/php-4.1
+	virtual/php
 	net-www/apache"
 DEPEND="app-arch/unzip"
 
 pkg_setup () {
 	webapp_pkg_setup
-	einfo "Please make sure that your PHP is compiled with zlib, XML, and MySQL support"
+	einfo "Please make sure that your PHP is compiled with XML and MySQL support"
 }
 
 src_install () {
@@ -46,7 +46,7 @@ src_install () {
 }
 
 pkg_postinst () {
-	einfo "Now run ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
+	einfo "Now run \"emerge --config =${PF}\""
 	einfo "to setup the database"
 	einfo "Note that db and dbuser need to be present prior to running db setup"
 	webapp_pkg_postinst
@@ -62,36 +62,31 @@ pkg_config() {
 	/etc/init.d/mysql restart || die "mysql needs to be running"
 
 	echo -n "mysql db name [${D_DB}]: "; read MY_DB
-	if (test -z ${MY_DB}) ; then MY_DB=${D_DB} ; fi
+	[[ -z ${MY_DB} ]] && MY_DB=${D_DB}
 
 	echo -n "mysql db host [${D_HOST}]: "; read MY_HOST
-	if (test -z ${MY_HOST}) ; then MY_HOST=${D_HOST}; fi
+	[[ -z ${MY_HOST} ]] && MY_HOST=${D_HOST}
 
 	echo -n "mysql dbuser name [${D_USER}]: "; read MY_USER
-	if (test -z ${MY_USER}) ; then MY_USER=${D_USER} ; fi
+	[[ -z ${MY_USER} ]] && MY_USER=${D_USER}
 
 	echo -n "mysql dbuser password: "; read mypwd
-	if (test -z ${mypwd}) ; then die "Error: no dbuser password" ; fi
+	[[ -z ${mypwd} ]] && die "Error: no dbuser password"
 
 	# privileges
 	echo -n "Please enter login info for user who has grant privileges on ${MY_HOST} [$USER]: "; read adminuser
-	if (test -z ${adminuser}) ; then adminuser="$USER" ; fi
+	[[ -z ${adminuser} ]] && adminuser="$USER"
 	if [ "${MY_HOST}" != "localhost" ]; then
 		echo -n "Client address (at db side) [$(hostname -f)]: "; read clientaddr
-		if (test -z ${clientaddr}) ; then clientaddr="$(hostname -f)" ; fi
+		[[ -z ${clientaddr} ]] && clientaddr="$(hostname -f)"
 	fi
 	# this will be default for localhost
-	if (test -z ${clientaddr}) ; then clientaddr="${MY_HOST}" ; fi
+	[[ -z ${clientaddr} ]] && clientaddr="${MY_HOST}"
 
 	# if $MY_HOST == localhost, don't specify -h argument, so local socket can be used.
 	host=${MY_HOST/localhost}
-	mysqladmin -u ${MY_USER} ${host:+-h ${host}} -p create ${MY_DB} || die "Error creating database"
-	mysql -u ${adminuser} ${host:+-h ${host}} -p mysql --exec="GRANT SELECT,INSERT,UPDATE,DELETE,INDEX, ALTER,CREATE,DROP,REFERENCES ON ${MY_DB}.* TO ${MY_USER}@${clientaddr} IDENTIFIED BY '${mypwd}'; FLUSH PRIVILEGES;"  || {
-	echo "Error running query!"
-	echo
-	echo "Please run it manually on ${host}."
-	echo
-	echo "   \$ mysql -u ${adminuser} -p mysql --exec=\"GRANT SELECT,INSERT,UPDATE,DELETE,INDEX, ALTER,CREATE,DROP,REFERENCES ON ${MY_DB}.* TO ${MY_USER}@${clientaddr} IDENTIFIED BY '${mypwd}'; FLUSH PRIVILEGES;\""
-	echo
-	}
+	mysqladmin -u ${adminuser} ${host:+-h ${host}} -p create ${MY_DB} || die "Error creating database"
+	mysql -u "${adminuser}" "${host:+-h ${host}}" -p \
+		-e "GRANT SELECT,INSERT,UPDATE,DELETE,INDEX,ALTER,CREATE,DROP,REFERENCES
+		ON ${MY_DB}.* TO '${MY_USER}'@'${clientaddr}' IDENTIFIED BY '${mypwd}'; FLUSH PRIVILEGES;"  || die "Error initializing database. Please grant permissions manually."
 }
diff --git a/www-apps/mantisbt/ChangeLog b/www-apps/mantisbt/ChangeLog
index db27bd1c682b..aa4afc4c944a 100644
--- a/www-apps/mantisbt/ChangeLog
+++ b/www-apps/mantisbt/ChangeLog
@@ -1,6 +1,88 @@
 # ChangeLog for www-apps/mantisbt
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mantisbt/ChangeLog,v 1.1 2004/08/30 09:31:26 rl03 Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mantisbt/ChangeLog,v 1.1.1.1 2005/11/30 09:37:13 chriswhite Exp $
+
+*mantisbt-1.0.0_rc3 (31 Oct 2005)
+
+  31 Oct 2005; Renat Lumpau <rl03@gentoo.org> +mantisbt-1.0.0_rc3.ebuild:
+  Version bump
+
+  25 Oct 2005; Renat Lumpau <rl03@gentoo.org> mantisbt-1.0.0_rc2.ebuild:
+  Added postgres support wrt bug #106488.
+
+  25 Oct 2005; Renat Lumpau <rl03@gentoo.org> -files/0.19.2-debian.patch,
+  -mantisbt-0.19.2.ebuild:
+  Removing old version
+
+  24 Oct 2005; Michael Hanselmann <hansmi@gentoo.org>
+  mantisbt-0.19.3.ebuild:
+  Stable on ppc.
+
+*mantisbt-0.19.3 (24 Oct 2005)
+
+  24 Oct 2005; Renat Lumpau <rl03@gentoo.org> +files/0.19.3-debian.patch,
+  +mantisbt-0.19.3.ebuild:
+  Version bump wrt security bug #110326.
+
+  16 Sep 2005; Renat Lumpau <rl03@gentoo.org> mantisbt-0.19.2.ebuild:
+  Fixed ${S}
+
+  15 Sep 2005; Renat Lumpau <rl03@gentoo.org> -mantisbt-0.18.3.ebuild:
+  Removing vulnerable version wrt security bug #103308.
+
+  15 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
+  mantisbt-0.19.2.ebuild:
+  Stable on ppc.
+
+*mantisbt-0.19.2 (14 Sep 2005)
+
+  14 Sep 2005; Renat Lumpau <rl03@gentoo.org> +files/0.19.2-debian.patch,
+  +mantisbt-0.19.2.ebuild:
+  Version bump wrt security bug #103308. Using a Debian patch.
+
+*mantisbt-1.0.0_rc2 (14 Sep 2005)
+
+  14 Sep 2005; Renat Lumpau <rl03@gentoo.org> -mantisbt-1.0.0_rc1.ebuild,
+  +mantisbt-1.0.0_rc2.ebuild:
+  Version bump
+
+  11 Sep 2005; Renat Lumpau <rl03@gentoo.org> mantisbt-0.18.3.ebuild,
+  mantisbt-1.0.0_rc1.ebuild:
+  Fixed php deps wrt bug #105419.
+
+  22 Aug 2005; Renat Lumpau <rl03@gentoo.org>
+  files/postinstall-en-1.0.0.txt:
+  Housekeeping
+
+  22 Aug 2005; Renat Lumpau <rl03@gentoo.org>
+  files/postinstall-en-1.0.0.txt, mantisbt-1.0.0_rc1.ebuild:
+  Housekeeping
+
+  12 Aug 2005; Luis Medinas <metalgod@gentoo.org> mantisbt-1.0.0_rc1.ebuild:
+  Add ~amd64 Keywords. Closes bug #98747.
+
+*mantisbt-1.0.0_rc1 (28 Jul 2005)
+
+  28 Jul 2005; Renat Lumpau <rl03@gentoo.org>
+  +files/postinstall-en-1.0.0.txt, -mantisbt-1.0.0_alpha3.ebuild,
+  +mantisbt-1.0.0_rc1.ebuild:
+  Version bump (bug #100564)
+
+*mantisbt-1.0.0_alpha3 (04 Jul 2005)
+
+  04 Jul 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  +mantisbt-1.0.0_alpha3.ebuild:
+  Version bump, closes #77253.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  mantisbt-0.18.3.ebuild:
+  Masked mantisbt-0.18.3.ebuild stable for ppc
+
+  03 Sep 2004; David Holm <dholm@gentoo.org> mantisbt-0.18.3.ebuild:
+  Added to ~ppc.
+
+  30 Aug 2004; Renat Lumpau <rl03@gentoo.org> mantisbt-0.18.3.ebuild:
+  Fixed DEPEND/RDEPEND
 
 *mantisbt-0.18.3 (30 Aug 2004)
 
diff --git a/www-apps/mantisbt/Manifest b/www-apps/mantisbt/Manifest
index c37f7ec9b898..79b13bed8cbe 100644
--- a/www-apps/mantisbt/Manifest
+++ b/www-apps/mantisbt/Manifest
@@ -1,5 +1,21 @@
-MD5 2df6fe9b97e4e65c31f11303e2ef81b1 ChangeLog 411
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 86a7a4861c91624ef8c32ff8ecf66eb5 mantisbt-0.19.3.ebuild 1072
+MD5 7482adb56759934e9b1db696dac6ab3e mantisbt-1.0.0_rc3.ebuild 959
+MD5 b8787b64b3c3b48b47ad5757dcf82a6d mantisbt-1.0.0_rc2.ebuild 959
+MD5 597cc2b3715ea9028bd4232ea81655b1 ChangeLog 2969
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
-MD5 bea72bdeefc1fb841a76beb8c5c8af5e mantisbt-0.18.3.ebuild 960
-MD5 cc4d1c5d3bb40662950d32111d027dad files/postinstall-en.txt 537
-MD5 4553a6ae29bae20c13ffa21fdb20281b files/digest-mantisbt-0.18.3 67
+MD5 aaabd486081a3b2aeb22bddd759bb22d files/digest-mantisbt-1.0.0_rc2 68
+MD5 694f56f5cc639943cec54ee947f52c79 files/digest-mantisbt-1.0.0_rc3 68
+MD5 35d6b6f4cf6611c8b6232b0c83c67f52 files/postinstall-en.txt 680
+MD5 072dd6da83b18a0497e3376b597b20ef files/digest-mantisbt-0.19.3 66
+MD5 97c947f30d07a6405194bed5981ceceb files/postinstall-en-1.0.0.txt 488
+MD5 8fd686995bd33035d403d5d0971ece6d files/0.19.3-debian.patch 593
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDZibdEzitwsaoONoRAtLSAKCPeZlmpc+EgnaR8lc17nykgCgqxgCdFlBa
+mA01pOdwzws60Axft4CowN4=
+=xFY5
+-----END PGP SIGNATURE-----
diff --git a/www-apps/mantisbt/files/0.19.3-debian.patch b/www-apps/mantisbt/files/0.19.3-debian.patch
index c9b68a416fb7..851e560a35f1 100644
--- a/www-apps/mantisbt/files/0.19.3-debian.patch
+++ b/www-apps/mantisbt/files/0.19.3-debian.patch
@@ -2,7 +2,7 @@ diff -upr mantis-0.19.3/core/database_api.php mantis-0.19.3_fixed/core/database_
 --- mantis-0.19.3/core/database_api.php	2004-12-09 13:55:06.000000000 -0500
 +++ mantis-0.19.3_fixed/core/database_api.php	2005-10-24 10:30:31.000000000 -0400
 @@ -9,6 +9,10 @@
- 	# $Id: 0.19.3-debian.patch,v 1.1 2005/10/24 14:41:57 rl03 Exp $
+ 	# $Id: 0.19.3-debian.patch,v 1.1.1.1 2005/11/30 09:37:13 chriswhite Exp $
  	# --------------------------------------------------------
  
 +	# Patch for #0005956: Database system scanner via variable poisoning
diff --git a/www-apps/mantisbt/files/postinstall-en-1.0.0.txt b/www-apps/mantisbt/files/postinstall-en-1.0.0.txt
index c0bfe4ee8864..7c4a8c58bccb 100644
--- a/www-apps/mantisbt/files/postinstall-en-1.0.0.txt
+++ b/www-apps/mantisbt/files/postinstall-en-1.0.0.txt
@@ -1,7 +1,7 @@
 If you are upgrading from an earlier version, you can use the upgrade scripts
 at admin/ to execute the pending database updates.
 
-To install, visit: http://${VHOST_HOSTNAME}/mantisbt/admin/install.php
+To install, visit: http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/admin/install.php
 Then log in: administrator/root.
 You can load up admin/check.php to see if everything is working correctly.
 
diff --git a/www-apps/mantisbt/files/postinstall-en.txt b/www-apps/mantisbt/files/postinstall-en.txt
index b49a956f2e65..72c4dc37bf1c 100644
--- a/www-apps/mantisbt/files/postinstall-en.txt
+++ b/www-apps/mantisbt/files/postinstall-en.txt
@@ -2,12 +2,17 @@ Please edit ${MY_INSTALLDIR}/config_inc.php to configure Mantis for your
 system.
 
 If this a first time install, you must create the mantis database and then
-execute ${MY_SQLSCRIPTSDIR}/mysql/${PVR}_create.sql
-via mysql to create the tables. If you are upgrading from an earlier version
-you can use the upgrade scripts at admin/ to execute the pending database
-updates.
+execute 
 
-Check your installation: http://${VHOST_HOSTNAME}/${PN}/admin
+ mysql -u<username> -p<password> <databasename> < ${MY_SQLSCRIPTSDIR}/mysql/${PVR}_create.sql
+
+If you are upgrading from an earlier version, you can use the upgrade scripts
+at admin/ to execute the pending database updates.
+
+Check your installation: http://${VHOST_HOSTNAME}/mantisbt/admin
 Then log in: administrator/root.
+You can load up admin/check.php to see if everything is working correctly.
 
 After you've finished these steps, please delete the admin/ directory.
+
+Don't forget to read the online manual!!!
diff --git a/www-apps/mantisbt/mantisbt-0.19.3.ebuild b/www-apps/mantisbt/mantisbt-0.19.3.ebuild
index b80cfe8e6797..9e3d6d0c4725 100644
--- a/www-apps/mantisbt/mantisbt-0.19.3.ebuild
+++ b/www-apps/mantisbt/mantisbt-0.19.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/www-apps/mantisbt/mantisbt-0.19.3.ebuild,v 1.1 2005/10/24 14:41:57 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mantisbt/mantisbt-0.19.3.ebuild,v 1.1.1.1 2005/11/30 09:37:13 chriswhite Exp $
 
 inherit webapp eutils
 
@@ -12,7 +12,7 @@ DESCRIPTION="PHP/MySQL/Web based bugtracking system"
 HOMEPAGE="http://www.mantisbt.org/"
 SRC_URI="mirror://sourceforge/${PN}/mantis-${PV}.tar.gz"
 
-KEYWORDS="~ppc ~x86"
+KEYWORDS="ppc ~x86"
 
 RDEPEND="
 	>=dev-db/mysql-3.23.32
diff --git a/www-apps/mantisbt/mantisbt-1.0.0_rc2.ebuild b/www-apps/mantisbt/mantisbt-1.0.0_rc2.ebuild
index c7ca15854ad8..4f7d714470fc 100644
--- a/www-apps/mantisbt/mantisbt-1.0.0_rc2.ebuild
+++ b/www-apps/mantisbt/mantisbt-1.0.0_rc2.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/www-apps/mantisbt/mantisbt-1.0.0_rc2.ebuild,v 1.1 2005/09/14 10:36:38 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mantisbt/mantisbt-1.0.0_rc2.ebuild,v 1.1.1.1 2005/11/30 09:37:13 chriswhite Exp $
 
 inherit webapp
 
-IUSE=""
+IUSE="mysql postgres"
 MY_PV=${PV/_rc/rc}
 
 DESCRIPTION="PHP/MySQL/Web based bugtracking system"
@@ -16,7 +16,8 @@ S=${WORKDIR}/mantis-${MY_PV}
 KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND="
-	>=dev-db/mysql-3.23.32
+	mysql? ( >=dev-db/mysql-3.23.32 )
+	postgres? ( >=dev-db/postgresql-7 )
 	net-www/apache
 	virtual/httpd-php
 "
diff --git a/www-apps/mantisbt/mantisbt-1.0.0_rc3.ebuild b/www-apps/mantisbt/mantisbt-1.0.0_rc3.ebuild
index 3c525a473628..268e684ad440 100644
--- a/www-apps/mantisbt/mantisbt-1.0.0_rc3.ebuild
+++ b/www-apps/mantisbt/mantisbt-1.0.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/www-apps/mantisbt/mantisbt-1.0.0_rc3.ebuild,v 1.1 2005/10/31 14:14:39 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mantisbt/mantisbt-1.0.0_rc3.ebuild,v 1.1.1.1 2005/11/30 09:37:13 chriswhite Exp $
 
 inherit webapp
 
diff --git a/www-apps/mediawiki/ChangeLog b/www-apps/mediawiki/ChangeLog
index 5973039402ef..ab03b36f35a0 100644
--- a/www-apps/mediawiki/ChangeLog
+++ b/www-apps/mediawiki/ChangeLog
@@ -1,6 +1,229 @@
 # ChangeLog for www-apps/mediawiki
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.1 2004/11/16 17:43:11 trapni Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.1.1.1 2005/11/30 09:37:02 chriswhite Exp $
+
+*mediawiki-1.5.2 (07 Nov 2005)
+*mediawiki-1.4.12 (07 Nov 2005)
+*mediawiki-1.3.18 (07 Nov 2005)
+
+  07 Nov 2005; Christian Parpart <trapni@gentoo.org>
+  +mediawiki-1.3.18.ebuild, +mediawiki-1.4.12.ebuild,
+  +mediawiki-1.5.2.ebuild:
+  version bumps
+
+*mediawiki-1.5.1-r1 (31 Oct 2005)
+
+  31 Oct 2005; Christian Parpart <trapni@gentoo.org>
+  +mediawiki-1.5.1-r1.ebuild:
+  incorporate thoughts from bug #110977
+
+  26 Oct 2005; Christian Parpart <trapni@gentoo.org>
+  -mediawiki-1.5.0_rc2.ebuild, -mediawiki-1.5.0_rc3.ebuild,
+  -mediawiki-1.5.0_rc4.ebuild:
+  more cleanup
+
+  26 Oct 2005; Christian Parpart <trapni@gentoo.org>
+  -mediawiki-1.5.0_rc4-r1.ebuild:
+  version cleanup
+
+*mediawiki-1.5.1 (26 Oct 2005)
+
+  26 Oct 2005; Christian Parpart <trapni@gentoo.org>
+  +mediawiki-1.5.1.ebuild:
+  version bump
+
+*mediawiki-1.4.11 (23 Oct 2005)
+*mediawiki-1.3.17 (23 Oct 2005)
+
+  23 Oct 2005; Christian Parpart <trapni@gentoo.org>
+  +mediawiki-1.3.17.ebuild, +mediawiki-1.4.11.ebuild:
+  version bumps (security/bug fix releases)
+
+*mediawiki-1.5.0 (23 Oct 2005)
+
+  23 Oct 2005; Christian Parpart <trapni@gentoo.org>
+  +mediawiki-1.5.0.ebuild:
+  version bump
+
+  16 Oct 2005; Jason Wever <weeve@gentoo.org> mediawiki-1.5.0_rc4-r1.ebuild:
+  Added ~sparc keyword.
+
+*mediawiki-1.4.10 (24 Sep 2005)
+*mediawiki-1.3.16 (24 Sep 2005)
+
+  24 Sep 2005; Christian Parpart <trapni@gentoo.org>
+  +mediawiki-1.3.16.ebuild, +mediawiki-1.4.10.ebuild:
+  version bump
+
+*mediawiki-1.3.15-r1 (17 Sep 2005)
+
+  17 Sep 2005; Christian Parpart <trapni@gentoo.org>
+  +mediawiki-1.3.15-r1.ebuild:
+  use virtual/tetex and virtual/ghostscript instead of explicitely qualifying
+  a fixed package
+
+  16 Sep 2005; Christian Parpart <trapni@gentoo.org>
+  mediawiki-1.5.0_rc4-r1.ebuild:
+  cleaning up some DIRS not to install from dist (as supposed in #105435)
+
+  15 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  mediawiki-1.5.0_rc4-r1.ebuild:
+  functions go in pkg_setup
+
+*mediawiki-1.5.0_rc4-r1 (15 Sep 2005)
+*mediawiki-1.4.9-r1 (15 Sep 2005)
+
+  15 Sep 2005; Christian Parpart <trapni@gentoo.org>
+  +mediawiki-1.4.9-r1.ebuild, +mediawiki-1.5.0_rc4-r1.ebuild:
+  fixing ghostscript depend and solved some more depend-on-useflag issues on
+  mediawiki 1.5
+
+*mediawiki-1.5.0_rc4 (30 Aug 2005)
+*mediawiki-1.4.9 (30 Aug 2005)
+*mediawiki-1.3.15 (30 Aug 2005)
+
+  30 Aug 2005; Christian Parpart <trapni@gentoo.org>
+  +mediawiki-1.3.15.ebuild, +mediawiki-1.4.9.ebuild,
+  +mediawiki-1.5.0_rc4.ebuild:
+  version bumps
+
+*mediawiki-1.5.0_rc3 (25 Aug 2005)
+
+  25 Aug 2005; Christian Parpart <trapni@gentoo.org>
+  +mediawiki-1.5.0_rc3.ebuild:
+  versiion bump
+
+*mediawiki-1.5.0_rc2 (24 Aug 2005)
+
+  24 Aug 2005; Christian Parpart <trapni@gentoo.org>
+  -mediawiki-1.5.0_rc1.ebuild, +mediawiki-1.5.0_rc2.ebuild:
+  bumping 1.5.0_rc2...
+
+*mediawiki-1.5.0_rc1 (24 Aug 2005)
+
+  24 Aug 2005; Christian Parpart <trapni@gentoo.org>
+  +mediawiki-1.5.0_rc1.ebuild:
+  bringing 1.5 series into the tree (masked for testing anyway)
+
+  24 Aug 2005; Christian Parpart <trapni@gentoo.org>
+  -mediawiki-1.3.11.ebuild, -mediawiki-1.3.12.ebuild,
+  -mediawiki-1.4.4.ebuild, -mediawiki-1.4.5.ebuild:
+  clean out pretty old versions of mediawiki
+
+*mediawiki-1.4.8 (24 Aug 2005)
+*mediawiki-1.3.14 (24 Aug 2005)
+
+  24 Aug 2005; Christian Parpart <trapni@gentoo.org>
+  +mediawiki-1.3.14.ebuild, +mediawiki-1.4.8.ebuild:
+  version bump; 1.3.14 is security fix only and 1.4.8 is security fix *and*
+  minor bugfixes regarding IE7/mono-skin. read the RELEASE-NOTES for more
+  infos
+
+*mediawiki-1.4.7 (16 Jul 2005)
+
+  16 Jul 2005; Christian Parpart <trapni@gentoo.org>
+  +mediawiki-1.4.7.ebuild:
+  version bump
+
+  22 Jun 2005; Jason Wever <weeve@gentoo.org> mediawiki-1.4.5.ebuild:
+  Added ~sparc keyword.
+
+*mediawiki-1.4.5 (05 Jun 2005)
+*mediawiki-1.3.13 (05 Jun 2005)
+
+  05 Jun 2005; Christian Parpart <trapni@gentoo.org>
+  +mediawiki-1.3.13.ebuild, +mediawiki-1.4.5.ebuild:
+  Bumping upstream releases 1.3.13 and 1.4.5
+
+  10 May 2005; Christian Parpart <trapni@gentoo.org> mediawiki-1.4.4.ebuild:
+  marked stable for amd64 and x86
+
+*mediawiki-1.4.4 (04 May 2005)
+
+  04 May 2005; Christian Parpart <trapni@gentoo.org>
+  +mediawiki-1.4.4.ebuild:
+  man, yet another release, they're fast, aren't they? (just announced a
+  minute ago)
+
+*mediawiki-1.4.3 (04 May 2005)
+
+  04 May 2005; Christian Parpart <trapni@gentoo.org> mediawiki-1.4.0.ebuild,
+  mediawiki-1.4.1.ebuild, mediawiki-1.4.2.ebuild, +mediawiki-1.4.3.ebuild:
+  version bump, and honoring bug #78164
+
+*mediawiki-1.3.12 (25 Apr 2005)
+
+  25 Apr 2005; Christian Parpart <trapni@gentoo.org>
+  +mediawiki-1.3.12.ebuild:
+  version bump
+
+  25 Apr 2005; Christian Parpart <trapni@gentoo.org> :
+  version bump
+
+*mediawiki-1.4.1 (25 Apr 2005)
+
+  25 Apr 2005; Christian Parpart <trapni@gentoo.org>
+  +mediawiki-1.4.1.ebuild:
+  version bump
+
+  03 Apr 2005; Christian Parpart <trapni@gentoo.org> mediawiki-1.4.0.ebuild:
+  adding ppc keyword on request
+
+*mediawiki-1.4.0 (23 Mar 2005)
+
+  23 Mar 2005; Christian Parpart <trapni@gentoo.org>
+  +mediawiki-1.4.0.ebuild:
+  version bump
+
+*mediawiki-1.4.0_rc1 (21 Feb 2005)
+
+  21 Feb 2005; Christian Parpart <trapni@gentoo.org>
+  +mediawiki-1.4.0_rc1.ebuild:
+  version bump of to 1.4.0_rc1 of the 1.4.x series (security update)
+
+*mediawiki-1.3.11 (21 Feb 2005)
+
+  21 Feb 2005; Christian Parpart <trapni@gentoo.org>
+  +mediawiki-1.3.11.ebuild:
+  * version bump to 1.3.11 (security update)
+  * also make use of local math useflag as proposed in bug 82329.
+
+  18 Feb 2005; Christian Parpart <trapni@gentoo.org> :
+  fixed bug 82329: typo
+
+  17 Feb 2005; Christian Parpart <trapni@gentoo.org>
+  +files/postinstall-1.4-en.txt:
+  be honest to comments in bug #81671
+
+*mediawiki-1.4.0_beta6 (17 Feb 2005)
+
+  17 Feb 2005; Christian Parpart <trapni@gentoo.org>
+  +mediawiki-1.4.0_beta6.ebuild:
+  version bump to 1.4.0_beta6; although fixed bug #81671 for 1.4x line
+
+*mediawiki-1.3.10 (04 Feb 2005)
+
+  04 Feb 2005; Christian Parpart <trapni@gentoo.org>
+  +mediawiki-1.3.10.ebuild:
+  version bump
+
+  23 Jan 2005; Christian Parpart <trapni@gentoo.org> mediawiki-1.3.9.ebuild:
+  -m marking stable for x86 and amd64 since no known problems occured
+
+*mediawiki-1.3.9 (19 Dec 2004)
+
+  19 Dec 2004; Christian Parpart <trapni@gentoo.org>
+  +mediawiki-1.3.9.ebuild:
+  version bump to 1.3.9
+
+  05 Dec 2004; Christian Parpart <trapni@gentoo.org> mediawiki-1.3.8.ebuild:
+  marked ~amd64, as proposed by Wolfgang Loeffler (bug #37894) comment 19;
+  he tested it, and it runs well on this arch
+
+  16 Nov 2004; Christian Parpart <trapni@gentoo.org>:
+  improved ebuild'ing behavior with the experience users made in 
+  bug #37894 already. Thanks to Alex Plank <aplank@notsohotmail.com> 
+  for his initial ebuild.
 
 *mediawiki-1.3.8 (16 Nov 2004)
 
diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index 388dbe489625..f362c32ee711 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -1,4 +1,28 @@
-MD5 0e201daa491640c742b312e06075cbc5 metadata.xml 225
-MD5 044792e95202f35c5a00511929a8c666 .mediawiki-1.3.8.ebuild.swp 16384
-MD5 2e8fd1c2af96f0e43fa054d188bfd561 mediawiki-1.3.8.ebuild 500
-MD5 f083e5c34cf1201e213e4b2daa3b289a files/digest-mediawiki-1.3.8 68
+MD5 26b754470a2f66016abe847c8f6a87e2 ChangeLog 7065
+MD5 7258757309ee4bf1c48769dcbfba8737 files/digest-mediawiki-1.3.15-r1 69
+MD5 463e35139bff169c5a262ac999d7b16b files/digest-mediawiki-1.3.16 69
+MD5 0cb49c402ac7c5ac958de17c74dda844 files/digest-mediawiki-1.3.17 69
+MD5 f9a834b189520af6979375f918f5f7d8 files/digest-mediawiki-1.3.18 69
+MD5 3506df677b5db3cae61371dd5eb5af07 files/digest-mediawiki-1.4.10 69
+MD5 ec6e042a8762c71dd5a137749e0bc14d files/digest-mediawiki-1.4.11 69
+MD5 e6804ca4c1fccd69e4eb208595151b96 files/digest-mediawiki-1.4.12 69
+MD5 fa7f17c613d569b12a8fc159c200119f files/digest-mediawiki-1.4.9-r1 68
+MD5 e7126e6e9d80398d7f39e6f2137b82f9 files/digest-mediawiki-1.5.0 68
+MD5 af48e06f47f3fca4b504d62041561922 files/digest-mediawiki-1.5.1 68
+MD5 af48e06f47f3fca4b504d62041561922 files/digest-mediawiki-1.5.1-r1 68
+MD5 be1ce9d589f7f3b0b7d99d7399475200 files/digest-mediawiki-1.5.2 68
+MD5 7ec90d807694699cb90d9a56ec2ff67b files/postinstall-1.4-en.txt 1843
+MD5 85f32b5fca9afd6479cdcea022c096f2 files/postinstall-en.txt 1731
+MD5 25fe3c4d0ee38dc4d7b7a5a7f25725c0 mediawiki-1.3.15-r1.ebuild 2900
+MD5 8287b963ff3efc992f54b01eba8b7895 mediawiki-1.3.16.ebuild 2897
+MD5 e2eb83c50a0da7a23cd74f12fddf708b mediawiki-1.3.17.ebuild 2897
+MD5 2ad6c36b0e0b867f6d6e087bc7ccf44b mediawiki-1.3.18.ebuild 2897
+MD5 4ad4ca4c8ce307bcb7be329474c1d548 mediawiki-1.4.10.ebuild 2788
+MD5 3dd30f042664b2b989c1e4f37ae7d1b8 mediawiki-1.4.11.ebuild 2788
+MD5 98b3e8fc1cde69d5706c94c807ff5884 mediawiki-1.4.12.ebuild 2788
+MD5 387803dfbebedc5a239cb73beb1c6901 mediawiki-1.4.9-r1.ebuild 2790
+MD5 4e7b0633ddae335dd5cf446016de24d8 mediawiki-1.5.0.ebuild 2936
+MD5 b9bccdf8f21072ba15085470c04a3b50 mediawiki-1.5.1-r1.ebuild 2933
+MD5 c4f2cd2731968301ae318465664bacc7 mediawiki-1.5.1.ebuild 2936
+MD5 118a5ee55f862de7e825d45fc6e42766 mediawiki-1.5.2.ebuild 2930
+MD5 4ce25f8911fa68ab85e31b0953266511 metadata.xml 226
diff --git a/www-apps/mediawiki/mediawiki-1.3.15-r1.ebuild b/www-apps/mediawiki/mediawiki-1.3.15-r1.ebuild
index fb8625ed30c3..4b7fc386592f 100644
--- a/www-apps/mediawiki/mediawiki-1.3.15-r1.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.3.15-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/www-apps/mediawiki/mediawiki-1.3.15-r1.ebuild,v 1.1 2005/09/16 23:30:36 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.3.15-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:02 chriswhite Exp $
 
 inherit webapp
 
diff --git a/www-apps/mediawiki/mediawiki-1.3.16.ebuild b/www-apps/mediawiki/mediawiki-1.3.16.ebuild
index 9b6d8c1af3e0..973824e81dd6 100644
--- a/www-apps/mediawiki/mediawiki-1.3.16.ebuild
+++ b/www-apps/mediawiki/mediawiki-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/www-apps/mediawiki/mediawiki-1.3.16.ebuild,v 1.1 2005/09/24 08:21:41 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.3.16.ebuild,v 1.1.1.1 2005/11/30 09:37:02 chriswhite Exp $
 
 inherit webapp
 
diff --git a/www-apps/mediawiki/mediawiki-1.3.17.ebuild b/www-apps/mediawiki/mediawiki-1.3.17.ebuild
index 350744fc14eb..4c5961089064 100644
--- a/www-apps/mediawiki/mediawiki-1.3.17.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.3.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/www-apps/mediawiki/mediawiki-1.3.17.ebuild,v 1.1 2005/10/23 11:34:52 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.3.17.ebuild,v 1.1.1.1 2005/11/30 09:37:02 chriswhite Exp $
 
 inherit webapp
 
diff --git a/www-apps/mediawiki/mediawiki-1.3.18.ebuild b/www-apps/mediawiki/mediawiki-1.3.18.ebuild
index 7a3d51f97dca..93befc9e6631 100644
--- a/www-apps/mediawiki/mediawiki-1.3.18.ebuild
+++ b/www-apps/mediawiki/mediawiki-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/www-apps/mediawiki/mediawiki-1.3.18.ebuild,v 1.1 2005/11/07 16:13:25 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.3.18.ebuild,v 1.1.1.1 2005/11/30 09:37:02 chriswhite Exp $
 
 inherit webapp
 
diff --git a/www-apps/mediawiki/mediawiki-1.4.10.ebuild b/www-apps/mediawiki/mediawiki-1.4.10.ebuild
index 5e56eb5cbabb..4d08cd7e1c59 100644
--- a/www-apps/mediawiki/mediawiki-1.4.10.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.4.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/www-apps/mediawiki/mediawiki-1.4.10.ebuild,v 1.1 2005/09/24 08:21:41 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.4.10.ebuild,v 1.1.1.1 2005/11/30 09:37:02 chriswhite Exp $
 
 inherit webapp
 
diff --git a/www-apps/mediawiki/mediawiki-1.4.11.ebuild b/www-apps/mediawiki/mediawiki-1.4.11.ebuild
index 2965e5ec3648..dc4d2f4dd65d 100644
--- a/www-apps/mediawiki/mediawiki-1.4.11.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.4.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/www-apps/mediawiki/mediawiki-1.4.11.ebuild,v 1.1 2005/10/23 11:34:52 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.4.11.ebuild,v 1.1.1.1 2005/11/30 09:37:02 chriswhite Exp $
 
 inherit webapp
 
diff --git a/www-apps/mediawiki/mediawiki-1.4.12.ebuild b/www-apps/mediawiki/mediawiki-1.4.12.ebuild
index 0b4fedac7443..ff4de9a497cd 100644
--- a/www-apps/mediawiki/mediawiki-1.4.12.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.4.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/www-apps/mediawiki/mediawiki-1.4.12.ebuild,v 1.1 2005/11/07 16:13:25 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.4.12.ebuild,v 1.1.1.1 2005/11/30 09:37:02 chriswhite Exp $
 
 inherit webapp
 
diff --git a/www-apps/mediawiki/mediawiki-1.4.9-r1.ebuild b/www-apps/mediawiki/mediawiki-1.4.9-r1.ebuild
index 312e8068f0e3..024ee6e56612 100644
--- a/www-apps/mediawiki/mediawiki-1.4.9-r1.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.4.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/www-apps/mediawiki/mediawiki-1.4.9-r1.ebuild,v 1.1 2005/09/15 21:01:57 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.4.9-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:02 chriswhite Exp $
 
 inherit webapp
 
diff --git a/www-apps/mediawiki/mediawiki-1.5.0.ebuild b/www-apps/mediawiki/mediawiki-1.5.0.ebuild
index ac8d81158bc5..b7abf408fc12 100644
--- a/www-apps/mediawiki/mediawiki-1.5.0.ebuild
+++ b/www-apps/mediawiki/mediawiki-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/www-apps/mediawiki/mediawiki-1.5.0.ebuild,v 1.1 2005/10/23 11:28:50 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.5.0.ebuild,v 1.1.1.1 2005/11/30 09:37:02 chriswhite Exp $
 
 inherit webapp depend.php
 
diff --git a/www-apps/mediawiki/mediawiki-1.5.1-r1.ebuild b/www-apps/mediawiki/mediawiki-1.5.1-r1.ebuild
index d8f9af68f7bb..330f0ff68b41 100644
--- a/www-apps/mediawiki/mediawiki-1.5.1-r1.ebuild
+++ b/www-apps/mediawiki/mediawiki-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/www-apps/mediawiki/mediawiki-1.5.1-r1.ebuild,v 1.1 2005/10/31 23:21:25 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.5.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:02 chriswhite Exp $
 
 inherit webapp depend.php
 
diff --git a/www-apps/mediawiki/mediawiki-1.5.1.ebuild b/www-apps/mediawiki/mediawiki-1.5.1.ebuild
index 7d0ff6e0acfc..cc0bc4228036 100644
--- a/www-apps/mediawiki/mediawiki-1.5.1.ebuild
+++ b/www-apps/mediawiki/mediawiki-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/www-apps/mediawiki/mediawiki-1.5.1.ebuild,v 1.1 2005/10/26 12:18:15 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.5.1.ebuild,v 1.1.1.1 2005/11/30 09:37:02 chriswhite Exp $
 
 inherit webapp depend.php
 
diff --git a/www-apps/mediawiki/mediawiki-1.5.2.ebuild b/www-apps/mediawiki/mediawiki-1.5.2.ebuild
index 37644753530b..7844b1661d1b 100644
--- a/www-apps/mediawiki/mediawiki-1.5.2.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.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/www-apps/mediawiki/mediawiki-1.5.2.ebuild,v 1.1 2005/11/07 16:13:25 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.5.2.ebuild,v 1.1.1.1 2005/11/30 09:37:02 chriswhite Exp $
 
 inherit webapp depend.php
 
diff --git a/www-apps/mediawiki/metadata.xml b/www-apps/mediawiki/metadata.xml
index f107e1bb8eac..756d7b20a6a2 100644
--- a/www-apps/mediawiki/metadata.xml
+++ b/www-apps/mediawiki/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>web-apps</herd>
 	<maintainer>
 		<email>trapni@gentoo.org</email>
 	</maintainer>
diff --git a/www-apps/metadata.xml b/www-apps/metadata.xml
index 69303b5f7d70..a0106b580212 100644
--- a/www-apps/metadata.xml
+++ b/www-apps/metadata.xml
@@ -4,5 +4,31 @@
 	<longdescription lang="en">
 		The www-apps category contains various world wide web applications.
 	</longdescription>
+	<longdescription lang="es">
+		La categoría www-apps contiene paquetes relacionados con la world wide
+		web (WWW).
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie www-apps enthält verschiedene WWW-Applikationen wie
+		beispielsweise Wikis, CMS- oder Blogging-Software.
+	</longdescription>
+	<longdescription lang="ja">
+		www-appsカテゴリーには様々なワールド・ワイド・ウェブの
+		アプリケーションが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De www-apps categorie bevat verschillende WWW-applicaties zoals bijvoorbeeld
+		wiki's, CMS- en blogging-software.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm www-apps chứa các ứng dụng web.
+	</longdescription>
+	<longdescription lang="sk">
+		Táto kategória obsahuje rôzne WWW aplikácie.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria www-apps contiene applicazioni per il world wide
+		web (WWW) come software per wiki, CMS e blog.
+	</longdescription>
 </catmetadata>
 
diff --git a/www-apps/metadot/ChangeLog b/www-apps/metadot/ChangeLog
index a982c73f99b6..cd3d280d6bff 100644
--- a/www-apps/metadot/ChangeLog
+++ b/www-apps/metadot/ChangeLog
@@ -1,6 +1,58 @@
 # ChangeLog for www-apps/metadot
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/metadot/ChangeLog,v 1.1 2004/08/29 00:07:24 rl03 Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/metadot/ChangeLog,v 1.1.1.1 2005/11/30 09:37:08 chriswhite Exp $
+
+  02 Sep 2005; Renat Lumpau <rl03@gentoo.org> metadot-6.1.6.ebuild:
+  Fix 6.1.6
+
+  02 Sep 2005; Renat Lumpau <rl03@gentoo.org> metadot-6.4_p3.ebuild:
+  Add missing dev-perl/DateManip dependency wrt bug #104403.
+
+  22 Aug 2005; Renat Lumpau <rl03@gentoo.org>
+  files/postinstall-en-6.4_p3.txt:
+  Housekeeping
+
+*metadot-6.4_p3 (22 Aug 2005)
+
+  22 Aug 2005; Renat Lumpau <rl03@gentoo.org> -files/reconfig-6.4_p1,
+  +files/reconfig-6.4_p3, -files/postinstall-en-6.4_p1.txt,
+  +files/postinstall-en-6.4_p3.txt, -metadot-6.4_p1.ebuild,
+  +metadot-6.4_p3.ebuild:
+  Version bump
+
+*metadot-6.4_p1 (03 Jul 2005)
+
+  03 Jul 2005; Renat Lumpau <rl03@gentoo.org> +files/reconfig-6.4_p1,
+  +files/postinstall-en-6.4_p1.txt, +files/metadot.conf,
+  +metadot-6.4_p1.ebuild:
+  Version bump. Fix #96959.
+
+  02 Jul 2005; Renat Lumpau <rl03@gentoo.org> +files/reconfig-6.1.6,
+  +files/postinstall-en-6.1.6.txt, -files/postinstall-en.txt,
+  -files/reconfig, metadot-6.1.6.ebuild:
+  Cleaning house
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> metadot-6.1.6.ebuild:
+  dev-perl/Time-HiRes => perl-core/Time-HiRes migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> metadot-6.1.6.ebuild:
+  dev-perl/Storable => perl-core/Storable migration
+
+  09 May 2005; Elfyn McBratney <beu@gentoo.org> metadot-6.1.6.ebuild:
+  dev-perl/mod_perl -> www-apache/mod_perl
+
+  23 Apr 2005; Michael Cummings <mcummings@gentoo.org> metadot-6.1.6.ebuild:
+  Migration of names for text-csv to text-csv-xs
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  metadot-6.1.6.ebuild:
+  Masked metadot-6.1.6.ebuild stable for ppc
+
+  03 Sep 2004; David Holm <dholm@gentoo.org> metadot-6.1.6.ebuild:
+  Added to ~ppc.
+
+  30 Aug 2004; Renat Lumpau <rl03@gentoo.org> metadot-6.1.6.ebuild:
+  Fixed DEPEND/RDEPEND
 
 *metadot-6.1.6 (28 Aug 2004)
 
diff --git a/www-apps/metadot/Manifest b/www-apps/metadot/Manifest
index de30d9cd881c..52fad83dec48 100644
--- a/www-apps/metadot/Manifest
+++ b/www-apps/metadot/Manifest
@@ -1,6 +1,21 @@
-MD5 5cf02b4257e74820437b29a5f0e085d6 metadot-6.1.6.ebuild 1296
-MD5 854fd4f3fe5a1a5fd08abd7a99b07677 ChangeLog 317
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5c802b64f9e5b8cb1a9a2e6d96970197 metadot-6.4_p3.ebuild 1828
+MD5 dfd60989a17e0ab31fe6e6c850886525 metadot-6.1.6.ebuild 1410
+MD5 7f042ee94e1a007223d1ae2ee236526a ChangeLog 2190
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
-MD5 20d7f02a98e7e1bdd83cc868dc128863 files/postinstall-en.txt 1567
+MD5 d94b7dade124ac6fcecd869a69a59f48 files/reconfig-6.4_p3 370
+MD5 a50cf71c764014873dd735a19b6b77f6 files/postinstall-en-6.4_p3.txt 1187
 MD5 04f2425090275b79624c2ef14ef107ff files/digest-metadot-6.1.6 65
-MD5 c7ad307b2475e81f9e5a15c731185dd4 files/reconfig 337
+MD5 20d7f02a98e7e1bdd83cc868dc128863 files/postinstall-en-6.1.6.txt 1567
+MD5 a46f23e9d0e84956e0d476a0a52a1f32 files/digest-metadot-6.4_p3 65
+MD5 f06f271783c0db5fcb541f0fc51812a1 files/metadot.conf 445
+MD5 c7ad307b2475e81f9e5a15c731185dd4 files/reconfig-6.1.6 337
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDGDWrEzitwsaoONoRAva/AKCxHzgvS8iNO4NvTvC+IboBFDUMIQCcDA/h
+f7mw62bgA42uGzk5imRyFOk=
+=/9IS
+-----END PGP SIGNATURE-----
diff --git a/www-apps/metadot/files/postinstall-en-6.4_p3.txt b/www-apps/metadot/files/postinstall-en-6.4_p3.txt
index ee53717d4016..23a9ea0ae244 100644
--- a/www-apps/metadot/files/postinstall-en-6.4_p3.txt
+++ b/www-apps/metadot/files/postinstall-en-6.4_p3.txt
@@ -27,7 +27,7 @@ suit your needs.
 Read the relevant section in the docs, and be sure to specify the right paths.
 HINT: /home/metadot is not used, everything is in ${MY_INSTALLDIR}
 
-5. Now go to http://${VHOST_HOSTNAME}${VHOST_APPDIR}/index.pl
+5. Now go to http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/index.pl
 Hopefully everything worked. Now go read the docs and set up your Metadot, and
 change the default Admin password.
 
diff --git a/www-apps/metadot/metadot-6.1.6.ebuild b/www-apps/metadot/metadot-6.1.6.ebuild
index 79f528efbab0..b995e6812baa 100644
--- a/www-apps/metadot/metadot-6.1.6.ebuild
+++ b/www-apps/metadot/metadot-6.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/www-apps/metadot/metadot-6.1.6.ebuild,v 1.1 2004/08/29 00:07:24 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/metadot/metadot-6.1.6.ebuild,v 1.1.1.1 2005/11/30 09:37:08 chriswhite Exp $
 
 inherit webapp
 MY_P=${P/-/}
@@ -12,20 +12,18 @@ DESCRIPTION="Metadot is a CMS with file, page and link management, and collabora
 HOMEPAGE="http://www.metadot.com"
 SRC_URI="http://download.metadot.com/${MY_P}.tar.gz"
 
-KEYWORDS="~x86"
+KEYWORDS="~x86 ppc"
 
-DEPEND="$DEPEND"
 RDEPEND="
-	${DEPEND}
 	>=dev-db/mysql-3.23
 	>=net-www/apache-1.3.6
 	>=dev-lang/perl-5.005
-	>=dev-perl/mod_perl-1.21
+	>=www-apache/mod_perl-1.21
 	dev-perl/DBI
 	dev-perl/DBD-mysql
 	dev-perl/Apache-DBI
 	dev-perl/XML-RSS
-	dev-perl/Storable
+	perl-core/Storable
 	dev-perl/perl-ldap
 	dev-perl/Log-Agent
 	dev-perl/Mail-POP3Client
@@ -38,12 +36,13 @@ RDEPEND="
 	dev-perl/AppConfig
 	dev-perl/ImageSize
 	dev-perl/Template-Toolkit
-	dev-perl/Time-HiRes
+	perl-core/Time-HiRes
 	dev-perl/Lingua-EN-NameParse
 	dev-perl/Number-Format
 	dev-perl/XML-Simple
-	dev-perl/Text-CSV
+	dev-perl/Text-CSV_XS
 	dev-perl/Archive-Zip
+	dev-perl/DateManip
 "
 
 LICENSE="GPL-2"
@@ -54,7 +53,7 @@ src_install() {
 
 	dodoc CHANGELOG README
 	cp -R [[:lower:]][[:lower:]]* ${D}/${MY_HTDOCSDIR}
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-	webapp_hook_script ${FILESDIR}/reconfig
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en-${PVR}.txt
+	webapp_hook_script ${FILESDIR}/reconfig-${PVR}
 	webapp_src_install
 }
diff --git a/www-apps/metadot/metadot-6.4_p3.ebuild b/www-apps/metadot/metadot-6.4_p3.ebuild
index 22396b7ec455..b459690b9dc5 100644
--- a/www-apps/metadot/metadot-6.4_p3.ebuild
+++ b/www-apps/metadot/metadot-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/www-apps/metadot/metadot-6.4_p3.ebuild,v 1.1 2005/08/22 20:25:29 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/metadot/metadot-6.4_p3.ebuild,v 1.1.1.1 2005/11/30 09:37:08 chriswhite Exp $
 
 inherit webapp
 MY_P="${PN}${PV/_p/r}"
@@ -19,13 +19,13 @@ RDEPEND=">=dev-db/mysql-3.23
 	>=net-www/apache-1.3.6
 	>=dev-lang/perl-5.6
 	>=www-apache/mod_perl-1.21
+	dev-perl/libwww-perl
 	dev-perl/DBI
 	>=dev-perl/DBD-mysql-2.1027
 	dev-perl/Apache-DBI
 	>=dev-perl/AppConfig-1.55
 	>=perl-core/ExtUtils-MakeMaker-6.05
 	>=dev-perl/XML-RSS-1.02
-	>=perl-core/Storable-2.07
 	dev-perl/perl-ldap
 	>=dev-perl/Log-Agent-0.304
 	dev-perl/Mail-POP3Client
@@ -47,6 +47,7 @@ RDEPEND=">=dev-db/mysql-3.23
 	>=dev-perl/XML-Simple-2.08
 	dev-perl/XML-Dumper
 	dev-perl/Archive-Zip
+	dev-perl/DateManip
 	dev-perl/Text-CSV_XS
 "
 
diff --git a/www-apps/moinmoin/ChangeLog b/www-apps/moinmoin/ChangeLog
index d6541eb0e49a..cb8836164af7 100644
--- a/www-apps/moinmoin/ChangeLog
+++ b/www-apps/moinmoin/ChangeLog
@@ -1,6 +1,50 @@
-# ChangeLog for net-www/moinmoin
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moinmoin/ChangeLog,v 1.1 2004/08/15 15:10:32 stuart Exp $
+# ChangeLog for www-apps/moinmoin
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moinmoin/ChangeLog,v 1.1.1.1 2005/11/30 09:36:55 chriswhite Exp $
+
+*moinmoin-1.3.5 (28 Aug 2005)
+
+  28 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  +files/reconfig, +moinmoin-1.3.5.ebuild:
+  Version bump, close bugs #74939, #68848
+
+  24 Jun 2005; Christian Parpart <trapni@gentoo.org>
+  files/postinstall-en.txt:
+  little typofix in postinst-en.txt
+
+  10 Mar 2005; Grant Goodyear <g2boojum@gentoo.org>
+  files/postinstall-en.txt:
+  Modified post-install directions to handle our new apache config.
+
+*moinmoin-1.3.3 (08 Feb 2005)
+
+  08 Feb 2005; Grant Goodyear <g2boojum@gentoo.org> +moinmoin-1.3.3.ebuild:
+  Version bump, needs serious testing.  Hopefully bugs will be 
+  added to bug 74939.
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  moinmoin-1.2.2.ebuild, moinmoin-1.2.3.ebuild:
+  Masked moinmoin-1.2.3.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  moinmoin-1.2.2.ebuild:
+  Masked moinmoin-1.2.2.ebuild stable for ppc
+
+*moinmoin-1.2.3-r1 (27 Aug 2004)
+
+  27 Aug 2004; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  +moinmoin-1.2.3-r1.ebuild:
+  Uses webapp.eclass. Closes #58381, see also 57913.
+
+*moinmoin-1.2.3 (16 Aug 2004)
+
+  16 Aug 2004; Grant Goodyear <g2boojum@gentoo.org> +files/postinstall-en.txt,
+  +moinmoin-1.2.3.ebuild:
+  Version / security bump (bug 57913).
+  I think that 58381 still needs work before it can be added.
 
 *moinmoin-1.2.2 (15 Aug 2004)
 
diff --git a/www-apps/moinmoin/Manifest b/www-apps/moinmoin/Manifest
index 70b5acac6aa2..3503fa6b4a7f 100644
--- a/www-apps/moinmoin/Manifest
+++ b/www-apps/moinmoin/Manifest
@@ -1,4 +1,24 @@
-MD5 0ff336477fb9bc231e2b6548afd9f58d ChangeLog 1633
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 77013058e89d7f7fbb52a276f071b95d moinmoin-1.2.3-r1.ebuild 1040
+MD5 1e73d40d888212699794efd23c42a5a5 moinmoin-1.2.3.ebuild 1323
+MD5 074fafad23e03d29c5d50539860bcfcf moinmoin-1.3.3.ebuild 1401
+MD5 85972b19c4ecbd63ec8df8a9486b1c05 ChangeLog 3249
 MD5 4defd726d2b03decc5b7ff21b0aac1a3 metadata.xml 225
-MD5 5fd6f49d0d05986d0480e6336effa9f1 moinmoin-1.2.2.ebuild 1320
+MD5 803c1dd135efc6b751540bf48cae1ca6 moinmoin-1.2.2.ebuild 1323
+MD5 cf080d8113cb7e26004a242f388b2eed moinmoin-1.3.5.ebuild 1638
+MD5 83ae27d75112afb66a2d5d1319ba9874 files/digest-moinmoin-1.2.3-r1 63
+MD5 6fb347eae42824c20e1dac8cd73f0ce6 files/postinstall-en.txt 808
+MD5 986a7f0ef30ca0797647e0723b3ed041 files/reconfig 251
 MD5 9f892950e59827ee9c7a8a082a880bd2 files/digest-moinmoin-1.2.2 63
+MD5 83ae27d75112afb66a2d5d1319ba9874 files/digest-moinmoin-1.2.3 63
+MD5 4a15b460b1bb9ff77b8b08e71a0f1f14 files/digest-moinmoin-1.3.3 63
+MD5 4b756ef0b0c4eb10b5b2646ce792c0dc files/digest-moinmoin-1.3.5 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDEkr+EzitwsaoONoRAshXAJ9MtScVHKp2hl2HldPferbIQSxqCQCfSJ6l
+MEnZHC8F5vAV8FR/1qtK8OU=
+=R9X+
+-----END PGP SIGNATURE-----
diff --git a/www-apps/moinmoin/files/postinstall-en.txt b/www-apps/moinmoin/files/postinstall-en.txt
index c459414cd1be..568aaf0f5373 100644
--- a/www-apps/moinmoin/files/postinstall-en.txt
+++ b/www-apps/moinmoin/files/postinstall-en.txt
@@ -1,16 +1,22 @@
+Now please read the installation manual at
+http://moinmoin.wikiwikiweb.de/HelpOnInstalling
 
-You are almost done!
+MoinMoin can work with a variety of webservers. Simple Apache instructions
+are given below:
 
-1. ExecCGI needs to be enabled in your Moinmoin directory. You con do this by
+1. ExecCGI needs to be enabled in your Moinmoin directory. You can do this by
 simply
 # echo "Options ExecCGI" > ${MY_INSTALLDIR}/.htaccess
+# echo "AddHandler cgi-script .cgi" >> ${MY_INSTALLDIR}/.htaccess
 
 2. Add the following lines to your Apache configs:
-Alias /moinmoin "${MY_INSTALLDIR}"
+Alias /wiki "${MY_INSTALLDIR}"
 ScriptAlias /mymoin "${MY_INSTALLDIR}/moin.cgi"
 
-3. Restart Apache
+3. If you are running >=net-www/apache-2.0.52-r2, then you also need to turn
+on .htaccess.  Look for the <Directory "/var/www/localhost/htdocs/"> stanza 
+in httpd.conf, and change "AllowOverride None" to "AllowOverride All".
 
-4. Go to http://YOURHOST/mymoin
+4. Restart Apache
 
-Enjoy!
+5. Go to http://${VHOST_HOSTNAME}/mymoin
diff --git a/www-apps/moinmoin/moinmoin-1.2.2.ebuild b/www-apps/moinmoin/moinmoin-1.2.2.ebuild
index 22345dc6cac6..f2e96c1e43af 100644
--- a/www-apps/moinmoin/moinmoin-1.2.2.ebuild
+++ b/www-apps/moinmoin/moinmoin-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/www-apps/moinmoin/moinmoin-1.2.2.ebuild,v 1.1 2004/08/15 15:10:32 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moinmoin/moinmoin-1.2.2.ebuild,v 1.1.1.1 2005/11/30 09:36:55 chriswhite Exp $
 
 inherit webapp-apache
 
@@ -10,7 +10,7 @@ S=${WORKDIR}/${PN0}-${PV}
 DESCRIPTION="Python WikiClone"
 SRC_URI="http://download.sourceforge.net/${PN0}/${PN0}-${PV}.tar.gz"
 HOMEPAGE="http://moin.sourceforge.net"
-KEYWORDS="x86 sparc ~amd64 ~ppc"
+KEYWORDS="x86 sparc ~amd64 ppc"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
diff --git a/www-apps/moinmoin/moinmoin-1.2.3-r1.ebuild b/www-apps/moinmoin/moinmoin-1.2.3-r1.ebuild
index 0ff48001f257..b2d9a749dad1 100644
--- a/www-apps/moinmoin/moinmoin-1.2.3-r1.ebuild
+++ b/www-apps/moinmoin/moinmoin-1.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/www-apps/moinmoin/moinmoin-1.2.3-r1.ebuild,v 1.1 2004/08/27 22:04:04 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moinmoin/moinmoin-1.2.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:55 chriswhite Exp $
 
 inherit webapp
 
diff --git a/www-apps/moinmoin/moinmoin-1.2.3.ebuild b/www-apps/moinmoin/moinmoin-1.2.3.ebuild
index 83cff7494930..4e4c6d815bdc 100644
--- a/www-apps/moinmoin/moinmoin-1.2.3.ebuild
+++ b/www-apps/moinmoin/moinmoin-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/www-apps/moinmoin/moinmoin-1.2.3.ebuild,v 1.1 2004/08/16 19:12:55 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moinmoin/moinmoin-1.2.3.ebuild,v 1.1.1.1 2005/11/30 09:36:55 chriswhite Exp $
 
 inherit webapp-apache
 
@@ -10,7 +10,7 @@ S=${WORKDIR}/${PN0}-${PV}
 DESCRIPTION="Python WikiClone"
 SRC_URI="http://download.sourceforge.net/${PN0}/${PN0}-${PV}.tar.gz"
 HOMEPAGE="http://moin.sourceforge.net"
-KEYWORDS="x86 sparc ~amd64 ~ppc"
+KEYWORDS="x86 sparc ~amd64 ppc"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
diff --git a/www-apps/moinmoin/moinmoin-1.3.3.ebuild b/www-apps/moinmoin/moinmoin-1.3.3.ebuild
index 2b613f7ca0fe..b7443e92ec3a 100644
--- a/www-apps/moinmoin/moinmoin-1.3.3.ebuild
+++ b/www-apps/moinmoin/moinmoin-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/www-apps/moinmoin/moinmoin-1.3.3.ebuild,v 1.1 2005/02/08 18:14:14 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moinmoin/moinmoin-1.3.3.ebuild,v 1.1.1.1 2005/11/30 09:36:55 chriswhite Exp $
 
 inherit webapp
 
diff --git a/www-apps/moinmoin/moinmoin-1.3.5.ebuild b/www-apps/moinmoin/moinmoin-1.3.5.ebuild
index 1abae69a33b8..9c57ed4e1082 100644
--- a/www-apps/moinmoin/moinmoin-1.3.5.ebuild
+++ b/www-apps/moinmoin/moinmoin-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/www-apps/moinmoin/moinmoin-1.3.5.ebuild,v 1.1 2005/08/28 23:38:26 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moinmoin/moinmoin-1.3.5.ebuild,v 1.1.1.1 2005/11/30 09:36:55 chriswhite Exp $
 
 inherit webapp
 
diff --git a/www-apps/moregroupware/ChangeLog b/www-apps/moregroupware/ChangeLog
index 7a8736480323..83252b71aeb9 100644
--- a/www-apps/moregroupware/ChangeLog
+++ b/www-apps/moregroupware/ChangeLog
@@ -1,6 +1,28 @@
 # ChangeLog for www-apps/moregroupware
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moregroupware/ChangeLog,v 1.1 2004/08/19 15:14:24 rl03 Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moregroupware/ChangeLog,v 1.1.1.1 2005/11/30 09:37:09 chriswhite Exp $
+
+  17 Sep 2005; Simon Stelling <blubb@gentoo.org> moregroupware-0.7.3.ebuild:
+  added ~amd64 keyword
+
+  22 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt:
+  Housekeeping
+
+*moregroupware-0.7.3 (22 Aug 2005)
+
+  22 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  +moregroupware-0.7.3.ebuild:
+  Version bump
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  moregroupware-0.7.2.ebuild:
+  Masked moregroupware-0.7.2.ebuild stable for ppc
+
+  03 Sep 2004; David Holm <dholm@gentoo.org> moregroupware-0.7.2.ebuild:
+  Added to ~ppc.
+
+  25 Aug 2004; Renat Lumpau <rl03@gentoo.org> moregroupware-0.7.2.ebuild:
+  Fixed pkg_compile insanity.
 
 *moregroupware-0.7.2 (19 Aug 2004)
 
diff --git a/www-apps/moregroupware/Manifest b/www-apps/moregroupware/Manifest
index 213530f1903c..0a6228357d6d 100644
--- a/www-apps/moregroupware/Manifest
+++ b/www-apps/moregroupware/Manifest
@@ -1,6 +1,8 @@
-MD5 85603b83100e761fcce7f0b13f605ff4 ChangeLog 340
-MD5 27c734e247a79d28c499dae2ecbfebe1 moregroupware-0.7.2.ebuild 695
+MD5 f8794bc24145e590a80d3f1b844f2581 ChangeLog 1114
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
-MD5 c81c6b9fc937775f5944aadd25c9e65f files/postinstall-en.txt 379
+MD5 a9cc809ff3051e27f2648bc68449a809 moregroupware-0.7.2.ebuild 804
+MD5 98247658c0e0908b7ad16434e9b2e483 moregroupware-0.7.3.ebuild 779
 MD5 bdd1af21cf674ab9392bb2487569112f files/digest-moregroupware-0.7.2 77
+MD5 ea1579be543f4842acd1a1ba0f10ce19 files/postinstall-en.txt 374
 MD5 c712e596258661bc51900999f0cf01f0 files/reconfig 138
+MD5 37665b24bd6b0757fc9cbbbc791a23a3 files/digest-moregroupware-0.7.3 77
diff --git a/www-apps/moregroupware/files/postinstall-en.txt b/www-apps/moregroupware/files/postinstall-en.txt
index c1f073e84f20..ecec1277487e 100644
--- a/www-apps/moregroupware/files/postinstall-en.txt
+++ b/www-apps/moregroupware/files/postinstall-en.txt
@@ -1,12 +1,11 @@
-
-You are almost done! 
+You are almost done!
 
 1. Restart your webserver and your database daemon.
 
-2. Point your browser to the URL http://<your_server_address>/moregroupware
+2. Point your browser to the URL http://${VHOST_HOSTNAME}/${VHOST_APPDIR}
 and follow the install script.
 
-Don't forget to read the installation manual, available from 
+Don't forget to read the installation manual, available from
 http://moregroupware.sourceforge.net/manual/en/index.html
 It describes the rest of the installation process.
 
diff --git a/www-apps/moregroupware/moregroupware-0.7.2.ebuild b/www-apps/moregroupware/moregroupware-0.7.2.ebuild
index 6a313b085ab9..d51d9fb97003 100644
--- a/www-apps/moregroupware/moregroupware-0.7.2.ebuild
+++ b/www-apps/moregroupware/moregroupware-0.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/www-apps/moregroupware/moregroupware-0.7.2.ebuild,v 1.1 2004/08/19 15:14:24 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moregroupware/moregroupware-0.7.2.ebuild,v 1.1.1.1 2005/11/30 09:37:09 chriswhite Exp $
 
 inherit webapp
 
@@ -11,14 +11,14 @@ HOMEPAGE="http://moregroupware.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${PN}-core-${PV}.tar.gz"
 
 LICENSE="X11 GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ppc"
 IUSE=""
 
 RDEPEND="virtual/php
 	>=dev-db/mysql-3.23
 	net-www/apache"
 
-pkg_compile() {
+src_compile() {
 	:;
 }
 
diff --git a/www-apps/moregroupware/moregroupware-0.7.3.ebuild b/www-apps/moregroupware/moregroupware-0.7.3.ebuild
index 5a45248ef6ef..16dc2add274e 100644
--- a/www-apps/moregroupware/moregroupware-0.7.3.ebuild
+++ b/www-apps/moregroupware/moregroupware-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/www-apps/moregroupware/moregroupware-0.7.3.ebuild,v 1.1 2005/08/22 20:46:47 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moregroupware/moregroupware-0.7.3.ebuild,v 1.1.1.1 2005/11/30 09:37:09 chriswhite Exp $
 
 inherit webapp
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://moregroupware.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${PN}-core-${PV}.tar.gz"
 
 LICENSE="X11 GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="virtual/php
diff --git a/www-apps/mypictures/ChangeLog b/www-apps/mypictures/ChangeLog
index d70ad534c358..26349f556853 100644
--- a/www-apps/mypictures/ChangeLog
+++ b/www-apps/mypictures/ChangeLog
@@ -1,6 +1,16 @@
-# ChangeLog for net-www/mypictures
+# ChangeLog for www-apps/mypictures
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mypictures/ChangeLog,v 1.1 2004/08/15 15:13:01 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mypictures/ChangeLog,v 1.1.1.1 2005/11/30 09:36:57 chriswhite Exp $
+
+  08 Sep 2004; Renat Lumpau <rl03@gentoo.org> :
+  Fixed herd name
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  mypictures-20040202.ebuild:
+  Masked mypictures-20040202.ebuild stable for ppc
 
 *mypictures-20040202 (15 Aug 2004)
 
diff --git a/www-apps/mypictures/Manifest b/www-apps/mypictures/Manifest
index af6b5334368a..1d51325e8988 100644
--- a/www-apps/mypictures/Manifest
+++ b/www-apps/mypictures/Manifest
@@ -1,5 +1,5 @@
-MD5 fc2cff8c46982359cc7cd944e53e7311 mypictures-20040202.ebuild 1081
-MD5 b2f6f0faa8df6daab732424bc78212eb ChangeLog 473
-MD5 3d182d43f7f0341a9a42f96694f04e72 metadata.xml 224
+MD5 eb7976e2b3b8261f6f0bbe25d064c884 mypictures-20040202.ebuild 1081
+MD5 73a61d6b5c98d756020d9e6e976bf512 ChangeLog 971
+MD5 4defd726d2b03decc5b7ff21b0aac1a3 metadata.xml 225
 MD5 d0c4d3efa97c9bf0927e82f3cdb295b8 files/digest-mypictures-20040202 58
 MD5 31a77b7664997f1fa8e77af1adf58833 files/mypictures.diff 482
diff --git a/www-apps/mypictures/metadata.xml b/www-apps/mypictures/metadata.xml
index 0d59c319c3eb..bee101f41174 100644
--- a/www-apps/mypictures/metadata.xml
+++ b/www-apps/mypictures/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/www-apps/mypictures/mypictures-20040202.ebuild b/www-apps/mypictures/mypictures-20040202.ebuild
index ce0dc43e3669..1c470e8275b3 100644
--- a/www-apps/mypictures/mypictures-20040202.ebuild
+++ b/www-apps/mypictures/mypictures-20040202.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/www-apps/mypictures/mypictures-20040202.ebuild,v 1.1 2004/08/15 15:13:01 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mypictures/mypictures-20040202.ebuild,v 1.1.1.1 2005/11/30 09:36:57 chriswhite Exp $
 
 inherit webapp eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.splitbrain.org/Programming/PHP/mypictures/index.php"
 SRC_URI="http://www.splitbrain.org/Programming/PHP/mypictures/mypictures.tgz"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ppc"
 IUSE=""
 
 DEPEND="sys-apps/sed"
diff --git a/www-apps/mythweb/ChangeLog b/www-apps/mythweb/ChangeLog
index 457aab3d9a6e..9793a949def3 100644
--- a/www-apps/mythweb/ChangeLog
+++ b/www-apps/mythweb/ChangeLog
@@ -1,6 +1,69 @@
-# ChangeLog for net-www/mythweb
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mythweb/ChangeLog,v 1.1 2004/08/15 15:15:27 stuart Exp $
+# ChangeLog for www-apps/mythweb
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mythweb/ChangeLog,v 1.1.1.1 2005/11/30 09:36:53 chriswhite Exp $
+
+  09 Oct 2005; Doug Goldstein <cardoe@gentoo.org> -mythweb-0.17.ebuild,
+  mythweb-0.18.1.ebuild:
+  Actually fix the PHP depends
+
+  23 Sep 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  mythweb-0.17.ebuild, mythweb-0.18.1.ebuild:
+  Setup php RDEPEND to be virtual.
+
+  31 May 2005; David Holm <dholm@gentoo.org> mythweb-0.18.1.ebuild:
+  Added to ~ppc.
+
+  30 May 2005; Doug Goldstein <cardoe@gentoo.org> -mythweb-0.16.ebuild,
+  -mythweb-0.18.ebuild, mythweb-0.18.1.ebuild:
+  stable on x86. clean up old ebuilds.
+
+  22 May 2005; Doug Goldstein <cardoe@gentoo.org> mythweb-0.18.1.ebuild:
+  removed MythTV depend
+
+*mythweb-0.18.1 (20 May 2005)
+
+  20 May 2005; Doug Goldstein <cardoe@gentoo.org> +mythweb-0.18.1.ebuild:
+  rev bump
+
+*mythweb-0.18 (18 Apr 2005)
+
+  18 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +mythweb-0.18.ebuild:
+  Version bump.
+
+*mythweb-0.16.20050115 (18 Jan 2005)
+
+  18 Jan 2005; Doug Goldstein <cardoe@gentoo.org> metadata.xml,
+  files/postinstall-en.txt, -mythweb-0.14-r1.ebuild, -mythweb-0.14.ebuild,
+  -mythweb-0.15.1.ebuild, +mythweb-0.16.20050115.ebuild:
+  rev bump to CVS snapshot to support CVS snapshot of MythTV
+  purged old, non-working versions
+
+  04 Dec 2004; Brian Jackson <iggy@gentoo.org> mythweb-0.16.ebuild:
+  I can't find any of the other media-tv guys, and it's been fairly bug free,
+  so marking as x86
+
+  19 Oct 2004; Daniel Ahlberg <aliz@gentoo.org> mythweb-0.16.ebuild:
+  Fixed some problems that would occur when re-emerging the package. Also added
+  php_sessions dir. Closing #67840.
+
+  05 Oct 2004; Daniel Ahlberg <aliz@gentoo.org> mythweb-0.16.ebuild:
+  Install .htacess file
+
+  16 Sep 2004; Daniel Ahlberg <aliz@gentoo.org> mythweb-0.16.ebuild:
+  Fix creation of some dirs.
+
+  10 Sep 2004; Daniel Ahlberg <aliz@gentoo.org> mythweb-0.16.ebuild:
+  + Webapp-config support, closing #58382.
+  + Added checks and warning about php5.
+
+*mythweb-0.16 (10 Sep 2004)
+
+  10 Sep 2004; Daniel Ahlberg <aliz@gentoo.org> mythweb-0.16.ebuild:
+  Version bump.
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
 
 *mythweb-0.15.1 (15 Aug 2004)
 
diff --git a/www-apps/mythweb/Manifest b/www-apps/mythweb/Manifest
index 22dd5db373fb..565b4f720446 100644
--- a/www-apps/mythweb/Manifest
+++ b/www-apps/mythweb/Manifest
@@ -1,8 +1,15 @@
-MD5 7fc985ee8d8e0abd9bd07b8fc361d447 mythweb-0.15.1.ebuild 1176
-MD5 ed4797339c0e9a57963374584523ff9d mythweb-0.14-r1.ebuild 1150
-MD5 dd3d56a0a74e0638ae122bdd09dd6ae7 mythweb-0.14.ebuild 1019
-MD5 9951a540f3d51c18281b2f1293a672e6 ChangeLog 2105
-MD5 20e2255501865de5b568424821abf69d metadata.xml 161
-MD5 7ed0401bccae5ab3c413c6463fae929f files/digest-mythweb-0.14 65
-MD5 7ed0401bccae5ab3c413c6463fae929f files/digest-mythweb-0.14-r1 65
-MD5 52be7e62ebc18848d12eab769057c26e files/digest-mythweb-0.15.1 67
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7b01673a4752018496a86b0820cb9002 ChangeLog 4405
+MD5 8739e9d1295223762426254acdc96551 files/digest-mythweb-0.18.1 72
+MD5 67c131deae039971648b7a6921fbf7d2 files/postinstall-en.txt 381
+MD5 f62db0df6ee8ee1d4fe7b9c3d74432a7 metadata.xml 222
+MD5 41eef79e469581ba557daa7ac3224646 mythweb-0.18.1.ebuild 1140
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDSNeIBtvusYtCZMsRAq7wAKCLIsCaQ2UUnZMBoTTQiQsKrH40mACaAw0U
+u80z/0O8zq4r7zJ1KmeZqKk=
+=xmPG
+-----END PGP SIGNATURE-----
diff --git a/www-apps/mythweb/files/postinstall-en.txt b/www-apps/mythweb/files/postinstall-en.txt
index a0ab6b6526b7..ffc782664bca 100644
--- a/www-apps/mythweb/files/postinstall-en.txt
+++ b/www-apps/mythweb/files/postinstall-en.txt
@@ -1,4 +1,10 @@
 You should modify ${MY_INSTALLDIR}/config/conf.php to fit your needs.
 
 If you are using php5 you may experience bugs, please report these to
-either Gentoo or MythTV bugzilla.
+Gentoo's bugzilla @ http://bugs.gentoo.org
+
+These issues have been reported to MythTV upstream, however they
+have no intention of supporting php5.
+
+http://www.mythtv.org/bugs/show_bug.cgi?id=90
+http://www.mythtv.org/bugs/show_bug.cgi?id=91
diff --git a/www-apps/mythweb/metadata.xml b/www-apps/mythweb/metadata.xml
index a6b9e38a1b93..1cb3ba51155e 100644
--- a/www-apps/mythweb/metadata.xml
+++ b/www-apps/mythweb/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>media-tv</herd>
+<maintainer>
+	<email>cardoe@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/www-apps/mythweb/mythweb-0.18.1.ebuild b/www-apps/mythweb/mythweb-0.18.1.ebuild
index 6af5f1aee6c1..28ce6b3d1b63 100644
--- a/www-apps/mythweb/mythweb-0.18.1.ebuild
+++ b/www-apps/mythweb/mythweb-0.18.1.ebuild
@@ -1,31 +1,25 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mythweb/mythweb-0.18.1.ebuild,v 1.1 2005/05/20 09:16:17 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mythweb/mythweb-0.18.1.ebuild,v 1.1.1.1 2005/11/30 09:36:54 chriswhite Exp $
 
-inherit webapp
+inherit webapp depend.php
 
 DESCRIPTION="PHP scripts intended to manage MythTV from a web browser."
 HOMEPAGE="http://www.mythtv.org/"
 SRC_URI="http://www.mythtv.org/mc/mythplugins-${PV}.tar.bz2"
 IUSE=""
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~ppc x86"
 
-RDEPEND=">=dev-php/mod_php-4.2
-	~media-tv/mythtv-${PV}"
+RDEPEND="virtual/httpd-php"
 
 S="${WORKDIR}/mythplugins-${PV}/${PN}"
 
 pkg_setup() {
 	webapp_pkg_setup
 
-	if has_version \>=dev-php/mod_php-5 ; then
-		local modphp_use="$(</var/db/pkg/`best_version =dev-php/mod_php`/USE)"
-	        if ! has session ${modphp_use} ; then
-	                eerror "mod_php is missing session support. Please add"
-	                eerror "'session' to your USE flags, and re-emerge mod_php and php."
-	                die "mod_php needs session support"
-	        fi
+	if has_version 'dev-lang/php' ; then
+	    require_php_with_use session
 	fi
 }
 
diff --git a/www-apps/nanoblogger/ChangeLog b/www-apps/nanoblogger/ChangeLog
index 222f831b10df..9defd95a71d3 100644
--- a/www-apps/nanoblogger/ChangeLog
+++ b/www-apps/nanoblogger/ChangeLog
@@ -1,6 +1,71 @@
 # ChangeLog for www-apps/nanoblogger
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/nanoblogger/ChangeLog,v 1.1 2005/01/24 11:03:41 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/nanoblogger/ChangeLog,v 1.1.1.1 2005/11/30 09:36:54 chriswhite Exp $
+
+  16 Sep 2005; Aron Griffis <agriffis@gentoo.org> nanoblogger-3.1-r3.ebuild:
+  Mark 3.1-r3 stable on alpha
+
+  06 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> nanoblogger-3.2.3.ebuild:
+  Added ~mips.
+
+*nanoblogger-3.2.3 (23 Jun 2005)
+
+  23 Jun 2005; Aaron Walker <ka0ttic@gentoo.org>
+  -files/nanoblogger-3.2.2-fix-add-option.diff,
+  -files/nanoblogger-3.2.2-fix-misplaced-dirs.diff, -nanoblogger-3.2.ebuild,
+  -nanoblogger-3.2.2.ebuild, +nanoblogger-3.2.3.ebuild:
+  Version bump for bug 96617. Tidy'd old ebuilds/patches.
+
+*nanoblogger-3.2.2 (20 Jun 2005)
+
+  20 Jun 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/nanoblogger-3.2.2-fix-add-option.diff,
+  +files/nanoblogger-3.2.2-fix-misplaced-dirs.diff,
+  +nanoblogger-3.2.2.ebuild:
+  Version bump for bug 96574.  Thanks to Ricardo Cordeiro for the patches.
+
+  08 Jun 2005; David Holm <dholm@gentoo.org> nanoblogger-3.2.ebuild:
+  Added to ~ppc.
+
+*nanoblogger-3.2 (07 Jun 2005)
+
+  07 Jun 2005; Aaron Walker <ka0ttic@gentoo.org> +nanoblogger-3.2.ebuild:
+  Version bump.
+
+  26 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  nanoblogger-3.1-r3.ebuild:
+  stable on amd64
+
+  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> nanoblogger-3.1-r3.ebuild:
+  stable on ia64
+
+  25 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> nanoblogger-3.1-r3.ebuild:
+  Marked stable on x86.
+
+*nanoblogger-3.1-r3 (21 Feb 2005)
+
+  21 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> -nanoblogger-3.1-r2.ebuild,
+  +nanoblogger-3.1-r3.ebuild:
+  Add to the sed to fix the --manual option for bug 82750.
+
+  19 Feb 2005; Anders Rune Jensen <arj@gentoo.org> nanoblogger-3.1-r2.ebuild:
+  add ~amd64
+
+*nanoblogger-3.1-r2 (18 Feb 2005)
+
+  18 Feb 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/nanoblogger-3.1-fix-rss2.diff, -nanoblogger-3.1-r1.ebuild,
+  +nanoblogger-3.1-r2.ebuild:
+  Revision bump; fixes small bug in rss2 plugin for bug 82453.
+
+  01 Feb 2005; Aron Griffis <agriffis@gentoo.org> nanoblogger-3.1-r1.ebuild:
+  add ~alpha and ~ia64
+
+*nanoblogger-3.1-r1 (31 Jan 2005)
+
+  31 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> +files/nb.bashcomp,
+  +nanoblogger-3.1-r1.ebuild, -nanoblogger-3.1.ebuild:
+  Revision bump; added bash-completion.
 
 *nanoblogger-3.1 (24 Jan 2005)
 
diff --git a/www-apps/nanoblogger/Manifest b/www-apps/nanoblogger/Manifest
index 0616d9c3520b..d75dd73db0d0 100644
--- a/www-apps/nanoblogger/Manifest
+++ b/www-apps/nanoblogger/Manifest
@@ -1,4 +1,8 @@
-MD5 03437794b4a304c8de42d4f4431fb239 ChangeLog 277
-MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254
-MD5 13b42c5bb6f9ee8d13c374299d296481 nanoblogger-3.1.ebuild 1309
-MD5 1ab32e1e0e5fef5232ec0b69d002f8eb files/digest-nanoblogger-3.1 66
+MD5 45b2d4fa06f44ca813862137a928e729 nanoblogger-3.2.3.ebuild 2138
+MD5 c08d190785ce2e73bba9042c2decf264 metadata.xml 1082
+MD5 eb0a629a651a6c60851f8eeec647609a ChangeLog 2529
+MD5 c53627b4a2e95411854d11a23f0645d6 nanoblogger-3.1-r3.ebuild 1668
+MD5 1c213e50a94f5d19d1aa1fb5edd93721 files/nb.bashcomp 1389
+MD5 bb5cc01bfa66d2134acce3a791a21f16 files/digest-nanoblogger-3.2.3 68
+MD5 1ab32e1e0e5fef5232ec0b69d002f8eb files/digest-nanoblogger-3.1-r3 66
+MD5 67755be92a7c9db9f65d470a5bd5cc6f files/nanoblogger-3.1-fix-rss2.diff 1204
diff --git a/www-apps/nanoblogger/files/nb.bashcomp b/www-apps/nanoblogger/files/nb.bashcomp
index 4ce64969b3c8..49b0e8925081 100644
--- a/www-apps/nanoblogger/files/nb.bashcomp
+++ b/www-apps/nanoblogger/files/nb.bashcomp
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/nanoblogger/files/nb.bashcomp,v 1.1 2005/01/31 10:19:45 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/nanoblogger/files/nb.bashcomp,v 1.1.1.1 2005/11/30 09:36:54 chriswhite Exp $
 
 # nanoblogger completion
 # author: Aaron Walker <ka0ttic@gentoo.org>
diff --git a/www-apps/nanoblogger/metadata.xml b/www-apps/nanoblogger/metadata.xml
index d31152aca840..74ecafc9eb6e 100644
--- a/www-apps/nanoblogger/metadata.xml
+++ b/www-apps/nanoblogger/metadata.xml
@@ -1,9 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>no-herd</herd>
+	<herd>web-apps</herd>
 	<maintainer>
 		<email>ka0ttic@gentoo.org</email>
 		<name>Aaron Walker</name>
 	</maintainer>
+	<longdescription lang="en">
+Nanoblogger is a small weblog engine written in Bash for the command line. It
+uses common UNIX tools such as cat, grep, and sed.  Features include: support
+for multiple weblogs, support for multiple categories, archiving by category,
+entry, and month, pagination, permanent links, RSS syndication (1.0 and 2.0),
+Atom syndication (0.3), templates and CSS style sheets for full control over
+appearance, placeholders for easy template manipulation, plugins for calendar,
+recent entries, weblog status, fortunes, etc, auto-formatting of HTML, support
+for relative and absolute links, per-weblog configuration, simple cache system
+for faster content generation, auto-detection of weblog by current directory, no
+database dependencies (uses flat-file), and mutliplatform portability.
+	</longdescription>
 </pkgmetadata>
diff --git a/www-apps/nanoblogger/nanoblogger-3.1-r3.ebuild b/www-apps/nanoblogger/nanoblogger-3.1-r3.ebuild
index 1adafc405a51..9d0b6ddc5000 100644
--- a/www-apps/nanoblogger/nanoblogger-3.1-r3.ebuild
+++ b/www-apps/nanoblogger/nanoblogger-3.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/www-apps/nanoblogger/nanoblogger-3.1-r3.ebuild,v 1.1 2005/02/21 17:00:16 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/nanoblogger/nanoblogger-3.1-r3.ebuild,v 1.1.1.1 2005/11/30 09:36:54 chriswhite Exp $
 
 inherit bash-completion eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~ia64 ~amd64"
+KEYWORDS="alpha amd64 ia64 x86"
 IUSE=""
 
 RDEPEND="app-shells/bash"
diff --git a/www-apps/nanoblogger/nanoblogger-3.2.3.ebuild b/www-apps/nanoblogger/nanoblogger-3.2.3.ebuild
index 172b47a6fa39..59c3471d3b13 100644
--- a/www-apps/nanoblogger/nanoblogger-3.2.3.ebuild
+++ b/www-apps/nanoblogger/nanoblogger-3.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/www-apps/nanoblogger/nanoblogger-3.2.3.ebuild,v 1.1 2005/06/23 10:34:31 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/nanoblogger/nanoblogger-3.2.3.ebuild,v 1.1.1.1 2005/11/30 09:36:54 chriswhite Exp $
 
 inherit bash-completion
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~x86"
 IUSE=""
 
 RDEPEND="app-shells/bash"
diff --git a/www-apps/net2ftp/ChangeLog b/www-apps/net2ftp/ChangeLog
index e10dfef8eae7..35a00daf05d3 100644
--- a/www-apps/net2ftp/ChangeLog
+++ b/www-apps/net2ftp/ChangeLog
@@ -1,8 +1,25 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
-# Copyright 2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/net2ftp/ChangeLog,v 1.1 2005/01/26 11:26:53 uberlord Exp $
+# ChangeLog for www-apps/net2ftp
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/net2ftp/ChangeLog,v 1.1.1.1 2005/11/30 09:37:12 chriswhite Exp $
 
-*web-apps/net2ftp-0.81 (26 Jan 2005)
+  04 Nov 2005; Roy Marples <uberlord@gentoo.org> net2ftp-0.82.ebuild:
+  doins does not work for webapps, do use cp -pPR instead
+
+  05 Sep 2005; Roy Marples <uberlord@gentoo.org> net2ftp-0.82.ebuild:
+  DEPEND on virtual/php and not dev-php/mod_php
+
+  19 Apr 2005; Roy Marples <uberlord@gentoo.org> net2ftp-0.82.ebuild:
+  stable on x86
+
+*net2ftp-0.82 (28 Feb 2005)
+
+  28 Feb 2005; Roy Marples <uberlord@gentoo.org> +net2ftp-0.82.ebuild:
+  Version bump.
+
+  15 Feb 2005; Roy Marples <uberlord@gentoo.org>
+  Changed cp -r to doins -r
+
+*net2ftp-0.81 (26 Jan 2005)
 
   26 Jan 2005; Roy Marples <uberlord@gentoo.org> +net2ftp-0.81.ebuild:
   Initial import.
diff --git a/www-apps/net2ftp/Manifest b/www-apps/net2ftp/Manifest
index e4b82aee8b53..45733bb62797 100644
--- a/www-apps/net2ftp/Manifest
+++ b/www-apps/net2ftp/Manifest
@@ -1,2 +1,4 @@
-MD5 05b02ee481288e298132242ff1d3441b net2ftp-0.81.ebuild 1241
-MD5 8391471952d058334440b6d79d6f5e58 files/digest-net2ftp-0.81 63
+MD5 8b95b273011835f83015784330c8a936 metadata.xml 296
+MD5 fa7ce935bd31508b35ff6789522b352c net2ftp-0.82.ebuild 1474
+MD5 ccc2c70800fc00c1992a60ed06c13d2e ChangeLog 855
+MD5 c522ad219593fb1395a4e9f71b1b9d2e files/digest-net2ftp-0.82 63
diff --git a/www-apps/net2ftp/net2ftp-0.82.ebuild b/www-apps/net2ftp/net2ftp-0.82.ebuild
index 32ae0913a906..a3010e4a249b 100644
--- a/www-apps/net2ftp/net2ftp-0.82.ebuild
+++ b/www-apps/net2ftp/net2ftp-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/www-apps/net2ftp/net2ftp-0.82.ebuild,v 1.1 2005/02/28 12:33:07 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/net2ftp/net2ftp-0.82.ebuild,v 1.1.1.1 2005/11/30 09:37:12 chriswhite Exp $
 
 inherit eutils webapp
 
@@ -14,22 +14,21 @@ SRC_URI="http://www.net2ftp.com/download/${MY_P}.zip"
 HOMEPAGE="http://www.net2ftp.com/"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
-DEPEND=">=dev-php/mod_php-4.2.3
-	app-arch/unzip"
-RDEPEND=">=dev-php/mod_php-4.2.3"
+DEPEND="app-arch/unzip"
+RDEPEND="virtual/php"
 
 src_unpack() {
-	unzip ${DISTDIR}/${MY_P}.zip >/dev/null \
+	unzip "${DISTDIR}/${MY_P}.zip" >/dev/null \
 		|| die "failed to unpack ${MY_P}.zip"
 
 	# We rename these files as it looks like Windows was
 	# development platform
 	# We also rename the version number as the doc dir is
 	# versioned anyway
-	cd ${S}
-	rename _v${PV} "" *.txt
+	cd "${S}"
+	rename "_v${PV}" "" *.txt
 	rename _ "" *.txt
 	rename .txt "" *.txt
 
@@ -44,19 +43,18 @@ src_install() {
 
 	dodoc ${docs} LICENSE
 	for doc in ${docs}; do
-		rm -f ${doc}
+		rm -f "${doc}"
 	done
 
 	rm -f temp/chmod_this_dir_to_777.txt
 
-	insinto ${MY_HTDOCSDIR}
-	doins -r *
+	cp -pPR * "${D}/${MY_HTDOCSDIR}"
 
-	webapp_serverowned ${MY_HTDOCSDIR}/temp
+	webapp_serverowned "${MY_HTDOCSDIR}/temp"
 
-	webapp_configfile ${MY_HTDOCSDIR}/settings.inc.php
-	webapp_configfile ${MY_HTDOCSDIR}/settings_authorizations.inc.php
-	webapp_configfile ${MY_HTDOCSDIR}/settings_screens.inc.php
+	webapp_configfile "${MY_HTDOCSDIR}/settings.inc.php"
+	webapp_configfile "${MY_HTDOCSDIR}/settings_authorizations.inc.php"
+	webapp_configfile "${MY_HTDOCSDIR}/settings_screens.inc.php"
 
 	webapp_sqlscript mysql create_tables.sql
 
diff --git a/www-apps/nut/ChangeLog b/www-apps/nut/ChangeLog
index a96ac6b7b393..84bce0343002 100644
--- a/www-apps/nut/ChangeLog
+++ b/www-apps/nut/ChangeLog
@@ -1,6 +1,48 @@
-# ChangeLog for net-misc/nut
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/nut/ChangeLog,v 1.1 2004/08/15 15:19:10 stuart Exp $
+# ChangeLog for www-apps/nut
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/nut/ChangeLog,v 1.1.1.1 2005/11/30 09:37:04 chriswhite Exp $
+
+  16 Sep 2005; Aron Griffis <agriffis@gentoo.org> nut-2.0.0-r1.ebuild:
+  Mark 2.0.0-r1 stable on alpha
+
+  12 Jul 2005; Simon Stelling <blubb@gentoo.org> nut-2.0.0-r1.ebuild:
+  stable on amd64
+
+*nut-2.0.1_pre4 (17 Feb 2005)
+
+  17 Feb 2005; Robin H. Johnson <robbat2@gentoo.org> +nut-2.0.1_pre4.ebuild:
+  Bug #82382: bump.
+
+*nut-2.0.0-r1 (13 Feb 2005)
+
+  13 Feb 2005; Robin H. Johnson <robbat2@gentoo.org> -files/upsd-init,
+  +files/upsdrv.rc6-r1, -files/upsmon-init, +nut-2.0.0-r1.ebuild:
+  Bug #47482. Move stuff away from the root filesystem where it wouldn't work
+  anyway.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  12 Nov 2004; Simon Stelling <blubb@gentoo.org> nut-2.0.0.ebuild:
+  added ~amd64
+
+  08 Nov 2004; Michael Sterrett <mr_bones_@gentoo.org> nut-2.0.0.ebuild:
+  fix media-libs/gd dep per bug #69959; clean out nut-1
+
+  28 Sep 2004; Bryan Østergaard,,, <kloeri@gentoo.org> nut-2.0.0.ebuild:
+  Add ~alpha.
+
+  18 Sep 2004; Jason Wever <weeve@gentoo.org> nut-2.0.0.ebuild:
+  Stable on sparc.
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> nut-2.0.0.ebuild:
+  Masked nut-2.0.0.ebuild stable for ppc
+
+  31 Aug 2004; David Holm <dholm@gentoo.org> nut-2.0.0.ebuild:
+  Added to ~ppc.
 
 *nut-1.2.2 (15 Aug 2004)
 
diff --git a/www-apps/nut/Manifest b/www-apps/nut/Manifest
index c7175b7a0a66..05f4ef569130 100644
--- a/www-apps/nut/Manifest
+++ b/www-apps/nut/Manifest
@@ -1,15 +1,12 @@
-MD5 583c0bd5063220e87154229b1108ca59 nut-2.0.0.ebuild 3070
-MD5 1969a0f72b023c619b1facc92fd05337 nut-1.5.12.ebuild 3300
-MD5 1ad752545fa2e6e001fc1b9a9ce62d41 nut-1.4.1.ebuild 2312
-MD5 0977e8d4434dbb7846d542dbfc050949 nut-1.2.2.ebuild 3375
-MD5 d970f096e6d10b5bda32fdec691246af ChangeLog 5436
 MD5 91a159b983332d5ed0fb985cc1fe1b80 metadata.xml 330
-MD5 ab96c8181bf3780dae5e3377987b05c2 files/digest-nut-1.2.2 61
-MD5 af157fac0a88e11c79527d952fce75ec files/digest-nut-1.4.1 61
+MD5 ad74f5e13e74ac23388b0ce192b4715b ChangeLog 7094
+MD5 7a4b25821ba8388e45f7fb67c8b8c54c nut-2.0.0.ebuild 3095
+MD5 81d4ae9730f813fcc5e55390ad277ffa nut-2.0.1_pre4.ebuild 3177
+MD5 da6f6cfef1b75a5df4a46f8aa910e847 nut-2.0.0-r1.ebuild 3112
 MD5 891b50cff5827a4e77573ee8f2f40e48 files/digest-nut-2.0.0 61
-MD5 3991086b9dd6c95fe463cb21ead5e0bd files/upsmon-init 474
-MD5 7b76eef352ad93b1369096360bbc3a11 files/digest-nut-1.5.12 62
-MD5 3a425305da409ff659235b4d219f8821 files/upsd.rc6 587
-MD5 59a02122c76aa6364c99e032db372c41 files/upsdrv.rc6 479
-MD5 2019e9c320d038dd72aba624016b0ae1 files/upsmon.rc6 473
-MD5 45f63e627825348055c082a0a94c55fd files/upsd-init 579
+MD5 5962635c2a91e3df315cc69f5aa52f6a files/upsmon.rc6 471
+MD5 d369e7d9bf8a83e47b0a958ec30baf43 files/upsdrv.rc6 477
+MD5 891b50cff5827a4e77573ee8f2f40e48 files/digest-nut-2.0.0-r1 61
+MD5 23c9faa5fc009d873bac5c36b1d02b4e files/digest-nut-2.0.1_pre4 66
+MD5 2d1326c3eefc364c474ea2f191810bfc files/upsdrv.rc6-r1 489
+MD5 057b35a5ced412ebf01c952b55d2e4db files/upsd.rc6 585
diff --git a/www-apps/nut/files/upsd.rc6 b/www-apps/nut/files/upsd.rc6
index 1f2f1330abf1..af57ad361fce 100644
--- a/www-apps/nut/files/upsd.rc6
+++ b/www-apps/nut/files/upsd.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/www-apps/nut/files/upsd.rc6,v 1.1 2004/08/15 15:19:10 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/nut/files/upsd.rc6,v 1.1.1.1 2005/11/30 09:37:04 chriswhite Exp $
 
 depend() {
 	need net upsdrv
diff --git a/www-apps/nut/files/upsdrv.rc6 b/www-apps/nut/files/upsdrv.rc6
index 2da25447b8f7..1ae3f80ee22b 100644
--- a/www-apps/nut/files/upsdrv.rc6
+++ b/www-apps/nut/files/upsdrv.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/www-apps/nut/files/upsdrv.rc6,v 1.1 2004/08/15 15:19:10 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/nut/files/upsdrv.rc6,v 1.1.1.1 2005/11/30 09:37:04 chriswhite Exp $
 
 depend() {
 	need net
diff --git a/www-apps/nut/files/upsdrv.rc6-r1 b/www-apps/nut/files/upsdrv.rc6-r1
index 794f53359c89..de3afab0f81f 100755
--- a/www-apps/nut/files/upsdrv.rc6-r1
+++ b/www-apps/nut/files/upsdrv.rc6-r1
@@ -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/www-apps/nut/files/upsdrv.rc6-r1,v 1.1 2005/02/14 07:57:16 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/nut/files/upsdrv.rc6-r1,v 1.1.1.1 2005/11/30 09:37:04 chriswhite Exp $
 
 depend() {
 	need net
diff --git a/www-apps/nut/files/upsmon.rc6 b/www-apps/nut/files/upsmon.rc6
index 8b89dc0ad714..296f1663181e 100644
--- a/www-apps/nut/files/upsmon.rc6
+++ b/www-apps/nut/files/upsmon.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/www-apps/nut/files/upsmon.rc6,v 1.1 2004/08/15 15:19:10 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/nut/files/upsmon.rc6,v 1.1.1.1 2005/11/30 09:37:04 chriswhite Exp $
 
 depend() {
 	need net
diff --git a/www-apps/nut/nut-2.0.0-r1.ebuild b/www-apps/nut/nut-2.0.0-r1.ebuild
index b81859dc0f3b..2c42c91cfeda 100644
--- a/www-apps/nut/nut-2.0.0-r1.ebuild
+++ b/www-apps/nut/nut-2.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/www-apps/nut/nut-2.0.0-r1.ebuild,v 1.1 2005/02/14 07:57:16 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/nut/nut-2.0.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:04 chriswhite Exp $
 
 inherit fixheadtails
 
@@ -10,11 +10,11 @@ SRC_URI="mirror://nut/source/${PV%.*}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 sparc ppc ~alpha ~amd64"
+KEYWORDS="alpha amd64 ppc sparc x86"
 IUSE="cgi snmp usb"
 
 RDEPEND="cgi? ( media-libs/gd )
-	snmp? ( virtual/snmp )"
+	snmp? ( net-analyzer/net-snmp )"
 DEPEND="$RDEPEND
 	>=sys-apps/sed-4
 	>=sys-devel/autoconf-2.58"
diff --git a/www-apps/nut/nut-2.0.0.ebuild b/www-apps/nut/nut-2.0.0.ebuild
index ff3a2d42706d..686e74e1f617 100644
--- a/www-apps/nut/nut-2.0.0.ebuild
+++ b/www-apps/nut/nut-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/www-apps/nut/nut-2.0.0.ebuild,v 1.1 2004/08/15 15:19:10 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/nut/nut-2.0.0.ebuild,v 1.1.1.1 2005/11/30 09:37:04 chriswhite Exp $
 
 inherit fixheadtails
 
@@ -10,11 +10,11 @@ SRC_URI="mirror://nut/source/${PV%.*}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~sparc"
+KEYWORDS="x86 sparc ppc ~alpha ~amd64"
 IUSE="cgi snmp usb"
 
-RDEPEND="cgi? ( =media-libs/gd-1* )
-	snmp? ( virtual/snmp )"
+RDEPEND="cgi? ( media-libs/gd )
+	snmp? ( net-analyzer/net-snmp )"
 DEPEND="$RDEPEND
 	>=sys-apps/sed-4
 	>=sys-devel/autoconf-2.58"
diff --git a/www-apps/nut/nut-2.0.1_pre4.ebuild b/www-apps/nut/nut-2.0.1_pre4.ebuild
index 83d38ef8d5eb..40028a584c6e 100644
--- a/www-apps/nut/nut-2.0.1_pre4.ebuild
+++ b/www-apps/nut/nut-2.0.1_pre4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/nut/nut-2.0.1_pre4.ebuild,v 1.1 2005/02/17 19:17:33 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/nut/nut-2.0.1_pre4.ebuild,v 1.1.1.1 2005/11/30 09:37:04 chriswhite Exp $
 
 inherit fixheadtails
 
@@ -18,13 +18,13 @@ KEYWORDS="~x86 ~sparc ~ppc ~alpha ~amd64"
 IUSE="cgi snmp usb"
 
 RDEPEND="cgi? ( media-libs/gd )
-		snmp? ( virtual/snmp )"
+		snmp? ( net-analyzer/net-snmp )"
 DEPEND="$RDEPEND
 		>=sys-apps/sed-4
 		>=sys-devel/autoconf-2.58"
 
 src_unpack() {
-	unpack ${A} 
+	unpack ${A}
 
 	cd "${S}"
 
diff --git a/www-apps/online-bookmarks/ChangeLog b/www-apps/online-bookmarks/ChangeLog
index a0948dd82fc5..6ad74607b2ef 100644
--- a/www-apps/online-bookmarks/ChangeLog
+++ b/www-apps/online-bookmarks/ChangeLog
@@ -1,6 +1,20 @@
-# ChangeLog for net-www/online-bookmarks
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/online-bookmarks/ChangeLog,v 1.1 2004/08/15 15:22:21 stuart Exp $
+# ChangeLog for www-apps/online-bookmarks
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/online-bookmarks/ChangeLog,v 1.1.1.1 2005/11/30 09:36:54 chriswhite Exp $
+
+*online-bookmarks-0.6.1c (25 Oct 2005)
+
+  25 Oct 2005; Renat Lumpau <rl03@gentoo.org> +files/postinstall-en.txt,
+  metadata.xml, -online-bookmarks-0.2.6.ebuild,
+  -online-bookmarks-0.2.8.ebuild, +online-bookmarks-0.6.1c.ebuild:
+  Version bump, fixed bug #60601.
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  online-bookmarks-0.4.0.ebuild:
+  Masked online-bookmarks-0.4.0.ebuild stable for ppc
 
 *online-bookmarks-0.2.8 (15 Aug 2004)
 
diff --git a/www-apps/online-bookmarks/Manifest b/www-apps/online-bookmarks/Manifest
index d7d1de758a6a..5239ad3deb1b 100644
--- a/www-apps/online-bookmarks/Manifest
+++ b/www-apps/online-bookmarks/Manifest
@@ -1,8 +1,17 @@
-MD5 846bbd480ae2f0d31d27575b7cf3b188 ChangeLog 812
-MD5 8cbe13cf7fd412cfdf3609b3bf67eebe metadata.xml 504
-MD5 44a36d0540d675cf5fc965d40b8076e1 online-bookmarks-0.2.6.ebuild 1459
-MD5 7a946b8651f022f893fa276e92f06e5c online-bookmarks-0.2.8.ebuild 1459
-MD5 a9127fa724780ca1db1f2d1e64bdf4c2 online-bookmarks-0.4.0.ebuild 1460
-MD5 17d5aedf274dc89da9c51a078276b928 files/digest-online-bookmarks-0.2.6 73
-MD5 108a2e1964d7b79417880adaf4846171 files/digest-online-bookmarks-0.2.8 73
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b1914f24c7c3de9dba6c745d45d45c13 online-bookmarks-0.6.1c.ebuild 951
+MD5 b81a11ffafa1d5c4c69a4d1dcd3cb901 online-bookmarks-0.4.0.ebuild 1463
+MD5 f6d6a36c61b73c3a466b085bd211f4dd ChangeLog 1575
+MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
+MD5 b887b7150525fd0effaa66c705c2599a files/postinstall-en.txt 96
 MD5 ecc864d6e8a42284be157e0ce864593c files/digest-online-bookmarks-0.4.0 73
+MD5 30f252628aa933133b811094d4f7f3c2 files/digest-online-bookmarks-0.6.1c 74
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDXqPtEzitwsaoONoRAsZiAKDKpx2y6D3bBJpSh3f7pJS17XEv+ACeKMni
+W5mXpEjrlXhIZEuFMzTV23M=
+=jPYr
+-----END PGP SIGNATURE-----
diff --git a/www-apps/online-bookmarks/metadata.xml b/www-apps/online-bookmarks/metadata.xml
index 6f9c59dc30c7..95c06f0095bb 100644
--- a/www-apps/online-bookmarks/metadata.xml
+++ b/www-apps/online-bookmarks/metadata.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-          <email>jmglov@gentoo.org</email>
-          <name>Josh Glover</name>
-  </maintainer>
-  <longdescription>online-bookmarks is a Bookmark management system to store your Bookmarks, Favorites and Links right in the WWW where they actually belong to. It is meant for people who work often with different computers and browsers.</longdescription>
+<herd>web-apps</herd>
 </pkgmetadata>
diff --git a/www-apps/online-bookmarks/online-bookmarks-0.4.0.ebuild b/www-apps/online-bookmarks/online-bookmarks-0.4.0.ebuild
index 0258a4693cc7..562319819cf7 100644
--- a/www-apps/online-bookmarks/online-bookmarks-0.4.0.ebuild
+++ b/www-apps/online-bookmarks/online-bookmarks-0.4.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/www-apps/online-bookmarks/online-bookmarks-0.4.0.ebuild,v 1.1 2004/08/15 15:22:21 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/online-bookmarks/online-bookmarks-0.4.0.ebuild,v 1.1.1.1 2005/11/30 09:36:54 chriswhite Exp $
 
 inherit webapp
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.frech.ch/online-bookmarks/index.php"
 SRC_URI="http://www.frech.ch/online-bookmarks/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ppc"
 
 IUSE=""
 
diff --git a/www-apps/online-bookmarks/online-bookmarks-0.6.1c.ebuild b/www-apps/online-bookmarks/online-bookmarks-0.6.1c.ebuild
index 936e851dc78b..72accdf40bf6 100644
--- a/www-apps/online-bookmarks/online-bookmarks-0.6.1c.ebuild
+++ b/www-apps/online-bookmarks/online-bookmarks-0.6.1c.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/online-bookmarks/online-bookmarks-0.6.1c.ebuild,v 1.1 2005/10/25 21:30:12 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/online-bookmarks/online-bookmarks-0.6.1c.ebuild,v 1.1.1.1 2005/11/30 09:36:54 chriswhite Exp $
 
 inherit webapp
 
diff --git a/www-apps/open-xchange/ChangeLog b/www-apps/open-xchange/ChangeLog
index 1ba9745dca75..9ddab2e3b5bb 100644
--- a/www-apps/open-xchange/ChangeLog
+++ b/www-apps/open-xchange/ChangeLog
@@ -1,6 +1,48 @@
 # ChangeLog for www-apps/open-xchange
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/open-xchange/ChangeLog,v 1.1 2005/09/24 03:24:00 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/open-xchange/ChangeLog,v 1.1.1.1 2005/11/30 09:37:05 chriswhite Exp $
+
+  20 Nov 2005; Stuart Herbert <stuart@gentoo.org> open-xchange-0.8.0.6.ebuild,
+  open-xchange-0.8.1.2.ebuild, open-xchange-0.8.1.3-r1.ebuild,
+  open-xchange-0.8.1.3.ebuild:
+  Fixed broken DEPEND
+
+*open-xchange-0.8.0.6 (22 Oct 2005)
+
+  22 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +open-xchange-0.8.0.6.ebuild:
+  Added ebuild for upstream stable version.
+
+*open-xchange-0.8.1.3-r1 (22 Oct 2005)
+
+  22 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +open-xchange-0.8.1.3-r1.ebuild:
+  Revbump with some further updates from Martin.
+
+  03 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  open-xchange-0.8.1.2.ebuild, open-xchange-0.8.1.3.ebuild:
+  Added missing DEPEND on zip.
+
+*open-xchange-0.8.1.3 (01 Oct 2005)
+
+  01 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +open-xchange-0.8.1.3.ebuild:
+  Version bump.
+
+  01 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  open-xchange-0.8.1.2.ebuild:
+  Using tomcat servelet classpath.
+
+  01 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/open-xchange-0.8.1.2-reply.patch, open-xchange-0.8.1.2.ebuild:
+  Fixed upstream bug #762 with buggy reply.
+
+  24 Sep 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/open-xchange-0.8.1.2-login.patch, open-xchange-0.8.1.2.ebuild:
+  Added patch for login.pm when USE=ssl.
+
+  24 Sep 2005; Jeremy Huddleston <eradicator@gentoo.org> files/slapd.ox.inc:
+  Fixed up the slapd permissions include.
 
 *open-xchange-0.8.1.2 (24 Sep 2005)
 
diff --git a/www-apps/open-xchange/Manifest b/www-apps/open-xchange/Manifest
index 1871c6bd0b1d..7027a0de30e1 100644
--- a/www-apps/open-xchange/Manifest
+++ b/www-apps/open-xchange/Manifest
@@ -1,7 +1,16 @@
-MD5 cd7494aedaa10b1eb342692b86dd4b16 open-xchange-0.8.1.2.ebuild 21515
-MD5 65c7e4c20fc38cac91ae5bfb4c6fb674 files/SocketHandler.java.debug 991
+MD5 7f5e1fd37dafbd470db23082f75bec44 ChangeLog 2026
+MD5 a339b15041bb6d450a7535f3df1fcc4c metadata.xml 247
+MD5 b8aa72c558406ead126ebc80b0e3a190 open-xchange-0.8.1.2.ebuild 21768
+MD5 77b42974858361e1f5400203c4ff8977 open-xchange-0.8.1.3.ebuild 21671
+MD5 2f0f8a27fcb26fd1ee44317fbcae53dd open-xchange-0.8.0.6.ebuild 22299
+MD5 7cacbe6ec67fc6217308ae3257a9d393 open-xchange-0.8.1.3-r1.ebuild 22302
+MD5 cfa72c4f5e62b779052acf1cd629234b files/88_mod_jk.ox.conf 1228
 MD5 ec8d72f6da3dbefde48787a53fa071bf files/digest-open-xchange-0.8.1.2 138
+MD5 6c1195bc1dd228bf7108e508aa8ef20f files/digest-open-xchange-0.8.1.3 138
 MD5 5388f979621c5e4d333aef5cd37f0062 files/init.d.open-xchange 1877
-MD5 cfa72c4f5e62b779052acf1cd629234b files/88_mod_jk.ox.conf 1228
-MD5 ad3894d059bf4fce235b76ad4521eff7 files/open-xchange-htaccess 172
-MD5 a6f59437ac9557974132d5648d662f72 files/slapd.ox.inc 1113
+MD5 b9bb53f0dd8125a862c1cbc45ab7c06f files/open-xchange-0.8.1.2-login.patch 638
+MD5 aba374392dbfe403d7b11f84e8a33a31 files/open-xchange-0.8.1.2-reply.patch 750
+MD5 7d1504e4241974d3583575b3827b0f5a files/open-xchange-htaccess 174
+MD5 2ad5cb7b97eca4314016247cde421449 files/slapd.ox.inc 2019
+MD5 9bc76a01ee94faa11aaf1e5b47f59236 files/digest-open-xchange-0.8.0.6 138
+MD5 a1eab7fcc69e1e1c85072befb227fc41 files/digest-open-xchange-0.8.1.3-r1 138
diff --git a/www-apps/open-xchange/files/slapd.ox.inc b/www-apps/open-xchange/files/slapd.ox.inc
index a3db13a811aa..b09c7d440150 100644
--- a/www-apps/open-xchange/files/slapd.ox.inc
+++ b/www-apps/open-xchange/files/slapd.ox.inc
@@ -1,36 +1,49 @@
-#access to attribute=userPassword
-#        by dn="cn=admin,@basedn@" write
-#        by anonymous auth
-#        by self write
-#        by * none
+access to dn.base=""
+  by dn="uid=root,ou=Users,ou=OxObjects,@basedn@" write
+  by * read
 
-#access to *
-#        by dn="cn=admin,@basedn@" write
-#	by self write
-#        by * read
-
-access to dn.base="" by * read
-access to dn.base="cn=Subschema" by * read
+access to dn.base="cn=Subschema"
+  by dn="uid=root,ou=Users,ou=OxObjects,@basedn@" write
+  by * read
 
 # protect the userPassword attribute
-access to attr=userPassword
-  by self =w
+access to attrs=userPassword,shadowLastChange 
+  by dn="uid=root,ou=Users,ou=OxObjects,@basedn@" write
   by anonymous auth
+  by self write
+  by * none
 
 # global address book
 access to dn.subtree="o=AddressBook,ou=OxObjects,@basedn@"
+  by dn="uid=root,ou=Users,ou=OxObjects,@basedn@" write
   by group.exact="cn=AddressAdmins,o=AddressBook,ou=OxObjects,@basedn@" write
   by users read
 
 # personal address book
 access to dn.regex="^ou=addr,(uid=([^,]+),ou=Users,ou=OxObjects,@basedn@)$" attrs=children
+  by dn="uid=root,ou=Users,ou=OxObjects,@basedn@" write
   by dn.exact,expand="$1" write
 access to dn.regex="^uid=([^,]+),ou=addr,(uid=([^,]+),ou=Users,ou=OxObjects,@basedn@)$" attrs=entry
+  by dn="uid=root,ou=Users,ou=OxObjects,@basedn@" write
   by dn.exact,expand="$2" write
 
 # default rule allowing users full access to their own entries
-access to attrs=cn,description,gecos,givenName,initials,l,labeledURI,mobile,o,OXAppointmentDays,OXTaskDays,OXTimeZone,postalCode,preferredLanguage,sn,st,street,title,userCountry
-    by self write
-    by users read
 
-index uid,mailEnabled,cn,sn,givenname,lnetMailAccess,alias,loginDestination eq,sub
+# In order to let users modify their attributes through OX, you must grant
+# users access to modify uid because of upstream bug #736:
+# http://www.open-xchange.org/cgi-bin/bugzilla/show_bug.cgi?id=736
+#
+# This is not secure and thus hasn't been set here.  To enable it, add
+# uid to the following list
+access to attrs=birthDay,cn,description,facsimileTelephoneNumber,gecos,givenName,homePhone,initials,l,labeledURI,mobile,o,ou,OXAppointmentDays,OXDayViewInterval,OXDayViewEndTime,OXDayViewStartTime,OXTaskDays,OXTimeZone,pager,postalCode,preferredLanguage,sn,st,street,telephoneNumber,title,userCountry
+  by dn="uid=root,ou=Users,ou=OxObjects,@basedn@" write
+  by self write
+  by * read
+
+access to *
+  by dn="uid=root,ou=Users,ou=OxObjects,@basedn@" write
+  by * read
+
+# This is supposed to give a performance boose, but it just breaks things for
+# me -- eradicator
+#index uid,mailEnabled,cn,sn,givenname,lnetMailAccess,alias,loginDestination eq,sub
diff --git a/www-apps/open-xchange/metadata.xml b/www-apps/open-xchange/metadata.xml
index c2d772176970..440d993367c5 100644
--- a/www-apps/open-xchange/metadata.xml
+++ b/www-apps/open-xchange/metadata.xml
@@ -2,12 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 
 <pkgmetadata>
-  <herd>base-system</herd>
   <maintainer>
     <email>eradicator@gentoo.org</email>
     <name>Jeremy Huddleston</name>
   </maintainer>
-  <longdescription>
-    evms is a volume management system written by IBM, it's open source
-  </longdescription>
 </pkgmetadata>
diff --git a/www-apps/open-xchange/open-xchange-0.8.0.6.ebuild b/www-apps/open-xchange/open-xchange-0.8.0.6.ebuild
index a3e4023cdd81..f7889c8f596c 100644
--- a/www-apps/open-xchange/open-xchange-0.8.0.6.ebuild
+++ b/www-apps/open-xchange/open-xchange-0.8.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/www-apps/open-xchange/open-xchange-0.8.0.6.ebuild,v 1.1 2005/10/22 01:24:46 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/open-xchange/open-xchange-0.8.0.6.ebuild,v 1.1.1.1 2005/11/30 09:37:06 chriswhite Exp $
 
 inherit eutils webapp ssl-cert toolchain-funcs java-pkg versionator depend.apache
 
@@ -37,7 +37,6 @@ RDEPEND=">=virtual/jre-1.4
 	 dev-perl/Authen-SASL
 	 dev-perl/Convert-ASN1
 	 dev-perl/perl-ldap
-	 net-www/webapp-config
 	 mysql? ( !postgres? ( dev-java/jdbc-mysql >=dev-db/mysql-4.1 ) )
 	 !mysql? ( ~dev-java/jdbc3-postgresql-7.4.5 dev-db/postgresql )
 	 postgres? ( ~dev-java/jdbc3-postgresql-7.4.5 dev-db/postgresql )
diff --git a/www-apps/open-xchange/open-xchange-0.8.1.2.ebuild b/www-apps/open-xchange/open-xchange-0.8.1.2.ebuild
index 7cf73837f5c7..2ca5644a6c7d 100644
--- a/www-apps/open-xchange/open-xchange-0.8.1.2.ebuild
+++ b/www-apps/open-xchange/open-xchange-0.8.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/www-apps/open-xchange/open-xchange-0.8.1.2.ebuild,v 1.1 2005/09/24 03:24:00 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/open-xchange/open-xchange-0.8.1.2.ebuild,v 1.1.1.1 2005/11/30 09:37:07 chriswhite Exp $
 
 inherit eutils webapp ssl-cert toolchain-funcs java-pkg versionator depend.apache
 
@@ -32,15 +32,15 @@ RDEPEND=">=virtual/jre-1.4
 	 dev-perl/Authen-SASL
 	 dev-perl/Convert-ASN1
 	 dev-perl/perl-ldap
-	 net-www/webapp-config
 	 mysql? ( !postgres? ( dev-java/jdbc-mysql >=dev-db/mysql-4.1 ) )
 	 !mysql? ( ~dev-java/jdbc3-postgresql-7.4.5 dev-db/postgresql )
 	 postgres? ( ~dev-java/jdbc3-postgresql-7.4.5 dev-db/postgresql )
 	 ssl? ( dev-libs/openssl dev-perl/IO-Socket-SSL )"
 
-# COMMENT: Why is the jdbc requirement set to 7.4.5 and now >=7.4.5?
+# COMMENT: Why is the jdbc requirement set to 7.4.5 and not >=7.4.5?
 
 DEPEND="${RDEPEND}
+	app-arch/zip
 	>=virtual/jdk-1.4"
 
 RDEPEND="${RDEPEND}
@@ -69,9 +69,15 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	# reported bug at open-xchang.org #656
+	# http://www.open-xchange.org/cgi-bin/bugzilla/show_bug.cgi?id=734
+	epatch ${FILESDIR}/${P}-login.patch
+
+	# http://www.open-xchange.org/cgi-bin/bugzilla/show_bug.cgi?id=762
+	epatch ${FILESDIR}/${P}-reply.patch
+
+	# http://www.open-xchange.org/cgi-bin/bugzilla/show_bug.cgi?id=656
 	sed -i "s|\${DESTDIR}|\$(DESTDIR)|g" Makefile.am
-	
+
 	export WANT_AUTOMAKE=1.8
 	export WANT_AUTOCONF=2.5
 	libtoolize --force --copy || die
@@ -79,7 +85,7 @@ src_unpack() {
 	automake -a -f -c || die
 	autoheader || die
 	autoconf || die
-	
+
 	# doing all preconfigure which can be done here
 	# correct ispell-handling of german dictionary
 	sed -i "s|-ddeutsch|-dgerman|g" conf/webmail/spellcheck.cfg
@@ -93,9 +99,9 @@ src_unpack() {
 	find groupware/ -regex '.*\.htm' |xargs sed -i "s|/cfintranet/|/open-xchange/cfintranet/|g"
 	find templates/ -regex '.*\.htm' |xargs sed -i "s|/cfintranet/|/open-xchange/cfintranet/|g"
 	find webmail/ -regex '.*\.htm' |xargs sed -i "s|/cfintranet/|/open-xchange/cfintranet/|g"
-	
+
 	find templates/ -regex '.*\.lang' |xargs sed -i "s|/cfintranet/|/open-xchange/cfintranet/|g"
-	
+
 	find system/www/ -regex '.*\.htm' |xargs sed -i "s|/cfintranet/|/open-xchange/cfintranet/|g"
 	find system/www/ -regex '.*\.js' |xargs sed -i "s|/cfintranet/|/open-xchange/cfintranet/|g"
 
@@ -124,16 +130,16 @@ src_compile() {
 		fi
 		myconf="${myconf} --with-dbdriver=com.mysql.jdbc.Driver"
 	fi
-	
+
 	myconf="${myconf} $(use_enable doc) $(use_enable webdav) $(use_enable ssl)"
 
 	myconf="${myconf} --with-servletdir=${SERVLETDIR}"
 
-	if has_version '>=www-servers/tomcat-5.0.28-r4' ; then
+#	if has_version '>=www-servers/tomcat-5.0.28-r4' ; then
 		myconf="${myconf} --with-jsdkjar=${TOMCAT_DIR}/common/lib/servlet-api.jar"
-	else
-		myconf="${myconf} --with-jsdkjar=/usr/share/servletapi-2.4/lib/servlet-api.jar"
-	fi
+#	else
+#		myconf="${myconf} --with-jsdkjar=/usr/share/servletapi-2.4/lib/servlet-api.jar"
+#	fi
 
 	myconf="${myconf} --with-mailjar=/usr/share/sun-javamail-bin/lib/mail.jar"
 	myconf="${myconf} --with-activationjar=/usr/share/sun-jaf-bin/lib/activation.jar"
@@ -176,7 +182,7 @@ src_install() {
 	# Install this big thing
 	cd ${S}
 	make DESTDIR=${D} install || die "Failed on make install"
-	
+
 	# copy the ldif.in file for better config-abilities in pkg_preinst
 	cp ${S}/system/setup/init_ldap.ldif.in ${D}/usr/share/open-xchange/init_ldap.ldif
 
@@ -186,7 +192,7 @@ src_install() {
 	rm ${D}/var/open-xchange/log/sessiond.log
 	rm ${D}/var/open-xchange/log/webmail.log
 	rmdir ${D}/var/open-xchange/log/
-	
+
 	# create log-dir
 	keepdir /var/log/open-xchange
 
@@ -203,7 +209,7 @@ src_install() {
 	# Init script
 	newinitd "${FILESDIR}/init.d.open-xchange" open-xchange || die "newinitd failed"
 
-	if has_version '<www-servers/tomcat-5.0.28-r4' ; then	
+	if has_version '<www-servers/tomcat-5.0.28-r4' ; then
 		dosed 's:tomcat-5:tomcat5:' /etc/init.d/open-xchange
 	fi
 
@@ -283,7 +289,7 @@ pkg_preinst(){
 		# copying the CA-certificate
 		dodir /etc/open-xchange/groupware/sslcerts/oxCA
 		cp ${T}/*ca.crt ${D}/etc/open-xchange/groupware/sslcerts/oxCA/cacert.pem
-		
+
 		# copying the groupware-key and -cert the way ox would like it to have
 		mv ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/groupware.key ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/groupwarekey.pem
 		mv ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/groupware.crt ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/groupwarecert.pem
@@ -300,33 +306,33 @@ pkg_postinst() {
 	webapp_pkg_postinst
 
 	chgrp -R apache /var/open-xchange/*
-	einfo " "
-	einfo " "
+	einfo
+	einfo
 	einfo " ==========================================================="
-	einfo " "
+	einfo
 	einfo "        You have successfully installed Open-Xchange"
-	einfo " "
+	einfo
 	einfo " ==========================================================="
-	einfo " "
+	einfo
 	einfo "   o FILE LOCATIONS"
 	einfo "        1.  Configuration: /etc/open-xchange"
 	einfo "        2.  HTML Files: 	  /usr/share/open-xchange"
-	einfo " "
+	einfo
 	einfo "   o STARTING and STOPPING the Open-Xchange"
 	einfo "        /etc/init.d/openexchange start"
 	einfo "        /etc/init.d/openexchange stop"
 	einfo "        /etc/init.d/openexchange restart"
-	einfo " "
+	einfo
 	einfo "Execute the following command"
 	einfo "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
 	einfo "to setup the initial open-xchange environment."
-	einfo " "
-	
+	einfo
+
 	if has_version '=net-nds/openldap-2.1*' ; then
 		ewarn "You have got OpenLDAP-2.1.* installed."
 		ewarn "Please make sure you've got enabled aci support for this package."
 		ewarn "For more information: http://gentoo-wiki.com/HOWTO_Open-Xchange#OpenLDAP"
-		ewarn ""
+		ewarn
 		ewarn "If you already have this done, ignore this warning"
 	fi
 }
@@ -347,7 +353,7 @@ get_user_config() {
 		echo ${default}
 	else
 		echo ${readval}
-	fi	
+	fi
 }
 
 pkg_config() {
@@ -373,21 +379,21 @@ pkg_config() {
 	local OX_ROOTPW=${OX_ROOTPW-"secret"}
 
 	# Guess base on the installed config
-	if false && [[ -e "${ROOT}/etc/open-xchange/admintools.conf" ]] ; then
+	if [[ -e "${ROOT}/etc/open-xchange/admintools.conf" ]] ; then
 		local temp_var
 		echo "Installation of OX detected"
-	
+
 		temp_var=$(get_oxvar DEFAULT_SQL_HOST)
-		[[ -n ${temp_var} ]] && OX_DBHOST==${temp_var}
+		[[ -n ${temp_var} ]] && OX_DBHOST=${temp_var}
 
 		temp_var=$(get_oxvar DEFAULT_SQL_DB)
-		[[ -n ${temp_var} ]] && OX_DBNAME==${temp_var}
+		[[ -n ${temp_var} ]] && OX_DBNAME=${temp_var}
 
 		temp_var=$(get_oxvar DEFAULT_SQL_USER)
-		[[ -n ${temp_var} ]] && OX_DBUSER==${temp_var}
+		[[ -n ${temp_var} ]] && OX_DBUSER=${temp_var}
 
 		temp_var=$(get_oxvar DEFAULT_SQL_PASS)
-		[[ -n ${temp_var} ]] && OX_DBPASS==${temp_var}
+		[[ -n ${temp_var} ]] && OX_DBPASS=${temp_var}
 
 		temp_var=$(get_oxvar ORGA)
 		[[ -n ${temp_var} ]] && OX_ORG=${temp_var}
@@ -396,7 +402,7 @@ pkg_config() {
 		[[ -n ${temp_var} ]] && OX_ROOTDN=${temp_var}
 
 		temp_var=$(get_oxvar BINDPW)
-		[[ -n ${temp_var} ]] && OX_ROOTPW=${OX_ROOTPW_TEMP}
+		[[ -n ${temp_var} ]] && OX_ROOTPW=${temp_var}
 
 		if [[ -e "${ROOT}/etc/open-xchange/groupware/ldap.conf" ]] ; then
 			# taken from admintools.conf self
@@ -407,7 +413,7 @@ pkg_config() {
 
 	# Now asking the user
 	einfo "If values are correct just press enter else enter the new value"
-	
+
 	OX_DBHOST=$(get_user_config "${OX_DBHOST}" "Database Host")
 	OX_DBNAME=$(get_user_config "${OX_DBNAME}" "Database Name")
 	OX_DBUSER=$(get_user_config "${OX_DBUSER}" "Database User")
@@ -425,7 +431,7 @@ pkg_config() {
 	[[ -d "${T}/ox_war" ]] && rm -rf ${T}/ox_war
 	mkdir -p ${T}/ox_war
 	unzip ${ROOT}/${SERVLETDIR}/umin.war -d ${T}/ox_war
-	
+
 	sed -i "s|LDAP_SERVER=.*|LDAP_SERVER=${OX_LDAPSERVER}|g" ${T}/ox_war/WEB-INF/classes/oxuserminconfig.properties
 	sed -i "s|LDAP_BASEDN=.*|LDAP_BASEDN=${OX_BASEDN}|g" ${T}/ox_war/WEB-INF/classes/oxuserminconfig.properties
 	sed -i "s|SQL_SERVER_GROUPWARE=.*|SQL_SERVER_GROUPWARE=${OX_DBHOST}|g" ${T}/ox_war/WEB-INF/classes/oxuserminconfig.properties
@@ -433,7 +439,7 @@ pkg_config() {
 	sed -i "s|SQL_SERVER_GROUPWARE_DATABASE_USERNAME=.*|SQL_SERVER_GROUPWARE_DATABASE_USERNAME=${OX_DBUSER}|g" ${T}/ox_war/WEB-INF/classes/oxuserminconfig.properties
 	sed -i "s|SQL_SERVER_GROUPWARE_DATABASE_PASSWORD=.*|SQL_SERVER_GROUPWARE_DATABASE_PASSWORD=${OX_DBPASS}|g" ${T}/ox_war/WEB-INF/classes/oxuserminconfig.properties
 	sed -i "s|CSS_PATH=/cfintranet/css/stylesheet.css|CSS_PATH=/open-xchange/cfintranet/css/stylesheet.css|g" ${T}/ox_war/WEB-INF/classes/oxuserminconfig.properties
-	
+
 	cd ${T}/ox_war
 	zip -r -9 umin.war *
 	cp umin.war ${ROOT}/${SERVLETDIR}
@@ -445,7 +451,7 @@ pkg_config() {
 	sed -i "s|@basedn@|${OX_BASEDN}|g" ${ROOT}/usr/share/open-xchange/init_ldap.ldif
 	sed -i "s|@domain@|${OX_DOMAIN}|g" ${ROOT}/usr/share/open-xchange/init_ldap.ldif
 	sed -i "s|@organization@|${OX_ORG}|g" ${ROOT}/usr/share/open-xchange/init_ldap.ldif
-	
+
 	local OX_BASEDC="`echo ${OX_BASEDN} | sed -n 's:dc=\([-A-Za-z_]*\).*:\1:p'|head -n 1`"
 	sed -i "s|@basedc@|${OX_BASEDC}|g" ${ROOT}/usr/share/open-xchange/init_ldap.ldif
 
@@ -487,9 +493,7 @@ pkg_config() {
 	echo
 	einfo "And setup /etc/conf.d/postgresql"
 	einfo "PGOPTS=\"-i\""
-	
-	
-	
+
 	# Tell the user how to propegate ldap and the db
 	## at first automatially change config in init_ldap.ldif and configuration-files
 
@@ -521,21 +525,21 @@ pkg_config() {
 	ewarn "Please make sure to STOP slapd to maintain database consistency (from slapadd(8c))!!!"
 	einfo "+++++++++++++++++++++++++++++++++"
 	einfo "/etc/init.d/slapd stop"
-	einfo ""
+	einfo
 	einfo "Add this to /etc/openldap/slapd.conf:"
 	einfo "include         /etc/openldap/schema/cosine.schema"
- 	einfo "include         /etc/openldap/schema/inetorgperson.schema"
- 	einfo "include         /etc/openldap/schema/misc.schema"
- 	einfo "include         /etc/openldap/schema/nis.schema"
- 	einfo "include         /etc/openldap/schema/openldap.schema"
+	einfo "include         /etc/openldap/schema/inetorgperson.schema"
+	einfo "include         /etc/openldap/schema/misc.schema"
+	einfo "include         /etc/openldap/schema/nis.schema"
+	einfo "include         /etc/openldap/schema/openldap.schema"
 	einfo "include         /etc/openldap/schema/openxchange.schema"
-	einfo ""
+	einfo
 	einfo "If you want an initial set of access rights (enables your user, editing their password, ...)"
 	einfo "you should also add the following line:"
 	einfo "include         /etc/openldap/slapd.ox.inc"
-	einfo ""
+	einfo
 	einfo "slapadd -l /usr/share/open-xchange/init_ldap.ldif"
-	einfo ""
+	einfo
 	einfo "/etc/init.d/slapd start"
 
 	echo
diff --git a/www-apps/open-xchange/open-xchange-0.8.1.3-r1.ebuild b/www-apps/open-xchange/open-xchange-0.8.1.3-r1.ebuild
index 26252badf564..08b03cadf59d 100644
--- a/www-apps/open-xchange/open-xchange-0.8.1.3-r1.ebuild
+++ b/www-apps/open-xchange/open-xchange-0.8.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/www-apps/open-xchange/open-xchange-0.8.1.3-r1.ebuild,v 1.1 2005/10/22 01:21:15 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/open-xchange/open-xchange-0.8.1.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:05 chriswhite Exp $
 
 inherit eutils webapp ssl-cert toolchain-funcs java-pkg versionator depend.apache
 
@@ -37,7 +37,6 @@ RDEPEND=">=virtual/jre-1.4
 	 dev-perl/Authen-SASL
 	 dev-perl/Convert-ASN1
 	 dev-perl/perl-ldap
-	 net-www/webapp-config
 	 mysql? ( !postgres? ( dev-java/jdbc-mysql >=dev-db/mysql-4.1 ) )
 	 !mysql? ( ~dev-java/jdbc3-postgresql-7.4.5 dev-db/postgresql )
 	 postgres? ( ~dev-java/jdbc3-postgresql-7.4.5 dev-db/postgresql )
@@ -447,13 +446,13 @@ pkg_postinst() {
 	einfo "        /etc/init.d/open-xchange restart"
 	einfo
 	einfo "Execute the following command"
-	
+
 	if has_version '<=sys-apps/portage-2.0.51*' ; then
 	    einfo "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
 	else
 	    einfo "emerge --config ${CATEGORY}/${PN}"
 	fi
-	
+
 	einfo "to setup the initial open-xchange environment."
 	einfo
 
diff --git a/www-apps/open-xchange/open-xchange-0.8.1.3.ebuild b/www-apps/open-xchange/open-xchange-0.8.1.3.ebuild
index 31bbaa8e670d..cb2dd58e869b 100644
--- a/www-apps/open-xchange/open-xchange-0.8.1.3.ebuild
+++ b/www-apps/open-xchange/open-xchange-0.8.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/www-apps/open-xchange/open-xchange-0.8.1.3.ebuild,v 1.1 2005/10/01 19:36:20 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/open-xchange/open-xchange-0.8.1.3.ebuild,v 1.1.1.1 2005/11/30 09:37:06 chriswhite Exp $
 
 inherit eutils webapp ssl-cert toolchain-funcs java-pkg versionator depend.apache
 
@@ -32,7 +32,6 @@ RDEPEND=">=virtual/jre-1.4
 	 dev-perl/Authen-SASL
 	 dev-perl/Convert-ASN1
 	 dev-perl/perl-ldap
-	 net-www/webapp-config
 	 mysql? ( !postgres? ( dev-java/jdbc-mysql >=dev-db/mysql-4.1 ) )
 	 !mysql? ( ~dev-java/jdbc3-postgresql-7.4.5 dev-db/postgresql )
 	 postgres? ( ~dev-java/jdbc3-postgresql-7.4.5 dev-db/postgresql )
@@ -41,6 +40,7 @@ RDEPEND=">=virtual/jre-1.4
 # COMMENT: Why is the jdbc requirement set to 7.4.5 and not >=7.4.5?
 
 DEPEND="${RDEPEND}
+	app-arch/zip
 	>=virtual/jdk-1.4"
 
 RDEPEND="${RDEPEND}
diff --git a/www-apps/openwebstats/ChangeLog b/www-apps/openwebstats/ChangeLog
index 5685ef503948..5d5c1414538d 100644
--- a/www-apps/openwebstats/ChangeLog
+++ b/www-apps/openwebstats/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/openwebstats
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/openwebstats/ChangeLog,v 1.1 2005/08/09 12:33:40 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/openwebstats/ChangeLog,v 1.1.1.1 2005/11/30 09:36:57 chriswhite Exp $
+
+  22 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt:
+  Housekeeping
+
+  09 Aug 2005; Renat Lumpau <rl03@gentoo.org> openwebstats-1.1.ebuild:
+  removed unnecessary eutils
 
 *openwebstats-1.1 (09 Aug 2005)
 
diff --git a/www-apps/openwebstats/Manifest b/www-apps/openwebstats/Manifest
index 65c8eaa31e42..075f5c25d9bb 100644
--- a/www-apps/openwebstats/Manifest
+++ b/www-apps/openwebstats/Manifest
@@ -1,6 +1,16 @@
-MD5 740b5ba083a02502668ad0d9a30380d3 openwebstats-1.1.ebuild 921
-MD5 97b4b139f8a2fcb05863b89b1304de95 ChangeLog 343
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 61952d8022cd90ab01af0526b8404142 openwebstats-1.1.ebuild 1019
+MD5 96e856b4b2a95dba3635a7b77829696f ChangeLog 623
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
-MD5 5b6e5f719c8ac89d80563e3a2fdbf90b files/postinstall-en.txt 1244
+MD5 6d0f42c05b37787650a9bc6d893669a9 files/postinstall-en.txt 1245
 MD5 9cd494690c72b7e0eadedda10bc3e148 files/config.php 2106
 MD5 d550fb469b3eeb7f034cd04d8134465d files/digest-openwebstats-1.1 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDClluEzitwsaoONoRApydAJ0f4uh5GbYXQSCrR11kF/lPfeUUaACgn+6W
+k1u/sE80ZNZKBOEBsEj7W8c=
+=LtIG
+-----END PGP SIGNATURE-----
diff --git a/www-apps/openwebstats/files/postinstall-en.txt b/www-apps/openwebstats/files/postinstall-en.txt
index 70b46ce6b391..ed4c7cd9260e 100644
--- a/www-apps/openwebstats/files/postinstall-en.txt
+++ b/www-apps/openwebstats/files/postinstall-en.txt
@@ -30,7 +30,7 @@ function of the web frontend.
 
 > chmod 644 /var/log/apache2/access_log 
 
-Now you can go to http://${VHOST_HOSTNAME}${VHOST_APPDIR} and use the
+Now you can go to http://${VHOST_HOSTNAME}/${VHOST_APPDIR} and use the
 application.
 
 ------------------------------------------------------------------------
diff --git a/www-apps/openwebstats/openwebstats-1.1.ebuild b/www-apps/openwebstats/openwebstats-1.1.ebuild
index 5b3d88915a0b..6084c77301c4 100644
--- a/www-apps/openwebstats/openwebstats-1.1.ebuild
+++ b/www-apps/openwebstats/openwebstats-1.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/www-apps/openwebstats/openwebstats-1.1.ebuild,v 1.1 2005/08/09 12:33:40 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/openwebstats/openwebstats-1.1.ebuild,v 1.1.1.1 2005/11/30 09:36:57 chriswhite Exp $
 
-inherit eutils webapp
+inherit webapp
 
 DESCRIPTION="OpenWebStats is a PHP stats application that reads Apache log files and imports the data to a MySQL database."
 HOMEPAGE="http://openwebstats.sourceforge.net/"
diff --git a/www-apps/otrs/ChangeLog b/www-apps/otrs/ChangeLog
index 85137ddc9069..38dde549ac3e 100644
--- a/www-apps/otrs/ChangeLog
+++ b/www-apps/otrs/ChangeLog
@@ -1,6 +1,69 @@
 # ChangeLog for www-apps/otrs
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/ChangeLog,v 1.1 2004/08/26 10:16:17 rl03 Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/ChangeLog,v 1.1.1.1 2005/11/30 09:37:05 chriswhite Exp $
+
+  20 Nov 2005; Stuart Herbert <stuart@gentoo.org> otrs-1.3.2.ebuild,
+  otrs-2.0.3.ebuild:
+  Fixed broken DEPEND
+
+*otrs-2.0.3 (23 Oct 2005)
+
+  23 Oct 2005; Renat Lumpau <rl03@gentoo.org> -otrs-2.0.1.ebuild,
+  -otrs-2.0.2.ebuild, +otrs-2.0.3.ebuild:
+  Version bump
+
+*otrs-2.0.2 (24 Aug 2005)
+
+  24 Aug 2005; Renat Lumpau <rl03@gentoo.org> +otrs-2.0.2.ebuild:
+  Version bump
+
+  08 Aug 2005; Renat Lumpau <rl03@gentoo.org> otrs-2.0.1.ebuild:
+  Fixed libapreq2 dependency
+
+  02 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/reconfig-2,
+  files/reconfig:
+  Fixed die()
+
+*otrs-1.3.2 (02 Aug 2005)
+
+  02 Aug 2005; Renat Lumpau <rl03@gentoo.org> -files/reconfig-1.3.1,
+  -files/postinstall-en-1.3.1.txt, +files/postinstall-en.txt,
+  +files/reconfig, -otrs-1.3.1.ebuild, +otrs-1.3.2.ebuild:
+  Version bump, removing old version
+
+*otrs-2.0.1 (02 Aug 2005)
+
+  02 Aug 2005; Renat Lumpau <rl03@gentoo.org> +files/reconfig-2,
+  +files/postinstall-en-2.txt, +files/apache1.patch, +files/apache2.patch,
+  +otrs-2.0.1.ebuild:
+  Version bump
+
+  10 May 2005; Elfyn McBratney <beu@gentoo.org> otrs-1.3.1.ebuild:
+  dev-perl/libapreq{,2} -> www-apache
+
+  23 Oct 2004; Renat Lumpau <rl03@gentoo.org> files/reconfig-1.3.1:
+  Disabled clean part of reconfig, see bug #65850
+
+  26 Sep 2004; Renat Lumpau <rl03@gentoo.org> -files/postinstall-en.txt,
+  -files/reconfig, -otrs-1.2.4.ebuild:
+  Removing old/broken version. Deleting the only ppc-stable ebuild! It was
+  marked stable erroneously (per pvdabeel).
+
+*otrs-1.3.1 (26 Sep 2004)
+
+  26 Sep 2004; Renat Lumpau <rl03@gentoo.org> +files/postinstall-en-1.3.1.txt,
+  +files/reconfig-1.3.1, +otrs-1.3.1.ebuild:
+  Version bump. Closes bug #65217. Reorganized install locations, everything is
+  now contained in ${VHOST_ROOT}
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> otrs-1.2.4.ebuild:
+  Masked otrs-1.2.4.ebuild stable for ppc
+
+  03 Sep 2004; Renat Lumpau <rl03@gentoo.org> files/reconfig:
+  The reconfig hook now cleans up after itself.
+
+  03 Sep 2004; David Holm <dholm@gentoo.org> otrs-1.2.4.ebuild:
+  Added to ~ppc.
 
 *otrs-1.2.4 (26 Aug 2004)
 
diff --git a/www-apps/otrs/Manifest b/www-apps/otrs/Manifest
index 3171ad7a465c..6637f82020b3 100644
--- a/www-apps/otrs/Manifest
+++ b/www-apps/otrs/Manifest
@@ -1,6 +1,12 @@
-MD5 a278fee45630624550b33cf22b1e1ff8 otrs-1.2.4.ebuild 2779
-MD5 2d92f650d8c6cde260908ac3d4e470a7 ChangeLog 306
+MD5 5faccb6694d65e601ca7cd4cf880e97e ChangeLog 2453
 MD5 224c312cc23d02aa06c26a4da3cc1f90 metadata.xml 221
-MD5 0802fdb74ba58ad4bf68831073f5e437 files/postinstall-en.txt 755
-MD5 c85b5ad5614552631d0e4ac09131e6ff files/digest-otrs-1.2.4 67
-MD5 5be5bf8e60743fe9cef39d6c521fbb82 files/reconfig 171
+MD5 c522a90cadf43493cf3a97c5fad53576 otrs-1.3.2.ebuild 2760
+MD5 7db2babd6d39e6b246cb52fcad25eba0 otrs-2.0.3.ebuild 3308
+MD5 17263c3cbe7f693cfdfcceefb18f7970 files/digest-otrs-1.3.2 67
+MD5 342b501154e2bbb0e75b34f1b3c27dea files/reconfig-2 883
+MD5 998679b77f9c18e33503499e586ca1fa files/postinstall-en-2.txt 660
+MD5 342b501154e2bbb0e75b34f1b3c27dea files/reconfig 883
+MD5 fed75d396b333655a8a8e83e64e27062 files/apache1.patch 529
+MD5 f47d2140cdd984fb31b2f468719d94e9 files/apache2.patch 902
+MD5 382162791127449707c542d146d8d025 files/digest-otrs-2.0.3 68
+MD5 3f701ce10ed527c36c342e856a4e43de files/postinstall-en.txt 548
diff --git a/www-apps/otrs/files/postinstall-en.txt b/www-apps/otrs/files/postinstall-en.txt
index e1f3a205e7fc..ebc75e4407bb 100644
--- a/www-apps/otrs/files/postinstall-en.txt
+++ b/www-apps/otrs/files/postinstall-en.txt
@@ -1,20 +1,13 @@
 
-
-***********************************************************
 Your installation is almost complete. 
-1. You now need to edit ${VHOST_ROOT}/Kernel/Config.pm and set some
-Kernel::Config options (FQDN, SystemID, TicketHook, Home, ...). Consult
-Config.pm.dist for a start.
+1. You now need to edit ${VHOST_ROOT}/${PN}-${PVR}/Kernel/Config.pm and set some
+Kernel::Config options (FQDN, SystemID, TicketHook, Home, ...).
 
-***********************************************************
 2. Configure and restart your webserver.
-Read /usr/share/doc/${P}/README.webserver.gz. Sample config files are in
-${VHOST_ROOT}/scripts
-
-***********************************************************
-3. Setup your database. Read /usr/share/doc/${P}/README.database.gz
+Read /usr/share/doc/${PN}-${PVR}/README.webserver.gz. Sample config files are in
+${VHOST_ROOT}/${PN}-${PVR}/scripts
 
-***********************************************************
+3. Setup your database. Read /usr/share/doc/${PN}-${PVR}/README.database.gz
 
-4. Read /usr/share/doc/${P}/INSTALL.gz to finish the installation. Cronjobs are
-in /var/otrs/cron
+4. Read /usr/share/doc/${PN}-${PVR}/INSTALL.gz , pp. 9-12.
+If you are upgrading, read /usr/share/doc/${PN}-${PVR}/UPGRADING.gz
diff --git a/www-apps/otrs/files/reconfig b/www-apps/otrs/files/reconfig
index 6a3319d9b2a6..dea936e42019 100644
--- a/www-apps/otrs/files/reconfig
+++ b/www-apps/otrs/files/reconfig
@@ -1,7 +1,31 @@
 #!/bin/bash
+PF=${PN}-${PVR}
 
-if [ $1 = "start" -o $1 = "install" ]; then
-	sed -i "s|/opt/otrs|${VHOST_ROOT}|" ${VHOST_ROOT}/Kernel/Config.pm.dist ${VHOST_ROOT}/scripts/*
-else
+die() {
+	echo "******"
 	echo $1
+	echo "******"
+	exit 1
+}
+
+if [ $1 = "install" ]; then
+	# edit Apache configs
+	cd ${VHOST_ROOT}/${PF}/scripts
+	sed -e "s|/opt/otrs/var/httpd/htdocs/|${MY_INSTALLDIR}/|g" -i apache-httpd.include.conf apache2-httpd.include.conf || die "sed 1 failed"
+	
+	# set $HOME
+	grep -lR "/opt" * | xargs sed -i "s|/opt/otrs|${VHOST_ROOT}/${PF}|g" || die "sed failed"
+	
+	sed -i "s|/opt/otrs|${VHOST_ROOT}/${PF}|g" ${VHOST_ROOT}/${PF}/Kernel/Config.pm || die "sed failed"
+
+	# set permissions
+	${VHOST_ROOT}/${PF}/bin/SetPermissions.sh  ${VHOST_ROOT}/${PF} otrs apache apache apache > /dev/null || die "Could not set permissions"
+
+
+elif [ $1 = "clean" ]; then
+	echo "Please examine the contents of the following directories"
+	echo "and delete anything that is no longer necessary"
+	echo 
+	echo ${VHOST_ROOT}/${PF}
+	echo ${MY_INSTALLDIR}
 fi
diff --git a/www-apps/otrs/files/reconfig-2 b/www-apps/otrs/files/reconfig-2
index 04a9feef674c..dea936e42019 100644
--- a/www-apps/otrs/files/reconfig-2
+++ b/www-apps/otrs/files/reconfig-2
@@ -5,6 +5,7 @@ die() {
 	echo "******"
 	echo $1
 	echo "******"
+	exit 1
 }
 
 if [ $1 = "install" ]; then
diff --git a/www-apps/otrs/otrs-1.3.2.ebuild b/www-apps/otrs/otrs-1.3.2.ebuild
index cd186bd50bd5..1cec91074e10 100644
--- a/www-apps/otrs/otrs-1.3.2.ebuild
+++ b/www-apps/otrs/otrs-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/www-apps/otrs/otrs-1.3.2.ebuild,v 1.1 2005/08/02 01:59:56 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/otrs-1.3.2.ebuild,v 1.1.1.1 2005/11/30 09:37:05 chriswhite Exp $
 
 inherit webapp eutils
 
@@ -16,7 +16,6 @@ KEYWORDS="~x86 ~ppc"
 
 DEPEND="
 	=dev-lang/perl-5*
-	>=net-www/webapp-config-1.11-r1
 	dev-perl/Date-Pcalc
 	dev-perl/DBI
 	perl-core/CGI
diff --git a/www-apps/otrs/otrs-2.0.3.ebuild b/www-apps/otrs/otrs-2.0.3.ebuild
index cef1ef2e675a..c7153d431929 100644
--- a/www-apps/otrs/otrs-2.0.3.ebuild
+++ b/www-apps/otrs/otrs-2.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/www-apps/otrs/otrs-2.0.3.ebuild,v 1.1 2005/10/23 22:07:59 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/otrs-2.0.3.ebuild,v 1.1.1.1 2005/11/30 09:37:05 chriswhite Exp $
 
 inherit webapp eutils
 
@@ -16,7 +16,6 @@ KEYWORDS="~x86 ~ppc"
 
 DEPEND="
 	=dev-lang/perl-5*
-	>=net-www/webapp-config-1.11-r1
 	dev-perl/Date-Pcalc
 	dev-perl/DBI
 	perl-core/CGI
diff --git a/www-apps/pcgi/ChangeLog b/www-apps/pcgi/ChangeLog
index c11f30e0df6f..2c33e800fafa 100644
--- a/www-apps/pcgi/ChangeLog
+++ b/www-apps/pcgi/ChangeLog
@@ -1,6 +1,18 @@
-# ChangeLog for net-www/pcgi
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/pcgi/ChangeLog,v 1.1 2004/08/15 15:24:42 stuart Exp $
+# ChangeLog for www-apps/pcgi
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/pcgi/ChangeLog,v 1.1.1.1 2005/11/30 09:37:12 chriswhite Exp $
+
+  23 Aug 2005; Renat Lumpau <rl03@gentoo.org> pcgi-2.0_alpha5.ebuild:
+  Fixing cp -a wrt bug #103487
+
+  27 Jun 2005; Stuart Herbert <stuart@gentoo.org> metadata.xml:
+  Fixed herd entry in metadata
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  28 Aug 2004; David Holm <dholm@gentoo.org> pcgi-2.0_alpha5.ebuild:
+  Added to ~ppc.
 
 *pcgi-2.0_alpha5 (15 Aug 2004)
 
diff --git a/www-apps/pcgi/Manifest b/www-apps/pcgi/Manifest
index 040fd2305503..e5fe47518575 100644
--- a/www-apps/pcgi/Manifest
+++ b/www-apps/pcgi/Manifest
@@ -1,4 +1,14 @@
-MD5 28d5132424e436c6fbda7ce2369079f9 ChangeLog 550
-MD5 0c1ffc3eff281366ee07df94a66166e6 metadata.xml 160
-MD5 f188f356a580c65cb5e3eb8bbcd401bd pcgi-2.0_alpha5.ebuild 1591
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 44815bf0122ba159b76e8573a2dfd7ac pcgi-2.0_alpha5.ebuild 1592
+MD5 5fd85a3ce13a29433e5acb0114f31379 ChangeLog 1079
+MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
 MD5 6cdcecf891e772282d2a8a46abcfb09b files/digest-pcgi-2.0_alpha5 137
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDC3qUEzitwsaoONoRAv/cAKCOKPYefT2v0FeCR4CkVaYGzPuEUQCgu+Hi
+npoBwY30feZ+TRD2FRUygag=
+=PPyw
+-----END PGP SIGNATURE-----
diff --git a/www-apps/pcgi/metadata.xml b/www-apps/pcgi/metadata.xml
index 631fc921d87a..95c06f0095bb 100644
--- a/www-apps/pcgi/metadata.xml
+++ b/www-apps/pcgi/metadata.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-www</herd>
+<herd>web-apps</herd>
 </pkgmetadata>
diff --git a/www-apps/pcgi/pcgi-2.0_alpha5.ebuild b/www-apps/pcgi/pcgi-2.0_alpha5.ebuild
index 2820bccda57c..b10c552aa8f6 100644
--- a/www-apps/pcgi/pcgi-2.0_alpha5.ebuild
+++ b/www-apps/pcgi/pcgi-2.0_alpha5.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/www-apps/pcgi/pcgi-2.0_alpha5.ebuild,v 1.1 2004/08/15 15:24:42 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/pcgi/pcgi-2.0_alpha5.ebuild,v 1.1.1.1 2005/11/30 09:37:12 chriswhite Exp $
 
 # this package is ONLY available inside the Zope tarball!!!
 ZOPE_PV=2.6.1
@@ -21,7 +21,7 @@ SRC_URI="http://www.zope.org/Products/Zope/${ZOPE_PV}/${ZOPE_P}.tgz
 		 mirror://gentoo/PCGI-HOWTO-${DOCDATE}.html.bz2"
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 IUSE=""
 DEPEND="${DEPEND}
 		virtual/libc"
@@ -46,5 +46,5 @@ src_install() {
 	dobin Util/killpcgi.py Util/pcgifile.py
 	dobin pcgi_publisher.py
 	newbin Test/parseinfo pcgi-parseinfo
-	cp -ra Example ${D}/usr/share/doc/${PF}/
+	cp -pPR Example ${D}/usr/share/doc/${PF}/
 }
diff --git a/www-apps/phpBB/ChangeLog b/www-apps/phpBB/ChangeLog
index e5e4a47386b0..1220ef93e39d 100644
--- a/www-apps/phpBB/ChangeLog
+++ b/www-apps/phpBB/ChangeLog
@@ -1,6 +1,92 @@
-# ChangeLog for net-www/phpBB
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpBB/ChangeLog,v 1.1 2004/08/15 15:27:23 stuart Exp $
+# ChangeLog for www-apps/phpBB
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpBB/ChangeLog,v 1.1.1.1 2005/11/30 09:37:01 chriswhite Exp $
+
+  31 Oct 2005; Renat Lumpau <rl03@gentoo.org> files/digest-phpBB-2.0.18,
+  Manifest:
+  Recommiting digest as UPSTREAM updated tarball
+
+*phpBB-2.0.18 (31 Oct 2005)
+
+  31 Oct 2005; Renat Lumpau <rl03@gentoo.org>
+  -files/2.0.17-postinstall-en.txt, +files/2.0.18-postinstall-en.txt,
+  -phpBB-2.0.17.ebuild, +phpBB-2.0.18.ebuild:
+  Version bump wrt bug #111000.
+
+  23 Aug 2005; Renat Lumpau <rl03@gentoo.org> phpBB-2.0.17.ebuild:
+  Fixing cp -a wrt bug #103487
+
+*phpBB-2.0.17 (20 Jul 2005)
+
+  20 Jul 2005; Renat Lumpau <rl03@gentoo.org>
+  +files/2.0.17-postinstall-en.txt, -files/2.0.16-postinstall-en.txt,
+  -phpBB-2.0.16.ebuild, +phpBB-2.0.17.ebuild:
+  Version bump wrt bug #98058
+
+  10 Jul 2005; Renat Lumpau <rl03@gentoo.org>
+  +files/2.0.16-postinstall-en.txt, -files/2.0.10-postinstall-en.txt,
+  -files/2.0.11-postinstall-en.txt, -phpBB-2.0.10.ebuild,
+  -phpBB-2.0.11.ebuild, -phpBB-2.0.13.ebuild, -phpBB-2.0.14.ebuild,
+  -phpBB-2.0.15.ebuild, phpBB-2.0.16.ebuild:
+  Removed old versions
+
+  06 Jul 2005; Renat Lumpau <rl03@gentoo.org> phpBB-2.0.16.ebuild:
+  Fixed DEPEND (#57418), permissions (#78126).
+
+*phpBB-2.0.16 (30 Jun 2005)
+
+  30 Jun 2005; Renat Lumpau <rl03@gentoo.org>
+  files/2.0.10-postinstall-en.txt, +phpBB-2.0.16.ebuild:
+  Version bump. Fix #97278.
+
+  12 May 2005; Lars Weiler <pylon@gentoo.org> phpBB-2.0.15.ebuild:
+  Stable on ppc; bug #90213.
+
+*phpBB-2.0.15 (08 May 2005)
+
+  08 May 2005; Aaron Walker <ka0ttic@gentoo.org> +phpBB-2.0.15.ebuild:
+  Version bump for security bug 90213.
+
+  18 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> phpBB-2.0.14.ebuild:
+  Stable on ppc.
+
+*phpBB-2.0.14 (18 Apr 2005)
+
+  18 Apr 2005; Aaron Walker <ka0ttic@gentoo.org> +phpBB-2.0.14.ebuild:
+  Version bump for sec bug 89248.
+
+  01 Mar 2005; Lars Weiler <pylon@gentoo.org> phpBB-2.0.13.ebuild:
+  Stable on ppc wrt bug #82955.
+
+*phpBB-2.0.13 (01 Mar 2005)
+
+  01 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> +phpBB-2.0.13.ebuild:
+  Version bump for security bug 82955.
+
+  24 Nov 2004; Kurt Lieber <klieber@gentoo.org> phpBB-2.0.11.ebuild:
+  mark stable on ppc, fixes 71681
+
+*phpBB-2.0.11 (21 Nov 2004)
+
+  21 Nov 2004; Rob Holland <tigger@gentoo.org>
+  +files/2.0.11-postinstall-en.txt, +phpBB-2.0.11.ebuild:
+  Fix for bug #71681. Fix tested and confirmed by lcars@gentoo.org
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  phpBB-2.0.10.ebuild:
+  Masked phpBB-2.0.10.ebuild stable for ppc
+
+  03 Sep 2004; Renat Lumpau <rl03@gentoo.org> -phpBB-2.0.8a-r1.ebuild:
+  Obsolete version; removed by eversionrm tool
+
+*phpBB-2.0.10 (27 Aug 2004)
+
+  27 Aug 2004; Martin Holzer <mholzer@gentoo.org>
+  +files/2.0.10-postinstall-en.txt, +phpBB-2.0.10.ebuild:
+  Version bumped. This is a Security release. See 56915
 
 *phpBB-2.0.6-r2 (15 Aug 2004)
 
diff --git a/www-apps/phpBB/Manifest b/www-apps/phpBB/Manifest
index c8e7fdb58879..bc1c8f6ea1a1 100644
--- a/www-apps/phpBB/Manifest
+++ b/www-apps/phpBB/Manifest
@@ -1,12 +1,15 @@
-MD5 027f5c27500ac5e0d1995b99edfebb88 phpBB-2.0.6-r2.ebuild 1253
-MD5 19f06d9922ace0164de775f71ddf2ee7 phpBB-2.0.8a-r1.ebuild 901
-MD5 af2de1970bde51c2e2c7af4bc2e70185 phpBB-2.0.6-r1.ebuild 1331
-MD5 638e20ef55fddb8f71886ca123a6e2b3 ChangeLog 1882
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8cba4a2906ee52e5de6e654cac5ef9fd phpBB-2.0.18.ebuild 1193
+MD5 5e1f72f4a89a25bdf1dd13da4e1f20be ChangeLog 4989
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
-MD5 eb9819c0b566913da73847f98d14d454 phpBB-2.0.8a.ebuild 1251
-MD5 2bcc15b387e45c0342ace8fe007ada43 files/digest-phpBB-2.0.6-r1 64
-MD5 81edef11555fd2672d5ccc894ce8b711 files/digest-phpBB-2.0.6-r2 64
-MD5 a2ffb1296c4ce58eee7df10b2ccaaebc files/2.0.8-postinstall-en.txt 116
-MD5 a5490792af02884bb7bfd22efa001697 files/digest-phpBB-2.0.8a-r1 65
-MD5 a5490792af02884bb7bfd22efa001697 files/digest-phpBB-2.0.8a 65
-MD5 baf12ebb39a1b14b5b0bf0fa9320eba8 files/phpBB-2.0.6-security.patch 248
+MD5 dd68afc68ca33831cd3745ca3c4a6945 files/digest-phpBB-2.0.18 65
+MD5 4fe81911988e4ff8a93ff3011f026315 files/2.0.18-postinstall-en.txt 197
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDZmrPEzitwsaoONoRAl6QAJ9SuHnmD15KzIsXJLCtSzh8bDvg7gCeLCuS
+HZDA7awdV7ZKMzjJQm+OzEs=
+=cV2a
+-----END PGP SIGNATURE-----
diff --git a/www-apps/phpBB/files/digest-phpBB-2.0.18 b/www-apps/phpBB/files/digest-phpBB-2.0.18
index 1f82e6202591..b983b7b9df15 100644
--- a/www-apps/phpBB/files/digest-phpBB-2.0.18
+++ b/www-apps/phpBB/files/digest-phpBB-2.0.18
@@ -1 +1 @@
-MD5 3dcdcf1ff90c96f81db96d9b8f543bb1 phpBB-2.0.18.tar.bz2 448808
+MD5 2d3c71574ea8d3ef0afbcf4aec63947a phpBB-2.0.18.tar.bz2 448983
diff --git a/www-apps/phpBB/phpBB-2.0.18.ebuild b/www-apps/phpBB/phpBB-2.0.18.ebuild
index 59357a5d57e6..6d1f4b700769 100644
--- a/www-apps/phpBB/phpBB-2.0.18.ebuild
+++ b/www-apps/phpBB/phpBB-2.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/www-apps/phpBB/phpBB-2.0.18.ebuild,v 1.1 2005/10/31 13:55:00 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpBB/phpBB-2.0.18.ebuild,v 1.1.1.1 2005/11/30 09:37:02 chriswhite Exp $
 
 inherit webapp
 
diff --git a/www-apps/phpcollab/ChangeLog b/www-apps/phpcollab/ChangeLog
index eba13b71f71e..85d720faa839 100644
--- a/www-apps/phpcollab/ChangeLog
+++ b/www-apps/phpcollab/ChangeLog
@@ -1,6 +1,28 @@
 # ChangeLog for www-apps/phpcollab
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpcollab/ChangeLog,v 1.1 2004/08/30 15:05:57 rl03 Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpcollab/ChangeLog,v 1.1.1.1 2005/11/30 09:37:07 chriswhite Exp $
+
+  11 Sep 2005; Renat Lumpau <rl03@gentoo.org> phpcollab-2.4.ebuild:
+  Fixed php deps wrt bug #105419.
+
+  22 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt:
+  Housekeeping
+
+*phpcollab-2.5_rc3 (22 Aug 2005)
+
+  22 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  +phpcollab-2.5_rc3.ebuild:
+  Version bump
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  phpcollab-2.4.ebuild:
+  Masked phpcollab-2.4.ebuild stable for ppc
+
+  03 Sep 2004; David Holm <dholm@gentoo.org> phpcollab-2.4.ebuild:
+  Added to ~ppc.
+
+  30 Aug 2004; Renat Lumpau <rl03@gentoo.org> phpcollab-2.4.ebuild:
+  Fixed DEPEND/RDEPEND
 
 *phpcollab-2.4 (30 Aug 2004)
 
diff --git a/www-apps/phpcollab/Manifest b/www-apps/phpcollab/Manifest
index 689121ba32e5..7cf4837ffcf3 100644
--- a/www-apps/phpcollab/Manifest
+++ b/www-apps/phpcollab/Manifest
@@ -1,5 +1,17 @@
-MD5 32c1cea915d3184b9dd208dc749c625b phpcollab-2.4.ebuild 1029
-MD5 70ab2ad88d2526d2c6c11fdd932622b6 ChangeLog 360
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9a51a46203c02d82350e7b845a8682c6 phpcollab-2.4.ebuild 1097
+MD5 edb8b84420e91755c660582a1b952b55 phpcollab-2.5_rc3.ebuild 1079
+MD5 d6efebfa0a8dcfc79f958e93bd748840 ChangeLog 1096
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
 MD5 47743bac09ee0035d6f56132dcd9b002 files/digest-phpcollab-2.4 65
-MD5 15a59a00b52171c81091d95bc6665c3f files/postinstall-en.txt 233
+MD5 a14e5f4b4c49b22f13b279b10f8e34db files/digest-phpcollab-2.5_rc3 70
+MD5 414b693f91f8cd4ce1e159bf103df39c files/postinstall-en.txt 316
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDJDhyEzitwsaoONoRAto2AKCiOM1/mabD7Vp76NlUbiRgkYffWACfaZU/
+5lcdqpYsQEhcPxyOY7xlN0Q=
+=61/x
+-----END PGP SIGNATURE-----
diff --git a/www-apps/phpcollab/files/postinstall-en.txt b/www-apps/phpcollab/files/postinstall-en.txt
index b0167997b2ab..5fe5873ffa5a 100644
--- a/www-apps/phpcollab/files/postinstall-en.txt
+++ b/www-apps/phpcollab/files/postinstall-en.txt
@@ -1,7 +1,8 @@
 You will need to create a new database. Consult your user manual.
 
-Browse to installation/setup.php
+Browse to http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/installation/setup.php
 
-When you are done, delete installation/setup.php, and login at index.php
+When you are done, delete installation/setup.php, and login at 
+http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/index.php
 
 Edit includes/settings.php to fine-tune the installation.
diff --git a/www-apps/phpcollab/phpcollab-2.4.ebuild b/www-apps/phpcollab/phpcollab-2.4.ebuild
index cdc2f85fdd79..360c0d2cb372 100644
--- a/www-apps/phpcollab/phpcollab-2.4.ebuild
+++ b/www-apps/phpcollab/phpcollab-2.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/www-apps/phpcollab/phpcollab-2.4.ebuild,v 1.1 2004/08/30 15:05:57 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpcollab/phpcollab-2.4.ebuild,v 1.1.1.1 2005/11/30 09:37:07 chriswhite Exp $
 
 inherit webapp
 
@@ -12,14 +12,12 @@ DESCRIPTION="phpCollab is an open-source internet-enabled collaboration workspac
 HOMEPAGE="http://php-collab.com/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-KEYWORDS="~x86"
+KEYWORDS="~x86 ppc"
 
-DEPEND="$DEPEND"
 RDEPEND="
-	${DEPEND}
 	>=net-www/apache-1.3
 	|| ( >=dev-db/mysql-3.23 >=dev-db/postgresql-7 )
-	>=dev-php/mod_php-4.2.0
+	virtual/httpd-php
 "
 
 LICENSE="GPL-2"
diff --git a/www-apps/phpcollab/phpcollab-2.5_rc3.ebuild b/www-apps/phpcollab/phpcollab-2.5_rc3.ebuild
index 2eea56b055dd..9ae52915fd90 100644
--- a/www-apps/phpcollab/phpcollab-2.5_rc3.ebuild
+++ b/www-apps/phpcollab/phpcollab-2.5_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/www-apps/phpcollab/phpcollab-2.5_rc3.ebuild,v 1.1 2005/08/22 21:06:25 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpcollab/phpcollab-2.5_rc3.ebuild,v 1.1.1.1 2005/11/30 09:37:07 chriswhite Exp $
 
 inherit webapp
 
diff --git a/www-apps/phpgroupware/ChangeLog b/www-apps/phpgroupware/ChangeLog
index 21f6dd09e113..317afaf1b485 100644
--- a/www-apps/phpgroupware/ChangeLog
+++ b/www-apps/phpgroupware/ChangeLog
@@ -1,6 +1,119 @@
-# ChangeLog for dev-php/phpgroupware
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpgroupware/ChangeLog,v 1.1 2004/08/19 09:44:54 rl03 Exp $
+# ChangeLog for www-apps/phpgroupware
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpgroupware/ChangeLog,v 1.1.1.1 2005/11/30 09:37:01 chriswhite Exp $
+
+  16 Sep 2005; Aron Griffis <agriffis@gentoo.org>
+  phpgroupware-0.9.16.008.ebuild:
+  Mark 0.9.16.008 stable on alpha
+
+  28 Aug 2005; Renat Lumpau <rl03@gentoo.org>
+  -phpgroupware-0.9.16.006.ebuild, -phpgroupware-0.9.16.007.ebuild:
+  Removing vulnerable versions
+
+  28 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  phpgroupware-0.9.16.008.ebuild:
+  Stable on ppc.
+
+  28 Aug 2005; Luis Medinas <metalgod@gentoo.org>
+  phpgroupware-0.9.16.008.ebuild:
+  Marked Stable on AMD64. Fixes bug #102379.
+
+*phpgroupware-0.9.16.008 (27 Aug 2005)
+
+  27 Aug 2005; Renat Lumpau <rl03@gentoo.org>
+  +phpgroupware-0.9.16.008.ebuild:
+  Version bump wrt security bug #102379
+
+*phpgroupware-0.9.16.007 (24 Aug 2005)
+
+  24 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  +phpgroupware-0.9.16.007.ebuild:
+  Version bump wrt security bug #102379
+
+  22 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt:
+  Housekeeping
+
+  22 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  phpgroupware-0.9.16.006.ebuild:
+  Housekeeping
+
+  06 Jul 2005; Simon Stelling <blubb@gentoo.org>
+  -phpgroupware-0.9.16.004.ebuild, -phpgroupware-0.9.16.005.ebuild:
+  removing old versions per comment #7 in bug 97460
+
+  06 Jul 2005; Simon Stelling <blubb@gentoo.org>
+  phpgroupware-0.9.16.006.ebuild:
+  marked stable on amd64 wrt bug 97460
+
+  06 Jul 2005; Michael Hanselmann <hansmi@gentoo.org>
+  phpgroupware-0.9.16.006.ebuild:
+  Stable on ppc.
+
+*phpgroupware-0.9.16.006 (06 Jul 2005)
+
+  06 Jul 2005; Aaron Walker <ka0ttic@gentoo.org>
+  -phpgroupware-0.9.16.003.ebuild, +phpgroupware-0.9.16.006.ebuild:
+  Version bump for security bug 97460.
+
+  06 Jan 2005; Lars Weiler <pylon@gentoo.org>
+  phpgroupware-0.9.16.004.ebuild:
+  Stable on ppc, bug #74487.
+
+  05 Jan 2005; Simon Stelling <blubb@gentoo.org>
+  phpgroupware-0.9.16.005.ebuild:
+  stable on amd64; bug #74487
+
+*phpgroupware-0.9.16.005 (04 Jan 2005)
+
+  04 Jan 2005; Martin Holzer <mholzer@gentoo.org>
+  +phpgroupware-0.9.16.005.ebuild:
+  Version bumped.
+
+*phpgroupware-0.9.16.004 (02 Jan 2005)
+
+  02 Jan 2005; Martin Holzer <mholzer@gentoo.org>
+  +phpgroupware-0.9.16.004.ebuild:
+  Version bumped. Security bump. See 74487
+
+  15 Sep 2004; Danny van Dyk <kugelfang@gentoo.org>
+  phpgroupware-0.9.16.003.ebuild:
+  Marked stable on amd64.
+
+*phpgroupware-0.9.16.003 (08 Sep 2004)
+
+  08 Sep 2004; Renat Lumpau <rl03@gentoo.org> +phpgroupware-0.9.16.003.ebuild:
+  Version bump, see bug #63063.
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  phpgroupware-0.9.16.000.ebuild, phpgroupware-0.9.16.001.ebuild,
+  phpgroupware-0.9.16.002-r1.ebuild, phpgroupware-0.9.16.002.ebuild:
+  Masked phpgroupware-0.9.16.002.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  phpgroupware-0.9.16.000.ebuild, phpgroupware-0.9.16.001.ebuild,
+  phpgroupware-0.9.16.002-r1.ebuild:
+  Masked phpgroupware-0.9.16.002-r1.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  phpgroupware-0.9.16.000.ebuild, phpgroupware-0.9.16.001.ebuild:
+  Masked phpgroupware-0.9.16.001.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  phpgroupware-0.9.16.000.ebuild:
+  Masked phpgroupware-0.9.16.000.ebuild stable for ppc
+
+  30 Aug 2004; Renat Lumpau <rl03@gentoo.org>
+  phpgroupware-0.9.16.002-r1.ebuild:
+  Fixed DEPEND/RDEPEND, removed unneeded src_compile
+
+*phpgroupware-0.9.16.002-r1 (19 Aug 2004)
+
+  19 Aug 2004; Renat Lumpau <rl03@gentoo.org> +files/postinstall-en.txt,
+  +phpgroupware-0.9.16.002-r1.ebuild:
+  Updated for webapp.eclass (bug #58376)
 
 *phpgroupware-0.9.16.002 (19 Aug 2004)
 
diff --git a/www-apps/phpgroupware/Manifest b/www-apps/phpgroupware/Manifest
index a806e23d8baa..a59f4fb71aac 100644
--- a/www-apps/phpgroupware/Manifest
+++ b/www-apps/phpgroupware/Manifest
@@ -1,8 +1,5 @@
-MD5 664a331cd05c51e1d6ecef89bc65cde5 ChangeLog 3423
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
-MD5 372a2ced88e621c1de16940f951fa1f0 phpgroupware-0.9.16.001.ebuild 1569
-MD5 868acd2e93fdfde59f34f64b199e5439 phpgroupware-0.9.16.000.ebuild 1570
-MD5 0afcf4d745cd7af9234139c8d8893eb2 phpgroupware-0.9.16.002.ebuild 1569
-MD5 476589363905ff689b142486cc9e534c files/digest-phpgroupware-0.9.16.001 78
-MD5 922ab954a67c17f0e1a566626098243a files/digest-phpgroupware-0.9.16.000 80
-MD5 2d079648289561daf7733bb66d312958 files/digest-phpgroupware-0.9.16.002 78
+MD5 8c7649f1b272f5d8f1e89ea59e4493e5 ChangeLog 7363
+MD5 00c7199de7a715a29c1dd8d8be3f8916 phpgroupware-0.9.16.008.ebuild 928
+MD5 c988a13ce426404f0b11eaa182952e18 files/digest-phpgroupware-0.9.16.008 78
+MD5 115b6294bccf539e44a4edf4408fcd04 files/postinstall-en.txt 248
diff --git a/www-apps/phpgroupware/files/postinstall-en.txt b/www-apps/phpgroupware/files/postinstall-en.txt
index 03a8c5a3bc5c..68de45f6c1fb 100644
--- a/www-apps/phpgroupware/files/postinstall-en.txt
+++ b/www-apps/phpgroupware/files/postinstall-en.txt
@@ -1,9 +1,8 @@
-
-You are almost done! 
+You are almost done!
 
 1. Restart your webserver and your database daemon.
 
-2. Point your browser to the URL http://<your_server_address>/phpgroupware
+2. Point your browser to the URL http://${VHOST_HOSTNAME}/${VHOST_APPDIR}
 and follow the install script.
 
 Don't forget to read the installation manual!
diff --git a/www-apps/phpgroupware/phpgroupware-0.9.16.008.ebuild b/www-apps/phpgroupware/phpgroupware-0.9.16.008.ebuild
index 9f976416653f..907c5213930c 100644
--- a/www-apps/phpgroupware/phpgroupware-0.9.16.008.ebuild
+++ b/www-apps/phpgroupware/phpgroupware-0.9.16.008.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpgroupware/phpgroupware-0.9.16.008.ebuild,v 1.1 2005/08/27 13:22:01 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpgroupware/phpgroupware-0.9.16.008.ebuild,v 1.1.1.1 2005/11/30 09:37:01 chriswhite Exp $
 
 inherit webapp
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.phpgroupware.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 IUSE=""
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 ~hppa ppc ~sparc ~x86"
 
 RDEPEND="virtual/httpd-php"
 
diff --git a/www-apps/phpmp/ChangeLog b/www-apps/phpmp/ChangeLog
index bb8f6fbfb4f6..f21abc627f6b 100644
--- a/www-apps/phpmp/ChangeLog
+++ b/www-apps/phpmp/ChangeLog
@@ -1,6 +1,18 @@
-# ChangeLog for net-www/phpmp
+# ChangeLog for www-apps/phpmp
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpmp/ChangeLog,v 1.1 2004/08/15 15:30:12 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpmp/ChangeLog,v 1.1.1.1 2005/11/30 09:36:56 chriswhite Exp $
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> phpmp-0.11.0.ebuild:
+  Stable amd64, sparc.
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  23 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> phpmp-0.11.0.ebuild:
+  Stable on alpha.
 
 *phpmp-0.10.2 (15 Aug 2004)
 
@@ -8,7 +20,7 @@
   +files/postinstall-en.txt, +phpmp-0.10.2.ebuild, +phpmp-0.11.0.ebuild:
   Moved from net-www/phpmp to www-apps/phpmp.
 
-  19 Jul 2004; Bryan �stergaard <kloeri@gentoo.org> phpmp-0.10.2.ebuild:
+  19 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> phpmp-0.10.2.ebuild:
   Stable on alpha.
 
   13 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> phpmp-0.11.0.ebuild:
@@ -22,7 +34,7 @@
   26 Jun 2004; Martin Holzer <mholzer@gentoo.org> phpmp-0.11.0.ebuild:
   Version bumped.
 
-  11 Jun 2004; Bryan �stergaard <kloeri@gentoo.org> phpmp-0.10.1-r1.ebuild:
+  11 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> phpmp-0.10.1-r1.ebuild:
   Stable on alpha.
 
 *phpmp-0.10.2 (23 May 2004)
diff --git a/www-apps/phpmp/Manifest b/www-apps/phpmp/Manifest
index 162cb0e16384..ef6dec7d80bf 100644
--- a/www-apps/phpmp/Manifest
+++ b/www-apps/phpmp/Manifest
@@ -1,7 +1,5 @@
-MD5 7e2318f401e1a4f5e12791fbcc785717 phpmp-0.11.0.ebuild 870
-MD5 6f95a6ecfd4b0cf2c3ec94aa57dd6105 phpmp-0.10.2.ebuild 861
+MD5 c9e2f57d6c04f51b75f34a1d6050dfda ChangeLog 3305
+MD5 99175a23f70aa006bc5f96d509f13199 phpmp-0.11.0.ebuild 871
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 d8fab6b7bd0027577b19a38710b53372 ChangeLog 2707
-MD5 cb8c8eab91c017d8a28491c9517f06d0 files/digest-phpmp-0.10.2 63
 MD5 e3fadc42d755dce00fb495211e7610a0 files/postinstall-en.txt 33
 MD5 b7c452bf3b231224b715c2b37a083238 files/digest-phpmp-0.11.0 63
diff --git a/www-apps/phpmp/phpmp-0.11.0.ebuild b/www-apps/phpmp/phpmp-0.11.0.ebuild
index bb5dade6740f..8b4e4610f1c4 100644
--- a/www-apps/phpmp/phpmp-0.11.0.ebuild
+++ b/www-apps/phpmp/phpmp-0.11.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/www-apps/phpmp/phpmp-0.11.0.ebuild,v 1.1 2004/08/15 15:30:12 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpmp/phpmp-0.11.0.ebuild,v 1.1.1.1 2005/11/30 09:36:56 chriswhite Exp $
 
 IUSE=""
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.musicpd.org/"
 SRC_URI="mirror://sourceforge/musicpd/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc ~alpha ~amd64"
+KEYWORDS="x86 ~ppc sparc alpha amd64"
 
 DEPEND=">=dev-php/mod_php-4.2.3-r2"
 
diff --git a/www-apps/phprojekt/ChangeLog b/www-apps/phprojekt/ChangeLog
index cad9929b96c6..7db4719b743f 100644
--- a/www-apps/phprojekt/ChangeLog
+++ b/www-apps/phprojekt/ChangeLog
@@ -1,6 +1,84 @@
-# ChangeLog for app-office/phprojekt
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phprojekt/ChangeLog,v 1.1 2004/08/19 19:04:51 rl03 Exp $
+# ChangeLog for www-apps/phprojekt
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phprojekt/ChangeLog,v 1.1.1.1 2005/11/30 09:37:09 chriswhite Exp $
+
+  31 Oct 2005; Renat Lumpau <rl03@gentoo.org> phprojekt-5.0.1.ebuild:
+  Fixed SRC_URI
+
+  25 Oct 2005; Renat Lumpau <rl03@gentoo.org> phprojekt-5.0.1.ebuild:
+  Fixed bug #110415.
+
+*phprojekt-5.0.1 (23 Oct 2005)
+
+  23 Oct 2005; Renat Lumpau <rl03@gentoo.org> -phprojekt-5.0.ebuild,
+  +phprojekt-5.0.1.ebuild:
+  Version bump.
+
+*phprojekt-5.0 (22 Aug 2005)
+
+  22 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  +phprojekt-5.0.ebuild:
+  Housekeeping
+
+  22 Aug 2005; Renat Lumpau <rl03@gentoo.org> -phprojekt-3.2a.ebuild,
+  -phprojekt-4.0-r1.ebuild, -phprojekt-4.1.ebuild, -phprojekt-4.2.ebuild,
+  -phprojekt-4.2-r1.ebuild, -phprojekt-4.2-r2.ebuild:
+  Cleaning old versions
+
+  30 May 2005; Michael Hanselmann <hansmi@gentoo.org>
+  phprojekt-4.2.3.ebuild:
+  Stable on ppc.
+
+*phprojekt-4.2.3 (29 May 2005)
+
+  29 May 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/phprojekt-4.2.3-fix-chat-vuln.diff, +phprojekt-4.2.3.ebuild:
+  Version bump; added patch to fix chat script insertion vuln for sec bug 89950.
+
+  17 Feb 2005; Robin H. Johnson <robbat2@gentoo.org>
+  phprojekt-4.2-r1.ebuild, phprojekt-4.2-r2.ebuild:
+  Bug #69831: Ensure unzip is in DEPEND.
+
+  29 Dec 2004; Stuart Herbert <stuart@gentoo.org> :
+  Security fix; see bug #75858
+
+  08 Dec 2004; Olivier Crete <tester@gentoo.org> phprojekt-4.2-r1.ebuild:
+  Stable on x86 wrt security bug 73021
+
+  08 Dec 2004; <SeJo@gentoo.org> phprojekt-4.2-r1.ebuild:
+  stable on ppc gsla: 73021
+
+*phprojekt-4.2-r1 (07 Dec 2004)
+
+  07 Dec 2004; Stuart Herbert <stuart@gentoo.org> +phprojekt-4.2-r1.ebuild:
+  Added replacement setup.php; fixes bug #73021
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  phprojekt-4.0-r1.ebuild, phprojekt-4.1.ebuild, phprojekt-4.2.ebuild:
+  Masked phprojekt-4.2.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  phprojekt-4.0-r1.ebuild, phprojekt-4.1.ebuild:
+  Masked phprojekt-4.1.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  phprojekt-4.0-r1.ebuild:
+  Masked phprojekt-4.0-r1.ebuild stable for ppc
+
+  30 Aug 2004; Renat Lumpau <rl03@gentoo.org> phprojekt-4.2.ebuild:
+  Fixed DEPEND/RDEPEND, removed unneeded src_compile
+
+  25 Aug 2004; Renat Lumpau <rl03@gentoo.org> phprojekt-4.2.ebuild:
+  Fixed sleep and pkg_compile insanity.
+
+*phprojekt-4.2 (19 Aug 2004)
+
+  19 Aug 2004; Renat Lumpau <rl03@gentoo.org> +files/postinstall-en.txt,
+  +phprojekt-4.2.ebuild:
+  Version bump (bug #56134). Updated for webapp.eclass (bug #52131).
 
 *phprojekt-3.2a (19 Aug 2004)
 
diff --git a/www-apps/phprojekt/Manifest b/www-apps/phprojekt/Manifest
index b43f4b6f87aa..20830d6d9f15 100644
--- a/www-apps/phprojekt/Manifest
+++ b/www-apps/phprojekt/Manifest
@@ -1,8 +1,18 @@
-MD5 69d3dfb2e4a8a56fc1e7ff72f07bc423 phprojekt-4.1.ebuild 839
-MD5 d6fe105537a0635b7f8f758379c5053c phprojekt-3.2a.ebuild 858
-MD5 c9fe79dbe42a4561e6f93100940657a9 ChangeLog 1181
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 332d16aeecf5bd51cce3ef777836bb4b phprojekt-5.0.1.ebuild 946
+MD5 a330d108aba1ec4937addc23fa5aac89 phprojekt-4.2.3.ebuild 1176
+MD5 fe97d5763d23068f4c94e21c00e21571 ChangeLog 3982
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
-MD5 f4e33aa0e30be7ab90a600cafbfb0920 phprojekt-4.0-r1.ebuild 843
-MD5 a5312d2a7dbb70b1d0416e37c9fd82d8 files/digest-phprojekt-3.2a 61
-MD5 a4fc4523f14a2ad77b9d00dd7e386b88 files/digest-phprojekt-4.0-r1 65
-MD5 6d1069d70f3ff3b4f87db9ca117da41d files/digest-phprojekt-4.1 65
+MD5 ea1a78c6499e50ff18624b82294686d6 files/postinstall-en.txt 612
+MD5 6eaeb910f5378708b62665ecdaaf8be2 files/phprojekt-4.2.3-fix-chat-vuln.diff 773
+MD5 0a2c5111e69c0d6f6c3299c5d892f427 files/digest-phprojekt-4.2.3 170
+MD5 195b337dbdc69faa7a462ef7bae29418 files/digest-phprojekt-5.0.1 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDZiUgEzitwsaoONoRAsLiAJ9mvko1+0r84WqslxKJtahwhqGRqgCgk+qI
+SyeRFADDaLplojQWogGcHyo=
+=QCiQ
+-----END PGP SIGNATURE-----
diff --git a/www-apps/phprojekt/files/postinstall-en.txt b/www-apps/phprojekt/files/postinstall-en.txt
index 4233d46281f5..a9f49cad14e7 100644
--- a/www-apps/phprojekt/files/postinstall-en.txt
+++ b/www-apps/phprojekt/files/postinstall-en.txt
@@ -1,20 +1,19 @@
 You are almost done!
 
-
   1. Restart your webserver
 
   2. You will need to create a blank database for phprojekt to use. Consult
   your database manual.
 
-  3. If this is a new install, you will need to 
+  3. If this is a new install, you will need to
   touch ${MY_INSTALLDIR}/config.inc.php
   chown ${VHOST_SERVER_GID}:${VHOST_SERVER_UID} ${MY_INSTALLDIR}/config.inc.php
 
-  4. It's a good idea to check your configuration by running 
-  http://YOURHOST/env_test.php
+  4. It's a good idea to check your configuration by running
+  http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/env_test.php
   Examine its output and fix whatever problems you encounter.
 
-  5. Complete the installation by logging on to 
-  http://YOURHOST/setup.php
+  5. Complete the installation by logging on to
+  http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/setup.php
 
   Enjoy!
diff --git a/www-apps/phprojekt/phprojekt-4.2.3.ebuild b/www-apps/phprojekt/phprojekt-4.2.3.ebuild
index b0644a9c9690..411103eb345e 100644
--- a/www-apps/phprojekt/phprojekt-4.2.3.ebuild
+++ b/www-apps/phprojekt/phprojekt-4.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/www-apps/phprojekt/phprojekt-4.2.3.ebuild,v 1.1 2005/05/30 05:18:55 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phprojekt/phprojekt-4.2.3.ebuild,v 1.1.1.1 2005/11/30 09:37:09 chriswhite Exp $
 
 inherit webapp eutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz
 	http://phprojekt.com/files/4.2/lib.zip"
 
 LICENSE="GPL-2"
-KEYWORDS="~ppc x86"
+KEYWORDS="ppc x86"
 IUSE="postgres mysql"
 
 RDEPEND="net-www/apache
diff --git a/www-apps/phprojekt/phprojekt-5.0.1.ebuild b/www-apps/phprojekt/phprojekt-5.0.1.ebuild
index fb9fd906b873..fb4e0806a971 100644
--- a/www-apps/phprojekt/phprojekt-5.0.1.ebuild
+++ b/www-apps/phprojekt/phprojekt-5.0.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/www-apps/phprojekt/phprojekt-5.0.1.ebuild,v 1.1 2005/10/23 19:38:38 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phprojekt/phprojekt-5.0.1.ebuild,v 1.1.1.1 2005/11/30 09:37:09 chriswhite Exp $
 
 inherit webapp
 
 DESCRIPTION="Project management and coordination system"
 HOMEPAGE="http://www.phprojekt.com/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
+SRC_URI="http://phprojekt.com/releases/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS="~ppc ~x86"
@@ -29,7 +29,7 @@ src_install() {
 	local file
 
 	cp -R . ${D}/${MY_HTDOCSDIR}
-	for file in attach chat upload; do
+	for file in attach chat; do
 		webapp_serverowned ${MY_HTDOCSDIR}/${file}
 	done
 	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
diff --git a/www-apps/phpwebsite/ChangeLog b/www-apps/phpwebsite/ChangeLog
index 5528d31ec36b..ad754ae0b725 100644
--- a/www-apps/phpwebsite/ChangeLog
+++ b/www-apps/phpwebsite/ChangeLog
@@ -1,6 +1,214 @@
-# ChangeLog for net-www/phpwebsite
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwebsite/ChangeLog,v 1.1 2004/08/15 15:32:57 stuart Exp $
+# ChangeLog for www-apps/phpwebsite
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwebsite/ChangeLog,v 1.1.1.1 2005/11/30 09:37:08 chriswhite Exp $
+
+  20 Nov 2005; Stuart Herbert <stuart@gentoo.org>
+  phpwebsite-0.10.2_rc2.ebuild:
+  Removed explicit DEPEND on webapp-config; this is handled by the webapp eclass
+
+  31 Aug 2005; Renat Lumpau <rl03@gentoo.org> -phpwebsite-0.10.2_rc1.ebuild:
+  Removing vulnerable versions
+
+  30 Aug 2005; Jose Luis Rivero <yoswink@gentoo.org>
+  phpwebsite-0.10.2_rc2.ebuild:
+  Stable on alpha due to security bug #102785
+
+  26 Aug 2005; Renat Lumpau <rl03@gentoo.org> phpwebsite-0.10.2_rc2.ebuild:
+  Stable on x86 wrt security bug #102785
+
+  25 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  phpwebsite-0.10.2_rc2.ebuild:
+  Stable on ppc.
+
+  25 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  phpwebsite-0.10.2_rc2.ebuild:
+  Stable on sparc wrt #102785
+
+  25 Aug 2005; Renat Lumpau <rl03@gentoo.org>
+  -files/phpwebsite-0.10.1-xml-rpc.diff, -phpwebsite-0.10.1-r1.ebuild:
+  Cleaning old versions
+
+*phpwebsite-0.10.2_rc2 (25 Aug 2005)
+
+  25 Aug 2005; Renat Lumpau <rl03@gentoo.org> +phpwebsite-0.10.2_rc2.ebuild:
+  Version bump wrt security bug #102785.
+
+  22 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt:
+  Housekeeping
+
+  22 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt:
+  Housekeeping
+
+  20 Aug 2005; Jose Luis Rivero <yoswink@gentoo.org>
+  phpwebsite-0.10.2_rc1.ebuild:
+  Stable on alpha wrt security bug #102785
+
+  19 Aug 2005; Renat Lumpau <rl03@gentoo.org> phpwebsite-0.10.2_rc1.ebuild:
+  stable on x86 wrt security bug #102785.
+
+  18 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  phpwebsite-0.10.2_rc1.ebuild:
+  Stable on ppc.
+
+  18 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  phpwebsite-0.10.2_rc1.ebuild:
+  Stable on sparc wrt #102785
+
+*phpwebsite-0.10.2_rc1 (17 Aug 2005)
+
+  17 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  +phpwebsite-0.10.2_rc1.ebuild:
+  Version bump wrt security bug #102785.
+
+  10 Jul 2005; Renat Lumpau <rl03@gentoo.org>
+  -files/phpwebsite-0.10.0-xml-rpc.diff,
+  +files/phpwebsite-0.10.1-xml-rpc.diff, -phpwebsite-0.9.3_p4-r1.ebuild,
+  -phpwebsite-0.9.3_p4-r2.ebuild, -phpwebsite-0.10.0.ebuild,
+  -phpwebsite-0.10.0-r1.ebuild, -phpwebsite-0.10.0-r2.ebuild,
+  -phpwebsite-0.10.0-r3.ebuild, phpwebsite-0.10.1-r1.ebuild:
+  Removed old versions
+
+  09 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  phpwebsite-0.10.1-r1.ebuild:
+  Stable on alpha, bug 97461.
+
+  09 Jul 2005; Aaron Walker <ka0ttic@gentoo.org> files/postinstall-en.txt:
+  Update postinstall-en.txt with upgrade information from upstream's upgrade doc.
+
+  09 Jul 2005; Jason Wever <weeve@gentoo.org> phpwebsite-0.10.1-r1.ebuild:
+  Stable on SPARC wrt security bug #97461.
+
+  08 Jul 2005; Renat Lumpau <rl03@gentoo.org> phpwebsite-0.10.1-r1.ebuild:
+  Stable on x86
+
+*phpwebsite-0.10.1-r1 (08 Jul 2005)
+
+  08 Jul 2005; Renat Lumpau <rl03@gentoo.org> -phpwebsite-0.10.1.ebuild,
+  +phpwebsite-0.10.1-r1.ebuild:
+  revbumped
+
+  08 Jul 2005; Renat Lumpau <rl03@gentoo.org> phpwebsite-0.10.1.ebuild:
+  Updated security patch wrt #97461
+
+  07 Jul 2005; Renat Lumpau <rl03@gentoo.org> phpwebsite-0.10.1.ebuild:
+  Fix patch location
+
+  06 Jul 2005; Michael Hanselmann <hansmi@gentoo.org>
+  phpwebsite-0.10.1.ebuild:
+  Stable on ppc.
+
+*phpwebsite-0.10.1 (06 Jul 2005)
+
+  06 Jul 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  +phpwebsite-0.10.1.ebuild:
+  Version bump.
+
+*phpwebsite-0.10.0-r3 (06 Jul 2005)
+
+  06 Jul 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/phpwebsite-0.10.0-xml-rpc.diff, +phpwebsite-0.10.0-r3.ebuild:
+  Revision bump for security bug 97461.
+
+  01 Mar 2005; Bryan Østergaard <kloeri@gentoo.org>
+  phpwebsite-0.10.0-r2.ebuild:
+  Stable on alpha.
+
+  01 Mar 2005; Don Seiler <rizzo@gentoo.org> phpwebsite-0.10.0-r2.ebuild:
+  stable on x86
+
+  28 Feb 2005; Jason Wever <weeve@gentoo.org> phpwebsite-0.10.0-r2.ebuild:
+  Stable on sparc wrt security bug #83297.
+
+  28 Feb 2005; Michael Hanselmann <hansmi@gentoo.org>
+  phpwebsite-0.10.0-r2.ebuild:
+  Stable on ppc, bug 83297.
+
+*phpwebsite-0.10.0-r2 (28 Feb 2005)
+
+  28 Feb 2005; Don Seiler <rizzo@gentoo.org> +phpwebsite-0.10.0-r2.ebuild:
+  Revision bump for another patch for bug #83297
+
+  27 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
+  phpwebsite-0.10.0-r1.ebuild:
+  Stable on alpha, bug 83297.
+
+*phpwebsite-0.10.0-r1 (25 Feb 2005)
+
+  25 Feb 2005; Don Seiler <rizzo@gentoo.org> +phpwebsite-0.10.0-r1.ebuild:
+  Revision bump for security fix.  Bug #83297
+
+  20 Jan 2005; Don Seiler <rizzo@gentoo.org> phpwebsite-0.10.0.ebuild:
+  Marking stable in x86
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*phpwebsite-0.10.0 (24 Nov 2004)
+
+  24 Nov 2004; Don Seiler <rizzo@gentoo.org> +phpwebsite-0.10.0.ebuild:
+  Version bump
+
+  24 Nov 2004; Olivier Crete <tester@gentoo.org>
+  phpwebsite-0.9.3_p4-r2.ebuild:
+  Stable in x86 per security bug 71502
+
+  06 Nov 2004; Joseph Jezak <josejx@gentoo.org>
+  phpwebsite-0.9.3_p4-r2.ebuild:
+  Marked ppc stable for bug #71502.
+
+  24 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
+  phpwebsite-0.9.3_p4-r2.ebuild:
+  Stable on alpha, bug 71502.
+
+  24 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
+  phpwebsite-0.9.3_p4-r2.ebuild:
+  Stable on alpha, bug 71502.
+
+*phpwebsite-0.9.3_p4-r2 (17 Nov 2004)
+
+  17 Nov 2004; Don Seiler <rizzo@gentoo.org> +phpwebsite-0.9.3_p4-r2.ebuild:
+  Revision bump for security patch, bug #71502
+
+  15 Sep 2004; Don Seiler <rizzo@gentoo.org> -phpwebsite-0.9.3_p2-r1.ebuild,
+  phpwebsite-0.9.3_p4-r1.ebuild, -phpwebsite-0.9.3_p4.ebuild:
+  Removing obsolete versions
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  04 Sep 2004; Bryan Østergaard <kloeri@gentoo.org>
+  phpwebsite-0.9.3_p4-r1.ebuild:
+  Stable on alpha.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  phpwebsite-0.9.3_p2-r1.ebuild, phpwebsite-0.9.3_p4-r1.ebuild,
+  phpwebsite-0.9.3_p4.ebuild:
+  Masked phpwebsite-0.9.3_p4.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  phpwebsite-0.9.3_p2-r1.ebuild, phpwebsite-0.9.3_p4-r1.ebuild:
+  Masked phpwebsite-0.9.3_p4-r1.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  phpwebsite-0.9.3_p2-r1.ebuild:
+  Masked phpwebsite-0.9.3_p2-r1.ebuild stable for ppc
+
+  27 Aug 2004; Don Seiler <rizzo@gentoo.org> :
+  Upstream updated patch file, new digest needed
+
+  27 Aug 2004; Don Seiler <rizzo@gentoo.org> phpwebsite-0.9.3_p4-r1.ebuild:
+  Stable on x86
+
+*phpwebsite-0.9.3_p4-r1 (25 Aug 2004)
+
+  25 Aug 2004; Don Seiler <rizzo@gentoo.org> +phpwebsite-0.9.3_p4-r1.ebuild:
+  Patch for possible cross-site scripting and SQL injection issues
+
+*phpwebsite-0.9.3_p4 (16 Aug 2004)
+
+  16 Aug 2004; Don Seiler <rizzo@gentoo.org> +files/postinstall-en.txt,
+  +phpwebsite-0.9.3_p4.ebuild:
+  Version bump, now with webapp eclass
 
 *phpwebsite-0.9.3_p2-r1 (15 Aug 2004)
 
@@ -8,7 +216,7 @@
   +phpwebsite-0.9.3_p2-r1.ebuild:
   Moved from net-www/phpwebsite to www-apps/phpwebsite.
 
-  11 Jun 2004; Bryan �stergaard <kloeri@gentoo.org>
+  11 Jun 2004; Bryan Østergaard <kloeri@gentoo.org>
   phpwebsite-0.9.3_p2-r1.ebuild:
   Stable on alpha.
 
diff --git a/www-apps/phpwebsite/Manifest b/www-apps/phpwebsite/Manifest
index 90d08557be12..b055773d949e 100644
--- a/www-apps/phpwebsite/Manifest
+++ b/www-apps/phpwebsite/Manifest
@@ -1,4 +1,5 @@
-MD5 e3fec57aa99eba955f5c444a83489f71 phpwebsite-0.9.3_p2-r1.ebuild 2078
-MD5 730ab2a968cc98e00364816d37d9a1d7 ChangeLog 2456
-MD5 ecbb5a02001856289bc050635b8d8394 metadata.xml 522
-MD5 5d0bf869aca158f5d35948955a1aafee files/digest-phpwebsite-0.9.3_p2-r1 136
+MD5 50e2ea733da83a9ef08687d7d88555ec ChangeLog 9447
+MD5 24a724cdfd1390bba450f4b7c1a9dfc5 metadata.xml 360
+MD5 2d402247fb119bc714c93bc295e2a0ec phpwebsite-0.10.2_rc2.ebuild 1414
+MD5 57b645768c6c1c4f1f09c26085385b16 files/digest-phpwebsite-0.10.2_rc2 74
+MD5 e5cab3ec158303e1d64a76d9eacd5cb6 files/postinstall-en.txt 4642
diff --git a/www-apps/phpwebsite/files/postinstall-en.txt b/www-apps/phpwebsite/files/postinstall-en.txt
index e8293275bb3e..7bca5583dafb 100644
--- a/www-apps/phpwebsite/files/postinstall-en.txt
+++ b/www-apps/phpwebsite/files/postinstall-en.txt
@@ -1,17 +1,130 @@
 phpWebSite is installed.
 
+Installation Instructions
+=========================
+
 You will need to create a database for phpWebSite
 on your own before starting setup.
 
 Then change permissions for set with this script:
 
-cd ${MY_HTDOCSDIR}/phpwebsite/setup
-./secure_setup.sh setup
+cd ${MY_INSTALLDIR}/setup
+./secure_phpws.sh setup
 
 Once you have a database ready proceed to
-http://$HOSTNAME/phpwebsite to continue installation.
+http://${VHOST_HOSTNAME}/${VHOST_APPDIR} to continue installation.
 
 Once you are done with installation you need to run:
 
-cd ${MY_HTDOCSDIR}/phpwebsite/setup
+cd ${MY_INSTALLDIR}/setup
 ./secure_phpws.sh run apache users
+
+Upgrade Instructions
+====================
+
+Preparing to Upgrade
+--------------------
+ - Dump/backup your hub and branch databases.
+ - Backup your hub and branch directories/files.
+ - Create an index.php file that warns users of the upgrade.
+
+<?php
+echo "<div align=\"center\"><h1>Please be patient while we upgrade the site.</h1>
+We'll be back in a jiffy!</div>";
+?>
+
+ - Close and restart your browser.  If you have a session live while updating
+   your site, it MIGHT interfere with the upgrade process.  If you are using
+   Boost to upgrade, you can skip this step.
+
+If you are upgrading to 0.9.3 or greater, you should make the images/
+directory and subdirectories writable by the web server.
+
+Prepare your branches if you are running any off of your hub site.  Depending
+on the owner of these directories will affect the commands to run.  The base
+directory of each branch will need to be writable.
+
+If the owner is the webserver and you have root access:
+chmod o+rwx branch1/
+chmod o+rwx branch2/
+etc...
+
+otherwise:
+chmod 0777 branch1/
+chmod 0777 branch2/
+etc...
+
+The images and themes directories will also need to be writable for the
+upgrade:
+
+chmod -R o+rwx branch1/{images,themes}
+chmod -R o+rwx branch2/{images,themes}
+
+-or-
+
+chmod -R 0777 branch1/{images,themes}
+chmod -R 0777 branch2/{images,themes}
+
+If the webserver is not given the proper permissions then the branch upgrade
+will not be successfull.
+
+
+Once you have you have finished these steps (and ONLY after) should you
+continue.
+
+Running the Upgrade
+--------------------------------------
+Now you can untar the new files into your installation. If you go to
+your site's index.php file, you will see a few error messages. The
+aforementioned index.php prevents most people from seeing these messages.
+Point your browser to 'http://www.myWebSitesName.com/setup/' where 
+'www.myWebSitesName.com' is the address for your web site.
+
+The first thing the upgrader will do is upgrade your core modules. It
+will also check to see if you are running any branch sites and automatically
+upgrade them as well.
+
+You should receive a 'Core Updated!' message. Underneath these messages
+will be a list of modules that appear to need upgrading as well. Click
+the checkboxes of the modules you want updated (or click the 'Check All' button
+to check all of them) and click the 'Update Modules' button. Your site and
+all your branch sites should now be updated.
+
+If you made a warning index.php file, dump it and put the real file back.
+You should now be able to use your site as normal.
+
+Should something go wrong
+--------------------------------------
+If you go to your site and receive errors the FIRST thing you should try
+is closing your browser, reopening it, and trying to use your site again.
+Sometimes old sessions will conflict with the upgraded information.
+
+If you get an error message or your sites still don't function, restore your
+backed up databases and files and try again. If it STILL doesn't work, contact
+us via Sourceforge, we want to know what went wrong.
+
+Please include your OS, web server, PHP, and phpWebSite version information.
+Also include any error messages that were displayed. The more data you supply
+us, the better chance you will receive help.
+
+You may also try using the repair.php file. It contains answers to a few
+commonly experienced problems.
+
+Returning to update.php
+---------------------------------------
+Most of the time, Boost will handle your upgrade needs. However, should 
+an upgraded module cause problems before you can get to the Boost module,
+you can always return to update.php to upgrade the offending module.
+
+Securing your Site
+---------------------------------------
+Although setup.php, update.php, and repair.php require passwords to enter,
+you may want to prevent malicious users (read: jerks) from even accessing
+these files. One way would be to limit read access on that directory after
+you are finished using it. Another measure would be to alter your 
+allow_setup.php file. Open this file in an editor and change the 'TRUE'
+to 'FALSE' like so:
+
+$_SESSION['allow_setup'] = FALSE;
+
+Change this back to TRUE when you need to update again.
diff --git a/www-apps/phpwebsite/metadata.xml b/www-apps/phpwebsite/metadata.xml
index 31da1fc18da8..d9d7e18e1eab 100644
--- a/www-apps/phpwebsite/metadata.xml
+++ b/www-apps/phpwebsite/metadata.xml
@@ -2,10 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>web-apps</herd>
-<maintainer>
-  <email>rizzo@gentoo.org</email>
-  <name>Don Seiler</name>
-  <description>web-apps herd member and phpWebSite developer</description>
-</maintainer>
 <longdescription>phpWebSite provides a complete web site content management system. Web-based administration allows for easy maintenance of interactive, community-driven web sites.</longdescription>
 </pkgmetadata>
diff --git a/www-apps/phpwebsite/phpwebsite-0.10.2_rc2.ebuild b/www-apps/phpwebsite/phpwebsite-0.10.2_rc2.ebuild
index c6c563e99db5..e1c95af08291 100644
--- a/www-apps/phpwebsite/phpwebsite-0.10.2_rc2.ebuild
+++ b/www-apps/phpwebsite/phpwebsite-0.10.2_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/www-apps/phpwebsite/phpwebsite-0.10.2_rc2.ebuild,v 1.1 2005/08/25 02:05:04 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwebsite/phpwebsite-0.10.2_rc2.ebuild,v 1.1.1.1 2005/11/30 09:37:08 chriswhite Exp $
 
 inherit webapp
 
@@ -10,12 +10,12 @@ DESCRIPTION="phpWebSite Content Management System"
 HOMEPAGE="http://phpwebsite.appstate.edu"
 SRC_URI="http://phpwebsite.appstate.edu/downloads/rc/${PN}-${MY_PV}.tar.gz"
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~ppc ~sparc ~x86"
+KEYWORDS="alpha ppc sparc x86"
 IUSE=""
 RDEPEND="virtual/httpd-php
 	>=dev-db/mysql-3.23.23"
 
-DEPEND="${DEPEND} ${RDEPEND} >=net-www/webapp-config-1.11"
+DEPEND="${DEPEND} ${RDEPEND}"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
diff --git a/www-apps/phpwiki/ChangeLog b/www-apps/phpwiki/ChangeLog
index 479465cf0eb6..db0380689906 100644
--- a/www-apps/phpwiki/ChangeLog
+++ b/www-apps/phpwiki/ChangeLog
@@ -1,6 +1,48 @@
 # ChangeLog for www-apps/phpwiki
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwiki/ChangeLog,v 1.1 2004/08/19 15:38:53 rl03 Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwiki/ChangeLog,v 1.1.1.1 2005/11/30 09:37:09 chriswhite Exp $
+
+  25 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  phpwiki-1.3.10-r2.ebuild:
+  Stable on ppc.
+
+*phpwiki-1.3.10-r2 (24 Aug 2005)
+
+  24 Aug 2005; Stuart Herbert <stuart@gentoo.org> +phpwiki-1.3.10-r2.ebuild:
+  Fix for security bug #102380
+
+  23 Aug 2005; Renat Lumpau <rl03@gentoo.org> phpwiki-1.2.4.ebuild,
+  phpwiki-1.3.10.ebuild, phpwiki-1.3.10-r1.ebuild:
+  Fix cp -a wrt bug #103487
+
+  22 Aug 2005; Renat Lumpau <rl03@gentoo.org> phpwiki-1.3.10-r1.ebuild:
+  Housekeeping
+
+  07 Jul 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-1.3-en.txt:
+  Mention location of db schemas wrt #70579.
+
+  05 Jul 2005; Stuart Herbert <stuart@gentoo.org>
+  +phpwiki-1.3.10.ebuild, files/phpwiki-1.3.10-xmlrpc.patch:
+  Applied patch for security bug #97458
+
+  22 Jun 2005; Jason Wever <weeve@gentoo.org> phpwiki-1.3.10.ebuild:
+  Added ~sparc keyword.
+
+*phpwiki-1.3.10 (08 Sep 2004)
+
+  08 Sep 2004; Renat Lumpau <rl03@gentoo.org> +files/postinstall-1.3-en.txt,
+  +phpwiki-1.3.10.ebuild:
+  Add new (unstable) version, bug #62951
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  phpwiki-1.2.4.ebuild:
+  Masked phpwiki-1.2.4.ebuild stable for ppc
+
+  03 Sep 2004; David Holm <dholm@gentoo.org> phpwiki-1.2.4.ebuild:
+  Added to ~ppc.
+
+  30 Aug 2004; Renat Lumpau <rl03@gentoo.org> phpwiki-1.2.4.ebuild:
+  Fixed DEPEND/RDEPEND
 
 *phpwiki-1.2.4 (19 Aug 2004)
 
diff --git a/www-apps/phpwiki/Manifest b/www-apps/phpwiki/Manifest
index df57ae5fb7f9..8d4e0d34ac6a 100644
--- a/www-apps/phpwiki/Manifest
+++ b/www-apps/phpwiki/Manifest
@@ -1,5 +1,13 @@
-MD5 e32977f934d93c6a765b02ecd5be5f10 ChangeLog 357
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
-MD5 eff66dc88ee70193def8ab95dd869464 phpwiki-1.2.4.ebuild 816
-MD5 c913f380e9beddcca756ea5d0c6fd85f files/postinstall-en.txt 149
+MD5 6d587086fb3566876bfd247bc58c35f9 phpwiki-1.3.10.ebuild 1036
+MD5 4145c92fa96fd75640b9dc1dc3025565 ChangeLog 1775
+MD5 0e0656e94faa81334e0b0e937dc06b3f phpwiki-1.3.10-r2.ebuild 1229
+MD5 34741d64857cb87b65ea9400953237d8 phpwiki-1.2.4.ebuild 803
+MD5 1b8ab8cea9f53a0baae7d8e03ebf5f70 phpwiki-1.3.10-r1.ebuild 1086
+MD5 4bd0a80d3c53ac5861e9a63e2540f996 files/postinstall-1.3-en.txt 252
 MD5 61ddc0899b2191583eb5755c954e5f14 files/digest-phpwiki-1.2.4 65
+MD5 e1cc1101057b18cfb203e30e539d69eb files/digest-phpwiki-1.3.10 67
+MD5 3259bf9dc4bef8f25c35478900932b96 files/phpwiki-1.3.10-xmlrpc.patch 959
+MD5 d6a81010992f94a63b01bf0eb9b37b43 files/digest-phpwiki-1.3.10-r2 132
+MD5 c913f380e9beddcca756ea5d0c6fd85f files/postinstall-en.txt 149
+MD5 e1cc1101057b18cfb203e30e539d69eb files/digest-phpwiki-1.3.10-r1 67
diff --git a/www-apps/phpwiki/files/postinstall-1.3-en.txt b/www-apps/phpwiki/files/postinstall-1.3-en.txt
index 3a4d80a3fdda..068cb33e1b83 100644
--- a/www-apps/phpwiki/files/postinstall-1.3-en.txt
+++ b/www-apps/phpwiki/files/postinstall-1.3-en.txt
@@ -1,3 +1,5 @@
 The default configuration uses a dbm file in /tmp
-Be sure to read the install notes in /usr/share/doc/${P}/
-You should customise ${MY_INSTALLDIR}/config/config.ini to suit your needs.
+Be sure to read the install notes in /usr/share/doc/phpwiki-VERSION/
+Note that db schemas are located in the same directory.
+
+You should customize ${MY_INSTALLDIR}/config/config.ini to suit your needs.
diff --git a/www-apps/phpwiki/phpwiki-1.2.4.ebuild b/www-apps/phpwiki/phpwiki-1.2.4.ebuild
index 2ed75c211630..302944b301e5 100644
--- a/www-apps/phpwiki/phpwiki-1.2.4.ebuild
+++ b/www-apps/phpwiki/phpwiki-1.2.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/www-apps/phpwiki/phpwiki-1.2.4.ebuild,v 1.1 2004/08/19 15:38:53 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwiki/phpwiki-1.2.4.ebuild,v 1.1.1.1 2005/11/30 09:37:09 chriswhite Exp $
 
 inherit webapp
 
@@ -9,17 +9,16 @@ HOMEPAGE="http://phpwiki.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ppc"
 IUSE=""
 
-DEPEND="$DEPEND"
 RDEPEND="virtual/php
 		net-www/apache"
 
 src_install() {
 	webapp_src_preinst
 
-	cp -a *.php admin images lib locale pgsrc templates \
+	cp -pPR *.php admin images lib locale pgsrc templates \
 		 "${D}/${MY_HTDOCSDIR}"
 
 	dodoc DBLIB.txt CREDITS ChangeLog LICENSE README INSTALL.*
diff --git a/www-apps/phpwiki/phpwiki-1.3.10-r1.ebuild b/www-apps/phpwiki/phpwiki-1.3.10-r1.ebuild
index 12ad294cb9c5..c2ec11daf416 100644
--- a/www-apps/phpwiki/phpwiki-1.3.10-r1.ebuild
+++ b/www-apps/phpwiki/phpwiki-1.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/www-apps/phpwiki/phpwiki-1.3.10-r1.ebuild,v 1.1 2005/07/05 22:25:55 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwiki/phpwiki-1.3.10-r1.ebuild,v 1.1.1.1 2005/11/30 09:37:09 chriswhite Exp $
 
 inherit eutils webapp
 
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 KEYWORDS="~ppc ~sparc ~x86"
 IUSE=""
 
-RDEPEND=">=virtual/php-4.0.6
+RDEPEND="virtual/php
 	net-www/apache"
 
 src_unpack() {
@@ -25,7 +25,7 @@ src_unpack() {
 src_install() {
 	webapp_src_preinst
 
-	cp -a * ${D}/${MY_HTDOCSDIR}
+	cp -pPR * ${D}/${MY_HTDOCSDIR}
 	rm -rf ${D}/${MY_HTDOCSDIR}/{doc,schemas,README,INSTALL,UPGRADING}
 
 	dodoc README INSTALL UPGRADING doc/* schemas/*
diff --git a/www-apps/phpwiki/phpwiki-1.3.10-r2.ebuild b/www-apps/phpwiki/phpwiki-1.3.10-r2.ebuild
index f3d69a93074e..fb05354736fb 100644
--- a/www-apps/phpwiki/phpwiki-1.3.10-r2.ebuild
+++ b/www-apps/phpwiki/phpwiki-1.3.10-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/www-apps/phpwiki/phpwiki-1.3.10-r2.ebuild,v 1.1 2005/08/24 21:37:19 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwiki/phpwiki-1.3.10-r2.ebuild,v 1.1.1.1 2005/11/30 09:37:09 chriswhite Exp $
 
 inherit eutils webapp
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://phpwiki.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz http://dev.gentoo.org/~stuart/patches/${PN}-xmlrpc.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~ppc ~sparc ~x86"
+KEYWORDS="ppc ~sparc ~x86"
 IUSE=""
 
 RDEPEND="virtual/php
diff --git a/www-apps/phpwiki/phpwiki-1.3.10.ebuild b/www-apps/phpwiki/phpwiki-1.3.10.ebuild
index a1cafe847d4b..efbfd3d96aca 100644
--- a/www-apps/phpwiki/phpwiki-1.3.10.ebuild
+++ b/www-apps/phpwiki/phpwiki-1.3.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/www-apps/phpwiki/phpwiki-1.3.10.ebuild,v 1.1 2004/09/08 12:23:16 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwiki/phpwiki-1.3.10.ebuild,v 1.1.1.1 2005/11/30 09:37:09 chriswhite Exp $
 
 inherit webapp
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://phpwiki.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~ppc ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=virtual/php-4.0.6
@@ -24,7 +24,7 @@ src_unpack() {
 src_install() {
 	webapp_src_preinst
 
-	cp -a * ${D}/${MY_HTDOCSDIR}
+	cp -pPR * ${D}/${MY_HTDOCSDIR}
 	rm -rf ${D}/${MY_HTDOCSDIR}/{doc,schemas,README,INSTALL,UPGRADING}
 
 	dodoc README INSTALL UPGRADING doc/* schemas/*
diff --git a/www-apps/polarblog/ChangeLog b/www-apps/polarblog/ChangeLog
index db66c9ec74ad..43ede6858572 100644
--- a/www-apps/polarblog/ChangeLog
+++ b/www-apps/polarblog/ChangeLog
@@ -1,6 +1,57 @@
 # ChangeLog for www-apps/polarblog
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/polarblog/ChangeLog,v 1.1 2004/08/28 11:31:02 rl03 Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/polarblog/ChangeLog,v 1.1.1.1 2005/11/30 09:37:07 chriswhite Exp $
+
+*polarblog-1.6.2 (23 Oct 2005)
+
+  23 Oct 2005; Renat Lumpau <rl03@gentoo.org> -polarblog-1.6.1.ebuild,
+  +polarblog-1.6.2.ebuild:
+  Version bump
+
+*polarblog-1.6.1 (08 Sep 2005)
+
+  08 Sep 2005; Renat Lumpau <rl03@gentoo.org> -polarblog-1.6.0.ebuild,
+  +polarblog-1.6.1.ebuild:
+  Version bump
+
+*polarblog-1.6.0 (24 Aug 2005)
+
+  24 Aug 2005; Renat Lumpau <rl03@gentoo.org> +polarblog-1.6.0.ebuild,
+  -polarblog-1.52.ebuild:
+  Version bump. Removed old version (1.52), which was actually 1.5.2, so the new
+  1.6.0 is the most recent version. Apologies for the apparent downgrade.
+
+  22 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt:
+  Housekeeping
+
+  22 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  files/reconfig, polarblog-1.52.ebuild:
+  Housekeeping
+
+*polarblog-1.52 (07 Jul 2005)
+
+  07 Jul 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  files/reconfig, -polarblog-1.02.ebuild, +polarblog-1.52.ebuild:
+  Version bump (#80407), cleaning old versions.
+
+  13 Dec 2004; Jason Wever <weeve@gentoo.org> polarblog-1.02.ebuild:
+  Added ~sparc keyword.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  polarblog-1.02.ebuild:
+  Masked polarblog-1.02.ebuild stable for ppc
+
+  03 Sep 2004; David Holm <dholm@gentoo.org> polarblog-1.02.ebuild:
+  Added to ~ppc.
+
+  30 Aug 2004; Renat Lumpau <rl03@gentoo.org> polarblog-1.02.ebuild:
+  Fixed DEPEND/RDEPEND
+
+  28 Aug 2004; Renat Lumpau <rl03@gentoo.org> polarblog-1.02.ebuild:
+  Removed empty src_compile.
+
+  28 Aug 2004; Renat Lumpau <rl03@gentoo.org> polarblog-1.02.ebuild:
+  Don't rm docs, and cp -R selectively.
 
 *polarblog-1.02 (28 Aug 2004)
 
diff --git a/www-apps/polarblog/Manifest b/www-apps/polarblog/Manifest
index 1471a3e47853..21ea53632b69 100644
--- a/www-apps/polarblog/Manifest
+++ b/www-apps/polarblog/Manifest
@@ -1,6 +1,16 @@
-MD5 53ac70294f9a4c083c6fcb7c6235be47 polarblog-1.02.ebuild 774
-MD5 7a2fa94e381b0cdb8c9d609a5d22d63a ChangeLog 321
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 725d588ef84681a9ab5b790358ad2a14 polarblog-1.6.2.ebuild 836
+MD5 5e376d7b816106341e6080610799fdf1 ChangeLog 2035
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
-MD5 8cd5b0a64b580ec4ed2a0dec96385724 files/postinstall-en.txt 501
-MD5 b9c871d8f0e42805c9c6eecb6c87444b files/digest-polarblog-1.02 55
-MD5 b78cec314fa6a3e0facf242931dd5091 files/reconfig 210
+MD5 7e03c515e971f691c041deeec4f46dfa files/digest-polarblog-1.6.2 56
+MD5 49ea194bc029ebaabc371f02ffd7a198 files/postinstall-en.txt 507
+MD5 15f47a7b879f76e31a344ac66540a22f files/reconfig 229
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDW+gdEzitwsaoONoRAhezAJ91ykXbwFTIWlRVPzU9a/9jYnkx/QCgmLNl
+tIuCQYajIX/fVP40it8wh5k=
+=ac6Z
+-----END PGP SIGNATURE-----
diff --git a/www-apps/polarblog/files/postinstall-en.txt b/www-apps/polarblog/files/postinstall-en.txt
index 8d3aaec4ba5c..561da8283b84 100644
--- a/www-apps/polarblog/files/postinstall-en.txt
+++ b/www-apps/polarblog/files/postinstall-en.txt
@@ -6,7 +6,7 @@ cp ${MY_INSTALLDIR}/config/config.php.dist ${MY_INSTALLDIR}/config/config.php
 and edit them. As a minimum, set LIB_PATH, DB_PREFIX, DB_HOST, DB_NAME,
 DB_USER, DB_PASSWORD, CSS.
 
-Then go to http://${VHOST_HOSTNAME}/polarblog/install.php to finish the installation.
+Then go to http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/install.php to finish the installation.
 Don't forget to delete ${MY_INSTALLDIR}/install.php when you are done.
 
 Read the docs at http://polarblog.polarlava.com/docs/
diff --git a/www-apps/polarblog/files/reconfig b/www-apps/polarblog/files/reconfig
index b7a2f6583eb4..89f55b48d928 100644
--- a/www-apps/polarblog/files/reconfig
+++ b/www-apps/polarblog/files/reconfig
@@ -1,6 +1,12 @@
 #!/bin/bash
-if [ $1 = "start" -o $1 = "install" ]; then
-	# enable RSS
-	chmod 777 ${MY_INSTALLDIR}
-	sed -e "s|/your/path/to/public_html/polarblog|${MY_INSTALLDIR}|" -i ${MY_INSTALLDIR}/config/config.php.dist
+
+die() {
+	echo "#####"
+	echo $1
+	echo "#####"
+	exit 1
+}
+
+if [ $1 = "install" ]; then
+	sed -e "s|/your/path/to/public_html/polarblog|${MY_INSTALLDIR}|" -i ${MY_INSTALLDIR}/config/config.php.dist || die "sed failed"
 fi
diff --git a/www-apps/polarblog/polarblog-1.6.2.ebuild b/www-apps/polarblog/polarblog-1.6.2.ebuild
index 2f7f3a757ed0..7158851b8275 100644
--- a/www-apps/polarblog/polarblog-1.6.2.ebuild
+++ b/www-apps/polarblog/polarblog-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/www-apps/polarblog/polarblog-1.6.2.ebuild,v 1.1 2005/10/23 19:43:56 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/polarblog/polarblog-1.6.2.ebuild,v 1.1.1.1 2005/11/30 09:37:07 chriswhite Exp $
 
 inherit webapp
 
diff --git a/www-apps/roundup/ChangeLog b/www-apps/roundup/ChangeLog
index 9de0348024b7..251ca6790282 100644
--- a/www-apps/roundup/ChangeLog
+++ b/www-apps/roundup/ChangeLog
@@ -1,6 +1,28 @@
-# ChangeLog for net-www/roundup
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/roundup/ChangeLog,v 1.1 2004/08/15 15:36:30 stuart Exp $
+# ChangeLog for www-apps/roundup
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/roundup/ChangeLog,v 1.1.1.1 2005/11/30 09:37:09 chriswhite Exp $
+
+  19 Apr 2005; Elfyn McBratney <beu@gentoo.org> metadata.xml:
+  Remove retired developer from metadata.xml.
+
+  06 Nov 2004; Chris White <chriswhite@gentoo.org> files/roundup:
+  Fixed roundup script as per bug #69812.
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> roundup-0.5.6.ebuild,
+  roundup-0.5.8.ebuild, roundup-0.6.4.ebuild, roundup-0.7.6.ebuild:
+  Fixed ChangeLog header. Added IUSE and don't assign default to S.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  roundup-0.5.8.ebuild, roundup-0.6.4.ebuild, roundup-0.7.6.ebuild:
+  Masked roundup-0.7.6.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  roundup-0.5.8.ebuild, roundup-0.6.4.ebuild:
+  Masked roundup-0.6.4.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  roundup-0.5.8.ebuild:
+  Masked roundup-0.5.8.ebuild stable for ppc
 
 *roundup-0.6.4 (15 Aug 2004)
 
diff --git a/www-apps/roundup/Manifest b/www-apps/roundup/Manifest
index c63dfcdff71b..bafd1863943b 100644
--- a/www-apps/roundup/Manifest
+++ b/www-apps/roundup/Manifest
@@ -1,11 +1,21 @@
-MD5 f7eb255d37911135d28698e49eb4a9fd ChangeLog 1529
-MD5 fef844269bd3a9d4937a4b67f7b6e67a roundup-0.5.6.ebuild 835
-MD5 c5c942f006f3fd7442add431f678f6bc roundup-0.5.8.ebuild 839
-MD5 349978393caaab8955a19232175c3396 roundup-0.6.4.ebuild 903
-MD5 f5f1522837a3398846f77d381fda47ec metadata.xml 226
-MD5 4df951443a69ffa2cd2861d6933b4973 roundup-0.7.6.ebuild 1364
-MD5 7d5f9adaaa2f73b32c8dc22108358ba9 files/digest-roundup-0.5.6 65
-MD5 25f3fa02512e6a3ba8561a8798073815 files/digest-roundup-0.5.8 65
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7882ddc445679873a20d08618dcb6add roundup-0.5.8.ebuild 832
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 e021919c5563d83c39c7e9a8f04db462 ChangeLog 2663
+MD5 d8baf61e61807162d25d03acebd913c6 roundup-0.7.6.ebuild 1372
+MD5 bf8a7f0e5e929d85b7fa01a8f238669c roundup-0.5.6.ebuild 824
+MD5 8a3bb76eab5c10abc93a09ac680e3088 roundup-0.6.4.ebuild 894
+MD5 591f15a67d110b417b2e7acb5d3c96aa files/roundup 1132
 MD5 4d7d00a2645573f2152a0a255fd9d1e1 files/digest-roundup-0.6.4 65
 MD5 36b397bc661ee56ad092acfd8c59df02 files/digest-roundup-0.7.6 65
-MD5 48ba3a85d0081aaadb9f6fe1d0ae26b5 files/roundup 1070
+MD5 25f3fa02512e6a3ba8561a8798073815 files/digest-roundup-0.5.8 65
+MD5 7d5f9adaaa2f73b32c8dc22108358ba9 files/digest-roundup-0.5.6 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCZN7MjUHll2nfF60RAnM9AKCnB7Ou12No5zRUICscMv5wjUKESwCcDZZL
+D4W/696tu9XvgzYStn2OKhQ=
+=HXm8
+-----END PGP SIGNATURE-----
diff --git a/www-apps/roundup/files/roundup b/www-apps/roundup/files/roundup
index c1c997bea6e3..19f1ab6d2bfb 100644
--- a/www-apps/roundup/files/roundup
+++ b/www-apps/roundup/files/roundup
@@ -4,7 +4,7 @@ case "$1" in
 		echo "Usage roundup {start|stop|help} options..."
 		echo "start usage:"
 		echo ""
-		echo "roundup start port host [tracker home]"
+		echo "roundup start port host tracker_name [tracker home]"
 		echo ""
 		echo ""
 		echo "stop usage:"
@@ -18,10 +18,12 @@ case "$1" in
 		shift
 		host=$1
 		shift
+		tracker_name=$1
+		shift
 		tracker_home="$@"
 		roundup-server -d ${tracker_home}/roundup.pid \
 		-l ${tracker_home}/roundup.log \
-		-p $port -n $host support=$tracker_home
+		-p $port -n $host ${tracker_name}=${tracker_home}
 		;;
 	"stop")
 		shift
@@ -33,7 +35,7 @@ case "$1" in
 		echo "Usage roundup {start|stop|help} options..."
 		echo "start usage:"
 		echo ""
-		echo "roundup start port host [tracker home]
+		echo "roundup start port host tracker_name [tracker home]
 		echo ""
 		echo ""
 		echo "stop usage:"
diff --git a/www-apps/roundup/metadata.xml b/www-apps/roundup/metadata.xml
index b452dec7e591..20ce219711a2 100644
--- a/www-apps/roundup/metadata.xml
+++ b/www-apps/roundup/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>no-herd</herd>
-<maintainer>
-  <email>chriswhite@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/www-apps/roundup/roundup-0.5.6.ebuild b/www-apps/roundup/roundup-0.5.6.ebuild
index e187bbda025e..5b125361af54 100644
--- a/www-apps/roundup/roundup-0.5.6.ebuild
+++ b/www-apps/roundup/roundup-0.5.6.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/roundup/roundup-0.5.6.ebuild,v 1.1 2004/08/15 15:36:30 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/roundup/roundup-0.5.6.ebuild,v 1.1.1.1 2005/11/30 09:37:09 chriswhite Exp $
 
-S="${WORKDIR}/${P}"
 DESCRIPTION="Simple-to-use and -install issue-tracking system with command-line, web, and e-mail interfaces."
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://roundup.sourceforge.net"
 KEYWORDS="x86 sparc"
 LICENSE="as-is"
 SLOT="0"
+IUSE=""
 
 DEPEND=">=dev-lang/python-2.2
 	>=sys-libs/db-3.2.9"
diff --git a/www-apps/roundup/roundup-0.5.8.ebuild b/www-apps/roundup/roundup-0.5.8.ebuild
index 41ff805d7294..f8719c9f9c8e 100644
--- a/www-apps/roundup/roundup-0.5.8.ebuild
+++ b/www-apps/roundup/roundup-0.5.8.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/roundup/roundup-0.5.8.ebuild,v 1.1 2004/08/15 15:36:30 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/roundup/roundup-0.5.8.ebuild,v 1.1.1.1 2005/11/30 09:37:09 chriswhite Exp $
 
-S="${WORKDIR}/${P}"
 DESCRIPTION="Simple-to-use and -install issue-tracking system with command-line, web, and e-mail interfaces."
 SRC_URI="mirror://sourceforge/roundup/${P}.tar.gz"
 HOMEPAGE="http://roundup.sourceforge.net"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="~x86 ~sparc ppc"
 LICENSE="as-is"
 SLOT="0"
+IUSE=""
 
 DEPEND=">=dev-lang/python-2.2
 	>=sys-libs/db-3.2.9"
diff --git a/www-apps/roundup/roundup-0.6.4.ebuild b/www-apps/roundup/roundup-0.6.4.ebuild
index a08f410c4a4f..1c72cabe0ae8 100644
--- a/www-apps/roundup/roundup-0.6.4.ebuild
+++ b/www-apps/roundup/roundup-0.6.4.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/roundup/roundup-0.6.4.ebuild,v 1.1 2004/08/15 15:36:30 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/roundup/roundup-0.6.4.ebuild,v 1.1.1.1 2005/11/30 09:37:09 chriswhite Exp $
 
-S="${WORKDIR}/${P}"
 DESCRIPTION="Simple-to-use and -install issue-tracking system with command-line, web, and e-mail interfaces."
 SRC_URI="mirror://sourceforge/roundup/${P}.tar.gz"
 HOMEPAGE="http://roundup.sourceforge.net"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+KEYWORDS="~x86 ~sparc ~amd64 ppc"
 LICENSE="as-is"
 SLOT="0"
+IUSE=""
 
 DEPEND=">=dev-lang/python-2.2
 	>=sys-libs/db-3.2.9"
diff --git a/www-apps/roundup/roundup-0.7.6.ebuild b/www-apps/roundup/roundup-0.7.6.ebuild
index b2ebfad6d915..0f2b7db88db8 100644
--- a/www-apps/roundup/roundup-0.7.6.ebuild
+++ b/www-apps/roundup/roundup-0.7.6.ebuild
@@ -1,15 +1,16 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/roundup/roundup-0.7.6.ebuild,v 1.1 2004/08/15 15:36:30 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/roundup/roundup-0.7.6.ebuild,v 1.1.1.1 2005/11/30 09:37:09 chriswhite Exp $
 
 inherit eutils
 
 DESCRIPTION="Simple-to-use and -install issue-tracking system with command-line, web, and e-mail interfaces."
 SRC_URI="mirror://sourceforge/roundup/${P}.tar.gz"
 HOMEPAGE="http://roundup.sourceforge.net"
-KEYWORDS="x86 sparc ~amd64 ~ppc"
+KEYWORDS="x86 sparc ~amd64 ppc"
 LICENSE="as-is"
 SLOT="0"
+IUSE=""
 
 DEPEND=">=dev-lang/python-2.2
 	>=sys-libs/db-3.2.9"
diff --git a/www-apps/rt/ChangeLog b/www-apps/rt/ChangeLog
index e4da416f1d8b..2664f8c6f275 100644
--- a/www-apps/rt/ChangeLog
+++ b/www-apps/rt/ChangeLog
@@ -1,6 +1,101 @@
 # ChangeLog for www-apps/rt
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/ChangeLog,v 1.1 2004/08/25 13:01:01 rl03 Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/ChangeLog,v 1.1.1.1 2005/11/30 09:36:58 chriswhite Exp $
+
+  24 Oct 2005; Renat Lumpau <rl03@gentoo.org> +files/3.4.2/Callback.patch,
+  rt-3.4.3.ebuild:
+  Fix for bug #109745.
+
+  24 Oct 2005; Renat Lumpau <rl03@gentoo.org> -rt-3.4.2-r1.ebuild,
+  rt-3.4.3.ebuild:
+  Dependency checking fixes wrt bug #110030.
+
+  24 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> rt-3.4.3.ebuild:
+  Added to ~ppc.
+
+  11 Sep 2005; Renat Lumpau <rl03@gentoo.org> rt-3.2.1.ebuild,
+  rt-3.4.2-r1.ebuild, rt-3.4.3.ebuild:
+  Housekeeping
+
+  24 Aug 2005; Renat Lumpau <rl03@gentoo.org> rt-3.2.1.ebuild,
+  rt-3.4.2-r1.ebuild, rt-3.4.3.ebuild:
+  Fix dependency checking code wrt bug #103481
+
+  23 Aug 2005; Renat Lumpau <rl03@gentoo.org> rt-3.4.3.ebuild:
+  Fix enewuser invocation wrt bug #103421
+
+*rt-3.4.3 (11 Aug 2005)
+
+  11 Aug 2005; Renat Lumpau <rl03@gentoo.org> +rt-3.4.3.ebuild:
+  Version bump
+
+  08 Aug 2005; Renat Lumpau <rl03@gentoo.org> rt-3.4.2-r1.ebuild:
+  Fixed HTML-Mason dependency
+
+  08 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/3.4.2/reconfig,
+  rt-3.4.2-r1.ebuild:
+  Fixed libapreq2/mod_perl2 dependency wrt bug #67686, bug #61893, bug #73115.
+
+  04 Aug 2005; Michael Cummings <mcummings@gentoo.org> rt-3.4.2-r1.ebuild:
+  Corrected Apache-Test dep since mod_perl-2 blocks it - made it an ||
+
+  02 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/3.4.2/reconfig:
+  added die()
+
+  29 Jul 2005; Renat Lumpau <rl03@gentoo.org>
+  files/3.4.2/postinstall-en.txt, files/3.4.2/reconfig, -rt-3.4.2.ebuild,
+  rt-3.4.2-r1.ebuild:
+  Finally fixed variables in the hook script. Fixes #99853.
+
+  21 Jun 2005; Renat Lumpau <rl03@gentoo.org> files/3.4.2/rt.init.d:
+  Fixed initscript.
+
+*rt-3.4.2-r1 (21 Jun 2005)
+
+  21 Jun 2005; Renat Lumpau <rl03@gentoo.org> +files/3.2.1/reconfig,
+  +files/3.4.2/config.layout-gentoo, -files/reconfig-3.4.2,
+  +files/3.4.2/postinstall-en.txt, +files/3.2.1/postinstall-en.txt,
+  +files/3.4.2/reconfig, -files/postinstall-en-3.4.2.txt,
+  +files/3.4.2/rt.conf.d, +files/3.4.2/rt.init.d,
+  +files/3.4.2/rt_apache.conf, +files/3.4.2/rt_apache1_fcgi.conf,
+  +files/3.4.2/rt_apache2_fcgi.conf, -files/config.layout-gentoo,
+  -files/postinstall-en.txt, -files/reconfig, -files/rt_apache.conf,
+  rt-3.2.1.ebuild, rt-3.4.2.ebuild, +rt-3.4.2-r1.ebuild:
+  Added proper FastCGI support for Apache1 and Apache2. Added lighttpd support.
+
+  15 Jun 2005; David Holm <dholm@gentoo.org> rt-3.4.2.ebuild:
+  Added to ~ppc.
+
+  12 Jun 2005; Renat Lumpau <rl03@gentoo.org> +files/config.layout-gentoo:
+  Add missing config.layout-gentoo
+
+*rt-3.4.2 (12 Jun 2005)
+
+  12 Jun 2005; Renat Lumpau <rl03@gentoo.org> +files/reconfig-3.4.2,
+  +files/postinstall-en-3.4.2.txt, +files/rt_apache.conf, +rt-3.4.2.ebuild:
+  Version bump (bug #67686, #81257). Use custom Gentoo layout instead of sed.
+  Fix MasonLocalComponentDir (#74680). General clean-up.
+
+  10 May 2005; Elfyn McBratney <beu@gentoo.org> rt-3.2.1.ebuild:
+  dev-perl/libapreq{,2} -> www-apache
+
+  03 Sep 2004; David Holm <dholm@gentoo.org> rt-3.2.1.ebuild:
+  Added to ~ppc.
+
+  02 Sep 2004; Renat Lumpau <rl03@gentoo.org> files/reconfig:
+  reconfig hook now clean up after itself.
+
+  02 Sep 2004; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  rt-3.2.1.ebuild:
+  Warn about MySQL with Innodb (closes bug #62591). Suggest adding PERL5LIB to
+  Apache configs (closes bug #62592).
+
+  27 Aug 2004; Renat Lumpau <rl03@gentoo.org> rt-3.2.1.ebuild:
+  HTML-Mason always pulls in libapreq, so IUSE="apache2" doesn't work. See bug
+  61893. Until libapreq2 is in portage, always use Apache1.
+
+  26 Aug 2004; Renat Lumpau <rl03@gentoo.org> files/reconfig:
+  Fixed db upgrade instructions.
 
 *rt-3.2.1 (25 Aug 2004)
 
diff --git a/www-apps/rt/Manifest b/www-apps/rt/Manifest
index a36ab8c1567e..2a28e5547a09 100644
--- a/www-apps/rt/Manifest
+++ b/www-apps/rt/Manifest
@@ -1,6 +1,17 @@
-MD5 d7ebfa86fdc6018ed994013a2123281a rt-3.2.1.ebuild 4100
-MD5 71d26c2d378bae4e6cc8488b05fb6b5a ChangeLog 430
+MD5 92dc20327e49512a91079db5434c7244 ChangeLog 4087
 MD5 224c312cc23d02aa06c26a4da3cc1f90 metadata.xml 221
-MD5 6737ba4198d78323c15c8b23da1dd323 files/postinstall-en.txt 1559
+MD5 939107934a799efb520c62c057341273 rt-3.2.1.ebuild 4362
+MD5 ead23ec5d52fefb7d8ba409ff8302d32 rt-3.4.3.ebuild 5999
 MD5 5f5c3f76ea4676e743612e38341780fe files/digest-rt-3.2.1 61
-MD5 7350a2201d6605b8e399a1fe3ce59652 files/reconfig 847
+MD5 74849aa771037cfdb03fc4a8b8d01af6 files/digest-rt-3.4.3 61
+MD5 15fc088b37155656e008679f3c07eea7 files/3.2.1/postinstall-en.txt 1648
+MD5 0706d6edcd1c4e23f526d611c9c6b531 files/3.2.1/reconfig 1170
+MD5 4dcfdbf63b882b398473d975b34fa23e files/3.4.2/config.layout-gentoo 616
+MD5 3a24e1ccdc0d6b7c6b0d40e19c586365 files/3.4.2/postinstall-en.txt 703
+MD5 bf81df666e02df7b1e6f73ee9908a767 files/3.4.2/reconfig 1206
+MD5 c807deb11e08ab9f37a658bd5e971c7f files/3.4.2/rt.conf.d 405
+MD5 54a1cd04dc0d0788ce920d941e5601d0 files/3.4.2/rt.init.d 1019
+MD5 3d2e627499ec86839cc0099719fcc3bd files/3.4.2/rt_apache.conf 574
+MD5 b54ebbfd3fc1dd2a49d396e3dba2b857 files/3.4.2/rt_apache1_fcgi.conf 990
+MD5 73c354dd8ba0f64a74e5c6cd01b33834 files/3.4.2/rt_apache2_fcgi.conf 993
+MD5 cee32ca276838f6d74230c66d0bfc961 files/3.4.2/Callback.patch 1567
diff --git a/www-apps/rt/files/3.4.2/postinstall-en.txt b/www-apps/rt/files/3.4.2/postinstall-en.txt
index 821fbb28b410..9a1c3a3301fd 100644
--- a/www-apps/rt/files/3.4.2/postinstall-en.txt
+++ b/www-apps/rt/files/3.4.2/postinstall-en.txt
@@ -5,8 +5,8 @@ Please follow the Gentoo install guide found at
 http://wiki.bestpractical.com/index.cgi?GentooInstallGuide
 
 Your local config files are located here:
-${VHOST_ROOT}/${P}/etc/RT_Config.pm
-${VHOST_ROOT}/${P}/etc/RT_SiteConfig.pm
+${VHOST_ROOT}/${PV}-${PVR}/etc/RT_Config.pm
+${VHOST_ROOT}/${PV}-${PVR}/etc/RT_SiteConfig.pm
 
 If you need more help, consider searching the mailing list (Google site:lists.fsck.com )
 
diff --git a/www-apps/rt/files/3.4.2/reconfig b/www-apps/rt/files/3.4.2/reconfig
index f2fdfe0451dc..e71d24fdbb70 100644
--- a/www-apps/rt/files/3.4.2/reconfig
+++ b/www-apps/rt/files/3.4.2/reconfig
@@ -1,34 +1,38 @@
 #!/bin/bash
+PF=${PN}-${PVR}
+
+die() {
+	echo "#####"
+	echo $1
+	echo "#####"
+	exit 1
+}
+
 if [ $1 = "install" ]; then
 	# fix location
-	cd ${VHOST_ROOT}/${P}
-	sed -e "s|${MY_HOSTROOTDIR}/${P}|${VHOST_ROOT}/${P}|g
-		s|${MY_HTDOCSDIR}|${MY_INSTALLDIR}|g" -i bin/* lib/RT.pm sbin/* etc/RT_Config.pm
+	cd ${VHOST_ROOT}/${PF}
+	sed -e "s|${MY_HOSTROOTDIR}/${PF}|${VHOST_ROOT}/${PF}|g
+		s|${MY_HTDOCSDIR}|${MY_INSTALLDIR}|g" -i bin/* lib/RT.pm sbin/* etc/RT_Config.pm || die
 
 	# fix Apache configs
-	sed -e "s|RT_DIR|${VHOST_ROOT}/${P}|g
-		s|HTDOCS|${MY_INSTALLDIR}|g" -i ${MY_SERVERCONFIGDIR}/apache*
+	sed -e "s|RT_DIR|${VHOST_ROOT}/${PF}|g
+		s|HTDOCS|${MY_INSTALLDIR}|g" -i ${MY_SERVERCONFIGDIR}/apache* || die
 
 	# check for upgrades
-	cd ${VHOST_ROOT}/${P}/upgrade
+	cd ${VHOST_ROOT}/${PF}/upgrade
 	echo "You may need to update your database."
 	echo "For each item in the output below"
 	echo "whose name is greater than your previously installed RT version,"
-	echo "rt-setup-database --action schema --datadir ${VHOST_ROOT}/${P}/upgrade/<version>"
-	echo "rt-setup-database --action acl --datadir ${VHOST_ROOT}/${P}/upgrade/<version>"
-	echo "rt-setup-database --action insert --datadir ${VHOST_ROOT}/${P}/upgrade/<version>"
+	echo "rt-setup-database --action schema --datadir ${VHOST_ROOT}/${PF}/upgrade/<version>"
+	echo "rt-setup-database --action acl --datadir ${VHOST_ROOT}/${PF}/upgrade/<version>"
+	echo "rt-setup-database --action insert --datadir ${VHOST_ROOT}/${PF}/upgrade/<version>"
 	echo "Don't forget to read the online installation guide for more details"
 	ls
 
 elif [ $1 = "clean" ]; then
-	# braindead - set ${P}
-	MY_PV=$(basename $(dirname ${MY_HOSTROOTDIR}))
-	MY_PN=$(basename $(dirname $(dirname ${MY_HOSTROOTDIR})))
-	MY_P="${MY_PN}-${MY_PV}"
-
-	if [[ "${VHOST_ROOT}${MY_P}" ]]; then 
-		rm -rf ${VHOST_ROOT}/${MY_P}/bin ${VHOST_ROOT}/${MY_P}/lib/RT.pm ${VHOST_ROOT}/${MY_P}/sbin ${VHOST_ROOT}/${MY_P}/etc/RT_Config.pm
-	else
-		echo "Variables not set!"
-	fi
+	echo "Please examine the contents of the following directories"
+	echo "and delete anything that is no longer necessary"
+	echo 
+	echo ${VHOST_ROOT}/${PF}
+	echo ${MY_INSTALLDIR}
 fi
diff --git a/www-apps/rt/files/3.4.2/rt.conf.d b/www-apps/rt/files/3.4.2/rt.conf.d
index e43336fa8ecf..a45711ea71c0 100644
--- a/www-apps/rt/files/3.4.2/rt.conf.d
+++ b/www-apps/rt/files/3.4.2/rt.conf.d
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/files/3.4.2/rt.conf.d,v 1.1 2005/06/21 02:12:38 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/files/3.4.2/rt.conf.d,v 1.1.1.1 2005/11/30 09:36:58 chriswhite Exp $
 
 # Config file for /etc/init.d/rt
 
diff --git a/www-apps/rt/files/3.4.2/rt.init.d b/www-apps/rt/files/3.4.2/rt.init.d
index a19aa0ffa51a..73a35ebabb8a 100755
--- a/www-apps/rt/files/3.4.2/rt.init.d
+++ b/www-apps/rt/files/3.4.2/rt.init.d
@@ -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/www-apps/rt/files/3.4.2/rt.init.d,v 1.1 2005/06/21 02:12:38 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/files/3.4.2/rt.init.d,v 1.1.1.1 2005/11/30 09:36:58 chriswhite Exp $
 
 depend() {
 	use mysql postgresql lighttpd
@@ -14,16 +14,17 @@ start() {
 		/sbin/start-stop-daemon -o --quiet --start \
 		--startas ${RTPATH}/bin/mason_handler.fcgi \
 		--pidfile ${PIDFILE} -c ${RTUSER} -g ${RTGROUP} -b -d ${RTPATH}
-	# if you experience problems, comment out the line above
-	# and uncomment the line below
-	# --pidfile ${PIDFILE} -c ${RTUSER} -g ${RTGROUP}  -d ${RTPATH}
+	# mason_handler.fcgi doesn't bg itself, so have start-stop-demon do that
+	# if you experience problems, delete the -b flag above
+	# and check if you get any errors
 
-	eend $?
+	# make sure lighttpd can use the socket
 	while true; do
 		[[ -a ${FCGI_SOCKET_PATH} ]] && break
 		sleep 1
 	done
 	chmod g+rwx ${FCGI_SOCKET_PATH}
+	eend $?
 }
 
 stop() {
diff --git a/www-apps/rt/rt-3.2.1.ebuild b/www-apps/rt/rt-3.2.1.ebuild
index 004db1201351..618df19162ba 100644
--- a/www-apps/rt/rt-3.2.1.ebuild
+++ b/www-apps/rt/rt-3.2.1.ebuild
@@ -1,10 +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/www-apps/rt/rt-3.2.1.ebuild,v 1.1 2004/08/25 13:01:01 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/rt-3.2.1.ebuild,v 1.1.1.1 2005/11/30 09:36:58 chriswhite Exp $
 
 inherit webapp eutils
 
-IUSE="mysql postgres fastcgi apache2"
+IUSE="mysql postgres fastcgi"
+#IUSE="mysql postgres fastcgi apache2"
 
 DESCRIPTION="RT is an industrial-grade ticketing system"
 HOMEPAGE="http://www.bestpractical.com/rt/"
@@ -12,7 +13,7 @@ SRC_URI="http://www.fsck.com/pub/${PN}/release/${P}.tar.gz
 	ftp://ftp.eu.uu.net/pub/unix/ticketing/${PN}/release/${P}.tar.gz
 	ftp://rhinst.ece.cmu.edu/${PN}/release/${P}.tar.gz"
 
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 
 DEPEND="
 	>=dev-lang/perl-5.8.3
@@ -61,22 +62,24 @@ RDEPEND="
 	mysql? ( >=dev-db/mysql-4.0.13 >=dev-perl/DBD-mysql-2.0416 )
 	postgres? ( >=dev-db/postgresql-7.4.2-r1 dev-perl/DBD-Pg )
 	fastcgi? ( dev-perl/FCGI net-www/mod_fastcgi )
-	apache2? ( >=net-www/apache-2 dev-perl/FCGI net-www/mod_fastcgi )
-	!apache2? ( =net-www/apache-1* =dev-perl/libapreq-1* )
+	!fastcgi? ( =www-apache/libapreq-1* )
+	=net-www/apache-1*
 "
-#	apache2? ( >=net-www/apache-2  >=dev-perl/mod_perl-1.99.11 >=dev-perl/libapreq-2 ) : ( =net-www/apache-1* dev-perl/libapreq-1* )
+#	apache2? ( >=net-www/apache-2 dev-perl/FCGI net-www/mod_fastcgi )
+#	!apache2? ( =net-www/apache-1* =www-apache/libapreq-1* )
 
 LICENSE="GPL-2"
 
 pkg_setup() {
 	webapp_pkg_setup
 
-	if use apache2; then
-		ewarn "mod_perl2 isn't ready for prime time, fastcgi will be used instead"
-		ewarn "If you really want mod_perl2, you can edit the ebuild and uncomment a few lines"
-		ewarn "but if your RT breaks, you get to keep the pieces."
-		ewarn
-	fi
+#	if use apache2; then
+#		ewarn "mod_perl2 isn't ready for prime time, fastcgi will be used instead"
+#		ewarn "If you really want mod_perl2, you can edit the ebuild and uncomment a few lines"
+#		ewarn "but if your RT breaks, you get to keep the pieces."
+#		ewarn
+#	fi
+	ewarn "RT needs MySQL with innodb support"
 	ewarn
 	ewarn "If you are upgrading from an existing _RT2_ installation,"
 	ewarn "stop this ebuild (Ctrl-C now), download the upgrade tool,"
@@ -94,9 +97,9 @@ src_unpack() {
 
 src_compile() {
 	# capture the list of files from configure to patch later on
-	files=`./configure --prefix=${D}/usr \
+	files=$(./configure --prefix=${D}/usr \
 		--with-web-user=apache \
-		--with-web-group=apache | grep creating | cut -d':' -f2 | cut -d' ' -f3`
+		--with-web-group=apache | grep creating | cut -d':' -f2 | cut -d' ' -f3)
 	# ./configure doesn't accept locations, so patch these files directly
 	sed -i "s|/usr/etc|${MY_HOSTROOTDIR}/rt-config|
 			s|/usr/man|/usr/share/man|
@@ -110,10 +113,17 @@ src_compile() {
 	" ${files}
 
 	# check for missing deps and ask to report if something is broken
-	if `make testdeps | grep "MISSING"`; then
-		ewarn "Missing Perl dependency, please file a bug in the Gentoo Bugzilla with the information above"
+	/usr/bin/perl ./sbin/rt-test-dependencies --verbose \
+		$(use_with mysql) \
+		$(use_with postgres pg) > ${T}/t
+	if grep -q "MISSING" ${T}/t; then
+		ewarn "Missing Perl dependency!"
+		ewarn
+		cat ${T}/t
+		ewarn
+		ewarn "Please file a bug in the Gentoo Bugzilla with the information above"
 		ewarn "and assign it to rl03@gentoo.org"
-		die "Missing dependencies"
+		die "Missing dependencies."
 	fi
 }
 
@@ -137,7 +147,7 @@ src_install() {
 	grep -Rl "${D}" * | xargs dosed
 	chmod +r ${D}/${MY_HOSTROOTDIR}/rt-config/RT*
 
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-	webapp_hook_script ${FILESDIR}/reconfig
+	webapp_postinst_txt en ${FILESDIR}/${PV}/postinstall-en.txt
+	webapp_hook_script ${FILESDIR}/${PV}/reconfig
 	webapp_src_install
 }
diff --git a/www-apps/rt/rt-3.4.3.ebuild b/www-apps/rt/rt-3.4.3.ebuild
index 0634b65b90f9..d9fef1d8e389 100644
--- a/www-apps/rt/rt-3.4.3.ebuild
+++ b/www-apps/rt/rt-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/www-apps/rt/rt-3.4.3.ebuild,v 1.1 2005/08/11 23:45:59 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/rt-3.4.3.ebuild,v 1.1.1.1 2005/11/30 09:36:58 chriswhite Exp $
 
 inherit webapp eutils
 
@@ -12,10 +12,9 @@ SRC_URI="http://download.bestpractical.com/pub/${PN}/release/${P}.tar.gz
 	ftp://ftp.eu.uu.net/pub/unix/ticketing/${PN}/release/${P}.tar.gz
 	ftp://rhinst.ece.cmu.edu/${PN}/release/${P}.tar.gz"
 
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 
 DEPEND="
-	>=net-www/webapp-config-1.11-r1
 	>=dev-lang/perl-5.8.3
 	>=dev-perl/Params-Validate-0.02
 	dev-perl/Cache-Cache
@@ -95,7 +94,7 @@ add_user_rt() {
 	if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
 		# check uid
 		rt_uid=$(egetent passwd "${euser}" | cut -d: -f3)
-		if `expr ${rt_uid} '<' 1000 > /dev/null`; then
+		if $(expr ${rt_uid} '<' 1000 > /dev/null); then
 			ewarn "uid of user rt is less than 1000. suexec2 will not work."
 			ewarn "If you want to use FastCGI, please delete the user 'rt'"
 			ewarn "from your system and re-emerge www-apps/rt"
@@ -119,7 +118,7 @@ add_user_rt() {
 
 	einfo " - Userid: ${euid}"
 
-	enewuser rt ${euid} /bin/false /dev/null rt > /dev/null
+	enewuser rt ${euid} -1 /dev/null rt > /dev/null
 	return 0
 }
 
@@ -143,11 +142,15 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+	epatch ${FILESDIR}/3.4.2/Callback.patch # fix for bug #109745
 
 	# add Gentoo-specific layout
 	cat ${FILESDIR}/3.4.2/config.layout-gentoo >> config.layout
 	sed -e "s|PREFIX|${D}/${MY_HOSTROOTDIR}/${PF}|
 			s|HTMLDIR|${D}/${MY_HTDOCSDIR}|g" -i ./config.layout || die
+
+	# don't need to check dev dependencies
+	sed -e "s|\$args{'with-DEV'} =1;|#\$args{'with-DEV'} =1;|" -i sbin/rt-test-dependencies.in || die
 }
 
 src_compile() {
@@ -166,7 +169,16 @@ src_compile() {
 		--with-web-group=${web}
 
 	# check for missing deps and ask to report if something is broken
-	make testdeps > ${T}/t
+	local myconf="--verbose $(use_with mysql) \
+		$(use_with postgres pg) \
+		$(use_with fastcgi) \
+		$(use_with lighttpd fastcgi)"
+	if ! useq fastcgi && ! useq lighttpd; then
+		myconf="${myconf} $(use_with apache2 modperl2)"
+		! useq apache2 && myconf="${myconf} --with-modperl1"
+	fi
+
+	/usr/bin/perl ./sbin/rt-test-dependencies ${myconf} > ${T}/t
 	if grep -q "MISSING" ${T}/t; then
 		ewarn "Missing Perl dependency!"
 		ewarn
diff --git a/www-apps/scgi/ChangeLog b/www-apps/scgi/ChangeLog
index 4f11db9b2030..2733ce7126a0 100644
--- a/www-apps/scgi/ChangeLog
+++ b/www-apps/scgi/ChangeLog
@@ -1,6 +1,22 @@
-# ChangeLog for net-www/scgi
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/scgi/ChangeLog,v 1.1 2004/08/15 15:39:21 stuart Exp $
+# ChangeLog for www-apps/scgi
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/scgi/ChangeLog,v 1.1.1.1 2005/11/30 09:36:54 chriswhite Exp $
+
+*scgi-1.2 (02 Mar 2005)
+
+  02 Mar 2005; Benedikt Boehm <hollow@gentoo.org> metadata.xml,
+  +scgi-1.2.ebuild:
+  version bump to 1.2 + new metadata
+
+  16 Nov 2004; Robin H. Johnson <robbat2@gentoo.org> scgi-1.2_alpha1.ebuild,
+  scgi-1.2_alpha2.ebuild:
+  fix bug #71477. alpha2 in stable x86.
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  31 Aug 2004; David Holm <dholm@gentoo.org> scgi-1.2_alpha2.ebuild:
+  Added to ~ppc.
 
 *scgi-1.2_alpha1 (15 Aug 2004)
 
diff --git a/www-apps/scgi/Manifest b/www-apps/scgi/Manifest
index 574421208479..ea432bd43ed8 100644
--- a/www-apps/scgi/Manifest
+++ b/www-apps/scgi/Manifest
@@ -1,6 +1,18 @@
-MD5 b003a111fcfa6d80cfcfd37c868f5365 scgi-1.2_alpha2.ebuild 648
-MD5 00f9bddab4466c2eb4136a5ae86d2855 scgi-1.2_alpha1.ebuild 647
-MD5 205cd90344a8507610b6444b95e3499a ChangeLog 634
-MD5 0c1ffc3eff281366ee07df94a66166e6 metadata.xml 160
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ab4b88efe687bdbdf4d6d827d53c770a ChangeLog 1285
+MD5 7092d8881e1387d40515b82e1c4e9afb files/digest-scgi-1.2 59
 MD5 fe6e3027503038b59f1e9b4ee2cb3baa files/digest-scgi-1.2_alpha1 61
 MD5 7ec590d1ee6da7b63a722808c6758ee7 files/digest-scgi-1.2_alpha2 61
+MD5 7272d8b6d09e3e301b6a08aa9c912eb0 metadata.xml 226
+MD5 c48c2a3665c6463c4769ff8fb1351805 scgi-1.2.ebuild 621
+MD5 183dc33a6debba1e4d370770c8c47e22 scgi-1.2_alpha1.ebuild 671
+MD5 58ca92f3121021a36283441896b7665d scgi-1.2_alpha2.ebuild 676
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDSXbWKf2g/qXtneoRAjzFAJ9fr+F/Iuz5jmx8jhFRtopslyD6VACfcQkU
+MgHyLRr9v1YchIsuylLEmIc=
+=6/7j
+-----END PGP SIGNATURE-----
diff --git a/www-apps/scgi/metadata.xml b/www-apps/scgi/metadata.xml
index 631fc921d87a..ff5b6490402e 100644
--- a/www-apps/scgi/metadata.xml
+++ b/www-apps/scgi/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>net-www</herd>
+<herd>apache</herd>
+<maintainer>
+  <email>apache-bugs@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/www-apps/scgi/scgi-1.2.ebuild b/www-apps/scgi/scgi-1.2.ebuild
index fa3ac754b6b9..f7cb785bff37 100644
--- a/www-apps/scgi/scgi-1.2.ebuild
+++ b/www-apps/scgi/scgi-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/www-apps/scgi/scgi-1.2.ebuild,v 1.1 2005/03/02 07:18:33 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/scgi/scgi-1.2.ebuild,v 1.1.1.1 2005/11/30 09:36:54 chriswhite Exp $
 
 inherit distutils
 
diff --git a/www-apps/scgi/scgi-1.2_alpha1.ebuild b/www-apps/scgi/scgi-1.2_alpha1.ebuild
index d73ef2fc0fd3..e67a9a875c07 100644
--- a/www-apps/scgi/scgi-1.2_alpha1.ebuild
+++ b/www-apps/scgi/scgi-1.2_alpha1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/scgi/scgi-1.2_alpha1.ebuild,v 1.1 2004/08/15 15:39:21 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/scgi/scgi-1.2_alpha1.ebuild,v 1.1.1.1 2005/11/30 09:36:54 chriswhite Exp $
+
+inherit distutils
 
 MY_P=${P/_alpha/a}
 S=${WORKDIR}/${MY_P}
@@ -12,9 +14,8 @@ SLOT="0"
 KEYWORDS="x86"
 IUSE=""
 
-inherit distutils
-
 pkg_postinst() {
+	distutils_pkg_postinst
 	einfo "This package does not install mod_scgi"
 	einfo "Please 'emerge mod_scgi' if you need it"
 }
diff --git a/www-apps/scgi/scgi-1.2_alpha2.ebuild b/www-apps/scgi/scgi-1.2_alpha2.ebuild
index f5d70ca208d1..11f93eaf5e4d 100644
--- a/www-apps/scgi/scgi-1.2_alpha2.ebuild
+++ b/www-apps/scgi/scgi-1.2_alpha2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/scgi/scgi-1.2_alpha2.ebuild,v 1.1 2004/08/15 15:39:21 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/scgi/scgi-1.2_alpha2.ebuild,v 1.1.1.1 2005/11/30 09:36:54 chriswhite Exp $
+
+inherit distutils
 
 MY_P=${P/_alpha/a}
 S=${WORKDIR}/${MY_P}
@@ -9,12 +11,11 @@ HOMEPAGE="http://www.mems-exchange.org/software/scgi/"
 SRC_URI="http://www.mems-exchange.org/software/files/${PN}/${MY_P}.tar.gz"
 LICENSE="CNRI"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
 IUSE=""
 
-inherit distutils
-
 pkg_postinst() {
+	distutils_pkg_postinst
 	einfo "This package does not install mod_scgi"
 	einfo "Please 'emerge mod_scgi' if you need it"
 }
diff --git a/www-apps/sitebar/ChangeLog b/www-apps/sitebar/ChangeLog
index c4770251ede6..19e80095dd69 100644
--- a/www-apps/sitebar/ChangeLog
+++ b/www-apps/sitebar/ChangeLog
@@ -1,6 +1,34 @@
 # ChangeLog for www-apps/sitebar
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/sitebar/ChangeLog,v 1.1 2004/08/18 20:30:22 rl03 Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/sitebar/ChangeLog,v 1.1.1.1 2005/11/30 09:37:03 chriswhite Exp $
+
+*sitebar-3.3.5 (28 Sep 2005)
+
+  28 Sep 2005; Renat Lumpau <rl03@gentoo.org> +sitebar-3.3.5.ebuild:
+  Version bump wrt bug #107445.
+
+  24 Aug 2005; Homer Parker <hparker@gentoo.org> sitebar-3.3.3.ebuild:
+  Marked ~amd64.
+
+  22 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt:
+  Housekeeping
+
+  22 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  sitebar-3.3.3.ebuild:
+  Housekeeping
+
+*sitebar-3.3.3 (03 Jul 2005)
+
+  03 Jul 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  +sitebar-3.3.3.ebuild:
+  Version bump, closes #94332
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  sitebar-3.2.6.ebuild:
+  Masked sitebar-3.2.6.ebuild stable for ppc
+
+  31 Aug 2004; David Holm <dholm@gentoo.org> sitebar-3.2.6.ebuild:
+  Added to ~ppc.
 
 *sitebar-3.2.6 (18 Aug 2004)
 
diff --git a/www-apps/sitebar/Manifest b/www-apps/sitebar/Manifest
index 461d3966b67c..3fda6213ae8d 100644
--- a/www-apps/sitebar/Manifest
+++ b/www-apps/sitebar/Manifest
@@ -1,5 +1,19 @@
-MD5 785789c5073d493e765f8ab0d92a8df4 ChangeLog 303
-MD5 a8bdd680f227a1586f637c82a2e080c8 sitebar-3.2.6.ebuild 736
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8fdd2fe61a30b12f98ef693e1501b9fd sitebar-3.3.3.ebuild 896
+MD5 8b2638d2745871fd4bb31e3d574a3a49 sitebar-3.3.5.ebuild 893
+MD5 895c2c1f7206eac49a25365069fccefe ChangeLog 1182
+MD5 e5ff6b38f58910b1a158919cc8ab3601 sitebar-3.2.6.ebuild 841
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
-MD5 beaa9ebb360d0d2629fad3382282a40c files/postinstall-en.txt 77
+MD5 bdd0317fff7e2cccecc51d7d97cd8dc7 files/postinstall-en.txt 93
 MD5 55c56a38fde4a9d4d2c9cd141259ccba files/digest-sitebar-3.2.6 66
+MD5 ef9082a8a38ad403f80d049f1d91644b files/digest-sitebar-3.3.3 66
+MD5 3f8d5cf97d2bf0569e9ecf305c6e686e files/digest-sitebar-3.3.5 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDOeJtEzitwsaoONoRAj+aAJ0dtn+hvuWyWp1e5NUmOF+cjhV8hwCgzJhj
+ZhshaimNySiYM6p/PQQU2PA=
+=2HPk
+-----END PGP SIGNATURE-----
diff --git a/www-apps/sitebar/files/postinstall-en.txt b/www-apps/sitebar/files/postinstall-en.txt
index b1bff6cedafe..2e7b45dd6e3b 100644
--- a/www-apps/sitebar/files/postinstall-en.txt
+++ b/www-apps/sitebar/files/postinstall-en.txt
@@ -1,2 +1 @@
-
-Now go to http://yourhost/sitebar/sitebar.php to complete the installation.
+Now go to http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/sitebar.php to complete the installation.
diff --git a/www-apps/sitebar/sitebar-3.2.6.ebuild b/www-apps/sitebar/sitebar-3.2.6.ebuild
index 4e168c20cdce..6146ed264644 100644
--- a/www-apps/sitebar/sitebar-3.2.6.ebuild
+++ b/www-apps/sitebar/sitebar-3.2.6.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/www-apps/sitebar/sitebar-3.2.6.ebuild,v 1.1 2004/08/18 20:30:22 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/sitebar/sitebar-3.2.6.ebuild,v 1.1.1.1 2005/11/30 09:37:04 chriswhite Exp $
 
 inherit webapp
 
 DESCRIPTION="The Bookmark Server for Personal and Team Use"
 HOMEPAGE="http://sitebar.sourceforge.net/"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ppc"
 
 IUSE=""
 MY_PN=${PN/sitebar/SiteBar}
diff --git a/www-apps/sitebar/sitebar-3.3.3.ebuild b/www-apps/sitebar/sitebar-3.3.3.ebuild
index a3bbb146e404..6051759bfe9c 100644
--- a/www-apps/sitebar/sitebar-3.3.3.ebuild
+++ b/www-apps/sitebar/sitebar-3.3.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/www-apps/sitebar/sitebar-3.3.3.ebuild,v 1.1 2005/07/03 18:24:26 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/sitebar/sitebar-3.3.3.ebuild,v 1.1.1.1 2005/11/30 09:37:04 chriswhite Exp $
 
 inherit webapp
 
 DESCRIPTION="The Bookmark Server for Personal and Team Use"
 HOMEPAGE="http://sitebar.sourceforge.net/"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE=""
 MY_PN=${PN/sitebar/SiteBar}
@@ -15,14 +15,10 @@ S=${WORKDIR}/${MY_PN}-${PV}
 SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}.tar.bz2"
 
 DEPEND="net-www/apache
-		>=virtual/php-4.1
+		virtual/php
 		>=dev-db/mysql-3.23"
 LICENSE="GPL-2"
 
-src_compile() {
-	:;
-}
-
 src_install() {
 	webapp_src_preinst
 	dodoc readme.txt doc/history.txt doc/install.txt doc/troubleshooting.txt
diff --git a/www-apps/sitebar/sitebar-3.3.5.ebuild b/www-apps/sitebar/sitebar-3.3.5.ebuild
index 57036951ef6e..cd4798c6d0f8 100644
--- a/www-apps/sitebar/sitebar-3.3.5.ebuild
+++ b/www-apps/sitebar/sitebar-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/www-apps/sitebar/sitebar-3.3.5.ebuild,v 1.1 2005/09/28 00:22:57 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/sitebar/sitebar-3.3.5.ebuild,v 1.1.1.1 2005/11/30 09:37:04 chriswhite Exp $
 
 inherit webapp
 
diff --git a/www-apps/swish-e/ChangeLog b/www-apps/swish-e/ChangeLog
index a8f4e5dec500..41b9e57e5056 100644
--- a/www-apps/swish-e/ChangeLog
+++ b/www-apps/swish-e/ChangeLog
@@ -1,6 +1,39 @@
-# ChangeLog for net-www/swish-e
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/swish-e/ChangeLog,v 1.1 2004/08/15 15:41:43 stuart Exp $
+# ChangeLog for www-apps/swish-e
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/swish-e/ChangeLog,v 1.1.1.1 2005/11/30 09:36:55 chriswhite Exp $
+
+*swish-e-2.4.3-r1 (08 Sep 2005)
+*swish-e-2.2.2-r2 (08 Sep 2005)
+
+  08 Sep 2005; Elfyn McBratney <beu@gentoo.org> +swish-e-2.2.2-r2.ebuild,
+  +swish-e-2.4.3-r1.ebuild:
+  Rev bumps (include more docs/example configs). Patch idea thanks to kalium
+  at gmx.de.
+
+*swish-e-2.4.3 (01 May 2005)
+
+  01 May 2005; Michael Cummings <mcummings@gentoo.org>
+  +swish-e-2.4.3.ebuild:
+  New version of swish-e, which means bug 37165 can finally be closed.
+  Revamped the ebuild a ton - a lot of optional perl modules now, as well as a
+  few I have no good use flag for enabling. Test and let me know :)
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  21 Oct 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  swish-e-2.2.2-r1.ebuild:
+  fix inherit line
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  swish-e-2.2.2-r1.ebuild:
+  Masked swish-e-2.2.2-r1.ebuild stable for ppc
+
+  31 Aug 2004; David Holm <dholm@gentoo.org> swish-e-2.2.2-r1.ebuild:
+  Added to ~ppc.
 
 *swish-e-2.2.2-r1 (15 Aug 2004)
 
@@ -15,6 +48,6 @@
   23910. Thanks rigo!
 
 *swish-e-2.2.2 (16 Mar 2003)
-  16 Mar 2003; J.Alberto Su�rez L�pez <bass@gentoo.org> swish-e-2.2.2.ebuild:
+  16 Mar 2003; J.Alberto Suárez López <bass@gentoo.org> swish-e-2.2.2.ebuild:
   initial ebuild
 
diff --git a/www-apps/swish-e/Manifest b/www-apps/swish-e/Manifest
index c326a057e0d3..98b8995ca3e0 100644
--- a/www-apps/swish-e/Manifest
+++ b/www-apps/swish-e/Manifest
@@ -1,3 +1,20 @@
-MD5 8d6988e20f959629c09f00c83ea5dcd3 swish-e-2.2.2-r1.ebuild 904
-MD5 71eec8ec549bf4e9479cf352db9e9976 ChangeLog 544
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ca578dcf545fc58b733b6640e6749489 swish-e-2.4.3-r1.ebuild 1712
+MD5 58e5db560ab2c09d34270b201352068c swish-e-2.2.2-r1.ebuild 892
+MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
+MD5 f90789edf8a1b32e4bee487e7476a79d ChangeLog 1799
+MD5 b9556bd730ff4631983bfad590fd2834 swish-e-2.4.3.ebuild 1570
+MD5 08d6578d805c2ddde5af5720f81cc323 swish-e-2.2.2-r2.ebuild 1037
+MD5 0af7d0e3bdf537f307d8f2e7df0bd924 files/digest-swish-e-2.4.3 66
+MD5 fc5a8d65b3761bfbd7f7744fda4c324e files/digest-swish-e-2.2.2-r2 65
+MD5 0af7d0e3bdf537f307d8f2e7df0bd924 files/digest-swish-e-2.4.3-r1 66
 MD5 fc5a8d65b3761bfbd7f7744fda4c324e files/digest-swish-e-2.2.2-r1 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDIEZLjUHll2nfF60RAsIKAJ9oOsi8/wB3LOl2XXudpgiiPE2OVgCdGOYM
+g4Dhkxted7bPc51srAfTkQ8=
+=MjqC
+-----END PGP SIGNATURE-----
diff --git a/www-apps/swish-e/swish-e-2.2.2-r1.ebuild b/www-apps/swish-e/swish-e-2.2.2-r1.ebuild
index 296af6c94e89..68e0d765ad26 100644
--- a/www-apps/swish-e/swish-e-2.2.2-r1.ebuild
+++ b/www-apps/swish-e/swish-e-2.2.2-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/www-apps/swish-e/swish-e-2.2.2-r1.ebuild,v 1.1 2004/08/15 15:41:43 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/swish-e/swish-e-2.2.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:54 chriswhite Exp $
 
-use perl && inherit perl-module
+inherit perl-module
 
 DESCRIPTION="Simple Web Indexing System for Humans - Enhanced"
 HOMEPAGE="http://www.swish-e.org/"
@@ -10,7 +10,7 @@ SRC_URI="http://www.swish-e.org/Download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ppc"
 IUSE="perl"
 
 DEPEND=">=sys-libs/zlib-1.1.3
diff --git a/www-apps/swish-e/swish-e-2.2.2-r2.ebuild b/www-apps/swish-e/swish-e-2.2.2-r2.ebuild
index 003acc28a745..305232751d6c 100644
--- a/www-apps/swish-e/swish-e-2.2.2-r2.ebuild
+++ b/www-apps/swish-e/swish-e-2.2.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/www-apps/swish-e/swish-e-2.2.2-r2.ebuild,v 1.1 2005/09/08 13:09:32 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/swish-e/swish-e-2.2.2-r2.ebuild,v 1.1.1.1 2005/11/30 09:36:55 chriswhite Exp $
 
 inherit perl-module
 
diff --git a/www-apps/swish-e/swish-e-2.4.3-r1.ebuild b/www-apps/swish-e/swish-e-2.4.3-r1.ebuild
index 8ffa9b80a7ef..8110a16101f3 100644
--- a/www-apps/swish-e/swish-e-2.4.3-r1.ebuild
+++ b/www-apps/swish-e/swish-e-2.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/www-apps/swish-e/swish-e-2.4.3-r1.ebuild,v 1.1 2005/09/08 13:09:32 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/swish-e/swish-e-2.4.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:55 chriswhite Exp $
 
 inherit perl-module
 
diff --git a/www-apps/swish-e/swish-e-2.4.3.ebuild b/www-apps/swish-e/swish-e-2.4.3.ebuild
index e5e70aae7e39..6a947f641727 100644
--- a/www-apps/swish-e/swish-e-2.4.3.ebuild
+++ b/www-apps/swish-e/swish-e-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/www-apps/swish-e/swish-e-2.4.3.ebuild,v 1.1 2005/05/01 15:33:20 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/swish-e/swish-e-2.4.3.ebuild,v 1.1.1.1 2005/11/30 09:36:55 chriswhite Exp $
 
 inherit perl-module
 
diff --git a/www-apps/tikiwiki/ChangeLog b/www-apps/tikiwiki/ChangeLog
index bf38e2b028d8..02ce8a9d961a 100644
--- a/www-apps/tikiwiki/ChangeLog
+++ b/www-apps/tikiwiki/ChangeLog
@@ -1,6 +1,131 @@
-# ChangeLog for net-www/tikiwiki
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/ChangeLog,v 1.1 2004/08/15 15:44:07 stuart Exp $
+# ChangeLog for www-apps/tikiwiki
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/ChangeLog,v 1.1.1.1 2005/11/30 09:37:03 chriswhite Exp $
+
+*tikiwiki-1.9.2 (07 Nov 2005)
+
+  07 Nov 2005; Renat Lumpau <rl03@gentoo.org> tikiwiki-1.9.1.1.ebuild,
+  +tikiwiki-1.9.2.ebuild:
+  Version bump
+
+  26 Oct 2005; Renat Lumpau <rl03@gentoo.org> -files/xmlrpc2-1.8.5.patch,
+  -tikiwiki-1.8.5-r2.ebuild:
+  Removing old version
+
+  24 Oct 2005; Michael Hanselmann <hansmi@gentoo.org>
+  tikiwiki-1.9.1.1.ebuild:
+  Stable on ppc.
+
+  23 Oct 2005; Renat Lumpau <rl03@gentoo.org> -tikiwiki-1.9.1.ebuild:
+  Removing vulnerable version
+
+*tikiwiki-1.9.1.1 (23 Oct 2005)
+
+  23 Oct 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  +tikiwiki-1.9.1.1.ebuild:
+  Version bump wrt security bug #109858.
+
+*tikiwiki-1.9.1 (24 Aug 2005)
+*tikiwiki-1.8.6 (24 Aug 2005)
+
+  24 Aug 2005; Renat Lumpau <rl03@gentoo.org> -files/xmlrpc2-1.9.0.patch,
+  tikiwiki-1.8.5-r2.ebuild, +tikiwiki-1.8.6.ebuild,
+  -tikiwiki-1.9.0-r1.ebuild, +tikiwiki-1.9.1.ebuild:
+  Version bump
+
+  23 Aug 2005; Renat Lumpau <rl03@gentoo.org> tikiwiki-1.9.0-r1.ebuild:
+  Fixing cp -a wrt bug #103487
+
+  22 Aug 2005; Renat Lumpau <rl03@gentoo.org> tikiwiki-1.9.0-r1.ebuild:
+  Housekeeping
+
+  22 Aug 2005; Renat Lumpau <rl03@gentoo.org>
+  -files/tikiwiki-1.8.5-xmlrpc.patch, -tikiwiki-1.8.5-r1.ebuild,
+  -tikiwiki-1.9.0.ebuild:
+  Removing vulnerable versions
+
+  22 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  tikiwiki-1.8.5-r2.ebuild:
+  Stable on ppc.
+
+  22 Aug 2005; Renat Lumpau <rl03@gentoo.org>
+  -files/tikiwiki-1.8.5-xmlrpc.patch, -tikiwiki-1.8.5-r1.ebuild,
+  -tikiwiki-1.9.0.ebuild:
+  Removing vulnerable versions
+
+  21 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/xmlrpc2-1.8.5.patch,
+  files/xmlrpc2-1.9.0.patch:
+  Fixed broken patches
+
+*tikiwiki-1.9.0-r1 (21 Aug 2005)
+*tikiwiki-1.8.5-r2 (21 Aug 2005)
+
+  21 Aug 2005; Renat Lumpau <rl03@gentoo.org> +files/xmlrpc2-1.8.5.patch,
+  +files/xmlrpc2-1.9.0.patch, +tikiwiki-1.8.5-r2.ebuild,
+  +tikiwiki-1.9.0-r1.ebuild:
+  revbump wrt security bug #102377
+
+  10 Jul 2005; Renat Lumpau <rl03@gentoo.org> -tikiwiki-1.8.4.1.ebuild,
+  -tikiwiki-1.8.5.ebuild:
+  Removed old versions
+
+*tikiwiki-1.9.0 (07 Jul 2005)
+
+  07 Jul 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  +tikiwiki-1.9.0.ebuild:
+  Add unstable version (#79078), add postgres USE flag (#85749), warn about
+  php USE flags (#73408).
+
+*tikiwiki-1.8.5-r1 (06 Jul 2005)
+
+  06 Jul 2005; Stuart Herbert <stuart@gentoo.org>
+  +files/tikiwiki-1.8.5-xmlrpc.patch, +tikiwiki-1.8.5-r1.ebuild:
+  Added patch for security bug #97648
+
+  26 Mar 2005; Konstantin Arkhipov <voxus@gentoo.org> tikiwiki-1.8.5.ebuild:
+  Added ~amd64 keyword, closes bug #86726.
+
+  29 Jan 2005; Michael Hanselmann <hansmi@gentoo.org> tikiwiki-1.8.5.ebuild:
+  Stable on ppc, bug 78944.
+
+*tikiwiki-1.8.5 (28 Jan 2005)
+
+  28 Jan 2005; Martin Holzer <mholzer@gentoo.org> +tikiwiki-1.8.5.ebuild:
+  adding new version. security bump see 78944
+
+  07 Jan 2005; Joseph Jezak <josejx@gentoo.org> tikiwiki-1.8.4.1.ebuild:
+  Marked ppc stable for bug #75568.
+
+*tikiwiki-1.8.4.1 (04 Jan 2005)
+
+  04 Jan 2005; Martin Holzer <mholzer@gentoo.org> +tikiwiki-1.8.4.1.ebuild:
+  Version bumped. Security fix. See 75568
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  tikiwiki-1.8.2-r1.ebuild, tikiwiki-1.8.2.ebuild, tikiwiki-1.8.3.ebuild,
+  tikiwiki-1.8.4.ebuild:
+  Masked tikiwiki-1.8.4.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  tikiwiki-1.8.2-r1.ebuild, tikiwiki-1.8.2.ebuild, tikiwiki-1.8.3.ebuild:
+  Masked tikiwiki-1.8.3.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  tikiwiki-1.8.2-r1.ebuild, tikiwiki-1.8.2.ebuild:
+  Masked tikiwiki-1.8.2.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  tikiwiki-1.8.2-r1.ebuild:
+  Masked tikiwiki-1.8.2-r1.ebuild stable for ppc
+
+*tikiwiki-1.8.4 (30 Aug 2004)
+
+  30 Aug 2004; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  +tikiwiki-1.8.4.ebuild:
+  Version bump. Cleaned up postinstall instructions. Closes #59170.
 
 *tikiwiki-1.8.3 (15 Aug 2004)
 
diff --git a/www-apps/tikiwiki/Manifest b/www-apps/tikiwiki/Manifest
index 9372afe4dd1a..0eb5d57dc380 100644
--- a/www-apps/tikiwiki/Manifest
+++ b/www-apps/tikiwiki/Manifest
@@ -1,9 +1,19 @@
-MD5 10e700f5e72d5bd98db8aed8aa037f99 tikiwiki-1.8.2.ebuild 1635
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0634ebc8d268c8fa6cbe516573e12b3d tikiwiki-1.9.1.1.ebuild 2416
+MD5 5a784470ea77c05d6eaeae69d28eeffe tikiwiki-1.9.2.ebuild 2415
+MD5 a1719a8cde06741a7a437cafe9e090a8 tikiwiki-1.8.6.ebuild 2069
+MD5 b60adbf9d43c16b975be552a859e0a70 ChangeLog 5781
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
-MD5 0bbd5547d7480794de55335296ba3768 ChangeLog 1467
-MD5 d4b710d3f2d93edbaea90bfbc3342031 tikiwiki-1.8.2-r1.ebuild 1978
-MD5 18e65d6c028b0b174d1836e2044345e2 tikiwiki-1.8.3.ebuild 1950
-MD5 02710bef8251c7989bb55efc5628bcc6 files/digest-tikiwiki-1.8.2 68
-MD5 bd86652016f6c4480eda7199fa25ebd9 files/postinstall-en.txt 1407
-MD5 02710bef8251c7989bb55efc5628bcc6 files/digest-tikiwiki-1.8.2-r1 68
-MD5 a0ee80f78f566fc992524890c3222b78 files/digest-tikiwiki-1.8.3 68
+MD5 250716051f339a0b1315218e13485039 files/postinstall-en.txt 1396
+MD5 179db1005cef09973bc3ffda69a7bb11 files/digest-tikiwiki-1.8.6 68
+MD5 eaed663821be60f11ff2e161e56b7a45 files/digest-tikiwiki-1.9.2 68
+MD5 7d874ec5f99ae67c3ae819a0d6aec572 files/digest-tikiwiki-1.9.1.1 70
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDb449EzitwsaoONoRAs+3AKDDsbCZBWiA6tM3+mTqthkvvyw+/wCgv0vs
+g3BfFT0NqOwrWo+7aa+9esk=
+=jaKk
+-----END PGP SIGNATURE-----
diff --git a/www-apps/tikiwiki/files/postinstall-en.txt b/www-apps/tikiwiki/files/postinstall-en.txt
index fab991414186..da88b675474b 100644
--- a/www-apps/tikiwiki/files/postinstall-en.txt
+++ b/www-apps/tikiwiki/files/postinstall-en.txt
@@ -2,8 +2,8 @@ Setup Completion
 ---
 
 If there is no existing TikiWiki install and database you will need to
-create an empty database for TikiWiki before starting setup.  For
-example (MySQL):
+create an empty database for TikiWiki before starting setup.
+You can run "emerge --config =${PF}", or (MySQL):
 
 mysql -p -u root mysql <<__EOSQL
   CREATE DATABASE tiki;
@@ -14,9 +14,11 @@ mysql -p -u root mysql <<__EOSQL
   FLUSH PRIVILEGES;
 __EOSQL
 
+If you are using PostgreSQL, please consult your documentation.
+
 
 TikiWiki likes to have a generous PHP environment.  Please edit
-/etc/php4/php.ini or arrange the settings through another mechanism such as
+your php.ini or arrange the settings through another mechanism such as
 Apache .htaccess files.
 
 Tiki requires PHP to have :
@@ -27,9 +29,8 @@ Tiki likes PHP to have :
     ==> 'file_uploads = On'
 
 
-Please read the files in:
-${G_HTDOCSDIR}${G_INSTALLDIR}doc 
-especially if you want clean URLS under Apache.
+Please read the files in ${MY_INSTALLDIR}/doc
+especially if you want clean URLs under Apache.
 
 You may find further information on the Tiki website
     ==> http://tikiwiki.org/InstallGettingStarted
@@ -40,15 +41,9 @@ Note: The equivalent of running setup.sh has already been completed.
 Now, point your browser to the location of tiki-install.php to complete the
 setup/upgrade.  For example:
 
-http://${G_HOSTNAME}/${G_INSTALLDIR}/tiki-install.php
-
+http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/tiki-install.php
 
 You may need to manually rename tiki-install.php to tiki-install.done to
-secure your system.  For example:
-
-cd ${G_HTDOCSDIR}${G_INSTALLDIR}
-mv tiki-install.php tiki-install.done
-
+secure your system.
 
 Enjoy your TikiWiki site.
-
diff --git a/www-apps/tikiwiki/tikiwiki-1.8.6.ebuild b/www-apps/tikiwiki/tikiwiki-1.8.6.ebuild
index c1e0b6e2a0b3..625141b2d48d 100644
--- a/www-apps/tikiwiki/tikiwiki-1.8.6.ebuild
+++ b/www-apps/tikiwiki/tikiwiki-1.8.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/www-apps/tikiwiki/tikiwiki-1.8.6.ebuild,v 1.1 2005/08/24 22:40:37 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/tikiwiki-1.8.6.ebuild,v 1.1.1.1 2005/11/30 09:37:03 chriswhite Exp $
 
 inherit webapp
 
diff --git a/www-apps/tikiwiki/tikiwiki-1.9.1.1.ebuild b/www-apps/tikiwiki/tikiwiki-1.9.1.1.ebuild
index 673d17bcec32..4a3fb6c29abe 100644
--- a/www-apps/tikiwiki/tikiwiki-1.9.1.1.ebuild
+++ b/www-apps/tikiwiki/tikiwiki-1.9.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/www-apps/tikiwiki/tikiwiki-1.9.1.1.ebuild,v 1.1 2005/10/23 15:39:10 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/tikiwiki-1.9.1.1.ebuild,v 1.1.1.1 2005/11/30 09:37:03 chriswhite Exp $
 
 inherit webapp
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 IUSE="mysql postgres graphviz"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="~amd64 ppc ~sparc ~x86"
 
 RDEPEND="virtual/php
 	mysql? ( >=dev-db/mysql-4 )
@@ -80,7 +80,7 @@ pkg_config() {
 
 pkg_postinst() {
 	einfo "To setup a MySQL database, run:"
-	einfo "\"ebuild /var/db/pkg/www-apps/${PF}/${PF}.ebuild config\""
+	einfo "\"emerge --config =${PF}\""
 	einfo "If you are using PostgreSQL, consult your documentation"
 	webapp_pkg_postinst
 }
diff --git a/www-apps/tikiwiki/tikiwiki-1.9.2.ebuild b/www-apps/tikiwiki/tikiwiki-1.9.2.ebuild
index e0cd2a54d716..5f9d826f7087 100644
--- a/www-apps/tikiwiki/tikiwiki-1.9.2.ebuild
+++ b/www-apps/tikiwiki/tikiwiki-1.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/www-apps/tikiwiki/tikiwiki-1.9.2.ebuild,v 1.1 2005/11/07 17:26:00 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/tikiwiki-1.9.2.ebuild,v 1.1.1.1 2005/11/30 09:37:03 chriswhite Exp $
 
 inherit webapp
 
diff --git a/www-apps/trac/ChangeLog b/www-apps/trac/ChangeLog
index b1878de5bae5..e1e46566ac9e 100644
--- a/www-apps/trac/ChangeLog
+++ b/www-apps/trac/ChangeLog
@@ -1,6 +1,108 @@
-# ChangeLog for net-www/trac
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/ChangeLog,v 1.1 2004/08/15 15:47:05 stuart Exp $
+# ChangeLog for www-apps/trac
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/ChangeLog,v 1.1.1.1 2005/11/30 09:37:11 chriswhite Exp $
+
+  20 Nov 2005; Joseph Jezak <josejx@gentoo.org> trac-0.9.ebuild:
+  Marked ~ppc for bug #111069.
+
+  09 Nov 2005; Jason Wever <weeve@gentoo.org> trac-0.9.ebuild:
+  Added ~sparc keyword wrt bug #111069.
+
+  01 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> trac-0.9.ebuild:
+  Marked ~amd64, bug 111069.
+
+*trac-0.9 (31 Oct 2005)
+
+  31 Oct 2005; Julien Allanos <dju@gentoo.org> +files/0.9-postinst-en.txt,
+  +trac-0.9.ebuild:
+  Version bump.
+
+*trac-0.9_beta2 (28 Sep 2005)
+
+  28 Sep 2005; Julien Allanos <dju@gentoo.org>
+  +files/0.9_beta2-postinst-en.txt, +trac-0.9_beta2.ebuild:
+  Version bump (new 0.9 series).
+
+  06 Jul 2005; Julien Allanos <dju@gentoo.org> -files/0.7.1-postinst-en.txt,
+  -files/0.8-postinst-en.txt, -files/0.7-postinst-en.txt,
+  -files/postinst-en.txt, -trac-0.6.1.ebuild, -trac-0.7.ebuild,
+  -trac-0.7.1.ebuild, -trac-0.8.ebuild, -trac-0.8.1.ebuild:
+  Removed old ebuids.
+
+  05 Jul 2005; Julien Allanos <dju@gentoo.org> +files/0.8.4-postinst-en.txt,
+  metadata.xml, trac-0.8.4.ebuild:
+  Fixed dependencies, updated post-installation instructions.
+  Added myself as the maintainer.
+
+  21 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> trac-0.8.4.ebuild:
+  Stable on ppc (#96572).
+
+*trac-0.8.4 (21 Jun 2005)
+
+  21 Jun 2005; Christian Parpart <trapni@gentoo.org> +trac-0.8.4.ebuild:
+  version bump (security fix)
+
+  02 Jun 2005; Christian Parpart <trapni@gentoo.org> trac-0.8.2.ebuild:
+  fixing postinst documentation problem
+
+*trac-0.8.2 (01 Jun 2005)
+
+  01 Jun 2005; Christian Parpart <trapni@gentoo.org> +trac-0.8.2.ebuild:
+  bumping up to 0.8.2
+
+  06 May 2005; Sven Wegener <swegener@gentoo.org> trac-0.8.ebuild,
+  trac-0.8.1.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  01 May 2005; Christian Parpart <trapni@gentoo.org> trac-0.8.1.ebuild:
+  went amd64 back to ~amd64, silvercity needs to stabelize before
+
+  30 Apr 2005; Christian Parpart <trapni@gentoo.org> trac-0.8.1.ebuild:
+  stable on x86 and amd64
+
+  20 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> trac-0.8.ebuild:
+  Stable on ppc.
+
+*trac-0.8.1 (11 Apr 2005)
+
+  11 Apr 2005; Christian Parpart <trapni@gentoo.org>
+  +files/0.8.1-postinst-en.txt, +trac-0.8.1.ebuild:
+  version bump
+
+*trac-0.8.1 (11 Apr 2005)
+
+  11 Apr 2005; Christian Parpart <trapni@gentoo.org>
+  +files/0.8.1-postinst-en.txt, +trac-0.8.1.ebuild:
+  version bump
+
+*trac-0.8 (11 Dec 2004)
+
+  11 Dec 2004; Stuart Herbert <stuart@gentoo.org> +files/0.8-postinst-en.txt,
+  trac-0.7.1.ebuild, +trac-0.8.ebuild:
+  Version bump; thanks to dju` as always ;-)
+
+  30 Nov 2004; Sven Wegener <swegener@gentoo.org> trac-0.7.1.ebuild:
+  Fixed invalid atoms in *DEPEND.
+
+  23 Oct 2004; Jason Wever <weeve@gentoo.org> trac-0.7.1.ebuild:
+  Added ~sparc keyword.
+
+  08 Sep 2004; Renat Lumpau <rl03@gentoo.org> metadata.xml:
+  Fixed herd name
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> trac-0.6.1.ebuild,
+  trac-0.7.1.ebuild, trac-0.7.ebuild:
+  Masked trac-0.7.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> trac-0.6.1.ebuild,
+  trac-0.7.1.ebuild:
+  Masked trac-0.7.1.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> trac-0.6.1.ebuild:
+  Masked trac-0.6.1.ebuild stable for ppc
 
 *trac-0.7 (15 Aug 2004)
 
diff --git a/www-apps/trac/Manifest b/www-apps/trac/Manifest
index 30cf40f335d4..bde796fc9462 100644
--- a/www-apps/trac/Manifest
+++ b/www-apps/trac/Manifest
@@ -1,11 +1,24 @@
-MD5 ffadd359fa0dcd3d9c265724e8b9052a trac-0.6.1.ebuild 1298
-MD5 73efcf8035a4dff6d640d950c848cb70 ChangeLog 1101
-MD5 3d182d43f7f0341a9a42f96694f04e72 metadata.xml 224
-MD5 dc74981c85ac42ee8aebd1be004bc779 trac-0.7.ebuild 1309
-MD5 e51a0203ad1bdcf333331e8ca61a6ee3 trac-0.7.1.ebuild 1334
-MD5 e48341b7627ee627a13e0ea41a0ef826 files/digest-trac-0.6.1 62
-MD5 76a6e6911b2d58e07f08566da7298f3f files/postinst-en.txt 631
-MD5 e5e17601cd3677a53e87ea4887302f81 files/0.7-postinst-en.txt 1013
-MD5 51f89a9fb89c4b1433da0db051f04147 files/digest-trac-0.7 60
-MD5 94e075de9e02819d253096d0527de6d8 files/digest-trac-0.7.1 62
-MD5 043ef6a77428424a22fb762977533416 files/0.7.1-postinst-en.txt 1252
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f08967cbcd0f6b25b4d58ecd436c43b6 ChangeLog 4679
+MD5 d9fb4f2a1d8f5d4653af732dd6504f7f files/0.8.1-postinst-en.txt 1242
+MD5 469236380f880bdb92903ecee4587ae3 files/0.8.4-postinst-en.txt 1035
+MD5 1ef68ae7232130e8152d6e007afc4352 files/0.9-postinst-en.txt 2275
+MD5 d14afae5ff44b00733239243fc47890a files/0.9_beta2-postinst-en.txt 2204
+MD5 ba2d3ff29f0357234fd123f84c210ec3 files/digest-trac-0.8.2 62
+MD5 8923e5fb9575c109266bbab2350940ff files/digest-trac-0.8.4 62
+MD5 9cc88e9b369b785a340664742074faf1 files/digest-trac-0.9 60
+MD5 fea08b6123da2cd35a5428f420a55dbf files/digest-trac-0.9_beta2 62
+MD5 fc3b5dec4ccef02547c54bf840024aa6 metadata.xml 220
+MD5 dc7f3171220dede396380a7d76b9d5e0 trac-0.8.2.ebuild 1838
+MD5 f605a49aef73a61cbcc7527da21fd418 trac-0.8.4.ebuild 1511
+MD5 b8efd134e63686ae9ab3eaf413cf663b trac-0.9.ebuild 2106
+MD5 bd15a5ca0c3b50a967843b84cb95f6a7 trac-0.9_beta2.ebuild 2132
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDf/EGcsIHjyDViGQRAjeTAKCCKICCbtOoXR9WYQyMOcHUWjxO+ACdHe93
+S7zonajP8lE0WmxghrZu+0Y=
+=v9gD
+-----END PGP SIGNATURE-----
diff --git a/www-apps/trac/metadata.xml b/www-apps/trac/metadata.xml
index 0d59c319c3eb..f1850ed53c18 100644
--- a/www-apps/trac/metadata.xml
+++ b/www-apps/trac/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>webapps</herd>
+<herd>web-apps</herd>
 <maintainer>
-  <email>web-apps@gentoo.org</email>
+  <email>dju@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/www-apps/trac/trac-0.8.2.ebuild b/www-apps/trac/trac-0.8.2.ebuild
index a2ad7473fd56..e8659c4b63e1 100644
--- a/www-apps/trac/trac-0.8.2.ebuild
+++ b/www-apps/trac/trac-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/www-apps/trac/trac-0.8.2.ebuild,v 1.1 2005/06/01 19:59:32 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-0.8.2.ebuild,v 1.1.1.1 2005/11/30 09:37:11 chriswhite Exp $
 
 inherit distutils webapp
 
@@ -21,9 +21,14 @@ DEPEND="$DEPEND
 	app-text/silvercity
 	>=dev-util/subversion-1.0.3"
 
+POSTINST_PV="0.8.1"
+
 # need choice between enscript/silvercity/nothing
 # need choice between sqlite-3 + pysqlite-1.1 / sqlite-2.8 + pysqlite-1.0
 # need choice between mod_python/nothing
+#
+# NOTE: could someone please enlight me in why ${who} wrote those notes above?
+# What's been ${who}'s goals? -- trapni (2005-06-02 07:17 UTC)
 
 DOCS="AUTHORS COPYING ChangeLog INSTALL MANIFEST.in PKG-INFO README README.tracd RELEASE THANKS UPGRADE"
 
@@ -43,7 +48,9 @@ src_install () {
 	mv ${my_dir}/htdocs/* ${D}${MY_HTDOCSDIR} || die
 	rm -rf ${my_dir}/htdocs || die
 
-	webapp_postinst_txt en ${FILESDIR}/${PV}-postinst-en.txt
+	for lang in en; do
+		webapp_postinst_txt ${lang} ${FILESDIR}/${POSTINST_PV}-postinst-${lang}.txt
+	done
 
 	# the trac dir itself needs to be server-owned
 	# this should do the trick
diff --git a/www-apps/trac/trac-0.8.4.ebuild b/www-apps/trac/trac-0.8.4.ebuild
index 417425176401..608d1398f300 100644
--- a/www-apps/trac/trac-0.8.4.ebuild
+++ b/www-apps/trac/trac-0.8.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/www-apps/trac/trac-0.8.4.ebuild,v 1.1 2005/06/21 18:47:24 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-0.8.4.ebuild,v 1.1.1.1 2005/11/30 09:37:11 chriswhite Exp $
 
 inherit distutils webapp
 
@@ -9,26 +9,19 @@ HOMEPAGE="http://trac.edgewall.com/"
 SRC_URI="http://ftp.edgewall.com/pub/trac/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc ~amd64"
+KEYWORDS="~amd64 ppc ~sparc x86"
 IUSE="vhosts"
 
 DEPEND="$DEPEND
 	>=dev-lang/python-2.3
 	>=dev-python/docutils-0.3.3
 	=dev-db/sqlite-2.8*
-	<=dev-python/pysqlite-1.0
-	>=dev-libs/clearsilver-0.9.3
+	<dev-python/pysqlite-1.1
+	dev-libs/clearsilver
 	app-text/silvercity
-	>=dev-util/subversion-1.0.3"
+	>=dev-util/subversion-1.0"
 
-POSTINST_PV="0.8.1"
-
-# need choice between enscript/silvercity/nothing
-# need choice between sqlite-3 + pysqlite-1.1 / sqlite-2.8 + pysqlite-1.0
-# need choice between mod_python/nothing
-#
-# NOTE: could someone please enlight me in why ${who} wrote those notes above?
-# What's been ${who}'s goals? -- trapni (2005-06-02 07:17 UTC)
+POSTINST_PV="0.8.4"
 
 DOCS="AUTHORS COPYING ChangeLog INSTALL MANIFEST.in PKG-INFO README README.tracd RELEASE THANKS UPGRADE"
 
@@ -41,7 +34,6 @@ src_install () {
 	dodoc ${DOCS}
 
 	# now, we have to turn this into something that webapp-config can use
-
 	local my_dir=${D}/usr/share/trac
 	mv ${my_dir}/cgi-bin/trac.cgi ${D}${MY_CGIBINDIR} || die
 	rm -rf ${my_dir}/cgi-bin || die
@@ -54,7 +46,6 @@ src_install () {
 
 	# the trac dir itself needs to be server-owned
 	# this should do the trick
-
 	webapp_serverowned ${MY_HTDOCSDIR}
 
 	# okay, we're done - let webapp.eclass finish off
diff --git a/www-apps/trac/trac-0.9.ebuild b/www-apps/trac/trac-0.9.ebuild
index f88c69ac6a60..b345712d91c4 100644
--- a/www-apps/trac/trac-0.9.ebuild
+++ b/www-apps/trac/trac-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/www-apps/trac/trac-0.9.ebuild,v 1.1 2005/11/01 00:06:43 dju Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-0.9.ebuild,v 1.1.1.1 2005/11/30 09:37:11 chriswhite Exp $
 
 inherit distutils webapp
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://trac.edgewall.com/"
 SRC_URI="http://ftp.edgewall.com/pub/trac/${P}.tar.gz"
 
 LICENSE="trac"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="vhosts cgi fastcgi postgres sqlite enscript silvercity"
 
 # doing so because utils (such as trac-admin), manpages... overlap
diff --git a/www-apps/trac/trac-0.9_beta2.ebuild b/www-apps/trac/trac-0.9_beta2.ebuild
index 4f9e0e39686f..3e6ac9cfd971 100644
--- a/www-apps/trac/trac-0.9_beta2.ebuild
+++ b/www-apps/trac/trac-0.9_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/www-apps/trac/trac-0.9_beta2.ebuild,v 1.1 2005/09/28 22:35:52 dju Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-0.9_beta2.ebuild,v 1.1.1.1 2005/11/30 09:37:11 chriswhite Exp $
 
 inherit distutils webapp
 
diff --git a/www-apps/twiki/ChangeLog b/www-apps/twiki/ChangeLog
index b3cb231e6363..3cb01f611381 100644
--- a/www-apps/twiki/ChangeLog
+++ b/www-apps/twiki/ChangeLog
@@ -1,6 +1,81 @@
-# ChangeLog for net-www/twiki
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/ChangeLog,v 1.1 2004/08/15 15:49:56 stuart Exp $
+# ChangeLog for www-apps/twiki
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/ChangeLog,v 1.1.1.1 2005/11/30 09:36:59 chriswhite Exp $
+
+  10 Nov 2005; Renat Lumpau <rl03@gentoo.org> twiki-20041030-r1.ebuild:
+  DEPEND on app-arch/unzip wrt bug #112054.
+
+*twiki-20041030-r1 (16 Sep 2005)
+
+  16 Sep 2005; Renat Lumpau <rl03@gentoo.org> -twiki-20041030.ebuild,
+  +twiki-20041030-r1.ebuild:
+  Revbump
+
+  16 Sep 2005; Renat Lumpau <rl03@gentoo.org> +files/exec_command.patch,
+  files/postinstall-en.txt, twiki-20041030.ebuild:
+  Security fixes for bug #106149.
+
+  22 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  files/reconfig, twiki-20041030.ebuild:
+  Housekeeping
+
+  29 Jun 2005; Renat Lumpau <rl03@gentoo.org> twiki-20041030.ebuild:
+  Added missing IUSE
+
+*twiki-20041030 (29 Jun 2005)
+
+  29 Jun 2005; Renat Lumpau <rl03@gentoo.org> +files/execwithsearch.patch,
+  +files/postinstall-en.txt, +files/reconfig, files/twiki.conf,
+  -twiki-20030201.ebuild, -twiki-20040901.ebuild, -twiki-20040902.ebuild,
+  -twiki-20040902-r1.ebuild, +twiki-20041030.ebuild:
+  Added recent version of twiki with correct dependencies, using
+  webapp.eclass. Fixes #52157, #53057, #60460, #77308, #84589, #93208.
+  Removing old versions of ebuilds, including stable on ppc (which should not
+  have been stabled in the first place). Whoever committed the original ebuild
+  is A BAD MAN.
+
+  22 Jun 2005; Jason Wever <weeve@gentoo.org> twiki-20040902-r1.ebuild:
+  Added ~sparc keyword.
+
+  27 May 2005; Simon Stelling <blubb@gentoo.org> twiki-20040902-r1.ebuild:
+  added ~amd64 keyword
+
+  07 May 2005; Elfyn McBratney <beu@gentoo.org> twiki-20030201.ebuild,
+  twiki-20040901.ebuild, twiki-20040902.ebuild, twiki-20040902-r1.ebuild:
+  Update LICENSE (twiki is GPL-licensed), bug #76782.
+
+  01 Mar 2005; Elfyn McBratney <beu@gentoo.org> twiki-20030201.ebuild,
+  twiki-20040901.ebuild, twiki-20040902-r1.ebuild, twiki-20040902.ebuild:
+  Fix einfo's.
+
+*twiki-20040902-r1 (01 Mar 2005)
+
+  01 Mar 2005; Elfyn McBratney <beu@gentoo.org> +twiki-20040902-r1.ebuild:
+  Rev bump.  Update to use the new apache paths.
+
+  06 Nov 2004; Joseph Jezak <josejx@gentoo.org> twiki-20040902.ebuild:
+  Marked stable on ppc for bug #71305
+
+*twiki-20040902 (22 Nov 2004)
+
+  22 Nov 2004; Rob Holland <tigger@gentoo.org> +twiki-20040902.ebuild:
+  Version bump again as last version was still vulnerable.
+
+*twiki-20040901 (22 Nov 2004)
+
+  22 Nov 2004; Rob Holland <tigger@gentoo.org> +twiki-20040901.ebuild:
+  Version bump to fix #71035.
+
+  28 Sep 2004; Sven Wegener <swegener@gentoo.org>
+  .#twiki-20030201.ebuild.1.4, .#twiki-20030201.ebuild.1.6:
+  Gentoo Technologies, Inc. -> Gentoo Foundation
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  twiki-20030201.ebuild:
+  Masked twiki-20030201.ebuild stable for ppc
 
 *twiki-20030201 (15 Aug 2004)
 
diff --git a/www-apps/twiki/Manifest b/www-apps/twiki/Manifest
index 665c6da645e2..03a1041ccf3f 100644
--- a/www-apps/twiki/Manifest
+++ b/www-apps/twiki/Manifest
@@ -1,5 +1,19 @@
-MD5 33850a64bd1188ccb1a8f0b578452252 ChangeLog 775
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0d8009de158a121e3cd78b854cefed80 twiki-20041030-r1.ebuild 1589
+MD5 c16525040c09bb881930fefd91045d59 ChangeLog 3794
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
-MD5 b839bd2f70cc2a21bcde499547842fed twiki-20030201.ebuild 1740
-MD5 6c6c056f184e8d333ae577837290e282 files/twiki.conf 538
-MD5 03289224ed6b4fd47078e353bc05c650 files/digest-twiki-20030201 65
+MD5 e2754c98027bd6468cfe636616377892 files/exec_command.patch 2445
+MD5 d6ef3da92ece6d68c83fa4be8f6f97be files/twiki.conf 508
+MD5 fab10473182738fadb4188bf90af8162 files/execwithsearch.patch 653
+MD5 81a10e4ed2ea4d51fd1001d051951a61 files/postinstall-en.txt 795
+MD5 4369d80c9ef3589ccebce4a23095082b files/digest-twiki-20041030-r1 138
+MD5 f4898afe44208d27fee4ab3910b8cc88 files/reconfig 588
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDc1OZEzitwsaoONoRAswuAJ9CQn96EuCYIcJ//BqJg7PlmsAUogCfZLWb
+b8pO2LSOh+JcwVyRs+l6oHw=
+=HJqr
+-----END PGP SIGNATURE-----
diff --git a/www-apps/twiki/files/postinstall-en.txt b/www-apps/twiki/files/postinstall-en.txt
index 15a4fa50eaf9..c70a30ed65d3 100644
--- a/www-apps/twiki/files/postinstall-en.txt
+++ b/www-apps/twiki/files/postinstall-en.txt
@@ -1,20 +1,22 @@
 
 You are almost done! 
 
-1. Apache configs have been installed for you. You will need to restart 
+1. Apache configs have been installed for you. You will need to restart
    Apache for them to take effect.
 
 2. You may want to edit TWiki's config to suit your needs:
    ${MY_INSTALLDIR}/lib/TWiki.cfg
 
 3. Run the testenv script from your browser:
-   http://${VHOST_HOSTNAME}/twiki/bin/testenv.
-   It will show you the user name of the CGI scripts, a table listing all CGI 
+   http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/bin/testenv
+   It will show you the user name of the CGI scripts, a table listing all CGI
    environment variables, and a test of your configuration file.
 
 4. Read the install guide
    http://twiki.org/cgi-bin/view/TWiki/TWikiInstallationGuide
    particularly if you wish to set up email preferences or I18N.
 
-5. Visit http://${VHOST_HOSTNAME}/twiki, or
-   http://${VHOST_HOSTNAME}/twiki/bin/view 
+5. Read ${MY_INSTALLDIR}/README.robustness for important security info.
+
+6. Visit http://${VHOST_HOSTNAME}/twiki, or
+   http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/bin/view
diff --git a/www-apps/twiki/files/reconfig b/www-apps/twiki/files/reconfig
index f8933d7b77fa..80d6883fb2a8 100644
--- a/www-apps/twiki/files/reconfig
+++ b/www-apps/twiki/files/reconfig
@@ -1,15 +1,25 @@
 #!/bin/bash
+
+die() {
+	echo "#####"
+	echo $1
+	echo "#####"
+	exit 1
+}
+
 if [ $1 = "install" ]; then
-	[[ -a /etc/apache/vhosts.d/twiki.conf ]] && sed -e "s|HOST|${VHOST_HOSTNAME}|
+	if [ -a /etc/apache/vhosts.d/twiki.conf ]; then
+		sed -e "s|HOST|${VHOST_HOSTNAME}|
 		s|DOCROOT|${VHOST_HTDOCSDIR}|
-		s|ROOTDIR|${MY_INSTALLDIR}|g" -i /etc/apache/vhosts.d/twiki.conf
+		s|ROOTDIR|${MY_INSTALLDIR}|g" -i /etc/apache/vhosts.d/twiki.conf || die "sed failed"
+	fi
 
 	# fix lib locations
-	sed -e "s|../lib|${MY_INSTALLDIR}/lib|" -i ${MY_INSTALLDIR}/bin/setlib.cfg
+	sed -e "s|../lib|${MY_INSTALLDIR}/lib|" -i ${MY_INSTALLDIR}/bin/setlib.cfg || die
 
 	# fix TWiki.cfg
 	sed -e "s|http://your.domain.com|http://${VHOST_HOSTNAME}|
-		s|/home/httpd/twiki|${MY_INSTALLDIR}|g" -i ${MY_INSTALLDIR}/lib/TWiki.cfg
+		s|/home/httpd/twiki|${MY_INSTALLDIR}|g" -i ${MY_INSTALLDIR}/lib/TWiki.cfg || die
 else
 	echo $1
 fi
diff --git a/www-apps/twiki/files/twiki.conf b/www-apps/twiki/files/twiki.conf
index c93d241d6b36..2e7bbae677bb 100644
--- a/www-apps/twiki/files/twiki.conf
+++ b/www-apps/twiki/files/twiki.conf
@@ -1,26 +1,26 @@
-ScriptAlias /twiki/bin/ "/var/www/twiki/bin/"
-Alias /twiki/ "/var/www/twiki/"
-
-<Directory "/var/www/twiki">
-	Options None
-	AllowOverride None
-	Order allow,deny
-	Allow from all
-</Directory>
-<Directory "/var/www/twiki/bin">
-	Options +ExecCGI
-	SetHandler cgi-script
-	Allow from all
-</Directory>
-
-<Directory "/var/www/twiki/pub">
-	Options FollowSymLinks +Includes
-	AllowOverride None
-	Allow from all
-</Directory>
-<Directory "/var/www/twiki/data">
-	deny from all
-</Directory>
-<Directory "/var/www/twiki/templates">
-	deny from all
-</Directory>
+<VirtualHost HOST:80>
+	DocumentRoot "DOCROOT"
+	
+	<Directory "ROOTDIR">
+		Options None
+		AllowOverride None
+		Order allow,deny
+		Allow from all
+	</Directory>
+	<Directory "ROOTDIR/bin">
+		Options +ExecCGI
+		SetHandler cgi-script
+		Allow from all
+	</Directory>
+	<Directory "ROOTDIR/pub">
+		Options FollowSymLinks +Includes
+		AllowOverride None
+		Allow from all
+	</Directory>
+	<Directory "ROOTDIR/data">
+		deny from all
+	</Directory>
+	<Directory "ROOTDIR/templates">
+		deny from all
+	</Directory>
+</VirtualHost>
diff --git a/www-apps/twiki/twiki-20041030-r1.ebuild b/www-apps/twiki/twiki-20041030-r1.ebuild
index 9c6018505486..3811037a0c51 100644
--- a/www-apps/twiki/twiki-20041030-r1.ebuild
+++ b/www-apps/twiki/twiki-20041030-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/www-apps/twiki/twiki-20041030-r1.ebuild,v 1.1 2005/09/16 22:56:53 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/twiki-20041030-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:59 chriswhite Exp $
 
 inherit webapp eutils depend.apache
 
@@ -15,6 +15,7 @@ IUSE=""
 
 S=${WORKDIR}
 
+DEPEND="app-arch/unzip"
 RDEPEND=">=dev-lang/perl-5.8
 		perl-core/CGI
 		dev-perl/libnet
diff --git a/www-apps/viewcvs/ChangeLog b/www-apps/viewcvs/ChangeLog
index 99ff5e89fa36..80ad253b67d4 100644
--- a/www-apps/viewcvs/ChangeLog
+++ b/www-apps/viewcvs/ChangeLog
@@ -1,6 +1,140 @@
-# ChangeLog for net-www/viewcvs
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/viewcvs/ChangeLog,v 1.1 2004/08/15 15:52:50 stuart Exp $
+# ChangeLog for www-apps/viewcvs
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/viewcvs/ChangeLog,v 1.1.1.1 2005/11/30 09:36:59 chriswhite Exp $
+
+  20 Nov 2005; Stuart Herbert <stuart@gentoo.org> viewcvs-0.9.4.ebuild:
+  Fixed broken DEPEND
+
+  18 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> viewcvs-0.9.3.ebuild:
+  Stable on sparc
+
+  12 Oct 2005; Michael Hanselmann <hansmi@gentoo.org> viewcvs-0.9.3.ebuild:
+  Stable on ppc.
+
+  09 Oct 2005; Lance Albertson <ramereth@gentoo.org>
+  +files/viewcvs-commitid-fix.patch, viewcvs-1.0_pre20050929.ebuild:
+  * New patch to fix commitid problems
+  * Changed config files to be just example config files until webapp-config is
+  fixed
+
+  05 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  viewcvs-1.0_pre20050929.ebuild:
+  Added to ~amd64.
+
+  03 Oct 2005; Lance Albertson <ramereth@gentoo.org> files/reconfig:
+  * Updated reconfig script to allow changes during an upgrade, resolves #107033
+
+  03 Oct 2005; Lance Albertson <ramereth@gentoo.org>
+  +files/viewcvs-mysql-4.0.sql, +files/viewcvs-mysql-4.1.sql:
+  * Added two mysql scripts I forgot, resolves #107969
+
+*viewcvs-1.0_pre20050929 (03 Oct 2005)
+
+  03 Oct 2005; Lance Albertson <ramereth@gentoo.org>
+  +files/postinstall-new-en.txt, files/reconfig, viewcvs-0.9.3.ebuild,
+  +viewcvs-1.0_pre20050929.ebuild:
+  * New CVS snapshot with several fixes:
+    * Resolved #77226 giving the option of using either
+      apache1/apache2/lighttpd for cgi capable webservers
+    * Resolved #106506 adding a mysql flag, and mysql-python deps for folks
+      wanting to use the mysql query engine.
+    * Added checks for several apps to ensure they have proper use flags
+      enabled.
+    * Added sql files for creating query engine tables
+    * Fixed reconfig script to fix the mod_python scripts
+    * Updated postinstall to include new information
+  * Marked 0.9.3 stable on x86
+
+*viewcvs-0.9.4 (22 Aug 2005)
+
+  22 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  files/reconfig, +viewcvs-0.9.4.ebuild:
+  Version bump
+
+  15 Jul 2005; Ferris McCormick <fmccor@gentoo.org>
+  viewcvs-0.9.2_p20041207-r1.ebuild, viewcvs-0.9.3.ebuild,
+  viewcvs-1.0_pre20050523.ebuild:
+  Bump 0.9.2 -> stable on sparc, and and [0.9.3,1.0] -> ~sparc.
+
+  06 Jun 2005; Ferris McCormick <fmccor@gentoo.org>
+  viewcvs-0.9.2_p20041207-r1.ebuild:
+  Add ~sparc keyword, Bug 70315.  Package builds fine and appears to run.
+
+  26 May 2005; Lance Albertson <ramereth@gentoo.org> viewcvs-0.9.3.ebuild,
+  viewcvs-1.0_pre20050523.ebuild:
+  Fixed RCS dep from being conditional to being needed no matter what
+
+  25 May 2005; Brian Harring <ferringb@gentoo.org>, viewcvs-0.9.3.ebuild:
+  mirror://mirror://sourceforge.net isn't valid :)
+
+*viewcvs-1.0_pre20050523 (24 May 2005)
+*viewcvs-0.9.3 (24 May 2005)
+
+  24 May 2005; Lance Albertson <ramereth@gentoo.org>
+  -files/viewcvs-0.9.2.patch, files/postinstall-en.txt, files/reconfig,
+  -viewcvs-0.9.2-r3.ebuild, -viewcvs-0.9.2-r4.ebuild,
+  -viewcvs-0.9.2_p20030430.ebuild, -viewcvs-0.9.2_p20030430-r1.ebuild,
+  -viewcvs-0.9.2_p20030430-r2.ebuild, -viewcvs-0.9.2_p20040831.ebuild,
+  -viewcvs-0.9.2_p20041207.ebuild, +viewcvs-0.9.3.ebuild,
+  +viewcvs-1.0_pre20050523.ebuild:
+  Several changes
+  * Added two new ebuilds that support webapp-config
+  * Added a new snapshot ebuild based off of the 1.0 branch
+  * Cleaned up old ebuilds and files
+  * fixed reconfig script
+  * fixed the postinstall file
+
+  23 May 2005; Lance Albertson <ramereth@gentoo.org> metadata.xml:
+  Adding myself as maintainer to help with the package
+
+  23 Dec 2004; <SeJo@gentoo.org> viewcvs-0.9.2_p20041207-r1.ebuild:
+  stable on ppc glsa: 73772
+
+*viewcvs-0.9.2_p20041207-r1 (23 Dec 2004)
+
+  23 Dec 2004; Stuart Herbert <stuart@gentoo.org>
+  +files/viewcvs-CAN-2004-1062.patch, +viewcvs-0.9.2_p20041207-r1.ebuild:
+  Added patch for security-related bug #73772
+
+*viewcvs-0.9.2_p20041207 (08 Dec 2004)
+
+  08 Dec 2004; <SeJo@gentoo.org> viewcvs-0.9.2_p20041207.ebuild:
+  stable on ppc gsla: 72461
+
+  07 Dec 2004; Stuart Herbert <stuart@gentoo.org> :
+  Two rev bumps (one for the released viewcvs, one for the cvs snapshot) to
+  address security bug #72461
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org>
+  viewcvs-0.9.2_p20040831.ebuild:
+  Fixed ChangeLog header. Added missing IUSE.
+
+  03 Sep 2004; Renat Lumpau <rl03@gentoo.org> files/reconfig:
+  The reconfig hook now cleans up after itself.
+
+*viewcvs-0.9.2_p20040831 (01 Sep 2004)
+
+  04 Oct 2004; <pvdabeel@gentoo.org>:
+  Add to ~ppc
+
+  01 Sep 2004; <pauldv@gentoo.org> -viewcvs-0.9.2-r1.ebuild,
+  -viewcvs-0.9.2-r2.ebuild, +viewcvs-0.9.2_p20040831.ebuild:
+  Remove some stale versions and get a new version from the viewcvs cvs. 
+  The old snapshot is more than a year old now.
+
+  30 Aug 2004; Renat Lumpau <rl03@gentoo.org>
+  viewcvs-0.9.2_p20030430-r2.ebuild:
+  Fixed DEPEND/RDEPEND, removed unneeded src_compile
+
+  26 Aug 2004; Renat Lumpau <rl03@gentoo.org> viewcvs-0.9.2-r1.ebuild,
+  viewcvs-0.9.2_p20030430-r1.ebuild, viewcvs-0.9.2_p20030430.ebuild:
+  Fixed repoman warnings (lack of IUSE)
+
+*viewcvs-0.9.2_p20030430-r2 (26 Aug 2004)
+
+  26 Aug 2004; Renat Lumpau <rl03@gentoo.org> +files/postinstall-en.txt,
+  +files/reconfig, +viewcvs-0.9.2_p20030430-r2.ebuild:
+  Rewrite to use webapp.ecalss. Closes #60893.
 
 *viewcvs-0.9.2-r2 (15 Aug 2004)
 
@@ -59,7 +193,10 @@
   Further masked stable on ppc.
 
 *viewcvs-0.9.2_p20030430 (21 May 2003)
- 
+
+  04 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> :
+  Added to ppc stable profile
+
   13 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
   Added missing changelog entry.
 
diff --git a/www-apps/viewcvs/Manifest b/www-apps/viewcvs/Manifest
index d7270d954d31..674a2151158c 100644
--- a/www-apps/viewcvs/Manifest
+++ b/www-apps/viewcvs/Manifest
@@ -1,12 +1,19 @@
-MD5 007e7010de06c480b1175912646a8ee6 viewcvs-0.9.2-r1.ebuild 2339
-MD5 60a02f2947add131a85934791b7a56ba viewcvs-0.9.2-r3.ebuild 2777
-MD5 6aef6aadb485af6f4a70dd7ecf8f46f0 viewcvs-0.9.2_p20030430.ebuild 2320
-MD5 ededb293af2666079cceece34700a490 viewcvs-0.9.2_p20030430-r1.ebuild 2407
-MD5 c543441009501c5a2d176f0aeff49ef6 viewcvs-0.9.2-r2.ebuild 2744
-MD5 a95c517acdb615530e4c77451088eebe ChangeLog 2568
-MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
-MD5 fbac846bcd488f255dc57fdd27ba99df files/digest-viewcvs-0.9.2_p20030430 69
-MD5 07a07f1a89e77c9f093ade7e395ffe3b files/digest-viewcvs-0.9.2-r1 65
-MD5 07a07f1a89e77c9f093ade7e395ffe3b files/digest-viewcvs-0.9.2-r2 65
-MD5 07a07f1a89e77c9f093ade7e395ffe3b files/digest-viewcvs-0.9.2-r3 65
-MD5 fbac846bcd488f255dc57fdd27ba99df files/digest-viewcvs-0.9.2_p20030430-r1 69
+MD5 b437a89bb09bcc5d830074821221de3a ChangeLog 8081
+MD5 fa8daabae86da3beefbc3ea1e5ccd42c metadata.xml 779
+MD5 5c453b1274f323a9abbfa87e169d77b8 viewcvs-0.9.3.ebuild 1477
+MD5 1efa77758ff6f9f8fa039c77a4e4d032 viewcvs-1.0_pre20050523.ebuild 1523
+MD5 3eecfba60ea8dc21c55c1e6d44a7cd22 viewcvs-0.9.4.ebuild 1478
+MD5 1c738f44ce7a084b6122c8baed0470a3 viewcvs-1.0_pre20050929.ebuild 3426
+MD5 de35d046cef5f9b95a5ddce9f2bf990d viewcvs-0.9.2_p20041207-r1.ebuild 2536
+MD5 1ebd12b88a2c6a6964c0d02b5c82911a files/digest-viewcvs-0.9.3 65
+MD5 63be22bf657c7d52e524b1a74c92cf2c files/digest-viewcvs-1.0_pre20050523 69
+MD5 26ecfea58fa51e62bc28985ff0f73048 files/digest-viewcvs-0.9.4 65
+MD5 6ad94993c3421b9b0413f3268e5f09b6 files/digest-viewcvs-1.0_pre20050929 69
+MD5 8dd7c985d9b13ffa051e8f293e88ddb1 files/postinstall-new-en.txt 933
+MD5 fee1dd762ebcd6fe9707794740684836 files/viewcvs-commitid-fix.patch 844
+MD5 9777bfdf8cffc9f8a930dca991d05c11 files/postinstall-en.txt 354
+MD5 12fb198ba0e0736a29ee719e25ab44fb files/reconfig 962
+MD5 9b65df9cd8e1bae9bca4fcf9623396e7 files/viewcvs-mysql-4.0.sql 2495
+MD5 48783b2b9bd95be9a4eb1525a0bf708a files/digest-viewcvs-0.9.2_p20041207-r1 69
+MD5 6260728f582a42a165dcf791a36b4825 files/viewcvs-mysql-4.1.sql 2422
+MD5 550579a3a648e62d01ec4c3c3ee47327 files/viewcvs-CAN-2004-1062.patch 341
diff --git a/www-apps/viewcvs/files/postinstall-en.txt b/www-apps/viewcvs/files/postinstall-en.txt
index 9f5864cf48f2..9f447dc1b428 100644
--- a/www-apps/viewcvs/files/postinstall-en.txt
+++ b/www-apps/viewcvs/files/postinstall-en.txt
@@ -1,9 +1,9 @@
 If you are using Apache, consider adding something like this to your
 apache.conf:
 
-ScriptAlias /viewcvs /var/www/localhost/cgi-bin/viewcvs/viewcvs.cgi
-ScriptAlias /cvsquery /var/www/localhost/cgi-bin/viewcvs/cvsquery.cgi
+ScriptAlias /viewcvs ${VHOST_CGIBINDIR}/${PN}/viewcvs.cgi
+ScriptAlias /cvsquery ${VHOST_CGIBINDIR}/${PN}/cvsquery.cgi
 
-Before using viewcvs, be sure to configure it properly. 
+Before using viewcvs, be sure to configure it properly.
 Edit ${VHOST_ROOT}/${PN}/viewcvs.conf and ${VHOST_ROOT}/${PN}/cvsgraph.conf to
-suit your needs. Consult the two .dist files for a start.
+suit your needs.
diff --git a/www-apps/viewcvs/files/reconfig b/www-apps/viewcvs/files/reconfig
index 97774707fe23..76d3d716c304 100644
--- a/www-apps/viewcvs/files/reconfig
+++ b/www-apps/viewcvs/files/reconfig
@@ -1,6 +1,18 @@
 #!/bin/bash
-if [ $1 = "start" -o $1 = "install" ]; then
-	find ${VHOST_CGIBINDIR}/${PN} ${VHOST_ROOT}/${PN} -type f | xargs sed -e "s|\(^LIBRARY_DIR\)\(.*\$\)|\1 = \"${VHOST_CGIBINDIR}/${PN}/lib\"|g
-	s,\(^CONF_PATHNAME\)\(.*\$\),\1 = \"${VHOST_ROOT}/${PN}/viewcvs.conf\",g
-	s,\(<VIEWCVS_INSTALL_DIRECTORY>\),${VHOST_ROOT}/${PN},g" -i
+# $Id: reconfig,v 1.1.1.1 2005/11/30 09:36:59 chriswhite Exp $
+
+if [ $1 = "install" ] ; then
+    find ${VHOST_CGIBINDIR}/viewcvs ${VHOST_ROOT}/viewcvs ${VHOST_ROOT}/htdocs/. -type f \
+    | xargs sed -e "s|\(^LIBRARY_DIR\)\(.*\$\)|\1 = \"${VHOST_ROOT}/viewcvs/lib\"|g
+    s,\(^CONF_PATHNAME\)\(.*\$\),\1 = \"${VHOST_ROOT}/viewcvs/viewcvs.conf\",g
+    s,\(<VIEWCVS_INSTALL_DIRECTORY>\),${VHOST_ROOT}/viewcvs,g 
+    s,\(<VIEWCVS_APACHE_LIBRARY_DIRECTORY>\),${VHOST_ROOT}/viewcvs/lib,g" -i
+elif [ $1 = "upgrade" ] ; then
+    find ${VHOST_CGIBINDIR}/viewcvs ${VHOST_ROOT}/viewcvs ${VHOST_ROOT}/htdocs/. -type f \
+    | xargs sed -e "s|\(^LIBRARY_DIR\)\(.*\$\)|\1 = \"${VHOST_ROOT}/viewcvs/lib\"|g
+    s,\(^CONF_PATHNAME\)\(.*\$\),\1 = \"${VHOST_ROOT}/viewcvs/viewcvs.conf\",g
+    s,\(<VIEWCVS_INSTALL_DIRECTORY>\),${VHOST_ROOT}/viewcvs,g 
+    s,\(<VIEWCVS_APACHE_LIBRARY_DIRECTORY>\),${VHOST_ROOT}/viewcvs/lib,g" -i
+elif [ $1 = "clean" ] ; then
+    echo $1
 fi
diff --git a/www-apps/viewcvs/metadata.xml b/www-apps/viewcvs/metadata.xml
index 13bc126c7d91..8c16b70fd344 100644
--- a/www-apps/viewcvs/metadata.xml
+++ b/www-apps/viewcvs/metadata.xml
@@ -1,9 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
-<maintainer>
-<email>web-apps@gentoo.org</email>
-<name>Gentoo Web Application Packages Maintainers</name>
-</maintainer>
+	<herd>web-apps</herd>
+	<maintainer>
+		<email>ramereth@gentoo.org</email>
+		<name>Lance Albertson</name>
+	</maintainer>
+	<longdescription lang="en">
+		ViewCVS is a browser interface for CVS and Subversion version control
+		repositories. It generates templatized HTML to present navigable
+		directory, revision, and change log listings. It can display specific
+		versions of files as well as diffs between those versions. Basically,
+		ViewCVS provides the bulk of the report-like functionality you expect
+		out of your version control tool, but much more prettily than the
+		average textual command-line program output.
+	</longdescription>
 </pkgmetadata>
+
diff --git a/www-apps/viewcvs/viewcvs-0.9.2_p20041207-r1.ebuild b/www-apps/viewcvs/viewcvs-0.9.2_p20041207-r1.ebuild
index 6bf68de4e576..15a4b84d79fa 100644
--- a/www-apps/viewcvs/viewcvs-0.9.2_p20041207-r1.ebuild
+++ b/www-apps/viewcvs/viewcvs-0.9.2_p20041207-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/www-apps/viewcvs/viewcvs-0.9.2_p20041207-r1.ebuild,v 1.1 2004/12/23 11:10:32 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/viewcvs/viewcvs-0.9.2_p20041207-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:59 chriswhite Exp $
 
 inherit eutils
 
@@ -11,13 +11,17 @@ SRC_URI="mirror://gentoo/${PN}-${PDATE}.tar.bz2"
 
 LICENSE="viewcvs"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="ppc sparc x86"
 IUSE=""
 
 DEPEND=""
-RDEPEND="|| ( ( >=app-text/rcs-5.7
-	>=dev-util/cvs-1.11 )
-	dev-util/subversion )
+RDEPEND="|| (
+		(
+			>=app-text/rcs-5.7
+			>=dev-util/cvs-1.11
+		)
+		dev-util/subversion
+	)
 	sys-apps/diffutils
 	net-www/apache"
 S=${WORKDIR}/${PN}
diff --git a/www-apps/viewcvs/viewcvs-0.9.3.ebuild b/www-apps/viewcvs/viewcvs-0.9.3.ebuild
index 4c4292aaf3f6..a7461463ddac 100644
--- a/www-apps/viewcvs/viewcvs-0.9.3.ebuild
+++ b/www-apps/viewcvs/viewcvs-0.9.3.ebuild
@@ -1,25 +1,27 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/viewcvs/viewcvs-0.9.3.ebuild,v 1.1 2005/05/24 02:34:59 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/viewcvs/viewcvs-0.9.3.ebuild,v 1.1.1.1 2005/11/30 09:36:59 chriswhite Exp $
 
 inherit webapp
 
 DESCRIPTION="Viewcvs, a web interface to cvs and subversion"
 HOMEPAGE="http://viewcvs.sourceforge.net/"
-SRC_URI="mirror://mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="viewcvs"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="ppc sparc x86"
 IUSE="cvsgraph enscript"
 
-RDEPEND="|| ( ( >=app-text/rcs-5.7
-				>=dev-util/cvs-1.11 )
-				dev-util/subversion )
-			dev-lang/python
-			sys-apps/diffutils
-			cvsgraph? dev-util/cvsgraph
-			enscript? app-text/enscript
-			net-www/apache"
+RDEPEND="|| (
+		>=dev-util/cvs-1.11
+		dev-util/subversion
+	)
+	dev-lang/python
+	>=app-text/rcs-5.7
+	sys-apps/diffutils
+	cvsgraph? ( dev-util/cvsgraph )
+	enscript? ( app-text/enscript )
+	net-www/apache"
 
 src_install() {
 	webapp_src_preinst
diff --git a/www-apps/viewcvs/viewcvs-0.9.4.ebuild b/www-apps/viewcvs/viewcvs-0.9.4.ebuild
index 70216d3e3e06..e84f351e73f6 100644
--- a/www-apps/viewcvs/viewcvs-0.9.4.ebuild
+++ b/www-apps/viewcvs/viewcvs-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/www-apps/viewcvs/viewcvs-0.9.4.ebuild,v 1.1 2005/08/22 23:26:34 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/viewcvs/viewcvs-0.9.4.ebuild,v 1.1.1.1 2005/11/30 09:36:59 chriswhite Exp $
 
 inherit webapp
 
@@ -16,7 +16,6 @@ RDEPEND="|| (
 		>=dev-util/cvs-1.11
 		dev-util/subversion
 	)
-	>=webapp-config-1.11-r1
 	dev-lang/python
 	>=app-text/rcs-5.7
 	sys-apps/diffutils
diff --git a/www-apps/viewcvs/viewcvs-1.0_pre20050523.ebuild b/www-apps/viewcvs/viewcvs-1.0_pre20050523.ebuild
index 414232600abb..29c1a0c74259 100644
--- a/www-apps/viewcvs/viewcvs-1.0_pre20050523.ebuild
+++ b/www-apps/viewcvs/viewcvs-1.0_pre20050523.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/viewcvs/viewcvs-1.0_pre20050523.ebuild,v 1.1 2005/05/24 02:34:59 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/viewcvs/viewcvs-1.0_pre20050523.ebuild,v 1.1.1.1 2005/11/30 09:36:59 chriswhite Exp $
 
 inherit webapp
 
@@ -10,17 +10,19 @@ HOMEPAGE="http://viewcvs.sourceforge.net/"
 SRC_URI="mirror://gentoo/${PN}-${PDATE}.tar.bz2"
 
 LICENSE="viewcvs"
-KEYWORDS="~x86"
+KEYWORDS="~sparc ~x86"
 IUSE="cvsgraph enscript"
 
-RDEPEND="|| ( ( >=app-text/rcs-5.7
-				>=dev-util/cvs-1.11 )
-				dev-util/subversion )
-			dev-lang/python
-			sys-apps/diffutils
-			cvsgraph? dev-util/cvsgraph
-			enscript? app-text/enscript
-			net-www/apache"
+RDEPEND="|| (
+		>=dev-util/cvs-1.11
+		dev-util/subversion
+	)
+	dev-lang/python
+	>=app-text/rcs-5.7
+	sys-apps/diffutils
+	cvsgraph? ( dev-util/cvsgraph )
+	enscript? ( app-text/enscript )
+	net-www/apache"
 S=${WORKDIR}/${PN}
 
 src_install() {
diff --git a/www-apps/viewcvs/viewcvs-1.0_pre20050929.ebuild b/www-apps/viewcvs/viewcvs-1.0_pre20050929.ebuild
index d3c74e7f43c2..87e291cafd7b 100644
--- a/www-apps/viewcvs/viewcvs-1.0_pre20050929.ebuild
+++ b/www-apps/viewcvs/viewcvs-1.0_pre20050929.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/viewcvs/viewcvs-1.0_pre20050929.ebuild,v 1.1 2005/10/03 05:06:28 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/viewcvs/viewcvs-1.0_pre20050929.ebuild,v 1.1.1.1 2005/11/30 09:36:59 chriswhite Exp $
 
 inherit webapp depend.apache eutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://viewcvs.sourceforge.net/"
 SRC_URI="mirror://gentoo/${PN}-${PDATE}.tar.bz2"
 
 LICENSE="viewcvs"
-KEYWORDS="~sparc ~x86"
+KEYWORDS="~amd64 ~sparc ~x86"
 IUSE="cvsgraph enscript mod_python mysql standalone"
 
 want_apache
@@ -48,6 +48,12 @@ pkg_setup() {
 	webapp_pkg_setup
 }
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-commitid-fix.patch
+}
+
 src_compile() {
 	sed -i -e "s:1.0-dev:${PV}:" lib/viewcvs.py
 }
@@ -80,8 +86,8 @@ src_install() {
 	cp -r tools/ ${D}/${MY_HOSTROOTDIR}/${PN}/
 	cp -r tests/ ${D}/${MY_HOSTROOTDIR}/${PN}/
 	insinto ${MY_HOSTROOTDIR}/${PN}
-	newins viewcvs.conf.dist viewcvs.conf
-	newins cvsgraph.conf.dist cvsgraph.conf
+	newins viewcvs.conf.dist viewcvs.conf.example
+	newins cvsgraph.conf.dist cvsgraph.conf.example
 
 	dosym /usr/share/doc/${PF}/html ${MY_HTDOCSDIR}/doc
 	dodoc INSTALL TODO CHANGES README
@@ -92,8 +98,8 @@ src_install() {
 		newexe standalone.py viewcvs-standalone
 	fi
 
-	webapp_configfile ${MY_HOSTROOTDIR}/${PN}/viewcvs.conf
-	webapp_configfile ${MY_HOSTROOTDIR}/${PN}/cvsgraph.conf
+	webapp_configfile ${MY_HOSTROOTDIR}/${PN}/viewcvs.conf.example
+	webapp_configfile ${MY_HOSTROOTDIR}/${PN}/cvsgraph.conf.example
 	webapp_postinst_txt en ${FILESDIR}/postinstall-new-en.txt
 	webapp_hook_script ${FILESDIR}/reconfig
 
diff --git a/www-apps/websvn/ChangeLog b/www-apps/websvn/ChangeLog
index 31e5b6d71a7d..95249421fda9 100644
--- a/www-apps/websvn/ChangeLog
+++ b/www-apps/websvn/ChangeLog
@@ -1,8 +1,62 @@
 # ChangeLog for www-apps/websvn
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/websvn/ChangeLog,v 1.1 2005/02/24 14:15:49 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/websvn/ChangeLog,v 1.1.1.1 2005/11/30 09:36:56 chriswhite Exp $
 
-*webapps/websvn-1.61 (24 Feb 2005)
+*websvn-1.70_beta1 (20 Oct 2005)
+
+  20 Oct 2005; Roy Marples <uberlord@gentoo.org> +websvn-1.70_beta1.ebuild:
+  New version.
+
+  18 Oct 2005; Roy Marples <uberlord@gentoo.org>
+  files/websvn-1.61-german.patch:
+  Fixed gay CR's in the german patch - thanks to vapier, #109589
+
+*websvn-1.61-r3 (17 Oct 2005)
+
+  17 Oct 2005; Roy Marples <uberlord@gentoo.org>
+  +files/websvn-1.61-german.patch, +files/websvn-1.61-issue32.patch,
+  +websvn-1.61-r3.ebuild:
+  Fixed an issue with German characters - thanks to Lars Teifland for an almost
+  working patch, #65351
+  
+  Fixed the error "svn: Can't check path '/root/.subversion': Permission denied"
+  (websvn issue 32)
+
+*websvn-1.61-r2 (05 Sep 2005)
+
+  05 Sep 2005; Roy Marples <uberlord@gentoo.org>
+  +files/websvn-1.61-r2.patch, websvn-1.61.ebuild, websvn-1.61-r1.ebuild,
+  +websvn-1.61-r2.ebuild:
+  Fixed Compare with previous wrt #104712
+  DEPEND on virtual/php instead of mod_php
+
+  01 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org> websvn-1.61.ebuild,
+  websvn-1.61-r1.ebuild:
+  Keyworded ~sparc wrt #104326
+
+*websvn-1.61-r1 (16 Aug 2005)
+
+  16 Aug 2005; Roy Marples <uberlord@gentoo.org>
+  +files/websvn-1.61-r1.patch, +websvn-1.61-r1.ebuild:
+  Created a patch from the below user submitted patches to websvn
+  
+  http://websvn.tigris.org/issues/show_bug.cgi?id=29
+  http://websvn.tigris.org/issues/show_bug.cgi?id=31
+  http://websvn.tigris.org/issues/show_bug.cgi?id=33
+  http://websvn.tigris.org/issues/show_bug.cgi?id=37
+  
+  Fixes our #102675
+
+  21 May 2005; Simon Stelling <blubb@gentoo.org> websvn-1.61.ebuild:
+  added ~amd64 keyword
+
+  19 Apr 2005; Roy Marples <uberlord@gentoo.org> websvn-1.61.ebuild:
+  stable on x86
+
+  28 Feb 2005; Roy Marples <uberlord@gentoo.org> websvn-1.61.ebuild:
+  Corrected homepage.
+
+*websvn-1.61 (24 Feb 2005)
 
   24 Feb 2005; Roy Marples <uberlord@gentoo.org> +websvn-1.61.ebuild:
   Initial import.
diff --git a/www-apps/websvn/Manifest b/www-apps/websvn/Manifest
index 665795af8e0d..cbba97eb14cc 100644
--- a/www-apps/websvn/Manifest
+++ b/www-apps/websvn/Manifest
@@ -1,4 +1,16 @@
-MD5 f68634f281d4c0011d6ad171670748fb websvn-1.61.ebuild 1210
-MD5 009f9e8bd4d6f71a18bc432071b42b01 ChangeLog 240
+MD5 802456ce2bc5882d3ff9df54d93162a0 websvn-1.61-r3.ebuild 1517
+MD5 38ea3b50727fee38c4499b1404738b32 ChangeLog 2089
+MD5 079c9b575ef8818374a7299069ef3200 websvn-1.61-r1.ebuild 1378
+MD5 f13b3ba8bd66f163f991ea63a55a9307 websvn-1.70_beta1.ebuild 1223
+MD5 2cb25e4130b40585eaf200897460746b websvn-1.61-r2.ebuild 1421
+MD5 65009af89b673d7f57d7ce7290d652fa websvn-1.61.ebuild 1308
 MD5 7999d6b6542ca3e8b7f9fb693fbbd016 metadata.xml 323
+MD5 6b1f00eaf678b8581924b0611c017839 files/digest-websvn-1.61-r2 61
+MD5 24bec7bc11c2c25adeeaa06bf4260cde files/websvn-1.61-issue32.patch 726
+MD5 4e965e308c932391ae71096e4690a88e files/websvn-1.61-german.patch 3092
+MD5 353969592a179cc1f93157cfa929775e files/digest-websvn-1.70_beta1 67
+MD5 0d0713dd2a344f83db7c81936914b4e6 files/websvn-1.61-r2.patch 442
 MD5 6b1f00eaf678b8581924b0611c017839 files/digest-websvn-1.61 61
+MD5 6b1f00eaf678b8581924b0611c017839 files/digest-websvn-1.61-r1 61
+MD5 e63dfafda87c3bf459f7d580e0a33b9d files/websvn-1.61-r1.patch 4908
+MD5 6b1f00eaf678b8581924b0611c017839 files/digest-websvn-1.61-r3 61
diff --git a/www-apps/websvn/files/websvn-1.61-german.patch b/www-apps/websvn/files/websvn-1.61-german.patch
index 1bc3981d109c..3d0e48044220 100644
--- a/www-apps/websvn/files/websvn-1.61-german.patch
+++ b/www-apps/websvn/files/websvn-1.61-german.patch
@@ -1,8 +1,8 @@
-Index: listing.php

-===================================================================

---- listing.php	(Revision 1)

-+++ listing.php	(Arbeitskopie)

-@@ -232,7 +232,15 @@

+Index: listing.php
+===================================================================
+--- listing.php	(Revision 1)
++++ listing.php	(Arbeitskopie)
+@@ -232,7 +232,15 @@
  $vars["action"] = "";

  $vars["author"] = $log['author'];

  $vars["date"] = $log['date'];

@@ -19,11 +19,11 @@ Index: listing.php
  $vars["rev"] = $rev;

  $vars["lastchangedrev"] = $logrev;

  $vars["path"] = $ppath;

-Index: log.php

-===================================================================

---- log.php	(Revision 1)

-+++ log.php	(Arbeitskopie)

-@@ -162,6 +162,7 @@

+Index: log.php
+===================================================================
+--- log.php	(Revision 1)
++++ log.php	(Arbeitskopie)
+@@ -162,6 +162,7 @@
        {

           // Turn all the HTML entities into real characters.  

           

@@ -31,7 +31,7 @@ Index: log.php
           if (version_compare(phpversion(), "4.1.0", "<"))

              $msg = html_entity_decode($log["message"]);

           else

-@@ -215,7 +216,15 @@

+@@ -215,7 +216,15 @@
        

        $listing[$index]["revauthor"] = $log["author"];

        $listing[$index]["revage"] = $log["age"];

@@ -48,11 +48,11 @@ Index: log.php
        $listing[$index]["rowparity"] = "$row";

        

        $row = 1 - $row;

-Index: rss.php

-===================================================================

---- rss.php	(Revision 1)

-+++ rss.php	(Arbeitskopie)

-@@ -98,7 +98,15 @@

+Index: rss.php
+===================================================================
+--- rss.php	(Revision 1)
++++ rss.php	(Arbeitskopie)
+@@ -98,7 +98,15 @@
   

     $url = $config->getURL($rep, $parent, "dir");

     

diff --git a/www-apps/websvn/websvn-1.61-r1.ebuild b/www-apps/websvn/websvn-1.61-r1.ebuild
index 80a9c0afa386..caade68b1403 100644
--- a/www-apps/websvn/websvn-1.61-r1.ebuild
+++ b/www-apps/websvn/websvn-1.61-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/www-apps/websvn/websvn-1.61-r1.ebuild,v 1.1 2005/08/16 10:12:19 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/websvn/websvn-1.61-r1.ebuild,v 1.1.1.1 2005/11/30 09:36:56 chriswhite Exp $
 
 inherit eutils webapp
 
@@ -10,9 +10,9 @@ HOMEPAGE="http://websvn.tigris.org/"
 SRC_URI="http://websvn.tigris.org/files/documents/1380/14334/WebSVN_${MY_PV}.tar.gz"
 LICENSE="GPL-2"
 IUSE="enscript"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86 ~amd64 ~sparc"
 
-RDEPEND=">=dev-php/mod_php-4.1.0
+RDEPEND="virtual/php
 	sys-apps/sed
 	enscript? ( >=app-text/enscript-1.6.0 )"
 DEPEND="sys-apps/findutils"
diff --git a/www-apps/websvn/websvn-1.61-r2.ebuild b/www-apps/websvn/websvn-1.61-r2.ebuild
index 90005c3fffe4..138d579b68aa 100644
--- a/www-apps/websvn/websvn-1.61-r2.ebuild
+++ b/www-apps/websvn/websvn-1.61-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/www-apps/websvn/websvn-1.61-r2.ebuild,v 1.1 2005/09/05 10:19:43 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/websvn/websvn-1.61-r2.ebuild,v 1.1.1.1 2005/11/30 09:36:56 chriswhite Exp $
 
 inherit eutils webapp
 
diff --git a/www-apps/websvn/websvn-1.61-r3.ebuild b/www-apps/websvn/websvn-1.61-r3.ebuild
index f2725f80dbd9..548350bc78d5 100644
--- a/www-apps/websvn/websvn-1.61-r3.ebuild
+++ b/www-apps/websvn/websvn-1.61-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/www-apps/websvn/websvn-1.61-r3.ebuild,v 1.1 2005/10/17 13:00:07 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/websvn/websvn-1.61-r3.ebuild,v 1.1.1.1 2005/11/30 09:36:56 chriswhite Exp $
 
 inherit eutils webapp
 
diff --git a/www-apps/websvn/websvn-1.61.ebuild b/www-apps/websvn/websvn-1.61.ebuild
index 2b031a654eb7..2a5b5774ab7c 100644
--- a/www-apps/websvn/websvn-1.61.ebuild
+++ b/www-apps/websvn/websvn-1.61.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/www-apps/websvn/websvn-1.61.ebuild,v 1.1 2005/02/24 14:15:49 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/websvn/websvn-1.61.ebuild,v 1.1.1.1 2005/11/30 09:36:56 chriswhite Exp $
 
 inherit eutils webapp
 
 MY_PV=161
 DESCRIPTION="Web-based browsing tool for Subversion (SVN) repositories in PHP"
-HOMEPAGE="http://websvn.tirgris.org/"
+HOMEPAGE="http://websvn.tigris.org/"
 SRC_URI="http://websvn.tigris.org/files/documents/1380/14334/WebSVN_${MY_PV}.tar.gz"
 LICENSE="GPL-2"
 IUSE="enscript"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~amd64 ~sparc"
 
-RDEPEND=">=dev-php/mod_php-4.1.0
+RDEPEND="virtual/php
 	sys-apps/sed
 	enscript? ( >=app-text/enscript-1.6.0 )"
 DEPEND="sys-apps/findutils"
diff --git a/www-apps/websvn/websvn-1.70_beta1.ebuild b/www-apps/websvn/websvn-1.70_beta1.ebuild
index 69c6063b66cc..fe6c4820f171 100644
--- a/www-apps/websvn/websvn-1.70_beta1.ebuild
+++ b/www-apps/websvn/websvn-1.70_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/www-apps/websvn/websvn-1.70_beta1.ebuild,v 1.1 2005/10/20 19:38:39 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/websvn/websvn-1.70_beta1.ebuild,v 1.1.1.1 2005/11/30 09:36:56 chriswhite Exp $
 
 inherit eutils webapp
 
diff --git a/www-apps/wordpress/ChangeLog b/www-apps/wordpress/ChangeLog
index 8bd9b1a42981..02addaec4477 100644
--- a/www-apps/wordpress/ChangeLog
+++ b/www-apps/wordpress/ChangeLog
@@ -1,6 +1,133 @@
-# ChangeLog for net-www/wordpress
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/ChangeLog,v 1.1 2004/08/15 15:56:24 stuart Exp $
+# ChangeLog for www-apps/wordpress
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/ChangeLog,v 1.1.1.1 2005/11/30 09:37:12 chriswhite Exp $
+
+  20 Nov 2005; Stuart Herbert <stuart@gentoo.org> wordpress-1.5.1.3.ebuild,
+  wordpress-1.5.2.ebuild:
+  Fixed broken DEPEND
+
+  21 Aug 2005; Olivier Crête <tester@gentoo.org> wordpress-1.5.2.ebuild:
+  Stable on x86 per security bug #102002
+
+  16 Aug 2005; Jason Wever <weeve@gentoo.org> wordpress-1.5.2.ebuild:
+  Stable on SPARC wrt bug #102002.
+
+  15 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  wordpress-1.5.2.ebuild:
+  Stable on ppc.
+
+  15 Aug 2005; Aaron Kulbe <superlag@gentoo.org> wordpress-1.5.2.ebuild:
+  Setting proper keywords. Sorry guys.
+
+*wordpress-1.5.2 (15 Aug 2005)
+
+  15 Aug 2005; Aaron Kulbe <superlag@gentoo.org> +wordpress-1.5.2.ebuild:
+  Version bump. Cleans up issues in bug #102002
+
+  20 Jul 2005; Aaron Kulbe <superlag@gentoo.org> wordpress-1.5.1.3.ebuild:
+  Tidy up all vulnerable versions: -wordpress-1.2.2.ebuild
+  -wordpress-1.5.ebuild -wordpress-1.5.1.2.ebuild
+  -files/digest-wordpress-1.2.2 -files/digest-wordpress-1.5
+  -files/digest-wordpress-1.5.1.2
+
+  20 Jul 2005; Aaron Kulbe <superlag@gentoo.org> wordpress-1.5.1.3.ebuild:
+  Removed deprecated webapp_runbycgibin calls.  Bug #99292
+
+  04 Jul 2005; Aaron Kulbe <superlag@gentoo.org> wordpress-1.5.1.3.ebuild:
+  Stable on amd64 and x86.
+
+  03 Jul 2005; Michael Hanselmann <hansmi@gentoo.org>
+  wordpress-1.5.1.3.ebuild:
+  Stable on ppc.
+
+  02 Jul 2005; Jason Wever <weeve@gentoo.org> wordpress-1.5.1.3.ebuild:
+  Stable on SPARC wrt security bug #97374.
+
+  30 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  wordpress-1.5.1.3.ebuild:
+  Readded to ~ppc. Please *don't drop arch keywords*. Thanks.
+
+*wordpress-1.5.1.3 (30 Jun 2005)
+
+  30 Jun 2005; Aaron Kulbe <superlag@gentoo.org> +wordpress-1.5.1.3.ebuild:
+  Bumping to 1.5.1.3, to address issues in Bug #97374.  ~amd64, ~x86
+
+  28 May 2005; Michael Hanselmann <hansmi@gentoo.org>
+  wordpress-1.5.1.2.ebuild:
+  Stable on ppc.
+
+  27 May 2005; Jason Wever <weeve@gentoo.org> wordpress-1.5.1.2.ebuild:
+  Stable on SPARC wrt security bug #88926.
+
+  27 May 2005; Aaron Kulbe <superlag@gentoo.org> wordpress-1.5.1.2.ebuild:
+  Since this is a security release, marking stable on amd64 and x86
+
+*wordpress-1.5.1.2 (27 May 2005)
+
+  27 May 2005; Aaron Kulbe <superlag@gentoo.org> +wordpress-1.5.1.2.ebuild:
+  Bumping to 1.5.1.2, keywording for all arches, removing from package.mask,
+  per #88926
+
+  12 May 2005; Aaron Kulbe <superlag@gentoo.org> wordpress-1.5.ebuild:
+  Keywording for ~amd64
+
+  27 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> wordpress-1.5.ebuild:
+  Stable on sparc wrt #88926
+
+  20 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> wordpress-1.5.ebuild:
+  Stable on ppc.
+
+*wordpress-1.5 (20 Apr 2005)
+
+  20 Apr 2005; Elfyn McBratney <beu@gentoo.org> +files/dummy-templates.php,
+  +wordpress-1.5.ebuild:
+  Version bump, fixes security bug #88926.  Stable on x86.
+
+  02 Mar 2005; Aaron Walker <ka0ttic@gentoo.org>
+  -files/wordpress-1.0.2.gentoo.diff, -files/1.2/login-patch.diff,
+  -files/1.2/postinstall-en.txt, -files/1.2.1/login-patch.diff,
+  -files/1.2.1/postinstall-en.txt, -wordpress-1.0.2.ebuild,
+  -wordpress-1.2-r1.ebuild, -wordpress-1.2.1.ebuild, -wordpress-1.2.ebuild:
+  Tidy all vulnerable ebuilds <1.2.2.
+
+  18 Dec 2004; Jason Wever <weeve@gentoo.org> wordpress-1.2.2.ebuild:
+  Stable on sparc wrt security bug #74649.
+
+  18 Dec 2004; Jason Wever <weeve@gentoo.org> wordpress-1.2-r1.ebuild:
+  Stable on sparc.
+
+*wordpress-1.2.2 (18 Dec 2004)
+
+  18 Dec 2004; Stuart Herbert <stuart@gentoo.org> +wordpress-1.2.2.ebuild:
+  Version bump; fixes bug 74649; thanks to Peter Westwood
+  (peter.westwood@ftwr.co.uk) for his help
+
+  12 Oct 2004; <SeJo@gentoo.org> :
+  stable on ppc gsla: 65798
+
+*wordpress-1.2.1 (08 Oct 2004)
+
+  08 Oct 2004; Stuart Herbert <stuart@gentoo.org> +wordpress-1.2.1.ebuild:
+  Version bump; fixes security bug #65798; thanks to Peter Westwood
+  <peter.westwood@ftwr.co.uk> for testing
+
+  08 Sep 2004; Renat Lumpau <rl03@gentoo.org> metadata.xml:
+  Fixed herd name
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wordpress-1.0.2.ebuild, wordpress-1.2-r1.ebuild, wordpress-1.2.ebuild:
+  Masked wordpress-1.2.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wordpress-1.0.2.ebuild, wordpress-1.2-r1.ebuild:
+  Masked wordpress-1.2-r1.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wordpress-1.0.2.ebuild:
+  Masked wordpress-1.0.2.ebuild stable for ppc
 
 *wordpress-1.2 (15 Aug 2004)
 
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index 361b06b75c08..dcafe4060dc0 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -1,11 +1,7 @@
-MD5 466144f1c1091f2f9be0189696ca3133 ChangeLog 1495
-MD5 9d471cc484027d6985487e1f0064643f wordpress-1.0.2.ebuild 1959
-MD5 3d182d43f7f0341a9a42f96694f04e72 metadata.xml 224
-MD5 854b49269847305ac5b9d202007ee6e2 wordpress-1.2.ebuild 1930
-MD5 b76db346dcc1b670f7a8b07425673c62 wordpress-1.2-r1.ebuild 1933
-MD5 3310de51163cfb2a4b23c784003c123d files/digest-wordpress-1.0.2 74
-MD5 8798d44320b59c755a81271d58bd3827 files/wordpress-1.0.2.gentoo.diff 7670
-MD5 60c89171f6db7c359da81d9bd4a78853 files/digest-wordpress-1.2 72
-MD5 60c89171f6db7c359da81d9bd4a78853 files/digest-wordpress-1.2-r1 72
-MD5 c2b531747ebb18f8bc7eed6261710c66 files/1.2/postinstall-en.txt 490
-MD5 bf77b16b46337e5eb66a5fb42c3b263d files/1.2/login-patch.diff 2062
+MD5 07a308c8d2c623243df9ba0660bdceee ChangeLog 6322
+MD5 bed9c007e8ee867414a21e2da8e92b3f metadata.xml 252
+MD5 923e5b3d31768189647560af4cbfa126 wordpress-1.5.2.ebuild 2287
+MD5 2043087278b4f778513ccfd4bc65b8f3 wordpress-1.5.1.3.ebuild 2019
+MD5 77f6e444886a1c9d39719c96d87ed625 files/digest-wordpress-1.5.2 67
+MD5 01d53342f3a1885d4067674e6d8feb5b files/digest-wordpress-1.5.1.3 69
+MD5 f816ff62dcd7cadf0fae9384ab9618e5 files/dummy-templates.php 269
diff --git a/www-apps/wordpress/metadata.xml b/www-apps/wordpress/metadata.xml
index 0d59c319c3eb..0def158e555f 100644
--- a/www-apps/wordpress/metadata.xml
+++ b/www-apps/wordpress/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>
+<herd>web-apps</herd>
 <maintainer>
-  <email>web-apps@gentoo.org</email>
+  <email>superlag@gentoo.org</email>
+  <name>Aaron Kulbe</name>
 </maintainer>
 </pkgmetadata>
diff --git a/www-apps/wordpress/wordpress-1.5.1.3.ebuild b/www-apps/wordpress/wordpress-1.5.1.3.ebuild
index 9d4e80b01a6e..7a26d5199066 100644
--- a/www-apps/wordpress/wordpress-1.5.1.3.ebuild
+++ b/www-apps/wordpress/wordpress-1.5.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/www-apps/wordpress/wordpress-1.5.1.3.ebuild,v 1.1 2005/06/30 03:00:09 superlag Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-1.5.1.3.ebuild,v 1.1.1.1 2005/11/30 09:37:12 chriswhite Exp $
 
 inherit webapp eutils
 
@@ -14,12 +14,12 @@ HOMEPAGE="http://wordpress.org/"
 #Download is renamed by HTTP Header as wordpress-1.5.1.2.tar.gz
 SRC_URI=mirror://gentoo/${P}.tar.gz
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
 RDEPEND=">=dev-php/mod_php-4.1
 	 >=dev-db/mysql-3.23.23"
 
-DEPEND="${DEPEND} ${RDEPEND} >=net-www/webapp-config-1.10-r5"
+DEPEND="${DEPEND} ${RDEPEND}"
 
 S="${WORKDIR}/${PN}"
 
@@ -65,10 +65,6 @@ src_install() {
 	# for wordpress, we *assume* that all .php files need to have CGI/BIN
 	# support added
 
-	for x in `find . -name '*.php' -print ` ; do
-		webapp_runbycgibin php ${MY_HTDOCSDIR}/$x
-	done
-
 	# post-install instructions
 	#webapp_postinst_txt en ${FILESDIR}/1.2/postinstall-en.txt
 
diff --git a/www-apps/wordpress/wordpress-1.5.2.ebuild b/www-apps/wordpress/wordpress-1.5.2.ebuild
index 77f728d04a58..ac1ab481bf11 100644
--- a/www-apps/wordpress/wordpress-1.5.2.ebuild
+++ b/www-apps/wordpress/wordpress-1.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/www-apps/wordpress/wordpress-1.5.2.ebuild,v 1.1 2005/08/15 05:25:00 superlag Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-1.5.2.ebuild,v 1.1.1.1 2005/11/30 09:37:11 chriswhite Exp $
 
 inherit webapp eutils
 
@@ -18,7 +18,7 @@ IUSE=""
 RDEPEND=">=dev-php/mod_php-4.1
 	 >=dev-db/mysql-3.23.23"
 
-DEPEND="${DEPEND} ${RDEPEND} >=net-www/webapp-config-1.10-r5"
+DEPEND="${DEPEND} ${RDEPEND}"
 
 S="${WORKDIR}/${PN}"
 
diff --git a/www-apps/xoops/ChangeLog b/www-apps/xoops/ChangeLog
index d0c8b42180e7..9ee8582ff1e5 100644
--- a/www-apps/xoops/ChangeLog
+++ b/www-apps/xoops/ChangeLog
@@ -1,6 +1,59 @@
 # ChangeLog for www-apps/xoops
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/xoops/ChangeLog,v 1.1 2004/09/22 07:43:41 rl03 Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/xoops/ChangeLog,v 1.1.1.1 2005/11/30 09:37:10 chriswhite Exp $
+
+  26 Oct 2005; Renat Lumpau <rl03@gentoo.org> -xoops-2.2.1.ebuild,
+  -xoops-2.2.2.ebuild:
+  Removing old versions
+
+*xoops-2.2.3 (25 Oct 2005)
+
+  25 Oct 2005; Renat Lumpau <rl03@gentoo.org> +xoops-2.2.3.ebuild:
+  Version bump wrt security bug #110466.
+
+  23 Aug 2005; Renat Lumpau <rl03@gentoo.org> xoops-2.2.1.ebuild,
+  xoops-2.2.2.ebuild:
+  Fix cp -a wrt bug #103487
+
+  22 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt:
+  Housekeeping
+
+*xoops-2.2.2 (16 Aug 2005)
+
+  16 Aug 2005; Renat Lumpau <rl03@gentoo.org> +xoops-2.2.2.ebuild:
+  Version bump.
+
+*xoops-2.2.1 (09 Aug 2005)
+
+  09 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  -xoops-2.0.13.ebuild, +xoops-2.2.1.ebuild:
+  Version bump wrt security bug #101899. Removed vulnerable versions.
+
+*xoops-2.0.13 (03 Jul 2005)
+
+  03 Jul 2005; Renat Lumpau <rl03@gentoo.org>
+  -files/xoops-2.0.9.2-fix-file-ext-validation.diff,
+  files/postinstall-en.txt, -xoops-2.0.7.3.ebuild, -xoops-2.0.9.2.ebuild,
+  -xoops-2.0.12a.ebuild, +xoops-2.0.13.ebuild:
+  Version bump (#79348). Fixes XML_RPC vulnerability (#97399).
+
+*xoops-2.0.12a (30 Jun 2005)
+
+  30 Jun 2005; Aaron Walker <ka0ttic@gentoo.org> +xoops-2.0.12a.ebuild:
+  Version bump for security bug 97522.
+
+  11 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> xoops-2.0.9.2.ebuild:
+  added ~amd64 to KEYWORDS. fixes #84443
+
+*xoops-2.0.9.2 (11 Mar 2005)
+
+  11 Mar 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/xoops-2.0.9.2-fix-file-ext-validation.diff, +xoops-2.0.9.2.ebuild:
+  Version bump; added patch to fix weak file extension validation (see bug
+  84570) until upstream releases a new version.
+
+  18 Oct 2004; David Holm <dholm@gentoo.org> xoops-2.0.7.3.ebuild:
+  Added to ~ppc.
 
 *xoops-2.0.7.3 (22 Sep 2004)
 
diff --git a/www-apps/xoops/Manifest b/www-apps/xoops/Manifest
index ced9aa149768..f64b75e15d5f 100644
--- a/www-apps/xoops/Manifest
+++ b/www-apps/xoops/Manifest
@@ -1,4 +1,15 @@
-MD5 82c804cd9bfe31f31a7dbed82308b29f xoops-2.0.7.3.ebuild 940
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d9e7cabfd237d92dd751fa74ee5c2e65 xoops-2.2.3.ebuild 1123
+MD5 6dd09dfab8d2f083eb35bbb7070592be ChangeLog 2137
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
-MD5 5e4fc169f3bd7008c2fb1ac862675cae files/postinstall-en.txt 227
-MD5 9b1db386f585147b9692a8c6b62dc574 files/digest-xoops-2.0.7.3 63
+MD5 16a0de71d69c8cf976d7df646f8f462a files/postinstall-en.txt 393
+MD5 0ea4d1059b018952db2e31f87ce665b9 files/digest-xoops-2.2.3 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDX3MoEzitwsaoONoRApGwAJ47Qg6yrrCRdr8sdVF1+M7EqNPYqwCgz7xy
+N+e6pdW+hR/DUtH+GXFin5g=
+=fINH
+-----END PGP SIGNATURE-----
diff --git a/www-apps/xoops/files/postinstall-en.txt b/www-apps/xoops/files/postinstall-en.txt
index c7b9ce00ba91..e77cf7c9acbd 100644
--- a/www-apps/xoops/files/postinstall-en.txt
+++ b/www-apps/xoops/files/postinstall-en.txt
@@ -1,6 +1,14 @@
 Now create a database for Xoops to use (consult your MySQL manual if you don't
 know how.
-Then browse to http://yourhost/xoops
+You will need to
 
-When you are done with the installer, remove the install/ directory, and chmod
-mainfile.php to 444.
+ chmod 666 ${MY_INSTALLDIR}/mainfile.php
+
+Then browse to http://${VHOST_HOSTNAME}/${VHOST_APPDIR}
+
+When you are done with the installer:
+
+ rm -rf ${MY_INSTALLDIR}/install
+ chmod 444 ${MY_INSTALLDIR}/mainfile.php
+
+Note that the extras have been installed into ${VHOST_ROOT}/${PN}-${PVR}
diff --git a/www-apps/xoops/xoops-2.2.3.ebuild b/www-apps/xoops/xoops-2.2.3.ebuild
index 8327bc60c840..e47dc2da079a 100644
--- a/www-apps/xoops/xoops-2.2.3.ebuild
+++ b/www-apps/xoops/xoops-2.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/www-apps/xoops/xoops-2.2.3.ebuild,v 1.1 2005/10/25 20:42:08 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/xoops/xoops-2.2.3.ebuild,v 1.1.1.1 2005/11/30 09:37:10 chriswhite Exp $
 
 inherit webapp
 
diff --git a/xfce-extra/exo/ChangeLog b/xfce-extra/exo/ChangeLog
index eaa5a051f1ef..3c529cb404a8 100644
--- a/xfce-extra/exo/ChangeLog
+++ b/xfce-extra/exo/ChangeLog
@@ -1,6 +1,51 @@
 # ChangeLog for xfce-extra/exo
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/exo/ChangeLog,v 1.1 2004/12/02 00:33:50 bcowan Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/exo/ChangeLog,v 1.1.1.1 2005/11/30 09:39:01 chriswhite Exp $
+
+  08 Oct 2005; Michael Hanselmann <hansmi@gentoo.org> exo-0.3.0.ebuild:
+  Stable on ppc.
+
+*exo-0.3.0-r1 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org> exo-0.3.0.ebuild,
+  +exo-0.3.0-r1.ebuild:
+  Xfce builds for new eclass and modular Xorg.
+
+  07 Sep 2005; Brad Cowan <bcowan@gentoo.org> exo-0.3.0.ebuild:
+  Remove dbus dep.
+
+  23 Aug 2005; Aron Griffis <agriffis@gentoo.org> exo-0.2.0-r1.ebuild:
+  stable on ia64
+
+  12 Jun 2005; Sven Wegener <swegener@gentoo.org> exo-0.2.0-r1.ebuild,
+  exo-0.3.0_pre1.ebuild, exo-0.3.0.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  23 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> exo-0.2.0-r1.ebuild:
+  Stable on ppc.
+
+*exo-0.3.0 (14 Mar 2005)
+
+  14 Mar 2005; Brad Cowan <bcowan@gentoo.org> +exo-0.3.0.ebuild:
+  Version bump.
+
+*exo-0.3.0_pre1 (04 Mar 2005)
+
+  04 Mar 2005; Brad Cowan <bcowan@gentoo.org> +exo-0.3.0_pre1.ebuild:
+  Version bump.
+
+  27 Feb 2005; Jason Wever <weeve@gentoo.org> exo-0.2.0-r1.ebuild:
+  Added ~sparc keyword.
+
+*exo-0.2.0-r1 (07 Jan 2005)
+
+  07 Jan 2005; Brad Cowan <bcowan@gentoo.org> +exo-0.2.0-r1.ebuild:
+  Updates for Xfce4 eclass.
+
+*exo-0.2.0 (02 Dec 2004)
+
+  02 Dec 2004; Brad Cowan <bcowan@gentoo.org> +exo-0.2.0.ebuild:
+  Version bump.
 
 *exo-0.2.0_pre2 (01 Dec 2004)
 
diff --git a/xfce-extra/exo/Manifest b/xfce-extra/exo/Manifest
index 24e721ebb66d..cc34a90ce884 100644
--- a/xfce-extra/exo/Manifest
+++ b/xfce-extra/exo/Manifest
@@ -1,2 +1,20 @@
-MD5 c41b18a3d0241f9f69d00411f1e058f0 exo-0.2.0_pre2.ebuild 688
-MD5 af225a57e3f3bab1d14a44cbc6834d75 files/digest-exo-0.2.0_pre2 66
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 51f30fb6df5794ffd70b78f99c8f8db3 ChangeLog 1614
+MD5 a297b200623fd9c91fcc162009f6d313 exo-0.2.0-r1.ebuild 487
+MD5 28434366e9b0eb8fbd0d9de0bf52c07c exo-0.3.0-r1.ebuild 601
+MD5 43d3544caf4bab5addd6098a4a7488d6 exo-0.3.0.ebuild 441
+MD5 807f3878637440cc0068a1174e3945e1 exo-0.3.0_pre1.ebuild 495
+MD5 ff443b2ff08285d00d134f52370c49c0 files/digest-exo-0.2.0-r1 62
+MD5 3329f89c13001f50cc3b9c995b84c4d3 files/digest-exo-0.3.0 62
+MD5 3329f89c13001f50cc3b9c995b84c4d3 files/digest-exo-0.3.0-r1 62
+MD5 1a12f2a9caec3822eec394a4cfa7fa9d files/digest-exo-0.3.0_pre1 66
+MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDSobCgIKl8Uu19MoRAqgHAJ9sDNx42W6kb8NtRwJMdzKX/7MM8wCfQ7MF
+vsryMOEsGpduyjMb/wUYf9k=
+=dkYg
+-----END PGP SIGNATURE-----
diff --git a/xfce-extra/exo/exo-0.2.0-r1.ebuild b/xfce-extra/exo/exo-0.2.0-r1.ebuild
index 412fac7b6528..5c5eaf75c453 100644
--- a/xfce-extra/exo/exo-0.2.0-r1.ebuild
+++ b/xfce-extra/exo/exo-0.2.0-r1.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/exo/exo-0.2.0-r1.ebuild,v 1.1 2005/01/07 06:29:27 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/exo/exo-0.2.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:39:01 chriswhite Exp $
 
 DESCRIPTION="Extension library for Xfce"
 HOMEPAGE="http://www.os-cillation.com/"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ia64 ppc ~ppc64 ~sparc x86"
 
-XFCE_RDEPEND=">=x11-libs/gtk+-2.4*
-	    >=sys-apps/dbus-0.22"
+RDEPEND=">=x11-libs/gtk+-2.4
+	>=sys-apps/dbus-0.22
+	>=xfce-base/libxfce4mcs-4.2.0"
 MY_P="${PN/t/T}-${PV}"
 BZIPPED=1
 GOODIES=1
diff --git a/xfce-extra/exo/exo-0.3.0-r1.ebuild b/xfce-extra/exo/exo-0.3.0-r1.ebuild
index 1cd1fb7bf6d8..03d5ee605f64 100644
--- a/xfce-extra/exo/exo-0.3.0-r1.ebuild
+++ b/xfce-extra/exo/exo-0.3.0-r1.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/xfce-extra/exo/exo-0.3.0-r1.ebuild,v 1.1 2005/10/06 07:37:09 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/exo/exo-0.3.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:39:01 chriswhite Exp $
 
 inherit xfce42
 
 DESCRIPTION="Extension library for Xfce"
 HOMEPAGE="http://www.os-cillation.com/"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="|| ( ( x11-libs/libX11
 	x11-libs/libICE
 	x11-libs/libSM )
 	virtual/x11 )
 	>=x11-libs/gtk+-2.4
-	>=xfce-base/libxfce4mcs-4.2.0"
+	>=xfce-base/libxfce4mcs-4.2.2-r1"
 DEPEND="${RDEPEND}
 	|| ( ( x11-libs/libX11
 	x11-libs/libXt )
diff --git a/xfce-extra/exo/exo-0.3.0.ebuild b/xfce-extra/exo/exo-0.3.0.ebuild
index 13b9c3c7ceeb..892bc8778c28 100644
--- a/xfce-extra/exo/exo-0.3.0.ebuild
+++ b/xfce-extra/exo/exo-0.3.0.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/exo/exo-0.3.0.ebuild,v 1.1 2005/03/14 08:55:30 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/exo/exo-0.3.0.ebuild,v 1.1.1.1 2005/11/30 09:39:01 chriswhite Exp $
 
 DESCRIPTION="Extension library for Xfce"
 HOMEPAGE="http://www.os-cillation.com/"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 arm ia64 ppc ~ppc64 ~sparc x86"
 
-RDEPEND=">=x11-libs/gtk+-2.4*
-	>=sys-apps/dbus-0.22
+RDEPEND=">=x11-libs/gtk+-2.4
 	>=xfce-base/libxfce4mcs-4.2.0"
 BZIPPED=1
 GOODIES=1
diff --git a/xfce-extra/exo/exo-0.3.0_pre1.ebuild b/xfce-extra/exo/exo-0.3.0_pre1.ebuild
index 197c06a084ef..46eebeeff020 100644
--- a/xfce-extra/exo/exo-0.3.0_pre1.ebuild
+++ b/xfce-extra/exo/exo-0.3.0_pre1.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/xfce-extra/exo/exo-0.3.0_pre1.ebuild,v 1.1 2005/03/04 06:23:03 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/exo/exo-0.3.0_pre1.ebuild,v 1.1.1.1 2005/11/30 09:39:01 chriswhite Exp $
 
 DESCRIPTION="Extension library for Xfce"
 HOMEPAGE="http://www.os-cillation.com/"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
-RDEPEND=">=x11-libs/gtk+-2.4*
+RDEPEND=">=x11-libs/gtk+-2.4
 	>=sys-apps/dbus-0.22
 	>=xfce-base/libxfce4mcs-4.2.0"
 MY_P="${PN/t/T}-${PV/_/}"
diff --git a/xfce-extra/metadata.xml b/xfce-extra/metadata.xml
index f0475539236d..a7aa2807cbc7 100644
--- a/xfce-extra/metadata.xml
+++ b/xfce-extra/metadata.xml
@@ -4,5 +4,24 @@
 	<longdescription lang="en">
 		The xfce-extra category contains non-core XFCE applications.
 	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie xfce-extra enthält zusätzliche Software für den
+		XFCE-Desktop.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría xfce-extra contiene paquetes no esenciales de XFCE.
+	</longdescription>
+	<longdescription lang="ja">
+		xfce-extraカテゴリーにはXFCEの拡張パッケージが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De xfce-extra categorie bevat additionele XFCE-applicaties.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm xfce-extra chứa các gói XFCE mở rộng.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria xfce-extra contiene applicazioni non essenziali per XFCE.
+	</longdescription>
 </catmetadata>
 
diff --git a/xfce-extra/mousepad/ChangeLog b/xfce-extra/mousepad/ChangeLog
index 30f88640a4c9..9f7410041388 100644
--- a/xfce-extra/mousepad/ChangeLog
+++ b/xfce-extra/mousepad/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for xfce-extra/mousepad
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/mousepad/ChangeLog,v 1.1 2005/02/20 21:02:10 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/mousepad/ChangeLog,v 1.1.1.1 2005/11/30 09:38:57 chriswhite Exp $
+
+*mousepad-0.2.2-r1 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org> +mousepad-0.2.2-r1.ebuild:
+  Xfce builds for new eclass and modular Xorg.
+
+  08 Sep 2005; Aron Griffis <agriffis@gentoo.org> mousepad-0.2.2.ebuild:
+  Mark 0.2.2 stable on ia64
+
+  08 Sep 2005; Luis Medinas <metalgod@gentoo.org> mousepad-0.2.2.ebuild:
+  Marked Stable on AMD64.
+
+  07 Sep 2005; Brad Cowan <bcowan@gentoo.org> mousepad-0.2.2.ebuild:
+  Stable on x86.
+
+*mousepad-0.2.2 (09 Apr 2005)
+
+  09 Apr 2005; Brad Cowan <bcowan@gentoo.org> +mousepad-0.2.2.ebuild:
+  Version bump.
 
 *mousepad-0.2.1 (20 Feb 2005)
 
diff --git a/xfce-extra/mousepad/Manifest b/xfce-extra/mousepad/Manifest
index e400ab70ba5d..71ffc4fc7eae 100644
--- a/xfce-extra/mousepad/Manifest
+++ b/xfce-extra/mousepad/Manifest
@@ -1,2 +1,8 @@
-MD5 8ae44e8496873b58c347386c1a600fb7 mousepad-0.2.1.ebuild 464
+MD5 07a67e7a018692f59d678b454b489852 mousepad-0.2.1.ebuild 458
+MD5 08606cb633340365c251551633c5db34 mousepad-0.2.2-r1.ebuild 459
+MD5 f566a449c7ab177ad8d7c55092711f94 mousepad-0.2.2.ebuild 457
+MD5 aa2fc2a180249fc67c290fda899107d5 ChangeLog 893
+MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 MD5 0112cc25411dd44eb52d85b488d59583 files/digest-mousepad-0.2.1 66
+MD5 b05f378444d8465ea9b68aa6528f3f78 files/digest-mousepad-0.2.2 66
+MD5 b05f378444d8465ea9b68aa6528f3f78 files/digest-mousepad-0.2.2-r1 66
diff --git a/xfce-extra/mousepad/mousepad-0.2.1.ebuild b/xfce-extra/mousepad/mousepad-0.2.1.ebuild
index 79e16973401d..b21d7087409a 100644
--- a/xfce-extra/mousepad/mousepad-0.2.1.ebuild
+++ b/xfce-extra/mousepad/mousepad-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/xfce-extra/mousepad/mousepad-0.2.1.ebuild,v 1.1 2005/02/20 21:02:10 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/mousepad/mousepad-0.2.1.ebuild,v 1.1.1.1 2005/11/30 09:38:57 chriswhite Exp $
 
 DESCRIPTION="Small text editor for Xfce 4"
 SRC_URI="http://erikharrison.net/software/${P}.tar.gz"
diff --git a/xfce-extra/mousepad/mousepad-0.2.2-r1.ebuild b/xfce-extra/mousepad/mousepad-0.2.2-r1.ebuild
index a55d5ff20459..eae94408333e 100644
--- a/xfce-extra/mousepad/mousepad-0.2.2-r1.ebuild
+++ b/xfce-extra/mousepad/mousepad-0.2.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/xfce-extra/mousepad/mousepad-0.2.2-r1.ebuild,v 1.1 2005/10/06 16:52:32 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/mousepad/mousepad-0.2.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:57 chriswhite Exp $
 
 inherit xfce42
 
diff --git a/xfce-extra/mousepad/mousepad-0.2.2.ebuild b/xfce-extra/mousepad/mousepad-0.2.2.ebuild
index 6505c36eda90..45955aeb5229 100644
--- a/xfce-extra/mousepad/mousepad-0.2.2.ebuild
+++ b/xfce-extra/mousepad/mousepad-0.2.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/xfce-extra/mousepad/mousepad-0.2.2.ebuild,v 1.1 2005/04/09 22:14:51 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/mousepad/mousepad-0.2.2.ebuild,v 1.1.1.1 2005/11/30 09:38:57 chriswhite Exp $
 
 DESCRIPTION="Small text editor for Xfce 4"
 SRC_URI="http://erikharrison.net/software/${P}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="xfce-base/libxfce4mcs"
 
diff --git a/xfce-extra/terminal/ChangeLog b/xfce-extra/terminal/ChangeLog
index 2ac623d51cbd..8878bb42ff73 100644
--- a/xfce-extra/terminal/ChangeLog
+++ b/xfce-extra/terminal/ChangeLog
@@ -1,6 +1,52 @@
 # ChangeLog for xfce-extra/terminal
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/terminal/ChangeLog,v 1.1 2004/12/02 00:38:25 bcowan Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/terminal/ChangeLog,v 1.1.1.1 2005/11/30 09:38:59 chriswhite Exp $
+
+  08 Oct 2005; Michael Hanselmann <hansmi@gentoo.org> terminal-0.2.4.ebuild:
+  Stable on ppc.
+
+*terminal-0.2.4-r1 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org> terminal-0.2.4.ebuild,
+  +terminal-0.2.4-r1.ebuild:
+  Xfce builds for new eclass and modular Xorg.
+
+  09 Sep 2005; Aron Griffis <agriffis@gentoo.org> terminal-0.2.2-r1.ebuild:
+  Mark 0.2.2-r1 stable on ia64
+
+  07 Sep 2005; Brad Cowan <bcowan@gentoo.org> terminal-0.2.4.ebuild:
+  Add dbus as conditional dep.
+
+  12 Jun 2005; Sven Wegener <swegener@gentoo.org> terminal-0.2.2-r1.ebuild,
+  terminal-0.2.4_pre1.ebuild, terminal-0.2.4.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  23 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  terminal-0.2.2-r1.ebuild:
+  Stable on ppc.
+
+  21 Mar 2005; Brad Cowan <bcowan@gentoo.org> :
+  Version bump. Now has option to choose default browser and mail client.
+
+*terminal-0.2.4_pre1 (04 Mar 2005)
+
+  04 Mar 2005; Brad Cowan <bcowan@gentoo.org> +terminal-0.2.4_pre1.ebuild:
+  Version bump.
+
+*terminal-0.2.2-r1 (07 Jan 2005)
+
+  07 Jan 2005; Brad Cowan <bcowan@gentoo.org> +terminal-0.2.2-r1.ebuild:
+  Updates for Xfce4 eclass.
+
+*terminal-0.2.2 (02 Jan 2005)
+
+  02 Jan 2005; Brad Cowan <bcowan@gentoo.org> +terminal-0.2.2.ebuild:
+  Version bump.
+
+*terminal-0.2.0 (02 Dec 2004)
+
+  02 Dec 2004; Brad Cowan <bcowan@gentoo.org> +terminal-0.2.0.ebuild:
+  Version bump.
 
 *terminal-0.2.0_pre2 (01 Dec 2004)
 
diff --git a/xfce-extra/terminal/Manifest b/xfce-extra/terminal/Manifest
index 0512c78f2b29..23a8ef1c8e75 100644
--- a/xfce-extra/terminal/Manifest
+++ b/xfce-extra/terminal/Manifest
@@ -1,2 +1,20 @@
-MD5 5f4c0f5d644c85eee7e2b0fef5c25b94 terminal-0.2.0_pre2.ebuild 727
-MD5 9a3b35ca7110998b046a6c2476cf5caa files/digest-terminal-0.2.0_pre2 71
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a431d4777c3eacfc431b9999501e1634 ChangeLog 1797
+MD5 d70719558b669d516582f062bf02d7c9 files/digest-terminal-0.2.2-r1 67
+MD5 7ef99426867dafad5a6020ba78dfa5c2 files/digest-terminal-0.2.4 68
+MD5 7ef99426867dafad5a6020ba78dfa5c2 files/digest-terminal-0.2.4-r1 68
+MD5 ffe4301116b9b2a849aeb52d1e74fd0f files/digest-terminal-0.2.4_pre1 71
+MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+MD5 348192d3f84c53883baa3988cc4fa885 terminal-0.2.2-r1.ebuild 528
+MD5 73cc384de1653bc5884812a286dcf7eb terminal-0.2.4-r1.ebuild 798
+MD5 835d382d94f5e9ce2a169b8ac2b1ffb5 terminal-0.2.4.ebuild 629
+MD5 2f33f0835f138986e6019840d3fad951 terminal-0.2.4_pre1.ebuild 542
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDSo58gIKl8Uu19MoRAskqAJ9sIZFCvQhCy7btZ3yCm0gsnl45zgCeOXo5
+XlPRNtZhjD7a9ZL8wrVZ5sA=
+=UyIj
+-----END PGP SIGNATURE-----
diff --git a/xfce-extra/terminal/terminal-0.2.2-r1.ebuild b/xfce-extra/terminal/terminal-0.2.2-r1.ebuild
index b3dd71b0325a..473fea6f17e2 100644
--- a/xfce-extra/terminal/terminal-0.2.2-r1.ebuild
+++ b/xfce-extra/terminal/terminal-0.2.2-r1.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/xfce-extra/terminal/terminal-0.2.2-r1.ebuild,v 1.1 2005/01/07 06:29:27 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/terminal/terminal-0.2.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:59 chriswhite Exp $
 
 DESCRIPTION="Terminal with close ties to xfce"
 HOMEPAGE="http://www.os-cillation.com/"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ia64 ppc ~ppc64 ~sparc x86"
 
-XFCE_RDEPEND=">=x11-libs/gtk+-2.4*
-	>=xfce-extra/exo-0.2.0-r1
-	>=x11-libs/vte-0.11.11"
+RDEPEND=">=x11-libs/gtk+-2.4
+	<xfce-extra/exo-0.3.0
+	>=x11-libs/vte-0.11.11
+	>=xfce-base/libxfce4mcs-4.2.0"
 MY_P="${PN/t/T}-${PV}"
 BZIPPED=1
 GOODIES=1
diff --git a/xfce-extra/terminal/terminal-0.2.4-r1.ebuild b/xfce-extra/terminal/terminal-0.2.4-r1.ebuild
index abdb40865932..4e7effb443ab 100644
--- a/xfce-extra/terminal/terminal-0.2.4-r1.ebuild
+++ b/xfce-extra/terminal/terminal-0.2.4-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/xfce-extra/terminal/terminal-0.2.4-r1.ebuild,v 1.1 2005/10/06 07:40:33 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/terminal/terminal-0.2.4-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:59 chriswhite Exp $
 
 inherit xfce42
 
 DESCRIPTION="Terminal with close ties to xfce"
 HOMEPAGE="http://www.os-cillation.com/"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="dbus"
 
@@ -20,6 +20,7 @@ RDEPEND="|| ( ( x11-libs/libX11
 	>=xfce-extra/exo-0.3.0-r1
 	dbus? ( sys-apps/dbus )
 	>=x11-libs/vte-0.11.11
+	x11-libs/startup-notification
 	>=xfce-base/libxfce4mcs-4.2.2-r1"
 
 MY_P="${PN/t/T}-${PV/_/}"
diff --git a/xfce-extra/terminal/terminal-0.2.4.ebuild b/xfce-extra/terminal/terminal-0.2.4.ebuild
index 2d4d6515d91a..18885733750c 100644
--- a/xfce-extra/terminal/terminal-0.2.4.ebuild
+++ b/xfce-extra/terminal/terminal-0.2.4.ebuild
@@ -1,17 +1,25 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/terminal/terminal-0.2.4.ebuild,v 1.1 2005/03/21 00:14:34 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/terminal/terminal-0.2.4.ebuild,v 1.1.1.1 2005/11/30 09:38:59 chriswhite Exp $
 
 DESCRIPTION="Terminal with close ties to xfce"
 HOMEPAGE="http://www.os-cillation.com/"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 arm ia64 ppc ~ppc64 ~sparc x86"
 
-RDEPEND=">=x11-libs/gtk+-2.4*
+IUSE="dbus"
+
+RDEPEND=">=x11-libs/gtk+-2.4
 	>=xfce-extra/exo-0.3.0_pre1
+	dbus? ( sys-apps/dbus )
 	>=x11-libs/vte-0.11.11
 	>=xfce-base/libxfce4mcs-4.2.0"
+
 MY_P="${PN/t/T}-${PV/_/}"
 BZIPPED=1
 GOODIES=1
 
+if ! use dbus; then
+	XFCE_CONFIG="--disable-dbus"
+fi
+
 inherit xfce4
diff --git a/xfce-extra/terminal/terminal-0.2.4_pre1.ebuild b/xfce-extra/terminal/terminal-0.2.4_pre1.ebuild
index 6ba99b2abe1a..8eca14090dbc 100644
--- a/xfce-extra/terminal/terminal-0.2.4_pre1.ebuild
+++ b/xfce-extra/terminal/terminal-0.2.4_pre1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/terminal/terminal-0.2.4_pre1.ebuild,v 1.1 2005/03/04 06:42:34 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/terminal/terminal-0.2.4_pre1.ebuild,v 1.1.1.1 2005/11/30 09:38:59 chriswhite Exp $
 
 DESCRIPTION="Terminal with close ties to xfce"
 HOMEPAGE="http://www.os-cillation.com/"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
-RDEPEND=">=x11-libs/gtk+-2.4*
-	>=xfce-extra/exo-0.2.0-r1
+RDEPEND=">=x11-libs/gtk+-2.4
+	>=xfce-extra/exo-0.3.0_pre1
 	>=x11-libs/vte-0.11.11
 	>=xfce-base/libxfce4mcs-4.2.0"
 MY_P="${PN/t/T}-${PV/_/}"
diff --git a/xfce-extra/xfcalendar/ChangeLog b/xfce-extra/xfcalendar/ChangeLog
index f66f5a5d20d7..b68a38f24c02 100644
--- a/xfce-extra/xfcalendar/ChangeLog
+++ b/xfce-extra/xfcalendar/ChangeLog
@@ -1,6 +1,163 @@
 # ChangeLog for xfce-extra/xfcalendar
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfcalendar/ChangeLog,v 1.1 2004/01/09 05:49:15 bcowan Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfcalendar/ChangeLog,v 1.1.1.1 2005/11/30 09:39:00 chriswhite Exp $
+
+*xfcalendar-4.2.2-r1 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org> +xfcalendar-4.2.2-r1.ebuild:
+  Xfce builds for new eclass and modular Xorg.
+
+  12 Jul 2005; Simon Stelling <blubb@gentoo.org> xfcalendar-4.2.2.ebuild:
+  stable on amd64
+
+  11 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  xfcalendar-4.2.2.ebuild:
+  Stable on alpha + ia64.
+
+  11 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  xfcalendar-4.2.2.ebuild:
+  Stable on hppa.
+
+  08 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  xfcalendar-4.2.2.ebuild:
+  Stable on sparc
+
+  07 Jul 2005; Daniel Ostrow <dostrow@gentoo.org> xfcalendar-4.2.2.ebuild:
+  Stable on ppc and ppc64.
+
+  15 Jun 2005; Markus Rothe <corsair@gentoo.org> xfcalendar-4.2.0.ebuild:
+  Stable on ppc64
+
+*xfcalendar-4.2.2 (18 May 2005)
+
+  18 May 2005; Brad Cowan <bcowan@gentoo.org> +xfcalendar-4.2.2.ebuild:
+  4.2.2 bugfix release of Xfce 4.
+
+  23 Mar 2005; Daniel Ostrow <dostrow@gentoo.org> xfcalendar-4.2.1.ebuild:
+  Version bump and associated fixes.
+
+*xfcalendar-4.2.1 (17 Mar 2005)
+
+  17 Mar 2005; Brad Cowan <bcowan@gentoo.org> +xfcalendar-4.2.1.ebuild:
+  Bugfix release of Xfce4.
+
+  09 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
+  xfcalendar-4.2.0.ebuild:
+  Stable on alpha.
+
+  31 Jan 2005; lanius@gentoo.org xfcalendar-4.2.0.ebuild:
+  stable on amd64
+
+  29 Jan 2005; Lars Weiler <pylon@gentoo.org> xfcalendar-4.2.0.ebuild:
+  Stable on ppc.
+
+  24 Jan 2005; Guy Martin <gmsoft@gentoo.org> xfcalendar-4.2.0.ebuild:
+  Stable on hppa.
+
+*xfcalendar-4.2.0 (16 Jan 2005)
+
+  16 Jan 2005; Brad Cowan <bcowan@gentoo.org> +xfcalendar-4.2.0.ebuild:
+  4.2 final release of Xfce4.
+
+*xfcalendar-4.1.99.3-r1 (06 Jan 2005)
+
+  06 Jan 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfcalendar-4.1.99.3-r1.ebuild:
+  Updated to use Xfce4 eclass.
+
+  03 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*xfcalendar-4.1.99.3 (02 Jan 2005)
+
+  02 Jan 2005; Brad Cowan <bcowan@gentoo.org> +xfcalendar-4.1.99.3.ebuild:
+  Version bump to RC version of 4.2 release.
+
+*xfcalendar-4.1.99.2 (13 Dec 2004)
+
+  13 Dec 2004; Brad Cowan <bcowan@gentoo.org> +xfcalendar-4.1.99.2.ebuild:
+  Version bump for beta version of 4.2 release.
+
+*xfcalendar-4.1.99.1 (25 Nov 2004)
+
+  25 Nov 2004; Brad Cowan <bcowan@gentoo.org> +xfcalendar-4.1.99.1.ebuild:
+  Version bump for beta version of 4.2 release.
+
+*xfcalendar-4.1.91 (31 Oct 2004)
+
+  31 Oct 2004; Brad Cowan <bcowan@gentoo.org> +xfcalendar-4.1.91.ebuild:
+  Version bump of beta version of 4.2 release.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> xfcalendar-0.1.9.ebuild:
+  Stable on amd64.
+
+*xfcalendar-4.1.90 (04 Oct 2004)
+
+  04 Oct 2004; Brad Cowan <bcowan@gentoo.org> +xfcalendar-4.1.90.ebuild:
+  Beta version of new 4.2 release. Contains too numerous improvements to list.
+
+  18 Sep 2004; Tom Gall <tgall@gentoo.org> xfcalendar-0.1.9.ebuild:
+  stable on ppc64, bug #57744
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  xfcalendar-0.1.9.ebuild:
+  Masked xfcalendar-0.1.9.ebuild stable for ppc
+
+  07 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> xfcalendar-0.1.9.ebuild:
+  Stable on alpha.
+
+  06 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> xfcalendar-0.1.9.ebuild:
+  Stable on sparc
+
+  06 Aug 2004; Guy Martin <gmsoft@gentoo.org> xfcalendar-0.1.9.ebuild:
+  Stable on hppa.
+
+*xfcalendar-0.1.9 (12 Jul 2004)
+
+  12 Jul 2004; Brad Cowan <bcowan@gentoo.org> +xfcalendar-0.1.9.ebuild:
+  Version bump. Bugfix release on stable branch that fixes cropped icons with
+  gtk-2.4 along with many others.
+
+  23 Jun 2004; <malc@gentoo.org> xfcalendar-0.1.8.ebuild:
+  Mark stable on amd64
+
+  24 May 2004; Guy Martin <gmsoft@gentoo.org> xfcalendar-0.1.8.ebuild:
+  Marked stable on hppa.
+
+  03 May 2004; Gustavo Zacarias <gustavoz@gentoo.org> xfcalendar-0.1.8.ebuild:
+  Stable on sparc
+
+*xfcalendar-0.1.8 (18 Apr 2004)
+
+  18 Apr 2004; Brad Cowan <bcowan@gentoo.org> :
+  Version bump.
+
+  17 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> xfcalendar-0.1.5.ebuild,
+  xfcalendar-0.1.6.ebuild:
+  Removed S=, added IUSE=
+
+  05 Apr 2004; Guy Martin <gmsoft@gentoo.org> xfcalendar-0.1.6.ebuild:
+  Marked stable on hppa.
+
+  16 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org> xfcalendar-0.1.6.ebuild:
+  stable on sparc
+
+*xfcalendar-0.1.6 (10 Mar 2004)
+
+  10 Mar 2004; <agriffis@gentoo.org> xfcalendar-0.1.5.ebuild:
+  stable on alpha and ia64
+
+  10 Mar 2004; Brad Cowan <bcowan@gentoo.org> :
+  Bugfix release of xfce4.
+
+  08 Mar 2004; Bret Curtis <psi29a@gentoo.org> xfcalendar-0.1.5.ebuild:
+  Added ~mips to KEYWORDS
+
+  03 Mar 2004; Brad Cowan <bcowan@gentoo.org> xfcalendar-0.1.5.ebuild:
+  Added dbh RDEPEND.
+
+  02 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org> xfcalendar-0.1.5.ebuild:
+  stable on sparc
 
 *xfcalendar-0.1.5 (09 Jan 2004)
 
diff --git a/xfce-extra/xfcalendar/Manifest b/xfce-extra/xfcalendar/Manifest
index 5a964603fdac..4de107cee9d2 100644
--- a/xfce-extra/xfcalendar/Manifest
+++ b/xfce-extra/xfcalendar/Manifest
@@ -1,6 +1,8 @@
-MD5 4a97c7291f5edae0cf84a68621593902 xfcalendar-0.1.4.ebuild 889
-MD5 4a97c7291f5edae0cf84a68621593902 xfcalendar-0.1.5.ebuild 889
+MD5 48d442e83461de6354f1854c9f115f6c xfcalendar-4.2.1.ebuild 386
+MD5 25a6f870d9aa82b1017fbe9ef31c72fa xfcalendar-4.2.2-r1.ebuild 475
+MD5 a9b73361d532a91a9eff64cb7cf8a613 xfcalendar-4.2.2.ebuild 373
+MD5 94a19d7c121e23c845a79ce083924a65 ChangeLog 5083
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 e806cf795f551af7303836d9ff4e41b3 files/digest-xfcalendar-0.1.4 68
-MD5 90a52c03fafdb3ad10616f98833e54b9 files/digest-xfcalendar-0.1.5 68
-MD5 13eaf45f63972476d9c3707225729ed7 files/xfcalendar-icon-inline.h 6412
+MD5 0047196ef8e2fe442f00cdff0c61907f files/digest-xfcalendar-4.2.1 68
+MD5 4571c4e24da4f2fb380ae0bc37fe5435 files/digest-xfcalendar-4.2.2 68
+MD5 4571c4e24da4f2fb380ae0bc37fe5435 files/digest-xfcalendar-4.2.2-r1 68
diff --git a/xfce-extra/xfcalendar/xfcalendar-4.2.1.ebuild b/xfce-extra/xfcalendar/xfcalendar-4.2.1.ebuild
index fc811f9f41ba..ce42318ae3a8 100644
--- a/xfce-extra/xfcalendar/xfcalendar-4.2.1.ebuild
+++ b/xfce-extra/xfcalendar/xfcalendar-4.2.1.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/xfce-extra/xfcalendar/xfcalendar-4.2.1.ebuild,v 1.1 2005/03/17 03:07:04 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfcalendar/xfcalendar-4.2.1.ebuild,v 1.1.1.1 2005/11/30 09:39:00 chriswhite Exp $
 
 DESCRIPTION="Xfce4 calendar"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
-RDEPEND="~xfce-base/xfce4-panel-${PV}"
+RDEPEND="~xfce-base/xfce4-panel-4.2.1.1"
 inherit xfce4
diff --git a/xfce-extra/xfcalendar/xfcalendar-4.2.2-r1.ebuild b/xfce-extra/xfcalendar/xfcalendar-4.2.2-r1.ebuild
index 33a1daa76393..0fc8bf90a388 100644
--- a/xfce-extra/xfcalendar/xfcalendar-4.2.2-r1.ebuild
+++ b/xfce-extra/xfcalendar/xfcalendar-4.2.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/xfce-extra/xfcalendar/xfcalendar-4.2.2-r1.ebuild,v 1.1 2005/10/06 06:45:58 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfcalendar/xfcalendar-4.2.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:39:00 chriswhite Exp $
 
 inherit xfce42
 
diff --git a/xfce-extra/xfcalendar/xfcalendar-4.2.2.ebuild b/xfce-extra/xfcalendar/xfcalendar-4.2.2.ebuild
index 823923fa47a6..1ec11f1025dc 100644
--- a/xfce-extra/xfcalendar/xfcalendar-4.2.2.ebuild
+++ b/xfce-extra/xfcalendar/xfcalendar-4.2.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/xfce-extra/xfcalendar/xfcalendar-4.2.2.ebuild,v 1.1 2005/05/18 03:02:08 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfcalendar/xfcalendar-4.2.2.ebuild,v 1.1.1.1 2005/11/30 09:39:00 chriswhite Exp $
 
 DESCRIPTION="Xfce4 calendar"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 
 RDEPEND="~xfce-base/xfce4-panel-${PV}"
 inherit xfce4
diff --git a/xfce-extra/xfce4-appfinder/ChangeLog b/xfce-extra/xfce4-appfinder/ChangeLog
index adcc5dccc32e..7bb5ee01e560 100644
--- a/xfce-extra/xfce4-appfinder/ChangeLog
+++ b/xfce-extra/xfce4-appfinder/ChangeLog
@@ -1,6 +1,97 @@
 # ChangeLog for xfce-extra/xfce4-appfinder
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-appfinder/ChangeLog,v 1.1 2004/10/04 18:41:03 bcowan Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-appfinder/ChangeLog,v 1.1.1.1 2005/11/30 09:39:01 chriswhite Exp $
+
+*xfce4-appfinder-4.2.2-r1 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-appfinder-4.2.2-r1.ebuild:
+  Xfce builds for new eclass and modular Xorg.
+
+  12 Jul 2005; Simon Stelling <blubb@gentoo.org>
+  xfce4-appfinder-4.2.2.ebuild:
+  stable on amd64
+
+  11 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  xfce4-appfinder-4.2.2.ebuild:
+  Stable on alpha + ia64.
+
+  11 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  xfce4-appfinder-4.2.2.ebuild:
+  Stable on hppa.
+
+  08 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  xfce4-appfinder-4.2.2.ebuild:
+  Stable on sparc
+
+  07 Jul 2005; Daniel Ostrow <dostrow@gentoo.org>
+  xfce4-appfinder-4.2.2.ebuild:
+  Stable on ppc and ppc64.
+
+  15 Jun 2005; Markus Rothe <corsair@gentoo.org>
+  xfce4-appfinder-4.2.0.ebuild:
+  Stable on ppc64
+
+*xfce4-appfinder-4.2.2 (18 May 2005)
+
+  18 May 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-appfinder-4.2.2.ebuild:
+  4.2.2 bugfix release of Xfce 4.
+
+*xfce4-appfinder-4.2.1 (17 Mar 2005)
+
+  17 Mar 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-appfinder-4.2.1.ebuild:
+  Bugfix release of Xfce4.
+
+  09 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
+  xfce4-appfinder-4.2.0.ebuild:
+  Stable on alpha.
+
+  31 Jan 2005; lanius@gentoo.org xfce4-appfinder-4.2.0.ebuild:
+  stable on amd64
+
+  29 Jan 2005; Lars Weiler <pylon@gentoo.org> xfce4-appfinder-4.2.0.ebuild:
+  Stable on ppc.
+
+  24 Jan 2005; Guy Martin <gmsoft@gentoo.org> xfce4-appfinder-4.2.0.ebuild:
+  Stable on hppa.
+
+*xfce4-appfinder-4.2.0 (16 Jan 2005)
+
+  16 Jan 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-appfinder-4.2.0.ebuild:
+  4.2 final release of Xfce4.
+
+*xfce4-appfinder-4.1.99.3-r1 (06 Jan 2005)
+
+  06 Jan 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-appfinder-4.1.99.3-r1.ebuild:
+  Updated to use Xfce4 eclass.
+
+*xfce4-appfinder-4.1.99.3 (02 Jan 2005)
+
+  02 Jan 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-appfinder-4.1.99.3.ebuild:
+  Version bump to RC version of 4.2 release.
+
+*xfce4-appfinder-4.1.99.2 (13 Dec 2004)
+
+  13 Dec 2004; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-appfinder-4.1.99.2.ebuild:
+  Version bump for beta version of 4.2 release.
+
+*xfce4-appfinder-4.1.99.1 (25 Nov 2004)
+
+  25 Nov 2004; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-appfinder-4.1.99.1.ebuild:
+  Version bump for beta 4.2
+
+  25 Nov 2004; Brad Cowan <bcowan@gentoo.org> :
+  Version bump for beta version of 4.2 release.
+
+*xfce4-appfinder-4.1.91 (31 Oct 2004)
+
+  31 Oct 2004; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-appfinder-4.1.91.ebuild:
+  Version bump of beta version of 4.2 release.
 
 *xfce4-appfinder-4.1.90 (04 Oct 2004)
 
diff --git a/xfce-extra/xfce4-appfinder/Manifest b/xfce-extra/xfce4-appfinder/Manifest
index 26641b3ee23f..a1174ebdd102 100644
--- a/xfce-extra/xfce4-appfinder/Manifest
+++ b/xfce-extra/xfce4-appfinder/Manifest
@@ -1,2 +1,8 @@
-MD5 dda5538b40f48f07b2416555ae93c964 xfce4-appfinder-4.1.90.ebuild 870
-MD5 6ccae52b3faecb9fc6092d4edc4f398b files/digest-xfce4-appfinder-4.1.90 74
+MD5 1448da78574ec85a732dc554e83a2f49 xfce4-appfinder-4.2.2.ebuild 395
+MD5 a057d9e51ccfdcf6e89ae26f0e055931 xfce4-appfinder-4.2.2-r1.ebuild 496
+MD5 a21173dc8cfdee45d47ff15bbcbf6f58 xfce4-appfinder-4.2.1.ebuild 404
+MD5 249c184536476238563b16fe39d0370b ChangeLog 2976
+MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+MD5 40caedb5905dd010d04ffcbb0c4f9073 files/digest-xfce4-appfinder-4.2.2-r1 73
+MD5 2b2b57f0a3081b3994ca2a75b18bda75 files/digest-xfce4-appfinder-4.2.1 73
+MD5 40caedb5905dd010d04ffcbb0c4f9073 files/digest-xfce4-appfinder-4.2.2 73
diff --git a/xfce-extra/xfce4-appfinder/xfce4-appfinder-4.2.1.ebuild b/xfce-extra/xfce4-appfinder/xfce4-appfinder-4.2.1.ebuild
index 1ed3131c856f..0d3571ee280d 100644
--- a/xfce-extra/xfce4-appfinder/xfce4-appfinder-4.2.1.ebuild
+++ b/xfce-extra/xfce4-appfinder/xfce4-appfinder-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/xfce-extra/xfce4-appfinder/xfce4-appfinder-4.2.1.ebuild,v 1.1 2005/03/17 03:08:17 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-appfinder/xfce4-appfinder-4.2.1.ebuild,v 1.1.1.1 2005/11/30 09:39:00 chriswhite Exp $
 
 DESCRIPTION="Xfce 4 application finder"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
diff --git a/xfce-extra/xfce4-appfinder/xfce4-appfinder-4.2.2-r1.ebuild b/xfce-extra/xfce4-appfinder/xfce4-appfinder-4.2.2-r1.ebuild
index 3d1a0cc004fb..ef8e17c53e98 100644
--- a/xfce-extra/xfce4-appfinder/xfce4-appfinder-4.2.2-r1.ebuild
+++ b/xfce-extra/xfce4-appfinder/xfce4-appfinder-4.2.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/xfce-extra/xfce4-appfinder/xfce4-appfinder-4.2.2-r1.ebuild,v 1.1 2005/10/06 06:47:46 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-appfinder/xfce4-appfinder-4.2.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:39:00 chriswhite Exp $
 
 inherit xfce42
 
diff --git a/xfce-extra/xfce4-appfinder/xfce4-appfinder-4.2.2.ebuild b/xfce-extra/xfce4-appfinder/xfce4-appfinder-4.2.2.ebuild
index abd6b1bda7a1..144079891ad1 100644
--- a/xfce-extra/xfce4-appfinder/xfce4-appfinder-4.2.2.ebuild
+++ b/xfce-extra/xfce4-appfinder/xfce4-appfinder-4.2.2.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/xfce-extra/xfce4-appfinder/xfce4-appfinder-4.2.2.ebuild,v 1.1 2005/05/18 03:03:24 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-appfinder/xfce4-appfinder-4.2.2.ebuild,v 1.1.1.1 2005/11/30 09:39:00 chriswhite Exp $
 
 DESCRIPTION="Xfce 4 application finder"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 
 RDEPEND="~xfce-base/libxfce4mcs-${PV}"
 
-inherit xfce4
\ No newline at end of file
+inherit xfce4
diff --git a/xfce-extra/xfce4-artwork/ChangeLog b/xfce-extra/xfce4-artwork/ChangeLog
index 021f4c4cd748..9ac344cc24ca 100644
--- a/xfce-extra/xfce4-artwork/ChangeLog
+++ b/xfce-extra/xfce4-artwork/ChangeLog
@@ -1,6 +1,38 @@
 # ChangeLog for xfce-extra/xfce4-artwork
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-artwork/ChangeLog,v 1.1 2003/09/08 20:38:53 bcowan Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-artwork/ChangeLog,v 1.1.1.1 2005/11/30 09:38:57 chriswhite Exp $
+
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org>
+  xfce4-artwork-0.0.4-r1.ebuild:
+  Mark 0.0.4-r1 stable on alpha
+
+*xfce4-artwork-0.0.4-r2 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-artwork-0.0.4-r2.ebuild:
+  Xfce builds for new eclass and modular Xorg.
+
+  07 Jul 2005; Daniel Ostrow <dostrow@gentoo.org>
+  xfce4-artwork-0.0.4-r1.ebuild:
+  Stable on ppc64.
+
+  31 Jan 2005; lanius@gentoo.org xfce4-artwork-0.0.4-r1.ebuild:
+  stable on amd64
+
+  29 Jan 2005; Lars Weiler <pylon@gentoo.org> xfce4-artwork-0.0.4-r1.ebuild:
+  Stable on ppc.
+
+*xfce4-artwork-0.0.4-r1 (06 Jan 2005)
+
+  06 Jan 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-artwork-0.0.4-r1.ebuild:
+  Updated to use Xfce4 eclass.
+
+  19 Jun 2004; Jason Wever <weeve@gentoo.org> xfce4-artwork-0.0.4.ebuild:
+  Stable on sparc.
+
+  17 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> xfce4-artwork-0.0.4.ebuild:
+  Removed S=
 
 *xfce4-artwork-0.0.4 (08 Sep 2003)
 
diff --git a/xfce-extra/xfce4-artwork/Manifest b/xfce-extra/xfce4-artwork/Manifest
index 5a21566385d5..dbaf023de5f4 100644
--- a/xfce-extra/xfce4-artwork/Manifest
+++ b/xfce-extra/xfce4-artwork/Manifest
@@ -1,2 +1,16 @@
-MD5 16c9a89983f1d6e0911169d18ede5327 xfce4-artwork-0.0.4.ebuild 662
-MD5 b27fc1ce5215fa1c9b94d1ed2355109a files/digest-xfce4-artwork-0.0.4 72
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+MD5 976b2ae7c8dcd699e292f0541c6e166a ChangeLog 1252
+MD5 7f1ce3347ffa1d1d458013078c5baa2b xfce4-artwork-0.0.4-r1.ebuild 413
+MD5 6b591f8494df50fa9fea7be2eede2a98 xfce4-artwork-0.0.4-r2.ebuild 368
+MD5 b27fc1ce5215fa1c9b94d1ed2355109a files/digest-xfce4-artwork-0.0.4-r2 72
+MD5 b27fc1ce5215fa1c9b94d1ed2355109a files/digest-xfce4-artwork-0.0.4-r1 72
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDVQ6jJrHF4yAQTrARAotYAJ9MBeV3UlIEI4/GselU+BQXCq31bQCgwdue
+8YpGyzu5ZJRyt5EygUQ1v5k=
+=h2d4
+-----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-artwork/xfce4-artwork-0.0.4-r1.ebuild b/xfce-extra/xfce4-artwork/xfce4-artwork-0.0.4-r1.ebuild
index edecf3d86efa..fea72fbd49db 100644
--- a/xfce-extra/xfce4-artwork/xfce4-artwork-0.0.4-r1.ebuild
+++ b/xfce-extra/xfce4-artwork/xfce4-artwork-0.0.4-r1.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/xfce-extra/xfce4-artwork/xfce4-artwork-0.0.4-r1.ebuild,v 1.1 2005/01/06 23:41:10 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-artwork/xfce4-artwork-0.0.4-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:57 chriswhite Exp $
 
 DESCRIPTION="Xfce4 extra artwork"
 SRC_URI="http://download.berlios.de/xfce-goodies/${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 
-inherit xfce4
\ No newline at end of file
+inherit xfce4
diff --git a/xfce-extra/xfce4-artwork/xfce4-artwork-0.0.4-r2.ebuild b/xfce-extra/xfce4-artwork/xfce4-artwork-0.0.4-r2.ebuild
index 275d523e4c31..d68722a7dc18 100644
--- a/xfce-extra/xfce4-artwork/xfce4-artwork-0.0.4-r2.ebuild
+++ b/xfce-extra/xfce4-artwork/xfce4-artwork-0.0.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/xfce-extra/xfce4-artwork/xfce4-artwork-0.0.4-r2.ebuild,v 1.1 2005/10/06 17:27:31 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-artwork/xfce4-artwork-0.0.4-r2.ebuild,v 1.1.1.1 2005/11/30 09:38:57 chriswhite Exp $
 
 inherit xfce42
 
diff --git a/xfce-extra/xfce4-battery/ChangeLog b/xfce-extra/xfce4-battery/ChangeLog
index 18d6246b419c..79a8186546ca 100644
--- a/xfce-extra/xfce4-battery/ChangeLog
+++ b/xfce-extra/xfce4-battery/ChangeLog
@@ -1,6 +1,67 @@
 # ChangeLog for xfce-extra/xfce4-battery
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-battery/ChangeLog,v 1.1 2003/08/15 12:12:24 bcowan Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-battery/ChangeLog,v 1.1.1.1 2005/11/30 09:38:58 chriswhite Exp $
+
+*xfce4-battery-0.3.0-r1 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-battery-0.3.0-r1.ebuild:
+  Xfce builds for new eclass and modular Xorg.
+
+*xfce4-battery-0.3.0 (14 Aug 2005)
+
+  14 Aug 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-battery-0.3.0.ebuild:
+  Version bump.
+
+  18 Jun 2005; Markus Rothe <corsair@gentoo.org>
+  xfce4-battery-0.2.0-r1.ebuild:
+  Stable on ppc64
+
+  13 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
+  xfce4-battery-0.2.0-r1.ebuild:
+  Stable on alpha.
+
+  31 Jan 2005; lanius@gentoo.org xfce4-battery-0.2.0-r1.ebuild:
+  stable on amd64
+
+  29 Jan 2005; Lars Weiler <pylon@gentoo.org> xfce4-battery-0.2.0-r1.ebuild:
+  Stable on ppc.
+
+  24 Jan 2005; Guy Martin <gmsoft@gentoo.org> xfce4-battery-0.2.0-r1.ebuild:
+  Stable on hppa.
+
+*xfce4-battery-0.2.0-r1 (06 Jan 2005)
+
+  06 Jan 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-battery-0.2.0-r1.ebuild:
+  Updated to use Xfce4 eclass.
+
+  18 Sep 2004; Tom Gall <tgall@gentoo.org> xfce4-battery-0.2.0.ebuild:
+  stable on ppc64, bug #57744
+
+  10 Mar 2004; <agriffis@gentoo.org> xfce4-battery-0.2.0.ebuild:
+  stable on alpha
+
+  08 Mar 2004; Bret Curtis <psi29a@gentoo.org> xfce4-battery-0.2.0.ebuild:
+  Added ~mips to KEYWORDS
+
+  17 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> :
+  manifest fix
+
+  16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org>
+  xfce4-battery-0.2.0.ebuild:
+  set ppc in keywords
+
+  18 Dec 2003; Jason Wever <weeve@gentoo.org> xfce4-battery-0.2.0.ebuild:
+  Marked stable on sparc.
+
+*xfce4-battery-0.2.0 (26 Oct 2003)
+
+  16 Nov 2003; Guy martin <gmsoft@gentoo.org> xfce4-battery-0.2.0.ebuild :
+  Added hppa to KEYWORDS.
+
+  26 Oct 2003; Daniel Ahlberg <aliz@gentoo.org> xfce4-battery-0.2.0.ebuild:
+  Version bump
 
 *xfce4-battery-0.1.2 (15 Aug 2003)
 
diff --git a/xfce-extra/xfce4-battery/Manifest b/xfce-extra/xfce4-battery/Manifest
index 264e879f9115..e30a3a338bf1 100644
--- a/xfce-extra/xfce4-battery/Manifest
+++ b/xfce-extra/xfce4-battery/Manifest
@@ -1,3 +1,8 @@
-MD5 32ecd27c4572b164ed64b334278a2e92 xfce4-battery-0.1.2.ebuild 833
-MD5 2f97f0e4465c8ef2882bbc623218241b ChangeLog 359
-MD5 f05351949b715199edab424de9923454 files/digest-xfce4-battery-0.1.2 78
+MD5 75f39ce9a71022ec8c9e4898f934c605 xfce4-battery-0.3.0.ebuild 400
+MD5 a92454bf80f23e99ba33c674436d0cec xfce4-battery-0.2.0-r1.ebuild 395
+MD5 ccf69db82f56b201d01da34df4eeb40a xfce4-battery-0.3.0-r1.ebuild 388
+MD5 66d6da1b7abc8e3672dea3d01f5e2b1f ChangeLog 2076
+MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+MD5 62b116cba4726ccaafa617391576b91e files/digest-xfce4-battery-0.2.0-r1 78
+MD5 04f73a252cf92df0af61a44a4fc2054f files/digest-xfce4-battery-0.3.0-r1 78
+MD5 04f73a252cf92df0af61a44a4fc2054f files/digest-xfce4-battery-0.3.0 78
diff --git a/xfce-extra/xfce4-battery/xfce4-battery-0.2.0-r1.ebuild b/xfce-extra/xfce4-battery/xfce4-battery-0.2.0-r1.ebuild
index 09fe330e4558..c2e2551403a1 100644
--- a/xfce-extra/xfce4-battery/xfce4-battery-0.2.0-r1.ebuild
+++ b/xfce-extra/xfce4-battery/xfce4-battery-0.2.0-r1.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/xfce-extra/xfce4-battery/xfce4-battery-0.2.0-r1.ebuild,v 1.1 2005/01/06 23:41:10 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-battery/xfce4-battery-0.2.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:58 chriswhite Exp $
 
 DESCRIPTION="Xfce4 panel battery monitor plugin"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 
 GOODIES_PLUGIN=1
 DEBUG_OFF=1
 
-inherit xfce4
\ No newline at end of file
+inherit xfce4
diff --git a/xfce-extra/xfce4-battery/xfce4-battery-0.3.0-r1.ebuild b/xfce-extra/xfce4-battery/xfce4-battery-0.3.0-r1.ebuild
index 13362b971ca2..74a5e3807e2a 100644
--- a/xfce-extra/xfce4-battery/xfce4-battery-0.3.0-r1.ebuild
+++ b/xfce-extra/xfce4-battery/xfce4-battery-0.3.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/xfce-extra/xfce4-battery/xfce4-battery-0.3.0-r1.ebuild,v 1.1 2005/10/06 17:28:45 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-battery/xfce4-battery-0.3.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:58 chriswhite Exp $
 
 inherit xfce42
 
diff --git a/xfce-extra/xfce4-battery/xfce4-battery-0.3.0.ebuild b/xfce-extra/xfce4-battery/xfce4-battery-0.3.0.ebuild
index a425292c06b2..560087585554 100644
--- a/xfce-extra/xfce4-battery/xfce4-battery-0.3.0.ebuild
+++ b/xfce-extra/xfce4-battery/xfce4-battery-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/xfce-extra/xfce4-battery/xfce4-battery-0.3.0.ebuild,v 1.1 2005/08/14 20:45:08 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-battery/xfce4-battery-0.3.0.ebuild,v 1.1.1.1 2005/11/30 09:38:58 chriswhite Exp $
 
 DESCRIPTION="Xfce4 panel battery monitor plugin"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
diff --git a/xfce-extra/xfce4-bglist-editor/ChangeLog b/xfce-extra/xfce4-bglist-editor/ChangeLog
index 9f445cfe928c..17cff6de04b8 100644
--- a/xfce-extra/xfce4-bglist-editor/ChangeLog
+++ b/xfce-extra/xfce4-bglist-editor/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for xfce-extra/xfce4-bglist-editor
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-bglist-editor/ChangeLog,v 1.1 2005/08/14 22:32:24 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-bglist-editor/ChangeLog,v 1.1.1.1 2005/11/30 09:38:59 chriswhite Exp $
+
+*xfce4-bglist-editor-4.2.0-r1 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-bglist-editor-4.2.0-r1.ebuild:
+  Xfce builds for new eclass and modular Xorg.
 
 *xfce4-bglist-editor-4.2.0 (14 Aug 2005)
 
diff --git a/xfce-extra/xfce4-bglist-editor/Manifest b/xfce-extra/xfce4-bglist-editor/Manifest
index bb10089c4684..6f76c654fbcd 100644
--- a/xfce-extra/xfce4-bglist-editor/Manifest
+++ b/xfce-extra/xfce4-bglist-editor/Manifest
@@ -1,3 +1,6 @@
-MD5 f07a3b13b2fc4b24fb3fbe4fc0c1d215 xfce4-bglist-editor-4.2.0.ebuild 429
+MD5 976d2235d521f58b205dae4f98121716 xfce4-bglist-editor-4.2.0.ebuild 438
+MD5 50fa6c6059f12d5a29baa165ed2c3c4c xfce4-bglist-editor-4.2.0-r1.ebuild 521
+MD5 ccb6f6d4a2c5c0da165ea916f0b7aab0 ChangeLog 571
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+MD5 c3b66c0c64a28e2462ea042d4bac7d95 files/digest-xfce4-bglist-editor-4.2.0-r1 77
 MD5 c3b66c0c64a28e2462ea042d4bac7d95 files/digest-xfce4-bglist-editor-4.2.0 77
diff --git a/xfce-extra/xfce4-bglist-editor/xfce4-bglist-editor-4.2.0-r1.ebuild b/xfce-extra/xfce4-bglist-editor/xfce4-bglist-editor-4.2.0-r1.ebuild
index 7a5bb806a614..7b4c3e56010e 100644
--- a/xfce-extra/xfce4-bglist-editor/xfce4-bglist-editor-4.2.0-r1.ebuild
+++ b/xfce-extra/xfce4-bglist-editor/xfce4-bglist-editor-4.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/xfce-extra/xfce4-bglist-editor/xfce4-bglist-editor-4.2.0-r1.ebuild,v 1.1 2005/10/06 07:43:45 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-bglist-editor/xfce4-bglist-editor-4.2.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:59 chriswhite Exp $
 
 inherit xfce42
 
diff --git a/xfce-extra/xfce4-bglist-editor/xfce4-bglist-editor-4.2.0.ebuild b/xfce-extra/xfce4-bglist-editor/xfce4-bglist-editor-4.2.0.ebuild
index c5e1737c2834..d6f269c9da7c 100644
--- a/xfce-extra/xfce4-bglist-editor/xfce4-bglist-editor-4.2.0.ebuild
+++ b/xfce-extra/xfce4-bglist-editor/xfce4-bglist-editor-4.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/xfce-extra/xfce4-bglist-editor/xfce4-bglist-editor-4.2.0.ebuild,v 1.1 2005/08/14 22:32:24 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-bglist-editor/xfce4-bglist-editor-4.2.0.ebuild,v 1.1.1.1 2005/11/30 09:38:59 chriswhite Exp $
 
 DESCRIPTION="Xfce4 background list editor"
 SRC_URI="http://download.berlios.de/xfce-goodies/${P}.tar.gz"
diff --git a/xfce-extra/xfce4-clipman/ChangeLog b/xfce-extra/xfce4-clipman/ChangeLog
index 0f4c6eefe263..e97f374ad65d 100644
--- a/xfce-extra/xfce4-clipman/ChangeLog
+++ b/xfce-extra/xfce4-clipman/ChangeLog
@@ -1,6 +1,58 @@
 # ChangeLog for xfce-extra/xfce4-clipman
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-clipman/ChangeLog,v 1.1 2003/10/10 04:10:47 bcowan Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-clipman/ChangeLog,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
+
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org>
+  xfce4-clipman-0.4.1-r1.ebuild:
+  Mark 0.4.1-r1 stable on alpha
+
+*xfce4-clipman-0.4.1-r2 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-clipman-0.4.1-r2.ebuild:
+  Xfce builds for new eclass and modular Xorg.
+
+  07 Jul 2005; Daniel Ostrow <dostrow@gentoo.org>
+  xfce4-clipman-0.4.1-r1.ebuild:
+  Stable on ppc64.
+
+  31 Jan 2005; lanius@gentoo.org xfce4-clipman-0.4.1-r1.ebuild:
+  stable on amd64
+
+  29 Jan 2005; Lars Weiler <pylon@gentoo.org> xfce4-clipman-0.4.1-r1.ebuild:
+  Stable on ppc.
+
+  24 Jan 2005; Guy Martin <gmsoft@gentoo.org> xfce4-clipman-0.4.1-r1.ebuild:
+  Stable on hppa.
+
+*xfce4-clipman-0.4.1-r1 (06 Jan 2005)
+
+  06 Jan 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-clipman-0.4.1-r1.ebuild:
+  Updated to use Xfce4 eclass.
+
+*xfce4-clipman-0.4.1 (19 Sep 2004)
+
+  19 Sep 2004; Brad Cowan <bcowan@gentoo.org> +xfce4-clipman-0.4.1.ebuild:
+  Version bump.
+
+  19 Jun 2004; Jason Wever <weeve@gentoo.org> xfce4-clipman-0.4.0.ebuild:
+  Stable on sparc.
+
+*xfce4-clipman-0.4.0 (21 Dec 2003)
+
+  21 Dec 2003; Brad Cowan <bcowan@gentoo.org> xfce4-clipman-0.4.0.ebuild:
+  Version bump.
+
+*xfce4-clipman-0.3.1 (09 Nov 2003)
+
+  09 Nov 2003; Brad Cowan <bcowan@gentoo.org> xfce4-clipman-0.3.1.ebuild:
+  Version bump.
+
+*xfce4-clipman-0.2.0 (05 Nov 2003)
+
+  05 Nov 2003; Brad Cowan <bcowan@gentoo.org> xfce4-clipman-0.2.0.ebuild:
+  Version bump.
 
 *xfce4-clipman-0.1 (10 Oct 2003)
 
diff --git a/xfce-extra/xfce4-clipman/Manifest b/xfce-extra/xfce4-clipman/Manifest
index c59604fcb4b2..7b63f12cb30d 100644
--- a/xfce-extra/xfce4-clipman/Manifest
+++ b/xfce-extra/xfce4-clipman/Manifest
@@ -1,2 +1,16 @@
-MD5 b5da60e2a3c32c99196dcabf7f38bf22 xfce4-clipman-0.1.ebuild 687
-MD5 05b0640fe033b50eba0c96b5638b2415 files/digest-xfce4-clipman-0.1 76
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 013cabc7d1b28e212bd46892f990d281 xfce4-clipman-0.4.1-r1.ebuild 386
+MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+MD5 ae9615d7229ef0a2ee2a20144ce30451 ChangeLog 1763
+MD5 f338e51e398d663ddeea48c6e8f8f66c xfce4-clipman-0.4.1-r2.ebuild 392
+MD5 51113de7354dc7d05f71d664c4d741d1 files/digest-xfce4-clipman-0.4.1-r1 78
+MD5 51113de7354dc7d05f71d664c4d741d1 files/digest-xfce4-clipman-0.4.1-r2 78
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDVRHlJrHF4yAQTrARAjecAJ9CTFyFcme9In4aZwu0lLd4LL/o4wCfTZS2
+7ZV2KBKeak9HjxhpK2MAE7o=
+=JIDW
+-----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-clipman/xfce4-clipman-0.4.1-r1.ebuild b/xfce-extra/xfce4-clipman/xfce4-clipman-0.4.1-r1.ebuild
index 25c8b6556055..4252b176d3b7 100644
--- a/xfce-extra/xfce4-clipman/xfce4-clipman-0.4.1-r1.ebuild
+++ b/xfce-extra/xfce4-clipman/xfce4-clipman-0.4.1-r1.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/xfce-extra/xfce4-clipman/xfce4-clipman-0.4.1-r1.ebuild,v 1.1 2005/01/06 23:41:11 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-clipman/xfce4-clipman-0.4.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
 
-DESCRIPTION="Xfce4 panel command line plugin"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+DESCRIPTION="Xfce4 panel clipboard manager plugin"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 
 GOODIES_PLUGIN=1
 
-inherit xfce4
\ No newline at end of file
+inherit xfce4
diff --git a/xfce-extra/xfce4-clipman/xfce4-clipman-0.4.1-r2.ebuild b/xfce-extra/xfce4-clipman/xfce4-clipman-0.4.1-r2.ebuild
index 7bad75bfd18b..13aab700a848 100644
--- a/xfce-extra/xfce4-clipman/xfce4-clipman-0.4.1-r2.ebuild
+++ b/xfce-extra/xfce4-clipman/xfce4-clipman-0.4.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/xfce-extra/xfce4-clipman/xfce4-clipman-0.4.1-r2.ebuild,v 1.1 2005/10/06 17:29:51 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-clipman/xfce4-clipman-0.4.1-r2.ebuild,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
 
 inherit xfce42
 
diff --git a/xfce-extra/xfce4-cpugraph/ChangeLog b/xfce-extra/xfce4-cpugraph/ChangeLog
index 47a6e27f01da..6ac84606f5cc 100644
--- a/xfce-extra/xfce4-cpugraph/ChangeLog
+++ b/xfce-extra/xfce4-cpugraph/ChangeLog
@@ -1,6 +1,29 @@
 # ChangeLog for xfce-extra/xfce4-cpugraph
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cpugraph/ChangeLog,v 1.1 2004/09/20 16:52:11 bcowan Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cpugraph/ChangeLog,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
+
+*xfce4-cpugraph-0.2.2-r2 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-cpugraph-0.2.2-r2.ebuild:
+  Xfce builds for new eclass and modular Xorg.
+
+  07 Jul 2005; Daniel Ostrow <dostrow@gentoo.org>
+  xfce4-cpugraph-0.2.2-r1.ebuild:
+  Stable on ppc64.
+
+  31 Jan 2005; lanius@gentoo.org xfce4-cpugraph-0.2.2-r1.ebuild:
+  stable on amd64
+
+  29 Jan 2005; Lars Weiler <pylon@gentoo.org>
+  xfce4-cpugraph-0.2.2-r1.ebuild:
+  Stable on ppc.
+
+*xfce4-cpugraph-0.2.2-r1 (06 Jan 2005)
+
+  06 Jan 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-cpugraph-0.2.2-r1.ebuild:
+  Updated to use Xfce4 eclass.
 
 *xfce4-cpugraph-0.2.2 (20 Sep 2004)
 
diff --git a/xfce-extra/xfce4-cpugraph/Manifest b/xfce-extra/xfce4-cpugraph/Manifest
index 3fc73ef02b53..6c266eda78f5 100644
--- a/xfce-extra/xfce4-cpugraph/Manifest
+++ b/xfce-extra/xfce4-cpugraph/Manifest
@@ -1,2 +1,6 @@
-MD5 f077a8925a03bfe61894702eec015e77 xfce4-cpugraph-0.2.2.ebuild 725
-MD5 9b6fb4bdabdf4cfa391fe2f12e90af09 files/digest-xfce4-cpugraph-0.2.2 79
+MD5 b7799cad73910a55174497b2f4f07b2a xfce4-cpugraph-0.2.2-r1.ebuild 422
+MD5 387be8e0e76af729f371cd9ae4ed91fb xfce4-cpugraph-0.2.2-r2.ebuild 415
+MD5 30a34eb7664880db3d149c6e7dfe93a8 ChangeLog 963
+MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+MD5 9b6fb4bdabdf4cfa391fe2f12e90af09 files/digest-xfce4-cpugraph-0.2.2-r1 79
+MD5 9b6fb4bdabdf4cfa391fe2f12e90af09 files/digest-xfce4-cpugraph-0.2.2-r2 79
diff --git a/xfce-extra/xfce4-cpugraph/xfce4-cpugraph-0.2.2-r1.ebuild b/xfce-extra/xfce4-cpugraph/xfce4-cpugraph-0.2.2-r1.ebuild
index 31cbcc54323e..c2d3add9cf2d 100644
--- a/xfce-extra/xfce4-cpugraph/xfce4-cpugraph-0.2.2-r1.ebuild
+++ b/xfce-extra/xfce4-cpugraph/xfce4-cpugraph-0.2.2-r1.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/xfce-extra/xfce4-cpugraph/xfce4-cpugraph-0.2.2-r1.ebuild,v 1.1 2005/01/06 23:41:11 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cpugraph/xfce4-cpugraph-0.2.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
 
 DESCRIPTION="Xfce4 panel cpu load graphing plugin"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 
 XFCE_S=${WORKDIR}/${MY_P/-${PV}/}
 GOODIES_PLUGIN=1
 
-inherit xfce4
\ No newline at end of file
+inherit xfce4
diff --git a/xfce-extra/xfce4-cpugraph/xfce4-cpugraph-0.2.2-r2.ebuild b/xfce-extra/xfce4-cpugraph/xfce4-cpugraph-0.2.2-r2.ebuild
index 2941491ad9d5..e5077c93043b 100644
--- a/xfce-extra/xfce4-cpugraph/xfce4-cpugraph-0.2.2-r2.ebuild
+++ b/xfce-extra/xfce4-cpugraph/xfce4-cpugraph-0.2.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/xfce-extra/xfce4-cpugraph/xfce4-cpugraph-0.2.2-r2.ebuild,v 1.1 2005/10/06 17:31:01 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cpugraph/xfce4-cpugraph-0.2.2-r2.ebuild,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
 
 inherit xfce42
 
diff --git a/xfce-extra/xfce4-datetime/ChangeLog b/xfce-extra/xfce4-datetime/ChangeLog
index a2d068bc4962..a144358e226b 100644
--- a/xfce-extra/xfce4-datetime/ChangeLog
+++ b/xfce-extra/xfce4-datetime/ChangeLog
@@ -1,6 +1,52 @@
 # ChangeLog for xfce-extra/xfce4-datetime
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-datetime/ChangeLog,v 1.1 2003/11/11 06:28:29 bcowan Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-datetime/ChangeLog,v 1.1.1.1 2005/11/30 09:38:59 chriswhite Exp $
+
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org>
+  xfce4-datetime-0.3.1-r1.ebuild:
+  Mark 0.3.1-r1 stable on alpha
+
+*xfce4-datetime-0.3.1-r2 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-datetime-0.3.1-r2.ebuild:
+  Xfce builds for new eclass and modular Xorg.
+
+  23 Aug 2005; Aron Griffis <agriffis@gentoo.org>
+  xfce4-datetime-0.3.1-r1.ebuild:
+  stable on ia64
+
+  22 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  xfce4-datetime-0.3.1-r1.ebuild:
+  Stable on ppc.
+
+  06 Mar 2005; Heinrich Wendel <lanius@gentoo.org>
+  xfce4-datetime-0.3.1-r1.ebuild:
+  stable on amd64
+
+  08 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  xfce4-datetime-0.3.1-r1.ebuild:
+  Stable on sparc
+
+*xfce4-datetime-0.3.1-r1 (06 Jan 2005)
+
+  06 Jan 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-datetime-0.3.1-r1.ebuild:
+  Updated to use Xfce4 eclass.
+
+*xfce4-datetime-0.3.1 (19 Sep 2004)
+
+  19 Sep 2004; Brad Cowan <bcowan@gentoo.org> +xfce4-datetime-0.3.1.ebuild:
+  Version bump.
+
+  09 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  xfce4-datetime-0.3.0.ebuild:
+  stable on sparc
+
+*xfce4-datetime-0.3.0 (03 Mar 2004)
+
+  03 Mar 2004; Brad Cowan <bcowan@gentoo.org> xfce4-datetime-0.3.0.ebuild:
+  Version bump.
 
 *xfce4-datetime-0.2 (09 Nov 2003)
 
diff --git a/xfce-extra/xfce4-datetime/Manifest b/xfce-extra/xfce4-datetime/Manifest
index 0a7ba53be7f9..97d39e04bd1a 100644
--- a/xfce-extra/xfce4-datetime/Manifest
+++ b/xfce-extra/xfce4-datetime/Manifest
@@ -1,2 +1,16 @@
-MD5 fb37e88d95fc68d712bac9afae6473ea xfce4-datetime-0.2.ebuild 706
-MD5 40593a052756dc604de7974615cd0a0e files/digest-xfce4-datetime-0.2 77
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+MD5 7357ecfa0aeacac9ce4b8ce4d2280563 ChangeLog 1590
+MD5 fcf43e878353738f2c8ac78aa27ebcbf xfce4-datetime-0.3.1-r1.ebuild 416
+MD5 ac51ff5f7497b794714baf07fa6ebb2f xfce4-datetime-0.3.1-r2.ebuild 419
+MD5 4709813b5da202e157bfac073beb9908 files/digest-xfce4-datetime-0.3.1-r1 79
+MD5 4709813b5da202e157bfac073beb9908 files/digest-xfce4-datetime-0.3.1-r2 79
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDVRJnJrHF4yAQTrARAji+AJ9SvWAxi+YZz8DBJvV3+KXvOb08JACcCiyz
+O3kkB4VxKpRwecd/C2XzxCE=
+=kC9n
+-----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-datetime/xfce4-datetime-0.3.1-r1.ebuild b/xfce-extra/xfce4-datetime/xfce4-datetime-0.3.1-r1.ebuild
index 4d9743d1ad31..a2b9fac00458 100644
--- a/xfce-extra/xfce4-datetime/xfce4-datetime-0.3.1-r1.ebuild
+++ b/xfce-extra/xfce4-datetime/xfce4-datetime-0.3.1-r1.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/xfce-extra/xfce4-datetime/xfce4-datetime-0.3.1-r1.ebuild,v 1.1 2005/01/07 01:49:40 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-datetime/xfce4-datetime-0.3.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:59 chriswhite Exp $
 
 DESCRIPTION="Xfce4 panel plugin that displays date/time and small calendar"
-KEYWORDS="~ia64 ~x86 ~ppc ~alpha ~sparc ~amd64"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ~ppc64 sparc x86"
 
 GOODIES_PLUGIN=1
 
-inherit xfce4
\ No newline at end of file
+inherit xfce4
diff --git a/xfce-extra/xfce4-datetime/xfce4-datetime-0.3.1-r2.ebuild b/xfce-extra/xfce4-datetime/xfce4-datetime-0.3.1-r2.ebuild
index ddd04db4767f..9d71a75ae566 100644
--- a/xfce-extra/xfce4-datetime/xfce4-datetime-0.3.1-r2.ebuild
+++ b/xfce-extra/xfce4-datetime/xfce4-datetime-0.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/xfce-extra/xfce4-datetime/xfce4-datetime-0.3.1-r2.ebuild,v 1.1 2005/10/06 17:32:16 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-datetime/xfce4-datetime-0.3.1-r2.ebuild,v 1.1.1.1 2005/11/30 09:39:00 chriswhite Exp $
 
 inherit xfce42
 
diff --git a/xfce-extra/xfce4-diskperf/ChangeLog b/xfce-extra/xfce4-diskperf/ChangeLog
index 40c4d2bb0724..bad9699674d6 100644
--- a/xfce-extra/xfce4-diskperf/ChangeLog
+++ b/xfce-extra/xfce4-diskperf/ChangeLog
@@ -1,6 +1,42 @@
 # ChangeLog for xfce-extra/xfce4-diskperf
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-diskperf/ChangeLog,v 1.1 2003/10/10 04:18:55 bcowan Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-diskperf/ChangeLog,v 1.1.1.1 2005/11/30 09:38:58 chriswhite Exp $
+
+*xfce4-diskperf-1.5-r2 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-diskperf-1.5-r2.ebuild:
+  Xfce builds for new eclass and modular Xorg.
+
+*xfce4-diskperf-1.5-r1 (06 Jan 2005)
+
+  06 Jan 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-diskperf-1.5-r1.ebuild:
+  Updated to use Xfce4 eclass.
+
+  19 Sep 2004; Brad Cowan <bcowan@gentoo.org> :
+  Version bump.
+
+  19 Jun 2004; Jason Wever <weeve@gentoo.org> xfce4-diskperf-1.4.1.ebuild:
+  Stable on sparc.
+
+*xfce4-diskperf-1.4.1 (07 Dec 2003)
+
+  07 Dec 2003; Brad Cowan <bcowan@gentoo.org> xfce4-diskperf-1.4.1.ebuild:
+  Version bump.
+
+*xfce4-diskperf-1.4 (12 Nov 2003)
+
+  12 Nov 2003; Brad Cowan <bcowan@gentoo.org> xfce4-diskperf-1.4.ebuild:
+  Version bump.
+
+*xfce4-diskperf-1.3 (05 Nov 2003)
+
+  05 Nov 2003; Brad Cowan <bcowan@gentoo.org> xfce4-diskperf-1.3.ebuild:
+  Version bump.
+
+*xfce4-diskperf-1.1 (26 Oct 2003)
+
+  26 Oct 2003; Daniel Ahlberg <aliz@gentoo.org xfce4-diskperf-1.1.ebuild:
+  Version bump
 
 *xfce4-diskperf-1.0 (10 Oct 2003)
 
diff --git a/xfce-extra/xfce4-diskperf/Manifest b/xfce-extra/xfce4-diskperf/Manifest
index 27249dc62e13..a0d074a93ae6 100644
--- a/xfce-extra/xfce4-diskperf/Manifest
+++ b/xfce-extra/xfce4-diskperf/Manifest
@@ -1,2 +1,6 @@
-MD5 b5da60e2a3c32c99196dcabf7f38bf22 xfce4-diskperf-1.0.ebuild 687
-MD5 74ab9cca84a3df848b9abb2c0857adc2 files/digest-xfce4-diskperf-1.0 77
+MD5 08222a913852017f8e515a3b0c7bc48c xfce4-diskperf-1.5-r2.ebuild 377
+MD5 64bdee177ba3cf6490223f9eaa45f024 xfce4-diskperf-1.5-r1.ebuild 378
+MD5 0124316bcf9e566e60d0e1037ebb8826 ChangeLog 1325
+MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+MD5 f629d9cdd63b12700e02bc3db543a233 files/digest-xfce4-diskperf-1.5-r1 77
+MD5 f629d9cdd63b12700e02bc3db543a233 files/digest-xfce4-diskperf-1.5-r2 77
diff --git a/xfce-extra/xfce4-diskperf/xfce4-diskperf-1.5-r1.ebuild b/xfce-extra/xfce4-diskperf/xfce4-diskperf-1.5-r1.ebuild
index b2513eeae21f..31bdef49252f 100644
--- a/xfce-extra/xfce4-diskperf/xfce4-diskperf-1.5-r1.ebuild
+++ b/xfce-extra/xfce4-diskperf/xfce4-diskperf-1.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/xfce-extra/xfce4-diskperf/xfce4-diskperf-1.5-r1.ebuild,v 1.1 2005/01/07 01:49:40 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-diskperf/xfce4-diskperf-1.5-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:58 chriswhite Exp $
 
 DESCRIPTION="Xfce4 panel disk usage/performance plugin"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
diff --git a/xfce-extra/xfce4-diskperf/xfce4-diskperf-1.5-r2.ebuild b/xfce-extra/xfce4-diskperf/xfce4-diskperf-1.5-r2.ebuild
index ad18a329f84e..77a4d633d463 100644
--- a/xfce-extra/xfce4-diskperf/xfce4-diskperf-1.5-r2.ebuild
+++ b/xfce-extra/xfce4-diskperf/xfce4-diskperf-1.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/xfce-extra/xfce4-diskperf/xfce4-diskperf-1.5-r2.ebuild,v 1.1 2005/10/06 17:33:28 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-diskperf/xfce4-diskperf-1.5-r2.ebuild,v 1.1.1.1 2005/11/30 09:38:58 chriswhite Exp $
 
 inherit xfce42
 
diff --git a/xfce-extra/xfce4-fsguard/ChangeLog b/xfce-extra/xfce4-fsguard/ChangeLog
index a1b70699bd83..0d39a9cc0c8f 100644
--- a/xfce-extra/xfce4-fsguard/ChangeLog
+++ b/xfce-extra/xfce4-fsguard/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for xfce-extra/xfce4-fsguard
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-fsguard/ChangeLog,v 1.1 2003/11/09 16:49:05 bcowan Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-fsguard/ChangeLog,v 1.1.1.1 2005/11/30 09:38:59 chriswhite Exp $
+
+*xfce4-fsguard-0.2.0-r2 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-fsguard-0.2.0-r2.ebuild:
+  Xfce builds for new eclass and modular Xorg.
+
+*xfce4-fsguard-0.2.0-r1 (06 Jan 2005)
+
+  06 Jan 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-fsguard-0.2.0-r1.ebuild:
+  Updated to use Xfce4 eclass.
+
+*xfce4-fsguard-0.2.0 (18 Mar 2004)
+
+  18 Mar 2004; Brad Cowan <bcowan@gentoo.org> xfce4-fsguard-0.2.0.ebuild:
+  Version bump. Fixes memory leak reported in bug #45096.
 
 *xfce4-fsguard-0.1.0 (09 Nov 2003)
 
diff --git a/xfce-extra/xfce4-fsguard/Manifest b/xfce-extra/xfce4-fsguard/Manifest
index 13e8217438d7..293211c92c6b 100644
--- a/xfce-extra/xfce4-fsguard/Manifest
+++ b/xfce-extra/xfce4-fsguard/Manifest
@@ -1,2 +1,6 @@
-MD5 fb37e88d95fc68d712bac9afae6473ea xfce4-fsguard-0.1.0.ebuild 706
-MD5 a3c8d7a8d6276ef0585455c28fa44664 files/digest-xfce4-fsguard-0.1.0 78
+MD5 84e7179af56975d27e5c34bac0c88a28 xfce4-fsguard-0.2.0-r2.ebuild 418
+MD5 0f970ae6f921c3f22ba72f7fc2fd7954 xfce4-fsguard-0.2.0-r1.ebuild 424
+MD5 4728b7d9a77fdf0492372a14bf551bc5 ChangeLog 853
+MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+MD5 aea530a0461b5517dd158f40d610ff18 files/digest-xfce4-fsguard-0.2.0-r1 78
+MD5 aea530a0461b5517dd158f40d610ff18 files/digest-xfce4-fsguard-0.2.0-r2 78
diff --git a/xfce-extra/xfce4-fsguard/xfce4-fsguard-0.2.0-r1.ebuild b/xfce-extra/xfce4-fsguard/xfce4-fsguard-0.2.0-r1.ebuild
index c6c57b98a275..b41f68125da0 100644
--- a/xfce-extra/xfce4-fsguard/xfce4-fsguard-0.2.0-r1.ebuild
+++ b/xfce-extra/xfce4-fsguard/xfce4-fsguard-0.2.0-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/xfce-extra/xfce4-fsguard/xfce4-fsguard-0.2.0-r1.ebuild,v 1.1 2005/01/07 01:49:40 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-fsguard/xfce4-fsguard-0.2.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:59 chriswhite Exp $
 
 DESCRIPTION="Xfce4 panel plugin that shows free space on mountpoints"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
 
+XFCE_S=${WORKDIR}/${PN}-plugin
 GOODIES_PLUGIN=1
 
 inherit xfce4
diff --git a/xfce-extra/xfce4-fsguard/xfce4-fsguard-0.2.0-r2.ebuild b/xfce-extra/xfce4-fsguard/xfce4-fsguard-0.2.0-r2.ebuild
index 0269d87e80f5..ae7354f3a84d 100644
--- a/xfce-extra/xfce4-fsguard/xfce4-fsguard-0.2.0-r2.ebuild
+++ b/xfce-extra/xfce4-fsguard/xfce4-fsguard-0.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/xfce-extra/xfce4-fsguard/xfce4-fsguard-0.2.0-r2.ebuild,v 1.1 2005/10/06 17:34:34 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-fsguard/xfce4-fsguard-0.2.0-r2.ebuild,v 1.1.1.1 2005/11/30 09:38:59 chriswhite Exp $
 
 inherit xfce42
 
diff --git a/xfce-extra/xfce4-genmon/ChangeLog b/xfce-extra/xfce4-genmon/ChangeLog
index b4d25be0530e..d89305b71b17 100644
--- a/xfce-extra/xfce4-genmon/ChangeLog
+++ b/xfce-extra/xfce4-genmon/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for xfce-extra/xfce4-genmon
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-genmon/ChangeLog,v 1.1 2004/09/20 17:00:55 bcowan Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-genmon/ChangeLog,v 1.1.1.1 2005/11/30 09:39:00 chriswhite Exp $
+
+*xfce4-genmon-1.0-r2 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-genmon-1.0-r2.ebuild:
+  Xfce builds for new eclass and modular Xorg.
+
+*xfce4-genmon-1.0-r1 (06 Jan 2005)
+
+  06 Jan 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-genmon-1.0-r1.ebuild:
+  Updated to use Xfce4 eclass.
 
 *xfce4-genmon-1.0 (20 Sep 2004)
 
diff --git a/xfce-extra/xfce4-genmon/Manifest b/xfce-extra/xfce4-genmon/Manifest
index 05136691f95c..7a9f8ece4d16 100644
--- a/xfce-extra/xfce4-genmon/Manifest
+++ b/xfce-extra/xfce4-genmon/Manifest
@@ -1,2 +1,6 @@
-MD5 f077a8925a03bfe61894702eec015e77 xfce4-genmon-1.0.ebuild 725
-MD5 bcdc83f02f76ea08b21ed56291a2d7f5 files/digest-xfce4-genmon-1.0 75
+MD5 ebc5a5e92e74a03b19114e50ce143461 xfce4-genmon-1.0-r1.ebuild 381
+MD5 eabb59e54d34c0597c81da0defc538d4 xfce4-genmon-1.0-r2.ebuild 381
+MD5 36fea2a2a18cb76f1d9799d9fd82c24c ChangeLog 662
+MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+MD5 bcdc83f02f76ea08b21ed56291a2d7f5 files/digest-xfce4-genmon-1.0-r1 75
+MD5 bcdc83f02f76ea08b21ed56291a2d7f5 files/digest-xfce4-genmon-1.0-r2 75
diff --git a/xfce-extra/xfce4-genmon/xfce4-genmon-1.0-r1.ebuild b/xfce-extra/xfce4-genmon/xfce4-genmon-1.0-r1.ebuild
index 3c5fca24d2c7..eae68b7127a6 100644
--- a/xfce-extra/xfce4-genmon/xfce4-genmon-1.0-r1.ebuild
+++ b/xfce-extra/xfce4-genmon/xfce4-genmon-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/xfce-extra/xfce4-genmon/xfce4-genmon-1.0-r1.ebuild,v 1.1 2005/01/07 01:49:40 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-genmon/xfce4-genmon-1.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:39:00 chriswhite Exp $
 
 DESCRIPTION="Xfce4 panel generic monitor plugin"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
diff --git a/xfce-extra/xfce4-genmon/xfce4-genmon-1.0-r2.ebuild b/xfce-extra/xfce4-genmon/xfce4-genmon-1.0-r2.ebuild
index 7126505cf95d..bc5e1ad65cba 100644
--- a/xfce-extra/xfce4-genmon/xfce4-genmon-1.0-r2.ebuild
+++ b/xfce-extra/xfce4-genmon/xfce4-genmon-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/xfce-extra/xfce4-genmon/xfce4-genmon-1.0-r2.ebuild,v 1.1 2005/10/06 17:35:44 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-genmon/xfce4-genmon-1.0-r2.ebuild,v 1.1.1.1 2005/11/30 09:39:00 chriswhite Exp $
 
 inherit xfce42
 
diff --git a/xfce-extra/xfce4-icon-theme/ChangeLog b/xfce-extra/xfce4-icon-theme/ChangeLog
index c1675481ab2c..638d8f7268e7 100644
--- a/xfce-extra/xfce4-icon-theme/ChangeLog
+++ b/xfce-extra/xfce4-icon-theme/ChangeLog
@@ -1,6 +1,97 @@
 # ChangeLog for xfce-extra/xfce4-icon-theme
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-icon-theme/ChangeLog,v 1.1 2004/10/04 18:45:22 bcowan Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-icon-theme/ChangeLog,v 1.1.1.1 2005/11/30 09:39:00 chriswhite Exp $
+
+*xfce4-icon-theme-4.2.2-r1 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-icon-theme-4.2.2-r1.ebuild:
+  Xfce builds for new eclass and modular Xorg.
+
+  12 Jul 2005; Simon Stelling <blubb@gentoo.org>
+  xfce4-icon-theme-4.2.2.ebuild:
+  stable on amd64
+
+  11 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  xfce4-icon-theme-4.2.2.ebuild:
+  Stable on alpha + ia64.
+
+  11 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  xfce4-icon-theme-4.2.2.ebuild:
+  Stable on hppa.
+
+  08 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  xfce4-icon-theme-4.2.2.ebuild:
+  Stable on sparc
+
+  07 Jul 2005; Daniel Ostrow <dostrow@gentoo.org>
+  xfce4-icon-theme-4.2.2.ebuild:
+  Stable on ppc and ppc64.
+
+  15 Jun 2005; Markus Rothe <corsair@gentoo.org>
+  xfce4-icon-theme-4.2.0.ebuild:
+  Stable on ppc64
+
+*xfce4-icon-theme-4.2.2 (18 May 2005)
+
+  18 May 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-icon-theme-4.2.2.ebuild:
+  4.2.2 bugfix release of Xfce 4.
+
+*xfce4-icon-theme-4.2.1 (17 Mar 2005)
+
+  17 Mar 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-icon-theme-4.2.1.ebuild:
+  Bugfix release of Xfce4.
+
+  09 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
+  xfce4-icon-theme-4.2.0.ebuild:
+  Stable on alpha.
+
+  31 Jan 2005; lanius@gentoo.org xfce4-icon-theme-4.2.0.ebuild:
+  stable on amd64
+
+  29 Jan 2005; Lars Weiler <pylon@gentoo.org> xfce4-icon-theme-4.2.0.ebuild:
+  Stable on ppc.
+
+  24 Jan 2005; Guy Martin <gmsoft@gentoo.org> xfce4-icon-theme-4.2.0.ebuild:
+  Stable on hppa.
+
+*xfce4-icon-theme-4.2.0 (16 Jan 2005)
+
+  16 Jan 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-icon-theme-4.2.0.ebuild:
+  4.2 final release of Xfce4.
+
+*xfce4-icon-theme-4.1.99.3-r1 (06 Jan 2005)
+
+  06 Jan 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-icon-theme-4.1.99.3-r1.ebuild:
+  Updated to use Xfce4 eclass.
+
+*xfce4-icon-theme-4.1.99.3 (02 Jan 2005)
+
+  02 Jan 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-icon-theme-4.1.99.3.ebuild:
+  Version bump to RC version of 4.2 release.
+
+*xfce4-icon-theme-4.1.99.2 (13 Dec 2004)
+
+  13 Dec 2004; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-icon-theme-4.1.99.2.ebuild:
+  Version bump for beta version of 4.2 release.
+
+*xfce4-icon-theme-4.1.99.1 (25 Nov 2004)
+
+  25 Nov 2004; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-icon-theme-4.1.99.1.ebuild:
+  Version bump for beta version of 4.2 release.
+
+*xfce4-icon-theme-4.1.91 (31 Oct 2004)
+
+  31 Oct 2004; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-icon-theme-4.1.91.ebuild:
+  Version bump of beta version of 4.2 release.
 
 *xfce4-icon-theme-4.1.90 (04 Oct 2004)
 
diff --git a/xfce-extra/xfce4-icon-theme/Manifest b/xfce-extra/xfce4-icon-theme/Manifest
index f2a01379f7a2..86206e4d4e3a 100644
--- a/xfce-extra/xfce4-icon-theme/Manifest
+++ b/xfce-extra/xfce4-icon-theme/Manifest
@@ -1,2 +1,8 @@
-MD5 830c4cef165abc262815b23e6e28a328 xfce4-icon-theme-4.1.90.ebuild 1070
-MD5 6f68b9f5ae83aacacc42f6666bd6fca2 files/digest-xfce4-icon-theme-4.1.90 76
+MD5 b1d471f940c70561175a02c0dd9b4009 xfce4-icon-theme-4.2.2-r1.ebuild 376
+MD5 9941a60c91179a55e8d7c9d440bcab3e xfce4-icon-theme-4.2.2.ebuild 349
+MD5 e3c514ca94bb602609999e14469ed3d5 xfce4-icon-theme-4.2.1.ebuild 359
+MD5 ceccecc03505b29aadda2c05b8f87076 ChangeLog 2937
+MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+MD5 e92b83a4cdb4400d15f7061e1569aa02 files/digest-xfce4-icon-theme-4.2.2-r1 75
+MD5 8c987fb00f1a32cdf0cef9020b4936e3 files/digest-xfce4-icon-theme-4.2.1 75
+MD5 e92b83a4cdb4400d15f7061e1569aa02 files/digest-xfce4-icon-theme-4.2.2 75
diff --git a/xfce-extra/xfce4-icon-theme/xfce4-icon-theme-4.2.1.ebuild b/xfce-extra/xfce4-icon-theme/xfce4-icon-theme-4.2.1.ebuild
index 208ca0f1d65a..cf502b75ccf5 100644
--- a/xfce-extra/xfce4-icon-theme/xfce4-icon-theme-4.2.1.ebuild
+++ b/xfce-extra/xfce4-icon-theme/xfce4-icon-theme-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/xfce-extra/xfce4-icon-theme/xfce4-icon-theme-4.2.1.ebuild,v 1.1 2005/03/17 03:09:28 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-icon-theme/xfce4-icon-theme-4.2.1.ebuild,v 1.1.1.1 2005/11/30 09:39:00 chriswhite Exp $
 
 DESCRIPTION="Xfce 4 icon theme"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
diff --git a/xfce-extra/xfce4-icon-theme/xfce4-icon-theme-4.2.2-r1.ebuild b/xfce-extra/xfce4-icon-theme/xfce4-icon-theme-4.2.2-r1.ebuild
index b90bd41ea20d..c0fc7546485b 100644
--- a/xfce-extra/xfce4-icon-theme/xfce4-icon-theme-4.2.2-r1.ebuild
+++ b/xfce-extra/xfce4-icon-theme/xfce4-icon-theme-4.2.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/xfce-extra/xfce4-icon-theme/xfce4-icon-theme-4.2.2-r1.ebuild,v 1.1 2005/10/06 06:49:44 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-icon-theme/xfce4-icon-theme-4.2.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:39:00 chriswhite Exp $
 
 inherit xfce42
 
diff --git a/xfce-extra/xfce4-icon-theme/xfce4-icon-theme-4.2.2.ebuild b/xfce-extra/xfce4-icon-theme/xfce4-icon-theme-4.2.2.ebuild
index 8257fe3a4740..5d43e252d13b 100644
--- a/xfce-extra/xfce4-icon-theme/xfce4-icon-theme-4.2.2.ebuild
+++ b/xfce-extra/xfce4-icon-theme/xfce4-icon-theme-4.2.2.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/xfce-extra/xfce4-icon-theme/xfce4-icon-theme-4.2.2.ebuild,v 1.1 2005/05/18 03:04:35 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-icon-theme/xfce4-icon-theme-4.2.2.ebuild,v 1.1.1.1 2005/11/30 09:39:00 chriswhite Exp $
 
 DESCRIPTION="Xfce 4 icon theme"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 
 inherit xfce4
diff --git a/xfce-extra/xfce4-iconbox/ChangeLog b/xfce-extra/xfce4-iconbox/ChangeLog
index dc19ddf6b630..66132fece220 100644
--- a/xfce-extra/xfce4-iconbox/ChangeLog
+++ b/xfce-extra/xfce4-iconbox/ChangeLog
@@ -1,6 +1,226 @@
-# ChangeLog for x11-misc/xfce4-iconbox
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-iconbox/ChangeLog,v 1.1 2003/07/15 05:22:41 bcowan Exp $
+# ChangeLog for xfce-extra/xfce4-iconbox
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-iconbox/ChangeLog,v 1.1.1.1 2005/11/30 09:39:00 chriswhite Exp $
+
+*xfce4-iconbox-4.2.2-r1 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-iconbox-4.2.2-r1.ebuild:
+  Xfce builds for new eclass and modular Xorg.
+
+  12 Jul 2005; Simon Stelling <blubb@gentoo.org> xfce4-iconbox-4.2.2.ebuild:
+  stable on amd64
+
+  11 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  xfce4-iconbox-4.2.2.ebuild:
+  Stable on alpha + ia64.
+
+  11 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  xfce4-iconbox-4.2.2.ebuild:
+  Stable on hppa.
+
+  08 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  xfce4-iconbox-4.2.2.ebuild:
+  Stable on sparc
+
+  07 Jul 2005; Daniel Ostrow <dostrow@gentoo.org>
+  xfce4-iconbox-4.2.2.ebuild:
+  Stable on ppc and ppc64.
+
+  15 Jun 2005; Markus Rothe <corsair@gentoo.org> xfce4-iconbox-4.2.0.ebuild:
+  Stable on ppc64
+
+*xfce4-iconbox-4.2.2 (18 May 2005)
+
+  18 May 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-iconbox-4.2.2.ebuild:
+  4.2.2 bugfix release of Xfce 4.
+
+  23 Mar 2005; Daniel Ostrow <dostrow@gentoo.org> xfce4-iconbox-4.2.1.ebuild:
+  Version bump and associated fixes.
+
+*xfce4-iconbox-4.2.1 (17 Mar 2005)
+
+  17 Mar 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-iconbox-4.2.1.ebuild:
+  Bugfix release of Xfce4.
+
+  09 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
+  xfce4-iconbox-4.2.0.ebuild:
+  Stable on alpha.
+
+  31 Jan 2005; lanius@gentoo.org xfce4-iconbox-4.2.0.ebuild:
+  stable on amd64
+
+  29 Jan 2005; Lars Weiler <pylon@gentoo.org> xfce4-iconbox-4.2.0.ebuild:
+  Stable on ppc.
+
+  24 Jan 2005; Guy Martin <gmsoft@gentoo.org> xfce4-iconbox-4.2.0.ebuild:
+  Stable on hppa.
+
+*xfce4-iconbox-4.2.0 (16 Jan 2005)
+
+  16 Jan 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-iconbox-4.2.0.ebuild:
+  4.2 final release of Xfce4.
+
+*xfce4-iconbox-4.1.99.3-r1 (06 Jan 2005)
+
+  06 Jan 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-iconbox-4.1.99.3-r1.ebuild:
+  Updated to use Xfce4 eclass.
+
+  03 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*xfce4-iconbox-4.1.99.3 (02 Jan 2005)
+
+  02 Jan 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-iconbox-4.1.99.3.ebuild:
+  Version bump to RC version of 4.2 release.
+
+*xfce4-iconbox-4.1.99.2 (13 Dec 2004)
+
+  13 Dec 2004; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-iconbox-4.1.99.2.ebuild:
+  Version bump for beta version of 4.2 release.
+
+*xfce4-iconbox-4.1.99.1 (25 Nov 2004)
+
+  25 Nov 2004; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-iconbox-4.1.99.1.ebuild:
+  Version bump for beta version of 4.2 release.
+
+*xfce4-iconbox-4.1.91 (31 Oct 2004)
+
+  31 Oct 2004; Brad Cowan <bcowan@gentoo.org> +xfce4-iconbox-4.1.91.ebuild:
+  Version bump of beta version of 4.2 release.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org>
+  xfce4-iconbox-4.0.6.ebuild:
+  Stable on amd64.
+
+*xfce4-iconbox-4.1.90 (04 Oct 2004)
+
+  04 Oct 2004; Brad Cowan <bcowan@gentoo.org> +xfce4-iconbox-4.1.90.ebuild:
+  Beta version of new 4.2 release. Contains too numerous improvements to list.
+
+  18 Sep 2004; Tom Gall <tgall@gentoo.org> xfce4-iconbox-4.0.6.ebuild:
+  stable on ppc64, bug #57744
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  xfce4-iconbox-4.0.6.ebuild:
+  Masked xfce4-iconbox-4.0.6.ebuild stable for ppc
+
+  07 Aug 2004; Bryan Østergaard <kloeri@gentoo.org>
+  xfce4-iconbox-4.0.6.ebuild:
+  Stable on alpha.
+
+  06 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  xfce4-iconbox-4.0.6.ebuild:
+  Stable on sparc
+
+  06 Aug 2004; Guy Martin <gmsoft@gentoo.org> xfce4-iconbox-4.0.6.ebuild:
+  Stable on hppa.
+
+*xfce4-iconbox-4.0.6 (12 Jul 2004)
+
+  12 Jul 2004; Brad Cowan <bcowan@gentoo.org> +xfce4-iconbox-4.0.6.ebuild:
+  Version bump. Bugfix release on stable branch that fixes cropped icons with
+  gtk-2.4 along with many others.
+
+  23 Jun 2004; <malc@gentoo.org> xfce4-iconbox-4.0.5.ebuild:
+  Mark stable on amd64
+
+  19 May 2004; Guy Martin <gmsoft@gentoo.org> xfce4-iconbox-4.0.5.ebuild:
+  Marked stable on hppa
+
+  03 May 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  xfce4-iconbox-4.0.5.ebuild:
+  Stable on sparc
+
+  20 Apr 2004; Aron Griffis <agriffis@gentoo.org> xfce4-iconbox-4.0.4.ebuild:
+  Stable on alpha and ia64
+
+*xfce4-iconbox-4.0.5 (18 Apr 2004)
+
+  18 Apr 2004; Brad Cowan <bcowan@gentoo.org> xfce4-iconbox-4.0.5.ebuild:
+  Bugfix release of xfce4.
+
+  17 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> xfce4-iconbox-4.0.0.ebuild,
+  xfce4-iconbox-4.0.1.ebuild, xfce4-iconbox-4.0.2.ebuild,
+  xfce4-iconbox-4.0.3.ebuild, xfce4-iconbox-4.0.4.ebuild:
+  Removed S=
+
+  05 Apr 2004; Guy Martin <gmsoft@gentoo.org> xfce4-iconbox-4.0.4.ebuild:
+  Marked stable on hppa.
+
+  16 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  xfce4-iconbox-4.0.4.ebuild:
+  stable on sparc
+
+*xfce4-iconbox-4.0.4 (10 Mar 2004)
+
+  10 Mar 2004; Brad Cowan <bcowan@gentoo.org> xfce4-iconbox-4.0.4.ebuild:
+  Bugfix release of xfce4.
+
+  09 Mar 2004; <agriffis@gentoo.org> xfce4-iconbox-4.0.3.ebuild:
+  stable on alpha and ia64
+
+  08 Mar 2004; Bret Curtis <psi29a@gentoo.org> xfce4-iconbox-4.0.3.ebuild:
+  Added ~mips to KEYWORDS
+
+  02 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  xfce4-iconbox-4.0.3.ebuild:
+  stable on sparc
+
+  17 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> :
+  manifest fix
+
+  16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org>
+  xfce4-iconbox-4.0.1.ebuild:
+  set ppc in keywords
+
+*xfce4-iconbox-4.0.3 (09 Jan 2004)
+
+  09 Jan 2004; Brad Cowan <bcowan@gentoo.org> xfce4-iconbox-4.0.3.ebuild:
+  Bugfix release of xfce4. Fixes memory leak and adds kde systray support
+
+*xfce4-iconbox-4.0.2 (24 Dec 2003)
+
+  24 Dec 2003; Brad Cowan <bcowan@gentoo.org> xfce4-iconbox-4.0.2.ebuild:
+  bugfix release of xfce4.
+
+  18 Dec 2003; Jason Wever <weeve@gentoo.org> xfce4-iconbox-4.0.1.ebuild:
+  Marked stable on sparc.
+
+  18 Dec 2003; Guy Martin <gmsoft@gentoo.org> xfce4-iconbox-4.0.1.ebuild:
+  Marked stable on hppa.
+
+*xfce4-iconbox-4.0.1 (12 Nov 2003)
+
+  12 Nov 2003; Brad Cowan <bcowan@gentoo.org> xfce4-iconbox-4.0.1.ebuild:
+  bugfix release of xfce4.
+
+*xfce4-iconbox-4.0.0 (25 Sep 2003)
+
+  16 Nov 2003; Guy Martin <gmsoft@gentoo.org> xfce4-iconbox-4.0.0.ebuild :
+  Added hppa to KEYWORDS.
+
+  25 Sep 2003; Brad Cowan <bcowan@gentoo.org> xfce4-iconbox-4.0.0.ebuild:
+  First official release of xfce4.
+
+*xfce4-iconbox-3.99.4 (12 Sep 2003)
+
+  12 Sep 2003; Brad Cowan <bcowan@gentoo.org> xfce4-iconbox-3.99.4.ebuild:
+  Version bump.
+
+*xfce4-iconbox-3.99.3 (03 Sep 2003)
+
+  03 Sep 2003; Brad Cowan <bcowan@gentoo.org> xfce4-iconbox-3.99.3.ebuild:
+  Version bump.
+
+*xfce4-iconbox-3.99.2 (22 Jul 2003)
+
+  22 Jul 2003; Brad Cowan <bcowan@gentoo.org> xfce4-iconbox-3.99.2.ebuild:
+  Version bump.
 
 *xfce4-iconbox-3.99.1 (15 Jul 2003)
 
diff --git a/xfce-extra/xfce4-iconbox/Manifest b/xfce-extra/xfce4-iconbox/Manifest
index ae6647a58c21..15e42ee4af27 100644
--- a/xfce-extra/xfce4-iconbox/Manifest
+++ b/xfce-extra/xfce4-iconbox/Manifest
@@ -1,3 +1,8 @@
-MD5 6fd583245b1851d77e379ae6cf053554 xfce4-iconbox-3.99.1.ebuild 824
-MD5 edf5c10217497b3559a56204a5020a58 ChangeLog 357
-MD5 a983ee8b68ab19c147d7e5cc2d4254d7 files/digest-xfce4-iconbox-3.99.1 72
+MD5 1e9dbbf03132ef8c5abfbdabe720614d xfce4-iconbox-4.2.1.ebuild 394
+MD5 def301c52eb8072ff5ab441efe3fdbf5 xfce4-iconbox-4.2.2-r1.ebuild 537
+MD5 3114250c061b866fa14c1c134691392f xfce4-iconbox-4.2.2.ebuild 381
+MD5 38a8639aecb3e2593dd8de696f9da136 ChangeLog 7043
+MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+MD5 5f893748301a580b15184398cf6613bc files/digest-xfce4-iconbox-4.2.1 71
+MD5 aa53567f90f6508bc2d48db4fdeda41c files/digest-xfce4-iconbox-4.2.2 71
+MD5 aa53567f90f6508bc2d48db4fdeda41c files/digest-xfce4-iconbox-4.2.2-r1 71
diff --git a/xfce-extra/xfce4-iconbox/xfce4-iconbox-4.2.1.ebuild b/xfce-extra/xfce4-iconbox/xfce4-iconbox-4.2.1.ebuild
index b52d8591016c..44616963d5bd 100644
--- a/xfce-extra/xfce4-iconbox/xfce4-iconbox-4.2.1.ebuild
+++ b/xfce-extra/xfce4-iconbox/xfce4-iconbox-4.2.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/xfce-extra/xfce4-iconbox/xfce4-iconbox-4.2.1.ebuild,v 1.1 2005/03/17 03:10:45 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-iconbox/xfce4-iconbox-4.2.1.ebuild,v 1.1.1.1 2005/11/30 09:39:00 chriswhite Exp $
 
 DESCRIPTION="Xfce 4 icon box"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
-RDEPEND="~xfce-base/xfce4-panel-${PV}"
+RDEPEND="~xfce-base/xfce4-panel-4.2.1.1"
 
-inherit xfce4
\ No newline at end of file
+inherit xfce4
diff --git a/xfce-extra/xfce4-iconbox/xfce4-iconbox-4.2.2-r1.ebuild b/xfce-extra/xfce4-iconbox/xfce4-iconbox-4.2.2-r1.ebuild
index 0a1301a543f3..9d5fde249cdc 100644
--- a/xfce-extra/xfce4-iconbox/xfce4-iconbox-4.2.2-r1.ebuild
+++ b/xfce-extra/xfce4-iconbox/xfce4-iconbox-4.2.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/xfce-extra/xfce4-iconbox/xfce4-iconbox-4.2.2-r1.ebuild,v 1.1 2005/10/06 06:51:36 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-iconbox/xfce4-iconbox-4.2.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:39:00 chriswhite Exp $
 
 inherit xfce42
 
diff --git a/xfce-extra/xfce4-iconbox/xfce4-iconbox-4.2.2.ebuild b/xfce-extra/xfce4-iconbox/xfce4-iconbox-4.2.2.ebuild
index e2cc0137bc80..d7aee5b86e14 100644
--- a/xfce-extra/xfce4-iconbox/xfce4-iconbox-4.2.2.ebuild
+++ b/xfce-extra/xfce4-iconbox/xfce4-iconbox-4.2.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/xfce-extra/xfce4-iconbox/xfce4-iconbox-4.2.2.ebuild,v 1.1 2005/05/18 03:05:45 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-iconbox/xfce4-iconbox-4.2.2.ebuild,v 1.1.1.1 2005/11/30 09:39:00 chriswhite Exp $
 
 DESCRIPTION="Xfce 4 icon box"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 
 RDEPEND="~xfce-base/xfce4-panel-${PV}"
 
diff --git a/xfce-extra/xfce4-megahertz/ChangeLog b/xfce-extra/xfce4-megahertz/ChangeLog
index 50e39457e326..78c9c96a3dde 100644
--- a/xfce-extra/xfce4-megahertz/ChangeLog
+++ b/xfce-extra/xfce4-megahertz/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for xfce-extra/xfce4-megahertz
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-megahertz/ChangeLog,v 1.1 2005/08/14 22:09:13 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-megahertz/ChangeLog,v 1.1.1.1 2005/11/30 09:39:01 chriswhite Exp $
+
+*xfce4-megahertz-0.1-r1 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-megahertz-0.1-r1.ebuild:
+  Xfce builds for new eclass and modular Xorg.
 
 *xfce4-megahertz-0.1 (14 Aug 2005)
 
diff --git a/xfce-extra/xfce4-megahertz/Manifest b/xfce-extra/xfce4-megahertz/Manifest
index 77df4ec8cec5..ddfd4033968d 100644
--- a/xfce-extra/xfce4-megahertz/Manifest
+++ b/xfce-extra/xfce4-megahertz/Manifest
@@ -1,3 +1,6 @@
-MD5 f31abcbd3619536faaf43b3a20aca8f8 xfce4-megahertz-0.1.ebuild 386
+MD5 4a1939682614ea49bf7f7aa919a53dae xfce4-megahertz-0.1-r1.ebuild 385
+MD5 96cefc21db989bf7102e90e6e4baa84d xfce4-megahertz-0.1.ebuild 384
+MD5 2a6141b57ab15f5ca785274168695a17 ChangeLog 539
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 MD5 8b1740f1881711ebdd35f4cf47dad193 files/digest-xfce4-megahertz-0.1 78
+MD5 8b1740f1881711ebdd35f4cf47dad193 files/digest-xfce4-megahertz-0.1-r1 78
diff --git a/xfce-extra/xfce4-megahertz/xfce4-megahertz-0.1-r1.ebuild b/xfce-extra/xfce4-megahertz/xfce4-megahertz-0.1-r1.ebuild
index 937f51d02539..44da0dfc553e 100644
--- a/xfce-extra/xfce4-megahertz/xfce4-megahertz-0.1-r1.ebuild
+++ b/xfce-extra/xfce4-megahertz/xfce4-megahertz-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/xfce-extra/xfce4-megahertz/xfce4-megahertz-0.1-r1.ebuild,v 1.1 2005/10/06 17:37:00 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-megahertz/xfce4-megahertz-0.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:39:01 chriswhite Exp $
 
 inherit xfce42
 
diff --git a/xfce-extra/xfce4-megahertz/xfce4-megahertz-0.1.ebuild b/xfce-extra/xfce4-megahertz/xfce4-megahertz-0.1.ebuild
index 38198a298974..35cc37b8d517 100644
--- a/xfce-extra/xfce4-megahertz/xfce4-megahertz-0.1.ebuild
+++ b/xfce-extra/xfce4-megahertz/xfce4-megahertz-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/xfce-extra/xfce4-megahertz/xfce4-megahertz-0.1.ebuild,v 1.1 2005/08/14 22:09:13 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-megahertz/xfce4-megahertz-0.1.ebuild,v 1.1.1.1 2005/11/30 09:39:01 chriswhite Exp $
 
 DESCRIPTION="Xfce4 panel megahertz plugin"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
diff --git a/xfce-extra/xfce4-minicmd/ChangeLog b/xfce-extra/xfce4-minicmd/ChangeLog
index e49b65b605fa..4f807e5bd171 100644
--- a/xfce-extra/xfce4-minicmd/ChangeLog
+++ b/xfce-extra/xfce4-minicmd/ChangeLog
@@ -1,6 +1,65 @@
 # ChangeLog for xfce-extra/xfce4-minicmd
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-minicmd/ChangeLog,v 1.1 2003/08/15 12:13:28 bcowan Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-minicmd/ChangeLog,v 1.1.1.1 2005/11/30 09:39:00 chriswhite Exp $
+
+  18 Jun 2005; Markus Rothe <corsair@gentoo.org>
+  xfce4-minicmd-0.3.0-r1.ebuild:
+  Stable on ppc64
+
+  13 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
+  xfce4-minicmd-0.3.0-r1.ebuild:
+  Stable on alpha.
+
+  31 Jan 2005; lanius@gentoo.org xfce4-minicmd-0.3.0-r1.ebuild:
+  stable on amd64
+
+  29 Jan 2005; Lars Weiler <pylon@gentoo.org> xfce4-minicmd-0.3.0-r1.ebuild:
+  Stable on ppc.
+
+  24 Jan 2005; Guy Martin <gmsoft@gentoo.org> xfce4-minicmd-0.3.0-r1.ebuild:
+  Stable on hppa.
+
+*xfce4-minicmd-0.3.0-r1 (06 Jan 2005)
+
+  06 Jan 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-minicmd-0.3.0-r1.ebuild:
+  Updated to use Xfce4 eclass.
+
+*xfce4-minicmd-0.3.0 (09 Nov 2004)
+
+  09 Nov 2004; Brad Cowan <bcowan@gentoo.org> +xfce4-minicmd-0.3.0.ebuild:
+  Version bump.
+
+  18 Sep 2004; Tom Gall <tgall@gentoo.org> xfce4-minicmd-0.2.0.ebuild:
+  stable on ppc64, bug #57744
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  xfce4-minicmd-0.1.1.ebuild:
+  Masked xfce4-minicmd-0.1.1.ebuild stable for ppc
+
+  09 Mar 2004; <agriffis@gentoo.org> xfce4-minicmd-0.2.0.ebuild:
+  stable on alpha and ia64
+
+  08 Mar 2004; Bret Curtis <psi29a@gentoo.org> xfce4-minicmd-0.2.0.ebuild:
+  Added ~mips to KEYWORDS
+
+  17 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> :
+  manifest fix
+
+  16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org>
+  xfce4-minicmd-0.2.0.ebuild:
+  set ppc in keywords
+
+  18 Dec 2003; Jason Wever <weeve@gentoo.org> xfce4-minicmd-0.2.0.ebuild:
+  Marked stable on sparc.
+
+*xfce4-minicmd-0.2.0 (10 Oct 2003)
+
+  16 Nov 2003; Guy Martin <gmsoft@gentoo.org> xfce4-minicmd-0.2.0.ebuild :
+  Added hppa to KEYWORDS.
+
+  10 Oct 2003; Brad Cowan <bcowan@gentoo.org> xfce4-minicmd-0.2.0.ebuild:
+  Version bump.
 
 *xfce4-minicmd-0.1.1 (15 Aug 2003)
 
diff --git a/xfce-extra/xfce4-minicmd/Manifest b/xfce-extra/xfce4-minicmd/Manifest
index 336291e84e53..e1a93c88cbe7 100644
--- a/xfce-extra/xfce4-minicmd/Manifest
+++ b/xfce-extra/xfce4-minicmd/Manifest
@@ -1,3 +1,4 @@
-MD5 626861e9a7b968f7262b5040bab29cc8 xfce4-minicmd-0.1.1.ebuild 830
-MD5 9e4adad868a6924f189dd1bd312147fd ChangeLog 359
-MD5 9ea0d837261f6759f6f24d1aae45746f files/digest-xfce4-minicmd-0.1.1 78
+MD5 659aeb16f4a71a0bdeaac89372e764e8 xfce4-minicmd-0.3.0-r1.ebuild 458
+MD5 87550e637bd368552befebbbd51423ee ChangeLog 2059
+MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+MD5 0087842189b5cc0731ef9cdad52307df files/digest-xfce4-minicmd-0.3.0-r1 78
diff --git a/xfce-extra/xfce4-minicmd/xfce4-minicmd-0.3.0-r1.ebuild b/xfce-extra/xfce4-minicmd/xfce4-minicmd-0.3.0-r1.ebuild
index 4a5f46d2013c..e81e55248953 100644
--- a/xfce-extra/xfce4-minicmd/xfce4-minicmd-0.3.0-r1.ebuild
+++ b/xfce-extra/xfce4-minicmd/xfce4-minicmd-0.3.0-r1.ebuild
@@ -1,10 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-minicmd/xfce4-minicmd-0.3.0-r1.ebuild,v 1.1 2005/01/06 23:41:11 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-minicmd/xfce4-minicmd-0.3.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:39:00 chriswhite Exp $
+
+inherit xfce42
 
 DESCRIPTION="Xfce4 panel command line plugin"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
+DEPEND="${RDEPEND}
+	|| ( ( x11-proto/xproto
+	x11-libs/libX11 )
+	virtual/x11 )"
 
-GOODIES_PLUGIN=1
+goodies_plugin
 
-inherit xfce4
\ No newline at end of file
diff --git a/xfce-extra/xfce4-mixer/ChangeLog b/xfce-extra/xfce4-mixer/ChangeLog
index cf4af7efb907..22e3ff92c816 100644
--- a/xfce-extra/xfce4-mixer/ChangeLog
+++ b/xfce-extra/xfce4-mixer/ChangeLog
@@ -1,6 +1,211 @@
-# ChangeLog for x11-misc/xfce4-mixer
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mixer/ChangeLog,v 1.1 2003/07/15 05:09:20 bcowan Exp $
+# ChangeLog for xfce-extra/xfce4-mixer
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mixer/ChangeLog,v 1.1.1.1 2005/11/30 09:38:58 chriswhite Exp $
+
+*xfce4-mixer-4.2.2-r1 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-mixer-4.2.2-r1.ebuild:
+  Xfce builds for new eclass and modular Xorg.
+
+  12 Jul 2005; Simon Stelling <blubb@gentoo.org> xfce4-mixer-4.2.2.ebuild:
+  stable on amd64
+
+  11 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  xfce4-mixer-4.2.2.ebuild:
+  Stable on alpha + ia64.
+
+  11 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  xfce4-mixer-4.2.2.ebuild:
+  Stable on hppa.
+
+  08 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  xfce4-mixer-4.2.2.ebuild:
+  Stable on sparc
+
+  07 Jul 2005; Daniel Ostrow <dostrow@gentoo.org> xfce4-mixer-4.2.2.ebuild:
+  Stable on ppc and ppc64.
+
+  15 Jun 2005; Markus Rothe <corsair@gentoo.org> xfce4-mixer-4.2.0.ebuild:
+  Stable on ppc64
+
+*xfce4-mixer-4.2.2 (18 May 2005)
+
+  18 May 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-mixer-4.2.2.ebuild:
+  4.2.2 bugfix release of Xfce 4.
+
+  23 Mar 2005; Daniel Ostrow <dostrow@gentoo.org> xfce4-mixer-4.2.1.ebuild:
+  Version bump and associated fixes.
+
+*xfce4-mixer-4.2.1 (17 Mar 2005)
+
+  17 Mar 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-mixer-4.2.1.ebuild:
+  Bugfix release of Xfce4.
+
+  09 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
+  xfce4-mixer-4.2.0.ebuild:
+  Stable on alpha.
+
+  31 Jan 2005; lanius@gentoo.org xfce4-mixer-4.2.0.ebuild:
+  stable on amd64
+
+  29 Jan 2005; Lars Weiler <pylon@gentoo.org> xfce4-mixer-4.2.0.ebuild:
+  Stable on ppc.
+
+  24 Jan 2005; Guy Martin <gmsoft@gentoo.org> xfce4-mixer-4.2.0.ebuild:
+  Stable on hppa.
+
+*xfce4-mixer-4.2.0 (16 Jan 2005)
+
+  16 Jan 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-mixer-4.2.0.ebuild:
+  4.2 final release of Xfce4.
+
+*xfce4-mixer-4.1.99.3-r1 (06 Jan 2005)
+
+  06 Jan 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-mixer-4.1.99.3-r1.ebuild:
+  Updated to use Xfce4 eclass.
+
+  03 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*xfce4-mixer-4.1.99.3 (02 Jan 2005)
+
+  02 Jan 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-mixer-4.1.99.3.ebuild:
+  Version bump to RC version of 4.2 release.
+
+*xfce4-mixer-4.1.99.2 (13 Dec 2004)
+
+  13 Dec 2004; Brad Cowan <bcowan@gentoo.org> +xfce4-mixer-4.1.99.2.ebuild:
+  Version bump for beta version of 4.2 release.
+
+*xfce4-mixer-4.1.99.1 (25 Nov 2004)
+
+  25 Nov 2004; Brad Cowan <bcowan@gentoo.org> +xfce4-mixer-4.1.99.1.ebuild:
+  Version bump for beta version of 4.2 release.
+
+*xfce4-mixer-4.1.91 (31 Oct 2004)
+
+  31 Oct 2004; Brad Cowan <bcowan@gentoo.org> +xfce4-mixer-4.1.91.ebuild:
+  Version bump of beta version of 4.2 release.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> xfce4-mixer-4.0.6.ebuild:
+  Stable on amd64.
+
+  18 Sep 2004; Tom Gall <tgall@gentoo.org> xfce4-mixer-4.0.6.ebuild:
+  stable on ppc64, bug #57744
+
+  04 Sep 2004; Bryan Østergaard <kloeri@gentoo.org> xfce4-mixer-4.0.6.ebuild:
+  Stable on alpha.
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  xfce4-mixer-4.0.6.ebuild:
+  Masked xfce4-mixer-4.0.6.ebuild stable for ppc
+
+  06 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  xfce4-mixer-4.0.6.ebuild:
+  Stable on sparc
+
+  06 Aug 2004; Guy Martin <gmsoft@gentoo.org> xfce4-mixer-4.0.6.ebuild:
+  Stable on hppa.
+
+*xfce4-mixer-4.0.6 (12 Jul 2004)
+
+  12 Jul 2004; Brad Cowan <bcowan@gentoo.org> +xfce4-mixer-4.0.6.ebuild:
+  Version bump. Bugfix release on stable branch that fixes cropped icons with
+  gtk-2.4 along with many others.
+
+  23 Jun 2004; <malc@gentoo.org> xfce4-mixer-4.0.5.ebuild:
+  Mark stable on amd64
+
+  19 May 2004; Guy Martin <gmsoft@gentoo.org> xfce4-mixer-4.0.5.ebuild:
+  Marked stable on hppa
+
+  03 May 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  xfce4-mixer-4.0.5.ebuild:
+  Stable on sparc
+
+  20 Apr 2004; Aron Griffis <agriffis@gentoo.org> xfce4-mixer-4.0.4.ebuild:
+  Stable on alpha and ia64
+
+*xfce4-mixer-4.0.5 (18 Apr 2004)
+
+  18 Apr 2004; Brad Cowan <bcowan@gentoo.org> xfce4-mixer-4.0.5.ebuild:
+  Bugfix release of xfce4.
+
+  17 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> xfce4-mixer-4.0.0.ebuild,
+  xfce4-mixer-4.0.1.ebuild, xfce4-mixer-4.0.2.ebuild,
+  xfce4-mixer-4.0.3.ebuild, xfce4-mixer-4.0.4.ebuild:
+  Removed S=
+
+  05 Apr 2004; Guy Martin <gmsoft@gentoo.org> xfce4-mixer-4.0.4.ebuild:
+  Marked stable on hppa.
+
+  16 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  xfce4-mixer-4.0.4.ebuild:
+  stable on sparc
+
+*xfce4-mixer-4.0.4 (10 Mar 2004)
+
+  10 Mar 2004; Brad Cowan <bcowan@gentoo.org> xfce4-mixer-4.0.4.ebuild:
+  Bugfix release of xfce4.
+
+  09 Mar 2004; <agriffis@gentoo.org> xfce4-mixer-4.0.3.ebuild:
+  stable on alpha and ia64
+
+  08 Mar 2004; Bret Curtis <psi29a@gentoo.org> xfce4-mixer-4.0.3.ebuild:
+  Added ~mips to KEYWORDS
+
+  02 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  xfce4-mixer-4.0.3.ebuild:
+  stable on sparc
+
+  16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org>
+  xfce4-mixer-4.0.1.ebuild:
+  set ppc in keywords
+
+*xfce4-mixer-4.0.3 (09 Jan 2004)
+
+  09 Jan 2004; Brad Cowan <bcowan@gentoo.org> xfce4-mixer-4.0.3.ebuild:
+  Bugfix release of xfce4. Fixes memory leak and adds kde systray support
+
+*xfce4-mixer-4.0.2 (24 Dec 2003)
+
+  24 Dec 2003; Brad Cowan <bcowan@gentoo.org> xfce4-mixer-4.0.2.ebuild:
+  bugfix release of xfce4.
+
+  18 Dec 2003; Jason Wever <weeve@gentoo.org> xfce4-mixer-4.0.1.ebuild:
+  Marked stable on sparc.
+
+  18 Dec 2003; Guy Martin <gmsoft@gentoo.org> xfce4-mixer-4.0.1.ebuild:
+  Marked stable on hppa.
+
+*xfce4-mixer-4.0.1 (12 Nov 2003)
+
+  12 Nov 2003; Brad Cowan <bcowan@gentoo.org> xfce4-mixer-4.0.1.ebuild:
+  bugfix release of xfce4.
+
+*xfce4-mixer-4.0.0 (25 Sep 2003)
+
+  16 Nov 2003; Guy Martin <gmsoft@gentoo.org> xfce4-mixer-4.0.0.ebuild :
+  Added hppa to KEYWORDS.
+
+  25 Sep 2003; Brad Cowan <bcowan@gentoo.org> xfce4-mixer-4.0.0.ebuild:
+  First official release of xfce4.
+
+*xfce4-mixer-3.99.4 (12 Sep 2003)
+
+  12 Sep 2003; Brad Cowan <bcowan@gentoo.org> xfce4-mixer-3.99.4.ebuild:
+  Version bump.
+
+*xfce4-mixer-3.99.3 (03 Sep 2003)
+
+  03 Sep 2003; Brad Cowan <bcowan@gentoo.org> xfce4-mixer-3.99.3.ebuild:
+  Version bump.
+
+*xfce4-mixer-3.99.2 (22 Jul 2003)
+
+  22 Jul 2003; Brad Cowan <bcowan@gentoo.org> xfce4-mixer-3.99.2.ebuild:
+  Version bump.
 
 *xfce4-mixer-3.99.1 (15 Jul 2003)
 
diff --git a/xfce-extra/xfce4-mixer/Manifest b/xfce-extra/xfce4-mixer/Manifest
index b01dacfdf7fa..98128f49e282 100644
--- a/xfce-extra/xfce4-mixer/Manifest
+++ b/xfce-extra/xfce4-mixer/Manifest
@@ -1,3 +1,8 @@
-MD5 8d9edc93a44b7b256a811574afb5e474 xfce4-mixer-3.99.1.ebuild 823
-MD5 83637e6aaf35c56e0c4b196ada75303f ChangeLog 343
-MD5 b84d44bf32c65a5c90aa369bada706cd files/digest-xfce4-mixer-3.99.1 70
+MD5 b418a028a7b4696efb082b3fd684a87e xfce4-mixer-4.2.1.ebuild 488
+MD5 bf8bf888946c2ddd184b5e3d99abc03f xfce4-mixer-4.2.2-r1.ebuild 633
+MD5 d316a2da2b0c79bf77527cc4a6f03556 xfce4-mixer-4.2.2.ebuild 475
+MD5 cbf9072c802701d5fa7d717fd0098582 ChangeLog 6598
+MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+MD5 59cce41ce2bd2a76d432307069e945c1 files/digest-xfce4-mixer-4.2.2-r1 69
+MD5 2d86e2f0849e0f4d12d8f67113b15a30 files/digest-xfce4-mixer-4.2.1 69
+MD5 59cce41ce2bd2a76d432307069e945c1 files/digest-xfce4-mixer-4.2.2 69
diff --git a/xfce-extra/xfce4-mixer/xfce4-mixer-4.2.1.ebuild b/xfce-extra/xfce4-mixer/xfce4-mixer-4.2.1.ebuild
index 35f2ffc1491b..c10c02cc28e8 100644
--- a/xfce-extra/xfce4-mixer/xfce4-mixer-4.2.1.ebuild
+++ b/xfce-extra/xfce4-mixer/xfce4-mixer-4.2.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/xfce-extra/xfce4-mixer/xfce4-mixer-4.2.1.ebuild,v 1.1 2005/03/17 03:16:57 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mixer/xfce4-mixer-4.2.1.ebuild,v 1.1.1.1 2005/11/30 09:38:58 chriswhite Exp $
 
 DESCRIPTION="Xfce 4 mixer panel plugin"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="alsa"
 
-RDEPEND="~xfce-base/xfce4-panel-${PV}
+RDEPEND="~xfce-base/xfce4-panel-4.2.1.1
 	alsa? ( media-libs/alsa-lib )"
 
 use alsa && XFCE_CONFIG="--with-sound=alsa"
 
-inherit xfce4
\ No newline at end of file
+inherit xfce4
diff --git a/xfce-extra/xfce4-mixer/xfce4-mixer-4.2.2-r1.ebuild b/xfce-extra/xfce4-mixer/xfce4-mixer-4.2.2-r1.ebuild
index fa59d7e337d6..40e45567b87b 100644
--- a/xfce-extra/xfce4-mixer/xfce4-mixer-4.2.2-r1.ebuild
+++ b/xfce-extra/xfce4-mixer/xfce4-mixer-4.2.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/xfce-extra/xfce4-mixer/xfce4-mixer-4.2.2-r1.ebuild,v 1.1 2005/10/06 07:01:08 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mixer/xfce4-mixer-4.2.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:58 chriswhite Exp $
 
 inherit xfce42
 
diff --git a/xfce-extra/xfce4-mixer/xfce4-mixer-4.2.2.ebuild b/xfce-extra/xfce4-mixer/xfce4-mixer-4.2.2.ebuild
index 2b70675d0514..6815271738c8 100644
--- a/xfce-extra/xfce4-mixer/xfce4-mixer-4.2.2.ebuild
+++ b/xfce-extra/xfce4-mixer/xfce4-mixer-4.2.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/xfce-extra/xfce4-mixer/xfce4-mixer-4.2.2.ebuild,v 1.1 2005/05/18 03:11:42 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mixer/xfce4-mixer-4.2.2.ebuild,v 1.1.1.1 2005/11/30 09:38:58 chriswhite Exp $
 
 DESCRIPTION="Xfce 4 mixer panel plugin"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="alsa"
 
 RDEPEND="~xfce-base/xfce4-panel-${PV}
diff --git a/xfce-extra/xfce4-modemlights/ChangeLog b/xfce-extra/xfce4-modemlights/ChangeLog
index 08361427c48f..1f2f7ee2c900 100644
--- a/xfce-extra/xfce4-modemlights/ChangeLog
+++ b/xfce-extra/xfce4-modemlights/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for xfce-extra/xfce4-modemlights
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-modemlights/ChangeLog,v 1.1 2005/08/14 22:14:16 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-modemlights/ChangeLog,v 1.1.1.1 2005/11/30 09:38:57 chriswhite Exp $
+
+*xfce4-modemlights-0.1.1-r1 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-modemlights-0.1.1-r1.ebuild:
+  Xfce builds for new eclass and modular Xorg.
 
 *xfce4-modemlights-0.1.1 (14 Aug 2005)
 
diff --git a/xfce-extra/xfce4-modemlights/Manifest b/xfce-extra/xfce4-modemlights/Manifest
index 5be8a87d28e8..006ef15dd9c9 100644
--- a/xfce-extra/xfce4-modemlights/Manifest
+++ b/xfce-extra/xfce4-modemlights/Manifest
@@ -1,2 +1,6 @@
-MD5 22de3c97fd41f6eccc2e8e440e183b41 xfce4-modemlights-0.1.1.ebuild 374
+MD5 94d9449db3dec8827d212a6ce6423851 ChangeLog 559
+MD5 5d1f3587f9393b9de35a745f188a797d xfce4-modemlights-0.1.1-r1.ebuild 450
+MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+MD5 7746807868a6da271308a40ca7250a15 xfce4-modemlights-0.1.1.ebuild 392
 MD5 023e1395c880c8de501c3fc05406737e files/digest-xfce4-modemlights-0.1.1 82
+MD5 023e1395c880c8de501c3fc05406737e files/digest-xfce4-modemlights-0.1.1-r1 82
diff --git a/xfce-extra/xfce4-modemlights/xfce4-modemlights-0.1.1-r1.ebuild b/xfce-extra/xfce4-modemlights/xfce4-modemlights-0.1.1-r1.ebuild
index dc4fd2b9be3e..6a7fc0a68a64 100644
--- a/xfce-extra/xfce4-modemlights/xfce4-modemlights-0.1.1-r1.ebuild
+++ b/xfce-extra/xfce4-modemlights/xfce4-modemlights-0.1.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/xfce-extra/xfce4-modemlights/xfce4-modemlights-0.1.1-r1.ebuild,v 1.1 2005/10/06 07:48:26 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-modemlights/xfce4-modemlights-0.1.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:57 chriswhite Exp $
 
 inherit xfce42
 
diff --git a/xfce-extra/xfce4-modemlights/xfce4-modemlights-0.1.1.ebuild b/xfce-extra/xfce4-modemlights/xfce4-modemlights-0.1.1.ebuild
index 5a9c5c8f4cff..7c23ad3d05d4 100644
--- a/xfce-extra/xfce4-modemlights/xfce4-modemlights-0.1.1.ebuild
+++ b/xfce-extra/xfce4-modemlights/xfce4-modemlights-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/xfce-extra/xfce4-modemlights/xfce4-modemlights-0.1.1.ebuild,v 1.1 2005/08/14 22:14:16 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-modemlights/xfce4-modemlights-0.1.1.ebuild,v 1.1.1.1 2005/11/30 09:38:57 chriswhite Exp $
 
 DESCRIPTION="Xfce4 panel modem lights plugin"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
diff --git a/xfce-extra/xfce4-mount/ChangeLog b/xfce-extra/xfce4-mount/ChangeLog
index 2158dc5142fb..84939af25d46 100644
--- a/xfce-extra/xfce4-mount/ChangeLog
+++ b/xfce-extra/xfce4-mount/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for xfce-extra/xfce4-mount
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mount/ChangeLog,v 1.1 2005/06/17 00:34:29 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mount/ChangeLog,v 1.1.1.1 2005/11/30 09:38:59 chriswhite Exp $
+
+*xfce4-mount-0.3-r1 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-mount-0.3-r1.ebuild:
+  Xfce builds for new eclass and modular Xorg.
+
+  08 Sep 2005; Aron Griffis <agriffis@gentoo.org> xfce4-mount-0.3.ebuild:
+  Mark 0.3 stable on ia64
+
+  08 Sep 2005; Luis Medinas <metalgod@gentoo.org> xfce4-mount-0.3.ebuild:
+  Marked Stable on AMD64.
+
+  07 Sep 2005; Brad Cowan <bcowan@gentoo.org> xfce4-mount-0.3.ebuild:
+  Stable on x86.
 
 *xfce4-mount-0.3 (17 Jun 2005)
 
diff --git a/xfce-extra/xfce4-mount/Manifest b/xfce-extra/xfce4-mount/Manifest
index 72a23e797369..9ce43121842c 100644
--- a/xfce-extra/xfce4-mount/Manifest
+++ b/xfce-extra/xfce4-mount/Manifest
@@ -1,2 +1,6 @@
-MD5 adee79aa967ef64e4fc7aeac1269e852 xfce4-mount-0.3.ebuild 387
+MD5 2b95b1e0ba0e4214c18a0c6ad256d788 xfce4-mount-0.3-r1.ebuild 378
+MD5 cde8f76220cf41c212d0542a47c2a24e xfce4-mount-0.3.ebuild 377
+MD5 38fafa0b3a75f3aadb8bce46954d332f ChangeLog 803
+MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+MD5 5d471bd57683d0fe5f8613ee71b2d5ad files/digest-xfce4-mount-0.3-r1 74
 MD5 5d471bd57683d0fe5f8613ee71b2d5ad files/digest-xfce4-mount-0.3 74
diff --git a/xfce-extra/xfce4-mount/xfce4-mount-0.3-r1.ebuild b/xfce-extra/xfce4-mount/xfce4-mount-0.3-r1.ebuild
index 4b2beab7bce0..80a23909ecbf 100644
--- a/xfce-extra/xfce4-mount/xfce4-mount-0.3-r1.ebuild
+++ b/xfce-extra/xfce4-mount/xfce4-mount-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/xfce-extra/xfce4-mount/xfce4-mount-0.3-r1.ebuild,v 1.1 2005/10/06 17:38:21 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mount/xfce4-mount-0.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:59 chriswhite Exp $
 
 inherit xfce42
 
diff --git a/xfce-extra/xfce4-mount/xfce4-mount-0.3.ebuild b/xfce-extra/xfce4-mount/xfce4-mount-0.3.ebuild
index 8346e04c8ed4..4d1ca1a654e3 100644
--- a/xfce-extra/xfce4-mount/xfce4-mount-0.3.ebuild
+++ b/xfce-extra/xfce4-mount/xfce4-mount-0.3.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/xfce-extra/xfce4-mount/xfce4-mount-0.3.ebuild,v 1.1 2005/06/17 00:34:29 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mount/xfce4-mount-0.3.ebuild,v 1.1.1.1 2005/11/30 09:38:59 chriswhite Exp $
 
 DESCRIPTION="Xfce4 panel mount point plugin"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 
 GOODIES_PLUGIN=1
 
diff --git a/xfce-extra/xfce4-netload/ChangeLog b/xfce-extra/xfce4-netload/ChangeLog
index 2cdf3c77e4ef..82cda921a025 100644
--- a/xfce-extra/xfce4-netload/ChangeLog
+++ b/xfce-extra/xfce4-netload/ChangeLog
@@ -1,6 +1,123 @@
 # ChangeLog for xfce-extra/xfce4-netload
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-netload/ChangeLog,v 1.1 2003/08/15 12:14:22 bcowan Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-netload/ChangeLog,v 1.1.1.1 2005/11/30 09:38:58 chriswhite Exp $
+
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org>
+  xfce4-netload-0.3.2.ebuild:
+  Mark 0.3.2 stable on alpha
+
+*xfce4-netload-0.3.2-r1 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-netload-0.3.2-r1.ebuild:
+  Xfce builds for new eclass and modular Xorg.
+
+  16 Sep 2005; <dang@gentoo.org> xfce4-netload-0.3.2.ebuild:
+  Marked stable on amd64
+
+  12 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  xfce4-netload-0.3.2.ebuild:
+  Stable on sparc
+
+  07 Sep 2005; Brad Cowan <bcowan@gentoo.org> xfce4-netload-0.3.2.ebuild:
+  Stable on x86.
+
+  23 Aug 2005; Aron Griffis <agriffis@gentoo.org>
+  xfce4-netload-0.3.2.ebuild:
+  stable on ia64
+
+  07 Jul 2005; Daniel Ostrow <dostrow@gentoo.org>
+  xfce4-netload-0.3.2.ebuild:
+  Stable on ppc and ppc64.
+
+  18 Jun 2005; Markus Rothe <corsair@gentoo.org> xfce4-netload-0.2.4.ebuild:
+  Stable on ppc64
+
+*xfce4-netload-0.3.2 (18 May 2005)
+
+  18 May 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-netload-0.3.2.ebuild:
+  Bumped version.
+
+  13 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
+  xfce4-netload-0.2.4.ebuild:
+  Stable on alpha.
+
+*xfce4-netload-0.3.1 (05 Feb 2005)
+
+  05 Feb 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-netload-0.3.1.ebuild:
+  Version bump.
+
+  31 Jan 2005; lanius@gentoo.org xfce4-netload-0.2.4.ebuild:
+  stable on amd64
+
+  29 Jan 2005; Lars Weiler <pylon@gentoo.org> xfce4-netload-0.2.4.ebuild:
+  Stable on ppc.
+
+  24 Jan 2005; Guy Martin <gmsoft@gentoo.org> xfce4-netload-0.2.4.ebuild:
+  Stable on hppa.
+
+*xfce4-netload-0.2.4 (20 Jan 2005)
+
+  20 Jan 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-netload-0.2.4.ebuild:
+  Version bump.
+
+*xfce4-netload-0.2.3-r1 (06 Jan 2005)
+
+  06 Jan 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-netload-0.2.3-r1.ebuild:
+  Updated to use Xfce4 eclass.
+
+*xfce4-netload-0.2.3 (19 Sep 2004)
+
+  19 Sep 2004; Brad Cowan <bcowan@gentoo.org> +xfce4-netload-0.2.3.ebuild:
+  Version bump.
+
+  18 Sep 2004; Tom Gall <tgall@gentoo.org> xfce4-netload-0.2.2.ebuild:
+  stable on ppc64, bug #57744
+
+  09 Mar 2004; <agriffis@gentoo.org> xfce4-netload-0.2.2.ebuild:
+  stable on alpha and ia64
+
+  08 Mar 2004; Bret Curtis <psi29a@gentoo.org> xfce4-netload-0.2.2.ebuild:
+  Added ~mips to KEYWORDS
+
+  17 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> :
+  manifest fix
+
+  16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org>
+  xfce4-netload-0.2.2.ebuild:
+  set ppc in keywords
+
+  18 Dec 2003; Jason Wever <weeve@gentoo.org> xfce4-netload-0.2.2.ebuild:
+  Marked stable on sparc.
+
+*xfce4-netload-0.2.2 (26 Oct 2003)
+
+  16 Nov 2003; Guy Martin <gmsoft@gentoo.org> xfce4-netload-0.2.2.ebuild :
+  Added hppa to KEYWORDS.
+
+  26 Oct 2003; Daniel Ahlberg <aliz@gentoo.org> xfce4-netload-0.2.2.ebuild:
+  Version bump
+
+*xfce4-netload-0.2.1 (09 Oct 2003)
+
+  09 Oct 2003; Brad Cowan <bcowan@gentoo.org> xfce4-netload-0.2.1.ebuild:
+  Version bump.
+
+*xfce4-netload-0.2.0 (18 Sep 2003)
+
+  18 Sep 2003; Brad Cowan <bcowan@gentoo.org> xfce4-netload-0.2.0.ebuild:
+  Version bump.
+
+*xfce4-netload-0.2.0_pre6 (08 Sep 2003)
+
+  08 Sep 2003; Brad Cowan <bcowan@gentoo.org> xfce4-netload-0.2.0_pre6.ebuild:
+  Version bump.
+
+*xfce4-netload-0.2.0_pre5 (03 Sep 2003)
+
+  03 Sep 2003; Brad Cowan <bcowan@gentoo.org> xfce4-netload-0.2.0_pre5.ebuild:
+  Version bump.
 
 *xfce4-netload-0.1.3 (15 Aug 2003)
 
diff --git a/xfce-extra/xfce4-netload/Manifest b/xfce-extra/xfce4-netload/Manifest
index ebfe52472b7a..a349357ac176 100644
--- a/xfce-extra/xfce4-netload/Manifest
+++ b/xfce-extra/xfce4-netload/Manifest
@@ -1,3 +1,22 @@
-MD5 429295c1a17268dd9238d40fed86f0b8 xfce4-netload-0.1.3.ebuild 838
-MD5 407eeb09d2f7e6ae415c0aebd39d12c2 ChangeLog 359
-MD5 0586c50a3bf009059d2c4825bad0e4a2 files/digest-xfce4-netload-0.1.3 78
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f654bb33908e7c21450c157bc5ea043e xfce4-netload-0.3.2.ebuild 396
+MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+MD5 ebf170065064f7b69168aa018bd952c5 xfce4-netload-0.3.2-r1.ebuild 402
+MD5 49cb35a7c86f76bb5658512e6e83b744 ChangeLog 3582
+MD5 0224c87896f3e6f6a038f882cde32ec1 xfce4-netload-0.2.3-r1.ebuild 396
+MD5 b1f6fa3a2c5709e9d9c1cf114731aceb xfce4-netload-0.2.4.ebuild 385
+MD5 723415976fbf3ffd1471b0de57c55459 xfce4-netload-0.3.1.ebuild 403
+MD5 2c91dfa041ede312bf559f62213dffdc files/digest-xfce4-netload-0.2.4 78
+MD5 19335b87c54a1cf33825330c46903f87 files/digest-xfce4-netload-0.2.3-r1 78
+MD5 1057e2f9ea55ebb89533861a319cf6c7 files/digest-xfce4-netload-0.3.2 79
+MD5 1057e2f9ea55ebb89533861a319cf6c7 files/digest-xfce4-netload-0.3.2-r1 79
+MD5 a477599ba752f810601381daeab01e56 files/digest-xfce4-netload-0.3.1 79
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDVRL3JrHF4yAQTrARAr6/AJwPkaCbB/X+GrnSXCgNXTz+dvhQrgCeO6Vd
+rycBjczYksU/U1ns8Xt1paM=
+=6wzX
+-----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-netload/xfce4-netload-0.2.3-r1.ebuild b/xfce-extra/xfce4-netload/xfce4-netload-0.2.3-r1.ebuild
index 9baf1d9751c5..ec0d2a12d313 100644
--- a/xfce-extra/xfce4-netload/xfce4-netload-0.2.3-r1.ebuild
+++ b/xfce-extra/xfce4-netload/xfce4-netload-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/xfce-extra/xfce4-netload/xfce4-netload-0.2.3-r1.ebuild,v 1.1 2005/01/06 23:41:11 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-netload/xfce4-netload-0.2.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:58 chriswhite Exp $
 
 DESCRIPTION="Xfce4 panel network load monitor plugin"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
diff --git a/xfce-extra/xfce4-netload/xfce4-netload-0.2.4.ebuild b/xfce-extra/xfce4-netload/xfce4-netload-0.2.4.ebuild
index 07407746757e..dfbd788701e2 100644
--- a/xfce-extra/xfce4-netload/xfce4-netload-0.2.4.ebuild
+++ b/xfce-extra/xfce4-netload/xfce4-netload-0.2.4.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/xfce-extra/xfce4-netload/xfce4-netload-0.2.4.ebuild,v 1.1 2005/01/21 00:58:05 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-netload/xfce4-netload-0.2.4.ebuild,v 1.1.1.1 2005/11/30 09:38:58 chriswhite Exp $
 
 DESCRIPTION="Xfce4 panel network load monitor plugin"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 
 GOODIES_PLUGIN=1
 
diff --git a/xfce-extra/xfce4-netload/xfce4-netload-0.3.1.ebuild b/xfce-extra/xfce4-netload/xfce4-netload-0.3.1.ebuild
index 8ffe1cd7d463..49cca0d40d9e 100644
--- a/xfce-extra/xfce4-netload/xfce4-netload-0.3.1.ebuild
+++ b/xfce-extra/xfce4-netload/xfce4-netload-0.3.1.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/xfce-extra/xfce4-netload/xfce4-netload-0.3.1.ebuild,v 1.1 2005/02/05 05:29:51 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-netload/xfce4-netload-0.3.1.ebuild,v 1.1.1.1 2005/11/30 09:38:58 chriswhite Exp $
 
 DESCRIPTION="Xfce4 panel network load monitor plugin"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 BZIPPED=1
 GOODIES_PLUGIN=1
diff --git a/xfce-extra/xfce4-netload/xfce4-netload-0.3.2-r1.ebuild b/xfce-extra/xfce4-netload/xfce4-netload-0.3.2-r1.ebuild
index dae1f8e3d59a..2b94d4c08538 100644
--- a/xfce-extra/xfce4-netload/xfce4-netload-0.3.2-r1.ebuild
+++ b/xfce-extra/xfce4-netload/xfce4-netload-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/xfce-extra/xfce4-netload/xfce4-netload-0.3.2-r1.ebuild,v 1.1 2005/10/06 17:39:38 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-netload/xfce4-netload-0.3.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:58 chriswhite Exp $
 
 inherit xfce42
 
diff --git a/xfce-extra/xfce4-netload/xfce4-netload-0.3.2.ebuild b/xfce-extra/xfce4-netload/xfce4-netload-0.3.2.ebuild
index e0003f3a6491..d5d468872297 100644
--- a/xfce-extra/xfce4-netload/xfce4-netload-0.3.2.ebuild
+++ b/xfce-extra/xfce4-netload/xfce4-netload-0.3.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/xfce-extra/xfce4-netload/xfce4-netload-0.3.2.ebuild,v 1.1 2005/05/18 04:28:24 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-netload/xfce4-netload-0.3.2.ebuild,v 1.1.1.1 2005/11/30 09:38:58 chriswhite Exp $
 
 DESCRIPTION="Xfce4 panel network load monitor plugin"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 
 BZIPPED=1
 GOODIES_PLUGIN=1
diff --git a/xfce-extra/xfce4-notes/ChangeLog b/xfce-extra/xfce4-notes/ChangeLog
index 92b41cfff989..887ed9bfda84 100644
--- a/xfce-extra/xfce4-notes/ChangeLog
+++ b/xfce-extra/xfce4-notes/ChangeLog
@@ -1,6 +1,53 @@
 # ChangeLog for xfce-extra/xfce4-notes
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-notes/ChangeLog,v 1.1 2003/10/10 04:14:24 bcowan Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-notes/ChangeLog,v 1.1.1.1 2005/11/30 09:38:57 chriswhite Exp $
+
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org>
+  xfce4-notes-0.10.0-r1.ebuild:
+  Mark 0.10.0-r1 stable on alpha
+
+*xfce4-notes-0.10.0-r2 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-notes-0.10.0-r2.ebuild:
+  Xfce builds for new eclass and modular Xorg.
+
+  20 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  xfce4-notes-0.10.0-r1.ebuild:
+  Stable on ppc64
+
+  07 Jul 2005; Daniel Ostrow <dostrow@gentoo.org>
+  xfce4-notes-0.9.7-r1.ebuild:
+  Stable on ppc and ppc64.
+
+*xfce4-notes-0.10.0-r1 (09 Apr 2005)
+
+  09 Apr 2005; Brad Cowan <bcowan@gentoo.org> +files/notes_applet.c.patch,
+  xfce4-notes-0.10.0.ebuild, +xfce4-notes-0.10.0-r1.ebuild:
+  Fix for bug #80478.
+
+  31 Jan 2005; lanius@gentoo.org xfce4-notes-0.10.0.ebuild:
+  stable on amd64
+
+  29 Jan 2005; Lars Weiler <pylon@gentoo.org> xfce4-notes-0.10.0.ebuild:
+  Stable on ppc.
+
+*xfce4-notes-0.10.0 (19 Jan 2005)
+
+  19 Jan 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-notes-0.10.0.ebuild:
+  Version bump.
+
+*xfce4-notes-0.9.7-r1 (06 Jan 2005)
+
+  06 Jan 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-notes-0.9.7-r1.ebuild:
+  Updated to use Xfce4 eclass.
+
+  19 Jun 2004; Jason Wever <weeve@gentoo.org> xfce4-notes-0.9.7.ebuild:
+  Stable on sparc.
+
+*xfce4-notes-0.9.7 (26 Oct 2003)
+
+  26 Oct 2003; Daniel Ahlberg <aliz@gentoo.org xfce4-notes-0.9.7.ebuild:
+  Version bump
 
 *xfce4-notes-0.9.6 (10 Oct 2003)
 
diff --git a/xfce-extra/xfce4-notes/Manifest b/xfce-extra/xfce4-notes/Manifest
index fcb70e36b3f4..3529a22edb52 100644
--- a/xfce-extra/xfce4-notes/Manifest
+++ b/xfce-extra/xfce4-notes/Manifest
@@ -1,2 +1,21 @@
-MD5 b5da60e2a3c32c99196dcabf7f38bf22 xfce4-notes-0.9.6.ebuild 687
-MD5 a56d078c211c4d4239767362630b45ab files/digest-xfce4-notes-0.9.6 76
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0fced766f6059422ee6ef0b868484c74 xfce4-notes-0.10.0.ebuild 377
+MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+MD5 8032df3bec249cf0042aca3f2c6eb790 ChangeLog 1685
+MD5 9278d13a9225aa157f615695ee8ae7e0 xfce4-notes-0.10.0-r1.ebuild 466
+MD5 cd15f6abd7facb85375a0b3111c12a19 xfce4-notes-0.9.7-r1.ebuild 384
+MD5 046dadc9c89e2656858ddcc9b9839d37 xfce4-notes-0.10.0-r2.ebuild 472
+MD5 ac9ea5633311f8effbd11a24724d9cb4 files/digest-xfce4-notes-0.10.0-r1 77
+MD5 26718c962f6a184d14efff98f76c2bd7 files/notes_applet.c.patch 285
+MD5 ac9ea5633311f8effbd11a24724d9cb4 files/digest-xfce4-notes-0.10.0-r2 77
+MD5 ac9ea5633311f8effbd11a24724d9cb4 files/digest-xfce4-notes-0.10.0 77
+MD5 6b41a6e0f0f511c726ef91eb894a79cd files/digest-xfce4-notes-0.9.7-r1 76
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDVRNxJrHF4yAQTrARAiWeAJ46BHCJefYgaSTSmhpDO/zpd1rEuQCdFLh+
+E9uXYfVpA3zms8veHbrpucU=
+=wTNn
+-----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-notes/xfce4-notes-0.10.0-r1.ebuild b/xfce-extra/xfce4-notes/xfce4-notes-0.10.0-r1.ebuild
index 58e13883e9df..d908bbb3130a 100644
--- a/xfce-extra/xfce4-notes/xfce4-notes-0.10.0-r1.ebuild
+++ b/xfce-extra/xfce4-notes/xfce4-notes-0.10.0-r1.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/xfce-extra/xfce4-notes/xfce4-notes-0.10.0-r1.ebuild,v 1.1 2005/04/09 22:50:18 bcowan Exp $
-
-DESCRIPTION="Xfce4 panel sticky notes plugin"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 sparc x86"
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-notes/xfce4-notes-0.10.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:57 chriswhite Exp $
 
 GOODIES_PLUGIN=1
 
-inherit eutils xfce4
+inherit xfce4 eutils
+
+DESCRIPTION="Xfce4 panel sticky notes plugin"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/notes_applet.c.patch
-}
\ No newline at end of file
+}
diff --git a/xfce-extra/xfce4-notes/xfce4-notes-0.10.0-r2.ebuild b/xfce-extra/xfce4-notes/xfce4-notes-0.10.0-r2.ebuild
index 536bd9e8cda9..f59b80da7280 100644
--- a/xfce-extra/xfce4-notes/xfce4-notes-0.10.0-r2.ebuild
+++ b/xfce-extra/xfce4-notes/xfce4-notes-0.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/xfce-extra/xfce4-notes/xfce4-notes-0.10.0-r2.ebuild,v 1.1 2005/10/06 17:40:45 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-notes/xfce4-notes-0.10.0-r2.ebuild,v 1.1.1.1 2005/11/30 09:38:57 chriswhite Exp $
 
 inherit xfce42 eutils
 
diff --git a/xfce-extra/xfce4-notes/xfce4-notes-0.10.0.ebuild b/xfce-extra/xfce4-notes/xfce4-notes-0.10.0.ebuild
index 1206f8fd1fc4..23e9929f1a4d 100644
--- a/xfce-extra/xfce4-notes/xfce4-notes-0.10.0.ebuild
+++ b/xfce-extra/xfce4-notes/xfce4-notes-0.10.0.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/xfce-extra/xfce4-notes/xfce4-notes-0.10.0.ebuild,v 1.1 2005/01/19 20:44:33 bcowan Exp $
-
-DESCRIPTION="Xfce4 panel sticky notes plugin"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-notes/xfce4-notes-0.10.0.ebuild,v 1.1.1.1 2005/11/30 09:38:57 chriswhite Exp $
 
 GOODIES_PLUGIN=1
 
 inherit xfce4
+
+DESCRIPTION="Xfce4 panel sticky notes plugin"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 sparc x86"
diff --git a/xfce-extra/xfce4-notes/xfce4-notes-0.9.7-r1.ebuild b/xfce-extra/xfce4-notes/xfce4-notes-0.9.7-r1.ebuild
index 522e50c5d16d..a2dd793827c3 100644
--- a/xfce-extra/xfce4-notes/xfce4-notes-0.9.7-r1.ebuild
+++ b/xfce-extra/xfce4-notes/xfce4-notes-0.9.7-r1.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/xfce-extra/xfce4-notes/xfce4-notes-0.9.7-r1.ebuild,v 1.1 2005/01/06 23:41:11 bcowan Exp $
-
-DESCRIPTION="Xfce4 panel sticky notes plugin"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-notes/xfce4-notes-0.9.7-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:57 chriswhite Exp $
 
 GOODIES_PLUGIN=1
 
 inherit xfce4
+
+DESCRIPTION="Xfce4 panel sticky notes plugin"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86"
diff --git a/xfce-extra/xfce4-panelmenu/ChangeLog b/xfce-extra/xfce4-panelmenu/ChangeLog
index 61f6e4eff83c..14fcfc1d4938 100644
--- a/xfce-extra/xfce4-panelmenu/ChangeLog
+++ b/xfce-extra/xfce4-panelmenu/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for xfce-extra/xfce4-panelmenu
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-panelmenu/ChangeLog,v 1.1 2005/02/28 21:41:32 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-panelmenu/ChangeLog,v 1.1.1.1 2005/11/30 09:38:57 chriswhite Exp $
+
+*xfce4-panelmenu-0.3.1-r1 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-panelmenu-0.3.1-r1.ebuild:
+  Xfce builds for new eclass and modular Xorg.
+
+*xfce4-panelmenu-0.3.1 (28 Apr 2005)
+
+  28 Apr 2005; Brad Cowan <bcowan@gentoo.org> xfce4-panelmenu-0.2.1.ebuild,
+  +xfce4-panelmenu-0.3.1.ebuild:
+  Version bump.
 
 *xfce4-panelmenu-0.2.1 (28 Feb 2005)
 
diff --git a/xfce-extra/xfce4-panelmenu/Manifest b/xfce-extra/xfce4-panelmenu/Manifest
index 8589d088f2fa..7c0c37aadd4e 100644
--- a/xfce-extra/xfce4-panelmenu/Manifest
+++ b/xfce-extra/xfce4-panelmenu/Manifest
@@ -1,3 +1,8 @@
-MD5 32b25e842b38e4d531d5232a5c7f551b xfce4-panelmenu-0.2.1.ebuild 511
-MD5 c4826eddca64406773f8272785a904ec files/digest-xfce4-panelmenu-0.1.0 80
+MD5 6b196f71a20cea62ac6ca5e2150e435f xfce4-panelmenu-0.2.1.ebuild 563
+MD5 ba2944f1885b8cb880bd3ae6757196cc xfce4-panelmenu-0.3.1.ebuild 563
+MD5 e24c57e2fe786ee9029a0aebce16560d xfce4-panelmenu-0.3.1-r1.ebuild 547
+MD5 6882e83d5a003bb4d9e143980cdae93c ChangeLog 711
+MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+MD5 7bb8fc6b22b208ae526318f58dc5068d files/digest-xfce4-panelmenu-0.3.1-r1 81
 MD5 63b8429595e0ea9e3cb84093e3e8740f files/digest-xfce4-panelmenu-0.2.1 81
+MD5 7bb8fc6b22b208ae526318f58dc5068d files/digest-xfce4-panelmenu-0.3.1 81
diff --git a/xfce-extra/xfce4-panelmenu/xfce4-panelmenu-0.2.1.ebuild b/xfce-extra/xfce4-panelmenu/xfce4-panelmenu-0.2.1.ebuild
index 0efc06a13be6..6dd6ac85f676 100644
--- a/xfce-extra/xfce4-panelmenu/xfce4-panelmenu-0.2.1.ebuild
+++ b/xfce-extra/xfce4-panelmenu/xfce4-panelmenu-0.2.1.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/xfce-extra/xfce4-panelmenu/xfce4-panelmenu-0.2.1.ebuild,v 1.1 2005/02/28 21:41:32 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-panelmenu/xfce4-panelmenu-0.2.1.ebuild,v 1.1.1.1 2005/11/30 09:38:57 chriswhite Exp $
 
 PLUGIN=1
 inherit xfce4
 
 MY_P="${MY_P/panelmenu/panel-menu}"
 
-DESCRIPTION="Xfce4 panel cpu load graphing plugin"
+DESCRIPTION="Xfce4 panel menu plugin"
 SRC_URI="http://download.berlios.de/${PN/-/}/${MY_P}.tar.gz"
+HOMEPAGE="https://developer.berlios.de/projects/xfce4panelmenu"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 XFCE_S="${WORKDIR}/${MY_P}"
diff --git a/xfce-extra/xfce4-panelmenu/xfce4-panelmenu-0.3.1-r1.ebuild b/xfce-extra/xfce4-panelmenu/xfce4-panelmenu-0.3.1-r1.ebuild
index e2c18d49aacc..a0c807c74fb0 100644
--- a/xfce-extra/xfce4-panelmenu/xfce4-panelmenu-0.3.1-r1.ebuild
+++ b/xfce-extra/xfce4-panelmenu/xfce4-panelmenu-0.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/xfce-extra/xfce4-panelmenu/xfce4-panelmenu-0.3.1-r1.ebuild,v 1.1 2005/10/06 17:41:51 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-panelmenu/xfce4-panelmenu-0.3.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:57 chriswhite Exp $
 
 inherit xfce42
 
diff --git a/xfce-extra/xfce4-panelmenu/xfce4-panelmenu-0.3.1.ebuild b/xfce-extra/xfce4-panelmenu/xfce4-panelmenu-0.3.1.ebuild
index 655e2456dd2d..529203781389 100644
--- a/xfce-extra/xfce4-panelmenu/xfce4-panelmenu-0.3.1.ebuild
+++ b/xfce-extra/xfce4-panelmenu/xfce4-panelmenu-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/xfce-extra/xfce4-panelmenu/xfce4-panelmenu-0.3.1.ebuild,v 1.1 2005/04/28 18:51:43 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-panelmenu/xfce4-panelmenu-0.3.1.ebuild,v 1.1.1.1 2005/11/30 09:38:57 chriswhite Exp $
 
 PLUGIN=1
 inherit xfce4
@@ -9,6 +9,7 @@ MY_P="${MY_P/panelmenu/panel-menu}"
 
 DESCRIPTION="Xfce4 panel menu plugin"
 SRC_URI="http://download.berlios.de/${PN/-/}/${MY_P}.tar.gz"
+HOMEPAGE="https://developer.berlios.de/projects/xfce4panelmenu"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 XFCE_S="${WORKDIR}/${MY_P}"
diff --git a/xfce-extra/xfce4-quicklauncher/ChangeLog b/xfce-extra/xfce4-quicklauncher/ChangeLog
index 985c8286888a..a67d50578ff3 100644
--- a/xfce-extra/xfce4-quicklauncher/ChangeLog
+++ b/xfce-extra/xfce4-quicklauncher/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for xfce-extra/xfce4-quicklauncher
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-quicklauncher/ChangeLog,v 1.1 2005/04/09 21:59:52 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-quicklauncher/ChangeLog,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
+
+*xfce4-quicklauncher-0.81-r1 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-quicklauncher-0.81-r1.ebuild:
+  Xfce builds for new eclass and modular Xorg.
+
+*xfce4-quicklauncher-0.81 (14 Aug 2005)
+
+  14 Aug 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-quicklauncher-0.81.ebuild:
+  Version bump.
+
+*xfce4-quicklauncher-0.8 (18 May 2005)
+
+  18 May 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-quicklauncher-0.8.ebuild:
+  Bumped version.
 
 *xfce4-quicklauncher-0.7 (09 Apr 2005)
 
diff --git a/xfce-extra/xfce4-quicklauncher/Manifest b/xfce-extra/xfce4-quicklauncher/Manifest
index 4f07a365d8f9..629dc164ac83 100644
--- a/xfce-extra/xfce4-quicklauncher/Manifest
+++ b/xfce-extra/xfce4-quicklauncher/Manifest
@@ -1,4 +1,10 @@
+MD5 ecf903b9e8cee063eca8e47dc6e5517c xfce4-quicklauncher-0.81.ebuild 397
+MD5 1159bfb19bf3656d867c0958878ec86a xfce4-quicklauncher-0.8.ebuild 396
+MD5 19ef171f538e614c06aa2732451fcfc1 xfce4-quicklauncher-0.81-r1.ebuild 397
 MD5 ce8efaa09cd4237436dce245eb772e92 xfce4-quicklauncher-0.7.ebuild 396
-MD5 2391e26fbac99633c40cddc0ade0e677 ChangeLog 388
+MD5 5ae9faaf746a62659e94a6990c8b7559 ChangeLog 845
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+MD5 d050eb6c818c7013fc0209b18ab4617e files/digest-xfce4-quicklauncher-0.81-r1 83
 MD5 a6249378a63e4fd99835f24255f7f7e4 files/digest-xfce4-quicklauncher-0.7 82
+MD5 b304afce9c4b814069e1b3d1445753e2 files/digest-xfce4-quicklauncher-0.8 83
+MD5 d050eb6c818c7013fc0209b18ab4617e files/digest-xfce4-quicklauncher-0.81 83
diff --git a/xfce-extra/xfce4-quicklauncher/xfce4-quicklauncher-0.7.ebuild b/xfce-extra/xfce4-quicklauncher/xfce4-quicklauncher-0.7.ebuild
index dfb4666b215b..b179255a3575 100644
--- a/xfce-extra/xfce4-quicklauncher/xfce4-quicklauncher-0.7.ebuild
+++ b/xfce-extra/xfce4-quicklauncher/xfce4-quicklauncher-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/xfce-extra/xfce4-quicklauncher/xfce4-quicklauncher-0.7.ebuild,v 1.1 2005/04/09 21:59:52 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-quicklauncher/xfce4-quicklauncher-0.7.ebuild,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
 
 DESCRIPTION="Xfce4 panel quicklauncher plugin"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
diff --git a/xfce-extra/xfce4-quicklauncher/xfce4-quicklauncher-0.8.ebuild b/xfce-extra/xfce4-quicklauncher/xfce4-quicklauncher-0.8.ebuild
index 40d0136c515f..377ae2900015 100644
--- a/xfce-extra/xfce4-quicklauncher/xfce4-quicklauncher-0.8.ebuild
+++ b/xfce-extra/xfce4-quicklauncher/xfce4-quicklauncher-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/xfce-extra/xfce4-quicklauncher/xfce4-quicklauncher-0.8.ebuild,v 1.1 2005/05/18 04:37:08 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-quicklauncher/xfce4-quicklauncher-0.8.ebuild,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
 
 DESCRIPTION="Xfce4 panel quicklauncher plugin"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
diff --git a/xfce-extra/xfce4-quicklauncher/xfce4-quicklauncher-0.81-r1.ebuild b/xfce-extra/xfce4-quicklauncher/xfce4-quicklauncher-0.81-r1.ebuild
index 2d3423d4c83a..ab7d0cad344f 100644
--- a/xfce-extra/xfce4-quicklauncher/xfce4-quicklauncher-0.81-r1.ebuild
+++ b/xfce-extra/xfce4-quicklauncher/xfce4-quicklauncher-0.81-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/xfce-extra/xfce4-quicklauncher/xfce4-quicklauncher-0.81-r1.ebuild,v 1.1 2005/10/06 17:43:09 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-quicklauncher/xfce4-quicklauncher-0.81-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
 inherit xfce42
 
 DESCRIPTION="Xfce4 panel quicklauncher plugin"
diff --git a/xfce-extra/xfce4-quicklauncher/xfce4-quicklauncher-0.81.ebuild b/xfce-extra/xfce4-quicklauncher/xfce4-quicklauncher-0.81.ebuild
index dfc4d833e68b..db38122568f8 100644
--- a/xfce-extra/xfce4-quicklauncher/xfce4-quicklauncher-0.81.ebuild
+++ b/xfce-extra/xfce4-quicklauncher/xfce4-quicklauncher-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/xfce-extra/xfce4-quicklauncher/xfce4-quicklauncher-0.81.ebuild,v 1.1 2005/08/14 20:36:35 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-quicklauncher/xfce4-quicklauncher-0.81.ebuild,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
 
 DESCRIPTION="Xfce4 panel quicklauncher plugin"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
diff --git a/xfce-extra/xfce4-sensors/ChangeLog b/xfce-extra/xfce4-sensors/ChangeLog
index 75207b0d31b1..891df50ba70a 100644
--- a/xfce-extra/xfce4-sensors/ChangeLog
+++ b/xfce-extra/xfce4-sensors/ChangeLog
@@ -1,6 +1,29 @@
 # ChangeLog for xfce-extra/xfce4-sensors
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-sensors/ChangeLog,v 1.1 2005/01/08 06:29:42 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-sensors/ChangeLog,v 1.1.1.1 2005/11/30 09:38:57 chriswhite Exp $
+
+*xfce4-sensors-0.6.1-r1 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-sensors-0.6.1-r1.ebuild:
+  Xfce builds for new eclass and modular Xorg.
+
+*xfce4-sensors-0.6.1 (14 Aug 2005)
+
+  14 Aug 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-sensors-0.6.1.ebuild:
+  Updating to latest version.
+
+*xfce4-sensors-0.5.1 (14 Aug 2005)
+
+  14 Aug 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-sensors-0.5.1.ebuild:
+  Bump version.
+
+  10 May 2005; David Holm <dholm@gentoo.org> xfce4-sensors-0.3.0.ebuild:
+  Added to ~ppc.
+
+  27 Feb 2005; Henrik Brix Andersen <brix@gentoo.org>
+  xfce4-sensors-0.3.0.ebuild:
+  Dependency update: sys-apps/lm-sensors -> sys-apps/lm_sensors.
 
 *xfce4-sensors-0.3.0 (08 Jan 2005)
 
diff --git a/xfce-extra/xfce4-sensors/Manifest b/xfce-extra/xfce4-sensors/Manifest
index 4bbe1ce576a6..84192301c4a4 100644
--- a/xfce-extra/xfce4-sensors/Manifest
+++ b/xfce-extra/xfce4-sensors/Manifest
@@ -1,4 +1,10 @@
-MD5 804869debae87853524dae5705749c60 xfce4-sensors-0.3.0.ebuild 417
-MD5 a0635001328c4f8e27ca203627805607 ChangeLog 368
+MD5 8f8b4a03c79d450ef088ec475cf5cd80 xfce4-sensors-0.6.1.ebuild 368
+MD5 d3a615dfb474bb1c3f173e074fcb494b xfce4-sensors-0.6.1-r1.ebuild 371
+MD5 66d94519e6ec5f14660e0dbe4bd38a1d xfce4-sensors-0.3.0.ebuild 367
+MD5 6c268f913587df39903289cab8af7734 xfce4-sensors-0.5.1.ebuild 368
+MD5 58cf6fe959470b1b627507dde86a4475 ChangeLog 1046
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 MD5 275580f04cb4adf0947f2db17499a4ff files/digest-xfce4-sensors-0.3.0 78
+MD5 2e9784be81ed3e10e0493e4458ad5b2a files/digest-xfce4-sensors-0.5.1 78
+MD5 9b4ec3de0aa227960e11076c91b8834e files/digest-xfce4-sensors-0.6.1 78
+MD5 9b4ec3de0aa227960e11076c91b8834e files/digest-xfce4-sensors-0.6.1-r1 78
diff --git a/xfce-extra/xfce4-sensors/xfce4-sensors-0.3.0.ebuild b/xfce-extra/xfce4-sensors/xfce4-sensors-0.3.0.ebuild
index b52d92757887..f048e7aac481 100644
--- a/xfce-extra/xfce4-sensors/xfce4-sensors-0.3.0.ebuild
+++ b/xfce-extra/xfce4-sensors/xfce4-sensors-0.3.0.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/xfce-extra/xfce4-sensors/xfce4-sensors-0.3.0.ebuild,v 1.1 2005/01/08 06:29:42 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-sensors/xfce4-sensors-0.3.0.ebuild,v 1.1.1.1 2005/11/30 09:38:57 chriswhite Exp $
 
 DESCRIPTION="Xfce4 panel lm-sensors plugin"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~x86 ~ppc"
 
 GOODIES_PLUGIN=1
-XFCE_RDEPEND="sys-apps/lm-sensors"
+RDEPEND="sys-apps/lm_sensors"
 
 inherit xfce4
\ No newline at end of file
diff --git a/xfce-extra/xfce4-sensors/xfce4-sensors-0.5.1.ebuild b/xfce-extra/xfce4-sensors/xfce4-sensors-0.5.1.ebuild
index a09aa3d08796..7040acbb8280 100644
--- a/xfce-extra/xfce4-sensors/xfce4-sensors-0.5.1.ebuild
+++ b/xfce-extra/xfce4-sensors/xfce4-sensors-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/xfce-extra/xfce4-sensors/xfce4-sensors-0.5.1.ebuild,v 1.1 2005/08/14 20:27:41 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-sensors/xfce4-sensors-0.5.1.ebuild,v 1.1.1.1 2005/11/30 09:38:57 chriswhite Exp $
 
 DESCRIPTION="Xfce4 panel lm-sensors plugin"
 KEYWORDS="~amd64 ~x86 ~ppc"
diff --git a/xfce-extra/xfce4-sensors/xfce4-sensors-0.6.1-r1.ebuild b/xfce-extra/xfce4-sensors/xfce4-sensors-0.6.1-r1.ebuild
index 88aac755b8af..a9ca09d0ebbe 100644
--- a/xfce-extra/xfce4-sensors/xfce4-sensors-0.6.1-r1.ebuild
+++ b/xfce-extra/xfce4-sensors/xfce4-sensors-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/xfce-extra/xfce4-sensors/xfce4-sensors-0.6.1-r1.ebuild,v 1.1 2005/10/06 17:44:20 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-sensors/xfce4-sensors-0.6.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:57 chriswhite Exp $
 
 inherit xfce42
 
diff --git a/xfce-extra/xfce4-sensors/xfce4-sensors-0.6.1.ebuild b/xfce-extra/xfce4-sensors/xfce4-sensors-0.6.1.ebuild
index 881b0345fdc8..053718bd3166 100644
--- a/xfce-extra/xfce4-sensors/xfce4-sensors-0.6.1.ebuild
+++ b/xfce-extra/xfce4-sensors/xfce4-sensors-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/xfce-extra/xfce4-sensors/xfce4-sensors-0.6.1.ebuild,v 1.1 2005/08/14 22:41:13 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-sensors/xfce4-sensors-0.6.1.ebuild,v 1.1.1.1 2005/11/30 09:38:57 chriswhite Exp $
 
 DESCRIPTION="Xfce4 panel lm-sensors plugin"
 KEYWORDS="~amd64 ~x86 ~ppc"
diff --git a/xfce-extra/xfce4-showdesktop/ChangeLog b/xfce-extra/xfce4-showdesktop/ChangeLog
index 58ebd5a96bfb..c40be3aba48b 100644
--- a/xfce-extra/xfce4-showdesktop/ChangeLog
+++ b/xfce-extra/xfce4-showdesktop/ChangeLog
@@ -1,6 +1,91 @@
 # ChangeLog for xfce-extra/xfce4-showdesktop
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-showdesktop/ChangeLog,v 1.1 2003/08/15 12:15:17 bcowan Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-showdesktop/ChangeLog,v 1.1.1.1 2005/11/30 09:39:01 chriswhite Exp $
+
+*xfce4-showdesktop-0.4.0-r2 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-showdesktop-0.4.0-r2.ebuild:
+  Xfce builds for new eclass and modular Xorg.
+
+  18 Jun 2005; Markus Rothe <corsair@gentoo.org>
+  xfce4-showdesktop-0.4.0-r1.ebuild:
+  Stable on ppc64
+
+  12 Jun 2005; Sven Wegener <swegener@gentoo.org>
+  xfce4-showdesktop-0.4.0.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  13 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
+  xfce4-showdesktop-0.4.0-r1.ebuild:
+  Stable on alpha.
+
+  31 Jan 2005; lanius@gentoo.org xfce4-showdesktop-0.4.0-r1.ebuild:
+  stable on amd64
+
+  29 Jan 2005; Lars Weiler <pylon@gentoo.org>
+  xfce4-showdesktop-0.4.0-r1.ebuild:
+  Stable on ppc.
+
+  24 Jan 2005; Guy Martin <gmsoft@gentoo.org>
+  xfce4-showdesktop-0.4.0-r1.ebuild:
+  Stable on hppa.
+
+*xfce4-showdesktop-0.4.0-r1 (06 Jan 2005)
+
+  06 Jan 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-showdesktop-0.4.0-r1.ebuild:
+  Updated to use Xfce4 eclass.
+
+*xfce4-showdesktop-0.4.0 (24 Oct 2004)
+
+  24 Oct 2004; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-showdesktop-0.4.0.ebuild:
+  Version bump to work with 4.2 series.
+
+  18 Sep 2004; Tom Gall <tgall@gentoo.org> xfce4-showdesktop-0.3.0.ebuild:
+  stable on ppc64, bug #57744
+
+  05 Apr 2004; Guy Martin <gmsoft@gentoo.org> xfce4-showdesktop-0.3.0.ebuild:
+  Marked stable on hppa.
+
+  09 Mar 2004; <agriffis@gentoo.org> xfce4-showdesktop-0.3.0.ebuild:
+  stable on alpha and ia64
+
+  08 Mar 2004; Bret Curtis <psi29a@gentoo.org> xfce4-showdesktop-0.3.0.ebuild:
+  Added ~mips to KEYWORDS
+
+  02 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  xfce4-showdesktop-0.3.0.ebuild:
+  stable on sparc
+
+  17 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> :
+  manifest fix
+
+  16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org>
+  xfce4-showdesktop-0.2.0.ebuild:
+  set ppc in keywords
+
+  18 Dec 2003; Jason Wever <weeve@gentoo.org> xfce4-showdesktop-0.2.0.ebuild:
+  Marked stable on sparc.
+
+*xfce4-showdesktop-0.3.0 (09 Nov 2003)
+
+  09 Nov 2003; Brad Cowan <bcowan@gentoo.org> xfce4-showdesktop-0.3.0.ebuild:
+  Version bump.
+
+*xfce4-showdesktop-0.2.0 (10 Oct 2003)
+
+  16 Nov 2003; Guy Martin <gmsoft@gentoo.org> xfce4-showdesktop-0.2.0.ebuild :
+  Added hppa to KEYWORDS.
+
+  10 Oct 2003; Brad Cowan <bcowan@gentoo.org> xfce4-showdesktop-0.2.0.ebuild:
+  Version Bump.
+
+*xfce4-showdesktop-0.1.9 (25 Sep 2003)
+
+  25 Sep 2003; Brad Cowan <bcowan@gentoo.org> xfce4-showdesktop-0.1.9.ebuild:
+  Version bump.
 
 *xfce4-showdesktop-0.1.1 (15 Aug 2003)
 
diff --git a/xfce-extra/xfce4-showdesktop/Manifest b/xfce-extra/xfce4-showdesktop/Manifest
index 24efbe3f9fc7..6217a7a896f1 100644
--- a/xfce-extra/xfce4-showdesktop/Manifest
+++ b/xfce-extra/xfce4-showdesktop/Manifest
@@ -1,3 +1,6 @@
-MD5 8937be0acfc14b51484c525ab39324e4 xfce4-showdesktop-0.1.1.ebuild 851
-MD5 edaa0e66354ec500951ec64374939dbc ChangeLog 375
-MD5 f8d8d5696a40cb0b41cdd2f7f6e201f2 files/digest-xfce4-showdesktop-0.1.1 82
+MD5 eba778e5c19a91b4682617ac0aef3888 xfce4-showdesktop-0.4.0-r1.ebuild 427
+MD5 c5790e6fc19ba2d0299db8b6487e8430 xfce4-showdesktop-0.4.0-r2.ebuild 420
+MD5 40085a59c47065e7acfa5cc3e0af044c ChangeLog 2827
+MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+MD5 357a04cf01b83e869c015c8be2e161ca files/digest-xfce4-showdesktop-0.4.0-r1 82
+MD5 357a04cf01b83e869c015c8be2e161ca files/digest-xfce4-showdesktop-0.4.0-r2 82
diff --git a/xfce-extra/xfce4-showdesktop/xfce4-showdesktop-0.4.0-r1.ebuild b/xfce-extra/xfce4-showdesktop/xfce4-showdesktop-0.4.0-r1.ebuild
index c5b079594b48..a90a843ee418 100644
--- a/xfce-extra/xfce4-showdesktop/xfce4-showdesktop-0.4.0-r1.ebuild
+++ b/xfce-extra/xfce4-showdesktop/xfce4-showdesktop-0.4.0-r1.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/xfce-extra/xfce4-showdesktop/xfce4-showdesktop-0.4.0-r1.ebuild,v 1.1 2005/01/06 23:41:11 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-showdesktop/xfce4-showdesktop-0.4.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:39:01 chriswhite Exp $
 
 DESCRIPTION="Xfce4 panel plugin to hide/show desktop"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 
 GOODIES_PLUGIN=1
 XFCE_S=${WORKDIR}/${PN}-plugin
 
-inherit xfce4
\ No newline at end of file
+inherit xfce4
diff --git a/xfce-extra/xfce4-showdesktop/xfce4-showdesktop-0.4.0-r2.ebuild b/xfce-extra/xfce4-showdesktop/xfce4-showdesktop-0.4.0-r2.ebuild
index 6cea84054d4f..e5a2d6fc94ba 100644
--- a/xfce-extra/xfce4-showdesktop/xfce4-showdesktop-0.4.0-r2.ebuild
+++ b/xfce-extra/xfce4-showdesktop/xfce4-showdesktop-0.4.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/xfce-extra/xfce4-showdesktop/xfce4-showdesktop-0.4.0-r2.ebuild,v 1.1 2005/10/06 17:45:31 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-showdesktop/xfce4-showdesktop-0.4.0-r2.ebuild,v 1.1.1.1 2005/11/30 09:39:01 chriswhite Exp $
 
 inherit xfce42
 
diff --git a/xfce-extra/xfce4-systemload/ChangeLog b/xfce-extra/xfce4-systemload/ChangeLog
index 8b3111d8ead1..0bd7f7b656e7 100644
--- a/xfce-extra/xfce4-systemload/ChangeLog
+++ b/xfce-extra/xfce4-systemload/ChangeLog
@@ -1,6 +1,89 @@
 # ChangeLog for xfce-extra/xfce4-systemload
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-systemload/ChangeLog,v 1.1 2003/07/15 18:41:24 bcowan Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-systemload/ChangeLog,v 1.1.1.1 2005/11/30 09:38:57 chriswhite Exp $
+
+*xfce4-systemload-0.3.6-r1 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-systemload-0.3.6-r1.ebuild:
+  Xfce builds for new eclass and modular Xorg.
+
+  07 Jul 2005; Daniel Ostrow <dostrow@gentoo.org>
+  xfce4-systemload-0.3.4-r1.ebuild:
+  Stable on ppc and ppc64.
+
+  18 Jun 2005; Markus Rothe <corsair@gentoo.org>
+  xfce4-systemload-0.3.6.ebuild:
+  Stable on ppc64
+
+  13 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
+  xfce4-systemload-0.3.6.ebuild:
+  Stable on alpha.
+
+  31 Jan 2005; lanius@gentoo.org xfce4-systemload-0.3.6.ebuild:
+  stable on amd64
+
+  29 Jan 2005; Lars Weiler <pylon@gentoo.org> xfce4-systemload-0.3.6.ebuild:
+  Stable on ppc.
+
+  24 Jan 2005; Guy Martin <gmsoft@gentoo.org> xfce4-systemload-0.3.6.ebuild:
+  Stable on hppa.
+
+*xfce4-systemload-0.3.6 (19 Jan 2005)
+
+  19 Jan 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-systemload-0.3.6.ebuild:
+  Version bump.
+
+*xfce4-systemload-0.3.4-r1 (06 Jan 2005)
+
+  06 Jan 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-systemload-0.3.4-r1.ebuild:
+  Updated to use Xfce4 eclass.
+
+  18 Sep 2004; Tom Gall <tgall@gentoo.org> xfce4-systemload-0.3.4.ebuild:
+  stable on ppc64, bug #57744
+
+  05 Apr 2004; Guy Martin <gmsoft@gentoo.org> xfce4-systemload-0.3.4.ebuild:
+  Marked stable on hppa.
+
+  09 Mar 2004; <agriffis@gentoo.org> xfce4-systemload-0.3.4.ebuild:
+  stable on alpha and ia64
+
+  08 Mar 2004; Bret Curtis <psi29a@gentoo.org> xfce4-systemload-0.3.4.ebuild:
+  Added ~mips to KEYWORDS
+
+  02 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  xfce4-systemload-0.3.4.ebuild:
+  stable on sparc
+
+  17 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> :
+  manifest fix
+
+  16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org>
+  xfce4-systemload-0.3.2.ebuild:
+  set ppc in keywords
+
+  18 Dec 2003; Jason Wever <weeve@gentoo.org> xfce4-systemload-0.3.2.ebuild:
+  Marked stable on sparc.
+
+*xfce4-systemload-0.3.4 (14 Nov 2003)
+
+  14 Nov 2003; Brad Cowan <bcowan@gentoo.org> xfce4-systemload-0.3.4.ebuild:
+  Version bump.
+
+*xfce4-systemload-0.3.3 (05 Nov 2003)
+
+  05 Nov 2003; Brad Cowan <bcowan@gentoo.org> xfce4-systemload-0.3.3.ebuild:
+  Version bump.
+
+*xfce4-systemload-0.3.2 (22 Jul 2003)
+
+  16 Nov 2003; Guy Martin <gmsoft@gentoo.org> xfce4-systemload-0.3.2.ebuild :
+  Added hppa to KEYWORDS.
+
+  22 Jul 2003; Brad Cowan <bcowan@gentoo.org> xfce4-systemload-0.3.2.ebuild:
+  Version bump.
 
 *xfce4-systemload-0.3.0 (15 Jul 2003)
 
diff --git a/xfce-extra/xfce4-systemload/Manifest b/xfce-extra/xfce4-systemload/Manifest
index 10cfcbf3bf1c..ea50d487af72 100644
--- a/xfce-extra/xfce4-systemload/Manifest
+++ b/xfce-extra/xfce4-systemload/Manifest
@@ -1,2 +1,8 @@
-MD5 188362ee7980271139ad89219619a72e xfce4-systemload-0.3.0.ebuild 874
-MD5 628c814c988a403f8b777cd367d3ec54 files/digest-xfce4-systemload-0.3.0 82
+MD5 9f8432aa6a0bca69d46dbf4f3add5111 xfce4-systemload-0.3.6.ebuild 376
+MD5 b1332ae613231fd474e063af1a09ca50 xfce4-systemload-0.3.4-r1.ebuild 385
+MD5 c480aca776f94b2c4a39542044922e97 xfce4-systemload-0.3.6-r1.ebuild 386
+MD5 89f5fbfb7d5200252ac22a3d283d48e6 ChangeLog 2729
+MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+MD5 640f6545d16ee55ffa3a3809d0031a89 files/digest-xfce4-systemload-0.3.4-r1 81
+MD5 dfcfaa61f1dcb4d4cb35472a00634f72 files/digest-xfce4-systemload-0.3.6-r1 81
+MD5 dfcfaa61f1dcb4d4cb35472a00634f72 files/digest-xfce4-systemload-0.3.6 81
diff --git a/xfce-extra/xfce4-systemload/xfce4-systemload-0.3.4-r1.ebuild b/xfce-extra/xfce4-systemload/xfce4-systemload-0.3.4-r1.ebuild
index 4c382002e167..465c09843a03 100644
--- a/xfce-extra/xfce4-systemload/xfce4-systemload-0.3.4-r1.ebuild
+++ b/xfce-extra/xfce4-systemload/xfce4-systemload-0.3.4-r1.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/xfce-extra/xfce4-systemload/xfce4-systemload-0.3.4-r1.ebuild,v 1.1 2005/01/06 23:41:11 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-systemload/xfce4-systemload-0.3.4-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:57 chriswhite Exp $
 
 DESCRIPTION="Xfce system load monitor"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86"
 
 GOODIES_PLUGIN=1
 
diff --git a/xfce-extra/xfce4-systemload/xfce4-systemload-0.3.6-r1.ebuild b/xfce-extra/xfce4-systemload/xfce4-systemload-0.3.6-r1.ebuild
index 347940485045..9443604d5112 100644
--- a/xfce-extra/xfce4-systemload/xfce4-systemload-0.3.6-r1.ebuild
+++ b/xfce-extra/xfce4-systemload/xfce4-systemload-0.3.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/xfce-extra/xfce4-systemload/xfce4-systemload-0.3.6-r1.ebuild,v 1.1 2005/10/06 17:46:53 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-systemload/xfce4-systemload-0.3.6-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:57 chriswhite Exp $
 
 inherit xfce42
 
diff --git a/xfce-extra/xfce4-systemload/xfce4-systemload-0.3.6.ebuild b/xfce-extra/xfce4-systemload/xfce4-systemload-0.3.6.ebuild
index fc949e743181..3fde8ad6433c 100644
--- a/xfce-extra/xfce4-systemload/xfce4-systemload-0.3.6.ebuild
+++ b/xfce-extra/xfce4-systemload/xfce4-systemload-0.3.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/xfce-extra/xfce4-systemload/xfce4-systemload-0.3.6.ebuild,v 1.1 2005/01/19 20:48:11 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-systemload/xfce4-systemload-0.3.6.ebuild,v 1.1.1.1 2005/11/30 09:38:57 chriswhite Exp $
 
 DESCRIPTION="Xfce system load monitor"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 
 GOODIES_PLUGIN=1
 
-inherit xfce4
\ No newline at end of file
+inherit xfce4
diff --git a/xfce-extra/xfce4-systray/ChangeLog b/xfce-extra/xfce4-systray/ChangeLog
index 9339d48e2a33..0a65e3ec9091 100644
--- a/xfce-extra/xfce4-systray/ChangeLog
+++ b/xfce-extra/xfce4-systray/ChangeLog
@@ -1,6 +1,226 @@
-# ChangeLog for x11-misc/xfce4-systray
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-systray/ChangeLog,v 1.1 2003/07/15 05:25:00 bcowan Exp $
+# ChangeLog for xfce-extra/xfce4-systray
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-systray/ChangeLog,v 1.1.1.1 2005/11/30 09:38:59 chriswhite Exp $
+
+*xfce4-systray-4.2.2-r1 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-systray-4.2.2-r1.ebuild:
+  Xfce builds for new eclass and modular Xorg.
+
+  12 Jul 2005; Simon Stelling <blubb@gentoo.org> xfce4-systray-4.2.2.ebuild:
+  stable on amd64
+
+  11 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  xfce4-systray-4.2.2.ebuild:
+  Stable on alpha + ia64.
+
+  11 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  xfce4-systray-4.2.2.ebuild:
+  Stable on hppa.
+
+  08 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  xfce4-systray-4.2.2.ebuild:
+  Stable on sparc
+
+  07 Jul 2005; Daniel Ostrow <dostrow@gentoo.org>
+  xfce4-systray-4.2.2.ebuild:
+  Stable on ppc and ppc64.
+
+  15 Jun 2005; Markus Rothe <corsair@gentoo.org> xfce4-systray-4.2.0.ebuild:
+  Stable on ppc64
+
+*xfce4-systray-4.2.2 (18 May 2005)
+
+  18 May 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-systray-4.2.2.ebuild:
+  4.2.2 bugfix release of Xfce 4.
+
+  23 Mar 2005; Daniel Ostrow <dostrow@gentoo.org> xfce4-systray-4.2.1.ebuild:
+  Version bump and associated fixes.
+
+*xfce4-systray-4.2.1 (17 Mar 2005)
+
+  17 Mar 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-systray-4.2.1.ebuild:
+  Bugfix release of Xfce4.
+
+  09 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
+  xfce4-systray-4.2.0.ebuild:
+  Stable on alpha.
+
+  31 Jan 2005; lanius@gentoo.org xfce4-systray-4.2.0.ebuild:
+  stable on amd64
+
+  29 Jan 2005; Lars Weiler <pylon@gentoo.org> xfce4-systray-4.2.0.ebuild:
+  Stable on ppc.
+
+  24 Jan 2005; Guy Martin <gmsoft@gentoo.org> xfce4-systray-4.2.0.ebuild:
+  Stable on hppa.
+
+*xfce4-systray-4.2.0 (16 Jan 2005)
+
+  16 Jan 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-systray-4.2.0.ebuild:
+  4.2 final release of Xfce4.
+
+*xfce4-systray-4.1.99.3-r1 (06 Jan 2005)
+
+  06 Jan 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-systray-4.1.99.3-r1.ebuild:
+  Updated to use Xfce4 eclass.
+
+  03 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*xfce4-systray-4.1.99.3 (02 Jan 2005)
+
+  02 Jan 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-systray-4.1.99.3.ebuild:
+  Version bump to RC version of 4.2 release.
+
+*xfce4-systray-4.1.99.2 (13 Dec 2004)
+
+  13 Dec 2004; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-systray-4.1.99.2.ebuild:
+  Version bump for beta version of 4.2 release.
+
+*xfce4-systray-4.1.99.1 (25 Nov 2004)
+
+  25 Nov 2004; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-systray-4.1.99.1.ebuild:
+  Version bump for beta version of 4.2 release.
+
+*xfce4-systray-4.1.91 (31 Oct 2004)
+
+  31 Oct 2004; Brad Cowan <bcowan@gentoo.org> +xfce4-systray-4.1.91.ebuild:
+  Version bump of beta version of 4.2 release.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org>
+  xfce4-systray-4.0.6.ebuild:
+  Stable on amd64.
+
+*xfce4-systray-4.1.90 (04 Oct 2004)
+
+  04 Oct 2004; Brad Cowan <bcowan@gentoo.org> +xfce4-systray-4.1.90.ebuild:
+  Beta version of new 4.2 release. Contains too numerous improvements to list.
+
+  18 Sep 2004; Tom Gall <tgall@gentoo.org> xfce4-systray-4.0.6.ebuild:
+  stable on ppc64, bug #57744
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  xfce4-systray-4.0.6.ebuild:
+  Masked xfce4-systray-4.0.6.ebuild stable for ppc
+
+  07 Aug 2004; Bryan Østergaard <kloeri@gentoo.org>
+  xfce4-systray-4.0.6.ebuild:
+  Stable on alpha.
+
+  06 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  xfce4-systray-4.0.6.ebuild:
+  Stable on sparc
+
+  06 Aug 2004; Guy Martin <gmsoft@gentoo.org> xfce4-systray-4.0.6.ebuild:
+  Stable on hppa.
+
+*xfce4-systray-4.0.6 (12 Jul 2004)
+
+  12 Jul 2004; Brad Cowan <bcowan@gentoo.org> +xfce4-systray-4.0.6.ebuild:
+  Version bump. Bugfix release on stable branch that fixes cropped icons with
+  gtk-2.4 along with many others.
+
+  23 Jun 2004; <malc@gentoo.org> xfce4-systray-4.0.5.ebuild:
+  Mark stable on amd64
+
+  19 May 2004; Guy Martin <gmsoft@gentoo.org> xfce4-systray-4.0.5.ebuild:
+  Marked stable on hppa
+
+  03 May 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  xfce4-systray-4.0.5.ebuild:
+  Stable on sparc
+
+  20 Apr 2004; Aron Griffis <agriffis@gentoo.org> xfce4-systray-4.0.4.ebuild:
+  Stable on alpha and ia64
+
+*xfce4-systray-4.0.5 (18 Apr 2004)
+
+  18 Apr 2004; Brad Cowan <bcowan@gentoo.org> xfce4-systray-4.0.5.ebuild:
+  Bugfix release of xfce4.
+
+  17 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> xfce4-systray-4.0.0.ebuild,
+  xfce4-systray-4.0.1.ebuild, xfce4-systray-4.0.2.ebuild,
+  xfce4-systray-4.0.3.ebuild, xfce4-systray-4.0.4.ebuild:
+  Removed S=
+
+  05 Apr 2004; Guy Martin <gmsoft@gentoo.org> xfce4-systray-4.0.4.ebuild:
+  Marked stable on hppa.
+
+  16 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  xfce4-systray-4.0.4.ebuild:
+  stable on sparc
+
+*xfce4-systray-4.0.4 (10 Mar 2004)
+
+  10 Mar 2004; Brad Cowan <bcowan@gentoo.org> xfce4-systray-4.0.4.ebuild:
+  Bugfix release of xfce4.
+
+  09 Mar 2004; <agriffis@gentoo.org> xfce4-systray-4.0.3.ebuild:
+  stable on alpha and ia64
+
+  08 Mar 2004; Bret Curtis <psi29a@gentoo.org> xfce4-systray-4.0.3.ebuild:
+  Added ~mips to KEYWORDS
+
+  02 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  xfce4-systray-4.0.3.ebuild:
+  stable on sparc
+
+  17 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> :
+  manifest fix
+
+  16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org>
+  xfce4-systray-4.0.1.ebuild:
+  set ppc in keywords
+
+*xfce4-systray-4.0.3 (09 Jan 2004)
+
+  09 Jan 2004; Brad Cowan <bcowan@gentoo.org> xfce4-systray-4.0.3.ebuild:
+  Bugfix release of xfce4. Fixes memory leak and adds kde systray support
+
+*xfce4-systray-4.0.2 (24 Dec 2003)
+
+  24 Dec 2003; Brad Cowan <bcowan@gentoo.org> xfce4-systray-4.0.2.ebuild:
+  bugfix release of xfce4.
+
+  18 Dec 2003; Jason Wever <weeve@gentoo.org> xfce4-systray-4.0.1.ebuild:
+  Marked stable on sparc.
+
+  18 Dec 2003; Guy Martin <gmsoft@gentoo.org> xfce4-systray-4.0.1.ebuild:
+  Marked stable on hppa.
+
+*xfce4-systray-4.0.1 (12 Nov 2003)
+
+  12 Nov 2003; Brad Cowan <bcowan@gentoo.org> xfce4-systray-4.0.1.ebuild:
+  bugfix release of xfce4.
+
+*xfce4-systray-4.0.0 (25 Sep 2003)
+
+  16 Nov 2003; Guy Martin <gmsoft@gentoo.org> xfce4-systray-4.0.0.ebuild :
+  Added hppa to KEYWORDS.
+
+  25 Sep 2003; Brad Cowan <bcowan@gentoo.org> xfce4-systray-4.0.0.ebuild:
+  First official release of xfce4.
+
+*xfce4-systray-3.99.4 (12 Sep 2003)
+
+  12 Sep 2003; Brad Cowan <bcowan@gentoo.org> xfce4-systray-3.99.4.ebuild:
+  Version bump.
+
+*xfce4-systray-3.99.3 (03 Sep 2003)
+
+  03 Sep 2003; Brad Cowan <bcowan@gentoo.org> xfce4-systray-3.99.3.ebuild:
+  Version bump.
+
+*xfce4-systray-3.99.2 (22 Jul 2003)
+
+  22 Jul 2003; Brad Cowan <bcowan@gentoo.org> xfce4-systray-3.99.2.ebuild:
+  Version bump.
 
 *xfce4-systray-3.99.1 (15 Jul 2003)
 
diff --git a/xfce-extra/xfce4-systray/Manifest b/xfce-extra/xfce4-systray/Manifest
index 782fd8cf934b..dc67da2a2a63 100644
--- a/xfce-extra/xfce4-systray/Manifest
+++ b/xfce-extra/xfce4-systray/Manifest
@@ -1,2 +1,8 @@
-MD5 257aab0c724578bc497d84148720de3e xfce4-systray-3.99.1.ebuild 857
-MD5 17377e3b21d8dadc7736269b3689035e files/digest-xfce4-systray-3.99.1 72
+MD5 a7466a11d8acb482e674e2468f649a77 xfce4-systray-4.2.1.ebuild 398
+MD5 b9dcc84bffd08594913efcc003654f23 xfce4-systray-4.2.2.ebuild 385
+MD5 c745e9dbeea89ba03b0e993974452b00 ChangeLog 7037
+MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+MD5 9c45512c5e5d558053cbb2442e472c71 xfce4-systray-4.2.2-r1.ebuild 412
+MD5 0aa5db9678036981185253b94aeec8c7 files/digest-xfce4-systray-4.2.1 71
+MD5 752f77ba62486a16f4c5ccf533c6ac1d files/digest-xfce4-systray-4.2.2 71
+MD5 752f77ba62486a16f4c5ccf533c6ac1d files/digest-xfce4-systray-4.2.2-r1 71
diff --git a/xfce-extra/xfce4-systray/xfce4-systray-4.2.1.ebuild b/xfce-extra/xfce4-systray/xfce4-systray-4.2.1.ebuild
index 9717c52f724b..83f8ce8e6772 100644
--- a/xfce-extra/xfce4-systray/xfce4-systray-4.2.1.ebuild
+++ b/xfce-extra/xfce4-systray/xfce4-systray-4.2.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/xfce-extra/xfce4-systray/xfce4-systray-4.2.1.ebuild,v 1.1 2005/03/17 03:11:59 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-systray/xfce4-systray-4.2.1.ebuild,v 1.1.1.1 2005/11/30 09:38:59 chriswhite Exp $
 
 DESCRIPTION="Xfce 4 system tray"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
-RDEPEND=">=xfce-base/xfce4-panel-${PV}"
+RDEPEND=">=xfce-base/xfce4-panel-4.2.1.1"
 
-inherit xfce4
\ No newline at end of file
+inherit xfce4
diff --git a/xfce-extra/xfce4-systray/xfce4-systray-4.2.2-r1.ebuild b/xfce-extra/xfce4-systray/xfce4-systray-4.2.2-r1.ebuild
index ad65da09895f..e13330160254 100644
--- a/xfce-extra/xfce4-systray/xfce4-systray-4.2.2-r1.ebuild
+++ b/xfce-extra/xfce4-systray/xfce4-systray-4.2.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/xfce-extra/xfce4-systray/xfce4-systray-4.2.2-r1.ebuild,v 1.1 2005/10/06 06:53:32 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-systray/xfce4-systray-4.2.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:59 chriswhite Exp $
 
 inherit xfce42
 
diff --git a/xfce-extra/xfce4-systray/xfce4-systray-4.2.2.ebuild b/xfce-extra/xfce4-systray/xfce4-systray-4.2.2.ebuild
index f7dff12c4ae7..ac240ac168c3 100644
--- a/xfce-extra/xfce4-systray/xfce4-systray-4.2.2.ebuild
+++ b/xfce-extra/xfce4-systray/xfce4-systray-4.2.2.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/xfce-extra/xfce4-systray/xfce4-systray-4.2.2.ebuild,v 1.1 2005/05/18 03:07:00 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-systray/xfce4-systray-4.2.2.ebuild,v 1.1.1.1 2005/11/30 09:38:59 chriswhite Exp $
 
 DESCRIPTION="Xfce 4 system tray"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 
-RDEPEND=">=xfce-base/xfce4-panel-4.2.1.1"
+RDEPEND=">=xfce-base/xfce4-panel-${PV}"
 
 inherit xfce4
diff --git a/xfce-extra/xfce4-taskbar/ChangeLog b/xfce-extra/xfce4-taskbar/ChangeLog
index 37e6358b8795..16e566276b2f 100644
--- a/xfce-extra/xfce4-taskbar/ChangeLog
+++ b/xfce-extra/xfce4-taskbar/ChangeLog
@@ -1,6 +1,41 @@
 # ChangeLog for xfce-extra/xfce4-taskbar
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-taskbar/ChangeLog,v 1.1 2004/09/20 17:06:02 bcowan Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-taskbar/ChangeLog,v 1.1.1.1 2005/11/30 09:38:59 chriswhite Exp $
+
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org>
+  xfce4-taskbar-0.2.2-r1.ebuild:
+  Mark 0.2.2-r1 stable on alpha
+
+*xfce4-taskbar-0.2.2-r2 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-taskbar-0.2.2-r2.ebuild:
+  Xfce builds for new eclass and modular Xorg.
+
+  07 Jul 2005; Daniel Ostrow <dostrow@gentoo.org>
+  xfce4-taskbar-0.2.2-r1.ebuild:
+  Stable on ppc64.
+
+  12 Jun 2005; Sven Wegener <swegener@gentoo.org>
+  xfce4-taskbar-0.2.2.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  31 Jan 2005; lanius@gentoo.org xfce4-taskbar-0.2.2-r1.ebuild:
+  stable on amd64
+
+  29 Jan 2005; Lars Weiler <pylon@gentoo.org> xfce4-taskbar-0.2.2-r1.ebuild:
+  Stable on ppc.
+
+*xfce4-taskbar-0.2.2-r1 (06 Jan 2005)
+
+  06 Jan 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-taskbar-0.2.2-r1.ebuild:
+  Updated to use Xfce4 eclass.
+
+*xfce4-taskbar-0.2.2 (24 Oct 2004)
+
+  24 Oct 2004; Brad Cowan <bcowan@gentoo.org> +xfce4-taskbar-0.2.2.ebuild:
+  Version bump.
 
 *xfce4-taskbar-0.1.0 (20 Sep 2004)
 
diff --git a/xfce-extra/xfce4-taskbar/Manifest b/xfce-extra/xfce4-taskbar/Manifest
index 7a575c1a26e5..1b40a10446ec 100644
--- a/xfce-extra/xfce4-taskbar/Manifest
+++ b/xfce-extra/xfce4-taskbar/Manifest
@@ -1,2 +1,16 @@
-MD5 f077a8925a03bfe61894702eec015e77 xfce4-taskbar-0.1.0.ebuild 725
-MD5 a8cfc3025b979736815bd89d43f815e0 files/digest-xfce4-taskbar-0.1.0 78
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+MD5 136af3ce7e16ae7a9dfa20867f973b7f ChangeLog 1349
+MD5 7ae16d31f173f4d4f3b4f842f484f070 xfce4-taskbar-0.2.2-r2.ebuild 382
+MD5 eec629628795db723c3f0fff6bf12d92 xfce4-taskbar-0.2.2-r1.ebuild 376
+MD5 78a9b99c33be4401990751c6d16d70db files/digest-xfce4-taskbar-0.2.2-r2 78
+MD5 78a9b99c33be4401990751c6d16d70db files/digest-xfce4-taskbar-0.2.2-r1 78
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDVRQeJrHF4yAQTrARAtw2AKC6p6A5yVvFg351lvYvzN3d231t5ACgufyv
+4FP8aTzi0Yhxdrx1PZiOhz0=
+=8VDN
+-----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-taskbar/xfce4-taskbar-0.2.2-r1.ebuild b/xfce-extra/xfce4-taskbar/xfce4-taskbar-0.2.2-r1.ebuild
index ff74913d48c3..2f3cdc3de373 100644
--- a/xfce-extra/xfce4-taskbar/xfce4-taskbar-0.2.2-r1.ebuild
+++ b/xfce-extra/xfce4-taskbar/xfce4-taskbar-0.2.2-r1.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/xfce-extra/xfce4-taskbar/xfce4-taskbar-0.2.2-r1.ebuild,v 1.1 2005/01/06 23:41:11 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-taskbar/xfce4-taskbar-0.2.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:59 chriswhite Exp $
 
 DESCRIPTION="Xfce4 panel taskbar plugin"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 
 GOODIES_PLUGIN=1
 
-inherit xfce4
\ No newline at end of file
+inherit xfce4
diff --git a/xfce-extra/xfce4-taskbar/xfce4-taskbar-0.2.2-r2.ebuild b/xfce-extra/xfce4-taskbar/xfce4-taskbar-0.2.2-r2.ebuild
index 3b4f9f409126..505abe32d8b6 100644
--- a/xfce-extra/xfce4-taskbar/xfce4-taskbar-0.2.2-r2.ebuild
+++ b/xfce-extra/xfce4-taskbar/xfce4-taskbar-0.2.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/xfce-extra/xfce4-taskbar/xfce4-taskbar-0.2.2-r2.ebuild,v 1.1 2005/10/06 17:48:00 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-taskbar/xfce4-taskbar-0.2.2-r2.ebuild,v 1.1.1.1 2005/11/30 09:38:59 chriswhite Exp $
 
 inherit xfce42
 
diff --git a/xfce-extra/xfce4-taskmanager/ChangeLog b/xfce-extra/xfce4-taskmanager/ChangeLog
index 5752bf4f05b7..68e9a1fdda0e 100644
--- a/xfce-extra/xfce4-taskmanager/ChangeLog
+++ b/xfce-extra/xfce4-taskmanager/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for xfce-extra/xfce4-taskmanager
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-taskmanager/ChangeLog,v 1.1 2005/01/19 20:54:53 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-taskmanager/ChangeLog,v 1.1.1.1 2005/11/30 09:39:00 chriswhite Exp $
+
+*xfce4-taskmanager-0.3.1-r1 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-taskmanager-0.3.1-r1.ebuild:
+  Xfce builds for new eclass and modular Xorg.
+
+*xfce4-taskmanager-0.3.1 (14 Aug 2005)
+
+  14 Aug 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-taskmanager-0.3.1.ebuild:
+  Version bump.
+
+*xfce4-taskmanager-0.2.1 (05 Feb 2005)
+
+  05 Feb 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-taskmanager-0.2.1.ebuild:
+  Version bump.
 
 *xfce4-taskmanager-0.0.1 (19 Jan 2005)
 
diff --git a/xfce-extra/xfce4-taskmanager/Manifest b/xfce-extra/xfce4-taskmanager/Manifest
index e4ffd8b8f0ef..471d8e8f583f 100644
--- a/xfce-extra/xfce4-taskmanager/Manifest
+++ b/xfce-extra/xfce4-taskmanager/Manifest
@@ -1,2 +1,10 @@
-MD5 2d118aa875e9a6a54a5ee57f053b3963 xfce4-taskmanager-0.0.1.ebuild 440
+MD5 601df78515fa30dc804df3c719fb325c xfce4-taskmanager-0.3.1.ebuild 754
+MD5 cbcdad05fb89061346064408155d79aa xfce4-taskmanager-0.0.1.ebuild 424
+MD5 c0cf439fbc8687844aaa5931b40351f9 xfce4-taskmanager-0.3.1-r1.ebuild 373
+MD5 0aa23c42013e41e57b705ead62a405b9 xfce4-taskmanager-0.2.1.ebuild 740
+MD5 2751c2227f25e12c01ca0e27563d58e1 ChangeLog 820
+MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+MD5 4ab513958feabe5453704f2cf03328b9 files/digest-xfce4-taskmanager-0.3.1-r1 75
 MD5 af52e0edd2212b36a154ab86aef7bd0e files/digest-xfce4-taskmanager-0.0.1 75
+MD5 1dc1cb79c47cfcdfdedb5a889f8fd5ea files/digest-xfce4-taskmanager-0.2.1 75
+MD5 4ab513958feabe5453704f2cf03328b9 files/digest-xfce4-taskmanager-0.3.1 75
diff --git a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-0.0.1.ebuild b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-0.0.1.ebuild
index e64b9c6b7a1b..f7a5167c2e54 100644
--- a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-0.0.1.ebuild
+++ b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-0.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/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-0.0.1.ebuild,v 1.1 2005/01/19 20:54:53 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-0.0.1.ebuild,v 1.1.1.1 2005/11/30 09:39:00 chriswhite Exp $
 
 DESCRIPTION="Xfce4 task manager"
 SRC_URI="http://download.berlios.de/xfce-goodies/${P}.tar.gz"
diff --git a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-0.2.1.ebuild b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-0.2.1.ebuild
index 3aa3ee1575a7..615c88f4dd5c 100644
--- a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-0.2.1.ebuild
+++ b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-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/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-0.2.1.ebuild,v 1.1 2005/02/05 05:34:42 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-0.2.1.ebuild,v 1.1.1.1 2005/11/30 09:39:00 chriswhite Exp $
 
 DESCRIPTION="Xfce4 task manager"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
diff --git a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-0.3.1-r1.ebuild b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-0.3.1-r1.ebuild
index 1286e48098a5..acf10b43c4a9 100644
--- a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-0.3.1-r1.ebuild
+++ b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-0.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/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-0.3.1-r1.ebuild,v 1.1 2005/10/06 17:49:10 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-0.3.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:39:00 chriswhite Exp $
 inherit xfce42
 
 DESCRIPTION="Xfce4 task manager"
diff --git a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-0.3.1.ebuild b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-0.3.1.ebuild
index 1e38ef15100f..c7fcd47bb33b 100644
--- a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-0.3.1.ebuild
+++ b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-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/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-0.3.1.ebuild,v 1.1 2005/08/14 20:56:23 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-0.3.1.ebuild,v 1.1.1.1 2005/11/30 09:39:00 chriswhite Exp $
 
 DESCRIPTION="Xfce4 task manager"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
diff --git a/xfce-extra/xfce4-toys/ChangeLog b/xfce-extra/xfce4-toys/ChangeLog
index 6c78dfca24b1..2b9288096c76 100644
--- a/xfce-extra/xfce4-toys/ChangeLog
+++ b/xfce-extra/xfce4-toys/ChangeLog
@@ -1,6 +1,214 @@
-# ChangeLog for x11-misc/xfce4-toys
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-toys/ChangeLog,v 1.1 2003/07/15 05:31:07 bcowan Exp $
+# ChangeLog for xfce-extra/xfce4-toys
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-toys/ChangeLog,v 1.1.1.1 2005/11/30 09:38:58 chriswhite Exp $
+
+*xfce4-toys-4.2.2-r1 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-toys-4.2.2-r1.ebuild:
+  Xfce builds for new eclass and modular Xorg.
+
+  12 Jul 2005; Simon Stelling <blubb@gentoo.org> xfce4-toys-4.2.2.ebuild:
+  stable on amd64
+
+  11 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  xfce4-toys-4.2.2.ebuild:
+  Stable on alpha + ia64.
+
+  11 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  xfce4-toys-4.2.2.ebuild:
+  Stable on hppa.
+
+  08 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  xfce4-toys-4.2.2.ebuild:
+  Stable on sparc
+
+  07 Jul 2005; Daniel Ostrow <dostrow@gentoo.org> xfce4-toys-4.2.2.ebuild:
+  Stable on ppc and ppc64.
+
+  15 Jun 2005; Markus Rothe <corsair@gentoo.org> xfce4-toys-4.2.0.ebuild:
+  Stable on ppc64
+
+*xfce4-toys-4.2.2 (18 May 2005)
+
+  18 May 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-toys-4.2.2.ebuild:
+  4.2.2 bugfix release of Xfce 4.
+
+  23 Mar 2005; Daniel Ostrow <dostrow@gentoo.org> xfce4-toys-4.2.1.ebuild:
+  Version bump and associated fixes.
+
+*xfce4-toys-4.2.1 (17 Mar 2005)
+
+  17 Mar 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-toys-4.2.1.ebuild:
+  Bugfix release of Xfce4.
+
+  09 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
+  xfce4-toys-4.2.0.ebuild:
+  Stable on alpha.
+
+  31 Jan 2005; lanius@gentoo.org xfce4-toys-4.2.0.ebuild:
+  stable on amd64
+
+  29 Jan 2005; Lars Weiler <pylon@gentoo.org> xfce4-toys-4.2.0.ebuild:
+  Stable on ppc.
+
+  24 Jan 2005; Guy Martin <gmsoft@gentoo.org> xfce4-toys-4.2.0.ebuild:
+  Stable on hppa.
+
+*xfce4-toys-4.2.0 (16 Jan 2005)
+
+  16 Jan 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-toys-4.2.0.ebuild:
+  4.2 final release of Xfce4.
+
+*xfce4-toys-4.1.99.3-r1 (06 Jan 2005)
+
+  06 Jan 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-toys-4.1.99.3-r1.ebuild:
+  Updated to use Xfce4 eclass.
+
+  03 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*xfce4-toys-4.1.99.3 (02 Jan 2005)
+
+  02 Jan 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-toys-4.1.99.3.ebuild:
+  Version bump to RC version of 4.2 release.
+
+*xfce4-toys-4.1.99.2 (13 Dec 2004)
+
+  13 Dec 2004; Brad Cowan <bcowan@gentoo.org> +xfce4-toys-4.1.99.2.ebuild:
+  Version bump for beta version of 4.2 release.
+
+*xfce4-toys-4.1.99.1 (25 Nov 2004)
+
+  25 Nov 2004; Brad Cowan <bcowan@gentoo.org> +xfce4-toys-4.1.99.1.ebuild:
+  Version bump for beta version of 4.2 release.
+
+*xfce4-toys-4.1.91 (31 Oct 2004)
+
+  31 Oct 2004; Brad Cowan <bcowan@gentoo.org> +xfce4-toys-4.1.91.ebuild:
+  Version bump of beta version of 4.2 release.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> xfce4-toys-4.0.6.ebuild:
+  Stable on amd64.
+
+*xfce4-toys-4.1.90 (04 Oct 2004)
+
+  04 Oct 2004; Brad Cowan <bcowan@gentoo.org> +xfce4-toys-4.1.90.ebuild:
+  Beta version of new 4.2 release. Contains too numerous improvements to list.
+
+  18 Sep 2004; Tom Gall <tgall@gentoo.org> xfce4-toys-4.0.6.ebuild:
+  Stable on ppc64, bug #57744
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  xfce4-toys-4.0.6.ebuild:
+  Masked xfce4-toys-4.0.6.ebuild stable for ppc
+
+  07 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> xfce4-toys-4.0.6.ebuild:
+  Stable on alpha.
+
+  06 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> xfce4-toys-4.0.6.ebuild:
+  Stable on sparc
+
+  06 Aug 2004; Guy Martin <gmsoft@gentoo.org> xfce4-toys-4.0.6.ebuild:
+  Stable on hppa.
+
+*xfce4-toys-4.0.6 (12 Jul 2004)
+
+  12 Jul 2004; Brad Cowan <bcowan@gentoo.org> +xfce4-toys-4.0.6.ebuild:
+  Version bump. Bugfix release on stable branch that fixes cropped icons with
+  gtk-2.4 along with many others.
+
+  23 Jun 2004; <malc@gentoo.org> xfce4-toys-4.0.5.ebuild:
+  Mark stable on amd64
+
+  19 May 2004; Guy Martin <gmsoft@gentoo.org> xfce4-toys-4.0.5.ebuild:
+  Marked stable on hppa
+
+  03 May 2004; Gustavo Zacarias <gustavoz@gentoo.org> xfce4-toys-4.0.5.ebuild:
+  Stable on sparc
+
+  20 Apr 2004; Aron Griffis <agriffis@gentoo.org> xfce4-toys-4.0.4.ebuild:
+  Stable on alpha and ia64
+
+*xfce4-toys-4.0.5 (18 Apr 2004)
+
+  18 Apr 2004; Brad Cowan <bcowan@gentoo.org> xfce4-toys-4.0.5.ebuild:
+  Bugfix release of xfce4.
+
+  17 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> xfce4-toys-4.0.0.ebuild,
+  xfce4-toys-4.0.1.ebuild, xfce4-toys-4.0.2.ebuild, xfce4-toys-4.0.3.ebuild,
+  xfce4-toys-4.0.4.ebuild:
+  Removed S=
+
+  05 Apr 2004; Guy Martin <gmsoft@gentoo.org> xfce4-toys-4.0.4.ebuild:
+  Marked stable on hppa.
+
+  16 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org> xfce4-toys-4.0.4.ebuild:
+  stable on sparc
+
+*xfce4-toys-4.0.4 (10 Mar 2004)
+
+  10 Mar 2004; Brad Cowan <bcowan@gentoo.org> xfce4-toys-4.0.4.ebuild:
+  Bugfix release of xfce4.
+
+  09 Mar 2004; <agriffis@gentoo.org> xfce4-toys-4.0.3.ebuild:
+  stable on alpha and ia64
+
+  08 Mar 2004; Bret Curtis <psi29a@gentoo.org> xfce4-toys-4.0.3.ebuild:
+  Added ~mips to KEYWORDS
+
+  02 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org> xfce4-toys-4.0.3.ebuild:
+  stable on sparc
+
+  17 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> :
+  manifest fix
+
+  16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> xfce4-toys-4.0.1.ebuild:
+  set ppc in keywords
+
+*xfce4-toys-4.0.3 (09 Jan 2004)
+
+  09 Jan 2004; Brad Cowan <bcowan@gentoo.org> xfce4-toys-4.0.3.ebuild:
+  Bugfix release of xfce4. Fixes memory leak and adds kde systray support
+
+*xfce4-toys-4.0.2 (24 Dec 2003)
+
+  24 Dec 2003; Brad Cowan <bcowan@gentoo.org> xfce4-toys-4.0.2.ebuild:
+  bugfix release of xfce4.
+
+  18 Dec 2003; Jason Wever <weeve@gentoo.org> xfce4-toys-4.0.1.ebuild:
+  Marked stable on sparc.
+
+  18 Dec 2003; Guy Martin <gmsoft@gentoo.org> xfce4-toys-4.0.1.ebuild:
+  Marked stable on hppa.
+
+*xfce4-toys-4.0.1 (12 Nov 2003)
+
+  12 Nov 2003; Brad Cowan <bcowan@gentoo.org> xfce4-toys-4.0.1.ebuild:
+  bugfix release of xfce4.
+
+*xfce4-toys-4.0.0 (25 Sep 2003)
+
+  16 Nov 2003; Guy Martin <gmsoft@gentoo.org> xfce4-toys-4.0.0.ebuild :
+  Added hppa to KEYWORDS.
+
+  25 Sep 2003; Brad Cowan <bcowan@gentoo.org> xfce4-toys-4.0.0.ebuild:
+  First official release of xfce4.
+
+*xfce4-toys-3.99.4 (12 Sep 2003)
+
+  12 Sep 2003; Brad Cowan <bcowan@gentoo.org> xfce4-toys-3.99.4.ebuild:
+  Version bump.
+
+*xfce4-toys-3.99.3 (03 Sep 2003)
+
+  03 Sep 2003; Brad Cowan <bcowan@gentoo.org> xfce4-toys-3.99.3.ebuild:
+  Version bump.
+
+*xfce4-toys-3.99.2 (22 Jul 2003)
+
+  22 Jul 2003; Brad Cowan <bcowan@gentoo.org> xfce4-toys-3.99.2.ebuild:
+  Version bump.
 
 *xfce4-toys-3.99.1 (15 Jul 2003)
 
diff --git a/xfce-extra/xfce4-toys/Manifest b/xfce-extra/xfce4-toys/Manifest
index f4d1f8ffa8ac..fe60f33a1936 100644
--- a/xfce-extra/xfce4-toys/Manifest
+++ b/xfce-extra/xfce4-toys/Manifest
@@ -1,3 +1,8 @@
-MD5 7973cdb21ddf75e4b32ed18901e815a9 ChangeLog 343
-MD5 cacb3382b10c8b26e78c04e439ac509b xfce4-toys-3.99.1.ebuild 881
-MD5 14ed7d4b068eaf2fca2b0a44e4950f37 files/digest-xfce4-toys-3.99.1 69
+MD5 444168491470ba2df4b5cff78e39601a xfce4-toys-4.2.2.ebuild 384
+MD5 9ba380b3d2722c86691e6f4fca07e34b xfce4-toys-4.2.2-r1.ebuild 485
+MD5 a20cb781d9fa04b1930bb571c002d48c xfce4-toys-4.2.1.ebuild 397
+MD5 08f5271f192e247b1deb00be766ea739 ChangeLog 6771
+MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+MD5 a895616888f1136a0ae73affcbf958cc files/digest-xfce4-toys-4.2.2-r1 68
+MD5 e57b8e8e6d0bcd722588e9a4b4e9da6a files/digest-xfce4-toys-4.2.1 68
+MD5 a895616888f1136a0ae73affcbf958cc files/digest-xfce4-toys-4.2.2 68
diff --git a/xfce-extra/xfce4-toys/xfce4-toys-4.2.1.ebuild b/xfce-extra/xfce4-toys/xfce4-toys-4.2.1.ebuild
index 483119f35f55..ba07e8f22934 100644
--- a/xfce-extra/xfce4-toys/xfce4-toys-4.2.1.ebuild
+++ b/xfce-extra/xfce4-toys/xfce4-toys-4.2.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/xfce-extra/xfce4-toys/xfce4-toys-4.2.1.ebuild,v 1.1 2005/03/17 03:13:09 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-toys/xfce4-toys-4.2.1.ebuild,v 1.1.1.1 2005/11/30 09:38:58 chriswhite Exp $
 
 DESCRIPTION="Xfce 4 panel toys plugin"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
-RDEPEND="~xfce-base/xfce4-panel-${PV}"
+RDEPEND="~xfce-base/xfce4-panel-4.2.1.1"
 
-inherit xfce4
\ No newline at end of file
+inherit xfce4
diff --git a/xfce-extra/xfce4-toys/xfce4-toys-4.2.2-r1.ebuild b/xfce-extra/xfce4-toys/xfce4-toys-4.2.2-r1.ebuild
index bc08543cb4b1..10993c50bbfd 100644
--- a/xfce-extra/xfce4-toys/xfce4-toys-4.2.2-r1.ebuild
+++ b/xfce-extra/xfce4-toys/xfce4-toys-4.2.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/xfce-extra/xfce4-toys/xfce4-toys-4.2.2-r1.ebuild,v 1.1 2005/10/06 06:55:33 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-toys/xfce4-toys-4.2.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:58 chriswhite Exp $
 
 inherit xfce42
 
diff --git a/xfce-extra/xfce4-toys/xfce4-toys-4.2.2.ebuild b/xfce-extra/xfce4-toys/xfce4-toys-4.2.2.ebuild
index 708385048ee6..df37ac1f8742 100644
--- a/xfce-extra/xfce4-toys/xfce4-toys-4.2.2.ebuild
+++ b/xfce-extra/xfce4-toys/xfce4-toys-4.2.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/xfce-extra/xfce4-toys/xfce4-toys-4.2.2.ebuild,v 1.1 2005/05/18 03:08:08 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-toys/xfce4-toys-4.2.2.ebuild,v 1.1.1.1 2005/11/30 09:38:58 chriswhite Exp $
 
 DESCRIPTION="Xfce 4 panel toys plugin"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 
 RDEPEND="~xfce-base/xfce4-panel-${PV}"
 
diff --git a/xfce-extra/xfce4-trigger-launcher/ChangeLog b/xfce-extra/xfce4-trigger-launcher/ChangeLog
index fd041c27da7d..85ce3e0efcb4 100644
--- a/xfce-extra/xfce4-trigger-launcher/ChangeLog
+++ b/xfce-extra/xfce4-trigger-launcher/ChangeLog
@@ -1,6 +1,254 @@
 # ChangeLog for xfce-extra/xfce4-trigger-launcher
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-trigger-launcher/ChangeLog,v 1.1 2003/07/15 18:17:18 bcowan Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-trigger-launcher/ChangeLog,v 1.1.1.1 2005/11/30 09:38:58 chriswhite Exp $
+
+*xfce4-trigger-launcher-4.2.2-r1 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-trigger-launcher-4.2.2-r1.ebuild:
+  Xfce builds for new eclass and modular Xorg.
+
+  12 Jul 2005; Simon Stelling <blubb@gentoo.org>
+  xfce4-trigger-launcher-4.2.2.ebuild:
+  stable on amd64
+
+  11 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  xfce4-trigger-launcher-4.2.2.ebuild:
+  Stable on alpha + ia64.
+
+  11 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  xfce4-trigger-launcher-4.2.2.ebuild:
+  Stable on hppa.
+
+  08 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  xfce4-trigger-launcher-4.2.2.ebuild:
+  Stable on sparc
+
+  07 Jul 2005; Daniel Ostrow <dostrow@gentoo.org>
+  xfce4-trigger-launcher-4.2.2.ebuild:
+  Stable on ppc and ppc64.
+
+  15 Jun 2005; Markus Rothe <corsair@gentoo.org>
+  xfce4-trigger-launcher-4.2.0.ebuild:
+  Stable on ppc64
+
+*xfce4-trigger-launcher-4.2.2 (18 May 2005)
+
+  18 May 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-trigger-launcher-4.2.2.ebuild:
+  4.2.2 bugfix release of Xfce 4.
+
+  23 Mar 2005; Daniel Ostrow <dostrow@gentoo.org>
+  xfce4-trigger-launcher-4.2.1.ebuild:
+  Version bump and associated fixes.
+
+*xfce4-trigger-launcher-4.2.1 (17 Mar 2005)
+
+  17 Mar 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-trigger-launcher-4.2.1.ebuild:
+  Bugfix release of Xfce4.
+
+  09 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
+  xfce4-trigger-launcher-4.2.0.ebuild:
+  Stable on alpha.
+
+  31 Jan 2005; lanius@gentoo.org xfce4-trigger-launcher-4.2.0.ebuild:
+  stable on amd64
+
+  29 Jan 2005; Lars Weiler <pylon@gentoo.org>
+  xfce4-trigger-launcher-4.2.0.ebuild:
+  Stable on ppc.
+
+  24 Jan 2005; Guy Martin <gmsoft@gentoo.org>
+  xfce4-trigger-launcher-4.2.0.ebuild:
+  Stable on hppa.
+
+*xfce4-trigger-launcher-4.2.0 (16 Jan 2005)
+
+  16 Jan 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-trigger-launcher-4.2.0.ebuild:
+  4.2 final release of Xfce4.
+
+*xfce4-trigger-launcher-4.1.99.3-r1 (06 Jan 2005)
+
+  06 Jan 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-trigger-launcher-4.1.99.3-r1.ebuild:
+  Updated to use Xfce4 eclass.
+
+  03 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*xfce4-trigger-launcher-4.1.99.3 (02 Jan 2005)
+
+  02 Jan 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-trigger-launcher-4.1.99.3.ebuild:
+  Version bump to RC version of 4.2 release.
+
+*xfce4-trigger-launcher-4.1.99.2 (13 Dec 2004)
+
+  13 Dec 2004; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-trigger-launcher-4.1.99.2.ebuild:
+  Version bump for beta version of 4.2 release.
+
+*xfce4-trigger-launcher-4.1.99.1 (25 Nov 2004)
+
+  25 Nov 2004; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-trigger-launcher-4.1.99.1.ebuild:
+  Version bump for beta version of 4.2 release.
+
+*xfce4-trigger-launcher-4.1.91 (31 Oct 2004)
+
+  31 Oct 2004; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-trigger-launcher-4.1.91.ebuild:
+  Version bump of beta version of 4.2 release.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org>
+  xfce4-trigger-launcher-4.0.6.ebuild:
+  Stable on amd64.
+
+*xfce4-trigger-launcher-4.1.90 (04 Oct 2004)
+
+  04 Oct 2004; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-trigger-launcher-4.1.90.ebuild:
+  Beta version of new 4.2 release. Contains too numerous improvements to list.
+
+  18 Sep 2004; Tom Gall <tgall@gentoo.org> xfce4-trigger-launcher-4.0.6.ebuild:
+  stable on ppc64, bug #57744
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  xfce4-trigger-launcher-4.0.6.ebuild:
+  Masked xfce4-trigger-launcher-4.0.6.ebuild stable for ppc
+
+  07 Aug 2004; Bryan Østergaard <kloeri@gentoo.org>
+  xfce4-trigger-launcher-4.0.6.ebuild:
+  Stable on alpha.
+
+  06 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  xfce4-trigger-launcher-4.0.6.ebuild:
+  Stable on sparc
+
+  06 Aug 2004; Guy Martin <gmsoft@gentoo.org>
+  xfce4-trigger-launcher-4.0.6.ebuild:
+  Stable on hppa.
+
+*xfce4-trigger-launcher-4.0.6 (12 Jul 2004)
+
+  12 Jul 2004; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-trigger-launcher-4.0.6.ebuild:
+  Version bump. Bugfix release on stable branch that fixes cropped icons with
+  gtk-2.4 along with many others.
+
+  23 Jun 2004; <malc@gentoo.org> xfce4-trigger-launcher-4.0.5.ebuild:
+  Mark stable on amd64
+
+  19 May 2004; Guy Martin <gmsoft@gentoo.org>
+  xfce4-trigger-launcher-4.0.5.ebuild:
+  Marked stable on hppa
+
+  03 May 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  xfce4-trigger-launcher-4.0.5.ebuild:
+  Stable on sparc
+
+  20 Apr 2004; Aron Griffis <agriffis@gentoo.org>
+  xfce4-trigger-launcher-4.0.4.ebuild:
+  Stable on alpha and ia64
+
+*xfce4-trigger-launcher-4.0.5 (18 Apr 2004)
+
+  18 Apr 2004; Brad Cowan <bcowan@gentoo.org>
+  xfce4-trigger-launcher-4.0.5.ebuild:
+  Bugfix release of xfce4.
+
+  17 Apr 2004; Daniel Ahlberg <aliz@gentoo.org>
+  xfce4-trigger-launcher-4.0.0.ebuild, xfce4-trigger-launcher-4.0.1.ebuild,
+  xfce4-trigger-launcher-4.0.2.ebuild, xfce4-trigger-launcher-4.0.3.ebuild,
+  xfce4-trigger-launcher-4.0.4.ebuild:
+  Removed S=
+
+  05 Apr 2004; Guy Martin <gmsoft@gentoo.org>
+  xfce4-trigger-launcher-4.0.4.ebuild:
+  Marked stable on hppa.
+
+  16 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  xfce4-trigger-launcher-4.0.4.ebuild:
+  stable on sparc
+
+*xfce4-trigger-launcher-4.0.4 (10 Mar 2004)
+
+  10 Mar 2004; Brad Cowan <bcowan@gentoo.org>
+  xfce4-trigger-launcher-4.0.4.ebuild:
+  Bugfix release of xfce4.
+
+  09 Mar 2004; <agriffis@gentoo.org> xfce4-trigger-launcher-4.0.3.ebuild:
+  stable on alpha and ia64
+
+  08 Mar 2004; Bret Curtis <psi29a@gentoo.org>
+  xfce4-trigger-launcher-4.0.3.ebuild:
+  Added ~mips to KEYWORDS
+
+  02 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  xfce4-trigger-launcher-4.0.3.ebuild:
+  stable on sparc
+
+  17 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> :
+  manifest fix
+
+  16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org>
+  xfce4-trigger-launcher-4.0.1.ebuild:
+  set ppc in keywords
+
+*xfce4-trigger-launcher-4.0.3 (09 Jan 2004)
+
+  09 Jan 2004; Brad Cowan <bcowan@gentoo.org>
+  xfce4-trigger-launcher-4.0.3.ebuild:
+  Bugfix release of xfce4. Fixes memory leak and adds kde systray support
+
+*xfce4-trigger-launcher-4.0.2 (24 Dec 2003)
+
+  24 Dec 2003; Brad Cowan <bcowan@gentoo.org>
+  xfce4-trigger-launcher-4.0.2.ebuild:
+  bugfix release of xfce4.
+
+  18 Dec 2003; Jason Wever <weeve@gentoo.org>
+  xfce4-trigger-launcher-4.0.1.ebuild:
+  Marked stable on sparc.
+
+  18 Dec 2003; Guy Martin <gmsoft@gentoo.org>
+  xfce4-trigger-launcher-4.0.1.ebuild:
+  Marked stable on hppa.
+
+*xfce4-trigger-launcher-4.0.1 (12 Nov 2003)
+
+  12 Nov 2003; Brad Cowan <bcowan@gentoo.org>
+  xfce4-trigger-launcher-4.0.1.ebuild:
+  bugfix release of xfce4.
+
+*xfce4-trigger-launcher-4.0.0 (25 Sep 2003)
+
+  16 Nov 2003; Guy Martin <gmsoft@gentoo.org> xfce4-trigger-launcher-4.0.0.ebuild :
+  Added hppa to KEYWORDS.
+
+  25 Sep 2003; Brad Cowan <bcowan@gentoo.org>
+  xfce4-trigger-launcher-4.0.0.ebuild:
+  First official release of xfce4.
+
+*xfce4-trigger-launcher-3.99.4 (12 Sep 2003)
+
+  12 Sep 2003; Brad Cowan <bcowan@gentoo.org>
+  xfce4-trigger-launcher-3.99.4.ebuild:
+  Version bump.
+
+*xfce4-trigger-launcher-3.99.3 (03 Sep 2003)
+
+  03 Sep 2003; Brad Cowan <bcowan@gentoo.org>
+  xfce4-trigger-launcher-3.99.3.ebuild:
+  Version bump.
+
+*xfce4-trigger-launcher-3.99.2 (22 Jul 2003)
+
+  22 Jul 2003; Brad Cowan <bcowan@gentoo.org>
+  xfce4-trigger-launcher-3.99.2.ebuild:
+  Version bump.
 
 *xfce4-trigger-launcher-3.99.1 (15 Jul 2003)
 
diff --git a/xfce-extra/xfce4-trigger-launcher/Manifest b/xfce-extra/xfce4-trigger-launcher/Manifest
index a3e31cdf2565..6daa6e1a11ca 100644
--- a/xfce-extra/xfce4-trigger-launcher/Manifest
+++ b/xfce-extra/xfce4-trigger-launcher/Manifest
@@ -1,2 +1,8 @@
-MD5 5da8716da60ae0c6a2fd75d2fb1b97b2 xfce4-trigger-launcher-3.99.1.ebuild 709
-MD5 4dc9388a8ab36df5c587d7bb1193f777 files/digest-xfce4-trigger-launcher-3.99.1 81
+MD5 004d9d7b9dd55ce01d175fa64969643b xfce4-trigger-launcher-4.2.2-r1.ebuild 447
+MD5 b9a14f530e8a86648778c6256de805a8 xfce4-trigger-launcher-4.2.2.ebuild 420
+MD5 eb84dd282c1a2203febbf2d6ea6bdddf ChangeLog 7661
+MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+MD5 e83d679268efd229d0ae3097af815f57 xfce4-trigger-launcher-4.2.1.ebuild 433
+MD5 a191282a90e86d29725ab15b539d0edf files/digest-xfce4-trigger-launcher-4.2.2-r1 80
+MD5 a0eef084e3e56e5ec39c1189ac0b2fef files/digest-xfce4-trigger-launcher-4.2.1 80
+MD5 a191282a90e86d29725ab15b539d0edf files/digest-xfce4-trigger-launcher-4.2.2 80
diff --git a/xfce-extra/xfce4-trigger-launcher/xfce4-trigger-launcher-4.2.1.ebuild b/xfce-extra/xfce4-trigger-launcher/xfce4-trigger-launcher-4.2.1.ebuild
index 6d2b3362d8c1..ea30a28ba7be 100644
--- a/xfce-extra/xfce4-trigger-launcher/xfce4-trigger-launcher-4.2.1.ebuild
+++ b/xfce-extra/xfce4-trigger-launcher/xfce4-trigger-launcher-4.2.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/xfce-extra/xfce4-trigger-launcher/xfce4-trigger-launcher-4.2.1.ebuild,v 1.1 2005/03/17 03:14:24 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-trigger-launcher/xfce4-trigger-launcher-4.2.1.ebuild,v 1.1.1.1 2005/11/30 09:38:59 chriswhite Exp $
 
 DESCRIPTION="Xfce 4 trigger launcher panel plugin"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
-RDEPEND="~xfce-base/xfce4-panel-${PV}"
+RDEPEND="~xfce-base/xfce4-panel-4.2.1.1"
 
-inherit xfce4
\ No newline at end of file
+inherit xfce4
diff --git a/xfce-extra/xfce4-trigger-launcher/xfce4-trigger-launcher-4.2.2-r1.ebuild b/xfce-extra/xfce4-trigger-launcher/xfce4-trigger-launcher-4.2.2-r1.ebuild
index 71e4c3650c77..2dc2b54c59c7 100644
--- a/xfce-extra/xfce4-trigger-launcher/xfce4-trigger-launcher-4.2.2-r1.ebuild
+++ b/xfce-extra/xfce4-trigger-launcher/xfce4-trigger-launcher-4.2.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/xfce-extra/xfce4-trigger-launcher/xfce4-trigger-launcher-4.2.2-r1.ebuild,v 1.1 2005/10/06 06:57:16 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-trigger-launcher/xfce4-trigger-launcher-4.2.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:59 chriswhite Exp $
 
 inherit xfce42
 
diff --git a/xfce-extra/xfce4-trigger-launcher/xfce4-trigger-launcher-4.2.2.ebuild b/xfce-extra/xfce4-trigger-launcher/xfce4-trigger-launcher-4.2.2.ebuild
index 9f3203dc960c..08165562e7cf 100644
--- a/xfce-extra/xfce4-trigger-launcher/xfce4-trigger-launcher-4.2.2.ebuild
+++ b/xfce-extra/xfce4-trigger-launcher/xfce4-trigger-launcher-4.2.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/xfce-extra/xfce4-trigger-launcher/xfce4-trigger-launcher-4.2.2.ebuild,v 1.1 2005/05/18 03:09:23 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-trigger-launcher/xfce4-trigger-launcher-4.2.2.ebuild,v 1.1.1.1 2005/11/30 09:38:59 chriswhite Exp $
 
 DESCRIPTION="Xfce 4 trigger launcher panel plugin"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 
 RDEPEND="~xfce-base/xfce4-panel-${PV}"
 
diff --git a/xfce-extra/xfce4-wavelan/ChangeLog b/xfce-extra/xfce4-wavelan/ChangeLog
index 0a7b7e1520b6..6dc98b8e7f78 100644
--- a/xfce-extra/xfce4-wavelan/ChangeLog
+++ b/xfce-extra/xfce4-wavelan/ChangeLog
@@ -1,9 +1,41 @@
 # ChangeLog for xfce-extra/xfce4-wavelan
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-wavelan/ChangeLog,v 1.1 2003/11/12 20:54:03 bcowan Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-wavelan/ChangeLog,v 1.1.1.1 2005/11/30 09:39:01 chriswhite Exp $
 
-*xfce4-wavelan-0.1.0 (12 Nov 2003)
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org>
+  xfce4-wavelan-0.4.1-r1.ebuild:
+  Mark 0.4.1-r1 stable on alpha
 
-  12 Nov 2003; Brad Cowan <bcowan@gentoo.org> xfce4-wavelan-0.1.0.ebuild:
-  Initial import.
+*xfce4-wavelan-0.4.1-r2 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-wavelan-0.4.1-r2.ebuild:
+  Xfce builds for new eclass and modular Xorg.
+
+  23 Aug 2005; Aron Griffis <agriffis@gentoo.org>
+  xfce4-wavelan-0.4.1-r1.ebuild:
+  stable on ia64
+
+  12 Jun 2005; Sven Wegener <swegener@gentoo.org>
+  xfce4-wavelan-0.4.1.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  23 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  xfce4-wavelan-0.4.1-r1.ebuild:
+  Stable on ppc.
+
+  31 Jan 2005; lanius@gentoo.org xfce4-wavelan-0.4.1-r1.ebuild:
+  stable on amd64
+
+*xfce4-wavelan-0.4.1-r1 (06 Jan 2005)
+
+  06 Jan 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-wavelan-0.4.1-r1.ebuild:
+  Updated to use Xfce4 eclass.
+
+*xfce4-wavelan-0.4.1 (14 Dec 2004)
+
+  14 Dec 2004; Brad Cowan <bcowan@gentoo.org> +metadata.xml,
+  +xfce4-wavelan-0.4.1.ebuild:
+  Readding to the tree since it now supports linux.
 
diff --git a/xfce-extra/xfce4-wavelan/Manifest b/xfce-extra/xfce4-wavelan/Manifest
index e269a0fc838a..abb0b61b658b 100644
--- a/xfce-extra/xfce4-wavelan/Manifest
+++ b/xfce-extra/xfce4-wavelan/Manifest
@@ -1,2 +1,16 @@
-MD5 13969eec6e33030f38766acf18fda1d2 xfce4-wavelan-0.1.0.ebuild 693
-MD5 d9234137647469d0df7d3912f183ecf7 files/digest-xfce4-wavelan-0.1.0 78
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c7dca1b3a18cf5c906bc54274ad5e2a8 xfce4-wavelan-0.4.1-r1.ebuild 380
+MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+MD5 49284fcae307d914c48c2e93aff7bb2a ChangeLog 1264
+MD5 a0c64d5479df65dbc9d9075203e04313 xfce4-wavelan-0.4.1-r2.ebuild 381
+MD5 ba5ee60f6d06ce87f11c3c36e51a558a files/digest-xfce4-wavelan-0.4.1-r1 78
+MD5 ba5ee60f6d06ce87f11c3c36e51a558a files/digest-xfce4-wavelan-0.4.1-r2 78
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDVRSqJrHF4yAQTrARAjoPAJ94MlYFToFuJ+/2zAdgTT2HKm6m1gCgqdLT
+Wkq6gDpIgqJQcd7FKf2Lu2U=
+=UApA
+-----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-wavelan/xfce4-wavelan-0.4.1-r1.ebuild b/xfce-extra/xfce4-wavelan/xfce4-wavelan-0.4.1-r1.ebuild
index d621b8d33766..892e204579c5 100644
--- a/xfce-extra/xfce4-wavelan/xfce4-wavelan-0.4.1-r1.ebuild
+++ b/xfce-extra/xfce4-wavelan/xfce4-wavelan-0.4.1-r1.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/xfce-extra/xfce4-wavelan/xfce4-wavelan-0.4.1-r1.ebuild,v 1.1 2005/01/07 01:49:40 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-wavelan/xfce4-wavelan-0.4.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:39:01 chriswhite Exp $
 
 DESCRIPTION="Xfce4 panel wavelan plugin"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ~ppc64 ~sparc x86"
 
 GOODIES_PLUGIN=1
 
diff --git a/xfce-extra/xfce4-wavelan/xfce4-wavelan-0.4.1-r2.ebuild b/xfce-extra/xfce4-wavelan/xfce4-wavelan-0.4.1-r2.ebuild
index fd974b26d680..a7ca6d4d1ccc 100644
--- a/xfce-extra/xfce4-wavelan/xfce4-wavelan-0.4.1-r2.ebuild
+++ b/xfce-extra/xfce4-wavelan/xfce4-wavelan-0.4.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/xfce-extra/xfce4-wavelan/xfce4-wavelan-0.4.1-r2.ebuild,v 1.1 2005/10/06 17:50:23 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-wavelan/xfce4-wavelan-0.4.1-r2.ebuild,v 1.1.1.1 2005/11/30 09:39:01 chriswhite Exp $
 
 inherit xfce42
 
diff --git a/xfce-extra/xfce4-weather/ChangeLog b/xfce-extra/xfce4-weather/ChangeLog
index b30c75a3ed6d..fd46c733a7cb 100644
--- a/xfce-extra/xfce4-weather/ChangeLog
+++ b/xfce-extra/xfce4-weather/ChangeLog
@@ -1,6 +1,68 @@
 # ChangeLog for xfce-extra/xfce4-weather
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-weather/ChangeLog,v 1.1 2004/03/03 03:54:43 bcowan Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-weather/ChangeLog,v 1.1.1.1 2005/11/30 09:39:00 chriswhite Exp $
+
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org>
+  xfce4-weather-0.4.9.ebuild:
+  Mark 0.4.9 stable on alpha
+
+*xfce4-weather-0.4.9-r1 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-weather-0.4.9-r1.ebuild:
+  Xfce builds for new eclass and modular Xorg.
+
+  16 Sep 2005; <dang@gentoo.org> xfce4-weather-0.4.9.ebuild:
+  Marked stable on amd64
+
+  12 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
+  xfce4-weather-0.4.9.ebuild:
+  Stable on ppc.
+
+  08 Sep 2005; Aron Griffis <agriffis@gentoo.org>
+  xfce4-weather-0.4.9.ebuild:
+  Mark 0.4.9 stable on ia64
+
+  07 Sep 2005; Brad Cowan <bcowan@gentoo.org> xfce4-weather-0.4.9.ebuild:
+  Stable on x86.
+
+  03 Sep 2005; Luis Medinas <metalgod@gentoo.org>
+  xfce4-weather-0.4.1.ebuild:
+  Marked Stable on AMD64.
+
+  23 Aug 2005; Aron Griffis <agriffis@gentoo.org>
+  xfce4-weather-0.4.1.ebuild:
+  stable on ia64
+
+  12 Jun 2005; Sven Wegener <swegener@gentoo.org>
+  xfce4-weather-0.3.9.1.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+*xfce4-weather-0.4.9 (04 Mar 2005)
+
+  04 Mar 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-weather-0.4.9.ebuild:
+  Version bump.
+
+*xfce4-weather-0.4.1 (20 Jan 2005)
+
+  20 Jan 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-weather-0.4.1.ebuild:
+  Version bump.
+
+*xfce4-weather-0.4.0 (19 Jan 2005)
+
+  19 Jan 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-weather-0.4.0.ebuild:
+  Version bump.
+
+*xfce4-weather-0.3.9.1-r1 (06 Jan 2005)
+
+  06 Jan 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-weather-0.3.9.1-r1.ebuild:
+  Updated to use Xfce4 eclass.
+
+*xfce4-weather-0.3.9.1 (19 Sep 2004)
+
+  19 Sep 2004; Brad Cowan <bcowan@gentoo.org> +xfce4-weather-0.3.9.1.ebuild:
+  Version bump.
 
 *xfce4-weather-0.3.0 (02 Mar 2004)
 
diff --git a/xfce-extra/xfce4-weather/Manifest b/xfce-extra/xfce4-weather/Manifest
index c600cc89b3fc..1a087cf2bb44 100644
--- a/xfce-extra/xfce4-weather/Manifest
+++ b/xfce-extra/xfce4-weather/Manifest
@@ -1,2 +1,22 @@
-MD5 7374312eaf5ff199d7cf2a7d45d3b9a3 xfce4-weather-0.3.0.ebuild 700
-MD5 a8f94c19c436e1477e9dade96a435ef1 files/digest-xfce4-weather-0.3.0 79
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+MD5 155c1ba67e68d225489b501e7e5ba790 xfce4-weather-0.3.9.1-r1.ebuild 375
+MD5 cf79387ac78ef5214d12a3cc4913d921 ChangeLog 2050
+MD5 7a07de33a1dcacfc04bd16f58e9bd061 xfce4-weather-0.4.1.ebuild 378
+MD5 edebd3c8e1046e5ec4f68a2337eb872a xfce4-weather-0.4.9-r1.ebuild 381
+MD5 a3a0056f959e0f09d49beea4bd183169 xfce4-weather-0.4.9.ebuild 376
+MD5 de3394f83ebd1cb70abbc0f06a86da58 xfce4-weather-0.4.0.ebuild 360
+MD5 be989a36ac26d1548a8f34f645093c49 files/digest-xfce4-weather-0.4.0 78
+MD5 2e191f696fc728d12674219a4aeed10c files/digest-xfce4-weather-0.4.1 78
+MD5 28a8646a05ce69fdda6cdcc567d218f0 files/digest-xfce4-weather-0.4.9 78
+MD5 28a8646a05ce69fdda6cdcc567d218f0 files/digest-xfce4-weather-0.4.9-r1 78
+MD5 477c070ad32ba8e67596199d197486f8 files/digest-xfce4-weather-0.3.9.1-r1 81
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDVRU3JrHF4yAQTrARAod5AKC3pNtGQWWBz8kGI8iSJfSgLExPSgCeM4yr
+2FUGGEelKSbdLNdsX3u93rM=
+=hgXD
+-----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-weather/xfce4-weather-0.3.9.1-r1.ebuild b/xfce-extra/xfce4-weather/xfce4-weather-0.3.9.1-r1.ebuild
index 039844087edc..ff3ac7010d55 100644
--- a/xfce-extra/xfce4-weather/xfce4-weather-0.3.9.1-r1.ebuild
+++ b/xfce-extra/xfce4-weather/xfce4-weather-0.3.9.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/xfce-extra/xfce4-weather/xfce4-weather-0.3.9.1-r1.ebuild,v 1.1 2005/01/07 01:49:40 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-weather/xfce4-weather-0.3.9.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:39:00 chriswhite Exp $
 
 DESCRIPTION="Xfce panel weather monitor"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
diff --git a/xfce-extra/xfce4-weather/xfce4-weather-0.4.0.ebuild b/xfce-extra/xfce4-weather/xfce4-weather-0.4.0.ebuild
index eb7b22c1f4d3..cf5aabbc1a30 100644
--- a/xfce-extra/xfce4-weather/xfce4-weather-0.4.0.ebuild
+++ b/xfce-extra/xfce4-weather/xfce4-weather-0.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/xfce-extra/xfce4-weather/xfce4-weather-0.4.0.ebuild,v 1.1 2005/01/19 20:39:32 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-weather/xfce4-weather-0.4.0.ebuild,v 1.1.1.1 2005/11/30 09:39:00 chriswhite Exp $
 
 DESCRIPTION="Xfce panel weather monitor"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
diff --git a/xfce-extra/xfce4-weather/xfce4-weather-0.4.1.ebuild b/xfce-extra/xfce4-weather/xfce4-weather-0.4.1.ebuild
index a1566c399933..aa01d50297b3 100644
--- a/xfce-extra/xfce4-weather/xfce4-weather-0.4.1.ebuild
+++ b/xfce-extra/xfce4-weather/xfce4-weather-0.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/xfce-extra/xfce4-weather/xfce4-weather-0.4.1.ebuild,v 1.1 2005/01/21 01:01:34 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-weather/xfce4-weather-0.4.1.ebuild,v 1.1.1.1 2005/11/30 09:39:00 chriswhite Exp $
 
 DESCRIPTION="Xfce panel weather monitor"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ~ppc64 ~sparc x86"
 
 GOODIES_PLUGIN=1
 
-inherit xfce4
\ No newline at end of file
+inherit xfce4
diff --git a/xfce-extra/xfce4-weather/xfce4-weather-0.4.9-r1.ebuild b/xfce-extra/xfce4-weather/xfce4-weather-0.4.9-r1.ebuild
index b0915a065f0b..bebca0e2a5ee 100644
--- a/xfce-extra/xfce4-weather/xfce4-weather-0.4.9-r1.ebuild
+++ b/xfce-extra/xfce4-weather/xfce4-weather-0.4.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/xfce-extra/xfce4-weather/xfce4-weather-0.4.9-r1.ebuild,v 1.1 2005/10/06 18:05:43 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-weather/xfce4-weather-0.4.9-r1.ebuild,v 1.1.1.1 2005/11/30 09:39:00 chriswhite Exp $
 
 inherit xfce42
 
diff --git a/xfce-extra/xfce4-weather/xfce4-weather-0.4.9.ebuild b/xfce-extra/xfce4-weather/xfce4-weather-0.4.9.ebuild
index e2716e6668d5..a9ac96fe5627 100644
--- a/xfce-extra/xfce4-weather/xfce4-weather-0.4.9.ebuild
+++ b/xfce-extra/xfce4-weather/xfce4-weather-0.4.9.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/xfce-extra/xfce4-weather/xfce4-weather-0.4.9.ebuild,v 1.1 2005/03/04 07:49:22 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-weather/xfce4-weather-0.4.9.ebuild,v 1.1.1.1 2005/11/30 09:39:00 chriswhite Exp $
 
 DESCRIPTION="Xfce panel weather monitor"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ~ppc64 ~sparc x86"
 
 GOODIES_PLUGIN=1
 
diff --git a/xfce-extra/xfce4-websearch/ChangeLog b/xfce-extra/xfce4-websearch/ChangeLog
index 9ad4c56ebe73..2e6d0502674f 100644
--- a/xfce-extra/xfce4-websearch/ChangeLog
+++ b/xfce-extra/xfce4-websearch/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for xfce-extra/xfce4-websearch
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-websearch/ChangeLog,v 1.1 2005/08/14 21:55:44 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-websearch/ChangeLog,v 1.1.1.1 2005/11/30 09:38:58 chriswhite Exp $
+
+*xfce4-websearch-0.1.0-r1 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-websearch-0.1.0-r1.ebuild:
+  Xfce builds for new eclass and modular Xorg.
 
 *xfce4-websearch-0.1.0 (14 Aug 2005)
 
diff --git a/xfce-extra/xfce4-websearch/Manifest b/xfce-extra/xfce4-websearch/Manifest
index 38b8faefd3e3..ffa399c4b1a0 100644
--- a/xfce-extra/xfce4-websearch/Manifest
+++ b/xfce-extra/xfce4-websearch/Manifest
@@ -1,2 +1,6 @@
-MD5 5af288ca3f146c28d5be3d88bd658894 xfce4-websearch-0.1.0.ebuild 391
+MD5 685e14bddfb91176f1b334ca88623f91 xfce4-websearch-0.1.0-r1.ebuild 388
+MD5 f31abcbd3619536faaf43b3a20aca8f8 xfce4-websearch-0.1.0.ebuild 386
+MD5 4be2c20a8a9a5c48f80bda2b170093b1 ChangeLog 547
+MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+MD5 886c6f6d7a7c0d869153ae779076e591 files/digest-xfce4-websearch-0.1.0-r1 80
 MD5 886c6f6d7a7c0d869153ae779076e591 files/digest-xfce4-websearch-0.1.0 80
diff --git a/xfce-extra/xfce4-websearch/xfce4-websearch-0.1.0-r1.ebuild b/xfce-extra/xfce4-websearch/xfce4-websearch-0.1.0-r1.ebuild
index a76cf07cecc4..8eae4cf21504 100644
--- a/xfce-extra/xfce4-websearch/xfce4-websearch-0.1.0-r1.ebuild
+++ b/xfce-extra/xfce4-websearch/xfce4-websearch-0.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/xfce-extra/xfce4-websearch/xfce4-websearch-0.1.0-r1.ebuild,v 1.1 2005/10/06 18:07:04 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-websearch/xfce4-websearch-0.1.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:58 chriswhite Exp $
 
 inherit xfce42
 
diff --git a/xfce-extra/xfce4-websearch/xfce4-websearch-0.1.0.ebuild b/xfce-extra/xfce4-websearch/xfce4-websearch-0.1.0.ebuild
index eecfc2b0d131..d5b755b1ec3d 100644
--- a/xfce-extra/xfce4-websearch/xfce4-websearch-0.1.0.ebuild
+++ b/xfce-extra/xfce4-websearch/xfce4-websearch-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/xfce-extra/xfce4-websearch/xfce4-websearch-0.1.0.ebuild,v 1.1 2005/08/14 21:55:44 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-websearch/xfce4-websearch-0.1.0.ebuild,v 1.1.1.1 2005/11/30 09:38:58 chriswhite Exp $
 
 DESCRIPTION="Xfce4 panel websearch plugin"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
diff --git a/xfce-extra/xfce4-windowlist/ChangeLog b/xfce-extra/xfce4-windowlist/ChangeLog
index 76258b68ab9b..0dcdc8b82ca4 100644
--- a/xfce-extra/xfce4-windowlist/ChangeLog
+++ b/xfce-extra/xfce4-windowlist/ChangeLog
@@ -1,6 +1,33 @@
 # ChangeLog for xfce-extra/xfce4-windowlist
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-windowlist/ChangeLog,v 1.1 2004/09/20 17:10:38 bcowan Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-windowlist/ChangeLog,v 1.1.1.1 2005/11/30 09:39:01 chriswhite Exp $
+
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org>
+  xfce4-windowlist-0.1.0-r1.ebuild:
+  Mark 0.1.0-r1 stable on alpha
+
+*xfce4-windowlist-0.1.0-r2 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-windowlist-0.1.0-r2.ebuild:
+  Xfce builds for new eclass and modular Xorg.
+
+  07 Jul 2005; Daniel Ostrow <dostrow@gentoo.org>
+  xfce4-windowlist-0.1.0-r1.ebuild:
+  Stable on ppc64.
+
+  31 Jan 2005; lanius@gentoo.org xfce4-windowlist-0.1.0-r1.ebuild:
+  stable on amd64
+
+  29 Jan 2005; Lars Weiler <pylon@gentoo.org>
+  xfce4-windowlist-0.1.0-r1.ebuild:
+  Stable on ppc.
+
+*xfce4-windowlist-0.1.0-r1 (06 Jan 2005)
+
+  06 Jan 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-windowlist-0.1.0-r1.ebuild:
+  Updated to use Xfce4 eclass.
 
 *xfce4-windowlist-0.1.0 (20 Sep 2004)
 
diff --git a/xfce-extra/xfce4-windowlist/Manifest b/xfce-extra/xfce4-windowlist/Manifest
index 03c70df354c1..64917695478d 100644
--- a/xfce-extra/xfce4-windowlist/Manifest
+++ b/xfce-extra/xfce4-windowlist/Manifest
@@ -1,2 +1,16 @@
-MD5 f077a8925a03bfe61894702eec015e77 xfce4-windowlist-0.1.0.ebuild 725
-MD5 ede2fb1d0a92f8c2aa944bb0134a181a files/digest-xfce4-windowlist-0.1.0 81
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+MD5 bdbb832b44beb77c60a8cc44ff63199d ChangeLog 1123
+MD5 30e3f50c03d9f992cf3fbf75a1e3636d xfce4-windowlist-0.1.0-r2.ebuild 420
+MD5 89d63771bef698cd4a29ad59fcf59df0 xfce4-windowlist-0.1.0-r1.ebuild 419
+MD5 ede2fb1d0a92f8c2aa944bb0134a181a files/digest-xfce4-windowlist-0.1.0-r1 81
+MD5 ede2fb1d0a92f8c2aa944bb0134a181a files/digest-xfce4-windowlist-0.1.0-r2 81
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDVRXeJrHF4yAQTrARAqBrAJ0RJ5gmVp/d4TjRj59av3Zqca9cxgCguA7f
+HvL8vKFrO7CMj0J6mHgRn9k=
+=190K
+-----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-windowlist/xfce4-windowlist-0.1.0-r1.ebuild b/xfce-extra/xfce4-windowlist/xfce4-windowlist-0.1.0-r1.ebuild
index 0cfa79aad939..938b4180a4f0 100644
--- a/xfce-extra/xfce4-windowlist/xfce4-windowlist-0.1.0-r1.ebuild
+++ b/xfce-extra/xfce4-windowlist/xfce4-windowlist-0.1.0-r1.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/xfce-extra/xfce4-windowlist/xfce4-windowlist-0.1.0-r1.ebuild,v 1.1 2005/01/06 23:41:11 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-windowlist/xfce4-windowlist-0.1.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:39:01 chriswhite Exp $
 
 DESCRIPTION="Xfce4 panel windowlist plugin"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 
 GOODIES_PLUGIN=1
 XFCE_S=${WORKDIR}/${MY_P/-${PV}/}
 
-inherit xfce4
\ No newline at end of file
+inherit xfce4
diff --git a/xfce-extra/xfce4-windowlist/xfce4-windowlist-0.1.0-r2.ebuild b/xfce-extra/xfce4-windowlist/xfce4-windowlist-0.1.0-r2.ebuild
index dd6387d8480c..154e78ebaea5 100644
--- a/xfce-extra/xfce4-windowlist/xfce4-windowlist-0.1.0-r2.ebuild
+++ b/xfce-extra/xfce4-windowlist/xfce4-windowlist-0.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/xfce-extra/xfce4-windowlist/xfce4-windowlist-0.1.0-r2.ebuild,v 1.1 2005/10/06 18:08:13 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-windowlist/xfce4-windowlist-0.1.0-r2.ebuild,v 1.1.1.1 2005/11/30 09:39:01 chriswhite Exp $
 
 inherit xfce42
 
diff --git a/xfce-extra/xfce4-xkb/ChangeLog b/xfce-extra/xfce4-xkb/ChangeLog
index 130a7ca94f8e..e6ab36cd6ec8 100644
--- a/xfce-extra/xfce4-xkb/ChangeLog
+++ b/xfce-extra/xfce4-xkb/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for xfce-extra/xfce4-xkb
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xkb/ChangeLog,v 1.1 2004/09/20 17:14:52 bcowan Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xkb/ChangeLog,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
+
+*xfce4-xkb-0.3.2-r2 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-xkb-0.3.2-r2.ebuild:
+  Xfce builds for new eclass and modular Xorg.
+
+*xfce4-xkb-0.3.2-r1 (06 Jan 2005)
+
+  06 Jan 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-xkb-0.3.2-r1.ebuild:
+  Updated to use Xfce4 eclass.
 
 *xfce4-xkb-0.3.2 (20 Sep 2004)
 
diff --git a/xfce-extra/xfce4-xkb/Manifest b/xfce-extra/xfce4-xkb/Manifest
index 9b001f76e7db..798f6dcdf2d2 100644
--- a/xfce-extra/xfce4-xkb/Manifest
+++ b/xfce-extra/xfce4-xkb/Manifest
@@ -1,2 +1,6 @@
-MD5 f077a8925a03bfe61894702eec015e77 xfce4-xkb-0.3.2.ebuild 725
-MD5 f2f7062883e987a9719cba81f19d7b34 files/digest-xfce4-xkb-0.3.2 74
+MD5 a38b6099a26d3a6b62d4aca1bc1d4ebe xfce4-xkb-0.3.2-r2.ebuild 527
+MD5 b0ca8ebce52a8e8e1191940f69d95db8 xfce4-xkb-0.3.2-r1.ebuild 388
+MD5 975f55f172c7e873e6c48fcfc0d62419 ChangeLog 650
+MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+MD5 f2f7062883e987a9719cba81f19d7b34 files/digest-xfce4-xkb-0.3.2-r1 74
+MD5 f2f7062883e987a9719cba81f19d7b34 files/digest-xfce4-xkb-0.3.2-r2 74
diff --git a/xfce-extra/xfce4-xkb/xfce4-xkb-0.3.2-r1.ebuild b/xfce-extra/xfce4-xkb/xfce4-xkb-0.3.2-r1.ebuild
index 18e63514f7c9..8b551441a441 100644
--- a/xfce-extra/xfce4-xkb/xfce4-xkb-0.3.2-r1.ebuild
+++ b/xfce-extra/xfce4-xkb/xfce4-xkb-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/xfce-extra/xfce4-xkb/xfce4-xkb-0.3.2-r1.ebuild,v 1.1 2005/01/07 01:49:40 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xkb/xfce4-xkb-0.3.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
 
 DESCRIPTION="Xfce4 panel xkb layout switching plugin"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
diff --git a/xfce-extra/xfce4-xkb/xfce4-xkb-0.3.2-r2.ebuild b/xfce-extra/xfce4-xkb/xfce4-xkb-0.3.2-r2.ebuild
index c71df7ae167b..bc7d44299dbe 100644
--- a/xfce-extra/xfce4-xkb/xfce4-xkb-0.3.2-r2.ebuild
+++ b/xfce-extra/xfce4-xkb/xfce4-xkb-0.3.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/xfce-extra/xfce4-xkb/xfce4-xkb-0.3.2-r2.ebuild,v 1.1 2005/10/06 07:53:04 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xkb/xfce4-xkb-0.3.2-r2.ebuild,v 1.1.1.1 2005/11/30 09:38:56 chriswhite Exp $
 
 inherit xfce42
 
diff --git a/xfce-extra/xfce4-xmms-controller/ChangeLog b/xfce-extra/xfce4-xmms-controller/ChangeLog
index fef437be30ce..3367659bf121 100644
--- a/xfce-extra/xfce4-xmms-controller/ChangeLog
+++ b/xfce-extra/xfce4-xmms-controller/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for xfce-extra/xfce4-xmms-controller
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xmms-controller/ChangeLog,v 1.1 2004/03/14 07:22:26 bcowan Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xmms-controller/ChangeLog,v 1.1.1.1 2005/11/30 09:39:00 chriswhite Exp $
+
+*xfce4-xmms-controller-1.4.3-r2 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-xmms-controller-1.4.3-r2.ebuild:
+  Xfce builds for new eclass and modular Xorg.
+
+*xfce4-xmms-controller-1.4.3-r1 (07 Jan 2005)
+
+  07 Jan 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-xmms-controller-1.4.3-r1.ebuild:
+  Update for eclass.
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org>
+  xfce4-xmms-controller-1.4.3.ebuild:
+  Add die following econf for bug 48950
 
 *xfce4-xmms-controller-1.4.3 (14 Mar 2004)
 
diff --git a/xfce-extra/xfce4-xmms-controller/Manifest b/xfce-extra/xfce4-xmms-controller/Manifest
index 402f9adb979e..194eacbf225e 100644
--- a/xfce-extra/xfce4-xmms-controller/Manifest
+++ b/xfce-extra/xfce4-xmms-controller/Manifest
@@ -1,2 +1,6 @@
-MD5 8acb7c6d7461198776a742c3680ef7a4 xfce4-xmms-controller-1.4.3.ebuild 693
-MD5 878c71f8e5c55647576993fe8ec56ab9 files/digest-xfce4-xmms-controller-1.4.3 86
+MD5 1a33c766aefe8af541c59fded751c028 xfce4-xmms-controller-1.4.3-r2.ebuild 715
+MD5 489a87f9348b28256ab8a96261e77c0e xfce4-xmms-controller-1.4.3-r1.ebuild 698
+MD5 6d75fe53d8692e83060d0a9d4ff4be02 ChangeLog 867
+MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+MD5 878c71f8e5c55647576993fe8ec56ab9 files/digest-xfce4-xmms-controller-1.4.3-r1 86
+MD5 878c71f8e5c55647576993fe8ec56ab9 files/digest-xfce4-xmms-controller-1.4.3-r2 86
diff --git a/xfce-extra/xfce4-xmms-controller/xfce4-xmms-controller-1.4.3-r1.ebuild b/xfce-extra/xfce4-xmms-controller/xfce4-xmms-controller-1.4.3-r1.ebuild
index 7f60659226c6..abcb7762584e 100644
--- a/xfce-extra/xfce4-xmms-controller/xfce4-xmms-controller-1.4.3-r1.ebuild
+++ b/xfce-extra/xfce4-xmms-controller/xfce4-xmms-controller-1.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/xfce-extra/xfce4-xmms-controller/xfce4-xmms-controller-1.4.3-r1.ebuild,v 1.1 2005/01/07 17:28:16 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xmms-controller/xfce4-xmms-controller-1.4.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:39:00 chriswhite Exp $
 
 DESCRIPTION="Xfce panel xmms controller"
 HOMEPAGE="http://eoin.angrystickman.com/"
diff --git a/xfce-extra/xfce4-xmms-controller/xfce4-xmms-controller-1.4.3-r2.ebuild b/xfce-extra/xfce4-xmms-controller/xfce4-xmms-controller-1.4.3-r2.ebuild
index cec62c0f3cd3..a7c496a05f49 100644
--- a/xfce-extra/xfce4-xmms-controller/xfce4-xmms-controller-1.4.3-r2.ebuild
+++ b/xfce-extra/xfce4-xmms-controller/xfce4-xmms-controller-1.4.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/xfce-extra/xfce4-xmms-controller/xfce4-xmms-controller-1.4.3-r2.ebuild,v 1.1 2005/10/06 18:09:17 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xmms-controller/xfce4-xmms-controller-1.4.3-r2.ebuild,v 1.1.1.1 2005/11/30 09:39:00 chriswhite Exp $
 inherit xfce42
 plugin
 
diff --git a/xfce-extra/xfce4-xmms/ChangeLog b/xfce-extra/xfce4-xmms/ChangeLog
index a4ba72569af2..7e6a1e5d4a4e 100644
--- a/xfce-extra/xfce4-xmms/ChangeLog
+++ b/xfce-extra/xfce4-xmms/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for xfce-extra/xfce4-xmms
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xmms/ChangeLog,v 1.1 2003/12/07 19:44:10 bcowan Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xmms/ChangeLog,v 1.1.1.1 2005/11/30 09:38:57 chriswhite Exp $
+
+*xfce4-xmms-0.3.1-r1 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-xmms-0.3.1-r1.ebuild:
+  Xfce builds for new eclass and modular Xorg.
+
+*xfce4-xmms-0.3.1 (16 Jun 2005)
+
+  16 Jun 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-xmms-0.3.1.ebuild:
+  Version bump.
+
+*xfce4-xmms-0.1.1-r1 (06 Jan 2005)
+
+  06 Jan 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-xmms-0.1.1-r1.ebuild:
+  Updated to use Xfce4 eclass.
+
+*xfce4-xmms-0.1.1-r1 (06 Jan 2005)
+
+  06 Jan 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-xmms-0.1.1-r1.ebuild:
+  Updated to use Xfce4 eclass.
 
 *xfce4-xmms-0.1.1 (07 Dec 2003)
 
diff --git a/xfce-extra/xfce4-xmms/Manifest b/xfce-extra/xfce4-xmms/Manifest
index a5cd05abe942..38a53ffbafb6 100644
--- a/xfce-extra/xfce4-xmms/Manifest
+++ b/xfce-extra/xfce4-xmms/Manifest
@@ -1,4 +1,8 @@
-MD5 ba20874e67b58e86e1c438df5079a0bb xfce4-xmms-0.1.1.ebuild 689
-MD5 d80d87e14e49f551f40c49d6d19660cf ChangeLog 347
+MD5 973dde7df94684d91810e98e63f1d3ce xfce4-xmms-0.1.1-r1.ebuild 367
+MD5 282ec258581023d9891d4eca9a0d0d6b xfce4-xmms-0.3.1-r1.ebuild 448
+MD5 382c7c5943f04c822d7cfa06284ea153 xfce4-xmms-0.3.1.ebuild 364
+MD5 c95a19bd9fdaff47e864108acdcb69f1 ChangeLog 905
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 e8c953020c22f72399f66f10780bb3d1 files/digest-xfce4-xmms-0.1.1 76
+MD5 70ae73560fba2812e9e1c1db135b2e1f files/digest-xfce4-xmms-0.3.1-r1 76
+MD5 70ae73560fba2812e9e1c1db135b2e1f files/digest-xfce4-xmms-0.3.1 76
+MD5 e8c953020c22f72399f66f10780bb3d1 files/digest-xfce4-xmms-0.1.1-r1 76
diff --git a/xfce-extra/xfce4-xmms/xfce4-xmms-0.1.1-r1.ebuild b/xfce-extra/xfce4-xmms/xfce4-xmms-0.1.1-r1.ebuild
index 0c805027dadb..b4bb9934fb5a 100644
--- a/xfce-extra/xfce4-xmms/xfce4-xmms-0.1.1-r1.ebuild
+++ b/xfce-extra/xfce4-xmms/xfce4-xmms-0.1.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/xfce-extra/xfce4-xmms/xfce4-xmms-0.1.1-r1.ebuild,v 1.1 2005/01/07 01:49:40 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xmms/xfce4-xmms-0.1.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:57 chriswhite Exp $
 
 DESCRIPTION="Xfce panel xmms controller"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
diff --git a/xfce-extra/xfce4-xmms/xfce4-xmms-0.3.1-r1.ebuild b/xfce-extra/xfce4-xmms/xfce4-xmms-0.3.1-r1.ebuild
index 68bbdc8cb0ed..17b3de79942e 100644
--- a/xfce-extra/xfce4-xmms/xfce4-xmms-0.3.1-r1.ebuild
+++ b/xfce-extra/xfce4-xmms/xfce4-xmms-0.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/xfce-extra/xfce4-xmms/xfce4-xmms-0.3.1-r1.ebuild,v 1.1 2005/10/06 07:56:10 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xmms/xfce4-xmms-0.3.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:57 chriswhite Exp $
 
 inherit xfce42
 
diff --git a/xfce-extra/xfce4-xmms/xfce4-xmms-0.3.1.ebuild b/xfce-extra/xfce4-xmms/xfce4-xmms-0.3.1.ebuild
index 3f1d17bf5b75..603e462ff21c 100644
--- a/xfce-extra/xfce4-xmms/xfce4-xmms-0.3.1.ebuild
+++ b/xfce-extra/xfce4-xmms/xfce4-xmms-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/xfce-extra/xfce4-xmms/xfce4-xmms-0.3.1.ebuild,v 1.1 2005/06/16 23:42:39 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xmms/xfce4-xmms-0.3.1.ebuild,v 1.1.1.1 2005/11/30 09:38:57 chriswhite Exp $
 
 DESCRIPTION="Xfce panel xmms controller"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
diff --git a/xfce-extra/xfmedia/ChangeLog b/xfce-extra/xfmedia/ChangeLog
index e531b8a4fce0..51ab68b3d136 100644
--- a/xfce-extra/xfmedia/ChangeLog
+++ b/xfce-extra/xfmedia/ChangeLog
@@ -1,6 +1,45 @@
 # ChangeLog for xfce-extra/xfmedia
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfmedia/ChangeLog,v 1.1 2004/11/01 21:44:51 bcowan Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfmedia/ChangeLog,v 1.1.1.1 2005/11/30 09:38:59 chriswhite Exp $
+
+*xfmedia-0.9.1-r1 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org> +xfmedia-0.9.1-r1.ebuild:
+  Xfce builds for new eclass and modular Xorg.
+
+*xfmedia-0.9.1 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org> +xfmedia-0.9.1.ebuild:
+  Bump version, closes bug #105940.
+
+  07 Sep 2005; Brad Cowan <bcowan@gentoo.org> xfmedia-0.8.0.ebuild:
+  Add dbus dep.
+
+*xfmedia-0.8.0 (14 Aug 2005)
+
+  14 Aug 2005; Brad Cowan <bcowan@gentoo.org> +xfmedia-0.8.0.ebuild:
+  Bump version.
+
+*xfmedia-0.7.0 (17 Mar 2005)
+
+  17 Mar 2005; Brad Cowan <bcowan@gentoo.org> +xfmedia-0.7.0.ebuild:
+  Version bump.
+
+*xfmedia-0.6.0-r1 (07 Jan 2005)
+
+  07 Jan 2005; Brad Cowan <bcowan@gentoo.org> +xfmedia-0.6.0-r1.ebuild:
+  Update for xfce4 eclass.
+
+*xfmedia-0.6.0 (02 Jan 2005)
+
+  02 Jan 2005; Brad Cowan <bcowan@gentoo.org> +xfmedia-0.6.0.ebuild:
+  Version bump.
+
+*xfmedia-0.5.0 (25 Nov 2004)
+
+  25 Nov 2004; Brad Cowan <bcowan@gentoo.org> +xfmedia-0.5.0.ebuild:
+  Version bump. Thanks to Brian Tarricone bjt23@cornell.edu (main project dev)
+  for the ebuild.
 
 *xfmedia-0.3.0 (01 Nov 2004)
 
diff --git a/xfce-extra/xfmedia/Manifest b/xfce-extra/xfmedia/Manifest
index 83a06bf0e0c9..fb5582f6131c 100644
--- a/xfce-extra/xfmedia/Manifest
+++ b/xfce-extra/xfmedia/Manifest
@@ -1,4 +1,12 @@
-MD5 42825cf82b5a063e453c7d5c5bf6cbfc xfmedia-0.3.0.ebuild 707
-MD5 1cda74d6349ea938980dbeba652e31d8 ChangeLog 344
+MD5 4d66b629cdf2a46222d8429edd08e939 xfmedia-0.6.0-r1.ebuild 526
+MD5 640ba8693bd8f5a244a5543b5ca83744 xfmedia-0.7.0.ebuild 528
+MD5 dcd9acdcff40799269735e5a40ab939b xfmedia-0.9.1-r1.ebuild 786
+MD5 0ae70bd17a911cc5389d91b67bf6542e xfmedia-0.9.1.ebuild 584
+MD5 338370882a698729325183fe51de3ad1 xfmedia-0.8.0.ebuild 543
+MD5 23cc53a018fceece1761dcfd3db37b73 ChangeLog 1396
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 d0f8cac9b16440f4a2a86a689781493c files/digest-xfmedia-0.3.0 65
+MD5 2c3b6e5cf0c76523cb35734e64448845 files/digest-xfmedia-0.7.0 66
+MD5 a23e85c3ffd7b97e397de04e29706d90 files/digest-xfmedia-0.8.0 66
+MD5 b311e3fa2bec544a97d3600745e8cff7 files/digest-xfmedia-0.9.1 66
+MD5 d00487379a40693e44d9bc6d7d014eb6 files/digest-xfmedia-0.6.0-r1 66
+MD5 b311e3fa2bec544a97d3600745e8cff7 files/digest-xfmedia-0.9.1-r1 66
diff --git a/xfce-extra/xfmedia/xfmedia-0.6.0-r1.ebuild b/xfce-extra/xfmedia/xfmedia-0.6.0-r1.ebuild
index 2a7dfa6899bf..240fa0739581 100644
--- a/xfce-extra/xfmedia/xfmedia-0.6.0-r1.ebuild
+++ b/xfce-extra/xfmedia/xfmedia-0.6.0-r1.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/xfce-extra/xfmedia/xfmedia-0.6.0-r1.ebuild,v 1.1 2005/01/07 05:39:27 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfmedia/xfmedia-0.6.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:59 chriswhite Exp $
 
 DESCRIPTION="Xfce4 media player"
 HOMEPAGE="http://spuriousinterrupt.org/projects/xfmedia"
 SRC_URI="http://spuriousinterrupt.org/projects/xfmedia/files/${P}.tar.bz2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86"
 
-XFCE_RDEPEND="media-libs/xine-lib"
+RDEPEND=">=xfce-base/libxfce4mcs-4.2.0
+	media-libs/xine-lib"
 
 inherit xfce4
diff --git a/xfce-extra/xfmedia/xfmedia-0.7.0.ebuild b/xfce-extra/xfmedia/xfmedia-0.7.0.ebuild
index aa0d4564b0ac..ea67a1735d52 100644
--- a/xfce-extra/xfmedia/xfmedia-0.7.0.ebuild
+++ b/xfce-extra/xfmedia/xfmedia-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/xfce-extra/xfmedia/xfmedia-0.7.0.ebuild,v 1.1 2005/03/17 18:26:35 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfmedia/xfmedia-0.7.0.ebuild,v 1.1.1.1 2005/11/30 09:38:59 chriswhite Exp $
 
 DESCRIPTION="Xfce4 media player"
 HOMEPAGE="http://spuriousinterrupt.org/projects/xfmedia"
diff --git a/xfce-extra/xfmedia/xfmedia-0.8.0.ebuild b/xfce-extra/xfmedia/xfmedia-0.8.0.ebuild
index aa2282a664ae..53a5f9f423e2 100644
--- a/xfce-extra/xfmedia/xfmedia-0.8.0.ebuild
+++ b/xfce-extra/xfmedia/xfmedia-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/xfce-extra/xfmedia/xfmedia-0.8.0.ebuild,v 1.1 2005/08/14 19:41:20 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfmedia/xfmedia-0.8.0.ebuild,v 1.1.1.1 2005/11/30 09:38:59 chriswhite Exp $
 
 DESCRIPTION="Xfce4 media player"
 HOMEPAGE="http://spuriousinterrupt.org/projects/xfmedia"
@@ -9,6 +9,7 @@ KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND=">=xfce-base/libxfce4mcs-4.2.0
 	xfce-extra/exo
+	sys-apps/dbus
 	media-libs/xine-lib"
 
 inherit xfce4
diff --git a/xfce-extra/xfmedia/xfmedia-0.9.1-r1.ebuild b/xfce-extra/xfmedia/xfmedia-0.9.1-r1.ebuild
index 377476e13e2f..6b76400cecbe 100644
--- a/xfce-extra/xfmedia/xfmedia-0.9.1-r1.ebuild
+++ b/xfce-extra/xfmedia/xfmedia-0.9.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/xfce-extra/xfmedia/xfmedia-0.9.1-r1.ebuild,v 1.1 2005/10/06 07:58:35 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfmedia/xfmedia-0.9.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:59 chriswhite Exp $
 
 inherit xfce42
 
@@ -14,7 +14,7 @@ RDEPEND="|| ( ( x11-libs/libX11
 	x11-libs/libSM
 	x11-libs/libXtst )
 	virtual/x11 )
-	>=xfce-base/libxfce4mcs-4.2.0
+	>=xfce-base/libxfce4mcs-4.2.2-r1
 	xfce-extra/exo
 	dbus? ( sys-apps/dbus )
 	media-libs/xine-lib
diff --git a/xfce-extra/xfmedia/xfmedia-0.9.1.ebuild b/xfce-extra/xfmedia/xfmedia-0.9.1.ebuild
index 29044497a8e8..14640afff7d5 100644
--- a/xfce-extra/xfmedia/xfmedia-0.9.1.ebuild
+++ b/xfce-extra/xfmedia/xfmedia-0.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfmedia/xfmedia-0.9.1.ebuild,v 1.1 2005/10/06 05:24:11 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfmedia/xfmedia-0.9.1.ebuild,v 1.1.1.1 2005/11/30 09:38:59 chriswhite Exp $
 
 DESCRIPTION="Xfce4 media player"
 HOMEPAGE="http://spuriousinterrupt.org/projects/xfmedia"
diff --git a/xfce-extra/xfwm4-themes/ChangeLog b/xfce-extra/xfwm4-themes/ChangeLog
index bd12ae9073c5..ad1439d0ed3a 100644
--- a/xfce-extra/xfwm4-themes/ChangeLog
+++ b/xfce-extra/xfwm4-themes/ChangeLog
@@ -1,6 +1,203 @@
-# ChangeLog for x11-themes/xfwm4-themes
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfwm4-themes/ChangeLog,v 1.1 2003/07/15 05:35:41 bcowan Exp $
+# ChangeLog for xfce-extra/xfwm4-themes
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfwm4-themes/ChangeLog,v 1.1.1.1 2005/11/30 09:38:57 chriswhite Exp $
+
+*xfwm4-themes-4.2.2-r1 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org> +xfwm4-themes-4.2.2-r1.ebuild:
+  Xfce builds for new eclass and modular Xorg.
+
+  12 Jul 2005; Simon Stelling <blubb@gentoo.org> xfwm4-themes-4.2.2.ebuild:
+  stable on amd64
+
+  11 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  xfwm4-themes-4.2.2.ebuild:
+  Stable on alpha + ia64.
+
+  11 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  xfwm4-themes-4.2.2.ebuild:
+  Stable on hppa.
+
+  08 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  xfwm4-themes-4.2.2.ebuild:
+  Stable on sparc
+
+  07 Jul 2005; Daniel Ostrow <dostrow@gentoo.org> xfwm4-themes-4.2.2.ebuild:
+  Stable on ppc and ppc64.
+
+  15 Jun 2005; Markus Rothe <corsair@gentoo.org> xfwm4-themes-4.2.0.ebuild:
+  Stable on ppc64
+
+*xfwm4-themes-4.2.2 (18 May 2005)
+
+  18 May 2005; Brad Cowan <bcowan@gentoo.org> +xfwm4-themes-4.2.2.ebuild:
+  4.2.2 bugfix release of Xfce 4.
+
+*xfwm4-themes-4.2.1 (17 Mar 2005)
+
+  17 Mar 2005; Brad Cowan <bcowan@gentoo.org> +xfwm4-themes-4.2.1.ebuild:
+  Bugfix release of Xfce4.
+
+  09 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
+  xfwm4-themes-4.2.0.ebuild:
+  Stable on alpha.
+
+  31 Jan 2005; lanius@gentoo.org xfwm4-themes-4.2.0.ebuild:
+  stable on amd64
+
+  29 Jan 2005; Lars Weiler <pylon@gentoo.org> xfwm4-themes-4.2.0.ebuild:
+  Stable on ppc.
+
+  24 Jan 2005; Guy Martin <gmsoft@gentoo.org> xfwm4-themes-4.2.0.ebuild:
+  Stable on hppa.
+
+*xfwm4-themes-4.2.0 (16 Jan 2005)
+
+  16 Jan 2005; Brad Cowan <bcowan@gentoo.org> +xfwm4-themes-4.2.0.ebuild:
+  4.2 final release of Xfce4.
+
+*xfwm4-themes-4.1.99.3-r1 (06 Jan 2005)
+
+  06 Jan 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfwm4-themes-4.1.99.3-r1.ebuild:
+  Updated to use Xfce4 eclass.
+
+  03 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*xfwm4-themes-4.1.99.3 (02 Jan 2005)
+
+  02 Jan 2005; Brad Cowan <bcowan@gentoo.org> +xfwm4-themes-4.1.99.3.ebuild:
+  Version bump to RC version of 4.2 release.
+
+*xfwm4-themes-4.1.99.2 (13 Dec 2004)
+
+  13 Dec 2004; Brad Cowan <bcowan@gentoo.org> +xfwm4-themes-4.1.99.2.ebuild:
+  Version bump for beta version of 4.2 release.
+
+*xfwm4-themes-4.1.99.1 (25 Nov 2004)
+
+  25 Nov 2004; Brad Cowan <bcowan@gentoo.org> +xfwm4-themes-4.1.99.1.ebuild:
+  Version bump for beta version of 4.2 release.
+
+*xfwm4-themes-4.1.91 (31 Oct 2004)
+
+  31 Oct 2004; Brad Cowan <bcowan@gentoo.org> +xfwm4-themes-4.1.91.ebuild:
+  Version bump of beta version of 4.2 release.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org>
+  xfwm4-themes-4.0.6.ebuild:
+  Stable on amd64.
+
+*xfwm4-themes-4.1.90 (04 Oct 2004)
+
+  04 Oct 2004; Brad Cowan <bcowan@gentoo.org> +xfwm4-themes-4.1.90.ebuild:
+  Beta version of new 4.2 release. Contains too numerous improvements to list.
+
+  18 Sep 2004; Tom Gall <tgall@gentoo.org> xfwm4-themes-4.0.6.ebuild:
+  stable on ppc64, bug #57744
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  xfwm4-themes-4.0.6.ebuild:
+  Masked xfwm4-themes-4.0.6.ebuild stable for ppc
+
+  07 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> xfwm4-themes-4.0.6.ebuild:
+  Stable on alpha.
+
+  06 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  xfwm4-themes-4.0.6.ebuild:
+  Stable on sparc
+
+  06 Aug 2004; Guy Martin <gmsoft@gentoo.org> xfwm4-themes-4.0.6.ebuild:
+  Stable on hppa.
+
+*xfwm4-themes-4.0.6 (12 Jul 2004)
+
+  12 Jul 2004; Brad Cowan <bcowan@gentoo.org> +xfwm4-themes-4.0.6.ebuild:
+  Version bump. Bugfix release on stable branch that fixes cropped icons with
+  gtk-2.4 along with many others.
+
+  23 Jun 2004; <malc@gentoo.org> xfwm4-themes-4.0.5.ebuild:
+  Mark stable on amd64
+
+  19 May 2004; Guy Martin <gmsoft@gentoo.org> xfwm4-themes-4.0.5.ebuild:
+  Marked stable on hppa
+
+  03 May 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  xfwm4-themes-4.0.5.ebuild:
+  Stable on sparc
+
+  20 Apr 2004; Aron Griffis <agriffis@gentoo.org> xfwm4-themes-4.0.4.ebuild:
+  Stable on alpha and ia64
+
+  20 Apr 2004; Guy Martin <gmsoft@gentoo.org> xfwm4-themes-4.0.4.ebuild:
+  Marked stable on hppa.
+
+*xfwm4-themes-4.0.5 (18 Apr 2004)
+
+  18 Apr 2004; Brad Cowan <bcowan@gentoo.org> xfwm4-themes-4.0.5.ebuild:
+  Bugfix release of xfce4.
+
+  17 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> xfwm4-themes-4.0.0.ebuild,
+  xfwm4-themes-4.0.3.ebuild, xfwm4-themes-4.0.4.ebuild:
+  Removed S=
+
+  16 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  xfwm4-themes-4.0.4.ebuild:
+  stable on sparc
+
+*xfwm4-themes-4.0.4 (10 Mar 2004)
+
+  10 Mar 2004; Brad Cowan <bcowan@gentoo.org> xfwm4-themes-4.0.4.ebuild:
+  Bugfix release of xfce4.
+
+  09 Mar 2004; <agriffis@gentoo.org> xfwm4-themes-4.0.3.ebuild:
+  stable on alpha and ia64
+
+  08 Mar 2004; Bret Curtis <psi29a@gentoo.org> xfwm4-themes-4.0.3.ebuild:
+  Added ~mips to KEYWORDS
+
+  02 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  xfwm4-themes-4.0.3.ebuild:
+  stable on sparc
+
+  17 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> :
+  manifest fix
+
+  16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org>
+  xfwm4-themes-4.0.0.ebuild:
+  set ppc in keywords
+
+*xfwm4-themes-4.0.3 (09 Jan 2004)
+
+  09 Jan 2004; Brad Cowan <bcowan@gentoo.org> xfwm4-themes-4.0.3.ebuild:
+  Bugfix release of xfce4. Fixes memory leak and adds kde systray support
+
+  18 Dec 2003; Jason Wever <weeve@gentoo.org> xfwm4-themes-4.0.0.ebuild:
+  Marked stable on sparc.
+
+*xfwm4-themes-4.0.0 (25 Sep 2003)
+
+  16 Nov 2003; Guy Martin <gmsoft@gentoo.org> xfwm4-themes-4.0.0.ebuild :
+  Added hppa to KEYWORDS.
+
+  25 Sep 2003; Brad Cowan <bcowan@gentoo.org> xfwm4-themes-4.0.0.ebuild:
+  First official release of xfce4.
+
+*xfwm4-themes-3.99.4 (12 Sep 2003)
+
+  12 Sep 2003; Brad Cowan <bcowan@gentoo.org> xfwm4-themes-3.99.4.ebuild:
+  Version bump.
+
+*xfwm4-themes-3.99.3 (03 Sep 2003)
+
+  03 Sep 2003; Brad Cowan <bcowan@gentoo.org> xfwm4-themes-3.99.3.ebuild:
+  Version bump.
+
+*xfwm4-themes-3.99.2 (22 Jul 2003)
+
+  22 Jul 2003; Brad Cowan <bcowan@gentoo.org> xfwm4-themes-3.99.2.ebuild:
+  Version bump.
 
 *xfwm4-themes-3.99.1 (15 Jul 2003)
 
diff --git a/xfce-extra/xfwm4-themes/Manifest b/xfce-extra/xfwm4-themes/Manifest
index 153fc12f337e..9e56c293f3f1 100644
--- a/xfce-extra/xfwm4-themes/Manifest
+++ b/xfce-extra/xfwm4-themes/Manifest
@@ -1,3 +1,8 @@
-MD5 7fdef381def9a2db0665e323aafd6e97 xfwm4-themes-3.99.1.ebuild 699
-MD5 5e5820113605b8b388a2921ea14fad24 ChangeLog 421
-MD5 87d03f9367cdb710d79c0f8905954243 files/digest-xfwm4-themes-3.99.1 71
+MD5 8041f09fbba6a7dc07bfc9331f08f6df xfwm4-themes-4.2.1.ebuild 395
+MD5 3f58bc9daafe0c53879e57e3302f9b32 xfwm4-themes-4.2.2-r1.ebuild 413
+MD5 acbb64ec4cf98266c79474e6991de992 xfwm4-themes-4.2.2.ebuild 386
+MD5 0ae264e0ae1561903253e9084343c73b ChangeLog 6471
+MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+MD5 bb1cffc84649fb09c4999e7cb2cdc782 files/digest-xfwm4-themes-4.2.2-r1 70
+MD5 d4eb558579e68c9b60f916c299e109bd files/digest-xfwm4-themes-4.2.1 70
+MD5 bb1cffc84649fb09c4999e7cb2cdc782 files/digest-xfwm4-themes-4.2.2 70
diff --git a/xfce-extra/xfwm4-themes/xfwm4-themes-4.2.1.ebuild b/xfce-extra/xfwm4-themes/xfwm4-themes-4.2.1.ebuild
index b8682e233839..3e5ea4ba1e75 100644
--- a/xfce-extra/xfwm4-themes/xfwm4-themes-4.2.1.ebuild
+++ b/xfce-extra/xfwm4-themes/xfwm4-themes-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/xfce-extra/xfwm4-themes/xfwm4-themes-4.2.1.ebuild,v 1.1 2005/03/17 03:15:46 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfwm4-themes/xfwm4-themes-4.2.1.ebuild,v 1.1.1.1 2005/11/30 09:38:57 chriswhite Exp $
 
 DESCRIPTION="Xfce 4 window manager themes"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
diff --git a/xfce-extra/xfwm4-themes/xfwm4-themes-4.2.2-r1.ebuild b/xfce-extra/xfwm4-themes/xfwm4-themes-4.2.2-r1.ebuild
index 20ad173e6f03..882ce35dae9e 100644
--- a/xfce-extra/xfwm4-themes/xfwm4-themes-4.2.2-r1.ebuild
+++ b/xfce-extra/xfwm4-themes/xfwm4-themes-4.2.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/xfce-extra/xfwm4-themes/xfwm4-themes-4.2.2-r1.ebuild,v 1.1 2005/10/06 06:59:13 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfwm4-themes/xfwm4-themes-4.2.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:38:57 chriswhite Exp $
 
 inherit xfce42
 
diff --git a/xfce-extra/xfwm4-themes/xfwm4-themes-4.2.2.ebuild b/xfce-extra/xfwm4-themes/xfwm4-themes-4.2.2.ebuild
index ddbdc42c002b..f0d96ce2ae28 100644
--- a/xfce-extra/xfwm4-themes/xfwm4-themes-4.2.2.ebuild
+++ b/xfce-extra/xfwm4-themes/xfwm4-themes-4.2.2.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/xfce-extra/xfwm4-themes/xfwm4-themes-4.2.2.ebuild,v 1.1 2005/05/18 03:10:32 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfwm4-themes/xfwm4-themes-4.2.2.ebuild,v 1.1.1.1 2005/11/30 09:38:57 chriswhite Exp $
 
 DESCRIPTION="Xfce 4 window manager themes"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 
 RDEPEND="~xfce-base/xfwm4-${PV}"
 
-inherit xfce4
\ No newline at end of file
+inherit xfce4